diff --git a/templates/gallery/base.html b/templates/gallery/base.html
index 7e66b6706b..df460a05ab 100644
--- a/templates/gallery/base.html
+++ b/templates/gallery/base.html
@@ -10,14 +10,14 @@
 
 
 {% block breadcrumb_base %}
-    <li><a href="{% url "gallery-list" %}">{% trans "Galeries" %}</a></li>
+    <li><a href="{% url "gallery:list" %}">{% trans "Galeries" %}</a></li>
 {% endblock %}
 
 
 
 {% block sidebar %}
     <aside class="sidebar mobile-menu-hide">
-        <a href="{% url "gallery-new" %}" class="new-btn ico-after more blue">
+        <a href="{% url "gallery:create" %}" class="new-btn ico-after more blue">
             {% trans "Créer une galerie" %}
         </a>
 
@@ -31,19 +31,19 @@ <h3>{% trans "Actions" %}</h3>
                     <ul>
                         {% if permissions.write %}
                             <li>
-                                <a href="{% url "gallery-image-new" gallery.pk %}" class="ico-after more blue">
+                                <a href="{% url "gallery:image-add" gallery.pk %}" class="ico-after more blue">
                                     {% trans "Ajouter une image" %}
                                 </a>
                             </li>
                             {% if not content_linked %}
                                 <li>
-                                    <a href="{% url "gallery-edit" gallery.pk gallery.slug %}" class="ico-after edit blue">
+                                    <a href="{% url "gallery:edit" gallery.pk %}" class="ico-after edit blue">
                                         {% trans "Éditer la galerie" %}
                                     </a>
                                 </li>
                             {% endif %}
                             <li>
-                                <a href="{% url "gallery-image-import" gallery.pk %}" class="ico-after import blue">
+                                <a href="{% url "gallery:image-import" gallery.pk %}" class="ico-after import blue">
                                     {% trans "Importer une archive" %}
                                 </a>
                             </li>
@@ -52,7 +52,7 @@ <h3>{% trans "Actions" %}</h3>
                                     <a href="#delete-galleries" class="open-modal ico-after cross red">
                                         {% trans "Supprimer la galerie" %}
                                     </a>
-                                    <form action="{% url "galleries-delete" %}" method="post" id="delete-galleries" class="modal modal-flex">
+                                    <form action="{% url "gallery:delete" %}" method="post" id="delete-galleries" class="modal modal-flex">
                                         <input name="g_items" type="hidden" value="{{ gallery.pk }}" form="delete-galleries" />
                                         <p>{% trans "Êtes-vous certain de vouloir supprimer cette galerie ?" %}</p>
                                         {% csrf_token %}
diff --git a/templates/gallery/gallery/details.html b/templates/gallery/gallery/details.html
index f66e24fa08..d69ddb8f97 100644
--- a/templates/gallery/gallery/details.html
+++ b/templates/gallery/gallery/details.html
@@ -70,7 +70,7 @@
                                                 <td>
                                                     {# droits #}
                                                     {% if u.user != current_user %}
-                                                        <form action="{% url "gallery-members" gallery.pk %}" method="post">
+                                                        <form action="{% url "gallery:members" gallery.pk %}" method="post">
                                                             {% csrf_token %}
                                                             <input type="hidden" name="action" value="edit">
                                                             <input type="hidden" name="user" value="{{ u.user.username }}">
@@ -85,7 +85,7 @@
                                                 </td>
                                                 <td>
                                                     {# suppression #}
-                                                    <form action="{% url "gallery-members" gallery.pk %}" method="post">
+                                                    <form action="{% url "gallery:members" gallery.pk %}" method="post">
                                                         {% csrf_token %}
                                                         <input type="hidden" name="action" value="leave">
                                                         <input type="hidden" name="user" value="{{ u.user.username }}">
@@ -127,7 +127,7 @@
                 <!-- Delete images -->
                 <a class="btn btn-cancel open-modal" href="#form-delete-images">{% trans "Supprimer la sélection" %}</a>
                 <!-- Confirmation modal -->
-                <form id="form-delete-images" name="form" method="post" action="{% url "gallery-image-delete" gallery.pk %}" class="modal modal-flex">
+                <form id="form-delete-images" name="form" method="post" action="{% url "gallery:image-delete" gallery.pk %}" class="modal modal-flex">
                     <input type="hidden" name="gallery" value="{{ gallery.pk }}">
                     {% csrf_token %}
                     <p>{% trans "Attention, vous vous appretez à supprimer toutes les images sélectionnées." %}</p>
@@ -149,7 +149,7 @@
                         {% endif %}
                     </div>
                     <div class="topic-description has-image" title="{{ img.title }}">
-                        <a href="{% url "gallery-image-edit" gallery.pk img.pk %}" class="topic-title-link navigable-link">
+                        <a href="{% url "gallery:image-edit" gallery.pk img.pk %}" class="topic-title-link navigable-link">
                             <img src="{{ img.physical.gallery.url }}"
                                  data-caption="{{ img.title }}"
                                  alt="{{ img.title }}"
@@ -164,7 +164,7 @@
                 </div>
             {% endfor %}
 
-            <a href="{% url "gallery-image-new" gallery.pk %}" title="Ajouter une image" class="gallery-item add-image">+</a>
+            <a href="{% url "gallery:image-add" gallery.pk %}" title="Ajouter une image" class="gallery-item add-image">+</a>
         </div>
     {% else %}
         <p>
@@ -172,8 +172,8 @@
             <br>
 
             {% if permissions.write %}
-                {% url "gallery-image-new" gallery.pk as new_img_url %}
-                {% url "gallery-image-import" gallery.pk as import_archive %}
+                {% url "gallery:image-add" gallery.pk as new_img_url %}
+                {% url "gallery:image-import" gallery.pk as import_archive %}
                 {% blocktrans %}
                     Vous pouvez <a href="{{new_img_url}}">ajouter une image</a> à cette galerie dès à présent, ou <a href="{{ import_archive }}">importer une archive</a> !
                 {% endblocktrans %}
diff --git a/templates/gallery/gallery/list.html b/templates/gallery/gallery/list.html
index 0ce9ffc71c..b1341ba2e3 100644
--- a/templates/gallery/gallery/list.html
+++ b/templates/gallery/gallery/list.html
@@ -80,7 +80,7 @@
     {% if galleries|length == 0 %}
         <p>
             {% trans "Vous n’avez pas encore de galerie" %}. <br>
-            <a href="{% url "gallery-new" %}">{% trans "Créer une galerie" %}</a>.
+            <a href="{% url "gallery:create" %}">{% trans "Créer une galerie" %}</a>.
         </p>
     {% endif %}
 
@@ -99,7 +99,7 @@ <h3>{% trans "Actions" %}</h3>
                         {% trans "Supprimer les galeries sélectionnées" %}
                     </a>
 
-                    <form action="{% url "galleries-delete" %}" method="post" id="delete-galleries" class="modal modal-flex">
+                    <form action="{% url "gallery:delete" %}" method="post" id="delete-galleries" class="modal modal-flex">
                         <p>
                             {% trans "Attention, vous vous apprêtez à supprimer toutes les galeries sélectionnées" %}.
                         </p>
diff --git a/templates/gallery/image/edit.html b/templates/gallery/image/edit.html
index bd492508a5..56479b7818 100644
--- a/templates/gallery/image/edit.html
+++ b/templates/gallery/image/edit.html
@@ -93,7 +93,7 @@
 
         {% if permissions.write %}
             {# Confirmation modal for deleting image #}
-            <form id="form-delete-image" name="form" method="post" action="{% url "gallery-image-delete" gallery.pk %}" class="modal modal-flex">
+            <form id="form-delete-image" name="form" method="post" action="{% url "gallery:image-delete" gallery.pk %}" class="modal modal-flex">
                 {% csrf_token %}
                 <input type="hidden" name="image" value="{{ image.pk }}">
                 <p>{% trans "Attention, vous vous apprêtez à supprimer cette image." %}</p>
diff --git a/templates/header.html b/templates/header.html
index 1ea571dcee..8ecb780730 100644
--- a/templates/header.html
+++ b/templates/header.html
@@ -367,7 +367,7 @@ <h1 class="dropdown-title">{{ user.username|truncatechars:25 }}</h1>
                             <a href="{% url "opinion:find-opinion" user.username %}">{% trans "Mes billets" %}</a>
                         </li>
                         <li>
-                            <a href="{% url "gallery-list" %}">{% trans "Galeries d’images" %}</a>
+                            <a href="{% url "gallery:list" %}">{% trans "Galeries d’images" %}</a>
                         </li>
                         <li>
                             <a href="{% url "update-member" %}">{% trans "Paramètres" %}</a>
diff --git a/templates/tutorialv2/create/container.html b/templates/tutorialv2/create/container.html
index e52c42f394..af7f5b3b9a 100644
--- a/templates/tutorialv2/create/container.html
+++ b/templates/tutorialv2/create/container.html
@@ -39,8 +39,8 @@ <h1>
 
 {% block sidebar_actions %}
     <li>
-        <a href="{% url "gallery-image-new" gallery.pk %}" class="ico-after more blue">
+        <a href="{% url "gallery:image-add" gallery.pk %}" class="ico-after more blue">
             {% trans "Ajouter une image à la galerie" %}
         </a>
     </li>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/templates/tutorialv2/create/extract.html b/templates/tutorialv2/create/extract.html
index a0b33c0b1d..d8ddb99b98 100644
--- a/templates/tutorialv2/create/extract.html
+++ b/templates/tutorialv2/create/extract.html
@@ -44,8 +44,8 @@ <h1>
 
 {% block sidebar_actions %}
     <li>
-        <a href="{% url "gallery-image-new" gallery.pk %}" class="ico-after more blue">
+        <a href="{% url "gallery:image-add" gallery.pk %}" class="ico-after more blue">
             {% trans "Ajouter une image à la galerie" %}
         </a>
     </li>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/templates/tutorialv2/edit/container.html b/templates/tutorialv2/edit/container.html
index 4810559c08..a8d5cb415e 100644
--- a/templates/tutorialv2/edit/container.html
+++ b/templates/tutorialv2/edit/container.html
@@ -40,8 +40,8 @@ <h1>
 
 {% block sidebar_actions %}
     <li>
-        <a href="{% url "gallery-image-new" gallery.pk %}" class="ico-after more blue">
+        <a href="{% url "gallery:image-add" gallery.pk %}" class="ico-after more blue">
             {% trans "Ajouter une image à la galerie" %}
         </a>
     </li>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/templates/tutorialv2/edit/content.html b/templates/tutorialv2/edit/content.html
index 74f55f0ba0..21f42caf28 100644
--- a/templates/tutorialv2/edit/content.html
+++ b/templates/tutorialv2/edit/content.html
@@ -38,8 +38,8 @@ <h1 {% if content.image %}class="illu"{% endif %}>
 
 {% block sidebar_actions %}
     <li>
-        <a href="{% url "gallery-image-new" gallery.pk %}" class="ico-after more blue">
+        <a href="{% url "gallery:image-add" gallery.pk %}" class="ico-after more blue">
             {% trans "Ajouter une image à la galerie" %}
         </a>
     </li>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/templates/tutorialv2/edit/extract.html b/templates/tutorialv2/edit/extract.html
index 567e0a221f..3e365d1af0 100644
--- a/templates/tutorialv2/edit/extract.html
+++ b/templates/tutorialv2/edit/extract.html
@@ -46,8 +46,8 @@ <h1>
 
 {% block sidebar_actions %}
     <li>
-        <a href="{% url "gallery-image-new" gallery.pk %}" class="ico-after more blue">
+        <a href="{% url "gallery:image-add" gallery.pk %}" class="ico-after more blue">
             {% trans "Ajouter une image à la galerie" %}
         </a>
     </li>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/templates/tutorialv2/view/content.html b/templates/tutorialv2/view/content.html
index 5c981f7e28..a0010ae219 100644
--- a/templates/tutorialv2/view/content.html
+++ b/templates/tutorialv2/view/content.html
@@ -614,7 +614,7 @@ <h2>
     {# GALERY #}
     {% if can_edit %}
         <li>
-            <a href="{% url "gallery-details" gallery.pk gallery.slug %}" class="ico-after offline blue">
+            <a href="{% url "gallery:details" gallery.pk gallery.slug %}" class="ico-after offline blue">
                 {% trans "Aller à la galerie liée" %}
             </a>
         </li>
diff --git a/zds/gallery/forms.py b/zds/gallery/forms.py
index c7ded6e439..bb3e640726 100644
--- a/zds/gallery/forms.py
+++ b/zds/gallery/forms.py
@@ -22,7 +22,7 @@ def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.helper = FormHelper()
         self.helper.form_class = "clearfix"
-        self.helper.form_action = reverse("gallery-new")
+        self.helper.form_action = reverse("gallery:create")
         self.helper.form_method = "post"
 
         self.helper.layout = Layout(
@@ -94,7 +94,7 @@ def __init__(self, *args, **kwargs):
         self.helper = FormHelper()
         self.helper.form_class = "modal modal-flex"
         self.helper.form_id = "add-user-modal"
-        self.helper.form_action = reverse("gallery-members", kwargs={"pk": gallery.pk})
+        self.helper.form_action = reverse("gallery:members", kwargs={"pk": gallery.pk})
         self.helper.form_method = "post"
 
         self.helper.layout = Layout(
diff --git a/zds/gallery/models.py b/zds/gallery/models.py
index 29c0a11ce9..5bd410e513 100644
--- a/zds/gallery/models.py
+++ b/zds/gallery/models.py
@@ -210,7 +210,7 @@ def get_absolute_url(self):
         :return: Gallery object URL
         :rtype: str
         """
-        return reverse("gallery-details", args=[self.pk, self.slug])
+        return reverse("gallery:details", args=[self.pk, self.slug])
 
     def get_gallery_path(self):
         """Get the filesystem path to this gallery root.
diff --git a/zds/gallery/tests/tests_models.py b/zds/gallery/tests/tests_models.py
index d620501034..7611a37e99 100644
--- a/zds/gallery/tests/tests_models.py
+++ b/zds/gallery/tests/tests_models.py
@@ -82,7 +82,7 @@ def tearDown(self):
         self.gallery.delete()
 
     def test_get_absolute_url(self):
-        absolute_url = reverse("gallery-details", args=[self.gallery.pk, self.gallery.slug])
+        absolute_url = reverse("gallery:details", args=[self.gallery.pk, self.gallery.slug])
         self.assertEqual(absolute_url, self.gallery.get_absolute_url())
 
     def test_get_linked_users(self):
diff --git a/zds/gallery/tests/tests_views.py b/zds/gallery/tests/tests_views.py
index cf83c1473e..be78205026 100644
--- a/zds/gallery/tests/tests_views.py
+++ b/zds/gallery/tests/tests_views.py
@@ -11,8 +11,8 @@
 
 class GalleryListViewTest(TestCase):
     def test_denies_anonymous(self):
-        response = self.client.get(reverse("gallery-list"), follow=True)
-        self.assertRedirects(response, reverse("member-login") + "?next=" + reverse("gallery-list"))
+        response = self.client.get(reverse("gallery:list"), follow=True)
+        self.assertRedirects(response, reverse("member-login") + "?next=" + reverse("gallery:list"))
 
     def test_list_galeries_belong_to_member(self):
         profile = ProfileFactory()
@@ -22,7 +22,7 @@ def test_list_galeries_belong_to_member(self):
 
         self.client.force_login(profile.user)
 
-        response = self.client.get(reverse("gallery-list"), follow=True)
+        response = self.client.get(reverse("gallery:list"), follow=True)
         self.assertEqual(200, response.status_code)
 
         self.assertEqual(1, len(response.context["galleries"]))
@@ -37,14 +37,14 @@ def setUp(self):
         self.profile2 = ProfileFactory()
 
     def test_denies_anonymous(self):
-        response = self.client.get(reverse("gallery-details", args=["89", "test-gallery"]), follow=True)
+        response = self.client.get(reverse("gallery:details", args=["89", "test-gallery"]), follow=True)
         self.assertRedirects(
-            response, reverse("member-login") + "?next=" + reverse("gallery-details", args=["89", "test-gallery"])
+            response, reverse("member-login") + "?next=" + reverse("gallery:details", args=["89", "test-gallery"])
         )
 
     def test_fail_gallery_no_exist(self):
         self.client.force_login(self.profile1.user)
-        response = self.client.get(reverse("gallery-details", args=["89", "test-gallery"]), follow=True)
+        response = self.client.get(reverse("gallery:details", args=["89", "test-gallery"]), follow=True)
 
         self.assertEqual(404, response.status_code)
 
@@ -55,7 +55,7 @@ def test_fail_gallery_details_no_permission(self):
 
         self.client.force_login(self.profile2.user)
 
-        response = self.client.get(reverse("gallery-details", args=[gallery.pk, gallery.slug]))
+        response = self.client.get(reverse("gallery:details", args=[gallery.pk, gallery.slug]))
         self.assertEqual(403, response.status_code)
 
     def test_success_gallery_details_permission_authorized(self):
@@ -65,7 +65,7 @@ def test_success_gallery_details_permission_authorized(self):
 
         self.client.force_login(self.profile2.user)
 
-        response = self.client.get(reverse("gallery-details", args=[gallery.pk, gallery.slug]))
+        response = self.client.get(reverse("gallery:details", args=[gallery.pk, gallery.slug]))
         self.assertEqual(200, response.status_code)
 
 
@@ -74,24 +74,24 @@ def setUp(self):
         self.profile1 = ProfileFactory()
 
     def test_denies_anonymous(self):
-        response = self.client.get(reverse("gallery-new"), follow=True)
-        self.assertRedirects(response, reverse("member-login") + "?next=" + reverse("gallery-new"))
+        response = self.client.get(reverse("gallery:create"), follow=True)
+        self.assertRedirects(response, reverse("member-login") + "?next=" + reverse("gallery:create"))
 
-        response = self.client.post(reverse("gallery-new"), follow=True)
-        self.assertRedirects(response, reverse("member-login") + "?next=" + reverse("gallery-new"))
+        response = self.client.post(reverse("gallery:create"), follow=True)
+        self.assertRedirects(response, reverse("member-login") + "?next=" + reverse("gallery:create"))
 
     def test_access_member(self):
         """just verify with get request that everythings is ok"""
         self.client.force_login(self.profile1.user)
 
-        response = self.client.get(reverse("gallery-new"))
+        response = self.client.get(reverse("gallery:create"))
         self.assertEqual(200, response.status_code)
 
     def test_fail_new_gallery_with_missing_params(self):
         self.client.force_login(self.profile1.user)
         self.assertEqual(0, Gallery.objects.count())
 
-        response = self.client.post(reverse("gallery-new"), {"subtitle": "test"})
+        response = self.client.post(reverse("gallery:create"), {"subtitle": "test"})
         self.assertEqual(200, response.status_code)
         self.assertTrue(response.context["form"].errors)
         self.assertEqual(0, Gallery.objects.filter(subtitle="test").count())
@@ -101,7 +101,7 @@ def test_success_new_gallery(self):
         self.assertEqual(0, Gallery.objects.count())
 
         response = self.client.post(
-            reverse("gallery-new"), {"title": "test title", "subtitle": "test subtitle"}, follow=True
+            reverse("gallery:create"), {"title": "test title", "subtitle": "test subtitle"}, follow=True
         )
 
         self.assertEqual(200, response.status_code)
@@ -146,7 +146,7 @@ def test_fail_delete_multi_read_permission(self):
         self.assertEqual(3, Image.objects.all().count())
 
         response = self.client.post(
-            reverse("galleries-delete"), {"delete_multi": "", "g_items": [self.gallery1.pk]}, follow=True
+            reverse("gallery:delete"), {"delete_multi": "", "g_items": [self.gallery1.pk]}, follow=True
         )
         self.assertEqual(200, response.status_code)
 
@@ -162,7 +162,7 @@ def test_success_delete_multi_write_permission(self):
         self.assertEqual(3, Image.objects.all().count())
 
         response = self.client.post(
-            reverse("galleries-delete"),
+            reverse("gallery:delete"),
             {"delete_multi": "", "g_items": [self.gallery1.pk, self.gallery2.pk]},
             follow=True,
         )
@@ -179,9 +179,7 @@ def test_fail_delete_read_permission(self):
         self.assertEqual(5, UserGallery.objects.all().count())
         self.assertEqual(3, Image.objects.all().count())
 
-        response = self.client.post(
-            reverse("galleries-delete"), {"delete": "", "gallery": self.gallery1.pk}, follow=True
-        )
+        response = self.client.post(reverse("gallery:delete"), {"delete": "", "gallery": self.gallery1.pk}, follow=True)
         self.assertEqual(403, response.status_code)
 
         self.assertEqual(4, Gallery.objects.all().count())
@@ -195,9 +193,7 @@ def test_success_delete_write_permission(self):
         self.assertEqual(5, UserGallery.objects.all().count())
         self.assertEqual(3, Image.objects.all().count())
 
-        response = self.client.post(
-            reverse("galleries-delete"), {"delete": "", "gallery": self.gallery1.pk}, follow=True
-        )
+        response = self.client.post(reverse("gallery:delete"), {"delete": "", "gallery": self.gallery1.pk}, follow=True)
         self.assertEqual(200, response.status_code)
         self.assertEqual(0, Gallery.objects.filter(pk=self.gallery1.pk).count())
         self.assertEqual(0, UserGallery.objects.filter(gallery=self.gallery1).count())
@@ -208,7 +204,7 @@ def test_fail_add_user_with_read_permission(self):
 
         # gallery nonexistent
         response = self.client.post(
-            reverse("gallery-members", kwargs={"pk": 99999}),
+            reverse("gallery:members", kwargs={"pk": 99999}),
             {
                 "action": "add",
             },
@@ -217,7 +213,7 @@ def test_fail_add_user_with_read_permission(self):
 
         # try to add a user with write permission
         response = self.client.post(
-            reverse("gallery-members", kwargs={"pk": self.gallery1.pk}),
+            reverse("gallery:members", kwargs={"pk": self.gallery1.pk}),
             {
                 "action": "add",
                 "user": self.profile2.user.username,
@@ -231,7 +227,7 @@ def test_fail_add_user_already_has_permission(self):
 
         # Same permission : read
         response = self.client.post(
-            reverse("gallery-members", kwargs={"pk": self.gallery1.pk}),
+            reverse("gallery:members", kwargs={"pk": self.gallery1.pk}),
             {
                 "action": "add",
                 "user": self.profile2.user.username,
@@ -247,7 +243,7 @@ def test_fail_add_user_already_has_permission(self):
         # try to add write permission to a user
         # who has already an read permission
         response = self.client.post(
-            reverse("gallery-members", kwargs={"pk": self.gallery1.pk}),
+            reverse("gallery:members", kwargs={"pk": self.gallery1.pk}),
             {
                 "action": "add",
                 "user": self.profile2.user.username,
@@ -264,7 +260,7 @@ def test_success_add_user_read_permission(self):
         self.client.force_login(self.profile1.user)
 
         response = self.client.post(
-            reverse("gallery-members", kwargs={"pk": self.gallery1.pk}),
+            reverse("gallery:members", kwargs={"pk": self.gallery1.pk}),
             {
                 "action": "add",
                 "user": self.profile3.user.username,
@@ -281,7 +277,7 @@ def test_success_add_user_write_permission(self):
         self.client.force_login(self.profile1.user)
 
         response = self.client.post(
-            reverse("gallery-members", kwargs={"pk": self.gallery1.pk}),
+            reverse("gallery:members", kwargs={"pk": self.gallery1.pk}),
             {
                 "action": "add",
                 "user": self.profile3.user.username,
@@ -298,7 +294,7 @@ def test_success_modify_user_write_permission(self):
         self.client.force_login(self.profile1.user)
 
         response = self.client.post(
-            reverse("gallery-members", kwargs={"pk": self.gallery1.pk}),
+            reverse("gallery:members", kwargs={"pk": self.gallery1.pk}),
             {
                 "action": "add",
                 "user": self.profile3.user.username,
@@ -312,7 +308,7 @@ def test_success_modify_user_write_permission(self):
         self.assertEqual("W", permissions[0].mode)
 
         response = self.client.post(
-            reverse("gallery-members", kwargs={"pk": self.gallery1.pk}),
+            reverse("gallery:members", kwargs={"pk": self.gallery1.pk}),
             {
                 "action": "edit",
                 "user": self.profile3.user.username,
@@ -329,7 +325,7 @@ def test_fail_user_modify_self(self):
         self.client.force_login(self.profile1.user)
 
         response = self.client.post(
-            reverse("gallery-members", kwargs={"pk": self.gallery1.pk}),
+            reverse("gallery:members", kwargs={"pk": self.gallery1.pk}),
             {
                 "action": "edit",
                 "user": self.profile1.user.username,
@@ -350,7 +346,7 @@ def test_success_user_leave_gallery(self):
 
         # kick the other
         response = self.client.post(
-            reverse("gallery-members", kwargs={"pk": self.gallery1.pk}),
+            reverse("gallery:members", kwargs={"pk": self.gallery1.pk}),
             {
                 "action": "leave",
                 "user": self.profile2.user.username,
@@ -370,7 +366,7 @@ def test_error_last_user_with_write_leave_gallery(self):
 
         # try to quit
         response = self.client.post(
-            reverse("gallery-members", kwargs={"pk": self.gallery1.pk}),
+            reverse("gallery:members", kwargs={"pk": self.gallery1.pk}),
             {
                 "action": "leave",
                 "user": self.profile1.user.username,
@@ -389,7 +385,7 @@ def test_success_user_with_read_permission_leave_gallery(self):
 
         # leave
         response = self.client.post(
-            reverse("gallery-members", kwargs={"pk": self.gallery1.pk}),
+            reverse("gallery:members", kwargs={"pk": self.gallery1.pk}),
             {
                 "action": "leave",
                 "user": self.profile2.user.username,
@@ -409,7 +405,7 @@ def test_fail_user_modify_user_has_permission(self):
 
         # set W
         response = self.client.post(
-            reverse("gallery-members", kwargs={"pk": self.gallery1.pk}),
+            reverse("gallery:members", kwargs={"pk": self.gallery1.pk}),
             {
                 "action": "edit",
                 "user": self.profile2.user.username,
@@ -424,7 +420,7 @@ def test_fail_user_modify_user_has_permission(self):
 
         # kick other
         response = self.client.post(
-            reverse("gallery-members", kwargs={"pk": self.gallery1.pk}),
+            reverse("gallery:members", kwargs={"pk": self.gallery1.pk}),
             {
                 "action": "leave",
                 "user": self.profile1.user.username,
@@ -452,7 +448,7 @@ def test_fail_member_no_permission_can_edit_gallery(self):
         given_subtile = "Un nouveau sous-titre"
 
         self.client.post(
-            reverse("gallery-edit", args=[self.gallery1.pk, self.gallery1.slug]),
+            reverse("gallery:edit", args=[self.gallery1.pk]),
             {"title": given_title, "subtitle": given_subtile},
             follow=True,
         )
@@ -468,7 +464,7 @@ def test_fail_member_read_permission_can_edit_gallery(self):
         given_subtile = "Un nouveau sous-titre"
 
         self.client.post(
-            reverse("gallery-edit", args=[self.gallery1.pk, self.gallery1.slug]),
+            reverse("gallery:edit", args=[self.gallery1.pk]),
             {"title": given_title, "subtitle": given_subtile},
             follow=True,
         )
@@ -484,7 +480,7 @@ def test_success_member_edit_gallery(self):
         given_subtile = "Un nouveau sous-titre"
 
         self.client.post(
-            reverse("gallery-edit", args=[self.gallery1.pk, self.gallery1.slug]),
+            reverse("gallery:edit", args=[self.gallery1.pk]),
             {"title": given_title, "subtitle": given_subtile},
             follow=True,
         )
@@ -513,7 +509,7 @@ def test_fail_member_no_permission_can_edit_image(self):
         with (settings.BASE_DIR / "fixtures" / "logo.png").open("rb") as fp:
 
             self.client.post(
-                reverse("gallery-image-edit", args=[self.gallery.pk, self.image.pk]),
+                reverse("gallery:image-edit", args=[self.gallery.pk, self.image.pk]),
                 {"title": "modify with no perms", "legend": "test legend", "physical": fp},
                 follow=True,
             )
@@ -534,7 +530,7 @@ def test_success_member_edit_image(self):
 
                 with open(filename, "rb") as fp:
                     response = self.client.post(
-                        reverse("gallery-image-edit", args=[self.gallery.pk, self.image.pk]),
+                        reverse("gallery:image-edit", args=[self.gallery.pk, self.image.pk]),
                         {"title": "edit title", "legend": "dit legend", "physical": fp},
                         follow=True,
                     )
@@ -548,7 +544,7 @@ def test_success_member_edit_image(self):
     def test_access_permission(self):
         self.client.force_login(self.profile1.user)
 
-        response = self.client.get(reverse("gallery-image-edit", args=[self.gallery.pk, self.image.pk]))
+        response = self.client.get(reverse("gallery:image-edit", args=[self.gallery.pk, self.image.pk]))
 
         self.assertEqual(200, response.status_code)
 
@@ -576,7 +572,7 @@ def test_fail_modify_image_with_no_permission(self):
         self.client.force_login(self.profile3.user)
 
         response = self.client.post(
-            reverse("gallery-image-delete", kwargs={"pk_gallery": self.gallery1.pk}),
+            reverse("gallery:image-delete", kwargs={"pk_gallery": self.gallery1.pk}),
             {
                 "gallery": self.gallery1.pk,
             },
@@ -595,7 +591,7 @@ def test_delete_image_from_other_user(self):
         self.client.force_login(self.profile1.user)
 
         self.client.post(
-            reverse("gallery-image-delete", kwargs={"pk_gallery": self.gallery1.pk}),
+            reverse("gallery:image-delete", kwargs={"pk_gallery": self.gallery1.pk}),
             {"gallery": self.gallery1.pk, "delete": "", "image": image4.pk},
             follow=True,
         )
@@ -608,7 +604,7 @@ def test_success_delete_image_write_permission(self):
         nb_files = len(os.listdir(self.gallery1.get_gallery_path()))
 
         response = self.client.post(
-            reverse("gallery-image-delete", kwargs={"pk_gallery": self.gallery1.pk}),
+            reverse("gallery:image-delete", kwargs={"pk_gallery": self.gallery1.pk}),
             {"gallery": self.gallery1.pk, "delete": "", "image": self.image1.pk},
             follow=True,
         )
@@ -623,7 +619,7 @@ def test_success_delete_list_images_write_permission(self):
         self.client.force_login(self.profile1.user)
 
         response = self.client.post(
-            reverse("gallery-image-delete", kwargs={"pk_gallery": self.gallery1.pk}),
+            reverse("gallery:image-delete", kwargs={"pk_gallery": self.gallery1.pk}),
             {"gallery": self.gallery1.pk, "delete_multi": "", "g_items": [self.image1.pk, self.image2.pk]},
             follow=True,
         )
@@ -636,7 +632,7 @@ def test_fail_delete_image_read_permission(self):
         self.client.force_login(self.profile2.user)
 
         response = self.client.post(
-            reverse("gallery-image-delete", kwargs={"pk_gallery": self.gallery1.pk}),
+            reverse("gallery:image-delete", kwargs={"pk_gallery": self.gallery1.pk}),
             {"gallery": self.gallery1.pk, "delete": "", "image": self.image1.pk},
             follow=True,
         )
@@ -665,7 +661,7 @@ def test_success_new_image_write_permission(self):
             with self.subTest(filename):
                 with open(filename, "rb") as fp:
                     response = self.client.post(
-                        reverse("gallery-image-new", args=[self.gallery.pk]),
+                        reverse("gallery:image-add", args=[self.gallery.pk]),
                         {"title": "Test title", "legend": "Test legend", "physical": fp},
                         follow=True,
                     )
@@ -681,7 +677,7 @@ def test_fail_new_image_with_read_permission(self):
 
         with (settings.BASE_DIR / "fixtures" / "logo.png").open("rb") as fp:
             response = self.client.post(
-                reverse("gallery-image-new", args=[self.gallery.pk]),
+                reverse("gallery:image-add", args=[self.gallery.pk]),
                 {"title": "Test title", "legend": "Test legend", "physical": fp},
                 follow=True,
             )
@@ -695,7 +691,7 @@ def test_fail_new_image_with_no_permission(self):
 
         with (settings.BASE_DIR / "fixtures" / "logo.png").open("rb") as fp:
             response = self.client.post(
-                reverse("gallery-image-new", args=[self.gallery.pk]),
+                reverse("gallery:image-add", args=[self.gallery.pk]),
                 {"title": "Test title", "legend": "Test legend", "physical": fp},
                 follow=True,
             )
@@ -708,7 +704,7 @@ def test_fail_gallery_not_exist(self):
 
         with (settings.BASE_DIR / "fixtures" / "logo.png").open("rb") as fp:
             response = self.client.post(
-                reverse("gallery-image-new", args=[156]),
+                reverse("gallery:image-add", args=[156]),
                 {"title": "Test title", "legend": "Test legend", "physical": fp},
                 follow=True,
             )
@@ -720,14 +716,14 @@ def test_import_images_in_gallery(self):
 
         with (settings.BASE_DIR / "fixtures" / "archive-gallery.zip").open("rb") as fp:
             response = self.client.post(
-                reverse("gallery-image-import", args=[self.gallery.pk]), {"file": fp}, follow=False
+                reverse("gallery:image-import", args=[self.gallery.pk]), {"file": fp}, follow=False
             )
         self.assertEqual(302, response.status_code)
         img = self.gallery.get_images()[0]
         self.assertEqual(Image.objects.filter(gallery=self.gallery).count(), 1)
         self.assertEqual("jpg", img.get_extension())
         response = self.client.post(
-            reverse("gallery-image-delete", kwargs={"pk_gallery": self.gallery.pk}),
+            reverse("gallery:image-delete", kwargs={"pk_gallery": self.gallery.pk}),
             {"delete": "", "image": img.pk},
             follow=True,
         )
@@ -738,7 +734,7 @@ def test_import_images_in_gallery_no_archive(self):
 
         with (settings.BASE_DIR / "fixtures" / "archive-gallery.zip").open("rb"):
             response = self.client.post(
-                reverse("gallery-image-import", args=[self.gallery.pk]),
+                reverse("gallery:image-import", args=[self.gallery.pk]),
                 {
                     # normally we have
                     # 'file': fp
@@ -754,7 +750,7 @@ def test_denies_import_images_in_gallery(self):
 
         with (settings.BASE_DIR / "fixtures" / "archive-gallery.zip").open("rb") as fp:
             response = self.client.post(
-                reverse("gallery-image-import", args=[self.gallery.pk]), {"file": fp}, follow=True
+                reverse("gallery:image-import", args=[self.gallery.pk]), {"file": fp}, follow=True
             )
         self.assertEqual(403, response.status_code)
         self.assertEqual(Image.objects.filter(gallery=self.gallery).count(), 0)
diff --git a/zds/gallery/urls.py b/zds/gallery/urls.py
index 4e1c6176b0..ae8d30ce14 100644
--- a/zds/gallery/urls.py
+++ b/zds/gallery/urls.py
@@ -1,4 +1,4 @@
-from django.urls import re_path
+from django.urls import path
 
 from zds.gallery.views import (
     NewGallery,
@@ -13,19 +13,20 @@
     EditGalleryMembers,
 )
 
+app_name = "gallery"
 
 urlpatterns = [
     # Index
-    re_path(r"^$", ListGallery.as_view(), name="gallery-list"),
-    # Gallery operation
-    re_path(r"^nouveau/$", NewGallery.as_view(), name="gallery-new"),
-    re_path(r"^(?P<pk>\d+)/(?P<slug>.+)/$", GalleryDetails.as_view(), name="gallery-details"),
-    re_path(r"^editer/(?P<pk>\d+)/(?P<slug>.+)/$", EditGallery.as_view(), name="gallery-edit"),
-    re_path(r"^membres/(?P<pk>\d+)/$", EditGalleryMembers.as_view(), name="gallery-members"),
-    re_path(r"^supprimer/$", DeleteGalleries.as_view(), name="galleries-delete"),
+    path("", ListGallery.as_view(), name="list"),
+    # Gallery operations
+    path("creer/", NewGallery.as_view(), name="create"),
+    path("<int:pk>/<slug:slug>/", GalleryDetails.as_view(), name="details"),
+    path("modifier/<int:pk>/", EditGallery.as_view(), name="edit"),
+    path("membres/<int:pk>/", EditGalleryMembers.as_view(), name="members"),
+    path("supprimer/", DeleteGalleries.as_view(), name="delete"),
     # Image operations
-    re_path(r"^image/ajouter/(?P<pk_gallery>\d+)/$", NewImage.as_view(), name="gallery-image-new"),
-    re_path(r"^image/supprimer/(?P<pk_gallery>\d+)/$", DeleteImages.as_view(), name="gallery-image-delete"),
-    re_path(r"^image/editer/(?P<pk_gallery>\d+)/(?P<pk>\d+)/$", EditImage.as_view(), name="gallery-image-edit"),
-    re_path(r"^image/importer/(?P<pk_gallery>\d+)/$", ImportImages.as_view(), name="gallery-image-import"),
+    path("<int:pk_gallery>/image/ajouter/", NewImage.as_view(), name="image-add"),
+    path("<int:pk_gallery>/image/supprimer/", DeleteImages.as_view(), name="image-delete"),
+    path("<int:pk_gallery>/image/<int:pk>/modifier/", EditImage.as_view(), name="image-edit"),
+    path("<int:pk_gallery>/image/importer/", ImportImages.as_view(), name="image-import"),
 ]
diff --git a/zds/gallery/views.py b/zds/gallery/views.py
index ff572fb941..f50a9aa8ce 100644
--- a/zds/gallery/views.py
+++ b/zds/gallery/views.py
@@ -118,7 +118,7 @@ class EditGallery(LoggedWithReadWriteHability, GalleryUpdateOrDeleteMixin, FormV
 
     def dispatch(self, *args, **kwargs):
         try:
-            self.get_gallery(pk=self.kwargs.get("pk"), slug=self.kwargs.get("slug"))
+            self.get_gallery(pk=self.kwargs.get("pk"))
         except Gallery.DoesNotExist:
             raise Http404()
 
@@ -206,7 +206,7 @@ def post(self, request, *args, **kwargs):
 
             self.perform_delete()
 
-        success_url = reverse("gallery-list")
+        success_url = reverse("gallery:list")
         return HttpResponseRedirect(success_url)
 
 
@@ -218,7 +218,7 @@ class EditGalleryMembers(LoggedWithReadWriteHability, GalleryUpdateOrDeleteMixin
 
     def dispatch(self, *args, **kwargs):
         try:
-            self.get_gallery(pk=self.kwargs.get("pk"), slug=self.kwargs.get("slug"))
+            self.get_gallery(pk=self.kwargs.get("pk"))
         except Gallery.DoesNotExist:
             raise Http404()
 
@@ -288,7 +288,7 @@ def form_valid(self, form):
         if not has_deleted and not modify_self:
             self.success_url = self.gallery.get_absolute_url()
         else:
-            self.success_url = reverse("gallery-list")
+            self.success_url = reverse("gallery:list")
 
         return super().form_valid(form)
 
@@ -300,7 +300,7 @@ class ImageFromGalleryViewMixin(GalleryMixin, View):
 
     def dispatch(self, request, *args, **kwargs):
         try:
-            self.get_gallery(pk=self.kwargs.get("pk_gallery"), slug=self.kwargs.get("slug"))
+            self.get_gallery(pk=self.kwargs.get("pk_gallery"))
         except Gallery.DoesNotExist:
             raise Http404()
 
@@ -337,7 +337,7 @@ def form_valid(self, form):
             messages.error(self.request, _(f"Le fichier « {e} » n'est pas une image valide."))
             form.add_error("physical", _("Image invalide"))
             return super().form_invalid(form)
-        self.success_url = reverse("gallery-image-edit", kwargs={"pk_gallery": self.gallery.pk, "pk": self.image.pk})
+        self.success_url = reverse("gallery:image-edit", kwargs={"pk_gallery": self.gallery.pk, "pk": self.image.pk})
 
         return super().form_valid(form)
 
@@ -395,7 +395,7 @@ def form_valid(self, form):
             form.add_error("physical", _("Image invalide"))
             return super().form_invalid(form)
 
-        self.success_url = reverse("gallery-image-edit", kwargs={"pk_gallery": self.gallery.pk, "pk": self.image.pk})
+        self.success_url = reverse("gallery:image-edit", kwargs={"pk_gallery": self.gallery.pk, "pk": self.image.pk})
 
         return super().form_valid(form)
 
diff --git a/zds/member/forms.py b/zds/member/forms.py
index 13d235d60b..0df5cd4a32 100644
--- a/zds/member/forms.py
+++ b/zds/member/forms.py
@@ -301,7 +301,7 @@ def __init__(self, *args, **kwargs):
                 _(
                     """
                 <p>
-                    <a href="{% url 'gallery-list' %}">Choisir un avatar dans une galerie</a><br/>
+                    <a href="{% url "gallery:list" %}">Choisir un avatar dans une galerie</a><br/>
                     Naviguez vers l'image voulue et cliquez sur le bouton "<em>Choisir comme avatar</em>".<br/>
                     Créez une galerie et importez votre avatar si ce n'est pas déjà fait !
                 </p>
diff --git a/zds/member/tests/views/tests_login.py b/zds/member/tests/views/tests_login.py
index f56c00e321..67c8818f92 100644
--- a/zds/member/tests/views/tests_login.py
+++ b/zds/member/tests/views/tests_login.py
@@ -51,11 +51,11 @@ def test_login(self):
         # login a user. Good password and next parameter then
         # redirection to the "next" page.
         result = self.client.post(
-            reverse("member-login") + "?next=" + reverse("gallery-list"),
+            reverse("member-login") + "?next=" + reverse("gallery:list"),
             {"username": user.user.username, "password": "hostel77", "remember": "remember"},
             follow=False,
         )
-        self.assertRedirects(result, reverse("gallery-list"))
+        self.assertRedirects(result, reverse("gallery:list"))
 
         # check the user is redirected to the home page if
         # the "next" parameter points to a non-existing page.
@@ -69,8 +69,8 @@ def test_login(self):
         # check if the login form will redirect if there is
         # a next parameter.
         self.client.logout()
-        result = self.client.get(reverse("member-login") + "?next=" + reverse("gallery-list"))
-        self.assertContains(result, reverse("member-login") + "?next=" + reverse("gallery-list"), count=1)
+        result = self.client.get(reverse("member-login") + "?next=" + reverse("gallery:list"))
+        self.assertContains(result, reverse("member-login") + "?next=" + reverse("gallery:list"), count=1)
 
     def test_nonascii(self):
         user = NonAsciiProfileFactory()
diff --git a/zds/tutorialv2/tests/tests_views/tests_content.py b/zds/tutorialv2/tests/tests_views/tests_content.py
index 4f4d51b8da..82c57022fa 100644
--- a/zds/tutorialv2/tests/tests_views/tests_content.py
+++ b/zds/tutorialv2/tests/tests_views/tests_content.py
@@ -3459,14 +3459,14 @@ def test_gallery_not_deleted_if_linked_to_content(self):
         self.client.force_login(self.user_author)
 
         # try to delete gallery
-        result = self.client.post(reverse("galleries-delete"), {"delete": "", "gallery": gallery.pk}, follow=True)
+        result = self.client.post(reverse("gallery:delete"), {"delete": "", "gallery": gallery.pk}, follow=True)
 
         self.assertEqual(result.status_code, 403)
         self.assertEqual(1, Gallery.objects.filter(pk=self.tuto.gallery.pk).count())  # gallery not deleted
 
         # try to add to gallery
         result = self.client.post(
-            reverse("gallery-members", kwargs={"pk": gallery.pk}),
+            reverse("gallery:members", kwargs={"pk": gallery.pk}),
             {"action": "add", "user": self.user_staff.username, "mode": "R"},
             follow=True,
         )
@@ -3476,7 +3476,7 @@ def test_gallery_not_deleted_if_linked_to_content(self):
 
         # try to leave gallery
         result = self.client.post(
-            reverse("gallery-members", kwargs={"pk": gallery.pk}),
+            reverse("gallery:members", kwargs={"pk": gallery.pk}),
             {
                 "action": "leave",
                 "user": self.user_author.username,
diff --git a/zds/urls.py b/zds/urls.py
index 64ada6e5e9..fcfef7423f 100644
--- a/zds/urls.py
+++ b/zds/urls.py
@@ -88,7 +88,7 @@ def location(self, item):
     re_path(r"^membres/", include(("zds.member.urls", ""))),
     re_path(r"^admin/", admin.site.urls),
     re_path(r"^pages/", include(("zds.pages.urls", ""))),
-    re_path(r"^galerie/", include(("zds.gallery.urls", ""))),
+    path("galerie/", include("zds.gallery.urls")),
     re_path(r"^rechercher/", include(("zds.searchv2.urls", "zds.searchv2"), namespace="search")),
     re_path(r"^munin/", include(("zds.munin.urls", ""))),
     re_path(r"^mise-en-avant/", include(("zds.featured.urls", ""))),