diff --git a/OpenRA.Mods.Common/Traits/Render/WithDecoration.cs b/OpenRA.Mods.Common/Traits/Render/WithDecoration.cs
index 016700e0ad..6a496a3374 100644
--- a/OpenRA.Mods.Common/Traits/Render/WithDecoration.cs
+++ b/OpenRA.Mods.Common/Traits/Render/WithDecoration.cs
@@ -47,7 +47,7 @@ namespace OpenRA.Mods.Common.Traits.Render
 		public readonly int ZOffset = 1;
 
 		[Desc("Player stances who can view the decoration.")]
-		public readonly Stance Stances = Stance.Ally;
+		public readonly Stance ValidStances = Stance.Ally;
 
 		[Desc("Should this be visible only when selected?")]
 		public readonly bool RequiresSelection = false;
@@ -91,7 +91,7 @@ namespace OpenRA.Mods.Common.Traits.Render
 			if (self.World.RenderPlayer != null)
 			{
 				var stance = self.Owner.Stances[self.World.RenderPlayer];
-				if (!Info.Stances.HasStance(stance))
+				if (!Info.ValidStances.HasStance(stance))
 					return Enumerable.Empty<IRenderable>();
 			}
 
diff --git a/OpenRA.Mods.Common/Traits/Render/WithTextDecoration.cs b/OpenRA.Mods.Common/Traits/Render/WithTextDecoration.cs
index b4bde0cf26..c6d10790eb 100644
--- a/OpenRA.Mods.Common/Traits/Render/WithTextDecoration.cs
+++ b/OpenRA.Mods.Common/Traits/Render/WithTextDecoration.cs
@@ -40,7 +40,7 @@ namespace OpenRA.Mods.Common.Traits.Render
 		public readonly int ZOffset = 1;
 
 		[Desc("Player stances who can view the decoration.")]
-		public readonly Stance Stances = Stance.Ally;
+		public readonly Stance ValidStances = Stance.Ally;
 
 		[Desc("Should this be visible only when selected?")]
 		public readonly bool RequiresSelection = false;
@@ -86,7 +86,7 @@ namespace OpenRA.Mods.Common.Traits.Render
 			if (self.World.RenderPlayer != null)
 			{
 				var stance = self.Owner.Stances[self.World.RenderPlayer];
-				if (!Info.Stances.HasStance(stance))
+				if (!Info.ValidStances.HasStance(stance))
 					return Enumerable.Empty<IRenderable>();
 			}
 
diff --git a/OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs b/OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs
index 5678ecb606..48aebb832f 100644
--- a/OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs
+++ b/OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs
@@ -212,6 +212,16 @@ namespace OpenRA.Mods.Common.UtilityCommands
 					}
 				}
 
+				if (engineVersion < 20160703)
+				{
+					if (node.Key.StartsWith("WithDecoration") || node.Key.StartsWith("WithRankDecoration") || node.Key.StartsWith("WithDecorationCarryable"))
+					{
+						var stancesNode = node.Value.Nodes.FirstOrDefault(n => n.Key == "Stances");
+						if (stancesNode != null)
+							stancesNode.Key = "ValidStances";
+					}
+				}
+
 				UpgradeActorRules(modData, engineVersion, ref node.Value.Nodes, node, depth + 1);
 			}