diff --git a/swh/web/add_forge_now/views.py b/swh/web/add_forge_now/views.py
--- a/swh/web/add_forge_now/views.py
+++ b/swh/web/add_forge_now/views.py
@@ -93,9 +93,7 @@
     """
 
     return render(
-        request,
-        "add_forge_now/create-request-create.html",
-        {"forge_types": FORGE_TYPES},
+        request, "add_forge_now/creation_form.html", {"forge_types": FORGE_TYPES},
     )
 
 
@@ -104,7 +102,7 @@
 
     """
 
-    return render(request, "add_forge_now/create-request-list.html",)
+    return render(request, "add_forge_now/list.html",)
 
 
 def create_request_help(request):
@@ -112,7 +110,7 @@
 
     """
 
-    return render(request, "add_forge_now/create-request-help.html",)
+    return render(request, "add_forge_now/help.html",)
 
 
 urlpatterns = [
diff --git a/swh/web/templates/add_forge_now/create-request.html b/swh/web/templates/add_forge_now/common.html
rename from swh/web/templates/add_forge_now/create-request.html
rename to swh/web/templates/add_forge_now/common.html
diff --git a/swh/web/templates/add_forge_now/create-request-create.html b/swh/web/templates/add_forge_now/creation_form.html
rename from swh/web/templates/add_forge_now/create-request-create.html
rename to swh/web/templates/add_forge_now/creation_form.html
--- a/swh/web/templates/add_forge_now/create-request-create.html
+++ b/swh/web/templates/add_forge_now/creation_form.html
@@ -1,4 +1,4 @@
-{% extends "./create-request.html" %}
+{% extends "./common.html" %}
 
 {% comment %}
 Copyright (C) 2022  The Software Heritage developers
diff --git a/swh/web/templates/add_forge_now/create-request-help.html b/swh/web/templates/add_forge_now/help.html
rename from swh/web/templates/add_forge_now/create-request-help.html
rename to swh/web/templates/add_forge_now/help.html
--- a/swh/web/templates/add_forge_now/create-request-help.html
+++ b/swh/web/templates/add_forge_now/help.html
@@ -1,4 +1,4 @@
-{% extends "./create-request.html" %}
+{% extends "./common.html" %}
 
 {% comment %}
 Copyright (C) 2022  The Software Heritage developers
diff --git a/swh/web/templates/add_forge_now/create-request-list.html b/swh/web/templates/add_forge_now/list.html
rename from swh/web/templates/add_forge_now/create-request-list.html
rename to swh/web/templates/add_forge_now/list.html
--- a/swh/web/templates/add_forge_now/create-request-list.html
+++ b/swh/web/templates/add_forge_now/list.html
@@ -1,4 +1,4 @@
-{% extends "./create-request.html" %}
+{% extends "./common.html" %}
 
 {% comment %}
 Copyright (C) 2022  The Software Heritage developers