diff --git a/binaries/data/mods/public/simulation/templates/other/macedonian_argyraspidai.xml b/binaries/data/mods/public/simulation/templates/other/macedonian_argyraspidai.xml
index 1c0e9f9001..65129077df 100644
--- a/binaries/data/mods/public/simulation/templates/other/macedonian_argyraspidai.xml
+++ b/binaries/data/mods/public/simulation/templates/other/macedonian_argyraspidai.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="other/camp_mace_hypaspist">
+<Entity parent="other/macedonian_hypaspist">
   <Identity>
-    <SpecificName>Hypaspistai Argyraspis</SpecificName>
+    <SpecificName>Argyraspidai (Silver shield)</SpecificName>
     <IconCell>16</IconCell>
 	<Tooltip>Alexander's elite guard infantry.</Tooltip>
 	<IconSheet>snPortraitSheetHele</IconSheet>
diff --git a/binaries/data/mods/public/simulation/templates/other/macedonian_hypaspist.xml b/binaries/data/mods/public/simulation/templates/other/macedonian_hypaspist.xml
index c5c93ae64f..d66b3544e6 100644
--- a/binaries/data/mods/public/simulation/templates/other/macedonian_hypaspist.xml
+++ b/binaries/data/mods/public/simulation/templates/other/macedonian_hypaspist.xml
@@ -2,14 +2,14 @@
 <Entity parent="template_unit_super_infantry">
   <Identity>
     <Civ>hele</Civ>
-    <SpecificName>Hypaspist</SpecificName>
+    <SpecificName>Hypaspist (Shield Bearer)</SpecificName>
     <IconCell>17</IconCell>
 	<IconSheet>snPortraitSheetHele</IconSheet>
     <History>The Hypaspistai, or "shield bearers", were the flower of the Macedonian infantry. They were the most battle hardened veterans  within the army and followed Philip II and Alexander the Great into over a dozen full scale engagements. These heavily armed and opulently armoured units acted as an intermediary between the phalanx and the cavalry arm, many times charging headlong with Alexander into a breech in the enemy lines. Sometimes they fought as slow pikemen, like the Pezhetairoi with 6 meter "sarissas", and other times they fought as Hoplites with large aspides and 2.5 meter-long spears, or "dorata". In later times they became known as the Argyraspidai, or "Silver Shields" when Alexander bestowed upon them armor and shields plated in pure silver, and played a decisive role in the early Diadochoi Wars of Alexander's "Successors."</History>
 	<Tooltip>Elite Macedonian infantry.</Tooltip>
   </Identity>
   <Promotion>
-    <Entity>camp_mace_hypaspist_argyraspidai</Entity>
+    <Entity>macedonian_argyraspidai</Entity>
     <Req>500</Req>
   </Promotion>
   <Cost>