diff --git a/OpenRA.Mods.RA/Move/PathFinder.cs b/OpenRA.Mods.RA/Move/PathFinder.cs
index c09e6d8126..5b1abc9f26 100755
--- a/OpenRA.Mods.RA/Move/PathFinder.cs
+++ b/OpenRA.Mods.RA/Move/PathFinder.cs
@@ -134,7 +134,7 @@ namespace OpenRA.Mods.RA.Move
 						}
 					}
 
-					var dbg = world.WorldActor.TraitOrDefault<DebugOverlay>();
+					var dbg = world.WorldActor.TraitOrDefault<PathfinderDebugOverlay>();
 					if (dbg != null)
 					{
 						dbg.AddLayer(search.considered.Select(p => new Pair<CPos, int>(p, search.cellInfo[p.X, p.Y].MinCost)), search.maxCost, search.owner);
@@ -199,7 +199,7 @@ namespace OpenRA.Mods.RA.Move
 						}
 					}
 
-					var dbg = world.WorldActor.TraitOrDefault<DebugOverlay>();
+					var dbg = world.WorldActor.TraitOrDefault<PathfinderDebugOverlay>();
 					if (dbg != null)
 					{
 						dbg.AddLayer(fromSrc.considered.Select(p => new Pair<CPos, int>(p, fromSrc.cellInfo[p.X, p.Y].MinCost)), fromSrc.maxCost, fromSrc.owner);
diff --git a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
index 49598d245e..beb37e3946 100644
--- a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
+++ b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
@@ -414,7 +414,6 @@
     <Compile Include="Widgets\SupportPowerBinWidget.cs" />
     <Compile Include="Widgets\WorldCommandWidget.cs" />
     <Compile Include="World\ChooseBuildTabOnSelect.cs" />
-    <Compile Include="World\DebugOverlay.cs" />
     <Compile Include="World\ResourceClaim.cs" />
     <Compile Include="World\ResourceClaimLayer.cs" />
     <Compile Include="World\PlayMusicOnMapLoad.cs" />
@@ -471,6 +470,7 @@
     <Compile Include="AI\States\AirStates.cs" />
     <Compile Include="Widgets\Logic\InstallLogic.cs" />
     <Compile Include="CombatDebugOverlay.cs" />
+    <Compile Include="World\PathfinderDebugOverlay.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\OpenRA.FileFormats\OpenRA.FileFormats.csproj">
diff --git a/OpenRA.Mods.RA/Widgets/Logic/CheatsLogic.cs b/OpenRA.Mods.RA/Widgets/Logic/CheatsLogic.cs
index 85ebe8fa68..890f3dc677 100644
--- a/OpenRA.Mods.RA/Widgets/Logic/CheatsLogic.cs
+++ b/OpenRA.Mods.RA/Widgets/Logic/CheatsLogic.cs
@@ -107,7 +107,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic
 				noexplorationButton.OnClick = () =>
 				world.IssueOrder(new Order("DevResetExploration", world.LocalPlayer.PlayerActor, false));
 
-			var dbgOverlay = world.WorldActor.TraitOrDefault<DebugOverlay>();
+			var dbgOverlay = world.WorldActor.TraitOrDefault<PathfinderDebugOverlay>();
 			var showAstarCostCheckbox = widget.GetOrNull<CheckboxWidget>("SHOW_ASTAR");
 			if (showAstarCostCheckbox != null)
 			{
diff --git a/OpenRA.Mods.RA/World/DebugOverlay.cs b/OpenRA.Mods.RA/World/PathfinderDebugOverlay.cs
similarity index 93%
rename from OpenRA.Mods.RA/World/DebugOverlay.cs
rename to OpenRA.Mods.RA/World/PathfinderDebugOverlay.cs
index 29d2692edc..b5a7249f77 100644
--- a/OpenRA.Mods.RA/World/DebugOverlay.cs
+++ b/OpenRA.Mods.RA/World/PathfinderDebugOverlay.cs
@@ -9,11 +9,8 @@ using OpenRA.Traits;
 
 namespace OpenRA.Mods.RA
 {
-	class DebugOverlayInfo : Traits.TraitInfo<DebugOverlay>
-	{
-	}
-
-	class DebugOverlay : IRenderOverlay, IWorldLoaded
+	class PathfinderDebugOverlayInfo : Traits.TraitInfo<PathfinderDebugOverlay> { }
+	class PathfinderDebugOverlay : IRenderOverlay, IWorldLoaded
 	{
 		Dictionary<Player, int[,]> layers;
 		int refreshTick;
diff --git a/mods/cnc/rules/system.yaml b/mods/cnc/rules/system.yaml
index 748199d14b..32013bfabb 100644
--- a/mods/cnc/rules/system.yaml
+++ b/mods/cnc/rules/system.yaml
@@ -311,7 +311,7 @@ World:
 		Type:Crater
 		Types:cr1,cr2,cr3,cr4,cr5,cr6
 		Depths:5,5,5,5,5,5
-	DebugOverlay:
+	PathfinderDebugOverlay:
 	SpawnMapActors:
 	MPStartLocations:
 	CreateMPPlayers:
diff --git a/mods/d2k/rules/system.yaml b/mods/d2k/rules/system.yaml
index 40b7f186d5..0e0e9a991d 100644
--- a/mods/d2k/rules/system.yaml
+++ b/mods/d2k/rules/system.yaml
@@ -441,7 +441,7 @@ World:
 		Name: Ordos
 		Race: ordos
 	DomainIndex:
-	DebugOverlay:
+	PathfinderDebugOverlay:
 	ResourceLayer:
 	ResourceClaimLayer:
 	ResourceType@Spice:
diff --git a/mods/ra/rules/system.yaml b/mods/ra/rules/system.yaml
index bb49a56c1b..286ea3d788 100644
--- a/mods/ra/rules/system.yaml
+++ b/mods/ra/rules/system.yaml
@@ -645,7 +645,7 @@ World:
 		Type:Crater
 		Types:cr1,cr2,cr3,cr4,cr5,cr6
 		Depths:5,5,5,5,5,5
-	DebugOverlay:
+	PathfinderDebugOverlay:
 	SpawnMapActors:
 	CreateMPPlayers:
 	MPStartUnits@mcvonly:
diff --git a/mods/ts/rules/system.yaml b/mods/ts/rules/system.yaml
index d0567f83e1..0625b3ce46 100644
--- a/mods/ts/rules/system.yaml
+++ b/mods/ts/rules/system.yaml
@@ -116,7 +116,7 @@ World:
 		Race: nod
 	ResourceLayer:
 	ResourceClaimLayer:
-	DebugOverlay:
+	PathfinderDebugOverlay:
 	SpawnMapActors:
 	CreateMPPlayers:
 	MPStartUnits: