diff --git a/doc/api_samples/os-keypairs/keypairs-get-resp.json b/doc/api_samples/os-keypairs/keypairs-list-resp.json
similarity index 100%
rename from doc/api_samples/os-keypairs/keypairs-get-resp.json
rename to doc/api_samples/os-keypairs/keypairs-list-resp.json
diff --git a/doc/api_samples/os-keypairs/keypairs-get-resp.xml b/doc/api_samples/os-keypairs/keypairs-list-resp.xml
similarity index 100%
rename from doc/api_samples/os-keypairs/keypairs-get-resp.xml
rename to doc/api_samples/os-keypairs/keypairs-list-resp.xml
diff --git a/doc/v3/api_samples/keypairs/keypairs-get-resp.json b/doc/v3/api_samples/keypairs/keypairs-list-resp.json
similarity index 100%
rename from doc/v3/api_samples/keypairs/keypairs-get-resp.json
rename to doc/v3/api_samples/keypairs/keypairs-list-resp.json
diff --git a/nova/tests/integrated/api_samples/os-keypairs/keypairs-get-resp.json.tpl b/nova/tests/integrated/api_samples/os-keypairs/keypairs-list-resp.json.tpl
similarity index 100%
rename from nova/tests/integrated/api_samples/os-keypairs/keypairs-get-resp.json.tpl
rename to nova/tests/integrated/api_samples/os-keypairs/keypairs-list-resp.json.tpl
diff --git a/nova/tests/integrated/api_samples/os-keypairs/keypairs-get-resp.xml.tpl b/nova/tests/integrated/api_samples/os-keypairs/keypairs-list-resp.xml.tpl
similarity index 100%
rename from nova/tests/integrated/api_samples/os-keypairs/keypairs-get-resp.xml.tpl
rename to nova/tests/integrated/api_samples/os-keypairs/keypairs-list-resp.xml.tpl
diff --git a/nova/tests/integrated/test_api_samples.py b/nova/tests/integrated/test_api_samples.py
index d9e1a44a03..f30016edf3 100644
--- a/nova/tests/integrated/test_api_samples.py
+++ b/nova/tests/integrated/test_api_samples.py
@@ -1110,13 +1110,13 @@ class KeyPairsSampleJsonTest(ApiSampleTestBaseV2):
         subs['keypair_name'] = '(%s)' % key_name
         self._verify_response('keypairs-import-post-resp', subs, response, 200)
 
-    def test_keypairs_get(self):
-        # Get api sample of key pairs get request.
+    def test_keypairs_list(self):
+        # Get api sample of key pairs list request.
         key_name = self.test_keypairs_post()
         response = self._do_get('os-keypairs')
         subs = self._get_regexes()
         subs['keypair_name'] = '(%s)' % key_name
-        self._verify_response('keypairs-get-resp', subs, response, 200)
+        self._verify_response('keypairs-list-resp', subs, response, 200)
 
 
 class KeyPairsSampleXmlTest(KeyPairsSampleJsonTest):
diff --git a/nova/tests/integrated/v3/api_samples/keypairs/keypairs-get-resp.json.tpl b/nova/tests/integrated/v3/api_samples/keypairs/keypairs-list-resp.json.tpl
similarity index 100%
rename from nova/tests/integrated/v3/api_samples/keypairs/keypairs-get-resp.json.tpl
rename to nova/tests/integrated/v3/api_samples/keypairs/keypairs-list-resp.json.tpl
diff --git a/nova/tests/integrated/v3/test_keypairs.py b/nova/tests/integrated/v3/test_keypairs.py
index bb47bcf6ee..8f71aff34d 100644
--- a/nova/tests/integrated/v3/test_keypairs.py
+++ b/nova/tests/integrated/v3/test_keypairs.py
@@ -55,10 +55,10 @@ class KeyPairsSampleJsonTest(api_sample_base.ApiSampleTestBaseV3):
         subs['keypair_name'] = '(%s)' % key_name
         self._verify_response('keypairs-import-post-resp', subs, response, 201)
 
-    def test_keypairs_get(self):
-        # Get api sample of key pairs get request.
+    def test_keypairs_list(self):
+        # Get api sample of key pairs list request.
         key_name = self.test_keypairs_post()
         response = self._do_get('keypairs')
         subs = self._get_regexes()
         subs['keypair_name'] = '(%s)' % key_name
-        self._verify_response('keypairs-get-resp', subs, response, 200)
+        self._verify_response('keypairs-list-resp', subs, response, 200)