diff --git a/sdk/keyvault/azure-security-keyvault-common/CHANGELOG.md b/sdk/keyvault/azure-security-keyvault-common/CHANGELOG.md
index 1939fc7b2..b94aaf0c4 100644
--- a/sdk/keyvault/azure-security-keyvault-common/CHANGELOG.md
+++ b/sdk/keyvault/azure-security-keyvault-common/CHANGELOG.md
@@ -7,12 +7,12 @@
 ### Breaking Changes
 
 - Removed `SHA256`, `SHA384`, and `SHA512` hashing classes by making them internal since the end user doesn't need them.
+- Renamed header `single_page.hpp` to `get_page_results_options.hpp`.
 
 ### Key Bugs Fixed
 
 ### Fixed
 
-
 ## 4.0.0-beta.3 (2021-06-08)
 
 No breaking changes or new features added. Includes only implementation enhancements.
diff --git a/sdk/keyvault/azure-security-keyvault-common/CMakeLists.txt b/sdk/keyvault/azure-security-keyvault-common/CMakeLists.txt
index bfd44b739..0800e6a80 100644
--- a/sdk/keyvault/azure-security-keyvault-common/CMakeLists.txt
+++ b/sdk/keyvault/azure-security-keyvault-common/CMakeLists.txt
@@ -28,8 +28,8 @@ endif()
 
 set(
   AZURE_KEYVAULT_COMMON_HEADER
+    inc/azure/keyvault/common/internal/get_page_results_options.hpp
     inc/azure/keyvault/common/internal/keyvault_pipeline.hpp
-    inc/azure/keyvault/common/internal/single_page.hpp
 )
 
 set(
diff --git a/sdk/keyvault/azure-security-keyvault-common/inc/azure/keyvault/common/internal/single_page.hpp b/sdk/keyvault/azure-security-keyvault-common/inc/azure/keyvault/common/internal/get_page_results_options.hpp
similarity index 100%
rename from sdk/keyvault/azure-security-keyvault-common/inc/azure/keyvault/common/internal/single_page.hpp
rename to sdk/keyvault/azure-security-keyvault-common/inc/azure/keyvault/common/internal/get_page_results_options.hpp
diff --git a/sdk/keyvault/azure-security-keyvault-keys/CHANGELOG.md b/sdk/keyvault/azure-security-keyvault-keys/CHANGELOG.md
index e18a12658..895a0c634 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/CHANGELOG.md
+++ b/sdk/keyvault/azure-security-keyvault-keys/CHANGELOG.md
@@ -15,6 +15,7 @@
 - Removed access to `Iv` field member from `EncryptParameters` and `DecryptParameters`.
 - Removed `Encrypt(EncryptionAlgorithm, std::vector, context)`.
 - Removed `Decrypt(DecryptAlgorithm, std::vector, context)`.
+- Renamed header `list_keys_single_page_result.hpp` to `list_keys_result.hpp`.
 
 ### Key Bugs Fixed
 
diff --git a/sdk/keyvault/azure-security-keyvault-keys/CMakeLists.txt b/sdk/keyvault/azure-security-keyvault-keys/CMakeLists.txt
index e6f1e830d..3db0a3247 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/CMakeLists.txt
+++ b/sdk/keyvault/azure-security-keyvault-keys/CMakeLists.txt
@@ -58,7 +58,7 @@ set(
     inc/azure/keyvault/keys/key_properties.hpp
     inc/azure/keyvault/keys/key_type.hpp
     inc/azure/keyvault/keys/key_vault_key.hpp
-    inc/azure/keyvault/keys/list_keys_single_page_result.hpp
+    inc/azure/keyvault/keys/list_keys_result.hpp
     inc/azure/keyvault/keys/recover_deleted_key_operation.hpp
 )
 
@@ -103,7 +103,7 @@ set(
     src/key_request_parameters.cpp
     src/key_type.cpp
     src/key_vault_key.cpp
-    src/list_keys_single_page_result.cpp
+    src/list_keys_result.cpp
     src/recover_deleted_key_operation.cpp
 )
 
diff --git a/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/key_vault_keys.hpp b/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/key_vault_keys.hpp
index ce423b55c..7c5c83bed 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/key_vault_keys.hpp
+++ b/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/key_vault_keys.hpp
@@ -32,5 +32,5 @@
 #include "azure/keyvault/keys/key_properties.hpp"
 #include "azure/keyvault/keys/key_type.hpp"
 #include "azure/keyvault/keys/key_vault_key.hpp"
-#include "azure/keyvault/keys/list_keys_single_page_result.hpp"
+#include "azure/keyvault/keys/list_keys_result.hpp"
 #include "azure/keyvault/keys/recover_deleted_key_operation.hpp"
diff --git a/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/key_client.hpp b/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/key_client.hpp
index 61f1d7b4c..fa2e717a1 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/key_client.hpp
+++ b/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/key_client.hpp
@@ -17,7 +17,7 @@
 #include "azure/keyvault/keys/key_create_options.hpp"
 #include "azure/keyvault/keys/key_type.hpp"
 #include "azure/keyvault/keys/key_vault_key.hpp"
-#include "azure/keyvault/keys/list_keys_single_page_result.hpp"
+#include "azure/keyvault/keys/list_keys_result.hpp"
 #include "azure/keyvault/keys/recover_deleted_key_operation.hpp"
 
 #include <functional>
diff --git a/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/list_keys_single_page_result.hpp b/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/list_keys_result.hpp
similarity index 98%
rename from sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/list_keys_single_page_result.hpp
rename to sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/list_keys_result.hpp
index 5bee938f5..d2b262644 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/list_keys_single_page_result.hpp
+++ b/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/list_keys_result.hpp
@@ -12,7 +12,7 @@
 #include <azure/core/http/http.hpp>
 #include <azure/core/paged_response.hpp>
 
-#include <azure/keyvault/common/internal/single_page.hpp>
+#include <azure/keyvault/common/internal/get_page_results_options.hpp>
 
 #include "azure/keyvault/keys/deleted_key.hpp"
 #include "azure/keyvault/keys/json_web_key.hpp"
diff --git a/sdk/keyvault/azure-security-keyvault-keys/src/key_client.cpp b/sdk/keyvault/azure-security-keyvault-keys/src/key_client.cpp
index 1db1f14bb..91b452d85 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/src/key_client.cpp
+++ b/sdk/keyvault/azure-security-keyvault-keys/src/key_client.cpp
@@ -5,7 +5,7 @@
 #include <azure/core/http/http.hpp>
 #include <azure/core/http/policies/policy.hpp>
 
-#include <azure/keyvault/common/internal/single_page.hpp>
+#include <azure/keyvault/common/internal/get_page_results_options.hpp>
 
 #include "azure/keyvault/keys/key_client.hpp"
 #include "private/key_backup.hpp"
diff --git a/sdk/keyvault/azure-security-keyvault-keys/src/list_keys_single_page_result.cpp b/sdk/keyvault/azure-security-keyvault-keys/src/list_keys_result.cpp
similarity index 98%
rename from sdk/keyvault/azure-security-keyvault-keys/src/list_keys_single_page_result.cpp
rename to sdk/keyvault/azure-security-keyvault-keys/src/list_keys_result.cpp
index 21df765ff..1defdca4c 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/src/list_keys_single_page_result.cpp
+++ b/sdk/keyvault/azure-security-keyvault-keys/src/list_keys_result.cpp
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include "azure/keyvault/keys/list_keys_single_page_result.hpp"
+#include "azure/keyvault/keys/list_keys_result.hpp"
 #include "azure/keyvault/keys/key_client.hpp"
 #include "private/key_constants.hpp"
 #include "private/key_serializers.hpp"
diff --git a/sdk/keyvault/azure-security-keyvault-keys/src/private/key_serializers.hpp b/sdk/keyvault/azure-security-keyvault-keys/src/private/key_serializers.hpp
index c7bb9deb7..e93ff9509 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/src/private/key_serializers.hpp
+++ b/sdk/keyvault/azure-security-keyvault-keys/src/private/key_serializers.hpp
@@ -14,7 +14,7 @@
 #include "azure/keyvault/keys/deleted_key.hpp"
 #include "azure/keyvault/keys/import_key_options.hpp"
 #include "azure/keyvault/keys/key_vault_key.hpp"
-#include "azure/keyvault/keys/list_keys_single_page_result.hpp"
+#include "azure/keyvault/keys/list_keys_result.hpp"
 
 #include <string>
 
diff --git a/sdk/keyvault/ci.yml b/sdk/keyvault/ci.yml
index 073175646..3f426ebd4 100644
--- a/sdk/keyvault/ci.yml
+++ b/sdk/keyvault/ci.yml
@@ -34,7 +34,7 @@ stages:
     parameters:
       ServiceDirectory: keyvault
       CtestRegex: "azure-security-keyvault.*-unittest"
-      LiveTestCtestRegex: "Remote"
+      LiveTestCtestRegex: "azure-security-keyvault.*-livetest"
       LiveTestTimeoutInMinutes: 120
       SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources)
       Artifacts: