diff --git a/mayan/apps/document_indexing/api.py b/mayan/apps/document_indexing/api.py
index 843b81c0a2..a059512543 100644
--- a/mayan/apps/document_indexing/api.py
+++ b/mayan/apps/document_indexing/api.py
@@ -30,7 +30,7 @@ def update_indexes(document):
     warnings = []
 
     eval_dict = {}
-    document_metadata_dict = dict([(metadata.metadata_type.name, metadata.value) for metadata in document.documentmetadata_set.all() if metadata.value])
+    document_metadata_dict = dict([(metadata.metadata_type.name, metadata.value) for metadata in document.metadata.all() if metadata.value])
     eval_dict['document'] = document
     eval_dict['metadata'] = MetadataClass(document_metadata_dict)
 
diff --git a/mayan/apps/linking/managers.py b/mayan/apps/linking/managers.py
index 41d4275e15..bffd0c2fcd 100644
--- a/mayan/apps/linking/managers.py
+++ b/mayan/apps/linking/managers.py
@@ -14,7 +14,7 @@ class SmartLinkManager(models.Manager):
         errors = []
         result = {}
         metadata_dict = {}
-        for document_metadata in document.documentmetadata_set.all():
+        for document_metadata in document.metadata.all():
             metadata_dict[document_metadata.metadata_type.name] = document_metadata.value
         eval_dict = {}
         eval_dict['document'] = document
diff --git a/mayan/apps/metadata/models.py b/mayan/apps/metadata/models.py
index f7ab417862..48d28cb764 100644
--- a/mayan/apps/metadata/models.py
+++ b/mayan/apps/metadata/models.py
@@ -82,7 +82,7 @@ class DocumentMetadata(models.Model):
     Link a document to a specific instance of a metadata type with it's
     current value
     """
-    document = models.ForeignKey(Document, verbose_name=_(u'document'))
+    document = models.ForeignKey(Document, verbose_name=_(u'document'), related_name='metadata')
     metadata_type = models.ForeignKey(MetadataType, verbose_name=_(u'type'))
     value = models.CharField(max_length=255, blank=True, verbose_name=_(u'value'), db_index=True)
 
diff --git a/mayan/apps/metadata/views.py b/mayan/apps/metadata/views.py
index f5098dc838..7f6902d5f8 100644
--- a/mayan/apps/metadata/views.py
+++ b/mayan/apps/metadata/views.py
@@ -35,7 +35,7 @@ from .permissions import (PERMISSION_METADATA_DOCUMENT_EDIT,
 def metadata_edit(request, document_id=None, document_id_list=None):
     if document_id:
         documents = [get_object_or_404(Document, pk=document_id)]
-        if documents[0].documentmetadata_set.count() == 0:
+        if documents[0].metadata.count() == 0:
             messages.warning(request, _(u'The selected document doesn\'t have any metadata.'))
             return HttpResponseRedirect(request.META.get('HTTP_REFERER', '/'))
     elif document_id_list:
@@ -58,7 +58,7 @@ def metadata_edit(request, document_id=None, document_id_list=None):
     for document in documents:
         RecentDocument.objects.add_document_for_user(request.user, document)
 
-        for item in document.documentmetadata_set.all():
+        for item in document.metadata.all():
             value = item.value
             if item.metadata_type in metadata:
                 if value not in metadata[item.metadata_type]:
@@ -186,7 +186,7 @@ def metadata_multiple_add(request):
 def metadata_remove(request, document_id=None, document_id_list=None):
     if document_id:
         documents = [get_object_or_404(Document, pk=document_id)]
-        if documents[0].documentmetadata_set.count() == 0:
+        if documents[0].metadata.count() == 0:
             messages.warning(request, _(u'The selected document doesn\'t have any metadata.'))
             return HttpResponseRedirect(request.META.get('HTTP_REFERER', '/'))
 
@@ -210,7 +210,7 @@ def metadata_remove(request, document_id=None, document_id_list=None):
     for document in documents:
         RecentDocument.objects.add_document_for_user(request.user, document)
 
-        for item in document.documentmetadata_set.all():
+        for item in document.metadata.all():
             value = item.value
             if item.metadata_type in metadata:
                 if value not in metadata[item.metadata_type]:
@@ -274,7 +274,7 @@ def metadata_view(request, document_id):
 
     return render_to_response('generic_list.html', {
         'title': _(u'metadata for: %s') % document,
-        'object_list': document.documentmetadata_set.all(),
+        'object_list': document.metadata.all(),
         'extra_columns': [{'name': _(u'value'), 'attribute': 'value'}],
         'hide_link': True,
         'object': document,
diff --git a/mayan/apps/sources/views.py b/mayan/apps/sources/views.py
index 5581fe5008..16482a8bc0 100644
--- a/mayan/apps/sources/views.py
+++ b/mayan/apps/sources/views.py
@@ -53,7 +53,7 @@ def document_create_siblings(request, document_id):
 
     document = get_object_or_404(Document, pk=document_id)
     query_dict = {}
-    for pk, metadata in enumerate(document.documentmetadata_set.all()):
+    for pk, metadata in enumerate(document.metadata.all()):
         query_dict['metadata%s_id' % pk] = metadata.metadata_type_id
         query_dict['metadata%s_value' % pk] = metadata.value