Index: ps/trunk/binaries/data/mods/public/maps/random/jebel_barkal_triggers.js
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/random/jebel_barkal_triggers.js
+++ ps/trunk/binaries/data/mods/public/maps/random/jebel_barkal_triggers.js
@@ -79,7 +79,7 @@
 var jebelBarkal_cityPatrolGroup_count = time => TriggerHelper.GetMapSizeTiles() > 192 ? scaleByTime(time, 3, scaleByMapSize(3, 10)) : 0;
 var jebelBarkal_cityPatrolGroup_interval = time => scaleByTime(time, 5, 3);
 var jebelBarkal_cityPatrolGroup_balancing = {
-	"buildingClasses": ["Wonder", "Temple", "CivCentre", "Fortress", "Barracks+!Stables", "Embassy"],
+	"buildingClasses": ["Wonder", "Temple", "CivCentre", "Fortress", "Barracks", "Embassy"],
 	"unitCount": time => Math.min(20, scaleByTime(time, 10, 45)),
 	"unitComposition": (time, heroes) => [
 		{
@@ -163,7 +163,7 @@
 		"capacityRatio": 1
 	},
 	{
-		"buildingClasses": ["Barracks+!Stables", "Embassy"],
+		"buildingClasses": ["Barracks", "Embassy"],
 		"unitTemplates": [...jebelBarkal_templates.citizenSoldiers, ...jebelBarkal_templates.champions],
 		"capacityRatio": 1
 	},
@@ -173,13 +173,13 @@
 		"capacityRatio": 1
 	},
 	{
-		"buildingClasses": ["ElephantStables"],
+		"buildingClasses": ["ElephantStable"],
 		"unitTemplates": jebelBarkal_templates.elephants,
 		"capacityRatio": 1
 
 	},
 	{
-		"buildingClasses": ["Stables"],
+		"buildingClasses": ["Stable"],
 		"unitTemplates": jebelBarkal_templates.champion_cavalry,
 		"capacityRatio": 1
 
@@ -312,7 +312,7 @@
 		"targetClasses": () => "Unit+!Ship"
 	},
 	{
-		"buildingClasses": ["Stables"],
+		"buildingClasses": ["Stable"],
 		"unitCount": time => Math.min(30, scaleByTime(time, 0, 80)),
 		"unitComposition": (time, heroes) => [
 			{
@@ -328,7 +328,7 @@
 		"targetClasses": () => "Unit+!Ship"
 	},
 	{
-		"buildingClasses": ["Barracks+!Stables", "Embassy"],
+		"buildingClasses": ["Barracks", "Embassy"],
 		"unitCount": time => Math.min(35, scaleByTime(time, 0, 70)),
 		"unitComposition": (time, heroes) => [
 			{
@@ -340,7 +340,7 @@
 		"targetClasses": () => "Unit+!Ship"
 	},
 	{
-		"buildingClasses": ["ElephantStables", "Wonder"],
+		"buildingClasses": ["ElephantStable", "Wonder"],
 		"unitCount": time => scaleByTime(time, 1, 14),
 		"unitComposition": (time, heroes) => [
 			{
Index: ps/trunk/binaries/data/mods/public/simulation/ai/petra/headquarters.js
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/ai/petra/headquarters.js
+++ ps/trunk/binaries/data/mods/public/simulation/ai/petra/headquarters.js
@@ -1925,7 +1925,7 @@
 	let numRanges = gameState.getOwnEntitiesByClass("Range", true).length;
 
 	let stableTemplate = this.canBuild(gameState, "structures/{civ}_stable") ? "structures/{civ}_stable" : undefined;
-	let numStables = gameState.getOwnEntitiesByClass("Stables", true).length;
+	let numStables = gameState.getOwnEntitiesByClass("Stable", true).length;
 
 	if (this.getAccountedPopulation(gameState) > this.Config.Military.popForBarracks1 ||
 	    this.phasing == 2 && gameState.getOwnStructures().filter(API3.Filters.byClass("Village")).length < 5)
@@ -1983,7 +1983,7 @@
 	if (this.currentPhase < 3)
 		return;
 
-	if (this.canBuild(gameState, "structures/{civ}_elephant_stables") && !gameState.getOwnEntitiesByClass("ElephantStables", true).hasEntities())
+	if (this.canBuild(gameState, "structures/{civ}_elephant_stables") && !gameState.getOwnEntitiesByClass("ElephantStable", true).hasEntities())
 	{
 		queues.militaryBuilding.addPlan(new m.ConstructionPlan(gameState, "structures/{civ}_elephant_stables", { "militaryBase": true }));
 		return;
Index: ps/trunk/binaries/data/mods/public/simulation/components/Identity.js
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/components/Identity.js
+++ ps/trunk/binaries/data/mods/public/simulation/components/Identity.js
@@ -62,7 +62,7 @@
 		"</element>" +
 	"</optional>" +
 	"<optional>" +
-		"<element name='VisibleClasses' a:help='Optional list of space-separated classes applying to this entity. These classes will also be visible in various GUI elements. If the classes need spaces, underscores will be replaced with spaces. Choices include: Archer, Barracks, Blacksmith, BoltShooter, Camel, Catapult, Cavalry, Champion, Chariot, Citizen, City, Civic, CivilCentre, Corral, DefenseTower, Dock, Dog, Economic, Elephant, ElephantStables, Embassy, Farmstead, Field, Fireship, Healer, Hero, House, Infantry, Javelin, Maceman, Market, Mechanical, Melee, Mercenary, Military, Outpost, Pike, Ram, Ranged, Relic, Resource, SentryTower, Ship, Shipyard, Siege, SiegeTower, Slave, Sling, Soldier, Spear, Stables, 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, Barracks, Blacksmith, BoltShooter, Camel, Catapult, Cavalry, Champion, Chariot, Citizen, City, Civic, CivilCentre, Corral, DefenseTower, Dock, Dog, Economic, Elephant, ElephantStable, Embassy, Farmstead, Field, Fireship, Healer, Hero, House, Infantry, Javelin, Maceman, Market, Mechanical, Melee, Mercenary, Military, Outpost, Pike, Ram, Range, Ranged, Relic, Resource, SentryTower, Ship, Shipyard, Siege, SiegeTower, Slave, Sling, Soldier, Spear, Stable, Storehouse, Support, Sword, Temple, Town, Trader, Village, Warship, Wonder, Worker, Workshop'>" +
 			"<attribute name='datatype'>" +
 				"<value>tokens</value>" +
 			"</attribute>" +
Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/persians/training_conscription_cavalry.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/technologies/persians/training_conscription_cavalry.json
+++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/persians/training_conscription_cavalry.json
@@ -9,6 +9,6 @@
 	"researchTime": 40,
 	"tooltip": "Faster batch training speed for the Stables.",
 	"modifications": [{"value": "ProductionQueue/BatchTimeModifier", "add": -0.1}],
-	"affects": ["Stables"],
+	"affects": ["Stable"],
 	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
-}
\ No newline at end of file
+}
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_elephant_stables.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_elephant_stables.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_elephant_stables.xml
@@ -27,7 +27,7 @@
     <RequiredTechnology>phase_city</RequiredTechnology>
     <Icon>structures/stable_elephant.png</Icon>
     <Tooltip>Train elephant units.</Tooltip>
-    <VisibleClasses datatype="tokens">City ElephantStables</VisibleClasses>
+    <VisibleClasses datatype="tokens">City ElephantStable</VisibleClasses>
   </Identity>
   <Loot>
     <wood>0</wood>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_stable.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_stable.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_stable.xml
@@ -23,7 +23,7 @@
     <Icon>structures/pers_stable.png</Icon>
     <RequiredTechnology>phase_village</RequiredTechnology>
     <Tooltip>Train citizen-soldier cavalry. Research training improvements.</Tooltip>
-    <VisibleClasses datatype="tokens">Village Stables</VisibleClasses>
+    <VisibleClasses datatype="tokens">Village Stable</VisibleClasses>
   </Identity>
   <Loot>
     <wood>30</wood>