diff --git a/binaries/data/mods/public/simulation/templates/gaia/fauna_fish.xml b/binaries/data/mods/public/simulation/templates/gaia/fauna_fish.xml
index c5512598ef..1da55ef82f 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/fauna_fish.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/fauna_fish.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_fish">
+<Entity parent="template_gaia_fish">
   <Identity>
-    <GenericName>Fish</GenericName>
     <SpecificName>Fish</SpecificName>
     <Icon>gaia/fauna_fish.png</Icon>
   </Identity>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/fauna_fish_tilapia.xml b/binaries/data/mods/public/simulation/templates/gaia/fauna_fish_tilapia.xml
index e9f3146bbf..2cd42cfca9 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/fauna_fish_tilapia.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/fauna_fish_tilapia.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_fish">
+<Entity parent="template_gaia_fish">
   <Identity>
-    <GenericName>Tilapia</GenericName>
-    <SpecificName>Fish</SpecificName>
+    <SpecificName>Tilapia</SpecificName>
     <Icon>gaia/fauna_fish.png</Icon>
   </Identity>
   <VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/fauna_fish_tuna.xml b/binaries/data/mods/public/simulation/templates/gaia/fauna_fish_tuna.xml
index 25c2f0461b..208d37b72e 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/fauna_fish_tuna.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/fauna_fish_tuna.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_fish">
+<Entity parent="template_gaia_fish">
   <Identity>
-    <GenericName>Tuna</GenericName>
-    <SpecificName>Fish</SpecificName>
+    <SpecificName>Tuna</SpecificName>
     <Icon>gaia/fauna_fish.png</Icon>
   </Identity>
   <VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_fauna_fish.xml b/binaries/data/mods/public/simulation/templates/template_gaia_fish.xml
similarity index 81%
rename from binaries/data/mods/public/simulation/templates/template_unit_fauna_fish.xml
rename to binaries/data/mods/public/simulation/templates/template_gaia_fish.xml
index 2a8cc81be0..24ebe7be68 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_fauna_fish.xml
+++ b/binaries/data/mods/public/simulation/templates/template_gaia_fish.xml
@@ -1,24 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna">
-  <Armour disable=""/>
-  <Footprint replace="">
+<Entity parent="template_gaia">
+  <Footprint>
     <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>
+  <Minimap>
+    <Type>food</Type>
+    <Color r="227" g="130" b="141"/>
+  </Minimap>
   <Obstruction>
+    <Unit/>
     <BlockMovement>false</BlockMovement>
     <BlockPathfinding>false</BlockPathfinding>
+    <BlockFoundation>false</BlockFoundation>
     <DeleteUponConstruction>true</DeleteUponConstruction>
   </Obstruction>
   <Position>
     <Altitude>-2.0</Altitude>
     <Floating>true</Floating>
-    <FloatDepth>0.0</FloatDepth>
   </Position>
   <ResourceSupply>
     <KillBeforeGather>false</KillBeforeGather>
@@ -27,8 +31,8 @@
     <MaxGatherers>4</MaxGatherers>
   </ResourceSupply>
   <Selectable>
+    <EditorOnly disable=""/>
     <Overlay>
-      <Texture disable=""/>
       <Outline>
         <LineTexture>outline_border.png</LineTexture>
         <LineTextureMask>outline_border_mask.png</LineTextureMask>
@@ -41,6 +45,4 @@
     <BarHeight>0.666</BarHeight>
     <HeightOffset>5.0</HeightOffset>
   </StatusBars>
-  <UnitAI disable=""/>
-  <UnitMotion disable=""/>
 </Entity>