diff --git a/nova/datastore.py b/nova/datastore.py
index dae78f50c..e57177e04 100644
--- a/nova/datastore.py
+++ b/nova/datastore.py
@@ -103,7 +103,7 @@ class BasicModel(object):
 
     @classmethod
     def _redis_name(cls):
-        return self.override_type or cls.__name__
+        return cls.override_type or cls.__name__
 
     @classmethod
     def lookup(cls, identifier):
@@ -145,7 +145,7 @@ class BasicModel(object):
 
     @property
     def __redis_key(self):
-        return '%s:%s' % (self.__class__.__name__.lower(), self.identifier)
+        return '%s:%s' % (self._redis_name(), self.identifier)
 
     def __repr__(self):
         return "<%s:%s>" % (self.__class__.__name__, self.identifier)