diff --git a/apps/document_indexing/api.py b/apps/document_indexing/api.py
index 3a338cbcf1..36dd513202 100644
--- a/apps/document_indexing/api.py
+++ b/apps/document_indexing/api.py
@@ -5,7 +5,7 @@ from django.utils.translation import ugettext
 from django.core.urlresolvers import reverse
 from django.template.defaultfilters import slugify
 
-from metadata.classes import MetadataObject
+from metadata.classes import MetadataClass
 
 from .models import (Index, IndexTemplateNode, IndexInstanceNode,
     DocumentRenameCount)
@@ -33,7 +33,7 @@ def update_indexes(document):
     eval_dict = {}
     document_metadata_dict = dict([(metadata.metadata_type.name, metadata.value) for metadata in document.documentmetadata_set.all() if metadata.value])
     eval_dict['document'] = document
-    eval_dict['metadata'] = MetadataObject(document_metadata_dict)
+    eval_dict['metadata'] = MetadataClass(document_metadata_dict)
 
     for index in Index.objects.filter(enabled=True):
         root_instance, created = IndexInstanceNode.objects.get_or_create(index_template_node=index.template_root, parent=None)
diff --git a/apps/linking/managers.py b/apps/linking/managers.py
index 4583b646ad..41d4275e15 100644
--- a/apps/linking/managers.py
+++ b/apps/linking/managers.py
@@ -3,7 +3,7 @@ from __future__ import absolute_import
 from django.db import models
 from django.db.models import Q
 
-from metadata.classes import MetadataObject
+from metadata.classes import MetadataClass
 from documents.models import Document
 
 from .literals import INCLUSION_AND, INCLUSION_OR
@@ -18,7 +18,7 @@ class SmartLinkManager(models.Manager):
             metadata_dict[document_metadata.metadata_type.name] = document_metadata.value
         eval_dict = {}
         eval_dict['document'] = document
-        eval_dict['metadata'] = MetadataObject(metadata_dict)
+        eval_dict['metadata'] = MetadataClass(metadata_dict)
 
         if smart_link_obj:
             smart_link_qs = self.model.objects.filter(Q(enabled=True) & Q(pk=smart_link_obj.pk))
diff --git a/apps/metadata/classes.py b/apps/metadata/classes.py
index b8476a744f..b370dcae21 100644
--- a/apps/metadata/classes.py
+++ b/apps/metadata/classes.py
@@ -1,7 +1,7 @@
 from django.utils.translation import ugettext_lazy as _
 
 
-class MetadataObject(object):
+class MetadataClass(object):
     def __init__(self, dictionary):
         self.dictionary = dictionary