diff --git a/Gems/Multiplayer/Code/Source/Imgui/MultiplayerImguiModule.cpp b/Gems/Multiplayer/Code/Source/Debug/MultiplayerDebugModule.cpp
similarity index 69%
rename from Gems/Multiplayer/Code/Source/Imgui/MultiplayerImguiModule.cpp
rename to Gems/Multiplayer/Code/Source/Debug/MultiplayerDebugModule.cpp
index 1b59a704dc..6ecb8e2ad6 100644
--- a/Gems/Multiplayer/Code/Source/Imgui/MultiplayerImguiModule.cpp
+++ b/Gems/Multiplayer/Code/Source/Debug/MultiplayerDebugModule.cpp
@@ -11,26 +11,26 @@
 */
 
 #include <Source/Multiplayer_precompiled.h>
-#include <Source/Imgui/MultiplayerImguiModule.h>
-#include <Source/Imgui/MultiplayerImguiSystemComponent.h>
+#include <Source/Imgui/MultiplayerDebugModule.h>
+#include <Source/Imgui/MultiplayerDebugSystemComponent.h>
 
 namespace Multiplayer
 {
-    MultiplayerImguiModule::MultiplayerImguiModule()
+    MultiplayerDebugModule::MultiplayerDebugModule()
         : AZ::Module()
     {
         m_descriptors.insert(m_descriptors.end(), {
-            MultiplayerImguiSystemComponent::CreateDescriptor(),
+            MultiplayerDebugSystemComponent::CreateDescriptor(),
         });
     }
 
-    AZ::ComponentTypeList MultiplayerImguiModule::GetRequiredSystemComponents() const
+    AZ::ComponentTypeList MultiplayerDebugModule::GetRequiredSystemComponents() const
     {
         return AZ::ComponentTypeList
         {
-            azrtti_typeid<MultiplayerImguiSystemComponent>(),
+            azrtti_typeid<MultiplayerDebugSystemComponent>(),
         };
     }
 }
 
-AZ_DECLARE_MODULE_CLASS(Gem_Multiplayer_Imgui, Multiplayer::MultiplayerImguiModule);
+AZ_DECLARE_MODULE_CLASS(Gem_Multiplayer_Imgui, Multiplayer::MultiplayerDebugModule);
diff --git a/Gems/Multiplayer/Code/Source/Imgui/MultiplayerImguiModule.h b/Gems/Multiplayer/Code/Source/Debug/MultiplayerDebugModule.h
similarity index 75%
rename from Gems/Multiplayer/Code/Source/Imgui/MultiplayerImguiModule.h
rename to Gems/Multiplayer/Code/Source/Debug/MultiplayerDebugModule.h
index ce0ed244be..94e96edf95 100644
--- a/Gems/Multiplayer/Code/Source/Imgui/MultiplayerImguiModule.h
+++ b/Gems/Multiplayer/Code/Source/Debug/MultiplayerDebugModule.h
@@ -16,15 +16,15 @@
 
 namespace Multiplayer
 {
-    class MultiplayerImguiModule
+    class MultiplayerDebugModule
         : public AZ::Module
     {
     public:
-        AZ_RTTI(MultiplayerImguiModule, "{9E1460FA-4513-4B5E-86B4-9DD8ADEFA714}", AZ::Module);
-        AZ_CLASS_ALLOCATOR(MultiplayerImguiModule, AZ::SystemAllocator, 0);
+        AZ_RTTI(MultiplayerDebugModule, "{9E1460FA-4513-4B5E-86B4-9DD8ADEFA714}", AZ::Module);
+        AZ_CLASS_ALLOCATOR(MultiplayerDebugModule, AZ::SystemAllocator, 0);
 
-        MultiplayerImguiModule();
-        ~MultiplayerImguiModule() override = default;
+        MultiplayerDebugModule();
+        ~MultiplayerDebugModule() override = default;
 
         AZ::ComponentTypeList GetRequiredSystemComponents() const override;
     };
diff --git a/Gems/Multiplayer/Code/Source/Imgui/MultiplayerImguiSystemComponent.cpp b/Gems/Multiplayer/Code/Source/Debug/MultiplayerDebugSystemComponent.cpp
similarity index 86%
rename from Gems/Multiplayer/Code/Source/Imgui/MultiplayerImguiSystemComponent.cpp
rename to Gems/Multiplayer/Code/Source/Debug/MultiplayerDebugSystemComponent.cpp
index a53dd2800f..106a8b1d03 100644
--- a/Gems/Multiplayer/Code/Source/Imgui/MultiplayerImguiSystemComponent.cpp
+++ b/Gems/Multiplayer/Code/Source/Debug/MultiplayerDebugSystemComponent.cpp
@@ -10,45 +10,45 @@
 *
 */
 
-#include <Source/Imgui/MultiplayerImguiSystemComponent.h>
+#include <Source/Imgui/MultiplayerDebugSystemComponent.h>
 #include <AzCore/Serialization/SerializeContext.h>
 #include <AzCore/Interface/Interface.h>
 #include <Include/IMultiplayer.h>
 
 namespace Multiplayer
 {
-    void MultiplayerImguiSystemComponent::Reflect(AZ::ReflectContext* context)
+    void MultiplayerDebugSystemComponent::Reflect(AZ::ReflectContext* context)
     {
         if (AZ::SerializeContext* serializeContext = azrtti_cast<AZ::SerializeContext*>(context))
         {
-            serializeContext->Class<MultiplayerImguiSystemComponent, AZ::Component>()
+            serializeContext->Class<MultiplayerDebugSystemComponent, AZ::Component>()
                 ->Version(1);
         }
     }
 
-    void MultiplayerImguiSystemComponent::GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided)
+    void MultiplayerDebugSystemComponent::GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided)
     {
-        provided.push_back(AZ_CRC_CE("MultiplayerImguiSystemComponent"));
+        provided.push_back(AZ_CRC_CE("MultiplayerDebugSystemComponent"));
     }
 
-    void MultiplayerImguiSystemComponent::GetRequiredServices([[maybe_unused]] AZ::ComponentDescriptor::DependencyArrayType& required)
+    void MultiplayerDebugSystemComponent::GetRequiredServices([[maybe_unused]] AZ::ComponentDescriptor::DependencyArrayType& required)
     {
         ;
     }
 
-    void MultiplayerImguiSystemComponent::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatbile)
+    void MultiplayerDebugSystemComponent::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatbile)
     {
-        incompatbile.push_back(AZ_CRC_CE("MultiplayerImguiSystemComponent"));
+        incompatbile.push_back(AZ_CRC_CE("MultiplayerDebugSystemComponent"));
     }
 
-    void MultiplayerImguiSystemComponent::Activate()
+    void MultiplayerDebugSystemComponent::Activate()
     {
 #ifdef IMGUI_ENABLED
         ImGui::ImGuiUpdateListenerBus::Handler::BusConnect();
 #endif
     }
 
-    void MultiplayerImguiSystemComponent::Deactivate()
+    void MultiplayerDebugSystemComponent::Deactivate()
     {
 #ifdef IMGUI_ENABLED
         ImGui::ImGuiUpdateListenerBus::Handler::BusDisconnect();
@@ -56,7 +56,7 @@ namespace Multiplayer
     }
 
 #ifdef IMGUI_ENABLED
-    void MultiplayerImguiSystemComponent::OnImGuiMainMenuUpdate()
+    void MultiplayerDebugSystemComponent::OnImGuiMainMenuUpdate()
     {
         if (ImGui::BeginMenu("Multiplayer"))
         {
@@ -95,7 +95,7 @@ namespace Multiplayer
         }
     }
 
-    void MultiplayerImguiSystemComponent::OnImGuiUpdate()
+    void MultiplayerDebugSystemComponent::OnImGuiUpdate()
     {
         if (m_displayStats)
         {
diff --git a/Gems/Multiplayer/Code/Source/Imgui/MultiplayerImguiSystemComponent.h b/Gems/Multiplayer/Code/Source/Debug/MultiplayerDebugSystemComponent.h
similarity index 90%
rename from Gems/Multiplayer/Code/Source/Imgui/MultiplayerImguiSystemComponent.h
rename to Gems/Multiplayer/Code/Source/Debug/MultiplayerDebugSystemComponent.h
index 1650d62264..81940423d7 100644
--- a/Gems/Multiplayer/Code/Source/Imgui/MultiplayerImguiSystemComponent.h
+++ b/Gems/Multiplayer/Code/Source/Debug/MultiplayerDebugSystemComponent.h
@@ -21,21 +21,21 @@
 
 namespace Multiplayer
 {
-    class MultiplayerImguiSystemComponent final
+    class MultiplayerDebugSystemComponent final
         : public AZ::Component
 #ifdef IMGUI_ENABLED
         , public ImGui::ImGuiUpdateListenerBus::Handler
 #endif
     {
     public:
-        AZ_COMPONENT(MultiplayerImguiSystemComponent, "{060BF3F1-0BFE-4FCE-9C3C-EE991F0DA581}");
+        AZ_COMPONENT(MultiplayerDebugSystemComponent, "{060BF3F1-0BFE-4FCE-9C3C-EE991F0DA581}");
 
         static void Reflect(AZ::ReflectContext* context);
         static void GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided);
         static void GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required);
         static void GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatbile);
 
-        ~MultiplayerImguiSystemComponent() override = default;
+        ~MultiplayerDebugSystemComponent() override = default;
 
         //! AZ::Component overrides
         //! @{
diff --git a/Gems/Multiplayer/Code/multiplayer_imgui_files.cmake b/Gems/Multiplayer/Code/multiplayer_debug_files.cmake
similarity index 76%
rename from Gems/Multiplayer/Code/multiplayer_imgui_files.cmake
rename to Gems/Multiplayer/Code/multiplayer_debug_files.cmake
index 57623772d2..8d0b121735 100644
--- a/Gems/Multiplayer/Code/multiplayer_imgui_files.cmake
+++ b/Gems/Multiplayer/Code/multiplayer_debug_files.cmake
@@ -12,8 +12,8 @@
 set(FILES
     Source/Multiplayer_precompiled.cpp
     Source/Multiplayer_precompiled.h
-    Source/Imgui/MultiplayerImguiModule.cpp
-    Source/Imgui/MultiplayerImguiModule.h
-    Source/Imgui/MultiplayerImguiSystemComponent.cpp
-    Source/Imgui/MultiplayerImguiSystemComponent.h
+    Source/Debug/MultiplayerDebugModule.cpp
+    Source/Debug/MultiplayerDebugModule.h
+    Source/Debug/MultiplayerDebugSystemComponent.cpp
+    Source/Debug/MultiplayerDebugSystemComponent.h
 )