diff --git a/sdk/keyvault/azure-security-keyvault-keys/CHANGELOG.md b/sdk/keyvault/azure-security-keyvault-keys/CHANGELOG.md
index e609cf042..975420ebf 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/CHANGELOG.md
+++ b/sdk/keyvault/azure-security-keyvault-keys/CHANGELOG.md
@@ -21,6 +21,7 @@
 - Updated `BackupKey()` API return type to `BackupKeyResult` model type.
 - Renamed `KeyPropertiesPageResult` to `KeyPropertiesPagedResponse`.
 - Renamed `DeletedKeyPageResult` to `DeletedKeyPagedResponse`.
+- Renamed high-level header from `key_vault_keys.hpp` to `keyvault_keys.hpp`.
 
 ## 4.0.0-beta.3 (2021-06-08)
 
diff --git a/sdk/keyvault/azure-security-keyvault-keys/CMakeLists.txt b/sdk/keyvault/azure-security-keyvault-keys/CMakeLists.txt
index 13852d0cc..bd3ab3fbd 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/CMakeLists.txt
+++ b/sdk/keyvault/azure-security-keyvault-keys/CMakeLists.txt
@@ -53,7 +53,7 @@ set(
     inc/azure/keyvault/keys/key_operation.hpp
     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/keyvault_key.hpp
     inc/azure/keyvault/keys/list_keys_responses.hpp
     inc/azure/keyvault/keys/recover_deleted_key_operation.hpp
 )
@@ -105,7 +105,7 @@ set(
     src/key_operation.cpp
     src/key_request_parameters.cpp
     src/key_type.cpp
-    src/key_vault_key.cpp
+    src/keyvault_key.cpp
     src/keyvault_protocol.cpp
     src/list_keys_responses.cpp
     src/recover_deleted_key_operation.cpp
diff --git a/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/deleted_key.hpp b/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/deleted_key.hpp
index b5c341313..84e556c68 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/deleted_key.hpp
+++ b/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/deleted_key.hpp
@@ -11,7 +11,7 @@
 
 #include <azure/core/datetime.hpp>
 
-#include "azure/keyvault/keys/key_vault_key.hpp"
+#include "azure/keyvault/keys/keyvault_key.hpp"
 
 namespace Azure { namespace Security { namespace KeyVault { namespace Keys {
 
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 f1bc932aa..48328fd51 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
@@ -15,7 +15,7 @@
 #include "azure/keyvault/keys/key_client_options.hpp"
 #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/keyvault_key.hpp"
 #include "azure/keyvault/keys/list_keys_responses.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_options.hpp b/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/key_client_options.hpp
index 09ff1c366..b5b9c1080 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/key_client_options.hpp
+++ b/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/key_client_options.hpp
@@ -12,7 +12,7 @@
 #include <azure/core/internal/client_options.hpp>
 
 #include "azure/keyvault/keys/dll_import_export.hpp"
-#include "azure/keyvault/keys/key_vault_key.hpp"
+#include "azure/keyvault/keys/keyvault_key.hpp"
 
 namespace Azure { namespace Security { namespace KeyVault { namespace Keys {
 
diff --git a/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/key_create_options.hpp b/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/key_create_options.hpp
index be8f51736..469e77ee4 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/key_create_options.hpp
+++ b/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/key_create_options.hpp
@@ -15,7 +15,7 @@
 
 #include "azure/keyvault/keys/key_curve_name.hpp"
 #include "azure/keyvault/keys/key_operation.hpp"
-#include "azure/keyvault/keys/key_vault_key.hpp"
+#include "azure/keyvault/keys/keyvault_key.hpp"
 
 #include <list>
 #include <string>
diff --git a/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/key_vault_key.hpp b/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/keyvault_key.hpp
similarity index 100%
rename from sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/key_vault_key.hpp
rename to sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/keyvault_key.hpp
diff --git a/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/list_keys_responses.hpp b/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/list_keys_responses.hpp
index a3b96cb91..0d884de8f 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/list_keys_responses.hpp
+++ b/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/list_keys_responses.hpp
@@ -14,7 +14,7 @@
 
 #include "azure/keyvault/keys/deleted_key.hpp"
 #include "azure/keyvault/keys/json_web_key.hpp"
-#include "azure/keyvault/keys/key_vault_key.hpp"
+#include "azure/keyvault/keys/keyvault_key.hpp"
 
 #include <memory>
 #include <vector>
diff --git a/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/recover_deleted_key_operation.hpp b/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/recover_deleted_key_operation.hpp
index 8d0d2235f..4031da3d1 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/recover_deleted_key_operation.hpp
+++ b/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/recover_deleted_key_operation.hpp
@@ -15,7 +15,7 @@
 #include <azure/core/operation_status.hpp>
 #include <azure/core/response.hpp>
 
-#include "azure/keyvault/keys/key_vault_key.hpp"
+#include "azure/keyvault/keys/keyvault_key.hpp"
 
 #include <memory>
 #include <string>
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/keyvault_keys.hpp
similarity index 97%
rename from sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/key_vault_keys.hpp
rename to sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keyvault_keys.hpp
index 35df48e85..67b30431c 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/keyvault_keys.hpp
@@ -33,6 +33,6 @@
 #include "azure/keyvault/keys/key_operation.hpp"
 #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/keyvault_key.hpp"
 #include "azure/keyvault/keys/list_keys_responses.hpp"
 #include "azure/keyvault/keys/recover_deleted_key_operation.hpp"
diff --git a/sdk/keyvault/azure-security-keyvault-keys/src/deleted_key.cpp b/sdk/keyvault/azure-security-keyvault-keys/src/deleted_key.cpp
index ec84733f5..e3dd3083f 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/src/deleted_key.cpp
+++ b/sdk/keyvault/azure-security-keyvault-keys/src/deleted_key.cpp
@@ -5,7 +5,7 @@
 #include <azure/core/internal/json/json_optional.hpp>
 
 #include "azure/keyvault/keys/deleted_key.hpp"
-#include "azure/keyvault/keys/key_vault_key.hpp"
+#include "azure/keyvault/keys/keyvault_key.hpp"
 #include "private/key_constants.hpp"
 #include "private/key_serializers.hpp"
 
diff --git a/sdk/keyvault/azure-security-keyvault-keys/src/key_vault_key.cpp b/sdk/keyvault/azure-security-keyvault-keys/src/keyvault_key.cpp
similarity index 98%
rename from sdk/keyvault/azure-security-keyvault-keys/src/key_vault_key.cpp
rename to sdk/keyvault/azure-security-keyvault-keys/src/keyvault_key.cpp
index 27c4ff347..6d252834f 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/src/key_vault_key.cpp
+++ b/sdk/keyvault/azure-security-keyvault-keys/src/keyvault_key.cpp
@@ -6,7 +6,7 @@
 #include <azure/core/internal/json/json_serializable.hpp>
 #include <azure/core/url.hpp>
 
-#include "azure/keyvault/keys/key_vault_key.hpp"
+#include "azure/keyvault/keys/keyvault_key.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 8db9aac80..585bf9ce9 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
@@ -13,7 +13,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/keyvault_key.hpp"
 #include "azure/keyvault/keys/list_keys_responses.hpp"
 
 #include <string>
diff --git a/sdk/keyvault/azure-security-keyvault-keys/src/private/local_cryptography_provider.hpp b/sdk/keyvault/azure-security-keyvault-keys/src/private/local_cryptography_provider.hpp
index e2ede91b0..98b0f162a 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/src/private/local_cryptography_provider.hpp
+++ b/sdk/keyvault/azure-security-keyvault-keys/src/private/local_cryptography_provider.hpp
@@ -11,7 +11,7 @@
 
 #include "cryptography_provider.hpp"
 
-#include "azure/keyvault/keys/key_vault_key.hpp"
+#include "azure/keyvault/keys/keyvault_key.hpp"
 
 #include <memory>
 #include <string>
diff --git a/sdk/keyvault/azure-security-keyvault-keys/src/private/local_cryptography_provider_factory.hpp b/sdk/keyvault/azure-security-keyvault-keys/src/private/local_cryptography_provider_factory.hpp
index 664bdc15c..e18fadcc6 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/src/private/local_cryptography_provider_factory.hpp
+++ b/sdk/keyvault/azure-security-keyvault-keys/src/private/local_cryptography_provider_factory.hpp
@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include "azure/keyvault/keys/key_vault_key.hpp"
+#include "azure/keyvault/keys/keyvault_key.hpp"
 
 #include "cryptography_provider.hpp"
 #include "rsa_cryptography_provider.hpp"
diff --git a/sdk/keyvault/azure-security-keyvault-keys/src/private/remote_cryptography_client.hpp b/sdk/keyvault/azure-security-keyvault-keys/src/private/remote_cryptography_client.hpp
index daf1eba4b..166179654 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/src/private/remote_cryptography_client.hpp
+++ b/sdk/keyvault/azure-security-keyvault-keys/src/private/remote_cryptography_client.hpp
@@ -18,7 +18,7 @@
 #include "azure/keyvault/keys/cryptography/cryptography_client_options.hpp"
 #include "azure/keyvault/keys/cryptography/encrypt_parameters.hpp"
 #include "azure/keyvault/keys/cryptography/encrypt_result.hpp"
-#include "azure/keyvault/keys/key_vault_key.hpp"
+#include "azure/keyvault/keys/keyvault_key.hpp"
 
 #include <memory>
 #include <string>
diff --git a/sdk/keyvault/azure-security-keyvault-keys/test/perf/inc/azure/keyvault/keys/test/get_key_test.hpp b/sdk/keyvault/azure-security-keyvault-keys/test/perf/inc/azure/keyvault/keys/test/get_key_test.hpp
index 068e40d7c..05227e61f 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/test/perf/inc/azure/keyvault/keys/test/get_key_test.hpp
+++ b/sdk/keyvault/azure-security-keyvault-keys/test/perf/inc/azure/keyvault/keys/test/get_key_test.hpp
@@ -12,7 +12,7 @@
 #include <azure/perf.hpp>
 
 #include <azure/identity.hpp>
-#include <azure/keyvault/key_vault_keys.hpp>
+#include <azure/keyvault/keyvault_keys.hpp>
 
 #include <memory>
 #include <string>
diff --git a/sdk/keyvault/azure-security-keyvault-keys/test/samples/sample1-hello-world/sample1_hello_world.cpp b/sdk/keyvault/azure-security-keyvault-keys/test/samples/sample1-hello-world/sample1_hello_world.cpp
index ec364202d..52fd2f24d 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/test/samples/sample1-hello-world/sample1_hello_world.cpp
+++ b/sdk/keyvault/azure-security-keyvault-keys/test/samples/sample1-hello-world/sample1_hello_world.cpp
@@ -19,7 +19,7 @@
 
 #include <azure/core.hpp>
 #include <azure/identity.hpp>
-#include <azure/keyvault/key_vault_keys.hpp>
+#include <azure/keyvault/keyvault_keys.hpp>
 
 #include <chrono>
 #include <iostream>
diff --git a/sdk/keyvault/azure-security-keyvault-keys/test/samples/sample2-backup-and-restore/sample2_backup_and_restore.cpp b/sdk/keyvault/azure-security-keyvault-keys/test/samples/sample2-backup-and-restore/sample2_backup_and_restore.cpp
index fc6512eb8..d8c65185c 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/test/samples/sample2-backup-and-restore/sample2_backup_and_restore.cpp
+++ b/sdk/keyvault/azure-security-keyvault-keys/test/samples/sample2-backup-and-restore/sample2_backup_and_restore.cpp
@@ -19,7 +19,7 @@
 
 #include <azure/core.hpp>
 #include <azure/identity.hpp>
-#include <azure/keyvault/key_vault_keys.hpp>
+#include <azure/keyvault/keyvault_keys.hpp>
 
 #include <assert.h>
 #include <chrono>
diff --git a/sdk/keyvault/azure-security-keyvault-keys/test/samples/sample3-get-keys/sample3_get_keys.cpp b/sdk/keyvault/azure-security-keyvault-keys/test/samples/sample3-get-keys/sample3_get_keys.cpp
index 6c41dce9a..936bf1da2 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/test/samples/sample3-get-keys/sample3_get_keys.cpp
+++ b/sdk/keyvault/azure-security-keyvault-keys/test/samples/sample3-get-keys/sample3_get_keys.cpp
@@ -20,7 +20,7 @@
 
 #include <azure/core.hpp>
 #include <azure/identity.hpp>
-#include <azure/keyvault/key_vault_keys.hpp>
+#include <azure/keyvault/keyvault_keys.hpp>
 
 #include <chrono>
 #include <fstream>
diff --git a/sdk/keyvault/azure-security-keyvault-keys/test/samples/sample4-encrypt-decrypt/sample4_encrypt_decrypt.cpp b/sdk/keyvault/azure-security-keyvault-keys/test/samples/sample4-encrypt-decrypt/sample4_encrypt_decrypt.cpp
index a140e0873..38cd2e152 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/test/samples/sample4-encrypt-decrypt/sample4_encrypt_decrypt.cpp
+++ b/sdk/keyvault/azure-security-keyvault-keys/test/samples/sample4-encrypt-decrypt/sample4_encrypt_decrypt.cpp
@@ -19,7 +19,7 @@
 
 #include <azure/core.hpp>
 #include <azure/identity.hpp>
-#include <azure/keyvault/key_vault_keys.hpp>
+#include <azure/keyvault/keyvault_keys.hpp>
 
 #include <chrono>
 #include <iostream>
diff --git a/sdk/keyvault/azure-security-keyvault-keys/test/samples/sample5-sign-verify/sample5_sign_verify.cpp b/sdk/keyvault/azure-security-keyvault-keys/test/samples/sample5-sign-verify/sample5_sign_verify.cpp
index 9bf202f30..2056928ad 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/test/samples/sample5-sign-verify/sample5_sign_verify.cpp
+++ b/sdk/keyvault/azure-security-keyvault-keys/test/samples/sample5-sign-verify/sample5_sign_verify.cpp
@@ -19,7 +19,7 @@
 
 #include <azure/core.hpp>
 #include <azure/identity.hpp>
-#include <azure/keyvault/key_vault_keys.hpp>
+#include <azure/keyvault/keyvault_keys.hpp>
 
 #include <chrono>
 #include <iostream>
diff --git a/sdk/keyvault/azure-security-keyvault-keys/test/samples/sample6-wrap-unwrap/sample6_wrap_unwrap.cpp b/sdk/keyvault/azure-security-keyvault-keys/test/samples/sample6-wrap-unwrap/sample6_wrap_unwrap.cpp
index 0b7c871a9..c38e44ca7 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/test/samples/sample6-wrap-unwrap/sample6_wrap_unwrap.cpp
+++ b/sdk/keyvault/azure-security-keyvault-keys/test/samples/sample6-wrap-unwrap/sample6_wrap_unwrap.cpp
@@ -19,7 +19,7 @@
 
 #include <azure/core.hpp>
 #include <azure/identity.hpp>
-#include <azure/keyvault/key_vault_keys.hpp>
+#include <azure/keyvault/keyvault_keys.hpp>
 
 #include <chrono>
 #include <iostream>
diff --git a/sdk/keyvault/azure-security-keyvault-keys/test/ut/key_client_backup_test_live.cpp b/sdk/keyvault/azure-security-keyvault-keys/test/ut/key_client_backup_test_live.cpp
index bb767466d..b1be26a51 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/test/ut/key_client_backup_test_live.cpp
+++ b/sdk/keyvault/azure-security-keyvault-keys/test/ut/key_client_backup_test_live.cpp
@@ -11,7 +11,7 @@
 
 #include <azure/core/base64.hpp>
 #include <azure/core/internal/json/json.hpp>
-#include <azure/keyvault/key_vault_keys.hpp>
+#include <azure/keyvault/keyvault_keys.hpp>
 #include <private/key_constants.hpp>
 
 #include <iostream>
diff --git a/sdk/keyvault/azure-security-keyvault-keys/test/ut/key_client_base_test.hpp b/sdk/keyvault/azure-security-keyvault-keys/test/ut/key_client_base_test.hpp
index 4941b615e..3f49e44dd 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/test/ut/key_client_base_test.hpp
+++ b/sdk/keyvault/azure-security-keyvault-keys/test/ut/key_client_base_test.hpp
@@ -11,7 +11,7 @@
 #include <azure/core/context.hpp>
 #include <azure/core/uuid.hpp>
 #include <azure/identity/client_secret_credential.hpp>
-#include <azure/keyvault/key_vault_keys.hpp>
+#include <azure/keyvault/keyvault_keys.hpp>
 
 #include <chrono>
 #include <cstdio>
diff --git a/sdk/keyvault/azure-security-keyvault-keys/test/ut/key_client_create_test_live.cpp b/sdk/keyvault/azure-security-keyvault-keys/test/ut/key_client_create_test_live.cpp
index fd82372fe..da815a337 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/test/ut/key_client_create_test_live.cpp
+++ b/sdk/keyvault/azure-security-keyvault-keys/test/ut/key_client_create_test_live.cpp
@@ -9,7 +9,7 @@
 
 #include "key_client_base_test.hpp"
 
-#include <azure/keyvault/key_vault_keys.hpp>
+#include <azure/keyvault/keyvault_keys.hpp>
 #include <private/key_constants.hpp>
 
 #include <string>
diff --git a/sdk/keyvault/azure-security-keyvault-keys/test/ut/key_client_delete_test_live.cpp b/sdk/keyvault/azure-security-keyvault-keys/test/ut/key_client_delete_test_live.cpp
index d29d58c71..f8c80589a 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/test/ut/key_client_delete_test_live.cpp
+++ b/sdk/keyvault/azure-security-keyvault-keys/test/ut/key_client_delete_test_live.cpp
@@ -9,7 +9,7 @@
 
 #include "key_client_base_test.hpp"
 
-#include <azure/keyvault/key_vault_keys.hpp>
+#include <azure/keyvault/keyvault_keys.hpp>
 #include <private/key_constants.hpp>
 
 #include <string>
diff --git a/sdk/keyvault/azure-security-keyvault-keys/test/ut/key_client_get_test_live.cpp b/sdk/keyvault/azure-security-keyvault-keys/test/ut/key_client_get_test_live.cpp
index 65cba7497..e36aefa48 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/test/ut/key_client_get_test_live.cpp
+++ b/sdk/keyvault/azure-security-keyvault-keys/test/ut/key_client_get_test_live.cpp
@@ -9,7 +9,7 @@
 
 #include "key_client_base_test.hpp"
 
-#include <azure/keyvault/key_vault_keys.hpp>
+#include <azure/keyvault/keyvault_keys.hpp>
 #include <private/key_constants.hpp>
 
 #include <string>
diff --git a/sdk/keyvault/azure-security-keyvault-keys/test/ut/key_client_import_test_live.cpp b/sdk/keyvault/azure-security-keyvault-keys/test/ut/key_client_import_test_live.cpp
index ab351503e..433c42c74 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/test/ut/key_client_import_test_live.cpp
+++ b/sdk/keyvault/azure-security-keyvault-keys/test/ut/key_client_import_test_live.cpp
@@ -10,7 +10,7 @@
 #include <azure/core/base64.hpp>
 #include <azure/core/exception.hpp>
 
-#include <azure/keyvault/key_vault_keys.hpp>
+#include <azure/keyvault/keyvault_keys.hpp>
 
 #include "key_client_base_test.hpp"
 
diff --git a/sdk/keyvault/azure-security-keyvault-keys/test/ut/key_client_test.cpp b/sdk/keyvault/azure-security-keyvault-keys/test/ut/key_client_test.cpp
index 49324cd52..cdc4022cb 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/test/ut/key_client_test.cpp
+++ b/sdk/keyvault/azure-security-keyvault-keys/test/ut/key_client_test.cpp
@@ -5,7 +5,7 @@
 
 #include <azure/core/context.hpp>
 #include <azure/identity/client_secret_credential.hpp>
-#include <azure/keyvault/key_vault_keys.hpp>
+#include <azure/keyvault/keyvault_keys.hpp>
 
 #include <exception>
 #include <memory>
diff --git a/sdk/keyvault/azure-security-keyvault-keys/test/ut/key_client_update_test_live.cpp b/sdk/keyvault/azure-security-keyvault-keys/test/ut/key_client_update_test_live.cpp
index fc4fa870f..83e533412 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/test/ut/key_client_update_test_live.cpp
+++ b/sdk/keyvault/azure-security-keyvault-keys/test/ut/key_client_update_test_live.cpp
@@ -10,7 +10,7 @@
 #include "key_client_base_test.hpp"
 
 #include <azure/core/datetime.hpp>
-#include <azure/keyvault/key_vault_keys.hpp>
+#include <azure/keyvault/keyvault_keys.hpp>
 #include <private/key_constants.hpp>
 
 #include <string>
diff --git a/sdk/keyvault/azure-security-keyvault-keys/test/ut/key_cryptographic_client_test_live.cpp b/sdk/keyvault/azure-security-keyvault-keys/test/ut/key_cryptographic_client_test_live.cpp
index 7134cde48..592239582 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/test/ut/key_cryptographic_client_test_live.cpp
+++ b/sdk/keyvault/azure-security-keyvault-keys/test/ut/key_cryptographic_client_test_live.cpp
@@ -11,7 +11,7 @@
 
 #include "key_client_base_test.hpp"
 
-#include <azure/keyvault/key_vault_keys.hpp>
+#include <azure/keyvault/keyvault_keys.hpp>
 
 #include <string>
 #include <vector>
diff --git a/sdk/keyvault/azure-security-keyvault-keys/test/ut/macro_guard.cpp b/sdk/keyvault/azure-security-keyvault-keys/test/ut/macro_guard.cpp
index 33910ab59..35fe15243 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/test/ut/macro_guard.cpp
+++ b/sdk/keyvault/azure-security-keyvault-keys/test/ut/macro_guard.cpp
@@ -12,4 +12,4 @@
 #define max(x, y) small
 #define min(x, y) small
 
-#include <azure/keyvault/key_vault_keys.hpp>
+#include <azure/keyvault/keyvault_keys.hpp>
diff --git a/sdk/keyvault/azure-security-keyvault-keys/test/ut/mocked_client_test.cpp b/sdk/keyvault/azure-security-keyvault-keys/test/ut/mocked_client_test.cpp
index a91b77a94..b4ee0a7ab 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/test/ut/mocked_client_test.cpp
+++ b/sdk/keyvault/azure-security-keyvault-keys/test/ut/mocked_client_test.cpp
@@ -10,7 +10,7 @@
 #include "mocked_transport_adapter_test.hpp"
 
 #include <azure/core/internal/strings.hpp>
-#include <azure/keyvault/key_vault_keys.hpp>
+#include <azure/keyvault/keyvault_keys.hpp>
 
 #include <string>
 using namespace Azure::Security::KeyVault::Keys;
diff --git a/sdk/keyvault/azure-security-keyvault-keys/test/ut/mocked_transport_adapter_test.hpp b/sdk/keyvault/azure-security-keyvault-keys/test/ut/mocked_transport_adapter_test.hpp
index b189b5a99..e825bebbb 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/test/ut/mocked_transport_adapter_test.hpp
+++ b/sdk/keyvault/azure-security-keyvault-keys/test/ut/mocked_transport_adapter_test.hpp
@@ -14,7 +14,7 @@
 
 #include <azure/core.hpp>
 #include <azure/core/internal/http/pipeline.hpp>
-#include <azure/keyvault/key_vault_keys.hpp>
+#include <azure/keyvault/keyvault_keys.hpp>
 #include <cstdio>
 #include <string>