diff --git a/binaries/data/mods/public/simulation/ai/petra/attackManager.js b/binaries/data/mods/public/simulation/ai/petra/attackManager.js
index 66a3f31491..c9ddbe25d3 100644
--- a/binaries/data/mods/public/simulation/ai/petra/attackManager.js
+++ b/binaries/data/mods/public/simulation/ai/petra/attackManager.js
@@ -151,7 +151,7 @@ PETRA.AttackManager.prototype.assignBombers = function(gameState)
 		}
 	}
 
-	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"))
diff --git a/binaries/data/mods/public/simulation/ai/petra/defenseManager.js b/binaries/data/mods/public/simulation/ai/petra/defenseManager.js
index 7285602987..2a9ed7ee97 100644
--- a/binaries/data/mods/public/simulation/ai/petra/defenseManager.js
+++ b/binaries/data/mods/public/simulation/ai/petra/defenseManager.js
@@ -428,7 +428,7 @@ PETRA.DefenseManager.prototype.assignDefenders = function(gameState)
 			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;
@@ -649,7 +649,7 @@ PETRA.DefenseManager.prototype.checkEvents = function(gameState, events)
 			continue;
 		}
 
-		// try to garrison any attacked support unit if low healthlevel
+		// Try to garrison any attacked support unit if low health.
 		if (target.hasClass("Support") && target.healthLevel() < this.Config.garrisonHealthLevel.medium &&
 			!target.getMetadata(PlayerID, "transport") && plan != -2 && plan != -3)
 		{
@@ -657,8 +657,8 @@ PETRA.DefenseManager.prototype.checkEvents = function(gameState, events)
 			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);
@@ -673,7 +673,7 @@ PETRA.DefenseManager.prototype.checkEvents = function(gameState, events)
 
 		if (target.hasClass("Unit") && attacker.hasClass("Unit"))
 		{
-			// Consider if we should retaliate or continue our task
+			// Consider whether we should retaliate or continue our task.
 			if (target.hasClass("Support") || target.attackTypes() === undefined)
 				continue;
 			let orderData = target.unitAIOrderData();
diff --git a/binaries/data/mods/public/simulation/components/Identity.js b/binaries/data/mods/public/simulation/components/Identity.js
index 4063f501f2..8e204595c0 100644
--- a/binaries/data/mods/public/simulation/components/Identity.js
+++ b/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 unit is primarily associated with, typically a 4-letter code. Choices include: gaia (world objects), skirm (skirmish map placeholders), 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).'>" +
 		"<text/>" +
 	"</element>" +
 	"<optional>" +
-		"<element name='Lang' a:help='Unit language for voices'>" +
+		"<element name='Lang' a:help='Unit language for voices.'>" +
 			"<text/>" +
 		"</element>" +
 	"</optional>" +
@@ -24,11 +24,11 @@ Identity.prototype.Schema =
 			"<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>" +
@@ -57,7 +57,7 @@ Identity.prototype.Schema =
 		"</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, Lighthouse, LongWall, MercenaryCamp, Naval, NavalMarket, Organic, Palace, Palisade, Player, PtolemyIV, SeaCreature, SiegeWall, SpecialBuilding, StoneWall, Structure, Syssiton, Theater, Tower, Unit.'>" +
 			"<attribute name='datatype'>" +
 				"<value>tokens</value>" +
 			"</attribute>" +
@@ -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: 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, 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, Melee, Market, 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>" +
@@ -73,7 +73,7 @@ Identity.prototype.Schema =
 		"</element>" +
 	"</optional>" +
 	"<optional>" +
-		"<element name='Formations' a:help='Optional list of space-separated formations this unit is allowed to use. Choices include: Scatter, Box, ColumnClosed, LineClosed, ColumnOpen, LineOpen, Flank, Skirmish, Wedge, Testudo, Phalanx, Syntagma, BattleLine'>" +
+		"<element name='Formations' a:help='Optional list of space-separated formations this unit is allowed to use. Choices include: Scatter, Box, ColumnClosed, LineClosed, ColumnOpen, LineOpen, Flank, Skirmish, Wedge, Testudo, Phalanx, Syntagma, BattleLine.'>" +
 			"<attribute name='datatype'>" +
 				"<value>tokens</value>" +
 			"</attribute>" +
diff --git a/binaries/data/mods/public/simulation/components/tests/test_Identity.js b/binaries/data/mods/public/simulation/components/tests/test_Identity.js
index 7fce36f8e9..5c4f628305 100644
--- a/binaries/data/mods/public/simulation/components/tests/test_Identity.js
+++ b/binaries/data/mods/public/simulation/components/tests/test_Identity.js
@@ -32,7 +32,7 @@ cmpIdentity = ConstructComponent(6, "Identity", {
 		" 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"
@@ -42,8 +42,8 @@ TS_ASSERT_EQUALS(cmpIdentity.GetCiv(), "iber");
 TS_ASSERT_EQUALS(cmpIdentity.GetLang(), "iberian");
 TS_ASSERT_EQUALS(cmpIdentity.GetPhenotype(), "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"]);
diff --git a/binaries/data/mods/public/simulation/components/tests/test_Technologies_reqs.js b/binaries/data/mods/public/simulation/components/tests/test_Technologies_reqs.js
index 9c5edb6d1b..a09301b3f9 100644
--- a/binaries/data/mods/public/simulation/components/tests/test_Technologies_reqs.js
+++ b/binaries/data/mods/public/simulation/components/tests/test_Technologies_reqs.js
@@ -514,25 +514,25 @@ template = {
 	"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 @@ template = {
 	"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
diff --git a/binaries/data/mods/public/simulation/data/auras/teambonuses/iber_player_teambonus.json b/binaries/data/mods/public/simulation/data/auras/teambonuses/iber_player_teambonus.json
index 7d542e9749..caf928f2ad 100644
--- a/binaries/data/mods/public/simulation/data/auras/teambonuses/iber_player_teambonus.json
+++ b/binaries/data/mods/public/simulation/data/auras/teambonuses/iber_player_teambonus.json
@@ -1,6 +1,6 @@
 {
 	"type": "global",
-	"affects": ["Citizen Javelin"],
+	"affects": ["Citizen Javelinist"],
 	"affectedPlayers": ["ExclusiveMutualAlly"],
 	"modifications": [
 		{ "value": "Cost/Resources/food", "multiply": 0.8 },
diff --git a/binaries/data/mods/public/simulation/data/auras/teambonuses/spart_player_teambonus.json b/binaries/data/mods/public/simulation/data/auras/teambonuses/spart_player_teambonus.json
index a3f611ad7d..ca195e0d56 100644
--- a/binaries/data/mods/public/simulation/data/auras/teambonuses/spart_player_teambonus.json
+++ b/binaries/data/mods/public/simulation/data/auras/teambonuses/spart_player_teambonus.json
@@ -1,6 +1,6 @@
 {
 	"type": "global",
-	"affects": ["Citizen Infantry Spear"],
+	"affects": ["Citizen Infantry Spearman"],
 	"affectedPlayers": ["ExclusiveMutualAlly"],
 	"modifications": [
 		{ "value": "Health/Max", "multiply": 1.10 }
diff --git a/binaries/data/mods/public/simulation/data/auras/units/catafalques/brit_catafalque_2.json b/binaries/data/mods/public/simulation/data/auras/units/catafalques/brit_catafalque_2.json
index 220cf6502b..fbb0b3f9dc 100644
--- a/binaries/data/mods/public/simulation/data/auras/units/catafalques/brit_catafalque_2.json
+++ b/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 }
 	],
diff --git a/binaries/data/mods/public/simulation/data/auras/units/catafalques/spart_catafalque_1.json b/binaries/data/mods/public/simulation/data/auras/units/catafalques/spart_catafalque_1.json
index f5e569ab55..c9340508e8 100644
--- a/binaries/data/mods/public/simulation/data/auras/units/catafalques/spart_catafalque_1.json
+++ b/binaries/data/mods/public/simulation/data/auras/units/catafalques/spart_catafalque_1.json
@@ -1,6 +1,6 @@
 {
 	"type": "global",
-	"affects": ["Citizen Infantry Spear"],
+	"affects": ["Citizen Infantry Spearman"],
 	"modifications": [
 		{ "value": "Cost/Resources/food", "multiply": 0.9 },
 		{ "value": "Cost/Resources/wood", "multiply": 0.9 },
diff --git a/binaries/data/mods/public/simulation/data/auras/units/catafalques/spart_catafalque_2.json b/binaries/data/mods/public/simulation/data/auras/units/catafalques/spart_catafalque_2.json
index 59b45c8b22..9310b66a1d 100644
--- a/binaries/data/mods/public/simulation/data/auras/units/catafalques/spart_catafalque_2.json
+++ b/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 },
diff --git a/binaries/data/mods/public/simulation/data/auras/units/heroes/athen_hero_iphicrates_2.json b/binaries/data/mods/public/simulation/data/auras/units/heroes/athen_hero_iphicrates_2.json
index a466516ad1..d82198329f 100644
--- a/binaries/data/mods/public/simulation/data/auras/units/heroes/athen_hero_iphicrates_2.json
+++ b/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 }
 	],
diff --git a/binaries/data/mods/public/simulation/data/auras/units/heroes/mace_hero_craterus.json b/binaries/data/mods/public/simulation/data/auras/units/heroes/mace_hero_craterus.json
index 162219b006..3b69266f68 100644
--- a/binaries/data/mods/public/simulation/data/auras/units/heroes/mace_hero_craterus.json
+++ b/binaries/data/mods/public/simulation/data/auras/units/heroes/mace_hero_craterus.json
@@ -1,7 +1,7 @@
 {
 	"type": "range",
 	"radius": 60,
-	"affects": ["Infantry Pike"],
+	"affects": ["Infantry Pikeman"],
 	"modifications": [
 		{ "value": "Attack/Melee/Damage/Hack", "multiply": 1.2 },
 		{ "value": "Attack/Melee/Damage/Pierce", "multiply": 1.2 },
diff --git a/binaries/data/mods/public/simulation/data/auras/units/heroes/ptol_hero_ptolemy_IV.json b/binaries/data/mods/public/simulation/data/auras/units/heroes/ptol_hero_ptolemy_IV.json
index a2cd8069c4..429147a94c 100644
--- a/binaries/data/mods/public/simulation/data/auras/units/heroes/ptol_hero_ptolemy_IV.json
+++ b/binaries/data/mods/public/simulation/data/auras/units/heroes/ptol_hero_ptolemy_IV.json
@@ -1,7 +1,7 @@
 {
 	"type": "range",
 	"radius": 60,
-	"affects": ["Pike"],
+	"affects": ["Pikeman"],
 	"modifications": [
 		{ "value": "Health/Max", "multiply": 1.40 }
 	],
diff --git a/binaries/data/mods/public/simulation/data/auras/units/heroes/spart_hero_brasidas.json b/binaries/data/mods/public/simulation/data/auras/units/heroes/spart_hero_brasidas.json
index 89952bd899..4dc75cb570 100644
--- a/binaries/data/mods/public/simulation/data/auras/units/heroes/spart_hero_brasidas.json
+++ b/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": ["Citizen Infantry Javelinist"],
 	"modifications": [
 		{ "value": "Attack/Ranged/Damage/Pierce", "multiply": 1.25 },
 		{ "value": "Armour/Pierce", "add": 1 },
diff --git a/binaries/data/mods/public/simulation/data/auras/units/heroes/spart_hero_leonidas.json b/binaries/data/mods/public/simulation/data/auras/units/heroes/spart_hero_leonidas.json
index 7070cf4ab0..a5e9bed5f8 100644
--- a/binaries/data/mods/public/simulation/data/auras/units/heroes/spart_hero_leonidas.json
+++ b/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/Damage/Hack", "multiply": 1.25 },
 		{ "value": "Attack/Melee/Damage/Pierce", "multiply": 1.25 },
diff --git a/binaries/data/mods/public/simulation/data/technologies/armor_infantryspearmen_pierce_01.json b/binaries/data/mods/public/simulation/data/technologies/armor_infantryspearmen_pierce_01.json
index 61a9625e7b..c99aaee50a 100644
--- a/binaries/data/mods/public/simulation/data/technologies/armor_infantryspearmen_pierce_01.json
+++ b/binaries/data/mods/public/simulation/data/technologies/armor_infantryspearmen_pierce_01.json
@@ -18,6 +18,6 @@
 	"modifications": [
 		{ "value": "Armour/Pierce", "add": 2 }
 	],
-	"affects": ["Infantry Spear"],
+	"affects": ["Infantry Spearman"],
 	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }
diff --git a/binaries/data/mods/public/simulation/data/technologies/armor_infantryspearmen_pierce_02.json b/binaries/data/mods/public/simulation/data/technologies/armor_infantryspearmen_pierce_02.json
index d9f0aaa605..ffce44dcc9 100644
--- a/binaries/data/mods/public/simulation/data/technologies/armor_infantryspearmen_pierce_02.json
+++ b/binaries/data/mods/public/simulation/data/technologies/armor_infantryspearmen_pierce_02.json
@@ -18,6 +18,6 @@
 	"modifications": [
 		{ "value": "Armour/Pierce", "add": 1 }
 	],
-	"affects": ["Infantry Spear"],
+	"affects": ["Infantry Spearman"],
 	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }
diff --git a/binaries/data/mods/public/simulation/data/technologies/armor_infantryspearmen_pierce_03.json b/binaries/data/mods/public/simulation/data/technologies/armor_infantryspearmen_pierce_03.json
index 9672b3202a..a8b1007c80 100644
--- a/binaries/data/mods/public/simulation/data/technologies/armor_infantryspearmen_pierce_03.json
+++ b/binaries/data/mods/public/simulation/data/technologies/armor_infantryspearmen_pierce_03.json
@@ -18,6 +18,6 @@
 	"modifications": [
 		{ "value": "Armour/Pierce", "add": 1 }
 	],
-	"affects": ["Infantry Spear"],
+	"affects": ["Infantry Spearman"],
 	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }
diff --git a/binaries/data/mods/public/simulation/data/technologies/attack_steel_working.json b/binaries/data/mods/public/simulation/data/technologies/attack_steel_working.json
index e345494959..da0dbafc7a 100644
--- a/binaries/data/mods/public/simulation/data/technologies/attack_steel_working.json
+++ b/binaries/data/mods/public/simulation/data/technologies/attack_steel_working.json
@@ -15,6 +15,6 @@
 		{ "value": "Attack/Melee/Damage/Hack", "multiply": 1.2 },
 		{ "value": "Attack/Melee/Damage/Crush", "multiply": 1.2 }
 	],
-	"affects": ["Sword", "Maceman"],
+	"affects": ["Swordsman", "Maceman"],
 	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }
diff --git a/binaries/data/mods/public/simulation/data/technologies/hellenes/attack_inf_spearfighting.json b/binaries/data/mods/public/simulation/data/technologies/hellenes/attack_inf_spearfighting.json
index 6483ac8681..8dc6684678 100644
--- a/binaries/data/mods/public/simulation/data/technologies/hellenes/attack_inf_spearfighting.json
+++ b/binaries/data/mods/public/simulation/data/technologies/hellenes/attack_inf_spearfighting.json
@@ -15,6 +15,6 @@
 	"modifications": [
 		{ "value": "Attack/Melee/Damage/Hack", "add": 2 }
 	],
-	"affects": ["Infantry Spear"],
+	"affects": ["Infantry Spearman"],
 	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }
diff --git a/binaries/data/mods/public/simulation/data/technologies/hellenes/spartans_agoge.json b/binaries/data/mods/public/simulation/data/technologies/hellenes/spartans_agoge.json
index a354b0f63c..3c093190b1 100644
--- a/binaries/data/mods/public/simulation/data/technologies/hellenes/spartans_agoge.json
+++ b/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"
 }
diff --git a/binaries/data/mods/public/simulation/data/technologies/melee_inf_spearheads.json b/binaries/data/mods/public/simulation/data/technologies/melee_inf_spearheads.json
index 53c44524ed..882f994d84 100644
--- a/binaries/data/mods/public/simulation/data/technologies/melee_inf_spearheads.json
+++ b/binaries/data/mods/public/simulation/data/technologies/melee_inf_spearheads.json
@@ -17,6 +17,6 @@
 	"modifications": [
 		{ "value": "Attack/Damage/Melee/Hack", "add": 2 }
 	],
-	"affects": ["Spear"],
+	"affects": ["Spearman"],
 	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }
diff --git a/binaries/data/mods/public/simulation/data/technologies/ranged_inf_skirmishers.json b/binaries/data/mods/public/simulation/data/technologies/ranged_inf_skirmishers.json
index 4c7abcb2ac..c49a0f2fbf 100644
--- a/binaries/data/mods/public/simulation/data/technologies/ranged_inf_skirmishers.json
+++ b/binaries/data/mods/public/simulation/data/technologies/ranged_inf_skirmishers.json
@@ -20,6 +20,6 @@
 		{ "value": "Attack/Ranged/MaxRange", "add": 4 },
 		{ "value": "Vision/Range", "add": 4 }
 	],
-	"affects": ["Javelin"],
+	"affects": ["Javelinist"],
 	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }
diff --git a/binaries/data/mods/public/simulation/templates/template_unit.xml b/binaries/data/mods/public/simulation/templates/template_unit.xml
index a8f0b430a4..bd05a713f5 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit.xml
@@ -39,8 +39,8 @@
   </Health>
   <Identity>
     <Civ>gaia</Civ>
+    <Classes datatype="tokens">Unit Organic ConquestCritical</Classes>
     <GenericName>Unit</GenericName>
-    <Classes datatype="tokens">Unit ConquestCritical</Classes>
     <Formations datatype="tokens">
       special/formations/null
       special/formations/box
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_catafalque.xml b/binaries/data/mods/public/simulation/templates/template_unit_catafalque.xml
index 40c191cee7..f4600c260a 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_catafalque.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_catafalque.xml
@@ -11,14 +11,14 @@
     <Square width="5.0" depth="12.0"/>
   </Footprint>
   <Identity>
-    <Classes datatype="tokens">-ConquestCritical</Classes>
+    <Classes datatype="tokens">-Organic -ConquestCritical</Classes>
+    <VisibleClasses datatype="tokens">Relic</VisibleClasses>
     <Formations disable=""/>
     <GenericName>Catafalque</GenericName>
     <Icon>units/catafalque.png</Icon>
     <SelectionGroupName>template_unit_catafalque</SelectionGroupName>
     <Tooltip>A catafalque that holds the remains of a great leader.</Tooltip>
     <Undeletable>true</Undeletable>
-    <VisibleClasses datatype="tokens">Relic</VisibleClasses>
   </Identity>
   <Minimap>
     <Color r="148" g="0" b="211"/>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_cavalry.xml b/binaries/data/mods/public/simulation/templates/template_unit_cavalry.xml
index 4e3bf67f46..4c62d5d24e 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_cavalry.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_cavalry.xml
@@ -36,8 +36,8 @@
     <Max>160</Max>
   </Health>
   <Identity>
-    <Classes datatype="tokens">CitizenSoldier Human Organic</Classes>
-    <VisibleClasses datatype="tokens">Cavalry Citizen Soldier</VisibleClasses>
+    <Classes datatype="tokens">Human CitizenSoldier</Classes>
+    <VisibleClasses datatype="tokens">Citizen Soldier Cavalry</VisibleClasses>
     <GenericName>Cavalry</GenericName>
     <Rank>Basic</Rank>
     <Formations datatype="tokens">
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_spearman.xml b/binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_spearman.xml
index 90533ce295..f004bdcad4 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_spearman.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_spearman.xml
@@ -22,7 +22,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>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_swordsman.xml b/binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_swordsman.xml
index 698a26045b..9aa1be6d4c 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_swordsman.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_swordsman.xml
@@ -21,7 +21,7 @@
     </Resources>
   </Cost>
   <Identity>
-    <VisibleClasses datatype="tokens">Sword</VisibleClasses>
+    <VisibleClasses datatype="tokens">Swordsman</VisibleClasses>
     <GenericName>Cavalry Swordsman</GenericName>
   </Identity>
   <Loot>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged.xml b/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged.xml
index 7e28d4bfea..8eae440559 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged.xml
@@ -25,8 +25,8 @@
     <Max>100</Max>
   </Health>
   <Identity>
-    <GenericName>Ranged Cavalry</GenericName>
     <VisibleClasses datatype="tokens">Ranged</VisibleClasses>
+    <GenericName>Ranged Cavalry</GenericName>
     <Formations datatype="tokens">
       special/formations/skirmish
     </Formations>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_javelinist.xml b/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_javelinist.xml
index d183cfdb4b..2d2be2267d 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_javelinist.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_javelinist.xml
@@ -23,7 +23,7 @@
     </Resources>
   </Cost>
   <Identity>
-    <VisibleClasses datatype="tokens">Javelin</VisibleClasses>
+    <VisibleClasses datatype="tokens">Javelinist</VisibleClasses>
     <GenericName>Cavalry Skirmisher</GenericName>
   </Identity>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_champion.xml b/binaries/data/mods/public/simulation/templates/template_unit_champion.xml
index 3e29e7c8a5..5757a25dd2 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_champion.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_champion.xml
@@ -9,9 +9,9 @@
     </Capture>
   </Attack>
   <Identity>
+    <Classes datatype="tokens">Human</Classes>
+    <VisibleClasses datatype="tokens">Soldier Champion</VisibleClasses>
     <GenericName>Champion Unit</GenericName>
-    <Classes datatype="tokens">Organic Human</Classes>
-    <VisibleClasses datatype="tokens">Champion Soldier</VisibleClasses>
     <RequiredTechnology>phase_city</RequiredTechnology>
   </Identity>
   <Loot>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry.xml b/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry.xml
index d72e28173f..e5402aa378 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry.xml
@@ -23,8 +23,8 @@
     <Max>240</Max>
   </Health>
   <Identity>
-    <GenericName>Champion Cavalry</GenericName>
     <VisibleClasses datatype="tokens">Cavalry</VisibleClasses>
+    <GenericName>Champion Cavalry</GenericName>
     <Formations datatype="tokens">
       special/formations/wedge
     </Formations>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_archer.xml b/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_archer.xml
index 0427bb3bfc..ed42cab4ba 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_archer.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_archer.xml
@@ -28,7 +28,7 @@
   </Cost>
   <Identity>
     <VisibleClasses datatype="tokens">Ranged Archer</VisibleClasses>
-    <GenericName>Champion Cavalry Archer.</GenericName>
+    <GenericName>Champion Cavalry Archer</GenericName>
     <Formations datatype="tokens">
       special/formations/skirmish
     </Formations>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_javelinist.xml b/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_javelinist.xml
index b3636b34cf..dc69315a43 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_javelinist.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_javelinist.xml
@@ -27,7 +27,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
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_spearman.xml b/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_spearman.xml
index 658ddb928c..92437edcda 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_spearman.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_spearman.xml
@@ -32,7 +32,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>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_swordsman.xml b/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_swordsman.xml
index 6038c8b1f8..707b7fda3a 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_swordsman.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_swordsman.xml
@@ -27,7 +27,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>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_champion_elephant.xml b/binaries/data/mods/public/simulation/templates/template_unit_champion_elephant.xml
index 3407d61d10..9dc4ce0bf0 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_champion_elephant.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_champion_elephant.xml
@@ -23,8 +23,8 @@
     <Max>750</Max>
   </Health>
   <Identity>
-    <GenericName>War Elephant</GenericName>
     <VisibleClasses datatype="tokens">Elephant</VisibleClasses>
+    <GenericName>War Elephant</GenericName>
     <Icon>gaia/fauna_elephant.png</Icon>
   </Identity>
   <Position>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_javelinist.xml b/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_javelinist.xml
index 56cf4ff34a..9b20ea8d31 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_javelinist.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_javelinist.xml
@@ -30,7 +30,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
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_pikeman.xml b/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_pikeman.xml
index ba27bafac2..18ad297e97 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_pikeman.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_pikeman.xml
@@ -33,7 +33,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">
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_spearman.xml b/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_spearman.xml
index 2b131a2d0a..2746114549 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_spearman.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_spearman.xml
@@ -32,8 +32,8 @@
     <Max>200</Max>
   </Health>
   <Identity>
+    <VisibleClasses datatype="tokens">Melee Spearman</VisibleClasses>
     <GenericName>Champion Spearman</GenericName>
-    <VisibleClasses datatype="tokens">Melee Spear</VisibleClasses>
     <Tooltip>Counters: 3x vs. Cavalry.</Tooltip>
     <Formations datatype="tokens">
       special/formations/testudo
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_swordsman.xml b/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_swordsman.xml
index 2c339a3a7e..4f14b65061 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_swordsman.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_swordsman.xml
@@ -27,7 +27,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
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_dog.xml b/binaries/data/mods/public/simulation/templates/template_unit_dog.xml
index 5f3a0bbb0f..354945eef4 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_dog.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_dog.xml
@@ -36,7 +36,7 @@
     <Max>90</Max>
   </Health>
   <Identity>
-    <Classes datatype="tokens">Organic Human</Classes>
+    <Classes datatype="tokens">Human</Classes>
     <VisibleClasses datatype="tokens">Dog Melee</VisibleClasses>
     <GenericName>War Dog</GenericName>
     <Rank>Basic</Rank>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_fauna.xml b/binaries/data/mods/public/simulation/templates/template_unit_fauna.xml
index f592e3785a..eb8e0d3a9b 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_fauna.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_fauna.xml
@@ -9,7 +9,7 @@
   </Footprint>
   <Guard disable=""/>
   <Identity>
-    <Classes datatype="tokens">Animal Organic -ConquestCritical</Classes>
+    <Classes datatype="tokens">-ConquestCritical Animal</Classes>
     <Icon>gaia/fauna_generic.png</Icon>
     <Formations disable=""/>
   </Identity>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_hero.xml b/binaries/data/mods/public/simulation/templates/template_unit_hero.xml
index 0fc4a77d93..1d216876b8 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_hero.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_hero.xml
@@ -28,9 +28,9 @@
     <Max>600</Max>
   </Health>
   <Identity>
+    <Classes datatype="tokens">Human</Classes>
+    <VisibleClasses datatype="tokens">Soldier Hero</VisibleClasses>
     <GenericName>Hero</GenericName>
-    <Classes datatype="tokens">Organic Human</Classes>
-    <VisibleClasses datatype="tokens">Hero Soldier</VisibleClasses>
     <RequiredTechnology>phase_city</RequiredTechnology>
   </Identity>
   <Loot>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry.xml b/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry.xml
index 76fef73021..f8ff5cd987 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry.xml
@@ -21,8 +21,8 @@
     <Max>1500</Max>
   </Health>
   <Identity>
-    <GenericName>Hero Cavalry</GenericName>
     <VisibleClasses datatype="tokens">Cavalry</VisibleClasses>
+    <GenericName>Hero Cavalry</GenericName>
     <Formations datatype="tokens">
       special/formations/wedge
     </Formations>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_javelinist.xml b/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_javelinist.xml
index 892c36b5f6..c1a6f5331a 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_javelinist.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_javelinist.xml
@@ -29,11 +29,11 @@
     <Max>1500</Max>
   </Health>
   <Identity>
+    <VisibleClasses datatype="tokens">Ranged Javelinist</VisibleClasses>
     <Formations datatype="tokens">
       special/formations/skirmish
     </Formations>
     <GenericName>Hero Cavalry Skirmisher</GenericName>
-    <VisibleClasses datatype="tokens">Javelin Ranged</VisibleClasses>
   </Identity>
   <UnitMotion>
     <WalkSpeed op="mul">1.05</WalkSpeed>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_spearman.xml b/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_spearman.xml
index 90d15916a6..d7e6e17d55 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_spearman.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_spearman.xml
@@ -24,7 +24,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>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_swordsman.xml b/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_swordsman.xml
index 30831fe464..c1b17956f3 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_swordsman.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_swordsman.xml
@@ -24,7 +24,7 @@
     </Resources>
   </Cost>
   <Identity>
-    <VisibleClasses datatype="tokens">Melee Sword</VisibleClasses>
+    <VisibleClasses datatype="tokens">Melee Swordsman</VisibleClasses>
     <GenericName>Hero Cavalry Swordsman</GenericName>
   </Identity>
   <UnitMotion>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_archer.xml b/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_archer.xml
index 49e4669daa..18ae00be81 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_archer.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_archer.xml
@@ -22,8 +22,8 @@
     </Ranged>
   </Attack>
   <Identity>
-    <GenericName>Hero Archer</GenericName>
     <VisibleClasses datatype="tokens">Ranged Archer</VisibleClasses>
+    <GenericName>Hero Archer</GenericName>
     <Formations datatype="tokens">
       special/formations/skirmish
     </Formations>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_javelinist.xml b/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_javelinist.xml
index 6e029b9bcd..07e7d25a2d 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_javelinist.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_javelinist.xml
@@ -22,7 +22,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
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_pikeman.xml b/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_pikeman.xml
index 8fb759eab0..05161db44f 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_pikeman.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_pikeman.xml
@@ -24,7 +24,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">
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_spearman.xml b/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_spearman.xml
index 3066268a10..ac803b4c19 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_spearman.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_spearman.xml
@@ -24,7 +24,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">
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_swordsman.xml b/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_swordsman.xml
index 0af89f0eff..6df0344fdd 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_swordsman.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_swordsman.xml
@@ -24,7 +24,7 @@
     </Resources>
   </Cost>
   <Identity>
-    <VisibleClasses datatype="tokens">Melee Sword</VisibleClasses>
+    <VisibleClasses datatype="tokens">Melee Swordsman</VisibleClasses>
     <GenericName>Hero Swordsman</GenericName>
   </Identity>
   <UnitMotion>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_infantry.xml b/binaries/data/mods/public/simulation/templates/template_unit_infantry.xml
index a21eeeb179..d308f0390a 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_infantry.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_infantry.xml
@@ -61,9 +61,9 @@
     <Max>80</Max>
   </Health>
   <Identity>
+    <Classes datatype="tokens">Human CitizenSoldier</Classes>
+    <VisibleClasses datatype="tokens">Citizen Worker Soldier Infantry</VisibleClasses>
     <GenericName>Infantry</GenericName>
-    <Classes datatype="tokens">CitizenSoldier Human Organic</Classes>
-    <VisibleClasses datatype="tokens">Citizen Infantry Soldier Worker</VisibleClasses>
     <Rank>Basic</Rank>
   </Identity>
   <Loot>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_pikeman.xml b/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_pikeman.xml
index 0eb19beae7..d3d17f5230 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_pikeman.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_pikeman.xml
@@ -26,7 +26,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">
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_spearman.xml b/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_spearman.xml
index 6c1d5fe1a3..afc89662f4 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_spearman.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_spearman.xml
@@ -25,7 +25,7 @@
     </Resources>
   </Cost>
   <Identity>
-    <VisibleClasses datatype="tokens">Spear</VisibleClasses>
+    <VisibleClasses datatype="tokens">Spearman</VisibleClasses>
     <GenericName>Spearman</GenericName>
     <Tooltip>Counters: 3x vs. Cavalry.</Tooltip>
   </Identity>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_swordsman.xml b/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_swordsman.xml
index fd3d0844ce..a9d024a475 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_swordsman.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_swordsman.xml
@@ -21,7 +21,7 @@
     </Resources>
   </Cost>
   <Identity>
-    <VisibleClasses datatype="tokens">Sword</VisibleClasses>
+    <VisibleClasses datatype="tokens">Swordsman</VisibleClasses>
     <GenericName>Swordsman</GenericName>
   </Identity>
   <Loot>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged.xml b/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged.xml
index 43ebfc34ff..9799a17480 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged.xml
@@ -30,8 +30,8 @@
     <Max>50</Max>
   </Health>
   <Identity>
-    <GenericName>Ranged</GenericName>
     <VisibleClasses datatype="tokens">Ranged</VisibleClasses>
+    <GenericName>Ranged</GenericName>
     <Formations datatype="tokens">
       special/formations/skirmish
     </Formations>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_javelinist.xml b/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_javelinist.xml
index 745d092fe0..39f4b3ac30 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_javelinist.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_javelinist.xml
@@ -27,7 +27,7 @@
     </Resources>
   </Cost>
   <Identity>
-    <VisibleClasses datatype="tokens">Javelin</VisibleClasses>
+    <VisibleClasses datatype="tokens">Javelinist</VisibleClasses>
     <GenericName>Skirmisher</GenericName>
   </Identity>
   <Loot>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_slinger.xml b/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_slinger.xml
index 131d2caa89..49d34c983c 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_slinger.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_slinger.xml
@@ -28,7 +28,7 @@
     </Resources>
   </Cost>
   <Identity>
-    <VisibleClasses datatype="tokens">Sling</VisibleClasses>
+    <VisibleClasses datatype="tokens">Slinger</VisibleClasses>
     <GenericName>Slinger</GenericName>
   </Identity>
   <Loot>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_ship.xml b/binaries/data/mods/public/simulation/templates/template_unit_ship.xml
index 854d7aca55..f97c449821 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_ship.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_ship.xml
@@ -31,9 +31,10 @@
     <Max>200</Max>
   </Health>
   <Identity>
+    <Classes datatype="tokens">-Organic</Classes>
+    <VisibleClasses datatype="tokens">Ship</VisibleClasses>
     <GenericName>Ship</GenericName>
     <Formations disable=""/>
-    <VisibleClasses datatype="tokens">Ship</VisibleClasses>
   </Identity>
   <Loot>
     <xp>60</xp>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_ship_bireme.xml b/binaries/data/mods/public/simulation/templates/template_unit_ship_bireme.xml
index 8d4b41a655..76c17fdcf8 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_ship_bireme.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_ship_bireme.xml
@@ -52,8 +52,8 @@
     <Max>800</Max>
   </Health>
   <Identity>
+    <VisibleClasses datatype="tokens">Ranged Warship Bireme</VisibleClasses>
     <GenericName>Light Warship</GenericName>
-    <VisibleClasses datatype="tokens">Ranged Warship</VisibleClasses>
     <RequiredTechnology>phase_town</RequiredTechnology>
     <Tooltip>Garrison units for transport and to increase firepower.</Tooltip>
   </Identity>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_ship_fire.xml b/binaries/data/mods/public/simulation/templates/template_unit_ship_fire.xml
index 4c248a6cd3..9a02cbeaa0 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_ship_fire.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_ship_fire.xml
@@ -42,8 +42,8 @@
     </DamageVariants>
   </Health>
   <Identity>
+    <VisibleClasses datatype="tokens">Melee Warship Fireship</VisibleClasses>
     <GenericName>Fire Ship</GenericName>
-    <VisibleClasses datatype="tokens">Fireship Melee Warship</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>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_ship_fishing.xml b/binaries/data/mods/public/simulation/templates/template_unit_ship_fishing.xml
index a1d296b76d..9688e0c3b9 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_ship_fishing.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_ship_fishing.xml
@@ -32,7 +32,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>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_ship_merchant.xml b/binaries/data/mods/public/simulation/templates/template_unit_ship_merchant.xml
index ae915da136..fc4eaa3b9d 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_ship_merchant.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_ship_merchant.xml
@@ -25,11 +25,11 @@
   </Health>
   <Identity>
     <Classes datatype="tokens">-ConquestCritical</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>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_ship_quinquereme.xml b/binaries/data/mods/public/simulation/templates/template_unit_ship_quinquereme.xml
index f21566401a..3ab04354a5 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_ship_quinquereme.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_ship_quinquereme.xml
@@ -35,7 +35,7 @@
     <DefaultArrowCount>1</DefaultArrowCount>
     <MaxArrowCount>10</MaxArrowCount>
     <GarrisonArrowMultiplier>1</GarrisonArrowMultiplier>
-    <GarrisonArrowClasses>Catapult</GarrisonArrowClasses>
+    <GarrisonArrowClasses>StoneThrower</GarrisonArrowClasses>
   </BuildingAI>
   <Cost>
     <Population>3</Population>
@@ -63,10 +63,10 @@
     <Max>2000</Max>
   </Health>
   <Identity>
+    <VisibleClasses datatype="tokens">Ranged Warship Quinquereme</VisibleClasses>
     <GenericName>Heavy Warship</GenericName>
-    <Tooltip>Garrison units for transport and to increase firepower.</Tooltip>
-    <VisibleClasses datatype="tokens">Ranged Warship</VisibleClasses>
     <RequiredTechnology>phase_city</RequiredTechnology>
+    <Tooltip>Garrison units for transport and to increase firepower.</Tooltip>
   </Identity>
   <Loot>
     <xp>150</xp>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_ship_trireme.xml b/binaries/data/mods/public/simulation/templates/template_unit_ship_trireme.xml
index 675654c252..308c1622bd 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_ship_trireme.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_ship_trireme.xml
@@ -52,8 +52,8 @@
     <Max>1400</Max>
   </Health>
   <Identity>
+    <VisibleClasses datatype="tokens">Ranged Warship Trireme</VisibleClasses>
     <GenericName>Medium Warship</GenericName>
-    <VisibleClasses datatype="tokens">Ranged Warship</VisibleClasses>
     <RequiredTechnology>phase_town</RequiredTechnology>
     <Tooltip>Garrison units for transport and to increase firepower.</Tooltip>
   </Identity>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_siege.xml b/binaries/data/mods/public/simulation/templates/template_unit_siege.xml
index 78b902bad0..31ff4cafd1 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_siege.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_siege.xml
@@ -22,6 +22,7 @@
     <Unhealable>true</Unhealable>
   </Health>
   <Identity>
+    <Classes datatype="tokens">-Organic</Classes>
     <VisibleClasses datatype="tokens">Siege</VisibleClasses>
     <GenericName>Siege</GenericName>
     <RequiredTechnology>phase_city</RequiredTechnology>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_siege_boltshooter.xml b/binaries/data/mods/public/simulation/templates/template_unit_siege_boltshooter.xml
index bdb4e94aa4..4f85f67765 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_siege_boltshooter.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_siege_boltshooter.xml
@@ -50,8 +50,8 @@
     <Max>200</Max>
   </Health>
   <Identity>
+    <VisibleClasses datatype="tokens">Ranged BoltShooter</VisibleClasses>
     <GenericName>Bolt Shooter</GenericName>
-    <VisibleClasses datatype="tokens">BoltShooter Ranged</VisibleClasses>
   </Identity>
   <Loot>
     <xp>200</xp>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_siege_ram.xml b/binaries/data/mods/public/simulation/templates/template_unit_siege_ram.xml
index 0e370df3a5..9b1b8482e0 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_siege_ram.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_siege_ram.xml
@@ -33,8 +33,8 @@
     <Max>400</Max>
   </Health>
   <Identity>
-    <GenericName>Battering Ram</GenericName>
     <VisibleClasses datatype="tokens">Melee Ram</VisibleClasses>
+    <GenericName>Battering Ram</GenericName>
   </Identity>
   <Sound>
     <SoundGroups>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_siege_stonethrower.xml b/binaries/data/mods/public/simulation/templates/template_unit_siege_stonethrower.xml
index 6723cb3f56..e152323ce4 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_siege_stonethrower.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_siege_stonethrower.xml
@@ -51,8 +51,8 @@
     <Max>250</Max>
   </Health>
   <Identity>
+    <VisibleClasses datatype="tokens">Ranged StoneThrower</VisibleClasses>
     <GenericName>Siege Catapult</GenericName>
-    <VisibleClasses datatype="tokens">Catapult Ranged</VisibleClasses>
   </Identity>
   <Loot>
     <xp>300</xp>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_siege_tower.xml b/binaries/data/mods/public/simulation/templates/template_unit_siege_tower.xml
index ae2f508d65..68ee25d4ca 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_siege_tower.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_siege_tower.xml
@@ -56,8 +56,8 @@
     <Max>500</Max>
   </Health>
   <Identity>
+    <VisibleClasses datatype="tokens">Ranged SiegeTower</VisibleClasses>
     <GenericName>Siege Tower</GenericName>
-    <VisibleClasses datatype="tokens">SiegeTower Ranged</VisibleClasses>
     <Tooltip>Garrison units for transport and to increase firepower.</Tooltip>
   </Identity>
   <Selectable>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_support.xml b/binaries/data/mods/public/simulation/templates/template_unit_support.xml
index f6327dc4c8..9560b2a841 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_support.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_support.xml
@@ -9,9 +9,9 @@
     <BuildTime>8</BuildTime>
   </Cost>
   <Identity>
-    <GenericName>Support</GenericName>
     <Classes datatype="tokens">Human Organic</Classes>
     <VisibleClasses datatype="tokens">Support</VisibleClasses>
+    <GenericName>Support</GenericName>
   </Identity>
   <Loot>
     <xp>10</xp>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_support_female_citizen.xml b/binaries/data/mods/public/simulation/templates/template_unit_support_female_citizen.xml
index 13fb9c1a0e..6f113414a2 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_support_female_citizen.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_support_female_citizen.xml
@@ -47,10 +47,10 @@
     <Max>25</Max>
   </Health>
   <Identity>
-    <GenericName>Female Citizen</GenericName>
-    <Phenotype>female</Phenotype>
     <Classes datatype="tokens">FemaleCitizen</Classes>
     <VisibleClasses datatype="tokens">Citizen Worker</VisibleClasses>
+    <GenericName>Female Citizen</GenericName>
+    <Phenotype>female</Phenotype>
     <Formations disable=""/>
   </Identity>
   <ResourceGatherer>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_support_healer.xml b/binaries/data/mods/public/simulation/templates/template_unit_support_healer.xml
index 5fd5be9125..5f773a7567 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_support_healer.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_support_healer.xml
@@ -22,11 +22,11 @@
   </Health>
   <Identity>
     <Classes datatype="tokens">-ConquestCritical</Classes>
+    <VisibleClasses datatype="tokens">Healer</VisibleClasses>
     <GenericName>Healer</GenericName>
     <Rank>Basic</Rank>
     <RequiredTechnology>phase_town</RequiredTechnology>
     <Tooltip>Heal units.</Tooltip>
-    <VisibleClasses datatype="tokens">Healer</VisibleClasses>
   </Identity>
   <Promotion>
     <RequiredXp>150</RequiredXp>
diff --git a/binaries/data/mods/public/simulation/templates/template_wallset.xml b/binaries/data/mods/public/simulation/templates/template_wallset.xml
index 3765d7d22f..2029d683fa 100644
--- a/binaries/data/mods/public/simulation/templates/template_wallset.xml
+++ b/binaries/data/mods/public/simulation/templates/template_wallset.xml
@@ -6,11 +6,11 @@
 <Entity>
   <Identity>
     <Civ>gaia</Civ>
-    <Icon>structures/wall.png</Icon>
     <Classes datatype="tokens">StoneWall</Classes>
     <GenericName>City Wall</GenericName>
-    <Tooltip>Wall off your town for a stout defense.</Tooltip>
+    <Icon>structures/wall.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
+    <Tooltip>Wall off your town for a stout defense.</Tooltip>
     <Undeletable>true</Undeletable>
   </Identity>
   <WallSet>
diff --git a/binaries/data/mods/public/simulation/templates/units/athen_infantry_javelinist_b.xml b/binaries/data/mods/public/simulation/templates/units/athen_infantry_javelinist_b.xml
index f095bda2b5..9d04b0e8b6 100644
--- a/binaries/data/mods/public/simulation/templates/units/athen_infantry_javelinist_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/athen_infantry_javelinist_b.xml
@@ -16,11 +16,11 @@
   </Cost>
   <Identity>
     <Civ>athen</Civ>
+    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
     <Lang>greek</Lang>
     <SelectionGroupName>units/athen_infantry_javelinist_b</SelectionGroupName>
     <GenericName>Thracian Peltast</GenericName>
     <SpecificName>Peltastḗs Thrâx</SpecificName>
-    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
     <Icon>units/hele_infantry_javelinist.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
diff --git a/binaries/data/mods/public/simulation/templates/units/athen_infantry_marine_archer_b.xml b/binaries/data/mods/public/simulation/templates/units/athen_infantry_marine_archer_b.xml
index 12202a705e..673d49cd81 100644
--- a/binaries/data/mods/public/simulation/templates/units/athen_infantry_marine_archer_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/athen_infantry_marine_archer_b.xml
@@ -16,9 +16,9 @@
   </Cost>
   <Identity>
     <Civ>athen</Civ>
+    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
     <Lang>greek</Lang>
     <SelectionGroupName>units/athen_infantry_marine_archer_b</SelectionGroupName>
-    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
     <GenericName>Cretan Mercenary Archer</GenericName>
     <SpecificName>Toxótēs Krētikós</SpecificName>
     <Icon>units/hele_infantry_archer.png</Icon>
diff --git a/binaries/data/mods/public/simulation/templates/units/cart_cavalry_spearman_ital_b.xml b/binaries/data/mods/public/simulation/templates/units/cart_cavalry_spearman_ital_b.xml
index e6d95e28db..37a52b8a57 100644
--- a/binaries/data/mods/public/simulation/templates/units/cart_cavalry_spearman_ital_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/cart_cavalry_spearman_ital_b.xml
@@ -9,12 +9,12 @@
   <Identity>
     <Civ>cart</Civ>
     <Classes datatype="tokens">Italian</Classes>
+    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
     <GenericName>Italic Cavalry</GenericName>
     <Icon>units/cart_cavalry_spearman.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
     <SelectionGroupName>units/cart_cavalry_spearman_ital_b</SelectionGroupName>
     <SpecificName>Ḥayyāl Romaḥ Raḫūv</SpecificName>
-    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
   </Identity>
   <Promotion>
     <Entity>units/cart_cavalry_spearman_ital_a</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/cart_cavalry_swordsman_gaul_b.xml b/binaries/data/mods/public/simulation/templates/units/cart_cavalry_swordsman_gaul_b.xml
index ba154095f5..294bce4cc9 100644
--- a/binaries/data/mods/public/simulation/templates/units/cart_cavalry_swordsman_gaul_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/cart_cavalry_swordsman_gaul_b.xml
@@ -9,12 +9,12 @@
   <Identity>
     <Civ>cart</Civ>
     <Classes datatype="tokens">Celt</Classes>
+    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
     <GenericName>Gallic Mercenary Cavalry</GenericName>
     <Icon>units/cart_cavalry_swordsman_2.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
     <SelectionGroupName>units/cart_cavalry_swordsman_gaul_b</SelectionGroupName>
     <SpecificName>Ḥayyāl Ḥerev Raḫūv</SpecificName>
-    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
   </Identity>
   <Promotion>
     <Entity>units/cart_cavalry_swordsman_gaul_a</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/cart_cavalry_swordsman_iber_b.xml b/binaries/data/mods/public/simulation/templates/units/cart_cavalry_swordsman_iber_b.xml
index 875ca9cce0..592d50eb46 100644
--- a/binaries/data/mods/public/simulation/templates/units/cart_cavalry_swordsman_iber_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/cart_cavalry_swordsman_iber_b.xml
@@ -9,12 +9,12 @@
   <Identity>
     <Civ>cart</Civ>
     <Classes datatype="tokens">Iberian</Classes>
+    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
     <GenericName>Iberian Heavy Cavalry</GenericName>
     <Icon>units/cart_cavalry_swordsman.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
     <SelectionGroupName>units/cart_cavalry_swordsman_iber_b</SelectionGroupName>
     <SpecificName>Ḥayyāl Ḥerev Raḫūv</SpecificName>
-    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
   </Identity>
   <Promotion>
     <Entity>units/cart_cavalry_swordsman_iber_a</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/cart_infantry_javelinist_iber_b.xml b/binaries/data/mods/public/simulation/templates/units/cart_infantry_javelinist_iber_b.xml
index c2f5a64416..f548df31f3 100644
--- a/binaries/data/mods/public/simulation/templates/units/cart_infantry_javelinist_iber_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/cart_infantry_javelinist_iber_b.xml
@@ -17,12 +17,12 @@
   <Identity>
     <Civ>cart</Civ>
     <Classes datatype="tokens">Iberian</Classes>
+    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
     <GenericName>Iberian Mercenary Skirmisher</GenericName>
     <Icon>units/cart_infantry_javelinist.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
     <SelectionGroupName>units/cart_infantry_javelinist_iber_b</SelectionGroupName>
     <SpecificName>Sǝḫīr Kidōn</SpecificName>
-    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
   </Identity>
   <Promotion>
     <Entity>units/cart_infantry_javelinist_iber_a</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/cart_infantry_slinger_iber_b.xml b/binaries/data/mods/public/simulation/templates/units/cart_infantry_slinger_iber_b.xml
index d69fe078c7..693f1d2c51 100644
--- a/binaries/data/mods/public/simulation/templates/units/cart_infantry_slinger_iber_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/cart_infantry_slinger_iber_b.xml
@@ -17,12 +17,12 @@
   <Identity>
     <Civ>cart</Civ>
     <Classes datatype="tokens">Iberian</Classes>
+    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
     <GenericName>Balearic Slinger</GenericName>
     <Icon>units/cart_infantry_slinger.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
     <SelectionGroupName>units/cart_infantry_slinger_iber_b</SelectionGroupName>
     <SpecificName>Qallāʿ Ibušimi</SpecificName>
-    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
   </Identity>
   <Promotion>
     <Entity>units/cart_infantry_slinger_iber_a</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/cart_infantry_swordsman_gaul_b.xml b/binaries/data/mods/public/simulation/templates/units/cart_infantry_swordsman_gaul_b.xml
index be8b4b8532..5799bb29fc 100644
--- a/binaries/data/mods/public/simulation/templates/units/cart_infantry_swordsman_gaul_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/cart_infantry_swordsman_gaul_b.xml
@@ -17,12 +17,12 @@
   <Identity>
     <Civ>cart</Civ>
     <Classes datatype="tokens">Celt</Classes>
+    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
     <GenericName>Gallic Mercenary Swordsman</GenericName>
     <Icon>units/cart_infantry_swordsman.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
     <SelectionGroupName>units/cart_infantry_swordsman_gaul_b</SelectionGroupName>
     <SpecificName>Seḫīr Ḥerev</SpecificName>
-    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
   </Identity>
   <Promotion>
     <Entity>units/cart_infantry_swordsman_gaul_a</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/cart_infantry_swordsman_ital_b.xml b/binaries/data/mods/public/simulation/templates/units/cart_infantry_swordsman_ital_b.xml
index 2bf9727bd8..e66f885be5 100644
--- a/binaries/data/mods/public/simulation/templates/units/cart_infantry_swordsman_ital_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/cart_infantry_swordsman_ital_b.xml
@@ -17,12 +17,12 @@
   <Identity>
     <Civ>cart</Civ>
     <Classes datatype="tokens">Italian</Classes>
+    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
     <GenericName>Samnite Swordsman</GenericName>
     <Icon>units/cart_infantry_swordsman.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
     <SelectionGroupName>units/cart_infantry_swordsman_ital_b</SelectionGroupName>
     <SpecificName>Seḫīr Romaḥ</SpecificName>
-    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
   </Identity>
   <Promotion>
     <Entity>units/cart_infantry_swordsman_ital_a</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/kush_cavalry_javelinist_merc_b.xml b/binaries/data/mods/public/simulation/templates/units/kush_cavalry_javelinist_merc_b.xml
index d2104dd875..488538a65e 100644
--- a/binaries/data/mods/public/simulation/templates/units/kush_cavalry_javelinist_merc_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/kush_cavalry_javelinist_merc_b.xml
@@ -8,12 +8,12 @@
   </Cost>
   <Identity>
     <Civ>kush</Civ>
+    <VisibleClasses datatype="tokens">Camel Mercenary</VisibleClasses>
     <SelectionGroupName>units/kush_cavalry_javelinist_merc_b</SelectionGroupName>
     <GenericName>Blemmye Desert Raider</GenericName>
     <SpecificName>nhw Bulahau gml</SpecificName>
     <Icon>units/kush_merc_camelry.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
-    <VisibleClasses datatype="tokens">Camel Mercenary</VisibleClasses>
   </Identity>
   <Promotion>
     <Entity>units/kush_cavalry_javelinist_merc_a</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/kush_champion_infantry_amun.xml b/binaries/data/mods/public/simulation/templates/units/kush_champion_infantry_amun.xml
index f2201de1d7..78eed864fc 100644
--- a/binaries/data/mods/public/simulation/templates/units/kush_champion_infantry_amun.xml
+++ b/binaries/data/mods/public/simulation/templates/units/kush_champion_infantry_amun.xml
@@ -2,9 +2,9 @@
 <Entity parent="template_unit_champion_infantry_swordsman">
   <Identity>
     <Civ>kush</Civ>
+    <Classes datatype="tokens">AmunGuard</Classes>
     <GenericName>Napatan Temple Guard</GenericName>
     <SpecificName>rs ‘Imn</SpecificName>
-    <Classes datatype="tokens">AmunGuard</Classes>
     <Icon>units/kush_champion_amun.png</Icon>
   </Identity>
   <VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/units/kush_champion_infantry_apedemak.xml b/binaries/data/mods/public/simulation/templates/units/kush_champion_infantry_apedemak.xml
index 95dd4a6946..81f2b1d430 100644
--- a/binaries/data/mods/public/simulation/templates/units/kush_champion_infantry_apedemak.xml
+++ b/binaries/data/mods/public/simulation/templates/units/kush_champion_infantry_apedemak.xml
@@ -20,11 +20,11 @@
   </Attack>
   <Identity>
     <Civ>kush</Civ>
+    <Classes datatype="tokens">ApedemakGuard</Classes>
+    <VisibleClasses datatype="tokens">-Swordsman Axeman</VisibleClasses>
     <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>
-    <Classes datatype="tokens">ApedemakGuard</Classes>
     <Icon>units/kush_champion_apedemak.png</Icon>
   </Identity>
   <VisualActor>
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_clubman_b.xml
index 9465df7761..155044a798 100644
--- a/binaries/data/mods/public/simulation/templates/units/kush_infantry_clubman_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/kush_infantry_clubman_b.xml
@@ -28,12 +28,12 @@
   </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>
-    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
   </Identity>
   <Promotion>
     <Entity>units/kush_infantry_clubman_a</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/kush_infantry_javelinist_merc_b.xml b/binaries/data/mods/public/simulation/templates/units/kush_infantry_javelinist_merc_b.xml
index 8341c5fb54..629e9427bc 100644
--- a/binaries/data/mods/public/simulation/templates/units/kush_infantry_javelinist_merc_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/kush_infantry_javelinist_merc_b.xml
@@ -17,12 +17,12 @@
   </Cost>
   <Identity>
     <Civ>kush</Civ>
+    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
     <SelectionGroupName>units/kush_infantry_javelinist_merc_b</SelectionGroupName>
     <GenericName>Nuba Skirmisher</GenericName>
     <SpecificName>nhw ‘h3w Noba</SpecificName>
     <Icon>units/kush_infantry_merc_javelinist.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
-    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
   </Identity>
   <Promotion>
     <Entity>units/kush_infantry_javelinist_merc_a</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/kush_ship_trireme.xml b/binaries/data/mods/public/simulation/templates/units/kush_ship_trireme.xml
index 5255edf82a..d5146c8d07 100644
--- a/binaries/data/mods/public/simulation/templates/units/kush_ship_trireme.xml
+++ b/binaries/data/mods/public/simulation/templates/units/kush_ship_trireme.xml
@@ -8,9 +8,9 @@
   </Cost>
   <Identity>
     <Civ>kush</Civ>
+    <Classes datatype="tokens">KushTrireme</Classes>
     <GenericName>Ptolemaic Mercenary Trireme</GenericName>
     <SpecificName>shry ‘3</SpecificName>
-    <Classes datatype="tokens">KushTrireme</Classes>
     <Icon>units/ptol_ship_trireme.png</Icon>
   </Identity>
   <VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/units/mace_cavalry_javelinist_b.xml b/binaries/data/mods/public/simulation/templates/units/mace_cavalry_javelinist_b.xml
index f219da4d09..7c82d56510 100644
--- a/binaries/data/mods/public/simulation/templates/units/mace_cavalry_javelinist_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/mace_cavalry_javelinist_b.xml
@@ -8,11 +8,11 @@
   </Cost>
   <Identity>
     <Civ>mace</Civ>
+    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
     <Lang>greek</Lang>
     <SelectionGroupName>units/mace_cavalry_javelinist_b</SelectionGroupName>
     <GenericName>Odrysian Skirmish Cavalry</GenericName>
     <SpecificName>Hippakontistḕs Odrysós</SpecificName>
-    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
     <Icon>units/mace_cavalry_javelinist.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
diff --git a/binaries/data/mods/public/simulation/templates/units/mace_champion_infantry_crossbowman.xml b/binaries/data/mods/public/simulation/templates/units/mace_champion_infantry_crossbowman.xml
index dbe1ce4c5e..ebc5659e97 100644
--- a/binaries/data/mods/public/simulation/templates/units/mace_champion_infantry_crossbowman.xml
+++ b/binaries/data/mods/public/simulation/templates/units/mace_champion_infantry_crossbowman.xml
@@ -19,6 +19,7 @@
   </Attack>
   <Identity>
     <Civ>mace</Civ>
+    <VisibleClasses datatype="tokens">-Archer Crossbowman</VisibleClasses>
     <Lang>greek</Lang>
     <GenericName>Champion Crossbowman</GenericName>
     <SpecificName>Gastraphetophoros</SpecificName>
diff --git a/binaries/data/mods/public/simulation/templates/units/mace_infantry_archer_b.xml b/binaries/data/mods/public/simulation/templates/units/mace_infantry_archer_b.xml
index 5021b0ae95..06764791b3 100644
--- a/binaries/data/mods/public/simulation/templates/units/mace_infantry_archer_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/mace_infantry_archer_b.xml
@@ -15,11 +15,11 @@
   </Cost>
   <Identity>
     <Civ>mace</Civ>
+    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
     <Lang>greek</Lang>
     <SelectionGroupName>units/mace_infantry_archer_b</SelectionGroupName>
     <GenericName>Cretan Mercenary Archer</GenericName>
     <SpecificName>Toxótēs Krētikós</SpecificName>
-    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
     <Icon>units/hele_infantry_archer.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
diff --git a/binaries/data/mods/public/simulation/templates/units/mace_infantry_slinger_b.xml b/binaries/data/mods/public/simulation/templates/units/mace_infantry_slinger_b.xml
index 0a83bdad7f..84d383f711 100644
--- a/binaries/data/mods/public/simulation/templates/units/mace_infantry_slinger_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/mace_infantry_slinger_b.xml
@@ -15,11 +15,11 @@
   </Cost>
   <Identity>
     <Civ>mace</Civ>
+    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
     <Lang>greek</Lang>
     <SelectionGroupName>units/mace_infantry_slinger_b</SelectionGroupName>
     <GenericName>Rhodian Slinger</GenericName>
     <SpecificName>Sphendonḗtēs Rhódios</SpecificName>
-    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
     <Icon>units/mace_infantry_slinger.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
diff --git a/binaries/data/mods/public/simulation/templates/units/maur_elephant_archer_b.xml b/binaries/data/mods/public/simulation/templates/units/maur_elephant_archer_b.xml
index 13c5788e25..889d041683 100644
--- a/binaries/data/mods/public/simulation/templates/units/maur_elephant_archer_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/maur_elephant_archer_b.xml
@@ -31,12 +31,12 @@
   </Health>
   <Identity>
     <Civ>maur</Civ>
+    <VisibleClasses datatype="tokens">-Cavalry Elephant</VisibleClasses>
     <GenericName>Elephant Archer</GenericName>
     <Icon>units/maur_cavalry_archer.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
     <SelectionGroupName>units/maur_elephant_archer_b</SelectionGroupName>
     <SpecificName>Vachii Gaja</SpecificName>
-    <VisibleClasses datatype="tokens">Elephant -Cavalry</VisibleClasses>
   </Identity>
   <Loot>
     <xp>260</xp>
diff --git a/binaries/data/mods/public/simulation/templates/units/maur_hero_ashoka.xml b/binaries/data/mods/public/simulation/templates/units/maur_hero_ashoka.xml
index 00bf433bc0..aaeb422435 100644
--- a/binaries/data/mods/public/simulation/templates/units/maur_hero_ashoka.xml
+++ b/binaries/data/mods/public/simulation/templates/units/maur_hero_ashoka.xml
@@ -9,10 +9,10 @@
   </Footprint>
   <Identity>
     <Civ>maur</Civ>
-    <GenericName>Ashoka the Great</GenericName>
-    <SpecificName>Aśoka Devānāmpriya</SpecificName>
     <Classes datatype="tokens">Ashoka</Classes>
     <VisibleClasses datatype="tokens">Chariot</VisibleClasses>
+    <GenericName>Ashoka the Great</GenericName>
+    <SpecificName>Aśoka Devānāmpriya</SpecificName>
     <Icon>units/maur_hero_ashoka.png</Icon>
     <Tooltip>Hero Special: "Edicts of Ashoka" - Edict Pillars of Ashoka can be built during Ashoka's lifetime.</Tooltip>
   </Identity>
diff --git a/binaries/data/mods/public/simulation/templates/units/maur_ship_trireme.xml b/binaries/data/mods/public/simulation/templates/units/maur_ship_trireme.xml
index 69aaeb7fc4..dc900fff85 100644
--- a/binaries/data/mods/public/simulation/templates/units/maur_ship_trireme.xml
+++ b/binaries/data/mods/public/simulation/templates/units/maur_ship_trireme.xml
@@ -16,7 +16,6 @@
   <Identity>
     <Civ>maur</Civ>
     <SpecificName>Yudhpot</SpecificName>
-    <VisibleClasses datatype="tokens">Melee</VisibleClasses>
     <Icon>units/maur_ship_trireme.png</Icon>
   </Identity>
   <UnitMotion>
diff --git a/binaries/data/mods/public/simulation/templates/units/merc_black_cloak.xml b/binaries/data/mods/public/simulation/templates/units/merc_black_cloak.xml
index dfb5b3b9be..f910628f10 100644
--- a/binaries/data/mods/public/simulation/templates/units/merc_black_cloak.xml
+++ b/binaries/data/mods/public/simulation/templates/units/merc_black_cloak.xml
@@ -8,10 +8,10 @@
     </Resources>
   </Cost>
   <Identity>
+    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
     <Lang>greek</Lang>
     <GenericName>Thracian Black Cloak</GenericName>
     <SpecificName>Rhomphaiaphoros</SpecificName>
-    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
     <Icon>units/sele_infantry_swordsman.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
diff --git a/binaries/data/mods/public/simulation/templates/units/merc_thorakites.xml b/binaries/data/mods/public/simulation/templates/units/merc_thorakites.xml
index 871c3f768b..2e4df21901 100644
--- a/binaries/data/mods/public/simulation/templates/units/merc_thorakites.xml
+++ b/binaries/data/mods/public/simulation/templates/units/merc_thorakites.xml
@@ -18,12 +18,12 @@
     </Resources>
   </Cost>
   <Identity>
+    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
     <Lang>greek</Lang>
     <GenericName>Armored Swordsman</GenericName>
     <SpecificName>Thōrakitēs</SpecificName>
     <Icon>units/mace_thorakites.png</Icon>
     <RequiredTechnology>phase_city</RequiredTechnology>
-    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
   </Identity>
   <VisualActor>
     <Actor>units/hellenes/infantry_swordsman_c_thorakites.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/merc_thureophoros.xml b/binaries/data/mods/public/simulation/templates/units/merc_thureophoros.xml
index 075f120c7b..7a1d28dc53 100644
--- a/binaries/data/mods/public/simulation/templates/units/merc_thureophoros.xml
+++ b/binaries/data/mods/public/simulation/templates/units/merc_thureophoros.xml
@@ -7,12 +7,12 @@
     </Resources>
   </Cost>
   <Identity>
+    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
     <Lang>greek</Lang>
     <GenericName>Heavy Skirmisher</GenericName>
     <SpecificName>Thyreophóros</SpecificName>
     <Icon>units/mace_thureophoros.png</Icon>
     <RequiredTechnology>phase_city</RequiredTechnology>
-    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
   </Identity>
   <VisualActor>
     <Actor>units/hellenes/infantry_javelinist_c_thureophoros.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/pers_cavalry_archer_b.xml b/binaries/data/mods/public/simulation/templates/units/pers_cavalry_archer_b.xml
index 911b0c587f..503aea11c7 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers_cavalry_archer_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/pers_cavalry_archer_b.xml
@@ -6,8 +6,8 @@
   </Footprint>
   <Identity>
     <Civ>pers</Civ>
-    <Lang>persian</Lang>
     <VisibleClasses datatype="tokens">Chariot</VisibleClasses>
+    <Lang>persian</Lang>
     <SelectionGroupName>units/pers_cavalry_archer_b</SelectionGroupName>
     <GenericName>Babylonian Scythed Chariot</GenericName>
     <SpecificName>Raθa Bābiruviya</SpecificName>
diff --git a/binaries/data/mods/public/simulation/templates/units/pers_champion_infantry.xml b/binaries/data/mods/public/simulation/templates/units/pers_champion_infantry.xml
index 9fc86cd1bf..641f8b681c 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers_champion_infantry.xml
+++ b/binaries/data/mods/public/simulation/templates/units/pers_champion_infantry.xml
@@ -2,10 +2,10 @@
 <Entity parent="template_unit_champion_infantry_spearman">
   <Identity>
     <Civ>pers</Civ>
+    <Classes datatype="tokens">Immortal</Classes>
     <Lang>persian</Lang>
     <GenericName>Persian Immortal</GenericName>
     <SpecificName>Anušiya</SpecificName>
-    <Classes datatype="tokens">Immortal</Classes>
     <Icon>units/pers_champion_infantry.png</Icon>
   </Identity>
   <VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/units/pers_hero_darius.xml b/binaries/data/mods/public/simulation/templates/units/pers_hero_darius.xml
index 6a0609c00c..f8ff361593 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers_hero_darius.xml
+++ b/binaries/data/mods/public/simulation/templates/units/pers_hero_darius.xml
@@ -9,8 +9,8 @@
   </Footprint>
   <Identity>
     <Civ>pers</Civ>
-    <Lang>persian</Lang>
     <VisibleClasses datatype="tokens">Chariot</VisibleClasses>
+    <Lang>persian</Lang>
     <GenericName>Darius I the Great</GenericName>
     <SpecificName>Dārayavahuš</SpecificName>
     <Icon>units/pers_hero_darius.png</Icon>
diff --git a/binaries/data/mods/public/simulation/templates/units/pers_hero_xerxes_chariot.xml b/binaries/data/mods/public/simulation/templates/units/pers_hero_xerxes_chariot.xml
index 3350533816..ac6b2ef1e1 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers_hero_xerxes_chariot.xml
+++ b/binaries/data/mods/public/simulation/templates/units/pers_hero_xerxes_chariot.xml
@@ -9,8 +9,8 @@
   </Footprint>
   <Identity>
     <Civ>pers</Civ>
-    <Lang>persian</Lang>
     <VisibleClasses datatype="tokens">Chariot</VisibleClasses>
+    <Lang>persian</Lang>
     <GenericName>Xerxes I</GenericName>
     <SpecificName>Xšayāršā</SpecificName>
     <Icon>units/pers_hero_xerxes.png</Icon>
diff --git a/binaries/data/mods/public/simulation/templates/units/pers_kardakes_hoplite.xml b/binaries/data/mods/public/simulation/templates/units/pers_kardakes_hoplite.xml
index ea58d2fbcc..2f9bbe8c3a 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers_kardakes_hoplite.xml
+++ b/binaries/data/mods/public/simulation/templates/units/pers_kardakes_hoplite.xml
@@ -8,11 +8,11 @@
   </Cost>
   <Identity>
     <Civ>pers</Civ>
+    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
     <Lang>persian</Lang>
     <GenericName>Cardaces Hoplite</GenericName>
     <SpecificName>Hoplites Kardakes</SpecificName>
     <Icon>units/pers_kardakes.png</Icon>
-    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
   </Identity>
   <VisualActor>
     <Actor>units/persians/infantry_spearman_c3.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/pers_kardakes_skirmisher.xml b/binaries/data/mods/public/simulation/templates/units/pers_kardakes_skirmisher.xml
index de603eb69d..c8b41bb720 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers_kardakes_skirmisher.xml
+++ b/binaries/data/mods/public/simulation/templates/units/pers_kardakes_skirmisher.xml
@@ -8,11 +8,11 @@
   </Cost>
   <Identity>
     <Civ>pers</Civ>
+    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
     <Lang>persian</Lang>
     <GenericName>Cardaces Skirmisher</GenericName>
     <SpecificName>Peltastes Kardakes</SpecificName>
     <Icon>units/pers_kardakes_skirmisher.png</Icon>
-    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
   </Identity>
   <VisualActor>
     <Actor>units/persians/infantry_javelinist_c.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/ptol_cavalry_javelinist_merc_b.xml b/binaries/data/mods/public/simulation/templates/units/ptol_cavalry_javelinist_merc_b.xml
index a353c65c9b..0e71477459 100644
--- a/binaries/data/mods/public/simulation/templates/units/ptol_cavalry_javelinist_merc_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/ptol_cavalry_javelinist_merc_b.xml
@@ -8,10 +8,10 @@
   </Cost>
   <Identity>
     <Civ>ptol</Civ>
+    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
     <SelectionGroupName>units/ptol_cavalry_javelinist_merc_b</SelectionGroupName>
     <GenericName>Tarantine Settler Cavalry</GenericName>
     <SpecificName>Hippeús Tarantînos</SpecificName>
-    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
     <Icon>units/mace_cavalry_javelinist.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
diff --git a/binaries/data/mods/public/simulation/templates/units/ptol_cavalry_spearman_merc_b.xml b/binaries/data/mods/public/simulation/templates/units/ptol_cavalry_spearman_merc_b.xml
index f0bb17fb21..14a19af657 100644
--- a/binaries/data/mods/public/simulation/templates/units/ptol_cavalry_spearman_merc_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/ptol_cavalry_spearman_merc_b.xml
@@ -8,10 +8,10 @@
   </Cost>
   <Identity>
     <Civ>ptol</Civ>
+    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
     <SelectionGroupName>units/ptol_cavalry_spearman_merc_b</SelectionGroupName>
     <GenericName>Macedonian Settler Cavalry</GenericName>
     <SpecificName>Hippeús Makedonikós</SpecificName>
-    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
     <Icon>units/ptol_cavalry_spearman.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
diff --git a/binaries/data/mods/public/simulation/templates/units/ptol_champion_juggernaut.xml b/binaries/data/mods/public/simulation/templates/units/ptol_champion_juggernaut.xml
index eb9e229b0e..8eb18c1c9f 100644
--- a/binaries/data/mods/public/simulation/templates/units/ptol_champion_juggernaut.xml
+++ b/binaries/data/mods/public/simulation/templates/units/ptol_champion_juggernaut.xml
@@ -17,9 +17,9 @@
   </Health>
   <Identity>
     <Civ>ptol</Civ>
+    <Classes datatype="tokens">Juggernaut</Classes>
     <GenericName>Juggernaut</GenericName>
     <SpecificName>Tessarakonterēs</SpecificName>
-    <Classes datatype="tokens">Juggernaut</Classes>
     <Icon>units/rome_ship_quinquereme.png</Icon>
   </Identity>
   <Loot>
diff --git a/binaries/data/mods/public/simulation/templates/units/ptol_hero_ptolemy_IV.xml b/binaries/data/mods/public/simulation/templates/units/ptol_hero_ptolemy_IV.xml
index df9fa463d7..d32d460db6 100644
--- a/binaries/data/mods/public/simulation/templates/units/ptol_hero_ptolemy_IV.xml
+++ b/binaries/data/mods/public/simulation/templates/units/ptol_hero_ptolemy_IV.xml
@@ -5,9 +5,9 @@
   </Auras>
   <Identity>
     <Civ>ptol</Civ>
+    <Classes datatype="tokens">PtolemyIV</Classes>
     <GenericName>Ptolemy IV "Father Loving"</GenericName>
     <SpecificName>Ptolemaios D' Philopator</SpecificName>
-    <Classes datatype="tokens">PtolemyIV</Classes>
     <Icon>units/mace_hero_philip.png</Icon>
   </Identity>
   <VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/units/ptol_infantry_javelinist_b.xml b/binaries/data/mods/public/simulation/templates/units/ptol_infantry_javelinist_b.xml
index 15f8102ab8..9cda7772b6 100644
--- a/binaries/data/mods/public/simulation/templates/units/ptol_infantry_javelinist_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/ptol_infantry_javelinist_b.xml
@@ -15,10 +15,10 @@
   </Cost>
   <Identity>
     <Civ>ptol</Civ>
+    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
     <SelectionGroupName>units/ptol_infantry_javelinist_b</SelectionGroupName>
     <GenericName>Mercenary Thureos Skirmisher</GenericName>
     <SpecificName>Thureophóros Akrobolistḗs</SpecificName>
-    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
     <Icon>units/ptol_infantry_javelinist_merc.png</Icon>
     <RequiredTechnology>phase_village</RequiredTechnology>
   </Identity>
diff --git a/binaries/data/mods/public/simulation/templates/units/ptol_infantry_spearman_merc_b.xml b/binaries/data/mods/public/simulation/templates/units/ptol_infantry_spearman_merc_b.xml
index b074433244..66cf9da92c 100644
--- a/binaries/data/mods/public/simulation/templates/units/ptol_infantry_spearman_merc_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/ptol_infantry_spearman_merc_b.xml
@@ -15,10 +15,10 @@
   </Cost>
   <Identity>
     <Civ>ptol</Civ>
+    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
     <SelectionGroupName>units/ptol_infantry_spearman_merc_b</SelectionGroupName>
     <GenericName>Mercenary Thureos Spearman</GenericName>
     <SpecificName>Thureophóros Misthophóros</SpecificName>
-    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
     <Icon>units/ptol_infantry_spearman_2.png</Icon>
   </Identity>
   <Promotion>
diff --git a/binaries/data/mods/public/simulation/templates/units/ptol_infantry_swordsman_merc_b.xml b/binaries/data/mods/public/simulation/templates/units/ptol_infantry_swordsman_merc_b.xml
index 444eae69b9..5ab352ae7d 100644
--- a/binaries/data/mods/public/simulation/templates/units/ptol_infantry_swordsman_merc_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/ptol_infantry_swordsman_merc_b.xml
@@ -15,11 +15,11 @@
   </Cost>
   <Identity>
     <Civ>ptol</Civ>
+    <Classes datatype="tokens">Celt</Classes>
+    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
     <SelectionGroupName>units/ptol_infantry_swordsman_merc_b</SelectionGroupName>
     <GenericName>Gallic Mercenary Swordsman</GenericName>
     <SpecificName>Gallikós Mistophorós</SpecificName>
-    <Classes datatype="tokens">Celt</Classes>
-    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
     <Icon>units/cart_infantry_swordsman.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
diff --git a/binaries/data/mods/public/simulation/templates/units/samnite_skirmisher.xml b/binaries/data/mods/public/simulation/templates/units/samnite_skirmisher.xml
index 1a0fe84ecc..1483b61059 100644
--- a/binaries/data/mods/public/simulation/templates/units/samnite_skirmisher.xml
+++ b/binaries/data/mods/public/simulation/templates/units/samnite_skirmisher.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_infantry_javelinist">
   <Identity>
+    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
     <GenericName>Samnite Skirmisher</GenericName>
     <SpecificName>Samnite Skirmisher</SpecificName>
-    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
     <Icon>units/samnite_skirmisher.png</Icon>
   </Identity>
   <VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/units/samnite_spearman.xml b/binaries/data/mods/public/simulation/templates/units/samnite_spearman.xml
index fd7aaaf99c..8064158557 100644
--- a/binaries/data/mods/public/simulation/templates/units/samnite_spearman.xml
+++ b/binaries/data/mods/public/simulation/templates/units/samnite_spearman.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_infantry_spearman_hoplite">
   <Identity>
+    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
     <GenericName>Samnite Spearman</GenericName>
     <SpecificName>Samnite Spearman</SpecificName>
-    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
     <Icon>units/samnite_spearman.png</Icon>
   </Identity>
   <VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/units/samnite_swordsman.xml b/binaries/data/mods/public/simulation/templates/units/samnite_swordsman.xml
index 881d86f292..dbe5d4e6ba 100644
--- a/binaries/data/mods/public/simulation/templates/units/samnite_swordsman.xml
+++ b/binaries/data/mods/public/simulation/templates/units/samnite_swordsman.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_infantry_swordsman">
   <Identity>
+    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
     <GenericName>Samnite Swordsman</GenericName>
     <SpecificName>Samnite Swordsman</SpecificName>
-    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
     <Icon>units/samnite_swordsman.png</Icon>
   </Identity>
   <VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/units/sele_cavalry_spearman_merc_b.xml b/binaries/data/mods/public/simulation/templates/units/sele_cavalry_spearman_merc_b.xml
index daf7020522..ac15a08a58 100644
--- a/binaries/data/mods/public/simulation/templates/units/sele_cavalry_spearman_merc_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/sele_cavalry_spearman_merc_b.xml
@@ -8,11 +8,11 @@
   </Cost>
   <Identity>
     <Civ>sele</Civ>
+    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
     <Lang>greek</Lang>
     <SelectionGroupName>units/sele_cavalry_spearman_merc_b</SelectionGroupName>
     <GenericName>Companion Cavalry</GenericName>
     <SpecificName>Hippos Hetairike</SpecificName>
-    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
     <RequiredTechnology>phase_town</RequiredTechnology>
     <Icon>units/mace_cavalry_spearman.png</Icon>
   </Identity>
diff --git a/binaries/data/mods/public/simulation/templates/units/sele_champion_chariot.xml b/binaries/data/mods/public/simulation/templates/units/sele_champion_chariot.xml
index 0a1298008b..5d05f8ffe4 100644
--- a/binaries/data/mods/public/simulation/templates/units/sele_champion_chariot.xml
+++ b/binaries/data/mods/public/simulation/templates/units/sele_champion_chariot.xml
@@ -6,8 +6,8 @@
   </Footprint>
   <Identity>
     <Civ>sele</Civ>
-    <Lang>greek</Lang>
     <VisibleClasses datatype="tokens">Chariot</VisibleClasses>
+    <Lang>greek</Lang>
     <GenericName>Scythed Chariot</GenericName>
     <SpecificName>Drepanèphoros</SpecificName>
     <Icon>units/sele_champion_chariot.png</Icon>
diff --git a/binaries/data/mods/public/simulation/templates/units/sele_infantry_archer_merc_b.xml b/binaries/data/mods/public/simulation/templates/units/sele_infantry_archer_merc_b.xml
index 5e2f8d7588..8c4b215098 100644
--- a/binaries/data/mods/public/simulation/templates/units/sele_infantry_archer_merc_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/sele_infantry_archer_merc_b.xml
@@ -14,11 +14,11 @@
   </Cost>
   <Identity>
     <Civ>sele</Civ>
+    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
     <Lang>greek</Lang>
     <SelectionGroupName>units/sele_infantry_archer_merc_b</SelectionGroupName>
     <GenericName>Syrian Archer</GenericName>
     <SpecificName>Toxótēs Syrías</SpecificName>
-    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
     <Icon>units/hele_infantry_archer.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
diff --git a/binaries/data/mods/public/simulation/templates/units/sele_infantry_swordsman_merc_b.xml b/binaries/data/mods/public/simulation/templates/units/sele_infantry_swordsman_merc_b.xml
index 408e62ceeb..f6bcc61283 100644
--- a/binaries/data/mods/public/simulation/templates/units/sele_infantry_swordsman_merc_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/sele_infantry_swordsman_merc_b.xml
@@ -14,12 +14,12 @@
   </Cost>
   <Identity>
     <Civ>sele</Civ>
+    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
     <Lang>greek</Lang>
     <SelectionGroupName>units/sele_infantry_swordsman_merc_b</SelectionGroupName>
     <GenericName>Thracian Mercenary Swordsman</GenericName>
     <SpecificName>Rhomphaiaphoros Thrakikós</SpecificName>
     <Icon>units/sele_infantry_swordsman.png</Icon>
-    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Promotion>