diff --git a/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/BlueprintMCPCommandlet.cpp b/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/MCPCommandlet.cpp
similarity index 94%
rename from Plugins/BlueprintMCP/Source/BlueprintMCP/Private/BlueprintMCPCommandlet.cpp
rename to Plugins/BlueprintMCP/Source/BlueprintMCP/Private/MCPCommandlet.cpp
index 67e77726..71587a08 100644
--- a/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/BlueprintMCPCommandlet.cpp
+++ b/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/MCPCommandlet.cpp
@@ -1,5 +1,5 @@
-#include "BlueprintMCPCommandlet.h"
-#include "BlueprintMCPServer.h"
+#include "MCPCommandlet.h"
+#include "MCPServer.h"
 #include "Containers/Ticker.h"
 
 UBlueprintMCPCommandlet::UBlueprintMCPCommandlet()
diff --git a/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/BlueprintMCPEditorSubsystem.cpp b/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/MCPEditorSubsystem.cpp
similarity index 94%
rename from Plugins/BlueprintMCP/Source/BlueprintMCP/Private/BlueprintMCPEditorSubsystem.cpp
rename to Plugins/BlueprintMCP/Source/BlueprintMCP/Private/MCPEditorSubsystem.cpp
index 6316cd3f..370d17de 100644
--- a/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/BlueprintMCPEditorSubsystem.cpp
+++ b/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/MCPEditorSubsystem.cpp
@@ -1,5 +1,5 @@
-#include "BlueprintMCPEditorSubsystem.h"
-#include "BlueprintMCPServer.h"
+#include "MCPEditorSubsystem.h"
+#include "MCPServer.h"
 
 void UBlueprintMCPEditorSubsystem::Initialize(FSubsystemCollectionBase& Collection)
 {
diff --git a/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/BlueprintMCPHandlers_AnimMutation.cpp b/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/MCPHandlers_AnimMutation.cpp
similarity index 99%
rename from Plugins/BlueprintMCP/Source/BlueprintMCP/Private/BlueprintMCPHandlers_AnimMutation.cpp
rename to Plugins/BlueprintMCP/Source/BlueprintMCP/Private/MCPHandlers_AnimMutation.cpp
index 205000f5..c889584c 100644
--- a/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/BlueprintMCPHandlers_AnimMutation.cpp
+++ b/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/MCPHandlers_AnimMutation.cpp
@@ -1,5 +1,5 @@
 #include "MCPAssetFinder.h"
-#include "BlueprintMCPServer.h"
+#include "MCPServer.h"
 #include "MCPUtils.h"
 #include "Engine/Blueprint.h"
 #include "EdGraph/EdGraph.h"
diff --git a/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/BlueprintMCPHandlers_Components.cpp b/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/MCPHandlers_Components.cpp
similarity index 99%
rename from Plugins/BlueprintMCP/Source/BlueprintMCP/Private/BlueprintMCPHandlers_Components.cpp
rename to Plugins/BlueprintMCP/Source/BlueprintMCP/Private/MCPHandlers_Components.cpp
index d0065502..01537d02 100644
--- a/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/BlueprintMCPHandlers_Components.cpp
+++ b/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/MCPHandlers_Components.cpp
@@ -1,5 +1,5 @@
 #include "MCPAssetFinder.h"
-#include "BlueprintMCPServer.h"
+#include "MCPServer.h"
 #include "MCPUtils.h"
 #include "Engine/Blueprint.h"
 #include "Engine/SimpleConstructionScript.h"
diff --git a/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/BlueprintMCPHandlers_DiffBlueprints.cpp b/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/MCPHandlers_DiffBlueprints.cpp
similarity index 98%
rename from Plugins/BlueprintMCP/Source/BlueprintMCP/Private/BlueprintMCPHandlers_DiffBlueprints.cpp
rename to Plugins/BlueprintMCP/Source/BlueprintMCP/Private/MCPHandlers_DiffBlueprints.cpp
index eea77c7e..899582c2 100644
--- a/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/BlueprintMCPHandlers_DiffBlueprints.cpp
+++ b/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/MCPHandlers_DiffBlueprints.cpp
@@ -1,6 +1,6 @@
-#include "BlueprintMCPHandlers_DiffBlueprints.h"
+#include "MCPHandlers_DiffBlueprints.h"
 #include "MCPAssetFinder.h"
-#include "BlueprintMCPServer.h"
+#include "MCPServer.h"
 #include "MCPUtils.h"
 #include "Engine/Blueprint.h"
 #include "EdGraph/EdGraph.h"
diff --git a/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/BlueprintMCPHandlers_DiffBlueprints.h b/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/MCPHandlers_DiffBlueprints.h
similarity index 93%
rename from Plugins/BlueprintMCP/Source/BlueprintMCP/Private/BlueprintMCPHandlers_DiffBlueprints.h
rename to Plugins/BlueprintMCP/Source/BlueprintMCP/Private/MCPHandlers_DiffBlueprints.h
index dfdb1980..f4ab9739 100644
--- a/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/BlueprintMCPHandlers_DiffBlueprints.h
+++ b/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/MCPHandlers_DiffBlueprints.h
@@ -2,7 +2,7 @@
 
 #include "CoreMinimal.h"
 #include "MCPHandler.h"
-#include "BlueprintMCPHandlers_DiffBlueprints.generated.h"
+#include "MCPHandlers_DiffBlueprints.generated.h"
 
 UCLASS(meta=(ToolName="diff_two_blueprints"))
 class UMCPHandler_DiffTwoBlueprints : public UObject, public IMCPHandler
diff --git a/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/BlueprintMCPHandlers_Discovery.cpp b/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/MCPHandlers_Discovery.cpp
similarity index 99%
rename from Plugins/BlueprintMCP/Source/BlueprintMCP/Private/BlueprintMCPHandlers_Discovery.cpp
rename to Plugins/BlueprintMCP/Source/BlueprintMCP/Private/MCPHandlers_Discovery.cpp
index f9d5d2ba..6e74de42 100644
--- a/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/BlueprintMCPHandlers_Discovery.cpp
+++ b/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/MCPHandlers_Discovery.cpp
@@ -1,5 +1,5 @@
 #include "MCPAssetFinder.h"
-#include "BlueprintMCPServer.h"
+#include "MCPServer.h"
 #include "MCPUtils.h"
 #include "Engine/Blueprint.h"
 #include "EdGraph/EdGraph.h"
diff --git a/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/BlueprintMCPHandlers_Dispatchers.cpp b/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/MCPHandlers_Dispatchers.cpp
similarity index 99%
rename from Plugins/BlueprintMCP/Source/BlueprintMCP/Private/BlueprintMCPHandlers_Dispatchers.cpp
rename to Plugins/BlueprintMCP/Source/BlueprintMCP/Private/MCPHandlers_Dispatchers.cpp
index e9cb54a2..50cdd917 100644
--- a/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/BlueprintMCPHandlers_Dispatchers.cpp
+++ b/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/MCPHandlers_Dispatchers.cpp
@@ -1,5 +1,5 @@
 #include "MCPAssetFinder.h"
-#include "BlueprintMCPServer.h"
+#include "MCPServer.h"
 #include "MCPUtils.h"
 #include "Engine/Blueprint.h"
 #include "EdGraph/EdGraph.h"
diff --git a/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/BlueprintMCPHandlers_Graphs.cpp b/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/MCPHandlers_Graphs.cpp
similarity index 99%
rename from Plugins/BlueprintMCP/Source/BlueprintMCP/Private/BlueprintMCPHandlers_Graphs.cpp
rename to Plugins/BlueprintMCP/Source/BlueprintMCP/Private/MCPHandlers_Graphs.cpp
index 52c9d297..b9ce2ab8 100644
--- a/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/BlueprintMCPHandlers_Graphs.cpp
+++ b/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/MCPHandlers_Graphs.cpp
@@ -1,5 +1,5 @@
 #include "MCPAssetFinder.h"
-#include "BlueprintMCPServer.h"
+#include "MCPServer.h"
 #include "MCPUtils.h"
 #include "Engine/Blueprint.h"
 #include "Engine/World.h"
diff --git a/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/BlueprintMCPHandlers_Interfaces.cpp b/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/MCPHandlers_Interfaces.cpp
similarity index 99%
rename from Plugins/BlueprintMCP/Source/BlueprintMCP/Private/BlueprintMCPHandlers_Interfaces.cpp
rename to Plugins/BlueprintMCP/Source/BlueprintMCP/Private/MCPHandlers_Interfaces.cpp
index 5813357f..5f91a5ee 100644
--- a/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/BlueprintMCPHandlers_Interfaces.cpp
+++ b/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/MCPHandlers_Interfaces.cpp
@@ -1,6 +1,6 @@
-#include "BlueprintMCPHandlers_Interfaces.h"
+#include "MCPHandlers_Interfaces.h"
 #include "MCPAssetFinder.h"
-#include "BlueprintMCPServer.h"
+#include "MCPServer.h"
 #include "MCPUtils.h"
 #include "Engine/Blueprint.h"
 #include "EdGraph/EdGraph.h"
diff --git a/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/BlueprintMCPHandlers_Interfaces.h b/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/MCPHandlers_Interfaces.h
similarity index 97%
rename from Plugins/BlueprintMCP/Source/BlueprintMCP/Private/BlueprintMCPHandlers_Interfaces.h
rename to Plugins/BlueprintMCP/Source/BlueprintMCP/Private/MCPHandlers_Interfaces.h
index dde08d0d..00ad3430 100644
--- a/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/BlueprintMCPHandlers_Interfaces.h
+++ b/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/MCPHandlers_Interfaces.h
@@ -2,7 +2,7 @@
 
 #include "CoreMinimal.h"
 #include "MCPHandler.h"
-#include "BlueprintMCPHandlers_Interfaces.generated.h"
+#include "MCPHandlers_Interfaces.generated.h"
 
 UCLASS(meta=(ToolName="list_blueprint_interfaces"))
 class UMCPHandler_ListBlueprintInterfaces : public UObject, public IMCPHandler
diff --git a/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/BlueprintMCPHandlers_MaterialInstance.cpp b/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/MCPHandlers_MaterialInstance.cpp
similarity index 99%
rename from Plugins/BlueprintMCP/Source/BlueprintMCP/Private/BlueprintMCPHandlers_MaterialInstance.cpp
rename to Plugins/BlueprintMCP/Source/BlueprintMCP/Private/MCPHandlers_MaterialInstance.cpp
index 6d29ff4e..9f2e1c52 100644
--- a/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/BlueprintMCPHandlers_MaterialInstance.cpp
+++ b/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/MCPHandlers_MaterialInstance.cpp
@@ -1,5 +1,5 @@
 #include "MCPAssetFinder.h"
-#include "BlueprintMCPServer.h"
+#include "MCPServer.h"
 #include "MCPUtils.h"
 #include "Materials/Material.h"
 #include "Materials/MaterialInterface.h"
diff --git a/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/BlueprintMCPHandlers_MaterialMutation.cpp b/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/MCPHandlers_MaterialMutation.cpp
similarity index 99%
rename from Plugins/BlueprintMCP/Source/BlueprintMCP/Private/BlueprintMCPHandlers_MaterialMutation.cpp
rename to Plugins/BlueprintMCP/Source/BlueprintMCP/Private/MCPHandlers_MaterialMutation.cpp
index 3b226d44..c0843664 100644
--- a/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/BlueprintMCPHandlers_MaterialMutation.cpp
+++ b/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/MCPHandlers_MaterialMutation.cpp
@@ -1,5 +1,5 @@
 #include "MCPAssetFinder.h"
-#include "BlueprintMCPServer.h"
+#include "MCPServer.h"
 #include "MCPUtils.h"
 #include "Materials/Material.h"
 #include "MaterialDomain.h"
diff --git a/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/BlueprintMCPHandlers_MaterialRead.cpp b/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/MCPHandlers_MaterialRead.cpp
similarity index 99%
rename from Plugins/BlueprintMCP/Source/BlueprintMCP/Private/BlueprintMCPHandlers_MaterialRead.cpp
rename to Plugins/BlueprintMCP/Source/BlueprintMCP/Private/MCPHandlers_MaterialRead.cpp
index 217e4f07..e49ef4de 100644
--- a/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/BlueprintMCPHandlers_MaterialRead.cpp
+++ b/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/MCPHandlers_MaterialRead.cpp
@@ -1,5 +1,5 @@
 #include "MCPAssetFinder.h"
-#include "BlueprintMCPServer.h"
+#include "MCPServer.h"
 #include "MCPUtils.h"
 #include "Materials/Material.h"
 #include "Materials/MaterialInstanceConstant.h"
diff --git a/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/BlueprintMCPHandlers_Mutation.cpp b/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/MCPHandlers_Mutation.cpp
similarity index 99%
rename from Plugins/BlueprintMCP/Source/BlueprintMCP/Private/BlueprintMCPHandlers_Mutation.cpp
rename to Plugins/BlueprintMCP/Source/BlueprintMCP/Private/MCPHandlers_Mutation.cpp
index 94754879..94b9f697 100644
--- a/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/BlueprintMCPHandlers_Mutation.cpp
+++ b/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/MCPHandlers_Mutation.cpp
@@ -1,6 +1,6 @@
-#include "BlueprintMCPHandlers_Mutation.h"
+#include "MCPHandlers_Mutation.h"
 #include "MCPAssetFinder.h"
-#include "BlueprintMCPServer.h"
+#include "MCPServer.h"
 #include "MCPUtils.h"
 #include "Engine/Blueprint.h"
 #include "Materials/Material.h"
diff --git a/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/BlueprintMCPHandlers_Mutation.h b/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/MCPHandlers_Mutation.h
similarity index 99%
rename from Plugins/BlueprintMCP/Source/BlueprintMCP/Private/BlueprintMCPHandlers_Mutation.h
rename to Plugins/BlueprintMCP/Source/BlueprintMCP/Private/MCPHandlers_Mutation.h
index 56c3ed34..5d557122 100644
--- a/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/BlueprintMCPHandlers_Mutation.h
+++ b/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/MCPHandlers_Mutation.h
@@ -2,7 +2,7 @@
 
 #include "CoreMinimal.h"
 #include "MCPHandler.h"
-#include "BlueprintMCPHandlers_Mutation.generated.h"
+#include "MCPHandlers_Mutation.generated.h"
 
 USTRUCT()
 struct FSetPinDefaultEntry
diff --git a/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/BlueprintMCPHandlers_Params.cpp b/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/MCPHandlers_Params.cpp
similarity index 99%
rename from Plugins/BlueprintMCP/Source/BlueprintMCP/Private/BlueprintMCPHandlers_Params.cpp
rename to Plugins/BlueprintMCP/Source/BlueprintMCP/Private/MCPHandlers_Params.cpp
index 12d0a80b..13a5f7ad 100644
--- a/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/BlueprintMCPHandlers_Params.cpp
+++ b/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/MCPHandlers_Params.cpp
@@ -1,5 +1,5 @@
 #include "MCPAssetFinder.h"
-#include "BlueprintMCPServer.h"
+#include "MCPServer.h"
 #include "MCPUtils.h"
 #include "Engine/Blueprint.h"
 #include "EdGraph/EdGraph.h"
diff --git a/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/BlueprintMCPHandlers_Read.cpp b/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/MCPHandlers_Read.cpp
similarity index 99%
rename from Plugins/BlueprintMCP/Source/BlueprintMCP/Private/BlueprintMCPHandlers_Read.cpp
rename to Plugins/BlueprintMCP/Source/BlueprintMCP/Private/MCPHandlers_Read.cpp
index d3e89546..e532e970 100644
--- a/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/BlueprintMCPHandlers_Read.cpp
+++ b/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/MCPHandlers_Read.cpp
@@ -1,5 +1,5 @@
 #include "MCPAssetFinder.h"
-#include "BlueprintMCPServer.h"
+#include "MCPServer.h"
 #include "MCPUtils.h"
 #include "Engine/Blueprint.h"
 #include "Engine/World.h"
diff --git a/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/BlueprintMCPHandlers_Snapshot.cpp b/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/MCPHandlers_Snapshot.cpp
similarity index 99%
rename from Plugins/BlueprintMCP/Source/BlueprintMCP/Private/BlueprintMCPHandlers_Snapshot.cpp
rename to Plugins/BlueprintMCP/Source/BlueprintMCP/Private/MCPHandlers_Snapshot.cpp
index 79e29e22..9a8a7249 100644
--- a/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/BlueprintMCPHandlers_Snapshot.cpp
+++ b/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/MCPHandlers_Snapshot.cpp
@@ -1,5 +1,5 @@
 #include "MCPAssetFinder.h"
-#include "BlueprintMCPServer.h"
+#include "MCPServer.h"
 #include "MCPUtils.h"
 #include "Engine/Blueprint.h"
 #include "EdGraph/EdGraph.h"
diff --git a/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/BlueprintMCPHandlers_UserTypes.cpp b/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/MCPHandlers_UserTypes.cpp
similarity index 99%
rename from Plugins/BlueprintMCP/Source/BlueprintMCP/Private/BlueprintMCPHandlers_UserTypes.cpp
rename to Plugins/BlueprintMCP/Source/BlueprintMCP/Private/MCPHandlers_UserTypes.cpp
index 5371f015..96cc6d50 100644
--- a/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/BlueprintMCPHandlers_UserTypes.cpp
+++ b/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/MCPHandlers_UserTypes.cpp
@@ -1,4 +1,4 @@
-#include "BlueprintMCPServer.h"
+#include "MCPServer.h"
 #include "MCPUtils.h"
 #include "Engine/UserDefinedStruct.h"
 #include "Engine/UserDefinedEnum.h"
diff --git a/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/BlueprintMCPHandlers_Validation.cpp b/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/MCPHandlers_Validation.cpp
similarity index 99%
rename from Plugins/BlueprintMCP/Source/BlueprintMCP/Private/BlueprintMCPHandlers_Validation.cpp
rename to Plugins/BlueprintMCP/Source/BlueprintMCP/Private/MCPHandlers_Validation.cpp
index 423f8fb5..e5549572 100644
--- a/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/BlueprintMCPHandlers_Validation.cpp
+++ b/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/MCPHandlers_Validation.cpp
@@ -1,5 +1,5 @@
 #include "MCPAssetFinder.h"
-#include "BlueprintMCPServer.h"
+#include "MCPServer.h"
 #include "MCPUtils.h"
 #include "Engine/Blueprint.h"
 #include "EdGraph/EdGraph.h"
diff --git a/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/BlueprintMCPHandlers_Variables.cpp b/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/MCPHandlers_Variables.cpp
similarity index 99%
rename from Plugins/BlueprintMCP/Source/BlueprintMCP/Private/BlueprintMCPHandlers_Variables.cpp
rename to Plugins/BlueprintMCP/Source/BlueprintMCP/Private/MCPHandlers_Variables.cpp
index 5b3770bb..aa649957 100644
--- a/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/BlueprintMCPHandlers_Variables.cpp
+++ b/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/MCPHandlers_Variables.cpp
@@ -1,5 +1,5 @@
 #include "MCPAssetFinder.h"
-#include "BlueprintMCPServer.h"
+#include "MCPServer.h"
 #include "MCPUtils.h"
 #include "Engine/Blueprint.h"
 #include "EdGraph/EdGraph.h"
diff --git a/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/BlueprintMCPModule.cpp b/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/MCPModule.cpp
similarity index 73%
rename from Plugins/BlueprintMCP/Source/BlueprintMCP/Private/BlueprintMCPModule.cpp
rename to Plugins/BlueprintMCP/Source/BlueprintMCP/Private/MCPModule.cpp
index f15bc481..e9dd0ba0 100644
--- a/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/BlueprintMCPModule.cpp
+++ b/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/MCPModule.cpp
@@ -1,4 +1,4 @@
-#include "BlueprintMCPModule.h"
+#include "MCPModule.h"
 #include "Modules/ModuleManager.h"
 
 IMPLEMENT_MODULE(FBlueprintMCPModule, BlueprintMCP);
diff --git a/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/BlueprintMCPModule.h b/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/MCPModule.h
similarity index 100%
rename from Plugins/BlueprintMCP/Source/BlueprintMCP/Private/BlueprintMCPModule.h
rename to Plugins/BlueprintMCP/Source/BlueprintMCP/Private/MCPModule.h
diff --git a/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/BlueprintMCPServer.cpp b/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/MCPServer.cpp
similarity index 99%
rename from Plugins/BlueprintMCP/Source/BlueprintMCP/Private/BlueprintMCPServer.cpp
rename to Plugins/BlueprintMCP/Source/BlueprintMCP/Private/MCPServer.cpp
index 64c5f226..57189d3d 100644
--- a/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/BlueprintMCPServer.cpp
+++ b/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/MCPServer.cpp
@@ -1,4 +1,4 @@
-#include "BlueprintMCPServer.h"
+#include "MCPServer.h"
 #include "MCPHandler.h"
 #include "MCPUtils.h"
 #include "MCPAssetFinder.h"
@@ -104,7 +104,7 @@
 // Get() — retrieve the active server via the editor subsystem
 // ============================================================
 
-#include "BlueprintMCPEditorSubsystem.h"
+#include "MCPEditorSubsystem.h"
 
 FBlueprintMCPServer* FBlueprintMCPServer::Get()
 {
diff --git a/Plugins/BlueprintMCP/Source/BlueprintMCP/Public/BlueprintMCPCommandlet.h b/Plugins/BlueprintMCP/Source/BlueprintMCP/Public/MCPCommandlet.h
similarity index 87%
rename from Plugins/BlueprintMCP/Source/BlueprintMCP/Public/BlueprintMCPCommandlet.h
rename to Plugins/BlueprintMCP/Source/BlueprintMCP/Public/MCPCommandlet.h
index e32ec15b..053dee47 100644
--- a/Plugins/BlueprintMCP/Source/BlueprintMCP/Public/BlueprintMCPCommandlet.h
+++ b/Plugins/BlueprintMCP/Source/BlueprintMCP/Public/MCPCommandlet.h
@@ -2,8 +2,8 @@
 
 #include "CoreMinimal.h"
 #include "Commandlets/Commandlet.h"
-#include "BlueprintMCPServer.h"
-#include "BlueprintMCPCommandlet.generated.h"
+#include "MCPServer.h"
+#include "MCPCommandlet.generated.h"
 
 /**
  * Standalone commandlet that hosts the Blueprint MCP HTTP server.
diff --git a/Plugins/BlueprintMCP/Source/BlueprintMCP/Public/BlueprintMCPEditorSubsystem.h b/Plugins/BlueprintMCP/Source/BlueprintMCP/Public/MCPEditorSubsystem.h
similarity index 91%
rename from Plugins/BlueprintMCP/Source/BlueprintMCP/Public/BlueprintMCPEditorSubsystem.h
rename to Plugins/BlueprintMCP/Source/BlueprintMCP/Public/MCPEditorSubsystem.h
index 214fb61a..b2e618b5 100644
--- a/Plugins/BlueprintMCP/Source/BlueprintMCP/Public/BlueprintMCPEditorSubsystem.h
+++ b/Plugins/BlueprintMCP/Source/BlueprintMCP/Public/MCPEditorSubsystem.h
@@ -3,8 +3,8 @@
 #include "CoreMinimal.h"
 #include "EditorSubsystem.h"
 #include "Tickable.h"
-#include "BlueprintMCPServer.h"
-#include "BlueprintMCPEditorSubsystem.generated.h"
+#include "MCPServer.h"
+#include "MCPEditorSubsystem.generated.h"
 
 /**
  * Editor subsystem that hosts the Blueprint MCP HTTP server inside the running
diff --git a/Plugins/BlueprintMCP/Source/BlueprintMCP/Public/BlueprintMCPServer.h b/Plugins/BlueprintMCP/Source/BlueprintMCP/Public/MCPServer.h
similarity index 100%
rename from Plugins/BlueprintMCP/Source/BlueprintMCP/Public/BlueprintMCPServer.h
rename to Plugins/BlueprintMCP/Source/BlueprintMCP/Public/MCPServer.h