diff --git a/binaries/data/mods/public/maps/random/jebel_barkal.js b/binaries/data/mods/public/maps/random/jebel_barkal.js
index 3cdfa87523..e4f753a512 100644
--- a/binaries/data/mods/public/maps/random/jebel_barkal.js
+++ b/binaries/data/mods/public/maps/random/jebel_barkal.js
@@ -72,8 +72,8 @@ const oTower = g_MapSettings.Size >= 256 && getDifficulty() >= 3 ? "structures/k
 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 clElephantStables = g_Map.createTileClass();
 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 @@ const layoutKushCity = [
 		"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 @@ var areaCityBushes =
 				clCivicCenter, 1,
 				clBarracks, 1,
 				clBlemmyeCamp, 1,
-				clNubaVillage, 1,
+				clNobaCamp, 1,
 				clMarket, 1)
 		]);
 
diff --git a/binaries/data/mods/public/maps/scenarios/sandbox_kushites.xml b/binaries/data/mods/public/maps/scenarios/sandbox_kushites.xml
index 1368aab8f1..e244b6894a 100644
--- a/binaries/data/mods/public/maps/scenarios/sandbox_kushites.xml
+++ b/binaries/data/mods/public/maps/scenarios/sandbox_kushites.xml
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e6d38bb76a7308db62d488578bb118f3925784e8f4714281b73f9289efc348ca
-size 418821
+oid sha256:63e76b2895ceffa6be9419fbf0de9c081ec19f7596f2e34ac02361240f763297
+size 418863
diff --git a/binaries/data/mods/public/simulation/ai/petra/config.js b/binaries/data/mods/public/simulation/ai/petra/config.js
index 1667e75e67..5327ba52b2 100644
--- a/binaries/data/mods/public/simulation/ai/petra/config.js
+++ b/binaries/data/mods/public/simulation/ai/petra/config.js
@@ -75,8 +75,8 @@ PETRA.Config = function(difficulty, behavior)
 			"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"
diff --git a/binaries/data/mods/public/simulation/components/Identity.js b/binaries/data/mods/public/simulation/components/Identity.js
index 72d9a36368..9eb35ae2f2 100644
--- a/binaries/data/mods/public/simulation/components/Identity.js
+++ b/binaries/data/mods/public/simulation/components/Identity.js
@@ -65,7 +65,7 @@ Identity.prototype.Schema =
 		"</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>" +
diff --git a/binaries/data/mods/public/simulation/templates/structures/kush_blemmye_camp.xml b/binaries/data/mods/public/simulation/templates/structures/kush_camp_blemmye.xml
similarity index 92%
rename from binaries/data/mods/public/simulation/templates/structures/kush_blemmye_camp.xml
rename to binaries/data/mods/public/simulation/templates/structures/kush_camp_blemmye.xml
index 3281c70145..8fe4aaf9a1 100644
--- a/binaries/data/mods/public/simulation/templates/structures/kush_blemmye_camp.xml
+++ b/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>
diff --git a/binaries/data/mods/public/simulation/templates/structures/kush_nuba_village.xml b/binaries/data/mods/public/simulation/templates/structures/kush_camp_noba.xml
similarity index 85%
rename from binaries/data/mods/public/simulation/templates/structures/kush_nuba_village.xml
rename to binaries/data/mods/public/simulation/templates/structures/kush_camp_noba.xml
index 60705e9e68..9f0aad9a3a 100644
--- a/binaries/data/mods/public/simulation/templates/structures/kush_nuba_village.xml
+++ b/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>
diff --git a/binaries/data/mods/public/simulation/templates/units/kush_infantry_archer_b.xml b/binaries/data/mods/public/simulation/templates/units/kush_infantry_archer_b.xml
index 77d062119b..c6a5f26ba9 100644
--- a/binaries/data/mods/public/simulation/templates/units/kush_infantry_archer_b.xml
+++ b/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>
diff --git a/binaries/data/mods/public/simulation/templates/units/kush_infantry_javelineer_merc_b.xml b/binaries/data/mods/public/simulation/templates/units/kush_infantry_javelineer_merc_b.xml
index c58f3c28e8..eee2f89803 100644
--- a/binaries/data/mods/public/simulation/templates/units/kush_infantry_javelineer_merc_b.xml
+++ b/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>
@@ -20,7 +20,7 @@
     <Lang>napatan</Lang>
     <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>
diff --git a/binaries/data/mods/public/simulation/templates/units/kush_infantry_clubman_a.xml b/binaries/data/mods/public/simulation/templates/units/kush_infantry_maceman_merc_a.xml
similarity index 66%
rename from binaries/data/mods/public/simulation/templates/units/kush_infantry_clubman_a.xml
rename to binaries/data/mods/public/simulation/templates/units/kush_infantry_maceman_merc_a.xml
index 1aaba96fab..3ad309b865 100644
--- a/binaries/data/mods/public/simulation/templates/units/kush_infantry_clubman_a.xml
+++ b/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>
diff --git a/binaries/data/mods/public/simulation/templates/units/kush_infantry_clubman_b.xml b/binaries/data/mods/public/simulation/templates/units/kush_infantry_maceman_merc_b.xml
similarity index 69%
rename from binaries/data/mods/public/simulation/templates/units/kush_infantry_clubman_b.xml
rename to binaries/data/mods/public/simulation/templates/units/kush_infantry_maceman_merc_b.xml
index 0f5a783189..d146bbe3c5 100644
--- a/binaries/data/mods/public/simulation/templates/units/kush_infantry_clubman_b.xml
+++ b/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>
@@ -26,15 +26,15 @@
   <Identity>
     <Civ>kush</Civ>
     <Lang>napatan</Lang>
-    <VisibleClasses datatype="tokens">-Swordsman Clubman Mercenary</VisibleClasses>
-    <SelectionGroupName>units/kush_infantry_clubman_b</SelectionGroupName>
-    <GenericName>Nuba Clubman</GenericName>
+    <VisibleClasses datatype="tokens">-Swordsman Macemen Mercenary</VisibleClasses>
+    <SelectionGroupName>units/kush_infantry_maceman_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_a</Entity>
   </Promotion>
   <Resistance>
     <Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/kush_infantry_clubman_e.xml b/binaries/data/mods/public/simulation/templates/units/kush_infantry_maceman_merc_e.xml
similarity index 80%
rename from binaries/data/mods/public/simulation/templates/units/kush_infantry_clubman_e.xml
rename to binaries/data/mods/public/simulation/templates/units/kush_infantry_maceman_merc_e.xml
index 0732cb3358..3c86f3de20 100644
--- a/binaries/data/mods/public/simulation/templates/units/kush_infantry_clubman_e.xml
+++ b/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>
diff --git a/binaries/data/mods/public/simulation/templates/units/kush_infantry_pikeman_b.xml b/binaries/data/mods/public/simulation/templates/units/kush_infantry_pikeman_b.xml
index 5b9fe07aa8..4caf529491 100644
--- a/binaries/data/mods/public/simulation/templates/units/kush_infantry_pikeman_b.xml
+++ b/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>
diff --git a/binaries/data/mods/public/simulation/templates/units/kush_infantry_spearman_b.xml b/binaries/data/mods/public/simulation/templates/units/kush_infantry_spearman_b.xml
index 7254a0c38a..29888e23a3 100644
--- a/binaries/data/mods/public/simulation/templates/units/kush_infantry_spearman_b.xml
+++ b/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>
diff --git a/binaries/data/mods/public/simulation/templates/units/kush_infantry_swordsman_b.xml b/binaries/data/mods/public/simulation/templates/units/kush_infantry_swordsman_b.xml
index 3da515f414..43fb706b60 100644
--- a/binaries/data/mods/public/simulation/templates/units/kush_infantry_swordsman_b.xml
+++ b/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>
diff --git a/binaries/data/mods/public/simulation/templates/units/kush_support_female_citizen.xml b/binaries/data/mods/public/simulation/templates/units/kush_support_female_citizen.xml
index 8736bad31e..7d15079502 100644
--- a/binaries/data/mods/public/simulation/templates/units/kush_support_female_citizen.xml
+++ b/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>