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	(revision 22013)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_arctic_wolf.xml	(revision 22014)
@@ -1,10 +1,11 @@
 <?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>
     <Actor>fauna/arctic_wolf.xml</Actor>
   </VisualActor>
 </Entity>
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	(revision 22013)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_bear.xml	(revision 22014)
@@ -1,38 +1,38 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_aggressive">
   <Attack>
     <Melee>
       <Hack>20.0</Hack>
       <Pierce>0.0</Pierce>
       <Crush>20.0</Crush>
       <MaxRange>6.0</MaxRange>
       <RepeatTime>2000</RepeatTime>
     </Melee>
   </Attack>
   <Footprint>
     <Square width="2.0" depth="4.0"/>
     <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>
     <Anchor>pitch</Anchor>
   </Position>
   <ResourceSupply>
     <Amount>300</Amount>
     <Type>food.meat</Type>
   </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>
   <VisualActor>
     <Actor>fauna/bear.xml</Actor>
   </VisualActor>
 </Entity>
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	(revision 22013)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_boar.xml	(revision 22014)
@@ -1,35 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_aggressive">
   <Attack>
     <Melee>
       <Hack>12.0</Hack>
       <Pierce>0.0</Pierce>
       <Crush>0.0</Crush>
       <MaxRange>1.0</MaxRange>
       <RepeatTime>1000</RepeatTime>
     </Melee>
   </Attack>
   <Footprint replace="">
     <Circle radius="1.0"/>
     <Height>3.5</Height>
   </Footprint>
   <Identity>
-    <Civ>gaia</Civ>
     <GenericName>Wild Boar</GenericName>
     <SpecificName>Sus scrofa</SpecificName>
     <Icon>gaia/fauna_boar.png</Icon>
   </Identity>
   <Position>
     <Anchor>pitch</Anchor>
   </Position>
   <ResourceSupply>
     <Amount>150</Amount>
     <Type>food.meat</Type>
   </ResourceSupply>
   <StatusBars>
     <HeightOffset>5.0</HeightOffset>
   </StatusBars>
   <VisualActor>
     <Actor>fauna/boar.xml</Actor>
   </VisualActor>
 </Entity>
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	(revision 22013)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_camel.xml	(revision 22014)
@@ -1,42 +1,42 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_skittish">
   <Footprint>
     <Square width="2.5" depth="5.0"/>
     <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>
     <Anchor>pitch</Anchor>
   </Position>
   <ResourceSupply>
     <Amount>200</Amount>
   </ResourceSupply>
   <Selectable>
     <Overlay>
       <Texture>
         <MainTexture>circle/256x256.png</MainTexture>
         <MainTextureMask>circle/256x256_mask.png</MainTextureMask>
       </Texture>
     </Overlay>
   </Selectable>
   <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>
   <UnitMotion>
     <WalkSpeed op="mul">0.45</WalkSpeed>
     <Run>
       <Speed op="mul">0.45</Speed>
     </Run>
   </UnitMotion>
   <VisualActor>
     <Actor>fauna/camel.xml</Actor>
   </VisualActor>
 </Entity>
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	(revision 22013)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_chicken.xml	(revision 22014)
@@ -1,50 +1,50 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_herd_domestic">
   <Footprint>
     <Square width="0.9" depth="1.8"/>
     <Height>1.0</Height>
   </Footprint>
   <Health>
     <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>
     <BlockMovement>false</BlockMovement>
   </Obstruction>
   <ResourceSupply>
     <Amount>40</Amount>
     <Type>food.meat</Type>
     <MaxGatherers>5</MaxGatherers>
   </ResourceSupply>
   <Sound>
     <SoundGroups>
       <panic>actor/fauna/animal/chickens.xml</panic>
       <select>actor/fauna/animal/chickens_select.xml</select>
       <death>actor/fauna/animal/chickens.xml</death>
     </SoundGroups>
   </Sound>
   <StatusBars>
     <HeightOffset>3.0</HeightOffset>
   </StatusBars>
   <UnitAI>
     <RoamDistance>4.0</RoamDistance>
     <FleeDistance>12.0</FleeDistance>
     <RoamTimeMin>2000</RoamTimeMin>
     <RoamTimeMax>8000</RoamTimeMax>
     <FeedTimeMin>10000</FeedTimeMin>
     <FeedTimeMax>40000</FeedTimeMax>
   </UnitAI>
   <UnitMotion>
     <WalkSpeed op="mul">0.15</WalkSpeed>
     <Run>
       <Speed op="mul">0.15</Speed>
     </Run>
   </UnitMotion>
   <VisualActor>
     <Actor>fauna/chicken.xml</Actor>
   </VisualActor>
 </Entity>
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	(revision 22013)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_crocodile.xml	(revision 22014)
@@ -1,49 +1,48 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_wild_aggressive">
   <Attack>
     <Melee>
       <Hack>30.0</Hack>
       <Pierce>0.0</Pierce>
       <Crush>0.0</Crush>
       <MaxRange>8.0</MaxRange>
       <RepeatTime>2000</RepeatTime>
     </Melee>
   </Attack>
   <Footprint>
     <Square width="3.5" depth="7.0"/>
     <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>
     <Anchor>pitch-roll</Anchor>
   </Position>
   <Selectable>
     <Overlay>
       <Texture>
         <MainTexture>circle/256x256.png</MainTexture>
         <MainTextureMask>circle/256x256_mask.png</MainTextureMask>
       </Texture>
     </Overlay>
   </Selectable>
   <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.3</WalkSpeed>
     <Run>
       <Speed op="mul">0.3</Speed>
     </Run>
   </UnitMotion>
   <VisualActor>
     <Actor>fauna/crocodile.xml</Actor>
   </VisualActor>
 </Entity>
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	(revision 22013)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_deer.xml	(revision 22014)
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_skittish">
   <Footprint>
     <Square width="1.7" depth="3.4"/>
     <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>
     <Anchor>pitch</Anchor>
   </Position>
   <VisualActor>
     <Actor>fauna/deer.xml</Actor>
   </VisualActor>
 </Entity>
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	(revision 22013)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_donkey.xml	(revision 22014)
@@ -1,10 +1,11 @@
 <?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>
     <Actor>fauna/donkey.xml</Actor>
   </VisualActor>
 </Entity>
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	(revision 22013)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_elephant_african_bush.xml	(revision 22014)
@@ -1,24 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_defensive_elephant">
   <Footprint>
     <Square width="4.6" depth="9.2"/>
     <Height>4.0</Height>
   </Footprint>
   <Health>
     <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>
     <xp>75</xp>
   </Loot>
   <ResourceSupply>
     <Amount>800</Amount>
     <Type>food.meat</Type>
   </ResourceSupply>
   <VisualActor>
     <Actor>fauna/elephant_african_bush.xml</Actor>
   </VisualActor>
 </Entity>
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	(revision 22013)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_elephant_african_infant.xml	(revision 22014)
@@ -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	(revision 22013)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_elephant_asian.xml	(revision 22014)
@@ -1,24 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_defensive_elephant">
   <Footprint>
     <Square width="4.0" depth="8.0"/>
     <Height>3.5</Height>
   </Footprint>
   <Health>
     <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>
     <xp>60</xp>
   </Loot>
   <ResourceSupply>
     <Amount>650</Amount>
     <Type>food.meat</Type>
   </ResourceSupply>
   <VisualActor>
     <Actor>fauna/elephant_asian.xml</Actor>
   </VisualActor>
 </Entity>
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	(revision 22013)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_elephant_asian_infant.xml	(revision 22014)
@@ -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	(revision 22013)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_elephant_north_african.xml	(revision 22014)
@@ -1,24 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_defensive_elephant">
   <Footprint>
     <Square width="3.5" depth="7.0"/>
     <Height>3.0</Height>
   </Footprint>
   <Health>
     <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>
     <xp>50</xp>
   </Loot>
   <ResourceSupply>
     <Amount>500</Amount>
     <Type>food.meat</Type>
   </ResourceSupply>
   <VisualActor>
     <Actor>fauna/elephant_african_forest.xml</Actor>
   </VisualActor>
 </Entity>
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	(revision 22013)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_fish.xml	(revision 22014)
@@ -1,12 +1,11 @@
 <?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>
     <Actor>fauna/fish_generic.xml</Actor>
   </VisualActor>
 </Entity>
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	(revision 22013)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_fish_tilapia.xml	(revision 22014)
@@ -1,12 +1,11 @@
 <?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>
     <Actor>fauna/fish_generic.xml</Actor>
   </VisualActor>
 </Entity>
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	(revision 22013)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_fish_tuna.xml	(revision 22014)
@@ -1,12 +1,11 @@
 <?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>
     <Actor>fauna/fish_generic.xml</Actor>
   </VisualActor>
 </Entity>
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	(revision 22013)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_fox_arctic.xml	(revision 22014)
@@ -1,10 +1,11 @@
 <?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>
     <Actor>fauna/fox_arctic.xml</Actor>
   </VisualActor>
 </Entity>
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	(revision 22013)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_fox_red.xml	(revision 22014)
@@ -1,10 +1,11 @@
 <?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>
     <Actor>fauna/fox_red.xml</Actor>
   </VisualActor>
 </Entity>
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	(revision 22013)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_gazelle.xml	(revision 22014)
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_skittish">
   <Footprint>
     <Square width="1.5" depth="3.0"/>
     <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>
     <Anchor>pitch</Anchor>
   </Position>
   <VisualActor>
     <Actor>fauna/gazelle.xml</Actor>
   </VisualActor>
 </Entity>
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	(revision 22013)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_giraffe.xml	(revision 22014)
@@ -1,42 +1,42 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_skittish">
   <Footprint>
     <Square width="3.3" depth="6.6"/>
     <Height>6.0</Height>
   </Footprint>
   <Health>
     <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>
     <Anchor>pitch</Anchor>
   </Position>
   <ResourceSupply>
     <Amount>350</Amount>
     <Type>food.meat</Type>
   </ResourceSupply>
   <Selectable>
     <Overlay>
       <Texture>
         <MainTexture>circle/256x256.png</MainTexture>
         <MainTextureMask>circle/256x256_mask.png</MainTextureMask>
       </Texture>
     </Overlay>
   </Selectable>
   <StatusBars>
     <HeightOffset>8.0</HeightOffset>
   </StatusBars>
   <UnitMotion>
     <WalkSpeed op="mul">0.6</WalkSpeed>
     <Run>
       <Speed op="mul">0.6</Speed>
     </Run>
   </UnitMotion>
   <VisualActor>
     <Actor>fauna/giraffe_adult.xml</Actor>
   </VisualActor>
 </Entity>
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	(revision 22013)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_giraffe_infant.xml	(revision 22014)
@@ -1,31 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_skittish">
   <Footprint>
     <Square width="1.9" depth="3.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>
     <Anchor>pitch</Anchor>
   </Position>
   <ResourceSupply>
     <Amount>150</Amount>
     <Type>food.meat</Type>
   </ResourceSupply>
   <StatusBars>
     <HeightOffset>7.0</HeightOffset>
   </StatusBars>
   <UnitMotion>
     <WalkSpeed op="mul">0.6</WalkSpeed>
     <Run>
       <Speed op="mul">0.6</Speed>
     </Run>
   </UnitMotion>
   <VisualActor>
     <Actor>fauna/giraffe_baby.xml</Actor>
   </VisualActor>
 </Entity>
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	(revision 22013)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_goat.xml	(revision 22014)
@@ -1,37 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_herd_domestic">
   <Footprint>
     <Square width="1.3" depth="2.6"/>
     <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>
     <Anchor>pitch</Anchor>
   </Position>
   <ResourceSupply>
     <Amount>100</Amount>
     <Type>food.meat</Type>
     <MaxGatherers>6</MaxGatherers>
   </ResourceSupply>
   <Sound>
     <SoundGroups>
       <select>actor/fauna/animal/goat_select.xml</select>
       <order_walk>actor/fauna/animal/goat_order.xml</order_walk>
       <death>actor/fauna/death/goat.xml</death>
       <trained>actor/fauna/animal/goat_trained.xml</trained>
     </SoundGroups>
   </Sound>
   <UnitMotion>
     <WalkSpeed op="mul">0.45</WalkSpeed>
     <Run>
       <Speed op="mul">0.45</Speed>
     </Run>
   </UnitMotion>
   <VisualActor>
     <Actor>fauna/goat.xml</Actor>
   </VisualActor>
 </Entity>
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	(revision 22013)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_horse.xml	(revision 22014)
@@ -1,37 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_skittish">
   <Footprint>
     <Square width="2.1" depth="4.2"/>
     <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>
     <Anchor>pitch</Anchor>
   </Position>
   <ResourceSupply>
     <Amount>200</Amount>
   </ResourceSupply>
   <Sound>
     <SoundGroups>
       <select>actor/fauna/animal/horse_select.xml</select>
       <order_attack>actor/fauna/animal/horse_attack_order.xml</order_attack>
       <order_walk>actor/fauna/animal/horse_order.xml</order_walk>
       <attack_melee>actor/fauna/animal/horse_attack.xml</attack_melee>
       <death>actor/fauna/animal/horse_death.xml</death>
       <trained>actor/fauna/animal/horse_trained.xml</trained>
     </SoundGroups>
   </Sound>
   <UnitMotion>
     <WalkSpeed op="mul">0.8</WalkSpeed>
     <Run>
       <Speed op="mul">0.8</Speed>
     </Run>
   </UnitMotion>
   <VisualActor>
     <Actor>fauna/horse.xml</Actor>
   </VisualActor>
 </Entity>
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	(revision 22013)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_lion.xml	(revision 22014)
@@ -1,40 +1,40 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_wild_violent">
   <Attack>
     <Melee>
       <Hack>20.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>
   <Identity>
-    <Civ>gaia</Civ>
-    <SpecificName>Lion</SpecificName>
+    <GenericName>Lion</GenericName>
+    <SpecificName>Panthera leo</SpecificName>
     <Icon>gaia/fauna_lion.png</Icon>
   </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/lion.xml</Actor>
   </VisualActor>
 </Entity>
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	(revision 22013)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_lioness.xml	(revision 22014)
@@ -1,40 +1,9 @@
 <?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>
 </Entity>
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	(revision 22013)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_muskox.xml	(revision 22014)
@@ -1,22 +1,22 @@
 <?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>
     <Anchor>pitch</Anchor>
   </Position>
   <ResourceSupply>
     <Amount>200</Amount>
     <Type>food.meat</Type>
   </ResourceSupply>
   <VisualActor>
     <Actor>fauna/muskox.xml</Actor>
   </VisualActor>
 </Entity>
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	(revision 22013)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_pig.xml	(revision 22014)
@@ -1,35 +1,35 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_herd_domestic">
   <Footprint>
     <Square width="1.4" depth="2.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>
     <Anchor>pitch</Anchor>
   </Position>
   <Sound>
     <SoundGroups>
       <select>actor/fauna/animal/pig_select.xml</select>
       <order_walk>actor/fauna/animal/pig_order.xml</order_walk>
       <death>actor/fauna/animal/pig.xml</death>
       <trained>actor/fauna/animal/pig_trained.xml</trained>
     </SoundGroups>
   </Sound>
   <StatusBars>
     <HeightOffset>5.0</HeightOffset>
   </StatusBars>
   <UnitMotion>
     <WalkSpeed op="mul">0.45</WalkSpeed>
     <Run>
       <Speed op="mul">0.45</Speed>
     </Run>
   </UnitMotion>
   <VisualActor>
     <Actor>fauna/pig1.xml</Actor>
   </VisualActor>
 </Entity>
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	(revision 22013)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_pony.xml	(revision 22014)
@@ -1,15 +1,15 @@
 <?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>
     <Run>
       <Speed op="mul">0.8</Speed>
     </Run>
   </UnitMotion>
   <VisualActor>
     <Actor>fauna/pony.xml</Actor>
   </VisualActor>
 </Entity>
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	(revision 22013)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_rhino.xml	(revision 22014)
@@ -1,46 +1,46 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_aggressive">
   <Attack>
     <Melee>
       <Hack>20.0</Hack>
       <Pierce>0.0</Pierce>
       <Crush>20.0</Crush>
       <MaxRange>6.0</MaxRange>
       <RepeatTime>2000</RepeatTime>
     </Melee>
   </Attack>
   <Footprint>
     <Square width="2.8" depth="5.6"/>
     <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>
     <Anchor>pitch</Anchor>
   </Position>
   <ResourceSupply>
     <Amount>300</Amount>
     <Type>food.meat</Type>
   </ResourceSupply>
   <Selectable>
     <Overlay>
       <Texture>
         <MainTexture>circle/256x256.png</MainTexture>
         <MainTextureMask>circle/256x256_mask.png</MainTextureMask>
       </Texture>
     </Overlay>
   </Selectable>
   <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>
   <VisualActor>
     <Actor>fauna/rhino.xml</Actor>
   </VisualActor>
 </Entity>
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	(revision 22013)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_tiger.xml	(revision 22014)
@@ -1,34 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_wild_violent">
   <Attack>
     <Melee>
       <Hack>30.0</Hack>
       <Pierce>20.0</Pierce>
       <Crush>0.0</Crush>
       <MaxRange>4.0</MaxRange>
       <RepeatTime>2000</RepeatTime>
     </Melee>
   </Attack>
   <Footprint>
     <Square width="2.1" depth="4.2"/>
     <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>
     <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>
   <VisualActor>
     <Actor>fauna/tiger.xml</Actor>
   </VisualActor>
 </Entity>
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	(revision 22013)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_whale_humpback.xml	(revision 22014)
@@ -1,16 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_whale">
   <Footprint>
     <Square width="4.0" depth="16.0"/>
     <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>
   </Position>
   <VisualActor>
     <Actor>fauna/whale.xml</Actor>
   </VisualActor>
 </Entity>
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	(revision 22013)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_wolfhound.xml	(revision 22014)
@@ -1,10 +1,11 @@
 <?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>
     <Actor>units/britons/wolfhound.xml</Actor>
   </VisualActor>
 </Entity>
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	(revision 22013)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_sheep.xml	(revision 22014)
@@ -1,35 +1,35 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_herd_domestic">
   <Footprint>
     <Square width="1.4" depth="2.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>
     <Anchor>pitch</Anchor>
   </Position>
   <Sound>
     <SoundGroups>
       <select>actor/fauna/animal/sheep_select.xml</select>
       <order_walk>actor/fauna/animal/sheep_order.xml</order_walk>
       <death>actor/fauna/animal/sheep.xml</death>
       <trained>actor/fauna/animal/sheep_trained.xml</trained>
     </SoundGroups>
   </Sound>
   <StatusBars>
     <HeightOffset>5.0</HeightOffset>
   </StatusBars>
   <UnitMotion>
     <WalkSpeed op="mul">0.45</WalkSpeed>
     <Run>
       <Speed op="mul">0.45</Speed>
     </Run>
   </UnitMotion>
   <VisualActor>
     <Actor>fauna/sheep3.xml</Actor>
   </VisualActor>
 </Entity>
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	(revision 22013)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_whale_fin.xml	(revision 22014)
@@ -1,16 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_whale">
   <Footprint>
     <Square width="5.0" depth="20.0"/>
     <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>
   </Position>
   <VisualActor>
     <Actor>fauna/whale_fin.xml</Actor>
   </VisualActor>
 </Entity>
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	(revision 22013)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_wolf.xml	(revision 22014)
@@ -1,10 +1,11 @@
 <?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>
     <Actor>fauna/wolf.xml</Actor>
   </VisualActor>
 </Entity>
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	(revision 22013)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_mastiff.xml	(revision 22014)
@@ -1,10 +1,11 @@
 <?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>
     <Actor>fauna/mastiff.xml</Actor>
   </VisualActor>
 </Entity>
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	(revision 22013)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_peacock.xml	(revision 22014)
@@ -1,43 +1,42 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_herd_domestic">
   <Health>
     <Max>10</Max>
   </Health>
   <Identity>
-    <Civ>gaia</Civ>
     <GenericName>Peacock</GenericName>
     <SpecificName>Pavo cristatus</SpecificName>
     <Icon>gaia/fauna_peacock.png</Icon>
   </Identity>
   <ResourceSupply>
     <Amount>50</Amount>
     <Type>food.meat</Type>
     <MaxGatherers>5</MaxGatherers>
   </ResourceSupply>
   <Sound>
     <SoundGroups>
       <select>actor/fauna/animal/peacock_select.xml</select>
       <order_walk>actor/fauna/animal/peacock_order.xml</order_walk>
       <death>actor/fauna/animal/peacock_call.xml</death>
       <trained>actor/fauna/animal/peacock_trained.xml</trained>
     </SoundGroups>
   </Sound>
   <UnitAI>
     <NaturalBehaviour>domestic</NaturalBehaviour>
     <RoamDistance>4.0</RoamDistance>
     <FleeDistance>12.0</FleeDistance>
     <RoamTimeMin>2000</RoamTimeMin>
     <RoamTimeMax>8000</RoamTimeMax>
     <FeedTimeMin>10000</FeedTimeMin>
     <FeedTimeMax>40000</FeedTimeMax>
   </UnitAI>
   <UnitMotion>
     <WalkSpeed op="mul">0.3</WalkSpeed>
     <Run>
       <Speed op="mul">0.3</Speed>
     </Run>
   </UnitMotion>
   <VisualActor>
     <Actor>fauna/peacock.xml</Actor>
   </VisualActor>
 </Entity>
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	(revision 22013)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_pig_flaming.xml	(revision 22014)
@@ -1,41 +1,40 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="gaia/fauna_pig">
   <Decay>
     <DelayTime>10.0</DelayTime>
     <SinkRate>0.05</SinkRate>
     <SinkAccel>0.1</SinkAccel>
   </Decay>
   <Health>
     <DeathType>corpse</DeathType>
     <RegenRate>-2</RegenRate>
     <DamageVariants>
       <lightdamage>0.80</lightdamage>
       <mediumdamage>0.50</mediumdamage>
       <heavydamage>0.20</heavydamage>
     </DamageVariants>
   </Health>
   <Identity>
     <GenericName>Flaming Pig</GenericName>
-    <SpecificName>Sus scrofa domesticus igne</SpecificName>
     <Icon>units/flaming_pig.png</Icon>
   </Identity>
   <ResourceSupply disable=""/>
   <Sound>
     <SoundGroups>
       <select>actor/fauna/animal/pig_flaming_select.xml</select>
       <order_walk>actor/fauna/animal/pig_flaming_order.xml</order_walk>
       <death>actor/fauna/animal/pig_death.xml</death>
       <trained>actor/fauna/animal/pig_flaming_trained.xml</trained>
     </SoundGroups>
   </Sound>
   <UnitMotion>
     <WalkSpeed op="mul">3.5</WalkSpeed>
     <Run>
       <Speed op="mul">3.5</Speed>
     </Run>
   </UnitMotion>
   <Upgrade disable=""/>
   <VisualActor>
     <Actor>fauna/pig_flaming.xml</Actor>
   </VisualActor>
 </Entity>
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	(revision 22013)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_rabbit.xml	(revision 22014)
@@ -1,31 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_skittish">
   <Footprint>
     <Square width="1.2" depth="2.0"/>
     <Height>1.0</Height>
   </Footprint>
   <Health>
     <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>
     <BlockMovement>false</BlockMovement>
   </Obstruction>
   <Position>
     <Anchor>pitch</Anchor>
   </Position>
   <ResourceSupply>
     <Amount>50</Amount>
     <Type>food.meat</Type>
   </ResourceSupply>
   <StatusBars>
     <HeightOffset>3.0</HeightOffset>
   </StatusBars>
   <VisualActor>
     <Actor>fauna/rabbit1.xml</Actor>
   </VisualActor>
 </Entity>
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	(revision 22013)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_shark.xml	(revision 22014)
@@ -1,59 +1,58 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_wild_passive">
   <Footprint>
     <Square width="2.0" depth="8.0"/>
     <Height>2.5</Height>
   </Footprint>
   <Health>
     <Max>150</Max>
     <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>
   <Minimap disable=""/>
   <Obstruction>
     <BlockMovement>false</BlockMovement>
     <BlockPathfinding>false</BlockPathfinding>
   </Obstruction>
   <Position>
     <Altitude>-1</Altitude>
     <Floating>true</Floating>
     <FloatDepth>0.0</FloatDepth>
     <TurnRate>5.0</TurnRate>
   </Position>
   <Selectable>
     <Overlay>
       <Texture>
         <MainTexture>circle/256x256.png</MainTexture>
         <MainTextureMask>circle/256x256_mask.png</MainTextureMask>
       </Texture>
     </Overlay>
   </Selectable>
   <UnitAI>
     <NaturalBehaviour>passive</NaturalBehaviour>
     <RoamDistance>100.0</RoamDistance>
     <FleeDistance>60.0</FleeDistance>
     <RoamTimeMin>100000</RoamTimeMin>
     <RoamTimeMax>300000</RoamTimeMax>
     <FeedTimeMin>1</FeedTimeMin>
     <FeedTimeMax>2</FeedTimeMax>
   </UnitAI>
   <UnitMotion>
     <PassabilityClass>ship-small</PassabilityClass>
     <WalkSpeed op="mul">0.6</WalkSpeed>
     <Run>
       <Speed op="mul">0.6</Speed>
     </Run>
   </UnitMotion>
   <Visibility>
     <RetainInFog>false</RetainInFog>
   </Visibility>
   <VisualActor>
     <Actor>fauna/shark.xml</Actor>
   </VisualActor>
 </Entity>
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	(revision 22013)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_walrus.xml	(revision 22014)
@@ -1,46 +1,46 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_defensive">
   <Armour>
     <Hack>3</Hack>
     <Pierce>4</Pierce>
     <Crush>5</Crush>
   </Armour>
   <Attack>
     <Melee>
       <Hack>15.0</Hack>
       <Pierce>10.0</Pierce>
       <Crush>0.0</Crush>
       <MaxRange>4.0</MaxRange>
       <PrepareTime>500</PrepareTime>
       <RepeatTime>1000</RepeatTime>
       <RestrictedClasses datatype="tokens">Structure Ship Siege</RestrictedClasses>
     </Melee>
   </Attack>
   <Footprint>
     <Square width="3.2" depth="6.4"/>
     <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>
     <Anchor>pitch</Anchor>
   </Position>
   <ResourceSupply>
     <Amount>300</Amount>
     <Type>food.meat</Type>
   </ResourceSupply>
   <Selectable>
     <Overlay>
       <Texture>
         <MainTexture>circle/256x256.png</MainTexture>
         <MainTextureMask>circle/256x256_mask.png</MainTextureMask>
       </Texture>
     </Overlay>
   </Selectable>
   <VisualActor>
     <Actor>fauna/walrus.xml</Actor>
   </VisualActor>
 </Entity>
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	(revision 22013)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_wildebeest.xml	(revision 22014)
@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_skittish">
   <Footprint>
     <Square width="2.1" depth="4.2"/>
     <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>
     <Anchor>pitch</Anchor>
   </Position>
   <ResourceSupply>
     <Amount>150</Amount>
     <Type>food.meat</Type>
   </ResourceSupply>
   <UnitMotion>
     <WalkSpeed op="mul">0.9</WalkSpeed>
     <Run>
       <Speed op="mul">0.9</Speed>
     </Run>
   </UnitMotion>
   <VisualActor>
     <Actor>fauna/wildebeest.xml</Actor>
   </VisualActor>
 </Entity>
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	(revision 22013)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_zebu.xml	(revision 22014)
@@ -1,30 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_herd_domestic">
   <Footprint>
     <Square width="1.9" depth="3.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>
     <Anchor>pitch</Anchor>
   </Position>
   <ResourceSupply>
     <Amount>150</Amount>
     <Type>food.meat</Type>
   </ResourceSupply>
   <UnitMotion>
     <WalkSpeed>6.0</WalkSpeed>
     <Run>
       <Speed>15.0</Speed>
       <Range>600.0</Range>
       <RangeMin>5.0</RangeMin>
     </Run>
   </UnitMotion>
   <VisualActor>
     <Actor>fauna/zebu.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	(revision 22013)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_whale.xml	(revision 22014)
@@ -1,60 +1,57 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna">
   <Health>
     <Max>200</Max>
     <DeathType>remain</DeathType>
     <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>
   </Loot>
   <Obstruction>
     <BlockMovement>false</BlockMovement>
     <BlockPathfinding>false</BlockPathfinding>
   </Obstruction>
   <Position>
     <Floating>true</Floating>
     <FloatDepth>0.0</FloatDepth>
   </Position>
   <ResourceSupply>
     <KillBeforeGather>true</KillBeforeGather>
     <Amount>2000</Amount>
     <Type>food.fish</Type>
     <MaxGatherers>5</MaxGatherers>
   </ResourceSupply>
   <Selectable>
     <Overlay>
       <Texture>
         <MainTexture>circle/512x512.png</MainTexture>
         <MainTextureMask>circle/512x512_mask.png</MainTextureMask>
       </Texture>
     </Overlay>
   </Selectable>
   <StatusBars>
     <BarWidth>4.0</BarWidth>
     <BarHeight>0.666</BarHeight>
     <HeightOffset>5.0</HeightOffset>
   </StatusBars>
   <UnitAI>
     <NaturalBehaviour>skittish</NaturalBehaviour>
     <RoamDistance>60.0</RoamDistance>
     <FleeDistance>60.0</FleeDistance>
     <RoamTimeMin>100000</RoamTimeMin>
     <RoamTimeMax>300000</RoamTimeMax>
     <FeedTimeMin>1</FeedTimeMin>
     <FeedTimeMax>2</FeedTimeMax>
   </UnitAI>
   <UnitMotion>
     <PassabilityClass>ship-small</PassabilityClass>
     <WalkSpeed op="mul">1.8</WalkSpeed>
     <Run>
       <Speed op="mul">1.8</Speed>
     </Run>
   </UnitMotion>
 </Entity>
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	(revision 22013)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_zebra.xml	(revision 22014)
@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_skittish">
   <Footprint>
     <Square width="1.9" depth="3.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>
     <Anchor>pitch</Anchor>
   </Position>
   <ResourceSupply>
     <Amount>150</Amount>
     <Type>food.meat</Type>
   </ResourceSupply>
   <UnitMotion>
     <WalkSpeed op="mul">0.9</WalkSpeed>
     <Run>
       <Speed op="mul">0.9</Speed>
     </Run>
   </UnitMotion>
   <VisualActor>
     <Actor>fauna/zebra.xml</Actor>
   </VisualActor>
 </Entity>
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	(revision 22013)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_skittish_elephant_infant.xml	(revision 22014)
@@ -1,36 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_skittish">
   <Armour>
     <Hack>1</Hack>
     <Pierce>3</Pierce>
     <Crush>1</Crush>
   </Armour>
   <Footprint>
     <Square width="1.7" depth="3.4"/>
     <Height>1.5</Height>
   </Footprint>
   <Identity>
     <VisibleClasses datatype="tokens">Elephant</VisibleClasses>
-    <Icon>gaia/fauna_elephant_african_infant.png</Icon>
   </Identity>
   <Position>
     <Anchor>pitch</Anchor>
   </Position>
   <ResourceSupply>
     <Amount>100</Amount>
     <Type>food.meat</Type>
   </ResourceSupply>
   <Sound>
     <SoundGroups>
       <select>actor/fauna/animal/elephant_select.xml</select>
       <order_attack>actor/fauna/animal/elephant_attack_order.xml</order_attack>
       <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>
-  <VisualActor>
-    <Actor>fauna/elephant_african_baby.xml</Actor>
-  </VisualActor>
 </Entity>
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	(revision 22013)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_fish.xml	(revision 22014)
@@ -1,46 +1,46 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna">
   <Armour disable=""/>
   <Footprint replace="">
     <Circle radius="10.0"/>
     <Height>2.5</Height>
   </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>
     <BlockPathfinding>false</BlockPathfinding>
     <DeleteUponConstruction>true</DeleteUponConstruction>
   </Obstruction>
   <Position>
     <Altitude>-2.0</Altitude>
     <Floating>true</Floating>
     <FloatDepth>0.0</FloatDepth>
   </Position>
   <ResourceSupply>
     <KillBeforeGather>false</KillBeforeGather>
     <Amount>1000</Amount>
     <Type>food.fish</Type>
     <MaxGatherers>4</MaxGatherers>
   </ResourceSupply>
   <Selectable>
     <Overlay>
       <Texture disable=""/>
       <Outline>
         <LineTexture>outline_border.png</LineTexture>
         <LineTextureMask>outline_border_mask.png</LineTextureMask>
         <LineThickness>0.2</LineThickness>
       </Outline>
     </Overlay>
   </Selectable>
   <StatusBars>
     <BarWidth>4.0</BarWidth>
     <BarHeight>0.666</BarHeight>
     <HeightOffset>5.0</HeightOffset>
   </StatusBars>
   <UnitAI disable=""/>
   <UnitMotion disable=""/>
 </Entity>
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	(revision 22013)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna.xml	(revision 22014)
@@ -1,45 +1,44 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit">
   <Cost>
     <Population>0</Population>
   </Cost>
   <Footprint replace="">
     <Square width="1.75" depth="3.5"/>
     <Height>2.25</Height>
   </Footprint>
   <Guard disable=""/>
   <Identity>
-    <GenericName>Fauna</GenericName>
     <Classes datatype="tokens">Animal Organic -ConquestCritical</Classes>
     <Icon>gaia/fauna_generic.png</Icon>
     <Formations disable=""/>
   </Identity>
   <Loot disable=""/>
   <Minimap>
     <Type>food</Type>
     <Color r="227" g="130" b="141"/>
   </Minimap>
   <ResourceGatherer disable=""/>
   <UnitAI>
     <CanGuard>false</CanGuard>
     <CanPatrol>false</CanPatrol>
     <RoamDistance>8.0</RoamDistance>
     <FleeDistance>24.0</FleeDistance>
     <RoamTimeMin>2000</RoamTimeMin>
     <RoamTimeMax>8000</RoamTimeMax>
     <FeedTimeMin>15000</FeedTimeMin>
     <FeedTimeMax>60000</FeedTimeMax>
   </UnitAI>
   <UnitMotion>
     <WalkSpeed op="mul">0.7</WalkSpeed>
     <Run>
       <Speed op="mul">0.7</Speed>
     </Run>
   </UnitMotion>
   <Visibility>
     <RetainInFog>true</RetainInFog>
   </Visibility>
   <Vision>
     <Range>0</Range>
   </Vision>
 </Entity>