diff --git a/sdk/core/azure-core/CHANGELOG.md b/sdk/core/azure-core/CHANGELOG.md
index 6f52c2ab1..6ba433b54 100644
--- a/sdk/core/azure-core/CHANGELOG.md
+++ b/sdk/core/azure-core/CHANGELOG.md
@@ -34,7 +34,7 @@
 - Changed type of `Azure::Core::Http::RetryOptions::StatusCodes` from `std::vector` to `std::set`.
 - Renamed `Azure::Core::Http::LoggingPolicy` to `LogPolicy`.
 - Introduced `Azure::Core::Http::LogOptions`, a mandatory parameter for `LogPolicy` construction. Entities that are not specified in the allow lists are hidden in the log.
-- Moved `Azure::Core::Logging` namespace entities to `Azure::Core::Logger` class.
+- Moved `Azure::Core::Logging` namespace entities to `Azure::Core::Diagnostics::Logger` class.
 - Removed `Azure::Core::DateTime::GetRfc3339String()`: `Azure::Core::DateTime::ToString()` was extended to provide the same functionality.
 - Renamed the `Range` type to `HttpRange` within the `Azure::Core::Http` namespace.
 - Moved `Azure::Core::Response<T>` to `Azure::Response<T>`.
diff --git a/sdk/core/azure-core/inc/azure/core/http/policy.hpp b/sdk/core/azure-core/inc/azure/core/http/policy.hpp
index 8bff9d1fd..9cba94056 100644
--- a/sdk/core/azure-core/inc/azure/core/http/policy.hpp
+++ b/sdk/core/azure-core/inc/azure/core/http/policy.hpp
@@ -405,7 +405,7 @@ namespace Azure { namespace Core { namespace Http {
    * @brief Logs every HTTP request.
    *
    * @details Logs every HTTP request and response.
-   * @remark See Azure::Core::Logger.
+   * @remark See Azure::Core::Diagnostics::Logger.
    */
   class LogPolicy : public HttpPolicy {
     LogOptions m_options;
diff --git a/sdk/core/azure-core/inc/azure/core/internal/log.hpp b/sdk/core/azure-core/inc/azure/core/internal/log.hpp
index f6c908fbc..548ba967d 100644
--- a/sdk/core/azure-core/inc/azure/core/internal/log.hpp
+++ b/sdk/core/azure-core/inc/azure/core/internal/log.hpp
@@ -9,7 +9,7 @@
 #include <atomic>
 #include <type_traits>
 
-namespace Azure { namespace Core { namespace _internal {
+namespace Azure { namespace Core { namespace Diagnostics { namespace _internal {
   class Log {
     using LogLevelInt = std::underlying_type<Logger::Level>::type;
 
@@ -36,4 +36,4 @@ namespace Azure { namespace Core { namespace _internal {
     static void EnableLogging(bool isEnabled);
     static void SetLogLevel(Logger::Level logLevel);
   };
-}}} // namespace Azure::Core::_internal
+}}}} // namespace Azure::Core::Diagnostics::_internal
diff --git a/sdk/core/azure-core/inc/azure/core/logger.hpp b/sdk/core/azure-core/inc/azure/core/logger.hpp
index 91f80db7b..4a5baeb40 100644
--- a/sdk/core/azure-core/inc/azure/core/logger.hpp
+++ b/sdk/core/azure-core/inc/azure/core/logger.hpp
@@ -12,7 +12,7 @@
 #include <functional>
 #include <string>
 
-namespace Azure { namespace Core {
+namespace Azure { namespace Core { namespace Diagnostics {
   /**
    * @brief Log message handler.
    */
@@ -49,13 +49,14 @@ namespace Azure { namespace Core {
     /**
      * @brief Set the function that will be invoked to report an SDK log message.
      *
-     * @param listener An #Azure::Core::Logger::Listener function that will be invoked when
-     * the SDK reports a log message. If `nullptr`, no function will be invoked.
+     * @param listener An #Azure::Core::Diagnostics::Logger::Listener function that will be invoked
+     * when the SDK reports a log message. If `nullptr`, no function will be invoked.
      */
     static void SetListener(Listener listener);
 
     /**
-     * @brief Sets the #Azure::Core::Logger::Level an application is interested in receiving.
+     * @brief Sets the #Azure::Core::Diagnostics::Logger::Level an application is interested in
+     * receiving.
      *
      * @param level Maximum log level.
      */
@@ -65,4 +66,4 @@ namespace Azure { namespace Core {
     Logger() = delete;
     ~Logger() = delete;
   };
-}} // namespace Azure::Core
+}}} // namespace Azure::Core::Diagnostics
diff --git a/sdk/core/azure-core/src/environment_log_level_listener.cpp b/sdk/core/azure-core/src/environment_log_level_listener.cpp
index c6b5c5daa..9da18239a 100644
--- a/sdk/core/azure-core/src/environment_log_level_listener.cpp
+++ b/sdk/core/azure-core/src/environment_log_level_listener.cpp
@@ -25,8 +25,8 @@
 #include <iostream>
 #include <string>
 
-using namespace Azure::Core;
-using namespace Azure::Core::_detail;
+using namespace Azure::Core::Diagnostics;
+using namespace Azure::Core::Diagnostics::_detail;
 
 namespace {
 Logger::Level const* GetEnvironmentLogLevel()
@@ -51,7 +51,7 @@ Logger::Level const* GetEnvironmentLogLevel()
 
     if (envVar)
     {
-      auto const logLevelStr = _internal::StringExtensions::ToLower(envVar);
+      auto const logLevelStr = Azure::Core::_internal::StringExtensions::ToLower(envVar);
 
       // See https://github.com/Azure/azure-sdk-for-java/wiki/Logging-with-Azure-SDK
       // And
diff --git a/sdk/core/azure-core/src/environment_log_level_listener_private.hpp b/sdk/core/azure-core/src/environment_log_level_listener_private.hpp
index 48cf4f172..d8f034fe3 100644
--- a/sdk/core/azure-core/src/environment_log_level_listener_private.hpp
+++ b/sdk/core/azure-core/src/environment_log_level_listener_private.hpp
@@ -16,7 +16,7 @@
 #include <windows.h>
 #endif
 
-namespace Azure { namespace Core { namespace _detail {
+namespace Azure { namespace Core { namespace Diagnostics { namespace _detail {
 
   class EnvironmentLogLevelListener {
     EnvironmentLogLevelListener() = delete;
@@ -36,4 +36,4 @@ namespace Azure { namespace Core { namespace _detail {
 
   inline Logger::Listener EnvironmentLogLevelListener::GetLogListener() { return nullptr; }
 #endif
-}}} // namespace Azure::Core::_detail
+}}}} // namespace Azure::Core::Diagnostics::_detail
diff --git a/sdk/core/azure-core/src/http/curl/curl.cpp b/sdk/core/azure-core/src/http/curl/curl.cpp
index cd176d86d..afba6a005 100644
--- a/sdk/core/azure-core/src/http/curl/curl.cpp
+++ b/sdk/core/azure-core/src/http/curl/curl.cpp
@@ -110,8 +110,8 @@ int pollSocketUntilEventOrTimeout(
   return result;
 }
 
-using Azure::Core::Logger;
-using Azure::Core::_internal::Log;
+using Azure::Core::Diagnostics::Logger;
+using Azure::Core::Diagnostics::_internal::Log;
 
 #if defined(AZ_PLATFORM_WINDOWS)
 // Windows needs this after every write to socket or performance would be reduced to 1/4 for
diff --git a/sdk/core/azure-core/src/http/log_policy.cpp b/sdk/core/azure-core/src/http/log_policy.cpp
index 8980fe0e5..acbf05de1 100644
--- a/sdk/core/azure-core/src/http/log_policy.cpp
+++ b/sdk/core/azure-core/src/http/log_policy.cpp
@@ -126,7 +126,8 @@ std::unique_ptr<RawResponse> Azure::Core::Http::LogPolicy::Send(
     NextHttpPolicy nextHttpPolicy,
     Context const& ctx) const
 {
-  using Azure::Core::_internal::Log;
+  using Azure::Core::Diagnostics::Logger;
+  using Azure::Core::Diagnostics::_internal::Log;
 
   if (Log::ShouldWrite(Logger::Level::Verbose))
   {
diff --git a/sdk/core/azure-core/src/http/retry_policy.cpp b/sdk/core/azure-core/src/http/retry_policy.cpp
index e38c5846b..dcce1d968 100644
--- a/sdk/core/azure-core/src/http/retry_policy.cpp
+++ b/sdk/core/azure-core/src/http/retry_policy.cpp
@@ -101,8 +101,8 @@ bool ShouldRetryOnResponse(
     RetryNumber attempt,
     Delay& retryAfter)
 {
-  using Azure::Core::Logger;
-  using Azure::Core::_internal::Log;
+  using Azure::Core::Diagnostics::Logger;
+  using Azure::Core::Diagnostics::_internal::Log;
   // Are we out of retry attempts?
   if (WasLastAttempt(retryOptions, attempt))
   {
@@ -182,8 +182,8 @@ std::unique_ptr<RawResponse> Azure::Core::Http::RetryPolicy::Send(
     NextHttpPolicy nextHttpPolicy,
     Context const& ctx) const
 {
-  using Azure::Core::Logger;
-  using Azure::Core::_internal::Log;
+  using Azure::Core::Diagnostics::Logger;
+  using Azure::Core::Diagnostics::_internal::Log;
 
   auto retryContext = CreateRetryContext(ctx);
 
diff --git a/sdk/core/azure-core/src/logger.cpp b/sdk/core/azure-core/src/logger.cpp
index bd1703eb8..9f666d779 100644
--- a/sdk/core/azure-core/src/logger.cpp
+++ b/sdk/core/azure-core/src/logger.cpp
@@ -9,8 +9,8 @@
 
 #include "environment_log_level_listener_private.hpp"
 
-using namespace Azure::Core;
-using namespace Azure::Core::_internal;
+using namespace Azure::Core::Diagnostics;
+using namespace Azure::Core::Diagnostics::_internal;
 
 namespace {
 static std::shared_timed_mutex g_logListenerMutex;
diff --git a/sdk/core/azure-core/test/ut/logging.cpp b/sdk/core/azure-core/test/ut/logging.cpp
index 52ef64b04..1cea376b5 100644
--- a/sdk/core/azure-core/test/ut/logging.cpp
+++ b/sdk/core/azure-core/test/ut/logging.cpp
@@ -4,8 +4,8 @@
 #include <azure/core/internal/log.hpp>
 #include <gtest/gtest.h>
 
-using Azure::Core::Logger;
-using Azure::Core::_internal::Log;
+using Azure::Core::Diagnostics::Logger;
+using Azure::Core::Diagnostics::_internal::Log;
 
 TEST(Logger, Levels)
 {
diff --git a/sdk/core/azure-core/test/ut/simplified_header.cpp b/sdk/core/azure-core/test/ut/simplified_header.cpp
index 120799df7..3a76d4ae5 100644
--- a/sdk/core/azure-core/test/ut/simplified_header.cpp
+++ b/sdk/core/azure-core/test/ut/simplified_header.cpp
@@ -37,7 +37,7 @@ TEST(SimplifiedHeader, core)
   EXPECT_NO_THROW(Azure::Core::Cryptography::Md5Hash m);
   EXPECT_NO_THROW(Azure::Core::Http::RawResponse r(
       1, 1, Azure::Core::Http::HttpStatusCode::Accepted, "phrase"));
-  EXPECT_NO_THROW(Azure::Core::Logger::Listener ll = nullptr);
+  EXPECT_NO_THROW(Azure::Core::Diagnostics::Logger::Listener ll = nullptr);
   EXPECT_NO_THROW(Azure::MatchConditions mc);
   EXPECT_NO_THROW(Azure::ModifiedConditions mc);
   EXPECT_NO_THROW(Azure::Core::Nullable<int> n);