diff --git a/OpenRA.Mods.Cnc/Traits/Disguise.cs b/OpenRA.Mods.Cnc/Traits/Disguise.cs
index 76686f7f10..57e3c8dc18 100644
--- a/OpenRA.Mods.Cnc/Traits/Disguise.cs
+++ b/OpenRA.Mods.Cnc/Traits/Disguise.cs
@@ -20,19 +20,19 @@ using OpenRA.Traits;
 
 namespace OpenRA.Mods.Cnc.Traits
 {
-	[Desc("Overrides the default ToolTip when this actor is disguised (aids in deceiving enemy players).")]
-	class DisguiseToolTipInfo : TooltipInfo, Requires<DisguiseInfo>
+	[Desc("Overrides the default Tooltip when this actor is disguised (aids in deceiving enemy players).")]
+	class DisguiseTooltipInfo : TooltipInfo, Requires<DisguiseInfo>
 	{
-		public override object Create(ActorInitializer init) { return new DisguiseToolTip(init.Self, this); }
+		public override object Create(ActorInitializer init) { return new DisguiseTooltip(init.Self, this); }
 	}
 
-	class DisguiseToolTip : ITooltip
+	class DisguiseTooltip : ITooltip
 	{
 		readonly Actor self;
 		readonly Disguise disguise;
 		TooltipInfo info;
 
-		public DisguiseToolTip(Actor self, TooltipInfo info)
+		public DisguiseTooltip(Actor self, TooltipInfo info)
 		{
 			this.self = self;
 			this.info = info;
diff --git a/OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs b/OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs
index 450c009eae..3290542159 100644
--- a/OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs
+++ b/OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs
@@ -568,6 +568,11 @@ namespace OpenRA.Mods.Common.UtilityCommands
 					}
 				}
 
+				// Renamed DisguiseToolTip to DisguiseTooltip in Disguise.
+				if (engineVersion < 20170303)
+					if (node.Key.StartsWith("DisguiseToolTip", StringComparison.Ordinal))
+						RenameNodeKey(node, "DisguiseTooltip");
+
 				UpgradeActorRules(modData, engineVersion, ref node.Value.Nodes, node, depth + 1);
 			}
 
diff --git a/mods/ra/rules/campaign-tooltips.yaml b/mods/ra/rules/campaign-tooltips.yaml
index 6a68f06ce6..e6bfad6800 100644
--- a/mods/ra/rules/campaign-tooltips.yaml
+++ b/mods/ra/rules/campaign-tooltips.yaml
@@ -76,5 +76,5 @@ FLARE:
 		ShowOwnerRow: false
 
 SPY:
-	DisguiseToolTip:
+	DisguiseTooltip:
 		ShowOwnerRow: false
diff --git a/mods/ra/rules/infantry.yaml b/mods/ra/rules/infantry.yaml
index af027eeeb8..27353aa729 100644
--- a/mods/ra/rules/infantry.yaml
+++ b/mods/ra/rules/infantry.yaml
@@ -228,7 +228,7 @@ SPY:
 	Valued:
 		Cost: 500
 	-Tooltip:
-	DisguiseToolTip:
+	DisguiseTooltip:
 		Name: Spy
 		GenericName: Soldier
 	-Guard:
@@ -278,7 +278,7 @@ SPY.England:
 		Cost: 250
 	GivesExperience:
 		Experience: 500
-	DisguiseToolTip:
+	DisguiseTooltip:
 		Name: British Spy
 	RenderSprites:
 		Image: spy
diff --git a/mods/ts/rules/civilian-infantry.yaml b/mods/ts/rules/civilian-infantry.yaml
index 18dba81cc4..3baebb6e32 100644
--- a/mods/ts/rules/civilian-infantry.yaml
+++ b/mods/ts/rules/civilian-infantry.yaml
@@ -55,7 +55,7 @@ CHAMSPY:
 	Inherits: ^Soldier
 	Valued:
 		Cost: 700
-	DisguiseToolTip:
+	DisguiseTooltip:
 		Name: Chameleon Spy
 	Voiced:
 		VoiceSet: Spy