diff --git a/mayan/apps/dynamic_search/classes.py b/mayan/apps/dynamic_search/classes.py
index 8ada5b90d7..f716843bdf 100644
--- a/mayan/apps/dynamic_search/classes.py
+++ b/mayan/apps/dynamic_search/classes.py
@@ -12,7 +12,7 @@ from django.utils.module_loading import import_string
 from acls.models import AccessEntry
 from permissions.models import Permission
 
-from .settings import LIMIT
+from .settings import setting_limit
 
 logger = logging.getLogger(__name__)
 
@@ -163,7 +163,7 @@ class SearchModel(object):
 
         elapsed_time = unicode(datetime.datetime.now() - start_time).split(':')[2]
 
-        queryset = self.model.objects.in_bulk(list(result_set)[: LIMIT.value]).values()
+        queryset = self.model.objects.in_bulk(list(result_set)[: setting_limit.value]).values()
 
         if self.permission:
             try:
diff --git a/mayan/apps/dynamic_search/managers.py b/mayan/apps/dynamic_search/managers.py
index 32f09570f5..46c68b1468 100644
--- a/mayan/apps/dynamic_search/managers.py
+++ b/mayan/apps/dynamic_search/managers.py
@@ -4,7 +4,7 @@ from django.contrib.auth.models import AnonymousUser
 from django.db import models
 from django.utils.http import urlencode
 
-from .settings import RECENT_COUNT
+from .settings import setting_recent_count
 
 
 class RecentSearchManager(models.Manager):
@@ -31,5 +31,5 @@ class RecentSearchManager(models.Manager):
                 new_recent.hits = hits
                 new_recent.save()
 
-            for recent_to_delete in self.model.objects.filter(user=user)[RECENT_COUNT.value:]:
+            for recent_to_delete in self.model.objects.filter(user=user)[setting_recent_count.value:]:
                 recent_to_delete.delete()
diff --git a/mayan/apps/dynamic_search/settings.py b/mayan/apps/dynamic_search/settings.py
index 81c75f409c..290464308e 100644
--- a/mayan/apps/dynamic_search/settings.py
+++ b/mayan/apps/dynamic_search/settings.py
@@ -6,6 +6,6 @@ from smart_settings import Namespace
 
 
 namespace = Namespace(name='dynamic_search', label=_('Search'))
-SHOW_OBJECT_TYPE = namespace.add_setting(global_name='SEARCH_SHOW_OBJECT_TYPE', default=True)
-LIMIT = namespace.add_setting(global_name='SEARCH_LIMIT', default=100, help_text=_('Maximum amount search hits to fetch and display.'))
-RECENT_COUNT = namespace.add_setting(global_name='SEARCH_RECENT_COUNT', default=5, help_text=_('Maximum number of search queries to remember per user.'))
+setting_show_object_type = namespace.add_setting(global_name='SEARCH_SHOW_OBJECT_TYPE', default=True)
+setting_limit = namespace.add_setting(global_name='SEARCH_LIMIT', default=100, help_text=_('Maximum amount search hits to fetch and display.'))
+setting_recent_count = namespace.add_setting(global_name='SEARCH_RECENT_COUNT', default=5, help_text=_('Maximum number of search queries to remember per user.'))
diff --git a/mayan/apps/dynamic_search/views.py b/mayan/apps/dynamic_search/views.py
index 1273ef790d..c7c2232c2e 100644
--- a/mayan/apps/dynamic_search/views.py
+++ b/mayan/apps/dynamic_search/views.py
@@ -12,7 +12,7 @@ from django.utils.translation import ugettext_lazy as _
 
 from .classes import SearchModel
 from .forms import SearchForm, AdvancedSearchForm
-from .settings import LIMIT, SHOW_OBJECT_TYPE
+from .settings import setting_limit, setting_show_object_type
 
 logger = logging.getLogger(__name__)
 
@@ -23,7 +23,7 @@ def results(request, extra_context=None):
     context = {
         'query_string': request.GET,
         'hide_links': True,
-        'search_results_limit': LIMIT.value,
+        'search_results_limit': setting_limit.value,
     }
 
     if request.GET:
@@ -42,7 +42,7 @@ def results(request, extra_context=None):
     if extra_context:
         context.update(extra_context)
 
-    if SHOW_OBJECT_TYPE.value:
+    if setting_show_object_type.value:
         context.update({
             'extra_columns': [{'name': _('Type'), 'attribute': lambda x: x._meta.verbose_name[0].upper() + x._meta.verbose_name[1:]}]
         })
@@ -63,7 +63,7 @@ def search(request, advanced=False):
                 'title': _('Advanced search'),
                 'form_action': reverse('search:results'),
                 'submit_method': 'GET',
-                'search_results_limit': LIMIT.value,
+                'search_results_limit': setting_limit.value,
                 'submit_label': _('Search'),
                 'submit_icon': 'fa fa-search',
             }, context_instance=RequestContext(request)