diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditorWindowComponent.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditorWindowComponent.cpp
index 88c7c0576f..33987df5b6 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditorWindowComponent.cpp
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditorWindowComponent.cpp
@@ -6,7 +6,6 @@
  *
  */
 
-#include <Atom/Window/MaterialEditorWindowFactoryRequestBus.h>
 #include <Atom/Window/MaterialEditorWindowSettings.h>
 #include <AzCore/RTTI/BehaviorContext.h>
 #include <AzCore/Serialization/EditContext.h>
@@ -23,6 +22,9 @@
 
 namespace MaterialEditor
 {
+    using FactoryRequestBus = AtomToolsFramework::AtomToolsMainWindowFactoryRequestBus;
+    using RequestBus = AtomToolsFramework::AtomToolsMainWindowRequestBus;
+
     void MaterialEditorWindowComponent::Reflect(AZ::ReflectContext* context)
     {
         MaterialEditorWindowSettings::Reflect(context);
@@ -35,16 +37,14 @@ namespace MaterialEditor
 
         if (AZ::BehaviorContext* behaviorContext = azrtti_cast<AZ::BehaviorContext*>(context))
         {
-            using FactoryRequestBus = MaterialEditorWindowFactoryRequestBus;
             behaviorContext->EBus<FactoryRequestBus>("MaterialEditorWindowFactoryRequestBus")
                 ->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Common)
                 ->Attribute(AZ::Script::Attributes::Category, "Editor")
                 ->Attribute(AZ::Script::Attributes::Module, "materialeditor")
-                ->Event("CreateMaterialEditorWindow", &FactoryRequestBus::Events::CreateMaterialEditorWindow)
-                ->Event("DestroyMaterialEditorWindow", &FactoryRequestBus::Events::DestroyMaterialEditorWindow)
+                ->Event("CreateMaterialEditorWindow", &FactoryRequestBus::Events::CreateMainWindow)
+                ->Event("DestroyMaterialEditorWindow", &FactoryRequestBus::Events::DestroyMainWindow)
                 ;
 
-            using RequestBus = AtomToolsFramework::AtomToolsMainWindowRequestBus;
             behaviorContext->EBus<RequestBus>("MaterialEditorWindowRequestBus")
                 ->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Common)
                 ->Attribute(AZ::Script::Attributes::Category, "Editor")
@@ -84,26 +84,26 @@ namespace MaterialEditor
     void MaterialEditorWindowComponent::Activate()
     {
         AzToolsFramework::EditorWindowRequestBus::Handler::BusConnect();
-        MaterialEditorWindowFactoryRequestBus::Handler::BusConnect();
+        FactoryRequestBus::Handler::BusConnect();
         AzToolsFramework::SourceControlConnectionRequestBus::Broadcast(&AzToolsFramework::SourceControlConnectionRequests::EnableSourceControl, true);
     }
 
     void MaterialEditorWindowComponent::Deactivate()
     {
-        MaterialEditorWindowFactoryRequestBus::Handler::BusDisconnect();
+        FactoryRequestBus::Handler::BusDisconnect();
         AzToolsFramework::EditorWindowRequestBus::Handler::BusDisconnect();
 
         m_window.reset();
     }
 
-    void MaterialEditorWindowComponent::CreateMaterialEditorWindow()
+    void MaterialEditorWindowComponent::CreateMainWindow()
     {
         m_materialEditorBrowserInteractions.reset(aznew MaterialEditorBrowserInteractions);
 
         m_window.reset(aznew MaterialEditorWindow);
     }
 
-    void MaterialEditorWindowComponent::DestroyMaterialEditorWindow()
+    void MaterialEditorWindowComponent::DestroyMainWindow()
     {
         m_window.reset();
     }
diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditorWindowComponent.h b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditorWindowComponent.h
index c62e399236..87f6160089 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditorWindowComponent.h
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditorWindowComponent.h
@@ -11,7 +11,7 @@
 #include <AzCore/Component/Component.h>
 #include <AzToolsFramework/API/EditorWindowRequestBus.h>
 
-#include <Atom/Window/MaterialEditorWindowFactoryRequestBus.h>
+#include <AtomToolsFramework/Window/AtomToolsMainWindowFactoryRequestBus.h>
 #include <Source/Window/MaterialEditorBrowserInteractions.h>
 #include <Source/Window/MaterialEditorWindow.h>
 
@@ -22,7 +22,7 @@ namespace MaterialEditor
     class MaterialEditorWindowComponent
         : public AZ::Component
         , private AzToolsFramework::EditorWindowRequestBus::Handler
-        , private MaterialEditorWindowFactoryRequestBus::Handler
+        , private AtomToolsFramework::AtomToolsMainWindowFactoryRequestBus::Handler
     {
     public:
         AZ_COMPONENT(MaterialEditorWindowComponent, "{03976F19-3C74-49FE-A15F-7D3CADBA616C}");
@@ -35,9 +35,9 @@ namespace MaterialEditor
 
     private:
         ////////////////////////////////////////////////////////////////////////
-        // MaterialEditorWindowFactoryRequestBus::Handler overrides...
-        void CreateMaterialEditorWindow() override;
-        void DestroyMaterialEditorWindow() override;
+        // AtomToolsMainWindowFactoryRequestBus::Handler overrides...
+        void CreateMainWindow() override;
+        void DestroyMainWindow() override;
         ////////////////////////////////////////////////////////////////////////
 
         //////////////////////////////////////////////////////////////////////////
diff --git a/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Window/ShaderManagementConsoleWindowComponent.cpp b/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Window/ShaderManagementConsoleWindowComponent.cpp
index b93f164323..e9dda40a50 100644
--- a/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Window/ShaderManagementConsoleWindowComponent.cpp
+++ b/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Window/ShaderManagementConsoleWindowComponent.cpp
@@ -34,6 +34,8 @@ AZ_POP_DISABLE_WARNING
 
 namespace ShaderManagementConsole
 {
+    using FactoryRequestBus = AtomToolsFramework::AtomToolsMainWindowFactoryRequestBus;
+
     void ShaderManagementConsoleWindowComponent::Reflect(AZ::ReflectContext* context)
     {
         if (AZ::SerializeContext* serialize = azrtti_cast<AZ::SerializeContext*>(context))
@@ -44,12 +46,12 @@ namespace ShaderManagementConsole
 
         if (AZ::BehaviorContext* behaviorContext = azrtti_cast<AZ::BehaviorContext*>(context))
         {
-            behaviorContext->EBus<ShaderManagementConsoleWindowFactoryRequestBus>("ShaderManagementConsoleWindowRequestBus")
+            behaviorContext->EBus<FactoryRequestBus>("ShaderManagementConsoleWindowRequestBus")
                 ->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Automation)
                 ->Attribute(AZ::Script::Attributes::Category, "Editor")
                 ->Attribute(AZ::Script::Attributes::Module, "shadermanagementconsole")
-                ->Event("CreateShaderManagementConsoleWindow", &ShaderManagementConsoleWindowFactoryRequestBus::Events::CreateShaderManagementConsoleWindow)
-                ->Event("DestroyShaderManagementConsoleWindow", &ShaderManagementConsoleWindowFactoryRequestBus::Events::DestroyShaderManagementConsoleWindow)
+                ->Event("CreateShaderManagementConsoleWindow", &FactoryRequestBus::Events::CreateMainWindow)
+                ->Event("DestroyShaderManagementConsoleWindow", &FactoryRequestBus::Events::DestroyMainWindow)
                 ;
 
             behaviorContext->EBus<ShaderManagementConsoleRequestBus>("ShaderManagementConsoleRequestBus")
@@ -87,7 +89,7 @@ namespace ShaderManagementConsole
     void ShaderManagementConsoleWindowComponent::Activate()
     {
         AzToolsFramework::EditorWindowRequestBus::Handler::BusConnect();
-        ShaderManagementConsoleWindowFactoryRequestBus::Handler::BusConnect();
+        FactoryRequestBus::Handler::BusConnect();
         ShaderManagementConsoleRequestBus::Handler::BusConnect();
         AzToolsFramework::SourceControlConnectionRequestBus::Broadcast(&AzToolsFramework::SourceControlConnectionRequests::EnableSourceControl, true);
     }
@@ -95,7 +97,7 @@ namespace ShaderManagementConsole
     void ShaderManagementConsoleWindowComponent::Deactivate()
     {
         ShaderManagementConsoleRequestBus::Handler::BusDisconnect();
-        ShaderManagementConsoleWindowFactoryRequestBus::Handler::BusDisconnect();
+        FactoryRequestBus::Handler::BusDisconnect();
         AzToolsFramework::EditorWindowRequestBus::Handler::BusDisconnect();
 
         m_window.reset();
@@ -106,7 +108,7 @@ namespace ShaderManagementConsole
         return m_window.get();
     }
 
-    void ShaderManagementConsoleWindowComponent::CreateShaderManagementConsoleWindow()
+    void ShaderManagementConsoleWindowComponent::CreateMainWindow()
     {
         m_assetBrowserInteractions.reset(aznew ShaderManagementConsoleBrowserInteractions);
 
@@ -114,7 +116,7 @@ namespace ShaderManagementConsole
         m_window->show();
     }
 
-    void ShaderManagementConsoleWindowComponent::DestroyShaderManagementConsoleWindow()
+    void ShaderManagementConsoleWindowComponent::DestroyMainWindow()
     {
         m_window.reset();
     }
diff --git a/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Window/ShaderManagementConsoleWindowComponent.h b/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Window/ShaderManagementConsoleWindowComponent.h
index 3d573ec416..9b43babd9a 100644
--- a/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Window/ShaderManagementConsoleWindowComponent.h
+++ b/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Window/ShaderManagementConsoleWindowComponent.h
@@ -13,7 +13,7 @@
 
 #include <Atom/RPI.Reflect/Material/MaterialAsset.h>
 
-#include <Atom/Window/ShaderManagementConsoleWindowFactoryRequestBus.h>
+#include <AtomToolsFramework/Window/AtomToolsMainWindowFactoryRequestBus.h>
 #include <Atom/Core/ShaderManagementConsoleRequestBus.h>
 #include <Source/Window/ShaderManagementConsoleBrowserInteractions.h>
 #include <Source/Window/ShaderManagementConsoleWindow.h>
@@ -24,7 +24,7 @@ namespace ShaderManagementConsole
     //! used for initialization and registration of other classes, including ShaderManagementConsoleWindow.
     class ShaderManagementConsoleWindowComponent
         : public AZ::Component
-        , private ShaderManagementConsoleWindowFactoryRequestBus::Handler
+        , private AtomToolsFramework::AtomToolsMainWindowFactoryRequestBus::Handler
         , private ShaderManagementConsoleRequestBus::Handler
         , private AzToolsFramework::EditorWindowRequestBus::Handler
     {
@@ -51,9 +51,9 @@ namespace ShaderManagementConsole
         //////////////////////////////////////////////////////////////////////////
 
         ////////////////////////////////////////////////////////////////////////
-        // ShaderManagementConsoleWindowRequestBus::Handler overrides...
-        void CreateShaderManagementConsoleWindow() override;
-        void DestroyShaderManagementConsoleWindow() override;
+        // AtomToolsMainWindowFactoryRequestBus::Handler overrides...
+        void CreateMainWindow() override;
+        void DestroyMainWindow() override;
         ////////////////////////////////////////////////////////////////////////
 
         ////////////////////////////////////////////////////////////////////////