Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart_embassy.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart_embassy.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart_embassy.xml
@@ -28,13 +28,13 @@
   </Obstruction>
   <ProductionQueue>
     <Entities datatype="tokens">
-      units/{civ}_infantry_swordsman_gaul_b
-      units/{civ}_cavalry_swordsman_gaul_b
-      units/{civ}_infantry_javelinist_iber_b
-      units/{civ}_infantry_slinger_iber_b
-      units/{civ}_cavalry_swordsman_iber_b
-      units/{civ}_infantry_swordsman_ital_b
-      units/{civ}_cavalry_spearman_ital_b
+      units/{native}_infantry_swordsman_gaul_b
+      units/{native}_cavalry_swordsman_gaul_b
+      units/{native}_infantry_javelinist_iber_b
+      units/{native}_infantry_slinger_iber_b
+      units/{native}_cavalry_swordsman_iber_b
+      units/{native}_infantry_swordsman_ital_b
+      units/{native}_cavalry_spearman_ital_b
     </Entities>
   </ProductionQueue>
   <VisualActor>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart_embassy_celtic.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart_embassy_celtic.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart_embassy_celtic.xml
@@ -26,8 +26,8 @@
   </Obstruction>
   <ProductionQueue>
     <Entities datatype="tokens">
-      units/{civ}_infantry_swordsman_gaul_b
-      units/{civ}_cavalry_swordsman_gaul_b
+      units/{native}_infantry_swordsman_gaul_b
+      units/{native}_cavalry_swordsman_gaul_b
     </Entities>
   </ProductionQueue>
   <VisualActor>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart_embassy_iberian.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart_embassy_iberian.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart_embassy_iberian.xml
@@ -19,9 +19,9 @@
   </Obstruction>
   <ProductionQueue>
     <Entities datatype="tokens">
-      units/{civ}_infantry_javelinist_iber_b
-      units/{civ}_infantry_slinger_iber_b
-      units/{civ}_cavalry_swordsman_iber_b
+      units/{native}_infantry_javelinist_iber_b
+      units/{native}_infantry_slinger_iber_b
+      units/{native}_cavalry_swordsman_iber_b
     </Entities>
   </ProductionQueue>
   <VisualActor>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart_embassy_italiote.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart_embassy_italiote.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart_embassy_italiote.xml
@@ -26,8 +26,8 @@
   </Obstruction>
   <ProductionQueue>
     <Entities datatype="tokens">
-      units/{civ}_infantry_swordsman_ital_b
-      units/{civ}_cavalry_spearman_ital_b
+      units/{native}_infantry_swordsman_ital_b
+      units/{native}_cavalry_spearman_ital_b
     </Entities>
   </ProductionQueue>
   <VisualActor>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/kush_blemmye_camp.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/kush_blemmye_camp.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/kush_blemmye_camp.xml
@@ -33,7 +33,7 @@
   </Obstruction>
   <ProductionQueue>
     <Entities datatype="tokens">
-      units/{civ}_cavalry_javelinist_merc_b
+      units/{native}_cavalry_javelinist_merc_b
     </Entities>
   </ProductionQueue>
   <TerritoryDecay>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/kush_nuba_village.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/kush_nuba_village.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/kush_nuba_village.xml
@@ -33,8 +33,8 @@
   </Obstruction>
   <ProductionQueue>
     <Entities datatype="tokens">
-      units/{civ}_infantry_clubman_b
-      units/{civ}_infantry_javelinist_merc_b
+      units/{native}_infantry_clubman_b
+      units/{native}_infantry_javelinist_merc_b
     </Entities>
   </ProductionQueue>
   <TerritoryDecay>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_infantry_javelinist_iber_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_infantry_javelinist_iber_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_infantry_javelinist_iber_b.xml
@@ -2,11 +2,11 @@
 <Entity parent="template_unit_infantry_ranged_javelinist">
   <Builder>
     <Entities datatype="tokens">
-      structures/cart_tower_artillery
-      structures/cart_super_dock
-      structures/cart_embassy_celtic
-      structures/cart_embassy_iberian
-      structures/cart_embassy_italiote
+      structures/{civ}_tower_artillery
+      structures/{civ}_super_dock
+      structures/{civ}_embassy_celtic
+      structures/{civ}_embassy_iberian
+      structures/{civ}_embassy_italiote
     </Entities>
   </Builder>
   <Cost>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_infantry_slinger_iber_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_infantry_slinger_iber_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_infantry_slinger_iber_b.xml
@@ -2,11 +2,11 @@
 <Entity parent="template_unit_infantry_ranged_slinger">
   <Builder>
     <Entities datatype="tokens">
-      structures/cart_tower_artillery
-      structures/cart_super_dock
-      structures/cart_embassy_celtic
-      structures/cart_embassy_iberian
-      structures/cart_embassy_italiote
+      structures/{civ}_tower_artillery
+      structures/{civ}_super_dock
+      structures/{civ}_embassy_celtic
+      structures/{civ}_embassy_iberian
+      structures/{civ}_embassy_italiote
     </Entities>
   </Builder>
   <Cost>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_infantry_swordsman_gaul_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_infantry_swordsman_gaul_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_infantry_swordsman_gaul_b.xml
@@ -2,11 +2,11 @@
 <Entity parent="template_unit_infantry_melee_swordsman">
   <Builder>
     <Entities datatype="tokens">
-      structures/cart_tower_artillery
-      structures/cart_super_dock
-      structures/cart_embassy_celtic
-      structures/cart_embassy_iberian
-      structures/cart_embassy_italiote
+      structures/{civ}_tower_artillery
+      structures/{civ}_super_dock
+      structures/{civ}_embassy_celtic
+      structures/{civ}_embassy_iberian
+      structures/{civ}_embassy_italiote
     </Entities>
   </Builder>
   <Cost>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_infantry_swordsman_ital_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_infantry_swordsman_ital_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_infantry_swordsman_ital_b.xml
@@ -2,11 +2,11 @@
 <Entity parent="template_unit_infantry_melee_swordsman">
   <Builder>
     <Entities datatype="tokens">
-      structures/cart_tower_artillery
-      structures/cart_super_dock
-      structures/cart_embassy_celtic
-      structures/cart_embassy_iberian
-      structures/cart_embassy_italiote
+      structures/{civ}_tower_artillery
+      structures/{civ}_super_dock
+      structures/{civ}_embassy_celtic
+      structures/{civ}_embassy_iberian
+      structures/{civ}_embassy_italiote
     </Entities>
   </Builder>
   <Cost>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_infantry_clubman_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_infantry_clubman_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_infantry_clubman_b.xml
@@ -13,11 +13,11 @@
   </Attack>
   <Builder>
     <Entities datatype="tokens">
-      structures/kush_pyramid_small
-      structures/kush_pyramid_large
-      structures/kush_temple_amun
-      structures/kush_blemmye_camp
-      structures/kush_nuba_village
+      structures/{civ}_pyramid_small
+      structures/{civ}_pyramid_large
+      structures/{civ}_temple_amun
+      structures/{civ}_blemmye_camp
+      structures/{civ}_nuba_village
     </Entities>
   </Builder>
   <Cost>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_infantry_javelinist_merc_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_infantry_javelinist_merc_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_infantry_javelinist_merc_b.xml
@@ -2,11 +2,11 @@
 <Entity parent="template_unit_infantry_ranged_javelinist">
   <Builder>
     <Entities datatype="tokens">
-      structures/kush_pyramid_small
-      structures/kush_pyramid_large
-      structures/kush_temple_amun
-      structures/kush_blemmye_camp
-      structures/kush_nuba_village
+      structures/{civ}_pyramid_small
+      structures/{civ}_pyramid_large
+      structures/{civ}_temple_amun
+      structures/{civ}_blemmye_camp
+      structures/{civ}_nuba_village
     </Entities>
   </Builder>
   <Cost>