Index: binaries/data/mods/public/simulation/ai/petra/attackManager.js
===================================================================
--- binaries/data/mods/public/simulation/ai/petra/attackManager.js
+++ binaries/data/mods/public/simulation/ai/petra/attackManager.js
@@ -153,7 +153,7 @@
 		}
 	}
 
-	let bombers = gameState.updatingCollection("bombers", API3.Filters.byClassesOr(["BoltShooter", "Catapult"]), gameState.getOwnUnits());
+	let bombers = gameState.updatingCollection("bombers", API3.Filters.byClassesOr(["BoltShooter", "StoneThrower"]), gameState.getOwnUnits());
 	for (let ent of bombers.values())
 	{
 		if (!ent.position() || !ent.isIdle() || !ent.attackRange("Ranged"))
Index: binaries/data/mods/public/simulation/ai/petra/defenseManager.js
===================================================================
--- binaries/data/mods/public/simulation/ai/petra/defenseManager.js
+++ binaries/data/mods/public/simulation/ai/petra/defenseManager.js
@@ -431,7 +431,7 @@
 			return;
 		if (ent.hasClass("Support") || ent.attackTypes() === undefined)
 			return;
-		if (ent.hasClass("Catapult"))
+		if (ent.hasClass("StoneThrower"))
 			return;
 		if (ent.hasClass("FishingBoat") || ent.hasClass("Trader"))
 			return;
@@ -660,8 +660,8 @@
 			continue;
 		}
 
-		// try to garrison any attacked catapult
-		if (target.hasClass("Catapult") &&
+		// try to garrison any attacked stone thrower
+		if (target.hasClass("StoneThrower") &&
 			!target.getMetadata(PlayerID, "transport") && plan != -2 && plan != -3)
 		{
 			this.garrisonSiegeUnit(gameState, target);
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
@@ -1,18 +1,18 @@
 function Identity() {}
 
 Identity.prototype.Schema =
-	"<a:help>Specifies various names and values associated with the unit type, typically for GUI display to users.</a:help>" +
+	"<a:help>Specifies various names and values associated with the entity, typically for GUI display to users.</a:help>" +
 	"<a:example>" +
 		"<Civ>athen</Civ>" +
 		"<GenericName>Athenian Hoplite</GenericName>" +
 		"<SpecificName>Hoplī́tēs Athēnaïkós</SpecificName>" +
 		"<Icon>units/athen_infantry_spearman.png</Icon>" +
 	"</a:example>" +
-	"<element name='Civ' a:help='Civilisation that this unit is primarily associated with, typically a 4-letter code. Choices include: gaia (world objects), athen (Athenians), brit (Britons), cart (Carthaginians), gaul (Gauls), iber (Iberians), kush (Kushites), mace (Macedonians), maur (Mauryas), pers (Persians), ptol (Ptolemies), rome (Romans), sele (Seleucids), spart (Spartans)'>" +
+	"<element name='Civ' a:help='Civilization that this entity is primarily associated with, typically a 4-letter code. Choices include: gaia (world objects), athen (Athenians), brit (Britons), cart (Carthaginians), gaul (Gauls), iber (Iberians), kush (Kushites), mace (Macedonians), maur (Mauryas), pers (Persians), ptol (Ptolemies), rome (Romans), sele (Seleucids), skirm (skirmish map placeholders), spart (Spartans).'>" +
 		"<text/>" +
 	"</element>" +
 	"<optional>" +
-		"<element name='Lang' a:help='Unit language for voices'>" +
+		"<element name='Lang' a:help='Unit language for voices.'>" +
 			"<text/>" +
 		"</element>" +
 	"</optional>" +
@@ -21,11 +21,11 @@
 			"<text/>" +
 		"</element>" +
 	"</optional>" +
-	"<element name='GenericName' a:help='Generic English-language name for this class of unit.'>" +
+	"<element name='GenericName' a:help='Generic English-language name for this entity.'>" +
 		"<text/>" +
 	"</element>" +
 	"<optional>" +
-		"<element name='SpecificName' a:help='Specific native-language name for this unit type.'>" +
+		"<element name='SpecificName' a:help='Specific native-language name for this entity.'>" +
 			"<text/>" +
 		"</element>" +
 	"</optional>" +
@@ -54,7 +54,7 @@
 		"</element>" +
 	"</optional>" +
 	"<optional>" +
-		"<element name='Classes' a:help='Optional list of space-separated classes applying to this entity. Choices include: Animal, Apadana, ArmyCamp, Ashoka, BarterMarket, Celt, CitizenSoldier, CivCentre, Colony, ConquestCritical, Defensive, Domestic, DropsiteFood, DropsiteMetal, DropsiteStone, DropsiteWood, FemaleCitizen, FishingBoat, ForestPlant, Fortress, GarrisonFortress, GarrisonTower, Gates, Human, Iberian, Immortal, Italian, Juggernaut, Kennel, Lighthouse, LongWall, MercenaryCamp, Naval, NavalMarket, Organic, Palace, Palisade, Player, PtolemyIV, SeaCreature, SiegeWall, SpecialBuilding, StoneWall, Structure, Syssiton, Theater, Tower, Unit'>" +
+		"<element name='Classes' a:help='Optional list of space-separated classes applying to this entity. Choices include: Animal, Apadana, ArmyCamp, Ashoka, BarterMarket, Celt, CitizenSoldier, CivCentre, Colony, ConquestCritical, Defensive, Domestic, DropsiteFood, DropsiteMetal, DropsiteStone, DropsiteWood, FemaleCitizen, FishingBoat, ForestPlant, Fortress, GarrisonFortress, GarrisonTower, Gates, Human, Iberian, Immortal, Italian, Juggernaut, Kennel, LandTrader, Lighthouse, LongWall, Mechanical, MercenaryCamp, Naval, NavalTrader, NavalMarket, Organic, Palace, Palisade, Player, PtolemyIV, SeaCreature, SiegeWall, SpecialBuilding, StoneWall, Structure, Syssiton, Theater, Tower, Unit.'>" +
 			"<attribute name='datatype'>" +
 				"<value>tokens</value>" +
 			"</attribute>" +
@@ -62,7 +62,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: Archer, Barracks, Blacksmith, BoltShooter, Camel, Catapult, Cavalry, Champion, Chariot, Citizen, City, Civic, CivilCentre, Corral, DefenseTower, Dock, Dog, Economic, Elephant, ElephantStable, Embassy, Farmstead, Field, Fireship, Healer, Hero, House, Infantry, Javelin, Maceman, Market, Mechanical, Melee, Mercenary, Military, Outpost, Pike, Ram, Range, Ranged, Relic, Resource, SentryTower, Ship, Shipyard, Siege, SiegeTower, Slave, Sling, Soldier, Spear, Stable, Storehouse, Support, Sword, Temple, Town, Trader, Village, Warship, Wonder, Worker, Workshop'>" +
+		"<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: Archer, Axeman, Barracks, Bireme, Blacksmith, BoltShooter, Camel, Cavalry, Champion, Chariot, Citizen, City, Civic, CivilCentre, Clubman, Corral, Crossbowman, DefenseTower, Dock, Dog, Economic, Elephant, ElephantStable, Embassy, Farmstead, Field, Fireship, Healer, Hero, House, Infantry, Javelinist, Maceman, Market, Melee, Mercenary, Military, Outpost, Pikeman, Quadrireme, Quinquereme, Ram, Range, Ranged, Relic, Resource, SentryTower, Ship, Shipyard, Siege, SiegeTower, Slave, Slinger, Soldier, Spearman, Stable, StoneThrower, Storehouse, Support, Swordsman, Temple, Town, Trader, Trireme, Village, Warship, Wonder, Worker, Workshop.'>" +
 			"<attribute name='datatype'>" +
 				"<value>tokens</value>" +
 			"</attribute>" +
Index: binaries/data/mods/public/simulation/components/TechnologyManager.js
===================================================================
--- binaries/data/mods/public/simulation/components/TechnologyManager.js
+++ binaries/data/mods/public/simulation/components/TechnologyManager.js
@@ -31,7 +31,7 @@
 
 	// This stores the modifications to unit stats from researched technologies
 	// Example data: {"ResourceGatherer/Rates/food.grain": [
-	//                     {"multiply": 1.15, "affects": ["FemaleCitizen", "Infantry Sword"]},
+	//                     {"multiply": 1.15, "affects": ["FemaleCitizen", "Infantry Swordsman"]},
 	//                     {"add": 2}
 	//                 ]}
 	this.modifications = {};
Index: binaries/data/mods/public/simulation/components/tests/test_Identity.js
===================================================================
--- binaries/data/mods/public/simulation/components/tests/test_Identity.js
+++ binaries/data/mods/public/simulation/components/tests/test_Identity.js
@@ -31,7 +31,7 @@
 		" good as a cheap siege weapon.",
 	"Rank": "Basic",
 	"Classes": { "_string": "CitizenSoldier Human Organic" },
-	"VisibleClasses": { "_string": "Javelin" },
+	"VisibleClasses": { "_string": "Javelinist" },
 	"Formations": { "_string": "special/formations/skirmish" },
 	"Icon": "units/iber_infantry_javelinist.png",
 	"RequiredTechnology": "phase_town"
@@ -41,8 +41,8 @@
 TS_ASSERT_EQUALS(cmpIdentity.GetLang(), "iberian");
 TS_ASSERT_EQUALS(cmpIdentity.GetGender(), "female");
 TS_ASSERT_EQUALS(cmpIdentity.GetRank(), "Basic");
-TS_ASSERT_UNEVAL_EQUALS(cmpIdentity.GetClassesList(), ["CitizenSoldier", "Human", "Organic", "Javelin", "Basic"]);
-TS_ASSERT_UNEVAL_EQUALS(cmpIdentity.GetVisibleClassesList(), ["Javelin"]);
+TS_ASSERT_UNEVAL_EQUALS(cmpIdentity.GetClassesList(), ["CitizenSoldier", "Human", "Organic", "Javelinist", "Basic"]);
+TS_ASSERT_UNEVAL_EQUALS(cmpIdentity.GetVisibleClassesList(), ["Javelinist"]);
 TS_ASSERT_EQUALS(cmpIdentity.HasClass("CitizenSoldier"), true);
 TS_ASSERT_EQUALS(cmpIdentity.HasClass("Female"), false);
 TS_ASSERT_UNEVAL_EQUALS(cmpIdentity.GetFormationsList(), ["special/formations/skirmish"]);
Index: binaries/data/mods/public/simulation/components/tests/test_Technologies.js
===================================================================
--- binaries/data/mods/public/simulation/components/tests/test_Technologies.js
+++ binaries/data/mods/public/simulation/components/tests/test_Technologies.js
@@ -514,25 +514,25 @@
 	"modifications": [{
 		"value": "ResourceGatherer/Rates/food.grain",
 		"multiply": 15,
-		"affects": "Spear Sword"
+		"affects": "Spearman Swordsman"
 	},
 	{
 		"value": "ResourceGatherer/Rates/food.meat",
 		"multiply": 10
 	}],
-	"affects": ["Female", "CitizenSoldier Melee"]
+	"affects": ["FemaleCitizen", "CitizenSoldier Melee"]
 };
 let techMods = {
 	"ResourceGatherer/Rates/food.grain": [{
 		"affects": [
-			["Female", "Spear", "Sword"],
-			["CitizenSoldier", "Melee", "Spear", "Sword"]
+			["FemaleCitizen", "Spearman", "Swordsman"],
+			["CitizenSoldier", "Melee", "Spearman", "Swordsman"]
 		],
 		"multiply": 15
 	}],
 	"ResourceGatherer/Rates/food.meat": [{
 		"affects": [
-			["Female"],
+			["FemaleCitizen"],
 			["CitizenSoldier", "Melee"]
 		],
 		"multiply": 10
@@ -544,37 +544,37 @@
 	"modifications": [{
 		"value": "ResourceGatherer/Rates/food.grain",
 		"multiply": 15,
-		"affects": "Spear"
+		"affects": "Spearman"
 	},
 	{
 		"value": "ResourceGatherer/Rates/food.grain",
 		"multiply": 15,
-		"affects": "Sword"
+		"affects": "Swordsman"
 	},
 	{
 		"value": "ResourceGatherer/Rates/food.meat",
 		"multiply": 10
 	}],
-	"affects": ["Female", "CitizenSoldier Melee"]
+	"affects": ["FemaleCitizen", "CitizenSoldier Melee"]
 };
 techMods = {
 	"ResourceGatherer/Rates/food.grain": [{
 		"affects": [
-			["Female", "Spear"],
-			["CitizenSoldier", "Melee", "Spear"]
+			["FemaleCitizen", "Spearman"],
+			["CitizenSoldier", "Melee", "Spearman"]
 		],
 		"multiply": 15
 	},
 	{
 		"affects": [
-			["Female", "Sword"],
-			["CitizenSoldier", "Melee", "Sword"]
+			["FemaleCitizen", "Swordsman"],
+			["CitizenSoldier", "Melee", "Swordsman"]
 		],
 		"multiply": 15
 	}],
 	"ResourceGatherer/Rates/food.meat": [{
 		"affects": [
-			["Female"],
+			["FemaleCitizen"],
 			["CitizenSoldier", "Melee"]
 		],
 		"multiply": 10
Index: binaries/data/mods/public/simulation/data/auras/teambonuses/iber_player_teambonus.json
===================================================================
--- binaries/data/mods/public/simulation/data/auras/teambonuses/iber_player_teambonus.json
+++ binaries/data/mods/public/simulation/data/auras/teambonuses/iber_player_teambonus.json
@@ -1,6 +1,6 @@
 {
 	"type": "global",
-	"affects": ["CitizenSoldier Javelin"],
+	"affects": ["CitizenSoldier Javelinist"],
 	"affectedPlayers": ["ExclusiveMutualAlly"],
 	"modifications": [
 		{ "value": "Cost/Resources/food", "multiply": 0.8 },
Index: binaries/data/mods/public/simulation/data/auras/teambonuses/spart_player_teambonus.json
===================================================================
--- binaries/data/mods/public/simulation/data/auras/teambonuses/spart_player_teambonus.json
+++ binaries/data/mods/public/simulation/data/auras/teambonuses/spart_player_teambonus.json
@@ -1,6 +1,6 @@
 {
 	"type": "global",
-	"affects": ["CitizenSoldier Spear Infantry"],
+	"affects": ["CitizenSoldier Infantry Spearman"],
 	"affectedPlayers": ["ExclusiveMutualAlly"],
 	"modifications": [
 		{ "value": "Health/Max", "multiply": 1.10 }
Index: binaries/data/mods/public/simulation/data/auras/units/catafalques/brit_catafalque_2.json
===================================================================
--- binaries/data/mods/public/simulation/data/auras/units/catafalques/brit_catafalque_2.json
+++ binaries/data/mods/public/simulation/data/auras/units/catafalques/brit_catafalque_2.json
@@ -1,6 +1,6 @@
 {
 	"type": "global",
-	"affects": ["Javelin"],
+	"affects": ["Javelinist"],
 	"modifications": [
 		{ "value": "Attack/Ranged/MaxRange", "multiply": 1.2 }
 	],
Index: binaries/data/mods/public/simulation/data/auras/units/catafalques/spart_catafalque_1.json
===================================================================
--- binaries/data/mods/public/simulation/data/auras/units/catafalques/spart_catafalque_1.json
+++ binaries/data/mods/public/simulation/data/auras/units/catafalques/spart_catafalque_1.json
@@ -1,6 +1,6 @@
 {
 	"type": "global",
-	"affects": ["CitizenSoldier Spear Infantry"],
+	"affects": ["CitizenSoldier Infantry Spearman"],
 	"modifications": [
 		{ "value": "Cost/Resources/food", "multiply": 0.9 },
 		{ "value": "Cost/Resources/wood", "multiply": 0.9 },
Index: binaries/data/mods/public/simulation/data/auras/units/catafalques/spart_catafalque_2.json
===================================================================
--- binaries/data/mods/public/simulation/data/auras/units/catafalques/spart_catafalque_2.json
+++ binaries/data/mods/public/simulation/data/auras/units/catafalques/spart_catafalque_2.json
@@ -1,6 +1,6 @@
 {
 	"type": "global",
-	"affects": ["Champion Spear Infantry"],
+	"affects": ["Champion Infantry Spearman"],
 	"modifications": [
 		{ "value": "Cost/Resources/food", "multiply": 0.95 },
 		{ "value": "Cost/Resources/wood", "multiply": 0.95 },
Index: binaries/data/mods/public/simulation/data/auras/units/heroes/athen_hero_iphicrates_2.json
===================================================================
--- binaries/data/mods/public/simulation/data/auras/units/heroes/athen_hero_iphicrates_2.json
+++ binaries/data/mods/public/simulation/data/auras/units/heroes/athen_hero_iphicrates_2.json
@@ -1,6 +1,6 @@
 {
 	"type": "global",
-	"affects": ["Javelin Infantry"],
+	"affects": ["Infantry Javelinist"],
 	"modifications": [
 		{ "value": "UnitMotion/WalkSpeed", "multiply": 1.15 }
 	],
Index: binaries/data/mods/public/simulation/data/auras/units/heroes/spart_hero_brasidas.json
===================================================================
--- binaries/data/mods/public/simulation/data/auras/units/heroes/spart_hero_brasidas.json
+++ binaries/data/mods/public/simulation/data/auras/units/heroes/spart_hero_brasidas.json
@@ -1,7 +1,7 @@
 {
 	"type": "range",
 	"radius": 60,
-	"affects": ["Javelin Infantry Citizen"],
+	"affects": ["CitizenSoldier Infantry Javelinist"],
 	"modifications": [
 		{ "value": "Attack/Ranged/Pierce", "multiply": 1.25 },
 		{ "value": "Armour/Pierce", "add": 1 },
Index: binaries/data/mods/public/simulation/data/auras/units/heroes/spart_hero_leonidas.json
===================================================================
--- binaries/data/mods/public/simulation/data/auras/units/heroes/spart_hero_leonidas.json
+++ binaries/data/mods/public/simulation/data/auras/units/heroes/spart_hero_leonidas.json
@@ -1,7 +1,7 @@
 {
 	"type": "range",
 	"radius": 30,
-	"affects": ["Spear"],
+	"affects": ["Spearman"],
 	"modifications": [
 		{ "value": "Attack/Melee/Hack", "multiply": 1.25 },
 		{ "value": "Attack/Melee/Pierce", "multiply": 1.25 },
Index: binaries/data/mods/public/simulation/data/technologies/armor_infantryspearmen_pierce_01.json
===================================================================
--- binaries/data/mods/public/simulation/data/technologies/armor_infantryspearmen_pierce_01.json
+++ binaries/data/mods/public/simulation/data/technologies/armor_infantryspearmen_pierce_01.json
@@ -16,6 +16,6 @@
 	"researchTime": 40,
 	"tooltip": "Infantry Spearmen +2 Pierce Armor Levels.",
 	"modifications": [{"value": "Armour/Pierce", "add": 2.0}],
-	"affects": ["Infantry Spear"],
+	"affects": ["Infantry Spearman"],
 	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }
Index: binaries/data/mods/public/simulation/data/technologies/armor_infantryspearmen_pierce_02.json
===================================================================
--- binaries/data/mods/public/simulation/data/technologies/armor_infantryspearmen_pierce_02.json
+++ binaries/data/mods/public/simulation/data/technologies/armor_infantryspearmen_pierce_02.json
@@ -16,6 +16,6 @@
 	"researchTime": 40,
 	"tooltip": "Infantry Spearmen +1 Pierce Armor Level.",
 	"modifications": [{"value": "Armour/Pierce", "add": 1.0}],
-	"affects": ["Infantry Spear"],
+	"affects": ["Infantry Spearman"],
 	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }
Index: binaries/data/mods/public/simulation/data/technologies/armor_infantryspearmen_pierce_03.json
===================================================================
--- binaries/data/mods/public/simulation/data/technologies/armor_infantryspearmen_pierce_03.json
+++ binaries/data/mods/public/simulation/data/technologies/armor_infantryspearmen_pierce_03.json
@@ -17,6 +17,6 @@
 	"tooltip": "Infantry Spearmen +1 Pierce Armor Level.",
 	"modifications": [
 		{"value": "Armour/Pierce", "add": 1.0}],
-	"affects": ["Infantry Spear"],
+	"affects": ["Infantry Spearman"],
 	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }
Index: binaries/data/mods/public/simulation/data/technologies/attack_steel_working.json
===================================================================
--- binaries/data/mods/public/simulation/data/technologies/attack_steel_working.json
+++ binaries/data/mods/public/simulation/data/technologies/attack_steel_working.json
@@ -15,6 +15,6 @@
 		{ "value": "Attack/Melee/Hack", "multiply": 1.2 },
 		{ "value": "Attack/Melee/Crush", "multiply": 1.2 }
 	],
-	"affects": ["Sword", "Maceman"],
+	"affects": ["Swordsman", "Maceman"],
 	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }
Index: binaries/data/mods/public/simulation/data/technologies/hellenes/attack_inf_spearfighting.json
===================================================================
--- binaries/data/mods/public/simulation/data/technologies/hellenes/attack_inf_spearfighting.json
+++ binaries/data/mods/public/simulation/data/technologies/hellenes/attack_inf_spearfighting.json
@@ -13,6 +13,6 @@
 	"researchTime": 40,
 	"tooltip": "Spearmen +2 hack attack.",
 	"modifications": [{"value": "Attack/Melee/Hack", "add": 2.0}],
-	"affects": ["Infantry Spear"],
+	"affects": ["Infantry Spearman"],
 	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }
Index: binaries/data/mods/public/simulation/data/technologies/hellenes/spartans_agoge.json
===================================================================
--- binaries/data/mods/public/simulation/data/technologies/hellenes/spartans_agoge.json
+++ binaries/data/mods/public/simulation/data/technologies/hellenes/spartans_agoge.json
@@ -11,6 +11,6 @@
 		{"value": "Health/Max", "multiply": 1.25},
 		{"value": "Cost/BuildTime", "multiply": 1.1}
 	],
-	"affects": ["Spear Infantry"],
+	"affects": ["Infantry Spearman"],
 	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
-}
\ No newline at end of file
+}
Index: binaries/data/mods/public/simulation/data/technologies/melee_inf_spearheads.json
===================================================================
--- binaries/data/mods/public/simulation/data/technologies/melee_inf_spearheads.json
+++ binaries/data/mods/public/simulation/data/technologies/melee_inf_spearheads.json
@@ -15,6 +15,6 @@
 	"researchTime": 40,
 	"tooltip": "All Spear units +2 hack attack.",
 	"modifications": [{"value": "Attack/Melee/Hack", "add": 2.0}],
-	"affects": ["Spear"],
+	"affects": ["Spearman"],
 	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }
Index: binaries/data/mods/public/simulation/data/technologies/ranged_inf_skirmishers.json
===================================================================
--- binaries/data/mods/public/simulation/data/technologies/ranged_inf_skirmishers.json
+++ binaries/data/mods/public/simulation/data/technologies/ranged_inf_skirmishers.json
@@ -19,6 +19,6 @@
 		{"value": "Attack/Ranged/Pierce", "add": 2.0},
 		{"value": "Attack/Ranged/MaxRange", "add": 4.0},
 		{"value": "Vision/Range", "add": 4.0}],
-	"affects": ["Javelin"],
+	"affects": ["Javelinist"],
 	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }
Index: binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_spearman.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_spearman.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_spearman.xml
@@ -20,7 +20,7 @@
     </Resources>
   </Cost>
   <Identity>
-    <VisibleClasses datatype="tokens">Spear</VisibleClasses>
+    <VisibleClasses datatype="tokens">Spearman</VisibleClasses>
     <GenericName>Cavalry Spearman</GenericName>
     <Tooltip>Counters: 1.5x vs. Cavalry.</Tooltip>
   </Identity>
Index: binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_swordsman.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_swordsman.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_swordsman.xml
@@ -19,7 +19,7 @@
     </Resources>
   </Cost>
   <Identity>
-    <VisibleClasses datatype="tokens">Sword</VisibleClasses>
+    <VisibleClasses datatype="tokens">Swordsman</VisibleClasses>
     <GenericName>Cavalry Swordsman</GenericName>
   </Identity>
   <Loot>
Index: binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_javelinist.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_javelinist.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_javelinist.xml
@@ -21,7 +21,7 @@
     </Resources>
   </Cost>
   <Identity>
-    <VisibleClasses datatype="tokens">Javelin</VisibleClasses>
+    <VisibleClasses datatype="tokens">Javelinist</VisibleClasses>
     <GenericName>Cavalry Skirmisher</GenericName>
   </Identity>
 </Entity>
Index: binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_javelinist.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_javelinist.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_javelinist.xml
@@ -25,7 +25,7 @@
     </Resources>
   </Cost>
   <Identity>
-    <VisibleClasses datatype="tokens">Ranged Javelin</VisibleClasses>
+    <VisibleClasses datatype="tokens">Ranged Javelinist</VisibleClasses>
     <GenericName>Champion Cavalry Skirmisher</GenericName>
     <Formations datatype="tokens">
       special/formations/skirmish
Index: binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_spearman.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_spearman.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_spearman.xml
@@ -30,7 +30,7 @@
     <Max>300</Max>
   </Health>
   <Identity>
-    <VisibleClasses datatype="tokens">Melee Spear</VisibleClasses>
+    <VisibleClasses datatype="tokens">Melee Spearman</VisibleClasses>
     <GenericName>Champion Cavalry Spearman</GenericName>
     <Tooltip>Counters: 1.5x vs. Cavalry.</Tooltip>
   </Identity>
Index: binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_swordsman.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_swordsman.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_swordsman.xml
@@ -25,7 +25,7 @@
     <Max>300</Max>
   </Health>
   <Identity>
-    <VisibleClasses datatype="tokens">Melee Sword</VisibleClasses>
+    <VisibleClasses datatype="tokens">Melee Swordsman</VisibleClasses>
     <GenericName>Champion Cavalry Swordsman</GenericName>
   </Identity>
   <UnitMotion>
Index: binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_javelinist.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_javelinist.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_javelinist.xml
@@ -28,7 +28,7 @@
     <Max>120</Max>
   </Health>
   <Identity>
-    <VisibleClasses datatype="tokens">Ranged Javelin</VisibleClasses>
+    <VisibleClasses datatype="tokens">Ranged Javelinist</VisibleClasses>
     <GenericName>Champion Skirmisher</GenericName>
     <Formations datatype="tokens">
       special/formations/skirmish
Index: binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_pikeman.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_pikeman.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_pikeman.xml
@@ -31,7 +31,7 @@
     <Max>200</Max>
   </Health>
   <Identity>
-    <VisibleClasses datatype="tokens">Melee Spear Pike</VisibleClasses>
+    <VisibleClasses datatype="tokens">Melee Pikeman</VisibleClasses>
     <GenericName>Champion Pikeman</GenericName>
     <Tooltip>Counters: 3x vs. Cavalry.</Tooltip>
     <Formations datatype="tokens">
Index: binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_spearman.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_spearman.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_spearman.xml
@@ -31,7 +31,7 @@
   </Health>
   <Identity>
     <GenericName>Champion Spearman</GenericName>
-    <VisibleClasses datatype="tokens">Melee Spear</VisibleClasses>
+    <VisibleClasses datatype="tokens">Melee Spearman</VisibleClasses>
     <Tooltip>Counters: 3x vs. Cavalry.</Tooltip>
     <Formations datatype="tokens">
       special/formations/testudo
Index: binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_swordsman.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_swordsman.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_swordsman.xml
@@ -25,7 +25,7 @@
     <Max>200</Max>
   </Health>
   <Identity>
-    <VisibleClasses datatype="tokens">Melee Sword</VisibleClasses>
+    <VisibleClasses datatype="tokens">Melee Swordsman</VisibleClasses>
     <GenericName>Champion Swordsman</GenericName>
     <Formations datatype="tokens">
       special/formations/testudo
Index: binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_javelinist.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_javelinist.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_javelinist.xml
@@ -31,7 +31,7 @@
       special/formations/skirmish
     </Formations>
     <GenericName>Hero Cavalry Skirmisher</GenericName>
-    <VisibleClasses datatype="tokens">Javelin Ranged</VisibleClasses>
+    <VisibleClasses datatype="tokens">Ranged Javelinist</VisibleClasses>
   </Identity>
   <UnitMotion>
     <WalkSpeed op="mul">1.05</WalkSpeed>
Index: binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_spearman.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_spearman.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_spearman.xml
@@ -22,7 +22,7 @@
     </Melee>
   </Attack>
   <Identity>
-    <VisibleClasses datatype="tokens">Melee Spear</VisibleClasses>
+    <VisibleClasses datatype="tokens">Melee Spearman</VisibleClasses>
     <GenericName>Hero Cavalry Spearman</GenericName>
     <Tooltip>Counters: 1.5x vs. Cavalry.</Tooltip>
   </Identity>
Index: binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_swordsman.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_swordsman.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_swordsman.xml
@@ -22,7 +22,7 @@
     </Resources>
   </Cost>
   <Identity>
-    <VisibleClasses datatype="tokens">Melee Sword</VisibleClasses>
+    <VisibleClasses datatype="tokens">Melee Swordsman</VisibleClasses>
     <GenericName>Hero Cavalry Swordsman</GenericName>
   </Identity>
   <UnitMotion>
Index: binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_javelinist.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_javelinist.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_javelinist.xml
@@ -20,7 +20,7 @@
     </Ranged>
   </Attack>
   <Identity>
-    <VisibleClasses datatype="tokens">Ranged Javelin</VisibleClasses>
+    <VisibleClasses datatype="tokens">Ranged Javelinist</VisibleClasses>
     <GenericName>Hero Skirmisher</GenericName>
     <Formations datatype="tokens">
       special/formations/skirmish
Index: binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_pikeman.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_pikeman.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_pikeman.xml
@@ -22,7 +22,7 @@
     </Melee>
   </Attack>
   <Identity>
-    <VisibleClasses datatype="tokens">Melee Spear Pike</VisibleClasses>
+    <VisibleClasses datatype="tokens">Melee Pikeman</VisibleClasses>
     <GenericName>Hero Pikeman</GenericName>
     <Tooltip>Counters: 3x vs. Cavalry.</Tooltip>
     <Formations datatype="tokens">
Index: binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_spearman.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_spearman.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_spearman.xml
@@ -22,7 +22,7 @@
     </Melee>
   </Attack>
   <Identity>
-    <VisibleClasses datatype="tokens">Melee Spear</VisibleClasses>
+    <VisibleClasses datatype="tokens">Melee Spearman</VisibleClasses>
     <GenericName>Hero Spearman</GenericName>
     <Tooltip>Counters: 3x vs. Cavalry.</Tooltip>
     <Formations datatype="tokens">
Index: binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_swordsman.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_swordsman.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_swordsman.xml
@@ -22,7 +22,7 @@
     </Resources>
   </Cost>
   <Identity>
-    <VisibleClasses datatype="tokens">Melee Sword</VisibleClasses>
+    <VisibleClasses datatype="tokens">Melee Swordsman</VisibleClasses>
     <GenericName>Hero Swordsman</GenericName>
   </Identity>
   <UnitMotion>
Index: binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_pikeman.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_pikeman.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_pikeman.xml
@@ -24,7 +24,7 @@
     </Resources>
   </Cost>
   <Identity>
-    <VisibleClasses datatype="tokens">Spear Pike</VisibleClasses>
+    <VisibleClasses datatype="tokens">Pikeman</VisibleClasses>
     <GenericName>Pikeman</GenericName>
     <Tooltip>Counters: 3x vs. Cavalry.</Tooltip>
     <Formations datatype="tokens">
Index: binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_spearman.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_spearman.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_spearman.xml
@@ -23,7 +23,7 @@
     </Resources>
   </Cost>
   <Identity>
-    <VisibleClasses datatype="tokens">Spear</VisibleClasses>
+    <VisibleClasses datatype="tokens">Spearman</VisibleClasses>
     <GenericName>Spearman</GenericName>
     <Tooltip>Counters: 3x vs. Cavalry.</Tooltip>
   </Identity>
Index: binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_swordsman.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_swordsman.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_swordsman.xml
@@ -19,7 +19,7 @@
     </Resources>
   </Cost>
   <Identity>
-    <VisibleClasses datatype="tokens">Sword</VisibleClasses>
+    <VisibleClasses datatype="tokens">Swordsman</VisibleClasses>
     <GenericName>Swordsman</GenericName>
   </Identity>
   <Loot>
Index: binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_javelinist.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_javelinist.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_javelinist.xml
@@ -25,7 +25,7 @@
     </Resources>
   </Cost>
   <Identity>
-    <VisibleClasses datatype="tokens">Javelin</VisibleClasses>
+    <VisibleClasses datatype="tokens">Javelinist</VisibleClasses>
     <GenericName>Skirmisher</GenericName>
   </Identity>
   <Loot>
Index: binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_slinger.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_slinger.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_slinger.xml
@@ -26,7 +26,7 @@
     </Resources>
   </Cost>
   <Identity>
-    <VisibleClasses datatype="tokens">Sling</VisibleClasses>
+    <VisibleClasses datatype="tokens">Slinger</VisibleClasses>
     <GenericName>Slinger</GenericName>
   </Identity>
   <Loot>
Index: binaries/data/mods/public/simulation/templates/template_unit_ship.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_ship.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_ship.xml
@@ -33,7 +33,8 @@
   <Identity>
     <GenericName>Ship</GenericName>
     <Formations disable=""/>
-    <VisibleClasses datatype="tokens">Mechanical Ship</VisibleClasses>
+    <Classes datatype="tokens">Mechanical</Classes>
+    <VisibleClasses datatype="tokens">Ship</VisibleClasses>
   </Identity>
   <Loot>
     <xp>60</xp>
Index: binaries/data/mods/public/simulation/templates/template_unit_ship_bireme.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_ship_bireme.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_ship_bireme.xml
@@ -51,7 +51,7 @@
   </Health>
   <Identity>
     <GenericName>Light Warship</GenericName>
-    <VisibleClasses datatype="tokens">Ranged Warship</VisibleClasses>
+    <VisibleClasses datatype="tokens">Ranged Warship Bireme</VisibleClasses>
     <RequiredTechnology>phase_town</RequiredTechnology>
     <Tooltip>Garrison units for transport and to increase firepower.</Tooltip>
   </Identity>
Index: binaries/data/mods/public/simulation/templates/template_unit_ship_fire.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_ship_fire.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_ship_fire.xml
@@ -39,7 +39,7 @@
   </Health>
   <Identity>
     <GenericName>Fire Ship</GenericName>
-    <VisibleClasses datatype="tokens">Fireship Melee Warship</VisibleClasses>
+    <VisibleClasses datatype="tokens">Melee Warship Fireship</VisibleClasses>
     <Tooltip>Rapidly drain the health of enemy ships. Slowly loses health due to being on fire, so use the Fire Ship quickly.</Tooltip>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
Index: binaries/data/mods/public/simulation/templates/template_unit_ship_fishing.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_ship_fishing.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_ship_fishing.xml
@@ -30,7 +30,8 @@
     <Pickup>true</Pickup>
   </GarrisonHolder>
   <Identity>
-    <Classes datatype="tokens">FishingBoat -ConquestCritical</Classes>
+    <Classes datatype="tokens">-ConquestCritical</Classes>
+    <VisibleClasses datatype="tokens">FishingBoat</VisibleClasses>
     <Formations disable=""/>
     <GenericName>Fishing Boat</GenericName>
     <Tooltip>Fish the waters for food.</Tooltip>
Index: binaries/data/mods/public/simulation/templates/template_unit_ship_merchant.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_ship_merchant.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_ship_merchant.xml
@@ -24,12 +24,12 @@
     <Max>400</Max>
   </Health>
   <Identity>
-    <Classes datatype="tokens">-ConquestCritical</Classes>
+    <Classes datatype="tokens">-ConquestCritical NavalTrader</Classes>
+    <VisibleClasses datatype="tokens">Trader Bribable</VisibleClasses>
     <Formations disable=""/>
     <GenericName>Merchantman</GenericName>
     <RequiredTechnology>phase_town</RequiredTechnology>
     <Tooltip>Trade between docks. Garrison a Trader aboard for additional profit (+20% for each garrisoned). Gather profitable aquatic treasures.</Tooltip>
-    <VisibleClasses datatype="tokens">Trader Bribable</VisibleClasses>
   </Identity>
   <Loot>
     <xp>25</xp>
Index: binaries/data/mods/public/simulation/templates/template_unit_ship_quinquereme.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_ship_quinquereme.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_ship_quinquereme.xml
@@ -31,7 +31,7 @@
     <DefaultArrowCount>1</DefaultArrowCount>
     <MaxArrowCount>10</MaxArrowCount>
     <GarrisonArrowMultiplier>1</GarrisonArrowMultiplier>
-    <GarrisonArrowClasses>Catapult</GarrisonArrowClasses>
+    <GarrisonArrowClasses>StoneThrower</GarrisonArrowClasses>
   </BuildingAI>
   <Cost>
     <Population>3</Population>
@@ -61,7 +61,7 @@
   <Identity>
     <GenericName>Heavy Warship</GenericName>
     <Tooltip>Garrison units for transport and to increase firepower.</Tooltip>
-    <VisibleClasses datatype="tokens">Ranged Warship</VisibleClasses>
+    <VisibleClasses datatype="tokens">Ranged Warship Quinquereme</VisibleClasses>
     <RequiredTechnology>phase_city</RequiredTechnology>
   </Identity>
   <Loot>
Index: binaries/data/mods/public/simulation/templates/template_unit_ship_trireme.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_ship_trireme.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_ship_trireme.xml
@@ -51,7 +51,7 @@
   </Health>
   <Identity>
     <GenericName>Medium Warship</GenericName>
-    <VisibleClasses datatype="tokens">Ranged Warship</VisibleClasses>
+    <VisibleClasses datatype="tokens">Ranged Warship Trireme</VisibleClasses>
     <RequiredTechnology>phase_town</RequiredTechnology>
     <Tooltip>Garrison units for transport and to increase firepower.</Tooltip>
   </Identity>
Index: binaries/data/mods/public/simulation/templates/template_unit_siege.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_siege.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_siege.xml
@@ -22,7 +22,8 @@
     <Unhealable>true</Unhealable>
   </Health>
   <Identity>
-    <VisibleClasses datatype="tokens">Mechanical Siege</VisibleClasses>
+    <Classes datatype="tokens">Mechanical</Classes>
+    <VisibleClasses datatype="tokens">Siege</VisibleClasses>
     <GenericName>Siege</GenericName>
     <RequiredTechnology>phase_city</RequiredTechnology>
   </Identity>
Index: binaries/data/mods/public/simulation/templates/template_unit_siege_boltshooter.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_siege_boltshooter.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_siege_boltshooter.xml
@@ -47,7 +47,7 @@
   </Health>
   <Identity>
     <GenericName>Bolt Shooter</GenericName>
-    <VisibleClasses datatype="tokens">BoltShooter Ranged</VisibleClasses>
+    <VisibleClasses datatype="tokens">Ranged BoltShooter</VisibleClasses>
   </Identity>
   <Loot>
     <xp>200</xp>
Index: binaries/data/mods/public/simulation/templates/template_unit_siege_stonethrower.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_siege_stonethrower.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_siege_stonethrower.xml
@@ -48,7 +48,7 @@
   </Health>
   <Identity>
     <GenericName>Siege Catapult</GenericName>
-    <VisibleClasses datatype="tokens">Catapult Ranged</VisibleClasses>
+    <VisibleClasses datatype="tokens">Ranged StoneThrower</VisibleClasses>
   </Identity>
   <Loot>
     <xp>300</xp>
Index: binaries/data/mods/public/simulation/templates/template_unit_siege_tower.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_siege_tower.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_siege_tower.xml
@@ -55,7 +55,7 @@
   </Health>
   <Identity>
     <GenericName>Siege Tower</GenericName>
-    <VisibleClasses datatype="tokens">SiegeTower Ranged</VisibleClasses>
+    <VisibleClasses datatype="tokens">Ranged SiegeTower</VisibleClasses>
     <Tooltip>Garrison units for transport and to increase firepower.</Tooltip>
   </Identity>
   <Selectable>
Index: binaries/data/mods/public/simulation/templates/template_unit_support_trader.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_support_trader.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_support_trader.xml
@@ -11,7 +11,7 @@
     <Max>100</Max>
   </Health>
   <Identity>
-    <Classes datatype="tokens">-ConquestCritical</Classes>
+    <Classes datatype="tokens">-ConquestCritical LandTrader</Classes>
     <VisibleClasses datatype="tokens">Trader Bribable</VisibleClasses>
     <GenericName>Trader</GenericName>
     <Tooltip>Trade resources between your own markets and those of your allies.</Tooltip>
Index: binaries/data/mods/public/simulation/templates/units/athen_champion_ranged_gastraphetes.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/athen_champion_ranged_gastraphetes.xml
+++ binaries/data/mods/public/simulation/templates/units/athen_champion_ranged_gastraphetes.xml
@@ -21,6 +21,7 @@
     <GenericName>Greek Gastraphetes</GenericName>
     <SpecificName>Toxótēs Skythikós</SpecificName>
     <Icon>units/athen_champion_ranged.png</Icon>
+    <VisibleClasses datatype="tokens">-Archer Crossbowman</VisibleClasses>
   </Identity>
   <VisualActor>
     <Actor>units/athenians/infantry_crossbowman_c.xml</Actor>
Index: binaries/data/mods/public/simulation/templates/units/kush_champion_infantry_apedemak.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/kush_champion_infantry_apedemak.xml
+++ binaries/data/mods/public/simulation/templates/units/kush_champion_infantry_apedemak.xml
@@ -23,7 +23,7 @@
     <GenericName>Meroitic Temple Guard</GenericName>
     <SpecificName>rs ‘Iprmk</SpecificName>
     <Tooltip>Armor-piercing Axes: Counters 1.3x vs. Champions and Heroes.</Tooltip>
-    <VisibleClasses datatype="tokens">Axe</VisibleClasses>
+    <VisibleClasses datatype="tokens">-Swordsman Axeman</VisibleClasses>
     <Classes datatype="tokens">ApedemakGuard</Classes>
     <Icon>units/kush_champion_apedemak.png</Icon>
   </Identity>
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
@@ -31,7 +31,7 @@
     <SpecificName>nhw Noba</SpecificName>
     <Icon>units/kush_infantry_clubman.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
-    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
+    <VisibleClasses datatype="tokens">-Swordsman Clubman Mercenary</VisibleClasses>
   </Identity>
   <Promotion>
     <Entity>units/kush_infantry_clubman_a</Entity>