Index: ps/trunk/binaries/data/mods/public/maps/scenarios/Sandbox - Persians.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/scenarios/Sandbox - Persians.xml
+++ ps/trunk/binaries/data/mods/public/maps/scenarios/Sandbox - Persians.xml
@@ -7184,7 +7184,7 @@
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1354">
-			<Template>structures/pers_stables</Template>
+			<Template>structures/pers_stable</Template>
 			<Player>1</Player>
 			<Position x="638.64405" z="779.02863"/>
 			<Orientation y="2.35621"/>
Index: ps/trunk/binaries/data/mods/public/maps/skirmishes/Egypt (3v3).xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/skirmishes/Egypt (3v3).xml
+++ ps/trunk/binaries/data/mods/public/maps/skirmishes/Egypt (3v3).xml
@@ -52028,7 +52028,7 @@
 			<Actor seed="387"/>
 		</Entity>
 		<Entity uid="11610">
-			<Template>structures/pers_stables</Template>
+			<Template>structures/pers_stable</Template>
 			<Player>4</Player>
 			<Position x="1746.03089" z="1665.09144"/>
 			<Orientation y="3.96238"/>
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
@@ -1924,8 +1924,7 @@
 	let rangeTemplate = this.canBuild(gameState, "structures/{civ}_range") ? "structures/{civ}_range" : undefined;
 	let numRanges = gameState.getOwnEntitiesByClass("Range", true).length;
 
-	let stableTemplate = this.canBuild(gameState, "structures/{civ}_stables") ? "structures/{civ}_stables" :
-	                     this.canBuild(gameState, "structures/{civ}_stable") ? "structures/{civ}_stable" : undefined;
+	let stableTemplate = this.canBuild(gameState, "structures/{civ}_stable") ? "structures/{civ}_stable" : undefined;
 	let numStables = gameState.getOwnEntitiesByClass("Stables", true).length;
 
 	if (this.getAccountedPopulation(gameState) > this.Config.Military.popForBarracks1 ||
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers_stable.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers_stable.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers_stable.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_structure_military_barracks">
+  <Cost>
+    <Resources>
+      <wood>0</wood>
+      <stone>200</stone>
+    </Resources>
+  </Cost>
+  <Footprint>
+    <Square width="22.0" depth="20.0"/>
+    <Height>5.0</Height>
+  </Footprint>
+  <Health>
+    <SpawnEntityOnDeath>decay|rubble/rubble_stone_4x4</SpawnEntityOnDeath>
+  </Health>
+  <Identity>
+    <Civ>pers</Civ>
+    <GenericName>Cavalry Stables</GenericName>
+    <SpecificName>Paraspa</SpecificName>
+    <VisibleClasses datatype="tokens">-Barracks Stables</VisibleClasses>
+    <Tooltip>Train citizen-cavalry units.</Tooltip>
+    <Icon>structures/pers_stable.png</Icon>
+  </Identity>
+  <Obstruction>
+    <Static width="18.0" depth="16.0"/>
+  </Obstruction>
+  <ProductionQueue>
+    <Entities datatype="tokens">
+      -units/{civ}_infantry_spearman_b
+      -units/{civ}_infantry_pikeman_b
+      -units/{civ}_infantry_swordsman_b
+      -units/{civ}_infantry_javelinist_b
+      -units/{civ}_infantry_slinger_b
+      -units/{civ}_infantry_archer_b
+    </Entities>
+    <Technologies datatype="tokens">
+      -training_conscription
+      persians/training_levy_cavalry
+      persians/training_conscription_cavalry
+      successors/special_war_horses
+    </Technologies>
+  </ProductionQueue>
+  <Sound>
+    <SoundGroups>
+      <select>interface/select/building/sel_cavalry_stables.xml</select>
+      <constructed>interface/complete/building/complete_cavalry_stables.xml</constructed>
+    </SoundGroups>
+  </Sound>
+  <VisualActor>
+    <Actor>structures/persians/stable.xml</Actor>
+    <FoundationActor>structures/fndn_6x5.xml</FoundationActor>
+  </VisualActor>
+</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers_stables.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers_stables.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers_stables.xml
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_military_barracks">
-  <Cost>
-    <Resources>
-      <wood>0</wood>
-      <stone>200</stone>
-    </Resources>
-  </Cost>
-  <Footprint>
-    <Square width="22.0" depth="20.0"/>
-    <Height>5.0</Height>
-  </Footprint>
-  <Health>
-    <SpawnEntityOnDeath>decay|rubble/rubble_stone_4x4</SpawnEntityOnDeath>
-  </Health>
-  <Identity>
-    <Civ>pers</Civ>
-    <GenericName>Cavalry Stables</GenericName>
-    <SpecificName>Paraspa</SpecificName>
-    <VisibleClasses datatype="tokens">-Barracks Stables</VisibleClasses>
-    <Tooltip>Train citizen-cavalry units.</Tooltip>
-    <Icon>structures/pers_stable.png</Icon>
-  </Identity>
-  <Obstruction>
-    <Static width="18.0" depth="16.0"/>
-  </Obstruction>
-  <ProductionQueue>
-    <Entities datatype="tokens">
-      -units/{civ}_infantry_spearman_b
-      -units/{civ}_infantry_pikeman_b
-      -units/{civ}_infantry_swordsman_b
-      -units/{civ}_infantry_javelinist_b
-      -units/{civ}_infantry_slinger_b
-      -units/{civ}_infantry_archer_b
-    </Entities>
-    <Technologies datatype="tokens">
-      -training_conscription
-      persians/training_levy_cavalry
-      persians/training_conscription_cavalry
-      successors/special_war_horses
-    </Technologies>
-  </ProductionQueue>
-  <Sound>
-    <SoundGroups>
-      <select>interface/select/building/sel_cavalry_stables.xml</select>
-      <constructed>interface/complete/building/complete_cavalry_stables.xml</constructed>
-    </SoundGroups>
-  </Sound>
-  <VisualActor>
-    <Actor>structures/persians/stable.xml</Actor>
-    <FoundationActor>structures/fndn_6x5.xml</FoundationActor>
-  </VisualActor>
-</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_infantry_archer_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_infantry_archer_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_infantry_archer_b.xml
@@ -2,7 +2,7 @@
 <Entity parent="template_unit_infantry_ranged_archer">
   <Builder>
     <Entities datatype="tokens">
-      structures/pers_stables
+      structures/pers_stable
       structures/pers_apadana
       structures/pers_ishtar_gate
       structures/pers_hall
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_infantry_javelinist_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_infantry_javelinist_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_infantry_javelinist_b.xml
@@ -2,7 +2,7 @@
 <Entity parent="template_unit_infantry_ranged_javelinist">
   <Builder>
     <Entities datatype="tokens">
-      structures/pers_stables
+      structures/pers_stable
       structures/pers_apadana
       structures/pers_ishtar_gate
       structures/pers_hall
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_infantry_spearman_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_infantry_spearman_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_infantry_spearman_b.xml
@@ -2,7 +2,7 @@
 <Entity parent="template_unit_infantry_melee_spearman">
   <Builder>
     <Entities datatype="tokens">
-      structures/pers_stables
+      structures/pers_stable
       structures/pers_apadana
       structures/pers_ishtar_gate
       structures/pers_hall