diff --git a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
index cebf038225..3dfe883214 100644
--- a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
+++ b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
@@ -491,7 +491,7 @@
     <Compile Include="Traits\Turreted.cs" />
     <Compile Include="Traits\ProducibleWithLevel.cs" />
     <Compile Include="Traits\Upgrades\GrantConditionOnDeploy.cs" />
-    <Compile Include="Traits\Upgrades\DisableOnUpgrade.cs" />
+    <Compile Include="Traits\Upgrades\DisableOnCondition.cs" />
     <Compile Include="Traits\Upgrades\UpgradableTrait.cs" />
     <Compile Include="Traits\Upgrades\ProximityExternalCondition.cs" />
     <Compile Include="Traits\Upgrades\GrantConditionOnDamageState.cs" />
diff --git a/OpenRA.Mods.Common/Traits/Upgrades/DisableOnUpgrade.cs b/OpenRA.Mods.Common/Traits/Upgrades/DisableOnCondition.cs
similarity index 75%
rename from OpenRA.Mods.Common/Traits/Upgrades/DisableOnUpgrade.cs
rename to OpenRA.Mods.Common/Traits/Upgrades/DisableOnCondition.cs
index b15e2debd6..225fd5d461 100644
--- a/OpenRA.Mods.Common/Traits/Upgrades/DisableOnUpgrade.cs
+++ b/OpenRA.Mods.Common/Traits/Upgrades/DisableOnCondition.cs
@@ -14,14 +14,14 @@ using OpenRA.Traits;
 namespace OpenRA.Mods.Common.Traits
 {
 	[Desc("Disable the actor when this trait is enabled by an upgrade.")]
-	public class DisableOnUpgradeInfo : UpgradableTraitInfo
+	public class DisableOnConditionInfo : UpgradableTraitInfo
 	{
-		public override object Create(ActorInitializer init) { return new DisableOnUpgrade(this); }
+		public override object Create(ActorInitializer init) { return new DisableOnCondition(this); }
 	}
 
-	public class DisableOnUpgrade : UpgradableTrait<DisableOnUpgradeInfo>, IDisable
+	public class DisableOnCondition : UpgradableTrait<DisableOnConditionInfo>, IDisable
 	{
-		public DisableOnUpgrade(DisableOnUpgradeInfo info)
+		public DisableOnCondition(DisableOnConditionInfo info)
 			: base(info) { }
 
 		public bool Disabled { get { return !IsTraitDisabled; } }
diff --git a/OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs b/OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs
index f07be9154c..5d3b98b58e 100644
--- a/OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs
+++ b/OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs
@@ -690,6 +690,9 @@ namespace OpenRA.Mods.Common.UtilityCommands
 							}
 						}
 					}
+
+					if (node.Key.StartsWith("DisableOnUpgrade", StringComparison.Ordinal))
+						RenameNodeKey(node, "DisableOnCondition");
 				}
 
 				UpgradeActorRules(modData, engineVersion, ref node.Value.Nodes, node, depth + 1);
diff --git a/mods/ts/rules/defaults.yaml b/mods/ts/rules/defaults.yaml
index 5b84a2cbf4..435e15b237 100644
--- a/mods/ts/rules/defaults.yaml
+++ b/mods/ts/rules/defaults.yaml
@@ -71,7 +71,7 @@
 	UpgradeOverlay@EMPDISABLE:
 		RequiresCondition: empdisable
 		Palette: disabled
-	DisableOnUpgrade@EMPDISABLE:
+	DisableOnCondition@EMPDISABLE:
 		RequiresCondition: empdisable
 	TimedConditionBar@EMPDISABLE:
 		Condition: empdisable