diff --git a/api-ref/source/os-keypairs.inc b/api-ref/source/os-keypairs.inc
index e728ef643576..e03e7d91aafc 100644
--- a/api-ref/source/os-keypairs.inc
+++ b/api-ref/source/os-keypairs.inc
@@ -41,7 +41,7 @@ Response
 
 **Example List Keypairs (v2.35): JSON response**
 
-.. literalinclude:: ../../doc/api_samples/keypairs/v2.35/keypairs-list-resp.json
+.. literalinclude:: ../../doc/api_samples/os-keypairs/v2.35/keypairs-list-resp.json
    :language: javascript
 
 Create Or Import Keypair
@@ -72,7 +72,7 @@ Request
 
 **Example Create Or Import Keypair (v2.10): JSON request**
 
-.. literalinclude:: ../../doc/api_samples/keypairs/v2.10/keypairs-import-post-req.json
+.. literalinclude:: ../../doc/api_samples/os-keypairs/v2.10/keypairs-import-post-req.json
    :language: javascript
 
 Response
@@ -90,7 +90,7 @@ Response
 
 **Example Create Or Import Keypair (v2.10): JSON response**
 
-.. literalinclude:: ../../doc/api_samples/keypairs/v2.10/keypairs-import-post-resp.json
+.. literalinclude:: ../../doc/api_samples/os-keypairs/v2.10/keypairs-import-post-resp.json
    :language: javascript
 
 Show Keypair Details
@@ -131,7 +131,7 @@ Response
 
 **Example Show Keypair Details (v2.10): JSON response**
 
-.. literalinclude:: ../../doc/api_samples/keypairs/v2.10/keypairs-get-resp.json
+.. literalinclude:: ../../doc/api_samples/os-keypairs/v2.10/keypairs-get-resp.json
    :language: javascript
 
 Delete Keypair
diff --git a/doc/api_samples/keypairs/keypairs-get-resp.json b/doc/api_samples/os-keypairs/keypairs-get-resp.json
similarity index 100%
rename from doc/api_samples/keypairs/keypairs-get-resp.json
rename to doc/api_samples/os-keypairs/keypairs-get-resp.json
diff --git a/doc/api_samples/keypairs/keypairs-import-post-req.json b/doc/api_samples/os-keypairs/keypairs-import-post-req.json
similarity index 100%
rename from doc/api_samples/keypairs/keypairs-import-post-req.json
rename to doc/api_samples/os-keypairs/keypairs-import-post-req.json
diff --git a/doc/api_samples/keypairs/keypairs-import-post-resp.json b/doc/api_samples/os-keypairs/keypairs-import-post-resp.json
similarity index 100%
rename from doc/api_samples/keypairs/keypairs-import-post-resp.json
rename to doc/api_samples/os-keypairs/keypairs-import-post-resp.json
diff --git a/doc/api_samples/keypairs/keypairs-list-resp.json b/doc/api_samples/os-keypairs/keypairs-list-resp.json
similarity index 100%
rename from doc/api_samples/keypairs/keypairs-list-resp.json
rename to doc/api_samples/os-keypairs/keypairs-list-resp.json
diff --git a/doc/api_samples/keypairs/keypairs-post-req.json b/doc/api_samples/os-keypairs/keypairs-post-req.json
similarity index 100%
rename from doc/api_samples/keypairs/keypairs-post-req.json
rename to doc/api_samples/os-keypairs/keypairs-post-req.json
diff --git a/doc/api_samples/keypairs/keypairs-post-resp.json b/doc/api_samples/os-keypairs/keypairs-post-resp.json
similarity index 100%
rename from doc/api_samples/keypairs/keypairs-post-resp.json
rename to doc/api_samples/os-keypairs/keypairs-post-resp.json
diff --git a/doc/api_samples/keypairs/v2.10/keypairs-get-resp.json b/doc/api_samples/os-keypairs/v2.10/keypairs-get-resp.json
similarity index 100%
rename from doc/api_samples/keypairs/v2.10/keypairs-get-resp.json
rename to doc/api_samples/os-keypairs/v2.10/keypairs-get-resp.json
diff --git a/doc/api_samples/keypairs/v2.10/keypairs-import-post-req.json b/doc/api_samples/os-keypairs/v2.10/keypairs-import-post-req.json
similarity index 100%
rename from doc/api_samples/keypairs/v2.10/keypairs-import-post-req.json
rename to doc/api_samples/os-keypairs/v2.10/keypairs-import-post-req.json
diff --git a/doc/api_samples/keypairs/v2.10/keypairs-import-post-resp.json b/doc/api_samples/os-keypairs/v2.10/keypairs-import-post-resp.json
similarity index 100%
rename from doc/api_samples/keypairs/v2.10/keypairs-import-post-resp.json
rename to doc/api_samples/os-keypairs/v2.10/keypairs-import-post-resp.json
diff --git a/doc/api_samples/keypairs/v2.10/keypairs-list-resp.json b/doc/api_samples/os-keypairs/v2.10/keypairs-list-resp.json
similarity index 100%
rename from doc/api_samples/keypairs/v2.10/keypairs-list-resp.json
rename to doc/api_samples/os-keypairs/v2.10/keypairs-list-resp.json
diff --git a/doc/api_samples/keypairs/v2.10/keypairs-post-req.json b/doc/api_samples/os-keypairs/v2.10/keypairs-post-req.json
similarity index 100%
rename from doc/api_samples/keypairs/v2.10/keypairs-post-req.json
rename to doc/api_samples/os-keypairs/v2.10/keypairs-post-req.json
diff --git a/doc/api_samples/keypairs/v2.10/keypairs-post-resp.json b/doc/api_samples/os-keypairs/v2.10/keypairs-post-resp.json
similarity index 100%
rename from doc/api_samples/keypairs/v2.10/keypairs-post-resp.json
rename to doc/api_samples/os-keypairs/v2.10/keypairs-post-resp.json
diff --git a/doc/api_samples/keypairs/v2.2/keypairs-get-resp.json b/doc/api_samples/os-keypairs/v2.2/keypairs-get-resp.json
similarity index 100%
rename from doc/api_samples/keypairs/v2.2/keypairs-get-resp.json
rename to doc/api_samples/os-keypairs/v2.2/keypairs-get-resp.json
diff --git a/doc/api_samples/keypairs/v2.2/keypairs-import-post-req.json b/doc/api_samples/os-keypairs/v2.2/keypairs-import-post-req.json
similarity index 100%
rename from doc/api_samples/keypairs/v2.2/keypairs-import-post-req.json
rename to doc/api_samples/os-keypairs/v2.2/keypairs-import-post-req.json
diff --git a/doc/api_samples/keypairs/v2.2/keypairs-import-post-resp.json b/doc/api_samples/os-keypairs/v2.2/keypairs-import-post-resp.json
similarity index 100%
rename from doc/api_samples/keypairs/v2.2/keypairs-import-post-resp.json
rename to doc/api_samples/os-keypairs/v2.2/keypairs-import-post-resp.json
diff --git a/doc/api_samples/keypairs/v2.2/keypairs-list-resp.json b/doc/api_samples/os-keypairs/v2.2/keypairs-list-resp.json
similarity index 100%
rename from doc/api_samples/keypairs/v2.2/keypairs-list-resp.json
rename to doc/api_samples/os-keypairs/v2.2/keypairs-list-resp.json
diff --git a/doc/api_samples/keypairs/v2.2/keypairs-post-req.json b/doc/api_samples/os-keypairs/v2.2/keypairs-post-req.json
similarity index 100%
rename from doc/api_samples/keypairs/v2.2/keypairs-post-req.json
rename to doc/api_samples/os-keypairs/v2.2/keypairs-post-req.json
diff --git a/doc/api_samples/keypairs/v2.2/keypairs-post-resp.json b/doc/api_samples/os-keypairs/v2.2/keypairs-post-resp.json
similarity index 100%
rename from doc/api_samples/keypairs/v2.2/keypairs-post-resp.json
rename to doc/api_samples/os-keypairs/v2.2/keypairs-post-resp.json
diff --git a/doc/api_samples/keypairs/v2.35/keypairs-list-resp.json b/doc/api_samples/os-keypairs/v2.35/keypairs-list-resp.json
similarity index 100%
rename from doc/api_samples/keypairs/v2.35/keypairs-list-resp.json
rename to doc/api_samples/os-keypairs/v2.35/keypairs-list-resp.json
diff --git a/doc/api_samples/keypairs/v2.35/keypairs-list-user1-resp.json b/doc/api_samples/os-keypairs/v2.35/keypairs-list-user1-resp.json
similarity index 100%
rename from doc/api_samples/keypairs/v2.35/keypairs-list-user1-resp.json
rename to doc/api_samples/os-keypairs/v2.35/keypairs-list-user1-resp.json
diff --git a/doc/api_samples/keypairs/v2.35/keypairs-list-user2-resp.json b/doc/api_samples/os-keypairs/v2.35/keypairs-list-user2-resp.json
similarity index 100%
rename from doc/api_samples/keypairs/v2.35/keypairs-list-user2-resp.json
rename to doc/api_samples/os-keypairs/v2.35/keypairs-list-user2-resp.json
diff --git a/doc/api_samples/keypairs/v2.35/keypairs-post-req.json b/doc/api_samples/os-keypairs/v2.35/keypairs-post-req.json
similarity index 100%
rename from doc/api_samples/keypairs/v2.35/keypairs-post-req.json
rename to doc/api_samples/os-keypairs/v2.35/keypairs-post-req.json
diff --git a/doc/api_samples/keypairs/v2.35/keypairs-post-resp.json b/doc/api_samples/os-keypairs/v2.35/keypairs-post-resp.json
similarity index 100%
rename from doc/api_samples/keypairs/v2.35/keypairs-post-resp.json
rename to doc/api_samples/os-keypairs/v2.35/keypairs-post-resp.json
diff --git a/nova/tests/functional/api_sample_tests/api_samples/keypairs/keypairs-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-keypairs/keypairs-get-resp.json.tpl
similarity index 100%
rename from nova/tests/functional/api_sample_tests/api_samples/keypairs/keypairs-get-resp.json.tpl
rename to nova/tests/functional/api_sample_tests/api_samples/os-keypairs/keypairs-get-resp.json.tpl
diff --git a/nova/tests/functional/api_sample_tests/api_samples/keypairs/keypairs-import-post-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-keypairs/keypairs-import-post-req.json.tpl
similarity index 100%
rename from nova/tests/functional/api_sample_tests/api_samples/keypairs/keypairs-import-post-req.json.tpl
rename to nova/tests/functional/api_sample_tests/api_samples/os-keypairs/keypairs-import-post-req.json.tpl
diff --git a/nova/tests/functional/api_sample_tests/api_samples/keypairs/keypairs-import-post-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-keypairs/keypairs-import-post-resp.json.tpl
similarity index 100%
rename from nova/tests/functional/api_sample_tests/api_samples/keypairs/keypairs-import-post-resp.json.tpl
rename to nova/tests/functional/api_sample_tests/api_samples/os-keypairs/keypairs-import-post-resp.json.tpl
diff --git a/nova/tests/functional/api_sample_tests/api_samples/keypairs/keypairs-list-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-keypairs/keypairs-list-resp.json.tpl
similarity index 100%
rename from nova/tests/functional/api_sample_tests/api_samples/keypairs/keypairs-list-resp.json.tpl
rename to nova/tests/functional/api_sample_tests/api_samples/os-keypairs/keypairs-list-resp.json.tpl
diff --git a/nova/tests/functional/api_sample_tests/api_samples/keypairs/keypairs-post-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-keypairs/keypairs-post-req.json.tpl
similarity index 100%
rename from nova/tests/functional/api_sample_tests/api_samples/keypairs/keypairs-post-req.json.tpl
rename to nova/tests/functional/api_sample_tests/api_samples/os-keypairs/keypairs-post-req.json.tpl
diff --git a/nova/tests/functional/api_sample_tests/api_samples/keypairs/keypairs-post-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-keypairs/keypairs-post-resp.json.tpl
similarity index 100%
rename from nova/tests/functional/api_sample_tests/api_samples/keypairs/keypairs-post-resp.json.tpl
rename to nova/tests/functional/api_sample_tests/api_samples/os-keypairs/keypairs-post-resp.json.tpl
diff --git a/nova/tests/functional/api_sample_tests/api_samples/keypairs/v2.10/keypairs-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-keypairs/v2.10/keypairs-get-resp.json.tpl
similarity index 100%
rename from nova/tests/functional/api_sample_tests/api_samples/keypairs/v2.10/keypairs-get-resp.json.tpl
rename to nova/tests/functional/api_sample_tests/api_samples/os-keypairs/v2.10/keypairs-get-resp.json.tpl
diff --git a/nova/tests/functional/api_sample_tests/api_samples/keypairs/v2.10/keypairs-import-post-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-keypairs/v2.10/keypairs-import-post-req.json.tpl
similarity index 100%
rename from nova/tests/functional/api_sample_tests/api_samples/keypairs/v2.10/keypairs-import-post-req.json.tpl
rename to nova/tests/functional/api_sample_tests/api_samples/os-keypairs/v2.10/keypairs-import-post-req.json.tpl
diff --git a/nova/tests/functional/api_sample_tests/api_samples/keypairs/v2.10/keypairs-import-post-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-keypairs/v2.10/keypairs-import-post-resp.json.tpl
similarity index 100%
rename from nova/tests/functional/api_sample_tests/api_samples/keypairs/v2.10/keypairs-import-post-resp.json.tpl
rename to nova/tests/functional/api_sample_tests/api_samples/os-keypairs/v2.10/keypairs-import-post-resp.json.tpl
diff --git a/nova/tests/functional/api_sample_tests/api_samples/keypairs/v2.10/keypairs-list-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-keypairs/v2.10/keypairs-list-resp.json.tpl
similarity index 100%
rename from nova/tests/functional/api_sample_tests/api_samples/keypairs/v2.10/keypairs-list-resp.json.tpl
rename to nova/tests/functional/api_sample_tests/api_samples/os-keypairs/v2.10/keypairs-list-resp.json.tpl
diff --git a/nova/tests/functional/api_sample_tests/api_samples/keypairs/v2.10/keypairs-post-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-keypairs/v2.10/keypairs-post-req.json.tpl
similarity index 100%
rename from nova/tests/functional/api_sample_tests/api_samples/keypairs/v2.10/keypairs-post-req.json.tpl
rename to nova/tests/functional/api_sample_tests/api_samples/os-keypairs/v2.10/keypairs-post-req.json.tpl
diff --git a/nova/tests/functional/api_sample_tests/api_samples/keypairs/v2.10/keypairs-post-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-keypairs/v2.10/keypairs-post-resp.json.tpl
similarity index 100%
rename from nova/tests/functional/api_sample_tests/api_samples/keypairs/v2.10/keypairs-post-resp.json.tpl
rename to nova/tests/functional/api_sample_tests/api_samples/os-keypairs/v2.10/keypairs-post-resp.json.tpl
diff --git a/nova/tests/functional/api_sample_tests/api_samples/keypairs/v2.2/keypairs-get-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-keypairs/v2.2/keypairs-get-resp.json.tpl
similarity index 100%
rename from nova/tests/functional/api_sample_tests/api_samples/keypairs/v2.2/keypairs-get-resp.json.tpl
rename to nova/tests/functional/api_sample_tests/api_samples/os-keypairs/v2.2/keypairs-get-resp.json.tpl
diff --git a/nova/tests/functional/api_sample_tests/api_samples/keypairs/v2.2/keypairs-import-post-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-keypairs/v2.2/keypairs-import-post-req.json.tpl
similarity index 100%
rename from nova/tests/functional/api_sample_tests/api_samples/keypairs/v2.2/keypairs-import-post-req.json.tpl
rename to nova/tests/functional/api_sample_tests/api_samples/os-keypairs/v2.2/keypairs-import-post-req.json.tpl
diff --git a/nova/tests/functional/api_sample_tests/api_samples/keypairs/v2.2/keypairs-import-post-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-keypairs/v2.2/keypairs-import-post-resp.json.tpl
similarity index 100%
rename from nova/tests/functional/api_sample_tests/api_samples/keypairs/v2.2/keypairs-import-post-resp.json.tpl
rename to nova/tests/functional/api_sample_tests/api_samples/os-keypairs/v2.2/keypairs-import-post-resp.json.tpl
diff --git a/nova/tests/functional/api_sample_tests/api_samples/keypairs/v2.2/keypairs-list-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-keypairs/v2.2/keypairs-list-resp.json.tpl
similarity index 100%
rename from nova/tests/functional/api_sample_tests/api_samples/keypairs/v2.2/keypairs-list-resp.json.tpl
rename to nova/tests/functional/api_sample_tests/api_samples/os-keypairs/v2.2/keypairs-list-resp.json.tpl
diff --git a/nova/tests/functional/api_sample_tests/api_samples/keypairs/v2.2/keypairs-post-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-keypairs/v2.2/keypairs-post-req.json.tpl
similarity index 100%
rename from nova/tests/functional/api_sample_tests/api_samples/keypairs/v2.2/keypairs-post-req.json.tpl
rename to nova/tests/functional/api_sample_tests/api_samples/os-keypairs/v2.2/keypairs-post-req.json.tpl
diff --git a/nova/tests/functional/api_sample_tests/api_samples/keypairs/v2.2/keypairs-post-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-keypairs/v2.2/keypairs-post-resp.json.tpl
similarity index 100%
rename from nova/tests/functional/api_sample_tests/api_samples/keypairs/v2.2/keypairs-post-resp.json.tpl
rename to nova/tests/functional/api_sample_tests/api_samples/os-keypairs/v2.2/keypairs-post-resp.json.tpl
diff --git a/nova/tests/functional/api_sample_tests/api_samples/keypairs/v2.35/keypairs-list-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-keypairs/v2.35/keypairs-list-resp.json.tpl
similarity index 100%
rename from nova/tests/functional/api_sample_tests/api_samples/keypairs/v2.35/keypairs-list-resp.json.tpl
rename to nova/tests/functional/api_sample_tests/api_samples/os-keypairs/v2.35/keypairs-list-resp.json.tpl
diff --git a/nova/tests/functional/api_sample_tests/api_samples/keypairs/v2.35/keypairs-list-user1-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-keypairs/v2.35/keypairs-list-user1-resp.json.tpl
similarity index 100%
rename from nova/tests/functional/api_sample_tests/api_samples/keypairs/v2.35/keypairs-list-user1-resp.json.tpl
rename to nova/tests/functional/api_sample_tests/api_samples/os-keypairs/v2.35/keypairs-list-user1-resp.json.tpl
diff --git a/nova/tests/functional/api_sample_tests/api_samples/keypairs/v2.35/keypairs-list-user2-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-keypairs/v2.35/keypairs-list-user2-resp.json.tpl
similarity index 100%
rename from nova/tests/functional/api_sample_tests/api_samples/keypairs/v2.35/keypairs-list-user2-resp.json.tpl
rename to nova/tests/functional/api_sample_tests/api_samples/os-keypairs/v2.35/keypairs-list-user2-resp.json.tpl
diff --git a/nova/tests/functional/api_sample_tests/api_samples/keypairs/v2.35/keypairs-post-req.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-keypairs/v2.35/keypairs-post-req.json.tpl
similarity index 100%
rename from nova/tests/functional/api_sample_tests/api_samples/keypairs/v2.35/keypairs-post-req.json.tpl
rename to nova/tests/functional/api_sample_tests/api_samples/os-keypairs/v2.35/keypairs-post-req.json.tpl
diff --git a/nova/tests/functional/api_sample_tests/api_samples/keypairs/v2.35/keypairs-post-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-keypairs/v2.35/keypairs-post-resp.json.tpl
similarity index 100%
rename from nova/tests/functional/api_sample_tests/api_samples/keypairs/v2.35/keypairs-post-resp.json.tpl
rename to nova/tests/functional/api_sample_tests/api_samples/os-keypairs/v2.35/keypairs-post-resp.json.tpl
diff --git a/nova/tests/functional/api_sample_tests/test_keypairs.py b/nova/tests/functional/api_sample_tests/test_keypairs.py
index 8c30730ebc00..c67384cd0c23 100644
--- a/nova/tests/functional/api_sample_tests/test_keypairs.py
+++ b/nova/tests/functional/api_sample_tests/test_keypairs.py
@@ -23,7 +23,7 @@ from nova.tests.unit import fake_crypto
 
 class KeyPairsSampleJsonTest(api_sample_base.ApiSampleTestBaseV21):
     microversion = None
-    sample_dir = "keypairs"
+    sample_dir = 'os-keypairs'
     expected_delete_status_code = 202
     expected_post_status_code = 200
 
@@ -246,7 +246,7 @@ class KeyPairsV210SampleJsonTestNotAdmin(KeyPairsV210SampleJsonTest):
 
 class KeyPairsV235SampleJsonTest(api_sample_base.ApiSampleTestBaseV21):
     ADMIN_API = True
-    sample_dir = "keypairs"
+    sample_dir = 'os-keypairs'
     microversion = '2.35'
     expected_post_status_code = 201
     scenarios = [('v2_35', {'api_major_version': 'v2.1'})]