Index: binaries/data/mods/public/maps/random/jebel_barkal.js
===================================================================
--- binaries/data/mods/public/maps/random/jebel_barkal.js
+++ binaries/data/mods/public/maps/random/jebel_barkal.js
@@ -72,8 +72,8 @@
 const oHouse = "structures/kush_house";
 const oMarket = "structures/kush_market";
 const oForge = "structures/kush_forge";
-const oBlemmyeCamp = "structures/kush_blemmye_camp";
-const oNubaVillage = "structures/kush_nuba_village";
+const oBlemmyeCamp = "structures/kush_camp_blemmye";
+const oNobaCamp = "structures/kush_camp_noba";
 const oCivicCenter = "structures/kush_civil_centre";
 const oBarracks = "structures/kush_barracks";
 const oStable = "structures/kush_stable";
@@ -187,7 +187,7 @@
 const clCivicCenter = g_Map.createTileClass();
 const clBarracks = g_Map.createTileClass();
 const clBlemmyeCamp = g_Map.createTileClass();
-const clNubaVillage = g_Map.createTileClass();
+const clNobaCamp = g_Map.createTileClass();
 const clMarket = g_Map.createTileClass();
 const clDecorative = g_Map.createTileClass();
 
@@ -306,10 +306,10 @@
 		"painters": new TileClassPainter(clForge)
 	},
 	{
-		"templateName": oNubaVillage,
+		"templateName": oNobaCamp,
 		"difficulty": "Easy",
-		"constraints": avoidClasses(clNubaVillage, 30),
-		"painters": new TileClassPainter(clNubaVillage)
+		"constraints": avoidClasses(clNobaCamp, 30),
+		"painters": new TileClassPainter(clNobaCamp)
 	},
 	{
 		"templateName": oBlemmyeCamp,
@@ -1067,7 +1067,7 @@
 				clCivicCenter, 1,
 				clBarracks, 1,
 				clBlemmyeCamp, 1,
-				clNubaVillage, 1,
+				clNobaCamp, 1,
 				clMarket, 1)
 		]);
 
Index: binaries/data/mods/public/maps/scenarios/sandbox_kushites.xml
===================================================================
--- binaries/data/mods/public/maps/scenarios/sandbox_kushites.xml
+++ binaries/data/mods/public/maps/scenarios/sandbox_kushites.xml
@@ -13119,63 +13119,63 @@
 			<Actor seed="46640"/>
 		</Entity>
 		<Entity uid="2508">
-			<Template>units/kush_infantry_clubman_b</Template>
+			<Template>units/kush_infantry_maceman_merc_b</Template>
 			<Player>1</Player>
 			<Position x="479.17469" z="525.92634"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="46210"/>
 		</Entity>
 		<Entity uid="2509">
-			<Template>units/kush_infantry_clubman_b</Template>
+			<Template>units/kush_infantry_maceman_merc_b</Template>
 			<Player>1</Player>
 			<Position x="480.60431" z="527.07453"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="8484"/>
 		</Entity>
 		<Entity uid="2510">
-			<Template>units/kush_infantry_clubman_b</Template>
+			<Template>units/kush_infantry_maceman_merc_b</Template>
 			<Player>1</Player>
 			<Position x="482.45246" z="528.63666"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="64706"/>
 		</Entity>
 		<Entity uid="2511">
-			<Template>units/kush_infantry_clubman_a</Template>
+			<Template>units/kush_infantry_maceman_merc_a</Template>
 			<Player>1</Player>
 			<Position x="482.23246" z="523.2115"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="47680"/>
 		</Entity>
 		<Entity uid="2515">
-			<Template>units/kush_infantry_clubman_a</Template>
+			<Template>units/kush_infantry_maceman_merc_a</Template>
 			<Player>1</Player>
 			<Position x="484.06269" z="524.3896"/>
 			<Orientation y="2.47185"/>
 			<Actor seed="25612"/>
 		</Entity>
 		<Entity uid="2522">
-			<Template>units/kush_infantry_clubman_a</Template>
+			<Template>units/kush_infantry_maceman_merc_a</Template>
 			<Player>1</Player>
 			<Position x="486.35376" z="526.48469"/>
 			<Orientation y="2.53083"/>
 			<Actor seed="13864"/>
 		</Entity>
 		<Entity uid="2523">
-			<Template>units/kush_infantry_clubman_e</Template>
+			<Template>units/kush_infantry_maceman_merc_e</Template>
 			<Player>1</Player>
 			<Position x="484.38981" z="520.17414"/>
 			<Orientation y="2.57821"/>
 			<Actor seed="13618"/>
 		</Entity>
 		<Entity uid="2524">
-			<Template>units/kush_infantry_clubman_e</Template>
+			<Template>units/kush_infantry_maceman_merc_e</Template>
 			<Player>1</Player>
 			<Position x="486.42847" z="522.24427"/>
 			<Orientation y="2.58497"/>
 			<Actor seed="2842"/>
 		</Entity>
 		<Entity uid="2528">
-			<Template>units/kush_infantry_clubman_e</Template>
+			<Template>units/kush_infantry_maceman_merc_e</Template>
 			<Player>1</Player>
 			<Position x="489.00779" z="523.3747"/>
 			<Orientation y="-3.09716"/>
@@ -13644,14 +13644,14 @@
 			<Actor seed="58404"/>
 		</Entity>
 		<Entity uid="2606">
-			<Template>structures/kush_blemmye_camp</Template>
+			<Template>structures/kush_camp_blemmye</Template>
 			<Player>1</Player>
 			<Position x="519.70057" z="468.06522"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="63932"/>
 		</Entity>
 		<Entity uid="2607">
-			<Template>structures/kush_nuba_village</Template>
+			<Template>structures/kush_camp_noba</Template>
 			<Player>1</Player>
 			<Position x="498.46335" z="540.27625"/>
 			<Orientation y="2.35621"/>
Index: binaries/data/mods/public/simulation/ai/petra/config.js
===================================================================
--- binaries/data/mods/public/simulation/ai/petra/config.js
+++ binaries/data/mods/public/simulation/ai/petra/config.js
@@ -75,8 +75,8 @@
 			"structures/{civ}_monument"
 		],
 		"kush": [
-			"structures/{civ}_blemmye_camp",
-			"structures/{civ}_nuba_village",
+			"structures/{civ}_camp_blemmye",
+			"structures/{civ}_camp_noba",
 			"structures/{civ}_pyramid_large",
 			"structures/{civ}_pyramid_small",
 			"structures/{civ}_temple_amun"
Index: binaries/data/mods/public/simulation/components/Identity.js
===================================================================
--- binaries/data/mods/public/simulation/components/Identity.js
+++ binaries/data/mods/public/simulation/components/Identity.js
@@ -65,7 +65,7 @@
 		"</element>" +
 	"</optional>" +
 	"<optional>" +
-		"<element name='VisibleClasses' a:help='Optional list of space-separated classes applying to this entity. These classes will also be visible in various GUI elements. If the classes need spaces, underscores will be replaced with spaces. Choices include: Amphitheater, Archer, ArmyCamp, Arsenal, ArtilleryTower, Axeman, Barracks, Bireme, BoltShooter, BoltTower, Bribable, Camel, Cavalry, Champion, Chariot, Citizen, City, Civic, CivilCentre, Clubman, Colony, Corral, Council, Crossbowman, Defensive, Dock, Dog, Economic, Elephant, ElephantStable, Embassy, Farmstead, Field, Fireship, FishingBoat, Forge, Fortress, Gate, Gladiator, Gymnasium, Hall, Healer, Hero, House, Infantry, IshtarGate, Javelineer, Library, Lighthouse, Maceman, Melee, Market, Mercenary, Military, Monument, Naval, Outpost, Palace, Palisade, Pikeman, Pillar, Pyramid, Quinquereme, Ram, Range, Ranged, Relic, Resource, RotaryMill, SentryTower, Ship, Shipyard, Siege, SiegeTower, SiegeWall, Slave, Slinger, Soldier, Spearman, Stable, Stoa, StoneThrower, StoneTower, Storehouse, Support, Swordsman, Syssiton, Temple, TempleOfAmun, TempleOfApedemak, TempleOfMars, TempleOfVesta, Theater, Tower, Town, Trade, Trader, Trireme, TriumphalArch, Village, Wall, Warship, Wonder, Worker.'>" +
+		"<element name='VisibleClasses' a:help='Optional list of space-separated classes applying to this entity. These classes will also be visible in various GUI elements. If the classes need spaces, underscores will be replaced with spaces. Choices include: Amphitheater, Archer, ArmyCamp, Arsenal, ArtilleryTower, Axeman, Barracks, Bireme, BoltShooter, BoltTower, Bribable, Camel, Cavalry, Champion, Chariot, Citizen, City, Civic, CivilCentre, Colony, Corral, Council, Crossbowman, Defensive, Dock, Dog, Economic, Elephant, ElephantStable, Embassy, Farmstead, Field, Fireship, FishingBoat, Forge, Fortress, Gate, Gladiator, Gymnasium, Hall, Healer, Hero, House, Infantry, IshtarGate, Javelineer, Library, Lighthouse, Maceman, Melee, Market, Mercenary, Military, Monument, Naval, Outpost, Palace, Palisade, Pikeman, Pillar, Pyramid, Quinquereme, Ram, Range, Ranged, Relic, Resource, RotaryMill, SentryTower, Ship, Shipyard, Siege, SiegeTower, SiegeWall, Slave, Slinger, Soldier, Spearman, Stable, Stoa, StoneThrower, StoneTower, Storehouse, Support, Swordsman, Syssiton, Temple, TempleOfAmun, TempleOfApedemak, TempleOfMars, TempleOfVesta, Theater, Tower, Town, Trade, Trader, Trireme, TriumphalArch, Village, Wall, Warship, Wonder, Worker.'>" +
 			"<attribute name='datatype'>" +
 				"<value>tokens</value>" +
 			"</attribute>" +
Index: binaries/data/mods/public/simulation/templates/structures/kush_blemmye_camp.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/kush_blemmye_camp.xml
+++ binaries/data/mods/public/simulation/templates/structures/kush_blemmye_camp.xml
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_military_embassy">
-  <BuildRestrictions>
-    <Territory>own neutral</Territory>
-  </BuildRestrictions>
-  <Cost>
-    <Resources>
-      <wood>100</wood>
-      <metal>100</metal>
-    </Resources>
-  </Cost>
-  <Footprint>
-    <Square width="29.0" depth="29.0"/>
-    <Height>12.0</Height>
-  </Footprint>
-  <Health>
-    <Max>1000</Max>
-    <SpawnEntityOnDeath>decay|rubble/rubble_stone_5x5</SpawnEntityOnDeath>
-  </Health>
-  <Identity>
-    <Civ>kush</Civ>
-    <GenericName>Blemmye Camp</GenericName>
-    <SpecificName>Blemmye Camp</SpecificName>
-    <Tooltip>Train Blemmye Desert Raiders.</Tooltip>
-    <Icon>structures/mercenary_camp.png</Icon>
-  </Identity>
-  <Loot>
-    <wood>20</wood>
-    <metal>20</metal>
-  </Loot>
-  <Obstruction>
-    <Static width="29.0" depth="29.0"/>
-  </Obstruction>
-  <ProductionQueue>
-    <Entities datatype="tokens">
-      units/{native}_cavalry_javelineer_merc_b
-    </Entities>
-  </ProductionQueue>
-  <TerritoryDecay>
-    <DecayRate>1</DecayRate>
-  </TerritoryDecay>
-  <TerritoryInfluence disable=""/>
-  <VisualActor>
-    <Actor>structures/mercenaries/camp_blemmye.xml</Actor>
-    <FoundationActor>structures/fndn_8x7.xml</FoundationActor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/structures/kush_camp_blemmye.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/kush_camp_blemmye.xml
+++ binaries/data/mods/public/simulation/templates/structures/kush_camp_blemmye.xml
@@ -20,8 +20,7 @@
   <Identity>
     <Civ>kush</Civ>
     <GenericName>Blemmye Camp</GenericName>
-    <SpecificName>Blemmye Camp</SpecificName>
-    <Tooltip>Train Blemmye Desert Raiders.</Tooltip>
+    <Tooltip>Train Blemmye Mercenaries.</Tooltip>
     <Icon>structures/mercenary_camp.png</Icon>
   </Identity>
   <Loot>
Index: binaries/data/mods/public/simulation/templates/structures/kush_camp_noba.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/kush_camp_noba.xml
+++ binaries/data/mods/public/simulation/templates/structures/kush_camp_noba.xml
@@ -19,9 +19,8 @@
   </Health>
   <Identity>
     <Civ>kush</Civ>
-    <GenericName>Nuba Village</GenericName>
-    <SpecificName>Nuba Village</SpecificName>
-    <Tooltip>Train the Nuba Clubman and Nuba Hunter.</Tooltip>
+    <GenericName>Noba Village</GenericName>
+    <Tooltip>Train Noba Mercenaries.</Tooltip>
     <Icon>structures/mercenary_camp.png</Icon>
   </Identity>
   <Loot>
@@ -33,7 +32,7 @@
   </Obstruction>
   <ProductionQueue>
     <Entities datatype="tokens">
-      units/{native}_infantry_clubman_b
+      units/{native}_infantry_maceman_merc_b
       units/{native}_infantry_javelineer_merc_b
     </Entities>
   </ProductionQueue>
Index: binaries/data/mods/public/simulation/templates/structures/kush_nuba_village.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/kush_nuba_village.xml
+++ binaries/data/mods/public/simulation/templates/structures/kush_nuba_village.xml
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_military_embassy">
-  <BuildRestrictions>
-    <Territory>own neutral</Territory>
-  </BuildRestrictions>
-  <Cost>
-    <Resources>
-      <wood>100</wood>
-      <metal>100</metal>
-    </Resources>
-  </Cost>
-  <Footprint>
-    <Square width="35.0" depth="35.0"/>
-    <Height>12.0</Height>
-  </Footprint>
-  <Health>
-    <Max>1000</Max>
-    <SpawnEntityOnDeath>decay|rubble/rubble_stone_5x5</SpawnEntityOnDeath>
-  </Health>
-  <Identity>
-    <Civ>kush</Civ>
-    <GenericName>Nuba Village</GenericName>
-    <SpecificName>Nuba Village</SpecificName>
-    <Tooltip>Train the Nuba Clubman and Nuba Hunter.</Tooltip>
-    <Icon>structures/mercenary_camp.png</Icon>
-  </Identity>
-  <Loot>
-    <wood>20</wood>
-    <metal>20</metal>
-  </Loot>
-  <Obstruction>
-    <Static width="35.0" depth="35.0"/>
-  </Obstruction>
-  <ProductionQueue>
-    <Entities datatype="tokens">
-      units/{native}_infantry_clubman_b
-      units/{native}_infantry_javelineer_merc_b
-    </Entities>
-  </ProductionQueue>
-  <TerritoryDecay>
-    <DecayRate>1</DecayRate>
-  </TerritoryDecay>
-  <TerritoryInfluence disable=""/>
-  <VisualActor>
-    <Actor>structures/mercenaries/camp_nuba.xml</Actor>
-    <FoundationActor>structures/fndn_8x8.xml</FoundationActor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/kush_infantry_archer_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/kush_infantry_archer_b.xml
+++ binaries/data/mods/public/simulation/templates/units/kush_infantry_archer_b.xml
@@ -5,8 +5,8 @@
       structures/kush_pyramid_small
       structures/kush_pyramid_large
       structures/kush_temple_amun
-      structures/kush_blemmye_camp
-      structures/kush_nuba_village
+      structures/kush_camp_blemmye
+      structures/kush_camp_noba
     </Entities>
   </Builder>
   <Identity>
Index: binaries/data/mods/public/simulation/templates/units/kush_infantry_clubman_a.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/kush_infantry_clubman_a.xml
+++ binaries/data/mods/public/simulation/templates/units/kush_infantry_clubman_a.xml
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/kush_infantry_clubman_b">
-  <Identity>
-    <Rank>Advanced</Rank>
-  </Identity>
-  <Promotion>
-    <Entity>units/kush_infantry_clubman_e</Entity>
-  </Promotion>
-  <VisualActor>
-    <Actor>units/kushites/infantry_clubman_a.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/kush_infantry_clubman_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/kush_infantry_clubman_b.xml
+++ binaries/data/mods/public/simulation/templates/units/kush_infantry_clubman_b.xml
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_infantry_melee_swordsman">
-  <Attack>
-    <Melee>
-      <Damage>
-        <Hack>3.0</Hack>
-        <Crush>2.5</Crush>
-      </Damage>
-    </Melee>
-  </Attack>
-  <Builder>
-    <Entities datatype="tokens">
-      structures/{civ}_pyramid_small
-      structures/{civ}_pyramid_large
-      structures/{civ}_temple_amun
-      structures/{civ}_blemmye_camp
-      structures/{civ}_nuba_village
-    </Entities>
-  </Builder>
-  <Cost>
-    <Resources>
-      <food op="add">-25</food>
-      <metal op="add">25</metal>
-    </Resources>
-  </Cost>
-  <Identity>
-    <Civ>kush</Civ>
-    <VisibleClasses datatype="tokens">-Swordsman Clubman Mercenary</VisibleClasses>
-    <SelectionGroupName>units/kush_infantry_clubman_b</SelectionGroupName>
-    <GenericName>Nuba Clubman</GenericName>
-    <SpecificName>nhw Noba</SpecificName>
-    <Icon>units/kush_infantry_clubman.png</Icon>
-    <RequiredTechnology>phase_town</RequiredTechnology>
-  </Identity>
-  <Promotion>
-    <Entity>units/kush_infantry_clubman_a</Entity>
-  </Promotion>
-  <Resistance>
-    <Entity>
-      <Damage>
-        <Hack op="add">-1</Hack>
-      </Damage>
-    </Entity>
-  </Resistance>
-  <VisualActor>
-    <Actor>units/kushites/infantry_clubman_b.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/kush_infantry_clubman_e.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/kush_infantry_clubman_e.xml
+++ binaries/data/mods/public/simulation/templates/units/kush_infantry_clubman_e.xml
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/kush_infantry_clubman_a">
-  <Identity>
-    <Rank>Elite</Rank>
-  </Identity>
-  <Promotion disable=""/>
-  <VisualActor>
-    <Actor>units/kushites/infantry_clubman_e.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/kush_infantry_javelineer_merc_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/kush_infantry_javelineer_merc_b.xml
+++ binaries/data/mods/public/simulation/templates/units/kush_infantry_javelineer_merc_b.xml
@@ -2,11 +2,11 @@
 <Entity parent="template_unit_infantry_ranged_javelineer">
   <Builder>
     <Entities datatype="tokens">
-      structures/{civ}_pyramid_small
-      structures/{civ}_pyramid_large
-      structures/{civ}_temple_amun
-      structures/{civ}_blemmye_camp
-      structures/{civ}_nuba_village
+      structures/kush_pyramid_small
+      structures/kush_pyramid_large
+      structures/kush_temple_amun
+      structures/kush_camp_blemmye
+      structures/kush_camp_noba
     </Entities>
   </Builder>
   <Cost>
@@ -19,7 +19,7 @@
     <Civ>kush</Civ>
     <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
     <SelectionGroupName>units/kush_infantry_javelineer_merc_b</SelectionGroupName>
-    <GenericName>Nuba Skirmisher</GenericName>
+    <GenericName>Noba Skirmisher</GenericName>
     <SpecificName>nhw ʿhȝw Noba</SpecificName>
     <Icon>units/kush_infantry_javelinist.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
Index: binaries/data/mods/public/simulation/templates/units/kush_infantry_maceman_merc_a.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/kush_infantry_maceman_merc_a.xml
+++ binaries/data/mods/public/simulation/templates/units/kush_infantry_maceman_merc_a.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/kush_infantry_clubman_b">
+<Entity parent="units/kush_infantry_maceman_merc_b">
   <Identity>
     <Rank>Advanced</Rank>
   </Identity>
   <Promotion>
-    <Entity>units/kush_infantry_clubman_e</Entity>
+    <Entity>units/kush_infantry_maceman_merc_e</Entity>
   </Promotion>
   <VisualActor>
     <Actor>units/kushites/infantry_clubman_a.xml</Actor>
Index: binaries/data/mods/public/simulation/templates/units/kush_infantry_maceman_merc_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/kush_infantry_maceman_merc_b.xml
+++ binaries/data/mods/public/simulation/templates/units/kush_infantry_maceman_merc_b.xml
@@ -10,11 +10,11 @@
   </Attack>
   <Builder>
     <Entities datatype="tokens">
-      structures/{civ}_pyramid_small
-      structures/{civ}_pyramid_large
-      structures/{civ}_temple_amun
-      structures/{civ}_blemmye_camp
-      structures/{civ}_nuba_village
+      structures/kush_pyramid_small
+      structures/kush_pyramid_large
+      structures/kush_temple_amun
+      structures/kush_camp_blemmye
+      structures/kush_camp_noba
     </Entities>
   </Builder>
   <Cost>
@@ -25,15 +25,15 @@
   </Cost>
   <Identity>
     <Civ>kush</Civ>
-    <VisibleClasses datatype="tokens">-Swordsman Clubman Mercenary</VisibleClasses>
-    <SelectionGroupName>units/kush_infantry_clubman_b</SelectionGroupName>
-    <GenericName>Nuba Clubman</GenericName>
+    <VisibleClasses datatype="tokens">-Swordsman Maceman Mercenary</VisibleClasses>
+    <SelectionGroupName>units/kush_infantry_maceman_merc_b</SelectionGroupName>
+    <GenericName>Noba Maceman</GenericName>
     <SpecificName>nhw Noba</SpecificName>
     <Icon>units/kush_infantry_clubman.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Promotion>
-    <Entity>units/kush_infantry_clubman_a</Entity>
+    <Entity>units/kush_infantry_maceman_merc_a</Entity>
   </Promotion>
   <Resistance>
     <Entity>
Index: binaries/data/mods/public/simulation/templates/units/kush_infantry_maceman_merc_e.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/kush_infantry_maceman_merc_e.xml
+++ binaries/data/mods/public/simulation/templates/units/kush_infantry_maceman_merc_e.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/kush_infantry_clubman_a">
+<Entity parent="units/kush_infantry_maceman_merc_a">
   <Identity>
     <Rank>Elite</Rank>
   </Identity>
Index: binaries/data/mods/public/simulation/templates/units/kush_infantry_pikeman_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/kush_infantry_pikeman_b.xml
+++ binaries/data/mods/public/simulation/templates/units/kush_infantry_pikeman_b.xml
@@ -5,8 +5,8 @@
       structures/kush_pyramid_small
       structures/kush_pyramid_large
       structures/kush_temple_amun
-      structures/kush_blemmye_camp
-      structures/kush_nuba_village
+      structures/kush_camp_blemmye
+      structures/kush_camp_noba
     </Entities>
   </Builder>
   <Identity>
Index: binaries/data/mods/public/simulation/templates/units/kush_infantry_spearman_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/kush_infantry_spearman_b.xml
+++ binaries/data/mods/public/simulation/templates/units/kush_infantry_spearman_b.xml
@@ -5,8 +5,8 @@
       structures/kush_pyramid_small
       structures/kush_pyramid_large
       structures/kush_temple_amun
-      structures/kush_blemmye_camp
-      structures/kush_nuba_village
+      structures/kush_camp_blemmye
+      structures/kush_camp_noba
     </Entities>
   </Builder>
   <Identity>
Index: binaries/data/mods/public/simulation/templates/units/kush_infantry_swordsman_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/kush_infantry_swordsman_b.xml
+++ binaries/data/mods/public/simulation/templates/units/kush_infantry_swordsman_b.xml
@@ -5,8 +5,8 @@
       structures/kush_pyramid_small
       structures/kush_pyramid_large
       structures/kush_temple_amun
-      structures/kush_blemmye_camp
-      structures/kush_nuba_village
+      structures/kush_camp_blemmye
+      structures/kush_camp_noba
     </Entities>
   </Builder>
   <Identity>
Index: binaries/data/mods/public/simulation/templates/units/kush_support_female_citizen.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/kush_support_female_citizen.xml
+++ binaries/data/mods/public/simulation/templates/units/kush_support_female_citizen.xml
@@ -5,8 +5,8 @@
       structures/kush_pyramid_small
       structures/kush_pyramid_large
       structures/kush_temple_amun
-      structures/kush_blemmye_camp
-      structures/kush_nuba_village
+      structures/kush_camp_blemmye
+      structures/kush_camp_noba
     </Entities>
   </Builder>
   <Identity>