diff --git a/OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs b/OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs
index e91feb2aba..8799533dc9 100644
--- a/OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs
+++ b/OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs
@@ -1775,6 +1775,11 @@ namespace OpenRA.Mods.Common.UtilityCommands
 						node.Key = "FactionImages";
 					if (depth == 2 && node.Key == "-RaceImages")
 						node.Key = "-FactionImages";
+
+					// Rename *CrateAction.ValidRaces
+					if (depth == 2 && node.Key == "ValidRaces"
+					    && (parentKey == "DuplicateUnitCrateAction" || parentKey == "GiveUnitCrateAction"))
+						node.Key = "ValidFactions";
 				}
 
 				UpgradeActorRules(engineVersion, ref node.Value.Nodes, node, depth + 1);
diff --git a/mods/d2k/rules/misc.yaml b/mods/d2k/rules/misc.yaml
index edd2d39bcf..3940ddafec 100644
--- a/mods/d2k/rules/misc.yaml
+++ b/mods/d2k/rules/misc.yaml
@@ -35,7 +35,7 @@ crate:
 	GiveUnitCrateAction@Raider:
 		SelectionShares: 15
 		Units: raider
-		ValidRaces: ordos
+		ValidFactions: ordos
 		Prerequisites: techlevel.low, Light
 	GiveUnitCrateAction@Quad:
 		SelectionShares: 40
@@ -44,17 +44,17 @@ crate:
 	GiveUnitCrateAction@CombatA:
 		SelectionShares: 10
 		Units: combata
-		ValidRaces: atreides
+		ValidFactions: atreides
 		Prerequisites: techlevel.low, Heavy
 	GiveUnitCrateAction@CombatH:
 		SelectionShares: 10
 		Units: combath
-		ValidRaces: harkonnen
+		ValidFactions: harkonnen
 		Prerequisites: techlevel.low, Heavy
 	GiveUnitCrateAction@CombatO:
 		SelectionShares: 10
 		Units: combato
-		ValidRaces: ordos
+		ValidFactions: ordos
 		Prerequisites: techlevel.low, Heavy
 	GiveUnitCrateAction@SiegeTank:
 		SelectionShares: 10
@@ -67,37 +67,37 @@ crate:
 	GiveUnitCrateAction@StealthRaider:
 		SelectionShares: 7
 		Units: stealthraider
-		ValidRaces: ordos
+		ValidFactions: ordos
 		Prerequisites: techlevel.medium, Hitech
 	GiveUnitCrateAction@Fremen:
 		SelectionShares: 5
 		Units: fremen,fremen
-		ValidRaces: atreides
+		ValidFactions: atreides
 		Prerequisites: techlevel.high, Palace
 	GiveUnitCrateAction@Sardaukar:
 		SelectionShares: 8
 		Units: sardaukar,sardaukar
-		ValidRaces: harkonnen
+		ValidFactions: harkonnen
 		Prerequisites: techlevel.high, Palace
 	GiveUnitCrateAction@Saboteur:
 		SelectionShares: 3
 		Units: saboteur,saboteur
-		ValidRaces: ordos
+		ValidFactions: ordos
 		Prerequisites: techlevel.high, Palace
 	GiveUnitCrateAction@SonicTank:
 		SelectionShares: 5
 		Units: sonictank
-		ValidRaces: atreides
+		ValidFactions: atreides
 		Prerequisites: techlevel.high, Research
 	GiveUnitCrateAction@Devast:
 		SelectionShares: 2
 		Units: devast
-		ValidRaces: harkonnen
+		ValidFactions: harkonnen
 		Prerequisites: techlevel.high, Research
 	GiveUnitCrateAction@DeviatorTank:
 		SelectionShares: 5
 		Units: deviatortank
-		ValidRaces: ordos
+		ValidFactions: ordos
 		Prerequisites: techlevel.high, Research
 	GiveMcvCrateAction:
 		SelectionShares: 0
diff --git a/mods/ra/rules/misc.yaml b/mods/ra/rules/misc.yaml
index e93a38bbc5..c97d60822a 100644
--- a/mods/ra/rules/misc.yaml
+++ b/mods/ra/rules/misc.yaml
@@ -94,51 +94,51 @@ CRATE:
 	GiveUnitCrateAction@jeep:
 		SelectionShares: 7
 		Units: jeep
-		ValidRaces: allies, england, france, germany
+		ValidFactions: allies, england, france, germany
 		Prerequisites: techlevel.low
 	GiveUnitCrateAction@arty:
 		SelectionShares: 6
 		Units: arty
-		ValidRaces: allies, england, france, germany
+		ValidFactions: allies, england, france, germany
 		Prerequisites: techlevel.medium, dome
 	GiveUnitCrateAction@v2rl:
 		SelectionShares: 6
 		Units: v2rl
-		ValidRaces: soviet, russia, ukraine
+		ValidFactions: soviet, russia, ukraine
 		Prerequisites: techlevel.medium, dome
 	GiveUnitCrateAction@1tnk:
 		SelectionShares: 5
 		Units: 1tnk
-		ValidRaces: allies, england, france, germany
+		ValidFactions: allies, england, france, germany
 		Prerequisites: techlevel.low
 	GiveUnitCrateAction@2tnk:
 		SelectionShares: 4
 		Units: 2tnk
-		ValidRaces: allies, england, france, germany
+		ValidFactions: allies, england, france, germany
 		Prerequisites: techlevel.medium, fix
 	GiveUnitCrateAction@3tnk:
 		SelectionShares: 4
 		Units: 3tnk
-		ValidRaces: soviet, russia, ukraine
+		ValidFactions: soviet, russia, ukraine
 		Prerequisites: techlevel.medium, fix
 	GiveUnitCrateAction@4tnk:
 		SelectionShares: 3
 		Units: 4tnk
-		ValidRaces: soviet, russia, ukraine
+		ValidFactions: soviet, russia, ukraine
 		Prerequisites: techlevel.unrestricted, fix, techcenter
 	GiveUnitCrateAction@squadlight:
 		SelectionShares: 7
 		Units: e1,e1,e1,e3,e3
-		ValidRaces: allies, england, france, germany, soviet, russia, ukraine
+		ValidFactions: allies, england, france, germany, soviet, russia, ukraine
 	GiveUnitCrateAction@squadheavyallies:
 		SelectionShares: 7
 		Units: e1,e1,e1,e1,e3,e3,e3,e6,medi
-		ValidRaces: allies, england, france, germany
+		ValidFactions: allies, england, france, germany
 		TimeDelay: 4500
 	GiveUnitCrateAction@squadheavysoviet:
 		SelectionShares: 7
 		Units: e1,e1,e4,e4,e3,e3,e3
-		ValidRaces: soviet, russia, ukraine
+		ValidFactions: soviet, russia, ukraine
 		TimeDelay: 4500
 	GrantUpgradeCrateAction@invuln:
 		SelectionShares: 5