diff --git a/mayan/apps/acls/views.py b/mayan/apps/acls/views.py
index 2028cc93a0..7e0b7b37b1 100644
--- a/mayan/apps/acls/views.py
+++ b/mayan/apps/acls/views.py
@@ -12,7 +12,7 @@ from django.utils.translation import ugettext_lazy as _
 from mayan.apps.common.mixins import (
     ContentTypeViewMixin, ExternalObjectMixin
 )
-from mayan.apps.common.views import (
+from mayan.apps.common.generics import (
     AssignRemoveView, SingleObjectCreateView, SingleObjectDeleteView,
     SingleObjectListView
 )
diff --git a/mayan/apps/cabinets/views.py b/mayan/apps/cabinets/views.py
index 1b4e1a559a..c244dd70ff 100644
--- a/mayan/apps/cabinets/views.py
+++ b/mayan/apps/cabinets/views.py
@@ -10,7 +10,7 @@ from django.utils.translation import ugettext_lazy as _
 from django.utils.translation import ungettext
 
 from mayan.apps.acls.models import AccessControlList
-from mayan.apps.common.views import (
+from mayan.apps.common.generics import (
     MultipleObjectFormActionView, SingleObjectCreateView,
     SingleObjectDeleteView, SingleObjectEditView, SingleObjectListView
 )
diff --git a/mayan/apps/converter/views.py b/mayan/apps/converter/views.py
index b55789d0b1..8aa4b5089c 100644
--- a/mayan/apps/converter/views.py
+++ b/mayan/apps/converter/views.py
@@ -10,7 +10,7 @@ from django.urls import reverse
 from django.utils.translation import ugettext_lazy as _
 
 from mayan.apps.acls.models import AccessControlList
-from mayan.apps.common.views import (
+from mayan.apps.common.generics import (
     SingleObjectCreateView, SingleObjectDeleteView, SingleObjectEditView,
     SingleObjectListView
 )
diff --git a/mayan/apps/document_indexing/views.py b/mayan/apps/document_indexing/views.py
index 8b8ee0bb15..5b974d6cd1 100644
--- a/mayan/apps/document_indexing/views.py
+++ b/mayan/apps/document_indexing/views.py
@@ -9,7 +9,7 @@ from django.utils.translation import ugettext_lazy as _
 from django.utils.translation import ungettext
 
 from mayan.apps.acls.models import AccessControlList
-from mayan.apps.common.views import (
+from mayan.apps.common.generics import (
     AssignRemoveView, FormView, SingleObjectCreateView, SingleObjectDeleteView,
     SingleObjectEditView, SingleObjectListView
 )
diff --git a/mayan/apps/document_states/views/workflow_instance_views.py b/mayan/apps/document_states/views/workflow_instance_views.py
index 8633531fcc..cc6a1be8cb 100644
--- a/mayan/apps/document_states/views/workflow_instance_views.py
+++ b/mayan/apps/document_states/views/workflow_instance_views.py
@@ -7,7 +7,7 @@ from django.utils.translation import ugettext_lazy as _
 
 from mayan.apps.acls.models import AccessControlList
 from mayan.apps.common.mixins import ExternalObjectMixin
-from mayan.apps.common.views import FormView, SingleObjectListView
+from mayan.apps.common.generics import FormView, SingleObjectListView
 from mayan.apps.documents.models import Document
 
 from ..forms import WorkflowInstanceTransitionForm
diff --git a/mayan/apps/document_states/views/workflow_proxy_views.py b/mayan/apps/document_states/views/workflow_proxy_views.py
index aa9c90ede3..68cc93fcdc 100644
--- a/mayan/apps/document_states/views/workflow_proxy_views.py
+++ b/mayan/apps/document_states/views/workflow_proxy_views.py
@@ -5,7 +5,7 @@ from django.template import RequestContext
 from django.utils.translation import ugettext_lazy as _
 
 from mayan.apps.common.mixins import ExternalObjectMixin
-from mayan.apps.common.views import SingleObjectListView
+from mayan.apps.common.generics import SingleObjectListView
 from mayan.apps.documents.models import Document
 from mayan.apps.documents.views import DocumentListView
 
diff --git a/mayan/apps/document_states/views/workflow_views.py b/mayan/apps/document_states/views/workflow_views.py
index d33af2624b..b124da1fce 100644
--- a/mayan/apps/document_states/views/workflow_views.py
+++ b/mayan/apps/document_states/views/workflow_views.py
@@ -9,7 +9,7 @@ from django.urls import reverse, reverse_lazy
 from django.utils.translation import ugettext_lazy as _
 
 from mayan.apps.common.mixins import ExternalObjectMixin
-from mayan.apps.common.views import (
+from mayan.apps.common.generics import (
     AssignRemoveView, ConfirmView, FormView, SingleObjectCreateView,
     SingleObjectDeleteView, SingleObjectDetailView,
     SingleObjectDynamicFormCreateView, SingleObjectDynamicFormEditView,
diff --git a/mayan/apps/file_metadata/views.py b/mayan/apps/file_metadata/views.py
index 1efe7adaa4..7d87259270 100644
--- a/mayan/apps/file_metadata/views.py
+++ b/mayan/apps/file_metadata/views.py
@@ -8,7 +8,7 @@ from django.utils.translation import ugettext_lazy as _
 from django.utils.translation import ungettext
 
 from mayan.apps.acls.models import AccessControlList
-from mayan.apps.common.views import (
+from mayan.apps.common.generics import (
     FormView, MultipleObjectConfirmActionView, SingleObjectEditView,
     SingleObjectListView
 )
diff --git a/mayan/apps/motd/views.py b/mayan/apps/motd/views.py
index 0abc8b2266..e7dd6202d7 100644
--- a/mayan/apps/motd/views.py
+++ b/mayan/apps/motd/views.py
@@ -6,7 +6,7 @@ from django.template import RequestContext
 from django.urls import reverse_lazy
 from django.utils.translation import ugettext_lazy as _
 
-from mayan.apps.common.views import (
+from mayan.apps.common.generics import (
     SingleObjectCreateView, SingleObjectDeleteView, SingleObjectEditView,
     SingleObjectListView
 )
diff --git a/mayan/apps/permissions/views.py b/mayan/apps/permissions/views.py
index db89b01d23..06c63c04dc 100644
--- a/mayan/apps/permissions/views.py
+++ b/mayan/apps/permissions/views.py
@@ -10,7 +10,7 @@ from django.utils.encoding import force_text
 from django.utils.translation import ugettext_lazy as _
 
 from mayan.apps.acls.models import AccessControlList
-from mayan.apps.common.views import (
+from mayan.apps.common.generics import (
     AssignRemoveView, SingleObjectCreateView, SingleObjectDeleteView,
     SingleObjectEditView, SingleObjectListView
 )
diff --git a/mayan/apps/smart_settings/views.py b/mayan/apps/smart_settings/views.py
index d723b9db92..92b881c594 100644
--- a/mayan/apps/smart_settings/views.py
+++ b/mayan/apps/smart_settings/views.py
@@ -5,7 +5,7 @@ from django.http import Http404
 from django.urls import reverse
 from django.utils.translation import ugettext_lazy as _
 
-from mayan.apps.common.views import FormView, SingleObjectListView
+from mayan.apps.common.generics import FormView, SingleObjectListView
 
 from .classes import Namespace, Setting
 from .forms import SettingForm
diff --git a/mayan/apps/sources/views.py b/mayan/apps/sources/views.py
index 96778a0dbe..14a02249fe 100644
--- a/mayan/apps/sources/views.py
+++ b/mayan/apps/sources/views.py
@@ -17,7 +17,7 @@ from mayan.apps.checkouts.models import NewVersionBlock
 from mayan.apps.common import menu_facet
 from mayan.apps.common.mixins import ExternalObjectMixin, ListModeMixin
 from mayan.apps.common.models import SharedUploadedFile
-from mayan.apps.common.views import (
+from mayan.apps.common.generics import (
     ConfirmView, MultiFormView, SingleObjectCreateView, SingleObjectDeleteView,
     SingleObjectEditView, SingleObjectListView
 )
@@ -361,7 +361,7 @@ class UploadInteractiveView(UploadBaseView):
         )
 
         AccessControlList.objects.check_access(
-            permissions=permission_document_create, user=request.user,
+            permission=permission_document_create, user=request.user,
             obj=self.document_type
         )
 
@@ -541,7 +541,7 @@ class UploadInteractiveVersionView(UploadBaseView):
             )
 
         AccessControlList.objects.check_access(
-            permissions=permission_document_new_version,
+            permission=permission_document_new_version,
             user=self.request.user, obj=self.document
         )