diff --git a/HISTORY.rst b/HISTORY.rst
index a6a56abea5..310ac8f4f8 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -45,6 +45,7 @@ Next (2018-XX-XX)
   test_document_page_views.py, test_document_type_views.py, test_document_version_views.py,
   test_document_views.py, test_duplicated_document_views.py
 - Sort smart links by label.
+- Rename the internal name of the document type permissions namespace. Existing permissions will need to be updated.
 
 2.8 (2018-02-27)
 ================
diff --git a/mayan/apps/documents/permissions.py b/mayan/apps/documents/permissions.py
index fd40d9303b..df40208190 100644
--- a/mayan/apps/documents/permissions.py
+++ b/mayan/apps/documents/permissions.py
@@ -51,9 +51,8 @@ permission_empty_trash = namespace.add_permission(
     name='document_empty_trash', label=_('Empty trash')
 )
 
-# TODO: rename 'document_setup' to 'document_types' on the next major version
 setup_namespace = PermissionNamespace(
-    'documents_setup', label=_('Document types')
+    'documents_types', label=_('Document types')
 )
 permission_document_type_create = setup_namespace.add_permission(
     name='document_type_create', label=_('Create document types')