diff --git a/binaries/data/mods/public/art/actors/props/units/heads/head_cynelvin.xml b/binaries/data/mods/public/art/actors/props/units/heads/head_cunobelin.xml
similarity index 60%
rename from binaries/data/mods/public/art/actors/props/units/heads/head_cynelvin.xml
rename to binaries/data/mods/public/art/actors/props/units/heads/head_cunobelin.xml
index 83b2d9fdb7..19365df99a 100644
--- a/binaries/data/mods/public/art/actors/props/units/heads/head_cynelvin.xml
+++ b/binaries/data/mods/public/art/actors/props/units/heads/head_cunobelin.xml
@@ -4,10 +4,10 @@
   <castshadow/>
 
   <group>
-    <variant frequency="1" name="cynelvin-head">
+    <variant frequency="1" name="cunobelin-head">
       <colour>78 55 24</colour>
       <mesh>props/dude_head.dae</mesh>
-      <textures><texture file="props/head/celt_cynvelin.dds" name="baseTex"/></textures>
+      <textures><texture file="props/head/celt_cunobelin.dds" name="baseTex"/></textures>
     </variant>
   </group>
 
diff --git a/binaries/data/mods/public/art/actors/props/units/shields/celt_cynelvin.xml b/binaries/data/mods/public/art/actors/props/units/shields/celt_cunobelin.xml
similarity index 100%
rename from binaries/data/mods/public/art/actors/props/units/shields/celt_cynelvin.xml
rename to binaries/data/mods/public/art/actors/props/units/shields/celt_cunobelin.xml
diff --git a/binaries/data/mods/public/art/actors/units/celts/cynvelin.xml b/binaries/data/mods/public/art/actors/units/celts/cunobelin.xml
similarity index 84%
rename from binaries/data/mods/public/art/actors/units/celts/cynvelin.xml
rename to binaries/data/mods/public/art/actors/units/celts/cunobelin.xml
index 400ff5ecf3..7ec1eaa3c8 100644
--- a/binaries/data/mods/public/art/actors/units/celts/cynvelin.xml
+++ b/binaries/data/mods/public/art/actors/units/celts/cunobelin.xml
@@ -18,12 +18,12 @@
       </animations>
       <mesh>skeletal/m_hero_cape.dae</mesh>
       <props>
-        <prop actor="props/units/heads/head_cynelvin.xml" attachpoint="head"/>
-        <prop actor="props/units/shields/celt_cynelvin.xml" attachpoint="shield"/>
+        <prop actor="props/units/heads/head_cunobelin.xml" attachpoint="head"/>
+        <prop actor="props/units/shields/celt_cunobelin.xml" attachpoint="shield"/>
         <prop actor="props/units/weapons/csword.xml" attachpoint="r_hand"/>
         <prop actor="props/temp/l_sheath.xml" attachpoint="l_hip"/>
       </props>
-      <textures><texture file="skeletal/celt_cynelvin.dds" name="baseTex"/></textures>
+      <textures><texture file="skeletal/celt_cunobelin.dds" name="baseTex"/></textures>
     </variant>
   </group>
 
diff --git a/binaries/data/mods/public/art/actors/units/celts/cynvelin_horse.xml b/binaries/data/mods/public/art/actors/units/celts/cunobelin_horse.xml
similarity index 87%
rename from binaries/data/mods/public/art/actors/units/celts/cynvelin_horse.xml
rename to binaries/data/mods/public/art/actors/units/celts/cunobelin_horse.xml
index fc8377646b..94f5557f3a 100644
--- a/binaries/data/mods/public/art/actors/units/celts/cynvelin_horse.xml
+++ b/binaries/data/mods/public/art/actors/units/celts/cunobelin_horse.xml
@@ -14,9 +14,9 @@
       <colour>0 0 0</colour>
       <mesh>skeletal/horse.pmd</mesh>
       <props>
-        <prop actor="units/celts/cynvelin_r.xml" attachpoint="rider"/>
+        <prop actor="units/celts/cunobelin_r.xml" attachpoint="rider"/>
       </props>
-      <textures><texture file="skeletal/horse_celt_cynelvin.dds" name="baseTex"/></textures>
+      <textures><texture file="skeletal/horse_celt_cunobelin.dds" name="baseTex"/></textures>
     </variant>
   </group>
   <group>
diff --git a/binaries/data/mods/public/art/actors/units/celts/cynvelin_r.xml b/binaries/data/mods/public/art/actors/units/celts/cunobelin_r.xml
similarity index 81%
rename from binaries/data/mods/public/art/actors/units/celts/cynvelin_r.xml
rename to binaries/data/mods/public/art/actors/units/celts/cunobelin_r.xml
index 7d9258f0b2..df9662c635 100644
--- a/binaries/data/mods/public/art/actors/units/celts/cynvelin_r.xml
+++ b/binaries/data/mods/public/art/actors/units/celts/cunobelin_r.xml
@@ -13,13 +13,13 @@
       </animations>
       <mesh>skeletal/m_hero_cape.dae</mesh>
       <props>
-        <prop actor="props/units/heads/head_cynelvin.xml" attachpoint="head"/>
-        <prop actor="props/units/shields/celt_cynelvin.xml" attachpoint="shield"/>
+        <prop actor="props/units/heads/head_cunobelin.xml" attachpoint="head"/>
+        <prop actor="props/units/shields/celt_cunobelin.xml" attachpoint="shield"/>
         <prop actor="props/units/weapons/csword.xml" attachpoint="r_hand"/>
         <prop actor="props/temp/l_sheath.xml" attachpoint="l_hip"/>
         <prop actor="props/units/heads/celt_hood_priest.xml" attachpoint="helmet"/>
       </props>
-      <textures><texture file="skeletal/celt_cynelvin.dds" name="baseTex"/></textures>
+      <textures><texture file="skeletal/celt_cunobelin.dds" name="baseTex"/></textures>
     </variant>
   </group>
   <material>player_trans.xml</material>
diff --git a/binaries/data/mods/public/art/textures/skins/props/head/celt_cynvelin.dds b/binaries/data/mods/public/art/textures/skins/props/head/celt_cunobelin.dds
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/props/head/celt_cynvelin.dds
rename to binaries/data/mods/public/art/textures/skins/props/head/celt_cunobelin.dds
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/celt_cynelvin.dds b/binaries/data/mods/public/art/textures/skins/skeletal/celt_cunobelin.dds
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/skeletal/celt_cynelvin.dds
rename to binaries/data/mods/public/art/textures/skins/skeletal/celt_cunobelin.dds
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/horse_celt_cynelvin.dds b/binaries/data/mods/public/art/textures/skins/skeletal/horse_celt_cunobelin.dds
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/skeletal/horse_celt_cynelvin.dds
rename to binaries/data/mods/public/art/textures/skins/skeletal/horse_celt_cunobelin.dds
diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_hero_cynvelin.png b/binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_hero_cunobelin.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_hero_cynvelin.png
rename to binaries/data/mods/public/art/textures/ui/session/portraits/units/celt_hero_cunobelin.png
diff --git a/binaries/data/mods/public/maps/scenarios/Sandbox - Britons.xml b/binaries/data/mods/public/maps/scenarios/Sandbox - Britons.xml
index f990d697e6..b30deaac7b 100644
--- a/binaries/data/mods/public/maps/scenarios/Sandbox - Britons.xml	
+++ b/binaries/data/mods/public/maps/scenarios/Sandbox - Britons.xml	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d0ea79ed2dc73e76439c4ce65f6a42505184ee0efcf6bbf135be3631213db1a0
-size 682841
+oid sha256:3ad096533acde40ce896a9a419e8bc1b53fdad0a939cc08229e16c2ba6b3c0c2
+size 682842
diff --git a/binaries/data/mods/public/simulation/templates/structures/brit_fortress.xml b/binaries/data/mods/public/simulation/templates/structures/brit_fortress.xml
index fa3b1a8ae4..2bb12b56b5 100644
--- a/binaries/data/mods/public/simulation/templates/structures/brit_fortress.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/brit_fortress.xml
@@ -36,7 +36,7 @@
     <Entities datatype="tokens">
       units/brit_hero_boudicca
       units/brit_hero_caratacos
-      units/brit_hero_cynvelin
+      units/brit_hero_cunobelin
       units/brit_champion_cavalry
       units/brit_champion_infantry
       units/brit_mechanical_siege_ram
diff --git a/binaries/data/mods/public/simulation/templates/structures/celt_fortress_b.xml b/binaries/data/mods/public/simulation/templates/structures/celt_fortress_b.xml
index 9490115336..316ae2999d 100644
--- a/binaries/data/mods/public/simulation/templates/structures/celt_fortress_b.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/celt_fortress_b.xml
@@ -37,7 +37,7 @@
     <Entities datatype="tokens">
       units/celt_hero_boudicca
       units/celt_hero_caratacos
-      units/celt_hero_cynvelin
+      units/celt_hero_cunobelin
       units/celt_champion_cavalry_brit
       units/celt_champion_infantry_brit
       units/celt_mechanical_siege_ram
diff --git a/binaries/data/mods/public/simulation/templates/units/brit_hero_caratacos.xml b/binaries/data/mods/public/simulation/templates/units/brit_hero_caratacos.xml
index a9f59602ed..0753b10e48 100644
--- a/binaries/data/mods/public/simulation/templates/units/brit_hero_caratacos.xml
+++ b/binaries/data/mods/public/simulation/templates/units/brit_hero_caratacos.xml
@@ -24,7 +24,7 @@
   <Identity>
     <Civ>brit</Civ>
     <SpecificName>Caratacos</SpecificName>
-    <History>Caratacos's name is better known in its Romanized form, Caratacus. Under this name he is remembered as a fierce defender of Britain against the Romans after their invasion in 43 AD. Son of King Cynvelin of the Catuvellauni tribe, Caratacos fought for nine years against the Romans with little success, eventually fleeing to the tribes in Wales, where he was defeated decisively. Finally he entered Northern Britain, where was handed over to the Romans. Taken to Rome, Caratacos was allowed to live by the Emperor Claudius and died in Italy.</History>
+    <History>Caratacos's name is better known in its Romanized form, Caratacus. Under this name he is remembered as a fierce defender of Britain against the Romans after their invasion in 43 AD. Son of King Cunobelin of the Catuvellauni tribe, Caratacos fought for nine years against the Romans with little success, eventually fleeing to the tribes in Wales, where he was defeated decisively. Finally he entered Northern Britain, where was handed over to the Romans. Taken to Rome, Caratacos was allowed to live by the Emperor Claudius and died in Italy.</History>
     <Icon>units/celt_hero_caratacos.png</Icon>
   </Identity>
   <VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/units/brit_hero_cunobelin.xml b/binaries/data/mods/public/simulation/templates/units/brit_hero_cunobelin.xml
new file mode 100644
index 0000000000..17b6af3916
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/units/brit_hero_cunobelin.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_hero_cavalry_swordsman">
+  <Auras>
+    <Aura1>
+      <Type>range</Type>
+      <Radius>60</Radius>
+      <Affects>Unit</Affects>
+      <Modifications>
+        <Health.RegenRate> <Add>1</Add> </Health.RegenRate>
+      </Modifications>
+      <AuraName>Hero Aura</AuraName>
+      <AuraDescription>Let all units heal at 1 HP per second</AuraDescription>
+    </Aura1>
+  </Auras>
+  <Armour>
+    <Hack>10</Hack>
+  </Armour>
+  <Identity>
+    <Civ>brit</Civ>
+    <SpecificName>Cunobelin</SpecificName>
+    <History>Cunobelin was a powerful ruler centered in the territory around modern day London. Ruling the Catuvellauni from Camulodunum, he was a warrior king who conquered a neighboring tribe and was referred to by the Romans as the King of the Britons. Eventually Cunobelin retired to become the arch-druid of Siluria, but was taken to Rome with his son upon Caratacos's capture. According to legend, the Apostle Paul baptized Cunobelin into Christianity before he died in Italy.</History>
+    <Icon>units/celt_hero_cunobelin.png</Icon>
+  </Identity>
+  <VisualActor>
+    <Actor>units/celts/cunobelin_horse.xml</Actor>
+  </VisualActor>
+</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/brit_hero_cynvelin.xml b/binaries/data/mods/public/simulation/templates/units/brit_hero_cynvelin.xml
deleted file mode 100644
index 58fd4ffa1b..0000000000
--- a/binaries/data/mods/public/simulation/templates/units/brit_hero_cynvelin.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_hero_cavalry_swordsman">
-  <Auras>
-    <Aura1>
-      <Type>range</Type>
-      <Radius>60</Radius>
-      <Affects>Unit</Affects>
-      <Modifications>
-        <Health.RegenRate> <Add>1</Add> </Health.RegenRate>
-      </Modifications>
-      <AuraName>Hero Aura</AuraName>
-      <AuraDescription>Let all units heal at 1 HP per second</AuraDescription>
-    </Aura1>
-  </Auras>
-  <Armour>
-    <Hack>10</Hack>
-  </Armour>
-  <Identity>
-    <Civ>brit</Civ>
-    <SpecificName>Cynvelin</SpecificName>
-    <History>Cynvelin was a powerful ruler centered in the territory around modern day London. Ruling the Catuvellauni from Camulodunum, he was a warrior king who conquered a neighboring tribe and was referred to by the Romans as the King of the Britons. Eventually Cynvelin retired to become the arch-druid of Siluria, but was taken to Rome with his son upon Caratacos's capture. According to legend, the Apostle Paul baptized Cynvelin into Christianity before he died in Italy.</History>
-    <Icon>units/celt_hero_cynvelin.png</Icon>
-  </Identity>
-  <VisualActor>
-    <Actor>units/celts/cynvelin_horse.xml</Actor>
-  </VisualActor>
-</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/celt_hero_cynvelin.xml b/binaries/data/mods/public/simulation/templates/units/celt_hero_cunobelin.xml
similarity index 68%
rename from binaries/data/mods/public/simulation/templates/units/celt_hero_cynvelin.xml
rename to binaries/data/mods/public/simulation/templates/units/celt_hero_cunobelin.xml
index d6f3ec4954..c4b8d577f3 100644
--- a/binaries/data/mods/public/simulation/templates/units/celt_hero_cynvelin.xml
+++ b/binaries/data/mods/public/simulation/templates/units/celt_hero_cunobelin.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/brit_hero_cynvelin">
+<Entity parent="units/brit_hero_cunobelin">
   <Identity>
     <Civ>celt</Civ>
   </Identity>