diff --git a/mayan/apps/cabinets/apps.py b/mayan/apps/cabinets/apps.py
index 3328fcf0e8..99c736e45a 100644
--- a/mayan/apps/cabinets/apps.py
+++ b/mayan/apps/cabinets/apps.py
@@ -9,7 +9,7 @@ from mayan.apps.acls.permissions import (
 )
 from mayan.apps.common import (
     MayanAppConfig, menu_facet, menu_main, menu_multi_item, menu_object,
-    menu_sidebar
+    menu_secondary
 )
 from mayan.apps.common.classes import ModelAttribute
 from mayan.apps.documents.search import document_page_search, document_search
@@ -123,7 +123,7 @@ class CabinetsApp(MayanAppConfig):
                 link_cabinet_delete
             ), sources=(Cabinet,)
         )
-        menu_sidebar.bind_links(
+        menu_secondary.bind_links(
             links=(link_document_cabinet_add, link_document_cabinet_remove),
             sources=(
                 'cabinets:document_cabinet_list',
diff --git a/mayan/apps/checkouts/apps.py b/mayan/apps/checkouts/apps.py
index 5d86957907..8253583175 100644
--- a/mayan/apps/checkouts/apps.py
+++ b/mayan/apps/checkouts/apps.py
@@ -10,7 +10,7 @@ from django.utils.translation import ugettext_lazy as _
 
 from mayan.apps.acls import ModelPermission
 from mayan.apps.common import (
-    MayanAppConfig, menu_facet, menu_main, menu_multi_item, menu_sidebar
+    MayanAppConfig, menu_facet, menu_main, menu_multi_item, menu_secondary
 )
 from mayan.apps.dashboards.dashboards import dashboard_main
 from mayan.apps.events import ModelEventType
@@ -128,7 +128,7 @@ class CheckoutsApp(MayanAppConfig):
                 link_document_multiple_check_in, link_document_multiple_checkout
             ), sources=(Document,)
         )
-        menu_sidebar.bind_links(
+        menu_secondary.bind_links(
             links=(link_document_checkout, link_document_check_in),
             sources=(
                 'checkouts:document_checkout_info', 'checkouts:document_checkout',
diff --git a/mayan/apps/converter/apps.py b/mayan/apps/converter/apps.py
index 920a73249a..c64b4f01d8 100644
--- a/mayan/apps/converter/apps.py
+++ b/mayan/apps/converter/apps.py
@@ -3,7 +3,7 @@ from __future__ import unicode_literals
 from django.utils.translation import ugettext_lazy as _
 
 from mayan.apps.acls.classes import ModelPermission
-from mayan.apps.common import MayanAppConfig, menu_object, menu_sidebar
+from mayan.apps.common import MayanAppConfig, menu_object, menu_secondary
 from mayan.apps.navigation import SourceColumn
 
 from .links import (
@@ -44,10 +44,10 @@ class ConverterApp(MayanAppConfig):
             links=(link_transformation_edit, link_transformation_delete),
             sources=(Transformation,)
         )
-        menu_sidebar.bind_links(
+        menu_secondary.bind_links(
             links=(link_transformation_create,), sources=(Transformation,)
         )
-        menu_sidebar.bind_links(
+        menu_secondary.bind_links(
             links=(link_transformation_create,),
             sources=(
                 'converter:transformation_create',
diff --git a/mayan/apps/django_gpg/apps.py b/mayan/apps/django_gpg/apps.py
index 2c501de5fd..aaa871ff83 100644
--- a/mayan/apps/django_gpg/apps.py
+++ b/mayan/apps/django_gpg/apps.py
@@ -6,7 +6,7 @@ from mayan.apps.acls import ModelPermission
 from mayan.apps.acls.links import link_acl_list
 from mayan.apps.acls.permissions import permission_acl_edit, permission_acl_view
 from mayan.apps.common import (
-    MayanAppConfig, menu_facet, menu_object, menu_setup, menu_sidebar
+    MayanAppConfig, menu_facet, menu_object, menu_setup, menu_secondary
 )
 from mayan.apps.navigation import SourceColumn
 
@@ -80,7 +80,7 @@ class DjangoGPGApp(MayanAppConfig):
                 'django_gpg:key_upload', Key, KeyStub
             )
         )
-        menu_sidebar.bind_links(
+        menu_secondary.bind_links(
             links=(link_key_query, link_key_upload),
             sources=(
                 'django_gpg:key_public_list', 'django_gpg:key_private_list',
diff --git a/mayan/apps/document_comments/apps.py b/mayan/apps/document_comments/apps.py
index a32ed30073..9223875a5e 100644
--- a/mayan/apps/document_comments/apps.py
+++ b/mayan/apps/document_comments/apps.py
@@ -5,7 +5,7 @@ from django.utils.translation import ugettext_lazy as _
 
 from mayan.apps.acls import ModelPermission
 from mayan.apps.common import (
-    MayanAppConfig, menu_facet, menu_object, menu_sidebar
+    MayanAppConfig, menu_facet, menu_object, menu_secondary
 )
 from mayan.apps.documents.search import document_page_search, document_search
 from mayan.apps.events import ModelEventType
@@ -74,7 +74,7 @@ class DocumentCommentsApp(MayanAppConfig):
             field='comments__comment'
         )
 
-        menu_sidebar.bind_links(
+        menu_secondary.bind_links(
             links=(link_comment_add,),
             sources=(
                 'comments:comments_for_document', 'comments:comment_add',
diff --git a/mayan/apps/document_signatures/apps.py b/mayan/apps/document_signatures/apps.py
index 587fb079f0..8c22c3807e 100644
--- a/mayan/apps/document_signatures/apps.py
+++ b/mayan/apps/document_signatures/apps.py
@@ -10,7 +10,7 @@ from kombu import Exchange, Queue
 
 from mayan.apps.acls import ModelPermission
 from mayan.apps.common import (
-    MayanAppConfig, menu_facet, menu_object, menu_sidebar, menu_tools
+    MayanAppConfig, menu_facet, menu_object, menu_secondary, menu_tools
 )
 from mayan.apps.navigation import SourceColumn
 from mayan.celery import app
@@ -145,7 +145,7 @@ class DocumentSignaturesApp(MayanAppConfig):
                 link_document_version_signature_delete,
             ), sources=(SignatureBaseModel,)
         )
-        menu_sidebar.bind_links(
+        menu_secondary.bind_links(
             links=(
                 link_document_version_signature_upload,
             ), sources=(DocumentVersion,)
diff --git a/mayan/apps/dynamic_search/apps.py b/mayan/apps/dynamic_search/apps.py
index fdd1008fc3..8aa6ea6cb8 100644
--- a/mayan/apps/dynamic_search/apps.py
+++ b/mayan/apps/dynamic_search/apps.py
@@ -2,7 +2,7 @@ from __future__ import unicode_literals
 
 from django.utils.translation import ugettext_lazy as _
 
-from mayan.apps.common import MayanAppConfig, menu_facet, menu_sidebar
+from mayan.apps.common import MayanAppConfig, menu_facet, menu_secondary
 
 from .links import link_search, link_search_advanced, link_search_again
 
@@ -24,6 +24,6 @@ class DynamicSearchApp(MayanAppConfig):
                 'search:search', 'search:search_advanced', 'search:results'
             )
         )
-        menu_sidebar.bind_links(
+        menu_secondary.bind_links(
             links=(link_search_again,), sources=('search:results',)
         )
diff --git a/mayan/apps/linking/apps.py b/mayan/apps/linking/apps.py
index 05890f0d6a..d645dcbe9e 100644
--- a/mayan/apps/linking/apps.py
+++ b/mayan/apps/linking/apps.py
@@ -10,7 +10,7 @@ from mayan.apps.acls.permissions import (
 )
 from mayan.apps.common import (
     MayanAppConfig, menu_facet, menu_list_facet, menu_object, menu_secondary,
-    menu_setup, menu_sidebar
+    menu_setup, menu_secondary
 )
 from mayan.apps.common.widgets import TwoStateWidget
 from mayan.apps.navigation import SourceColumn
@@ -108,7 +108,7 @@ class LinkingApp(MayanAppConfig):
             )
         )
         menu_setup.bind_links(links=(link_smart_link_setup,))
-        menu_sidebar.bind_links(
+        menu_secondary.bind_links(
             links=(link_smart_link_condition_create,),
             sources=(
                 'linking:smart_link_condition_list',
diff --git a/mayan/apps/metadata/apps.py b/mayan/apps/metadata/apps.py
index 99d227ccd8..6973a6811d 100644
--- a/mayan/apps/metadata/apps.py
+++ b/mayan/apps/metadata/apps.py
@@ -13,7 +13,7 @@ from mayan.apps.acls.links import link_acl_list
 from mayan.apps.acls.permissions import permission_acl_edit, permission_acl_view
 from mayan.apps.common import (
     MayanAppConfig, menu_facet, menu_list_facet, menu_multi_item, menu_object,
-    menu_secondary, menu_setup, menu_sidebar
+    menu_secondary, menu_setup, menu_secondary
 )
 from mayan.apps.common.classes import ModelAttribute, ModelField
 from mayan.apps.common.widgets import TwoStateWidget
@@ -237,7 +237,7 @@ class MetadataApp(MayanAppConfig):
             )
         )
         menu_setup.bind_links(links=(link_metadata_type_list,))
-        menu_sidebar.bind_links(
+        menu_secondary.bind_links(
             links=(
                 link_document_metadata_add, link_document_metadata_edit,
                 link_document_metadata_remove
diff --git a/mayan/apps/sources/apps.py b/mayan/apps/sources/apps.py
index 16510adc24..b32bb9e934 100644
--- a/mayan/apps/sources/apps.py
+++ b/mayan/apps/sources/apps.py
@@ -6,7 +6,7 @@ from kombu import Exchange, Queue
 
 from mayan.apps.common import (
     MayanAppConfig, MissingItem, menu_list_facet, menu_object, menu_secondary,
-    menu_setup, menu_sidebar
+    menu_setup, menu_secondary
 )
 from mayan.apps.common.signals import post_initial_setup, post_upgrade
 from mayan.apps.common.widgets import TwoStateWidget
@@ -171,7 +171,7 @@ class SourcesApp(MayanAppConfig):
             )
         )
         menu_setup.bind_links(links=(link_source_list,))
-        menu_sidebar.bind_links(
+        menu_secondary.bind_links(
             links=(link_upload_version,),
             sources=(
                 'documents:document_version_list', 'documents:upload_version',