diff --git a/OpenRA.Mods.RA/DebugMuzzlePositions.cs b/OpenRA.Mods.RA/CombatDebugOverlay.cs
similarity index 88%
rename from OpenRA.Mods.RA/DebugMuzzlePositions.cs
rename to OpenRA.Mods.RA/CombatDebugOverlay.cs
index 931561a00b..f0def58dbb 100755
--- a/OpenRA.Mods.RA/DebugMuzzlePositions.cs
+++ b/OpenRA.Mods.RA/CombatDebugOverlay.cs
@@ -20,17 +20,17 @@ using OpenRA.Traits;
 
 namespace OpenRA.Mods.RA
 {
-	public class DebugMuzzlePositionsInfo : ITraitInfo
+	public class CombatDebugOverlayInfo : ITraitInfo
 	{
-		public object Create(ActorInitializer init) { return new DebugFiringOffsets(init.self); }
+		public object Create(ActorInitializer init) { return new CombatDebugOverlay(init.self); }
 	}
 
-	public class DebugFiringOffsets : IPostRender
+	public class CombatDebugOverlay : IPostRender
 	{
 		Lazy<IEnumerable<Armament>> armaments;
 		DeveloperMode devMode;
 
-		public DebugFiringOffsets(Actor self)
+		public CombatDebugOverlay(Actor self)
 		{
 			armaments = Lazy.New(() => self.TraitsImplementing<Armament>());
 
diff --git a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
index 14aa9d463b..49598d245e 100644
--- a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
+++ b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
@@ -429,7 +429,6 @@
     <Compile Include="Widgets\ColorPreviewManagerWidget.cs" />
     <Compile Include="Infiltrates.cs" />
     <Compile Include="Armament.cs" />
-    <Compile Include="DebugMuzzlePositions.cs" />
     <Compile Include="Buildings\BaseProvider.cs" />
     <Compile Include="Widgets\Logic\ObserverShroudSelectorLogic.cs" />
     <Compile Include="RepairsBridges.cs" />
@@ -471,6 +470,7 @@
     <Compile Include="AI\States\ProtectionStates.cs" />
     <Compile Include="AI\States\AirStates.cs" />
     <Compile Include="Widgets\Logic\InstallLogic.cs" />
+    <Compile Include="CombatDebugOverlay.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\OpenRA.FileFormats\OpenRA.FileFormats.csproj">
diff --git a/mods/cnc/rules/defaults.yaml b/mods/cnc/rules/defaults.yaml
index 38686db5c4..f253dc3b83 100644
--- a/mods/cnc/rules/defaults.yaml
+++ b/mods/cnc/rules/defaults.yaml
@@ -29,7 +29,7 @@
 	ActorLostNotification:
 	AttackMove:
 	WithSmoke:
-	DebugMuzzlePositions:
+	CombatDebugOverlay:
 	Guard:
 	Guardable:
 	BodyOrientation:
@@ -75,7 +75,7 @@
 	Explodes:
 		Weapon: UnitExplodeSmall
 		EmptyWeapon: UnitExplodeSmall
-	DebugMuzzlePositions:
+	CombatDebugOverlay:
 	Guard:
 	Guardable:
 	BodyOrientation:
@@ -110,7 +110,7 @@
 	Explodes:
 		Weapon: HeliExplode
 		EmptyWeapon: HeliExplode
-	DebugMuzzlePositions:
+	CombatDebugOverlay:
 	BodyOrientation:
 	UpdatesPlayerStatistics:
 
@@ -159,7 +159,7 @@
 		Probability: 2
 	CrushableInfantry:
 		WarnProbability: 60
-	DebugMuzzlePositions:
+	CombatDebugOverlay:
 	Guard:
 	Guardable:
 	BodyOrientation:
@@ -261,7 +261,7 @@
 	GivesExperience:
 	DrawLineToTarget:
 	ActorLostNotification:
-	DebugMuzzlePositions:
+	CombatDebugOverlay:
 	BodyOrientation:
 
 ^Ship:
@@ -281,7 +281,7 @@
 	DrawLineToTarget:
 	ActorLostNotification:
 	AttackMove:
-	DebugMuzzlePositions:
+	CombatDebugOverlay:
 	Guard:
 	Guardable:
 	BodyOrientation:
@@ -329,7 +329,7 @@
 	ShakeOnDeath:
 	Sellable:
 	LegacyCapturable:
-	DebugMuzzlePositions:
+	CombatDebugOverlay:
 	Guardable:
 		Range: 3
 	BodyOrientation:
diff --git a/mods/d2k/rules/defaults.yaml b/mods/d2k/rules/defaults.yaml
index d59a8f5b35..492fd4f45e 100644
--- a/mods/d2k/rules/defaults.yaml
+++ b/mods/d2k/rules/defaults.yaml
@@ -29,7 +29,7 @@
 	GivesBounty:
 	Repairable:
 		RepairBuildings: repaira,repairo,repairh
-	DebugMuzzlePositions:
+	CombatDebugOverlay:
 	Guard:
 	Guardable:
 	RenderUnit:
@@ -67,7 +67,7 @@
 	GivesBounty:
 	Repairable:
 		RepairBuildings: repaira,repairo,repairh
-	DebugMuzzlePositions:
+	CombatDebugOverlay:
 	Guard:
 	Guardable:
 	RenderUnit:
@@ -162,7 +162,7 @@
 	RepairableNear:
 		Buildings: barra, barro
 		CloseEnough: 1
-	DebugMuzzlePositions:
+	CombatDebugOverlay:
 	Guard:
 	Guardable:
 	BodyOrientation:
@@ -185,7 +185,7 @@
 	ProximityCaptor:
 		Types:Plane
 	GivesBounty:
-	DebugMuzzlePositions:
+	CombatDebugOverlay:
 	BodyOrientation:
 	UpdatesPlayerStatistics:
 
@@ -231,7 +231,7 @@
 		Types:Building
 	Sellable:
 	GivesBounty:
-	DebugMuzzlePositions:
+	CombatDebugOverlay:
 	Guardable:
 		Range: 3
 	BodyOrientation:
diff --git a/mods/ra/rules/defaults.yaml b/mods/ra/rules/defaults.yaml
index c8eb7e9935..76f90d1f70 100644
--- a/mods/ra/rules/defaults.yaml
+++ b/mods/ra/rules/defaults.yaml
@@ -33,7 +33,7 @@
 		String:Vehicle
 	WithSmoke:
 	UpdatesPlayerStatistics:
-	DebugMuzzlePositions:
+	CombatDebugOverlay:
 	Guard:
 	Guardable:
 	BodyOrientation:
@@ -78,7 +78,7 @@
 		String:Vehicle
 	WithSmoke:
 	UpdatesPlayerStatistics:
-	DebugMuzzlePositions:
+	CombatDebugOverlay:
 	Guard:
 	Guardable:
 	BodyOrientation:
@@ -132,7 +132,7 @@
 	CrushableInfantry:
 		CrushSound: squishy2.aud
 	UpdatesPlayerStatistics:
-	DebugMuzzlePositions:
+	CombatDebugOverlay:
 	Guard:
 	Guardable:
 	BodyOrientation:
@@ -170,7 +170,7 @@
 		String:Ship
 	WithSmoke:
 	UpdatesPlayerStatistics:
-	DebugMuzzlePositions:
+	CombatDebugOverlay:
 	Guard:
 	Guardable:
 	BodyOrientation:
@@ -201,7 +201,7 @@
 	GpsDot:
 		String:Plane
 	UpdatesPlayerStatistics:
-	DebugMuzzlePositions:
+	CombatDebugOverlay:
 	BodyOrientation:
 
 ^Helicopter:
@@ -245,7 +245,7 @@
 	AcceptsSupplies:
 	GivesBounty:
 	UpdatesPlayerStatistics:
-	DebugMuzzlePositions:
+	CombatDebugOverlay:
 	Guardable:
 		Range: 3
 	BodyOrientation:
diff --git a/mods/ts/rules/defaults.yaml b/mods/ts/rules/defaults.yaml
index 1bdb1a7818..d4050f8c90 100644
--- a/mods/ts/rules/defaults.yaml
+++ b/mods/ts/rules/defaults.yaml
@@ -33,7 +33,7 @@
 	AcceptsSupplies:
 	GivesBounty:
 	UpdatesPlayerStatistics:
-	DebugMuzzlePositions:
+	CombatDebugOverlay:
 	Guardable:
 		Range: 3
 	BodyOrientation:
@@ -77,7 +77,7 @@
 	CrushableInfantry:
 		CrushSound: squish6.aud
 	UpdatesPlayerStatistics:
-	DebugMuzzlePositions:
+	CombatDebugOverlay:
 	Guard:
 	Guardable:
 	BodyOrientation:
@@ -142,7 +142,7 @@
 	GivesBounty:
 #	WithSmoke:
 	UpdatesPlayerStatistics:
-	DebugMuzzlePositions:
+	CombatDebugOverlay:
 	Guard:
 	Guardable:
 	BodyOrientation:
@@ -197,5 +197,5 @@
 	GivesExperience:
 	DrawLineToTarget:
 	ActorLostNotification:
-	DebugMuzzlePositions:
+	CombatDebugOverlay:
 	BodyOrientation:
\ No newline at end of file