Index: binaries/data/mods/public/maps/random/wild_lake.js
===================================================================
--- binaries/data/mods/public/maps/random/wild_lake.js
+++ binaries/data/mods/public/maps/random/wild_lake.js
@@ -187,7 +187,7 @@
 	"generic/tropic": [
 		{ "Template" : "structures/merc_camp_egyptian" },
 		{ "Template" : "units/ptol_infantry_javelinist_b", "Count" : 4 },
-		{ "Template" : "units/ptol_cavalry_archer_e", "Count" : 3 },
+		{ "Template" : "units/ptol_camel_archer_arab_e", "Count" : 3 },
 		{ "Template" : "units/ptol_infantry_slinger_a", "Count" : 4 },
 		{ "Template" : "units/ptol_champion_infantry_pikeman", "Count" : 3 }
 	],
Index: binaries/data/mods/public/maps/scenarios/sandbox_kushites.xml
===================================================================
--- binaries/data/mods/public/maps/scenarios/sandbox_kushites.xml
+++ binaries/data/mods/public/maps/scenarios/sandbox_kushites.xml
@@ -12650,21 +12650,21 @@
 			<Actor seed="16538"/>
 		</Entity>
 		<Entity uid="2441">
-			<Template>units/kush_cavalry_javelinist_merc_b</Template>
+			<Template>units/kush_camel_javelinist_blemmye_b</Template>
 			<Player>1</Player>
 			<Position x="523.69196" z="443.55524"/>
 			<Orientation y="-2.32712"/>
 			<Actor seed="41280"/>
 		</Entity>
 		<Entity uid="2442">
-			<Template>units/kush_cavalry_javelinist_merc_a</Template>
+			<Template>units/kush_camel_javelinist_blemmye_a</Template>
 			<Player>1</Player>
 			<Position x="526.97284" z="440.65043"/>
 			<Orientation y="2.70665"/>
 			<Actor seed="12858"/>
 		</Entity>
 		<Entity uid="2443">
-			<Template>units/kush_cavalry_javelinist_merc_e</Template>
+			<Template>units/kush_camel_javelinist_blemmye_e</Template>
 			<Player>1</Player>
 			<Position x="529.8238" z="446.32822"/>
 			<Orientation y="1.14618"/>
Index: binaries/data/mods/public/maps/scenarios/sandbox_ptolemies.xml
===================================================================
--- binaries/data/mods/public/maps/scenarios/sandbox_ptolemies.xml
+++ binaries/data/mods/public/maps/scenarios/sandbox_ptolemies.xml
@@ -8548,7 +8548,7 @@
 			<Actor seed="32462"/>
 		</Entity>
 		<Entity uid="1420">
-			<Template>units/ptol_cavalry_archer_b</Template>
+			<Template>units/ptol_camel_archer_arab_b</Template>
 			<Player>1</Player>
 			<Position x="461.86445" z="704.55329"/>
 			<Orientation y="-2.50872"/>
Index: binaries/data/mods/public/maps/scenarios/sandbox_ptolemies_02.xml
===================================================================
--- binaries/data/mods/public/maps/scenarios/sandbox_ptolemies_02.xml
+++ binaries/data/mods/public/maps/scenarios/sandbox_ptolemies_02.xml
@@ -14057,21 +14057,21 @@
 			<Actor seed="33258"/>
 		</Entity>
 		<Entity uid="5622">
-			<Template>units/ptol_cavalry_archer_e</Template>
+			<Template>units/ptol_camel_archer_arab_e</Template>
 			<Player>1</Player>
 			<Position x="384.18989" z="574.64014"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="2216"/>
 		</Entity>
 		<Entity uid="5623">
-			<Template>units/ptol_cavalry_archer_a</Template>
+			<Template>units/ptol_camel_archer_arab_a</Template>
 			<Player>1</Player>
 			<Position x="378.75748" z="581.0522"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="65300"/>
 		</Entity>
 		<Entity uid="5624">
-			<Template>units/ptol_cavalry_archer_b</Template>
+			<Template>units/ptol_camel_archer_arab_b</Template>
 			<Player>1</Player>
 			<Position x="372.61295" z="587.65723"/>
 			<Orientation y="2.35621"/>
@@ -14442,42 +14442,42 @@
 			<Actor seed="57290"/>
 		</Entity>
 		<Entity uid="5677">
-			<Template>units/ptol_cavalry_archer_b</Template>
+			<Template>units/ptol_camel_archer_arab_b</Template>
 			<Player>1</Player>
 			<Position x="375.21769" z="590.29468"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="34992"/>
 		</Entity>
 		<Entity uid="5678">
-			<Template>units/ptol_cavalry_archer_b</Template>
+			<Template>units/ptol_camel_archer_arab_b</Template>
 			<Player>1</Player>
 			<Position x="378.20795" z="592.7834"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="27448"/>
 		</Entity>
 		<Entity uid="5679">
-			<Template>units/ptol_cavalry_archer_a</Template>
+			<Template>units/ptol_camel_archer_arab_a</Template>
 			<Player>1</Player>
 			<Position x="381.05839" z="584.49427"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="40954"/>
 		</Entity>
 		<Entity uid="5680">
-			<Template>units/ptol_cavalry_archer_a</Template>
+			<Template>units/ptol_camel_archer_arab_a</Template>
 			<Player>1</Player>
 			<Position x="383.66953" z="587.32721"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="1082"/>
 		</Entity>
 		<Entity uid="5681">
-			<Template>units/ptol_cavalry_archer_e</Template>
+			<Template>units/ptol_camel_archer_arab_e</Template>
 			<Player>1</Player>
 			<Position x="386.54126" z="577.7417"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="8580"/>
 		</Entity>
 		<Entity uid="5682">
-			<Template>units/ptol_cavalry_archer_e</Template>
+			<Template>units/ptol_camel_archer_arab_e</Template>
 			<Player>1</Player>
 			<Position x="389.68638" z="580.25696"/>
 			<Orientation y="2.35621"/>
Index: binaries/data/mods/public/maps/scenarios/sandbox_seleucids.xml
===================================================================
--- binaries/data/mods/public/maps/scenarios/sandbox_seleucids.xml
+++ binaries/data/mods/public/maps/scenarios/sandbox_seleucids.xml
@@ -10247,7 +10247,7 @@
 			<Actor seed="51302"/>
 		</Entity>
 		<Entity uid="2521">
-			<Template>units/ptol_cavalry_archer_b</Template>
+			<Template>units/ptol_camel_archer_arab_b</Template>
 			<Player>2</Player>
 			<Position x="447.3979" z="891.89582"/>
 			<Orientation y="-0.74244"/>
Index: binaries/data/mods/public/maps/skirmishes/egypt_3pv3p.xml
===================================================================
--- binaries/data/mods/public/maps/skirmishes/egypt_3pv3p.xml
+++ binaries/data/mods/public/maps/skirmishes/egypt_3pv3p.xml
@@ -20744,14 +20744,14 @@
 			<Actor seed="25520"/>
 		</Entity>
 		<Entity uid="5028">
-			<Template>units/ptol_cavalry_archer_a</Template>
+			<Template>units/ptol_camel_archer_arab_a</Template>
 			<Player>0</Player>
 			<Position x="1839.95386" z="1292.23194"/>
 			<Orientation y="1.16709"/>
 			<Actor seed="32174"/>
 		</Entity>
 		<Entity uid="5029">
-			<Template>units/ptol_cavalry_archer_a</Template>
+			<Template>units/ptol_camel_archer_arab_a</Template>
 			<Player>0</Player>
 			<Position x="1843.81434" z="1296.922"/>
 			<Orientation y="2.35621"/>
Index: binaries/data/mods/public/simulation/data/civs/ptol.json
===================================================================
--- binaries/data/mods/public/simulation/data/civs/ptol.json
+++ binaries/data/mods/public/simulation/data/civs/ptol.json
@@ -138,7 +138,7 @@
 			"Count": 2
 		},
 		{
-			"Template": "units/ptol_cavalry_archer_b"
+			"Template": "units/ptol_camel_archer_arab_b"
 		}
 	],
 	"Formations":
@@ -181,7 +181,7 @@
 	"SkirmishReplacements":
 	{
 		"skirmish/units/default_infantry_melee_b": "units/ptol_infantry_pikeman_b",
-		"skirmish/units/default_cavalry": "units/ptol_cavalry_archer_b",
+		"skirmish/units/default_cavalry": "units/ptol_camel_archer_arab_b",
 		"skirmish/structures/default_house_5": "structures/{civ}_house"
 	},
 	"SelectableInGameSetup": true
Index: binaries/data/mods/public/simulation/templates/structures/kush_blemmye_camp.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/kush_blemmye_camp.xml
+++ binaries/data/mods/public/simulation/templates/structures/kush_blemmye_camp.xml
@@ -33,7 +33,7 @@
   </Obstruction>
   <ProductionQueue>
     <Entities datatype="tokens">
-      units/{native}_cavalry_javelinist_merc_b
+      units/{native}_camel_javelinist_blemmye_b
     </Entities>
   </ProductionQueue>
   <TerritoryDecay>
Index: binaries/data/mods/public/simulation/templates/structures/ptol_civil_centre.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/ptol_civil_centre.xml
+++ binaries/data/mods/public/simulation/templates/structures/ptol_civil_centre.xml
@@ -15,7 +15,7 @@
     <Entities datatype="tokens">
       units/{civ}_infantry_pikeman_b
       units/{civ}_infantry_javelinist_b
-      units/{civ}_cavalry_archer_b
+      units/{native}_camel_archer_arab_b
       units/{civ}_hero_ptolemy_I
       units/{civ}_hero_ptolemy_IV
       units/{civ}_hero_cleopatra
Index: binaries/data/mods/public/simulation/templates/template_unit_camel.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/template_unit_camel.xml
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit">
+  <Armour>
+    <Hack>1</Hack>
+    <Pierce>1</Pierce>
+    <Crush>15</Crush>
+  </Armour>
+  <Attack>
+    <Capture>
+      <Capture>2.5</Capture>
+      <MaxRange>4</MaxRange>
+      <RepeatTime>1000</RepeatTime>
+      <RestrictedClasses datatype="tokens">Field Palisade Wall</RestrictedClasses>
+    </Capture>
+    <Slaughter>
+      <Damage>
+        <Hack>100</Hack>
+        <Pierce>0</Pierce>
+        <Crush>0</Crush>
+      </Damage>
+      <MaxRange>2</MaxRange>
+    </Slaughter>
+  </Attack>
+  <Cost>
+    <Population>1</Population>
+    <BuildTime>15</BuildTime>
+    <Resources>
+      <food>100</food>
+      <wood>50</wood>
+    </Resources>
+  </Cost>
+  <Footprint replace="">
+    <Square width="3.0" depth="6.0"/>
+    <Height>7.5</Height>
+  </Footprint>
+  <Health>
+    <Max>140</Max>
+  </Health>
+  <Identity>
+    <GenericName>Camel</GenericName>
+    <Classes datatype="tokens">Human CitizenSoldier</Classes>
+    <VisibleClasses datatype="tokens">Citizen Soldier Camel</VisibleClasses>
+    <Rank>Basic</Rank>
+    <Formations datatype="tokens">
+      special/formations/wedge
+    </Formations>
+  </Identity>
+  <Loot>
+    <xp>140</xp>
+    <food>10</food>
+    <wood>5</wood>
+    <stone>0</stone>
+    <metal>0</metal>
+  </Loot>
+  <Promotion>
+    <RequiredXp>140</RequiredXp>
+  </Promotion>
+  <ResourceGatherer>
+    <MaxDistance>2.0</MaxDistance>
+    <BaseSpeed>1.0</BaseSpeed>
+    <Rates>
+      <food.meat>5</food.meat>
+    </Rates>
+    <Capacities>
+      <food>20</food>
+      <wood>20</wood>
+      <stone>20</stone>
+      <metal>20</metal>
+    </Capacities>
+  </ResourceGatherer>
+  <Selectable>
+    <Overlay>
+      <Texture>
+        <MainTexture>128x256/ellipse.png</MainTexture>
+        <MainTextureMask>128x256/ellipse_mask.png</MainTextureMask>
+      </Texture>
+    </Overlay>
+  </Selectable>
+  <Sound>
+    <SoundGroups>
+      <death>actor/fauna/death/death_camel.xml</death>
+      <select>actor/fauna/animal/camel.xml</select>
+      <order_attack>voice/{lang}/civ/civ_{phenotype}_attack.xml</order_attack>
+      <order_garrison>voice/{lang}/civ/civ_{phenotype}_garrison.xml</order_garrison>
+      <order_gather>voice/{lang}/civ/civ_{phenotype}_gather.xml</order_gather>
+      <order_walk>actor/fauna/movement/camel_order.xml</order_walk>
+      <run>actor/mounted/movement/walk.xml</run>
+      <trained>interface/alarm/alarm_create_cav.xml</trained>
+      <walk>actor/mounted/movement/walk.xml</walk>
+    </SoundGroups>
+  </Sound>
+  <StatusBars>
+    <HeightOffset>8.5</HeightOffset>
+  </StatusBars>
+  <UnitMotion>
+    <WalkSpeed op="mul">2</WalkSpeed>
+  </UnitMotion>
+  <Vision>
+    <Range>92</Range>
+  </Vision>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/template_unit_camel_archer.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/template_unit_camel_archer.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_camel">
+  <Attack>
+    <Ranged>
+      <Damage>
+        <Hack>0</Hack>
+        <Pierce>7</Pierce>
+        <Crush>0</Crush>
+      </Damage>
+      <MaxRange>72</MaxRange>
+      <MinRange>0</MinRange>
+      <PrepareTime>500</PrepareTime>
+      <RepeatTime>1000</RepeatTime>
+      <Delay>0</Delay>
+      <Projectile>
+        <Speed>75.0</Speed>
+        <Gravity>39.81</Gravity>
+        <Spread>3.0</Spread>
+        <FriendlyFire>false</FriendlyFire>
+        <LaunchPoint y="3"/>
+      </Projectile>
+      <PreferredClasses datatype="tokens">Human</PreferredClasses>
+    </Ranged>
+  </Attack>
+  <Identity>
+    <GenericName>Camel Archer</GenericName>
+    <VisibleClasses datatype="tokens">Ranged Archer</VisibleClasses>
+    <Formations datatype="tokens">
+      special/formations/skirmish
+    </Formations>
+  </Identity>
+  <Sound>
+    <SoundGroups>
+      <attack_ranged>attack/weapon/bow_attack.xml</attack_ranged>
+      <attack_impact_ranged>attack/impact/arrow_impact.xml</attack_impact_ranged>
+    </SoundGroups>
+  </Sound>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/template_unit_camel_javelinist.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/simulation/templates/template_unit_camel_javelinist.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_camel">
+  <Attack>
+    <Ranged>
+      <Damage>
+        <Hack>0</Hack>
+        <Pierce>18</Pierce>
+        <Crush>0</Crush>
+      </Damage>
+      <MaxRange>28</MaxRange>
+      <MinRange>0</MinRange>
+      <PrepareTime>750</PrepareTime>
+      <RepeatTime>1250</RepeatTime>
+      <Delay>0</Delay>
+      <Projectile>
+        <Speed>62.5</Speed>
+        <Gravity>39.81</Gravity>
+        <Spread>4.0</Spread>
+        <FriendlyFire>false</FriendlyFire>
+        <LaunchPoint y="3"/>
+      </Projectile>
+      <PreferredClasses datatype="tokens">Human</PreferredClasses>
+    </Ranged>
+  </Attack>
+  <Identity>
+    <GenericName>Camel Javelinist</GenericName>
+    <VisibleClasses datatype="tokens">Ranged Javelinist</VisibleClasses>
+    <Formations datatype="tokens">
+      special/formations/skirmish
+    </Formations>
+  </Identity>
+  <Sound>
+    <SoundGroups>
+      <attack_ranged>attack/weapon/javelin_attack.xml</attack_ranged>
+      <attack_impact_ranged>attack/impact/javelin_impact.xml</attack_impact_ranged>
+    </SoundGroups>
+  </Sound>
+</Entity>
Index: binaries/data/mods/public/simulation/templates/units/kush_camel_javelinist_blemmye_a.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/kush_camel_javelinist_blemmye_a.xml
+++ binaries/data/mods/public/simulation/templates/units/kush_camel_javelinist_blemmye_a.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/kush_cavalry_javelinist_merc_b">
+<Entity parent="units/kush_camel_javelinist_blemmye_b">
   <Identity>
     <Rank>Advanced</Rank>
   </Identity>
   <Promotion>
-    <Entity>units/kush_cavalry_javelinist_merc_e</Entity>
+    <Entity>units/kush_camel_javelinist_blemmye_e</Entity>
   </Promotion>
 </Entity>
Index: binaries/data/mods/public/simulation/templates/units/kush_camel_javelinist_blemmye_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/kush_camel_javelinist_blemmye_b.xml
+++ binaries/data/mods/public/simulation/templates/units/kush_camel_javelinist_blemmye_b.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_cavalry_ranged_javelinist">
+<Entity parent="template_unit_camel_javelinist">
   <Cost>
     <Resources>
       <food op="add">-25</food>
@@ -8,23 +8,16 @@
   </Cost>
   <Identity>
     <Civ>kush</Civ>
-    <VisibleClasses datatype="tokens">Camel Mercenary</VisibleClasses>
-    <SelectionGroupName>units/kush_cavalry_javelinist_merc_b</SelectionGroupName>
+    <SelectionGroupName>units/kush_camel_javelinist_blemmye_b</SelectionGroupName>
     <GenericName>Blemmye Desert Raider</GenericName>
     <SpecificName>nhw Bulahau gml</SpecificName>
+    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
     <Icon>units/kush_camel_javelinist.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Promotion>
-    <Entity>units/kush_cavalry_javelinist_merc_a</Entity>
+    <Entity>units/kush_camel_javelinist_blemmye_a</Entity>
   </Promotion>
-  <Sound>
-    <SoundGroups>
-      <select>actor/fauna/animal/camel.xml</select>
-      <order_walk>actor/fauna/movement/camel_order.xml</order_walk>
-      <death>actor/fauna/death/death_camel.xml</death>
-    </SoundGroups>
-  </Sound>
   <VisualActor>
     <Actor>units/kushites/camelry_javelinist_b_m.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/units/kush_camel_javelinist_blemmye_e.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/kush_camel_javelinist_blemmye_e.xml
+++ binaries/data/mods/public/simulation/templates/units/kush_camel_javelinist_blemmye_e.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/kush_cavalry_javelinist_merc_a">
+<Entity parent="units/kush_camel_javelinist_blemmye_a">
   <Identity>
     <Rank>Elite</Rank>
   </Identity>
Index: binaries/data/mods/public/simulation/templates/units/kush_cavalry_javelinist_merc_a.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/kush_cavalry_javelinist_merc_a.xml
+++ binaries/data/mods/public/simulation/templates/units/kush_cavalry_javelinist_merc_a.xml
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/kush_cavalry_javelinist_merc_b">
-  <Identity>
-    <Rank>Advanced</Rank>
-  </Identity>
-  <Promotion>
-    <Entity>units/kush_cavalry_javelinist_merc_e</Entity>
-  </Promotion>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/kush_cavalry_javelinist_merc_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/kush_cavalry_javelinist_merc_b.xml
+++ binaries/data/mods/public/simulation/templates/units/kush_cavalry_javelinist_merc_b.xml
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_cavalry_ranged_javelinist">
-  <Cost>
-    <Resources>
-      <food op="add">-25</food>
-      <metal op="add">25</metal>
-    </Resources>
-  </Cost>
-  <Identity>
-    <Civ>kush</Civ>
-    <VisibleClasses datatype="tokens">Camel Mercenary</VisibleClasses>
-    <SelectionGroupName>units/kush_cavalry_javelinist_merc_b</SelectionGroupName>
-    <GenericName>Blemmye Desert Raider</GenericName>
-    <SpecificName>nhw Bulahau gml</SpecificName>
-    <Icon>units/kush_camel_javelinist.png</Icon>
-    <RequiredTechnology>phase_town</RequiredTechnology>
-  </Identity>
-  <Promotion>
-    <Entity>units/kush_cavalry_javelinist_merc_a</Entity>
-  </Promotion>
-  <Sound>
-    <SoundGroups>
-      <select>actor/fauna/animal/camel.xml</select>
-      <order_walk>actor/fauna/movement/camel_order.xml</order_walk>
-      <death>actor/fauna/death/death_camel.xml</death>
-    </SoundGroups>
-  </Sound>
-  <VisualActor>
-    <Actor>units/kushites/camelry_javelinist_b_m.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/kush_cavalry_javelinist_merc_e.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/kush_cavalry_javelinist_merc_e.xml
+++ binaries/data/mods/public/simulation/templates/units/kush_cavalry_javelinist_merc_e.xml
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/kush_cavalry_javelinist_merc_a">
-  <Identity>
-    <Rank>Elite</Rank>
-  </Identity>
-  <Promotion disable=""/>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/ptol_camel_archer_arab_a.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/ptol_camel_archer_arab_a.xml
+++ binaries/data/mods/public/simulation/templates/units/ptol_camel_archer_arab_a.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/ptol_cavalry_archer_b">
+<Entity parent="units/ptol_camel_archer_arab_b">
   <Identity>
     <Rank>Advanced</Rank>
   </Identity>
   <Promotion>
-    <Entity>units/ptol_cavalry_archer_e</Entity>
+    <Entity>units/ptol_camel_archer_arab_e</Entity>
   </Promotion>
   <VisualActor>
     <Actor>units/ptolemies/camelry_archer_a_m.xml</Actor>
Index: binaries/data/mods/public/simulation/templates/units/ptol_camel_archer_arab_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/ptol_camel_archer_arab_b.xml
+++ binaries/data/mods/public/simulation/templates/units/ptol_camel_archer_arab_b.xml
@@ -1,24 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_cavalry_ranged_archer">
+<Entity parent="template_unit_camel_archer">
   <Identity>
     <Civ>ptol</Civ>
-    <VisibleClasses datatype="tokens">Camel</VisibleClasses>
-    <SelectionGroupName>units/ptol_cavalry_archer</SelectionGroupName>
+    <SelectionGroupName>units/ptol_camel_archer_arab_b</SelectionGroupName>
     <GenericName>Nabataean Camel Archer</GenericName>
     <SpecificName>Mutsābiq Gamal Nabatu</SpecificName>
     <Icon>units/ptol_camel_archer.png</Icon>
     <RequiredTechnology>phase_village</RequiredTechnology>
   </Identity>
   <Promotion>
-    <Entity>units/ptol_cavalry_archer_a</Entity>
+    <Entity>units/ptol_camel_archer_arab_a</Entity>
   </Promotion>
-  <Sound>
-    <SoundGroups>
-      <select>actor/fauna/animal/camel_select.xml</select>
-      <order_walk>actor/fauna/movement/camel_order.xml</order_walk>
-      <death>actor/fauna/death/death_camel.xml</death>
-    </SoundGroups>
-  </Sound>
   <VisualActor>
     <Actor>units/ptolemies/camelry_archer_b_m.xml</Actor>
   </VisualActor>
Index: binaries/data/mods/public/simulation/templates/units/ptol_camel_archer_arab_e.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/ptol_camel_archer_arab_e.xml
+++ binaries/data/mods/public/simulation/templates/units/ptol_camel_archer_arab_e.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/ptol_cavalry_archer_a">
+<Entity parent="units/ptol_camel_archer_arab_a">
   <Identity>
     <Rank>Elite</Rank>
   </Identity>
Index: binaries/data/mods/public/simulation/templates/units/ptol_cavalry_archer_a.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/ptol_cavalry_archer_a.xml
+++ binaries/data/mods/public/simulation/templates/units/ptol_cavalry_archer_a.xml
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/ptol_cavalry_archer_b">
-  <Identity>
-    <Rank>Advanced</Rank>
-  </Identity>
-  <Promotion>
-    <Entity>units/ptol_cavalry_archer_e</Entity>
-  </Promotion>
-  <VisualActor>
-    <Actor>units/ptolemies/camelry_archer_a_m.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/ptol_cavalry_archer_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/ptol_cavalry_archer_b.xml
+++ binaries/data/mods/public/simulation/templates/units/ptol_cavalry_archer_b.xml
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_cavalry_ranged_archer">
-  <Identity>
-    <Civ>ptol</Civ>
-    <VisibleClasses datatype="tokens">Camel</VisibleClasses>
-    <SelectionGroupName>units/ptol_cavalry_archer</SelectionGroupName>
-    <GenericName>Nabataean Camel Archer</GenericName>
-    <SpecificName>Mutsābiq Gamal Nabatu</SpecificName>
-    <Icon>units/ptol_camel_archer.png</Icon>
-    <RequiredTechnology>phase_village</RequiredTechnology>
-  </Identity>
-  <Promotion>
-    <Entity>units/ptol_cavalry_archer_a</Entity>
-  </Promotion>
-  <Sound>
-    <SoundGroups>
-      <select>actor/fauna/animal/camel_select.xml</select>
-      <order_walk>actor/fauna/movement/camel_order.xml</order_walk>
-      <death>actor/fauna/death/death_camel.xml</death>
-    </SoundGroups>
-  </Sound>
-  <VisualActor>
-    <Actor>units/ptolemies/camelry_archer_b_m.xml</Actor>
-  </VisualActor>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/units/ptol_cavalry_archer_e.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/ptol_cavalry_archer_e.xml
+++ binaries/data/mods/public/simulation/templates/units/ptol_cavalry_archer_e.xml
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/ptol_cavalry_archer_a">
-  <Identity>
-    <Rank>Elite</Rank>
-  </Identity>
-  <Promotion disable=""/>
-  <VisualActor>
-    <Actor>units/ptolemies/camelry_archer_e_m.xml</Actor>
-  </VisualActor>
-</Entity>