diff --git a/binaries/data/mods/public/simulation/templates/structures/celt_kennel.xml b/binaries/data/mods/public/simulation/templates/structures/celt_kennel.xml
index b4beb547c6..6b99b76f6b 100644
--- a/binaries/data/mods/public/simulation/templates/structures/celt_kennel.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/celt_kennel.xml
@@ -42,7 +42,7 @@
   </TerritoryInfluence>
   <TrainingQueue>
     <Entities datatype="tokens">
-      units/celt_cavalry_spearman_b
+      units/celt_war_dog_b
     </Entities>
   </TrainingQueue>
   <VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/units/celt_cavalry_spearman_a.xml b/binaries/data/mods/public/simulation/templates/units/celt_war_dog_a.xml
similarity index 75%
rename from binaries/data/mods/public/simulation/templates/units/celt_cavalry_spearman_a.xml
rename to binaries/data/mods/public/simulation/templates/units/celt_war_dog_a.xml
index de40a06029..c370f5e875 100644
--- a/binaries/data/mods/public/simulation/templates/units/celt_cavalry_spearman_a.xml
+++ b/binaries/data/mods/public/simulation/templates/units/celt_war_dog_a.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/celt_cavalry_spearman_b">
+<Entity parent="units/celt_war_dog_b">
   <Armour>
     <Hack>4.0</Hack>
     <Pierce>4.0</Pierce>
@@ -17,11 +17,8 @@
     <Rank>Advanced</Rank>
   </Identity>
   <Promotion>
-    <Entity>units/celt_cavalry_spearman_e</Entity>
+    <Entity>units/celt_war_dog_e</Entity>
   </Promotion>
-  <ResourceGatherer>
-    <BaseSpeed>0.75</BaseSpeed>
-  </ResourceGatherer>
   <UnitMotion>
     <WalkSpeed>9.24</WalkSpeed>
     <Run>
diff --git a/binaries/data/mods/public/simulation/templates/units/celt_cavalry_spearman_b.xml b/binaries/data/mods/public/simulation/templates/units/celt_war_dog_b.xml
similarity index 86%
rename from binaries/data/mods/public/simulation/templates/units/celt_cavalry_spearman_b.xml
rename to binaries/data/mods/public/simulation/templates/units/celt_war_dog_b.xml
index 301f72241a..0e7373c52f 100644
--- a/binaries/data/mods/public/simulation/templates/units/celt_cavalry_spearman_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/celt_war_dog_b.xml
@@ -10,17 +10,29 @@
       <Hack>20.0</Hack>
       <Pierce>0.0</Pierce>
       <Crush>0.0</Crush>
+	  <Bonuses>
+		<BonusHunt>
+		  <Classes>Animal</Classes>
+		  <Multiplier>2.0</Multiplier>
+		</BonusHunt>
+	  </Bonuses>
     </Melee>
     <Charge>
       <Hack>60.0</Hack>
       <Pierce>0.0</Pierce>
+	  <Bonuses>
+		<BonusHunt>
+		  <Classes>Animal</Classes>
+		  <Multiplier>2.0</Multiplier>
+		</BonusHunt>
+	  </Bonuses>
     </Charge>
   </Attack>
   <Cost>
     <BuildTime>10</BuildTime>
     <Population>1</Population>
     <Resources>
-      <food>110</food>
+      <food>100</food>
       <wood>0</wood>
     </Resources>
   </Cost>
@@ -44,8 +56,9 @@
     <Unit radius="1.0"/>
   </Obstruction>
   <Promotion>
-    <Entity>units/celt_cavalry_spearman_a</Entity>
+    <Entity>units/celt_war_dog_a</Entity>
   </Promotion>
+  <ResourceGatherer disable=""/>
   <Sound>
     <SoundGroups>
       <select>voice/celts/civ/civ_dog_bark.xml</select>
@@ -67,7 +80,7 @@
     </Run>
   </UnitMotion>
   <Vision>
-    <Range>80</Range>
+    <Range>40</Range>
   </Vision>
   <VisualActor>
     <Actor>units/celts/cavalry_spearman_b.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/celt_cavalry_spearman_e.xml b/binaries/data/mods/public/simulation/templates/units/celt_war_dog_e.xml
similarity index 81%
rename from binaries/data/mods/public/simulation/templates/units/celt_cavalry_spearman_e.xml
rename to binaries/data/mods/public/simulation/templates/units/celt_war_dog_e.xml
index 64b63d2c2d..3b28357ec8 100644
--- a/binaries/data/mods/public/simulation/templates/units/celt_cavalry_spearman_e.xml
+++ b/binaries/data/mods/public/simulation/templates/units/celt_war_dog_e.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/celt_cavalry_spearman_a">
+<Entity parent="units/celt_war_dog_a">
   <Armour>
     <Hack>6.0</Hack>
     <Pierce>6.0</Pierce>
@@ -17,9 +17,6 @@
     <Rank>Elite</Rank>
   </Identity>
   <Promotion disable=""/>
-  <ResourceGatherer>
-    <BaseSpeed>0.5</BaseSpeed>
-  </ResourceGatherer>
   <UnitMotion>
     <WalkSpeed>8.8</WalkSpeed>
     <Run>