diff --git a/OpenRA.Game/Traits/Player/DeveloperMode.cs b/OpenRA.Game/Traits/Player/DeveloperMode.cs
index af34cbc68d..b700326a38 100644
--- a/OpenRA.Game/Traits/Player/DeveloperMode.cs
+++ b/OpenRA.Game/Traits/Player/DeveloperMode.cs
@@ -19,7 +19,7 @@ namespace OpenRA.Traits
 		public bool PathDebug = false;
 		public bool UnlimitedPower;
 		public bool BuildAnywhere;
-		public bool ShowMuzzles;
+		public bool ShowCombatGeometry;
 		public bool ShowDebugGeometry;
 
 		public object Create (ActorInitializer init) { return new DeveloperMode(this); }
@@ -37,7 +37,7 @@ namespace OpenRA.Traits
 		[Sync] public bool BuildAnywhere;
 
 		// Client size only
-		public bool ShowMuzzles;
+		public bool ShowCombatGeometry;
 		public bool ShowDebugGeometry;
 
 		public DeveloperMode(DeveloperModeInfo info)
@@ -49,7 +49,7 @@ namespace OpenRA.Traits
 			PathDebug = info.PathDebug;
 			UnlimitedPower = info.UnlimitedPower;
 			BuildAnywhere = info.BuildAnywhere;
-			ShowMuzzles = info.ShowMuzzles;
+			ShowCombatGeometry = info.ShowCombatGeometry;
 			ShowDebugGeometry = info.ShowDebugGeometry;
 		}
 
diff --git a/OpenRA.Mods.RA/CombatDebugOverlay.cs b/OpenRA.Mods.RA/CombatDebugOverlay.cs
old mode 100755
new mode 100644
index 29d50c0580..103a032cf3
--- a/OpenRA.Mods.RA/CombatDebugOverlay.cs
+++ b/OpenRA.Mods.RA/CombatDebugOverlay.cs
@@ -38,7 +38,7 @@ namespace OpenRA.Mods.RA
 
 		public void RenderAfterWorld(WorldRenderer wr, Actor self)
 		{
-			if (devMode == null || !devMode.ShowMuzzles)
+			if (devMode == null || !devMode.ShowCombatGeometry)
 				return;
 
 			if (health.Value != null)
diff --git a/OpenRA.Mods.RA/Widgets/Logic/CheatsLogic.cs b/OpenRA.Mods.RA/Widgets/Logic/CheatsLogic.cs
index 87675980ea..7fd5e9e7ae 100644
--- a/OpenRA.Mods.RA/Widgets/Logic/CheatsLogic.cs
+++ b/OpenRA.Mods.RA/Widgets/Logic/CheatsLogic.cs
@@ -57,11 +57,11 @@ namespace OpenRA.Mods.RA.Widgets.Logic
 				fastChargeCheckbox.OnClick = () => Order(world, "DevFastCharge");
 			}
 
-			var showMuzzlesCheckbox = widget.GetOrNull<CheckboxWidget>("SHOW_MUZZLES");
-			if (showMuzzlesCheckbox != null)
+			var showCombatCheckbox = widget.GetOrNull<CheckboxWidget>("SHOW_COMBATOVERLAY");
+			if (showCombatCheckbox != null)
 			{
-				showMuzzlesCheckbox.IsChecked = () => devTrait.ShowMuzzles;
-				showMuzzlesCheckbox.OnClick = () => devTrait.ShowMuzzles ^= true;
+				showCombatCheckbox.IsChecked = () => devTrait.ShowCombatGeometry;
+				showCombatCheckbox.OnClick = () => devTrait.ShowCombatGeometry ^= true;
 			}
 
 			var showGeometryCheckbox = widget.GetOrNull<CheckboxWidget>("SHOW_GEOMETRY");
diff --git a/mods/cnc/chrome/cheats.yaml b/mods/cnc/chrome/cheats.yaml
index 40001cae4d..7be077c94e 100644
--- a/mods/cnc/chrome/cheats.yaml
+++ b/mods/cnc/chrome/cheats.yaml
@@ -101,7 +101,7 @@ Container@CHEATS_PANEL:
 					Width:200
 					Font:Regular
 					Text:Show A* Cost
-				Checkbox@SHOW_MUZZLES:
+				Checkbox@SHOW_COMBATOVERLAY:
 					X:290
 					Y:235
 					Height:20
diff --git a/mods/ra/chrome/cheats.yaml b/mods/ra/chrome/cheats.yaml
index f3a600fc9f..fcb9c6bc1d 100644
--- a/mods/ra/chrome/cheats.yaml
+++ b/mods/ra/chrome/cheats.yaml
@@ -81,7 +81,7 @@ Background@CHEATS_PANEL:
 			Width:PARENT_RIGHT - 30
 			Height:20
 			Text:Show A* Cost
-		Checkbox@SHOW_MUZZLES:
+		Checkbox@SHOW_COMBATOVERLAY:
 			X:30
 			Y:350
 			Height:20