diff --git a/sdk/keyvault/azure-security-keyvault-administration/inc/azure/keyvault/administration/settings_client.hpp b/sdk/keyvault/azure-security-keyvault-administration/inc/azure/keyvault/administration/settings_client.hpp
index b73a4e054..1968c28ed 100644
--- a/sdk/keyvault/azure-security-keyvault-administration/inc/azure/keyvault/administration/settings_client.hpp
+++ b/sdk/keyvault/azure-security-keyvault-administration/inc/azure/keyvault/administration/settings_client.hpp
@@ -17,8 +17,6 @@
 #include <memory>
 #include <string>
 
-using namespace Azure::Security::KeyVault::Administration::Models;
-
 namespace Azure { namespace Security { namespace KeyVault { namespace Administration {
   /**
    * @brief Settings Client class.
@@ -67,7 +65,7 @@ namespace Azure { namespace Security { namespace KeyVault { namespace Administra
      *
      * @returns Response containing the new updated setting.
      */
-    Azure::Response<Setting> UpdateSetting(
+    Azure::Response<Models::Setting> UpdateSetting(
         std::string const& name,
         std::string const& value,
         const Azure::Core::Context& context = Azure::Core::Context{}) const;
@@ -80,7 +78,7 @@ namespace Azure { namespace Security { namespace KeyVault { namespace Administra
      *
      * @returns response containing the setting.
      */
-    Azure::Response<Setting> GetSetting(
+    Azure::Response<Models::Setting> GetSetting(
         std::string const& name,
         const Azure::Core::Context& context = Azure::Core::Context{}) const;
 
@@ -91,11 +89,11 @@ namespace Azure { namespace Security { namespace KeyVault { namespace Administra
      *
      * @returns Response containing a list of settings.
      */
-    Azure::Response<SettingsListResult> GetSettings(
+    Azure::Response<Models::SettingsListResult> GetSettings(
         const Azure::Core::Context& context = Azure::Core::Context{}) const;
 
   private:
-    Setting ParseSetting(std::vector<uint8_t> const& responseBody) const;
+    Models::Setting ParseSetting(std::vector<uint8_t> const& responseBody) const;
 
     std::unique_ptr<Azure::Core::Http::RawResponse> SendRequest(
         Azure::Core::Http::Request& request,
diff --git a/sdk/keyvault/azure-security-keyvault-administration/src/settings_client.cpp b/sdk/keyvault/azure-security-keyvault-administration/src/settings_client.cpp
index de106ec4e..195876bd7 100644
--- a/sdk/keyvault/azure-security-keyvault-administration/src/settings_client.cpp
+++ b/sdk/keyvault/azure-security-keyvault-administration/src/settings_client.cpp
@@ -19,6 +19,7 @@ using namespace Azure::Core::Http::Policies;
 using namespace Azure::Core::Http::Policies::_internal;
 using namespace Azure::Core::Json::_internal;
 using namespace Azure::Security::KeyVault::Administration;
+using namespace Azure::Security::KeyVault::Administration::Models;
 using namespace Azure::Security::KeyVault::Administration::_detail;
 
 std::unique_ptr<Azure::Core::Http::RawResponse> SettingsClient::SendRequest(