diff --git a/Plugins/BlueprintMCP/Source/BlueprintMCP/Handlers/BlueprintVariable_Create.h b/Plugins/BlueprintMCP/Source/BlueprintMCP/Handlers/BlueprintVariable_Create.h
index 0e9c81e8..384465c3 100644
--- a/Plugins/BlueprintMCP/Source/BlueprintMCP/Handlers/BlueprintVariable_Create.h
+++ b/Plugins/BlueprintMCP/Source/BlueprintMCP/Handlers/BlueprintVariable_Create.h
@@ -6,7 +6,7 @@
 #include "WingFetcher.h"
 #include "WingJson.h"
 #include "WingProperty.h"
-#include "BPVarEditor.h"
+#include "WingBlueprintVar.h"
 #include "WingUtils.h"
 #include "WingTypes.h"
 #include "Engine/Blueprint.h"
@@ -63,7 +63,7 @@ public:
 		}
 
 		// Find the newly created variable description
-		FBPVarEditor Editor(BP, Name);
+		FBlueprintVar Editor(BP, Name);
 		if (Editor.NotFound()) return;
 
 		// Apply config if provided
diff --git a/Plugins/BlueprintMCP/Source/BlueprintMCP/Handlers/BlueprintVariable_Delete.h b/Plugins/BlueprintMCP/Source/BlueprintMCP/Handlers/BlueprintVariable_Delete.h
index d2069fc5..88cd9b09 100644
--- a/Plugins/BlueprintMCP/Source/BlueprintMCP/Handlers/BlueprintVariable_Delete.h
+++ b/Plugins/BlueprintMCP/Source/BlueprintMCP/Handlers/BlueprintVariable_Delete.h
@@ -5,7 +5,7 @@
 #include "WingHandler.h"
 #include "WingFetcher.h"
 #include "WingUtils.h"
-#include "BPVarEditor.h"
+#include "WingBlueprintVar.h"
 #include "Engine/Blueprint.h"
 #include "Kismet2/BlueprintEditorUtils.h"
 #include "BlueprintVariable_Delete.generated.h"
@@ -38,7 +38,7 @@ public:
 		UBlueprint* BP = F.Walk(Blueprint).Cast<UBlueprint>();
 		if (!BP) return;
 
-		FBPVarEditor Editor(BP, Variable);
+		FBlueprintVar Editor(BP, Variable);
 		if (Editor.NotFound()) return;
 
 		FBlueprintEditorUtils::RemoveMemberVariable(BP, Editor.Desc->VarName);
diff --git a/Plugins/BlueprintMCP/Source/BlueprintMCP/Handlers/BlueprintVariable_Dump.h b/Plugins/BlueprintMCP/Source/BlueprintMCP/Handlers/BlueprintVariable_Dump.h
index 796dffc0..4c577141 100644
--- a/Plugins/BlueprintMCP/Source/BlueprintMCP/Handlers/BlueprintVariable_Dump.h
+++ b/Plugins/BlueprintMCP/Source/BlueprintMCP/Handlers/BlueprintVariable_Dump.h
@@ -5,7 +5,7 @@
 #include "WingHandler.h"
 #include "WingFetcher.h"
 #include "WingUtils.h"
-#include "BPVarEditor.h"
+#include "WingBlueprintVar.h"
 #include "Engine/Blueprint.h"
 #include "Kismet2/BlueprintEditorUtils.h"
 #include "BlueprintVariable_Dump.generated.h"
@@ -38,7 +38,7 @@ public:
 		UBlueprint* BP = F.Walk(Blueprint).Cast<UBlueprint>();
 		if (!BP) return;
 
-		FBPVarEditor Editor(BP, Variable);
+		FBlueprintVar Editor(BP, Variable);
 		if (Editor.NotFound()) return;
 
 		UWingServer::Printf(TEXT("Variable %s in %s:\n"), *Variable, *WingUtils::FormatName(BP));
diff --git a/Plugins/BlueprintMCP/Source/BlueprintMCP/Handlers/BlueprintVariable_Modify.h b/Plugins/BlueprintMCP/Source/BlueprintMCP/Handlers/BlueprintVariable_Modify.h
index 0cb89ee3..e76de135 100644
--- a/Plugins/BlueprintMCP/Source/BlueprintMCP/Handlers/BlueprintVariable_Modify.h
+++ b/Plugins/BlueprintMCP/Source/BlueprintMCP/Handlers/BlueprintVariable_Modify.h
@@ -6,7 +6,7 @@
 #include "WingFetcher.h"
 #include "WingJson.h"
 #include "WingProperty.h"
-#include "BPVarEditor.h"
+#include "WingBlueprintVar.h"
 #include "WingUtils.h"
 #include "WingTypes.h"
 #include "Engine/Blueprint.h"
@@ -44,7 +44,7 @@ public:
 		UBlueprint* BP = F.Walk(Blueprint).Cast<UBlueprint>();
 		if (!BP) return;
 
-		FBPVarEditor Editor(BP, Variable);
+		FBlueprintVar Editor(BP, Variable);
 		if (Editor.NotFound()) return;
 
 		if (!Properties.Json || Properties.Json->Values.Num() == 0)
diff --git a/Plugins/BlueprintMCP/Source/BlueprintMCP/Handlers/GraphNode_Dump.h b/Plugins/BlueprintMCP/Source/BlueprintMCP/Handlers/GraphNode_Dump.h
index 710df50c..eb613ff2 100644
--- a/Plugins/BlueprintMCP/Source/BlueprintMCP/Handlers/GraphNode_Dump.h
+++ b/Plugins/BlueprintMCP/Source/BlueprintMCP/Handlers/GraphNode_Dump.h
@@ -4,7 +4,7 @@
 #include "WingHandler.h"
 #include "WingServer.h"
 #include "WingFetcher.h"
-#include "GraphExport.h"
+#include "WingGraphExport.h"
 #include "GraphNode_Dump.generated.h"
 
 
diff --git a/Plugins/BlueprintMCP/Source/BlueprintMCP/Handlers/GraphNode_SetArgs.h b/Plugins/BlueprintMCP/Source/BlueprintMCP/Handlers/GraphNode_SetArgs.h
index cc5eac25..af1684cf 100644
--- a/Plugins/BlueprintMCP/Source/BlueprintMCP/Handlers/GraphNode_SetArgs.h
+++ b/Plugins/BlueprintMCP/Source/BlueprintMCP/Handlers/GraphNode_SetArgs.h
@@ -5,7 +5,7 @@
 #include "WingServer.h"
 #include "WingFetcher.h"
 #include "WingUtils.h"
-#include "FunctionArgs.h"
+#include "WingFunctionArgs.h"
 #include "GraphNode_SetArgs.generated.h"
 
 UCLASS()
diff --git a/Plugins/BlueprintMCP/Source/BlueprintMCP/Handlers/Graph_Dump.h b/Plugins/BlueprintMCP/Source/BlueprintMCP/Handlers/Graph_Dump.h
index b85941a2..80b47a65 100644
--- a/Plugins/BlueprintMCP/Source/BlueprintMCP/Handlers/Graph_Dump.h
+++ b/Plugins/BlueprintMCP/Source/BlueprintMCP/Handlers/Graph_Dump.h
@@ -5,7 +5,7 @@
 #include "WingServer.h"
 #include "WingFetcher.h"
 #include "WingUtils.h"
-#include "GraphExport.h"
+#include "WingGraphExport.h"
 #include "Engine/Blueprint.h"
 #include "EdGraph/EdGraph.h"
 #include "Materials/Material.h"
diff --git a/Plugins/BlueprintMCP/Source/BlueprintMCP/Handlers/MaterialInstance_ClearParameter.h b/Plugins/BlueprintMCP/Source/BlueprintMCP/Handlers/MaterialInstance_ClearParameter.h
index c8cfd478..124ece36 100644
--- a/Plugins/BlueprintMCP/Source/BlueprintMCP/Handlers/MaterialInstance_ClearParameter.h
+++ b/Plugins/BlueprintMCP/Source/BlueprintMCP/Handlers/MaterialInstance_ClearParameter.h
@@ -5,7 +5,7 @@
 #include "WingHandler.h"
 #include "WingFetcher.h"
 #include "WingUtils.h"
-#include "MaterialParameter.h"
+#include "WingMaterialParameter.h"
 #include "Materials/MaterialInstanceConstant.h"
 #include "MaterialTypes.h"
 #include "MaterialInstance_ClearParameter.generated.h"
diff --git a/Plugins/BlueprintMCP/Source/BlueprintMCP/Handlers/MaterialInstance_DumpParameters.h b/Plugins/BlueprintMCP/Source/BlueprintMCP/Handlers/MaterialInstance_DumpParameters.h
index 1285f6ef..5afaab29 100644
--- a/Plugins/BlueprintMCP/Source/BlueprintMCP/Handlers/MaterialInstance_DumpParameters.h
+++ b/Plugins/BlueprintMCP/Source/BlueprintMCP/Handlers/MaterialInstance_DumpParameters.h
@@ -5,7 +5,7 @@
 #include "WingHandler.h"
 #include "WingFetcher.h"
 #include "WingUtils.h"
-#include "MaterialParameter.h"
+#include "WingMaterialParameter.h"
 #include "Materials/MaterialInstanceConstant.h"
 #include "MaterialTypes.h"
 #include "MaterialInstance_DumpParameters.generated.h"
diff --git a/Plugins/BlueprintMCP/Source/BlueprintMCP/Handlers/MaterialInstance_SetParameter.h b/Plugins/BlueprintMCP/Source/BlueprintMCP/Handlers/MaterialInstance_SetParameter.h
index 525706e0..49c540e9 100644
--- a/Plugins/BlueprintMCP/Source/BlueprintMCP/Handlers/MaterialInstance_SetParameter.h
+++ b/Plugins/BlueprintMCP/Source/BlueprintMCP/Handlers/MaterialInstance_SetParameter.h
@@ -5,7 +5,7 @@
 #include "WingHandler.h"
 #include "WingFetcher.h"
 #include "WingUtils.h"
-#include "MaterialParameter.h"
+#include "WingMaterialParameter.h"
 #include "Materials/MaterialInstanceConstant.h"
 #include "MaterialTypes.h"
 #include "Misc/DefaultValueHelper.h"
diff --git a/Plugins/BlueprintMCP/Source/BlueprintMCP/Handlers/Material_DumpParameters.h b/Plugins/BlueprintMCP/Source/BlueprintMCP/Handlers/Material_DumpParameters.h
index d236c49d..9424cec2 100644
--- a/Plugins/BlueprintMCP/Source/BlueprintMCP/Handlers/Material_DumpParameters.h
+++ b/Plugins/BlueprintMCP/Source/BlueprintMCP/Handlers/Material_DumpParameters.h
@@ -5,7 +5,7 @@
 #include "WingFetcher.h"
 #include "WingServer.h"
 #include "WingUtils.h"
-#include "MaterialParameter.h"
+#include "WingMaterialParameter.h"
 #include "MaterialTypes.h"
 #include "Material_DumpParameters.generated.h"
 
diff --git a/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/BPVarEditor.cpp b/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/WingBlueprintVar.cpp
similarity index 89%
rename from Plugins/BlueprintMCP/Source/BlueprintMCP/Private/BPVarEditor.cpp
rename to Plugins/BlueprintMCP/Source/BlueprintMCP/Private/WingBlueprintVar.cpp
index c38e62ec..d76cfb19 100644
--- a/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/BPVarEditor.cpp
+++ b/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/WingBlueprintVar.cpp
@@ -1,4 +1,4 @@
-#include "BPVarEditor.h"
+#include "WingBlueprintVar.h"
 #include "WingJson.h"
 #include "WingServer.h"
 #include "WingTypes.h"
@@ -6,7 +6,7 @@
 #include "EdGraphSchema_K2.h"
 #include "Kismet2/BlueprintEditorUtils.h"
 
-FBPVarEditor::FBPVarEditor(UBlueprint* BP, const FString& VarName)
+FBlueprintVar::FBlueprintVar(UBlueprint* BP, const FString& VarName)
 {
 	FName VarFName(*VarName);
 	int32 VarIndex = FBlueprintEditorUtils::FindNewVariableIndex(BP, VarFName);
@@ -27,7 +27,7 @@ FBPVarEditor::FBPVarEditor(UBlueprint* BP, const FString& VarName)
 	}
 }
 
-void FBPVarEditor::Dump()
+void FBlueprintVar::Dump()
 {
 	LoadFlags();
 	LoadDefault();
@@ -41,7 +41,7 @@ void FBPVarEditor::Dump()
 	}
 }
 
-bool FBPVarEditor::ApplyJson(const FJsonObject* Json)
+bool FBlueprintVar::ApplyJson(const FJsonObject* Json)
 {
 	bool bHasDefault = Json->HasField(TEXT("DefaultValue"));
 	bool bHasType = Json->HasField(TEXT("VarType"));
@@ -66,7 +66,7 @@ bool FBPVarEditor::ApplyJson(const FJsonObject* Json)
 	return true;
 }
 
-void FBPVarEditor::LoadFlags()
+void FBlueprintVar::LoadFlags()
 {
 	InstanceEditable   = !(Desc->PropertyFlags & CPF_DisableEditOnInstance);
 	BlueprintReadOnly  =  (Desc->PropertyFlags & CPF_BlueprintReadOnly) != 0;
@@ -80,7 +80,7 @@ void FBPVarEditor::LoadFlags()
 		Description.Empty();
 }
 
-void FBPVarEditor::LoadDefault()
+void FBlueprintVar::LoadDefault()
 {
 	if (DefaultValueProp)
 		DefaultValue = DefaultValueProp.GetText();
@@ -88,7 +88,7 @@ void FBPVarEditor::LoadDefault()
 		DefaultValue.Empty();
 }
 
-void FBPVarEditor::SaveFlags()
+void FBlueprintVar::SaveFlags()
 {
 	// CPF flags
 	if (InstanceEditable)
@@ -124,14 +124,14 @@ void FBPVarEditor::SaveFlags()
 		Desc->RemoveMetaData(TEXT("tooltip"));
 }
 
-bool FBPVarEditor::SaveDefault()
+bool FBlueprintVar::SaveDefault()
 {
 	if (DefaultValueProp)
 		return DefaultValueProp.SetText(DefaultValue);
 	return true;
 }
 
-TArray<WingProperty> FBPVarEditor::MergedProperties()
+TArray<WingProperty> FBlueprintVar::MergedProperties()
 {
 	TArray<WingProperty> Props = WingProperty::GetAll(
 		FBPVariableDescription::StaticStruct(), Desc, CPF_Edit);
@@ -143,7 +143,7 @@ TArray<WingProperty> FBPVarEditor::MergedProperties()
 	WingProperty::Remove(Props, TEXT("DefaultValue"));
 
 	Props.Append(WingProperty::GetAll(
-		FBPVarEditor::StaticStruct(), this, (EPropertyFlags)0));
+		FBlueprintVar::StaticStruct(), this, (EPropertyFlags)0));
 
 	// Remove DefaultValue if we don't have a CDO property to back it.
 	if (!DefaultValueProp)
diff --git a/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/WingmanCommandlet.cpp b/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/WingCommandlet.cpp
similarity index 83%
rename from Plugins/BlueprintMCP/Source/BlueprintMCP/Private/WingmanCommandlet.cpp
rename to Plugins/BlueprintMCP/Source/BlueprintMCP/Private/WingCommandlet.cpp
index 0911dac4..0a2cc722 100644
--- a/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/WingmanCommandlet.cpp
+++ b/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/WingCommandlet.cpp
@@ -1,8 +1,8 @@
-#include "WingmanCommandlet.h"
+#include "WingCommandlet.h"
 #include "WingServer.h"
 #include "Containers/Ticker.h"
 
-UWingmanCommandlet::UWingmanCommandlet()
+UWingCommandlet::UWingCommandlet()
 {
 	IsClient = false;
 	IsEditor = true;
@@ -10,7 +10,7 @@ UWingmanCommandlet::UWingmanCommandlet()
 	LogToConsole = true;
 }
 
-int32 UWingmanCommandlet::Main(const FString& Params)
+int32 UWingCommandlet::Main(const FString& Params)
 {
 	// The UWingServer editor subsystem starts the server automatically.
 	// We just need to tick it, since FTickableEditorObject doesn't tick in commandlet mode.
diff --git a/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/FunctionArgs.cpp b/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/WingFunctionArgs.cpp
similarity index 99%
rename from Plugins/BlueprintMCP/Source/BlueprintMCP/Private/FunctionArgs.cpp
rename to Plugins/BlueprintMCP/Source/BlueprintMCP/Private/WingFunctionArgs.cpp
index 99681da2..34e092e0 100644
--- a/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/FunctionArgs.cpp
+++ b/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/WingFunctionArgs.cpp
@@ -1,4 +1,4 @@
-#include "FunctionArgs.h"
+#include "WingFunctionArgs.h"
 #include "K2Node_EditablePinBase.h"
 #include "K2Node_FunctionResult.h"
 #include "K2Node_Tunnel.h"
diff --git a/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/GraphExport.cpp b/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/WingGraphExport.cpp
similarity index 99%
rename from Plugins/BlueprintMCP/Source/BlueprintMCP/Private/GraphExport.cpp
rename to Plugins/BlueprintMCP/Source/BlueprintMCP/Private/WingGraphExport.cpp
index 33a486d0..db9aa4f4 100644
--- a/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/GraphExport.cpp
+++ b/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/WingGraphExport.cpp
@@ -1,4 +1,4 @@
-#include "GraphExport.h"
+#include "WingGraphExport.h"
 #include "WingTypes.h"
 #include "WingUtils.h"
 #include "Engine/Blueprint.h"
@@ -11,7 +11,7 @@
 #include "K2Node_VariableGet.h"
 #include "K2Node_CallFunction.h"
 #include "K2Node_FunctionEntry.h"
-#include "FunctionArgs.h"
+#include "WingFunctionArgs.h"
 #include "MaterialGraph/MaterialGraphNode.h"
 
 WingGraphExport::WingGraphExport(UEdGraph* InGraph)
diff --git a/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/LogCapture.h b/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/WingLogCapture.h
similarity index 100%
rename from Plugins/BlueprintMCP/Source/BlueprintMCP/Private/LogCapture.h
rename to Plugins/BlueprintMCP/Source/BlueprintMCP/Private/WingLogCapture.h
diff --git a/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/MaterialParameter.cpp b/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/WingMaterialParameter.cpp
similarity index 98%
rename from Plugins/BlueprintMCP/Source/BlueprintMCP/Private/MaterialParameter.cpp
rename to Plugins/BlueprintMCP/Source/BlueprintMCP/Private/WingMaterialParameter.cpp
index 0a8731ec..977f229d 100644
--- a/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/MaterialParameter.cpp
+++ b/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/WingMaterialParameter.cpp
@@ -1,4 +1,4 @@
-#include "MaterialParameter.h"
+#include "WingMaterialParameter.h"
 #include "WingUtils.h"
 #include "WingServer.h"
 
diff --git a/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/WingModule.cpp b/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/WingModule.cpp
new file mode 100644
index 00000000..03747c6b
--- /dev/null
+++ b/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/WingModule.cpp
@@ -0,0 +1,4 @@
+#include "WingModule.h"
+#include "Modules/ModuleManager.h"
+
+IMPLEMENT_MODULE(FWingModule, BlueprintMCP);
diff --git a/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/WingmanModule.h b/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/WingModule.h
similarity index 78%
rename from Plugins/BlueprintMCP/Source/BlueprintMCP/Private/WingmanModule.h
rename to Plugins/BlueprintMCP/Source/BlueprintMCP/Private/WingModule.h
index aecc428d..ef30e2d8 100644
--- a/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/WingmanModule.h
+++ b/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/WingModule.h
@@ -3,7 +3,7 @@
 #include "CoreMinimal.h"
 #include "Modules/ModuleInterface.h"
 
-class FWingmanModule : public IModuleInterface
+class FWingModule : public IModuleInterface
 {
 public:
 	virtual void StartupModule() override {}
diff --git a/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/WingServer.cpp b/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/WingServer.cpp
index 14b934d3..8ff2a387 100644
--- a/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/WingServer.cpp
+++ b/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/WingServer.cpp
@@ -1,7 +1,7 @@
 #include "WingServer.h"
 #include "WingHandler.h"
 #include "WingJson.h"
-#include "LogCapture.h"
+#include "WingLogCapture.h"
 #include "WingUtils.h"
 #include "UObject/StrongObjectPtr.h"
 #include "Materials/MaterialExpression.h"
diff --git a/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/WingmanModule.cpp b/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/WingmanModule.cpp
deleted file mode 100644
index be2f62fa..00000000
--- a/Plugins/BlueprintMCP/Source/BlueprintMCP/Private/WingmanModule.cpp
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "WingmanModule.h"
-#include "Modules/ModuleManager.h"
-
-IMPLEMENT_MODULE(FWingmanModule, BlueprintMCP);
diff --git a/Plugins/BlueprintMCP/Source/BlueprintMCP/Public/BPVarEditor.h b/Plugins/BlueprintMCP/Source/BlueprintMCP/Public/WingBlueprintVar.h
similarity index 91%
rename from Plugins/BlueprintMCP/Source/BlueprintMCP/Public/BPVarEditor.h
rename to Plugins/BlueprintMCP/Source/BlueprintMCP/Public/WingBlueprintVar.h
index f003ec87..d5378c38 100644
--- a/Plugins/BlueprintMCP/Source/BlueprintMCP/Public/BPVarEditor.h
+++ b/Plugins/BlueprintMCP/Source/BlueprintMCP/Public/WingBlueprintVar.h
@@ -3,22 +3,22 @@
 #include "CoreMinimal.h"
 #include "WingProperty.h"
 #include "Engine/Blueprint.h"
-#include "BPVarEditor.generated.h"
+#include "WingBlueprintVar.generated.h"
 
 // Editor-friendly view of a blueprint variable's properties.
 // Wraps an FBPVariableDescription, exposing commonly-used flags
 // and metadata as simple UPROPERTYs that the property system can
 // populate from JSON.
 USTRUCT()
-struct FBPVarEditor
+struct FBlueprintVar
 {
 	GENERATED_BODY()
 
 	FBPVariableDescription* Desc = nullptr;
 	WingProperty DefaultValueProp;
 
-	FBPVarEditor() = default;
-	FBPVarEditor(UBlueprint* BP, const FString& VarName);
+	FBlueprintVar() = default;
+	FBlueprintVar(UBlueprint* BP, const FString& VarName);
 
 	bool NotFound() const { return Desc == nullptr; }
 
diff --git a/Plugins/BlueprintMCP/Source/BlueprintMCP/Public/WingmanCommandlet.h b/Plugins/BlueprintMCP/Source/BlueprintMCP/Public/WingCommandlet.h
similarity index 77%
rename from Plugins/BlueprintMCP/Source/BlueprintMCP/Public/WingmanCommandlet.h
rename to Plugins/BlueprintMCP/Source/BlueprintMCP/Public/WingCommandlet.h
index c3ab5ff9..ade9ccd8 100644
--- a/Plugins/BlueprintMCP/Source/BlueprintMCP/Public/WingmanCommandlet.h
+++ b/Plugins/BlueprintMCP/Source/BlueprintMCP/Public/WingCommandlet.h
@@ -2,7 +2,7 @@
 
 #include "CoreMinimal.h"
 #include "Commandlets/Commandlet.h"
-#include "WingmanCommandlet.generated.h"
+#include "WingCommandlet.generated.h"
 
 /**
  * Commandlet that keeps the engine alive so the BlueprintMCP editor subsystem
@@ -11,11 +11,11 @@
  * Usage:  UnrealEditor-Cmd.exe Project.uproject -run=BlueprintMCP
  */
 UCLASS()
-class UWingmanCommandlet : public UCommandlet
+class UWingCommandlet : public UCommandlet
 {
 	GENERATED_BODY()
 
 public:
-	UWingmanCommandlet();
+	UWingCommandlet();
 	virtual int32 Main(const FString& Params) override;
 };
diff --git a/Plugins/BlueprintMCP/Source/BlueprintMCP/Public/FunctionArgs.h b/Plugins/BlueprintMCP/Source/BlueprintMCP/Public/WingFunctionArgs.h
similarity index 100%
rename from Plugins/BlueprintMCP/Source/BlueprintMCP/Public/FunctionArgs.h
rename to Plugins/BlueprintMCP/Source/BlueprintMCP/Public/WingFunctionArgs.h
diff --git a/Plugins/BlueprintMCP/Source/BlueprintMCP/Public/GraphExport.h b/Plugins/BlueprintMCP/Source/BlueprintMCP/Public/WingGraphExport.h
similarity index 100%
rename from Plugins/BlueprintMCP/Source/BlueprintMCP/Public/GraphExport.h
rename to Plugins/BlueprintMCP/Source/BlueprintMCP/Public/WingGraphExport.h
diff --git a/Plugins/BlueprintMCP/Source/BlueprintMCP/Public/MaterialParameter.h b/Plugins/BlueprintMCP/Source/BlueprintMCP/Public/WingMaterialParameter.h
similarity index 100%
rename from Plugins/BlueprintMCP/Source/BlueprintMCP/Public/MaterialParameter.h
rename to Plugins/BlueprintMCP/Source/BlueprintMCP/Public/WingMaterialParameter.h
diff --git a/Plugins/BlueprintMCP/Source/BlueprintMCP/Public/WingServer.h b/Plugins/BlueprintMCP/Source/BlueprintMCP/Public/WingServer.h
index 237173bd..e6580881 100644
--- a/Plugins/BlueprintMCP/Source/BlueprintMCP/Public/WingServer.h
+++ b/Plugins/BlueprintMCP/Source/BlueprintMCP/Public/WingServer.h
@@ -8,7 +8,7 @@
 #include "Dom/JsonObject.h"
 #include "WingUtils.h"
 #include "WingNotifier.h"
-#include "LogCapture.h"
+#include "WingLogCapture.h"
 #include "WingServer.generated.h"
 
 class FSocket;