diff --git a/OpenRA.Game/Network/Session.cs b/OpenRA.Game/Network/Session.cs
index 7fe75b715f..32c9df85a2 100644
--- a/OpenRA.Game/Network/Session.cs
+++ b/OpenRA.Game/Network/Session.cs
@@ -94,7 +94,7 @@ namespace OpenRA.Network
 			public bool Crates = true;
 			public bool Shroud = true;
 			public bool Fog = true;
-			public string StartingUnitsClass = "default";
+			public string StartingUnitsClass = "none";
 			public bool AllowVersionMismatch;
 		}
 
diff --git a/OpenRA.Mods.RA/MPStartUnits.cs b/OpenRA.Mods.RA/MPStartUnits.cs
index dc571d74d1..bab7fac798 100644
--- a/OpenRA.Mods.RA/MPStartUnits.cs
+++ b/OpenRA.Mods.RA/MPStartUnits.cs
@@ -15,7 +15,7 @@ namespace OpenRA.Mods.RA
 {
 	public class MPStartUnitsInfo : TraitInfo<MPStartUnits>
 	{
-		public readonly string Class = "default";
+		public readonly string Class = "none";
 		public readonly string[] Races = { };
 
 		public readonly string BaseActor = null;
diff --git a/OpenRA.Mods.RA/Widgets/Logic/LobbyLogic.cs b/OpenRA.Mods.RA/Widgets/Logic/LobbyLogic.cs
index 73841e332b..fb2e025eac 100644
--- a/OpenRA.Mods.RA/Widgets/Logic/LobbyLogic.cs
+++ b/OpenRA.Mods.RA/Widgets/Logic/LobbyLogic.cs
@@ -327,7 +327,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic
 				var classNames = new Dictionary<string,string>()
 				{
 					{"none", "MCV Only"},
-					{"default", "Light Support"},
+					{"light", "Light Support"},
 					{"heavy", "Heavy Support"},
 				};
 
diff --git a/mods/cnc/mod.yaml b/mods/cnc/mod.yaml
index 0ac21865b0..d5da8da5b2 100644
--- a/mods/cnc/mod.yaml
+++ b/mods/cnc/mod.yaml
@@ -121,7 +121,7 @@ ServerTraits:
 LobbyDefaults:
 	AllowCheats: false
 	Crates: true
-	StartingUnitsClass: default
+	StartingUnitsClass: light
 	FragileAlliances: false
 	Shroud: true
 	Fog: true
diff --git a/mods/cnc/rules/system.yaml b/mods/cnc/rules/system.yaml
index 823f799146..73b3d5e5ec 100644
--- a/mods/cnc/rules/system.yaml
+++ b/mods/cnc/rules/system.yaml
@@ -318,22 +318,27 @@ World:
 		Races: gdi, nod
 		BaseActor: mcv
 	MPStartUnits@defaultgdia:
+		Class: light
 		Races: gdi
 		BaseActor: mcv
 		SupportActors: e1,e1,e1,e1,e1,e3,e3,jeep
 	MPStartUnits@defaultgdib:
+		Class: light
 		Races: gdi
 		BaseActor: mcv
 		SupportActors: e1,e1,e1,e1,e1,e1,e3,apc
 	MPStartUnits@defaultnoda:
+		Class: light
 		Races: nod
 		BaseActor: mcv
 		SupportActors: e1,e1,e1,e1,e3,bggy,bike
 	MPStartUnits@defaultnodb:
+		Class: light
 		Races: nod
 		BaseActor: mcv
 		SupportActors: e1,e1,e1,e3,e3,e3,bggy
 	MPStartUnits@defaultnodc:
+		Class: light
 		Races: nod
 		BaseActor: mcv
 		SupportActors: e1,e1,e1,e1,e1,e1,e1,e3,bike
diff --git a/mods/d2k/mod.yaml b/mods/d2k/mod.yaml
index 1241b90666..df8ca2ca70 100644
--- a/mods/d2k/mod.yaml
+++ b/mods/d2k/mod.yaml
@@ -107,7 +107,7 @@ ServerTraits:
 LobbyDefaults:
 	AllowCheats: false
 	Crates: true
-	StartingUnitsClass: default
+	StartingUnitsClass: none
 	FragileAlliances: false
 	Shroud: false
 	Fog: true
diff --git a/mods/ra/mod.yaml b/mods/ra/mod.yaml
index be5cfd8cd3..375eeae817 100644
--- a/mods/ra/mod.yaml
+++ b/mods/ra/mod.yaml
@@ -123,7 +123,7 @@ ServerTraits:
 LobbyDefaults:
 	AllowCheats: false
 	Crates: true
-	StartingUnitsClass: default
+	StartingUnitsClass: none
 	FragileAlliances: false
 	Shroud: true
 	Fog: true
diff --git a/mods/ts/mod.yaml b/mods/ts/mod.yaml
index 84af14ec3d..77c15fb7c3 100644
--- a/mods/ts/mod.yaml
+++ b/mods/ts/mod.yaml
@@ -146,7 +146,7 @@ ServerTraits:
 LobbyDefaults:
 	AllowCheats: false
 	Crates: true
-	StartingUnitsClass: default
+	StartingUnitsClass: none
 	FragileAlliances: false
 	Shroud: true
 	Fog: true