Index: binaries/data/mods/public/simulation/templates/special/formations/anti_cavalry.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/special/formations/anti_cavalry.xml
+++ binaries/data/mods/public/simulation/templates/special/formations/anti_cavalry.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_formation">
+<FormationEntity parent="template_formation">
   <Formation>
     <RequiredMemberCount>16</RequiredMemberCount>
     <DisabledTooltip>Melee Infantry only, requires at least 16.</DisabledTooltip>
@@ -24,4 +24,4 @@
     <Icon>formations/testudo.png</Icon>
     <GenericName>Anti Cavalry</GenericName>
   </Identity>
-</Entity>
+</FormationEntity>
Index: binaries/data/mods/public/simulation/templates/special/formations/battle_line.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/special/formations/battle_line.xml
+++ binaries/data/mods/public/simulation/templates/special/formations/battle_line.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_formation">
+<FormationEntity parent="template_formation">
   <Formation>
     <SortingClasses>Cavalry Melee Ranged</SortingClasses>
     <SortingOrder>fillFromTheSides</SortingOrder>
@@ -13,4 +13,4 @@
     <GenericName>Battle Line</GenericName>
     <Icon>formations/battle_line.png</Icon>
   </Identity>
-</Entity>
+</FormationEntity>
Index: binaries/data/mods/public/simulation/templates/special/formations/box.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/special/formations/box.xml
+++ binaries/data/mods/public/simulation/templates/special/formations/box.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_formation">
+<FormationEntity parent="template_formation">
   <Formation>
     <RequiredMemberCount>4</RequiredMemberCount>
     <DisabledTooltip>Requires at least 4 Soldiers or Siege engines.</DisabledTooltip>
@@ -12,4 +12,4 @@
     <GenericName>Box</GenericName>
     <Icon>formations/box.png</Icon>
   </Identity>
-</Entity>
+</FormationEntity>
Index: binaries/data/mods/public/simulation/templates/special/formations/column_closed.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/special/formations/column_closed.xml
+++ binaries/data/mods/public/simulation/templates/special/formations/column_closed.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_formation">
+<FormationEntity parent="template_formation">
   <Formation>
     <UnitSeparationWidthMultiplier>0.75</UnitSeparationWidthMultiplier>
     <UnitSeparationDepthMultiplier>1.0</UnitSeparationDepthMultiplier>
@@ -10,4 +10,4 @@
     <GenericName>Forced March</GenericName>
     <Icon>formations/column_closed.png</Icon>
   </Identity>
-</Entity>
+</FormationEntity>
Index: binaries/data/mods/public/simulation/templates/special/formations/column_open.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/special/formations/column_open.xml
+++ binaries/data/mods/public/simulation/templates/special/formations/column_open.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_formation">
+<FormationEntity parent="template_formation">
   <Formation>
     <ShiftRows>true</ShiftRows>
     <UnitSeparationWidthMultiplier>2</UnitSeparationWidthMultiplier>
@@ -10,4 +10,4 @@
     <GenericName>Column Open</GenericName>
     <Icon>formations/column_open.png</Icon>
   </Identity>
-</Entity>
+</FormationEntity>
Index: binaries/data/mods/public/simulation/templates/special/formations/flank.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/special/formations/flank.xml
+++ binaries/data/mods/public/simulation/templates/special/formations/flank.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_formation">
+<FormationEntity parent="template_formation">
   <Formation>
     <RequiredMemberCount>8</RequiredMemberCount>
     <DisabledTooltip>Requires at least 8 Soldiers or Siege engines.</DisabledTooltip>
@@ -11,4 +11,4 @@
     <GenericName>Flank</GenericName>
     <Icon>formations/flank.png</Icon>
   </Identity>
-</Entity>
+</FormationEntity>
Index: binaries/data/mods/public/simulation/templates/special/formations/line_closed.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/special/formations/line_closed.xml
+++ binaries/data/mods/public/simulation/templates/special/formations/line_closed.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_formation">
+<FormationEntity parent="template_formation">
   <Formation>
     <MinColumns>3</MinColumns>
     <WidthDepthRatio>4</WidthDepthRatio>
@@ -9,4 +9,4 @@
     <GenericName>Close Order</GenericName>
     <Icon>formations/line_closed.png</Icon>
   </Identity>
-</Entity>
+</FormationEntity>
Index: binaries/data/mods/public/simulation/templates/special/formations/line_open.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/special/formations/line_open.xml
+++ binaries/data/mods/public/simulation/templates/special/formations/line_open.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_formation">
+<FormationEntity parent="template_formation">
   <Formation>
     <UnitSeparationWidthMultiplier>1.5</UnitSeparationWidthMultiplier>
     <UnitSeparationDepthMultiplier>1.5</UnitSeparationDepthMultiplier>
@@ -11,4 +11,4 @@
     <GenericName>Open Order</GenericName>
     <Icon>formations/line_open.png</Icon>
   </Identity>
-</Entity>
+</FormationEntity>
Index: binaries/data/mods/public/simulation/templates/special/formations/null.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/special/formations/null.xml
+++ binaries/data/mods/public/simulation/templates/special/formations/null.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_formation">
+<FormationEntity parent="template_formation">
   <Formation>
     <DisabledTooltip/>
   </Formation>
@@ -7,4 +7,4 @@
     <GenericName>None</GenericName>
     <Icon>formations/null.png</Icon>
   </Identity>
-</Entity>
+</FormationEntity>
Index: binaries/data/mods/public/simulation/templates/special/formations/phalanx.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/special/formations/phalanx.xml
+++ binaries/data/mods/public/simulation/templates/special/formations/phalanx.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_formation">
+<FormationEntity parent="template_formation">
   <Formation>
     <RequiredMemberCount>10</RequiredMemberCount>
     <DisabledTooltip>Infantry Hoplites only, requires at least 10.</DisabledTooltip>
@@ -23,4 +23,4 @@
     <GenericName>Phalanx</GenericName>
     <Icon>formations/phalanx.png</Icon>
   </Identity>
-</Entity>
+</FormationEntity>
Index: binaries/data/mods/public/simulation/templates/special/formations/scatter.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/special/formations/scatter.xml
+++ binaries/data/mods/public/simulation/templates/special/formations/scatter.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_formation">
+<FormationEntity parent="template_formation">
   <Formation>
     <FormationShape>special</FormationShape>
     <MaxTurningAngle>0</MaxTurningAngle>
@@ -8,4 +8,4 @@
     <GenericName>Scatter</GenericName>
     <Icon>formations/scatter.png</Icon>
   </Identity>
-</Entity>
+</FormationEntity>
Index: binaries/data/mods/public/simulation/templates/special/formations/skirmish.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/special/formations/skirmish.xml
+++ binaries/data/mods/public/simulation/templates/special/formations/skirmish.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_formation">
+<FormationEntity parent="template_formation">
   <Formation>
     <DisabledTooltip>Ranged Soldiers only, requires at least 2.</DisabledTooltip>
     <ShiftRows>true</ShiftRows>
@@ -14,4 +14,4 @@
     <GenericName>Skirmish</GenericName>
     <Icon>formations/skirmish.png</Icon>
   </Identity>
-</Entity>
+</FormationEntity>
Index: binaries/data/mods/public/simulation/templates/special/formations/syntagma.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/special/formations/syntagma.xml
+++ binaries/data/mods/public/simulation/templates/special/formations/syntagma.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_formation">
+<FormationEntity parent="template_formation">
   <Formation>
     <RequiredMemberCount>16</RequiredMemberCount>
     <DisabledTooltip>Infantry Pikemen only, requires at least 16.</DisabledTooltip>
@@ -29,4 +29,4 @@
     <GenericName>Syntagma</GenericName>
     <Icon>formations/syntagma.png</Icon>
   </Identity>
-</Entity>
+</FormationEntity>
Index: binaries/data/mods/public/simulation/templates/special/formations/testudo.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/special/formations/testudo.xml
+++ binaries/data/mods/public/simulation/templates/special/formations/testudo.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_formation">
+<FormationEntity parent="template_formation">
   <Formation>
     <RequiredMemberCount>16</RequiredMemberCount>
     <DisabledTooltip>Melee Infantry only, requires at least 16.</DisabledTooltip>
@@ -70,4 +70,4 @@
     <GenericName>Testudo</GenericName>
     <Icon>formations/testudo.png</Icon>
   </Identity>
-</Entity>
+</FormationEntity>
Index: binaries/data/mods/public/simulation/templates/special/formations/wedge.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/special/formations/wedge.xml
+++ binaries/data/mods/public/simulation/templates/special/formations/wedge.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_formation">
+<FormationEntity parent="template_formation">
   <Formation>
     <RequiredMemberCount>6</RequiredMemberCount>
     <DisabledTooltip>Cavalry only, requires at least 6.</DisabledTooltip>
@@ -16,4 +16,4 @@
     <GenericName>Wedge</GenericName>
     <Icon>formations/wedge.png</Icon>
   </Identity>
-</Entity>
+</FormationEntity>
Index: binaries/data/mods/public/simulation/templates/template_formation.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_formation.xml
+++ binaries/data/mods/public/simulation/templates/template_formation.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity>
+<FormationEntity>
   <!--
   <Selectable>
     <Overlay>
@@ -77,4 +77,4 @@
     <SilhouetteOccluder>false</SilhouetteOccluder>
     <VisibleInAtlasOnly>false</VisibleInAtlasOnly>
   </VisualActor>
-</Entity>
+</FormationEntity>