Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_bear_black.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_bear_black.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_bear_black.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_hunt_aggressive_bear">
+<Entity parent="template_unit_fauna_hunt_defensive_bear">
   <Attack>
     <Melee>
       <AttackName>Paws</AttackName>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_bear_brown.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_bear_brown.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_bear_brown.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_hunt_aggressive_bear">
+<Entity parent="template_unit_fauna_hunt_defensive_bear">
   <Attack>
     <Melee>
       <AttackName>Paws</AttackName>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_bear_polar.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_bear_polar.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_bear_polar.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_hunt_aggressive_bear">
+<Entity parent="template_unit_fauna_hunt_defensive_bear">
   <Attack>
     <Melee>
       <AttackName>Paws</AttackName>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_boar.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_boar.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_boar.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_hunt_aggressive">
+<Entity parent="template_unit_fauna_hunt_passive-defensive">
   <Attack>
     <Melee>
       <AttackName>Tusks</AttackName>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_cattle_bull.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_cattle_bull.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_cattle_bull.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_hunt_defensive_bull">
+<Entity parent="template_unit_fauna_hunt_passive-defensive_bull">
   <Attack>
     <Melee>
       <AttackName>Horns</AttackName>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_crocodile_nile.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_crocodile_nile.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_crocodile_nile.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_wild_aggressive">
+<Entity parent="template_unit_fauna_wild_defensive">
   <Attack>
     <Melee>
       <AttackName>Teeth</AttackName>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_elephant_african_bush.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_elephant_african_bush.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_elephant_african_bush.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_hunt_defensive_elephant">
+<Entity parent="template_unit_fauna_hunt_passive-defensive_elephant">
   <Attack>
     <Melee>
       <AttackName>Trunk</AttackName>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_elephant_asian.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_elephant_asian.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_elephant_asian.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_hunt_defensive_elephant">
+<Entity parent="template_unit_fauna_hunt_passive-defensive_elephant">
   <Attack>
     <Melee>
       <AttackName>Trunk</AttackName>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_elephant_north_african.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_elephant_north_african.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_elephant_north_african.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_hunt_defensive_elephant">
+<Entity parent="template_unit_fauna_hunt_passive-defensive_elephant">
   <Attack>
     <Melee>
       <AttackName>Trunk</AttackName>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_hippopotamus.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_hippopotamus.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_hippopotamus.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_hunt_aggressive">
+<Entity parent="template_unit_fauna_hunt_defensive">
   <Attack>
     <Melee>
       <AttackName>Tusks</AttackName>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_lion.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_lion.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_lion.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_wild_violent">
+<Entity parent="template_unit_fauna_wild_defensive">
   <Attack>
     <Melee>
       <AttackName>Paws</AttackName>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_rhinoceros_white.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_rhinoceros_white.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_rhinoceros_white.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_hunt_aggressive">
+<Entity parent="template_unit_fauna_hunt_defensive">
   <Attack>
     <Melee>
       <AttackName>Horn</AttackName>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_tiger.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_tiger.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_tiger.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_wild_violent">
+<Entity parent="template_unit_fauna_wild_defensive">
   <Attack>
     <Melee>
       <AttackName>Paws</AttackName>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_walrus.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_walrus.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_walrus.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_hunt_defensive">
+<Entity parent="template_unit_fauna_hunt_passive-defensive">
   <Attack>
     <Melee>
       <AttackName>Tusks</AttackName>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_wolf.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_wolf.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_wolf.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_wild_aggressive">
+<Entity parent="template_unit_fauna_wild_defensive">
   <Attack>
     <Melee>
       <AttackName>Fangs</AttackName>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_wolf_arctic.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_wolf_arctic.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_wolf_arctic.xml
@@ -4,6 +4,9 @@
     <GenericName>Arctic Wolf</GenericName>
     <Icon>gaia/fauna_arctic_wolf.png</Icon>
   </Identity>
+  <UnitAI>
+    <DefaultStance>aggressive</DefaultStance>
+  </UnitAI>
   <VisualActor>
     <Actor>fauna/arctic_wolf.xml</Actor>
   </VisualActor>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna.xml
@@ -52,6 +52,6 @@
     <RetainInFog>true</RetainInFog>
   </Visibility>
   <Vision>
-    <Range>60</Range>
+    <Range>90</Range>
   </Vision>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_aggressive_bear.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_aggressive_bear.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_aggressive_bear.xml
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_hunt_aggressive">
-  <ResourceSupply>
-    <Max>300</Max>
-  </ResourceSupply>
-  <Sound>
-    <SoundGroups>
-      <select>actor/fauna/animal/lion_select.xml</select>
-      <attack_melee>actor/fauna/animal/lion_attack.xml</attack_melee>
-      <death>actor/fauna/animal/lion_death.xml</death>
-    </SoundGroups>
-  </Sound>
-</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_defensive.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_defensive.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_defensive.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt">
   <UnitAI>
-    <DefaultStance>passive-defensive</DefaultStance>
+    <DefaultStance>defensive</DefaultStance>
   </UnitAI>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_defensive_bear.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_defensive_bear.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_defensive_bear.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_fauna_hunt_defensive">
+  <ResourceSupply>
+    <Max>300</Max>
+  </ResourceSupply>
+  <Sound>
+    <SoundGroups>
+      <select>actor/fauna/animal/lion_select.xml</select>
+      <attack_melee>actor/fauna/animal/lion_attack.xml</attack_melee>
+      <death>actor/fauna/animal/lion_death.xml</death>
+    </SoundGroups>
+  </Sound>
+</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_defensive_bull.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_defensive_bull.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_defensive_bull.xml
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_hunt_defensive">
-  <Sound>
-    <SoundGroups>
-      <select>actor/fauna/animal/cattle_select.xml</select>
-      <attack_melee>actor/fauna/animal/cattle_attack.xml</attack_melee>
-      <death>actor/fauna/animal/cattle_death.xml</death>
-      <order_walk>actor/fauna/animal/cattle_order.xml</order_walk>
-      <trained>actor/fauna/animal/cattle_trained.xml</trained>
-    </SoundGroups>
-  </Sound>
-  <UnitMotion>
-    <PassabilityClass>large</PassabilityClass>
-    <WalkSpeed op="mul">0.4</WalkSpeed>
-    <RunMultiplier>2.0</RunMultiplier>
-    <Acceleration op="mul">0.4</Acceleration>
-  </UnitMotion>
-</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_defensive_elephant.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_defensive_elephant.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_defensive_elephant.xml
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_hunt_defensive">
-  <Identity>
-    <VisibleClasses datatype="tokens">Elephant</VisibleClasses>
-  </Identity>
-  <Position>
-    <TurnRate>4</TurnRate>
-  </Position>
-  <Sound>
-    <SoundGroups>
-      <select>actor/fauna/animal/elephant_select.xml</select>
-      <order_walk>actor/fauna/animal/elephant_order.xml</order_walk>
-      <attack_melee>actor/fauna/animal/elephant_attack.xml</attack_melee>
-      <death>actor/fauna/animal/elephant_death.xml</death>
-      <trained>actor/fauna/animal/elephant_trained.xml</trained>
-    </SoundGroups>
-  </Sound>
-  <UnitMotion>
-    <PassabilityClass>large</PassabilityClass>
-    <WalkSpeed op="mul">0.5</WalkSpeed>
-    <Acceleration op="mul">0.25</Acceleration>
-    <Weight op="mul">5.0</Weight>
-  </UnitMotion>
-</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_passive-defensive.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_passive-defensive.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_passive-defensive.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_fauna_hunt">
+  <UnitAI>
+    <DefaultStance>passive-defensive</DefaultStance>
+  </UnitAI>
+</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_passive-defensive_bull.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_passive-defensive_bull.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_passive-defensive_bull.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_fauna_hunt_passive-defensive">
+  <Sound>
+    <SoundGroups>
+      <select>actor/fauna/animal/cattle_select.xml</select>
+      <attack_melee>actor/fauna/animal/cattle_attack.xml</attack_melee>
+      <death>actor/fauna/animal/cattle_death.xml</death>
+      <order_walk>actor/fauna/animal/cattle_order.xml</order_walk>
+      <trained>actor/fauna/animal/cattle_trained.xml</trained>
+    </SoundGroups>
+  </Sound>
+  <UnitMotion>
+    <PassabilityClass>large</PassabilityClass>
+    <WalkSpeed op="mul">0.4</WalkSpeed>
+    <RunMultiplier>2.0</RunMultiplier>
+    <Acceleration op="mul">0.4</Acceleration>
+  </UnitMotion>
+</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_passive-defensive_elephant.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_passive-defensive_elephant.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_passive-defensive_elephant.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_fauna_hunt_passive-defensive">
+  <Identity>
+    <VisibleClasses datatype="tokens">Elephant</VisibleClasses>
+  </Identity>
+  <Position>
+    <TurnRate>4</TurnRate>
+  </Position>
+  <Sound>
+    <SoundGroups>
+      <select>actor/fauna/animal/elephant_select.xml</select>
+      <order_walk>actor/fauna/animal/elephant_order.xml</order_walk>
+      <attack_melee>actor/fauna/animal/elephant_attack.xml</attack_melee>
+      <death>actor/fauna/animal/elephant_death.xml</death>
+      <trained>actor/fauna/animal/elephant_trained.xml</trained>
+    </SoundGroups>
+  </Sound>
+  <UnitMotion>
+    <PassabilityClass>large</PassabilityClass>
+    <WalkSpeed op="mul">0.5</WalkSpeed>
+    <Acceleration op="mul">0.25</Acceleration>
+    <Weight op="mul">5.0</Weight>
+  </UnitMotion>
+</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_wild_defensive.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_wild_defensive.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_wild_defensive.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_wild">
   <UnitAI>
-    <DefaultStance>passive-defensive</DefaultStance>
+    <DefaultStance>defensive</DefaultStance>
   </UnitAI>
 </Entity>