Index: binaries/data/mods/public/art/actors/props/units/shields/rome_scutum_legionnaire.xml
===================================================================
--- binaries/data/mods/public/art/actors/props/units/shields/rome_scutum_legionnaire.xml
+++ binaries/data/mods/public/art/actors/props/units/shields/rome_scutum_legionnaire.xml
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-
-  <castshadow/>
-
-  <group>
-    <variant frequency="1" name="shield1">
-      <mesh>props/shield/scutum_j_f.dae</mesh>
-      <props>
-        <prop actor="props/units/shields/rome_scutum_imp_back1.xml" attachpoint="back"/>
-      </props>
-    </variant>
-    <variant frequency="1" name="shield2">
-      <mesh>props/shield/scutum_k_f.dae</mesh>
-      <props>
-        <prop actor="props/units/shields/rome_scutum_imp_back2.xml" attachpoint="back"/>
-      </props>
-    </variant>
-    <variant frequency="1" name="shield3">
-      <mesh>props/shield/scutum_l_f.dae</mesh>
-      <props>
-        <prop actor="props/units/shields/rome_scutum_imp_back2.xml" attachpoint="back"/>
-      </props>
-    </variant>
-  </group>
-
-  <group>
-    <variant frequency="1" name="shield-scutum-a">
-      <textures><texture file="props/shield/rome_imp_scutum_a.dds" name="baseTex"/></textures>
-    </variant>
-    <variant frequency="1" name="shield-scutum-b">
-      <textures><texture file="props/shield/rome_imp_scutum_b.dds" name="baseTex"/></textures>
-    </variant>
-    <variant frequency="1" name="shield-scutum-c">
-      <textures><texture file="props/shield/rome_imp_scutum_c.dds" name="baseTex"/></textures>
-    </variant>
-    <variant frequency="1" name="shield-scutum-d">
-      <textures><texture file="props/shield/rome_imp_scutum_d.dds" name="baseTex"/></textures>
-    </variant>
-  </group>
-
-  <material>player_trans.xml</material>
-
-</actor>
Index: binaries/data/mods/public/art/actors/units/romans/infantry_swordsman_c2.xml
===================================================================
--- binaries/data/mods/public/art/actors/units/romans/infantry_swordsman_c2.xml
+++ binaries/data/mods/public/art/actors/units/romans/infantry_swordsman_c2.xml
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant file="biped/base_swordsman_shield_ready.xml">
-      <mesh>skeletal/new/m_tunic_short.dae</mesh>
-      <props>
-        <prop actor="props/units/heads/new/rome_head_veteran.xml" attachpoint="head"/>
-        <prop actor="props/units/helmets/rome_helmet_coolus.xml" attachpoint="helmet"/>
-        <prop actor="props/units/weapons/gladus.xml" attachpoint="weapon_R"/>
-        <prop actor="props/units/shields/rome_scutum_marian.xml" attachpoint="shield"/>
-      </props>
-      <textures>
-        <texture file="skeletal/rome_su3_marian_legion.dds" name="baseTex"/>
-        <texture file="skeletal/rome_su3_marian_legion_spec.png" name="specTex"/>
-      </textures>
-    </variant>
-  </group>
-  <group>
-    <variant frequency="1" name="Idle"/>
-    <variant file="biped/attack_capture.xml"/>
-    <variant file="biped/death_infantry.xml"/>
-  </group>
-  <group>
-    <variant file="biped/formations/testudo_idle_top.xml"/>
-    <variant file="biped/formations/testudo_idle_front.xml"/>
-    <variant file="biped/formations/testudo_walk_top.xml"/>
-    <variant file="biped/formations/testudo_walk_front.xml"/>
-    <variant file="biped/formations/testudo_idle_front_left.xml"/>
-    <variant file="biped/formations/testudo_idle_front_right.xml"/>
-    <variant file="biped/formations/testudo_idle_left.xml"/>
-    <variant file="biped/formations/testudo_idle_right.xml"/>
-    <variant file="biped/formations/testudo_walk_left.xml"/>
-    <variant file="biped/formations/testudo_walk_right.xml"/>
-    <variant file="biped/formations/testudo_walk_front_left.xml"/>
-    <variant file="biped/formations/testudo_walk_front_right.xml"/>
-  </group>
-  <material>player_trans_spec.xml</material>
-</actor>
Index: binaries/data/mods/public/art/actors/units/romans/infantry_swordsman_c3.xml
===================================================================
--- binaries/data/mods/public/art/actors/units/romans/infantry_swordsman_c3.xml
+++ binaries/data/mods/public/art/actors/units/romans/infantry_swordsman_c3.xml
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant file="biped/base_swordsman_shield_ready.xml">
-      <mesh>skeletal/new/m_armor_tunic_long.dae</mesh>
-      <props>
-        <prop actor="props/units/heads/new/rome_head_veteran.xml" attachpoint="head"/>
-        <prop actor="props/units/helmets/rome_helmet_imperial_gallic.xml" attachpoint="helmet"/>
-        <prop actor="props/units/weapons/gladus.xml" attachpoint="weapon_R"/>
-        <prop actor="props/units/shields/rome_scutum_legionnaire.xml" attachpoint="shield"/>
-      </props>
-      <textures>
-        <texture file="skeletal/rome_su4_imperial_legion.dds" name="baseTex"/>
-      </textures>
-    </variant>
-  </group>
-  <group>
-    <variant frequency="1" name="Idle"/>
-    <variant file="biped/attack_capture.xml"/>
-    <variant file="biped/death_infantry.xml"/>
-    <variant file="biped/formations/testudo_idle_top.xml"/>
-    <variant file="biped/formations/testudo_idle_front.xml"/>
-    <variant file="biped/formations/testudo_walk_top.xml"/>
-    <variant file="biped/formations/testudo_walk_front.xml"/>
-    <variant file="biped/formations/testudo_idle_front_left.xml"/>
-    <variant file="biped/formations/testudo_idle_front_right.xml"/>
-    <variant file="biped/formations/testudo_idle_left.xml"/>
-    <variant file="biped/formations/testudo_idle_right.xml"/>
-    <variant file="biped/formations/testudo_walk_left.xml"/>
-    <variant file="biped/formations/testudo_walk_right.xml"/>
-    <variant file="biped/formations/testudo_walk_front_left.xml"/>
-    <variant file="biped/formations/testudo_walk_front_right.xml"/>
-  </group>
-  <material>player_trans.xml</material>
-</actor>
Index: binaries/data/mods/public/art/actors/units/romans/infantry_swordsman_c4.xml
===================================================================
--- binaries/data/mods/public/art/actors/units/romans/infantry_swordsman_c4.xml
+++ binaries/data/mods/public/art/actors/units/romans/infantry_swordsman_c4.xml
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant file="biped/base_swordsman_shield_ready.xml">
-      <mesh>skeletal/new/m_armor_tunic_long.dae</mesh>
-      <props>
-        <prop actor="props/units/heads/new/rome_head_veteran.xml" attachpoint="head"/>
-        <prop actor="props/units/helmets/rome_helmet_imperial_gallic_cent.xml" attachpoint="helmet"/>
-        <prop actor="props/units/weapons/gladus.xml" attachpoint="weapon_R"/>
-        <prop actor="props/units/shields/rome_scutum_marian.xml" attachpoint="shield"/>
-        <prop actor="props/units/capes/swordsman_shield_ready_centurion.xml" attachpoint="root"/>
-      </props>
-      <textures>
-        <texture file="skeletal/imp/infantry_swordsman_c_a.dds" name="baseTex"/>
-        <texture file="skeletal/imp/infantry_swordsman_c_a_spec.dds" name="specTex"/>
-      </textures>
-    </variant>
-  </group>
-  <group>
-    <variant frequency="1" name="Idle"/>
-    <variant file="biped/attack_capture.xml"/>
-    <variant file="biped/death_infantry.xml">
-      <props>
-        <prop actor="props/units/capes/swordsman_shield_ready_centurion.xml" attachpoint="root"/>
-      </props>
-    </variant>
-  </group>
-  <group>
-    <variant file="biped/formations/testudo_idle_top.xml"/>
-    <variant file="biped/formations/testudo_idle_front.xml"/>
-    <variant file="biped/formations/testudo_walk_top.xml"/>
-    <variant file="biped/formations/testudo_walk_front.xml"/>
-    <variant file="biped/formations/testudo_idle_front_left.xml"/>
-    <variant file="biped/formations/testudo_idle_front_right.xml"/>
-    <variant file="biped/formations/testudo_idle_left.xml"/>
-    <variant file="biped/formations/testudo_idle_right.xml"/>
-    <variant file="biped/formations/testudo_walk_left.xml"/>
-    <variant file="biped/formations/testudo_walk_right.xml"/>
-    <variant file="biped/formations/testudo_walk_front_left.xml"/>
-    <variant file="biped/formations/testudo_walk_front_right.xml"/>
-  </group>
-  <material>player_trans_spec.xml</material>
-</actor>
Index: binaries/data/mods/public/art/actors/units/romans/infantry_swordsman_c_3.xml
===================================================================
--- binaries/data/mods/public/art/actors/units/romans/infantry_swordsman_c_3.xml
+++ binaries/data/mods/public/art/actors/units/romans/infantry_swordsman_c_3.xml
@@ -8,7 +8,7 @@
         <prop actor="props/units/heads/new/rome_head_veteran.xml" attachpoint="head"/>
         <prop actor="props/units/helmets/rome_helmet_imperial_gallic.xml" attachpoint="helmet"/>
         <prop actor="props/units/weapons/gladus.xml" attachpoint="weapon_R"/>
-        <prop actor="props/units/shields/rome_scutum_legionnaire.xml" attachpoint="shield"/>
+        <prop actor="props/units/shields/rome_scutum_legionary.xml" attachpoint="shield"/>
       </props>
       <textures>
         <texture file="skeletal/rome_su4_imperial_legion.dds" name="baseTex"/>
Index: binaries/data/mods/public/maps/random/extinct_volcano_triggers.js
===================================================================
--- binaries/data/mods/public/maps/random/extinct_volcano_triggers.js
+++ binaries/data/mods/public/maps/random/extinct_volcano_triggers.js
@@ -71,7 +71,7 @@
 /**
  * Units to be garrisoned in the wooden towers.
  */
-var garrisonedUnits = "units/rome_legionnaire_marian";
+var garrisonedUnits = "units/rome_infantry_swordsman_c_2";
 
 Trigger.prototype.RaisingWaterNotification = function()
 {
Index: binaries/data/mods/public/simulation/templates/units/rome_centurio_imperial.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/rome_centurio_imperial.xml
+++ binaries/data/mods/public/simulation/templates/units/rome_centurio_imperial.xml
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/rome_legionnaire_imperial">
-  <Attack>
-    <Melee>
-      <Hack>20</Hack>
-    </Melee>
-  </Attack>
-  <Health>
-    <Max>140</Max>
-  </Health>
-  <Identity>
-    <Civ>rome</Civ>
-    <Lang>latin</Lang>
-    <GenericName>Roman Centurion</GenericName>
-    <SpecificName>Centurio Legionarius</SpecificName>
-    <Icon>units/rome_champion_legion_centurio.png</Icon>
-  </Identity>
-  <Promotion disable=""/>
-  <VisualActor>
-    <Actor>units/romans/infantry_swordsman_c4.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/rome_infantry_swordsman_c_2.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/rome_infantry_swordsman_c_2.xml
+++ binaries/data/mods/public/simulation/templates/units/rome_infantry_swordsman_c_2.xml
@@ -3,16 +3,16 @@
   <Identity>
     <Civ>rome</Civ>
     <Lang>latin</Lang>
-    <GenericName>Marian Legionaire</GenericName>
-    <SpecificName>Marian Legionarius</SpecificName>
+    <GenericName>Marian Legionary</GenericName>
+    <SpecificName>Legionarius</SpecificName>
     <Icon>units/rome_champion_legion_marian.png</Icon>
-    <SelectionGroupName>units/rome_legionnaire_marian</SelectionGroupName>
+    <SelectionGroupName>units/rome_legionary</SelectionGroupName>
   </Identity>
   <Promotion>
-    <Entity>units/rome_legionnaire_imperial</Entity>
+    <Entity>units/rome_infantry_swordsman_c_3</Entity>
     <RequiredXp>150</RequiredXp>
   </Promotion>
   <VisualActor>
-    <Actor>units/romans/infantry_swordsman_c2.xml</Actor>
+    <Actor>units/romans/infantry_swordsman_c_2.xml</Actor>
   </VisualActor>
 </Entity>
Index: binaries/data/mods/public/simulation/templates/units/rome_infantry_swordsman_c_3.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/rome_infantry_swordsman_c_3.xml
+++ binaries/data/mods/public/simulation/templates/units/rome_infantry_swordsman_c_3.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/rome_legionnaire_marian">
+<Entity parent="units/rome_infantry_swordsman_c_2">
   <Attack>
     <Melee>
       <Hack>18.5</Hack>
@@ -8,15 +8,15 @@
   <Identity>
     <Civ>rome</Civ>
     <Lang>latin</Lang>
-    <GenericName>Roman Legionnaire</GenericName>
+    <GenericName>Roman Legionary</GenericName>
     <SpecificName>Legionarius Romanus</SpecificName>
     <Icon>units/rome_champion_legion_imperial.png</Icon>
   </Identity>
   <Promotion>
-    <Entity>units/rome_centurio_imperial</Entity>
+    <Entity>units/rome_infantry_swordsman_c_4</Entity>
     <RequiredXp>300</RequiredXp>
   </Promotion>
   <VisualActor>
-    <Actor>units/romans/infantry_swordsman_c3.xml</Actor>
+    <Actor>units/romans/infantry_swordsman_c_3.xml</Actor>
   </VisualActor>
 </Entity>
Index: binaries/data/mods/public/simulation/templates/units/rome_infantry_swordsman_c_4.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/rome_infantry_swordsman_c_4.xml
+++ binaries/data/mods/public/simulation/templates/units/rome_infantry_swordsman_c_4.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/rome_legionnaire_imperial">
+<Entity parent="units/rome_infantry_swordsman_c_3">
   <Attack>
     <Melee>
       <Hack>20</Hack>
@@ -17,6 +17,6 @@
   </Identity>
   <Promotion disable=""/>
   <VisualActor>
-    <Actor>units/romans/infantry_swordsman_c4.xml</Actor>
+    <Actor>units/romans/infantry_swordsman_c_4.xml</Actor>
   </VisualActor>
 </Entity>
Index: binaries/data/mods/public/simulation/templates/units/rome_legionnaire_imperial.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/rome_legionnaire_imperial.xml
+++ binaries/data/mods/public/simulation/templates/units/rome_legionnaire_imperial.xml
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/rome_legionnaire_marian">
-  <Attack>
-    <Melee>
-      <Hack>18.5</Hack>
-    </Melee>
-  </Attack>
-  <Identity>
-    <Civ>rome</Civ>
-    <Lang>latin</Lang>
-    <GenericName>Roman Legionnaire</GenericName>
-    <SpecificName>Legionarius Romanus</SpecificName>
-    <Icon>units/rome_champion_legion_imperial.png</Icon>
-  </Identity>
-  <Promotion>
-    <Entity>units/rome_centurio_imperial</Entity>
-    <RequiredXp>300</RequiredXp>
-  </Promotion>
-  <VisualActor>
-    <Actor>units/romans/infantry_swordsman_c3.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/rome_legionnaire_marian.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/rome_legionnaire_marian.xml
+++ binaries/data/mods/public/simulation/templates/units/rome_legionnaire_marian.xml
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_infantry_swordsman">
-  <Identity>
-    <Civ>rome</Civ>
-    <Lang>latin</Lang>
-    <GenericName>Marian Legionaire</GenericName>
-    <SpecificName>Marian Legionarius</SpecificName>
-    <Icon>units/rome_champion_legion_marian.png</Icon>
-    <SelectionGroupName>units/rome_legionnaire_marian</SelectionGroupName>
-  </Identity>
-  <Promotion>
-    <Entity>units/rome_legionnaire_imperial</Entity>
-    <RequiredXp>150</RequiredXp>
-  </Promotion>
-  <VisualActor>
-    <Actor>units/romans/infantry_swordsman_c2.xml</Actor>
-  </VisualActor>
-</Entity>