diff --git a/sdk/keyvault/azure-security-keyvault-common/inc/azure/keyvault/common/client_options.hpp b/sdk/keyvault/azure-security-keyvault-common/inc/azure/keyvault/common/client_options.hpp
index 865a75a1a..30288b22f 100644
--- a/sdk/keyvault/azure-security-keyvault-common/inc/azure/keyvault/common/client_options.hpp
+++ b/sdk/keyvault/azure-security-keyvault-common/inc/azure/keyvault/common/client_options.hpp
@@ -14,7 +14,7 @@
 #include <stdexcept>
 #include <string>
 
-namespace Azure { namespace Security { namespace KeyVault { namespace Common {
+namespace Azure { namespace Security { namespace KeyVault {
 
   /**
    * @brief Available and supported service versions.
@@ -72,4 +72,4 @@ namespace Azure { namespace Security { namespace KeyVault { namespace Common {
     }
   };
 
-}}}} // namespace Azure::Security::KeyVault::Common
+}}} // namespace Azure::Security::KeyVault
diff --git a/sdk/keyvault/azure-security-keyvault-common/inc/azure/keyvault/common/internal/base64url.hpp b/sdk/keyvault/azure-security-keyvault-common/inc/azure/keyvault/common/internal/base64url.hpp
index 7fa482ed6..9f1d05aa1 100644
--- a/sdk/keyvault/azure-security-keyvault-common/inc/azure/keyvault/common/internal/base64url.hpp
+++ b/sdk/keyvault/azure-security-keyvault-common/inc/azure/keyvault/common/internal/base64url.hpp
@@ -13,7 +13,7 @@
 #include <stdexcept>
 #include <string>
 
-namespace Azure { namespace Security { namespace KeyVault { namespace Common { namespace _internal {
+namespace Azure { namespace Security { namespace KeyVault { namespace _internal {
 
   /**
    * @brief Provides conversion methods for base64url.
@@ -56,4 +56,4 @@ namespace Azure { namespace Security { namespace KeyVault { namespace Common { n
       return Azure::Core::Convert::Base64Decode(base64url);
     }
   };
-}}}}} // namespace Azure::Security::KeyVault::Common::_internal
+}}}} // namespace Azure::Security::KeyVault::_internal
diff --git a/sdk/keyvault/azure-security-keyvault-common/inc/azure/keyvault/common/internal/keyvault_pipeline.hpp b/sdk/keyvault/azure-security-keyvault-common/inc/azure/keyvault/common/internal/keyvault_pipeline.hpp
index f736c911e..5a1b1f8a0 100644
--- a/sdk/keyvault/azure-security-keyvault-common/inc/azure/keyvault/common/internal/keyvault_pipeline.hpp
+++ b/sdk/keyvault/azure-security-keyvault-common/inc/azure/keyvault/common/internal/keyvault_pipeline.hpp
@@ -21,7 +21,7 @@
 #include <string>
 #include <vector>
 
-namespace Azure { namespace Security { namespace KeyVault { namespace Common { namespace _internal {
+namespace Azure { namespace Security { namespace KeyVault { namespace _internal {
 
   /**
    * @brief The HTTP pipeline used by KeyVault clients.
@@ -188,10 +188,10 @@ namespace Azure { namespace Security { namespace KeyVault { namespace Common { n
 
     /**
      * @brief Get the Vault Url which was used to create the
-     * #Azure::Security::KeyVault::Common::_internal::KeyVaultPipeline.
+     * #Azure::Security::KeyVault::_internal::KeyVaultPipeline.
      *
      * @return The vault Url as string.
      */
     std::string GetVaultUrl() const { return m_vaultUrl.GetAbsoluteUrl(); }
   };
-}}}}} // namespace Azure::Security::KeyVault::Common::_internal
+}}}} // namespace Azure::Security::KeyVault::_internal
diff --git a/sdk/keyvault/azure-security-keyvault-common/inc/azure/keyvault/common/internal/unix_time_helper.hpp b/sdk/keyvault/azure-security-keyvault-common/inc/azure/keyvault/common/internal/unix_time_helper.hpp
index b3d19cf09..cd6b4b16b 100644
--- a/sdk/keyvault/azure-security-keyvault-common/inc/azure/keyvault/common/internal/unix_time_helper.hpp
+++ b/sdk/keyvault/azure-security-keyvault-common/inc/azure/keyvault/common/internal/unix_time_helper.hpp
@@ -12,7 +12,7 @@
 
 #include <chrono>
 
-namespace Azure { namespace Security { namespace KeyVault { namespace Common { namespace _internal {
+namespace Azure { namespace Security { namespace KeyVault { namespace _internal {
 
   /**
    * @brief Provides convertion methods for unix time to Azure Core Datetime.
@@ -43,4 +43,4 @@ namespace Azure { namespace Security { namespace KeyVault { namespace Common { n
       return secondsSince1970.count();
     }
   };
-}}}}} // namespace Azure::Security::KeyVault::Common::_internal
+}}}} // namespace Azure::Security::KeyVault::_internal
diff --git a/sdk/keyvault/azure-security-keyvault-common/inc/azure/keyvault/common/keyvault_constants.hpp b/sdk/keyvault/azure-security-keyvault-common/inc/azure/keyvault/common/keyvault_constants.hpp
index 7a6fb5891..eb2ebab5a 100644
--- a/sdk/keyvault/azure-security-keyvault-common/inc/azure/keyvault/common/keyvault_constants.hpp
+++ b/sdk/keyvault/azure-security-keyvault-common/inc/azure/keyvault/common/keyvault_constants.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-namespace Azure { namespace Security { namespace KeyVault { namespace Common { namespace _detail {
+namespace Azure { namespace Security { namespace KeyVault { namespace _detail {
   /***************** KeyVault headers *****************/
   static constexpr char const ContentType[] = "content-type";
   static constexpr char const ApplicationJson[] = "application/json";
@@ -18,4 +18,4 @@ namespace Azure { namespace Security { namespace KeyVault { namespace Common { n
 
   /**************** KeyVault QueryParameters *********/
   static constexpr char const ApiVersion[] = "api-version";
-}}}}} // namespace Azure::Security::KeyVault::Common::_detail
+}}}} // namespace Azure::Security::KeyVault::_detail
diff --git a/sdk/keyvault/azure-security-keyvault-common/inc/azure/keyvault/common/keyvault_exception.hpp b/sdk/keyvault/azure-security-keyvault-common/inc/azure/keyvault/common/keyvault_exception.hpp
index 56f50cff3..18146d422 100644
--- a/sdk/keyvault/azure-security-keyvault-common/inc/azure/keyvault/common/keyvault_exception.hpp
+++ b/sdk/keyvault/azure-security-keyvault-common/inc/azure/keyvault/common/keyvault_exception.hpp
@@ -15,7 +15,7 @@
 #include <stdexcept>
 #include <string>
 
-namespace Azure { namespace Security { namespace KeyVault { namespace Common {
+namespace Azure { namespace Security { namespace KeyVault {
 
   /**
    * @brief The general exception thrown by the Key Vault SDK clients.
@@ -73,7 +73,7 @@ namespace Azure { namespace Security { namespace KeyVault { namespace Common {
     std::unique_ptr<Azure::Core::Http::RawResponse> RawResponse;
 
     /**
-     * @brief Create a #Azure::Security::KeyVault::Common::KeyVaultException by parsing the \p
+     * @brief Create a #Azure::Security::KeyVault::KeyVaultException by parsing the \p
      * response.
      *
      * @param response The Http raw response from the network.
@@ -83,7 +83,7 @@ namespace Azure { namespace Security { namespace KeyVault { namespace Common {
         std::unique_ptr<Azure::Core::Http::RawResponse> response);
 
     /**
-     * @brief Create #Azure::Security::KeyVault::Common::KeyVaultException by parsing the \p
+     * @brief Create #Azure::Security::KeyVault::KeyVaultException by parsing the \p
      * response reference.
      *
      * @param response The Http raw response from the network.
@@ -91,4 +91,4 @@ namespace Azure { namespace Security { namespace KeyVault { namespace Common {
      */
     static KeyVaultException CreateFromResponse(Azure::Core::Http::RawResponse const& response);
   };
-}}}} // namespace Azure::Security::KeyVault::Common
+}}} // namespace Azure::Security::KeyVault
diff --git a/sdk/keyvault/azure-security-keyvault-common/src/keyvault_exception.cpp b/sdk/keyvault/azure-security-keyvault-common/src/keyvault_exception.cpp
index 6ab0a19a1..39652a895 100644
--- a/sdk/keyvault/azure-security-keyvault-common/src/keyvault_exception.cpp
+++ b/sdk/keyvault/azure-security-keyvault-common/src/keyvault_exception.cpp
@@ -9,7 +9,7 @@
 #include <azure/core/internal/json/json.hpp>
 #include <type_traits>
 
-using namespace Azure::Security::KeyVault::Common;
+using namespace Azure::Security::KeyVault;
 
 namespace {
 
diff --git a/sdk/keyvault/azure-security-keyvault-common/src/keyvault_pipeline.cpp b/sdk/keyvault/azure-security-keyvault-common/src/keyvault_pipeline.cpp
index 81d2c866b..dc6ddf743 100644
--- a/sdk/keyvault/azure-security-keyvault-common/src/keyvault_pipeline.cpp
+++ b/sdk/keyvault/azure-security-keyvault-common/src/keyvault_pipeline.cpp
@@ -5,7 +5,7 @@
 #include "azure/keyvault/common/keyvault_constants.hpp"
 #include "azure/keyvault/common/keyvault_exception.hpp"
 
-using namespace Azure::Security::KeyVault::Common;
+using namespace Azure::Security::KeyVault;
 
 namespace {
 inline Azure::Core::Http::Request InitRequest(
diff --git a/sdk/keyvault/azure-security-keyvault-common/test/ut/pipeline_test.cpp b/sdk/keyvault/azure-security-keyvault-common/test/ut/pipeline_test.cpp
index 5956ffe87..823dcd9f5 100644
--- a/sdk/keyvault/azure-security-keyvault-common/test/ut/pipeline_test.cpp
+++ b/sdk/keyvault/azure-security-keyvault-common/test/ut/pipeline_test.cpp
@@ -10,7 +10,7 @@
 
 #include <memory>
 
-using namespace Azure::Security::KeyVault::Common::_internal;
+using namespace Azure::Security::KeyVault::_internal;
 
 TEST(KeyVaultPipeline, initPipeline)
 {
diff --git a/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/delete_key_operation.hpp b/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/delete_key_operation.hpp
index c763f174c..8d76a3c14 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/delete_key_operation.hpp
+++ b/sdk/keyvault/azure-security-keyvault-keys/inc/azure/keyvault/keys/delete_key_operation.hpp
@@ -36,7 +36,7 @@ namespace Azure { namespace Security { namespace KeyVault { namespace Keys {
      * constructor is private and requires internal components.*/
     friend class KeyClient;
 
-    std::shared_ptr<Azure::Security::KeyVault::Common::_internal::KeyVaultPipeline> m_pipeline;
+    std::shared_ptr<Azure::Security::KeyVault::_internal::KeyVaultPipeline> m_pipeline;
     Azure::Security::KeyVault::Keys::DeletedKey m_value;
     std::string m_continuationToken;
 
@@ -72,8 +72,7 @@ namespace Azure { namespace Security { namespace KeyVault { namespace Keys {
      * Since C++ doesn't offer `internal` access, we use friends-only instead.
      */
     DeleteKeyOperation(
-        std::shared_ptr<Azure::Security::KeyVault::Common::_internal::KeyVaultPipeline>
-            keyvaultPipeline,
+        std::shared_ptr<Azure::Security::KeyVault::_internal::KeyVaultPipeline> keyvaultPipeline,
         Azure::Response<Azure::Security::KeyVault::Keys::DeletedKey> response);
 
     /**
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 7e22aaff1..468cb8ac7 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
@@ -58,7 +58,7 @@ namespace Azure { namespace Security { namespace KeyVault { namespace Keys {
   class KeyClient {
   protected:
     // Using a shared pipeline for a client to share it with LRO (like delete key)
-    std::shared_ptr<Azure::Security::KeyVault::Common::_internal::KeyVaultPipeline> m_pipeline;
+    std::shared_ptr<Azure::Security::KeyVault::_internal::KeyVaultPipeline> m_pipeline;
 
   public:
     /**
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 5872cae25..6c11cd1c1 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
@@ -19,7 +19,7 @@ namespace Azure { namespace Security { namespace KeyVault { namespace Keys {
    * @brief Define the options to create an SDK Keys client.
    *
    */
-  struct KeyClientOptions : public Azure::Security::KeyVault::Common::ClientOptions
+  struct KeyClientOptions : public Azure::Security::KeyVault::ClientOptions
   {
     /**
      * @brief Construct a new Key Client Options object.
@@ -27,8 +27,8 @@ namespace Azure { namespace Security { namespace KeyVault { namespace Keys {
      * @param version Optional version for the client.
      */
     KeyClientOptions(
-        Azure::Security::KeyVault::Common::ServiceVersion version
-        = Azure::Security::KeyVault::Common::ServiceVersion::V7_2)
+        Azure::Security::KeyVault::ServiceVersion version
+        = Azure::Security::KeyVault::ServiceVersion::V7_2)
         : ClientOptions(version)
     {
     }
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 d4ee32e0e..9a32361a1 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
@@ -35,7 +35,7 @@ namespace Azure { namespace Security { namespace KeyVault { namespace Keys {
      * The constructor is private and requires internal components.*/
     friend class KeyClient;
 
-    std::shared_ptr<Azure::Security::KeyVault::Common::_internal::KeyVaultPipeline> m_pipeline;
+    std::shared_ptr<Azure::Security::KeyVault::_internal::KeyVaultPipeline> m_pipeline;
     Azure::Security::KeyVault::Keys::KeyVaultKey m_value;
     std::string m_continuationToken;
 
@@ -68,8 +68,7 @@ namespace Azure { namespace Security { namespace KeyVault { namespace Keys {
      * Since C++ doesn't offer `internal` access, we use friends-only instead.
      */
     RecoverDeletedKeyOperation(
-        std::shared_ptr<Azure::Security::KeyVault::Common::_internal::KeyVaultPipeline>
-            keyvaultPipeline,
+        std::shared_ptr<Azure::Security::KeyVault::_internal::KeyVaultPipeline> keyvaultPipeline,
         Azure::Response<Azure::Security::KeyVault::Keys::KeyVaultKey> response);
 
     /**
diff --git a/sdk/keyvault/azure-security-keyvault-keys/src/delete_key_operation.cpp b/sdk/keyvault/azure-security-keyvault-keys/src/delete_key_operation.cpp
index 2ef54fd19..047b48cb2 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/src/delete_key_operation.cpp
+++ b/sdk/keyvault/azure-security-keyvault-keys/src/delete_key_operation.cpp
@@ -23,7 +23,7 @@ inline Azure::Core::OperationStatus CheckCompleted(Azure::Core::Http::RawRespons
     case Azure::Core::Http::HttpStatusCode::NotFound:
       return Azure::Core::OperationStatus::Running;
     default:
-      throw Azure::Security::KeyVault::Common::KeyVaultException::CreateFromResponse(response);
+      throw Azure::Security::KeyVault::KeyVaultException::CreateFromResponse(response);
   }
 }
 } // namespace
@@ -50,8 +50,7 @@ Azure::Security::KeyVault::Keys::DeleteKeyOperation::PollInternal(Azure::Core::C
 }
 
 Azure::Security::KeyVault::Keys::DeleteKeyOperation::DeleteKeyOperation(
-    std::shared_ptr<Azure::Security::KeyVault::Common::_internal::KeyVaultPipeline>
-        keyvaultPipeline,
+    std::shared_ptr<Azure::Security::KeyVault::_internal::KeyVaultPipeline> keyvaultPipeline,
     Azure::Response<Azure::Security::KeyVault::Keys::DeletedKey> response)
     : m_pipeline(keyvaultPipeline)
 {
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 a721588d6..32ec7927c 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/src/deleted_key.cpp
+++ b/sdk/keyvault/azure-security-keyvault-keys/src/deleted_key.cpp
@@ -13,7 +13,7 @@
 
 using namespace Azure::Security::KeyVault::Keys;
 using namespace Azure::Core::Json::_internal;
-using Azure::Security::KeyVault::Common::_internal::UnixTimeConverter;
+using Azure::Security::KeyVault::_internal::UnixTimeConverter;
 
 DeletedKey _detail::DeletedKeySerializer::DeletedKeyDeserialize(
     std::string const& name,
diff --git a/sdk/keyvault/azure-security-keyvault-keys/src/import_key_options.cpp b/sdk/keyvault/azure-security-keyvault-keys/src/import_key_options.cpp
index a283a181f..6cba2bfb6 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/src/import_key_options.cpp
+++ b/sdk/keyvault/azure-security-keyvault-keys/src/import_key_options.cpp
@@ -15,7 +15,7 @@
 using namespace Azure::Security::KeyVault::Keys;
 using namespace Azure::Security::KeyVault::Keys::_detail;
 using namespace Azure::Core::Json::_internal;
-using namespace Azure::Security::KeyVault::Common::_internal;
+using namespace Azure::Security::KeyVault::_internal;
 
 std::string
 Azure::Security::KeyVault::Keys::_detail::ImportKeyOptionsSerializer::ImportKeyOptionsSerialize(
diff --git a/sdk/keyvault/azure-security-keyvault-keys/src/json_web_key.cpp b/sdk/keyvault/azure-security-keyvault-keys/src/json_web_key.cpp
index ad26a6e63..5b744f28c 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/src/json_web_key.cpp
+++ b/sdk/keyvault/azure-security-keyvault-keys/src/json_web_key.cpp
@@ -10,7 +10,7 @@
 
 using namespace Azure::Security::KeyVault::Keys;
 using namespace Azure::Core::Json::_internal;
-using namespace Azure::Security::KeyVault::Common::_internal;
+using namespace Azure::Security::KeyVault::_internal;
 
 void Azure::Security::KeyVault::Keys::to_json(
     Azure::Core::Json::_internal::json& j,
diff --git a/sdk/keyvault/azure-security-keyvault-keys/src/key_backup.cpp b/sdk/keyvault/azure-security-keyvault-keys/src/key_backup.cpp
index faa6e361d..4572e770b 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/src/key_backup.cpp
+++ b/sdk/keyvault/azure-security-keyvault-keys/src/key_backup.cpp
@@ -13,7 +13,7 @@
 
 using namespace Azure::Security::KeyVault::Keys::_detail;
 using namespace Azure::Core::Json::_internal;
-using namespace Azure::Security::KeyVault::Common::_internal;
+using namespace Azure::Security::KeyVault::_internal;
 
 std::string KeyBackup::Serialize() const
 {
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 95f1f68ea..7e1d882ab 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/src/key_client.cpp
+++ b/sdk/keyvault/azure-security-keyvault-keys/src/key_client.cpp
@@ -71,7 +71,7 @@ KeyClient::KeyClient(
         std::make_unique<BearerTokenAuthenticationPolicy>(credential, tokenContext));
   }
 
-  m_pipeline = std::make_shared<Azure::Security::KeyVault::Common::_internal::KeyVaultPipeline>(
+  m_pipeline = std::make_shared<Azure::Security::KeyVault::_internal::KeyVaultPipeline>(
       Azure::Core::Url(vaultUrl),
       apiVersion,
       Azure::Core::Http::_internal::HttpPipeline(
diff --git a/sdk/keyvault/azure-security-keyvault-keys/src/key_request_parameters.cpp b/sdk/keyvault/azure-security-keyvault-keys/src/key_request_parameters.cpp
index 601e3ac89..c99bb211c 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/src/key_request_parameters.cpp
+++ b/sdk/keyvault/azure-security-keyvault-keys/src/key_request_parameters.cpp
@@ -13,7 +13,7 @@
 
 using namespace Azure::Security::KeyVault::Keys::_detail;
 using namespace Azure::Core::Json::_internal;
-using namespace Azure::Security::KeyVault::Common::_internal;
+using namespace Azure::Security::KeyVault::_internal;
 
 std::string KeyRequestParameters::Serialize() const
 {
diff --git a/sdk/keyvault/azure-security-keyvault-keys/src/key_vault_key.cpp b/sdk/keyvault/azure-security-keyvault-keys/src/key_vault_key.cpp
index a52d0b590..ab0a300f8 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/src/key_vault_key.cpp
+++ b/sdk/keyvault/azure-security-keyvault-keys/src/key_vault_key.cpp
@@ -15,7 +15,7 @@
 
 using namespace Azure::Security::KeyVault::Keys;
 using namespace Azure::Core::Json::_internal;
-using Azure::Security::KeyVault::Common::_internal::UnixTimeConverter;
+using Azure::Security::KeyVault::_internal::UnixTimeConverter;
 
 namespace {
 void ParseStringOperationsToKeyOperations(
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_single_page_result.cpp
index 5f84ad141..1d7b9c2a6 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_single_page_result.cpp
@@ -14,7 +14,7 @@
 
 using namespace Azure::Security::KeyVault::Keys;
 using namespace Azure::Core::Json::_internal;
-using Azure::Security::KeyVault::Common::_internal::UnixTimeConverter;
+using Azure::Security::KeyVault::_internal::UnixTimeConverter;
 
 KeyPropertiesSinglePage
 _detail::KeyPropertiesSinglePageSerializer::KeyPropertiesSinglePageDeserialize(
diff --git a/sdk/keyvault/azure-security-keyvault-keys/src/recover_deleted_key_operation.cpp b/sdk/keyvault/azure-security-keyvault-keys/src/recover_deleted_key_operation.cpp
index f936deccb..8c9d72866 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/src/recover_deleted_key_operation.cpp
+++ b/sdk/keyvault/azure-security-keyvault-keys/src/recover_deleted_key_operation.cpp
@@ -23,7 +23,7 @@ inline Azure::Core::OperationStatus CheckCompleted(Azure::Core::Http::RawRespons
     case Azure::Core::Http::HttpStatusCode::NotFound:
       return Azure::Core::OperationStatus::Running;
     default:
-      throw Azure::Security::KeyVault::Common::KeyVaultException::CreateFromResponse(response);
+      throw Azure::Security::KeyVault::KeyVaultException::CreateFromResponse(response);
   }
 }
 } // namespace
@@ -54,8 +54,7 @@ Azure::Security::KeyVault::Keys::RecoverDeletedKeyOperation::PollInternal(
 }
 
 Azure::Security::KeyVault::Keys::RecoverDeletedKeyOperation::RecoverDeletedKeyOperation(
-    std::shared_ptr<Azure::Security::KeyVault::Common::_internal::KeyVaultPipeline>
-        keyvaultPipeline,
+    std::shared_ptr<Azure::Security::KeyVault::_internal::KeyVaultPipeline> keyvaultPipeline,
     Azure::Response<Azure::Security::KeyVault::Keys::KeyVaultKey> response)
     : m_pipeline(keyvaultPipeline)
 {
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 632cecfe9..506b42887 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
@@ -75,7 +75,7 @@ int main()
     std::cout << "Authentication Exception happened:" << std::endl << e.what() << std::endl;
     return 1;
   }
-  catch (Azure::Security::KeyVault::Common::KeyVaultException const& e)
+  catch (Azure::Security::KeyVault::KeyVaultException const& e)
   {
     std::cout << "KeyVault Client Exception happened:" << std::endl << e.Message << std::endl;
     return 1;
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 31a60a673..b92e98f2e 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
@@ -100,7 +100,7 @@ int main()
     std::cout << "Authentication Exception happened:" << std::endl << e.what() << std::endl;
     return 1;
   }
-  catch (Azure::Security::KeyVault::Common::KeyVaultException const& e)
+  catch (Azure::Security::KeyVault::KeyVaultException const& e)
   {
     std::cout << "KeyVault Client Exception happened:" << std::endl << e.Message << std::endl;
     return 1;
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 a4c8945ef..14e99c5ef 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
@@ -155,7 +155,7 @@ int main()
     std::cout << "Authentication Exception happened:" << std::endl << e.what() << std::endl;
     return 1;
   }
-  catch (Azure::Security::KeyVault::Common::KeyVaultException const& e)
+  catch (Azure::Security::KeyVault::KeyVaultException const& e)
   {
     std::cout << "KeyVault Client Exception happened:" << std::endl << e.Message << std::endl;
     return 1;
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 7d67c7cd2..751569b63 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
@@ -56,7 +56,7 @@ TEST_F(KeyVaultClientTest, BackupKey)
     std::this_thread::sleep_for(std::chrono::minutes(2));
   }
   { // Check key is gone
-    EXPECT_THROW(keyClient.GetKey(keyName), Azure::Security::KeyVault::Common::KeyVaultException);
+    EXPECT_THROW(keyClient.GetKey(keyName), Azure::Security::KeyVault::KeyVaultException);
   }
   {
     // Restore
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 1470a3dfa..2e24afca9 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
@@ -119,7 +119,7 @@ TEST_F(KeyVaultClientTest, DeleteInvalidKey)
   {
     auto keyResponseLRO = keyClient.StartDeleteKey(keyName);
   }
-  catch (Azure::Security::KeyVault::Common::KeyVaultException const& error)
+  catch (Azure::Security::KeyVault::KeyVaultException const& error)
   {
     EXPECT_EQ(
         static_cast<typename std::underlying_type<Azure::Core::Http::HttpStatusCode>::type>(
@@ -157,7 +157,7 @@ TEST_F(KeyVaultClientTest, DoubleDelete)
   {
     auto keyResponseLRO = keyClient.StartDeleteKey(keyName);
   }
-  catch (Azure::Security::KeyVault::Common::KeyVaultException const& error)
+  catch (Azure::Security::KeyVault::KeyVaultException const& error)
   {
     EXPECT_EQ(
         static_cast<typename std::underlying_type<Azure::Core::Http::HttpStatusCode>::type>(
@@ -192,7 +192,7 @@ TEST_F(KeyVaultClientTest, DoubleDeleteBeforePollComplete)
   {
     auto keyResponseLRO = keyClient.StartDeleteKey(keyName);
   }
-  catch (Azure::Security::KeyVault::Common::KeyVaultException const& error)
+  catch (Azure::Security::KeyVault::KeyVaultException const& error)
   {
     EXPECT_EQ(
         static_cast<typename std::underlying_type<Azure::Core::Http::HttpStatusCode>::type>(
@@ -232,7 +232,7 @@ TEST_F(KeyVaultClientTest, CreateDeletedKey)
     auto keyResponse
         = keyClient.CreateKey(keyName, Azure::Security::KeyVault::Keys::JsonWebKeyType::Ec);
   }
-  catch (Azure::Security::KeyVault::Common::KeyVaultException const& error)
+  catch (Azure::Security::KeyVault::KeyVaultException const& error)
   {
     EXPECT_EQ(
         static_cast<typename std::underlying_type<Azure::Core::Http::HttpStatusCode>::type>(
@@ -269,7 +269,7 @@ TEST_F(KeyVaultClientTest, CreateDeletedKeyBeforePollComplete)
     auto keyResponse
         = keyClient.CreateKey(keyName, Azure::Security::KeyVault::Keys::JsonWebKeyType::Ec);
   }
-  catch (Azure::Security::KeyVault::Common::KeyVaultException const& error)
+  catch (Azure::Security::KeyVault::KeyVaultException const& error)
   {
     EXPECT_EQ(
         static_cast<typename std::underlying_type<Azure::Core::Http::HttpStatusCode>::type>(
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 5c450f7ef..b1886b733 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
@@ -17,7 +17,7 @@
 
 using namespace Azure::Security::KeyVault::Keys::Test;
 using namespace Azure::Security::KeyVault::Keys;
-using namespace Azure::Security::KeyVault::Common::_internal;
+using namespace Azure::Security::KeyVault::_internal;
 
 TEST_F(KeyVaultClientTest, ImportKey)
 {
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 c8fd5adf6..5d619564d 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
@@ -63,7 +63,7 @@ namespace Azure { namespace Security { namespace KeyVault { namespace Keys { nam
     {
       auto apiVersion = options.GetVersionString();
 
-      m_pipeline = std::make_unique<Azure::Security::KeyVault::Common::_internal::KeyVaultPipeline>(
+      m_pipeline = std::make_unique<Azure::Security::KeyVault::_internal::KeyVaultPipeline>(
           Azure::Core::Url(vaultUrl),
           apiVersion,
           Azure::Core::Http::_internal::HttpPipeline(options, "test", "version", {}, {}));