diff --git a/apps/linking/__init__.py b/apps/linking/__init__.py
index 02af2176c8..ab1bdc616a 100644
--- a/apps/linking/__init__.py
+++ b/apps/linking/__init__.py
@@ -8,10 +8,10 @@ from documents.models import Document
 
 from linking.models import SmartLink, SmartLinkCondition
 
-PERMISSION_SMART_LINK_VIEW = {'namespace': 'linking', 'name': 'group_view', 'label': _(u'View existing smart links')}
-PERMISSION_SMART_LINK_CREATE = {'namespace': 'linking', 'name': 'group_create', 'label': _(u'Create new smart links')}
-PERMISSION_SMART_LINK_DELETE = {'namespace': 'linking', 'name': 'group_delete', 'label': _(u'Delete smart links')}
-PERMISSION_SMART_LINK_EDIT = {'namespace': 'linking', 'name': 'group_edit', 'label': _(u'Edit smart links')}
+PERMISSION_SMART_LINK_VIEW = {'namespace': 'linking', 'name': 'smart_link_view', 'label': _(u'View existing smart links')}
+PERMISSION_SMART_LINK_CREATE = {'namespace': 'linking', 'name': 'smart_link_create', 'label': _(u'Create new smart links')}
+PERMISSION_SMART_LINK_DELETE = {'namespace': 'linking', 'name': 'smart_link_delete', 'label': _(u'Delete smart links')}
+PERMISSION_SMART_LINK_EDIT = {'namespace': 'linking', 'name': 'smart_link_edit', 'label': _(u'Edit smart links')}
 
 set_namespace_title('linking', _(u'Smart links'))
 register_permission(PERMISSION_SMART_LINK_VIEW)
@@ -22,11 +22,11 @@ register_permission(PERMISSION_SMART_LINK_EDIT)
 smart_link_instance_view_link = {'text': _(u'smart links actions'), 'view': 'smart_link_instance_view', 'famfam': 'page_link', 'permissions': [PERMISSION_DOCUMENT_VIEW]}
 smart_link_instances_for_document = {'text': _(u'smart links'), 'view': 'smart_link_instances_for_document', 'args': 'object.pk', 'famfam': 'page_link', 'permissions': [PERMISSION_DOCUMENT_VIEW]}
 
-document_groups_setup = {'text': _(u'smart links'), 'view': 'document_group_list', 'icon': 'link.png', 'permissions': [PERMISSION_SMART_LINK_CREATE]}
-document_group_list = {'text': _(u'smart links list'), 'view': 'document_group_list', 'famfam': 'link', 'permissions': [PERMISSION_SMART_LINK_CREATE]}
-document_group_create = {'text': _(u'create new smart link'), 'view': 'document_group_create', 'famfam': 'link_add', 'permissions': [PERMISSION_SMART_LINK_CREATE]}
-document_group_edit = {'text': _(u'edit'), 'view': 'document_group_edit', 'args': 'smart_link.pk', 'famfam': 'link_edit', 'permissions': [PERMISSION_SMART_LINK_EDIT]}
-document_group_delete = {'text': _(u'delete'), 'view': 'document_group_delete', 'args': 'smart_link.pk', 'famfam': 'link_delete', 'permissions': [PERMISSION_SMART_LINK_DELETE]}
+smart_link_setup = {'text': _(u'smart links'), 'view': 'smart_link_list', 'icon': 'link.png', 'permissions': [PERMISSION_SMART_LINK_CREATE]}
+smart_link_list = {'text': _(u'smart links list'), 'view': 'smart_link_list', 'famfam': 'link', 'permissions': [PERMISSION_SMART_LINK_CREATE]}
+smart_link_create = {'text': _(u'create new smart link'), 'view': 'smart_link_create', 'famfam': 'link_add', 'permissions': [PERMISSION_SMART_LINK_CREATE]}
+smart_link_edit = {'text': _(u'edit'), 'view': 'smart_link_edit', 'args': 'smart_link.pk', 'famfam': 'link_edit', 'permissions': [PERMISSION_SMART_LINK_EDIT]}
+smart_link_delete = {'text': _(u'delete'), 'view': 'smart_link_delete', 'args': 'smart_link.pk', 'famfam': 'link_delete', 'permissions': [PERMISSION_SMART_LINK_DELETE]}
 
 smart_link_condition_list = {'text': _(u'conditions'), 'view': 'smart_link_condition_list', 'args': 'smart_link.pk', 'famfam': 'cog', 'permissions': [PERMISSION_SMART_LINK_CREATE, PERMISSION_SMART_LINK_CREATE]}
 smart_link_condition_create = {'text': _(u'create condition'), 'view': 'smart_link_condition_create', 'args': 'smart_link.pk', 'famfam': 'cog_add', 'permissions': [PERMISSION_SMART_LINK_CREATE, PERMISSION_SMART_LINK_EDIT]}
@@ -35,10 +35,10 @@ smart_link_condition_delete = {'text': _(u'delete'), 'view': 'smart_link_conditi
 
 register_links(Document, [smart_link_instances_for_document], menu_name='form_header')
 
-register_links(SmartLink, [document_group_edit, document_group_delete, smart_link_condition_list])
+register_links(SmartLink, [smart_link_edit, smart_link_delete, smart_link_condition_list])
 register_links(SmartLinkCondition, [smart_link_condition_edit, smart_link_condition_delete])
-register_links(['document_group_list', 'document_group_create', 'document_group_edit', 'document_group_delete', 'smart_link_condition_list', 'smart_link_condition_create', 'smart_link_condition_edit', 'smart_link_condition_delete'], [document_group_list, document_group_create], menu_name='sidebar')
+register_links(['smart_link_list', 'smart_link_create', 'smart_link_edit', 'smart_link_delete', 'smart_link_condition_list', 'smart_link_condition_create', 'smart_link_condition_edit', 'smart_link_condition_delete'], [smart_link_list, smart_link_create], menu_name='sidebar')
 register_links(['smart_link_condition_list', 'smart_link_condition_create', 'smart_link_condition_edit', 'smart_link_condition_delete'], [smart_link_condition_create], menu_name='sidebar')
 
-register_setup(document_groups_setup)
-register_sidebar_template(['document_group_list'], 'smart_links_help.html')
+register_setup(smart_link_setup)
+register_sidebar_template(['smart_link_list'], 'smart_links_help.html')
diff --git a/apps/linking/urls.py b/apps/linking/urls.py
index 0a00851384..080a180b2b 100644
--- a/apps/linking/urls.py
+++ b/apps/linking/urls.py
@@ -5,10 +5,10 @@ urlpatterns = patterns('linking.views',
     url(r'^document/(?P<document_id>\d+)/smart_link/(?P<smart_link_pk>\d+)/$', 'smart_link_instance_view', (), 'smart_link_instance_view'),
     url(r'^smart/for_document/(?P<document_id>\d+)/$', 'smart_link_instances_for_document', (), 'smart_link_instances_for_document'),
     
-    url(r'^setup/list/$', 'document_group_list', (), 'document_group_list'),
-    url(r'^setup/create/$', 'document_group_create', (), 'document_group_create'),
-    url(r'^setup/(?P<smart_link_pk>\d+)/delete/$', 'document_group_delete', (), 'document_group_delete'),
-    url(r'^setup/(?P<smart_link_pk>\d+)/edit/$', 'document_group_edit', (), 'document_group_edit'),
+    url(r'^setup/list/$', 'smart_link_list', (), 'smart_link_list'),
+    url(r'^setup/create/$', 'smart_link_create', (), 'smart_link_create'),
+    url(r'^setup/(?P<smart_link_pk>\d+)/delete/$', 'smart_link_delete', (), 'smart_link_delete'),
+    url(r'^setup/(?P<smart_link_pk>\d+)/edit/$', 'smart_link_edit', (), 'smart_link_edit'),
     
     url(r'^setup/(?P<smart_link_pk>\d+)/condition/list/$', 'smart_link_condition_list', (), 'smart_link_condition_list'),
     url(r'^setup/(?P<smart_link_pk>\d+)/condition/create/$', 'smart_link_condition_create', (), 'smart_link_condition_create'),
diff --git a/apps/linking/views.py b/apps/linking/views.py
index 1e948ee9b0..2b1770cb12 100644
--- a/apps/linking/views.py
+++ b/apps/linking/views.py
@@ -98,7 +98,7 @@ def smart_link_instances_for_document(request, document_id):
     }, context_instance=RequestContext(request))
     
     
-def document_group_list(request):
+def smart_link_list(request):
     check_permissions(request.user, [PERMISSION_SMART_LINK_CREATE])
     
     return render_to_response('generic_list.html', {
@@ -114,7 +114,7 @@ def document_group_list(request):
         }, context_instance=RequestContext(request))
         
         
-def document_group_create(request):
+def smart_link_create(request):
     check_permissions(request.user, [PERMISSION_SMART_LINK_CREATE])
 
     if request.method == 'POST':
@@ -132,7 +132,7 @@ def document_group_create(request):
     }, context_instance=RequestContext(request))    
     
     
-def document_group_edit(request, smart_link_pk):
+def smart_link_edit(request, smart_link_pk):
     check_permissions(request.user, [PERMISSION_SMART_LINK_EDIT])
     
     smart_link = get_object_or_404(SmartLink, pk=smart_link_pk)
@@ -154,7 +154,7 @@ def document_group_edit(request, smart_link_pk):
     }, context_instance=RequestContext(request))    
         
     
-def document_group_delete(request, smart_link_pk):
+def smart_link_delete(request, smart_link_pk):
     check_permissions(request.user, [PERMISSION_SMART_LINK_DELETE])
     
     smart_link = get_object_or_404(SmartLink, pk=smart_link_pk)