diff --git a/CHANGELOG b/CHANGELOG
index f01e7d1e3..35ba70736 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -13,6 +13,11 @@ Agenda:
   agenda model. No API changes.
 Assignments:
 - Massive refactoring and cleanup of assignments app.
+- Renamed app from assignment to assignments
+Motions:
+- Renamed app from motion to motions
+Mediafiles:
+- Renamed app from mediafile to mediafiles
 Users:
 - Massive refactoring of the participant app. Now called 'users'.
 - Used new anonymous user object instead of an authentification backend.
diff --git a/openslides/agenda/main_menu.py b/openslides/agenda/main_menu.py
index 00e578e57..db50655a6 100644
--- a/openslides/agenda/main_menu.py
+++ b/openslides/agenda/main_menu.py
@@ -8,7 +8,7 @@ class AgendaMainMenuEntry(MainMenuEntry):
     Main menu entry for the agenda app.
     """
     verbose_name = ugettext_lazy('Agenda')
-    required_permission = 'agenda.can_see_agenda'
+    required_permission = 'agenda.can_see'
     default_weight = 20
     pattern_name = 'item_overview'
     icon_css_class = 'glyphicon-calendar'
diff --git a/openslides/agenda/models.py b/openslides/agenda/models.py
index 8fc269e52..d9ec490ed 100644
--- a/openslides/agenda/models.py
+++ b/openslides/agenda/models.py
@@ -114,8 +114,8 @@ class Item(RESTModelMixin, SlideMixin, AbsoluteUrlMixin, MPTTModel):
 
     class Meta:
         permissions = (
-            ('can_see_agenda', ugettext_noop("Can see agenda")),
-            ('can_manage_agenda', ugettext_noop("Can manage agenda")),
+            ('can_see', ugettext_noop("Can see agenda")),
+            ('can_manage', ugettext_noop("Can manage agenda")),
             ('can_see_orga_items', ugettext_noop("Can see orga items and time scheduling of agenda")))
 
     class MPTTMeta:
diff --git a/openslides/agenda/templates/agenda/item_row.html b/openslides/agenda/templates/agenda/item_row.html
index f6a39e51b..dde29ad09 100644
--- a/openslides/agenda/templates/agenda/item_row.html
+++ b/openslides/agenda/templates/agenda/item_row.html
@@ -2,7 +2,7 @@
 {% load tags %}
 
 <div class="{% if node.is_active_slide %}activeline{% endif %}">
-    {% if perms.agenda.can_manage_agenda or perms.core.can_manage_projector %}
+    {% if perms.agenda.can_manage or perms.core.can_manage_projector %}
     <div class="manage">
         <span style="width: 1px; white-space: nowrap;">
         {% if perms.core.can_manage_projector %}
@@ -17,7 +17,7 @@
                 <i class="icon icon-bell {% if node.is_active_slide and active_type == 'list_of_speakers' %}icon-white{% endif %}"></i>
             </a>
         {% endif %}
-        {% if perms.agenda.can_manage_agenda %}
+        {% if perms.agenda.can_manage %}
             <span class="optional-small">
             <a href="{{ node|absolute_url:'update' }}" rel="tooltip" data-original-title="{% trans 'Edit' %}" class="btn btn-mini">
                 <i class="icon-pencil"></i>
@@ -56,7 +56,7 @@
     </div>
     {% endif %}
 
-    {% if perms.agenda.can_manage_agenda %}
+    {% if perms.agenda.can_manage %}
     <div class="optional">
         {% if node.comment %}
             {{ node.comment|first_line }}
diff --git a/openslides/agenda/templates/agenda/overview.html b/openslides/agenda/templates/agenda/overview.html
index 5d6d6ac40..e4dd49b42 100644
--- a/openslides/agenda/templates/agenda/overview.html
+++ b/openslides/agenda/templates/agenda/overview.html
@@ -17,7 +17,7 @@
 {% block content %}
         <h1>{% trans "Agenda" %}
             <small class="pull-right">
-            {% if perms.agenda.can_manage_agenda %}
+            {% if perms.agenda.can_manage %}
                 <a href="{% url 'item_new' %}" class="btn btn-sm btn-primary"
                         rel="tooltip" data-original-title="{% trans 'New item' %}">
                     <span class="glyphicon glyphicon-plus" aria-hidden="true"></span>
@@ -31,7 +31,7 @@
                     <span class="optional-small"> {% trans 'Tags' %}</span>
                 </a>
             {% endif %}
-            {% if perms.agenda.can_manage_agenda %}
+            {% if perms.agenda.can_manage %}
                 <a href="{% url 'item_csv_import' %}" class="btn btn-default btn-sm"
                         rel="tooltip" data-original-title="{% trans 'Import agenda items' %}">
                     <span class="glyphicon glyphicon-import" aria-hidden="true"></span>
@@ -56,7 +56,7 @@
 
         <div class="row-fluid">
             <div class="pull-left">
-                {% if perms.agenda.can_manage_agenda %}
+                {% if perms.agenda.can_manage %}
                     <p>
                         <a href="{% url 'agenda_numbering' %}"
                             class="btn btn-default btn-sm">{% trans 'Number agenda items' %}
@@ -95,13 +95,13 @@
         <table id="menu-overview" class="table table-striped table-bordered">
             <tr>
                 <th class="title">{% trans "Item" %}</th>
-                {% if perms.agenda.can_manage_agenda %}
+                {% if perms.agenda.can_manage %}
                     <th class="optional">{% trans "Comment" %}</th>
                 {% endif %}
                 {% if perms.agenda.can_see_orga_items %}
                     <th class="duration">{% trans "Duration" %}</th>
                 {% endif %}
-                {% if perms.agenda.can_manage_agenda or perms.core.can_manage_projector %}
+                {% if perms.agenda.can_manage or perms.core.can_manage_projector %}
                     <th class="manage">{% trans "Actions" %}</th>
                 {% endif %}
             </tr>
@@ -109,13 +109,13 @@
                 <td class="title">
                     {% trans "Agenda" %}
                 </td>
-                {% if perms.agenda.can_manage_agenda %}
+                {% if perms.agenda.can_manage %}
                 <td class="optional"></td>
                 {% endif %}
                 {% if perms.agenda.can_see_orga_items %}
                 <td class="duration">{{ duration }} h</td>
                 {% endif %}
-                {% if perms.agenda.can_manage_agenda or perms.core.can_manage_projector %}
+                {% if perms.agenda.can_manage or perms.core.can_manage_projector %}
                 <td class="manage">
                 {% if perms.core.can_manage_projector %}
                     <span>
@@ -131,7 +131,7 @@
             </tr>
         </table>
         {% if items %}
-        <ol class="agenda_list {% if perms.agenda.can_manage_agenda %}sortable{% endif %}">
+        <ol class="agenda_list {% if perms.agenda.can_manage %}sortable{% endif %}">
             {% recursetree items %}
             <li class="draggable">
                 {% include "agenda/item_row.html" %}
diff --git a/openslides/agenda/templates/agenda/sort.html b/openslides/agenda/templates/agenda/sort.html
index eaee7a1f2..1bb85f3bd 100644
--- a/openslides/agenda/templates/agenda/sort.html
+++ b/openslides/agenda/templates/agenda/sort.html
@@ -12,7 +12,7 @@
 
 {% block javascript %}
     <script type="text/javascript" src="{% static 'js/agenda.js' %}"></script>
-    {% if perms.agenda.can_manage_agenda %}
+    {% if perms.agenda.can_manage %}
         <script type="text/javascript" src="{% static 'js/jquery/jquery-ui.custom.min.js' %}"></script>
         <script type="text/javascript" src="{% static 'js/jquery/jquery.once.js' %}"></script>
         <script type="text/javascript" src="{% static 'js/jquery/jquery.tmpl.js' %}"></script>
@@ -22,7 +22,7 @@
 
 {% block content %}
     <form action="" method="post">{% csrf_token %}
-        {% if perms.agenda.can_manage_agenda %}
+        {% if perms.agenda.can_manage %}
             <div id="changed-order-message" style="display:none" class="alert alert-warning">
                 <button type="button" class="close" data-dismiss="alert">×</button>
                 {% trans "Do you want to save the changed order of agenda items?" %}<br>
@@ -33,7 +33,7 @@
 
         <h1>{% trans "Agenda" %}
             <small class="pull-right">
-            {% if perms.agenda.can_manage_agenda %}
+            {% if perms.agenda.can_manage %}
                 <a href="{% url 'item_new' %}" class="btn btn-mini btn-primary" rel="tooltip" data-original-title="{% trans 'New item' %}">
                     <i class="icon-plus icon-white"></i>
                     {% trans "New" %}
@@ -45,7 +45,7 @@
                     <span class="optional-small"> {% trans 'Tags' %}</span>
                 </a>
             {% endif %}
-            {% if perms.agenda.can_manage_agenda %}
+            {% if perms.agenda.can_manage %}
                 <a href="{% url 'item_csv_import' %}" class="btn btn-mini" rel="tooltip" data-original-title="{% trans 'Import agenda items' %}">
                     <i class="icon-import"></i>
                     {% trans "Import" %}
@@ -61,7 +61,7 @@
 
         <div class="row-fluid">
             <div class="pull-left">
-                {% if perms.agenda.can_manage_agenda %}
+                {% if perms.agenda.can_manage %}
                     <p><a href="{% url 'agenda_numbering' %}"
                        class="btn btn-mini">{% trans 'Number agenda items' %}</a>
                     </p>
@@ -96,13 +96,13 @@
         <table id="menu-overview" class="table table-striped table-bordered">
             <tr>
                 <th class="title">{% trans "Item" %}</th>
-                {% if perms.agenda.can_manage_agenda %}
+                {% if perms.agenda.can_manage %}
                     <th class="optional">{% trans "Comment" %}</th>
                 {% endif %}
                 {% if perms.agenda.can_see_orga_items %}
                     <th class="duration">{% trans "Duration" %}</th>
                 {% endif %}
-                {% if perms.agenda.can_manage_agenda or perms.core.can_manage_projector %}
+                {% if perms.agenda.can_manage or perms.core.can_manage_projector %}
                     <th class="manage">{% trans "Actions" %}</th>
                 {% endif %}
             </tr>
@@ -110,13 +110,13 @@
                 <td class="title">
                     {% trans "Agenda" %}
                 </td>
-                {% if perms.agenda.can_manage_agenda %}
+                {% if perms.agenda.can_manage %}
                 <td class="optional"></td>
                 {% endif %}
                 {% if perms.agenda.can_see_orga_items %}
                 <td class="duration">{{ duration }} h</td>
                 {% endif %}
-                {% if perms.agenda.can_manage_agenda or perms.core.can_manage_projector %}
+                {% if perms.agenda.can_manage or perms.core.can_manage_projector %}
                 <td class="manage">
                 {% if perms.core.can_manage_projector %}
                     <span>
@@ -132,7 +132,7 @@
             </tr>
         </table>
         {% if items %}
-        <ol class="agenda_list {% if perms.agenda.can_manage_agenda %}sortable{% endif %}">
+        <ol class="agenda_list {% if perms.agenda.can_manage %}sortable{% endif %}">
             {% recursetree items %}
             <li class="draggable">
                 {% include "agenda/item_row.html" %}
diff --git a/openslides/agenda/templates/agenda/view.html b/openslides/agenda/templates/agenda/view.html
index d41c66ce2..93730488b 100644
--- a/openslides/agenda/templates/agenda/view.html
+++ b/openslides/agenda/templates/agenda/view.html
@@ -27,7 +27,7 @@
             <i class="icon icon-facetime-video {% if item.is_active_slide and active_type != 'list_of_speakers' %}icon-white{% endif %}"></i>
         </a>
     {% endif %}
-    {% if perms.agenda.can_manage_agenda %}
+    {% if perms.agenda.can_manage %}
     <div class="btn-group">
         <a data-toggle="dropdown" href="#" class="btn btn-mini dropdown-toggle">
             {% trans 'More actions' %}
@@ -57,7 +57,7 @@
 </p>
 
 <!-- Comment -->
-{% if perms.agenda.can_manage_agenda %}
+{% if perms.agenda.can_manage %}
     {% if item.comment %}
         <h3>{% trans "Comment" %}</h3>
         <p>{{ item.comment|linebreaks }}</p>
@@ -67,7 +67,7 @@
 <!-- List of Speakers -->
 <h3>{% trans "List of speakers" %} {% if item.speaker_list_closed %}<span class="label label-important">{% trans 'closed' %}</span>{% endif %}</h3>
 <p>
-{% if perms.agenda.can_manage_agenda %}
+{% if perms.agenda.can_manage %}
     {% if item.speaker_list_closed %}
         <a href="{% url 'agenda_speaker_reopen' item.pk %}" class="btn btn-mini btn-danger">{% trans 'Open list' %}</a>
     {% else %}
@@ -84,7 +84,7 @@
 {% endif %}
 </p>
 
-{% if perms.agenda.can_manage_agenda %}
+{% if perms.agenda.can_manage %}
     <form id="coming_speakers_changed_form" action="{% url 'agenda_speaker_change_order' item.pk %}" method="post" style="display:none" class="alert alert-warning">{% csrf_token %}
         <button type="button" class="close" data-dismiss="alert">×</button>
         {% trans "Do you want to save the changed order of speakers?" %}<br>
@@ -119,13 +119,13 @@
         {% endif %}
         <li id="speaker_{{ speaker_dict.speaker.pk }}">
             {% if speaker_dict.type == 'coming_speaker' %}
-                <span {% if perms.agenda.can_manage_agenda %}class="ui-icon ui-icon-arrowthick-2-n-s"{% endif %}></span>
+                <span {% if perms.agenda.can_manage %}class="ui-icon ui-icon-arrowthick-2-n-s"{% endif %}></span>
                 {{ speaker_dict.prefix }}.
             {% else %}
                 <small class="grey">[{{ speaker_dict.speaker.begin_time }}{% if speaker_dict.type == 'old_speaker' %} – {{ speaker_dict.speaker.end_time }}{% endif %}]</small>
             {% endif %}
             <a href="{{ speaker_dict.speaker|absolute_url }}">{{ speaker_dict.speaker }}</a>
-            {% if perms.agenda.can_manage_agenda %}
+            {% if perms.agenda.can_manage %}
                 {% if speaker_dict.type == 'actual_speaker' %}
                     <a href="{% url 'agenda_speaker_end_speach' item.pk %}" class="btn btn-mini btn-danger"><i class="icon-bell icon-white"></i> {% trans 'End speach' %}</a>
                 {% elif speaker_dict.type == 'coming_speaker' %}
@@ -151,7 +151,7 @@
         {% endif %}
     </p>
 
-    {% if perms.agenda.can_manage_agenda %}
+    {% if perms.agenda.can_manage %}
         <form action="" method="post">{% csrf_token %}
             {% for field in form %}
                 <label>{{ field.label }}:</label>
diff --git a/openslides/agenda/templates/agenda/widget_item.html b/openslides/agenda/templates/agenda/widget_item.html
index a4494212a..905b8bf2b 100644
--- a/openslides/agenda/templates/agenda/widget_item.html
+++ b/openslides/agenda/templates/agenda/widget_item.html
@@ -27,7 +27,7 @@
            rel="tooltip" data-original-title="{% trans 'Show' %}">
             <i class="icon-facetime-video {% if item.is_active_slide and active_type == 'text' %}icon-white{% endif %}"></i>
         </a>&nbsp;
-        {% if perms.agenda.can_manage_agenda %}
+        {% if perms.agenda.can_manage %}
             <a href="{{ item|absolute_url:'update' }}"
                 rel="tooltip" data-original-title="{% trans 'Edit' %}" class="btn btn-mini right">
                 <i class="icon-pencil"></i>
diff --git a/openslides/agenda/templates/agenda/widget_list_of_speakers.html b/openslides/agenda/templates/agenda/widget_list_of_speakers.html
index e16ab5069..98fdd3844 100644
--- a/openslides/agenda/templates/agenda/widget_list_of_speakers.html
+++ b/openslides/agenda/templates/agenda/widget_list_of_speakers.html
@@ -6,7 +6,7 @@
 {% if perms.agenda.can_be_speaker %}
     <p><a href="{% url 'agenda_add_to_current_list_of_speakers' %}" class="btn"><i class="icon icon-speaker"></i> {% trans 'Put me on the current list of speakers' %}</a></p>
 {% endif %}
-{% if perms.agenda.can_manage_agenda %}
+{% if perms.agenda.can_manage %}
     <p>
         <a href="{% url 'agenda_next_on_current_list_of_speakers' %}" class="btn btn-mini"><i class="icon icon-bell"></i> {% trans 'Next speaker' %}</a>
         <a href="{% url 'agenda_end_speach_on_current_list_of_speakers' %}" class="btn btn-mini"><i class="icon icon-bell"></i> {% trans 'End speach' %}</a>
diff --git a/openslides/agenda/templates/search/agenda-results.html b/openslides/agenda/templates/search/agenda-results.html
index 2807e2445..808e38217 100644
--- a/openslides/agenda/templates/search/agenda-results.html
+++ b/openslides/agenda/templates/search/agenda-results.html
@@ -1,7 +1,7 @@
 {% load i18n %}
 {% load highlight %}
 
-{% if perms.agenda.can_see_agenda and result.object.type == result.object.AGENDA_ITEM %}
+{% if perms.agenda.can_see and result.object.type == result.object.AGENDA_ITEM %}
     <li>
         <a href="{{ result.object.get_absolute_url }}">{{ result.object }}</a><br>
         <span class="app">{% trans "Agenda" %}</a></span><br>
diff --git a/openslides/agenda/views.py b/openslides/agenda/views.py
index 715b808d6..1d0632985 100644
--- a/openslides/agenda/views.py
+++ b/openslides/agenda/views.py
@@ -50,7 +50,7 @@ class Overview(TemplateView):
     """
     Show all agenda items, and update their range via post.
     """
-    required_permission = 'agenda.can_see_agenda'
+    required_permission = 'agenda.can_see'
     template_name = 'agenda/overview.html'
 
     def get_context_data(self, **kwargs):
@@ -120,7 +120,7 @@ class Overview(TemplateView):
         return context
 
     def post(self, request, *args, **kwargs):
-        if not request.user.has_perm('agenda.can_manage_agenda'):
+        if not request.user.has_perm('agenda.can_manage'):
             messages.error(
                 request,
                 _('You are not authorized to manage the agenda.'))
@@ -179,7 +179,7 @@ class AgendaItemView(SingleObjectMixin, FormView):
         if self.get_object().type == Item.ORGANIZATIONAL_ITEM:
             check_permission = request.user.has_perm('agenda.can_see_orga_items')
         else:
-            check_permission = request.user.has_perm('agenda.can_see_agenda')
+            check_permission = request.user.has_perm('agenda.can_see')
         return check_permission
 
     def get_context_data(self, **kwargs):
@@ -209,7 +209,7 @@ class SetClosed(SingleObjectMixin, RedirectView):
     """
     Close or open an item.
     """
-    required_permission = 'agenda.can_manage_agenda'
+    required_permission = 'agenda.can_manage'
     allow_ajax = True
     url_name = 'item_overview'
     model = Item
@@ -237,7 +237,7 @@ class ItemUpdate(UpdateView):
     """
     Update an existing item.
     """
-    required_permission = 'agenda.can_manage_agenda'
+    required_permission = 'agenda.can_manage'
     template_name = 'agenda/edit.html'
     model = Item
     context_object_name = 'item'
@@ -256,7 +256,7 @@ class ItemCreate(CreateView):
     """
     Create a new item.
     """
-    required_permission = 'agenda.can_manage_agenda'
+    required_permission = 'agenda.can_manage'
     template_name = 'agenda/edit.html'
     model = Item
     context_object_name = 'item'
@@ -269,7 +269,7 @@ class ItemDelete(DeleteView):
     """
     Delete an item.
     """
-    required_permission = 'agenda.can_manage_agenda'
+    required_permission = 'agenda.can_manage'
     model = Item
     question_url_name = 'item_overview'
     success_url_name = 'item_overview'
@@ -325,7 +325,7 @@ class CreateRelatedAgendaItemView(SingleObjectMixin, RedirectView):
     This view is only for subclassing in views of related apps. You
     have to define 'model = ....'
     """
-    required_permission = 'agenda.can_manage_agenda'
+    required_permission = 'agenda.can_manage'
     url_name = 'item_overview'
     url_name_args = []
 
@@ -337,7 +337,7 @@ class CreateRelatedAgendaItemView(SingleObjectMixin, RedirectView):
 
 
 class AgendaNumberingView(QuestionView):
-    required_permission = 'agenda.can_manage_agenda'
+    required_permission = 'agenda.can_manage'
     question_url_name = 'item_overview'
     url_name = 'item_overview'
     question_message = ugettext_lazy('Do you really want to generate agenda numbering? Manually added item numbers will be overwritten!')
@@ -356,7 +356,7 @@ class AgendaPDF(PDFView):
     """
     Create a full agenda-PDF.
     """
-    required_permission = 'agenda.can_see_agenda'
+    required_permission = 'agenda.can_see'
     filename = ugettext_lazy('Agenda')
     document_title = ugettext_lazy('Agenda')
 
@@ -404,7 +404,7 @@ class SpeakerDeleteView(DeleteView):
         Check the permission to delete a speaker.
         """
         if 'speaker' in kwargs:
-            return request.user.has_perm('agenda.can_manage_agenda')
+            return request.user.has_perm('agenda.can_manage')
         else:
             # Any user who is on the list of speakers can delete himself from the list.
             return True
@@ -454,7 +454,7 @@ class SpeakerSpeakView(SingleObjectMixin, RedirectView):
     """
     Mark the speaking user.
     """
-    required_permission = 'agenda.can_manage_agenda'
+    required_permission = 'agenda.can_manage'
     url_name = 'item_view'
     model = Item
 
@@ -480,7 +480,7 @@ class SpeakerEndSpeachView(SingleObjectMixin, RedirectView):
     """
     The speach of the actual speaker is finished.
     """
-    required_permission = 'agenda.can_manage_agenda'
+    required_permission = 'agenda.can_manage'
     url_name = 'item_view'
     model = Item
 
@@ -505,7 +505,7 @@ class SpeakerListCloseView(SingleObjectMixin, RedirectView):
     """
     View to close and reopen a list of speakers.
     """
-    required_permission = 'agenda.can_manage_agenda'
+    required_permission = 'agenda.can_manage'
     model = Item
     reopen = False
     url_name = 'item_view'
@@ -524,7 +524,7 @@ class SpeakerChangeOrderView(SingleObjectMixin, RedirectView):
 
     Has to be called as post-request with the new order of the speaker ids.
     """
-    required_permission = 'agenda.can_manage_agenda'
+    required_permission = 'agenda.can_manage'
     model = Item
     url_name = 'item_view'
 
@@ -657,7 +657,7 @@ class CurrentListOfSpeakersView(RedirectView):
             else:
                 return reverse('item_view', args=[item.pk])
         else:
-            if reverse_to_dashboard or not self.request.user.has_perm('agenda.can_see_agenda'):
+            if reverse_to_dashboard or not self.request.user.has_perm('agenda.can_see'):
                 return reverse('core_dashboard')
             else:
                 return reverse('item_view', args=[item.pk])
@@ -770,7 +770,7 @@ class ItemCSVImportView(CSVImportView):
     Imports agenda items from an uploaded csv file.
     """
     import_function = staticmethod(import_agenda_items)
-    required_permission = 'agenda.can_manage_agenda'
+    required_permission = 'agenda.can_manage'
     success_url_name = 'item_overview'
     template_name = 'agenda/item_form_csv_import.html'
 
@@ -789,9 +789,9 @@ class ItemViewSet(ModelViewSet):
         requests the permission to manage the agenda and to see organizational
         items.
         """
-        if (not request.user.has_perm('agenda.can_see_agenda') or
+        if (not request.user.has_perm('agenda.can_see') or
                 (self.action in ('create', 'update', 'destroy') and not
-                 (request.user.has_perm('agenda.can_manage_agenda') and
+                 (request.user.has_perm('agenda.can_manage') and
                   request.user.has_perm('agenda.can_see_orga_items')))):
             self.permission_denied(request)
 
diff --git a/openslides/agenda/widgets.py b/openslides/agenda/widgets.py
index 9493f4aaf..32290a2ca 100644
--- a/openslides/agenda/widgets.py
+++ b/openslides/agenda/widgets.py
@@ -46,5 +46,5 @@ class ListOfSpeakersWidget(Widget):
     icon_css_class = 'icon-bell'
 
     def check_permission(self):
-        return (self.request.user.has_perm('agenda.can_manage_agenda') or
+        return (self.request.user.has_perm('agenda.can_manage') or
                 self.request.user.has_perm('agenda.can_be_speaker'))
diff --git a/openslides/assignment/__init__.py b/openslides/assignment/__init__.py
deleted file mode 100644
index 5eff81229..000000000
--- a/openslides/assignment/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-default_app_config = 'openslides.assignment.apps.AssignmentAppConfig'
diff --git a/openslides/assignments/__init__.py b/openslides/assignments/__init__.py
new file mode 100644
index 000000000..3d09acb77
--- /dev/null
+++ b/openslides/assignments/__init__.py
@@ -0,0 +1 @@
+default_app_config = 'openslides.assignments.apps.AssignmentAppConfig'
diff --git a/openslides/assignment/apps.py b/openslides/assignments/apps.py
similarity index 79%
rename from openslides/assignment/apps.py
rename to openslides/assignments/apps.py
index c623017ed..fb0d11ea3 100644
--- a/openslides/assignment/apps.py
+++ b/openslides/assignments/apps.py
@@ -2,8 +2,8 @@ from django.apps import AppConfig
 
 
 class AssignmentAppConfig(AppConfig):
-    name = 'openslides.assignment'
-    verbose_name = 'OpenSlides Assignment'
+    name = 'openslides.assignments'
+    verbose_name = 'OpenSlides Assignments'
 
     def ready(self):
         # Load main menu entry, personal info and widgets.
@@ -28,8 +28,8 @@ class AssignmentAppConfig(AppConfig):
         # Register slides.
         Assignment = self.get_model('Assignment')
         AssignmentPoll = self.get_model('AssignmentPoll')
-        register_slide_model(Assignment, 'assignment/slide.html')
-        register_slide_model(AssignmentPoll, 'assignment/assignmentpoll_slide.html')
+        register_slide_model(Assignment, 'assignments/slide.html')
+        register_slide_model(AssignmentPoll, 'assignments/assignmentpoll_slide.html')
 
         # Register viewsets.
-        router.register('assignment/assignment', AssignmentViewSet)
+        router.register('assignments/assignment', AssignmentViewSet)
diff --git a/openslides/assignment/forms.py b/openslides/assignments/forms.py
similarity index 100%
rename from openslides/assignment/forms.py
rename to openslides/assignments/forms.py
diff --git a/openslides/assignment/main_menu.py b/openslides/assignments/main_menu.py
similarity index 85%
rename from openslides/assignment/main_menu.py
rename to openslides/assignments/main_menu.py
index 8e18dc0ef..16a53f285 100644
--- a/openslides/assignment/main_menu.py
+++ b/openslides/assignments/main_menu.py
@@ -8,7 +8,7 @@ class AssignmentMainMenuEntry(MainMenuEntry):
     Main menu entry for the assignment app.
     """
     verbose_name = ugettext_lazy('Elections')
-    required_permission = 'assignment.can_see_assignments'
+    required_permission = 'assignments.can_see'
     default_weight = 40
     pattern_name = 'assignment_list'
     icon_css_class = 'icon-assignment'
diff --git a/openslides/assignment/models.py b/openslides/assignments/models.py
similarity index 98%
rename from openslides/assignment/models.py
rename to openslides/assignments/models.py
index 87465f2fa..a3638bcee 100644
--- a/openslides/assignment/models.py
+++ b/openslides/assignments/models.py
@@ -122,10 +122,10 @@ class Assignment(RESTModelMixin, SlideMixin, AbsoluteUrlMixin, models.Model):
 
     class Meta:
         permissions = (
-            ('can_see_assignments', ugettext_noop('Can see elections')),
+            ('can_see', ugettext_noop('Can see elections')),
             ('can_nominate_other', ugettext_noop('Can nominate another participant')),
             ('can_nominate_self', ugettext_noop('Can nominate oneself')),
-            ('can_manage_assignments', ugettext_noop('Can manage elections')),
+            ('can_manage', ugettext_noop('Can manage elections')),
         )
         ordering = ('title', )
         verbose_name = ugettext_noop('Election')
diff --git a/openslides/assignment/personal_info.py b/openslides/assignments/personal_info.py
similarity index 100%
rename from openslides/assignment/personal_info.py
rename to openslides/assignments/personal_info.py
diff --git a/openslides/assignment/search_indexes.py b/openslides/assignments/search_indexes.py
similarity index 79%
rename from openslides/assignment/search_indexes.py
rename to openslides/assignments/search_indexes.py
index f9d434645..8a9dd4bc8 100644
--- a/openslides/assignment/search_indexes.py
+++ b/openslides/assignments/search_indexes.py
@@ -5,7 +5,7 @@ from .models import Assignment
 class Index(indexes.SearchIndex, indexes.Indexable):
     text = indexes.EdgeNgramField(document=True, use_template=True)
     modelfilter_name = "Elections"  # verbose_name of model
-    modelfilter_value = "assignment.assignment"  # 'app_name.model_name'
+    modelfilter_value = "assignments.assignment"  # 'app_name.model_name'
 
     def get_model(self):
         return Assignment
diff --git a/openslides/assignment/serializers.py b/openslides/assignments/serializers.py
similarity index 100%
rename from openslides/assignment/serializers.py
rename to openslides/assignments/serializers.py
diff --git a/openslides/assignment/signals.py b/openslides/assignments/signals.py
similarity index 100%
rename from openslides/assignment/signals.py
rename to openslides/assignments/signals.py
diff --git a/openslides/assignment/static/css/assignment.css b/openslides/assignments/static/css/assignments.css
similarity index 100%
rename from openslides/assignment/static/css/assignment.css
rename to openslides/assignments/static/css/assignments.css
diff --git a/openslides/assignment/static/img/glyphicons_041_charts.png b/openslides/assignments/static/img/glyphicons_041_charts.png
similarity index 100%
rename from openslides/assignment/static/img/glyphicons_041_charts.png
rename to openslides/assignments/static/img/glyphicons_041_charts.png
diff --git a/openslides/assignment/static/img/glyphicons_041_charts_white.png b/openslides/assignments/static/img/glyphicons_041_charts_white.png
similarity index 100%
rename from openslides/assignment/static/img/glyphicons_041_charts_white.png
rename to openslides/assignments/static/img/glyphicons_041_charts_white.png
diff --git a/openslides/assignment/static/js/assignment.js b/openslides/assignments/static/js/assignment.js
similarity index 100%
rename from openslides/assignment/static/js/assignment.js
rename to openslides/assignments/static/js/assignment.js
diff --git a/openslides/assignment/static/js/assignments/assignments.js b/openslides/assignments/static/js/assignments/assignments.js
similarity index 95%
rename from openslides/assignment/static/js/assignments/assignments.js
rename to openslides/assignments/static/js/assignments/assignments.js
index 8cfcc3e45..e3cc60972 100644
--- a/openslides/assignment/static/js/assignments/assignments.js
+++ b/openslides/assignments/static/js/assignments/assignments.js
@@ -36,8 +36,8 @@ angular.module('OpenSlidesApp.assignments', [])
 
 .factory('Assignment', function(DS) {
     return DS.defineResource({
-        name: 'assignment/assignment',
-        endpoint: '/rest/assignment/assignment/'
+        name: 'assignments/assignment',
+        endpoint: '/rest/assignments/assignment/'
     });
 })
 
diff --git a/openslides/assignment/static/templates/assignments/assignment-detail.html b/openslides/assignments/static/templates/assignments/assignment-detail.html
similarity index 100%
rename from openslides/assignment/static/templates/assignments/assignment-detail.html
rename to openslides/assignments/static/templates/assignments/assignment-detail.html
diff --git a/openslides/assignment/static/templates/assignments/assignment-form.html b/openslides/assignments/static/templates/assignments/assignment-form.html
similarity index 100%
rename from openslides/assignment/static/templates/assignments/assignment-form.html
rename to openslides/assignments/static/templates/assignments/assignment-form.html
diff --git a/openslides/assignment/static/templates/assignments/assignment-list.html b/openslides/assignments/static/templates/assignments/assignment-list.html
similarity index 100%
rename from openslides/assignment/static/templates/assignments/assignment-list.html
rename to openslides/assignments/static/templates/assignments/assignment-list.html
diff --git a/openslides/assignment/template.py b/openslides/assignments/template.py
similarity index 100%
rename from openslides/assignment/template.py
rename to openslides/assignments/template.py
diff --git a/openslides/assignment/templates/assignment/assignment_detail.html b/openslides/assignments/templates/assignments/assignment_detail.html
similarity index 87%
rename from openslides/assignment/templates/assignment/assignment_detail.html
rename to openslides/assignments/templates/assignments/assignment_detail.html
index 7699caab6..947f1a1dc 100644
--- a/openslides/assignment/templates/assignment/assignment_detail.html
+++ b/openslides/assignments/templates/assignments/assignment_detail.html
@@ -35,13 +35,13 @@
             <span class="glyphicon glyphicon-facetime-video" aria-hidden="true"></span>
         </a>
     {% endif %}
-    {% if perms.assignment.can_manage_assignments or perms.agenda.can_manage_agenda %}
+    {% if perms.assignments.can_manage or perms.agenda.can_manage %}
     <div class="btn-group">
         <a data-toggle="dropdown" class="btn btn-default btn-sm dropdown-toggle">
             <span class="optional-small">{% trans 'More actions' %}</span> <span class="caret"></span>
         </a>
         <ul class="dropdown-menu pull-right">
-            {% if perms.assignment.can_manage_assignments %}
+            {% if perms.assignments.can_manage %}
                 <!-- edit -->
                 <li>
                     <a href="{{ assignment|absolute_url:'update' }}">
@@ -58,7 +58,7 @@
                 </li>
             {% endif %}
             <!-- create agenda item -->
-            {% if perms.agenda.can_manage_agenda %}
+            {% if perms.agenda.can_manage %}
                 <li>
                     <a href="{% url 'assignment_create_agenda' assignment.id  %}">
                         <span class="glyphicon glyphicon-plus" aria-hidden="true"></span>
@@ -94,7 +94,7 @@
     {% for person in assignment.candidates %}
         <li>
             <a href="{{ person|absolute_url }}">{{ person }}</a>
-            {% if perms.assignment.can_manage_assignments %}
+            {% if perms.assignments.can_manage %}
                 <a href="{% url 'assignment_del_candidate_other' assignment.id person.pk %}"
                         class="btn btn-default btn-xs"
                         rel="tooltip" data-original-title="{% trans 'Remove candidate' %}">
@@ -103,7 +103,7 @@
             {% endif %}
             {% if person in assignment.elected %}
                 | <b>{% trans "elected" %}</b>
-                {% if perms.assignment.can_manage_assignments %}
+                {% if perms.assignments.can_manage %}
                     <a href="{% url 'assignment_user_not_elected' assignment.id person.pk %}"
                             class="btn btn-default btn-xs"
                             rel="tooltip" data-original-title="{% trans 'Mark candidate as not elected' %}">
@@ -118,10 +118,10 @@
         </li>
     {% endfor %}
     </ol>
-    {% if assignment.phase == assignment.PHASE_SEARCH or perms.assignment.can_manage_assignments and assignment.phase == assignment.PHASE_VOTING %}
-    {% if  perms.assignment.can_nominate_self or perms.assignment.can_nominate_other %}
+    {% if assignment.phase == assignment.PHASE_SEARCH or perms.assignments.can_manage and assignment.phase == assignment.PHASE_VOTING %}
+    {% if  perms.assignments.can_nominate_self or perms.assignments.can_nominate_other %}
     <form action="" method="post">{% csrf_token %}
-        {% if perms.assignment.can_nominate_self %}
+        {% if perms.assignments.can_nominate_self %}
             <p>
             {% if user_is_candidate %}
                 <a href='{% url 'assignment_del_candidate' assignment.id %}' class="btn btn-default btn-sm">
@@ -136,7 +136,7 @@
             {% endif %}
             </p>
         {% endif %}
-        {% if perms.assignment.can_nominate_other %}
+        {% if perms.assignments.can_nominate_other %}
             {% for field in form %}
                 <label>{{ field.label }}:</label>
                 {{ field }}
@@ -157,7 +157,7 @@
     {% endif %}
 {% endif %}
 
-{% if perms.assignment.can_manage_assignments and blocked_candidates and assignment.phase != assignment.PHASE_FINISHED %}
+{% if perms.assignments.can_manage and blocked_candidates and assignment.phase != assignment.PHASE_FINISHED %}
     <h4>{% trans "Blocked Candidates" %}</h4>
     <ul>
     {% for person in blocked_candidates %}
@@ -184,9 +184,9 @@
             <th>{% trans "Candidates" %}</th>
             {% for poll in polls %}
                 <th style="white-space: nowrap;" class="col-sm-1">
-                    {% if perms.assignment.can_manage_assignments %}<p class="text-center">{% endif %}
+                    {% if perms.assignments.can_manage %}<p class="text-center">{% endif %}
                     {{ poll.get_ballot|ordinal|safe }} {% trans 'ballot' %}
-                    {% if perms.assignment.can_manage_assignments %}
+                    {% if perms.assignments.can_manage %}
                         <a class="publish_link btn btn-sm btn-danger {% if poll.published %}btn-primary{% endif %}"
                                 href="{% url 'assignmentpoll_publish_poll' poll.id %}"
                                 rel="tooltip" data-original-title="{% trans 'Publish result' %}">
@@ -213,7 +213,7 @@
                     {% endif %}
                 </th>
             {% endfor %}
-            {% if assignment.candidates and perms.assignment.can_manage_assignments and assignment.phase == assignment.PHASE_VOTING %}
+            {% if assignment.candidates and perms.assignments.can_manage and assignment.phase == assignment.PHASE_VOTING %}
                 <th class="col-sm-1 nobr">
                     <a href="{% url 'assignmentpoll_create' assignment.pk %}" class="btn btn-default btn-sm">
                         <span class="glyphicon glyphicon-plus" aria-hidden="true"></span>
@@ -226,7 +226,7 @@
         <tr>
             <td>
                 {% if candidate in assignment.elected %}
-                    {% if perms.assignment.can_manage_assignments %}
+                    {% if perms.assignments.can_manage %}
                         <a class="election_link elected tooltip-bottom" href="{% url 'assignment_user_not_elected' assignment.id candidate.pk %}"
                             data-original-title="{% trans 'Mark candidate as elected' %}"></a>
                     {% else %}
@@ -235,7 +235,7 @@
                         </a>
                     {% endif %}
                 {% else %}
-                    {% if perms.assignment.can_manage_assignments %}
+                    {% if perms.assignments.can_manage %}
                         <a class="election_link tooltip-bottom" href="{% url 'assignment_user_elected' assignment.id candidate.pk %}"
                            data-original-title="{% trans 'Mark candidate as elected' %}"></a>
                     {% endif %}
@@ -257,7 +257,7 @@
                     {% endif %}
                 </td>
             {% endfor %}
-            {% if assignment.candidates and perms.assignment.can_manage_assignments and assignment.phase == assignment.PHASE_VOTING %}
+            {% if assignment.candidates and perms.assignments.can_manage and assignment.phase == assignment.PHASE_VOTING %}
                 <td></td>
             {% endif %}
         </tr>
@@ -265,7 +265,7 @@
         <tr>
             <td>{% trans 'Valid votes' %}</td>
             {% for poll in polls %}
-                {% if poll.published or perms.assignment.can_manage_assignments %}
+                {% if poll.published or perms.assignments.can_manage %}
                     <td style="white-space:nowrap;">
                         {% if poll.has_votes %}
                             <img src="{% static 'img/voting-yes-grey.png' %}" class="tooltip-left" data-original-title="{% trans 'Valid votes' %}">
@@ -274,14 +274,14 @@
                     </td>
                 {% endif %}
             {% endfor %}
-            {% if assignment.candidates and perms.assignment.can_manage_assignments and assignment.phase == assignment.PHASE_VOTING %}
+            {% if assignment.candidates and perms.assignments.can_manage and assignment.phase == assignment.PHASE_VOTING %}
                 <td></td>
             {% endif %}
         </tr>
         <tr>
             <td>{% trans 'Invalid votes' %}</td>
             {% for poll in polls %}
-                {% if poll.published or perms.assignment.can_manage_assignments %}
+                {% if poll.published or perms.assignments.can_manage %}
                     <td style="white-space:nowrap;">
                         {% if poll.has_votes %}
                             <img src="{% static 'img/voting-invalid.png' %}" class="tooltip-left" data-original-title="{% trans 'Invalid votes' %}">
@@ -290,14 +290,14 @@
                     </td>
                 {% endif %}
             {% endfor %}
-            {% if assignment.candidates and perms.assignment.can_manage_assignments and assignment.phase == assignment.PHASE_VOTING %}
+            {% if assignment.candidates and perms.assignments.can_manage and assignment.phase == assignment.PHASE_VOTING %}
                 <td></td>
             {% endif %}
         </tr>
         <tr class="info total">
             <td>{% trans 'Votes cast' %}</td>
             {% for poll in polls %}
-                {% if poll.published or perms.assignment.can_manage_assignments %}
+                {% if poll.published or perms.assignments.can_manage %}
                     <td style="white-space:nowrap;">
                         {% if poll.has_votes %}
                             <img src="{% static 'img/voting-total.png' %}" class="tooltip-left" data-original-title="{% trans 'Votes cast' %}">
@@ -306,14 +306,14 @@
                     </td>
                 {% endif %}
             {% endfor %}
-            {% if assignment.candidates and perms.assignment.can_manage_assignments and assignment.phase == assignment.PHASE_VOTING %}
+            {% if assignment.candidates and perms.assignments.can_manage and assignment.phase == assignment.PHASE_VOTING %}
                 <td></td>
             {% endif %}
         </tr>
         </table>
     {% else %}
         <i>{% trans "No ballots available." %}</i>
-        {% if assignment.candidates and perms.assignment.can_manage_assignments and assignment.phase == assignment.PHASE_VOTING %}
+        {% if assignment.candidates and perms.assignments.can_manage and assignment.phase == assignment.PHASE_VOTING %}
             <p>
                 <a href='{% url 'assignmentpoll_create' assignment.id %}' class="btn btn-default">
                     <span class="glyphicon glyphicon-plus" aria-hidden="true"></span>
@@ -335,7 +335,7 @@
         {{ assignment.posts }}
     </div> <!--/well-->
 
-    {% if perms.assignment.can_manage_assignments %}
+    {% if perms.assignments.can_manage %}
     <div class="well">
         <h4>{% trans "Change phase" %}:</h4>
         <div class="btn-group btn-group-vertical" data-toggle="buttons-radio">
diff --git a/openslides/assignment/templates/assignment/assignment_form.html b/openslides/assignments/templates/assignments/assignment_form.html
similarity index 100%
rename from openslides/assignment/templates/assignment/assignment_form.html
rename to openslides/assignments/templates/assignments/assignment_form.html
diff --git a/openslides/assignment/templates/assignment/assignment_list.html b/openslides/assignments/templates/assignments/assignment_list.html
similarity index 91%
rename from openslides/assignment/templates/assignment/assignment_list.html
rename to openslides/assignments/templates/assignments/assignment_list.html
index 2a96e1ee4..5653f6964 100644
--- a/openslides/assignment/templates/assignment/assignment_list.html
+++ b/openslides/assignments/templates/assignments/assignment_list.html
@@ -9,7 +9,7 @@
 {% block content %}
     <h1>{% trans "Elections" %}
         <small class="pull-right">
-        {% if perms.assignment.can_manage_assignments %}
+        {% if perms.assignments.can_manage %}
             <a href="{% url 'assignment_create' %}" class="btn btn-primary btn-sm"
                     rel="tooltip" data-original-title="{% trans 'New election' %}">
                 <span class="glyphicon glyphicon-plus" aria-hidden="true"></span>
@@ -23,7 +23,7 @@
                 <span class="optional-small"> {% trans 'Tags' %}</span>
             </a>
         {% endif %}
-        {% if perms.assignment.can_see_assignments %}
+        {% if perms.assignments.can_see %}
             <a href="{% url 'assignment_list_pdf' %}" class="btn btn-default btn-sm"
                     rel="tooltip" data-original-title="{% trans 'Print all elections as PDF' %}" target="_blank">
                 <span class="glyphicon glyphicon-print" aria-hidden="true"></span>
@@ -39,7 +39,7 @@
             <th>{% trans "Election" %}</th>
             <th class="optional">{% trans "Candidates" %}</th>
             <th>{% trans "Phase" %}</th>
-            {% if perms.assignment.can_manage_assignments or perms.core.can_manage_projector %}
+            {% if perms.assignments.can_manage or perms.core.can_manage_projector %}
                 <th class="mini_width">{% trans "Actions" %}</th>
             {% endif %}
         </tr>
@@ -63,7 +63,7 @@
                 | {% trans "Elected" %}: <span class="badge badge-success">{{ object.elected.count }}</span>
             </td>
             <td><span class="label label-info">{{ object.get_phase_display }}</span></td>
-            {% if perms.assignment.can_manage_assignments or perms.core.can_manage_projector %}
+            {% if perms.assignments.can_manage or perms.core.can_manage_projector %}
             <td>
                 <span style="width: 1px; white-space: nowrap;">
                 {% if perms.core.can_manage_projector %}
@@ -73,7 +73,7 @@
                         <span class="glyphicon glyphicon-facetime-video" aria-hidden="true"></span>
                     </a>
                 {% endif %}
-                {% if perms.assignment.can_manage_assignments %}
+                {% if perms.assignments.can_manage %}
                     <a href="{{ object|absolute_url:'update' }}"
                             rel="tooltip" data-original-title="{% trans 'Edit' %}"
                             class="btn btn-default btn-sm">
diff --git a/openslides/assignment/templates/assignment/assignmentpoll_form.html b/openslides/assignments/templates/assignments/assignmentpoll_form.html
similarity index 98%
rename from openslides/assignment/templates/assignment/assignmentpoll_form.html
rename to openslides/assignments/templates/assignments/assignmentpoll_form.html
index ef2c2390c..45f5fcb3c 100644
--- a/openslides/assignment/templates/assignment/assignmentpoll_form.html
+++ b/openslides/assignments/templates/assignments/assignmentpoll_form.html
@@ -25,7 +25,7 @@
                 rel="tooltip" data-original-title="{% trans 'Show election result' %}">
                 <i class="icon-facetime-video {% if poll.is_active_slide %}icon-white{% endif %}"></i> {% trans "Election result" %}</a>
         {% endif %}
-        {% if perms.motion.can_manage_motion %}
+        {% if perms.motions.can_manage %}
             <a class="btn btn-mini" href="{{ poll|absolute_url:'delete' }}"
                 rel="tooltip" data-original-title="{% trans 'Delete ballot' %}"><i class="icon-remove"></i></a>
         {% endif %}
diff --git a/openslides/assignment/templates/assignment/assignmentpoll_slide.html b/openslides/assignments/templates/assignments/assignmentpoll_slide.html
similarity index 100%
rename from openslides/assignment/templates/assignment/assignmentpoll_slide.html
rename to openslides/assignments/templates/assignments/assignmentpoll_slide.html
diff --git a/openslides/assignment/templates/assignment/slide.html b/openslides/assignments/templates/assignments/slide.html
similarity index 100%
rename from openslides/assignment/templates/assignment/slide.html
rename to openslides/assignments/templates/assignments/slide.html
diff --git a/openslides/assignment/templates/assignment/widget_assignment.html b/openslides/assignments/templates/assignments/widget_assignment.html
similarity index 95%
rename from openslides/assignment/templates/assignment/widget_assignment.html
rename to openslides/assignments/templates/assignments/widget_assignment.html
index 0c3162c30..7c28f131a 100644
--- a/openslides/assignment/templates/assignment/widget_assignment.html
+++ b/openslides/assignments/templates/assignments/widget_assignment.html
@@ -11,7 +11,7 @@
                 rel="tooltip" data-original-title="{% trans 'Show' %}">
                 <i class="icon-facetime-video {% if assignment.is_active_slide %}icon-white{% endif %}"></i>
             </a>&nbsp;
-            {% if perms.assignment.can_manage_assignments %}
+            {% if perms.assignments.can_manage %}
                 <a href="{{ assignment|absolute_url:'update' }}"
                     rel="tooltip" data-original-title="{% trans 'Edit' %}" class="btn btn-mini right">
                     <i class="icon-pencil"></i>
diff --git a/openslides/assignment/templates/search/assignment-results.html b/openslides/assignments/templates/search/assignment-results.html
similarity index 85%
rename from openslides/assignment/templates/search/assignment-results.html
rename to openslides/assignments/templates/search/assignment-results.html
index 381bac760..d118d1817 100644
--- a/openslides/assignment/templates/search/assignment-results.html
+++ b/openslides/assignments/templates/search/assignment-results.html
@@ -1,7 +1,7 @@
 {% load i18n %}
 {% load highlight %}
 
-{% if perms.assignment.can_see_assignments %}
+{% if perms.assignments.can_see %}
     <li>
         <a href="{{ result.object.get_absolute_url }}">{{ result.object }}</a><br>
         <span class="app">{% trans "Election" %}</a></span><br>
diff --git a/openslides/assignment/templates/search/indexes/assignment/assignment_text.txt b/openslides/assignments/templates/search/indexes/assignments/assignment_text.txt
similarity index 100%
rename from openslides/assignment/templates/search/indexes/assignment/assignment_text.txt
rename to openslides/assignments/templates/search/indexes/assignments/assignment_text.txt
diff --git a/openslides/assignment/urls.py b/openslides/assignments/urls.py
similarity index 100%
rename from openslides/assignment/urls.py
rename to openslides/assignments/urls.py
diff --git a/openslides/assignment/views.py b/openslides/assignments/views.py
similarity index 94%
rename from openslides/assignment/views.py
rename to openslides/assignments/views.py
index 3c4e9aae8..915f6d96c 100644
--- a/openslides/assignment/views.py
+++ b/openslides/assignments/views.py
@@ -30,7 +30,7 @@ class AssignmentListView(ListView):
     """
     Lists all assignments.
     """
-    required_permission = 'assignment.can_see_assignments'
+    required_permission = 'assignments.can_see'
     model = Assignment
 
 
@@ -39,7 +39,7 @@ class AssignmentDetail(DetailView):
     Shows one assignment.
     """
     # TODO: use another view as 'run form' when updating this to angular
-    required_permission = 'assignment.can_see_assignments'
+    required_permission = 'assignments.can_see'
     model = Assignment
     form_class = AssignmentRunForm
 
@@ -52,7 +52,7 @@ class AssignmentDetail(DetailView):
             context['form'] = self.form_class()
 
         polls = assignment.polls.all()
-        if not self.request.user.has_perm('assignment.can_manage_assignments'):
+        if not self.request.user.has_perm('assignments.can_manage'):
             polls = polls.filter(published=True)
             vote_results = assignment.vote_results(only_published=True)
         else:
@@ -66,15 +66,15 @@ class AssignmentDetail(DetailView):
         return context
 
     def post(self, *args, **kwargs):
-        if self.request.user.has_perm('assignment.can_nominate_other'):
+        if self.request.user.has_perm('assignments.can_nominate_other'):
             assignment = self.get_object()
             form = self.form_class(self.request.POST)
             if form.is_valid():
                 user = form.cleaned_data['candidate']
                 if (assignment.phase == assignment.PHASE_SEARCH or
-                        self.request.user.has_perm('assignment.can_manage_assignments')):
+                        self.request.user.has_perm('assignments.can_manage')):
                     if (assignment.is_blocked(user) and
-                            not self.request.user.has_perm('assignment.can_manage_assignments')):
+                            not self.request.user.has_perm('assignments.can_manage')):
                         messages.error(
                             self.request,
                             _("User %s does not want to be an candidate") % user)
@@ -99,25 +99,25 @@ class AssignmentDetail(DetailView):
 
 
 class AssignmentCreateView(CreateView):
-    required_permission = 'assignment.can_manage_assignments'
+    required_permission = 'assignments.can_manage'
     model = Assignment
     form_class = AssignmentForm
 
 
 class AssignmentUpdateView(UpdateView):
-    required_permission = 'assignment.can_manage_assignments'
+    required_permission = 'assignments.can_manage'
     model = Assignment
     form_class = AssignmentForm
 
 
 class AssignmentDeleteView(DeleteView):
-    required_permission = 'assignment.can_manage_assignments'
+    required_permission = 'assignments.can_manage'
     model = Assignment
     success_url_name = 'assignment_list'
 
 
 class AssignmentSetPhaseView(SingleObjectMixin, RedirectView):
-    required_permission = 'assignment.can_manage_assignments'
+    required_permission = 'assignments.can_manage'
     model = Assignment
     url_name = 'assignment_detail'
 
@@ -137,14 +137,14 @@ class AssignmentSetPhaseView(SingleObjectMixin, RedirectView):
 
 
 class AssignmentCandidateView(SingleObjectMixin, RedirectView):
-    required_permission = 'assignment.can_nominate_self'
+    required_permission = 'assignments.can_nominate_self'
     model = Assignment
     url_name = 'assignment_detail'
 
     def pre_redirect(self, *args, **kwargs):
         assignment = self.get_object()
         if (assignment.phase == assignment.PHASE_SEARCH or
-                self.request.user.has_perm('assignment.can_manage_assignments')):
+                self.request.user.has_perm('assignments.can_manage')):
             user = self.request.user
             if assignment.is_elected(user):
                 messages.error(
@@ -173,7 +173,7 @@ class AssignmentDeleteCandidateshipView(SingleObjectMixin, RedirectView):
     def pre_redirect(self, *args, **kwargs):
         assignment = self.get_object()
         if (assignment.phase == assignment.PHASE_SEARCH or
-                self.request.user.has_perm('assignment.can_manage_assignments')):
+                self.request.user.has_perm('assignments.can_manage')):
             user = self.request.user
             assignment.set_blocked(user)
             messages.success(self.request, _(
@@ -184,7 +184,7 @@ class AssignmentDeleteCandidateshipView(SingleObjectMixin, RedirectView):
 
 
 class AssignmentDeleteCandidateshipOtherView(SingleObjectMixin, QuestionView):
-    required_permission = 'assignment.can_manage_assignments'
+    required_permission = 'assignments.can_manage'
     model = Assignment
 
     def get_question_message(self):
@@ -227,16 +227,16 @@ class AssignmentViewSet(ModelViewSet):
         permission to see assignments and in case of create, update or destroy
         requests the permission to manage assignments.
         """
-        if (not request.user.has_perm('assignment.can_see_assignments') or
+        if (not request.user.has_perm('assignments.can_see') or
                 (self.action in ('create', 'update', 'destroy') and not
-                 request.user.has_perm('assignment.can_manage_assignments'))):
+                 request.user.has_perm('assignments.can_manage'))):
             self.permission_denied(request)
 
     def get_serializer_class(self):
         """
         Returns different serializer classes with respect to users permissions.
         """
-        if self.request.user.has_perm('assignment.can_manage_assignments'):
+        if self.request.user.has_perm('assignments.can_manage'):
             serializer_class = AssignmentFullSerializer
         else:
             serializer_class = AssignmentShortSerializer
@@ -244,7 +244,7 @@ class AssignmentViewSet(ModelViewSet):
 
 
 class PollCreateView(SingleObjectMixin, RedirectView):
-    required_permission = 'assignment.can_manage_assignments'
+    required_permission = 'assignments.can_manage'
     model = Assignment
     url_name = 'assignment_detail'
 
@@ -254,9 +254,9 @@ class PollCreateView(SingleObjectMixin, RedirectView):
 
 
 class PollUpdateView(PollFormView):
-    required_permission = 'assignment.can_manage_assignments'
+    required_permission = 'assignments.can_manage'
     poll_class = AssignmentPoll
-    template_name = 'assignment/assignmentpoll_form.html'
+    template_name = 'assignments/assignmentpoll_form.html'
 
     def get_context_data(self, **kwargs):
         context = super(PollUpdateView, self).get_context_data(**kwargs)
@@ -276,7 +276,7 @@ class PollUpdateView(PollFormView):
 
 
 class SetPublishPollView(SingleObjectMixin, RedirectView):
-    required_permission = 'assignment.can_manage_assignments'
+    required_permission = 'assignments.can_manage'
     model = AssignmentPoll
     url_name = 'assignment_detail'
     allow_ajax = True
@@ -293,7 +293,7 @@ class SetPublishPollView(SingleObjectMixin, RedirectView):
 
 
 class SetElectedView(SingleObjectMixin, RedirectView):
-    required_permission = 'assignment.can_manage_assignments'
+    required_permission = 'assignments.can_manage'
     model = Assignment
     url_name = 'assignment_detail'
     allow_ajax = True
@@ -320,7 +320,7 @@ class AssignmentPollDeleteView(DeleteView):
     """
     Delete an assignment poll object.
     """
-    required_permission = 'assignment.can_manage_assignments'
+    required_permission = 'assignments.can_manage'
     model = AssignmentPoll
 
     def pre_redirect(self, request, *args, **kwargs):
@@ -342,7 +342,7 @@ class AssignmentPollDeleteView(DeleteView):
 
 
 class AssignmentPDF(PDFView):
-    required_permission = 'assignment.can_see_assignments'
+    required_permission = 'assignments.can_see'
     top_space = 0
 
     def get_filename(self):
@@ -539,7 +539,7 @@ class CreateRelatedAgendaItemView(_CreateRelatedAgendaItemView):
 
 
 class AssignmentPollPDF(PDFView):
-    required_permission = 'assignment.can_manage_assignments'
+    required_permission = 'assignments.can_manage'
     top_space = 0
 
     def get(self, request, *args, **kwargs):
diff --git a/openslides/assignment/widgets.py b/openslides/assignments/widgets.py
similarity index 91%
rename from openslides/assignment/widgets.py
rename to openslides/assignments/widgets.py
index 678a20605..f227353b8 100644
--- a/openslides/assignment/widgets.py
+++ b/openslides/assignments/widgets.py
@@ -14,7 +14,7 @@ class AssignmentWidget(Widget):
     required_permission = 'core.can_manage_projector'
     default_column = 1
     default_weight = 50
-    template_name = 'assignment/widget_assignment.html'
+    template_name = 'assignments/widget_assignment.html'
     more_link_pattern_name = 'assignment_list'
 
     def get_context_data(self, **context):
diff --git a/openslides/global_settings.py b/openslides/global_settings.py
index beab81772..446f9de6a 100644
--- a/openslides/global_settings.py
+++ b/openslides/global_settings.py
@@ -93,9 +93,9 @@ INSTALLED_APPS = (
     'openslides.account',
     'openslides.projector',
     'openslides.agenda',
-    'openslides.motion',
-    'openslides.assignment',
-    'openslides.mediafile',
+    'openslides.motions',
+    'openslides.assignments',
+    'openslides.mediafiles',
     'openslides.config',
 )
 
diff --git a/openslides/mediafile/__init__.py b/openslides/mediafile/__init__.py
deleted file mode 100644
index 352bdc7eb..000000000
--- a/openslides/mediafile/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-default_app_config = 'openslides.mediafile.apps.MediafileAppConfig'
diff --git a/openslides/mediafiles/__init__.py b/openslides/mediafiles/__init__.py
new file mode 100644
index 000000000..6e3261912
--- /dev/null
+++ b/openslides/mediafiles/__init__.py
@@ -0,0 +1 @@
+default_app_config = 'openslides.mediafiles.apps.MediafileAppConfig'
diff --git a/openslides/mediafile/apps.py b/openslides/mediafiles/apps.py
similarity index 86%
rename from openslides/mediafile/apps.py
rename to openslides/mediafiles/apps.py
index 14b55a610..52fdaee00 100644
--- a/openslides/mediafile/apps.py
+++ b/openslides/mediafiles/apps.py
@@ -2,8 +2,8 @@ from django.apps import AppConfig
 
 
 class MediafileAppConfig(AppConfig):
-    name = 'openslides.mediafile'
-    verbose_name = 'OpenSlides Mediafile'
+    name = 'openslides.mediafiles'
+    verbose_name = 'OpenSlides Mediafiles'
 
     def ready(self):
         # Load main menu entry and widgets.
@@ -26,4 +26,4 @@ class MediafileAppConfig(AppConfig):
         register_slide('mediafile', mediafile_presentation_as_slide, Mediafile)
 
         # Register viewsets.
-        router.register('mediafile/mediafile', MediafileViewSet)
+        router.register('mediafiles/mediafile', MediafileViewSet)
diff --git a/openslides/mediafile/forms.py b/openslides/mediafiles/forms.py
similarity index 100%
rename from openslides/mediafile/forms.py
rename to openslides/mediafiles/forms.py
diff --git a/openslides/mediafile/main_menu.py b/openslides/mediafiles/main_menu.py
similarity index 67%
rename from openslides/mediafile/main_menu.py
rename to openslides/mediafiles/main_menu.py
index ffa87b61e..518d86c43 100644
--- a/openslides/mediafile/main_menu.py
+++ b/openslides/mediafiles/main_menu.py
@@ -14,6 +14,6 @@ class MediafileMainMenuEntry(MainMenuEntry):
 
     def check_permission(self):
         return (
-            self.request.user.has_perm('mediafile.can_see') or
-            self.request.user.has_perm('mediafile.can_upload') or
-            self.request.user.has_perm('mediafile.can_manage'))
+            self.request.user.has_perm('mediafiles.can_see') or
+            self.request.user.has_perm('mediafiles.can_upload') or
+            self.request.user.has_perm('mediafiles.can_manage'))
diff --git a/openslides/mediafile/models.py b/openslides/mediafiles/models.py
similarity index 100%
rename from openslides/mediafile/models.py
rename to openslides/mediafiles/models.py
diff --git a/openslides/mediafile/search_indexes.py b/openslides/mediafiles/search_indexes.py
similarity index 80%
rename from openslides/mediafile/search_indexes.py
rename to openslides/mediafiles/search_indexes.py
index 894448997..a1de7c4c9 100644
--- a/openslides/mediafile/search_indexes.py
+++ b/openslides/mediafiles/search_indexes.py
@@ -5,7 +5,7 @@ from .models import Mediafile
 class Index(indexes.SearchIndex, indexes.Indexable):
     text = indexes.EdgeNgramField(document=True, use_template=True)
     modelfilter_name = "Files"  # verbose_name of model
-    modelfilter_value = "mediafile.mediafile"  # 'app_name.model_name'
+    modelfilter_value = "mediafiles.mediafile"  # 'app_name.model_name'
 
     def get_model(self):
         return Mediafile
diff --git a/openslides/mediafile/serializers.py b/openslides/mediafiles/serializers.py
similarity index 100%
rename from openslides/mediafile/serializers.py
rename to openslides/mediafiles/serializers.py
diff --git a/openslides/mediafile/slides.py b/openslides/mediafiles/slides.py
similarity index 91%
rename from openslides/mediafile/slides.py
rename to openslides/mediafiles/slides.py
index 84d69621e..95cb991bb 100644
--- a/openslides/mediafile/slides.py
+++ b/openslides/mediafiles/slides.py
@@ -26,4 +26,4 @@ def mediafile_presentation_as_slide(**kwargs):
         raise SlideError
     context = {'pdf': pdf, 'page_num': page_num,
                'fullscreen': config['pdf_fullscreen']}
-    return render_to_string('mediafile/presentation_slide.html', context)
+    return render_to_string('mediafiles/presentation_slide.html', context)
diff --git a/openslides/mediafile/static/css/mediafile.css b/openslides/mediafiles/static/css/mediafile.css
similarity index 100%
rename from openslides/mediafile/static/css/mediafile.css
rename to openslides/mediafiles/static/css/mediafile.css
diff --git a/openslides/mediafile/static/css/mediafile_projector.css b/openslides/mediafiles/static/css/mediafile_projector.css
similarity index 100%
rename from openslides/mediafile/static/css/mediafile_projector.css
rename to openslides/mediafiles/static/css/mediafile_projector.css
diff --git a/openslides/mediafile/static/img/glyphicons_062_paperclip.png b/openslides/mediafiles/static/img/glyphicons_062_paperclip.png
similarity index 100%
rename from openslides/mediafile/static/img/glyphicons_062_paperclip.png
rename to openslides/mediafiles/static/img/glyphicons_062_paperclip.png
diff --git a/openslides/mediafile/static/img/glyphicons_062_paperclip_white.png b/openslides/mediafiles/static/img/glyphicons_062_paperclip_white.png
similarity index 100%
rename from openslides/mediafile/static/img/glyphicons_062_paperclip_white.png
rename to openslides/mediafiles/static/img/glyphicons_062_paperclip_white.png
diff --git a/openslides/mediafile/static/js/pdf.js b/openslides/mediafiles/static/js/pdf.js
similarity index 100%
rename from openslides/mediafile/static/js/pdf.js
rename to openslides/mediafiles/static/js/pdf.js
diff --git a/openslides/mediafile/static/js/pdf.worker.js b/openslides/mediafiles/static/js/pdf.worker.js
similarity index 100%
rename from openslides/mediafile/static/js/pdf.worker.js
rename to openslides/mediafiles/static/js/pdf.worker.js
diff --git a/openslides/mediafile/static/js/pdf_presenter.js b/openslides/mediafiles/static/js/pdf_presenter.js
similarity index 100%
rename from openslides/mediafile/static/js/pdf_presenter.js
rename to openslides/mediafiles/static/js/pdf_presenter.js
diff --git a/openslides/mediafile/template.py b/openslides/mediafiles/template.py
similarity index 100%
rename from openslides/mediafile/template.py
rename to openslides/mediafiles/template.py
diff --git a/openslides/mediafile/templates/mediafile/mediafile_form.html b/openslides/mediafiles/templates/mediafiles/mediafile_form.html
similarity index 100%
rename from openslides/mediafile/templates/mediafile/mediafile_form.html
rename to openslides/mediafiles/templates/mediafiles/mediafile_form.html
diff --git a/openslides/mediafile/templates/mediafile/mediafile_list.html b/openslides/mediafiles/templates/mediafiles/mediafile_list.html
similarity index 88%
rename from openslides/mediafile/templates/mediafile/mediafile_list.html
rename to openslides/mediafiles/templates/mediafiles/mediafile_list.html
index 1a1918587..b1095701f 100644
--- a/openslides/mediafile/templates/mediafile/mediafile_list.html
+++ b/openslides/mediafiles/templates/mediafiles/mediafile_list.html
@@ -8,7 +8,7 @@
 {% block content %}
     <h1>{% trans 'Files' %}
         <small class="pull-right">
-        {% if perms.mediafile.can_upload %}
+        {% if perms.mediafiles.can_upload %}
             <a href="{% url 'mediafile_create' %}" class="btn btn-mini btn-primary" rel="tooltip" data-original-title="{% trans 'New file' %}"><i class="icon-plus icon-white"></i> {% trans "New" %}</a>
         {% endif %}
         </small>
@@ -20,7 +20,7 @@
             <th class="optional-small">{% trans 'Size' %}</th>
             <th class="optional">{% trans 'Upload time' %}</th>
             <th class="optional">{% trans 'Uploaded by' %}</th>
-            {% if perms.mediafile.can_manage or perms.mediafile.can_upload %}
+            {% if perms.mediafiles.can_manage or perms.mediafiles.can_upload %}
                 <th class="mini_width">{% trans "Actions" %}</th>
             {% endif %}
         </tr>
@@ -31,13 +31,13 @@
             <td class="optional-small">{{ mediafile.get_filesize }}</td>
             <td class="optional">{{ mediafile.timestamp }}</td>
             <td class="optional"><a href="{{ mediafile.uploader|absolute_url }}">{{ mediafile.uploader }}</a></td>
-            {% if perms.mediafile.can_manage or perms.mediafile.can_upload %}
+            {% if perms.mediafiles.can_manage or perms.mediafiles.can_upload %}
             <td>
                 {% if mediafile.with_action_buttons %}
                 <span style="width: 1px; white-space: nowrap;">
                     <a href="{{ mediafile|absolute_url:'update' }}" rel="tooltip" data-original-title="{% trans 'Edit' %}" class="btn btn-mini"><i class="icon-pencil"></i></a>
                     <a href="{{ mediafile|absolute_url:'delete' }}" rel="tooltip" data-original-title="{% trans 'Delete' %}" class="btn btn-mini"><i class="icon-remove"></i></a>
-                    {% if perms.mediafile.can_manage and mediafile.is_presentable %}{% if mediafile.filetype in mediafile.PRESENTABLE_FILE_TYPES %}
+                    {% if perms.mediafiles.can_manage and mediafile.is_presentable %}{% if mediafile.filetype in mediafile.PRESENTABLE_FILE_TYPES %}
                     <a href="{{ mediafile|absolute_url:'projector' }}" class="activate_link choose-pdf btn {% if mediafile.is_active_slide %}btn-primary{% endif %} btn-mini" title="{% trans 'Show' %}">
                         <i class="icon-facetime-video {% if mediafile.is_active_slide %}icon-white{% endif %}">
                         </i>
diff --git a/openslides/mediafile/templates/mediafile/presentation_slide.html b/openslides/mediafiles/templates/mediafiles/presentation_slide.html
similarity index 100%
rename from openslides/mediafile/templates/mediafile/presentation_slide.html
rename to openslides/mediafiles/templates/mediafiles/presentation_slide.html
diff --git a/openslides/mediafile/templates/mediafile/widget_pdfpresentation.html b/openslides/mediafiles/templates/mediafiles/widget_pdfpresentation.html
similarity index 100%
rename from openslides/mediafile/templates/mediafile/widget_pdfpresentation.html
rename to openslides/mediafiles/templates/mediafiles/widget_pdfpresentation.html
diff --git a/openslides/mediafile/templates/search/indexes/mediafile/mediafile_text.txt b/openslides/mediafiles/templates/search/indexes/mediafiles/mediafile_text.txt
similarity index 100%
rename from openslides/mediafile/templates/search/indexes/mediafile/mediafile_text.txt
rename to openslides/mediafiles/templates/search/indexes/mediafiles/mediafile_text.txt
diff --git a/openslides/mediafile/templates/search/mediafile-results.html b/openslides/mediafiles/templates/search/mediafile-results.html
similarity index 88%
rename from openslides/mediafile/templates/search/mediafile-results.html
rename to openslides/mediafiles/templates/search/mediafile-results.html
index aceb903ca..2871e1e01 100644
--- a/openslides/mediafile/templates/search/mediafile-results.html
+++ b/openslides/mediafiles/templates/search/mediafile-results.html
@@ -1,7 +1,7 @@
 {% load i18n %}
 {% load highlight %}
 
-{% if perms.mediafile.can_see %}
+{% if perms.mediafiles.can_see %}
     <li>
         <a href="{{ result.object.get_absolute_url }}">{{ result.object }}</a><br>
         <span class="app">{% trans "File" %}</a></span><br>
diff --git a/openslides/mediafile/urls.py b/openslides/mediafiles/urls.py
similarity index 100%
rename from openslides/mediafile/urls.py
rename to openslides/mediafiles/urls.py
diff --git a/openslides/mediafile/views.py b/openslides/mediafiles/views.py
similarity index 86%
rename from openslides/mediafile/views.py
rename to openslides/mediafiles/views.py
index 6e6c87404..4b57d5d81 100644
--- a/openslides/mediafile/views.py
+++ b/openslides/mediafiles/views.py
@@ -18,16 +18,16 @@ class MediafileListView(ListView):
     model = Mediafile
 
     def check_permission(self, request, *args, **kwargs):
-        return (request.user.has_perm('mediafile.can_see') or
-                request.user.has_perm('mediafile.can_upload') or
-                request.user.has_perm('mediafile.can_manage'))
+        return (request.user.has_perm('mediafiles.can_see') or
+                request.user.has_perm('mediafiles.can_upload') or
+                request.user.has_perm('mediafiles.can_manage'))
 
     def get_context_data(self, *args, **kwargs):
         context = super(MediafileListView, self).get_context_data(*args, **kwargs)
         for mediafile in context['mediafile_list']:
-            if self.request.user.has_perm('mediafile.can_manage'):
+            if self.request.user.has_perm('mediafiles.can_manage'):
                 mediafile.with_action_buttons = True
-            elif self.request.user.has_perm('mediafile.can_upload') and self.request.user == mediafile.uploader:
+            elif self.request.user.has_perm('mediafiles.can_upload') and self.request.user == mediafile.uploader:
                 mediafile.with_action_buttons = True
             else:
                 mediafile.with_action_buttons = False
@@ -47,7 +47,7 @@ class MediafileViewMixin(object):
 
     def get_form(self, form_class):
         form_kwargs = self.get_form_kwargs()
-        if not self.request.user.has_perm('mediafile.can_manage'):
+        if not self.request.user.has_perm('mediafiles.can_manage'):
             return MediafileNormalUserForm(**form_kwargs)
         else:
             return MediafileManagerForm(**form_kwargs)
@@ -58,7 +58,7 @@ class MediafileViewMixin(object):
         he has to set the uploader in the given form field. Then this
         method only calls super. Else it sets the requesting user as uploader.
         """
-        if not self.request.user.has_perm('mediafile.can_manage'):
+        if not self.request.user.has_perm('mediafiles.can_manage'):
             self.object.uploader = self.request.user
         return super(MediafileViewMixin, self).manipulate_object(*args, **kwargs)
 
@@ -67,7 +67,7 @@ class MediafileCreateView(MediafileViewMixin, CreateView):
     """
     View to upload a new file.
     """
-    required_permission = 'mediafile.can_upload'
+    required_permission = 'mediafiles.can_upload'
 
     def get_form_kwargs(self, *args, **kwargs):
         form_kwargs = super(MediafileCreateView, self).get_form_kwargs(*args, **kwargs)
@@ -81,8 +81,8 @@ class MediafileUpdateView(MediafileViewMixin, UpdateView):
     View to edit the entry of an uploaded file.
     """
     def check_permission(self, request, *args, **kwargs):
-        return (request.user.has_perm('mediafile.can_manage') or
-                (request.user.has_perm('mediafile.can_upload') and
+        return (request.user.has_perm('mediafiles.can_manage') or
+                (request.user.has_perm('mediafiles.can_upload') and
                  self.get_object().uploader == self.request.user))
 
     def get_form_kwargs(self, *args, **kwargs):
@@ -99,8 +99,8 @@ class MediafileDeleteView(DeleteView):
     success_url_name = 'mediafile_list'
 
     def check_permission(self, request, *args, **kwargs):
-        return (request.user.has_perm('mediafile.can_manage') or
-                (request.user.has_perm('mediafile.can_upload') and self.get_object().uploader == self.request.user))
+        return (request.user.has_perm('mediafiles.can_manage') or
+                (request.user.has_perm('mediafiles.can_upload') and self.get_object().uploader == self.request.user))
 
     def on_clicked_yes(self, *args, **kwargs):
         """Deletes the file in the filesystem, if user clicks "Yes"."""
@@ -216,9 +216,9 @@ class MediafileViewSet(ModelViewSet):
         permission to see mediafile objects and in case of create, update or
         destroy requests the permission to manage mediafile objects.
         """
-        # TODO: Use mediafile.can_upload permission to create and update some
+        # TODO: Use mediafiles.can_upload permission to create and update some
         #       objects but restricted concerning the uploader.
-        if (not request.user.has_perm('mediafile.can_see') or
+        if (not request.user.has_perm('mediafiles.can_see') or
                 (self.action in ('create', 'update', 'destroy') and not
-                 request.user.has_perm('mediafile.can_manage'))):
+                 request.user.has_perm('mediafiles.can_manage'))):
             self.permission_denied(request)
diff --git a/openslides/mediafile/widgets.py b/openslides/mediafiles/widgets.py
similarity index 94%
rename from openslides/mediafile/widgets.py
rename to openslides/mediafiles/widgets.py
index b3c2a6127..e8628810c 100644
--- a/openslides/mediafile/widgets.py
+++ b/openslides/mediafiles/widgets.py
@@ -15,7 +15,7 @@ class PDFPresentationWidget(Widget):
     required_permission = 'core.can_manage_projector'
     default_column = 1
     default_weight = 75
-    template_name = 'mediafile/widget_pdfpresentation.html'
+    template_name = 'mediafiles/widget_pdfpresentation.html'
     icon_css_class = 'icon-align-left'
     more_link_pattern_name = 'mediafile_list'
     # javascript_files = None  # TODO: Add pdf.js stuff here.
diff --git a/openslides/motion/__init__.py b/openslides/motion/__init__.py
deleted file mode 100644
index 544a0c792..000000000
--- a/openslides/motion/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-default_app_config = 'openslides.motion.apps.MotionAppConfig'
diff --git a/openslides/motions/__init__.py b/openslides/motions/__init__.py
new file mode 100644
index 000000000..9d454b8a0
--- /dev/null
+++ b/openslides/motions/__init__.py
@@ -0,0 +1 @@
+default_app_config = 'openslides.motions.apps.MotionAppConfig'
diff --git a/openslides/motion/apps.py b/openslides/motions/apps.py
similarity index 76%
rename from openslides/motion/apps.py
rename to openslides/motions/apps.py
index 3413b6128..19c8b7807 100644
--- a/openslides/motion/apps.py
+++ b/openslides/motions/apps.py
@@ -3,7 +3,7 @@ from django.db.models.signals import post_migrate
 
 
 class MotionAppConfig(AppConfig):
-    name = 'openslides.motion'
+    name = 'openslides.motions'
     verbose_name = 'OpenSlides Motion'
 
     def ready(self):
@@ -25,10 +25,10 @@ class MotionAppConfig(AppConfig):
         # Register slides.
         Motion = self.get_model('Motion')
         MotionPoll = self.get_model('MotionPoll')
-        register_slide_model(Motion, 'motion/slide.html')
-        register_slide_model(MotionPoll, 'motion/motionpoll_slide.html')
+        register_slide_model(Motion, 'motions/slide.html')
+        register_slide_model(MotionPoll, 'motions/motionpoll_slide.html')
 
         # Register viewsets.
-        router.register('motion/category', CategoryViewSet)
-        router.register('motion/motion', MotionViewSet)
-        router.register('motion/workflow', WorkflowViewSet)
+        router.register('motions/category', CategoryViewSet)
+        router.register('motions/motion', MotionViewSet)
+        router.register('motions/workflow', WorkflowViewSet)
diff --git a/openslides/motion/csv_import.py b/openslides/motions/csv_import.py
similarity index 100%
rename from openslides/motion/csv_import.py
rename to openslides/motions/csv_import.py
diff --git a/openslides/motion/exceptions.py b/openslides/motions/exceptions.py
similarity index 100%
rename from openslides/motion/exceptions.py
rename to openslides/motions/exceptions.py
diff --git a/openslides/motion/forms.py b/openslides/motions/forms.py
similarity index 99%
rename from openslides/motion/forms.py
rename to openslides/motions/forms.py
index 74b40df4c..432020a74 100644
--- a/openslides/motion/forms.py
+++ b/openslides/motions/forms.py
@@ -3,7 +3,7 @@ import collections
 from django import forms
 from django.utils.translation import ugettext_lazy
 
-from openslides.mediafile.models import Mediafile
+from openslides.mediafiles.models import Mediafile
 from openslides.utils.forms import (CleanHtmlFormMixin, CssClassMixin,
                                     CSVImportForm, LocalizedModelChoiceField)
 from openslides.users.models import User
diff --git a/openslides/motion/main_menu.py b/openslides/motions/main_menu.py
similarity index 87%
rename from openslides/motion/main_menu.py
rename to openslides/motions/main_menu.py
index 2acfb21eb..0bac46298 100644
--- a/openslides/motion/main_menu.py
+++ b/openslides/motions/main_menu.py
@@ -8,7 +8,7 @@ class MotionMainMenuEntry(MainMenuEntry):
     Main menu entry for the motion app.
     """
     verbose_name = ugettext_lazy('Motions')
-    required_permission = 'motion.can_see_motion'
+    required_permission = 'motions.can_see'
     default_weight = 30
     pattern_name = 'motion_list'
     icon_css_class = 'glyphicon-file'
diff --git a/openslides/motion/models.py b/openslides/motions/models.py
similarity index 97%
rename from openslides/motion/models.py
rename to openslides/motions/models.py
index e73788247..bdc807308 100644
--- a/openslides/motion/models.py
+++ b/openslides/motions/models.py
@@ -7,7 +7,7 @@ from django.utils.translation import ugettext_lazy, ugettext_noop
 
 from openslides.config.api import config
 from openslides.core.models import Tag
-from openslides.mediafile.models import Mediafile
+from openslides.mediafiles.models import Mediafile
 from openslides.poll.models import (BaseOption, BasePoll, BaseVote, CollectDefaultVotesMixin)
 from openslides.projector.models import SlideMixin
 from jsonfield import JSONField
@@ -85,10 +85,10 @@ class Motion(RESTModelMixin, SlideMixin, AbsoluteUrlMixin, models.Model):
 
     class Meta:
         permissions = (
-            ('can_see_motion', ugettext_noop('Can see motions')),
-            ('can_create_motion', ugettext_noop('Can create motions')),
-            ('can_support_motion', ugettext_noop('Can support motions')),
-            ('can_manage_motion', ugettext_noop('Can manage motions')),
+            ('can_see', ugettext_noop('Can see motions')),
+            ('can_create', ugettext_noop('Can create motions')),
+            ('can_support', ugettext_noop('Can support motions')),
+            ('can_manage', ugettext_noop('Can manage motions')),
         )
         ordering = ('identifier', )
         verbose_name = ugettext_noop('Motion')
@@ -505,18 +505,18 @@ class Motion(RESTModelMixin, SlideMixin, AbsoluteUrlMixin, models.Model):
         * reset_state
         """
         actions = {
-            'see': (person.has_perm('motion.can_see_motion') and
+            'see': (person.has_perm('motions.can_see') and
                     (not self.state.required_permission_to_see or
                      person.has_perm(self.state.required_permission_to_see) or
                      self.is_submitter(person))),
 
-            'update': (person.has_perm('motion.can_manage_motion') or
+            'update': (person.has_perm('motions.can_manage') or
                        (self.is_submitter(person) and
                         self.state.allow_submitter_edit)),
 
-            'delete': person.has_perm('motion.can_manage_motion'),
+            'delete': person.has_perm('motions.can_manage'),
 
-            'create_poll': (person.has_perm('motion.can_manage_motion') and
+            'create_poll': (person.has_perm('motions.can_manage') and
                             self.state.allow_create_poll),
 
             'support': (self.state.allow_support and
@@ -527,9 +527,9 @@ class Motion(RESTModelMixin, SlideMixin, AbsoluteUrlMixin, models.Model):
             'unsupport': (self.state.allow_support and
                           self.is_supporter(person)),
 
-            'change_state': person.has_perm('motion.can_manage_motion'),
+            'change_state': person.has_perm('motions.can_manage'),
 
-            'reset_state': person.has_perm('motion.can_manage_motion')}
+            'reset_state': person.has_perm('motions.can_manage')}
 
         actions['edit'] = actions['update']
 
@@ -855,7 +855,7 @@ class State(RESTModelMixin, models.Model):
 
     To use this feature change the database entry of a state object and add
     your favourite permission string. You can do this e. g. by editing the
-    definitions in create_builtin_workflows() in openslides/motion/signals.py.
+    definitions in create_builtin_workflows() in openslides/motions/signals.py.
     """
 
     allow_support = models.BooleanField(default=False)
diff --git a/openslides/motion/pdf.py b/openslides/motions/pdf.py
similarity index 100%
rename from openslides/motion/pdf.py
rename to openslides/motions/pdf.py
diff --git a/openslides/motion/personal_info.py b/openslides/motions/personal_info.py
similarity index 100%
rename from openslides/motion/personal_info.py
rename to openslides/motions/personal_info.py
diff --git a/openslides/motion/search_indexes.py b/openslides/motions/search_indexes.py
similarity index 81%
rename from openslides/motion/search_indexes.py
rename to openslides/motions/search_indexes.py
index 46a599d9f..9b702f325 100644
--- a/openslides/motion/search_indexes.py
+++ b/openslides/motions/search_indexes.py
@@ -5,7 +5,7 @@ from .models import Motion
 class Index(indexes.SearchIndex, indexes.Indexable):
     text = indexes.EdgeNgramField(document=True, use_template=True)
     modelfilter_name = "Motions"  # verbose_name of model
-    modelfilter_value = "motion.motion"  # 'app_name.model_name'
+    modelfilter_value = "motions.motion"  # 'app_name.model_name'
 
     def get_model(self):
         return Motion
diff --git a/openslides/motion/serializers.py b/openslides/motions/serializers.py
similarity index 100%
rename from openslides/motion/serializers.py
rename to openslides/motions/serializers.py
diff --git a/openslides/motion/signals.py b/openslides/motions/signals.py
similarity index 100%
rename from openslides/motion/signals.py
rename to openslides/motions/signals.py
diff --git a/openslides/motion/static/css/motion.css b/openslides/motions/static/css/motion.css
similarity index 100%
rename from openslides/motion/static/css/motion.css
rename to openslides/motions/static/css/motion.css
diff --git a/openslides/motion/templates/motion/category_form.html b/openslides/motions/templates/motions/category_form.html
similarity index 100%
rename from openslides/motion/templates/motion/category_form.html
rename to openslides/motions/templates/motions/category_form.html
diff --git a/openslides/motion/templates/motion/category_list.html b/openslides/motions/templates/motions/category_list.html
similarity index 97%
rename from openslides/motion/templates/motion/category_list.html
rename to openslides/motions/templates/motions/category_list.html
index 88472c5ba..e34ce20de 100644
--- a/openslides/motion/templates/motion/category_list.html
+++ b/openslides/motions/templates/motions/category_list.html
@@ -9,7 +9,7 @@
     <h1>
         {% trans "Categories" %}
         <small class="pull-right">
-        {% if perms.motion.can_manage_motion %}
+        {% if perms.motions.can_manage %}
             <a href="{% url 'motion_category_create' %}" class="btn btn-mini btn-primary" rel="tooltip" data-original-title="{% trans 'New category' %}"><i class="icon-plus icon-white"></i> {% trans 'New' %}</a>
         {% endif %}
         <a href="{% url 'motion_list' %}" class="btn btn-mini"><i class="icon-chevron-left"></i> {% trans "Back to overview" %}</a>
diff --git a/openslides/motion/templates/motion/motion_detail.html b/openslides/motions/templates/motions/motion_detail.html
similarity index 96%
rename from openslides/motion/templates/motion/motion_detail.html
rename to openslides/motions/templates/motions/motion_detail.html
index 7f3951268..52c0102fd 100644
--- a/openslides/motion/templates/motion/motion_detail.html
+++ b/openslides/motions/templates/motions/motion_detail.html
@@ -51,7 +51,7 @@
                 <span class="glyphicon glyphicon-facetime-video" aria-hidden="true"></span>
             </a>
         {% endif %}
-        {% if perms.motion.can_manage_motion or perms.agenda.can_manage_agenda or allowed_actions.edit %}
+        {% if perms.motions.can_manage or perms.agenda.can_manage or allowed_actions.edit %}
         <div class="btn-group">
             <a data-toggle="dropdown" class="btn btn-sm btn-default dropdown-toggle">
                 <span class="optional-small">{% trans 'More actions' %}</span> <span class="caret"></span>
@@ -63,7 +63,7 @@
                         <span class="glyphicon glyphicon-pencil" aria-hidden="true"></span>
                         {% trans 'Edit motion' %}</a></li>
                 {% endif %}
-                {% if perms.motion.can_manage_motion %}
+                {% if perms.motions.can_manage %}
                     <!-- delete -->
                     {% if allowed_actions.delete %}
                         <li><a href="{{ motion|absolute_url:'delete' }}">
@@ -72,7 +72,7 @@
                     {% endif %}
                 {% endif %}
                 <!-- create agenda item -->
-                {% if perms.agenda.can_manage_agenda %}
+                {% if perms.agenda.can_manage %}
                     <li><a href="{% url 'motion_create_agenda' motion.id  %}">
                         <span class="glyphicon glyphicon-plus" aria-hidden="true"></span>
                         {% trans 'New agenda item' %}</a></li>
@@ -142,7 +142,7 @@
                     {% if version == motion.active_version %}
                          <span class="badge badge-success" title="{% trans 'This version is authorized' %}"><i class="icon-ok icon-white"></i></span>
                     {% else %}
-                         {% if perms.motion.can_manage_motion %}
+                         {% if perms.motions.can_manage %}
                              <a class="btn btn-default btn-sm" href="{% url 'motion_version_permit' motion.id version.version_number %}" title="{% trans 'Permit this version' %}"><i class="icon-ok"></i></a>
                          {% endif %}
                     {% endif %}
@@ -157,7 +157,7 @@
                         <a href="{{ version|absolute_url }}" title="{% trans 'Show' %}" class="btn btn-default btn-xs">
                             <span class="glyphicon glyphicon-search" aria-hidden="true"></span>
                         </a>
-                        {% if perms.motion.can_manage_motion and version != motion.active_version %}
+                        {% if perms.motions.can_manage and version != motion.active_version %}
                             <a href="{{ version|absolute_url:'delete' }}" title="{% trans 'Delete' %}" class="btn btn-default btn-xs">
                                 <span class="glyphicon glyphicon-remove" aria-hidden="true"></span>
                             </a>
@@ -173,7 +173,7 @@
     {% endwith %}
 
     <!-- Log -->
-    {% if perms.motion.can_manage_motion %}
+    {% if perms.motions.can_manage %}
         <p>
         <div class="btn-group" data-toggle="buttons-checkbox">
         <button type="button" class="btn btn-default btn-sm" data-toggle="collapse" data-target="#log">
@@ -227,7 +227,7 @@
                     {% if polls.count > 1 %}
                         {{ poll.poll_number|ordinal|safe }} {% trans "vote" %}:
                     {% endif %}
-                    {% if perms.motion.can_manage_motion %}
+                    {% if perms.motions.can_manage %}
                         {% if polls.count > 1 %}<br>{% endif %}
                         <a class="btn btn-default btn-sm activate_link {% if poll.is_active_slide %}btn-primary{% endif %}"
                                 href="{{ poll|absolute_url:'projector' }}"
@@ -326,7 +326,7 @@
         {% endif %}
 
         <!-- Support/Unsupport button -->
-        {% if perms.motion.can_support_motion and 'motion_min_supporters'|get_config > 0 %}
+        {% if perms.motions.can_support and 'motion_min_supporters'|get_config > 0 %}
             {% if allowed_actions.unsupport %}
                 <br><br>
                 <a href="{% url 'motion_unsupport' motion.id %}" class="btn btn-default btn-sm">
@@ -348,7 +348,7 @@
         {% endif %}
     </div> <!--/well-->
 
-    {% if perms.motion.can_manage_motion %}
+    {% if perms.motions.can_manage %}
     <!-- Manage motion box -->
     <div class="well">
     <h4>{% trans "Manage motion" %}</h4>
diff --git a/openslides/motion/templates/motion/motion_diff.html b/openslides/motions/templates/motions/motion_diff.html
similarity index 100%
rename from openslides/motion/templates/motion/motion_diff.html
rename to openslides/motions/templates/motions/motion_diff.html
diff --git a/openslides/motion/templates/motion/motion_form.html b/openslides/motions/templates/motions/motion_form.html
similarity index 100%
rename from openslides/motion/templates/motion/motion_form.html
rename to openslides/motions/templates/motions/motion_form.html
diff --git a/openslides/motion/templates/motion/motion_form_csv_import.html b/openslides/motions/templates/motions/motion_form_csv_import.html
similarity index 100%
rename from openslides/motion/templates/motion/motion_form_csv_import.html
rename to openslides/motions/templates/motions/motion_form_csv_import.html
diff --git a/openslides/motion/templates/motion/motion_list.html b/openslides/motions/templates/motions/motion_list.html
similarity index 95%
rename from openslides/motion/templates/motion/motion_list.html
rename to openslides/motions/templates/motions/motion_list.html
index 78dada3c2..7135690b2 100644
--- a/openslides/motion/templates/motion/motion_list.html
+++ b/openslides/motions/templates/motions/motion_list.html
@@ -25,8 +25,8 @@
     <h1>
         {% trans "Motions" %}
         <small class="pull-right">
-        {% if perms.motion.can_create_motion %}
-            {% if not 'motion_stop_submitting'|get_config or perms.motion.can_manage_motion %}
+        {% if perms.motions.can_create %}
+            {% if not 'motion_stop_submitting'|get_config or perms.motions.can_manage %}
                 <a href="{% url 'motion_create' %}" class="btn btn-sm btn-primary"
                         rel="tooltip" data-original-title="{% trans 'New motion' %}">
                     <span class="glyphicon glyphicon-plus" aria-hidden="true"></span>
@@ -41,7 +41,7 @@
                 <span class="optional-small"> {% trans 'Tags' %}</span>
             </a>
         {% endif %}
-        {% if perms.motion.can_manage_motion %}
+        {% if perms.motions.can_manage %}
             <a href="{% url 'motion_category_list' %}" class="btn btn-default btn-sm"
                     rel="tooltip" data-original-title="{% trans 'Manage categories' %}">
                 <span class="glyphicon glyphicon-th-large" aria-hidden="true"></span>
@@ -71,7 +71,7 @@
                 <th class="optional">{% trans "Supporters" %}</th>
             {% endif %}
             <th class="optional">{% trans "Last changes" %}</th>
-            {% if perms.motion.can_manage_motion or perms.core.can_manage_projector %}
+            {% if perms.motions.can_manage or perms.core.can_manage_projector %}
                 <th class="mini_width">{% trans "Actions" %}</th>
             {% endif %}
         </tr>
@@ -120,7 +120,7 @@
                         <i class="icon-warning-sign icon-white"></i>
                     </a>
                 {% endif %}</td>
-            {% if perms.motion.can_manage_motion or perms.core.can_manage_projector %}
+            {% if perms.motions.can_manage or perms.core.can_manage_projector %}
             <td>
                 <span style="width: 1px; white-space: nowrap;">
                 {% if perms.core.can_manage_projector %}
@@ -130,7 +130,7 @@
                         <span class="glyphicon glyphicon-facetime-video" aria-hidden="true"></span>
                     </a>
                 {% endif %}
-                {% if perms.motion.can_manage_motion %}
+                {% if perms.motions.can_manage %}
                     <a href="{{ motion|absolute_url:'update' }}" rel="tooltip" data-original-title="{% trans 'Edit' %}"
                             class="btn btn-default btn-sm">
                         <span class="glyphicon glyphicon-pencil" aria-hidden="true"></span>
diff --git a/openslides/motion/templates/motion/motionpoll_form.html b/openslides/motions/templates/motions/motionpoll_form.html
similarity index 98%
rename from openslides/motion/templates/motion/motionpoll_form.html
rename to openslides/motions/templates/motions/motionpoll_form.html
index 73cc178d6..4a0e02c67 100644
--- a/openslides/motion/templates/motion/motionpoll_form.html
+++ b/openslides/motions/templates/motions/motionpoll_form.html
@@ -26,7 +26,7 @@
                 rel="tooltip" data-original-title="{% trans 'Show vote result' %}">
                 <i class="icon-facetime-video {% if poll.is_active_slide %}icon-white{% endif %}"></i> {% trans "Vote result" %}</a>
         {% endif %}
-        {% if perms.motion.can_manage_motion %}
+        {% if perms.motions.can_manage %}
             <a class="btn btn-mini" href="{{ poll|absolute_url:'delete' }}"
                 rel="tooltip" data-original-title="{% trans 'Delete Vote' %}"><i class="icon-remove"></i></a>
         {% endif %}
diff --git a/openslides/motion/templates/motion/motionpoll_slide.html b/openslides/motions/templates/motions/motionpoll_slide.html
similarity index 100%
rename from openslides/motion/templates/motion/motionpoll_slide.html
rename to openslides/motions/templates/motions/motionpoll_slide.html
diff --git a/openslides/motion/templates/motion/slide.html b/openslides/motions/templates/motions/slide.html
similarity index 100%
rename from openslides/motion/templates/motion/slide.html
rename to openslides/motions/templates/motions/slide.html
diff --git a/openslides/motion/templates/motion/widget_motion.html b/openslides/motions/templates/motions/widget_motion.html
similarity index 96%
rename from openslides/motion/templates/motion/widget_motion.html
rename to openslides/motions/templates/motions/widget_motion.html
index 4a03c87f2..d497e3d7e 100644
--- a/openslides/motion/templates/motion/widget_motion.html
+++ b/openslides/motions/templates/motions/widget_motion.html
@@ -11,7 +11,7 @@
                 rel="tooltip" data-original-title="{% trans 'Show' %}">
                 <i class="icon-facetime-video {% if motion.is_active_slide %}icon-white{% endif %}"></i>
             </a>&nbsp;
-            {% if perms.motion.can_manage_motion %}
+            {% if perms.motions.can_manage %}
                 <a href="{{ motion|absolute_url:'update' }}"
                     rel="tooltip" data-original-title="{% trans 'Edit' %}" class="btn btn-mini right">
                     <i class="icon-pencil"></i>
diff --git a/openslides/motion/templates/search/indexes/motion/motion_text.txt b/openslides/motions/templates/search/indexes/motions/motion_text.txt
similarity index 100%
rename from openslides/motion/templates/search/indexes/motion/motion_text.txt
rename to openslides/motions/templates/search/indexes/motions/motion_text.txt
diff --git a/openslides/motion/templates/search/motion-results.html b/openslides/motions/templates/search/motion-results.html
similarity index 87%
rename from openslides/motion/templates/search/motion-results.html
rename to openslides/motions/templates/search/motion-results.html
index 708d8c5b3..013d22216 100644
--- a/openslides/motion/templates/search/motion-results.html
+++ b/openslides/motions/templates/search/motion-results.html
@@ -1,7 +1,7 @@
 {% load i18n %}
 {% load highlight %}
 
-{% if perms.motion.can_see_motion %}
+{% if perms.motions.can_see %}
     <li>
         <a href="{{ result.object.get_absolute_url }}">{{ result.object }}</a><br>
         <span class="app">{% trans "Motion" %}</a></span><br>
diff --git a/openslides/motion/urls.py b/openslides/motions/urls.py
similarity index 98%
rename from openslides/motion/urls.py
rename to openslides/motions/urls.py
index 3052c42e8..04e0365d7 100644
--- a/openslides/motion/urls.py
+++ b/openslides/motions/urls.py
@@ -2,9 +2,8 @@ from django.conf.urls import patterns, url
 
 from . import views
 
-# TODO: define the Views inhere
 urlpatterns = patterns(
-    'openslides.motion.views',
+    '',
     url(r'^$',
         views.MotionListView.as_view(),
         name='motion_list'),
diff --git a/openslides/motion/views.py b/openslides/motions/views.py
similarity index 93%
rename from openslides/motion/views.py
rename to openslides/motions/views.py
index e7f215f19..7da29a6e5 100644
--- a/openslides/motion/views.py
+++ b/openslides/motions/views.py
@@ -32,11 +32,12 @@ class MotionListView(ListView):
     View, to list all motions.
     """
     model = Motion
-    required_permission = 'motion.can_see_motion'
+    required_permission = 'motions.can_see'
     # The template name must be set explicitly because the overridden method
     # get_queryset() does not return a QuerySet any more so that Django can't
     # generate the template name from the name of the model.
-    template_name = 'motion/motion_list.html'
+
+    template_name = 'motions/motion_list.html'
     # The attribute context_object_name must be set explicitly because the
     # overridden method get_queryset() does not return a QuerySet any more so
     # that Django can't generate the context_object_name from the name of the
@@ -156,13 +157,13 @@ class MotionEditMixin(object):
         """
         form_classes = []
 
-        if (self.request.user.has_perm('motion.can_manage_motion') and
+        if (self.request.user.has_perm('motions.can_manage') and
                 (config['motion_identifier'] == 'manually' or type(self) == MotionUpdateView)):
             form_classes.append(MotionIdentifierMixin)
 
         form_classes.append(BaseMotionForm)
 
-        if self.request.user.has_perm('motion.can_manage_motion'):
+        if self.request.user.has_perm('motions.can_manage'):
             form_classes.append(MotionSubmitterMixin)
             form_classes.append(MotionCategoryMixin)
             if config['motion_min_supporters'] > 0:
@@ -185,13 +186,13 @@ class MotionCreateView(MotionEditMixin, CreateView):
     def check_permission(self, request, *args, **kwargs):
         """
         Checks whether the requesting user can submit a new motion. He needs
-        at least the permission 'motion.can_create_motion'. If the submitting
+        at least the permission 'motions.can_create'. If the submitting
         of new motions by non-staff users is stopped via config variable
         'motion_stop_submitting', the requesting user needs also to have
-        'motion.can_manage_motion'.
+        'motions.can_manage'.
         """
-        if request.user.has_perm('motion.can_create_motion'):
-            return not config['motion_stop_submitting'] or request.user.has_perm('motion.can_manage_motion')
+        if request.user.has_perm('motions.can_create'):
+            return not config['motion_stop_submitting'] or request.user.has_perm('motions.can_manage')
         return False
 
     def form_valid(self, form):
@@ -216,7 +217,7 @@ class MotionCreateView(MotionEditMixin, CreateView):
         """
         initial = super().get_initial()
         initial['text'] = config['motion_preamble']
-        if self.request.user.has_perm('motion.can_manage_motion'):
+        if self.request.user.has_perm('motions.can_manage'):
             initial['workflow'] = config['motion_workflow']
         return initial
 
@@ -297,7 +298,7 @@ class MotionUpdateView(MotionEditMixin, UpdateView):
         response = super().form_valid(form)
         self.write_log()
         if (config['motion_remove_supporters'] and self.object.state.allow_support and
-                not self.request.user.has_perm('motion.can_manage_motion')):
+                not self.request.user.has_perm('motions.can_manage')):
             self.object.clear_supporters()
             self.object.write_log([ugettext_noop('All supporters removed')], self.request.user)
         return response
@@ -320,7 +321,7 @@ class MotionUpdateView(MotionEditMixin, UpdateView):
 
     def get_initial(self):
         initial = super().get_initial()
-        if self.request.user.has_perm('motion.can_manage_motion'):
+        if self.request.user.has_perm('motions.can_manage'):
             initial['workflow'] = self.object.state.workflow
         return initial
 
@@ -366,7 +367,7 @@ class VersionDeleteView(DeleteView):
     View to delete a motion version.
     """
     model = MotionVersion
-    required_permission = 'motion.can_manage_motion'
+    required_permission = 'motions.can_manage'
     success_url_name = 'motion_detail'
 
     def get_object(self):
@@ -398,7 +399,7 @@ class VersionPermitView(SingleObjectMixin, QuestionView):
     """
     model = Motion
     final_message = ugettext_lazy('Version successfully permitted.')
-    required_permission = 'motion.can_manage_motion'
+    required_permission = 'motions.can_manage'
     question_url_name = 'motion_version_detail'
 
     def get(self, *args, **kwargs):
@@ -442,7 +443,7 @@ class VersionDiffView(DetailView):
     Show diff between two versions of a motion.
     """
     model = Motion
-    template_name = 'motion/motion_diff.html'
+    template_name = 'motions/motion_diff.html'
 
     def check_permission(self, request, *args, **kwargs):
         """
@@ -486,7 +487,7 @@ class SupportView(SingleObjectMixin, QuestionView):
     If self.support is False, the view will remove a request.user from the supporter list.
     """
 
-    required_permission = 'motion.can_support_motion'
+    required_permission = 'motions.can_support'
     model = Motion
     support = True
 
@@ -552,12 +553,12 @@ class MotionViewSet(ModelViewSet):
         permission to see motions and in case of create, update or
         destroy requests the permission to manage motions.
         """
-        # TODO: Use motion.can_create_motion permission and
-        #       motion.can_support_motion permission to create and update some
+        # TODO: Use motions.can_create permission and
+        #       motions.can_support permission to create and update some
         #       objects but restricted concerning the requesting user.
-        if (not request.user.has_perm('motion.can_see_motion') or
+        if (not request.user.has_perm('motions.can_see') or
                 (self.action in ('create', 'update', 'destroy') and not
-                 request.user.has_perm('motion.can_manage_motion'))):
+                 request.user.has_perm('motions.can_manage'))):
             self.permission_denied(request)
 
 
@@ -565,7 +566,7 @@ class PollCreateView(SingleObjectMixin, RedirectView):
     """
     View to create a poll for a motion.
     """
-    required_permission = 'motion.can_manage_motion'
+    required_permission = 'motions.can_manage'
     model = Motion
     url_name = 'motionpoll_detail'
 
@@ -589,7 +590,7 @@ class PollMixin(object):
     Mixin for the PollUpdateView and the PollDeleteView.
     """
 
-    required_permission = 'motion.can_manage_motion'
+    required_permission = 'motions.can_manage'
     success_url_name = 'motion_detail'
 
     def get_object(self):
@@ -626,7 +627,7 @@ class PollUpdateView(PollMixin, PollFormView):
     Poll Class to use for this view.
     """
 
-    template_name = 'motion/motionpoll_form.html'
+    template_name = 'motions/motionpoll_form.html'
 
     def get_context_data(self, **kwargs):
         """
@@ -675,7 +676,7 @@ class PollPDFView(PollMixin, PDFView):
     Generates a ballotpaper.
     """
 
-    required_permission = 'motion.can_manage_motion'
+    required_permission = 'motions.can_manage'
     top_space = 0
 
     def get_filename(self):
@@ -706,7 +707,7 @@ class MotionSetStateView(SingleObjectMixin, RedirectView):
     If self.reset is False, the new state is taken from url.
     If self.reset is True, the default state is taken.
     """
-    required_permission = 'motion.can_manage_motion'
+    required_permission = 'motions.can_manage'
     url_name = 'motion_detail'
     model = Motion
     reset = False
@@ -769,7 +770,7 @@ class MotionPDFView(SingleObjectMixin, PDFView):
         PDF.
         """
         if self.print_all_motions:
-            is_allowed = request.user.has_perm('motion.can_see_motion')
+            is_allowed = request.user.has_perm('motions.can_see')
         else:
             is_allowed = self.get_object().get_allowed_actions(request.user)['see']
         return is_allowed
@@ -811,13 +812,13 @@ class MotionPDFView(SingleObjectMixin, PDFView):
 
 
 class CategoryListView(ListView):
-    required_permission = 'motion.can_manage_motion'
+    required_permission = 'motions.can_manage'
     model = Category
 
 
 class CategoryCreateView(CreateView):
     fields = ("name", "prefix",)
-    required_permission = 'motion.can_manage_motion'
+    required_permission = 'motions.can_manage'
     model = Category
     success_url_name = 'motion_category_list'
     url_name_args = []
@@ -825,14 +826,14 @@ class CategoryCreateView(CreateView):
 
 class CategoryUpdateView(UpdateView):
     fields = ("name", "prefix",)
-    required_permission = 'motion.can_manage_motion'
+    required_permission = 'motions.can_manage'
     model = Category
     success_url_name = 'motion_category_list'
     url_name_args = []
 
 
 class CategoryDeleteView(DeleteView):
-    required_permission = 'motion.can_manage_motion'
+    required_permission = 'motions.can_manage'
     model = Category
     question_url_name = 'motion_category_list'
     url_name_args = []
@@ -852,9 +853,9 @@ class CategoryViewSet(ModelViewSet):
         permission to see motions and in case of create, update or destroy
         requests the permission to manage motions.
         """
-        if (not request.user.has_perm('motion.can_see_motion') or
+        if (not request.user.has_perm('motions.can_see') or
                 (self.action in ('create', 'update', 'destroy') and not
-                 request.user.has_perm('motion.can_manage_motion'))):
+                 request.user.has_perm('motions.can_manage'))):
             self.permission_denied(request)
 
 
@@ -863,9 +864,9 @@ class MotionCSVImportView(CSVImportView):
     Imports motions from an uploaded csv file.
     """
     form_class = MotionCSVImportForm
-    required_permission = 'motion.can_manage_motion'
+    required_permission = 'motions.can_manage'
     success_url_name = 'motion_list'
-    template_name = 'motion/motion_form_csv_import.html'
+    template_name = 'motions/motion_form_csv_import.html'
 
     def get_initial(self, *args, **kwargs):
         """
@@ -897,7 +898,7 @@ class WorkflowViewSet(ModelViewSet):
         permission to see motions and in case of create, update or destroy
         requests the permission to manage motions.
         """
-        if (not request.user.has_perm('motion.can_see_motion') or
+        if (not request.user.has_perm('motions.can_see') or
                 (self.action in ('create', 'update', 'destroy') and not
-                 request.user.has_perm('motion.can_manage_motion'))):
+                 request.user.has_perm('motions.can_manage'))):
             self.permission_denied(request)
diff --git a/openslides/motion/widgets.py b/openslides/motions/widgets.py
similarity index 92%
rename from openslides/motion/widgets.py
rename to openslides/motions/widgets.py
index 2d9d93f24..bae2b6586 100644
--- a/openslides/motion/widgets.py
+++ b/openslides/motions/widgets.py
@@ -15,7 +15,7 @@ class MotionWidget(Widget):
     default_column = 1
     default_weight = 40
     icon_css_class = 'icon-file'
-    template_name = 'motion/widget_motion.html'
+    template_name = 'motions/widget_motion.html'
     more_link_pattern_name = 'motion_list'
 
     def get_context_data(self, **context):
diff --git a/openslides/urls.py b/openslides/urls.py
index 9e129d07a..5f4f04d51 100644
--- a/openslides/urls.py
+++ b/openslides/urls.py
@@ -17,7 +17,7 @@ urlpatterns = patterns(
 
     # Activate next lines to get more AngularJS views
     # url(r'^$', IndexView.as_view()),
-    # url(r'^assignment.*', IndexView.as_view()),
+    # url(r'^assignments.*', IndexView.as_view()),
     # url(r'^agenda.*', IndexView.as_view()),
 )
 
@@ -25,9 +25,9 @@ urlpatterns = patterns(
 urlpatterns += patterns(
     '',
     (r'^agenda/', include('openslides.agenda.urls')),
-    (r'^motion/', include('openslides.motion.urls')),
-    (r'^assignment/', include('openslides.assignment.urls')),
-    (r'^mediafile/', include('openslides.mediafile.urls')),
+    (r'^motions/', include('openslides.motions.urls')),
+    (r'^assignments/', include('openslides.assignments.urls')),
+    (r'^mediafiles/', include('openslides.mediafiles.urls')),
     (r'^config/', include('openslides.config.urls')),
     (r'^projector/', include('openslides.projector.urls')),
     (r'^i18n/', include('django.conf.urls.i18n')),
diff --git a/openslides/users/signals.py b/openslides/users/signals.py
index 3e367df84..2a432becd 100644
--- a/openslides/users/signals.py
+++ b/openslides/users/signals.py
@@ -115,26 +115,26 @@ def create_builtin_groups_and_admin(**kwargs):
 
     permission_strings = (
         'agenda.can_be_speaker',
-        'agenda.can_manage_agenda',
-        'agenda.can_see_agenda',
+        'agenda.can_manage',
+        'agenda.can_see',
         'agenda.can_see_orga_items',
-        'assignment.can_manage_assignments',
-        'assignment.can_nominate_other',
-        'assignment.can_nominate_self',
-        'assignment.can_see_assignments',
+        'assignments.can_manage',
+        'assignments.can_nominate_other',
+        'assignments.can_nominate_self',
+        'assignments.can_see',
         'config.can_manage',
         'core.can_manage_projector',
         'core.can_manage_tags',
         'core.can_see_dashboard',
         'core.can_see_projector',
         'core.can_use_chat',
-        'mediafile.can_manage',
-        'mediafile.can_see',
-        'mediafile.can_upload',
-        'motion.can_create_motion',
-        'motion.can_manage_motion',
-        'motion.can_see_motion',
-        'motion.can_support_motion',
+        'mediafiles.can_manage',
+        'mediafiles.can_see',
+        'mediafiles.can_upload',
+        'motions.can_create',
+        'motions.can_manage',
+        'motions.can_see',
+        'motions.can_support',
         'users.can_manage',
         'users.can_see_extra_data',
         'users.can_see_name', )
@@ -151,13 +151,13 @@ def create_builtin_groups_and_admin(**kwargs):
 
     # Anonymous (pk 1) and Registered (pk 2)
     base_permissions = (
-        permission_dict['agenda.can_see_agenda'],
+        permission_dict['agenda.can_see'],
         permission_dict['agenda.can_see_orga_items'],
-        permission_dict['assignment.can_see_assignments'],
+        permission_dict['assignments.can_see'],
         permission_dict['core.can_see_dashboard'],
         permission_dict['core.can_see_projector'],
-        permission_dict['mediafile.can_see'],
-        permission_dict['motion.can_see_motion'],
+        permission_dict['mediafiles.can_see'],
+        permission_dict['motions.can_see'],
         permission_dict['users.can_see_extra_data'],
         permission_dict['users.can_see_name'], )
     group_anonymous = Group.objects.create(name=ugettext_noop('Anonymous'), pk=1)
@@ -169,28 +169,28 @@ def create_builtin_groups_and_admin(**kwargs):
 
     # Delegates (pk 3)
     delegates_permissions = (
-        permission_dict['assignment.can_nominate_other'],
-        permission_dict['assignment.can_nominate_self'],
-        permission_dict['mediafile.can_upload'],
-        permission_dict['motion.can_create_motion'],
-        permission_dict['motion.can_support_motion'], )
+        permission_dict['assignments.can_nominate_other'],
+        permission_dict['assignments.can_nominate_self'],
+        permission_dict['mediafiles.can_upload'],
+        permission_dict['motions.can_create'],
+        permission_dict['motions.can_support'], )
     group_delegates = Group.objects.create(name=ugettext_noop('Delegates'), pk=3)
     group_delegates.permissions.add(*delegates_permissions)
 
     # Staff (pk 4)
     staff_permissions = (
-        permission_dict['agenda.can_manage_agenda'],
-        permission_dict['assignment.can_manage_assignments'],
-        permission_dict['assignment.can_nominate_other'],
-        permission_dict['assignment.can_nominate_self'],
+        permission_dict['agenda.can_manage'],
+        permission_dict['assignments.can_manage'],
+        permission_dict['assignments.can_nominate_other'],
+        permission_dict['assignments.can_nominate_self'],
         permission_dict['config.can_manage'],
         permission_dict['core.can_manage_projector'],
         permission_dict['core.can_manage_tags'],
         permission_dict['core.can_use_chat'],
-        permission_dict['mediafile.can_manage'],
-        permission_dict['mediafile.can_upload'],
-        permission_dict['motion.can_create_motion'],
-        permission_dict['motion.can_manage_motion'],
+        permission_dict['mediafiles.can_manage'],
+        permission_dict['mediafiles.can_upload'],
+        permission_dict['motions.can_create'],
+        permission_dict['motions.can_manage'],
         permission_dict['users.can_manage'], )
     group_staff = Group.objects.create(name=ugettext_noop('Staff'), pk=4)
     group_staff.permissions.add(*staff_permissions)
diff --git a/tests/integration/motion/__init__.py b/tests/integration/motions/__init__.py
similarity index 100%
rename from tests/integration/motion/__init__.py
rename to tests/integration/motions/__init__.py
diff --git a/tests/integration/motion/test_views.py b/tests/integration/motions/test_views.py
similarity index 82%
rename from tests/integration/motion/test_views.py
rename to tests/integration/motions/test_views.py
index 77d06b292..55998fc78 100644
--- a/tests/integration/motion/test_views.py
+++ b/tests/integration/motions/test_views.py
@@ -1,7 +1,7 @@
 from django.test.client import Client
 
 from openslides.utils.test import TestCase
-from openslides.motion.models import Motion
+from openslides.motions.models import Motion
 from openslides.config.api import config
 
 
@@ -16,6 +16,6 @@ class AnonymousRequests(TestCase):
     def test_motion_detail(self):
         Motion.objects.create(title='test_motion')
 
-        response = self.client.get('/motion/1/')
+        response = self.client.get('/motions/1/')
 
         self.assertEqual(response.status_code, 200)
diff --git a/tests/old/assignment/__init__.py b/tests/old/assignments/__init__.py
similarity index 100%
rename from tests/old/assignment/__init__.py
rename to tests/old/assignments/__init__.py
diff --git a/tests/old/assignment/test_pdf.py b/tests/old/assignments/test_pdf.py
similarity index 81%
rename from tests/old/assignment/test_pdf.py
rename to tests/old/assignments/test_pdf.py
index 03ea82f0e..1b84b1aa9 100644
--- a/tests/old/assignment/test_pdf.py
+++ b/tests/old/assignments/test_pdf.py
@@ -1,6 +1,6 @@
 from django.test.client import Client
 
-from openslides.assignment.models import Assignment
+from openslides.assignments.models import Assignment
 from openslides.users.models import User
 from openslides.utils.test import TestCase
 
@@ -17,10 +17,10 @@ class AssignmentPDFTest(TestCase):
 
     def test_render_pdf(self):
         Assignment.objects.create(title='assignment_name_ith8qua1Eiferoqu5ju2', description="test", open_posts=1)
-        response = self.admin_client.get('/assignment/print/')
+        response = self.admin_client.get('/assignments/print/')
         self.assertEqual(response.status_code, 200)
 
     def test_render_many_posts(self):
         Assignment.objects.create(title='assignment_name_cohZ9shaipee3Phaing4', description="test", open_posts=20)
-        response = self.admin_client.get('/assignment/print/')
+        response = self.admin_client.get('/assignments/print/')
         self.assertEqual(response.status_code, 200)
diff --git a/tests/old/assignment/test_views.py b/tests/old/assignments/test_views.py
similarity index 84%
rename from tests/old/assignment/test_views.py
rename to tests/old/assignments/test_views.py
index 9c5c17e6c..0a3527fba 100644
--- a/tests/old/assignment/test_views.py
+++ b/tests/old/assignments/test_views.py
@@ -1,6 +1,6 @@
 from django.test.client import Client
 
-from openslides.assignment.models import Assignment, AssignmentPoll
+from openslides.assignments.models import Assignment, AssignmentPoll
 from openslides.config.api import config
 from openslides.users.models import Group, User
 from openslides.utils.test import TestCase
@@ -48,12 +48,12 @@ class TestAssignmentPollDelete(AssignmentViewTestCase):
         self.assignment1.create_poll()
 
     def test_get(self):
-        response = self.check_url('/assignment/poll/1/del/', self.admin_client, 302)
-        self.assertRedirects(response, 'assignment/1/')
+        response = self.check_url('/assignments/poll/1/del/', self.admin_client, 302)
+        self.assertRedirects(response, 'assignments/1/')
 
     def test_post(self):
-        response = self.admin_client.post('/assignment/poll/1/del/', {'yes': 1})
-        self.assertRedirects(response, '/assignment/1/')
+        response = self.admin_client.post('/assignments/poll/1/del/', {'yes': 1})
+        self.assertRedirects(response, '/assignments/1/')
 
 
 class TestAssignmentDetailView(AssignmentViewTestCase):
@@ -61,23 +61,23 @@ class TestAssignmentDetailView(AssignmentViewTestCase):
         """
         Tests that a delegate runs for a vote and then withdraws himself.
         """
-        response = self.staff_client.get('/assignment/1/')
+        response = self.staff_client.get('/assignments/1/')
         self.assertContains(response, 'No candidates available.')
         self.assertNotContains(response, 'Blocked Candidates')
 
-        response = self.delegate_client.get('/assignment/1/candidate/')
+        response = self.delegate_client.get('/assignments/1/candidate/')
         self.assertTrue(self.assignment1.is_candidate(self.delegate))
         self.assertFalse(self.assignment1.is_blocked(self.delegate))
 
-        response = self.staff_client.get('/assignment/1/')
+        response = self.staff_client.get('/assignments/1/')
         self.assertNotContains(response, 'No candidates available.')
         self.assertNotContains(response, 'Blocked Candidates')
 
-        response = self.delegate_client.get('/assignment/1/delete_candidate/')
+        response = self.delegate_client.get('/assignments/1/delete_candidate/')
         self.assertFalse(self.assignment1.is_candidate(self.delegate))
         self.assertTrue(self.assignment1.is_blocked(self.delegate))
 
-        response = self.staff_client.get('/assignment/1/')
+        response = self.staff_client.get('/assignments/1/')
         self.assertContains(response, 'No candidates available.')
         self.assertContains(response, 'Blocked Candidates')
 
@@ -101,8 +101,8 @@ class TestAssignmentPollCreateView(TestCase):
         admin_client.login(username='admin', password='admin')
         self.assertFalse(AssignmentPoll.objects.exists())
         self.assertEqual(config['assignment_poll_vote_values'], 'auto')
-        response = admin_client.get('/assignment/1/create_poll/')
-        self.assertRedirects(response, '/assignment/1/')
+        response = admin_client.get('/assignments/1/create_poll/')
+        self.assertRedirects(response, '/assignments/1/')
         poll = AssignmentPoll.objects.get()
         self.assertEqual(poll.assignment, self.assignment)
         self.assertEqual(poll.assignmentoption_set.count(), 1)
@@ -125,7 +125,7 @@ class TestAssignmentPollPdfView(TestCase):
         client.login(username='admin', password='admin')
 
         # request the pdf
-        response = client.get('/assignment/poll/1/print/')
+        response = client.get('/assignments/poll/1/print/')
 
         # test the response
         self.assertEqual(response.status_code, 200)
@@ -141,7 +141,7 @@ class TestPollUpdateView(TestCase):
         Tests that a 404 is returned, when a non existing poll is requested.
         """
         Assignment.objects.create(title='test assignment', open_posts=1)
-        url = '/assignment/poll/1/edit/'
+        url = '/assignments/poll/1/edit/'
 
         response = self.admin_client.get(url)
 
diff --git a/tests/old/mediafile/__init__.py b/tests/old/mediafiles/__init__.py
similarity index 100%
rename from tests/old/mediafile/__init__.py
rename to tests/old/mediafiles/__init__.py
diff --git a/tests/old/mediafile/tests.py b/tests/old/mediafiles/tests.py
similarity index 83%
rename from tests/old/mediafile/tests.py
rename to tests/old/mediafiles/tests.py
index f2782b046..a89e67f71 100644
--- a/tests/old/mediafile/tests.py
+++ b/tests/old/mediafiles/tests.py
@@ -7,7 +7,7 @@ from django.contrib.contenttypes.models import ContentType
 from django.core.files.uploadedfile import SimpleUploadedFile
 from django.test.client import Client
 
-from openslides.mediafile.models import Mediafile
+from openslides.mediafiles.models import Mediafile
 from openslides.users.models import User
 from openslides.utils.test import TestCase
 
@@ -18,7 +18,7 @@ class MediafileTest(TestCase):
     """
     def setUp(self):
         # Setup the three permissions
-        ct = ContentType.objects.get(app_label='mediafile', model='mediafile')
+        ct = ContentType.objects.get(app_label='mediafiles', model='mediafile')
         perm_1 = Permission.objects.get(content_type=ct, codename='can_see')
         perm_2 = Permission.objects.get(content_type=ct, codename='can_upload')
 
@@ -41,9 +41,9 @@ class MediafileTest(TestCase):
         self.assertEqual(str(self.object), 'Title File 1')
 
     def test_absolute_url(self):
-        self.assertEqual(self.object.get_absolute_url(), '/mediafile/1/edit/')
-        self.assertEqual(self.object.get_absolute_url('update'), '/mediafile/1/edit/')
-        self.assertEqual(self.object.get_absolute_url(link='delete'), '/mediafile/1/del/')
+        self.assertEqual(self.object.get_absolute_url(), '/mediafiles/1/edit/')
+        self.assertEqual(self.object.get_absolute_url('update'), '/mediafiles/1/edit/')
+        self.assertEqual(self.object.get_absolute_url(link='delete'), '/mediafiles/1/del/')
 
     def login_clients(self):
         """
@@ -61,33 +61,33 @@ class MediafileTest(TestCase):
 
     def test_see_mediafilelist(self):
         for client in self.login_clients().values():
-            response = client.get('/mediafile/')
+            response = client.get('/mediafiles/')
             self.assertEqual(response.status_code, 200)
-            self.assertTemplateUsed(response, 'mediafile/mediafile_list.html')
+            self.assertTemplateUsed(response, 'mediafiles/mediafile_list.html')
 
     def test_upload_mediafile_get_request(self):
         clients = self.login_clients()
-        response = clients['client_manager'].get('/mediafile/new/')
+        response = clients['client_manager'].get('/mediafiles/new/')
         self.assertContains(response, '---------', status_code=200)
         self.assertContains(response, '<option value="1" selected="selected">Administrator</option>', status_code=200)
-        self.assertTemplateUsed(response, 'mediafile/mediafile_form.html')
+        self.assertTemplateUsed(response, 'mediafiles/mediafile_form.html')
 
-        response = clients['client_vip_user'].get('/mediafile/new/')
+        response = clients['client_vip_user'].get('/mediafiles/new/')
         self.assertNotContains(response, '<select id="id_uploader" name="uploader">', status_code=200)
-        self.assertTemplateUsed(response, 'mediafile/mediafile_form.html')
+        self.assertTemplateUsed(response, 'mediafiles/mediafile_form.html')
 
-        response = clients['client_normal_user'].get('/mediafile/new/')
+        response = clients['client_normal_user'].get('/mediafiles/new/')
         self.assertEqual(response.status_code, 403)
 
     def test_upload_mediafile_post_request(self):
         # Test first user
         client_1 = self.login_clients()['client_manager']
         new_file_1 = SimpleUploadedFile(name='new_test_file.txt', content=bytes('test content hello manager', 'UTF-8'))
-        response_1 = client_1.post('/mediafile/new/',
+        response_1 = client_1.post('/mediafiles/new/',
                                    {'title': 'new_test_file_title_1',
                                     'mediafile': new_file_1,
                                     'uploader': self.normal_user.pk})
-        self.assertRedirects(response_1, expected_url='/mediafile/', status_code=302, target_status_code=200)
+        self.assertRedirects(response_1, expected_url='/mediafiles/', status_code=302, target_status_code=200)
         object_1 = Mediafile.objects.latest('timestamp')
         self.assertEqual(object_1.mediafile.url, '/media/file/new_test_file.txt')
         self.assertEqual(object_1.uploader, self.normal_user)
@@ -98,12 +98,12 @@ class MediafileTest(TestCase):
         # Test second user
         client_2 = self.login_clients()['client_vip_user']
         new_file_2 = SimpleUploadedFile(name='new_test_file.txt', content=bytes('test content hello vip_user', 'UTF-8'))
-        response_2 = client_2.post('/mediafile/new/',
+        response_2 = client_2.post('/mediafiles/new/',
                                    {'title': 'new_test_file_title_2',
                                     'mediafile': new_file_2})
         self.assertEqual(response_2.status_code, 302)
         # TODO: Check, why this does not work.
-        # self.assertRedirects(response_2, expected_url='/mediafile/', status_code=302, target_status_code=200)
+        # self.assertRedirects(response_2, expected_url='/mediafiles/', status_code=302, target_status_code=200)
         object_2 = Mediafile.objects.latest('timestamp')
         self.assertEqual(object_2.mediafile.url, '/media/file/new_test_file.txt')
         self.assertEqual(object_2.uploader, self.vip_user)
@@ -114,32 +114,32 @@ class MediafileTest(TestCase):
         # Test third user
         client_3 = self.login_clients()['client_normal_user']
         new_file_3 = SimpleUploadedFile(name='new_test_file.txt', content=bytes('test content hello vip_user', 'UTF-8'))
-        response_3 = client_3.post('/mediafile/new/',
+        response_3 = client_3.post('/mediafiles/new/',
                                    {'title': 'new_test_file_title_2',
                                     'mediafile': new_file_3})
         self.assertEqual(response_3.status_code, 403)
 
     def test_edit_mediafile_get_request(self):
         clients = self.login_clients()
-        response = clients['client_manager'].get('/mediafile/1/edit/')
+        response = clients['client_manager'].get('/mediafiles/1/edit/')
         self.assertContains(response, '---------', status_code=200)
         self.assertContains(response, '<option value="3" selected="selected">mediafile_test_normal_user</option>', status_code=200)
-        self.assertTemplateUsed(response, 'mediafile/mediafile_form.html')
+        self.assertTemplateUsed(response, 'mediafiles/mediafile_form.html')
 
-        response = clients['client_vip_user'].get('/mediafile/1/edit/')
+        response = clients['client_vip_user'].get('/mediafiles/1/edit/')
         self.assertEqual(response.status_code, 403)
 
-        response = clients['client_normal_user'].get('/mediafile/1/edit/')
+        response = clients['client_normal_user'].get('/mediafiles/1/edit/')
         self.assertEqual(response.status_code, 403)
 
     def test_edit_mediafile_get_request_own_file(self):
         clients = self.login_clients()
         self.object.uploader = self.vip_user
         self.object.save()
-        response = clients['client_vip_user'].get('/mediafile/1/edit/')
+        response = clients['client_vip_user'].get('/mediafiles/1/edit/')
         self.assertNotContains(response, '---------', status_code=200)
         self.assertNotContains(response, '<option value="2" selected="selected">mediafile_test_vip_user</option>', status_code=200)
-        self.assertTemplateUsed(response, 'mediafile/mediafile_form.html')
+        self.assertTemplateUsed(response, 'mediafiles/mediafile_form.html')
 
     def test_edit_mediafile_post_request(self):
         # Test only one user
@@ -148,7 +148,7 @@ class MediafileTest(TestCase):
         object_2 = Mediafile.objects.create(title='Title File 2', mediafile=mediafile_2_path, uploader=self.vip_user)
         client_1 = self.login_clients()['client_manager']
         new_file_1 = SimpleUploadedFile(name='new_test_file.txt', content=bytes('test content hello manager', 'UTF-8'))
-        response_1 = client_1.post('/mediafile/2/edit/',
+        response_1 = client_1.post('/mediafiles/2/edit/',
                                    {'title': 'new_test_file_title_1',
                                     'mediafile': new_file_1,
                                     'uploader': self.manager.pk})
@@ -166,7 +166,7 @@ class MediafileTest(TestCase):
         object_2 = Mediafile.objects.create(title='Title File 2b', mediafile=mediafile_2_path, uploader=self.vip_user)
         client = self.login_clients()['client_vip_user']
         new_file_1 = SimpleUploadedFile(name='new_test_file.txt', content=bytes('test content hello vip user', 'UTF-8'))
-        response_1 = client.post('/mediafile/2/edit/',
+        response_1 = client.post('/mediafiles/2/edit/',
                                  {'title': 'new_test_file_title_2b',
                                   'mediafile': new_file_1})
         self.assertEqual(response_1.status_code, 302)
@@ -180,33 +180,33 @@ class MediafileTest(TestCase):
     def test_edit_mediafile_post_request_another_file(self):
         client = self.login_clients()['client_vip_user']
         new_file_1 = SimpleUploadedFile(name='new_test_file.txt', content=bytes('test content hello vip user', 'UTF-8'))
-        response = client.post('/mediafile/1/edit/',
+        response = client.post('/mediafiles/1/edit/',
                                {'title': 'new_test_file_title_2c',
                                 'mediafile': new_file_1})
         self.assertEqual(response.status_code, 403)
 
     def test_delete_mediafile_get_request(self):
         clients = self.login_clients()
-        response = clients['client_manager'].get('/mediafile/1/del/')
-        self.assertRedirects(response, expected_url='/mediafile/1/edit/', status_code=302, target_status_code=200)
-        response = clients['client_vip_user'].get('/mediafile/1/del/')
+        response = clients['client_manager'].get('/mediafiles/1/del/')
+        self.assertRedirects(response, expected_url='/mediafiles/1/edit/', status_code=302, target_status_code=200)
+        response = clients['client_vip_user'].get('/mediafiles/1/del/')
         self.assertEqual(response.status_code, 403)
-        response = clients['client_normal_user'].get('/mediafile/1/del/')
+        response = clients['client_normal_user'].get('/mediafiles/1/del/')
         self.assertEqual(response.status_code, 403)
 
     def test_delete_mediafile_get_request_own_file(self):
         self.object.uploader = self.vip_user
         self.object.save()
-        response = self.login_clients()['client_vip_user'].get('/mediafile/1/del/')
-        self.assertRedirects(response, expected_url='/mediafile/1/edit/', status_code=302, target_status_code=200)
+        response = self.login_clients()['client_vip_user'].get('/mediafiles/1/del/')
+        self.assertRedirects(response, expected_url='/mediafiles/1/edit/', status_code=302, target_status_code=200)
 
     def test_delete_mediafile_post_request(self):
         tmpfile_no, mediafile_3_path = tempfile.mkstemp(prefix='tmp_openslides_test_', dir=self.tmp_dir)
         os.close(tmpfile_no)
         object_3 = Mediafile.objects.create(title='Title File 3', mediafile=mediafile_3_path)
         client_1 = self.login_clients()['client_manager']
-        response_1 = client_1.post('/mediafile/2/del/', {'yes': 'foo'})
-        self.assertRedirects(response_1, expected_url='/mediafile/', status_code=302, target_status_code=200)
+        response_1 = client_1.post('/mediafiles/2/del/', {'yes': 'foo'})
+        self.assertRedirects(response_1, expected_url='/mediafiles/', status_code=302, target_status_code=200)
         self.assertFalse(os.path.exists(object_3.mediafile.path))
 
     def test_delete_mediafile_post_request_own_file(self):
@@ -214,8 +214,8 @@ class MediafileTest(TestCase):
         os.close(tmpfile_no)
         object_3 = Mediafile.objects.create(title='Title File 3b', mediafile=mediafile_3_path, uploader=self.vip_user)
         client_1 = self.login_clients()['client_vip_user']
-        response_1 = client_1.post('/mediafile/2/del/', {'yes': 'foo'})
-        self.assertRedirects(response_1, expected_url='/mediafile/', status_code=302, target_status_code=200)
+        response_1 = client_1.post('/mediafiles/2/del/', {'yes': 'foo'})
+        self.assertRedirects(response_1, expected_url='/mediafiles/', status_code=302, target_status_code=200)
         self.assertFalse(os.path.exists(object_3.mediafile.path))
 
     def test_delete_mediafile_post_request_another_file(self):
@@ -223,7 +223,7 @@ class MediafileTest(TestCase):
         os.close(tmpfile_no)
         object_3 = Mediafile.objects.create(title='Title File 3c', mediafile=mediafile_3_path, uploader=self.normal_user)
         client_1 = self.login_clients()['client_vip_user']
-        response = client_1.post('/mediafile/2/del/', {'yes': 'foo'})
+        response = client_1.post('/mediafiles/2/del/', {'yes': 'foo'})
         self.assertEqual(response.status_code, 403)
         path_3 = object_3.mediafile.path
         self.assertTrue(os.path.exists(path_3))
diff --git a/tests/old/motion/__init__.py b/tests/old/motions/__init__.py
similarity index 100%
rename from tests/old/motion/__init__.py
rename to tests/old/motions/__init__.py
diff --git a/tests/old/motion/test_csv_import.py b/tests/old/motions/test_csv_import.py
similarity index 97%
rename from tests/old/motion/test_csv_import.py
rename to tests/old/motions/test_csv_import.py
index 00448896d..a062712d2 100644
--- a/tests/old/motion/test_csv_import.py
+++ b/tests/old/motions/test_csv_import.py
@@ -1,8 +1,8 @@
 import os
 from io import BytesIO
 
-from openslides.motion.csv_import import import_motions
-from openslides.motion.models import Category, Motion
+from openslides.motions.csv_import import import_motions
+from openslides.motions.models import Category, Motion
 from openslides.users.models import User
 from openslides.utils.test import TestCase
 from openslides.config.api import config
diff --git a/tests/old/motion/test_models.py b/tests/old/motions/test_models.py
similarity index 97%
rename from tests/old/motion/test_models.py
rename to tests/old/motions/test_models.py
index fd2b8fb64..ba9dd5774 100644
--- a/tests/old/motion/test_models.py
+++ b/tests/old/motions/test_models.py
@@ -1,6 +1,6 @@
 from openslides.config.api import config
-from openslides.motion.exceptions import WorkflowError
-from openslides.motion.models import Motion, State, Workflow
+from openslides.motions.exceptions import WorkflowError
+from openslides.motions.models import Motion, State, Workflow
 from openslides.users.models import User
 from openslides.utils.test import TestCase
 
@@ -57,9 +57,9 @@ class ModelTest(TestCase):
     def test_absolute_url(self):
         motion_id = self.motion.id
 
-        self.assertEqual(self.motion.get_absolute_url('detail'), '/motion/%d/' % motion_id)
-        self.assertEqual(self.motion.get_absolute_url('update'), '/motion/%d/edit/' % motion_id)
-        self.assertEqual(self.motion.get_absolute_url('delete'), '/motion/%d/del/' % motion_id)
+        self.assertEqual(self.motion.get_absolute_url('detail'), '/motions/%d/' % motion_id)
+        self.assertEqual(self.motion.get_absolute_url('update'), '/motions/%d/edit/' % motion_id)
+        self.assertEqual(self.motion.get_absolute_url('delete'), '/motions/%d/del/' % motion_id)
 
     def test_supporter(self):
         self.assertFalse(self.motion.is_supporter(self.test_user))
diff --git a/tests/old/motion/test_pdf.py b/tests/old/motions/test_pdf.py
similarity index 79%
rename from tests/old/motion/test_pdf.py
rename to tests/old/motions/test_pdf.py
index fde7b88a8..8c5502af1 100644
--- a/tests/old/motion/test_pdf.py
+++ b/tests/old/motions/test_pdf.py
@@ -1,5 +1,5 @@
 from django.test.client import Client
-from openslides.motion.models import Motion
+from openslides.motions.models import Motion
 from openslides.users.models import User
 from openslides.utils.test import TestCase
 
@@ -26,19 +26,19 @@ class MotionPDFTest(TestCase):
                  '<ul><li>Subelement 1 rel0liiGh0bi3ree6Jei</li>'
                  '<li>Subelement 2 rel0liiGh0bi3ree6Jei</li></ul></li>'
                  '<li>Element 2 rel0liiGh0bi3ree6Jei</li></ul>')
-        response = self.admin_client.get('/motion/1/pdf/')
+        response = self.admin_client.get('/motions/1/pdf/')
         self.assertEqual(response.status_code, 200)
 
     def test_get_without_required_permission_from_state(self):
         motion = Motion.objects.create(title='motion_title_zthguis8qqespgknme52')
-        motion.state.required_permission_to_see = 'motion.can_manage_motion'
+        motion.state.required_permission_to_see = 'motions.can_manage'
         motion.state.save()
-        response = self.registered_client.get('/motion/1/pdf/')
+        response = self.registered_client.get('/motions/1/pdf/')
         self.assertEqual(response.status_code, 403)
 
     def test_get_with_filtered_motion_list(self):
         motion = Motion.objects.create(title='motion_title_qwgvzf6487guni0oikcc')
-        motion.state.required_permission_to_see = 'motion.can_manage_motion'
+        motion.state.required_permission_to_see = 'motions.can_manage'
         motion.state.save()
-        response = self.registered_client.get('/motion/pdf/')
+        response = self.registered_client.get('/motions/pdf/')
         self.assertEqual(response.status_code, 200)
diff --git a/tests/old/motion/test_views.py b/tests/old/motions/test_views.py
similarity index 83%
rename from tests/old/motion/test_views.py
rename to tests/old/motions/test_views.py
index 24dbeea31..3a2f6bdf2 100644
--- a/tests/old/motion/test_views.py
+++ b/tests/old/motions/test_views.py
@@ -7,9 +7,9 @@ from django.test import RequestFactory
 from django.test.client import Client
 
 from openslides.config.api import config
-from openslides.mediafile.models import Mediafile
-from openslides.motion import views
-from openslides.motion.models import Category, Motion, MotionLog, State
+from openslides.mediafiles.models import Mediafile
+from openslides.motions import views
+from openslides.motions.models import Category, Motion, MotionLog, State
 from openslides.users.models import Group, User
 from openslides.utils.test import TestCase
 
@@ -53,28 +53,28 @@ class MotionViewTestCase(TestCase):
 
 class TestMotionListView(MotionViewTestCase):
     def test_get(self):
-        self.check_url('/motion/', self.admin_client, 200)
+        self.check_url('/motions/', self.admin_client, 200)
 
     def test_get_with_motion(self):
         self.motion1.title = 'motion1_iozaixeeDuMah8sheGhe'
         self.motion1.save()
-        response = self.admin_client.get('/motion/')
+        response = self.admin_client.get('/motions/')
         self.assertContains(response, 'motion1_iozaixeeDuMah8sheGhe')
 
     def test_get_with_filtered_motion_list(self):
-        self.motion1.state.required_permission_to_see = 'motion.can_manage_motion'
+        self.motion1.state.required_permission_to_see = 'motions.can_manage'
         self.motion1.state.save()
         self.motion1.title = 'motion1_djfplquczyxasvvgdnmbr'
         self.motion1.save()
-        response = self.registered_client.get('/motion/')
+        response = self.registered_client.get('/motions/')
         self.assertNotContains(response, 'motion1_djfplquczyxasvvgdnmbr')
 
 
 class TestMotionDetailView(MotionViewTestCase):
     def test_get(self):
-        self.check_url('/motion/1/', self.admin_client, 200)
-        self.check_url('/motion/2/', self.admin_client, 200)
-        self.check_url('/motion/500/', self.admin_client, 404)
+        self.check_url('/motions/1/', self.admin_client, 200)
+        self.check_url('/motions/2/', self.admin_client, 200)
+        self.check_url('/motions/500/', self.admin_client, 404)
 
     def test_attachment(self):
         # Preparation
@@ -84,59 +84,59 @@ class TestMotionDetailView(MotionViewTestCase):
         self.motion1.attachments.add(attachment)
 
         # Test appearance
-        response = self.registered_client.get('/motion/1/')
+        response = self.registered_client.get('/motions/1/')
         self.assertContains(response, '<h4>Attachments:</h4>')
         self.assertContains(response, 'TestFile_Neiri4xai4ueseGohzid')
 
         # Test disappearance
         attachment.mediafile.delete()
         attachment.delete()
-        response = self.registered_client.get('/motion/1/')
+        response = self.registered_client.get('/motions/1/')
         self.assertNotContains(response, '<h4>Attachments:</h4>')
         self.assertNotContains(response, 'TestFile_Neiri4xai4ueseGohzid')
 
     def test_poll(self):
-        response = self.staff_client.get('/motion/1/create_poll/')
-        self.assertRedirects(response, '/motion/1/poll/1/edit/')
+        response = self.staff_client.get('/motions/1/create_poll/')
+        self.assertRedirects(response, '/motions/1/poll/1/edit/')
         response = self.staff_client.post(
-            '/motion/1/poll/1/edit/',
+            '/motions/1/poll/1/edit/',
             {'option-1-Yes': '10',
              'pollform-votesvalid': '50'})
-        self.assertRedirects(response, '/motion/1/')
-        response = self.staff_client.get('/motion/1/')
+        self.assertRedirects(response, '/motions/1/')
+        response = self.staff_client.get('/motions/1/')
         self.assertContains(response, '50 (100')
 
     def test_deleted_supporter(self):
         config['motion_min_supporters'] = 1
         self.motion1.support(self.registered)
-        self.assertContains(self.admin_client.get('/motion/1/'), 'registered')
+        self.assertContains(self.admin_client.get('/motions/1/'), 'registered')
         self.registered.delete()
-        self.assertNotContains(self.admin_client.get('/motion/1/'), 'registered')
+        self.assertNotContains(self.admin_client.get('/motions/1/'), 'registered')
 
     def test_get_without_required_permission_from_state(self):
-        self.motion1.state.required_permission_to_see = 'motion.can_manage_motion'
+        self.motion1.state.required_permission_to_see = 'motions.can_manage'
         self.motion1.state.save()
-        self.check_url('/motion/1/', self.admin_client, 200)
-        self.check_url('/motion/1/', self.registered_client, 403)
+        self.check_url('/motions/1/', self.admin_client, 200)
+        self.check_url('/motions/1/', self.registered_client, 403)
         self.motion1.set_state(state=State.objects.get(name='permitted'))
         self.motion1.save()
-        self.check_url('/motion/1/', self.registered_client, 200)
+        self.check_url('/motions/1/', self.registered_client, 200)
 
     def test_get_without_required_permission_from_state_but_by_submitter(self):
-        self.motion1.state.required_permission_to_see = 'motion.can_manage_motion'
+        self.motion1.state.required_permission_to_see = 'motions.can_manage'
         self.motion1.state.save()
         self.motion1.add_submitter(self.registered)
-        self.check_url('/motion/1/', self.registered_client, 200)
+        self.check_url('/motions/1/', self.registered_client, 200)
 
 
 class TestMotionDetailVersionView(MotionViewTestCase):
     def test_get(self):
         self.motion1.title = 'AFWEROBjwerGwer'
         self.motion1.save(use_version=self.motion1.get_new_version())
-        self.check_url('/motion/1/version/1/', self.admin_client, 200)
-        response = self.check_url('/motion/1/version/2/', self.admin_client, 200)
+        self.check_url('/motions/1/version/1/', self.admin_client, 200)
+        response = self.check_url('/motions/1/version/2/', self.admin_client, 200)
         self.assertContains(response, 'AFWEROBjwerGwer')
-        self.check_url('/motion/1/version/500/', self.admin_client, 404)
+        self.check_url('/motions/1/version/500/', self.admin_client, 404)
 
 
 class TestMotionVersionDiffView(MotionViewTestCase):
@@ -147,22 +147,22 @@ class TestMotionVersionDiffView(MotionViewTestCase):
         self.motion1.save(use_version=self.motion1.get_new_version())
 
         response = self.registered_client.get(
-            '/motion/1/diff/',
+            '/motions/1/diff/',
             {'rev1': '1', 'rev2': '2'})
         self.assertNotContains(response, 'At least one version number is not valid.')
         self.assertEqual(response.status_code, 200)
 
-        self.motion1.state.required_permission_to_see = 'motion.can_manage_motion'
+        self.motion1.state.required_permission_to_see = 'motions.can_manage'
         self.motion1.state.save()
 
         response = self.registered_client.get(
-            '/motion/1/diff/',
+            '/motions/1/diff/',
             {'rev1': '1', 'rev2': '2'})
         self.assertEqual(response.status_code, 403)
 
 
 class TestMotionCreateView(MotionViewTestCase):
-    url = '/motion/new/'
+    url = '/motions/new/'
 
     def test_get(self):
         self.check_url(self.url, self.admin_client, 200)
@@ -199,8 +199,8 @@ class TestMotionCreateView(MotionViewTestCase):
 
     def test_delegate_after_stop_submitting_new_motions_overview(self):
         config['motion_stop_submitting'] = True
-        response = self.delegate_client.get('/motion/')
-        self.assertNotContains(response, 'href="/motion/new/"', status_code=200)
+        response = self.delegate_client.get('/motions/')
+        self.assertNotContains(response, 'href="/motions/new/"', status_code=200)
 
     def test_staff_after_stop_submitting_new_motions(self):
         config['motion_stop_submitting'] = True
@@ -209,8 +209,8 @@ class TestMotionCreateView(MotionViewTestCase):
 
     def test_staff_after_stop_submitting_new_motions_overview(self):
         config['motion_stop_submitting'] = True
-        response = self.staff_client.get('/motion/')
-        self.assertContains(response, 'href="/motion/new/"', status_code=200)
+        response = self.staff_client.get('/motions/')
+        self.assertContains(response, 'href="/motions/new/"', status_code=200)
 
     def test_identifier_not_unique(self):
         Motion.objects.create(title='Another motion 3', identifier='uufag5faoX0thahBi8Fo')
@@ -245,7 +245,7 @@ class TestMotionCreateView(MotionViewTestCase):
 
 
 class TestMotionCreateAmendmentView(MotionViewTestCase):
-    url = '/motion/1/new_amendment/'
+    url = '/motions/1/new_amendment/'
 
     def test_get_amendment_active(self):
         config['motion_amendments_enabled'] = True
@@ -306,7 +306,7 @@ class TestMotionCreateAmendmentView(MotionViewTestCase):
 
 
 class TestMotionUpdateView(MotionViewTestCase):
-    url = '/motion/1/edit/'
+    url = '/motions/1/edit/'
 
     def test_get(self):
         self.check_url(self.url, self.admin_client, 200)
@@ -317,7 +317,7 @@ class TestMotionUpdateView(MotionViewTestCase):
                                                      'reason': 'motion reason',
                                                      'submitter': self.admin.id,
                                                      'workflow': 1})
-        self.assertRedirects(response, '/motion/1/')
+        self.assertRedirects(response, '/motions/1/')
         motion = Motion.objects.get(pk=1)
         self.assertEqual(motion.title, 'new motion_title')
 
@@ -331,7 +331,7 @@ class TestMotionUpdateView(MotionViewTestCase):
         response = self.delegate_client.post(self.url, {'title': 'my title',
                                                         'text': 'motion text',
                                                         'reason': 'motion reason'})
-        self.assertRedirects(response, '/motion/1/')
+        self.assertRedirects(response, '/motions/1/')
         motion = Motion.objects.get(pk=1)
         self.assertEqual(motion.title, 'my title')
 
@@ -350,7 +350,7 @@ class TestMotionUpdateView(MotionViewTestCase):
                                                      'reason': 'another motion reason',
                                                      'workflow': workflow.pk,
                                                      'submitter': self.admin.id})
-        self.assertRedirects(response, '/motion/1/')
+        self.assertRedirects(response, '/motions/1/')
         motion = Motion.objects.get(pk=self.motion1.pk)
         self.assertEqual(motion.versions.count(), 2)
 
@@ -371,7 +371,7 @@ class TestMotionUpdateView(MotionViewTestCase):
                                                      'submitter': self.admin.id,
                                                      'workflow': workflow.pk,
                                                      'disable_versioning': 'true'})
-        self.assertRedirects(response, '/motion/1/')
+        self.assertRedirects(response, '/motions/1/')
         motion = Motion.objects.get(pk=self.motion1.pk)
         self.assertEqual(motion.versions.count(), 1)
 
@@ -393,7 +393,7 @@ class TestMotionUpdateView(MotionViewTestCase):
                                                      'reason': 'ier2laiy1veeGoo0mau2',
                                                      'workflow': workflow.pk,
                                                      'submitter': self.admin.id})
-        self.assertRedirects(response, '/motion/1/')
+        self.assertRedirects(response, '/motions/1/')
         motion = Motion.objects.get(pk=self.motion1.pk)
         self.assertEqual(motion.versions.count(), 1)
 
@@ -407,25 +407,25 @@ class TestMotionUpdateView(MotionViewTestCase):
                                                      'text': 'eequei1Tee1aegeNgee0',
                                                      'submitter': self.admin.id,
                                                      'workflow': 2})
-        self.assertRedirects(response, '/motion/1/')
+        self.assertRedirects(response, '/motions/1/')
         self.assertEqual(Motion.objects.get(pk=self.motion1.pk).state.workflow.pk, 2)
 
     def test_remove_supporters(self):
         # Setup a new motion with one supporter
         config['motion_min_supporters'] = 1
         motion = Motion.objects.create(title='cuoPhoX4Baifoxoothi3', text='zee7xei3taediR9loote')
-        response = self.staff_client.get('/motion/%s/' % motion.id)
+        response = self.staff_client.get('/motions/%s/' % motion.id)
         self.assertNotContains(response, 'aengeing3quair3fieGi')
 
         motion.support(self.registered)
         self.registered.last_name = 'aengeing3quair3fieGi'
         self.registered.save()
-        response = self.staff_client.get('/motion/%s/' % motion.id)
+        response = self.staff_client.get('/motions/%s/' % motion.id)
         self.assertContains(response, 'aengeing3quair3fieGi')
 
         # Check editing by submitter
         response = self.delegate_client.post(
-            '/motion/%s/edit/' % motion.id,
+            '/motions/%s/edit/' % motion.id,
             {'title': 'oori4KiaghaeSeuzaim2',
              'text': 'eequei1Tee1aegeNgee0',
              'submitter': self.delegate.id})
@@ -437,10 +437,10 @@ class TestMotionUpdateView(MotionViewTestCase):
             if i == 1:
                 config['motion_remove_supporters'] = True
             response = self.delegate_client.post(
-                '/motion/%s/edit/' % motion.id,
+                '/motions/%s/edit/' % motion.id,
                 {'title': 'iezae8reevaT6phiesoa',
                  'text': 'Lohjuu1aebewiu2or3oh'})
-            self.assertRedirects(response, '/motion/%s/' % motion.id)
+            self.assertRedirects(response, '/motions/%s/' % motion.id)
             if i == 0 or i == 2:
                 self.assertTrue(self.registered in Motion.objects.get(pk=motion.pk).supporters)
             else:
@@ -468,7 +468,7 @@ class TestMotionUpdateView(MotionViewTestCase):
         motion.save(use_version=False)
         self.assertNotEqual(motion.active_version, motion.get_last_version())
 
-        response = self.admin_client.get('/motion/%s/edit/' % motion.id)
+        response = self.admin_client.get('/motions/%s/edit/' % motion.id)
         self.assertEqual(response.context['form'].initial['text'], 'tpdfgojwerldkfgertdfg')
 
     def test_log(self):
@@ -523,18 +523,18 @@ class TestMotionUpdateView(MotionViewTestCase):
 
 class TestMotionDeleteView(MotionViewTestCase):
     def test_get(self):
-        response = self.check_url('/motion/2/del/', self.admin_client, 302)
-        self.assertRedirects(response, '/motion/2/')
+        response = self.check_url('/motions/2/del/', self.admin_client, 302)
+        self.assertRedirects(response, '/motions/2/')
 
     def test_admin(self):
-        response = self.admin_client.post('/motion/2/del/', {'yes': 'yes'})
-        self.assertRedirects(response, '/motion/')
+        response = self.admin_client.post('/motions/2/del/', {'yes': 'yes'})
+        self.assertRedirects(response, '/motions/')
 
     def test_delegate(self):
-        response = self.delegate_client.post('/motion/2/del/', {'yes': 'yes'})
+        response = self.delegate_client.post('/motions/2/del/', {'yes': 'yes'})
         self.assertEqual(response.status_code, 403)
         Motion.objects.get(pk=2).add_submitter(self.delegate)
-        response = self.delegate_client.post('/motion/2/del/', {'yes': 'yes'})
+        response = self.delegate_client.post('/motions/2/del/', {'yes': 'yes'})
         self.assertEqual(response.status_code, 403)
 
 
@@ -545,13 +545,13 @@ class TestVersionPermitView(MotionViewTestCase):
         self.motion1.save(use_version=self.motion1.get_new_version())
 
     def test_get(self):
-        response = self.check_url('/motion/1/version/2/permit/', self.admin_client, 302)
-        self.assertRedirects(response, '/motion/1/version/2/')
+        response = self.check_url('/motions/1/version/2/permit/', self.admin_client, 302)
+        self.assertRedirects(response, '/motions/1/version/2/')
 
     def test_post(self):
         new_version = self.motion1.get_last_version()
-        response = self.admin_client.post('/motion/1/version/2/permit/', {'yes': 1})
-        self.assertRedirects(response, '/motion/1/')
+        response = self.admin_client.post('/motions/1/version/2/permit/', {'yes': 1})
+        self.assertRedirects(response, '/motions/1/')
         self.assertEqual(self.motion1.get_active_version(), new_version)
 
     def test_activate_old_version(self):
@@ -561,7 +561,7 @@ class TestVersionPermitView(MotionViewTestCase):
         self.motion1.active_version = new_version
         self.motion1.save()
         self.assertEqual(self.motion1.versions.count(), 2)
-        self.admin_client.post('/motion/1/version/1/permit/', {'yes': 1})
+        self.admin_client.post('/motions/1/version/1/permit/', {'yes': 1})
         self.motion1 = Motion.objects.get(pk=1)
         self.assertEqual(self.motion1.active_version, first_version)
         self.assertEqual(self.motion1.versions.count(), 2)
@@ -570,8 +570,8 @@ class TestVersionPermitView(MotionViewTestCase):
 class TestVersionDeleteView(MotionViewTestCase):
     def test_get(self):
         self.motion1.save(use_version=self.motion1.get_new_version(title='new', text='new'))
-        response = self.check_url('/motion/1/version/1/del/', self.admin_client, 302)
-        self.assertRedirects(response, '/motion/1/version/1/')
+        response = self.check_url('/motions/1/version/1/del/', self.admin_client, 302)
+        self.assertRedirects(response, '/motions/1/version/1/')
 
     def test_post(self):
         new_version = self.motion1.get_new_version
@@ -579,31 +579,31 @@ class TestVersionDeleteView(MotionViewTestCase):
         self.motion1.save(use_version=new_version(title='new2', text='new'))
         self.assertEqual(self.motion1.versions.count(), 3)
 
-        response = self.admin_client.post('/motion/1/version/2/del/', {'yes': 1})
-        self.assertRedirects(response, '/motion/1/')
+        response = self.admin_client.post('/motions/1/version/2/del/', {'yes': 1})
+        self.assertRedirects(response, '/motions/1/')
         self.assertEqual(self.motion1.versions.count(), 2)
 
     def test_delete_active_version(self):
         self.motion1.save(use_version=self.motion1.get_new_version(title='new_title_yae6Aequaiw5saeb8suG', text='new'))
         motion = Motion.objects.all()[0]
         self.assertEqual(motion.get_active_version().title, 'new_title_yae6Aequaiw5saeb8suG')
-        response = self.admin_client.post('/motion/1/version/2/del/', {'yes': 1})
+        response = self.admin_client.post('/motions/1/version/2/del/', {'yes': 1})
         self.assertEqual(response.status_code, 404)
 
 
 class MotionSetStatusView(MotionViewTestCase):
     def test_set_status(self):
         self.assertEqual(self.motion1.state, State.objects.get(name='submitted'))
-        self.check_url('/motion/1/set_state/4/', self.registered_client, 403)
-        response = self.staff_client.get('/motion/1/set_state/4/')
-        self.assertRedirects(response, '/motion/1/')
+        self.check_url('/motions/1/set_state/4/', self.registered_client, 403)
+        response = self.staff_client.get('/motions/1/set_state/4/')
+        self.assertRedirects(response, '/motions/1/')
         self.assertEqual(Motion.objects.get(pk=1).state, State.objects.get(name='not decided'))
-        response = self.staff_client.get('/motion/1/set_state/1/')
+        response = self.staff_client.get('/motions/1/set_state/1/')
         self.assertTrue('You can not set the state of the motion to submitted.' in response.cookies['messages'].value)
-        self.assertRedirects(response, '/motion/1/')
-        response = self.staff_client.get('/motion/1/set_state/4/')
+        self.assertRedirects(response, '/motions/1/')
+        response = self.staff_client.get('/motions/1/set_state/4/')
         self.assertTrue('You can not set the state of the motion. It is already done.' in response.cookies['messages'].value)
-        self.assertRedirects(response, '/motion/1/')
+        self.assertRedirects(response, '/motions/1/')
 
 
 class CategoryViewsTest(TestCase):
@@ -612,34 +612,34 @@ class CategoryViewsTest(TestCase):
         self.admin_client.login(username='admin', password='admin')
 
     def test_create(self):
-        url = '/motion/category/new/'
+        url = '/motions/category/new/'
         response = self.admin_client.get(url)
-        self.assertTemplateUsed(response, 'motion/category_form.html')
+        self.assertTemplateUsed(response, 'motions/category_form.html')
         response = self.admin_client.post(url, {'name': 'test_title_eingee0hiveeZ6coohoo'})
-        self.assertRedirects(response, '/motion/category/')
+        self.assertRedirects(response, '/motions/category/')
         self.assertTrue(Category.objects.filter(name='test_title_eingee0hiveeZ6coohoo').exists())
 
     def test_update(self):
         # Setup
-        url = '/motion/category/1/edit/'
+        url = '/motions/category/1/edit/'
         Category.objects.create(name='test_title_chu6zu3deithae1gooL1')
         # Test
         response = self.admin_client.get(url)
-        self.assertTemplateUsed(response, 'motion/category_form.html')
+        self.assertTemplateUsed(response, 'motions/category_form.html')
         self.assertContains(response, 'test_title_chu6zu3deithae1gooL1')
         response = self.admin_client.post(url, {'name': 'test_title_jaiShae1sheingahlee2'})
-        self.assertRedirects(response, '/motion/category/')
+        self.assertRedirects(response, '/motions/category/')
         self.assertEqual(Category.objects.get(pk=1).name, 'test_title_jaiShae1sheingahlee2')
 
     def test_delete(self):
         # Setup
-        url = '/motion/category/1/del/'
+        url = '/motions/category/1/del/'
         Category.objects.create(name='test_title_nei1wooHes2aiquuraep')
         # Test
         response = self.admin_client.get(url)
-        self.assertRedirects(response, '/motion/category/')
+        self.assertRedirects(response, '/motions/category/')
         response = self.admin_client.post(url, {'yes': 'true'})
-        self.assertRedirects(response, '/motion/category/')
+        self.assertRedirects(response, '/motions/category/')
         self.assertFalse(Category.objects.exists())
 
 
@@ -653,7 +653,7 @@ class PollUpdateViewTest(TestCase):
         Tests that a 404 is returned, when a non existing poll is requested
         """
         Motion.objects.create(title='test_motion')
-        url = '/motion/1/poll/1/edit/'
+        url = '/motions/1/poll/1/edit/'
 
         response = self.admin_client.get(url)