diff --git a/binaries/data/mods/public/simulation/templates/other/celt_tavern.xml b/binaries/data/mods/public/simulation/templates/other/celt_tavern.xml
index 14781d0c15..1b0ca48e0b 100644
--- a/binaries/data/mods/public/simulation/templates/other/celt_tavern.xml
+++ b/binaries/data/mods/public/simulation/templates/other/celt_tavern.xml
@@ -5,7 +5,7 @@
     <GenericName>Tavern</GenericName>
     <SpecificName>Celtic Tavern</SpecificName>
     <History>Taverns are where Celtic warriors go for a tall glass of mead after a hard-won battle. Some might even find rest in one of the back rooms for rent in this seedy establishment.</History>
-	<Tooltip>Add +10 to Population Cap. Train fanatics.</Tooltip>
+	<Tooltip>Add +10 to Population Cap. Recruit fanatics.</Tooltip>
   </Identity>
   <Cost>
     <PopulationBonus>10</PopulationBonus>
diff --git a/binaries/data/mods/public/simulation/templates/other/hellenic_royal_stoa.xml b/binaries/data/mods/public/simulation/templates/other/hellenic_royal_stoa.xml
index b5bc260fa0..466d800f5f 100644
--- a/binaries/data/mods/public/simulation/templates/other/hellenic_royal_stoa.xml
+++ b/binaries/data/mods/public/simulation/templates/other/hellenic_royal_stoa.xml
@@ -5,7 +5,7 @@
     <GenericName>Stoa</GenericName>
     <SpecificName>Hellenic Royal Stoa</SpecificName>
     <History>A structure built for civic purposes. Stoas eventually became meeting places for philosophy and commerce. They were usually built within the Agora, or city center, of a Greek city.</History>
-	<Tooltip>Add +10 to Population Cap.</Tooltip>
+	<Tooltip>Add +10 to Population Cap. Recruit special units.</Tooltip>
     <Icon>gaia/special_stoa.png</Icon>
   </Identity>
   <BuildRestrictions>
@@ -13,7 +13,7 @@
   </BuildRestrictions>
   <Cost>
     <PopulationBonus>10</PopulationBonus>
-    <BuildTime>140</BuildTime>
+    <BuildTime>150</BuildTime>
     <Resources>
       <food>0</food>
       <wood>0</wood>
@@ -22,19 +22,24 @@
     </Resources>
   </Cost>
   <Health>
-    <Max>1400</Max>
+    <Max>1500</Max>
   </Health>
   <Armour>
     <Hack>20.0</Hack>
     <Pierce>40.0</Pierce>
     <Crush>10.0</Crush>
   </Armour>
+  <TrainingQueue>
+    <Entities datatype="tokens">
+      units/thrace_black_cloak
+    </Entities>
+  </TrainingQueue>
   <Loot>
     <xp>10</xp>
     <food>0</food>
     <wood>0</wood>
-    <stone>75</stone>
-    <metal>75</metal>
+    <stone>10</stone>
+    <metal>15</metal>
   </Loot>
   <VisualActor>
     <Actor>special/greek_stoa_great.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/thrace_black_cloak.xml b/binaries/data/mods/public/simulation/templates/units/thrace_black_cloak.xml
index e6bdcd58ce..07689fb624 100644
--- a/binaries/data/mods/public/simulation/templates/units/thrace_black_cloak.xml
+++ b/binaries/data/mods/public/simulation/templates/units/thrace_black_cloak.xml
@@ -2,8 +2,10 @@
 <Entity parent="template_unit_champion_infantry_swordsman">
   <Identity>
     <Civ>hele</Civ>
-    <SpecificName>Thracian Black Cloak</SpecificName>
-    <Tooltip>Mercenary swordsmen. Bonus vs. All Spear Units.</Tooltip>
+    <GenericName>Thracian Black Cloak</GenericName>
+    <SpecificName>Rhomphaiaphoros Thrakikos</SpecificName>
+    <Tooltip>Mercenary swordsman.
+Bonus vs. All Spear Units.</Tooltip>
     <History>Thracian tribesmen who wield the fiercesome rhomphaia polearm weapon in combat. They were ubiquitous mercenary swordsmen throughout Hellenistic times, sometimes even serving in two opposing armies.</History>
     <Icon>units/thracian_rhomphaia.png</Icon>
   </Identity>