diff --git a/apps/comments/urls.py b/apps/comments/urls.py
index 680051c84f..abd63cb385 100644
--- a/apps/comments/urls.py
+++ b/apps/comments/urls.py
@@ -1,6 +1,6 @@
 from django.conf.urls.defaults import patterns, url
 
-urlpatterns = patterns('comments.views',
+urlpatterns = patterns('document_comments.views',
     url(r'^(?P<comment_id>\d+)/delete/$', 'comment_delete', (), 'comment_delete'),
     url(r'^multiple/delete/$', 'comment_multiple_delete', (), 'comment_multiple_delete'),
     url(r'^add_to_document(?P<document_id>\d+)/$', 'comment_add', (), 'comment_add'),
diff --git a/apps/comments/utils.py b/apps/comments/utils.py
index cea790479e..7f59249a09 100644
--- a/apps/comments/utils.py
+++ b/apps/comments/utils.py
@@ -1,6 +1,6 @@
 from django.utils.translation import ugettext_lazy as _
 from django.contrib.comments.models import Comment
-from comments import comment_delete
+from document_comments import comment_delete
 
 
 def get_comments_subtemplate(obj):
diff --git a/apps/comments/views.py b/apps/comments/views.py
index 1efd1ea6cf..e28b20f208 100644
--- a/apps/comments/views.py
+++ b/apps/comments/views.py
@@ -10,8 +10,8 @@ from django.contrib.sites.models import Site
 from permissions.api import check_permissions
 from documents.models import Document
 
-from comments import PERMISSION_COMMENT_DELETE, PERMISSION_COMMENT_CREATE
-from comments.forms import CommentForm
+from document_comments import PERMISSION_COMMENT_DELETE, PERMISSION_COMMENT_CREATE
+from document_comments.forms import CommentForm
 
 
 def comment_delete(request, comment_id=None, comment_id_list=None):
diff --git a/settings.py b/settings.py
index 699400892a..ec707449a8 100644
--- a/settings.py
+++ b/settings.py
@@ -142,7 +142,7 @@ INSTALLED_APPS = (
     'folders',
     'taggit',
     'tags',
-    'comments',
+    'document_comments',
 )
 
 TEMPLATE_CONTEXT_PROCESSORS = (