diff --git a/musician/mixins.py b/musician/mixins.py
index 3cc463a..ba54587 100644
--- a/musician/mixins.py
+++ b/musician/mixins.py
@@ -12,10 +12,10 @@ class CustomContextMixin(ContextMixin):
         # generate services menu items
         services_menu = [
             {'icon': 'globe-europe', 'pattern_name': 'musician:dashboard', 'title': _('Domains & websites')},
-            {'icon': 'envelope', 'pattern_name': 'musician:mails', 'title': _('Mails')},
+            {'icon': 'envelope', 'pattern_name': 'musician:address-list', 'title': _('Mails')},
             {'icon': 'mail-bulk', 'pattern_name': 'musician:mailing-lists', 'title': _('Mailing lists')},
-            {'icon': 'database', 'pattern_name': 'musician:databases', 'title': _('Databases')},
-            {'icon': 'fire', 'pattern_name': 'musician:saas', 'title': _('SaaS')},
+            {'icon': 'database', 'pattern_name': 'musician:database-list', 'title': _('Databases')},
+            {'icon': 'fire', 'pattern_name': 'musician:saas-list', 'title': _('SaaS')},
         ]
         context.update({
             'services_menu': services_menu,
diff --git a/musician/templates/musician/addresses.html b/musician/templates/musician/addresses.html
index 5c0c757..4f6bf5c 100644
--- a/musician/templates/musician/addresses.html
+++ b/musician/templates/musician/addresses.html
@@ -21,7 +21,7 @@
     <tbody>
       {% for obj in object_list %}
       <tr>
-        <td><a href="{% url 'musician:mail-update' obj.id %}">{{ obj.mail_address }}</a></td>
+        <td><a href="{% url 'musician:address-update' obj.id %}">{{ obj.mail_address }}</a></td>
         <td>{{ obj.domain.name }}</td>
         <td>
           {% for mailbox in obj.mailboxes %}
@@ -34,7 +34,7 @@
     </tbody>
     {% include "musician/components/table_paginator.html" %}
   </table>
-  <a class="btn btn-primary mt-4 mb-4" href="{% url 'musician:mail-create' %}">{% trans "New mail address" %}</a>
+  <a class="btn btn-primary mt-4 mb-4" href="{% url 'musician:address-create' %}">{% trans "New mail address" %}</a>
 
 </div>
 {% endblock %}
diff --git a/musician/templates/musician/dashboard.html b/musician/templates/musician/dashboard.html
index addca3d..8226bd1 100644
--- a/musician/templates/musician/dashboard.html
+++ b/musician/templates/musician/dashboard.html
@@ -71,7 +71,7 @@
             <span class="text-{{ domain.addresses_left.alert_level }}">{{ domain.addresses_left.count }} {% trans "mail address left" %}</span>
             {% endif %}
           </p>
-          <a class="stretched-link" href="{% url 'musician:mails' %}?domain={{ domain.id }}"></a>
+          <a class="stretched-link" href="{% url 'musician:address-list' %}?domain={{ domain.id }}"></a>
       </div>
       <div class="col-md-2 border-right">
           <h4>{% trans "Mail list" %}</h4>
@@ -82,7 +82,7 @@
           <h4>{% trans "Software as a Service" %}</h4>
           <p class="card-text"><i class="fas fa-fire fa-3x"></i></p>
           <p class="card-text text-dark">{% trans "Nothing installed" %}</p>
-          <a class="stretched-link" href="{% url 'musician:saas' %}?domain={{ domain.id }}"></a>
+          <a class="stretched-link" href="{% url 'musician:saas-list' %}?domain={{ domain.id }}"></a>
       </div>
       <div class="col-md-1"></div>
       <div class="col-md-4">
diff --git a/musician/templates/musician/mail_base.html b/musician/templates/musician/mail_base.html
index 1790e90..4d15891 100644
--- a/musician/templates/musician/mail_base.html
+++ b/musician/templates/musician/mail_base.html
@@ -3,7 +3,7 @@
 
 {% block content %}
 {% if active_domain %}
-<a class="btn-arrow-left" href="{% url 'musician:mails' %}">{% trans "Go to global" %}</a>
+<a class="btn-arrow-left" href="{% url 'musician:address-list' %}">{% trans "Go to global" %}</a>
 {% endif %}
 
 <h1 class="service-name">{{ service.verbose_name }}{% if active_domain %} <span class="font-weight-light">{% trans "for"
@@ -13,11 +13,12 @@
 {% with request.resolver_match.url_name as url_name %}
 <ul class="nav nav-tabs" id="myTab" role="tablist">
   <li class="nav-item">
-    <a class="nav-link {% if url_name == 'mails' %}active{% endif %}" href="{% url 'musician:mails' %}" role="tab"
-      aria-selected="true">{% trans "Addresses" %}</a>
+    <a class="nav-link {% if url_name == 'address-list' %}active{% endif %}" href="{% url 'musician:address-list' %}" role="tab"
+      aria-selected="{% if url_name == 'address-list' %}true{% else %}false{% endif %}">{% trans "Addresses" %}</a>
   </li>
   <li class="nav-item">
-    <a class="nav-link {% if url_name == 'mailboxes' %}active{% endif %}" href="{% url 'musician:mailboxes' %}" role="tab" aria-selected="false">{% trans "Mailboxes" %}</a>
+    <a class="nav-link {% if url_name == 'mailbox-list' %}active{% endif %}" href="{% url 'musician:mailbox-list' %}" role="tab"
+    aria-selected="{% if url_name == 'mailbox-list' %}true{% else %}false{% endif %}">{% trans "Mailboxes" %}</a>
   </li>
 </ul>
 
diff --git a/musician/templates/musician/mail_form.html b/musician/templates/musician/mail_form.html
index c6bb3ec..2f0aa07 100644
--- a/musician/templates/musician/mail_form.html
+++ b/musician/templates/musician/mail_form.html
@@ -8,7 +8,7 @@
   {% csrf_token %}
   {% bootstrap_form form %}
   {% buttons %}
-  <a class="btn btn-light mr-2" href="{% url 'musician:mails' %}">{% trans "Cancel" %}</a>
+  <a class="btn btn-light mr-2" href="{% url 'musician:address-list' %}">{% trans "Cancel" %}</a>
   <button type="submit" class="btn btn-secondary">{% trans "Save" %}</button>
   {% endbuttons %}
 </form>
diff --git a/musician/templates/musician/mailboxes.html b/musician/templates/musician/mailboxes.html
index a9e0764..666c94b 100644
--- a/musician/templates/musician/mailboxes.html
+++ b/musician/templates/musician/mailboxes.html
@@ -25,7 +25,7 @@
         <td>{{ mailbox.filtering }}</td>
         <td>
           {% for addr in mailbox.addresses %}
-            <a href="{% url 'musician:mail-update' addr.data.id %}">
+            <a href="{% url 'musician:address-update' addr.data.id %}">
               {{ addr.data.name }}@{{ addr.data.domain.name }}
             </a><br/>
           {% endfor %}
diff --git a/musician/urls.py b/musician/urls.py
index d699832..308bf06 100644
--- a/musician/urls.py
+++ b/musician/urls.py
@@ -16,14 +16,14 @@ urlpatterns = [
     path('auth/logout/', views.LogoutView.as_view(), name='logout'),
     path('dashboard/', views.DashboardView.as_view(), name='dashboard'),
     path('domains/<int:pk>/', views.DomainDetailView.as_view(), name='domain-detail'),
-    path('bills/', views.BillingView.as_view(), name='billing'),
+    path('billing/', views.BillingView.as_view(), name='billing'),
     path('bills/<int:pk>/download/', views.BillDownloadView.as_view(), name='bill-download'),
     path('profile/', views.ProfileView.as_view(), name='profile'),
-    path('mails/', views.MailView.as_view(), name='mails'),
-    path('mails/new/', views.MailCreateView.as_view(), name='mail-create'),
-    path('mails/<int:pk>/', views.MailUpdateView.as_view(), name='mail-update'),
-    path('mailboxes/', views.MailboxesView.as_view(), name='mailboxes'),
+    path('address/', views.MailView.as_view(), name='address-list'),
+    path('address/new/', views.MailCreateView.as_view(), name='address-create'),
+    path('address/<int:pk>/', views.MailUpdateView.as_view(), name='address-update'),
+    path('mailboxes/', views.MailboxesView.as_view(), name='mailbox-list'),
     path('mailing-lists/', views.MailingListsView.as_view(), name='mailing-lists'),
-    path('databases/', views.DatabasesView.as_view(), name='databases'),
-    path('software-as-a-service/', views.SaasView.as_view(), name='saas'),
+    path('databases/', views.DatabasesView.as_view(), name='database-list'),
+    path('saas/', views.SaasView.as_view(), name='saas-list'),
 ]
diff --git a/musician/views.py b/musician/views.py
index 336f4ea..4e524ac 100644
--- a/musician/views.py
+++ b/musician/views.py
@@ -207,7 +207,7 @@ class MailCreateView(CustomContextMixin, UserTokenRequiredMixin, FormView):
     service_class = Address
     template_name = "musician/mail_form.html"
     form_class = MailForm
-    success_url = reverse_lazy("musician:mails")
+    success_url = reverse_lazy("musician:address-list")
     extra_context = {'service': service_class}
 
     def get_form_kwargs(self):
@@ -232,7 +232,7 @@ class MailUpdateView(CustomContextMixin, UserTokenRequiredMixin, FormView):
     service_class = Address
     template_name = "musician/mail_form.html"
     form_class = MailForm
-    success_url = reverse_lazy("musician:mails")
+    success_url = reverse_lazy("musician:address-list")
     extra_context = {'service': service_class}
 
     def get_form_kwargs(self):