diff --git a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
index 89b91993f0..09f9822f60 100644
--- a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
+++ b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
@@ -355,7 +355,7 @@
     <Compile Include="Traits\Modifiers\DisabledOverlay.cs" />
     <Compile Include="Traits\Modifiers\FrozenUnderFog.cs" />
     <Compile Include="Traits\Modifiers\HiddenUnderFog.cs" />
-    <Compile Include="Traits\Modifiers\UpgradeOverlay.cs" />
+    <Compile Include="Traits\Modifiers\WithColoredOverlay.cs" />
     <Compile Include="Traits\MustBeDestroyed.cs" />
     <Compile Include="Traits\Parachutable.cs" />
     <Compile Include="Traits\ParaDrop.cs" />
diff --git a/OpenRA.Mods.Common/Traits/Modifiers/UpgradeOverlay.cs b/OpenRA.Mods.Common/Traits/Modifiers/WithColoredOverlay.cs
similarity index 79%
rename from OpenRA.Mods.Common/Traits/Modifiers/UpgradeOverlay.cs
rename to OpenRA.Mods.Common/Traits/Modifiers/WithColoredOverlay.cs
index 6a33d38205..3d0dd09b09 100644
--- a/OpenRA.Mods.Common/Traits/Modifiers/UpgradeOverlay.cs
+++ b/OpenRA.Mods.Common/Traits/Modifiers/WithColoredOverlay.cs
@@ -15,18 +15,18 @@ using OpenRA.Traits;
 
 namespace OpenRA.Mods.Common.Traits
 {
-	[Desc("Display a colored overlay when a timed upgrade is active.")]
-	public class UpgradeOverlayInfo : ConditionalTraitInfo
+	[Desc("Display a colored overlay when a timed condition is active.")]
+	public class WithColoredOverlayInfo : ConditionalTraitInfo
 	{
 		[Desc("Palette to use when rendering the overlay")]
 		[PaletteReference] public readonly string Palette = "invuln";
 
-		public override object Create(ActorInitializer init) { return new UpgradeOverlay(this); }
+		public override object Create(ActorInitializer init) { return new WithColoredOverlay(this); }
 	}
 
-	public class UpgradeOverlay : ConditionalTrait<UpgradeOverlayInfo>, IRenderModifier
+	public class WithColoredOverlay : ConditionalTrait<WithColoredOverlayInfo>, IRenderModifier
 	{
-		public UpgradeOverlay(UpgradeOverlayInfo info)
+		public WithColoredOverlay(WithColoredOverlayInfo info)
 			: base(info) { }
 
 		public IEnumerable<IRenderable> ModifyRender(Actor self, WorldRenderer wr, IEnumerable<IRenderable> r)
diff --git a/OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs b/OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs
index efceb98227..f706c08cbb 100644
--- a/OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs
+++ b/OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs
@@ -776,6 +776,11 @@ namespace OpenRA.Mods.Common.UtilityCommands
 					}
 				}
 
+				// Rename UpgradeOverlay to WithColoredOverlay
+				if (engineVersion < 20170201)
+					if (node.Key.StartsWith("UpgradeOverlay", StringComparison.Ordinal))
+						RenameNodeKey(node, "WithColoredOverlay" + node.Key.Substring(14));
+
 				UpgradeActorRules(modData, engineVersion, ref node.Value.Nodes, node, depth + 1);
 			}
 
diff --git a/mods/ra/rules/defaults.yaml b/mods/ra/rules/defaults.yaml
index 849772126a..4797957197 100644
--- a/mods/ra/rules/defaults.yaml
+++ b/mods/ra/rules/defaults.yaml
@@ -116,7 +116,7 @@
 		ZOffset: 256
 
 ^IronCurtainable:
-	UpgradeOverlay@IRONCURTAIN:
+	WithColoredOverlay@IRONCURTAIN:
 		RequiresCondition: invulnerability
 	DamageMultiplier@IRONCURTAIN:
 		RequiresCondition: invulnerability
diff --git a/mods/ts/rules/defaults.yaml b/mods/ts/rules/defaults.yaml
index 4fa94512f7..d82d3e0530 100644
--- a/mods/ts/rules/defaults.yaml
+++ b/mods/ts/rules/defaults.yaml
@@ -79,7 +79,7 @@
 		Conditions: crate-firepower, crate-damage, crate-speed
 
 ^EmpDisable:
-	UpgradeOverlay@EMPDISABLE:
+	WithColoredOverlay@EMPDISABLE:
 		RequiresCondition: empdisable
 		Palette: disabled
 	DisableOnCondition@EMPDISABLE: