diff --git a/amt/api/main.py b/amt/api/main.py
index ec4321ec..f381b234 100644
--- a/amt/api/main.py
+++ b/amt/api/main.py
@@ -6,6 +6,6 @@
 api_router.include_router(root.router)
 api_router.include_router(health.router, prefix="/health", tags=["health"])
 api_router.include_router(pages.router, prefix="/pages", tags=["pages"])
-api_router.include_router(algorithms.router, prefix="/algorithm-systems", tags=["algorithm-systems"])
-api_router.include_router(algorithm.router, prefix="/algorithm-system", tags=["algorithm-system"])
+api_router.include_router(algorithms.router, prefix="/algorithms", tags=["algorithms"])
+api_router.include_router(algorithm.router, prefix="/algorithm", tags=["algorithm"])
 api_router.include_router(auth.router, prefix="/auth", tags=["auth"])
diff --git a/amt/api/navigation.py b/amt/api/navigation.py
index 088f6c0f..d1516168 100644
--- a/amt/api/navigation.py
+++ b/amt/api/navigation.py
@@ -22,7 +22,7 @@ class DisplayText(Enum):
     ALGORITHM_DETAILS = "algorithm_details"
     INFO = "info"
     HOME = "home"
-    ALGORITHMS = "algorithm systems"
+    ALGORITHMS = "algorithms"
     OVERVIEW = "overview"
     TASKS = "tasks"
     NEW = "new"
@@ -43,7 +43,7 @@ def get_translation(key: DisplayText, translations: NullTranslations) -> str:
     # translations are determined at runtime, which is why we use the dictionary below
     keys = {
         DisplayText.HOME: _("Home"),
-        DisplayText.ALGORITHMS: _("Algorithm systems"),
+        DisplayText.ALGORITHMS: _("Algorithms"),
         DisplayText.OVERVIEW: _("Overview"),
         DisplayText.TASKS: _("Tasks"),
         DisplayText.NEW: _("New"),
@@ -92,45 +92,41 @@ def get_display_text(self, translations: NullTranslations | None = None) -> str:
 class Navigation:
     ALGORITHMS_ROOT = BaseNavigationItem(
         display_text=DisplayText.ALGORITHMS,
-        url=["/algorithm-systems/", "/algorithm-system/"],
+        url=["/algorithms/", "/algorithm/"],
         icon="rvo-icon-publicatie",
     )
-    ALGORITHMS_OVERVIEW = BaseNavigationItem(display_text=DisplayText.OVERVIEW, url="/algorithm-systems/")
-    ALGORITHM_TASKS = BaseNavigationItem(
-        display_text=DisplayText.TASKS, url="/algorithm-system/{algorithm_id}/details/tasks"
-    )
+    ALGORITHMS_OVERVIEW = BaseNavigationItem(display_text=DisplayText.OVERVIEW, url="/algorithms/")
+    ALGORITHM_TASKS = BaseNavigationItem(display_text=DisplayText.TASKS, url="/algorithm/{algorithm_id}/details/tasks")
     ALGORITHM_DETAILS = BaseNavigationItem(
-        display_text=DisplayText.DETAILS, url="/algorithm-system/{algorithm_id}/details/system_card"
+        display_text=DisplayText.DETAILS, url="/algorithm/{algorithm_id}/details/system_card"
     )
     ALGORITHM_MODEL = BaseNavigationItem(
-        display_text=DisplayText.MODEL, url="/algorithm-system/{algorithm_id}/details/model/inference"
-    )
-    ALGORITHM_NEW = BaseNavigationItem(display_text=DisplayText.NEW, url="/algorithm-systems/new")
-    ALGORITHM_SYSTEM_INFO = BaseNavigationItem(
-        display_text=DisplayText.INFO, url="/algorithm-system/{algorithm_id}/details"
+        display_text=DisplayText.MODEL, url="/algorithm/{algorithm_id}/details/model/inference"
     )
-    ALGORITHM_SYSTEM_ALGORITHM_DETAILS = BaseNavigationItem(
-        display_text=DisplayText.ALGORITHM_DETAILS, url="/algorithm-system/{algorithm_id}/details/system_card"
+    ALGORITHM_NEW = BaseNavigationItem(display_text=DisplayText.NEW, url="/algorithms/new")
+    ALGORITHM_INFO = BaseNavigationItem(display_text=DisplayText.INFO, url="/algorithm/{algorithm_id}/details")
+    ALGORITHM_ALGORITHM_DETAILS = BaseNavigationItem(
+        display_text=DisplayText.ALGORITHM_DETAILS, url="/algorithm/{algorithm_id}/details/system_card"
     )
     ALGORITHM_SYSTEM_CARD = BaseNavigationItem(
-        display_text=DisplayText.SYSTEMCARD, url="/algorithm-system/{algorithm_id}/details/system_card"
+        display_text=DisplayText.SYSTEMCARD, url="/algorithm/{algorithm_id}/details/system_card"
     )
     ALGORITHM_DATA_CARD = BaseNavigationItem(
-        display_text=DisplayText.DATA, url="/algorithm-system/{algorithm_id}/details/system_card/data"
+        display_text=DisplayText.DATA, url="/algorithm/{algorithm_id}/details/system_card/data"
     )
     ALGORITHM_MODEL_CARD = BaseNavigationItem(
         display_text=DisplayText.MODELCARD,
-        url="/algorithm-system/{algorithm_id}/details/system_card/models/{model_card}",
+        url="/algorithm/{algorithm_id}/details/system_card/models/{model_card}",
     )
     ALGORITHM_ASSESSMENT_CARD = BaseNavigationItem(
         display_text=DisplayText.ASSESSMENTCARD,
-        url="/algorithm-system/{algorithm_id}/details/system_card/assessment/{assessment_card}",
+        url="/algorithm/{algorithm_id}/details/system_card/assessment/{assessment_card}",
     )
     ALGORITHM_REQUIREMENTS = BaseNavigationItem(
-        display_text=DisplayText.REQUIREMENTS, url="/algorithm-system/{algorithm_id}/details/system_card/requirements"
+        display_text=DisplayText.REQUIREMENTS, url="/algorithm/{algorithm_id}/details/system_card/requirements"
     )
-    ALGORITHM_SYSTEM_INSTRUMENTS = BaseNavigationItem(
-        display_text=DisplayText.INSTRUMENTS, url="/algorithm-system/{algorithm_id}/details/system_card/instruments"
+    ALGORITHM_INSTRUMENTS = BaseNavigationItem(
+        display_text=DisplayText.INSTRUMENTS, url="/algorithm/{algorithm_id}/details/system_card/instruments"
     )
 
 
diff --git a/amt/api/routes/algorithm.py b/amt/api/routes/algorithm.py
index 8f79914f..423e453f 100644
--- a/amt/api/routes/algorithm.py
+++ b/amt/api/routes/algorithm.py
@@ -70,13 +70,13 @@ async def get_algorithm_or_error(
 def get_algorithm_details_tabs(request: Request) -> list[NavigationItem]:
     return resolve_navigation_items(
         [
-            Navigation.ALGORITHM_SYSTEM_INFO,
-            Navigation.ALGORITHM_SYSTEM_ALGORITHM_DETAILS,
+            Navigation.ALGORITHM_INFO,
+            Navigation.ALGORITHM_ALGORITHM_DETAILS,
             Navigation.ALGORITHM_MODEL,
             Navigation.ALGORITHM_REQUIREMENTS,
             Navigation.ALGORITHM_DATA_CARD,
             Navigation.ALGORITHM_TASKS,
-            Navigation.ALGORITHM_SYSTEM_INSTRUMENTS,
+            Navigation.ALGORITHM_INSTRUMENTS,
         ],
         request,
     )
@@ -114,9 +114,7 @@ async def get_tasks(
     breadcrumbs = resolve_base_navigation_items(
         [
             Navigation.ALGORITHMS_ROOT,
-            BaseNavigationItem(
-                custom_display_text=algorithm.name, url="/algorithm-system/{algorithm_id}/details/system_card"
-            ),
+            BaseNavigationItem(custom_display_text=algorithm.name, url="/algorithm/{algorithm_id}/details/system_card"),
             Navigation.ALGORITHM_TASKS,
         ],
         request,
@@ -193,9 +191,7 @@ async def get_algorithm_details(
     breadcrumbs = resolve_base_navigation_items(
         [
             Navigation.ALGORITHMS_ROOT,
-            BaseNavigationItem(
-                custom_display_text=algorithm.name, url="/algorithm-system/{algorithm_id}/details/system_card"
-            ),
+            BaseNavigationItem(custom_display_text=algorithm.name, url="/algorithm/{algorithm_id}/details/system_card"),
             Navigation.ALGORITHM_DETAILS,
         ],
         request,
@@ -287,9 +283,7 @@ async def get_system_card(
     breadcrumbs = resolve_base_navigation_items(
         [
             Navigation.ALGORITHMS_ROOT,
-            BaseNavigationItem(
-                custom_display_text=algorithm.name, url="/algorithm-system/{algorithm_id}/details/system_card"
-            ),
+            BaseNavigationItem(custom_display_text=algorithm.name, url="/algorithm/{algorithm_id}/details/system_card"),
             Navigation.ALGORITHM_SYSTEM_CARD,
         ],
         request,
@@ -319,7 +313,7 @@ async def get_algorithm_inference(
         [
             Navigation.ALGORITHMS_ROOT,
             BaseNavigationItem(
-                custom_display_text=algorithm.name, url="/algorithm-system/{algorithm_id}/details/model/inference"
+                custom_display_text=algorithm.name, url="/algorithm/{algorithm_id}/details/model/inference"
             ),
             Navigation.ALGORITHM_MODEL,
         ],
@@ -359,9 +353,7 @@ async def get_system_card_requirements(
     breadcrumbs = resolve_base_navigation_items(
         [
             Navigation.ALGORITHMS_ROOT,
-            BaseNavigationItem(
-                custom_display_text=algorithm.name, url="/algorithm-system/{algorithm_id}/details/system_card"
-            ),
+            BaseNavigationItem(custom_display_text=algorithm.name, url="/algorithm/{algorithm_id}/details/system_card"),
             Navigation.ALGORITHM_SYSTEM_CARD,
         ],
         request,
@@ -440,7 +432,7 @@ async def delete_algorithm(
     algorithms_service: Annotated[AlgorithmsService, Depends(AlgorithmsService)],
 ) -> HTMLResponse:
     await algorithms_service.delete(algorithm_id)
-    return templates.Redirect(request, "/algorithm-systems/")
+    return templates.Redirect(request, "/algorithms/")
 
 
 @router.get("/{algorithm_id}/measure/{measure_urn}")
@@ -505,7 +497,7 @@ async def update_measure_value(
 
     await algorithms_service.update(algorithm)
     # TODO: FIX THIS!! The page now reloads at the top, which is annoying
-    return templates.Redirect(request, f"/algorithm-system/{algorithm_id}/details/system_card/requirements")
+    return templates.Redirect(request, f"/algorithm/{algorithm_id}/details/system_card/requirements")
 
 
 # !!!
@@ -528,9 +520,7 @@ async def get_system_card_data_page(
     breadcrumbs = resolve_base_navigation_items(
         [
             Navigation.ALGORITHMS_ROOT,
-            BaseNavigationItem(
-                custom_display_text=algorithm.name, url="/algorithm-system/{algorithm_id}/details/system_card"
-            ),
+            BaseNavigationItem(custom_display_text=algorithm.name, url="/algorithm/{algorithm_id}/details/system_card"),
             Navigation.ALGORITHM_SYSTEM_CARD,
         ],
         request,
@@ -568,9 +558,7 @@ async def get_system_card_instruments(
     breadcrumbs = resolve_base_navigation_items(
         [
             Navigation.ALGORITHMS_ROOT,
-            BaseNavigationItem(
-                custom_display_text=algorithm.name, url="/algorithm-system/{algorithm_id}/details/system_card"
-            ),
+            BaseNavigationItem(custom_display_text=algorithm.name, url="/algorithm/{algorithm_id}/details/system_card"),
             Navigation.ALGORITHM_SYSTEM_CARD,
         ],
         request,
@@ -606,9 +594,7 @@ async def get_assessment_card(
     breadcrumbs = resolve_base_navigation_items(
         [
             Navigation.ALGORITHMS_ROOT,
-            BaseNavigationItem(
-                custom_display_text=algorithm.name, url="/algorithm-system/{algorithm_id}/details/system_card"
-            ),
+            BaseNavigationItem(custom_display_text=algorithm.name, url="/algorithm/{algorithm_id}/details/system_card"),
             Navigation.ALGORITHM_ASSESSMENT_CARD,
         ],
         request,
@@ -657,9 +643,7 @@ async def get_model_card(
     breadcrumbs = resolve_base_navigation_items(
         [
             Navigation.ALGORITHMS_ROOT,
-            BaseNavigationItem(
-                custom_display_text=algorithm.name, url="/algorithm-system/{algorithm_id}/details/system_card"
-            ),
+            BaseNavigationItem(custom_display_text=algorithm.name, url="/algorithm/{algorithm_id}/details/system_card"),
             Navigation.ALGORITHM_MODEL_CARD,
         ],
         request,
diff --git a/amt/api/routes/algorithms.py b/amt/api/routes/algorithms.py
index c8920b28..3191d78f 100644
--- a/amt/api/routes/algorithms.py
+++ b/amt/api/routes/algorithms.py
@@ -69,7 +69,7 @@ async def get_root(
     if display_type == "LIFECYCLE":
         algorithms: dict[str, list[Algorithm]] = {}
 
-        # When the lifecycle filter is active, only show these algorithm systems
+        # When the lifecycle filter is active, only show these algorithms
         if "lifecycle" in filters:
             for lifecycle in Lifecycles:
                 algorithms[lifecycle.name] = []
@@ -154,5 +154,5 @@ async def post_new(
     algorithms_service: Annotated[AlgorithmsService, Depends(AlgorithmsService)],
 ) -> HTMLResponse:
     algorithm = await algorithms_service.create(algorithm_new)
-    response = templates.Redirect(request, f"/algorithm-system/{algorithm.id}/details/tasks")
+    response = templates.Redirect(request, f"/algorithm/{algorithm.id}/details/tasks")
     return response
diff --git a/amt/api/routes/auth.py b/amt/api/routes/auth.py
index d8b71908..9e7d4ee5 100644
--- a/amt/api/routes/auth.py
+++ b/amt/api/routes/auth.py
@@ -72,7 +72,7 @@ async def auth_callback(
     if user:
         request.session["user"] = dict(user)  # type: ignore
         request.session["id_token"] = token["id_token"]  # type: ignore
-    return RedirectResponse(url="/algorithm-systems/")
+    return RedirectResponse(url="/algorithms/")
 
 
 @router.get("/profile", response_class=Response)
diff --git a/amt/locale/base.pot b/amt/locale/base.pot
index 5b8f1a86..e23d34b6 100644
--- a/amt/locale/base.pot
+++ b/amt/locale/base.pot
@@ -3,7 +3,6 @@
 # This file is distributed under the same license as the PROJECT project.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2024.
 #
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
@@ -44,7 +43,7 @@ msgstr ""
 #: amt/api/group_by_category.py:15
 #: amt/site/templates/algorithms/details_info.html.j2:24
 #: amt/site/templates/algorithms/new.html.j2:40
-#: amt/site/templates/parts/algorithm_search.html.j2:49
+#: amt/site/templates/parts/algorithm_search.html.j2:48
 #: amt/site/templates/parts/filter_list.html.j2:94
 msgid "Lifecycle"
 msgstr ""
@@ -90,7 +89,7 @@ msgid "Home"
 msgstr ""
 
 #: amt/api/navigation.py:46
-msgid "Algorithm systems"
+msgid "Algorithms"
 msgstr ""
 
 #: amt/api/navigation.py:47 amt/site/templates/auth/profile.html.j2:10
@@ -250,7 +249,7 @@ msgid "No"
 msgstr ""
 
 #: amt/site/templates/algorithms/details_base.html.j2:57
-msgid "Delete algorithm system"
+msgid "Delete algorithm"
 msgstr ""
 
 #: amt/site/templates/algorithms/details_base.html.j2:71
@@ -362,7 +361,7 @@ msgid "Repository"
 msgstr ""
 
 #: amt/site/templates/algorithms/details_info.html.j2:20
-msgid "Algorithm system code"
+msgid "Algorithm code"
 msgstr ""
 
 #: amt/site/templates/algorithms/details_info.html.j2:28
@@ -436,19 +435,21 @@ msgid "Edit"
 msgstr ""
 
 #: amt/site/templates/algorithms/new.html.j2:7
-msgid "Create a Algorithm System"
+msgid "Create a Algorithm"
 msgstr ""
 
 #: amt/site/templates/algorithms/new.html.j2:25
-msgid "Algorithm System name"
+#: amt/site/templates/parts/filter_list.html.j2:90
+#: amt/site/templates/parts/filter_list.html.j2:116
+msgid "Algorithm name"
 msgstr ""
 
 #: amt/site/templates/algorithms/new.html.j2:29
-msgid "Name of the algorithm system"
+msgid "Name of the algorithm"
 msgstr ""
 
 #: amt/site/templates/algorithms/new.html.j2:43
-msgid "Select the lifecycle your algorithm system is currently in."
+msgid "Select the lifecycle your algorithm is currently in."
 msgstr ""
 
 #: amt/site/templates/algorithms/new.html.j2:44
@@ -487,7 +488,7 @@ msgid "Choose one or more instruments"
 msgstr ""
 
 #: amt/site/templates/algorithms/new.html.j2:183
-msgid "Create Algorithm System"
+msgid "Create Algorithm"
 msgstr ""
 
 #: amt/site/templates/algorithms/new.html.j2:200
@@ -655,38 +656,38 @@ msgid "Model cards"
 msgstr ""
 
 #: amt/site/templates/parts/algorithm_search.html.j2:9
-msgid "Algorithm Systems"
+msgid "algorithms"
 msgstr ""
 
-#: amt/site/templates/parts/algorithm_search.html.j2:15
-msgid "New algorithm system"
+#: amt/site/templates/parts/algorithm_search.html.j2:14
+msgid "New algorithm"
 msgstr ""
 
-#: amt/site/templates/parts/algorithm_search.html.j2:25
+#: amt/site/templates/parts/algorithm_search.html.j2:24
 msgid "Search"
 msgstr ""
 
-#: amt/site/templates/parts/algorithm_search.html.j2:32
-msgid "Find algorithm system..."
+#: amt/site/templates/parts/algorithm_search.html.j2:31
+msgid "Find algorithm..."
 msgstr ""
 
-#: amt/site/templates/parts/algorithm_search.html.j2:54
+#: amt/site/templates/parts/algorithm_search.html.j2:53
 msgid "Select lifecycle"
 msgstr ""
 
-#: amt/site/templates/parts/algorithm_search.html.j2:63
+#: amt/site/templates/parts/algorithm_search.html.j2:62
 msgid "Category"
 msgstr ""
 
-#: amt/site/templates/parts/algorithm_search.html.j2:68
+#: amt/site/templates/parts/algorithm_search.html.j2:67
 msgid "Select publication category"
 msgstr ""
 
-#: amt/site/templates/parts/algorithm_search.html.j2:86
+#: amt/site/templates/parts/algorithm_search.html.j2:85
 msgid "Group by"
 msgstr ""
 
-#: amt/site/templates/parts/algorithm_search.html.j2:96
+#: amt/site/templates/parts/algorithm_search.html.j2:95
 msgid "Select group by"
 msgstr ""
 
@@ -709,15 +710,10 @@ msgstr ""
 
 #: amt/site/templates/parts/filter_list.html.j2:70
 msgid ""
-"No Algorithm system match your selected filters. Try adjusting your "
-"filters or clearing them to\n"
+"No Algorithm match your selected filters. Try adjusting your filters or "
+"clearing them to\n"
 "        see more\n"
-"        algorithm systems."
-msgstr ""
-
-#: amt/site/templates/parts/filter_list.html.j2:90
-#: amt/site/templates/parts/filter_list.html.j2:116
-msgid "Algorithm system name"
+"        algorithms."
 msgstr ""
 
 #: amt/site/templates/parts/header.html.j2:7
diff --git a/amt/locale/en_US/LC_MESSAGES/messages.mo b/amt/locale/en_US/LC_MESSAGES/messages.mo
index cffc12f4..83f4ad01 100644
Binary files a/amt/locale/en_US/LC_MESSAGES/messages.mo and b/amt/locale/en_US/LC_MESSAGES/messages.mo differ
diff --git a/amt/locale/en_US/LC_MESSAGES/messages.po b/amt/locale/en_US/LC_MESSAGES/messages.po
index 82c01db5..a4557055 100644
--- a/amt/locale/en_US/LC_MESSAGES/messages.po
+++ b/amt/locale/en_US/LC_MESSAGES/messages.po
@@ -45,7 +45,7 @@ msgstr ""
 #: amt/api/group_by_category.py:15
 #: amt/site/templates/algorithms/details_info.html.j2:24
 #: amt/site/templates/algorithms/new.html.j2:40
-#: amt/site/templates/parts/algorithm_search.html.j2:49
+#: amt/site/templates/parts/algorithm_search.html.j2:48
 #: amt/site/templates/parts/filter_list.html.j2:94
 msgid "Lifecycle"
 msgstr ""
@@ -91,7 +91,7 @@ msgid "Home"
 msgstr ""
 
 #: amt/api/navigation.py:46
-msgid "Algorithm systems"
+msgid "Algorithms"
 msgstr ""
 
 #: amt/api/navigation.py:47 amt/site/templates/auth/profile.html.j2:10
@@ -251,7 +251,7 @@ msgid "No"
 msgstr ""
 
 #: amt/site/templates/algorithms/details_base.html.j2:57
-msgid "Delete algorithm system"
+msgid "Delete algorithm"
 msgstr ""
 
 #: amt/site/templates/algorithms/details_base.html.j2:71
@@ -363,7 +363,7 @@ msgid "Repository"
 msgstr ""
 
 #: amt/site/templates/algorithms/details_info.html.j2:20
-msgid "Algorithm system code"
+msgid "Algorithm code"
 msgstr ""
 
 #: amt/site/templates/algorithms/details_info.html.j2:28
@@ -437,19 +437,21 @@ msgid "Edit"
 msgstr ""
 
 #: amt/site/templates/algorithms/new.html.j2:7
-msgid "Create a Algorithm System"
+msgid "Create a Algorithm"
 msgstr ""
 
 #: amt/site/templates/algorithms/new.html.j2:25
-msgid "Algorithm System name"
+#: amt/site/templates/parts/filter_list.html.j2:90
+#: amt/site/templates/parts/filter_list.html.j2:116
+msgid "Algorithm name"
 msgstr ""
 
 #: amt/site/templates/algorithms/new.html.j2:29
-msgid "Name of the algorithm system"
+msgid "Name of the algorithm"
 msgstr ""
 
 #: amt/site/templates/algorithms/new.html.j2:43
-msgid "Select the lifecycle your algorithm system is currently in."
+msgid "Select the lifecycle your algorithm is currently in."
 msgstr ""
 
 #: amt/site/templates/algorithms/new.html.j2:44
@@ -488,7 +490,7 @@ msgid "Choose one or more instruments"
 msgstr ""
 
 #: amt/site/templates/algorithms/new.html.j2:183
-msgid "Create Algorithm System"
+msgid "Create Algorithm"
 msgstr ""
 
 #: amt/site/templates/algorithms/new.html.j2:200
@@ -656,38 +658,38 @@ msgid "Model cards"
 msgstr ""
 
 #: amt/site/templates/parts/algorithm_search.html.j2:9
-msgid "Algorithm Systems"
+msgid "algorithms"
 msgstr ""
 
-#: amt/site/templates/parts/algorithm_search.html.j2:15
-msgid "New algorithm system"
+#: amt/site/templates/parts/algorithm_search.html.j2:14
+msgid "New algorithm"
 msgstr ""
 
-#: amt/site/templates/parts/algorithm_search.html.j2:25
+#: amt/site/templates/parts/algorithm_search.html.j2:24
 msgid "Search"
 msgstr ""
 
-#: amt/site/templates/parts/algorithm_search.html.j2:32
-msgid "Find algorithm system..."
+#: amt/site/templates/parts/algorithm_search.html.j2:31
+msgid "Find algorithm..."
 msgstr ""
 
-#: amt/site/templates/parts/algorithm_search.html.j2:54
+#: amt/site/templates/parts/algorithm_search.html.j2:53
 msgid "Select lifecycle"
 msgstr ""
 
-#: amt/site/templates/parts/algorithm_search.html.j2:63
+#: amt/site/templates/parts/algorithm_search.html.j2:62
 msgid "Category"
 msgstr ""
 
-#: amt/site/templates/parts/algorithm_search.html.j2:68
+#: amt/site/templates/parts/algorithm_search.html.j2:67
 msgid "Select publication category"
 msgstr ""
 
-#: amt/site/templates/parts/algorithm_search.html.j2:86
+#: amt/site/templates/parts/algorithm_search.html.j2:85
 msgid "Group by"
 msgstr ""
 
-#: amt/site/templates/parts/algorithm_search.html.j2:96
+#: amt/site/templates/parts/algorithm_search.html.j2:95
 msgid "Select group by"
 msgstr ""
 
@@ -710,15 +712,10 @@ msgstr ""
 
 #: amt/site/templates/parts/filter_list.html.j2:70
 msgid ""
-"No Algorithm system match your selected filters. Try adjusting your "
-"filters or clearing them to\n"
+"No Algorithm match your selected filters. Try adjusting your filters or "
+"clearing them to\n"
 "        see more\n"
-"        algorithm systems."
-msgstr ""
-
-#: amt/site/templates/parts/filter_list.html.j2:90
-#: amt/site/templates/parts/filter_list.html.j2:116
-msgid "Algorithm system name"
+"        algorithms."
 msgstr ""
 
 #: amt/site/templates/parts/header.html.j2:7
diff --git a/amt/locale/nl_NL/LC_MESSAGES/messages.mo b/amt/locale/nl_NL/LC_MESSAGES/messages.mo
index b7198fa6..e389e672 100644
Binary files a/amt/locale/nl_NL/LC_MESSAGES/messages.mo and b/amt/locale/nl_NL/LC_MESSAGES/messages.mo differ
diff --git a/amt/locale/nl_NL/LC_MESSAGES/messages.po b/amt/locale/nl_NL/LC_MESSAGES/messages.po
index a21b711f..b1807299 100644
--- a/amt/locale/nl_NL/LC_MESSAGES/messages.po
+++ b/amt/locale/nl_NL/LC_MESSAGES/messages.po
@@ -45,7 +45,7 @@ msgstr "Rol"
 #: amt/api/group_by_category.py:15
 #: amt/site/templates/algorithms/details_info.html.j2:24
 #: amt/site/templates/algorithms/new.html.j2:40
-#: amt/site/templates/parts/algorithm_search.html.j2:49
+#: amt/site/templates/parts/algorithm_search.html.j2:48
 #: amt/site/templates/parts/filter_list.html.j2:94
 msgid "Lifecycle"
 msgstr "Levenscyclus"
@@ -91,8 +91,8 @@ msgid "Home"
 msgstr "Start"
 
 #: amt/api/navigation.py:46
-msgid "Algorithm systems"
-msgstr "Algoritmesystemen"
+msgid "Algorithms"
+msgstr "Algoritmes"
 
 #: amt/api/navigation.py:47 amt/site/templates/auth/profile.html.j2:10
 msgid "Overview"
@@ -236,7 +236,7 @@ msgstr ""
 
 #: amt/site/templates/algorithms/details_base.html.j2:19
 msgid "Delete algoritmic system"
-msgstr "Verwijder Algoritmesysteem"
+msgstr "Verwijder algoritme"
 
 #: amt/site/templates/algorithms/details_base.html.j2:26
 msgid "Are you sure you want to delete your algoritmic system "
@@ -261,8 +261,8 @@ msgid "No"
 msgstr "Nee"
 
 #: amt/site/templates/algorithms/details_base.html.j2:57
-msgid "Delete algorithm system"
-msgstr "Verwijder Algoritmesysteem"
+msgid "Delete algorithm"
+msgstr "Verwijder algoritme"
 
 #: amt/site/templates/algorithms/details_base.html.j2:71
 msgid "Does the algorithm meet the requirements?"
@@ -373,8 +373,8 @@ msgid "Repository"
 msgstr "Repository"
 
 #: amt/site/templates/algorithms/details_info.html.j2:20
-msgid "Algorithm system code"
-msgstr "Algoritmesysteem code"
+msgid "Algorithm code"
+msgstr "algoritme code"
 
 #: amt/site/templates/algorithms/details_info.html.j2:28
 #: amt/site/templates/pages/assessment_card.html.j2:7
@@ -449,22 +449,22 @@ msgid "Edit"
 msgstr "Bewerk"
 
 #: amt/site/templates/algorithms/new.html.j2:7
-msgid "Create a Algorithm System"
-msgstr "Creëer een Algoritmesysteem"
+msgid "Create a Algorithm"
+msgstr "Creëer een algoritme"
 
 #: amt/site/templates/algorithms/new.html.j2:25
-msgid "Algorithm System name"
-msgstr "Algoritmesysteem naam"
+#: amt/site/templates/parts/filter_list.html.j2:90
+#: amt/site/templates/parts/filter_list.html.j2:116
+msgid "Algorithm name"
+msgstr "algoritme naam"
 
 #: amt/site/templates/algorithms/new.html.j2:29
-msgid "Name of the algorithm system"
-msgstr "Nieuw algoritmesysteem"
+msgid "Name of the algorithm"
+msgstr "Nieuw algoritme"
 
 #: amt/site/templates/algorithms/new.html.j2:43
-msgid "Select the lifecycle your algorithm system is currently in."
-msgstr ""
-"Selecteer de levenscyclus waarin uw algoritmesysteem zich momenteel "
-"bevindt."
+msgid "Select the lifecycle your algorithm is currently in."
+msgstr "Selecteer de levenscyclus waarin uw algoritme zich momenteel bevindt."
 
 #: amt/site/templates/algorithms/new.html.j2:44
 msgid "For more information on lifecycle, read the"
@@ -507,8 +507,8 @@ msgid "Choose one or more instruments"
 msgstr "Kies één of meerdere instrumenten"
 
 #: amt/site/templates/algorithms/new.html.j2:183
-msgid "Create Algorithm System"
-msgstr "Creëer Algoritmesysteem"
+msgid "Create Algorithm"
+msgstr "Creëer algoritme"
 
 #: amt/site/templates/algorithms/new.html.j2:200
 msgid "Copy results and close"
@@ -682,38 +682,38 @@ msgid "Model cards"
 msgstr "Modelkaart"
 
 #: amt/site/templates/parts/algorithm_search.html.j2:9
-msgid "Algorithm Systems"
+msgid "algorithms"
 msgstr "Algoritmesystemen"
 
-#: amt/site/templates/parts/algorithm_search.html.j2:15
-msgid "New algorithm system"
-msgstr "Nieuw algoritmesysteem"
+#: amt/site/templates/parts/algorithm_search.html.j2:14
+msgid "New algorithm"
+msgstr "Nieuw algoritme"
 
-#: amt/site/templates/parts/algorithm_search.html.j2:25
+#: amt/site/templates/parts/algorithm_search.html.j2:24
 msgid "Search"
 msgstr "Zoek"
 
-#: amt/site/templates/parts/algorithm_search.html.j2:32
-msgid "Find algorithm system..."
-msgstr "Vind algoritmesysteem..."
+#: amt/site/templates/parts/algorithm_search.html.j2:31
+msgid "Find algorithm..."
+msgstr "Vind algoritme..."
 
-#: amt/site/templates/parts/algorithm_search.html.j2:54
+#: amt/site/templates/parts/algorithm_search.html.j2:53
 msgid "Select lifecycle"
 msgstr "Selecteer levenscyclus"
 
-#: amt/site/templates/parts/algorithm_search.html.j2:63
+#: amt/site/templates/parts/algorithm_search.html.j2:62
 msgid "Category"
 msgstr "Categorie"
 
-#: amt/site/templates/parts/algorithm_search.html.j2:68
+#: amt/site/templates/parts/algorithm_search.html.j2:67
 msgid "Select publication category"
 msgstr "Selecteer publicatiecategorie"
 
-#: amt/site/templates/parts/algorithm_search.html.j2:86
+#: amt/site/templates/parts/algorithm_search.html.j2:85
 msgid "Group by"
 msgstr "Groeperen op"
 
-#: amt/site/templates/parts/algorithm_search.html.j2:96
+#: amt/site/templates/parts/algorithm_search.html.j2:95
 msgid "Select group by"
 msgstr "Selecteer groepering"
 
@@ -742,19 +742,13 @@ msgstr "voor"
 
 #: amt/site/templates/parts/filter_list.html.j2:70
 msgid ""
-"No Algorithm system match your selected filters. Try adjusting your "
-"filters or clearing them to\n"
+"No Algorithm match your selected filters. Try adjusting your filters or "
+"clearing them to\n"
 "        see more\n"
-"        algorithm systems."
+"        algorithms."
 msgstr ""
-"Er zijn geen Algoritmesystemen die overeen komen met de geselecteerde "
-"filters. Pas de filters aan of verwijder ze om meer algoritmesystemen te "
-"zien."
-
-#: amt/site/templates/parts/filter_list.html.j2:90
-#: amt/site/templates/parts/filter_list.html.j2:116
-msgid "Algorithm system name"
-msgstr "Algoritmesysteem naam"
+"Er zijn geen Algoritmes die overeen komen met de geselecteerde filters. "
+"Pas de filters aan of verwijder ze om meer algoritmes te zien."
 
 #: amt/site/templates/parts/header.html.j2:7
 msgid "Beta Version"
diff --git a/amt/migrations/versions/f6da4d6dd867_remove_project_table.py b/amt/migrations/versions/f6da4d6dd867_remove_project_table.py
index 30e2e168..25f95222 100644
--- a/amt/migrations/versions/f6da4d6dd867_remove_project_table.py
+++ b/amt/migrations/versions/f6da4d6dd867_remove_project_table.py
@@ -10,7 +10,7 @@
 
 import sqlalchemy as sa
 from alembic import op
-from sqlalchemy.dialects import sqlite
+from sqlalchemy.dialects import sqlite, postgresql
 
 # revision identifiers, used by Alembic.
 revision: str = "f6da4d6dd867"
@@ -27,14 +27,16 @@ def upgrade() -> None:
 
 def downgrade() -> None:
     # ### commands auto generated by Alembic - please adjust! ###
+    lifecycle_enum = postgresql.ENUM(name='lifecycle', create_type=False)
+
     op.create_table(
         "project",
-        sa.Column("id", sa.INTEGER(), nullable=False),
-        sa.Column("name", sa.VARCHAR(length=255), nullable=False),
-        sa.Column("lifecycle", sa.VARCHAR(length=32), nullable=True),
-        sa.Column("last_edited", sa.DATETIME(), server_default=sa.text("(CURRENT_TIMESTAMP)"), nullable=False),
-        sa.Column("system_card_json", sqlite.JSON(), nullable=True),
-        sa.Column("deleted_at", sa.DATETIME(), nullable=True),
+        sa.Column("id", sa.Integer(), nullable=False),
+        sa.Column("name", sa.String(length=255), nullable=False),
+        sa.Column("lifecycle", lifecycle_enum, nullable=True),
+        sa.Column("last_edited", sa.DateTime(), server_default=sa.text("(CURRENT_TIMESTAMP)"), nullable=False),
+        sa.Column("system_card_json", sa.JSON(), nullable=False),
+        sa.Column("deleted_at", sa.DateTime(), nullable=True),
         sa.PrimaryKeyConstraint("id", name="pk_project"),
     )
     # ### end Alembic commands ###
diff --git a/amt/site/templates/algorithms/details_base.html.j2 b/amt/site/templates/algorithms/details_base.html.j2
index ded6d297..0fde8c53 100644
--- a/amt/site/templates/algorithms/details_base.html.j2
+++ b/amt/site/templates/algorithms/details_base.html.j2
@@ -33,7 +33,7 @@
             </p>
             <p class="utrecht-button-group">
                 <button hx-headers='{"X-CSRF-Token": "{{ csrftoken }}"}'
-                        hx-delete="/algorithm-system/{{ algorithm.id }}"
+                        hx-delete="/algorithm/{{ algorithm.id }}"
                         class="utrecht-button utrecht-button--primary-action utrecht-button--rvo-md"
                         type="button">
                     {% trans %}Yes{%
@@ -54,7 +54,7 @@
                     <span class="utrecht-icon rvo-icon rvo-icon-verwijderen rvo-icon--md rvo-icon--hemelblauw rvo-link__icon--before"
                           role="img"
                           aria-label="Home"></span>
-                    {% trans %}Delete algorithm system{% endtrans %}
+                    {% trans %}Delete algorithm{% endtrans %}
                 </a>
             </div>
         </div>
@@ -106,7 +106,7 @@
                         {% endfor %}
                     </ul>
                     <a class="margin-top-large rvo-link rvo-link--normal rvo-link--with-icon rvo-layout-margin-vertical--sm"
-                       href="/algorithm-system/{{ algorithm_id }}/details/system_card/requirements"
+                       href="/algorithm/{{ algorithm_id }}/details/system_card/requirements"
                        style="bottom: 0;
                               position: absolute">
                         <span class="utrecht-icon rvo-icon rvo-icon-pijl-naar-rechts rvo-icon--md rvo-icon--hemelblauw rvo-link__icon--before"
@@ -158,7 +158,7 @@
                         {% endfor %}
                     </ul>
                     <a class="margin-top-large rvo-link rvo-link--normal rvo-link--with-icon rvo-layout-margin-vertical--sm"
-                       href="/algorithm-system/{{ algorithm_id }}/details/system_card/instruments"
+                       href="/algorithm/{{ algorithm_id }}/details/system_card/instruments"
                        style="bottom: 0;
                               position: absolute">
                         <span class="utrecht-icon rvo-icon rvo-icon-pijl-naar-rechts rvo-icon--md rvo-icon--hemelblauw rvo-link__icon--before"
diff --git a/amt/site/templates/algorithms/details_info.html.j2 b/amt/site/templates/algorithms/details_info.html.j2
index b8518444..494fab0c 100644
--- a/amt/site/templates/algorithms/details_info.html.j2
+++ b/amt/site/templates/algorithms/details_info.html.j2
@@ -17,7 +17,7 @@
                     <td class="rvo-table-cell">{{ editable(algorithm, "system_card.provenance.uri") }}</td>
                 </tr>
                 <tr class="rvo-table-row rvo-max-width-layout--sm">
-                    <td class="rvo-table-cell">{% trans %}Algorithm system code{% endtrans %}</td>
+                    <td class="rvo-table-cell">{% trans %}Algorithm code{% endtrans %}</td>
                     <td class="rvo-table-cell">NL-AI-VALIDATIE-383672821-PI234</td>
                 </tr>
                 <tr class="rvo-table-row">
diff --git a/amt/site/templates/algorithms/details_measure_modal.html.j2 b/amt/site/templates/algorithms/details_measure_modal.html.j2
index caec7387..9b93cd98 100644
--- a/amt/site/templates/algorithms/details_measure_modal.html.j2
+++ b/amt/site/templates/algorithms/details_measure_modal.html.j2
@@ -3,7 +3,7 @@
     <div class="rvo-layout-column rvo-layout-gap--md">
         <div class="rvo-layout-column rvo-layout-gap--xs">
             <form hx-ext="json-enc"
-                  hx-post="/algorithm-system/{{ algorithm_id }}/measure/{{ measure.urn }}"
+                  hx-post="/algorithm/{{ algorithm_id }}/measure/{{ measure.urn }}"
                   hx-headers='{"X-CSRF-Token": "{{ csrftoken }}"}'
                   hx-target-error="#errorContainer"
                   hx-swap="innerHTML"
diff --git a/amt/site/templates/algorithms/details_requirements.html.j2 b/amt/site/templates/algorithms/details_requirements.html.j2
index 56eec360..15a1fc34 100644
--- a/amt/site/templates/algorithms/details_requirements.html.j2
+++ b/amt/site/templates/algorithms/details_requirements.html.j2
@@ -46,7 +46,7 @@
                                 <a class="rvo-link rvo-link--normal rvo-link--with-icon"
                                    hx-trigger="click"
                                    hx-target="#dynamic-modal-content"
-                                   hx-get="/algorithm-system/{{ algorithm_id }}/measure/{{ measure.urn }}"
+                                   hx-get="/algorithm/{{ algorithm_id }}/measure/{{ measure.urn }}"
                                    hx-swap="innerHTML"
                                    onclick="amt.openModal('measure-modal')">
                                     <span class="utrecht-icon rvo-icon rvo-icon-pijl-naar-rechts rvo-icon--md rvo-icon--hemelblauw rvo-link__icon--before"
diff --git a/amt/site/templates/algorithms/new.html.j2 b/amt/site/templates/algorithms/new.html.j2
index 7e4c40a9..8793bf46 100644
--- a/amt/site/templates/algorithms/new.html.j2
+++ b/amt/site/templates/algorithms/new.html.j2
@@ -4,11 +4,11 @@
         <div class="rvo-form">
             <div class="rvo-layout-column rvo-layout-gap--sm">
                 <div class="rvo-form-intro">
-                    <h1 class="utrecht-heading-1">{% trans %}Create a Algorithm System{% endtrans %}</h1>
+                    <h1 class="utrecht-heading-1">{% trans %}Create a Algorithm{% endtrans %}</h1>
                 </div>
                 <form class="rvo-layout-column rvo-layout-gap--sm"
                       hx-ext="json-enc"
-                      hx-post="/algorithm-systems/new"
+                      hx-post="/algorithms/new"
                       hx-headers='{"X-CSRF-Token": "{{ csrftoken }}"}'
                       hx-target-error="#errorContainer"
                       hx-swap="innerHTML"
@@ -22,11 +22,11 @@
                                  aria-labelledby="fieldId-label"
                                  class="utrecht-form-field utrecht-form-field--text rvo-form-field">
                                 <div class="rvo-form-field__label">
-                                    <label class="rvo-label rvo-label--required">{% trans %}Algorithm System name{% endtrans %}</label>
+                                    <label class="rvo-label rvo-label--required">{% trans %}Algorithm name{% endtrans %}</label>
                                 </div>
                                 <div id="error-name" class="htmx-error-oob"></div>
                                 <input id="name"
-                                       placeholder="{% trans %}Name of the algorithm system{% endtrans %}"
+                                       placeholder="{% trans %}Name of the algorithm{% endtrans %}"
                                        name="name"
                                        type="text"
                                        class="utrecht-textbox utrecht-textbox--html-input"
@@ -40,7 +40,7 @@
                                     <label class="rvo-label rvo-label--required">{% trans %}Lifecycle{% endtrans %}</label>
                                     <div id="error-lifecycle" class="htmx-error-oob"></div>
                                     <p>
-                                        {% trans %}Select the lifecycle your algorithm system is currently in.{% endtrans %}
+                                        {% trans %}Select the lifecycle your algorithm is currently in.{% endtrans %}
                                         {% trans %}For more information on lifecycle, read the{% endtrans %}
                                         <a class="rvo-link"
                                            href="https://minbzk.github.io/Algoritmekader/levenscyclus/"
@@ -180,7 +180,7 @@
                                 type="submit"
                                 id="button-new-algorithm-create"
                                 hx-on:click="document.querySelectorAll('div.htmx-error-oob').forEach(e => e.innerHTML = '')">
-                            {% trans %}Create Algorithm System{% endtrans %}
+                            {% trans %}Create Algorithm{% endtrans %}
                         </button>
                     </p>
                 </form>
diff --git a/amt/site/templates/algorithms/tasks.html.j2 b/amt/site/templates/algorithms/tasks.html.j2
index f29e9f6f..6e248c05 100644
--- a/amt/site/templates/algorithms/tasks.html.j2
+++ b/amt/site/templates/algorithms/tasks.html.j2
@@ -4,7 +4,7 @@
 {% block detail_content %}
     <div class="container margin-top-large">
         <form id="cardMovedForm"
-              hx-patch="/algorithm-system/move_task"
+              hx-patch="/algorithm/move_task"
               hx-ext="json-enc"
               hx-headers='{"X-CSRF-Token": "{{ csrftoken }}"}'
               hx-target-5
diff --git a/amt/site/templates/macros/table_row.html.j2 b/amt/site/templates/macros/table_row.html.j2
index b33ab9a0..8c2ca2c4 100644
--- a/amt/site/templates/macros/table_row.html.j2
+++ b/amt/site/templates/macros/table_row.html.j2
@@ -1,13 +1,13 @@
 {% macro item(loop, algorithm, show_lifecycles) -%}
     <tr class="rvo-table-row"
-        {% if loop.last and algorithms|length == limit %} data-marker="last-element" hx-get="/algorithm-systems/?skip={{ next }}" hx-swap="beforeend" hx-trigger="revealed" {% endif %}>
+        {% if loop.last and algorithms|length == limit %} data-marker="last-element" hx-get="/algorithms/?skip={{ next }}" hx-swap="beforeend" hx-trigger="revealed" {% endif %}>
         {% if show_lifecycles %}
             <td class="rvo-table-cell">
             {% else %}
                 <td class="rvo-table-cell" style="padding-left: 0">
                 {% endif %}
                 <a class="rvo-link rvo-link--no-underline rvo-link--zwart"
-                   href="/algorithm-system/{{ algorithm.id }}/details/">{{ algorithm.name }}</a>
+                   href="/algorithm/{{ algorithm.id }}/details/">{{ algorithm.name }}</a>
             </td>
             {% if show_lifecycles %}
                 <td class="rvo-table-cell">
diff --git a/amt/site/templates/pages/system_card.html.j2 b/amt/site/templates/pages/system_card.html.j2
index 39e1d4e2..12344ace 100644
--- a/amt/site/templates/pages/system_card.html.j2
+++ b/amt/site/templates/pages/system_card.html.j2
@@ -11,7 +11,7 @@
                     {% for assessment in system_card.assessments %}
                         <li>
                             <a class="rvo-link rvo-link--with-icon rvo-link--zwart rvo-link--normal"
-                               href="/algorithm-system/{{ algorithm_id }}/details/system_card/assessments/{{ assessment["name"].lower() }}">
+                               href="/algorithm/{{ algorithm_id }}/details/system_card/assessments/{{ assessment["name"].lower() }}">
                                 <span class="utrecht-icon rvo-icon rvo-icon-document-met-lijnen rvo-icon--md rvo-icon--zwart rvo-link__icon--before"
                                       role="img"
                                       aria-label="Document met lijnen"></span>
@@ -29,7 +29,7 @@
                     {% for model in system_card.models %}
                         <li>
                             <a class="rvo-link rvo-link--with-icon rvo-link--zwart rvo-link--normal"
-                               href="/algorithm-system/{{ algorithm_id }}/details/system_card/models/{{ model["name"].lower() }}">
+                               href="/algorithm/{{ algorithm_id }}/details/system_card/models/{{ model["name"].lower() }}">
                                 <span class="utrecht-icon rvo-icon rvo-icon-document-met-lijnen rvo-icon--md rvo-icon--zwart rvo-link__icon--before"
                                       role="img"
                                       aria-label="Document met lijnen"></span>
diff --git a/amt/site/templates/parts/algorithm_search.html.j2 b/amt/site/templates/parts/algorithm_search.html.j2
index fd9489fc..90252ece 100644
--- a/amt/site/templates/parts/algorithm_search.html.j2
+++ b/amt/site/templates/parts/algorithm_search.html.j2
@@ -1,18 +1,17 @@
 <form id="search-algorithm-form"
-      hx-get="/algorithm-systems/?skip=0"
+      hx-get="/algorithms/?skip=0"
       hx-target="#algorithm-search-results"
       hx-trigger="change #search-algorithm-form select"
       hx-include="this"
       hx-swap="innerHTML">
     <div class="amt-layout-grid rvo-layout-gap--md amt-layout-grid-columns--two">
         <div>
-            <h1 class="utrecht-heading-1">{% trans %}Algorithm Systems{% endtrans %}</h1>
+            <h1 class="utrecht-heading-1">{% trans %}algorithms{% endtrans %}</h1>
         </div>
         <div style="margin-left: auto">
-            <a data-navigation="button:/algorithm-systems/new"
-               href="/algorithm-systems/new">
+            <a data-navigation="button:/algorithms/new" href="/algorithms/new">
                 <button class="utrecht-button utrecht-button--primary-action utrecht-button--rvo-md"
-                        type="button">{% trans %}New algorithm system{% endtrans %}</button>
+                        type="button">{% trans %}New algorithm{% endtrans %}</button>
             </a>
         </div>
     </div>
@@ -29,9 +28,9 @@
                                        class="utrecht-textbox utrecht-textbox--html-input"
                                        dir="auto"
                                        value="{{ search }}"
-                                       placeholder="{% trans %}Find algorithm system...{% endtrans %}"
+                                       placeholder="{% trans %}Find algorithm...{% endtrans %}"
                                        name="search"
-                                       hx-get="/algorithm-systems/?skip=0"
+                                       hx-get="/algorithms/?skip=0"
                                        hx-trigger="input changed delay:500ms, search"
                                        autocomplete="off"
                                        onfocus="this.value=''" />
@@ -39,7 +38,7 @@
                                       role="img"
                                       aria-label="Kruis"
                                       hx-trigger="click"
-                                      hx-get="/algorithm-systems/?skip=0"
+                                      hx-get="/algorithms/?skip=0"
                                       hx-indicator=".htmx-indicator"
                                       hx-swap="innerHTML"
                                       onclick="document.getElementById('algorithm-search-input').value = ''"></span>
@@ -88,7 +87,7 @@
             <form name="htmx-grouped-form"
                   hx-target="#algorithm-search-results"
                   hx-trigger="change from:find select"
-                  hx-get="/algorithm-systems/?skip=0"
+                  hx-get="/algorithms/?skip=0"
                   hx-swap="innerHTML">
                 <select id="display_type"
                         name="display_type"
diff --git a/amt/site/templates/parts/filter_list.html.j2 b/amt/site/templates/parts/filter_list.html.j2
index 0df0eb4e..dad02b90 100644
--- a/amt/site/templates/parts/filter_list.html.j2
+++ b/amt/site/templates/parts/filter_list.html.j2
@@ -2,7 +2,7 @@
 {% macro sort_button(field_name, sort_by) %}
     {% if field_name in sort_by and sort_by[field_name] == "ascending" or (not field_name in sort_by) %}
         <button hx-trigger="click"
-                hx-get="/algorithm-systems/?skip=0&sort-by-{{ field_name }}=descending"
+                hx-get="/algorithms/?skip=0&sort-by-{{ field_name }}=descending"
                 hx-swap="innerHTML"
                 class="utrecht-button utrecht-button--rvo-tertiary-action utrecht-button--rvo-sm"
                 type="button">
@@ -12,7 +12,7 @@
         </button>
     {% elif field_name in sort_by and sort_by[field_name] == "descending" %}
         <button hx-trigger="click"
-                hx-get="/algorithm-systems/?skip=0&sort-by-{{ field_name }}=ascending"
+                hx-get="/algorithms/?skip=0&sort-by-{{ field_name }}=ascending"
                 hx-swap="innerHTML"
                 class="utrecht-button utrecht-button--rvo-tertiary-action utrecht-button--rvo-sm"
                 type="button">
@@ -49,7 +49,7 @@
                 <span target="_self"
                       class="rvo-tag rvo-tag--default"
                       hx-trigger="click"
-                      hx-get="/algorithm-systems/?skip=0&drop-filter-={{ key }}"
+                      hx-get="/algorithms/?skip=0&drop-filter-={{ key }}"
                       hx-swap="innerHTML"
                       style="cursor: pointer;
                              display: inline-block">
@@ -67,9 +67,9 @@
 </div>
 {% if algorithms|length == 0 %}
     <div class="margin-top-large">
-        {% trans %}No Algorithm system match your selected filters. Try adjusting your filters or clearing them to
+        {% trans %}No Algorithm match your selected filters. Try adjusting your filters or clearing them to
         see more
-        algorithm systems.{% endtrans %}
+        algorithms.{% endtrans %}
     </div>
 {% else %}
     {% if display_type == "" %}
@@ -87,7 +87,7 @@
                 <thead class="rvo-table-head">
                     <tr class="rvo-table-row">
                         <th style="width: 60%" scope="col" class="rvo-table-header">
-                            {% trans %}Algorithm system name{% endtrans %}
+                            {% trans %}Algorithm name{% endtrans %}
                             {{ sort_button('name', sort_by) }}
                         </th>
                         <th scope="col" class="rvo-table-header">
@@ -113,7 +113,7 @@
                     <th style="width: 81%;
                                padding-left: var(--rvo-card-padding-xl-padding-block-start)"
                         scope="col"
-                        class="rvo-table-header">{% trans %}Algorithm system name{% endtrans %}</th>
+                        class="rvo-table-header">{% trans %}Algorithm name{% endtrans %}</th>
                     <th scope="col"
                         class="rvo-table-header"
                         style="white-space: nowrap;
diff --git a/tests/api/routes/test_algorithm.py b/tests/api/routes/test_algorithm.py
index 4f84b0a9..1c7fc1b7 100644
--- a/tests/api/routes/test_algorithm.py
+++ b/tests/api/routes/test_algorithm.py
@@ -32,7 +32,7 @@
 @pytest.mark.asyncio
 async def test_get_unknown_algorithm(client: AsyncClient) -> None:
     # when
-    response = await client.get("/algorithm-system/1/details")
+    response = await client.get("/algorithm/1/details")
 
     # then
     assert response.status_code == 404
@@ -46,7 +46,7 @@ async def test_get_algorithm_tasks(client: AsyncClient, db: DatabaseTestUtils) -
     await db.given([default_algorithm("testalgorithm1"), default_task(algorithm_id=1, status_id=1)])
 
     # when
-    response = await client.get("/algorithm-system/1/details/tasks")
+    response = await client.get("/algorithm/1/details/tasks")
 
     # then
     assert response.status_code == 200
@@ -60,7 +60,7 @@ async def test_get_algorithm_inference(client: AsyncClient, db: DatabaseTestUtil
     await db.given([default_algorithm("testalgorithm1"), default_task(algorithm_id=1, status_id=1)])
 
     # when
-    response = await client.get("/algorithm-system/1/details/model/inference")
+    response = await client.get("/algorithm/1/details/model/inference")
 
     # then
     assert response.status_code == 200
@@ -83,7 +83,7 @@ async def test_move_task(client: AsyncClient, db: DatabaseTestUtils, mocker: Moc
 
     # All -1 flow
     move_task_json = MovedTask(taskId=1, statusId=1, previousSiblingId=-1, nextSiblingId=-1).model_dump(by_alias=True)
-    response = await client.patch("/algorithm-system/move_task", json=move_task_json, headers={"X-CSRF-Token": "1"})
+    response = await client.patch("/algorithm/move_task", json=move_task_json, headers={"X-CSRF-Token": "1"})
 
     # then
     assert response.status_code == 200
@@ -92,7 +92,7 @@ async def test_move_task(client: AsyncClient, db: DatabaseTestUtils, mocker: Moc
 
     # All 1 flow
     move_task_json = MovedTask(taskId=1, statusId=1, previousSiblingId=1, nextSiblingId=1).model_dump(by_alias=True)
-    response = await client.patch("/algorithm-system/move_task", json=move_task_json, headers={"X-CSRF-Token": "1"})
+    response = await client.patch("/algorithm/move_task", json=move_task_json, headers={"X-CSRF-Token": "1"})
 
     # then
     assert response.status_code == 200
@@ -120,7 +120,7 @@ async def test_get_algorithm_non_existing_algorithm(client: AsyncClient, db: Dat
     await db.given([default_algorithm("testalgorithm1"), default_task(algorithm_id=1, status_id=1)])
 
     # when
-    response = await client.get("/algorithm-system/99/details/tasks")
+    response = await client.get("/algorithm/99/details/tasks")
 
     # then
     assert response.status_code == 404
@@ -157,7 +157,7 @@ async def test_get_system_card(client: AsyncClient, db: DatabaseTestUtils) -> No
     await db.given([default_algorithm("testalgorithm1")])
 
     # when
-    response = await client.get("/algorithm-system/1/details/system_card")
+    response = await client.get("/algorithm/1/details/system_card")
 
     # then
     assert response.status_code == 200
@@ -171,7 +171,7 @@ async def test_get_system_card(client: AsyncClient, db: DatabaseTestUtils) -> No
 @pytest.mark.asyncio
 async def test_get_system_card_unknown_algorithm(client: AsyncClient) -> None:
     # when
-    response = await client.get("/algorithm-system/1/details/system_card")
+    response = await client.get("/algorithm/1/details/system_card")
 
     # then
     assert response.status_code == 404
@@ -196,7 +196,7 @@ async def test_get_assessment_card(client: AsyncClient, httpx_mock: HTTPXMock, d
     await db.given([default_algorithm_with_system_card("testalgorithm1")])
 
     # when
-    response = await client.get("/algorithm-system/1/details/system_card/assessments/iama")
+    response = await client.get("/algorithm/1/details/system_card/assessments/iama")
 
     # then
     assert response.status_code == 200
@@ -210,7 +210,7 @@ async def test_get_assessment_card_unknown_algorithm(client: AsyncClient, db: Da
     await db.given([default_algorithm("testalgorithm1")])
 
     # when
-    response = await client.get("/algorithm-system/1/details/system_card/assessments/iama")
+    response = await client.get("/algorithm/1/details/system_card/assessments/iama")
 
     # then
     assert response.status_code == 404
@@ -224,7 +224,7 @@ async def test_get_assessment_card_unknown_assessment(client: AsyncClient, db: D
     await db.given([default_algorithm("testalgorithm1")])
 
     # when
-    response = await client.get("/algorithm-system/1/details/system_card/assessments/nonexistent")
+    response = await client.get("/algorithm/1/details/system_card/assessments/nonexistent")
 
     # then
     assert response.status_code == 404
@@ -249,7 +249,7 @@ async def test_get_model_card(client: AsyncClient, httpx_mock: HTTPXMock, db: Da
     await db.given([default_algorithm_with_system_card("testalgorithm1")])
 
     # when
-    response = await client.get("/algorithm-system/1/details/system_card/models/logres_iris")
+    response = await client.get("/algorithm/1/details/system_card/models/logres_iris")
 
     # then
     assert response.status_code == 200
@@ -259,7 +259,7 @@ async def test_get_model_card(client: AsyncClient, httpx_mock: HTTPXMock, db: Da
 
 async def test_get_model_card_unknown_algorithm(client: AsyncClient) -> None:
     # when
-    response = await client.get("/algorithm-system/1/details/system_card/models/logres_iris")
+    response = await client.get("/algorithm/1/details/system_card/models/logres_iris")
 
     # then
     assert response.status_code == 404
@@ -273,7 +273,7 @@ async def test_get_assessment_card_unknown_model_card(client: AsyncClient, db: D
     await db.given([default_algorithm("testalgorithm1")])
 
     # when
-    response = await client.get("/algorithm-system/1/details/system_card/models/nonexistent")
+    response = await client.get("/algorithm/1/details/system_card/models/nonexistent")
 
     # then
     assert response.status_code == 404
@@ -287,7 +287,7 @@ async def test_get_algorithm_details(client: AsyncClient, db: DatabaseTestUtils)
     await db.given([default_algorithm("testalgorithm1"), default_task(algorithm_id=1, status_id=1)])
 
     # when
-    response = await client.get("/algorithm-system/1/details")
+    response = await client.get("/algorithm/1/details")
 
     # then
     assert response.status_code == 200
@@ -312,7 +312,7 @@ async def test_get_system_card_requirements(client: AsyncClient, httpx_mock: HTT
     await db.given([default_algorithm_with_system_card("testalgorithm1"), default_task(algorithm_id=1, status_id=1)])
 
     # when
-    response = await client.get("/algorithm-system/1/details/system_card/requirements")
+    response = await client.get("/algorithm/1/details/system_card/requirements")
 
     # then
     assert response.status_code == 200
@@ -337,7 +337,7 @@ async def test_get_system_card_data_page(client: AsyncClient, httpx_mock: HTTPXM
     await db.given([default_algorithm_with_system_card("testalgorithm1"), default_task(algorithm_id=1, status_id=1)])
 
     # when
-    response = await client.get("/algorithm-system/1/details/system_card/data")
+    response = await client.get("/algorithm/1/details/system_card/data")
 
     # then
     assert response.status_code == 200
@@ -362,7 +362,7 @@ async def test_get_system_card_instruments(client: AsyncClient, httpx_mock: HTTP
     await db.given([default_algorithm_with_system_card("testalgorithm1"), default_task(algorithm_id=1, status_id=1)])
 
     # when
-    response = await client.get("/algorithm-system/1/details/system_card/instruments")
+    response = await client.get("/algorithm/1/details/system_card/instruments")
 
     # then
     assert response.status_code == 200
@@ -376,7 +376,7 @@ async def test_get_algorithm_edit(client: AsyncClient, db: DatabaseTestUtils) ->
     await db.given([default_algorithm("testalgorithm1")])
 
     # when
-    response = await client.get("/algorithm-system/1/edit/system_card/lifecycle")
+    response = await client.get("/algorithm/1/edit/system_card/lifecycle")
 
     # then
     assert response.status_code == 200
@@ -393,13 +393,13 @@ async def test_delete_algorithm(client: AsyncClient, db: DatabaseTestUtils, mock
     client.cookies["fastapi-csrf-token"] = "1"
 
     # when
-    response = await client.delete("/algorithm-system/1", headers={"X-CSRF-Token": "1"})
+    response = await client.delete("/algorithm/1", headers={"X-CSRF-Token": "1"})
 
     # then
     assert response.status_code == 200
     assert response.headers["content-type"] == "text/html; charset=utf-8"
     assert "hx-redirect" in response.headers
-    assert response.headers["hx-redirect"] == "/algorithm-systems/"
+    assert response.headers["hx-redirect"] == "/algorithms/"
 
 
 @pytest.mark.asyncio
@@ -410,14 +410,14 @@ async def test_delete_algorithm_and_check_list(client: AsyncClient, db: Database
     client.cookies["fastapi-csrf-token"] = "1"
 
     # when
-    response = await client.delete("/algorithm-system/1", headers={"X-CSRF-Token": "1"})
+    response = await client.delete("/algorithm/1", headers={"X-CSRF-Token": "1"})
 
     # then
     assert response.status_code == 200
     assert response.headers["content-type"] == "text/html; charset=utf-8"
     assert "hx-redirect" in response.headers
 
-    response2 = await client.get("/algorithm-systems/")
+    response2 = await client.get("/algorithms/")
     assert response2.status_code == 200
     assert response2.headers["content-type"] == "text/html; charset=utf-8"
     assert b"testalgorithm2" in response2.content
@@ -434,14 +434,14 @@ async def test_delete_algorithm_and_check_algorithm(
     client.cookies["fastapi-csrf-token"] = "1"
 
     # when
-    response = await client.delete("/algorithm-system/1", headers={"X-CSRF-Token": "1"})
+    response = await client.delete("/algorithm/1", headers={"X-CSRF-Token": "1"})
 
     # then
     assert response.status_code == 200
     assert response.headers["content-type"] == "text/html; charset=utf-8"
     assert "hx-redirect" in response.headers
 
-    response2 = await client.get("/algorithm-system/1/details")
+    response2 = await client.get("/algorithm/1/details")
     assert response2.status_code == 404
 
 
@@ -451,7 +451,7 @@ async def test_get_algorithm_cancel(client: AsyncClient, db: DatabaseTestUtils)
     await db.given([default_algorithm("testalgorithm1")])
 
     # when
-    response = await client.get("/algorithm-system/1/cancel/system_card/lifecycle")
+    response = await client.get("/algorithm/1/cancel/system_card/lifecycle")
 
     # then
     assert response.status_code == 200
@@ -466,9 +466,7 @@ async def test_get_algorithm_update(client: AsyncClient, mocker: MockFixture, db
     mocker.patch("fastapi_csrf_protect.CsrfProtect.validate_csrf", new_callable=mocker.AsyncMock)
 
     # when
-    response = await client.put(
-        "/algorithm-system/1/update/name", json={"value": "Test Name"}, headers={"X-CSRF-Token": "1"}
-    )
+    response = await client.put("/algorithm/1/update/name", json={"value": "Test Name"}, headers={"X-CSRF-Token": "1"})
 
     # then
     assert response.status_code == 200
@@ -593,7 +591,7 @@ async def test_get_measure(client: AsyncClient, db: DatabaseTestUtils) -> None:
     await db.given([default_algorithm_with_system_card("testalgorithm1")])
 
     # when
-    response = await client.get("/algorithm-system/1/measure/urn:nl:ak:mtr:bnd-01")
+    response = await client.get("/algorithm/1/measure/urn:nl:ak:mtr:bnd-01")
 
     # then
     assert response.status_code == 200
@@ -610,7 +608,7 @@ async def test_update_measure_value(client: AsyncClient, mocker: MockFixture, db
 
     # happy flow
     response = await client.post(
-        "/algorithm-system/1/measure/urn:nl:ak:mtr:bnd-01",
+        "/algorithm/1/measure/urn:nl:ak:mtr:bnd-01",
         json={"measure_update": MeasureUpdate(measure_state="done", measure_value="something").model_dump()},
         headers={"X-CSRF-Token": "1"},
     )
diff --git a/tests/api/routes/test_algorithms.py b/tests/api/routes/test_algorithms.py
index 751c16f9..57487563 100644
--- a/tests/api/routes/test_algorithms.py
+++ b/tests/api/routes/test_algorithms.py
@@ -21,7 +21,7 @@
 
 @pytest.mark.asyncio
 async def test_algorithms_get_root(client: AsyncClient) -> None:
-    response = await client.get("/algorithm-systems/")
+    response = await client.get("/algorithms/")
 
     assert response.status_code == 200
     assert b'<div id="algorithm-search-results"' in response.content
@@ -29,7 +29,7 @@ async def test_algorithms_get_root(client: AsyncClient) -> None:
 
 @pytest.mark.asyncio
 async def test_algorithms_get_root_missing_slash(client: AsyncClient) -> None:
-    response = await client.get("/algorithm-systems", follow_redirects=True)
+    response = await client.get("/algorithms", follow_redirects=True)
 
     assert response.status_code == 200
     assert b'<div id="algorithm-search-results"' in response.content
@@ -37,7 +37,7 @@ async def test_algorithms_get_root_missing_slash(client: AsyncClient) -> None:
 
 @pytest.mark.asyncio
 async def test_algorithms_get_root_htmx(client: AsyncClient) -> None:
-    response = await client.get("/algorithm-systems/", headers={"HX-Request": "true"})
+    response = await client.get("/algorithms/", headers={"HX-Request": "true"})
 
     assert response.status_code == 200
     assert b'<table id="search-results-table" class="rvo-table margin-top-large">' not in response.content
@@ -45,7 +45,7 @@ async def test_algorithms_get_root_htmx(client: AsyncClient) -> None:
 
 @pytest.mark.asyncio
 async def test_algorithms_get_root_htmx_with_group_by(client: AsyncClient) -> None:
-    response = await client.get("/algorithm-systems/?skip=0&display_type=LIFECYCLE", headers={"HX-Request": "true"})
+    response = await client.get("/algorithms/?skip=0&display_type=LIFECYCLE", headers={"HX-Request": "true"})
 
     assert response.status_code == 200
     assert b'<table id="search-results-table" class="rvo-table margin-top-large">' not in response.content
@@ -54,7 +54,7 @@ async def test_algorithms_get_root_htmx_with_group_by(client: AsyncClient) -> No
 @pytest.mark.asyncio
 async def test_algorithms_get_root_htmx_with_group_by_and_lifecycle_filter(client: AsyncClient) -> None:
     response = await client.get(
-        "/algorithm-systems/?skip=0&add-filter-lifecycle=DESIGN&display_type=LIFECYCLE", headers={"HX-Request": "true"}
+        "/algorithms/?skip=0&add-filter-lifecycle=DESIGN&display_type=LIFECYCLE", headers={"HX-Request": "true"}
     )
 
     assert response.status_code == 200
@@ -69,7 +69,7 @@ async def test_algorithms_get_root_htmx_with_algorithms_mock(client: AsyncClient
     mocker.patch("amt.services.algorithms.AlgorithmsService.paginate", return_value=[mock_algorithm])
 
     # when
-    response = await client.get("/algorithm-systems/", headers={"HX-Request": "true"})
+    response = await client.get("/algorithms/", headers={"HX-Request": "true"})
 
     assert response.status_code == 200
     assert b'<table id="search-results-table" class="rvo-table margin-top-large">' in response.content
@@ -84,7 +84,7 @@ async def test_get_new_algorithms(client: AsyncClient, mocker: MockFixture) -> N
     )
 
     # when
-    response = await client.get("/algorithm-systems/new")
+    response = await client.get("/algorithms/new")
     assert response.status_code == 200
     assert response.headers["content-type"] == "text/html; charset=utf-8"
     content = " ".join(response.content.decode().split())
@@ -106,7 +106,7 @@ async def test_post_new_algorithms_bad_request(client: AsyncClient, mocker: Mock
 
     # when
     client.cookies["fastapi-csrf-token"] = "1"
-    response = await client.post("/algorithm-systems/new", json={}, headers={"X-CSRF-Token": "1"})
+    response = await client.post("/algorithms/new", json={}, headers={"X-CSRF-Token": "1"})
 
     # then
     assert response.status_code == 400
@@ -136,14 +136,12 @@ async def test_post_new_algorithms(client: AsyncClient, mocker: MockFixture) ->
     )
 
     # when
-    response = await client.post(
-        "/algorithm-systems/new", json=new_algorithm.model_dump(), headers={"X-CSRF-Token": "1"}
-    )
+    response = await client.post("/algorithms/new", json=new_algorithm.model_dump(), headers={"X-CSRF-Token": "1"})
 
     # then
     assert response.status_code == 200
     assert response.headers["content-type"] == "text/html; charset=utf-8"
-    assert response.headers["HX-Redirect"] == "/algorithm-system/1/details/tasks"
+    assert response.headers["HX-Redirect"] == "/algorithm/1/details/tasks"
 
 
 @pytest.mark.asyncio
@@ -193,7 +191,7 @@ async def test_post_new_algorithms_write_system_card(
     )
 
     # when
-    await client.post("/algorithm-systems/new", json=algorithm_new.model_dump(), headers={"X-CSRF-Token": "1"})
+    await client.post("/algorithms/new", json=algorithm_new.model_dump(), headers={"X-CSRF-Token": "1"})
 
     # then
     base_algorithms: list[Base] = await db.get(Algorithm, "name", name)
diff --git a/tests/api/test_navigation.py b/tests/api/test_navigation.py
index 0978352d..84533af3 100644
--- a/tests/api/test_navigation.py
+++ b/tests/api/test_navigation.py
@@ -109,16 +109,14 @@ def test_resolve_base_navigation_items():
 
 
 def test_get_main_menu():
-    main_menu = get_main_menu(
-        default_fastapi_request(url="/algorithm-system/"), internationalization.get_translation("en")
-    )
+    main_menu = get_main_menu(default_fastapi_request(url="/algorithm/"), internationalization.get_translation("en"))
 
     # assert right item is active
     assert len(main_menu) == 1
     assert main_menu[0].active is True
 
     # assert display text is correct
-    assert main_menu[0].display_text == "Algorithm systems"
+    assert main_menu[0].display_text == "Algorithms"
 
 
 def test_mark_active_navigation_item():
diff --git a/tests/core/test_exception_handlers.py b/tests/core/test_exception_handlers.py
index 8e9f2b08..59091a25 100644
--- a/tests/core/test_exception_handlers.py
+++ b/tests/core/test_exception_handlers.py
@@ -17,7 +17,7 @@ async def test_http_exception_handler(client: AsyncClient):
 
 @pytest.mark.asyncio
 async def test_request_validation_exception_handler(client: AsyncClient):
-    response = await client.get("/algorithm-systems/?skip=a")
+    response = await client.get("/algorithms/?skip=a")
 
     assert response.status_code == status.HTTP_400_BAD_REQUEST
     assert response.headers["content-type"] == "text/html; charset=utf-8"
@@ -25,11 +25,11 @@ async def test_request_validation_exception_handler(client: AsyncClient):
 
 @pytest.mark.asyncio
 async def test_request_csrf_protect_exception_handler_invalid_token_in_header(client: AsyncClient):
-    data = await client.get("/algorithm-systems/new")
+    data = await client.get("/algorithms/new")
     new_algorithm = AlgorithmNew(name="default algorithm", lifecycle="DATA_EXPLORATION_AND_PREPARATION")
     with pytest.raises(AMTCSRFProtectError):
         _response = await client.post(
-            "/algorithm-systems/new",
+            "/algorithms/new",
             json=new_algorithm.model_dump(),
             headers={"X-CSRF-Token": "1"},
             cookies=data.cookies,
@@ -46,7 +46,7 @@ async def test_http_exception_handler_htmx(client: AsyncClient):
 
 @pytest.mark.asyncio
 async def test_request_validation_exception_handler_htmx(client: AsyncClient):
-    response = await client.get("/algorithm-systems/?skip=a", headers={"HX-Request": "true"})
+    response = await client.get("/algorithms/?skip=a", headers={"HX-Request": "true"})
 
     assert response.status_code == status.HTTP_400_BAD_REQUEST
     assert response.headers["content-type"] == "text/html; charset=utf-8"
@@ -54,11 +54,11 @@ async def test_request_validation_exception_handler_htmx(client: AsyncClient):
 
 @pytest.mark.asyncio
 async def test_request_csrf_protect_exception_handler_invalid_token(client: AsyncClient):
-    data = await client.get("/algorithm-systems/new")
+    data = await client.get("/algorithms/new")
     new_algorithm = AlgorithmNew(name="default algorithm", lifecycle="DATA_EXPLORATION_AND_PREPARATION")
     with pytest.raises(AMTCSRFProtectError):
         _response = await client.post(
-            "/algorithm-systems/new",
+            "/algorithms/new",
             json=new_algorithm.model_dump(),
             headers={"HX-Request": "true", "X-CSRF-Token": "1"},
             cookies=data.cookies,
diff --git a/tests/e2e/test_create_algorithm.py b/tests/e2e/test_create_algorithm.py
index dc3fd3b3..b61d4a64 100644
--- a/tests/e2e/test_create_algorithm.py
+++ b/tests/e2e/test_create_algorithm.py
@@ -4,7 +4,7 @@
 
 @pytest.mark.slow
 def test_e2e_create_algorithm(page: Page):
-    page.goto("/algorithm-systems/new")
+    page.goto("/algorithms/new")
 
     page.fill("#name", "My new algorithm")
 
@@ -34,7 +34,7 @@ def test_e2e_create_algorithm(page: Page):
 
 @pytest.mark.slow
 def test_e2e_create_algorithm_invalid(page: Page):
-    page.goto("/algorithm-systems/new")
+    page.goto("/algorithms/new")
 
     button = page.locator("#transparency_obligations-transparantieverplichtingen")
     button.click()
@@ -53,7 +53,7 @@ def test_e2e_create_algorithm_invalid(page: Page):
 
 @pytest.mark.slow
 def test_e2e_create_algorithm_with_tasks(page: Page):
-    page.goto("/algorithm-systems/new")
+    page.goto("/algorithms/new")
 
     page.fill("#name", "My new filled algorithm")
 
diff --git a/tests/e2e/test_move_task.py b/tests/e2e/test_move_task.py
index 36929bfe..0b6531be 100644
--- a/tests/e2e/test_move_task.py
+++ b/tests/e2e/test_move_task.py
@@ -11,7 +11,7 @@ def test_e2e_move_task_to_column(page: Page) -> None:
     :return: None
     """
 
-    page.goto("/algorithm-system/1/details/tasks")
+    page.goto("/algorithm/1/details/tasks")
 
     card = page.get_by_text("task1")
     expect(card).to_be_visible()
@@ -37,7 +37,7 @@ def test_e2e_move_task_order_in_same_column(page: Page) -> None:
     :return: None
     """
 
-    page.goto("/algorithm-system/1/details/tasks")
+    page.goto("/algorithm/1/details/tasks")
 
     card1 = page.get_by_text("task1")
     card2 = page.get_by_text("task2")
diff --git a/tests/e2e/test_scroll_algorithm.py b/tests/e2e/test_scroll_algorithm.py
index 14fd91ce..3fc01f58 100644
--- a/tests/e2e/test_scroll_algorithm.py
+++ b/tests/e2e/test_scroll_algorithm.py
@@ -4,7 +4,7 @@
 
 @pytest.mark.slow
 def test_e2e_scroll_algorithms(page: Page) -> None:
-    page.goto("/algorithm-systems/?limit=100")
+    page.goto("/algorithms/?limit=100")
 
     algorithm_links = page.locator("#search-results-table tr").count() - 1
 
@@ -12,7 +12,7 @@ def test_e2e_scroll_algorithms(page: Page) -> None:
 
     expect(page.locator('[data-marker="last-element"]')).to_be_visible()
 
-    with page.expect_response("/algorithm-systems/?skip=100&search=", timeout=3000) as response_info:
+    with page.expect_response("/algorithms/?skip=100&search=", timeout=3000) as response_info:
         page.locator('[data-marker="last-element"]').scroll_into_view_if_needed()
 
     response = response_info.value
diff --git a/tests/e2e/test_search_algorithm.py b/tests/e2e/test_search_algorithm.py
index e65cd10c..50127e23 100644
--- a/tests/e2e/test_search_algorithm.py
+++ b/tests/e2e/test_search_algorithm.py
@@ -4,7 +4,7 @@
 
 @pytest.mark.slow
 def test_e2e_search_algorithms(page: Page) -> None:
-    page.goto("/algorithm-systems/?limit=100")
+    page.goto("/algorithms/?limit=100")
 
     algorithm_links = page.locator("#search-results-table tr").count() - 1
 
@@ -13,7 +13,7 @@ def test_e2e_search_algorithms(page: Page) -> None:
     page.locator("#algorithm-search-input").fill("10")
 
     with page.expect_response(
-        "/algorithm-systems/?skip=0&search=10&add-filter-lifecycle=&add-filter-publication-category=&display_type=",
+        "/algorithms/?skip=0&search=10&add-filter-lifecycle=&add-filter-publication-category=&display_type=",
         timeout=3000,
     ) as response_info:
         expect(page.get_by_text("Algorithm 10", exact=True)).to_be_visible()
@@ -25,7 +25,7 @@ def test_e2e_search_algorithms(page: Page) -> None:
 
 @pytest.mark.slow
 def test_e2e_search_scroll_algorithms(page: Page) -> None:
-    page.goto("/algorithm-systems/?limit=100")
+    page.goto("/algorithms/?limit=100")
 
     algorithm_links = page.locator("#search-results-table tr").count() - 1
 
@@ -34,7 +34,7 @@ def test_e2e_search_scroll_algorithms(page: Page) -> None:
     page.locator("#algorithm-search-input").fill("Algorithm")
 
     with page.expect_request(
-        "/algorithm-systems/?skip=0&search=Algorithm&add-filter-lifecycle=&add-filter-publication-category=&display_type=",
+        "/algorithms/?skip=0&search=Algorithm&add-filter-lifecycle=&add-filter-publication-category=&display_type=",
         timeout=3000,
     ) as _:
         algorithm_links = page.locator("#search-results-table tr").count() - 1
@@ -44,7 +44,7 @@ def test_e2e_search_scroll_algorithms(page: Page) -> None:
 
 @pytest.mark.slow
 def test_e2e_search_algorithms_with_group_by_lifecycle_view(page: Page) -> None:
-    page.goto("/algorithm-systems/?limit=100")
+    page.goto("/algorithms/?limit=100")
 
     algorithm_links = page.locator("#search-results-table tr").count() - 1
 
@@ -54,7 +54,7 @@ def test_e2e_search_algorithms_with_group_by_lifecycle_view(page: Page) -> None:
     page.locator("#display_type").select_option("LIFECYCLE")
 
     with page.expect_request(
-        "/algorithm-systems/?skip=0&search=Algorithm&add-filter-lifecycle=&add-filter-publication-category=&display_type=LIFECYCLE",
+        "/algorithms/?skip=0&search=Algorithm&add-filter-lifecycle=&add-filter-publication-category=&display_type=LIFECYCLE",
         timeout=3000,
     ) as _:
         expect(page.get_by_title("Organizational Responsibilities", exact=True)).to_be_visible()
@@ -63,7 +63,7 @@ def test_e2e_search_algorithms_with_group_by_lifecycle_view(page: Page) -> None:
 
 @pytest.mark.slow
 def test_e2e_search_algorithms_with_group_by_lifecycle_view_and_search(page: Page) -> None:
-    page.goto("/algorithm-systems/?limit=100")
+    page.goto("/algorithms/?limit=100")
 
     algorithm_links = page.locator("#search-results-table tr").count() - 1
 
@@ -73,7 +73,7 @@ def test_e2e_search_algorithms_with_group_by_lifecycle_view_and_search(page: Pag
     page.locator("#display_type").select_option("LIFECYCLE")
 
     with page.expect_request(
-        "/algorithm-systems/?skip=0&search=10&add-filter-lifecycle=&add-filter-publication-category=&display_type=LIFECYCLE",
+        "/algorithms/?skip=0&search=10&add-filter-lifecycle=&add-filter-publication-category=&display_type=LIFECYCLE",
         timeout=3000,
     ) as _:
         expect(page.get_by_title("Organizational Responsibilities", exact=True)).to_be_visible()
diff --git a/tests/regression/e2e/test_duplicate_task_bug.py b/tests/regression/e2e/test_duplicate_task_bug.py
index f0a7b1df..db0267c2 100644
--- a/tests/regression/e2e/test_duplicate_task_bug.py
+++ b/tests/regression/e2e/test_duplicate_task_bug.py
@@ -12,7 +12,7 @@ def test_e2e_duplicate_task(page: Page) -> None:
     This test captured that behaviour.
     """
 
-    page.goto("/algorithm-system/1/details/tasks")
+    page.goto("/algorithm/1/details/tasks")
     cards_begin = page.locator(".progress-card-container").all()
 
     expect(page.locator("#column-1 #card-container-1")).to_be_visible()
diff --git a/tests/site/static/templates/test_template_new_algorithm.py b/tests/site/static/templates/test_template_new_algorithm.py
index 387dc3ab..34dc79b3 100644
--- a/tests/site/static/templates/test_template_new_algorithm.py
+++ b/tests/site/static/templates/test_template_new_algorithm.py
@@ -12,4 +12,4 @@ def test_tempate_algorithms_new():
 
     # then
     assert response.headers["Content-Type"] == "text/html; charset=utf-8"
-    assert b"Create Algorithm System" in response.body
+    assert b"Create Algorithm" in response.body