Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/athen_royal_stoa.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/athen_royal_stoa.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/athen_royal_stoa.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_civic_hellenic_royal_stoa">
+<Entity parent="template_structure_civic_stoa">
   <Identity>
     <Civ>athen</Civ>
     <SpecificName>Stoá</SpecificName>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/mace_royal_stoa.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/mace_royal_stoa.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/mace_royal_stoa.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_civic_hellenic_royal_stoa">
+<Entity parent="template_structure_civic_stoa">
   <Identity>
     <Civ>mace</Civ>
     <SpecificName>Stoá</SpecificName>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/spart_royal_stoa.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/spart_royal_stoa.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/spart_royal_stoa.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_civic_hellenic_royal_stoa">
+<Entity parent="template_structure_civic_stoa">
   <Footprint>
     <Square width="27.0" depth="24.5"/>
     <Height>10.0</Height>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_civic_hellenic_royal_stoa.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_civic_hellenic_royal_stoa.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_civic_hellenic_royal_stoa.xml
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_civic">
-  <BuildRestrictions>
-    <Category>Stoa</Category>
-  </BuildRestrictions>
-  <Cost>
-    <PopulationBonus>10</PopulationBonus>
-    <BuildTime>150</BuildTime>
-    <Resources>
-      <food>0</food>
-      <wood>0</wood>
-      <stone>100</stone>
-      <metal>150</metal>
-    </Resources>
-  </Cost>
-  <Footprint>
-    <Square width="29" depth="21.0"/>
-    <Height>10.0</Height>
-  </Footprint>
-  <GarrisonHolder>
-    <Max>10</Max>
-    <EjectHealth>0.1</EjectHealth>
-    <EjectClassesOnDestroy datatype="tokens">Unit</EjectClassesOnDestroy>
-    <List datatype="tokens">Support Infantry Cavalry</List>
-    <BuffHeal>1</BuffHeal>
-    <LoadingRange>2</LoadingRange>
-  </GarrisonHolder>
-  <Health>
-    <Max>2500</Max>
-    <SpawnEntityOnDeath>decay|rubble/rubble_stone_6x4</SpawnEntityOnDeath>
-  </Health>
-  <Identity>
-    <GenericName>Hellenic Royal Stoa</GenericName>
-    <Tooltip>Recruit special units.</Tooltip>
-    <Icon>gaia/special_stoa.png</Icon>
-    <RequiredTechnology>phase_town</RequiredTechnology>
-    <VisibleClasses datatype="tokens">Town</VisibleClasses>
-  </Identity>
-  <Loot>
-    <stone>10</stone>
-    <metal>15</metal>
-  </Loot>
-  <Obstruction>
-    <Static width="28.0" depth="20.0"/>
-  </Obstruction>
-  <ProductionQueue>
-    <BatchTimeModifier>0.7</BatchTimeModifier>
-    <Entities datatype="tokens">
-      units/{civ}_black_cloak
-      units/{civ}_thureophoros
-      units/{civ}_thorakites
-    </Entities>
-  </ProductionQueue>
-  <TerritoryInfluence>
-    <Root>false</Root>
-    <Radius>40</Radius>
-    <Weight>65535</Weight>
-  </TerritoryInfluence>
-  <Vision>
-    <Range>40</Range>
-  </Vision>
-  <VisualActor>
-    <FoundationActor>structures/fndn_8x4.xml</FoundationActor>
-  </VisualActor>
-</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_civic_stoa.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_civic_stoa.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_civic_stoa.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_structure_civic">
+  <BuildRestrictions>
+    <Category>Stoa</Category>
+  </BuildRestrictions>
+  <Cost>
+    <PopulationBonus>10</PopulationBonus>
+    <BuildTime>150</BuildTime>
+    <Resources>
+      <food>0</food>
+      <wood>0</wood>
+      <stone>100</stone>
+      <metal>150</metal>
+    </Resources>
+  </Cost>
+  <Footprint>
+    <Square width="29" depth="21.0"/>
+    <Height>10.0</Height>
+  </Footprint>
+  <GarrisonHolder>
+    <Max>10</Max>
+    <EjectHealth>0.1</EjectHealth>
+    <EjectClassesOnDestroy datatype="tokens">Unit</EjectClassesOnDestroy>
+    <List datatype="tokens">Support Infantry Cavalry</List>
+    <BuffHeal>1</BuffHeal>
+    <LoadingRange>2</LoadingRange>
+  </GarrisonHolder>
+  <Health>
+    <Max>2500</Max>
+    <SpawnEntityOnDeath>decay|rubble/rubble_stone_6x4</SpawnEntityOnDeath>
+  </Health>
+  <Identity>
+    <GenericName>Stoa</GenericName>
+    <Tooltip>Recruit special units.</Tooltip>
+    <Icon>gaia/special_stoa.png</Icon>
+    <RequiredTechnology>phase_town</RequiredTechnology>
+    <VisibleClasses datatype="tokens">Town</VisibleClasses>
+  </Identity>
+  <Loot>
+    <stone>10</stone>
+    <metal>15</metal>
+  </Loot>
+  <Obstruction>
+    <Static width="28.0" depth="20.0"/>
+  </Obstruction>
+  <ProductionQueue>
+    <BatchTimeModifier>0.7</BatchTimeModifier>
+    <Entities datatype="tokens">
+      units/{civ}_black_cloak
+      units/{civ}_thureophoros
+      units/{civ}_thorakites
+    </Entities>
+  </ProductionQueue>
+  <TerritoryInfluence>
+    <Root>false</Root>
+    <Radius>40</Radius>
+    <Weight>65535</Weight>
+  </TerritoryInfluence>
+  <Vision>
+    <Range>40</Range>
+  </Vision>
+  <VisualActor>
+    <FoundationActor>structures/fndn_8x4.xml</FoundationActor>
+  </VisualActor>
+</Entity>