Index: binaries/data/mods/public/maps/scenarios/Sandbox - Athenians.xml
===================================================================
--- binaries/data/mods/public/maps/scenarios/Sandbox - Athenians.xml
+++ binaries/data/mods/public/maps/scenarios/Sandbox - Athenians.xml
@@ -223,7 +223,7 @@
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="33">
-			<Template>structures/athen_gymnasion</Template>
+			<Template>structures/athen_gymnasium</Template>
 			<Player>1</Player>
 			<Position x="622.08893" z="1342.53553"/>
 			<Orientation y="0.78064"/>
Index: binaries/data/mods/public/maps/skirmishes/Egypt (3v3).xml
===================================================================
--- binaries/data/mods/public/maps/skirmishes/Egypt (3v3).xml
+++ binaries/data/mods/public/maps/skirmishes/Egypt (3v3).xml
@@ -35326,7 +35326,7 @@
 			<Actor seed="35014"/>
 		</Entity>
 		<Entity uid="8230">
-			<Template>structures/athen_gymnasion</Template>
+			<Template>structures/athen_gymnasium</Template>
 			<Player>1</Player>
 			<Position x="833.33484" z="1537.30042"/>
 			<Orientation y="-0.80987"/>
Index: binaries/data/mods/public/simulation/ai/petra/config.js
===================================================================
--- binaries/data/mods/public/simulation/ai/petra/config.js
+++ binaries/data/mods/public/simulation/ai/petra/config.js
@@ -59,7 +59,7 @@
 	this.buildings =
 	{
 		"default": [],
-		"athen": ["structures/{civ}_gymnasion", "structures/{civ}_prytaneion",
+		"athen": ["structures/{civ}_gymnasium", "structures/{civ}_prytaneion",
 			  "structures/{civ}_theatron", "structures/{civ}_royal_stoa"],
 		"brit": ["structures/{civ}_rotarymill"],
 		"cart": ["structures/{civ}_embassy_celtic", "structures/{civ}_embassy_iberian",
Index: binaries/data/mods/public/simulation/templates/structures/athen_gymnasion.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/athen_gymnasion.xml
+++ binaries/data/mods/public/simulation/templates/structures/athen_gymnasion.xml
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_special">
-  <Cost>
-    <BuildTime>200</BuildTime>
-    <Resources>
-      <wood>0</wood>
-      <stone>200</stone>
-      <metal>200</metal>
-    </Resources>
-  </Cost>
-  <Footprint>
-    <Square width="30.0" depth="30.0"/>
-    <Height>8.0</Height>
-  </Footprint>
-  <GarrisonHolder>
-    <Max>10</Max>
-  </GarrisonHolder>
-  <Health>
-    <Max>2000</Max>
-  </Health>
-  <Identity>
-    <Civ>athen</Civ>
-    <Classes datatype="tokens">ConquestCritical</Classes>
-    <GenericName>Gymnasium</GenericName>
-    <SpecificName>Gymnásion</SpecificName>
-    <Tooltip>Train champion units.</Tooltip>
-    <Icon>structures/gymnasion.png</Icon>
-  </Identity>
-  <Loot>
-    <wood>0</wood>
-    <stone>50</stone>
-    <metal>50</metal>
-  </Loot>
-  <Obstruction>
-    <Static width="28.0" depth="28.0"/>
-  </Obstruction>
-  <ProductionQueue>
-    <BatchTimeModifier>0.7</BatchTimeModifier>
-    <Entities datatype="tokens">
-      units/{civ}_champion_infantry
-      units/{civ}_champion_ranged
-    </Entities>
-  </ProductionQueue>
-  <Sound>
-    <SoundGroups>
-      <select>interface/select/building/sel_gymnasium.xml</select>
-      <constructed>interface/complete/building/complete_gymnasium.xml</constructed>
-    </SoundGroups>
-  </Sound>
-  <VisualActor>
-    <Actor>structures/athenians/gymnasion.xml</Actor>
-    <FoundationActor>structures/fndn_8x9.xml</FoundationActor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/athen_infantry_javelinist_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/athen_infantry_javelinist_b.xml
+++ binaries/data/mods/public/simulation/templates/units/athen_infantry_javelinist_b.xml
@@ -2,7 +2,7 @@
 <Entity parent="template_unit_infantry_ranged_javelinist">
   <Builder>
     <Entities datatype="tokens">
-      structures/athen_gymnasion
+      structures/athen_gymnasium
       structures/athen_theatron
       structures/athen_prytaneion
       structures/athen_royal_stoa
Index: binaries/data/mods/public/simulation/templates/units/athen_infantry_marine_archer_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/athen_infantry_marine_archer_b.xml
+++ binaries/data/mods/public/simulation/templates/units/athen_infantry_marine_archer_b.xml
@@ -2,7 +2,7 @@
 <Entity parent="template_unit_infantry_ranged_archer">
   <Builder>
     <Entities datatype="tokens">
-      structures/athen_gymnasion
+      structures/athen_gymnasium
       structures/athen_theatron
       structures/athen_prytaneion
       structures/athen_royal_stoa
Index: binaries/data/mods/public/simulation/templates/units/athen_infantry_slinger_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/athen_infantry_slinger_b.xml
+++ binaries/data/mods/public/simulation/templates/units/athen_infantry_slinger_b.xml
@@ -2,7 +2,7 @@
 <Entity parent="template_unit_infantry_ranged_slinger">
   <Builder>
     <Entities datatype="tokens">
-      structures/athen_gymnasion
+      structures/athen_gymnasium
       structures/athen_theatron
       structures/athen_prytaneion
       structures/athen_royal_stoa
Index: binaries/data/mods/public/simulation/templates/units/athen_infantry_spearman_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/athen_infantry_spearman_b.xml
+++ binaries/data/mods/public/simulation/templates/units/athen_infantry_spearman_b.xml
@@ -2,7 +2,7 @@
 <Entity parent="template_unit_infantry_melee_spearman_hoplite">
   <Builder>
     <Entities datatype="tokens">
-      structures/athen_gymnasion
+      structures/athen_gymnasium
       structures/athen_theatron
       structures/athen_prytaneion
       structures/athen_royal_stoa