diff --git a/doc/v3/api_samples/all_extensions/extensions-list-resp.json b/doc/v3/api_samples/all_extensions/extensions-list-resp.json
index 902110ea7e..7bf8286bcd 100644
--- a/doc/v3/api_samples/all_extensions/extensions-list-resp.json
+++ b/doc/v3/api_samples/all_extensions/extensions-list-resp.json
@@ -268,7 +268,7 @@
             "alias": "os-consoles",
             "description": "Interactive Console support.",
             "links": [],
-            "name": "RemoteConsoles",
+            "name": "Consoles",
             "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
             "updated": "2014-12-03T00:00:00Z"
         },
@@ -404,7 +404,7 @@
             "alias": "os-flavor-extra-specs",
             "description": "Flavors extra specs support.",
             "links": [],
-            "name": "FlavorsExtraSpecs",
+            "name": "FlavorExtraSpecs",
             "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
             "updated": "2014-12-03T00:00:00Z"
         },
@@ -516,7 +516,7 @@
             "alias": "os-instance_usage_audit_log",
             "description": "Admin-only Task Log Monitoring.",
             "links": [],
-            "name": "InstanceUsageAuditLog",
+            "name": "OSInstanceUsageAuditLog",
             "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
             "updated": "2014-12-03T00:00:00Z"
         },
@@ -740,7 +740,7 @@
             "alias": "os-tenant-networks",
             "description": "Tenant-based Network Management Extension.",
             "links": [],
-            "name": "TenantNetworks",
+            "name": "OSTenantNetworks",
             "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
             "updated": "2014-12-03T00:00:00Z"
         },
diff --git a/nova/api/openstack/compute/plugins/v3/flavors_extraspecs.py b/nova/api/openstack/compute/plugins/v3/flavors_extraspecs.py
index b9265c54db..f6c7dd5dc3 100644
--- a/nova/api/openstack/compute/plugins/v3/flavors_extraspecs.py
+++ b/nova/api/openstack/compute/plugins/v3/flavors_extraspecs.py
@@ -140,7 +140,7 @@ class FlavorExtraSpecsController(wsgi.Controller):
 
 class FlavorsExtraSpecs(extensions.V3APIExtensionBase):
     """Flavors extra specs support."""
-    name = 'FlavorsExtraSpecs'
+    name = 'FlavorExtraSpecs'
     alias = ALIAS
     version = 1
 
diff --git a/nova/api/openstack/compute/plugins/v3/instance_usage_audit_log.py b/nova/api/openstack/compute/plugins/v3/instance_usage_audit_log.py
index 247dc89071..a28f9a3bd0 100644
--- a/nova/api/openstack/compute/plugins/v3/instance_usage_audit_log.py
+++ b/nova/api/openstack/compute/plugins/v3/instance_usage_audit_log.py
@@ -128,7 +128,7 @@ class InstanceUsageAuditLogController(wsgi.Controller):
 
 class InstanceUsageAuditLog(extensions.V3APIExtensionBase):
     """Admin-only Task Log Monitoring."""
-    name = "InstanceUsageAuditLog"
+    name = "OSInstanceUsageAuditLog"
     alias = ALIAS
     version = 1
 
diff --git a/nova/api/openstack/compute/plugins/v3/remote_consoles.py b/nova/api/openstack/compute/plugins/v3/remote_consoles.py
index d99d221896..a72a00b71e 100644
--- a/nova/api/openstack/compute/plugins/v3/remote_consoles.py
+++ b/nova/api/openstack/compute/plugins/v3/remote_consoles.py
@@ -157,7 +157,7 @@ class RemoteConsolesController(wsgi.Controller):
 
 class RemoteConsoles(extensions.V3APIExtensionBase):
     """Interactive Console support."""
-    name = "RemoteConsoles"
+    name = "Consoles"
     alias = ALIAS
     version = 1
 
diff --git a/nova/api/openstack/compute/plugins/v3/tenant_networks.py b/nova/api/openstack/compute/plugins/v3/tenant_networks.py
index a32c5af52d..5c406532d4 100644
--- a/nova/api/openstack/compute/plugins/v3/tenant_networks.py
+++ b/nova/api/openstack/compute/plugins/v3/tenant_networks.py
@@ -195,7 +195,7 @@ class TenantNetworkController(wsgi.Controller):
 class TenantNetworks(extensions.V3APIExtensionBase):
     """Tenant-based Network Management Extension."""
 
-    name = "TenantNetworks"
+    name = "OSTenantNetworks"
     alias = ALIAS
     version = 1
 
diff --git a/nova/tests/functional/v3/api_samples/all_extensions/extensions-list-resp.json.tpl b/nova/tests/functional/v3/api_samples/all_extensions/extensions-list-resp.json.tpl
index 902110ea7e..7bf8286bcd 100644
--- a/nova/tests/functional/v3/api_samples/all_extensions/extensions-list-resp.json.tpl
+++ b/nova/tests/functional/v3/api_samples/all_extensions/extensions-list-resp.json.tpl
@@ -268,7 +268,7 @@
             "alias": "os-consoles",
             "description": "Interactive Console support.",
             "links": [],
-            "name": "RemoteConsoles",
+            "name": "Consoles",
             "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
             "updated": "2014-12-03T00:00:00Z"
         },
@@ -404,7 +404,7 @@
             "alias": "os-flavor-extra-specs",
             "description": "Flavors extra specs support.",
             "links": [],
-            "name": "FlavorsExtraSpecs",
+            "name": "FlavorExtraSpecs",
             "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
             "updated": "2014-12-03T00:00:00Z"
         },
@@ -516,7 +516,7 @@
             "alias": "os-instance_usage_audit_log",
             "description": "Admin-only Task Log Monitoring.",
             "links": [],
-            "name": "InstanceUsageAuditLog",
+            "name": "OSInstanceUsageAuditLog",
             "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
             "updated": "2014-12-03T00:00:00Z"
         },
@@ -740,7 +740,7 @@
             "alias": "os-tenant-networks",
             "description": "Tenant-based Network Management Extension.",
             "links": [],
-            "name": "TenantNetworks",
+            "name": "OSTenantNetworks",
             "namespace": "http://docs.openstack.org/compute/ext/fake_xml",
             "updated": "2014-12-03T00:00:00Z"
         },