diff --git a/binaries/data/mods/official/entities/structures/cart_civil_centre.xml b/binaries/data/mods/official/entities/structures/cart_civil_centre.xml
index 5b2979662d..15c7cae374 100644
--- a/binaries/data/mods/official/entities/structures/cart_civil_centre.xml
+++ b/binaries/data/mods/official/entities/structures/cart_civil_centre.xml
@@ -19,9 +19,9 @@
 		<Create>
 			<List>
 				<Unit>
-					<Infantry_Spearman />
-					<Infantry_Slinger />
-					<Cavalry_Javelinist />
+					<Infantry_Spearman_B />
+					<Infantry_Slinger_B />
+					<Cavalry_Javelinist_B />
 				</Unit>
 			</List>
 		</Create>
diff --git a/binaries/data/mods/official/entities/structures/celt_civil_centre.xml b/binaries/data/mods/official/entities/structures/celt_civil_centre.xml
index 0131fa5a40..673258aa4f 100644
--- a/binaries/data/mods/official/entities/structures/celt_civil_centre.xml
+++ b/binaries/data/mods/official/entities/structures/celt_civil_centre.xml
@@ -23,9 +23,9 @@
 		<Create>
 			<List>
 				<Unit>
-					<Infantry_Spearman />
-					<Infantry_Javelinist />
-					<Cavalry_Javelinist />
+					<Infantry_Spearman_B />
+					<Infantry_Javelinist_B />
+					<Cavalry_Javelinist_B />
 				</Unit>
 			</List>
 		</Create>
diff --git a/binaries/data/mods/official/entities/structures/hele_civil_centre.xml b/binaries/data/mods/official/entities/structures/hele_civil_centre.xml
index f43e6a125c..9f42a81fc2 100644
--- a/binaries/data/mods/official/entities/structures/hele_civil_centre.xml
+++ b/binaries/data/mods/official/entities/structures/hele_civil_centre.xml
@@ -21,9 +21,9 @@
 		<Create>
 			<List>
 				<Unit>
-					<Infantry_Spearman />
-					<Infantry_Javelinist />
-					<Cavalry_Swordsman />
+					<Infantry_Spearman_B />
+					<Infantry_Javelinist_B />
+					<Cavalry_Swordsman_B />
 				</Unit>
 			</List>
 		</Create>
diff --git a/binaries/data/mods/official/entities/structures/iber_civil_centre.xml b/binaries/data/mods/official/entities/structures/iber_civil_centre.xml
index b591098579..00a3c1b939 100644
--- a/binaries/data/mods/official/entities/structures/iber_civil_centre.xml
+++ b/binaries/data/mods/official/entities/structures/iber_civil_centre.xml
@@ -21,9 +21,9 @@
 		<Create>
 			<List>
 				<Unit>
-					<Infantry_Swordsman />
-					<Infantry_Slinger />
-					<Cavalry_Javelinist />
+					<Infantry_Swordsman_B />
+					<Infantry_Slinger_B />
+					<Cavalry_Javelinist_B />
 				</Unit>
 			</List>
 		</Create>
diff --git a/binaries/data/mods/official/entities/structures/pers_civil_centre.xml b/binaries/data/mods/official/entities/structures/pers_civil_centre.xml
index 22789cdb8a..d819986c51 100644
--- a/binaries/data/mods/official/entities/structures/pers_civil_centre.xml
+++ b/binaries/data/mods/official/entities/structures/pers_civil_centre.xml
@@ -23,9 +23,9 @@
 		<Create>
 			<List>
 				<Unit>
-					<Infantry_Spearman />
-					<Infantry_Archer />
-					<Cavalry_Javelinist />
+					<Infantry_Spearman_B />
+					<Infantry_Archer_B />
+					<Cavalry_Javelinist_B />
 				</Unit>
 			</List>
 		</Create>
diff --git a/binaries/data/mods/official/entities/structures/rome_civil_centre.xml b/binaries/data/mods/official/entities/structures/rome_civil_centre.xml
index a69d1d5138..c88dca060d 100644
--- a/binaries/data/mods/official/entities/structures/rome_civil_centre.xml
+++ b/binaries/data/mods/official/entities/structures/rome_civil_centre.xml
@@ -23,9 +23,9 @@
 		<Create>
 			<List>
 				<Unit>
-					<Infantry_Spearman />
-					<Infantry_Javelinist />
-					<Cavalry_Spearman />
+					<Infantry_Spearman_B />
+					<Infantry_Javelinist_B />
+					<Cavalry_Spearman_B />
 				</Unit>
 			</List>
 		</Create>
diff --git a/binaries/data/mods/official/entities/template_structure_civic_civil_centre.xml b/binaries/data/mods/official/entities/template_structure_civic_civil_centre.xml
index e5e9c543bc..5b5a092de3 100644
--- a/binaries/data/mods/official/entities/template_structure_civic_civil_centre.xml
+++ b/binaries/data/mods/official/entities/template_structure_civic_civil_centre.xml
@@ -43,7 +43,7 @@
 		<Create>
  			<List>
 				<Unit>
-					<Female_Citizen />
+					<Support_Female_Citizen />
 				</Unit>
  				<Tech>
 					<Fem />