From 0f9cd7e07954ba52f12f64b9ecd59b36446b5972 Mon Sep 17 00:00:00 2001
From: Dan LaManna <dan.lamanna@kitware.com>
Date: Wed, 11 Mar 2026 18:31:10 +0000
Subject: [PATCH] Improve url and naming consistencies

---
 isic/core/api/collection.py                   |  9 ++--
 isic/core/api/doi.py                          |  6 +--
 isic/core/api/image.py                        | 14 ++---
 isic/core/api/user.py                         |  2 +-
 isic/core/templates/core/partials/navbar.html |  2 +-
 isic/core/tests/test_api_cohort.py            |  5 +-
 isic/core/tests/test_api_collection.py        | 32 ++++++------
 isic/core/tests/test_api_contributor.py       |  7 +--
 isic/core/tests/test_api_image.py             | 25 +++++----
 isic/core/tests/test_api_permissions.py       | 28 +++++-----
 isic/core/tests/test_api_user.py              |  5 +-
 isic/core/tests/test_cache.py                 | 12 ++---
 isic/core/tests/test_doi.py                   | 10 ++--
 isic/core/tests/test_search.py                | 52 +++++++++----------
 isic/find/api.py                              |  2 +-
 isic/ingest/api.py                            | 20 +++----
 .../ingest/partials/breadcrumbs.html          |  2 +-
 isic/ingest/tests/test_api_accession.py       | 13 ++---
 isic/ingest/tests/test_api_lesion.py          | 15 +++---
 isic/ingest/tests/test_api_pagination.py      |  7 +--
 isic/zip_download/api.py                      | 16 +++---
 isic/zip_download/tests/test_zip_download.py  | 31 +++++------
 22 files changed, 166 insertions(+), 149 deletions(-)

diff --git a/isic/core/api/collection.py b/isic/core/api/collection.py
index be58a41e8..b7f3832c1 100644
--- a/isic/core/api/collection.py
+++ b/isic/core/api/collection.py
@@ -17,7 +17,8 @@
 from isic.core.pagination import CursorPagination
 from isic.core.permissions import get_visible_objects
 from isic.core.serializers import SearchQueryIn
-from isic.core.services.collection import collection_create, collection_delete
+from isic.core.services.collection import collection_create
+from isic.core.services.collection import collection_delete as collection_delete_service
 from isic.core.services.collection.image import (
     collection_add_images_from_isic_ids,
     collection_remove_images_from_isic_ids,
@@ -196,7 +197,7 @@ def collection_detail(request, id: int) -> CollectionOut:
     response={204: None, 400: dict, 403: dict},
     include_in_schema=False,
 )
-def collection_delete_(request, id: int):
+def collection_delete(request, id: int):
     qs = get_visible_objects(request.user, "core.view_collection", Collection.objects.all())
     collection = get_object_or_404(qs.distinct(), id=id)
 
@@ -204,7 +205,7 @@ def collection_delete_(request, id: int):
         return 403, {"error": "You do not have permission to delete this collection."}
 
     try:
-        collection_delete(collection=collection)
+        collection_delete_service(collection=collection)
     except ValidationError as e:
         return 400, {"error": e.message}
 
@@ -319,7 +320,7 @@ def collection_populate_from_list(request, id, payload: IsicIdList):
 @router.post(
     "/{id}/remove-from-list/", response={200: None, 403: dict, 409: dict}, include_in_schema=False
 )
-def remove_from_list(request, id, payload: IsicIdList):
+def collection_remove_from_list(request, id, payload: IsicIdList):
     qs = get_visible_objects(request.user, "core.view_collection", Collection.objects.all())
     collection = get_object_or_404(qs.distinct(), id=id)
 
diff --git a/isic/core/api/doi.py b/isic/core/api/doi.py
index c993fd51d..006572b63 100644
--- a/isic/core/api/doi.py
+++ b/isic/core/api/doi.py
@@ -66,7 +66,7 @@ def validate_related_identifiers(cls, v):  # noqa: N805
     summary="Create a draft DOI for a collection.",
     include_in_schema=False,
 )
-def create_doi(request, payload: CreateDOIIn):
+def doi_create(request, payload: CreateDOIIn):
     collection = get_object_or_404(Collection, pk=payload.collection_id)
 
     if not request.user.has_perm("core.create_doi", collection):
@@ -93,7 +93,7 @@ class UpdateDraftDOIIn(Schema):
     summary="Update a draft DOI.",
     include_in_schema=False,
 )
-def update_draft_doi(request, draft_doi_slug: str, payload: UpdateDraftDOIIn):
+def doi_update_draft(request, draft_doi_slug: str, payload: UpdateDraftDOIIn):
     from isic.core.services.collection import collection_update
 
     draft_doi = get_object_or_404(
@@ -116,7 +116,7 @@ def update_draft_doi(request, draft_doi_slug: str, payload: UpdateDraftDOIIn):
     summary="Publish a draft DOI to make it findable.",
     include_in_schema=False,
 )
-def publish_draft_doi(request, draft_doi_slug: str):
+def doi_publish_draft(request, draft_doi_slug: str):
     with transaction.atomic():
         draft_doi = get_object_or_404(
             DraftDoi.objects.select_for_update().select_related("collection"), slug=draft_doi_slug
diff --git a/isic/core/api/image.py b/isic/core/api/image.py
index df58e1625..da261a423 100644
--- a/isic/core/api/image.py
+++ b/isic/core/api/image.py
@@ -85,7 +85,7 @@ def resolve_metadata(image: Image) -> dict:
     "/", response=list[ImageOut], summary="Return a list of images.", include_in_schema=True
 )
 @paginate(CursorPagination, ordering=Image._meta.ordering)
-def list_images(request: HttpRequest):
+def image_list(request: HttpRequest):
     qs = get_visible_objects(request.user, "core.view_image", default_qs)
 
     if settings.ISIC_USE_ELASTICSEARCH_COUNTS:
@@ -107,7 +107,7 @@ def list_images(request: HttpRequest):
     include_in_schema=True,
 )
 @paginate(CursorPagination, ordering=Image._meta.ordering)
-def search_images(request: HttpRequest, search: SearchQueryIn = Query(...)):
+def image_search(request: HttpRequest, search: SearchQueryIn = Query(...)):
     try:
         qs = search.to_queryset(user=request.user, qs=default_qs)
         if settings.ISIC_USE_ELASTICSEARCH_COUNTS:
@@ -135,7 +135,7 @@ def search_images(request: HttpRequest, search: SearchQueryIn = Query(...)):
     summary="Get total size of images matching a search query.",
     include_in_schema=False,
 )
-def get_search_size(request: HttpRequest, search: SearchQueryIn = Query(...)):
+def image_search_size(request: HttpRequest, search: SearchQueryIn = Query(...)):
     try:
         es_query = search.to_es_query(request.user)
     except ParseException as e:
@@ -157,8 +157,8 @@ def get_search_size(request: HttpRequest, search: SearchQueryIn = Query(...)):
 
 
 @router.get("/facets/", response=dict, include_in_schema=False)
-def get_facets(request: HttpRequest, search: SearchQueryIn = Query(...)):
-    cache_key = f"get_facets:{search.to_cache_key(request.user)}"
+def image_facets(request: HttpRequest, search: SearchQueryIn = Query(...)):
+    cache_key = f"image_facets:{search.to_cache_key(request.user)}"
     cached_facets = cache.get(cache_key)
 
     set_tag("cached_facets", cached_facets is not None)
@@ -182,7 +182,7 @@ def get_facets(request: HttpRequest, search: SearchQueryIn = Query(...)):
     summary="Retrieve a single image by ISIC ID.",
     include_in_schema=True,
 )
-def retrieve_image(request: HttpRequest, isic_id: str):
+def image_detail(request: HttpRequest, isic_id: str):
     qs = get_visible_objects(request.user, "core.view_image", default_qs)
     return get_object_or_404(qs, isic_id=isic_id)
 
@@ -197,7 +197,7 @@ class SimilarImageOut(ImageOut):
     summary="Find images similar to the specified image.",
     include_in_schema=True,
 )
-def get_similar_images(
+def image_similar(
     request: HttpRequest, isic_id: str, limit: int = Query(10, le=50)
 ) -> list[SimilarImageOut]:
     qs = get_visible_objects(request.user, "core.view_image", default_qs)
diff --git a/isic/core/api/user.py b/isic/core/api/user.py
index 7a111b6bb..64722d4e5 100644
--- a/isic/core/api/user.py
+++ b/isic/core/api/user.py
@@ -42,7 +42,7 @@ def user_me(request: AuthenticatedHttpRequest):
 
 
 @router.put("/accept-terms/", include_in_schema=False, auth=is_authenticated)
-def accept_terms_of_use(request: AuthenticatedHttpRequest):
+def user_accept_terms(request: AuthenticatedHttpRequest):
     if not request.user.profile.accepted_terms:
         request.user.profile.accepted_terms = timezone.now()
         request.user.profile.save(update_fields=["accepted_terms"])
diff --git a/isic/core/templates/core/partials/navbar.html b/isic/core/templates/core/partials/navbar.html
index 26534ab54..d7b882ed3 100644
--- a/isic/core/templates/core/partials/navbar.html
+++ b/isic/core/templates/core/partials/navbar.html
@@ -8,7 +8,7 @@
         {% include 'core/partials/nav_elements.html' with right_arrow=1 %}
       </ul>
     </div>
-    <a class="btn btn-ghost normal-case text-xl" href="/">ISIC Archive</a>
+    <a class="btn btn-ghost normal-case text-xl" href="{% url 'index' %}">ISIC Archive</a>
   </div>
   <div class="navbar-center hidden lg:flex">
     <ul class="menu menu-horizontal p-0">
diff --git a/isic/core/tests/test_api_cohort.py b/isic/core/tests/test_api_cohort.py
index d87e9a51f..fa3ee1e44 100644
--- a/isic/core/tests/test_api_cohort.py
+++ b/isic/core/tests/test_api_cohort.py
@@ -1,3 +1,4 @@
+from django.urls import reverse
 import pytest
 from pytest_lazy_fixtures import lf
 
@@ -28,7 +29,7 @@ def cohorts(cohort, other_cohort):
     ],
 )
 def test_core_api_cohort_list_permissions(client_, cohorts_, num_visible):
-    r = client_.get("/api/v2/cohorts/")
+    r = client_.get(reverse("api:cohort_list"))
 
     assert r.status_code == 200, r.json()
     assert r.json()["count"] == num_visible
@@ -55,7 +56,7 @@ def test_core_api_cohort_list_permissions(client_, cohorts_, num_visible):
     ],
 )
 def test_core_api_cohort_detail_permissions(client_, cohort_, visible):
-    r = client_.get(f"/api/v2/cohorts/{cohort_.pk}/")
+    r = client_.get(reverse("api:cohort_detail", kwargs={"id": cohort_.pk}))
 
     if visible:
         assert r.status_code == 200, r.json()
diff --git a/isic/core/tests/test_api_collection.py b/isic/core/tests/test_api_collection.py
index fd6cc478a..d6017262b 100644
--- a/isic/core/tests/test_api_collection.py
+++ b/isic/core/tests/test_api_collection.py
@@ -33,7 +33,7 @@ def test_core_api_collection_autocomplete(
     for name in collection_names:
         collection_factory(name=name, public=True)
 
-    r = client.get(f"/api/v2/collections/autocomplete/?query={search_term}")
+    r = client.get(reverse("api:collection_autocomplete"), {"query": search_term})
     assert r.status_code == 200, r.json()
 
     assert [c["name"] for c in r.json()] == expected_collection_names
@@ -58,7 +58,7 @@ def test_core_api_collection_autocomplete(
     ],
 )
 def test_core_api_collection_list_permissions(client_, colls, num_visible):
-    r = client_.get("/api/v2/collections/")
+    r = client_.get(reverse("api:collection_list"))
 
     assert r.status_code == 200, r.json()
     assert r.json()["count"] == num_visible
@@ -105,7 +105,7 @@ def test_core_api_collection_list_permissions(client_, colls, num_visible):
     ],
 )
 def test_core_api_collection_detail_permissions(client_, collection, visible):
-    r = client_.get(f"/api/v2/collections/{collection.pk}/")
+    r = client_.get(reverse("api:collection_detail", kwargs={"id": collection.pk}))
 
     if visible:
         assert r.status_code == 200, r.json()
@@ -128,7 +128,7 @@ def test_core_api_collection_populate_from_search(
 
     with django_capture_on_commit_callbacks(execute=True):
         r = authenticated_client.post(
-            f"/api/v2/collections/{collection.pk}/populate-from-search/",
+            reverse("api:collection_populate_from_search", kwargs={"id": collection.pk}),
             {"query": "sex:male"},
             content_type="application/json",
         )
@@ -140,18 +140,18 @@ def test_core_api_collection_populate_from_search(
 
 @pytest.mark.django_db
 @pytest.mark.parametrize(
-    ("endpoint", "data"),
+    ("url_name", "data"),
     [
-        ("populate-from-search", {"query": "sex:male"}),
-        ("populate-from-list", {"isic_ids": ["ISIC_0000000"]}),
-        ("remove-from-list", {"isic_ids": ["ISIC_0000000"]}),
+        ("api:collection_populate_from_search", {"query": "sex:male"}),
+        ("api:collection_populate_from_list", {"isic_ids": ["ISIC_0000000"]}),
+        ("api:collection_remove_from_list", {"isic_ids": ["ISIC_0000000"]}),
     ],
 )
-def test_core_api_collection_modify_locked(endpoint, data, staff_client, collection_factory, user):
+def test_core_api_collection_modify_locked(url_name, data, staff_client, collection_factory, user):
     collection = collection_factory(locked=True, creator=user)
 
     r = staff_client.post(
-        f"/api/v2/collections/{collection.pk}/{endpoint}/",
+        reverse(url_name, kwargs={"id": collection.pk}),
         data,
         content_type="application/json",
     )
@@ -173,7 +173,7 @@ def test_core_api_collection_populate_from_list(
     )
 
     r = authenticated_client.post(
-        f"/api/v2/collections/{collection.pk}/populate-from-list/",
+        reverse("api:collection_populate_from_list", kwargs={"id": collection.pk}),
         {
             "isic_ids": [
                 public_image.isic_id,
@@ -210,7 +210,7 @@ def test_core_api_collection_remove_from_list(
     collection.images.add(public_image, private_image_shared, private_image_unshared)
 
     r = authenticated_client.post(
-        f"/api/v2/collections/{collection.pk}/remove-from-list/",
+        reverse("api:collection_remove_from_list", kwargs={"id": collection.pk}),
         {
             "isic_ids": [
                 public_image.isic_id,
@@ -375,7 +375,7 @@ def other_user_client(user_factory):
     ids=["creator", "staff", "other-user", "anonymous"],
 )
 def test_core_api_collection_delete_permissions(client_, deletable_collection, expected_status):
-    r = client_.delete(f"/api/v2/collections/{deletable_collection.pk}/")
+    r = client_.delete(reverse("api:collection_delete", kwargs={"id": deletable_collection.pk}))
 
     assert r.status_code == expected_status
     if expected_status == 204:
@@ -415,7 +415,7 @@ def test_core_api_collection_delete_blocked(
         collection = collection_factory(locked=False, creator=user)
         draft_doi_factory(collection=collection)
 
-    r = authenticated_client.delete(f"/api/v2/collections/{collection.pk}/")
+    r = authenticated_client.delete(reverse("api:collection_delete", kwargs={"id": collection.pk}))
 
     assert r.status_code == 400
     assert Collection.objects.filter(pk=collection.pk).exists()
@@ -439,7 +439,7 @@ def test_core_api_collection_create_from_isic_ids(
     }
 
     r = client.post(
-        "/api/v2/collections/create-from-isic-ids/",
+        reverse("api:collection_create_from_isic_ids"),
         payload,
         content_type="application/json",
     )
@@ -447,7 +447,7 @@ def test_core_api_collection_create_from_isic_ids(
 
     with django_capture_on_commit_callbacks(execute=True):
         r = authenticated_client.post(
-            "/api/v2/collections/create-from-isic-ids/",
+            reverse("api:collection_create_from_isic_ids"),
             payload,
             content_type="application/json",
         )
diff --git a/isic/core/tests/test_api_contributor.py b/isic/core/tests/test_api_contributor.py
index 0d858a8f5..1d48e2d73 100644
--- a/isic/core/tests/test_api_contributor.py
+++ b/isic/core/tests/test_api_contributor.py
@@ -1,3 +1,4 @@
+from django.urls import reverse
 import pytest
 from pytest_lazy_fixtures import lf
 
@@ -21,7 +22,7 @@
     ],
 )
 def test_core_api_contributor_list_permissions(client_, contributors_, num_visible):
-    r = client_.get("/api/v2/contributors/")
+    r = client_.get(reverse("api:contributor_list"))
 
     assert r.status_code == 200, r.json()
     assert r.json()["count"] == num_visible
@@ -52,7 +53,7 @@ def test_core_api_contributor_list_permissions(client_, contributors_, num_visib
     ],
 )
 def test_core_api_contributor_detail_permissions(client_, contributor_, visible):
-    r = client_.get(f"/api/v2/contributors/{contributor_.pk}/")
+    r = client_.get(reverse("api:contributor_detail", kwargs={"id": contributor_.pk}))
 
     if visible:
         assert r.status_code == 200, r.json()
@@ -64,7 +65,7 @@ def test_core_api_contributor_detail_permissions(client_, contributor_, visible)
 @pytest.mark.django_db
 def test_core_api_contributor_create(authenticated_client, user):
     r = authenticated_client.post(
-        "/api/v2/contributors/",
+        reverse("api:contributor_create"),
         data={
             "institution_name": "string",
             "institution_url": "http://google.com",
diff --git a/isic/core/tests/test_api_image.py b/isic/core/tests/test_api_image.py
index 5a851bdbf..26e10b1eb 100644
--- a/isic/core/tests/test_api_image.py
+++ b/isic/core/tests/test_api_image.py
@@ -1,4 +1,5 @@
 from django.db import connection
+from django.urls import reverse
 import pytest
 
 from isic.core.search import add_to_search_index, get_elasticsearch_client
@@ -30,22 +31,22 @@ def test_core_api_image_ages_are_always_rounded(
     authenticated_client, staff_client, searchable_image
 ):
     for client_ in [authenticated_client, staff_client]:
-        r = client_.get("/api/v2/images/")
+        r = client_.get(reverse("api:image_list"))
         assert r.status_code == 200, r.json()
         assert r.json()["count"] == 1
         assert r.json()["results"][0]["metadata"]["clinical"]["age_approx"] == 50
 
-        r = client_.get(f"/api/v2/images/{searchable_image.isic_id}/")
+        r = client_.get(reverse("api:image_detail", kwargs={"isic_id": searchable_image.isic_id}))
         assert r.status_code == 200, r.json()
         assert r.json()["metadata"]["clinical"]["age_approx"] == 50
 
         # test search isn't leaking ages
-        r = client_.get("/api/v2/images/search/", {"query": "age_approx:50"})
+        r = client_.get(reverse("api:image_search"), {"query": "age_approx:50"})
         assert r.status_code == 200, r.json()
         assert r.json()["count"] == 1
         assert r.json()["results"][0]["metadata"]["clinical"]["age_approx"] == 50
 
-        r = client_.get("/api/v2/images/search/", {"query": "age_approx:52"})
+        r = client_.get(reverse("api:image_search"), {"query": "age_approx:52"})
         assert r.status_code == 200, r.json()
         assert r.json()["count"] == 0
 
@@ -55,7 +56,7 @@ def test_core_api_image_ages_are_always_rounded(
 def test_api_image_urls_thumbnail_256(client, image_factory, image_file):
     image = image_factory(public=True)
 
-    api_resp = client.get(f"/api/v2/images/{image.isic_id}/")
+    api_resp = client.get(reverse("api:image_detail", kwargs={"isic_id": image.isic_id}))
 
     assert isinstance(api_resp.json().get("files"), dict)
     assert isinstance(api_resp.json()["files"].get(image_file), dict)
@@ -66,19 +67,19 @@ def test_api_image_urls_thumbnail_256(client, image_factory, image_file):
 def test_api_image_search_size(client, searchable_images_with_size):
     image1, image2 = searchable_images_with_size
 
-    r = client.get("/api/v2/images/search/size/")
+    r = client.get(reverse("api:image_search_size"))
     assert r.status_code == 200
     assert r.json()["size"] == 30  # 10 + 20
 
-    r = client.get("/api/v2/images/search/size/", {"query": "age_approx:10"})
+    r = client.get(reverse("api:image_search_size"), {"query": "age_approx:10"})
     assert r.status_code == 200
     assert r.json()["size"] == 10
 
-    r = client.get("/api/v2/images/search/size/", {"query": "age_approx:20"})
+    r = client.get(reverse("api:image_search_size"), {"query": "age_approx:20"})
     assert r.status_code == 200
     assert r.json()["size"] == 20
 
-    r = client.get("/api/v2/images/search/size/", {"query": "age_approx:30"})
+    r = client.get(reverse("api:image_search_size"), {"query": "age_approx:30"})
     assert r.status_code == 200
     assert r.json()["size"] == 0
 
@@ -97,7 +98,8 @@ def test_api_image_similar_images(client, image_factory, image_embedding_factory
     with connection.cursor() as cursor:
         cursor.execute("SET enable_indexscan = off")
 
-    r = client.get(f"/api/v2/images/{image_with_embedding.isic_id}/similar/")
+    url = reverse("api:image_similar", kwargs={"isic_id": image_with_embedding.isic_id})
+    r = client.get(url)
     assert r.status_code == 200
     results = r.json()
     assert len(results) == 1
@@ -109,6 +111,7 @@ def test_api_image_similar_images(client, image_factory, image_embedding_factory
 def test_api_image_similar_images_without_embedding(client, image_factory):
     image_without_embedding = image_factory(public=True)
 
-    r = client.get(f"/api/v2/images/{image_without_embedding.isic_id}/similar/")
+    url = reverse("api:image_similar", kwargs={"isic_id": image_without_embedding.isic_id})
+    r = client.get(url)
     assert r.status_code == 200
     assert r.json() == []
diff --git a/isic/core/tests/test_api_permissions.py b/isic/core/tests/test_api_permissions.py
index 5906f734f..c56d1ad16 100644
--- a/isic/core/tests/test_api_permissions.py
+++ b/isic/core/tests/test_api_permissions.py
@@ -13,19 +13,19 @@ def images(image_factory):
 @pytest.mark.django_db
 def test_core_api_image_list(images, client, authenticated_client, staff_client):
     for client_ in [client, authenticated_client]:
-        r = client_.get("/api/v2/images/")
+        r = client_.get(reverse("api:image_list"))
         assert r.status_code == 200, r.json()
         assert r.json()["count"] == 1
         assert {x["public"] for x in r.json()["results"]} == {True}
 
-    r = staff_client.get("/api/v2/images/")
+    r = staff_client.get(reverse("api:image_list"))
     assert r.status_code == 200, r.json()
     assert r.json()["count"] == 2
 
 
 @pytest.mark.django_db
 def test_core_api_image_list_private(private_image, authenticated_client):
-    r = authenticated_client.get("/api/v2/images/")
+    r = authenticated_client.get(reverse("api:image_list"))
     assert r.status_code == 200, r.json()
     assert r.json()["count"] == 0
 
@@ -34,7 +34,7 @@ def test_core_api_image_list_private(private_image, authenticated_client):
 def test_core_api_image_list_contributed(private_image, authenticated_client, user):
     private_image.accession.cohort.contributor.owners.add(user)
 
-    r = authenticated_client.get("/api/v2/images/")
+    r = authenticated_client.get(reverse("api:image_list"))
     assert r.status_code == 200, r.json()
     assert r.json()["count"] == 1
 
@@ -44,7 +44,7 @@ def test_core_api_image_list_shares(private_image, authenticated_client, user, s
     private_image.shares.add(user, through_defaults={"grantor": staff_user})
     private_image.save()
 
-    r = authenticated_client.get("/api/v2/images/")
+    r = authenticated_client.get(reverse("api:image_list"))
     assert r.status_code == 200, r.json()
     assert r.json()["count"] == 1
 
@@ -56,7 +56,7 @@ def test_core_api_image_list_no_duplicates(private_image, authenticated_client,
     private_image.shares.add(user, through_defaults={"grantor": staff_user})
     private_image.save()
 
-    r = authenticated_client.get("/api/v2/images/")
+    r = authenticated_client.get(reverse("api:image_list"))
     assert r.status_code == 200, r.json()
     assert r.json()["count"] == 1
 
@@ -66,23 +66,27 @@ def test_core_api_image_detail(images, authenticated_client, staff_client):
     public_image_id = images[0].isic_id
     private_image_id = images[1].isic_id
 
-    r = authenticated_client.get(f"/api/v2/images/{public_image_id}/")
+    public_url = reverse("api:image_detail", kwargs={"isic_id": public_image_id})
+    private_url = reverse("api:image_detail", kwargs={"isic_id": private_image_id})
+
+    r = authenticated_client.get(public_url)
     assert r.status_code == 200, r.json()
-    r = authenticated_client.get(f"/api/v2/images/{private_image_id}/")
+    r = authenticated_client.get(private_url)
     assert r.status_code == 404, r.json()
 
-    r = staff_client.get(f"/api/v2/images/{public_image_id}/")
+    r = staff_client.get(public_url)
     assert r.status_code == 200, r.json()
-    r = staff_client.get(f"/api/v2/images/{private_image_id}/")
+    r = staff_client.get(private_url)
     assert r.status_code == 200, r.json()
 
 
 @pytest.mark.django_db
 def test_api_auth_staff_user(authenticated_client, staff_client, metadata_file):
-    r = authenticated_client.delete(f"/api/v2/metadata-files/{metadata_file.pk}/")
+    url = reverse("api:metadata_file_delete", kwargs={"id": metadata_file.pk})
+    r = authenticated_client.delete(url)
     assert r.status_code == 401, r.json()
 
-    r = staff_client.delete(f"/api/v2/metadata-files/{metadata_file.pk}/")
+    r = staff_client.delete(url)
     assert r.status_code == 204, r.json()
 
 
diff --git a/isic/core/tests/test_api_user.py b/isic/core/tests/test_api_user.py
index 1a7e54024..fc602553a 100644
--- a/isic/core/tests/test_api_user.py
+++ b/isic/core/tests/test_api_user.py
@@ -1,3 +1,4 @@
+from django.urls import reverse
 import pytest
 from pytest_lazy_fixtures import lf
 
@@ -12,7 +13,7 @@
     ],
 )
 def test_core_api_user_me(client_user, client_, status):
-    r = client_.get("/api/v2/users/me/")
+    r = client_.get(reverse("api:user_me"))
     assert r.status_code == status, r.json()
     if status == 200:
         assert r.json()["id"] == client_user.pk
@@ -28,7 +29,7 @@ def test_core_api_user_me(client_user, client_, status):
     ],
 )
 def test_core_api_user_accept_terms(client_user, client_, status):
-    r = client_.put("/api/v2/users/accept-terms/", content_type="application/json")
+    r = client_.put(reverse("api:user_accept_terms"), content_type="application/json")
     assert r.status_code == status, r.json()
 
     if status == 200:
diff --git a/isic/core/tests/test_cache.py b/isic/core/tests/test_cache.py
index 166707da9..cdeee44a5 100644
--- a/isic/core/tests/test_cache.py
+++ b/isic/core/tests/test_cache.py
@@ -8,21 +8,21 @@
 @pytest.mark.usefixtures("_search_index")
 def test_faceting_cache(client, django_assert_max_num_queries):
     with django_assert_max_num_queries(1):
-        client.get(reverse("api:get_facets"))
+        client.get(reverse("api:image_facets"))
 
     with django_assert_max_num_queries(0):
-        client.get(reverse("api:get_facets"))
+        client.get(reverse("api:image_facets"))
 
     with django_assert_max_num_queries(1):
-        client.get(reverse("api:get_facets"), {"query": "age_approx:50"})
+        client.get(reverse("api:image_facets"), {"query": "age_approx:50"})
 
     with django_assert_max_num_queries(0):
-        client.get(reverse("api:get_facets"), {"query": "age_approx:50"})
+        client.get(reverse("api:image_facets"), {"query": "age_approx:50"})
 
     sync_elasticsearch_indices_task()
 
     with django_assert_max_num_queries(1):
-        client.get(reverse("api:get_facets"))
+        client.get(reverse("api:image_facets"))
 
     with django_assert_max_num_queries(1):
-        client.get(reverse("api:get_facets"), {"query": "age_approx:50"})
+        client.get(reverse("api:image_facets"), {"query": "age_approx:50"})
diff --git a/isic/core/tests/test_doi.py b/isic/core/tests/test_doi.py
index fe2f1561f..c41503836 100644
--- a/isic/core/tests/test_doi.py
+++ b/isic/core/tests/test_doi.py
@@ -293,7 +293,7 @@ def test_api_doi_creation(
     staff_client,
 ):
     r = staff_client.post(
-        reverse("api:create_doi"),
+        reverse("api:doi_create"),
         {
             "collection_id": public_collection_with_public_images.id,
             "description": "Test description",
@@ -395,7 +395,7 @@ def test_api_doi_creation_invalid_related_identifiers(
     related_identifier,
 ):
     r = staff_client.post(
-        reverse("api:create_doi"),
+        reverse("api:doi_create"),
         {
             "collection_id": public_collection_with_public_images.id,
             "description": "Test description",
@@ -419,7 +419,7 @@ def test_api_doi_creation_invalid_related_identifier_relation_type(
     staff_client,
 ):
     r = staff_client.post(
-        reverse("api:create_doi"),
+        reverse("api:doi_create"),
         {
             "collection_id": public_collection_with_public_images.id,
             "description": "Test description",
@@ -444,7 +444,7 @@ def test_api_doi_creation_invalid_related_identifier_relation_identifier_type(
     staff_client,
 ):
     r = staff_client.post(
-        reverse("api:create_doi"),
+        reverse("api:doi_create"),
         {
             "collection_id": public_collection_with_public_images.id,
             "description": "Test description",
@@ -668,7 +668,7 @@ def test_api_update_draft_doi_permissions(
     draft_doi = DraftDoiFactory.create(collection=public_collection_with_public_images)
 
     r = client_.patch(
-        reverse("api:update_draft_doi", args=[draft_doi.slug]),
+        reverse("api:doi_update_draft", args=[draft_doi.slug]),
         {"description": "Updated description"},
         content_type="application/json",
     )
diff --git a/isic/core/tests/test_search.py b/isic/core/tests/test_search.py
index a1faffe8d..b4775140c 100644
--- a/isic/core/tests/test_search.py
+++ b/isic/core/tests/test_search.py
@@ -50,7 +50,7 @@ def searchable_images(image_factory, _search_index):
 @pytest.mark.django_db
 @pytest.mark.parametrize(
     "route",
-    ["api:search_images", "api:list_images"],
+    ["api:image_search", "api:image_list"],
 )
 def test_elasticsearch_counts(searchable_images, settings, client, route):
     settings.ISIC_USE_ELASTICSEARCH_COUNTS = False
@@ -117,20 +117,20 @@ def test_elasticsearch_caching(searchable_images, settings, staff_client, client
     cache_set = mocker.spy(isic.core.search.cache, "set")
 
     with cachalot_disabled():
-        r = staff_client.get("/api/v2/images/search/")
+        r = staff_client.get(reverse("api:image_search"))
         assert r.status_code == 200, r.json()
         assert r.json()["count"] == 2, r.json()
         assert cache_get.call_count == 1
         assert cache_set.call_count == 1
 
-        r = staff_client.get("/api/v2/images/search/")
+        r = staff_client.get(reverse("api:image_search"))
         assert r.status_code == 200, r.json()
         assert r.json()["count"] == 2, r.json()
         assert cache_get.call_count == 2
         assert cache_set.call_count == 1
 
         # notably the cache is not shared between a staff user and a regular user
-        r = client.get("/api/v2/images/search/")
+        r = client.get(reverse("api:image_search"))
         assert r.status_code == 200, r.json()
         assert r.json()["count"] == 1, r.json()
         assert cache_get.call_count == 3
@@ -154,7 +154,7 @@ def test_elasticsearch_cache_sharing(
     cache_set = mocker.spy(isic.core.search.cache, "set")
 
     with cachalot_disabled():
-        r = client.get("/api/v2/images/search/")
+        r = client.get(reverse("api:image_search"))
         assert r.status_code == 200, r.json()
         assert r.json()["count"] == 1, r.json()
         assert cache_get.call_count == 1
@@ -164,7 +164,7 @@ def test_elasticsearch_cache_sharing(
         client.force_login(user)
 
         # a public user shares the same cache with a regular user with no special permissions
-        r = client.get("/api/v2/images/search/")
+        r = client.get(reverse("api:image_search"))
         assert r.status_code == 200, r.json()
         assert r.json()["count"] == 1, r.json()
         assert cache_get.call_count == 2
@@ -174,7 +174,7 @@ def test_elasticsearch_cache_sharing(
         user.owned_contributors.add(contributor)
 
         # now the user has special permissions, so the cache should not be shared
-        r = client.get("/api/v2/images/search/")
+        r = client.get(reverse("api:image_search"))
         assert r.status_code == 200, r.json()
         assert r.json()["count"] == 1, r.json()
         assert cache_get.call_count == 3
@@ -187,40 +187,40 @@ def test_elasticsearch_cache_sharing(
 
 @pytest.mark.django_db
 def test_core_api_image_search(searchable_images, staff_client):
-    r = staff_client.get("/api/v2/images/search/")
+    r = staff_client.get(reverse("api:image_search"))
     assert r.status_code == 200, r.json()
     assert r.json()["count"] == 2, r.json()
 
-    r = staff_client.get("/api/v2/images/search/", {"query": "diagnosis_3:Nevus"})
+    r = staff_client.get(reverse("api:image_search"), {"query": "diagnosis_3:Nevus"})
     assert r.status_code == 200, r.json()
     assert r.json()["count"] == 1, r.json()
 
-    r = staff_client.get("/api/v2/images/search/", {"query": "anatom_site_3:Scalp"})
+    r = staff_client.get(reverse("api:image_search"), {"query": "anatom_site_3:Scalp"})
     assert r.status_code == 200, r.json()
     assert r.json()["count"] == 1, r.json()
 
-    r = staff_client.get("/api/v2/images/search/", {"query": 'anatom_site_1:"Upper extremity"'})
+    r = staff_client.get(reverse("api:image_search"), {"query": 'anatom_site_1:"Upper extremity"'})
     assert r.status_code == 200, r.json()
     assert r.json()["count"] == 1, r.json()
 
 
 @pytest.mark.django_db
 def test_core_api_image_search_private_image(private_searchable_image, authenticated_client):
-    r = authenticated_client.get("/api/v2/images/search/")
+    r = authenticated_client.get(reverse("api:image_search"))
     assert r.status_code == 200, r.json()
     assert r.json()["count"] == 0, r.json()
 
 
 @pytest.mark.django_db
 def test_core_api_image_search_private_image_as_guest(private_searchable_image, client):
-    r = client.get("/api/v2/images/search/")
+    r = client.get(reverse("api:image_search"))
     assert r.status_code == 200, r.json()
     assert r.json()["count"] == 0, r.json()
 
 
 @pytest.mark.django_db
 def test_core_api_image_search_images_as_guest(searchable_images, client):
-    r = client.get("/api/v2/images/search/")
+    r = client.get(reverse("api:image_search"))
     assert r.status_code == 200, r.json()
     assert r.json()["count"] == 1, r.json()
 
@@ -231,7 +231,7 @@ def test_core_api_image_search_contributed(private_searchable_image, authenticat
     add_to_search_index(private_searchable_image)
     get_elasticsearch_client().indices.refresh(index="_all")
 
-    r = authenticated_client.get("/api/v2/images/search/")
+    r = authenticated_client.get(reverse("api:image_search"))
     assert r.status_code == 200, r.json()
     assert r.json()["count"] == 1, r.json()
 
@@ -245,27 +245,27 @@ def test_core_api_image_search_shares(
     add_to_search_index(private_searchable_image)
     get_elasticsearch_client().indices.refresh(index="_all")
 
-    r = authenticated_client.get("/api/v2/images/search/")
+    r = authenticated_client.get(reverse("api:image_search"))
     assert r.status_code == 200, r.json()
     assert r.json()["count"] == 1, r.json()
 
 
 @pytest.mark.django_db
-@pytest.mark.parametrize("route", ["images/search/", "images/facets/"])
+@pytest.mark.parametrize("route", ["api:image_search", "api:image_facets"])
 def test_core_api_image_search_invalid_query(route, searchable_images, authenticated_client):
-    r = authenticated_client.get(f"/api/v2/{route}", {"query": "age_approx:[[[[]]]]"})
+    r = authenticated_client.get(reverse(route), {"query": "age_approx:[[[[]]]]"})
     assert r.status_code == 400, r.json()
 
 
 @pytest.mark.django_db
 @pytest.mark.parametrize(
     "route",
-    ["/api/v2/images/", "/api/v2/images/search/"],
+    ["api:image_list", "api:image_search"],
 )
 def test_core_api_image_hides_fields(
     authenticated_client, searchable_image_with_private_field, route
 ):
-    r = authenticated_client.get(route)
+    r = authenticated_client.get(reverse(route))
     assert r.status_code == 200, r.json()
     assert r.json()["count"] == 1, r.json()
     for image in r.json()["results"]:
@@ -275,7 +275,7 @@ def test_core_api_image_hides_fields(
 @pytest.mark.django_db
 def test_core_api_image_search_collection_and_query(collection_with_image, authenticated_client):
     r = authenticated_client.get(
-        "/api/v2/images/search/",
+        reverse("api:image_search"),
         {"collections": f"{collection_with_image.pk}", "query": "age_approx:50"},
     )
     assert r.status_code == 200, r.json()
@@ -308,7 +308,7 @@ def test_core_api_image_search_collection(
     add_to_search_index(image)
     get_elasticsearch_client().indices.refresh(index="_all")
 
-    r = authenticated_client.get("/api/v2/images/search/", {"collections": str(collection.pk)})
+    r = authenticated_client.get(reverse("api:image_search"), {"collections": str(collection.pk)})
     assert r.status_code == 200, r.json()
 
     if can_see:
@@ -324,7 +324,7 @@ def test_core_api_image_search_collection_parsing(
     public_coll, private_coll = private_and_public_images_collections
 
     r = authenticated_client.get(
-        "/api/v2/images/search/", {"collections": f"{public_coll.pk},{private_coll.pk}"}
+        reverse("api:image_search"), {"collections": f"{public_coll.pk},{private_coll.pk}"}
     )
     assert r.status_code == 200, r.json()
     assert r.json()["count"] == 1, r.json()
@@ -334,7 +334,7 @@ def test_core_api_image_search_collection_parsing(
 def test_core_api_image_faceting_collection_filter(private_and_public_images_collections, client):
     public_coll, _ = private_and_public_images_collections
 
-    r = client.get("/api/v2/images/facets/", {"collections": f"{public_coll.pk}"})
+    r = client.get(reverse("api:image_facets"), {"collections": f"{public_coll.pk}"})
     assert r.status_code == 200, r.json()
 
     for bucket in r.json()["age_approx"]["buckets"]:
@@ -347,7 +347,7 @@ def test_core_api_image_faceting_collection_filter(private_and_public_images_col
 @pytest.mark.django_db
 def test_core_api_image_faceting_structure(searchable_images, client):
     r = client.get(
-        "/api/v2/images/facets/",
+        reverse("api:image_facets"),
     )
     assert r.status_code == 200, r.json()
     assert len(r.json()["diagnosis_3"]["buckets"]) == 2, r.json()
@@ -378,7 +378,7 @@ def test_core_api_image_faceting_structure(searchable_images, client):
 def test_core_api_image_faceting_query(private_and_public_images_collections, client_):
     public_coll, private_coll = private_and_public_images_collections
 
-    r = client_.get("/api/v2/images/facets/", {"query": "age_approx:10"})
+    r = client_.get(reverse("api:image_facets"), {"query": "age_approx:10"})
     assert r.status_code == 200, r.json()
     buckets = r.json()["age_approx"]["buckets"]
     for bucket in buckets:
diff --git a/isic/find/api.py b/isic/find/api.py
index 457769f59..077ac3465 100644
--- a/isic/find/api.py
+++ b/isic/find/api.py
@@ -57,7 +57,7 @@ def cohort_autocomplete(request: HttpRequest, query=Query(..., min_length=3)):
 
 
 @autocomplete_router.get("/collection/", response=list[CollectionOut], include_in_schema=False)
-def collection_autocomplete(request: HttpRequest, query=Query(..., min_length=3)):
+def find_collection_autocomplete(request: HttpRequest, query=Query(..., min_length=3)):
     # exclude magic collections
     qs = get_visible_objects(
         request.user,
diff --git a/isic/ingest/api.py b/isic/ingest/api.py
index 8caec05f8..609f30c00 100644
--- a/isic/ingest/api.py
+++ b/isic/ingest/api.py
@@ -15,8 +15,10 @@
 from isic.core.permissions import get_visible_objects
 from isic.ingest.models import Accession, Cohort, Contributor, Lesion, MetadataFile
 from isic.ingest.models.lesion import get_lesion_count_for_user
-from isic.ingest.services.accession import accession_create
-from isic.ingest.services.accession.review import accession_review_bulk_create
+from isic.ingest.services.accession import accession_create as accession_create_service
+from isic.ingest.services.accession.review import (
+    accession_review_bulk_create as accession_review_bulk_create_service,
+)
 from isic.ingest.tasks import update_metadata_task
 
 lesion_router = Router()
@@ -104,7 +106,7 @@ class Meta:
     summary="Create an Accession.",
     include_in_schema=False,
 )
-def create_accession(request: HttpRequest, payload: AccessionIn):
+def accession_create(request: HttpRequest, payload: AccessionIn):
     cohort = get_object_or_404(Cohort, pk=payload.cohort)
     if not request.user.is_staff and not request.user.has_perm("ingest.add_accession", cohort):
         return 403, {"error": "You do not have permission to add accessions to this cohort."}
@@ -113,7 +115,7 @@ def create_accession(request: HttpRequest, payload: AccessionIn):
     # TODO: how to make django-ninja schema aware of S3PlaceholderFile while using str for input?
     assert isinstance(payload.original_blob, S3PlaceholderFile)  # noqa: S101
 
-    return 201, accession_create(
+    return 201, accession_create_service(
         cohort=cohort,
         creator=request.user,
         original_blob=payload.original_blob,
@@ -132,11 +134,11 @@ class AccessionReview(Schema):
 @accession_router.post(
     "/create-review-bulk/", response={403: dict, 201: dict}, include_in_schema=False
 )
-def create_review_bulk(request: HttpRequest, payload: list[AccessionReview]):
+def accession_review_bulk_create(request: HttpRequest, payload: list[AccessionReview]):
     if not request.user.is_staff:
         return 403, {"error": "Only staff users may bulk create reviews."}
 
-    accession_review_bulk_create(
+    accession_review_bulk_create_service(
         reviewer=request.user,
         accession_ids_values={x.id: x.value for x in payload},
     )
@@ -241,7 +243,7 @@ def contributor_detail(request: HttpRequest, id: int):
     "/", response={201: ContributorOut}, include_in_schema=False, auth=is_authenticated
 )
 @transaction.atomic
-def create_contributor(request: HttpRequest, payload: ContributorIn):
+def contributor_create(request: HttpRequest, payload: ContributorIn):
     contributor = Contributor.objects.create(creator=request.user, **payload.dict())
     contributor.owners.add(request.user)
     return 201, contributor
@@ -257,7 +259,7 @@ class Meta:
 
 
 @metadata_file_router.delete("/{id}/", response={204: None}, include_in_schema=False, auth=is_staff)
-def delete_metadata_file(request: HttpRequest, id: int):
+def metadata_file_delete(request: HttpRequest, id: int):
     metadata_file = get_object_or_404(MetadataFile, id=id)
     metadata_file.delete()
     # Delete the blob from S3, making sure to not reattempt saving the same metadata_file model
@@ -271,7 +273,7 @@ def delete_metadata_file(request: HttpRequest, id: int):
     include_in_schema=False,
     auth=is_staff,
 )
-def update_metadata(request: HttpRequest, id: int):
+def metadata_file_update_metadata(request: HttpRequest, id: int):
     metadata_file = get_object_or_404(MetadataFile, id=id)
     update_metadata_task.delay_on_commit(request.user.pk, metadata_file.pk)
     return 202, None
diff --git a/isic/ingest/templates/ingest/partials/breadcrumbs.html b/isic/ingest/templates/ingest/partials/breadcrumbs.html
index 79671a328..0e85e95e6 100644
--- a/isic/ingest/templates/ingest/partials/breadcrumbs.html
+++ b/isic/ingest/templates/ingest/partials/breadcrumbs.html
@@ -2,7 +2,7 @@
   <ol class="flex items-center space-x-4">
     <li>
       <div>
-        <a href="/" class="text-gray-400 hover:text-gray-500">
+        <a href="{% url 'index' %}" class="text-gray-400 hover:text-gray-500">
           <i class="ri-home-2-fill flex-shrink-0 text-xl" aria-hidden="true"></i>
           <span class="sr-only">Home</span>
         </a>
diff --git a/isic/ingest/tests/test_api_accession.py b/isic/ingest/tests/test_api_accession.py
index 5029b1780..9519f3be7 100644
--- a/isic/ingest/tests/test_api_accession.py
+++ b/isic/ingest/tests/test_api_accession.py
@@ -1,3 +1,4 @@
+from django.urls import reverse
 import pytest
 
 from isic.ingest.models.accession import Accession
@@ -18,7 +19,7 @@ def test_api_accession_create(authenticated_client, user, cohort_factory, s3ff_r
     cohort = cohort_factory(contributor__owners=[user])
 
     resp = authenticated_client.post(
-        "/api/v2/accessions/",
+        reverse("api:accession_create"),
         data={"cohort": cohort.pk, "original_blob": s3ff_random_field_value},
         content_type="application/json",
     )
@@ -34,7 +35,7 @@ def test_api_accession_create_creates_accessions_with_unstructured_metadata(
     cohort = cohort_factory(contributor__owners=[user])
 
     resp = authenticated_client.post(
-        "/api/v2/accessions/",
+        reverse("api:accession_create"),
         data={"cohort": cohort.pk, "original_blob": s3ff_random_field_value},
         content_type="application/json",
     )
@@ -51,7 +52,7 @@ def test_api_accession_create_duplicate_blob_name(
     cohort = cohort_factory(contributor__owners=[user])
 
     resp = authenticated_client.post(
-        "/api/v2/accessions/",
+        reverse("api:accession_create"),
         data={"cohort": cohort.pk, "original_blob": s3ff_random_field_value},
         content_type="application/json",
     )
@@ -59,7 +60,7 @@ def test_api_accession_create_duplicate_blob_name(
     assert cohort.accessions.count() == 1
 
     resp = authenticated_client.post(
-        "/api/v2/accessions/",
+        reverse("api:accession_create"),
         data={"cohort": cohort.pk, "original_blob": s3ff_random_field_value},
         content_type="application/json",
     )
@@ -74,7 +75,7 @@ def test_api_accession_create_invalid_cohort(
     invalid_cohort = cohort_factory(contributor__creator=user_factory())
 
     resp = authenticated_client.post(
-        "/api/v2/accessions/",
+        reverse("api:accession_create"),
         data={"cohort": invalid_cohort.pk, "original_blob": s3ff_random_field_value},
         content_type="application/json",
     )
@@ -87,7 +88,7 @@ def test_api_accession_create_review_bulk(staff_client, accession_factory):
     accessions = [accession_factory() for _ in range(4)]
 
     resp = staff_client.post(
-        "/api/v2/accessions/create-review-bulk/",
+        reverse("api:accession_review_bulk_create"),
         data=[{"id": accession.id, "value": True} for accession in accessions],
         content_type="application/json",
     )
diff --git a/isic/ingest/tests/test_api_lesion.py b/isic/ingest/tests/test_api_lesion.py
index f2e75fdd0..62003c508 100644
--- a/isic/ingest/tests/test_api_lesion.py
+++ b/isic/ingest/tests/test_api_lesion.py
@@ -1,6 +1,7 @@
 from dataclasses import dataclass
 from typing import Literal
 
+from django.urls import reverse
 from isic_metadata.fields import DiagnosisEnum
 import pytest
 from pytest_lazy_fixtures import lf
@@ -13,7 +14,7 @@ def test_api_lesion_detail(authenticated_client, lesion_factory, image_factory):
     lesion = lesion_factory()
     image_factory(accession__lesion=lesion, public=True)
 
-    resp = authenticated_client.get(f"/api/v2/lesions/{lesion.id}/")
+    resp = authenticated_client.get(reverse("api:lesion_detail", kwargs={"id": lesion.id}))
     assert resp.status_code == 200, resp.json()
 
 
@@ -23,7 +24,7 @@ def test_api_lesion(authenticated_client, lesion_factory, image_factory):
     lesion = lesion_factory()
     image_factory(accession__lesion=lesion)
 
-    resp = authenticated_client.get("/api/v2/lesions/")
+    resp = authenticated_client.get(reverse("api:lesion_list"))
     assert resp.status_code == 200, resp.json()
 
 
@@ -33,7 +34,7 @@ def test_api_lesion_ignores_imageless_lesions(authenticated_client, lesion_facto
     # give access to the lesion to ensure this isn't passing due to lack of permissions
     lesion_factory(cohort__contributor__owners=[user])
 
-    resp = authenticated_client.get("/api/v2/lesions/")
+    resp = authenticated_client.get(reverse("api:lesion_list"))
     assert resp.status_code == 200, resp.json()
     assert len(resp.json()["results"]) == 0
 
@@ -73,7 +74,7 @@ def test_api_lesion_permissions_public(
             accession__cohort__contributor__owners=[other_user],
         )
 
-    resp = client_.get("/api/v2/lesions/")
+    resp = client_.get(reverse("api:lesion_list"))
     assert resp.status_code == 200, resp.json()
     assert len(resp.json()["results"]) == expected_lesion_count
 
@@ -88,7 +89,7 @@ def test_api_lesion_permissions_contributor(
         accession__lesion=lesion, accession__cohort__contributor=contributor, public=False
     )
 
-    resp = authenticated_client.get("/api/v2/lesions/")
+    resp = authenticated_client.get(reverse("api:lesion_list"))
     assert resp.status_code == 200, resp.json()
 
 
@@ -103,7 +104,7 @@ def test_api_lesion_completeness(client, lesion_factory, image_factory):
         public=True,
     )
 
-    resp = client.get("/api/v2/lesions/")
+    resp = client.get(reverse("api:lesion_list"))
     assert resp.status_code == 200, resp.json()
     assert resp.json()["results"][0]["images_count"] == 1
     assert not resp.json()["results"][0]["longitudinally_monitored"]
@@ -122,7 +123,7 @@ def test_api_lesion_completeness(client, lesion_factory, image_factory):
         public=True,
     )
 
-    resp = client.get("/api/v2/lesions/")
+    resp = client.get(reverse("api:lesion_list"))
     assert resp.status_code == 200, resp.json()
     assert resp.json()["results"][0]["images_count"] == 2
     assert resp.json()["results"][0]["longitudinally_monitored"]
diff --git a/isic/ingest/tests/test_api_pagination.py b/isic/ingest/tests/test_api_pagination.py
index 3479e05a2..653be1709 100644
--- a/isic/ingest/tests/test_api_pagination.py
+++ b/isic/ingest/tests/test_api_pagination.py
@@ -1,5 +1,6 @@
 from urllib.parse import urlparse
 
+from django.urls import reverse
 import pytest
 
 
@@ -7,7 +8,7 @@
 def test_pagination(image_factory, staff_client):
     images = [image_factory() for _ in range(2)]
 
-    resp = staff_client.get("/api/v2/images/", data={"limit": 1})
+    resp = staff_client.get(reverse("api:image_list"), data={"limit": 1})
 
     assert resp.status_code == 200, resp.json()
     assert resp.json()["count"] == 2
@@ -16,7 +17,7 @@ def test_pagination(image_factory, staff_client):
     assert resp.json()["results"][0]["isic_id"] == images[0].isic_id
     assert resp.json()["previous"] is None
     parsed = urlparse(resp.json()["next"])
-    assert parsed.path == "/api/v2/images/"
+    assert parsed.path == reverse("api:image_list")
     assert "cursor" in parsed.query
 
     # follow next page link
@@ -28,7 +29,7 @@ def test_pagination(image_factory, staff_client):
     assert resp.json()["results"][0]["isic_id"] == images[1].isic_id
     assert resp.json()["next"] is None
     parsed = urlparse(resp.json()["previous"])
-    assert parsed.path == "/api/v2/images/"
+    assert parsed.path == reverse("api:image_list")
     assert "cursor" in parsed.query
 
     # make sure previous links also work
diff --git a/isic/zip_download/api.py b/isic/zip_download/api.py
index 946a0bb58..d006165cb 100644
--- a/isic/zip_download/api.py
+++ b/isic/zip_download/api.py
@@ -65,7 +65,7 @@ def authenticate(self, request: HttpRequest, key: str | None) -> dict:
 
 @csrf_exempt
 @zip_router.post("/url/", response=str, include_in_schema=False)
-def create_zip_download_url(request: HttpRequest, payload: SearchQueryIn):
+def zip_download_url(request: HttpRequest, payload: SearchQueryIn):
     url: ParseResult | None = settings.ISIC_ZIP_DOWNLOAD_SERVICE_URL
     if url is None:
         raise ValueError("ISIC_ZIP_DOWNLOAD_SERVICE_URL is not set.")
@@ -100,8 +100,8 @@ def extension_from_str(s: str) -> str:
     # initialize files with metadata and attribution files
     domain = Site.objects.get_current().domain
     for endpoint, zip_path in [
-        [reverse("api:zip_file_metadata_file"), "metadata.csv"],
-        [reverse("api:zip_file_attribution_file"), "attribution.txt"],
+        [reverse("api:zip_download_metadata_file"), "metadata.csv"],
+        [reverse("api:zip_download_attribution_file"), "attribution.txt"],
     ]:
         yield {
             "url": f"http://{domain}{endpoint}?token={token}",
@@ -110,7 +110,7 @@ def extension_from_str(s: str) -> str:
 
     yield from (
         {
-            "url": f"http://{domain}{reverse('api:zip_file_license_file', args=[license_])}",
+            "url": f"http://{domain}{reverse('api:zip_download_license_file', args=[license_])}",
             "zipPath": f"licenses/{license_}.txt",
         }
         for license_ in (
@@ -121,7 +121,7 @@ def extension_from_str(s: str) -> str:
 
 @zip_router.get("/file-listing/", include_in_schema=False, auth=ZipDownloadTokenAuth())
 @transaction.atomic
-def zip_file_listing(
+def zip_download_listing(
     request: NinjaAuthHttpRequest,
 ):
     # use repeatable read to ensure consistent results
@@ -165,7 +165,7 @@ def write_response(buffer: Buffer) -> Iterable[bytes]:
 
 
 @zip_router.get("/metadata-file/", include_in_schema=False, auth=ZipDownloadTokenAuth())
-def zip_file_metadata_file(request: NinjaAuthHttpRequest):
+def zip_download_metadata_file(request: NinjaAuthHttpRequest):
     user, search = SearchQueryIn.from_token_representation(request.auth)
     qs = search.to_queryset(user, Image.objects.select_related("accession__cohort").distinct())
 
@@ -183,7 +183,7 @@ def write_response(buffer: Buffer) -> Iterable[bytes]:
 
 
 @zip_router.get("/attribution-file/", include_in_schema=False, auth=ZipDownloadTokenAuth())
-def zip_file_attribution_file(request: NinjaAuthHttpRequest):
+def zip_download_attribution_file(request: NinjaAuthHttpRequest):
     user, search = SearchQueryIn.from_token_representation(request.auth)
     qs = search.to_queryset(user, Image.objects.select_related("accession__cohort").distinct())
     attributions = get_attributions(qs.values_list("accession__attribution", flat=True))
@@ -191,7 +191,7 @@ def zip_file_attribution_file(request: NinjaAuthHttpRequest):
 
 
 @zip_router.get("/license-file/{license_type}/", include_in_schema=False)
-def zip_file_license_file(request: HttpRequest, license_type: str):
+def zip_download_license_file(request: HttpRequest, license_type: str):
     if license_type not in CopyrightLicense.values:
         raise Http404
 
diff --git a/isic/zip_download/tests/test_zip_download.py b/isic/zip_download/tests/test_zip_download.py
index ca1ddfe8a..dddc08ce4 100644
--- a/isic/zip_download/tests/test_zip_download.py
+++ b/isic/zip_download/tests/test_zip_download.py
@@ -3,6 +3,7 @@
 from urllib.parse import ParseResult, parse_qs, urlparse
 
 from django.core.files.storage import storages
+from django.urls import reverse
 import pytest
 
 
@@ -42,14 +43,14 @@ def mock_zip_download_service_url(settings) -> None:
 @pytest.mark.usefixtures("_random_images_with_licenses")
 def test_zip_download_licenses(authenticated_client):
     r = authenticated_client.post(
-        "/api/v2/zip-download/url/", {"query": ""}, content_type="application/json"
+        reverse("api:zip_download_url"), {"query": ""}, content_type="application/json"
     )
     assert r.status_code == 200, r.json()
     parsed_url = urlparse(r.json())
     token = parse_qs(parsed_url.query)["zsid"]
 
     r = authenticated_client.get(
-        "/api/v2/zip-download/file-listing/",
+        reverse("api:zip_download_listing"),
         data={"token": token[0]},
     )
     assert r.status_code == 200
@@ -73,7 +74,7 @@ def test_zip_download_licenses(authenticated_client):
 @pytest.mark.usefixtures("_random_images_with_licenses")
 def test_zip_download_listing(authenticated_client):
     r = authenticated_client.post(
-        "/api/v2/zip-download/url/",
+        reverse("api:zip_download_url"),
         {"query": ""},
         content_type="application/json",
     )
@@ -82,7 +83,7 @@ def test_zip_download_listing(authenticated_client):
     token = parse_qs(parsed_url.query)["zsid"]
 
     r = authenticated_client.get(
-        "/api/v2/zip-download/file-listing/",
+        reverse("api:zip_download_listing"),
         data={"token": token[0], "limit": 1},
     )
     output = json.loads(b"".join(r.streaming_content))
@@ -101,7 +102,7 @@ def test_zip_download_listing_urls(authenticated_client, image_factory, user):
     private_image.accession.cohort.contributor.owners.add(user)
 
     r = authenticated_client.post(
-        "/api/v2/zip-download/url/",
+        reverse("api:zip_download_url"),
         {"query": ""},
         content_type="application/json",
     )
@@ -110,7 +111,7 @@ def test_zip_download_listing_urls(authenticated_client, image_factory, user):
     token = parse_qs(parsed_url.query)["zsid"]
 
     r = authenticated_client.get(
-        "/api/v2/zip-download/file-listing/",
+        reverse("api:zip_download_listing"),
         data={"token": token[0]},
     )
     output = json.loads(b"".join(r.streaming_content))
@@ -133,20 +134,20 @@ def test_zip_download_listing_urls(authenticated_client, image_factory, user):
 @pytest.mark.django_db
 @pytest.mark.usefixtures("_random_images_with_licenses")
 @pytest.mark.parametrize(
-    ("endpoint", "zip_auth_token"),
+    ("endpoint_name", "zip_auth_token"),
     [
-        ("/api/v2/zip-download/metadata-file/", "malformed"),
-        ("/api/v2/zip-download/metadata-file/", "good"),
-        ("/api/v2/zip-download/metadata-file/", "missing"),
-        ("/api/v2/zip-download/attribution-file/", "good"),
-        ("/api/v2/zip-download/attribution-file/", "missing"),
+        ("api:zip_download_metadata_file", "malformed"),
+        ("api:zip_download_metadata_file", "good"),
+        ("api:zip_download_metadata_file", "missing"),
+        ("api:zip_download_attribution_file", "good"),
+        ("api:zip_download_attribution_file", "missing"),
     ],
 )
 def test_zip_download_authentication(
-    endpoint, zip_auth_token: Literal["malformed", "good", "missing"], authenticated_client
+    endpoint_name, zip_auth_token: Literal["malformed", "good", "missing"], authenticated_client
 ):
     r = authenticated_client.post(
-        "/api/v2/zip-download/url/",
+        reverse("api:zip_download_url"),
         {"query": ""},
         content_type="application/json",
     )
@@ -161,7 +162,7 @@ def test_zip_download_authentication(
     else:
         data = {}
 
-    r = authenticated_client.get(endpoint, data=data)
+    r = authenticated_client.get(reverse(endpoint_name), data=data)
     if zip_auth_token == "good":
         assert r.status_code == 200, r.content
     else: