diff --git a/doc/api_samples/os-hypervisors/v2.33/hypervisors-detail-resp.json b/doc/api_samples/os-hypervisors/v2.33/hypervisors-detail-resp.json
index 767e2e7bc5..2da7f09f4e 100644
--- a/doc/api_samples/os-hypervisors/v2.33/hypervisors-detail-resp.json
+++ b/doc/api_samples/os-hypervisors/v2.33/hypervisors-detail-resp.json
@@ -42,7 +42,7 @@
     ],
     "hypervisors_links": [
         {
-            "href": "http://openstack.example.com/v2.1/6f70656e737461636b20342065766572/hypervisors/detail?limit=1&marker=2",
+            "href": "http://openstack.example.com/v2.1/6f70656e737461636b20342065766572/os-hypervisors/detail?limit=1&marker=2",
             "rel": "next"
         }
     ]
diff --git a/doc/api_samples/os-hypervisors/v2.33/hypervisors-list-resp.json b/doc/api_samples/os-hypervisors/v2.33/hypervisors-list-resp.json
index 9a5771df02..bb531ace7a 100644
--- a/doc/api_samples/os-hypervisors/v2.33/hypervisors-list-resp.json
+++ b/doc/api_samples/os-hypervisors/v2.33/hypervisors-list-resp.json
@@ -9,7 +9,7 @@
     ],
     "hypervisors_links": [
         {
-            "href": "http://openstack.example.com/v2.1/6f70656e737461636b20342065766572/hypervisors?limit=1&marker=2",
+            "href": "http://openstack.example.com/v2.1/6f70656e737461636b20342065766572/os-hypervisors?limit=1&marker=2",
             "rel": "next"
         }
     ]
diff --git a/doc/api_samples/os-hypervisors/v2.53/hypervisors-detail-resp.json b/doc/api_samples/os-hypervisors/v2.53/hypervisors-detail-resp.json
index a2172f69a2..ed62b8cd47 100644
--- a/doc/api_samples/os-hypervisors/v2.53/hypervisors-detail-resp.json
+++ b/doc/api_samples/os-hypervisors/v2.53/hypervisors-detail-resp.json
@@ -42,7 +42,7 @@
     ],
     "hypervisors_links": [
         {
-            "href": "http://openstack.example.com/v2.1/6f70656e737461636b20342065766572/hypervisors/detail?limit=1&marker=1bb62a04-c576-402c-8147-9e89757a09e3",
+            "href": "http://openstack.example.com/v2.1/6f70656e737461636b20342065766572/os-hypervisors/detail?limit=1&marker=1bb62a04-c576-402c-8147-9e89757a09e3",
             "rel": "next"
         }
     ]
diff --git a/doc/api_samples/os-hypervisors/v2.53/hypervisors-list-resp.json b/doc/api_samples/os-hypervisors/v2.53/hypervisors-list-resp.json
index ad6d9c4edf..2171311a16 100644
--- a/doc/api_samples/os-hypervisors/v2.53/hypervisors-list-resp.json
+++ b/doc/api_samples/os-hypervisors/v2.53/hypervisors-list-resp.json
@@ -9,7 +9,7 @@
     ],
     "hypervisors_links": [
         {
-            "href": "http://openstack.example.com/v2.1/6f70656e737461636b20342065766572/hypervisors?limit=1&marker=1bb62a04-c576-402c-8147-9e89757a09e3",
+            "href": "http://openstack.example.com/v2.1/6f70656e737461636b20342065766572/os-hypervisors?limit=1&marker=1bb62a04-c576-402c-8147-9e89757a09e3",
             "rel": "next"
         }
     ]
diff --git a/nova/api/openstack/compute/views/hypervisors.py b/nova/api/openstack/compute/views/hypervisors.py
index 2284245993..370e383166 100644
--- a/nova/api/openstack/compute/views/hypervisors.py
+++ b/nova/api/openstack/compute/views/hypervisors.py
@@ -17,7 +17,7 @@ from nova.api.openstack import common
 
 
 class ViewBuilder(common.ViewBuilder):
-    _collection_name = "hypervisors"
+    _collection_name = "os-hypervisors"
 
     def get_links(self, request, hypervisors, detail=False):
         coll_name = (self._collection_name + '/detail' if detail else
diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-hypervisors/v2.33/hypervisors-detail-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-hypervisors/v2.33/hypervisors-detail-resp.json.tpl
index e927fe433f..0c36d6eadb 100644
--- a/nova/tests/functional/api_sample_tests/api_samples/os-hypervisors/v2.33/hypervisors-detail-resp.json.tpl
+++ b/nova/tests/functional/api_sample_tests/api_samples/os-hypervisors/v2.33/hypervisors-detail-resp.json.tpl
@@ -42,7 +42,7 @@
     ],
     "hypervisors_links": [
         {
-            "href": "http://openstack.example.com/v2.1/6f70656e737461636b20342065766572/hypervisors/detail?limit=1&marker=2",
+            "href": "http://openstack.example.com/v2.1/6f70656e737461636b20342065766572/os-hypervisors/detail?limit=1&marker=2",
             "rel": "next"
         }
     ]
diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-hypervisors/v2.33/hypervisors-list-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-hypervisors/v2.33/hypervisors-list-resp.json.tpl
index 9a5771df02..bb531ace7a 100644
--- a/nova/tests/functional/api_sample_tests/api_samples/os-hypervisors/v2.33/hypervisors-list-resp.json.tpl
+++ b/nova/tests/functional/api_sample_tests/api_samples/os-hypervisors/v2.33/hypervisors-list-resp.json.tpl
@@ -9,7 +9,7 @@
     ],
     "hypervisors_links": [
         {
-            "href": "http://openstack.example.com/v2.1/6f70656e737461636b20342065766572/hypervisors?limit=1&marker=2",
+            "href": "http://openstack.example.com/v2.1/6f70656e737461636b20342065766572/os-hypervisors?limit=1&marker=2",
             "rel": "next"
         }
     ]
diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-hypervisors/v2.53/hypervisors-detail-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-hypervisors/v2.53/hypervisors-detail-resp.json.tpl
index 9d27290eb5..91762e0753 100644
--- a/nova/tests/functional/api_sample_tests/api_samples/os-hypervisors/v2.53/hypervisors-detail-resp.json.tpl
+++ b/nova/tests/functional/api_sample_tests/api_samples/os-hypervisors/v2.53/hypervisors-detail-resp.json.tpl
@@ -42,7 +42,7 @@
     ],
     "hypervisors_links": [
         {
-            "href": "http://openstack.example.com/v2.1/6f70656e737461636b20342065766572/hypervisors/detail?limit=1&marker=%(hypervisor_id)s",
+            "href": "http://openstack.example.com/v2.1/6f70656e737461636b20342065766572/os-hypervisors/detail?limit=1&marker=%(hypervisor_id)s",
             "rel": "next"
         }
     ]
diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-hypervisors/v2.53/hypervisors-list-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-hypervisors/v2.53/hypervisors-list-resp.json.tpl
index af2b6fbdb7..8b4b552c71 100644
--- a/nova/tests/functional/api_sample_tests/api_samples/os-hypervisors/v2.53/hypervisors-list-resp.json.tpl
+++ b/nova/tests/functional/api_sample_tests/api_samples/os-hypervisors/v2.53/hypervisors-list-resp.json.tpl
@@ -9,7 +9,7 @@
     ],
     "hypervisors_links": [
         {
-            "href": "http://openstack.example.com/v2.1/6f70656e737461636b20342065766572/hypervisors?limit=1&marker=%(hypervisor_id)s",
+            "href": "http://openstack.example.com/v2.1/6f70656e737461636b20342065766572/os-hypervisors?limit=1&marker=%(hypervisor_id)s",
             "rel": "next"
         }
     ]
diff --git a/nova/tests/unit/api/openstack/compute/test_hypervisors.py b/nova/tests/unit/api/openstack/compute/test_hypervisors.py
index cd343608e2..8ba48fa3db 100644
--- a/nova/tests/unit/api/openstack/compute/test_hypervisors.py
+++ b/nova/tests/unit/api/openstack/compute/test_hypervisors.py
@@ -746,7 +746,7 @@ class HypervisorsTestV233(HypervisorsTestV228):
                  'status': 'enabled'}
             ],
             'hypervisors_links': [
-                {'href': 'http://localhost/v2/hypervisors?limit=1&marker=2',
+                {'href': 'http://localhost/v2/os-hypervisors?limit=1&marker=2',
                  'rel': 'next'}
             ]
         }
@@ -807,7 +807,7 @@ class HypervisorsTestV233(HypervisorsTestV228):
                  'status': 'enabled'}
             ],
             'hypervisors_links': [
-                {'href': 'http://localhost/v2/hypervisors?limit=1&marker=2',
+                {'href': 'http://localhost/v2/os-hypervisors?limit=1&marker=2',
                  'rel': 'next'}
             ]
         }
@@ -820,7 +820,7 @@ class HypervisorsTestV233(HypervisorsTestV228):
         req = self._get_request(
             True, '/v2/1234/os-hypervisors/detail?limit=1&marker=1')
         result = self.controller.detail(req)
-        link = 'http://localhost/v2/hypervisors/detail?limit=1&marker=2'
+        link = 'http://localhost/v2/os-hypervisors/detail?limit=1&marker=2'
         expected = {
             'hypervisors': [
                 {'cpu_info': {'arch': 'x86_64',
@@ -922,7 +922,7 @@ class HypervisorsTestV233(HypervisorsTestV228):
             self.assertEqual(expected, result['hypervisors'])
 
     def test_detail_pagination_with_additional_filter(self):
-        link = 'http://localhost/v2/hypervisors/detail?limit=1&marker=2'
+        link = 'http://localhost/v2/os-hypervisors/detail?limit=1&marker=2'
         expected = {
             'hypervisors': [
                 {'cpu_info': {'arch': 'x86_64',
@@ -1256,7 +1256,7 @@ class HypervisorsTestV253(HypervisorsTestV252):
             url='/os-hypervisors/detail?limit=1&marker=%s' %
                 TEST_HYPERS_OBJ[0].uuid)
         result = self.controller.detail(req)
-        link = ('http://localhost/v2/hypervisors/detail?limit=1&marker=%s' %
+        link = ('http://localhost/v2/os-hypervisors/detail?limit=1&marker=%s' %
                 TEST_HYPERS_OBJ[1].uuid)
         expected = {
             'hypervisors': [
@@ -1332,7 +1332,7 @@ class HypervisorsTestV253(HypervisorsTestV252):
             url='/os-hypervisors?limit=1&marker=%s' %
                 TEST_HYPERS_OBJ[0].uuid)
         result = self.controller.index(req)
-        link = ('http://localhost/v2/hypervisors?limit=1&marker=%s' %
+        link = ('http://localhost/v2/os-hypervisors?limit=1&marker=%s' %
                 TEST_HYPERS_OBJ[1].uuid)
         expected = {
             'hypervisors': [{