diff --git a/apps/comments/__init__.py b/apps/document_comments/__init__.py
similarity index 100%
rename from apps/comments/__init__.py
rename to apps/document_comments/__init__.py
diff --git a/apps/comments/forms.py b/apps/document_comments/forms.py
similarity index 100%
rename from apps/comments/forms.py
rename to apps/document_comments/forms.py
diff --git a/apps/comments/locale/es/LC_MESSAGES/django.mo b/apps/document_comments/locale/es/LC_MESSAGES/django.mo
similarity index 100%
rename from apps/comments/locale/es/LC_MESSAGES/django.mo
rename to apps/document_comments/locale/es/LC_MESSAGES/django.mo
diff --git a/apps/comments/locale/es/LC_MESSAGES/django.po b/apps/document_comments/locale/es/LC_MESSAGES/django.po
similarity index 100%
rename from apps/comments/locale/es/LC_MESSAGES/django.po
rename to apps/document_comments/locale/es/LC_MESSAGES/django.po
diff --git a/apps/comments/models.py b/apps/document_comments/models.py
similarity index 100%
rename from apps/comments/models.py
rename to apps/document_comments/models.py
diff --git a/apps/comments/tests.py b/apps/document_comments/tests.py
similarity index 100%
rename from apps/comments/tests.py
rename to apps/document_comments/tests.py
diff --git a/apps/comments/urls.py b/apps/document_comments/urls.py
similarity index 100%
rename from apps/comments/urls.py
rename to apps/document_comments/urls.py
diff --git a/apps/comments/utils.py b/apps/document_comments/utils.py
similarity index 100%
rename from apps/comments/utils.py
rename to apps/document_comments/utils.py
diff --git a/apps/comments/views.py b/apps/document_comments/views.py
similarity index 100%
rename from apps/comments/views.py
rename to apps/document_comments/views.py
diff --git a/apps/documents/views.py b/apps/documents/views.py
index fc7ab0b0fa..6141704769 100644
--- a/apps/documents/views.py
+++ b/apps/documents/views.py
@@ -26,7 +26,7 @@ from filesystem_serving.conf.settings import FILESERVING_ENABLE
 from permissions.api import check_permissions
 from navigation.utils import resolve_to_name
 from tags.utils import get_tags_subtemplate
-from comments.utils import get_comments_subtemplate
+from document_comments.utils import get_comments_subtemplate
 
 from documents.conf.settings import DELETE_STAGING_FILE_AFTER_UPLOAD
 from documents.conf.settings import USE_STAGING_DIRECTORY
diff --git a/urls.py b/urls.py
index 5f34cfcae1..34ce9be978 100644
--- a/urls.py
+++ b/urls.py
@@ -18,7 +18,7 @@ urlpatterns = patterns('',
     (r'^admin/', include(admin.site.urls)),
     (r'^grappelli/', include('grappelli.urls')),
     (r'^sentry/', include('sentry.urls')),
-    (r'^comments/', include('comments.urls')),
+    (r'^comments/', include('document_comments.urls')),
 )