Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_arctic_wolf.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_arctic_wolf.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_arctic_wolf.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_wild_aggressive_wolf">
   <Identity>
-    <SpecificName>Arctic Wolf</SpecificName>
+    <GenericName>Arctic Wolf</GenericName>
+    <SpecificName>Canis lupus</SpecificName>
     <Icon>gaia/fauna_arctic_wolf.png</Icon>
   </Identity>
   <VisualActor>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_bear.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_bear.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_bear.xml
@@ -14,8 +14,8 @@
     <Height>2.0</Height>
   </Footprint>
   <Identity>
-    <Civ>gaia</Civ>
-    <SpecificName>Bear</SpecificName>
+    <GenericName>Brown Bear</GenericName>
+    <SpecificName>Ursus arctos</SpecificName>
     <Icon>gaia/fauna_bear.png</Icon>
   </Identity>
   <Position>
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
@@ -14,7 +14,6 @@
     <Height>3.5</Height>
   </Footprint>
   <Identity>
-    <Civ>gaia</Civ>
     <GenericName>Wild Boar</GenericName>
     <SpecificName>Sus scrofa</SpecificName>
     <Icon>gaia/fauna_boar.png</Icon>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_camel.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_camel.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_camel.xml
@@ -5,8 +5,8 @@
     <Height>3.0</Height>
   </Footprint>
   <Identity>
-    <Civ>gaia</Civ>
-    <SpecificName>Camel</SpecificName>
+    <GenericName>Dromedary</GenericName>
+    <SpecificName>Camelus dromedarius</SpecificName>
     <Icon>gaia/fauna_camel.png</Icon>
   </Identity>
   <Position>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_chicken.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_chicken.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_chicken.xml
@@ -8,8 +8,8 @@
     <Max>5</Max>
   </Health>
   <Identity>
-    <Civ>gaia</Civ>
-    <SpecificName>Chicken</SpecificName>
+    <GenericName>Chicken</GenericName>
+    <SpecificName>Gallus gallus domesticus</SpecificName>
     <Icon>gaia/fauna_chicken.png</Icon>
   </Identity>
   <Obstruction>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_crocodile.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_crocodile.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_crocodile.xml
@@ -14,9 +14,8 @@
     <Height>1.5</Height>
   </Footprint>
   <Identity>
-    <Civ>gaia</Civ>
-    <SpecificName>Crocodylus niloticus</SpecificName>
     <GenericName>Nile Crocodile</GenericName>
+    <SpecificName>Crocodylus niloticus</SpecificName>
     <Icon>gaia/fauna_crocodile.png</Icon>
   </Identity>
   <Position>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_deer.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_deer.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_deer.xml
@@ -5,8 +5,8 @@
     <Height>2.0</Height>
   </Footprint>
   <Identity>
-    <Civ>gaia</Civ>
-    <SpecificName>Deer</SpecificName>
+    <GenericName>Red Deer</GenericName>
+    <SpecificName>Cervus elaphus</SpecificName>
     <Icon>gaia/fauna_deer.png</Icon>
   </Identity>
   <Position>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_donkey.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_donkey.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_donkey.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="gaia/fauna_horse">
   <Identity>
-    <SpecificName>Donkey</SpecificName>
+    <GenericName>Donkey</GenericName>
+    <SpecificName>Equus africanus asinus</SpecificName>
     <Icon>gaia/fauna_donkey.png</Icon>
   </Identity>
   <VisualActor>
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
@@ -8,7 +8,8 @@
     <Max>300</Max>
   </Health>
   <Identity>
-    <SpecificName>African Bush Elephant</SpecificName>
+    <GenericName>African Bush Elephant</GenericName>
+    <SpecificName>Loxodonta africana</SpecificName>
     <Icon>gaia/fauna_elephant_african_bush.png</Icon>
   </Identity>
   <Loot>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_elephant_african_infant.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_elephant_african_infant.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_elephant_african_infant.xml
@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_skittish_elephant_infant">
   <Identity>
-    <SpecificName>African Elephant Calf</SpecificName>
+    <GenericName>African Bush Elephant Calf</GenericName>
+    <SpecificName>Loxodonta africana</SpecificName>
+    <Icon>gaia/fauna_elephant_african_infant.png</Icon>
   </Identity>
+  <VisualActor>
+    <Actor>fauna/elephant_african_baby.xml</Actor>
+  </VisualActor>
 </Entity>
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
@@ -8,7 +8,8 @@
     <Max>250</Max>
   </Health>
   <Identity>
-    <SpecificName>Asian Elephant</SpecificName>
+    <GenericName>Asian Elephant</GenericName>
+    <SpecificName>Elephas maximus</SpecificName>
     <Icon>gaia/fauna_elephant_asian.png</Icon>
   </Identity>
   <Loot>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_elephant_asian_infant.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_elephant_asian_infant.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_elephant_asian_infant.xml
@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_skittish_elephant_infant">
   <Identity>
-    <SpecificName>Asian Elephant Calf</SpecificName>
+    <GenericName>Asian Elephant Calf</GenericName>
+    <SpecificName>Elephas maximus</SpecificName>
+    <Icon>gaia/fauna_elephant_african_infant.png</Icon>
   </Identity>
+  <VisualActor>
+    <Actor>fauna/elephant_african_baby.xml</Actor>
+  </VisualActor>
 </Entity>
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
@@ -8,7 +8,8 @@
     <Max>200</Max>
   </Health>
   <Identity>
-    <SpecificName>North African Elephant</SpecificName>
+    <GenericName>African Forest Elephant</GenericName>
+    <SpecificName>Loxodonta cyclotis</SpecificName>
     <Icon>gaia/fauna_elephant_north_african.png</Icon>
   </Identity>
   <Loot>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_fish.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_fish.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_fish.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_fish">
   <Identity>
-    <Civ>gaia</Civ>
-    <SpecificName>Tuna Fish</SpecificName>
-    <Tooltip>Gather food from this bountiful oceanic resource.</Tooltip>
+    <GenericName>Fish</GenericName>
+    <SpecificName>Fish</SpecificName>
     <Icon>gaia/fauna_fish.png</Icon>
   </Identity>
   <VisualActor>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_fish_tilapia.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_fish_tilapia.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_fish_tilapia.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_fish">
   <Identity>
-    <Civ>gaia</Civ>
-    <SpecificName>Tilapia Fish</SpecificName>
-    <Tooltip>Gather food from this bountiful riparian resource.</Tooltip>
+    <GenericName>Tilapia</GenericName>
+    <SpecificName>Fish</SpecificName>
     <Icon>gaia/fauna_fish.png</Icon>
   </Identity>
   <VisualActor>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_fish_tuna.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_fish_tuna.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_fish_tuna.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_fish">
   <Identity>
-    <Civ>gaia</Civ>
-    <SpecificName>Tuna Fish</SpecificName>
-    <Tooltip>Gather food from this bountiful oceanic resource.</Tooltip>
+    <GenericName>Tuna</GenericName>
+    <SpecificName>Fish</SpecificName>
     <Icon>gaia/fauna_fish.png</Icon>
   </Identity>
   <VisualActor>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_fox_arctic.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_fox_arctic.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_fox_arctic.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_wild_defensive_fox">
   <Identity>
-    <SpecificName>Arctic Fox</SpecificName>
+    <GenericName>Arctic Fox</GenericName>
+    <SpecificName>Vulpes lagopus</SpecificName>
     <Icon>gaia/fauna_fox_arctic.png</Icon>
   </Identity>
   <VisualActor>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_fox_red.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_fox_red.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_fox_red.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_wild_defensive_fox">
   <Identity>
-    <SpecificName>Red Fox</SpecificName>
+    <GenericName>Red Fox</GenericName>
+    <SpecificName>Vulpes vulpes</SpecificName>
     <Icon>gaia/fauna_fox_red.png</Icon>
   </Identity>
   <VisualActor>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_gazelle.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_gazelle.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_gazelle.xml
@@ -5,8 +5,8 @@
     <Height>2.0</Height>
   </Footprint>
   <Identity>
-    <Civ>gaia</Civ>
-    <SpecificName>Gazelle</SpecificName>
+    <GenericName>Thomson's Gazelle</GenericName>
+    <SpecificName>Eudorcas thomsonii</SpecificName>
     <Icon>gaia/fauna_gazelle.png</Icon>
   </Identity>
   <Position>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_giraffe.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_giraffe.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_giraffe.xml
@@ -8,8 +8,8 @@
     <Max>150</Max>
   </Health>
   <Identity>
-    <Civ>gaia</Civ>
-    <SpecificName>Giraffe (Adult)</SpecificName>
+    <GenericName>Giraffe</GenericName>
+    <SpecificName>Giraffa camelopardalis</SpecificName>
     <Icon>gaia/fauna_giraffe.png</Icon>
   </Identity>
   <Position>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_giraffe_infant.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_giraffe_infant.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_giraffe_infant.xml
@@ -5,8 +5,8 @@
     <Height>3.5</Height>
   </Footprint>
   <Identity>
-    <Civ>gaia</Civ>
-    <SpecificName>Giraffe (Juvenile)</SpecificName>
+    <GenericName>Juvenile Giraffe</GenericName>
+    <SpecificName>Giraffa camelopardalis</SpecificName>
     <Icon>gaia/fauna_giraffe.png</Icon>
   </Identity>
   <Position>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_goat.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_goat.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_goat.xml
@@ -5,8 +5,8 @@
     <Height>1.5</Height>
   </Footprint>
   <Identity>
-    <Civ>gaia</Civ>
-    <SpecificName>Goat</SpecificName>
+    <GenericName>Goat</GenericName>
+    <SpecificName>Capra aegagrus hircus</SpecificName>
     <Icon>gaia/fauna_goat.png</Icon>
   </Identity>
   <Position>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_horse.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_horse.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_horse.xml
@@ -5,8 +5,8 @@
     <Height>3.0</Height>
   </Footprint>
   <Identity>
-    <Civ>gaia</Civ>
-    <SpecificName>Horse</SpecificName>
+    <GenericName>Horse</GenericName>
+    <SpecificName>Equus ferus caballus</SpecificName>
     <Icon>gaia/fauna_horse.png</Icon>
   </Identity>
   <Position>
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
@@ -14,8 +14,8 @@
     <Height>2.0</Height>
   </Footprint>
   <Identity>
-    <Civ>gaia</Civ>
-    <SpecificName>Lion</SpecificName>
+    <GenericName>Lion</GenericName>
+    <SpecificName>Panthera leo</SpecificName>
     <Icon>gaia/fauna_lion.png</Icon>
   </Identity>
   <Position>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_lioness.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_lioness.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_lioness.xml
@@ -1,39 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_wild_violent">
-  <Attack>
-    <Melee>
-      <Hack>15.0</Hack>
-      <Pierce>0.0</Pierce>
-      <Crush>0.0</Crush>
-      <MaxRange>4.0</MaxRange>
-      <RepeatTime>2000</RepeatTime>
-    </Melee>
-  </Attack>
-  <Footprint>
-    <Square width="2.0" depth="4.0"/>
-    <Height>2.0</Height>
-  </Footprint>
+<Entity parent="gaia/fauna_lion">
   <Identity>
-    <Civ>gaia</Civ>
-    <SpecificName>Lioness</SpecificName>
-    <Icon>gaia/fauna_lion.png</Icon>
+    <GenericName>Lioness</GenericName>
   </Identity>
-  <Position>
-    <Anchor>pitch</Anchor>
-  </Position>
-  <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>
-  <UnitMotion>
-    <WalkSpeed op="mul">0.45</WalkSpeed>
-    <Run>
-      <Speed op="mul">0.45</Speed>
-    </Run>
-  </UnitMotion>
   <VisualActor>
     <Actor>fauna/lioness.xml</Actor>
   </VisualActor>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_mastiff.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_mastiff.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_mastiff.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_wild_aggressive_dog">
   <Identity>
-    <SpecificName>Mastiff</SpecificName>
+    <GenericName>Mastiff</GenericName>
+    <SpecificName>Canis lupus familiaris</SpecificName>
     <Icon>gaia/fauna_dog.png</Icon>
   </Identity>
   <VisualActor>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_muskox.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_muskox.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_muskox.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_herd_domestic">
+<Entity parent="template_unit_fauna_hunt_skittish">
   <Footprint replace="">
     <Square width="2.1" depth="4.2"/>
     <Height>2.0</Height>
   </Footprint>
   <Identity>
-    <Civ>gaia</Civ>
-    <SpecificName>Muskox</SpecificName>
+    <GenericName>Muskox</GenericName>
+    <SpecificName>Ovibos moschatus</SpecificName>
     <Icon>gaia/fauna_muskox.png</Icon>
   </Identity>
   <Position>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_peacock.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_peacock.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_peacock.xml
@@ -4,7 +4,6 @@
     <Max>10</Max>
   </Health>
   <Identity>
-    <Civ>gaia</Civ>
     <GenericName>Peacock</GenericName>
     <SpecificName>Pavo cristatus</SpecificName>
     <Icon>gaia/fauna_peacock.png</Icon>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_pig.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_pig.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_pig.xml
@@ -5,8 +5,8 @@
     <Height>1.5</Height>
   </Footprint>
   <Identity>
-    <Civ>gaia</Civ>
-    <SpecificName>Pig</SpecificName>
+    <GenericName>Pig</GenericName>
+    <SpecificName>Sus scrofa domesticus</SpecificName>
     <Icon>gaia/fauna_pig.png</Icon>
   </Identity>
   <Position>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_pig_flaming.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_pig_flaming.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_pig_flaming.xml
@@ -16,7 +16,6 @@
   </Health>
   <Identity>
     <GenericName>Flaming Pig</GenericName>
-    <SpecificName>Sus scrofa domesticus igne</SpecificName>
     <Icon>units/flaming_pig.png</Icon>
   </Identity>
   <ResourceSupply disable=""/>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_pony.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_pony.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_pony.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="gaia/fauna_horse">
   <Identity>
-    <SpecificName>Pony</SpecificName>
+    <GenericName>Pony</GenericName>
   </Identity>
   <UnitMotion>
     <WalkSpeed op="mul">0.8</WalkSpeed>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_rabbit.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_rabbit.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_rabbit.xml
@@ -8,8 +8,8 @@
     <Max>10</Max>
   </Health>
   <Identity>
-    <Civ>gaia</Civ>
-    <SpecificName>Rabbit</SpecificName>
+    <GenericName>Rabbit</GenericName>
+    <SpecificName>Oryctolagus cuniculus</SpecificName>
     <Icon>gaia/fauna_rabbit.png</Icon>
   </Identity>
   <Obstruction>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_rhino.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_rhino.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_rhino.xml
@@ -14,8 +14,8 @@
     <Height>2.0</Height>
   </Footprint>
   <Identity>
-    <Civ>gaia</Civ>
-    <SpecificName>Rhinoceros</SpecificName>
+    <GenericName>White Rhinoceros</GenericName>
+    <SpecificName>Ceratotherium simum</SpecificName>
     <Icon>gaia/fauna_rhino.png</Icon>
   </Identity>
   <Position>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_shark.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_shark.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_shark.xml
@@ -9,9 +9,8 @@
     <Unhealable>true</Unhealable>
   </Health>
   <Identity>
-    <Civ>gaia</Civ>
-    <SpecificName>Great White</SpecificName>
-    <GenericName>Shark</GenericName>
+    <GenericName>Great White Shark</GenericName>
+    <SpecificName>Carcharodon carcharias</SpecificName>
     <Classes datatype="tokens">SeaCreature</Classes>
     <Icon>gaia/fauna_fish.png</Icon>
   </Identity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_sheep.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_sheep.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_sheep.xml
@@ -5,8 +5,8 @@
     <Height>1.5</Height>
   </Footprint>
   <Identity>
-    <Civ>gaia</Civ>
-    <SpecificName>Sheep</SpecificName>
+    <GenericName>Sheep</GenericName>
+    <SpecificName>Ovis aries</SpecificName>
     <Icon>gaia/fauna_sheep.png</Icon>
   </Identity>
   <Position>
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
@@ -14,8 +14,8 @@
     <Height>2.0</Height>
   </Footprint>
   <Identity>
-    <Civ>gaia</Civ>
-    <SpecificName>Tiger</SpecificName>
+    <GenericName>Tiger</GenericName>
+    <SpecificName>Panthera tigris</SpecificName>
     <Icon>gaia/fauna_tiger.png</Icon>
   </Identity>
   <Position>
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
@@ -21,8 +21,8 @@
     <Height>2.0</Height>
   </Footprint>
   <Identity>
-    <Civ>gaia</Civ>
-    <SpecificName>Walrus</SpecificName>
+    <GenericName>Walrus</GenericName>
+    <SpecificName>Odobenus rosmarus</SpecificName>
     <Icon>gaia/fauna_walrus.png</Icon>
   </Identity>
   <Position>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_whale_fin.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_whale_fin.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_whale_fin.xml
@@ -5,7 +5,9 @@
     <Height>2.5</Height>
   </Footprint>
   <Identity>
-    <SpecificName>Fin Whale</SpecificName>
+    <GenericName>Fin Whale</GenericName>
+    <SpecificName>Balaenoptera physalus</SpecificName>
+    <Icon>gaia/fauna_fish.png</Icon>
   </Identity>
   <Position>
     <Altitude>-0.5</Altitude>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_whale_humpback.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_whale_humpback.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_whale_humpback.xml
@@ -5,7 +5,9 @@
     <Height>2.5</Height>
   </Footprint>
   <Identity>
-    <SpecificName>Humpback Whale</SpecificName>
+    <GenericName>Humpback Whale</GenericName>
+    <SpecificName>Megaptera novaeangliae</SpecificName>
+    <Icon>gaia/fauna_fish.png</Icon>
   </Identity>
   <Position>
     <Altitude>-4</Altitude>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_wildebeest.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_wildebeest.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_wildebeest.xml
@@ -5,8 +5,8 @@
     <Height>2.0</Height>
   </Footprint>
   <Identity>
-    <Civ>gaia</Civ>
-    <SpecificName>Wildebeest</SpecificName>
+    <GenericName>Blue Wildebeest</GenericName>
+    <SpecificName>Connochaetes taurinus</SpecificName>
     <Icon>gaia/fauna_wildebeest.png</Icon>
   </Identity>
   <Position>
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,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_wild_aggressive_wolf">
   <Identity>
-    <SpecificName>Wolf</SpecificName>
+    <GenericName>Wolf</GenericName>
+    <SpecificName>Canis lupus</SpecificName>
     <Icon>gaia/fauna_wolf.png</Icon>
   </Identity>
   <VisualActor>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_wolfhound.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_wolfhound.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_wolfhound.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_wild_aggressive_dog">
   <Identity>
-    <SpecificName>Wolfhound</SpecificName>
+    <GenericName>Wolfhound</GenericName>
+    <SpecificName>Canis lupus familiaris</SpecificName>
     <Icon>units/brit_wolfhound.png</Icon>
   </Identity>
   <VisualActor>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_zebra.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_zebra.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_zebra.xml
@@ -5,8 +5,8 @@
     <Height>2.0</Height>
   </Footprint>
   <Identity>
-    <Civ>gaia</Civ>
-    <SpecificName>Zebra</SpecificName>
+    <GenericName>Common Zebra</GenericName>
+    <SpecificName>Equus quagga</SpecificName>
     <Icon>gaia/fauna_zebra.png</Icon>
   </Identity>
   <Position>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_zebu.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_zebu.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_zebu.xml
@@ -5,8 +5,8 @@
     <Height>2.0</Height>
   </Footprint>
   <Identity>
-    <Civ>gaia</Civ>
-    <SpecificName>Zebu</SpecificName>
+    <GenericName>Zebu</GenericName>
+    <SpecificName>Bos taurus indicus</SpecificName>
     <Icon>gaia/fauna_zebu.png</Icon>
   </Identity>
   <Position>
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
@@ -9,7 +9,6 @@
   </Footprint>
   <Guard disable=""/>
   <Identity>
-    <GenericName>Fauna</GenericName>
     <Classes datatype="tokens">Animal Organic -ConquestCritical</Classes>
     <Icon>gaia/fauna_generic.png</Icon>
     <Formations disable=""/>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_fish.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_fish.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_fish.xml
@@ -7,8 +7,8 @@
   </Footprint>
   <Health disable=""/>
   <Identity>
-    <GenericName>Fish</GenericName>
     <Classes datatype="tokens">SeaCreature</Classes>
+    <Tooltip>Gather food from this bountiful oceanic resource.</Tooltip>
   </Identity>
   <Obstruction>
     <BlockMovement>false</BlockMovement>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_skittish_elephant_infant.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_skittish_elephant_infant.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_skittish_elephant_infant.xml
@@ -11,7 +11,6 @@
   </Footprint>
   <Identity>
     <VisibleClasses datatype="tokens">Elephant</VisibleClasses>
-    <Icon>gaia/fauna_elephant_african_infant.png</Icon>
   </Identity>
   <Position>
     <Anchor>pitch</Anchor>
@@ -30,7 +29,4 @@
       <trained>actor/fauna/animal/elephant_trained.xml</trained>
     </SoundGroups>
   </Sound>
-  <VisualActor>
-    <Actor>fauna/elephant_african_baby.xml</Actor>
-  </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_whale.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_whale.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_whale.xml
@@ -6,10 +6,7 @@
     <Unhealable>true</Unhealable>
   </Health>
   <Identity>
-    <Classes datatype="tokens">SeaCreature</Classes>
-    <GenericName>Cetacean</GenericName>
     <Tooltip>Kill, then gather food from this bountiful oceanic resource.</Tooltip>
-    <Icon>gaia/fauna_fish.png</Icon>
   </Identity>
   <Loot>
     <xp>10</xp>