diff --git a/bin/nova-manage b/bin/nova-manage
index 46cb5b1b..f2d945f1 100755
--- a/bin/nova-manage
+++ b/bin/nova-manage
@@ -1746,7 +1746,7 @@ class StorageManagerCommands(object):
                     flav['description'])
 
     def flavor_create(self, label, desc):
-        # TODO flavor name must be unique
+        # TODO(renukaapte) flavor name must be unique
         try:
             db.sm_flavor_create(context.get_admin_context(),
                                 dict(label=label,
@@ -1792,7 +1792,7 @@ class StorageManagerCommands(object):
                                                      b['config_params'],)
 
     def backend_add(self, flavor_label, sr_type, *args):
-        # TODO Add backend_introduce.
+        # TODO(renukaapte) Add backend_introduce.
         ctxt = context.get_admin_context()
         params = dict(map(self._splitfun, args))
         sr_uuid = utils.gen_uuid()
diff --git a/nova/tests/baremetal/test_proxy_bare_metal.py b/nova/tests/baremetal/test_proxy_bare_metal.py
index 30bc3595..32304380 100644
--- a/nova/tests/baremetal/test_proxy_bare_metal.py
+++ b/nova/tests/baremetal/test_proxy_bare_metal.py
@@ -261,7 +261,7 @@ class ProxyBareMetalTestCase(test.TestCase):
 
         # Code under test
         conn = proxy.get_connection(True)
-        # TODO: this is not a very good fake instance
+        # TODO(mikalstill): this is not a very good fake instance
         info = conn.get_info({'name': 'instance-00000001'})
 
         # Expected values
diff --git a/nova/tests/rpc/common.py b/nova/tests/rpc/common.py
index 4ccc8ef6..87cb522c 100644
--- a/nova/tests/rpc/common.py
+++ b/nova/tests/rpc/common.py
@@ -132,7 +132,8 @@ class BaseRpcTestCase(test.TestCase):
                 """Calls echo in the passed queue"""
                 LOG.debug(_("Nested received %(queue)s, %(value)s")
                         % locals())
-                # TODO: so, it will replay the context and use the same REQID?
+                # TODO(comstud):
+                # so, it will replay the context and use the same REQID?
                 # that's bizarre.
                 ret = self.rpc.call(context,
                                queue,
diff --git a/nova/tests/test_auth.py b/nova/tests/test_auth.py
index 242da09d..6549d6e9 100644
--- a/nova/tests/test_auth.py
+++ b/nova/tests/test_auth.py
@@ -420,5 +420,5 @@ class AuthManagerDbTestCase(_AuthManagerBaseTestCase):
 
 
 if __name__ == "__main__":
-    # TODO: Implement use_fake as an option
+    # TODO(anotherjesse): Implement use_fake as an option
     unittest.main()
diff --git a/nova/vsa/api.py b/nova/vsa/api.py
index 1a03dfb1..dbe3607e 100644
--- a/nova/vsa/api.py
+++ b/nova/vsa/api.py
@@ -295,7 +295,8 @@ class API(base.Base):
 
         vc_count = kwargs.get('vc_count', None)
         if vc_count is not None:
-            # VP-TODO: This request may want to update number of VCs
+            # VP-TODO(vladimir.p):
+            # This request may want to update number of VCs
             # Get number of current VCs and add/delete VCs appropriately
             vsa = self.get(context, vsa_id)
             vc_count = int(vc_count)
@@ -317,13 +318,13 @@ class API(base.Base):
             add_cnt = vc_count - old_vc_count
             LOG.debug(_("Adding %(add_cnt)s VCs to VSA %(vsa_name)s."),
                         locals())
-            # VP-TODO: actual code for adding new VCs
+            # VP-TODO(vladimir.p): actual code for adding new VCs
 
         elif vc_count < old_vc_count:
             del_cnt = old_vc_count - vc_count
             LOG.debug(_("Deleting %(del_cnt)s VCs from VSA %(vsa_name)s."),
                         locals())
-            # VP-TODO: actual code for deleting extra VCs
+            # VP-TODO(vladimir.p): actual code for deleting extra VCs
 
     def _force_volume_delete(self, ctxt, volume):
         """Delete a volume, bypassing the check that it must be available."""