diff --git a/samples/integration/vcpkg-all-smoke/src/main.cpp b/samples/integration/vcpkg-all-smoke/src/main.cpp
index b17694e3ad..09f2445512 100644
--- a/samples/integration/vcpkg-all-smoke/src/main.cpp
+++ b/samples/integration/vcpkg-all-smoke/src/main.cpp
@@ -10,9 +10,9 @@
 #include <azure/attestation.hpp>
 #include <azure/core.hpp>
 #include <azure/identity.hpp>
-#include <azure/keyvault/keyvault_certificates.hpp>
-#include <azure/keyvault/keyvault_keys.hpp>
-#include <azure/keyvault/keyvault_secrets.hpp>
+#include <azure/keyvault/certificates.hpp>
+#include <azure/keyvault/keys.hpp>
+#include <azure/keyvault/secrets.hpp>
 #include <azure/storage/blobs.hpp>
 #include <azure/storage/files/datalake.hpp>
 #include <azure/storage/files/shares.hpp>
@@ -67,10 +67,11 @@ int main()
     ShareLeaseClient shareLeaseClient(shareFileClient, leaseID);
     ShareServiceClient shareServiceClient(smokeUrl);
 
-    //Attestation 
+    // Attestation
     std::cout << "Creating Attestation Clients" << std::endl;
     AttestationClient attestationClient(AttestationClient::Create(smokeUrl));
-    AttestationAdministrationClient attestationAdminClient(AttestationAdministrationClient::Create(smokeUrl, credential));
+    AttestationAdministrationClient attestationAdminClient(
+        AttestationAdministrationClient::Create(smokeUrl, credential));
 
     std::cout << "Successfully Created the Clients" << std::endl;
   }
diff --git a/samples/integration/vcpkg-keyvault/src/main.cpp b/samples/integration/vcpkg-keyvault/src/main.cpp
index b8d2c69232..541a95160c 100644
--- a/samples/integration/vcpkg-keyvault/src/main.cpp
+++ b/samples/integration/vcpkg-keyvault/src/main.cpp
@@ -17,7 +17,7 @@
 
 #include <azure/core.hpp>
 #include <azure/identity.hpp>
-#include <azure/keyvault/keyvault_keys.hpp>
+#include <azure/keyvault/keys.hpp>
 
 #include <chrono>
 #include <iostream>
diff --git a/sdk/attestation/azure-security-attestation/CMakeLists.txt b/sdk/attestation/azure-security-attestation/CMakeLists.txt
index 413ca7d523..0fd43b0753 100644
--- a/sdk/attestation/azure-security-attestation/CMakeLists.txt
+++ b/sdk/attestation/azure-security-attestation/CMakeLists.txt
@@ -31,38 +31,38 @@ find_package(OpenSSL REQUIRED)
 
 set(
   AZURE_ATTESTATION_HEADER
-    inc/azure/attestation/dll_import_export.hpp
-    inc/azure/attestation/attestation_client.hpp
     inc/azure/attestation/attestation_administration_client.hpp
-    inc/azure/attestation.hpp
+    inc/azure/attestation/attestation_client.hpp
     inc/azure/attestation/attestation_client_models.hpp
     inc/azure/attestation/attestation_client_options.hpp
-    
-    src/private/package_version.hpp
-    src/private/attestation_common_request.hpp
-    src/private/attestation_deserializers_private.hpp
-     
-    src/private/attestation_client_models_private.hpp
-    src/private/crypto/inc/crypto.hpp
-    
-    src/private/attestation_client_private.hpp)
+    inc/azure/attestation/dll_import_export.hpp
+    inc/azure/attestation/rtti.hpp
+    inc/azure/attestation.hpp
+)
 
 set(
   AZURE_ATTESTATION_SOURCE
-    src/attestation_client.cpp
-    src/attestation_administration_client.cpp
-    src/attestation_client_options.cpp
+    src/private/crypto/inc/crypto.hpp
+    src/private/crypto/openssl/openssl_helpers.hpp
+    src/private/crypto/openssl/opensslcert.cpp
+    src/private/crypto/openssl/opensslcert.hpp
+    src/private/crypto/openssl/opensslcrypto.cpp
+    src/private/crypto/openssl/opensslkeys.cpp
+    src/private/crypto/openssl/opensslkeys.hpp
+    src/private/attestation_client_models_private.hpp
+    src/private/attestation_client_private.cpp
+    src/private/attestation_client_private.hpp
     src/private/attestation_common_request.cpp
+    src/private/attestation_common_request.hpp
     src/private/attestation_deserializers_private.cpp
+    src/private/attestation_deserializers_private.hpp
     src/private/jsonhelpers.cpp
-    src/private/attestation_client_private.cpp)
-
-set(
-    AZURE_ATTESTATION_SOURCE
-    ${AZURE_ATTESTATION_SOURCE}
-    src/private/crypto/openssl/opensslcrypto.cpp
-    src/private/crypto/openssl/opensslkeys.cpp
-    src/private/crypto/openssl/opensslcert.cpp)
+    src/private/jsonhelpers_private.hpp
+    src/private/package_version.hpp
+    src/attestation_administration_client.cpp
+    src/attestation_client.cpp
+    src/attestation_client_options.cpp
+)
 
 add_library(azure-security-attestation ${AZURE_ATTESTATION_HEADER} ${AZURE_ATTESTATION_SOURCE})
 
diff --git a/sdk/attestation/azure-security-attestation/inc/azure/attestation.hpp b/sdk/attestation/azure-security-attestation/inc/azure/attestation.hpp
index 8b8f6e02b4..17e41da1a8 100644
--- a/sdk/attestation/azure-security-attestation/inc/azure/attestation.hpp
+++ b/sdk/attestation/azure-security-attestation/inc/azure/attestation.hpp
@@ -10,4 +10,7 @@
 
 #include "attestation/attestation_administration_client.hpp"
 #include "attestation/attestation_client.hpp"
+#include "attestation/attestation_client_models.hpp"
+#include "attestation/attestation_client_options.hpp"
 #include "attestation/dll_import_export.hpp"
+#include "attestation/rtti.hpp"
diff --git a/sdk/core/azure-core/CMakeLists.txt b/sdk/core/azure-core/CMakeLists.txt
index 54698b777c..8a00fd083d 100644
--- a/sdk/core/azure-core/CMakeLists.txt
+++ b/sdk/core/azure-core/CMakeLists.txt
@@ -60,25 +60,25 @@ set(
     inc/azure/core/credentials/token_credential_options.hpp
     inc/azure/core/cryptography/hash.hpp
     inc/azure/core/diagnostics/logger.hpp
-    inc/azure/core/http/http_status_code.hpp
+    inc/azure/core/http/policies/policy.hpp
     inc/azure/core/http/http.hpp
+    inc/azure/core/http/http_status_code.hpp
     inc/azure/core/http/raw_response.hpp
-    inc/azure/core/http/policies/policy.hpp
     inc/azure/core/http/transport.hpp
-    inc/azure/core/internal/client_options.hpp
-    inc/azure/core/internal/contract.hpp
     inc/azure/core/internal/cryptography/sha_hash.hpp
     inc/azure/core/internal/diagnostics/log.hpp
-    inc/azure/core/internal/environment.hpp
-    inc/azure/core/internal/extendable_enumeration.hpp
     inc/azure/core/internal/http/pipeline.hpp
     inc/azure/core/internal/io/null_body_stream.hpp
-    inc/azure/core/internal/json/json_serializable.hpp
     inc/azure/core/internal/json/json.hpp
+    inc/azure/core/internal/json/json_optional.hpp
+    inc/azure/core/internal/json/json_serializable.hpp
+    inc/azure/core/internal/client_options.hpp
+    inc/azure/core/internal/contract.hpp
+    inc/azure/core/internal/environment.hpp
+    inc/azure/core/internal/extendable_enumeration.hpp
     inc/azure/core/internal/strings.hpp
     inc/azure/core/io/body_stream.hpp
     inc/azure/core/azure_assert.hpp
-    inc/azure/core/rtti.hpp
     inc/azure/core/base64.hpp
     inc/azure/core/case_insensitive_containers.hpp
     inc/azure/core/context.hpp
@@ -90,10 +90,11 @@ set(
     inc/azure/core/modified_conditions.hpp
     inc/azure/core/nullable.hpp
     inc/azure/core/operation.hpp
-    inc/azure/core/paged_response.hpp
     inc/azure/core/operation_status.hpp
+    inc/azure/core/paged_response.hpp
     inc/azure/core/platform.hpp
     inc/azure/core/response.hpp
+    inc/azure/core/rtti.hpp
     inc/azure/core/url.hpp
     inc/azure/core/uuid.hpp
     inc/azure/core.hpp
@@ -103,7 +104,6 @@ set(
   AZURE_CORE_SOURCE
     ${CURL_TRANSPORT_ADAPTER_SRC}
     ${WIN_TRANSPORT_ADAPTER_SRC}
-    src/azure_assert.cpp
     src/cryptography/md5.cpp
     src/cryptography/sha_hash.cpp
     src/http/bearer_token_authentication_policy.cpp
@@ -120,6 +120,7 @@ set(
     src/io/random_access_file_body_stream.cpp
     src/private/environment_log_level_listener.hpp
     src/private/package_version.hpp
+    src/azure_assert.cpp
     src/base64.cpp
     src/context.cpp
     src/datetime.cpp
diff --git a/sdk/core/azure-core/inc/azure/core.hpp b/sdk/core/azure-core/inc/azure/core.hpp
index 9f18d88a2b..6b7e1aa75e 100644
--- a/sdk/core/azure-core/inc/azure/core.hpp
+++ b/sdk/core/azure-core/inc/azure/core.hpp
@@ -25,6 +25,7 @@
 #include "azure/core/paged_response.hpp"
 #include "azure/core/platform.hpp"
 #include "azure/core/response.hpp"
+#include "azure/core/rtti.hpp"
 #include "azure/core/url.hpp"
 #include "azure/core/uuid.hpp"
 
diff --git a/sdk/identity/azure-identity/CMakeLists.txt b/sdk/identity/azure-identity/CMakeLists.txt
index 75594bdfbb..8cc8f7414c 100644
--- a/sdk/identity/azure-identity/CMakeLists.txt
+++ b/sdk/identity/azure-identity/CMakeLists.txt
@@ -52,6 +52,7 @@ set(
     inc/azure/identity/dll_import_export.hpp
     inc/azure/identity/environment_credential.hpp
     inc/azure/identity/managed_identity_credential.hpp
+    inc/azure/identity/rtti.hpp
     inc/azure/identity.hpp
 )
 
diff --git a/sdk/identity/azure-identity/inc/azure/identity.hpp b/sdk/identity/azure-identity/inc/azure/identity.hpp
index 0ef5230656..ff96cd03f3 100644
--- a/sdk/identity/azure-identity/inc/azure/identity.hpp
+++ b/sdk/identity/azure-identity/inc/azure/identity.hpp
@@ -14,3 +14,4 @@
 #include "azure/identity/dll_import_export.hpp"
 #include "azure/identity/environment_credential.hpp"
 #include "azure/identity/managed_identity_credential.hpp"
+#include "azure/identity/rtti.hpp"
diff --git a/sdk/keyvault/azure-security-keyvault-certificates/CHANGELOG.md b/sdk/keyvault/azure-security-keyvault-certificates/CHANGELOG.md
index 08f3f17cca..4648f49e0c 100644
--- a/sdk/keyvault/azure-security-keyvault-certificates/CHANGELOG.md
+++ b/sdk/keyvault/azure-security-keyvault-certificates/CHANGELOG.md
@@ -6,6 +6,8 @@
 
 ### Breaking Changes
 
+- Renamed `keyvault_certificates.hpp` to `certificates.hpp`.
+
 ### Bugs Fixed
 
 ### Other Changes
diff --git a/sdk/keyvault/azure-security-keyvault-certificates/CMakeLists.txt b/sdk/keyvault/azure-security-keyvault-certificates/CMakeLists.txt
index 27cd1c1943..205a5e008f 100644
--- a/sdk/keyvault/azure-security-keyvault-certificates/CMakeLists.txt
+++ b/sdk/keyvault/azure-security-keyvault-certificates/CMakeLists.txt
@@ -52,15 +52,22 @@ set(
     inc/azure/keyvault/certificates/certificate_client_models.hpp
     inc/azure/keyvault/certificates/certificate_client_options.hpp
     inc/azure/keyvault/certificates/certificate_client_operations.hpp
+    inc/azure/keyvault/certificates/dll_import_export.hpp
+    inc/azure/keyvault/certificates/rtti.hpp
 )
 
 set(
   AZURE_KEYVAULT_CERTIFICATES_SOURCE
+    src/private/certificate_constants.hpp
+    src/private/certificate_key_usage.hpp
+    src/private/certificate_serializers.hpp
+    src/private/keyvault_certificates_common_request.hpp
+    src/private/package_version.hpp
     src/certificate_client.cpp
-    src/certificate_serializers.cpp
-    src/keyvault_certificates_common_request.cpp
     src/certificate_client_operations.cpp
     src/certificate_client_paged_response.cpp
+    src/certificate_serializers.cpp
+    src/keyvault_certificates_common_request.cpp
 )
 
 add_library(azure-security-keyvault-certificates
diff --git a/sdk/keyvault/azure-security-keyvault-certificates/inc/azure/keyvault/keyvault_certificates.hpp b/sdk/keyvault/azure-security-keyvault-certificates/inc/azure/keyvault/certificates.hpp
similarity index 91%
rename from sdk/keyvault/azure-security-keyvault-certificates/inc/azure/keyvault/keyvault_certificates.hpp
rename to sdk/keyvault/azure-security-keyvault-certificates/inc/azure/keyvault/certificates.hpp
index 59a6d7e4b9..ef41801aaf 100644
--- a/sdk/keyvault/azure-security-keyvault-certificates/inc/azure/keyvault/keyvault_certificates.hpp
+++ b/sdk/keyvault/azure-security-keyvault-certificates/inc/azure/keyvault/certificates.hpp
@@ -14,3 +14,5 @@
 #include "azure/keyvault/certificates/certificate_client_models.hpp"
 #include "azure/keyvault/certificates/certificate_client_operations.hpp"
 #include "azure/keyvault/certificates/certificate_client_options.hpp"
+
+#include "azure/keyvault/certificates/rtti.hpp"
diff --git a/sdk/keyvault/azure-security-keyvault-certificates/test/samples/certificate-basic-operations/certificate_basic_operations.cpp b/sdk/keyvault/azure-security-keyvault-certificates/test/samples/certificate-basic-operations/certificate_basic_operations.cpp
index 4ba98a41ce..74b349cefe 100644
--- a/sdk/keyvault/azure-security-keyvault-certificates/test/samples/certificate-basic-operations/certificate_basic_operations.cpp
+++ b/sdk/keyvault/azure-security-keyvault-certificates/test/samples/certificate-basic-operations/certificate_basic_operations.cpp
@@ -16,7 +16,7 @@
 #include "get_env.hpp"
 
 #include <azure/identity.hpp>
-#include <azure/keyvault/keyvault_certificates.hpp>
+#include <azure/keyvault/certificates.hpp>
 
 #include <chrono>
 #include <iostream>
diff --git a/sdk/keyvault/azure-security-keyvault-certificates/test/samples/certificate-get-certificates/certificate_get_certificates.cpp b/sdk/keyvault/azure-security-keyvault-certificates/test/samples/certificate-get-certificates/certificate_get_certificates.cpp
index a9ab513362..da75bf9c9c 100644
--- a/sdk/keyvault/azure-security-keyvault-certificates/test/samples/certificate-get-certificates/certificate_get_certificates.cpp
+++ b/sdk/keyvault/azure-security-keyvault-certificates/test/samples/certificate-get-certificates/certificate_get_certificates.cpp
@@ -19,7 +19,7 @@
 #include "get_env.hpp"
 
 #include <azure/identity.hpp>
-#include <azure/keyvault/keyvault_certificates.hpp>
+#include <azure/keyvault/certificates.hpp>
 
 #include <chrono>
 #include <iostream>
diff --git a/sdk/keyvault/azure-security-keyvault-certificates/test/samples/certificate-import-certificate/certificate_import_certificate.cpp b/sdk/keyvault/azure-security-keyvault-certificates/test/samples/certificate-import-certificate/certificate_import_certificate.cpp
index 6eda422347..79a8576ebd 100644
--- a/sdk/keyvault/azure-security-keyvault-certificates/test/samples/certificate-import-certificate/certificate_import_certificate.cpp
+++ b/sdk/keyvault/azure-security-keyvault-certificates/test/samples/certificate-import-certificate/certificate_import_certificate.cpp
@@ -17,7 +17,7 @@
 
 #include <azure/core.hpp>
 #include <azure/identity.hpp>
-#include <azure/keyvault/keyvault_certificates.hpp>
+#include <azure/keyvault/certificates.hpp>
 #include <chrono>
 #include <iostream>
 
diff --git a/sdk/keyvault/azure-security-keyvault-certificates/test/ut/certificate_client_base_test.hpp b/sdk/keyvault/azure-security-keyvault-certificates/test/ut/certificate_client_base_test.hpp
index 599a5270c5..678cafddca 100644
--- a/sdk/keyvault/azure-security-keyvault-certificates/test/ut/certificate_client_base_test.hpp
+++ b/sdk/keyvault/azure-security-keyvault-certificates/test/ut/certificate_client_base_test.hpp
@@ -12,7 +12,7 @@
 #include "../src/private/certificate_serializers.hpp"
 #include <azure/core/test/test_base.hpp>
 #include <azure/identity/client_secret_credential.hpp>
-#include <azure/keyvault/keyvault_certificates.hpp>
+#include <azure/keyvault/certificates.hpp>
 #include <chrono>
 #include <thread>
 
diff --git a/sdk/keyvault/azure-security-keyvault-certificates/test/ut/macro_guard.cpp b/sdk/keyvault/azure-security-keyvault-certificates/test/ut/macro_guard.cpp
index 1257993335..d0e5a6e243 100644
--- a/sdk/keyvault/azure-security-keyvault-certificates/test/ut/macro_guard.cpp
+++ b/sdk/keyvault/azure-security-keyvault-certificates/test/ut/macro_guard.cpp
@@ -12,4 +12,4 @@
 #define max(x, y) small
 #define min(x, y) small
 
-#include "azure/keyvault/keyvault_certificates.hpp"
+#include "azure/keyvault/certificates.hpp"
diff --git a/sdk/keyvault/azure-security-keyvault-keys/CMakeLists.txt b/sdk/keyvault/azure-security-keyvault-keys/CMakeLists.txt
index 5fb37a7add..571a1875bb 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/CMakeLists.txt
+++ b/sdk/keyvault/azure-security-keyvault-keys/CMakeLists.txt
@@ -47,18 +47,22 @@ endif()
 
 set(
   AZURE_KEYVAULT_KEYS_HEADER
+    inc/azure/keyvault/keys/cryptography/cryptography_client.hpp
     inc/azure/keyvault/keys/cryptography/cryptography_client_models.hpp
     inc/azure/keyvault/keys/cryptography/cryptography_client_options.hpp
-    inc/azure/keyvault/keys/cryptography/cryptography_client.hpp
+    inc/azure/keyvault/keys/dll_import_export.hpp
     inc/azure/keyvault/keys/key_client.hpp
     inc/azure/keyvault/keys/key_client_models.hpp
     inc/azure/keyvault/keys/key_client_options.hpp
+    inc/azure/keyvault/keys/rtti.hpp
+    inc/azure/keyvault/keys.hpp
+    inc/azure/keyvault/keyvault_keys.hpp
 )
 
 set(
   AZURE_KEYVAULT_KEYS_SOURCE
-    src/cryptography/cryptography_client_options.cpp
     src/cryptography/cryptography_client.cpp
+    src/cryptography/cryptography_client_options.cpp
     src/cryptography/decrypt_parameters.cpp
     src/cryptography/decrypt_result.cpp
     src/cryptography/encrypt_parameters.cpp
@@ -70,9 +74,9 @@ set(
     src/cryptography/key_wrap_parameters.cpp
     src/cryptography/sign_result.cpp
     src/cryptography/signature_algorithm.cpp
-    src/cryptography/wrap_result.cpp
     src/cryptography/unwrap_result.cpp
     src/cryptography/verify_result.cpp
+    src/cryptography/wrap_result.cpp
     src/private/cryptography_internal_access.hpp
     src/private/cryptography_serializers.hpp
     src/private/key_backup.hpp
@@ -90,8 +94,8 @@ set(
     src/import_key_options.cpp
     src/json_web_key.cpp
     src/key_backup.cpp
-    src/key_client_options.cpp
     src/key_client.cpp
+    src/key_client_options.cpp
     src/key_client_paged_responses.cpp
     src/key_curve_name.cpp
     src/key_operation.cpp
diff --git a/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys.hpp b/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys.hpp
new file mode 100644
index 0000000000..0a2c2739ff
--- /dev/null
+++ b/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys.hpp
@@ -0,0 +1,18 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+/**
+ * @brief Includes all public headers from Azure Key Vault Keys SDK library.
+ *
+ */
+
+#pragma once
+
+#include "azure/keyvault/keys/cryptography/cryptography_client.hpp"
+#include "azure/keyvault/keys/cryptography/cryptography_client_models.hpp"
+#include "azure/keyvault/keys/cryptography/cryptography_client_options.hpp"
+#include "azure/keyvault/keys/dll_import_export.hpp"
+#include "azure/keyvault/keys/key_client.hpp"
+#include "azure/keyvault/keys/key_client_models.hpp"
+#include "azure/keyvault/keys/key_client_options.hpp"
+#include "azure/keyvault/keys/rtti.hpp"
diff --git a/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keyvault_keys.hpp b/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keyvault_keys.hpp
index d662199f90..a1a2415109 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keyvault_keys.hpp
+++ b/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keyvault_keys.hpp
@@ -4,14 +4,11 @@
 /**
  * @brief Includes all public headers from Azure Key Vault Keys SDK library.
  *
+ * @remark This header file does exist for compatibility with prior stable releases.
+ * It is recommended to use `keys.hpp` instead.
+ *
  */
 
 #pragma once
 
-#include "azure/keyvault/keys/cryptography/cryptography_client.hpp"
-#include "azure/keyvault/keys/cryptography/cryptography_client_models.hpp"
-#include "azure/keyvault/keys/cryptography/cryptography_client_options.hpp"
-#include "azure/keyvault/keys/dll_import_export.hpp"
-#include "azure/keyvault/keys/key_client.hpp"
-#include "azure/keyvault/keys/key_client_models.hpp"
-#include "azure/keyvault/keys/key_client_options.hpp"
+#include "azure/keyvault/keys.hpp"
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 52f4077f14..c75f7a0ef8 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/keyvault_keys.hpp>
+#include <azure/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 56e2331cea..c67dfd5203 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
@@ -17,7 +17,7 @@
 
 #include <azure/core.hpp>
 #include <azure/identity.hpp>
-#include <azure/keyvault/keyvault_keys.hpp>
+#include <azure/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 94e42a7250..db9ab83a31 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
@@ -17,7 +17,7 @@
 
 #include <azure/core.hpp>
 #include <azure/identity.hpp>
-#include <azure/keyvault/keyvault_keys.hpp>
+#include <azure/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 681f6c0b29..8484e691f9 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
@@ -18,7 +18,7 @@
 
 #include <azure/core.hpp>
 #include <azure/identity.hpp>
-#include <azure/keyvault/keyvault_keys.hpp>
+#include <azure/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 d6e81bcd37..500a58a819 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
@@ -17,7 +17,7 @@
 
 #include <azure/core.hpp>
 #include <azure/identity.hpp>
-#include <azure/keyvault/keyvault_keys.hpp>
+#include <azure/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 8749233ac4..85251a18ae 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
@@ -17,7 +17,7 @@
 
 #include <azure/core.hpp>
 #include <azure/identity.hpp>
-#include <azure/keyvault/keyvault_keys.hpp>
+#include <azure/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 830f4e441c..68092365bc 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
@@ -17,7 +17,7 @@
 
 #include <azure/core.hpp>
 #include <azure/identity.hpp>
-#include <azure/keyvault/keyvault_keys.hpp>
+#include <azure/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 00a912ee82..d3536f79f3 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
@@ -7,7 +7,7 @@
 
 #include <azure/core/base64.hpp>
 #include <azure/core/internal/json/json.hpp>
-#include <azure/keyvault/keyvault_keys.hpp>
+#include <azure/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 d7553a6f2f..fbffa95fb9 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,8 +11,8 @@
 #include <azure/core/context.hpp>
 #include <azure/core/uuid.hpp>
 #include <azure/identity/client_secret_credential.hpp>
+#include <azure/keyvault/keys.hpp>
 #include <azure/keyvault/keys/cryptography/cryptography_client.hpp>
-#include <azure/keyvault/keyvault_keys.hpp>
 
 #include <azure/core/test/test_base.hpp>
 
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 65ce578886..1efe301349 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
@@ -5,7 +5,7 @@
 
 #include "key_client_base_test.hpp"
 
-#include <azure/keyvault/keyvault_keys.hpp>
+#include <azure/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 626987623a..bf13777b2f 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
@@ -5,7 +5,7 @@
 
 #include "key_client_base_test.hpp"
 
-#include <azure/keyvault/keyvault_keys.hpp>
+#include <azure/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 7259ff2286..dacc326455 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
@@ -5,7 +5,7 @@
 
 #include "key_client_base_test.hpp"
 
-#include <azure/keyvault/keyvault_keys.hpp>
+#include <azure/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 af640c578e..756336584b 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
@@ -6,7 +6,7 @@
 #include <azure/core/base64.hpp>
 #include <azure/core/exception.hpp>
 
-#include <azure/keyvault/keyvault_keys.hpp>
+#include <azure/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 1803ab6289..6b87993f12 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/keyvault_keys.hpp>
+#include <azure/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 2bcb5445cc..691e5793a5 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
@@ -6,7 +6,7 @@
 #include "key_client_base_test.hpp"
 
 #include <azure/core/datetime.hpp>
-#include <azure/keyvault/keyvault_keys.hpp>
+#include <azure/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 1250216b2a..c20df1c2e6 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
@@ -7,7 +7,7 @@
 
 #include "key_client_base_test.hpp"
 
-#include <azure/keyvault/keyvault_keys.hpp>
+#include <azure/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 35fe152431..304501a03d 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/keyvault_keys.hpp>
+#include <azure/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 d1c37374cf..7587463624 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
@@ -6,7 +6,7 @@
 #include "mocked_transport_adapter_test.hpp"
 
 #include <azure/core/internal/strings.hpp>
-#include <azure/keyvault/keyvault_keys.hpp>
+#include <azure/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 97146f8ed6..cd6cf66dc1 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
@@ -15,7 +15,7 @@
 
 #include <azure/core.hpp>
 #include <azure/core/internal/http/pipeline.hpp>
-#include <azure/keyvault/keyvault_keys.hpp>
+#include <azure/keyvault/keys.hpp>
 
 #include <cstdio>
 #include <string>
diff --git a/sdk/keyvault/azure-security-keyvault-secrets/CHANGELOG.md b/sdk/keyvault/azure-security-keyvault-secrets/CHANGELOG.md
index 01a44320d8..32a1794c1c 100644
--- a/sdk/keyvault/azure-security-keyvault-secrets/CHANGELOG.md
+++ b/sdk/keyvault/azure-security-keyvault-secrets/CHANGELOG.md
@@ -6,6 +6,8 @@
 
 ### Breaking Changes
 
+- Renamed `keyvault_secrets.hpp` to `secrets.hpp`.
+
 ### Bugs Fixed
 
 ### Other Changes
diff --git a/sdk/keyvault/azure-security-keyvault-secrets/CMakeLists.txt b/sdk/keyvault/azure-security-keyvault-secrets/CMakeLists.txt
index 67f343263b..480c5c161f 100644
--- a/sdk/keyvault/azure-security-keyvault-secrets/CMakeLists.txt
+++ b/sdk/keyvault/azure-security-keyvault-secrets/CMakeLists.txt
@@ -48,31 +48,32 @@ endif()
 set(
   AZURE_SECURITY_KEYVAULT_SECRETS_HEADER
     inc/azure/keyvault/secrets/dll_import_export.hpp
-    inc/azure/keyvault/secrets/keyvault_secret.hpp
-    inc/azure/keyvault/secrets/keyvault_secret_properties.hpp
-    inc/azure/keyvault/secrets/secret_client.hpp
-    inc/azure/keyvault/keyvault_secrets.hpp
-    inc/azure/keyvault/secrets/keyvault_deleted_secret.hpp
-    inc/azure/keyvault/secrets/keyvault_secret_paged_response.hpp
     inc/azure/keyvault/secrets/keyvault_backup_secret.hpp
+    inc/azure/keyvault/secrets/keyvault_deleted_secret.hpp
     inc/azure/keyvault/secrets/keyvault_operations.hpp
     inc/azure/keyvault/secrets/keyvault_options.hpp
+    inc/azure/keyvault/secrets/keyvault_secret.hpp
+    inc/azure/keyvault/secrets/keyvault_secret_paged_response.hpp
+    inc/azure/keyvault/secrets/keyvault_secret_properties.hpp
+    inc/azure/keyvault/secrets/rtti.hpp
+    inc/azure/keyvault/secrets/secret_client.hpp
+    inc/azure/keyvault/secrets.hpp
 )
 
 set(
   AZURE_SECURITY_KEYVAULT_SECRETS_SOURCE
-    src/private/package_version.hpp
     src/private/keyvault_protocol.hpp
+    src/private/keyvault_secrets_common_request.hpp
+    src/private/package_version.hpp
     src/private/secret_constants.hpp
     src/private/secret_serializers.hpp
-    src/private/keyvault_secrets_common_request.hpp
-    src/keyvault_protocol.cpp
-    src/secret_client.cpp
-    src/secret_serializers.cpp
     src/keyvault_operations.cpp
+    src/keyvault_protocol.cpp
     src/keyvault_secret_paged_response.cpp
     src/keyvault_secret_properties.cpp
     src/keyvault_secrets_common_request.cpp
+    src/secret_client.cpp
+    src/secret_serializers.cpp
 )
 
 add_library(azure-security-keyvault-secrets ${AZURE_SECURITY_KEYVAULT_SECRETS_HEADER} ${AZURE_SECURITY_KEYVAULT_SECRETS_SOURCE})
diff --git a/sdk/keyvault/azure-security-keyvault-secrets/inc/azure/keyvault/keyvault_secrets.hpp b/sdk/keyvault/azure-security-keyvault-secrets/inc/azure/keyvault/secrets.hpp
similarity index 94%
rename from sdk/keyvault/azure-security-keyvault-secrets/inc/azure/keyvault/keyvault_secrets.hpp
rename to sdk/keyvault/azure-security-keyvault-secrets/inc/azure/keyvault/secrets.hpp
index 775dab5729..cbfc63ebf9 100644
--- a/sdk/keyvault/azure-security-keyvault-secrets/inc/azure/keyvault/keyvault_secrets.hpp
+++ b/sdk/keyvault/azure-security-keyvault-secrets/inc/azure/keyvault/secrets.hpp
@@ -16,4 +16,5 @@
 #include "azure/keyvault/secrets/keyvault_secret.hpp"
 #include "azure/keyvault/secrets/keyvault_secret_paged_response.hpp"
 #include "azure/keyvault/secrets/keyvault_secret_properties.hpp"
+#include "azure/keyvault/secrets/rtti.hpp"
 #include "azure/keyvault/secrets/secret_client.hpp"
diff --git a/sdk/keyvault/azure-security-keyvault-secrets/test/samples/sample1-basic-operations/sample1_basic_operations.cpp b/sdk/keyvault/azure-security-keyvault-secrets/test/samples/sample1-basic-operations/sample1_basic_operations.cpp
index c4c1cc44e6..4362030ef1 100644
--- a/sdk/keyvault/azure-security-keyvault-secrets/test/samples/sample1-basic-operations/sample1_basic_operations.cpp
+++ b/sdk/keyvault/azure-security-keyvault-secrets/test/samples/sample1-basic-operations/sample1_basic_operations.cpp
@@ -16,7 +16,7 @@
 #include "get_env.hpp"
 
 #include <azure/identity.hpp>
-#include <azure/keyvault/keyvault_secrets.hpp>
+#include <azure/keyvault/secrets.hpp>
 
 #include <chrono>
 #include <iostream>
diff --git a/sdk/keyvault/azure-security-keyvault-secrets/test/samples/sample2-backup-restore/sample2_backup_restore.cpp b/sdk/keyvault/azure-security-keyvault-secrets/test/samples/sample2-backup-restore/sample2_backup_restore.cpp
index 340bb10407..d5c1cab98b 100644
--- a/sdk/keyvault/azure-security-keyvault-secrets/test/samples/sample2-backup-restore/sample2_backup_restore.cpp
+++ b/sdk/keyvault/azure-security-keyvault-secrets/test/samples/sample2-backup-restore/sample2_backup_restore.cpp
@@ -16,7 +16,7 @@
 #include "get_env.hpp"
 
 #include <azure/identity.hpp>
-#include <azure/keyvault/keyvault_secrets.hpp>
+#include <azure/keyvault/secrets.hpp>
 
 #include <assert.h>
 #include <chrono>
diff --git a/sdk/keyvault/azure-security-keyvault-secrets/test/samples/sample3-delete-recover/sample3_delete_recover.cpp b/sdk/keyvault/azure-security-keyvault-secrets/test/samples/sample3-delete-recover/sample3_delete_recover.cpp
index 905d67456c..35be06a372 100644
--- a/sdk/keyvault/azure-security-keyvault-secrets/test/samples/sample3-delete-recover/sample3_delete_recover.cpp
+++ b/sdk/keyvault/azure-security-keyvault-secrets/test/samples/sample3-delete-recover/sample3_delete_recover.cpp
@@ -16,7 +16,7 @@
 #include "get_env.hpp"
 
 #include <azure/identity.hpp>
-#include <azure/keyvault/keyvault_secrets.hpp>
+#include <azure/keyvault/secrets.hpp>
 
 #include <assert.h>
 #include <chrono>
diff --git a/sdk/keyvault/azure-security-keyvault-secrets/test/samples/sample4-get-secrets-deleted/sample4_get_secrets_deleted.cpp b/sdk/keyvault/azure-security-keyvault-secrets/test/samples/sample4-get-secrets-deleted/sample4_get_secrets_deleted.cpp
index a148760e48..e80c8d4dfc 100644
--- a/sdk/keyvault/azure-security-keyvault-secrets/test/samples/sample4-get-secrets-deleted/sample4_get_secrets_deleted.cpp
+++ b/sdk/keyvault/azure-security-keyvault-secrets/test/samples/sample4-get-secrets-deleted/sample4_get_secrets_deleted.cpp
@@ -16,7 +16,7 @@
 #include "get_env.hpp"
 
 #include <azure/identity.hpp>
-#include <azure/keyvault/keyvault_secrets.hpp>
+#include <azure/keyvault/secrets.hpp>
 
 #include <chrono>
 #include <iostream>
diff --git a/sdk/keyvault/azure-security-keyvault-secrets/test/test-app/macro_guard.cpp b/sdk/keyvault/azure-security-keyvault-secrets/test/test-app/macro_guard.cpp
index 29d98b4c10..ee583e8605 100644
--- a/sdk/keyvault/azure-security-keyvault-secrets/test/test-app/macro_guard.cpp
+++ b/sdk/keyvault/azure-security-keyvault-secrets/test/test-app/macro_guard.cpp
@@ -12,4 +12,4 @@
 #define max(x, y) small
 #define min(x, y) small
 
-#include "azure/keyvault/keyvault_secrets.hpp"
+#include "azure/keyvault/secrets.hpp"
diff --git a/sdk/keyvault/azure-security-keyvault-secrets/test/test-app/test_app.cpp b/sdk/keyvault/azure-security-keyvault-secrets/test/test-app/test_app.cpp
index 7bf83e9dee..972cd41887 100644
--- a/sdk/keyvault/azure-security-keyvault-secrets/test/test-app/test_app.cpp
+++ b/sdk/keyvault/azure-security-keyvault-secrets/test/test-app/test_app.cpp
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-#include "azure/keyvault/keyvault_secrets.hpp"
+#include "azure/keyvault/secrets.hpp"
 #include <azure/core/internal/environment.hpp>
 #include <azure/identity.hpp>
 
diff --git a/sdk/keyvault/azure-security-keyvault-secrets/test/ut/macro_guard.cpp b/sdk/keyvault/azure-security-keyvault-secrets/test/ut/macro_guard.cpp
index 29d98b4c10..ee583e8605 100644
--- a/sdk/keyvault/azure-security-keyvault-secrets/test/ut/macro_guard.cpp
+++ b/sdk/keyvault/azure-security-keyvault-secrets/test/ut/macro_guard.cpp
@@ -12,4 +12,4 @@
 #define max(x, y) small
 #define min(x, y) small
 
-#include "azure/keyvault/keyvault_secrets.hpp"
+#include "azure/keyvault/secrets.hpp"
diff --git a/sdk/keyvault/azure-security-keyvault-secrets/test/ut/secret_client_base_test.hpp b/sdk/keyvault/azure-security-keyvault-secrets/test/ut/secret_client_base_test.hpp
index a37bf6ad3b..2d92cb3913 100644
--- a/sdk/keyvault/azure-security-keyvault-secrets/test/ut/secret_client_base_test.hpp
+++ b/sdk/keyvault/azure-security-keyvault-secrets/test/ut/secret_client_base_test.hpp
@@ -10,7 +10,7 @@
 
 #include <azure/core/test/test_base.hpp>
 #include <azure/identity/client_secret_credential.hpp>
-#include <azure/keyvault/keyvault_secrets.hpp>
+#include <azure/keyvault/secrets.hpp>
 
 using namespace std::chrono_literals;
 
diff --git a/sdk/storage/azure-storage-blobs/CMakeLists.txt b/sdk/storage/azure-storage-blobs/CMakeLists.txt
index e005b3df5d..2271cd5840 100644
--- a/sdk/storage/azure-storage-blobs/CMakeLists.txt
+++ b/sdk/storage/azure-storage-blobs/CMakeLists.txt
@@ -52,6 +52,7 @@ set(
     inc/azure/storage/blobs/dll_import_export.hpp
     inc/azure/storage/blobs/page_blob_client.hpp
     inc/azure/storage/blobs/rest_client.hpp
+    inc/azure/storage/blobs/rtti.hpp
     inc/azure/storage/blobs.hpp
     src/private/avro_parser.hpp
     src/private/package_version.hpp
diff --git a/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs.hpp b/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs.hpp
index 7c9ddb1383..03eb6fce23 100644
--- a/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs.hpp
+++ b/sdk/storage/azure-storage-blobs/inc/azure/storage/blobs.hpp
@@ -8,13 +8,18 @@
 
 #pragma once
 
+#include <azure/storage/common/storage_exception.hpp>
+
 #include "azure/storage/blobs/append_blob_client.hpp"
 #include "azure/storage/blobs/blob_client.hpp"
 #include "azure/storage/blobs/blob_container_client.hpp"
 #include "azure/storage/blobs/blob_lease_client.hpp"
+#include "azure/storage/blobs/blob_options.hpp"
+#include "azure/storage/blobs/blob_responses.hpp"
 #include "azure/storage/blobs/blob_sas_builder.hpp"
 #include "azure/storage/blobs/blob_service_client.hpp"
 #include "azure/storage/blobs/block_blob_client.hpp"
 #include "azure/storage/blobs/dll_import_export.hpp"
 #include "azure/storage/blobs/page_blob_client.hpp"
-#include "azure/storage/common/storage_exception.hpp"
+#include "azure/storage/blobs/rest_client.hpp"
+#include "azure/storage/blobs/rtti.hpp"
diff --git a/sdk/storage/azure-storage-common/CMakeLists.txt b/sdk/storage/azure-storage-common/CMakeLists.txt
index 840b85af99..ad8759b9f5 100644
--- a/sdk/storage/azure-storage-common/CMakeLists.txt
+++ b/sdk/storage/azure-storage-common/CMakeLists.txt
@@ -55,14 +55,15 @@ set(
     inc/azure/storage/common/internal/storage_service_version_policy.hpp
     inc/azure/storage/common/internal/storage_switch_to_secondary_policy.hpp
     inc/azure/storage/common/internal/xml_wrapper.hpp
+    inc/azure/storage/common/rtti.hpp
     inc/azure/storage/common/storage_common.hpp
     inc/azure/storage/common/storage_credential.hpp
     inc/azure/storage/common/storage_exception.hpp
-    src/private/package_version.hpp
 )
 
 set(
   AZURE_STORAGE_COMMON_SOURCE
+    src/private/package_version.hpp
     src/account_sas_builder.cpp
     src/crypt.cpp
     src/file_io.cpp
diff --git a/sdk/storage/azure-storage-files-datalake/CMakeLists.txt b/sdk/storage/azure-storage-files-datalake/CMakeLists.txt
index 0152ddef4c..f8ed9bc9d3 100644
--- a/sdk/storage/azure-storage-files-datalake/CMakeLists.txt
+++ b/sdk/storage/azure-storage-files-datalake/CMakeLists.txt
@@ -52,13 +52,14 @@ set(
     inc/azure/storage/files/datalake/datalake_service_client.hpp
     inc/azure/storage/files/datalake/dll_import_export.hpp
     inc/azure/storage/files/datalake/rest_client.hpp
-    src/private/package_version.hpp
+    inc/azure/storage/files/datalake/rtti.hpp
 )
 
 set(
   AZURE_STORAGE_FILES_DATALAKE_SOURCE
     src/private/datalake_constants.hpp
     src/private/datalake_utilities.hpp
+    src/private/package_version.hpp
     src/datalake_directory_client.cpp
     src/datalake_file_client.cpp
     src/datalake_file_system_client.cpp
diff --git a/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake.hpp b/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake.hpp
index a8b861450a..aaa0f7ae82 100644
--- a/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake.hpp
+++ b/sdk/storage/azure-storage-files-datalake/inc/azure/storage/files/datalake.hpp
@@ -8,12 +8,17 @@
 
 #pragma once
 
-#include "azure/storage/common/storage_exception.hpp"
+#include <azure/storage/common/storage_exception.hpp>
+
 #include "azure/storage/files/datalake/datalake_directory_client.hpp"
 #include "azure/storage/files/datalake/datalake_file_client.hpp"
 #include "azure/storage/files/datalake/datalake_file_system_client.hpp"
 #include "azure/storage/files/datalake/datalake_lease_client.hpp"
+#include "azure/storage/files/datalake/datalake_options.hpp"
 #include "azure/storage/files/datalake/datalake_path_client.hpp"
+#include "azure/storage/files/datalake/datalake_responses.hpp"
 #include "azure/storage/files/datalake/datalake_sas_builder.hpp"
 #include "azure/storage/files/datalake/datalake_service_client.hpp"
 #include "azure/storage/files/datalake/dll_import_export.hpp"
+#include "azure/storage/files/datalake/rest_client.hpp"
+#include "azure/storage/files/datalake/rtti.hpp"
diff --git a/sdk/storage/azure-storage-files-shares/CMakeLists.txt b/sdk/storage/azure-storage-files-shares/CMakeLists.txt
index ceb7649e26..dd8e913086 100644
--- a/sdk/storage/azure-storage-files-shares/CMakeLists.txt
+++ b/sdk/storage/azure-storage-files-shares/CMakeLists.txt
@@ -42,6 +42,7 @@ set(
   AZURE_STORAGE_FILES_SHARES_HEADER
     inc/azure/storage/files/shares/dll_import_export.hpp
     inc/azure/storage/files/shares/rest_client.hpp
+    inc/azure/storage/files/shares/rtti.hpp
     inc/azure/storage/files/shares/share_client.hpp
     inc/azure/storage/files/shares/share_constants.hpp
     inc/azure/storage/files/shares/share_directory_client.hpp
@@ -52,11 +53,11 @@ set(
     inc/azure/storage/files/shares/share_sas_builder.hpp
     inc/azure/storage/files/shares/share_service_client.hpp
     inc/azure/storage/files/shares.hpp
-    src/private/package_version.hpp
 )
 
 set(
   AZURE_STORAGE_FILES_SHARES_SOURCE
+    src/private/package_version.hpp
     src/rest_client.cpp
     src/share_client.cpp
     src/share_directory_client.cpp
diff --git a/sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares.hpp b/sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares.hpp
index 4978566505..fe99ed8c9a 100644
--- a/sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares.hpp
+++ b/sdk/storage/azure-storage-files-shares/inc/azure/storage/files/shares.hpp
@@ -8,11 +8,17 @@
 
 #pragma once
 
-#include "azure/storage/common/storage_exception.hpp"
+#include <azure/storage/common/storage_exception.hpp>
+
 #include "azure/storage/files/shares/dll_import_export.hpp"
+#include "azure/storage/files/shares/rest_client.hpp"
+#include "azure/storage/files/shares/rtti.hpp"
 #include "azure/storage/files/shares/share_client.hpp"
+#include "azure/storage/files/shares/share_constants.hpp"
 #include "azure/storage/files/shares/share_directory_client.hpp"
 #include "azure/storage/files/shares/share_file_client.hpp"
 #include "azure/storage/files/shares/share_lease_client.hpp"
+#include "azure/storage/files/shares/share_options.hpp"
+#include "azure/storage/files/shares/share_responses.hpp"
 #include "azure/storage/files/shares/share_sas_builder.hpp"
 #include "azure/storage/files/shares/share_service_client.hpp"
diff --git a/sdk/storage/azure-storage-queues/CMakeLists.txt b/sdk/storage/azure-storage-queues/CMakeLists.txt
index ab6b2f4034..ee7d9e7204 100644
--- a/sdk/storage/azure-storage-queues/CMakeLists.txt
+++ b/sdk/storage/azure-storage-queues/CMakeLists.txt
@@ -48,11 +48,12 @@ set(
     inc/azure/storage/queues/queue_sas_builder.hpp
     inc/azure/storage/queues/queue_service_client.hpp
     inc/azure/storage/queues/rest_client.hpp
-    src/private/package_version.hpp
+    inc/azure/storage/queues/rtti.hpp
 )
 
 set(
   AZURE_STORAGE_QUEUES_SOURCE
+    src/private/package_version.hpp
     src/queue_client.cpp
     src/queue_options.cpp
     src/queue_responses.cpp
diff --git a/sdk/storage/azure-storage-queues/inc/azure/storage/queues.hpp b/sdk/storage/azure-storage-queues/inc/azure/storage/queues.hpp
index 6feb9eb0b4..294cd425c6 100644
--- a/sdk/storage/azure-storage-queues/inc/azure/storage/queues.hpp
+++ b/sdk/storage/azure-storage-queues/inc/azure/storage/queues.hpp
@@ -8,8 +8,13 @@
 
 #pragma once
 
-#include "azure/storage/common/storage_exception.hpp"
+#include <azure/storage/common/storage_exception.hpp>
+
 #include "azure/storage/queues/dll_import_export.hpp"
 #include "azure/storage/queues/queue_client.hpp"
+#include "azure/storage/queues/queue_options.hpp"
+#include "azure/storage/queues/queue_responses.hpp"
 #include "azure/storage/queues/queue_sas_builder.hpp"
 #include "azure/storage/queues/queue_service_client.hpp"
+#include "azure/storage/queues/rest_client.hpp"
+#include "azure/storage/queues/rtti.hpp"
diff --git a/sdk/storage/ci.yml b/sdk/storage/ci.yml
index 017ab238a9..cebc7b29cf 100644
--- a/sdk/storage/ci.yml
+++ b/sdk/storage/ci.yml
@@ -27,8 +27,8 @@ stages:
       ServiceDirectory: storage
       # Not running tests on CI but only on LiveTest mode
       CtestRegex: azure-storage
-      LineCoverageTarget: 76
-      BranchCoverageTarget: 41
+      LineCoverageTarget: 73.5305
+      BranchCoverageTarget: 40.7738
       LiveTestCtestRegex: azure-storage
       Clouds: Preview
       SupportedClouds: Preview
diff --git a/sdk/template/azure-template/inc/azure/template.hpp b/sdk/template/azure-template/inc/azure/template.hpp
index fb47d2120d..05315c0be7 100644
--- a/sdk/template/azure-template/inc/azure/template.hpp
+++ b/sdk/template/azure-template/inc/azure/template.hpp
@@ -9,4 +9,5 @@
 #pragma once
 
 #include "azure/template/dll_import_export.hpp"
+#include "azure/template/rtti.hpp"
 #include "azure/template/template_client.hpp"