Index: binaries/data/mods/public/maps/random/jebel_barkal.js
===================================================================
--- binaries/data/mods/public/maps/random/jebel_barkal.js
+++ binaries/data/mods/public/maps/random/jebel_barkal.js
@@ -77,7 +77,7 @@
 const oCivicCenter = "structures/kush/civil_centre";
 const oBarracks = "structures/kush/barracks";
 const oStable = "structures/kush/stable";
-const oElephantStables = "structures/kush/elephant_stables";
+const oElephantStable = "structures/kush/elephant_stable";
 const oWallMedium = "structures/kush/wall_medium";
 const oWallGate = "structures/kush/wall_gate";
 const oWallTower = "structures/kush/wall_tower";
@@ -183,7 +183,7 @@
 const clHouse = g_Map.createTileClass();
 const clForge = g_Map.createTileClass();
 const clStable = g_Map.createTileClass();
-const clElephantStables = g_Map.createTileClass();
+const clElephantStable = g_Map.createTileClass();
 const clCivicCenter = g_Map.createTileClass();
 const clBarracks = g_Map.createTileClass();
 const clBlemmyeCamp = g_Map.createTileClass();
@@ -270,10 +270,10 @@
 		"painters": new TileClassPainter(clCivicCenter)
 	},
 	{
-		"templateName": oElephantStables,
+		"templateName": oElephantStable,
 		"difficulty": "Easy",
-		"constraints": avoidClasses(clElephantStables, 10),
-		"painters": new TileClassPainter(clElephantStables)
+		"constraints": avoidClasses(clElephantStable, 10),
+		"painters": new TileClassPainter(clElephantStable)
 	},
 	{
 		"templateName": oStable,
@@ -1062,7 +1062,7 @@
 				clFortress, 1,
 				clHouse, 1,
 				clForge, 1,
-				clElephantStables, 1,
+				clElephantStable, 1,
 				clStable, 1,
 				clCivicCenter, 1,
 				clBarracks, 1,
@@ -1078,7 +1078,7 @@
 		undefined,
 		[
 			new StayAreasConstraint([areaCityBushes]),
-			avoidClasses(clElephantStables, 3)
+			avoidClasses(clElephantStable, 3)
 		]);
 
 g_Map.log("Placing city palms");
Index: binaries/data/mods/public/maps/scenarios/sandbox_kushites.xml
===================================================================
--- binaries/data/mods/public/maps/scenarios/sandbox_kushites.xml
+++ binaries/data/mods/public/maps/scenarios/sandbox_kushites.xml
@@ -12449,7 +12449,7 @@
 			<Actor seed="27256"/>
 		</Entity>
 		<Entity uid="2411">
-			<Template>structures/kush/elephant_stables</Template>
+			<Template>structures/kush/elephant_stable</Template>
 			<Player>1</Player>
 			<Position x="504.78296" z="816.6916"/>
 			<Orientation y="2.35621"/>
Index: binaries/data/mods/public/maps/scenarios/sandbox_mauryas.xml
===================================================================
--- binaries/data/mods/public/maps/scenarios/sandbox_mauryas.xml
+++ binaries/data/mods/public/maps/scenarios/sandbox_mauryas.xml
@@ -29827,7 +29827,7 @@
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="5488">
-			<Template>structures/maur/elephant_stables</Template>
+			<Template>structures/maur/elephant_stable</Template>
 			<Player>1</Player>
 			<Position x="259.38968" z="679.1869"/>
 			<Orientation y="2.35621"/>
Index: binaries/data/mods/public/maps/skirmishes/egypt_3pv3p.xml
===================================================================
--- binaries/data/mods/public/maps/skirmishes/egypt_3pv3p.xml
+++ binaries/data/mods/public/maps/skirmishes/egypt_3pv3p.xml
@@ -62833,7 +62833,7 @@
 			<Actor seed="5542"/>
 		</Entity>
 		<Entity uid="14008">
-			<Template>structures/maur/elephant_stables</Template>
+			<Template>structures/maur/elephant_stable</Template>
 			<Player>0</Player>
 			<Position x="1969.65125" z="724.28541"/>
 			<Orientation y="-0.92026"/>
@@ -101338,7 +101338,7 @@
 			<Actor seed="8260"/>
 		</Entity>
 		<Entity uid="21133">
-			<Template>structures/kush/elephant_stables</Template>
+			<Template>structures/kush/elephant_stable</Template>
 			<Player>2</Player>
 			<Position x="1519.04603" z="546.43561"/>
 			<Orientation y="-3.71683"/>
Index: binaries/data/mods/public/simulation/ai/petra/headquarters.js
===================================================================
--- binaries/data/mods/public/simulation/ai/petra/headquarters.js
+++ binaries/data/mods/public/simulation/ai/petra/headquarters.js
@@ -1986,9 +1986,9 @@
 	if (this.currentPhase < 3)
 		return;
 
-	if (this.canBuild(gameState, "structures/{civ}/elephant_stables") && !gameState.getOwnEntitiesByClass("ElephantStable", true).hasEntities())
+	if (this.canBuild(gameState, "structures/{civ}/elephant_stable") && !gameState.getOwnEntitiesByClass("ElephantStable", true).hasEntities())
 	{
-		queues.militaryBuilding.addPlan(new PETRA.ConstructionPlan(gameState, "structures/{civ}/elephant_stables", { "militaryBase": true }));
+		queues.militaryBuilding.addPlan(new PETRA.ConstructionPlan(gameState, "structures/{civ}/elephant_stable", { "militaryBase": true }));
 		return;
 	}
 
Index: binaries/data/mods/public/simulation/ai/petra/queueplanBuilding.js
===================================================================
--- binaries/data/mods/public/simulation/ai/petra/queueplanBuilding.js
+++ binaries/data/mods/public/simulation/ai/petra/queueplanBuilding.js
@@ -316,7 +316,7 @@
 
 	let radius = 0;
 	if (template.hasClass("Fortress") || template.hasClass("Arsenal") ||
-		this.type == gameState.applyCiv("structures/{civ}/elephant_stables"))
+		this.type == gameState.applyCiv("structures/{civ}/elephant_stable"))
 		radius = Math.floor((template.obstructionRadius().max + 8) / obstructions.cellSize);
 	else if (template.resourceDropsiteTypes() === undefined && !template.hasClass("House") &&
 		!template.hasClass("Field") && !template.hasClass("Market"))
Index: binaries/data/mods/public/simulation/templates/structures/cart/elephant_stable.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/cart/elephant_stable.xml
+++ binaries/data/mods/public/simulation/templates/structures/cart/elephant_stable.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_military_elephant_stables">
+<Entity parent="template_structure_military_elephant_stable">
   <Identity>
     <Civ>cart</Civ>
   </Identity>
Index: binaries/data/mods/public/simulation/templates/structures/cart/elephant_stables.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/cart/elephant_stables.xml
+++ binaries/data/mods/public/simulation/templates/structures/cart/elephant_stables.xml
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_military_elephant_stables">
-  <Identity>
-    <Civ>cart</Civ>
-  </Identity>
-  <VisualActor>
-    <Actor>structures/carthaginians/stable_elephant.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/structures/kush/elephant_stable.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/kush/elephant_stable.xml
+++ binaries/data/mods/public/simulation/templates/structures/kush/elephant_stable.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_military_elephant_stables">
+<Entity parent="template_structure_military_elephant_stable">
   <Identity>
     <Civ>kush</Civ>
     <SpecificName>Ỉḥ Abu</SpecificName>
Index: binaries/data/mods/public/simulation/templates/structures/kush/elephant_stables.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/kush/elephant_stables.xml
+++ binaries/data/mods/public/simulation/templates/structures/kush/elephant_stables.xml
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_military_elephant_stables">
-  <Identity>
-    <Civ>kush</Civ>
-    <SpecificName>Ỉḥ Abu</SpecificName>
-  </Identity>
-  <VisualActor>
-    <Actor>structures/kushites/stable_elephant.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/structures/maur/elephant_stable.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/maur/elephant_stable.xml
+++ binaries/data/mods/public/simulation/templates/structures/maur/elephant_stable.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_military_elephant_stables">
+<Entity parent="template_structure_military_elephant_stable">
   <Identity>
     <Civ>maur</Civ>
     <SpecificName>Vāraṇaśālā</SpecificName>
Index: binaries/data/mods/public/simulation/templates/structures/maur/elephant_stables.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/maur/elephant_stables.xml
+++ binaries/data/mods/public/simulation/templates/structures/maur/elephant_stables.xml
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_military_elephant_stables">
-  <Identity>
-    <Civ>maur</Civ>
-    <SpecificName>Vāraṇaśālā</SpecificName>
-    <RequiredTechnology>phase_town</RequiredTechnology>
-    <Classes datatype="tokens">CivSpecific</Classes>
-    <VisibleClasses datatype="tokens">-City Town</VisibleClasses>
-  </Identity>
-  <VisualActor>
-    <Actor>structures/mauryas/stable_elephant.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/structures/pers/elephant_stable.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/pers/elephant_stable.xml
+++ binaries/data/mods/public/simulation/templates/structures/pers/elephant_stable.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_military_elephant_stables">
+<Entity parent="template_structure_military_elephant_stable">
   <Identity>
     <Civ>pers</Civ>
   </Identity>
Index: binaries/data/mods/public/simulation/templates/structures/pers/elephant_stables.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/pers/elephant_stables.xml
+++ binaries/data/mods/public/simulation/templates/structures/pers/elephant_stables.xml
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_military_elephant_stables">
-  <Identity>
-    <Civ>pers</Civ>
-  </Identity>
-  <VisualActor>
-    <Actor>structures/persians/stable_elephant.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/structures/ptol/elephant_stable.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/ptol/elephant_stable.xml
+++ binaries/data/mods/public/simulation/templates/structures/ptol/elephant_stable.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_military_elephant_stables">
+<Entity parent="template_structure_military_elephant_stable">
   <Identity>
     <Civ>ptol</Civ>
     <SpecificName>Stathmos tōn Elepantōn</SpecificName>
Index: binaries/data/mods/public/simulation/templates/structures/ptol/elephant_stables.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/ptol/elephant_stables.xml
+++ binaries/data/mods/public/simulation/templates/structures/ptol/elephant_stables.xml
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_military_elephant_stables">
-  <Identity>
-    <Civ>ptol</Civ>
-    <SpecificName>Stathmos tōn Elepantōn</SpecificName>
-  </Identity>
-  <VisualActor>
-    <Actor>structures/ptolemies/stable_elephant.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/structures/sele/elephant_stable.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/sele/elephant_stable.xml
+++ binaries/data/mods/public/simulation/templates/structures/sele/elephant_stable.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_military_elephant_stables">
+<Entity parent="template_structure_military_elephant_stable">
   <Identity>
     <Civ>sele</Civ>
     <SpecificName>Stathmos tōn Elepantōn</SpecificName>
Index: binaries/data/mods/public/simulation/templates/structures/sele/elephant_stables.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/sele/elephant_stables.xml
+++ binaries/data/mods/public/simulation/templates/structures/sele/elephant_stables.xml
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_military_elephant_stables">
-  <Identity>
-    <Civ>sele</Civ>
-    <SpecificName>Stathmos tōn Elepantōn</SpecificName>
-  </Identity>
-  <VisualActor>
-    <Actor>structures/seleucids/stable_elephant.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/template_structure_military_elephant_stables.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_military_elephant_stables.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_military_elephant_stables.xml
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_military">
-  <Cost>
-    <BuildTime>240</BuildTime>
-    <Resources>
-      <wood>200</wood>
-      <stone>200</stone>
-    </Resources>
-  </Cost>
-  <Footprint>
-    <Square width="31" depth="29"/>
-    <Height>8.0</Height>
-  </Footprint>
-  <GarrisonHolder>
-    <Max>5</Max>
-    <List datatype="tokens">Elephant</List>
-  </GarrisonHolder>
-  <Health>
-    <Max>3000</Max>
-    <SpawnEntityOnDeath>decay|rubble/rubble_stone_6x6</SpawnEntityOnDeath>
-  </Health>
-  <Identity>
-    <GenericName>Elephant Stable</GenericName>
-    <SelectionGroupName>template_structure_military_elephant_stables</SelectionGroupName>
-    <Tooltip>Train Elephants and research Elephant technologies.</Tooltip>
-    <VisibleClasses datatype="tokens">City ElephantStable</VisibleClasses>
-    <RequiredTechnology>phase_city</RequiredTechnology>
-    <Icon>structures/stable_elephant.png</Icon>
-  </Identity>
-  <Loot>
-    <wood>40</wood>
-    <stone>40</stone>
-  </Loot>
-  <Obstruction>
-    <Static width="29" depth="27"/>
-  </Obstruction>
-  <ProductionQueue>
-    <BatchTimeModifier>0.7</BatchTimeModifier>
-    <Entities datatype="tokens">
-      units/{civ}/support_elephant
-      units/{civ}/elephant_archer_b
-      units/{civ}/champion_elephant
-    </Entities>
-  </ProductionQueue>
-  <Sound>
-    <SoundGroups>
-      <constructed>interface/complete/building/complete_elephant_stables.xml</constructed>
-      <select>interface/select/building/sel_elephant_stables.xml</select>
-    </SoundGroups>
-  </Sound>
-  <TerritoryInfluence>
-    <Radius>38</Radius>
-  </TerritoryInfluence>
-  <Vision>
-    <Range>40</Range>
-  </Vision>
-  <VisualActor>
-    <FoundationActor>structures/fndn_9x8.xml</FoundationActor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/maur/infantry_archer_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/maur/infantry_archer_b.xml
+++ binaries/data/mods/public/simulation/templates/units/maur/infantry_archer_b.xml
@@ -2,7 +2,7 @@
 <Entity parent="template_unit_infantry_ranged_archer">
   <Builder>
     <Entities datatype="tokens">
-      structures/maur/elephant_stables
+      structures/maur/elephant_stable
       structures/maur/palace
       structures/maur/pillar_ashoka
     </Entities>
Index: binaries/data/mods/public/simulation/templates/units/maur/infantry_spearman_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/maur/infantry_spearman_b.xml
+++ binaries/data/mods/public/simulation/templates/units/maur/infantry_spearman_b.xml
@@ -2,7 +2,7 @@
 <Entity parent="template_unit_infantry_melee_spearman">
   <Builder>
     <Entities datatype="tokens">
-      structures/maur/elephant_stables
+      structures/maur/elephant_stable
       structures/maur/palace
       structures/maur/pillar_ashoka
     </Entities>
Index: binaries/data/mods/public/simulation/templates/units/maur/infantry_swordsman_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/maur/infantry_swordsman_b.xml
+++ binaries/data/mods/public/simulation/templates/units/maur/infantry_swordsman_b.xml
@@ -7,7 +7,7 @@
   </Attack>
   <Builder>
     <Entities datatype="tokens">
-      structures/maur/elephant_stables
+      structures/maur/elephant_stable
       structures/maur/palace
       structures/maur/pillar_ashoka
     </Entities>
Index: binaries/data/mods/public/simulation/templates/units/maur/support_female_citizen.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/maur/support_female_citizen.xml
+++ binaries/data/mods/public/simulation/templates/units/maur/support_female_citizen.xml
@@ -2,7 +2,7 @@
 <Entity parent="template_unit_support_female_citizen">
   <Builder>
     <Entities datatype="tokens">
-      structures/maur/elephant_stables
+      structures/maur/elephant_stable
       structures/maur/palace
       structures/maur/pillar_ashoka
     </Entities>