Index: binaries/data/mods/public/simulation/templates/special/players/athen.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/special/players/athen.xml
+++ binaries/data/mods/public/simulation/templates/special/players/athen.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_player">
+<PlayerEntity parent="template_player">
   <Auras datatype="tokens">
     teambonuses/athen_player_teambonus
   </Auras>
@@ -14,4 +14,4 @@
       special/formations/phalanx
     </Formations>
   </Player>
-</Entity>
+</PlayerEntity>
Index: binaries/data/mods/public/simulation/templates/special/players/brit.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/special/players/brit.xml
+++ binaries/data/mods/public/simulation/templates/special/players/brit.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_player">
+<PlayerEntity parent="template_player">
   <Auras datatype="tokens">
     teambonuses/brit_player_teambonus
   </Auras>
@@ -9,4 +9,4 @@
     <History>The Britons were the Celtic tribes of the British Isles. Using chariots, longswordsmen and powerful melee soldiers, they staged fearsome revolts against Rome to protect their customs and interests. Also, they built thousands of unique structures such as hill forts, crannogs and brochs.</History>
     <Icon>emblems/emblem_britons.png</Icon>
   </Identity>
-</Entity>
+</PlayerEntity>
Index: binaries/data/mods/public/simulation/templates/special/players/cart.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/special/players/cart.xml
+++ binaries/data/mods/public/simulation/templates/special/players/cart.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_player">
+<PlayerEntity parent="template_player">
   <Auras datatype="tokens">
     teambonuses/cart_player_teambonus
   </Auras>
@@ -14,4 +14,4 @@
       special/formations/phalanx
     </Formations>
   </Player>
-</Entity>
+</PlayerEntity>
Index: binaries/data/mods/public/simulation/templates/special/players/gaia.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/special/players/gaia.xml
+++ binaries/data/mods/public/simulation/templates/special/players/gaia.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity>
+<PlayerEntity>
   <Identity>
     <Civ>gaia</Civ>
     <GenericName>Gaia</GenericName>
@@ -42,4 +42,4 @@
       special/formations/scatter
     </Formations>
   </Player>
-</Entity>
+</PlayerEntity>
Index: binaries/data/mods/public/simulation/templates/special/players/gaul.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/special/players/gaul.xml
+++ binaries/data/mods/public/simulation/templates/special/players/gaul.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_player">
+<PlayerEntity parent="template_player">
   <Auras datatype="tokens">
     teambonuses/gaul_player_teambonus
   </Auras>
@@ -9,4 +9,4 @@
     <History>The Gauls were the Celtic tribes of continental Europe. Dominated by a priestly class of Druids, they featured a sophisticated culture of advanced metalworking, agriculture, trade and even road engineering. With heavy infantry and cavalry, Gallic warriors valiantly resisted Caesar's campaign of conquest and Rome's authoritarian rule.</History>
     <Icon>emblems/emblem_celts.png</Icon>
   </Identity>
-</Entity>
+</PlayerEntity>
Index: binaries/data/mods/public/simulation/templates/special/players/han.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/special/players/han.xml
+++ binaries/data/mods/public/simulation/templates/special/players/han.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_player">
+<PlayerEntity parent="template_player">
   <Auras datatype="tokens">
     teambonuses/han_player_teambonus
   </Auras>
@@ -22,4 +22,4 @@
       special/formations/anti_cavalry
     </Formations>
   </Player>
-</Entity>
+</PlayerEntity>
Index: binaries/data/mods/public/simulation/templates/special/players/iber.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/special/players/iber.xml
+++ binaries/data/mods/public/simulation/templates/special/players/iber.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_player">
+<PlayerEntity parent="template_player">
   <Auras datatype="tokens">
     teambonuses/iber_player_teambonus
   </Auras>
@@ -9,4 +9,4 @@
     <History>The Iberians were a people of mysterious origins and language, with a strong tradition of horsemanship and metalworking. A relatively peaceful culture, they usually fought in other's battles only as mercenaries. However, they proved tenacious when Rome sought to take their land and freedom from them, and employed pioneering guerrilla tactics and flaming javelins as they fought back.</History>
     <Icon>emblems/emblem_iberians.png</Icon>
   </Identity>
-</Entity>
+</PlayerEntity>
Index: binaries/data/mods/public/simulation/templates/special/players/kush.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/special/players/kush.xml
+++ binaries/data/mods/public/simulation/templates/special/players/kush.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_player">
+<PlayerEntity parent="template_player">
   <Auras datatype="tokens">
     teambonuses/kush_player_teambonus
   </Auras>
@@ -14,4 +14,4 @@
       special/formations/syntagma
     </Formations>
   </Player>
-</Entity>
+</PlayerEntity>
Index: binaries/data/mods/public/simulation/templates/special/players/mace.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/special/players/mace.xml
+++ binaries/data/mods/public/simulation/templates/special/players/mace.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_player">
+<PlayerEntity parent="template_player">
   <Auras datatype="tokens">
     teambonuses/mace_player_teambonus
   </Auras>
@@ -15,4 +15,4 @@
       special/formations/syntagma
     </Formations>
   </Player>
-</Entity>
+</PlayerEntity>
Index: binaries/data/mods/public/simulation/templates/special/players/maur.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/special/players/maur.xml
+++ binaries/data/mods/public/simulation/templates/special/players/maur.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_player">
+<PlayerEntity parent="template_player">
   <Auras datatype="tokens">
     teambonuses/maur_player_teambonus
   </Auras>
@@ -9,4 +9,4 @@
     <History>Founded in 322 B.C. by Chandragupta Maurya, the Mauryan Empire was the first to rule most of the Indian subcontinent, and was one of the largest and most populous empires of antiquity. Its military featured bowmen who used the long-range bamboo longbow, fierce female warriors, chariots, and thousands of armored war elephants. Its philosophers, especially the famous Acharya Chanakya, contributed to such varied fields such as economics, religion, diplomacy, warfare, and good governance. Under the rule of Ashoka the Great, the empire saw 40 years of peace, harmony, and prosperity.</History>
     <Icon>emblems/emblem_mauryas.png</Icon>
   </Identity>
-</Entity>
+</PlayerEntity>
Index: binaries/data/mods/public/simulation/templates/special/players/pers.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/special/players/pers.xml
+++ binaries/data/mods/public/simulation/templates/special/players/pers.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_player">
+<PlayerEntity parent="template_player">
   <Auras datatype="tokens">
     teambonuses/pers_player_teambonus
   </Auras>
@@ -14,4 +14,4 @@
       special/formations/phalanx
     </Formations>
   </Player>
-</Entity>
+</PlayerEntity>
Index: binaries/data/mods/public/simulation/templates/special/players/ptol.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/special/players/ptol.xml
+++ binaries/data/mods/public/simulation/templates/special/players/ptol.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_player">
+<PlayerEntity parent="template_player">
   <Auras datatype="tokens">
     teambonuses/ptol_player_teambonus
   </Auras>
@@ -23,4 +23,4 @@
       special/formations/syntagma
     </Formations>
   </Player>
-</Entity>
+</PlayerEntity>
Index: binaries/data/mods/public/simulation/templates/special/players/rome.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/special/players/rome.xml
+++ binaries/data/mods/public/simulation/templates/special/players/rome.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_player">
+<PlayerEntity parent="template_player">
   <Auras datatype="tokens">
     teambonuses/rome_player_teambonus
   </Auras>
@@ -15,4 +15,4 @@
       special/formations/anti_cavalry
     </Formations>
   </Player>
-</Entity>
+</PlayerEntity>
Index: binaries/data/mods/public/simulation/templates/special/players/sele.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/special/players/sele.xml
+++ binaries/data/mods/public/simulation/templates/special/players/sele.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_player">
+<PlayerEntity parent="template_player">
   <Auras datatype="tokens">
     teambonuses/sele_player_teambonus
   </Auras>
@@ -23,4 +23,4 @@
       special/formations/syntagma
     </Formations>
   </Player>
-</Entity>
+</PlayerEntity>
Index: binaries/data/mods/public/simulation/templates/special/players/spart.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/special/players/spart.xml
+++ binaries/data/mods/public/simulation/templates/special/players/spart.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_player">
+<PlayerEntity parent="template_player">
   <Auras datatype="tokens">teambonuses/spart_player_teambonus</Auras>
   <Identity>
     <Civ>spart</Civ>
@@ -12,4 +12,4 @@
       special/formations/phalanx
     </Formations>
   </Player>
-</Entity>
+</PlayerEntity>
Index: binaries/data/mods/public/simulation/templates/template_player.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_player.xml
+++ binaries/data/mods/public/simulation/templates/template_player.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity>
+<PlayerEntity>
   <AttackDetection>
     <SuppressionTransferRange>80</SuppressionTransferRange>
     <SuppressionRange>160</SuppressionRange>
@@ -128,4 +128,4 @@
     </StructureClasses>
   </StatisticsTracker>
   <TechnologyManager/>
-</Entity>
+</PlayerEntity>