diff --git a/mayan/apps/document_indexing/models.py b/mayan/apps/document_indexing/models.py
index e9f315484d..1e113d36b8 100644
--- a/mayan/apps/document_indexing/models.py
+++ b/mayan/apps/document_indexing/models.py
@@ -24,7 +24,7 @@ class Index(models.Model):
 
     @property
     def template_root(self):
-        return self.template_nodes.get(parent=None)
+        return self.node_templates.get(parent=None)
 
     @property
     def instance_root(self):
@@ -59,7 +59,7 @@ class Index(models.Model):
 
     @property
     def node_instances(self):
-        return [template_node.node_instance.get() for template_node in self.template_nodes.all()]
+        return [template_node.node_instance.get() for template_node in self.node_templates.all()]
 
     class Meta:
         verbose_name = _(u'Index')
@@ -68,7 +68,7 @@ class Index(models.Model):
 
 class IndexTemplateNode(MPTTModel):
     parent = TreeForeignKey('self', null=True, blank=True)
-    index = models.ForeignKey(Index, verbose_name=_(u'Index'), related_name='template_nodes')
+    index = models.ForeignKey(Index, verbose_name=_(u'Index'), related_name='node_templates')
     expression = models.CharField(max_length=128, verbose_name=_(u'Indexing expression'), help_text=_(u'Enter a python string expression to be evaluated.'))
     # % available_indexing_functions_string)
     enabled = models.BooleanField(default=True, verbose_name=_(u'Enabled'), help_text=_(u'Causes this node to be visible and updated when document data changes.'))
@@ -86,7 +86,7 @@ class IndexInstanceNode(MPTTModel):
     parent = TreeForeignKey('self', null=True, blank=True)
     index_template_node = models.ForeignKey(IndexTemplateNode, related_name='node_instance', verbose_name=_(u'Index template node'))
     value = models.CharField(max_length=128, blank=True, verbose_name=_(u'Value'))
-    documents = models.ManyToManyField(Document, related_name='index_instance_nodes', verbose_name=_(u'Documents'))
+    documents = models.ManyToManyField(Document, related_name='node_instances', verbose_name=_(u'Documents'))
 
     def __unicode__(self):
         return self.value
diff --git a/mayan/apps/document_indexing/serializers.py b/mayan/apps/document_indexing/serializers.py
index 925bdd5fba..f664641734 100644
--- a/mayan/apps/document_indexing/serializers.py
+++ b/mayan/apps/document_indexing/serializers.py
@@ -20,7 +20,7 @@ class IndexTemplateNodeSerializer(serializers.ModelSerializer):
 
 
 class IndexSerializer(serializers.ModelSerializer):
-    template_nodes = IndexTemplateNodeSerializer(read_only=True, many=True)
+    node_templates = IndexTemplateNodeSerializer(read_only=True, many=True)
     node_instances = IndexInstanceNodeSerializer(read_only=True, many=True)
 
     class Meta:
diff --git a/mayan/apps/document_indexing/views.py b/mayan/apps/document_indexing/views.py
index 7f6d7513a4..9dbc3628da 100644
--- a/mayan/apps/document_indexing/views.py
+++ b/mayan/apps/document_indexing/views.py
@@ -410,7 +410,7 @@ def document_index_list(request, document_id):
     document = get_object_or_404(Document, pk=document_id)
     object_list = []
 
-    queryset = document.indexinstancenode_set.all()
+    queryset = document.node_instances.all()
     try:
         # TODO: should be AND not OR
         Permission.objects.check_permissions(request.user, [PERMISSION_DOCUMENT_VIEW, PERMISSION_DOCUMENT_INDEXING_VIEW])