diff --git a/Code/Framework/AzCore/Tests/Debug.cpp b/Code/Framework/AzCore/Tests/Debug.cpp
index bd90611af3..e27cdcd27e 100644
--- a/Code/Framework/AzCore/Tests/Debug.cpp
+++ b/Code/Framework/AzCore/Tests/Debug.cpp
@@ -7,7 +7,7 @@
  */
 
 #include <AzCore/Debug/StackTracer.h>
-#include <AzCore/Debug/TraceMessagesDrillerBus.h>
+#include <AzCore/Debug/TraceMessageBus.h>
 #include <AzCore/Debug/Profiler.h>
 #include <AzCore/std/parallel/thread.h>
 #include <AzCore/Math/Crc.h>
@@ -104,7 +104,7 @@ namespace UnitTest
     }
 
     class TraceTest
-        : public AZ::Debug::TraceMessageDrillerBus::Handler
+        : public AZ::Debug::TraceMessageBus::Handler
         , public ::testing::Test
     {
         int m_numTracePrintfs;
@@ -113,12 +113,13 @@ namespace UnitTest
             : m_numTracePrintfs(0) {}
 
         //////////////////////////////////////////////////////////////////////////
-        // TraceMessagesDrillerBus
-        void OnPrintf(const char* windowName, const char* message) override
+        // TraceMessageBus
+        bool OnPrintf(const char* windowName, const char* message) override
         {
             (void)windowName;
             (void)message;
             ++m_numTracePrintfs;
+            return false;
         }
         //////////////////////////////////////////////////////////////////////////
 
diff --git a/Code/Framework/AzCore/Tests/StatisticalProfiler.cpp b/Code/Framework/AzCore/Tests/StatisticalProfiler.cpp
index fc5fe66c4b..291f2a8110 100644
--- a/Code/Framework/AzCore/Tests/StatisticalProfiler.cpp
+++ b/Code/Framework/AzCore/Tests/StatisticalProfiler.cpp
@@ -13,7 +13,7 @@
 #include <AzCore/std/string/string.h>
 #include <AzCore/std/parallel/thread.h>
 #include <AzCore/std/parallel/shared_spin_mutex.h>
-#include <AzCore/Debug/TraceMessagesDrillerBus.h>
+#include <AzCore/Debug/TraceMessageBus.h>
 
 #include <AzCore/Statistics/StatisticalProfilerProxy.h>
 
@@ -468,28 +468,29 @@ namespace UnitTest
     /** Trace message handler to track messages during tests
 */
     struct MyTraceMessageSink final
-        : public AZ::Debug::TraceMessageDrillerBus::Handler
+        : public AZ::Debug::TraceMessageBus::Handler
     {
         MyTraceMessageSink()
         {
-            AZ::Debug::TraceMessageDrillerBus::Handler::BusConnect();
+            AZ::Debug::TraceMessageBus::Handler::BusConnect();
         }
 
         ~MyTraceMessageSink()
         {
-            AZ::Debug::TraceMessageDrillerBus::Handler::BusDisconnect();
+            AZ::Debug::TraceMessageBus::Handler::BusDisconnect();
         }
 
         //////////////////////////////////////////////////////////////////////////
-        // TraceMessageDrillerBus
-        void OnPrintf(const char* window, const char* message) override
+        // TraceMessageBus
+        bool OnPrintf(const char* window, const char* message) override
         {
-            OnOutput(window, message);
+            return OnOutput(window, message);
         }
 
-        void OnOutput(const char* window, const char* message) override
+        bool OnOutput(const char* window, const char* message) override
         {
             printf("%s: %s\n", window, message);
+            return false;
         }
     }; //struct MyTraceMessageSink
 
diff --git a/Gems/EditorPythonBindings/Code/Tests/PythonTraceMessageSink.h b/Gems/EditorPythonBindings/Code/Tests/PythonTraceMessageSink.h
index 28971aec9e..63616ce8ea 100644
--- a/Gems/EditorPythonBindings/Code/Tests/PythonTraceMessageSink.h
+++ b/Gems/EditorPythonBindings/Code/Tests/PythonTraceMessageSink.h
@@ -7,7 +7,7 @@
  */
 #pragma once
 
-#include <AzCore/Debug/TraceMessagesDrillerBus.h>
+#include <AzCore/Debug/TraceMessageBus.h>
 #include <AzToolsFramework/API/EditorPythonConsoleBus.h>
 
 namespace UnitTest
@@ -15,18 +15,18 @@ namespace UnitTest
     /** Trace message handler to track messages during tests
     */
     struct PythonTraceMessageSink final
-        : public AZ::Debug::TraceMessageDrillerBus::Handler
+        : public AZ::Debug::TraceMessageBus::Handler
         , public AzToolsFramework::EditorPythonConsoleNotificationBus::Handler
     {
         PythonTraceMessageSink()
         {
-            AZ::Debug::TraceMessageDrillerBus::Handler::BusConnect();
+            AZ::Debug::TraceMessageBus::Handler::BusConnect();
             AzToolsFramework::EditorPythonConsoleNotificationBus::Handler::BusConnect();
         }
 
         ~PythonTraceMessageSink()
         {
-            AZ::Debug::TraceMessageDrillerBus::Handler::BusDisconnect();
+            AZ::Debug::TraceMessageBus::Handler::BusDisconnect();
             AzToolsFramework::EditorPythonConsoleNotificationBus::Handler::BusDisconnect();
         }
 
@@ -47,13 +47,13 @@ namespace UnitTest
         }
 
         //////////////////////////////////////////////////////////////////////////
-        // TraceMessageDrillerBus
-        void OnPrintf(const char* window, const char* message) override
+        // TraceMessageBus
+        bool OnPrintf(const char* window, const char* message) override
         {
-            OnOutput(window, message);
+            return OnOutput(window, message);
         }
 
-        void OnOutput(const char* window, const char* message) override
+        bool OnOutput(const char* window, const char* message) override
         {
             AZStd::lock_guard<decltype(m_lock)> lock(m_lock);
 
@@ -73,6 +73,7 @@ namespace UnitTest
                     }
                 }
             }
+            return false;
         }
 
         //////////////////////////////////////////////////////////////////////////