From c0dd79ac3d43203035df505fb97976ca169d83fd Mon Sep 17 00:00:00 2001
From: Stan <stan@wildfiregames.com>
Date: Fri, 10 May 2019 14:55:00 +0000
Subject: [PATCH] Add different names to the gaul shield color variants so they
 don't synchronize when using them as props.

This was SVN commit r22271.
---
 .../shields/gaul_shield_cav_sw_hex_a_01.xml   | 40 +++++++++---------
 .../shields/gaul_shield_cav_sw_hex_a_02.xml   | 40 +++++++++---------
 .../shields/gaul_shield_cav_sw_oval_a_01.xml  | 42 +++++++++----------
 .../shields/gaul_shield_cav_sw_oval_a_02.xml  | 42 +++++++++----------
 .../shields/gaul_shield_cav_sw_oval_a_03.xml  | 42 +++++++++----------
 .../shields/gaul_shield_cav_sw_oval_b_01.xml  | 42 +++++++++----------
 .../shields/gaul_shield_cav_sw_oval_b_02.xml  | 42 +++++++++----------
 .../shields/gaul_shield_jav_oval_d_01.xml     | 26 ++++++------
 .../shields/gaul_shield_jav_oval_d_02.xml     | 26 ++++++------
 .../shields/gaul_shield_jav_oval_d_03.xml     | 26 ++++++------
 .../shields/gaul_shield_jav_oval_h_01.xml     | 42 +++++++++----------
 .../shields/gaul_shield_jav_oval_h_02.xml     | 42 +++++++++----------
 .../shields/gaul_shield_jav_oval_h_03.xml     | 42 +++++++++----------
 .../units/shields/gaul_shield_jav_sq_b_01.xml | 40 +++++++++---------
 .../units/shields/gaul_shield_jav_sq_b_02.xml | 40 +++++++++---------
 .../units/shields/gaul_shield_jav_sq_b_03.xml | 39 +++++++++--------
 .../units/shields/gaul_shield_oval_b_03.xml   | 42 +++++++++----------
 .../shields/gaul_shield_spear_hex_a_01.xml    | 40 +++++++++---------
 .../shields/gaul_shield_spear_hex_a_02.xml    | 40 +++++++++---------
 .../shields/gaul_shield_spear_hex_a_03.xml    | 40 +++++++++---------
 .../shields/gaul_shield_spear_oval_b_01.xml   | 42 +++++++++----------
 .../shields/gaul_shield_spear_oval_b_02.xml   | 42 +++++++++----------
 .../shields/gaul_shield_spear_oval_b_03.xml   | 42 +++++++++----------
 .../shields/gaul_shield_spear_oval_c_01.xml   | 42 +++++++++----------
 .../shields/gaul_shield_spear_oval_c_02.xml   | 42 +++++++++----------
 .../shields/gaul_shield_spear_oval_c_03.xml   | 42 +++++++++----------
 26 files changed, 513 insertions(+), 514 deletions(-)

diff --git a/binaries/data/mods/public/art/actors/props/units/shields/gaul_shield_cav_sw_hex_a_01.xml b/binaries/data/mods/public/art/actors/props/units/shields/gaul_shield_cav_sw_hex_a_01.xml
index 6ea19ac73b..8f6848877d 100644
--- a/binaries/data/mods/public/art/actors/props/units/shields/gaul_shield_cav_sw_hex_a_01.xml
+++ b/binaries/data/mods/public/art/actors/props/units/shields/gaul_shield_cav_sw_hex_a_01.xml
@@ -11,26 +11,26 @@
     </variant>
   </group>
   <group>
-    <variant frequency="1" file="shields/celt_shield_01.xml" name="Player-Color-01"/>
-    <variant frequency="1" file="shields/celt_shield_02.xml" name="Player-Color-02"/>
-    <variant frequency="1" file="shields/celt_shield_03.xml" name="Player-Color-03"/>
-    <variant frequency="1" file="shields/celt_shield_04.xml" name="Player-Color-04"/>
-    <variant frequency="1" file="shields/celt_shield_05.xml" name="Player-Color-05"/>
-    <variant frequency="1" file="shields/celt_shield_06.xml" name="Player-Color-06"/>
-    <variant frequency="1" file="shields/celt_shield_07.xml" name="Player-Color-07"/>
-    <variant frequency="1" file="shields/celt_shield_08.xml" name="Player-Color-08"/>
-    <variant frequency="1" file="shields/celt_shield_09.xml" name="Player-Color-09"/>
-    <variant frequency="1" file="shields/celt_shield_10.xml" name="Player-Color-10"/>
-    <variant frequency="1" file="shields/celt_shield_11.xml" name="Player-Color-11"/>
-    <variant frequency="1" file="shields/celt_shield_12.xml" name="Player-Color-12"/>
-    <variant frequency="1" file="shields/celt_shield_13.xml" name="Player-Color-13"/>
-    <variant frequency="1" file="shields/celt_shield_14.xml" name="Player-Color-14"/>
-    <variant frequency="1" file="shields/celt_shield_15.xml" name="Player-Color-15"/>
-    <variant frequency="1" file="shields/gaul_shield_01.xml" name="Gaul-01"/>
-    <variant frequency="1" file="shields/gaul_shield_02.xml" name="Gaul-02"/>
-    <variant frequency="1" file="shields/gaul_shield_03.xml" name="Gaul-03"/>
-    <variant frequency="1" file="shields/gaul_shield_04.xml" name="Gaul-04"/>
-    <variant frequency="1" file="shields/gaul_shield_05.xml" name="Gaul-05"/>
+    <variant frequency="1" file="shields/celt_shield_01.xml" name="Cav-SW-Hex-A-01-Player-Color-01"/>
+    <variant frequency="1" file="shields/celt_shield_02.xml" name="Cav-SW-Hex-A-01-Player-Color-02"/>
+    <variant frequency="1" file="shields/celt_shield_03.xml" name="Cav-SW-Hex-A-01-Player-Color-03"/>
+    <variant frequency="1" file="shields/celt_shield_04.xml" name="Cav-SW-Hex-A-01-Player-Color-04"/>
+    <variant frequency="1" file="shields/celt_shield_05.xml" name="Cav-SW-Hex-A-01-Player-Color-05"/>
+    <variant frequency="1" file="shields/celt_shield_06.xml" name="Cav-SW-Hex-A-01-Player-Color-06"/>
+    <variant frequency="1" file="shields/celt_shield_07.xml" name="Cav-SW-Hex-A-01-Player-Color-07"/>
+    <variant frequency="1" file="shields/celt_shield_08.xml" name="Cav-SW-Hex-A-01-Player-Color-08"/>
+    <variant frequency="1" file="shields/celt_shield_09.xml" name="Cav-SW-Hex-A-01-Player-Color-09"/>
+    <variant frequency="1" file="shields/celt_shield_10.xml" name="Cav-SW-Hex-A-01-Player-Color-10"/>
+    <variant frequency="1" file="shields/celt_shield_11.xml" name="Cav-SW-Hex-A-01-Player-Color-11"/>
+    <variant frequency="1" file="shields/celt_shield_12.xml" name="Cav-SW-Hex-A-01-Player-Color-12"/>
+    <variant frequency="1" file="shields/celt_shield_13.xml" name="Cav-SW-Hex-A-01-Player-Color-13"/>
+    <variant frequency="1" file="shields/celt_shield_14.xml" name="Cav-SW-Hex-A-01-Player-Color-14"/>
+    <variant frequency="1" file="shields/celt_shield_15.xml" name="Cav-SW-Hex-A-01-Player-Color-15"/>
+    <variant frequency="1" file="shields/gaul_shield_01.xml" name="Cav-SW-Hex-A-01-Gaul-01"/>
+    <variant frequency="1" file="shields/gaul_shield_02.xml" name="Cav-SW-Hex-A-01-Gaul-02"/>
+    <variant frequency="1" file="shields/gaul_shield_03.xml" name="Cav-SW-Hex-A-01-Gaul-03"/>
+    <variant frequency="1" file="shields/gaul_shield_04.xml" name="Cav-SW-Hex-A-01-Gaul-04"/>
+    <variant frequency="1" file="shields/gaul_shield_05.xml" name="Cav-SW-Hex-A-01-Gaul-05"/>
   </group>
   <group>
     <variant frequency="1" name="Spina-a">
diff --git a/binaries/data/mods/public/art/actors/props/units/shields/gaul_shield_cav_sw_hex_a_02.xml b/binaries/data/mods/public/art/actors/props/units/shields/gaul_shield_cav_sw_hex_a_02.xml
index 9ca28ef2a6..dd2c85720e 100644
--- a/binaries/data/mods/public/art/actors/props/units/shields/gaul_shield_cav_sw_hex_a_02.xml
+++ b/binaries/data/mods/public/art/actors/props/units/shields/gaul_shield_cav_sw_hex_a_02.xml
@@ -11,26 +11,26 @@
     </variant>
   </group>
   <group>
-    <variant frequency="1" file="shields/celt_shield_01.xml" name="Player-Color-01"/>
-    <variant frequency="1" file="shields/celt_shield_02.xml" name="Player-Color-02"/>
-    <variant frequency="1" file="shields/celt_shield_03.xml" name="Player-Color-03"/>
-    <variant frequency="1" file="shields/celt_shield_04.xml" name="Player-Color-04"/>
-    <variant frequency="1" file="shields/celt_shield_05.xml" name="Player-Color-05"/>
-    <variant frequency="1" file="shields/celt_shield_06.xml" name="Player-Color-06"/>
-    <variant frequency="1" file="shields/celt_shield_07.xml" name="Player-Color-07"/>
-    <variant frequency="1" file="shields/celt_shield_08.xml" name="Player-Color-08"/>
-    <variant frequency="1" file="shields/celt_shield_09.xml" name="Player-Color-09"/>
-    <variant frequency="1" file="shields/celt_shield_10.xml" name="Player-Color-10"/>
-    <variant frequency="1" file="shields/celt_shield_11.xml" name="Player-Color-11"/>
-    <variant frequency="1" file="shields/celt_shield_12.xml" name="Player-Color-12"/>
-    <variant frequency="1" file="shields/celt_shield_13.xml" name="Player-Color-13"/>
-    <variant frequency="1" file="shields/celt_shield_14.xml" name="Player-Color-14"/>
-    <variant frequency="1" file="shields/celt_shield_15.xml" name="Player-Color-15"/>
-    <variant frequency="1" file="shields/gaul_shield_01.xml" name="Gaul-01"/>
-    <variant frequency="1" file="shields/gaul_shield_02.xml" name="Gaul-02"/>
-    <variant frequency="1" file="shields/gaul_shield_03.xml" name="Gaul-03"/>
-    <variant frequency="1" file="shields/gaul_shield_04.xml" name="Gaul-04"/>
-    <variant frequency="1" file="shields/gaul_shield_05.xml" name="Gaul-05"/>
+    <variant frequency="1" file="shields/celt_shield_01.xml" name="Cav-SW-Hex-A-02-Player-Color-01"/>
+    <variant frequency="1" file="shields/celt_shield_02.xml" name="Cav-SW-Hex-A-02-Player-Color-02"/>
+    <variant frequency="1" file="shields/celt_shield_03.xml" name="Cav-SW-Hex-A-02-Player-Color-03"/>
+    <variant frequency="1" file="shields/celt_shield_04.xml" name="Cav-SW-Hex-A-02-Player-Color-04"/>
+    <variant frequency="1" file="shields/celt_shield_05.xml" name="Cav-SW-Hex-A-02-Player-Color-05"/>
+    <variant frequency="1" file="shields/celt_shield_06.xml" name="Cav-SW-Hex-A-02-Player-Color-06"/>
+    <variant frequency="1" file="shields/celt_shield_07.xml" name="Cav-SW-Hex-A-02-Player-Color-07"/>
+    <variant frequency="1" file="shields/celt_shield_08.xml" name="Cav-SW-Hex-A-02-Player-Color-08"/>
+    <variant frequency="1" file="shields/celt_shield_09.xml" name="Cav-SW-Hex-A-02-Player-Color-09"/>
+    <variant frequency="1" file="shields/celt_shield_10.xml" name="Cav-SW-Hex-A-02-Player-Color-10"/>
+    <variant frequency="1" file="shields/celt_shield_11.xml" name="Cav-SW-Hex-A-02-Player-Color-11"/>
+    <variant frequency="1" file="shields/celt_shield_12.xml" name="Cav-SW-Hex-A-02-Player-Color-12"/>
+    <variant frequency="1" file="shields/celt_shield_13.xml" name="Cav-SW-Hex-A-02-Player-Color-13"/>
+    <variant frequency="1" file="shields/celt_shield_14.xml" name="Cav-SW-Hex-A-02-Player-Color-14"/>
+    <variant frequency="1" file="shields/celt_shield_15.xml" name="Cav-SW-Hex-A-02-Player-Color-15"/>
+    <variant frequency="1" file="shields/gaul_shield_01.xml" name="Cav-SW-Hex-A-02-Gaul-01"/>
+    <variant frequency="1" file="shields/gaul_shield_02.xml" name="Cav-SW-Hex-A-02-Gaul-02"/>
+    <variant frequency="1" file="shields/gaul_shield_03.xml" name="Cav-SW-Hex-A-02-Gaul-03"/>
+    <variant frequency="1" file="shields/gaul_shield_04.xml" name="Cav-SW-Hex-A-02-Gaul-04"/>
+    <variant frequency="1" file="shields/gaul_shield_05.xml" name="Cav-SW-Hex-A-02-Gaul-05"/>
   </group>
   <group>
     <variant frequency="1" name="Spina-b">
diff --git a/binaries/data/mods/public/art/actors/props/units/shields/gaul_shield_cav_sw_oval_a_01.xml b/binaries/data/mods/public/art/actors/props/units/shields/gaul_shield_cav_sw_oval_a_01.xml
index 5c766b1b67..95e9be8a78 100644
--- a/binaries/data/mods/public/art/actors/props/units/shields/gaul_shield_cav_sw_oval_a_01.xml
+++ b/binaries/data/mods/public/art/actors/props/units/shields/gaul_shield_cav_sw_oval_a_01.xml
@@ -11,27 +11,27 @@
     </variant>
   </group>
   <group>
-    <variant frequency="1" file="shields/celt_shield_01.xml" name="Player-Color-01"/>
-    <variant frequency="1" file="shields/celt_shield_02.xml" name="Player-Color-02"/>
-    <variant frequency="1" file="shields/celt_shield_03.xml" name="Player-Color-03"/>
-    <variant frequency="1" file="shields/celt_shield_04.xml" name="Player-Color-04"/>
-    <variant frequency="1" file="shields/celt_shield_05.xml" name="Player-Color-05"/>
-    <variant frequency="1" file="shields/celt_shield_06.xml" name="Player-Color-06"/>
-    <variant frequency="1" file="shields/celt_shield_07.xml" name="Player-Color-07"/>
-    <variant frequency="1" file="shields/celt_shield_08.xml" name="Player-Color-08"/>
-    <variant frequency="1" file="shields/celt_shield_09.xml" name="Player-Color-09"/>
-    <variant frequency="1" file="shields/celt_shield_10.xml" name="Player-Color-10"/>
-    <variant frequency="1" file="shields/celt_shield_11.xml" name="Player-Color-11"/>
-    <variant frequency="1" file="shields/celt_shield_12.xml" name="Player-Color-12"/>
-    <variant frequency="1" file="shields/celt_shield_13.xml" name="Player-Color-13"/>
-    <variant frequency="1" file="shields/celt_shield_14.xml" name="Player-Color-14"/>
-    <variant frequency="1" file="shields/celt_shield_15.xml" name="Player-Color-15"/>
-    <variant frequency="1" file="shields/gaul_shield_01.xml" name="Gaul-01"/>
-    <variant frequency="1" file="shields/gaul_shield_02.xml" name="Gaul-02"/>
-    <variant frequency="1" file="shields/gaul_shield_03.xml" name="Gaul-03"/>
-    <variant frequency="1" file="shields/gaul_shield_04.xml" name="Gaul-04"/>
-    <variant frequency="1" file="shields/gaul_shield_05.xml" name="Gaul-05"/>
-    <variant frequency="1" file="shields/gaul_shield_06.xml" name="Gaul-06"/>
+    <variant frequency="1" file="shields/celt_shield_01.xml" name="cav-sw-oval-a-01-Player-Color-01"/>
+    <variant frequency="1" file="shields/celt_shield_02.xml" name="cav-sw-oval-a-01-Player-Color-02"/>
+    <variant frequency="1" file="shields/celt_shield_03.xml" name="cav-sw-oval-a-01-Player-Color-03"/>
+    <variant frequency="1" file="shields/celt_shield_04.xml" name="cav-sw-oval-a-01-Player-Color-04"/>
+    <variant frequency="1" file="shields/celt_shield_05.xml" name="cav-sw-oval-a-01-Player-Color-05"/>
+    <variant frequency="1" file="shields/celt_shield_06.xml" name="cav-sw-oval-a-01-Player-Color-06"/>
+    <variant frequency="1" file="shields/celt_shield_07.xml" name="cav-sw-oval-a-01-Player-Color-07"/>
+    <variant frequency="1" file="shields/celt_shield_08.xml" name="cav-sw-oval-a-01-Player-Color-08"/>
+    <variant frequency="1" file="shields/celt_shield_09.xml" name="cav-sw-oval-a-01-Player-Color-09"/>
+    <variant frequency="1" file="shields/celt_shield_10.xml" name="cav-sw-oval-a-01-Player-Color-10"/>
+    <variant frequency="1" file="shields/celt_shield_11.xml" name="cav-sw-oval-a-01-Player-Color-11"/>
+    <variant frequency="1" file="shields/celt_shield_12.xml" name="cav-sw-oval-a-01-Player-Color-12"/>
+    <variant frequency="1" file="shields/celt_shield_13.xml" name="cav-sw-oval-a-01-Player-Color-13"/>
+    <variant frequency="1" file="shields/celt_shield_14.xml" name="cav-sw-oval-a-01-Player-Color-14"/>
+    <variant frequency="1" file="shields/celt_shield_15.xml" name="cav-sw-oval-a-01-Player-Color-15"/>
+    <variant frequency="1" file="shields/gaul_shield_01.xml" name="cav-sw-oval-a-01-Gaul-01"/>
+    <variant frequency="1" file="shields/gaul_shield_02.xml" name="cav-sw-oval-a-01-Gaul-02"/>
+    <variant frequency="1" file="shields/gaul_shield_03.xml" name="cav-sw-oval-a-01-Gaul-03"/>
+    <variant frequency="1" file="shields/gaul_shield_04.xml" name="cav-sw-oval-a-01-Gaul-04"/>
+    <variant frequency="1" file="shields/gaul_shield_05.xml" name="cav-sw-oval-a-01-Gaul-05"/>
+    <variant frequency="1" file="shields/gaul_shield_06.xml" name="cav-sw-oval-a-01-Gaul-06"/>
   </group>
   <group>
     <variant frequency="1" name="Spina-a">
diff --git a/binaries/data/mods/public/art/actors/props/units/shields/gaul_shield_cav_sw_oval_a_02.xml b/binaries/data/mods/public/art/actors/props/units/shields/gaul_shield_cav_sw_oval_a_02.xml
index c4e97b0f2d..48cf847c3a 100644
--- a/binaries/data/mods/public/art/actors/props/units/shields/gaul_shield_cav_sw_oval_a_02.xml
+++ b/binaries/data/mods/public/art/actors/props/units/shields/gaul_shield_cav_sw_oval_a_02.xml
@@ -12,27 +12,27 @@
     </variant>
   </group>
   <group>
-    <variant frequency="1" file="shields/celt_shield_01.xml" name="Player-Color-01"/>
-    <variant frequency="1" file="shields/celt_shield_02.xml" name="Player-Color-02"/>
-    <variant frequency="1" file="shields/celt_shield_03.xml" name="Player-Color-03"/>
-    <variant frequency="1" file="shields/celt_shield_04.xml" name="Player-Color-04"/>
-    <variant frequency="1" file="shields/celt_shield_05.xml" name="Player-Color-05"/>
-    <variant frequency="1" file="shields/celt_shield_06.xml" name="Player-Color-06"/>
-    <variant frequency="1" file="shields/celt_shield_07.xml" name="Player-Color-07"/>
-    <variant frequency="1" file="shields/celt_shield_08.xml" name="Player-Color-08"/>
-    <variant frequency="1" file="shields/celt_shield_09.xml" name="Player-Color-09"/>
-    <variant frequency="1" file="shields/celt_shield_10.xml" name="Player-Color-10"/>
-    <variant frequency="1" file="shields/celt_shield_11.xml" name="Player-Color-11"/>
-    <variant frequency="1" file="shields/celt_shield_12.xml" name="Player-Color-12"/>
-    <variant frequency="1" file="shields/celt_shield_13.xml" name="Player-Color-13"/>
-    <variant frequency="1" file="shields/celt_shield_14.xml" name="Player-Color-14"/>
-    <variant frequency="1" file="shields/celt_shield_15.xml" name="Player-Color-15"/>
-    <variant frequency="1" file="shields/gaul_shield_01.xml" name="Gaul-01"/>
-    <variant frequency="1" file="shields/gaul_shield_02.xml" name="Gaul-02"/>
-    <variant frequency="1" file="shields/gaul_shield_03.xml" name="Gaul-03"/>
-    <variant frequency="1" file="shields/gaul_shield_04.xml" name="Gaul-04"/>
-    <variant frequency="1" file="shields/gaul_shield_05.xml" name="Gaul-05"/>
-    <variant frequency="1" file="shields/gaul_shield_06.xml" name="Gaul-06"/>
+    <variant frequency="1" file="shields/celt_shield_01.xml" name="cav-sw-oval-a-02-Player-Color-01"/>
+    <variant frequency="1" file="shields/celt_shield_02.xml" name="cav-sw-oval-a-02-Player-Color-02"/>
+    <variant frequency="1" file="shields/celt_shield_03.xml" name="cav-sw-oval-a-02-Player-Color-03"/>
+    <variant frequency="1" file="shields/celt_shield_04.xml" name="cav-sw-oval-a-02-Player-Color-04"/>
+    <variant frequency="1" file="shields/celt_shield_05.xml" name="cav-sw-oval-a-02-Player-Color-05"/>
+    <variant frequency="1" file="shields/celt_shield_06.xml" name="cav-sw-oval-a-02-Player-Color-06"/>
+    <variant frequency="1" file="shields/celt_shield_07.xml" name="cav-sw-oval-a-02-Player-Color-07"/>
+    <variant frequency="1" file="shields/celt_shield_08.xml" name="cav-sw-oval-a-02-Player-Color-08"/>
+    <variant frequency="1" file="shields/celt_shield_09.xml" name="cav-sw-oval-a-02-Player-Color-09"/>
+    <variant frequency="1" file="shields/celt_shield_10.xml" name="cav-sw-oval-a-02-Player-Color-10"/>
+    <variant frequency="1" file="shields/celt_shield_11.xml" name="cav-sw-oval-a-02-Player-Color-11"/>
+    <variant frequency="1" file="shields/celt_shield_12.xml" name="cav-sw-oval-a-02-Player-Color-12"/>
+    <variant frequency="1" file="shields/celt_shield_13.xml" name="cav-sw-oval-a-02-Player-Color-13"/>
+    <variant frequency="1" file="shields/celt_shield_14.xml" name="cav-sw-oval-a-02-Player-Color-14"/>
+    <variant frequency="1" file="shields/celt_shield_15.xml" name="cav-sw-oval-a-02-Player-Color-15"/>
+    <variant frequency="1" file="shields/gaul_shield_01.xml" name="cav-sw-oval-a-02-Gaul-01"/>
+    <variant frequency="1" file="shields/gaul_shield_02.xml" name="cav-sw-oval-a-02-Gaul-02"/>
+    <variant frequency="1" file="shields/gaul_shield_03.xml" name="cav-sw-oval-a-02-Gaul-03"/>
+    <variant frequency="1" file="shields/gaul_shield_04.xml" name="cav-sw-oval-a-02-Gaul-04"/>
+    <variant frequency="1" file="shields/gaul_shield_05.xml" name="cav-sw-oval-a-02-Gaul-05"/>
+    <variant frequency="1" file="shields/gaul_shield_06.xml" name="cav-sw-oval-a-02-Gaul-06"/>
   </group>
   <group>
     <variant frequency="1" name="Spina-a">
diff --git a/binaries/data/mods/public/art/actors/props/units/shields/gaul_shield_cav_sw_oval_a_03.xml b/binaries/data/mods/public/art/actors/props/units/shields/gaul_shield_cav_sw_oval_a_03.xml
index b2a3e28da6..ce6b902155 100644
--- a/binaries/data/mods/public/art/actors/props/units/shields/gaul_shield_cav_sw_oval_a_03.xml
+++ b/binaries/data/mods/public/art/actors/props/units/shields/gaul_shield_cav_sw_oval_a_03.xml
@@ -12,27 +12,27 @@
     </variant>
   </group>
   <group>
-    <variant frequency="1" file="shields/celt_shield_01.xml" name="Player-Color-01"/>
-    <variant frequency="1" file="shields/celt_shield_02.xml" name="Player-Color-02"/>
-    <variant frequency="1" file="shields/celt_shield_03.xml" name="Player-Color-03"/>
-    <variant frequency="1" file="shields/celt_shield_04.xml" name="Player-Color-04"/>
-    <variant frequency="1" file="shields/celt_shield_05.xml" name="Player-Color-05"/>
-    <variant frequency="1" file="shields/celt_shield_06.xml" name="Player-Color-06"/>
-    <variant frequency="1" file="shields/celt_shield_07.xml" name="Player-Color-07"/>
-    <variant frequency="1" file="shields/celt_shield_08.xml" name="Player-Color-08"/>
-    <variant frequency="1" file="shields/celt_shield_09.xml" name="Player-Color-09"/>
-    <variant frequency="1" file="shields/celt_shield_10.xml" name="Player-Color-10"/>
-    <variant frequency="1" file="shields/celt_shield_11.xml" name="Player-Color-11"/>
-    <variant frequency="1" file="shields/celt_shield_12.xml" name="Player-Color-12"/>
-    <variant frequency="1" file="shields/celt_shield_13.xml" name="Player-Color-13"/>
-    <variant frequency="1" file="shields/celt_shield_14.xml" name="Player-Color-14"/>
-    <variant frequency="1" file="shields/celt_shield_15.xml" name="Player-Color-15"/>
-    <variant frequency="1" file="shields/gaul_shield_01.xml" name="Gaul-01"/>
-    <variant frequency="1" file="shields/gaul_shield_02.xml" name="Gaul-02"/>
-    <variant frequency="1" file="shields/gaul_shield_03.xml" name="Gaul-03"/>
-    <variant frequency="1" file="shields/gaul_shield_04.xml" name="Gaul-04"/>
-    <variant frequency="1" file="shields/gaul_shield_05.xml" name="Gaul-05"/>
-    <variant frequency="1" file="shields/gaul_shield_06.xml" name="Gaul-06"/>
+    <variant frequency="1" file="shields/celt_shield_01.xml" name="cav-sw-oval-a-03-Player-Color-01"/>
+    <variant frequency="1" file="shields/celt_shield_02.xml" name="cav-sw-oval-a-03-Player-Color-02"/>
+    <variant frequency="1" file="shields/celt_shield_03.xml" name="cav-sw-oval-a-03-Player-Color-03"/>
+    <variant frequency="1" file="shields/celt_shield_04.xml" name="cav-sw-oval-a-03-Player-Color-04"/>
+    <variant frequency="1" file="shields/celt_shield_05.xml" name="cav-sw-oval-a-03-Player-Color-05"/>
+    <variant frequency="1" file="shields/celt_shield_06.xml" name="cav-sw-oval-a-03-Player-Color-06"/>
+    <variant frequency="1" file="shields/celt_shield_07.xml" name="cav-sw-oval-a-03-Player-Color-07"/>
+    <variant frequency="1" file="shields/celt_shield_08.xml" name="cav-sw-oval-a-03-Player-Color-08"/>
+    <variant frequency="1" file="shields/celt_shield_09.xml" name="cav-sw-oval-a-03-Player-Color-09"/>
+    <variant frequency="1" file="shields/celt_shield_10.xml" name="cav-sw-oval-a-03-Player-Color-10"/>
+    <variant frequency="1" file="shields/celt_shield_11.xml" name="cav-sw-oval-a-03-Player-Color-11"/>
+    <variant frequency="1" file="shields/celt_shield_12.xml" name="cav-sw-oval-a-03-Player-Color-12"/>
+    <variant frequency="1" file="shields/celt_shield_13.xml" name="cav-sw-oval-a-03-Player-Color-13"/>
+    <variant frequency="1" file="shields/celt_shield_14.xml" name="cav-sw-oval-a-03-Player-Color-14"/>
+    <variant frequency="1" file="shields/celt_shield_15.xml" name="cav-sw-oval-a-03-Player-Color-15"/>
+    <variant frequency="1" file="shields/gaul_shield_01.xml" name="cav-sw-oval-a-03-Gaul-01"/>
+    <variant frequency="1" file="shields/gaul_shield_02.xml" name="cav-sw-oval-a-03-Gaul-02"/>
+    <variant frequency="1" file="shields/gaul_shield_03.xml" name="cav-sw-oval-a-03-Gaul-03"/>
+    <variant frequency="1" file="shields/gaul_shield_04.xml" name="cav-sw-oval-a-03-Gaul-04"/>
+    <variant frequency="1" file="shields/gaul_shield_05.xml" name="cav-sw-oval-a-03-Gaul-05"/>
+    <variant frequency="1" file="shields/gaul_shield_06.xml" name="cav-sw-oval-a-03-Gaul-06"/>
   </group>
   <group>
     <variant frequency="1" name="Spina-a">
diff --git a/binaries/data/mods/public/art/actors/props/units/shields/gaul_shield_cav_sw_oval_b_01.xml b/binaries/data/mods/public/art/actors/props/units/shields/gaul_shield_cav_sw_oval_b_01.xml
index bcbfd4c35e..8f3224ddcc 100644
--- a/binaries/data/mods/public/art/actors/props/units/shields/gaul_shield_cav_sw_oval_b_01.xml
+++ b/binaries/data/mods/public/art/actors/props/units/shields/gaul_shield_cav_sw_oval_b_01.xml
@@ -11,27 +11,27 @@
     </variant>
   </group>
   <group>
-    <variant frequency="1" file="shields/celt_shield_01.xml" name="Player-Color-01"/>
-    <variant frequency="1" file="shields/celt_shield_02.xml" name="Player-Color-02"/>
-    <variant frequency="1" file="shields/celt_shield_03.xml" name="Player-Color-03"/>
-    <variant frequency="1" file="shields/celt_shield_04.xml" name="Player-Color-04"/>
-    <variant frequency="1" file="shields/celt_shield_05.xml" name="Player-Color-05"/>
-    <variant frequency="1" file="shields/celt_shield_06.xml" name="Player-Color-06"/>
-    <variant frequency="1" file="shields/celt_shield_07.xml" name="Player-Color-07"/>
-    <variant frequency="1" file="shields/celt_shield_08.xml" name="Player-Color-08"/>
-    <variant frequency="1" file="shields/celt_shield_09.xml" name="Player-Color-09"/>
-    <variant frequency="1" file="shields/celt_shield_10.xml" name="Player-Color-10"/>
-    <variant frequency="1" file="shields/celt_shield_11.xml" name="Player-Color-11"/>
-    <variant frequency="1" file="shields/celt_shield_12.xml" name="Player-Color-12"/>
-    <variant frequency="1" file="shields/celt_shield_13.xml" name="Player-Color-13"/>
-    <variant frequency="1" file="shields/celt_shield_14.xml" name="Player-Color-14"/>
-    <variant frequency="1" file="shields/celt_shield_15.xml" name="Player-Color-15"/>
-    <variant frequency="1" file="shields/gaul_shield_01.xml" name="Gaul-01"/>
-    <variant frequency="1" file="shields/gaul_shield_02.xml" name="Gaul-02"/>
-    <variant frequency="1" file="shields/gaul_shield_03.xml" name="Gaul-03"/>
-    <variant frequency="1" file="shields/gaul_shield_04.xml" name="Gaul-04"/>
-    <variant frequency="1" file="shields/gaul_shield_05.xml" name="Gaul-05"/>
-    <variant frequency="1" file="shields/gaul_shield_06.xml" name="Gaul-06"/>
+    <variant frequency="1" file="shields/celt_shield_01.xml" name="cav-sw-oval-b-01-Player-Color-01"/>
+    <variant frequency="1" file="shields/celt_shield_02.xml" name="cav-sw-oval-b-01-Player-Color-02"/>
+    <variant frequency="1" file="shields/celt_shield_03.xml" name="cav-sw-oval-b-01-Player-Color-03"/>
+    <variant frequency="1" file="shields/celt_shield_04.xml" name="cav-sw-oval-b-01-Player-Color-04"/>
+    <variant frequency="1" file="shields/celt_shield_05.xml" name="cav-sw-oval-b-01-Player-Color-05"/>
+    <variant frequency="1" file="shields/celt_shield_06.xml" name="cav-sw-oval-b-01-Player-Color-06"/>
+    <variant frequency="1" file="shields/celt_shield_07.xml" name="cav-sw-oval-b-01-Player-Color-07"/>
+    <variant frequency="1" file="shields/celt_shield_08.xml" name="cav-sw-oval-b-01-Player-Color-08"/>
+    <variant frequency="1" file="shields/celt_shield_09.xml" name="cav-sw-oval-b-01-Player-Color-09"/>
+    <variant frequency="1" file="shields/celt_shield_10.xml" name="cav-sw-oval-b-01-Player-Color-10"/>
+    <variant frequency="1" file="shields/celt_shield_11.xml" name="cav-sw-oval-b-01-Player-Color-11"/>
+    <variant frequency="1" file="shields/celt_shield_12.xml" name="cav-sw-oval-b-01-Player-Color-12"/>
+    <variant frequency="1" file="shields/celt_shield_13.xml" name="cav-sw-oval-b-01-Player-Color-13"/>
+    <variant frequency="1" file="shields/celt_shield_14.xml" name="cav-sw-oval-b-01-Player-Color-14"/>
+    <variant frequency="1" file="shields/celt_shield_15.xml" name="cav-sw-oval-b-01-Player-Color-15"/>
+    <variant frequency="1" file="shields/gaul_shield_01.xml" name="cav-sw-oval-b-01-Gaul-01"/>
+    <variant frequency="1" file="shields/gaul_shield_02.xml" name="cav-sw-oval-b-01-Gaul-02"/>
+    <variant frequency="1" file="shields/gaul_shield_03.xml" name="cav-sw-oval-b-01-Gaul-03"/>
+    <variant frequency="1" file="shields/gaul_shield_04.xml" name="cav-sw-oval-b-01-Gaul-04"/>
+    <variant frequency="1" file="shields/gaul_shield_05.xml" name="cav-sw-oval-b-01-Gaul-05"/>
+    <variant frequency="1" file="shields/gaul_shield_06.xml" name="cav-sw-oval-b-01-Gaul-06"/>
   </group>
   <group>
     <variant frequency="1" name="Spina-a">
diff --git a/binaries/data/mods/public/art/actors/props/units/shields/gaul_shield_cav_sw_oval_b_02.xml b/binaries/data/mods/public/art/actors/props/units/shields/gaul_shield_cav_sw_oval_b_02.xml
index dfe435f5f9..0fe3fd4c71 100644
--- a/binaries/data/mods/public/art/actors/props/units/shields/gaul_shield_cav_sw_oval_b_02.xml
+++ b/binaries/data/mods/public/art/actors/props/units/shields/gaul_shield_cav_sw_oval_b_02.xml
@@ -12,27 +12,27 @@
     </variant>
   </group>
   <group>
-    <variant frequency="1" file="shields/celt_shield_01.xml" name="Player-Color-01"/>
-    <variant frequency="1" file="shields/celt_shield_02.xml" name="Player-Color-02"/>
-    <variant frequency="1" file="shields/celt_shield_03.xml" name="Player-Color-03"/>
-    <variant frequency="1" file="shields/celt_shield_04.xml" name="Player-Color-04"/>
-    <variant frequency="1" file="shields/celt_shield_05.xml" name="Player-Color-05"/>
-    <variant frequency="1" file="shields/celt_shield_06.xml" name="Player-Color-06"/>
-    <variant frequency="1" file="shields/celt_shield_07.xml" name="Player-Color-07"/>
-    <variant frequency="1" file="shields/celt_shield_08.xml" name="Player-Color-08"/>
-    <variant frequency="1" file="shields/celt_shield_09.xml" name="Player-Color-09"/>
-    <variant frequency="1" file="shields/celt_shield_10.xml" name="Player-Color-10"/>
-    <variant frequency="1" file="shields/celt_shield_11.xml" name="Player-Color-11"/>
-    <variant frequency="1" file="shields/celt_shield_12.xml" name="Player-Color-12"/>
-    <variant frequency="1" file="shields/celt_shield_13.xml" name="Player-Color-13"/>
-    <variant frequency="1" file="shields/celt_shield_14.xml" name="Player-Color-14"/>
-    <variant frequency="1" file="shields/celt_shield_15.xml" name="Player-Color-15"/>
-    <variant frequency="1" file="shields/gaul_shield_01.xml" name="Gaul-01"/>
-    <variant frequency="1" file="shields/gaul_shield_02.xml" name="Gaul-02"/>
-    <variant frequency="1" file="shields/gaul_shield_03.xml" name="Gaul-03"/>
-    <variant frequency="1" file="shields/gaul_shield_04.xml" name="Gaul-04"/>
-    <variant frequency="1" file="shields/gaul_shield_05.xml" name="Gaul-05"/>
-    <variant frequency="1" file="shields/gaul_shield_06.xml" name="Gaul-06"/>
+    <variant frequency="1" file="shields/celt_shield_01.xml" name="cav-sw-oval-b-02-Player-Color-01"/>
+    <variant frequency="1" file="shields/celt_shield_02.xml" name="cav-sw-oval-b-02-Player-Color-02"/>
+    <variant frequency="1" file="shields/celt_shield_03.xml" name="cav-sw-oval-b-02-Player-Color-03"/>
+    <variant frequency="1" file="shields/celt_shield_04.xml" name="cav-sw-oval-b-02-Player-Color-04"/>
+    <variant frequency="1" file="shields/celt_shield_05.xml" name="cav-sw-oval-b-02-Player-Color-05"/>
+    <variant frequency="1" file="shields/celt_shield_06.xml" name="cav-sw-oval-b-02-Player-Color-06"/>
+    <variant frequency="1" file="shields/celt_shield_07.xml" name="cav-sw-oval-b-02-Player-Color-07"/>
+    <variant frequency="1" file="shields/celt_shield_08.xml" name="cav-sw-oval-b-02-Player-Color-08"/>
+    <variant frequency="1" file="shields/celt_shield_09.xml" name="cav-sw-oval-b-02-Player-Color-09"/>
+    <variant frequency="1" file="shields/celt_shield_10.xml" name="cav-sw-oval-b-02-Player-Color-10"/>
+    <variant frequency="1" file="shields/celt_shield_11.xml" name="cav-sw-oval-b-02-Player-Color-11"/>
+    <variant frequency="1" file="shields/celt_shield_12.xml" name="cav-sw-oval-b-02-Player-Color-12"/>
+    <variant frequency="1" file="shields/celt_shield_13.xml" name="cav-sw-oval-b-02-Player-Color-13"/>
+    <variant frequency="1" file="shields/celt_shield_14.xml" name="cav-sw-oval-b-02-Player-Color-14"/>
+    <variant frequency="1" file="shields/celt_shield_15.xml" name="cav-sw-oval-b-02-Player-Color-15"/>
+    <variant frequency="1" file="shields/gaul_shield_01.xml" name="cav-sw-oval-b-02-Gaul-01"/>
+    <variant frequency="1" file="shields/gaul_shield_02.xml" name="cav-sw-oval-b-02-Gaul-02"/>
+    <variant frequency="1" file="shields/gaul_shield_03.xml" name="cav-sw-oval-b-02-Gaul-03"/>
+    <variant frequency="1" file="shields/gaul_shield_04.xml" name="cav-sw-oval-b-02-Gaul-04"/>
+    <variant frequency="1" file="shields/gaul_shield_05.xml" name="cav-sw-oval-b-02-Gaul-05"/>
+    <variant frequency="1" file="shields/gaul_shield_06.xml" name="cav-sw-oval-b-02-Gaul-06"/>
   </group>
   <group>
     <variant frequency="1" name="Spina-a">
diff --git a/binaries/data/mods/public/art/actors/props/units/shields/gaul_shield_jav_oval_d_01.xml b/binaries/data/mods/public/art/actors/props/units/shields/gaul_shield_jav_oval_d_01.xml
index ee4122f3ee..d8c9304a3e 100644
--- a/binaries/data/mods/public/art/actors/props/units/shields/gaul_shield_jav_oval_d_01.xml
+++ b/binaries/data/mods/public/art/actors/props/units/shields/gaul_shield_jav_oval_d_01.xml
@@ -11,19 +11,19 @@
     </variant>
   </group>
   <group>
-    <variant frequency="1" file="shields/celt_shield_01.xml" name="Player-Color-01"/>
-    <variant frequency="1" file="shields/celt_shield_02.xml" name="Player-Color-02"/>
-    <variant frequency="1" file="shields/celt_shield_03.xml" name="Player-Color-03"/>
-    <variant frequency="1" file="shields/celt_shield_04.xml" name="Player-Color-04"/>
-    <variant frequency="1" file="shields/celt_shield_05.xml" name="Player-Color-05"/>
-    <variant frequency="1" file="shields/celt_shield_06.xml" name="Player-Color-06"/>
-    <variant frequency="1" file="shields/celt_shield_07.xml" name="Player-Color-07"/>
-    <variant frequency="1" file="shields/celt_shield_08.xml" name="Player-Color-08"/>
-    <variant frequency="1" file="shields/celt_shield_09.xml" name="Player-Color-09"/>
-    <variant frequency="1" file="shields/celt_shield_14.xml" name="Player-Color-14"/>
-    <variant frequency="1" file="shields/gaul_shield_03.xml" name="Gaul-03"/>
-    <variant frequency="1" file="shields/gaul_shield_04.xml" name="Gaul-04"/>
-    <variant frequency="1" file="shields/gaul_shield_05.xml" name="Gaul-05"/>
+    <variant frequency="1" file="shields/celt_shield_01.xml" name="Jav-Oval-D-01-Player-Color-01"/>
+    <variant frequency="1" file="shields/celt_shield_02.xml" name="Jav-Oval-D-01-Player-Color-02"/>
+    <variant frequency="1" file="shields/celt_shield_03.xml" name="Jav-Oval-D-01-Player-Color-03"/>
+    <variant frequency="1" file="shields/celt_shield_04.xml" name="Jav-Oval-D-01-Player-Color-04"/>
+    <variant frequency="1" file="shields/celt_shield_05.xml" name="Jav-Oval-D-01-Player-Color-05"/>
+    <variant frequency="1" file="shields/celt_shield_06.xml" name="Jav-Oval-D-01-Player-Color-06"/>
+    <variant frequency="1" file="shields/celt_shield_07.xml" name="Jav-Oval-D-01-Player-Color-07"/>
+    <variant frequency="1" file="shields/celt_shield_08.xml" name="Jav-Oval-D-01-Player-Color-08"/>
+    <variant frequency="1" file="shields/celt_shield_09.xml" name="Jav-Oval-D-01-Player-Color-09"/>
+    <variant frequency="1" file="shields/celt_shield_14.xml" name="Jav-Oval-D-01-Player-Color-14"/>
+    <variant frequency="1" file="shields/gaul_shield_03.xml" name="Jav-Oval-D-01-Gaul-03"/>
+    <variant frequency="1" file="shields/gaul_shield_04.xml" name="Jav-Oval-D-01-Gaul-04"/>
+    <variant frequency="1" file="shields/gaul_shield_05.xml" name="Jav-Oval-D-01-Gaul-05"/>
   </group>
   <group>
     <variant frequency="1" name="Spina-c">
diff --git a/binaries/data/mods/public/art/actors/props/units/shields/gaul_shield_jav_oval_d_02.xml b/binaries/data/mods/public/art/actors/props/units/shields/gaul_shield_jav_oval_d_02.xml
index 32f2a5154f..1ab1875b52 100644
--- a/binaries/data/mods/public/art/actors/props/units/shields/gaul_shield_jav_oval_d_02.xml
+++ b/binaries/data/mods/public/art/actors/props/units/shields/gaul_shield_jav_oval_d_02.xml
@@ -11,19 +11,19 @@
     </variant>
   </group>
   <group>
-    <variant frequency="1" file="shields/celt_shield_01.xml" name="Player-Color-01"/>
-    <variant frequency="1" file="shields/celt_shield_02.xml" name="Player-Color-02"/>
-    <variant frequency="1" file="shields/celt_shield_03.xml" name="Player-Color-03"/>
-    <variant frequency="1" file="shields/celt_shield_04.xml" name="Player-Color-04"/>
-    <variant frequency="1" file="shields/celt_shield_05.xml" name="Player-Color-05"/>
-    <variant frequency="1" file="shields/celt_shield_06.xml" name="Player-Color-06"/>
-    <variant frequency="1" file="shields/celt_shield_07.xml" name="Player-Color-07"/>
-    <variant frequency="1" file="shields/celt_shield_08.xml" name="Player-Color-08"/>
-    <variant frequency="1" file="shields/celt_shield_09.xml" name="Player-Color-09"/>
-    <variant frequency="1" file="shields/celt_shield_14.xml" name="Player-Color-14"/>
-    <variant frequency="1" file="shields/gaul_shield_03.xml" name="Gaul-03"/>
-    <variant frequency="1" file="shields/gaul_shield_04.xml" name="Gaul-04"/>
-    <variant frequency="1" file="shields/gaul_shield_05.xml" name="Gaul-05"/>
+    <variant frequency="1" file="shields/celt_shield_01.xml" name="Jav-Oval-D-02-Player-Color-01"/>
+    <variant frequency="1" file="shields/celt_shield_02.xml" name="Jav-Oval-D-02-Player-Color-02"/>
+    <variant frequency="1" file="shields/celt_shield_03.xml" name="Jav-Oval-D-02-Player-Color-03"/>
+    <variant frequency="1" file="shields/celt_shield_04.xml" name="Jav-Oval-D-02-Player-Color-04"/>
+    <variant frequency="1" file="shields/celt_shield_05.xml" name="Jav-Oval-D-02-Player-Color-05"/>
+    <variant frequency="1" file="shields/celt_shield_06.xml" name="Jav-Oval-D-02-Player-Color-06"/>
+    <variant frequency="1" file="shields/celt_shield_07.xml" name="Jav-Oval-D-02-Player-Color-07"/>
+    <variant frequency="1" file="shields/celt_shield_08.xml" name="Jav-Oval-D-02-Player-Color-08"/>
+    <variant frequency="1" file="shields/celt_shield_09.xml" name="Jav-Oval-D-02-Player-Color-09"/>
+    <variant frequency="1" file="shields/celt_shield_14.xml" name="Jav-Oval-D-02-Player-Color-14"/>
+    <variant frequency="1" file="shields/gaul_shield_03.xml" name="Jav-Oval-D-02-Gaul-03"/>
+    <variant frequency="1" file="shields/gaul_shield_04.xml" name="Jav-Oval-D-02-Gaul-04"/>
+    <variant frequency="1" file="shields/gaul_shield_05.xml" name="Jav-Oval-D-02-Gaul-05"/>
   </group>
   <group>
     <variant frequency="1" name="Spina-e">
diff --git a/binaries/data/mods/public/art/actors/props/units/shields/gaul_shield_jav_oval_d_03.xml b/binaries/data/mods/public/art/actors/props/units/shields/gaul_shield_jav_oval_d_03.xml
index 5041e7a5be..593201a6bf 100644
--- a/binaries/data/mods/public/art/actors/props/units/shields/gaul_shield_jav_oval_d_03.xml
+++ b/binaries/data/mods/public/art/actors/props/units/shields/gaul_shield_jav_oval_d_03.xml
@@ -11,19 +11,19 @@
     </variant>
   </group>
   <group>
-    <variant frequency="1" file="shields/celt_shield_01.xml" name="Player-Color-01"/>
-    <variant frequency="1" file="shields/celt_shield_02.xml" name="Player-Color-02"/>
-    <variant frequency="1" file="shields/celt_shield_03.xml" name="Player-Color-03"/>
-    <variant frequency="1" file="shields/celt_shield_04.xml" name="Player-Color-04"/>
-    <variant frequency="1" file="shields/celt_shield_05.xml" name="Player-Color-05"/>
-    <variant frequency="1" file="shields/celt_shield_06.xml" name="Player-Color-06"/>
-    <variant frequency="1" file="shields/celt_shield_07.xml" name="Player-Color-07"/>
-    <variant frequency="1" file="shields/celt_shield_08.xml" name="Player-Color-08"/>
-    <variant frequency="1" file="shields/celt_shield_09.xml" name="Player-Color-09"/>
-    <variant frequency="1" file="shields/celt_shield_14.xml" name="Player-Color-14"/>
-    <variant frequency="1" file="shields/gaul_shield_03.xml" name="Gaul-03"/>
-    <variant frequency="1" file="shields/gaul_shield_04.xml" name="Gaul-04"/>
-    <variant frequency="1" file="shields/gaul_shield_05.xml" name="Gaul-05"/>
+    <variant frequency="1" file="shields/celt_shield_01.xml" name="Jav-Oval-D-03-Player-Color-01"/>
+    <variant frequency="1" file="shields/celt_shield_02.xml" name="Jav-Oval-D-03-Player-Color-02"/>
+    <variant frequency="1" file="shields/celt_shield_03.xml" name="Jav-Oval-D-03-Player-Color-03"/>
+    <variant frequency="1" file="shields/celt_shield_04.xml" name="Jav-Oval-D-03-Player-Color-04"/>
+    <variant frequency="1" file="shields/celt_shield_05.xml" name="Jav-Oval-D-03-Player-Color-05"/>
+    <variant frequency="1" file="shields/celt_shield_06.xml" name="Jav-Oval-D-03-Player-Color-06"/>
+    <variant frequency="1" file="shields/celt_shield_07.xml" name="Jav-Oval-D-03-Player-Color-07"/>
+    <variant frequency="1" file="shields/celt_shield_08.xml" name="Jav-Oval-D-03-Player-Color-08"/>
+    <variant frequency="1" file="shields/celt_shield_09.xml" name="Jav-Oval-D-03-Player-Color-09"/>
+    <variant frequency="1" file="shields/celt_shield_14.xml" name="Jav-Oval-D-03-Player-Color-14"/>
+    <variant frequency="1" file="shields/gaul_shield_03.xml" name="Jav-Oval-D-03-Gaul-03"/>
+    <variant frequency="1" file="shields/gaul_shield_04.xml" name="Jav-Oval-D-03-Gaul-04"/>
+    <variant frequency="1" file="shields/gaul_shield_05.xml" name="Jav-Oval-D-03-Gaul-05"/>
   </group>
   <group>
     <variant frequency="1" name="Spina-e">
diff --git a/binaries/data/mods/public/art/actors/props/units/shields/gaul_shield_jav_oval_h_01.xml b/binaries/data/mods/public/art/actors/props/units/shields/gaul_shield_jav_oval_h_01.xml
index f984be4e4f..51b6c9bed4 100644
--- a/binaries/data/mods/public/art/actors/props/units/shields/gaul_shield_jav_oval_h_01.xml
+++ b/binaries/data/mods/public/art/actors/props/units/shields/gaul_shield_jav_oval_h_01.xml
@@ -11,27 +11,27 @@
     </variant>
   </group>
   <group>
-    <variant frequency="1" file="shields/celt_shield_01.xml" name="Player-Color-01"/>
-    <variant frequency="1" file="shields/celt_shield_02.xml" name="Player-Color-02"/>
-    <variant frequency="1" file="shields/celt_shield_03.xml" name="Player-Color-03"/>
-    <variant frequency="1" file="shields/celt_shield_04.xml" name="Player-Color-04"/>
-    <variant frequency="1" file="shields/celt_shield_05.xml" name="Player-Color-05"/>
-    <variant frequency="1" file="shields/celt_shield_06.xml" name="Player-Color-06"/>
-    <variant frequency="1" file="shields/celt_shield_07.xml" name="Player-Color-07"/>
-    <variant frequency="1" file="shields/celt_shield_08.xml" name="Player-Color-08"/>
-    <variant frequency="1" file="shields/celt_shield_09.xml" name="Player-Color-09"/>
-    <variant frequency="1" file="shields/celt_shield_10.xml" name="Player-Color-10"/>
-    <variant frequency="1" file="shields/celt_shield_11.xml" name="Player-Color-11"/>
-    <variant frequency="1" file="shields/celt_shield_12.xml" name="Player-Color-12"/>
-    <variant frequency="1" file="shields/celt_shield_13.xml" name="Player-Color-13"/>
-    <variant frequency="1" file="shields/celt_shield_14.xml" name="Player-Color-14"/>
-    <variant frequency="1" file="shields/celt_shield_15.xml" name="Player-Color-15"/>
-    <variant frequency="1" file="shields/gaul_shield_01.xml" name="Gaul-01"/>
-    <variant frequency="1" file="shields/gaul_shield_02.xml" name="Gaul-02"/>
-    <variant frequency="1" file="shields/gaul_shield_03.xml" name="Gaul-03"/>
-    <variant frequency="1" file="shields/gaul_shield_04.xml" name="Gaul-04"/>
-    <variant frequency="1" file="shields/gaul_shield_05.xml" name="Gaul-05"/>
-    <variant frequency="1" file="shields/gaul_shield_06.xml" name="Gaul-06"/>
+    <variant frequency="1" file="shields/celt_shield_01.xml" name="Jav-Oval-H-01-Player-Color-01"/>
+    <variant frequency="1" file="shields/celt_shield_02.xml" name="Jav-Oval-H-01-Player-Color-02"/>
+    <variant frequency="1" file="shields/celt_shield_03.xml" name="Jav-Oval-H-01-Player-Color-03"/>
+    <variant frequency="1" file="shields/celt_shield_04.xml" name="Jav-Oval-H-01-Player-Color-04"/>
+    <variant frequency="1" file="shields/celt_shield_05.xml" name="Jav-Oval-H-01-Player-Color-05"/>
+    <variant frequency="1" file="shields/celt_shield_06.xml" name="Jav-Oval-H-01-Player-Color-06"/>
+    <variant frequency="1" file="shields/celt_shield_07.xml" name="Jav-Oval-H-01-Player-Color-07"/>
+    <variant frequency="1" file="shields/celt_shield_08.xml" name="Jav-Oval-H-01-Player-Color-08"/>
+    <variant frequency="1" file="shields/celt_shield_09.xml" name="Jav-Oval-H-01-Player-Color-09"/>
+    <variant frequency="1" file="shields/celt_shield_10.xml" name="Jav-Oval-H-01-Player-Color-10"/>
+    <variant frequency="1" file="shields/celt_shield_11.xml" name="Jav-Oval-H-01-Player-Color-11"/>
+    <variant frequency="1" file="shields/celt_shield_12.xml" name="Jav-Oval-H-01-Player-Color-12"/>
+    <variant frequency="1" file="shields/celt_shield_13.xml" name="Jav-Oval-H-01-Player-Color-13"/>
+    <variant frequency="1" file="shields/celt_shield_14.xml" name="Jav-Oval-H-01-Player-Color-14"/>
+    <variant frequency="1" file="shields/celt_shield_15.xml" name="Jav-Oval-H-01-Player-Color-15"/>
+    <variant frequency="1" file="shields/gaul_shield_01.xml" name="Jav-Oval-H-01-Gaul-01"/>
+    <variant frequency="1" file="shields/gaul_shield_02.xml" name="Jav-Oval-H-01-Gaul-02"/>
+    <variant frequency="1" file="shields/gaul_shield_03.xml" name="Jav-Oval-H-01-Gaul-03"/>
+    <variant frequency="1" file="shields/gaul_shield_04.xml" name="Jav-Oval-H-01-Gaul-04"/>
+    <variant frequency="1" file="shields/gaul_shield_05.xml" name="Jav-Oval-H-01-Gaul-05"/>
+    <variant frequency="1" file="shields/gaul_shield_06.xml" name="Jav-Oval-H-01-Gaul-06"/>
   </group>
   <group>
     <variant frequency="1" name="Spina-d">
diff --git a/binaries/data/mods/public/art/actors/props/units/shields/gaul_shield_jav_oval_h_02.xml b/binaries/data/mods/public/art/actors/props/units/shields/gaul_shield_jav_oval_h_02.xml
index 19df3870f6..afd29088be 100644
--- a/binaries/data/mods/public/art/actors/props/units/shields/gaul_shield_jav_oval_h_02.xml
+++ b/binaries/data/mods/public/art/actors/props/units/shields/gaul_shield_jav_oval_h_02.xml
@@ -11,27 +11,27 @@
     </variant>
   </group>
   <group>
-    <variant frequency="1" file="shields/celt_shield_01.xml" name="Player-Color-01"/>
-    <variant frequency="1" file="shields/celt_shield_02.xml" name="Player-Color-02"/>
-    <variant frequency="1" file="shields/celt_shield_03.xml" name="Player-Color-03"/>
-    <variant frequency="1" file="shields/celt_shield_04.xml" name="Player-Color-04"/>
-    <variant frequency="1" file="shields/celt_shield_05.xml" name="Player-Color-05"/>
-    <variant frequency="1" file="shields/celt_shield_06.xml" name="Player-Color-06"/>
-    <variant frequency="1" file="shields/celt_shield_07.xml" name="Player-Color-07"/>
-    <variant frequency="1" file="shields/celt_shield_08.xml" name="Player-Color-08"/>
-    <variant frequency="1" file="shields/celt_shield_09.xml" name="Player-Color-09"/>
-    <variant frequency="1" file="shields/celt_shield_10.xml" name="Player-Color-10"/>
-    <variant frequency="1" file="shields/celt_shield_11.xml" name="Player-Color-11"/>
-    <variant frequency="1" file="shields/celt_shield_12.xml" name="Player-Color-12"/>
-    <variant frequency="1" file="shields/celt_shield_13.xml" name="Player-Color-13"/>
-    <variant frequency="1" file="shields/celt_shield_14.xml" name="Player-Color-14"/>
-    <variant frequency="1" file="shields/celt_shield_15.xml" name="Player-Color-15"/>
-    <variant frequency="1" file="shields/gaul_shield_01.xml" name="Gaul-01"/>
-    <variant frequency="1" file="shields/gaul_shield_02.xml" name="Gaul-02"/>
-    <variant frequency="1" file="shields/gaul_shield_03.xml" name="Gaul-03"/>
-    <variant frequency="1" file="shields/gaul_shield_04.xml" name="Gaul-04"/>
-    <variant frequency="1" file="shields/gaul_shield_05.xml" name="Gaul-05"/>
-    <variant frequency="1" file="shields/gaul_shield_06.xml" name="Gaul-06"/>
+    <variant frequency="1" file="shields/celt_shield_01.xml" name="Jav-Oval-H-02-Player-Color-01"/>
+    <variant frequency="1" file="shields/celt_shield_02.xml" name="Jav-Oval-H-02-Player-Color-02"/>
+    <variant frequency="1" file="shields/celt_shield_03.xml" name="Jav-Oval-H-02-Player-Color-03"/>
+    <variant frequency="1" file="shields/celt_shield_04.xml" name="Jav-Oval-H-02-Player-Color-04"/>
+    <variant frequency="1" file="shields/celt_shield_05.xml" name="Jav-Oval-H-02-Player-Color-05"/>
+    <variant frequency="1" file="shields/celt_shield_06.xml" name="Jav-Oval-H-02-Player-Color-06"/>
+    <variant frequency="1" file="shields/celt_shield_07.xml" name="Jav-Oval-H-02-Player-Color-07"/>
+    <variant frequency="1" file="shields/celt_shield_08.xml" name="Jav-Oval-H-02-Player-Color-08"/>
+    <variant frequency="1" file="shields/celt_shield_09.xml" name="Jav-Oval-H-02-Player-Color-09"/>
+    <variant frequency="1" file="shields/celt_shield_10.xml" name="Jav-Oval-H-02-Player-Color-10"/>
+    <variant frequency="1" file="shields/celt_shield_11.xml" name="Jav-Oval-H-02-Player-Color-11"/>
+    <variant frequency="1" file="shields/celt_shield_12.xml" name="Jav-Oval-H-02-Player-Color-12"/>
+    <variant frequency="1" file="shields/celt_shield_13.xml" name="Jav-Oval-H-02-Player-Color-13"/>
+    <variant frequency="1" file="shields/celt_shield_14.xml" name="Jav-Oval-H-02-Player-Color-14"/>
+    <variant frequency="1" file="shields/celt_shield_15.xml" name="Jav-Oval-H-02-Player-Color-15"/>
+    <variant frequency="1" file="shields/gaul_shield_01.xml" name="Jav-Oval-H-02-Gaul-01"/>
+    <variant frequency="1" file="shields/gaul_shield_02.xml" name="Jav-Oval-H-02-Gaul-02"/>
+    <variant frequency="1" file="shields/gaul_shield_03.xml" name="Jav-Oval-H-02-Gaul-03"/>
+    <variant frequency="1" file="shields/gaul_shield_04.xml" name="Jav-Oval-H-02-Gaul-04"/>
+    <variant frequency="1" file="shields/gaul_shield_05.xml" name="Jav-Oval-H-02-Gaul-05"/>
+    <variant frequency="1" file="shields/gaul_shield_06.xml" name="Jav-Oval-H-02-Gaul-06"/>
   </group>
   <group>
     <variant frequency="1" name="Spina-d">
diff --git a/binaries/data/mods/public/art/actors/props/units/shields/gaul_shield_jav_oval_h_03.xml b/binaries/data/mods/public/art/actors/props/units/shields/gaul_shield_jav_oval_h_03.xml
index 509f984fc4..bfe714fbcd 100644
--- a/binaries/data/mods/public/art/actors/props/units/shields/gaul_shield_jav_oval_h_03.xml
+++ b/binaries/data/mods/public/art/actors/props/units/shields/gaul_shield_jav_oval_h_03.xml
@@ -11,27 +11,27 @@
     </variant>
   </group>
   <group>
-    <variant frequency="1" file="shields/celt_shield_01.xml" name="Player-Color-01"/>
-    <variant frequency="1" file="shields/celt_shield_02.xml" name="Player-Color-02"/>
-    <variant frequency="1" file="shields/celt_shield_03.xml" name="Player-Color-03"/>
-    <variant frequency="1" file="shields/celt_shield_04.xml" name="Player-Color-04"/>
-    <variant frequency="1" file="shields/celt_shield_05.xml" name="Player-Color-05"/>
-    <variant frequency="1" file="shields/celt_shield_06.xml" name="Player-Color-06"/>
-    <variant frequency="1" file="shields/celt_shield_07.xml" name="Player-Color-07"/>
-    <variant frequency="1" file="shields/celt_shield_08.xml" name="Player-Color-08"/>
-    <variant frequency="1" file="shields/celt_shield_09.xml" name="Player-Color-09"/>
-    <variant frequency="1" file="shields/celt_shield_10.xml" name="Player-Color-10"/>
-    <variant frequency="1" file="shields/celt_shield_11.xml" name="Player-Color-11"/>
-    <variant frequency="1" file="shields/celt_shield_12.xml" name="Player-Color-12"/>
-    <variant frequency="1" file="shields/celt_shield_13.xml" name="Player-Color-13"/>
-    <variant frequency="1" file="shields/celt_shield_14.xml" name="Player-Color-14"/>
-    <variant frequency="1" file="shields/celt_shield_15.xml" name="Player-Color-15"/>
-    <variant frequency="1" file="shields/gaul_shield_01.xml" name="Gaul-01"/>
-    <variant frequency="1" file="shields/gaul_shield_02.xml" name="Gaul-02"/>
-    <variant frequency="1" file="shields/gaul_shield_03.xml" name="Gaul-03"/>
-    <variant frequency="1" file="shields/gaul_shield_04.xml" name="Gaul-04"/>
-    <variant frequency="1" file="shields/gaul_shield_05.xml" name="Gaul-05"/>
-    <variant frequency="1" file="shields/gaul_shield_06.xml" name="Gaul-06"/>
+    <variant frequency="1" file="shields/celt_shield_01.xml" name="Jav-Oval-H-03-Player-Color-01"/>
+    <variant frequency="1" file="shields/celt_shield_02.xml" name="Jav-Oval-H-03-Player-Color-02"/>
+    <variant frequency="1" file="shields/celt_shield_03.xml" name="Jav-Oval-H-03-Player-Color-03"/>
+    <variant frequency="1" file="shields/celt_shield_04.xml" name="Jav-Oval-H-03-Player-Color-04"/>
+    <variant frequency="1" file="shields/celt_shield_05.xml" name="Jav-Oval-H-03-Player-Color-05"/>
+    <variant frequency="1" file="shields/celt_shield_06.xml" name="Jav-Oval-H-03-Player-Color-06"/>
+    <variant frequency="1" file="shields/celt_shield_07.xml" name="Jav-Oval-H-03-Player-Color-07"/>
+    <variant frequency="1" file="shields/celt_shield_08.xml" name="Jav-Oval-H-03-Player-Color-08"/>
+    <variant frequency="1" file="shields/celt_shield_09.xml" name="Jav-Oval-H-03-Player-Color-09"/>
+    <variant frequency="1" file="shields/celt_shield_10.xml" name="Jav-Oval-H-03-Player-Color-10"/>
+    <variant frequency="1" file="shields/celt_shield_11.xml" name="Jav-Oval-H-03-Player-Color-11"/>
+    <variant frequency="1" file="shields/celt_shield_12.xml" name="Jav-Oval-H-03-Player-Color-12"/>
+    <variant frequency="1" file="shields/celt_shield_13.xml" name="Jav-Oval-H-03-Player-Color-13"/>
+    <variant frequency="1" file="shields/celt_shield_14.xml" name="Jav-Oval-H-03-Player-Color-14"/>
+    <variant frequency="1" file="shields/celt_shield_15.xml" name="Jav-Oval-H-03-Player-Color-15"/>
+    <variant frequency="1" file="shields/gaul_shield_01.xml" name="Jav-Oval-H-03-Gaul-01"/>
+    <variant frequency="1" file="shields/gaul_shield_02.xml" name="Jav-Oval-H-03-Gaul-02"/>
+    <variant frequency="1" file="shields/gaul_shield_03.xml" name="Jav-Oval-H-03-Gaul-03"/>
+    <variant frequency="1" file="shields/gaul_shield_04.xml" name="Jav-Oval-H-03-Gaul-04"/>
+    <variant frequency="1" file="shields/gaul_shield_05.xml" name="Jav-Oval-H-03-Gaul-05"/>
+    <variant frequency="1" file="shields/gaul_shield_06.xml" name="Jav-Oval-H-03-Gaul-06"/>
   </group>
   <group>
     <variant frequency="1" name="Spina-d">
diff --git a/binaries/data/mods/public/art/actors/props/units/shields/gaul_shield_jav_sq_b_01.xml b/binaries/data/mods/public/art/actors/props/units/shields/gaul_shield_jav_sq_b_01.xml
index f11c0cb62f..caa0ce3270 100644
--- a/binaries/data/mods/public/art/actors/props/units/shields/gaul_shield_jav_sq_b_01.xml
+++ b/binaries/data/mods/public/art/actors/props/units/shields/gaul_shield_jav_sq_b_01.xml
@@ -11,26 +11,26 @@
     </variant>
   </group>
   <group>
-    <variant frequency="1" file="shields/celt_shield_01.xml" name="Player-Color-01"/>
-    <variant frequency="1" file="shields/celt_shield_02.xml" name="Player-Color-02"/>
-    <variant frequency="1" file="shields/celt_shield_03.xml" name="Player-Color-03"/>
-    <variant frequency="1" file="shields/celt_shield_04.xml" name="Player-Color-04"/>
-    <variant frequency="1" file="shields/celt_shield_05.xml" name="Player-Color-05"/>
-    <variant frequency="1" file="shields/celt_shield_06.xml" name="Player-Color-06"/>
-    <variant frequency="1" file="shields/celt_shield_07.xml" name="Player-Color-07"/>
-    <variant frequency="1" file="shields/celt_shield_08.xml" name="Player-Color-08"/>
-    <variant frequency="1" file="shields/celt_shield_09.xml" name="Player-Color-09"/>
-    <variant frequency="1" file="shields/celt_shield_10.xml" name="Player-Color-10"/>
-    <variant frequency="1" file="shields/celt_shield_11.xml" name="Player-Color-11"/>
-    <variant frequency="1" file="shields/celt_shield_12.xml" name="Player-Color-12"/>
-    <variant frequency="1" file="shields/celt_shield_13.xml" name="Player-Color-13"/>
-    <variant frequency="1" file="shields/celt_shield_14.xml" name="Player-Color-14"/>
-    <variant frequency="1" file="shields/celt_shield_15.xml" name="Player-Color-15"/>
-    <variant frequency="1" file="shields/gaul_shield_01.xml" name="Gaul-01"/>
-    <variant frequency="1" file="shields/gaul_shield_02.xml" name="Gaul-02"/>
-    <variant frequency="1" file="shields/gaul_shield_03.xml" name="Gaul-03"/>
-    <variant frequency="1" file="shields/gaul_shield_04.xml" name="Gaul-04"/>
-    <variant frequency="1" file="shields/gaul_shield_05.xml" name="Gaul-05"/>
+    <variant frequency="1" file="shields/celt_shield_01.xml" name="jav-sq-b-01-Player-Color-01"/>
+    <variant frequency="1" file="shields/celt_shield_02.xml" name="jav-sq-b-01-Player-Color-02"/>
+    <variant frequency="1" file="shields/celt_shield_03.xml" name="jav-sq-b-01-Player-Color-03"/>
+    <variant frequency="1" file="shields/celt_shield_04.xml" name="jav-sq-b-01-Player-Color-04"/>
+    <variant frequency="1" file="shields/celt_shield_05.xml" name="jav-sq-b-01-Player-Color-05"/>
+    <variant frequency="1" file="shields/celt_shield_06.xml" name="jav-sq-b-01-Player-Color-06"/>
+    <variant frequency="1" file="shields/celt_shield_07.xml" name="jav-sq-b-01-Player-Color-07"/>
+    <variant frequency="1" file="shields/celt_shield_08.xml" name="jav-sq-b-01-Player-Color-08"/>
+    <variant frequency="1" file="shields/celt_shield_09.xml" name="jav-sq-b-01-Player-Color-09"/>
+    <variant frequency="1" file="shields/celt_shield_10.xml" name="jav-sq-b-01-Player-Color-10"/>
+    <variant frequency="1" file="shields/celt_shield_11.xml" name="jav-sq-b-01-Player-Color-11"/>
+    <variant frequency="1" file="shields/celt_shield_12.xml" name="jav-sq-b-01-Player-Color-12"/>
+    <variant frequency="1" file="shields/celt_shield_13.xml" name="jav-sq-b-01-Player-Color-13"/>
+    <variant frequency="1" file="shields/celt_shield_14.xml" name="jav-sq-b-01-Player-Color-14"/>
+    <variant frequency="1" file="shields/celt_shield_15.xml" name="jav-sq-b-01-Player-Color-15"/>
+    <variant frequency="1" file="shields/gaul_shield_01.xml" name="jav-sq-b-01-Gaul-01"/>
+    <variant frequency="1" file="shields/gaul_shield_02.xml" name="jav-sq-b-01-Gaul-02"/>
+    <variant frequency="1" file="shields/gaul_shield_03.xml" name="jav-sq-b-01-Gaul-03"/>
+    <variant frequency="1" file="shields/gaul_shield_04.xml" name="jav-sq-b-01-Gaul-04"/>
+    <variant frequency="1" file="shields/gaul_shield_05.xml" name="jav-sq-b-01-Gaul-05"/>
   </group>
   <group>
     <variant frequency="1" name="Spina-e">
diff --git a/binaries/data/mods/public/art/actors/props/units/shields/gaul_shield_jav_sq_b_02.xml b/binaries/data/mods/public/art/actors/props/units/shields/gaul_shield_jav_sq_b_02.xml
index 1bf2250ca2..f41ae999ea 100644
--- a/binaries/data/mods/public/art/actors/props/units/shields/gaul_shield_jav_sq_b_02.xml
+++ b/binaries/data/mods/public/art/actors/props/units/shields/gaul_shield_jav_sq_b_02.xml
@@ -11,26 +11,26 @@
     </variant>
   </group>
   <group>
-    <variant frequency="1" file="shields/celt_shield_01.xml" name="Player-Color-01"/>
-    <variant frequency="1" file="shields/celt_shield_02.xml" name="Player-Color-02"/>
-    <variant frequency="1" file="shields/celt_shield_03.xml" name="Player-Color-03"/>
-    <variant frequency="1" file="shields/celt_shield_04.xml" name="Player-Color-04"/>
-    <variant frequency="1" file="shields/celt_shield_05.xml" name="Player-Color-05"/>
-    <variant frequency="1" file="shields/celt_shield_06.xml" name="Player-Color-06"/>
-    <variant frequency="1" file="shields/celt_shield_07.xml" name="Player-Color-07"/>
-    <variant frequency="1" file="shields/celt_shield_08.xml" name="Player-Color-08"/>
-    <variant frequency="1" file="shields/celt_shield_09.xml" name="Player-Color-09"/>
-    <variant frequency="1" file="shields/celt_shield_10.xml" name="Player-Color-10"/>
-    <variant frequency="1" file="shields/celt_shield_11.xml" name="Player-Color-11"/>
-    <variant frequency="1" file="shields/celt_shield_12.xml" name="Player-Color-12"/>
-    <variant frequency="1" file="shields/celt_shield_13.xml" name="Player-Color-13"/>
-    <variant frequency="1" file="shields/celt_shield_14.xml" name="Player-Color-14"/>
-    <variant frequency="1" file="shields/celt_shield_15.xml" name="Player-Color-15"/>
-    <variant frequency="1" file="shields/gaul_shield_01.xml" name="Gaul-01"/>
-    <variant frequency="1" file="shields/gaul_shield_02.xml" name="Gaul-02"/>
-    <variant frequency="1" file="shields/gaul_shield_03.xml" name="Gaul-03"/>
-    <variant frequency="1" file="shields/gaul_shield_04.xml" name="Gaul-04"/>
-    <variant frequency="1" file="shields/gaul_shield_05.xml" name="Gaul-05"/>
+    <variant frequency="1" file="shields/celt_shield_01.xml" name="jav-sq-b-02-Player-Color-01"/>
+    <variant frequency="1" file="shields/celt_shield_02.xml" name="jav-sq-b-02-Player-Color-02"/>
+    <variant frequency="1" file="shields/celt_shield_03.xml" name="jav-sq-b-02-Player-Color-03"/>
+    <variant frequency="1" file="shields/celt_shield_04.xml" name="jav-sq-b-02-Player-Color-04"/>
+    <variant frequency="1" file="shields/celt_shield_05.xml" name="jav-sq-b-02-Player-Color-05"/>
+    <variant frequency="1" file="shields/celt_shield_06.xml" name="jav-sq-b-02-Player-Color-06"/>
+    <variant frequency="1" file="shields/celt_shield_07.xml" name="jav-sq-b-02-Player-Color-07"/>
+    <variant frequency="1" file="shields/celt_shield_08.xml" name="jav-sq-b-02-Player-Color-08"/>
+    <variant frequency="1" file="shields/celt_shield_09.xml" name="jav-sq-b-02-Player-Color-09"/>
+    <variant frequency="1" file="shields/celt_shield_10.xml" name="jav-sq-b-02-Player-Color-10"/>
+    <variant frequency="1" file="shields/celt_shield_11.xml" name="jav-sq-b-02-Player-Color-11"/>
+    <variant frequency="1" file="shields/celt_shield_12.xml" name="jav-sq-b-02-Player-Color-12"/>
+    <variant frequency="1" file="shields/celt_shield_13.xml" name="jav-sq-b-02-Player-Color-13"/>
+    <variant frequency="1" file="shields/celt_shield_14.xml" name="jav-sq-b-02-Player-Color-14"/>
+    <variant frequency="1" file="shields/celt_shield_15.xml" name="jav-sq-b-02-Player-Color-15"/>
+    <variant frequency="1" file="shields/gaul_shield_01.xml" name="jav-sq-b-02-Gaul-01"/>
+    <variant frequency="1" file="shields/gaul_shield_02.xml" name="jav-sq-b-02-Gaul-02"/>
+    <variant frequency="1" file="shields/gaul_shield_03.xml" name="jav-sq-b-02-Gaul-03"/>
+    <variant frequency="1" file="shields/gaul_shield_04.xml" name="jav-sq-b-02-Gaul-04"/>
+    <variant frequency="1" file="shields/gaul_shield_05.xml" name="jav-sq-b-02-Gaul-05"/>
   </group>
   <group>
     <variant frequency="1" name="Spina-e">
diff --git a/binaries/data/mods/public/art/actors/props/units/shields/gaul_shield_jav_sq_b_03.xml b/binaries/data/mods/public/art/actors/props/units/shields/gaul_shield_jav_sq_b_03.xml
index 1864676258..f6cb3ea504 100644
--- a/binaries/data/mods/public/art/actors/props/units/shields/gaul_shield_jav_sq_b_03.xml
+++ b/binaries/data/mods/public/art/actors/props/units/shields/gaul_shield_jav_sq_b_03.xml
@@ -11,26 +11,25 @@
     </variant>
   </group>
   <group>
-    <variant frequency="1" file="shields/celt_shield_01.xml" name="Player-Color-01"/>
-    <variant frequency="1" file="shields/celt_shield_02.xml" name="Player-Color-02"/>
-    <variant frequency="1" file="shields/celt_shield_03.xml" name="Player-Color-03"/>
-    <variant frequency="1" file="shields/celt_shield_04.xml" name="Player-Color-04"/>
-    <variant frequency="1" file="shields/celt_shield_05.xml" name="Player-Color-05"/>
-    <variant frequency="1" file="shields/celt_shield_06.xml" name="Player-Color-06"/>
-    <variant frequency="1" file="shields/celt_shield_07.xml" name="Player-Color-07"/>
-    <variant frequency="1" file="shields/celt_shield_08.xml" name="Player-Color-08"/>
-    <variant frequency="1" file="shields/celt_shield_09.xml" name="Player-Color-09"/>
-    <variant frequency="1" file="shields/celt_shield_10.xml" name="Player-Color-10"/>
-    <variant frequency="1" file="shields/celt_shield_11.xml" name="Player-Color-11"/>
-    <variant frequency="1" file="shields/celt_shield_12.xml" name="Player-Color-12"/>
-    <variant frequency="1" file="shields/celt_shield_13.xml" name="Player-Color-13"/>
-    <variant frequency="1" file="shields/celt_shield_14.xml" name="Player-Color-14"/>
-    <variant frequency="1" file="shields/celt_shield_15.xml" name="Player-Color-15"/>
-    <variant frequency="1" file="shields/gaul_shield_01.xml" name="Gaul-01"/>
-    <variant frequency="1" file="shields/gaul_shield_02.xml" name="Gaul-02"/>
-    <variant frequency="1" file="shields/gaul_shield_03.xml" name="Gaul-03"/>
-    <variant frequency="1" file="shields/gaul_shield_04.xml" name="Gaul-04"/>
-    <variant frequency="1" file="shields/gaul_shield_05.xml" name="Gaul-05"/>
+    <variant frequency="1" file="shields/celt_shield_02.xml" name="jav-sq-b-03-Player-Color-02"/>
+    <variant frequency="1" file="shields/celt_shield_03.xml" name="jav-sq-b-03-Player-Color-03"/>
+    <variant frequency="1" file="shields/celt_shield_04.xml" name="jav-sq-b-03-Player-Color-04"/>
+    <variant frequency="1" file="shields/celt_shield_05.xml" name="jav-sq-b-03-Player-Color-05"/>
+    <variant frequency="1" file="shields/celt_shield_06.xml" name="jav-sq-b-03-Player-Color-06"/>
+    <variant frequency="1" file="shields/celt_shield_07.xml" name="jav-sq-b-03-Player-Color-07"/>
+    <variant frequency="1" file="shields/celt_shield_08.xml" name="jav-sq-b-03-Player-Color-08"/>
+    <variant frequency="1" file="shields/celt_shield_09.xml" name="jav-sq-b-03-Player-Color-09"/>
+    <variant frequency="1" file="shields/celt_shield_10.xml" name="jav-sq-b-03-Player-Color-10"/>
+    <variant frequency="1" file="shields/celt_shield_11.xml" name="jav-sq-b-03-Player-Color-11"/>
+    <variant frequency="1" file="shields/celt_shield_12.xml" name="jav-sq-b-03-Player-Color-12"/>
+    <variant frequency="1" file="shields/celt_shield_13.xml" name="jav-sq-b-03-Player-Color-13"/>
+    <variant frequency="1" file="shields/celt_shield_14.xml" name="jav-sq-b-03-Player-Color-14"/>
+    <variant frequency="1" file="shields/celt_shield_15.xml" name="jav-sq-b-03-Player-Color-15"/>
+    <variant frequency="1" file="shields/gaul_shield_01.xml" name="jav-sq-b-03-Gaul-01"/>
+    <variant frequency="1" file="shields/gaul_shield_02.xml" name="jav-sq-b-03-Gaul-02"/>
+    <variant frequency="1" file="shields/gaul_shield_03.xml" name="jav-sq-b-03-Gaul-03"/>
+    <variant frequency="1" file="shields/gaul_shield_04.xml" name="jav-sq-b-03-Gaul-04"/>
+    <variant frequency="1" file="shields/gaul_shield_05.xml" name="jav-sq-b-03-Gaul-05"/>
   </group>
   <group>
     <variant frequency="1" name="Spina-e">
diff --git a/binaries/data/mods/public/art/actors/props/units/shields/gaul_shield_oval_b_03.xml b/binaries/data/mods/public/art/actors/props/units/shields/gaul_shield_oval_b_03.xml
index a67a7f59f0..29d8cba6bc 100644
--- a/binaries/data/mods/public/art/actors/props/units/shields/gaul_shield_oval_b_03.xml
+++ b/binaries/data/mods/public/art/actors/props/units/shields/gaul_shield_oval_b_03.xml
@@ -11,27 +11,27 @@
     </variant>
   </group>
   <group>
-    <variant frequency="1" file="shields/celt_shield_01.xml" name="Player-Color-01"/>
-    <variant frequency="1" file="shields/celt_shield_02.xml" name="Player-Color-02"/>
-    <variant frequency="1" file="shields/celt_shield_03.xml" name="Player-Color-03"/>
-    <variant frequency="1" file="shields/celt_shield_04.xml" name="Player-Color-04"/>
-    <variant frequency="1" file="shields/celt_shield_05.xml" name="Player-Color-05"/>
-    <variant frequency="1" file="shields/celt_shield_06.xml" name="Player-Color-06"/>
-    <variant frequency="1" file="shields/celt_shield_07.xml" name="Player-Color-07"/>
-    <variant frequency="1" file="shields/celt_shield_08.xml" name="Player-Color-08"/>
-    <variant frequency="1" file="shields/celt_shield_09.xml" name="Player-Color-09"/>
-    <variant frequency="1" file="shields/celt_shield_10.xml" name="Player-Color-10"/>
-    <variant frequency="1" file="shields/celt_shield_11.xml" name="Player-Color-11"/>
-    <variant frequency="1" file="shields/celt_shield_12.xml" name="Player-Color-12"/>
-    <variant frequency="1" file="shields/celt_shield_13.xml" name="Player-Color-13"/>
-    <variant frequency="1" file="shields/celt_shield_14.xml" name="Player-Color-14"/>
-    <variant frequency="1" file="shields/celt_shield_15.xml" name="Player-Color-15"/>
-    <variant frequency="1" file="shields/gaul_shield_01.xml" name="Gaul-01"/>
-    <variant frequency="1" file="shields/gaul_shield_02.xml" name="Gaul-02"/>
-    <variant frequency="1" file="shields/gaul_shield_03.xml" name="Gaul-03"/>
-    <variant frequency="1" file="shields/gaul_shield_04.xml" name="Gaul-04"/>
-    <variant frequency="1" file="shields/gaul_shield_05.xml" name="Gaul-05"/>
-    <variant frequency="1" file="shields/gaul_shield_06.xml" name="Gaul-06"/>
+    <variant frequency="1" file="shields/celt_shield_01.xml" name="OVAL-B-03-Player-Color-01"/>
+    <variant frequency="1" file="shields/celt_shield_02.xml" name="OVAL-B-03-Player-Color-02"/>
+    <variant frequency="1" file="shields/celt_shield_03.xml" name="OVAL-B-03-Player-Color-03"/>
+    <variant frequency="1" file="shields/celt_shield_04.xml" name="OVAL-B-03-Player-Color-04"/>
+    <variant frequency="1" file="shields/celt_shield_05.xml" name="OVAL-B-03-Player-Color-05"/>
+    <variant frequency="1" file="shields/celt_shield_06.xml" name="OVAL-B-03-Player-Color-06"/>
+    <variant frequency="1" file="shields/celt_shield_07.xml" name="OVAL-B-03-Player-Color-07"/>
+    <variant frequency="1" file="shields/celt_shield_08.xml" name="OVAL-B-03-Player-Color-08"/>
+    <variant frequency="1" file="shields/celt_shield_09.xml" name="OVAL-B-03-Player-Color-09"/>
+    <variant frequency="1" file="shields/celt_shield_10.xml" name="OVAL-B-03-Player-Color-10"/>
+    <variant frequency="1" file="shields/celt_shield_11.xml" name="OVAL-B-03-Player-Color-11"/>
+    <variant frequency="1" file="shields/celt_shield_12.xml" name="OVAL-B-03-Player-Color-12"/>
+    <variant frequency="1" file="shields/celt_shield_13.xml" name="OVAL-B-03-Player-Color-13"/>
+    <variant frequency="1" file="shields/celt_shield_14.xml" name="OVAL-B-03-Player-Color-14"/>
+    <variant frequency="1" file="shields/celt_shield_15.xml" name="OVAL-B-03-Player-Color-15"/>
+    <variant frequency="1" file="shields/gaul_shield_01.xml" name="OVAL-B-03-Gaul-01"/>
+    <variant frequency="1" file="shields/gaul_shield_02.xml" name="OVAL-B-03-Gaul-02"/>
+    <variant frequency="1" file="shields/gaul_shield_03.xml" name="OVAL-B-03-Gaul-03"/>
+    <variant frequency="1" file="shields/gaul_shield_04.xml" name="OVAL-B-03-Gaul-04"/>
+    <variant frequency="1" file="shields/gaul_shield_05.xml" name="OVAL-B-03-Gaul-05"/>
+    <variant frequency="1" file="shields/gaul_shield_06.xml" name="OVAL-B-03-Gaul-06"/>
   </group>
   <group>
     <variant frequency="1" name="Spina-a">
diff --git a/binaries/data/mods/public/art/actors/props/units/shields/gaul_shield_spear_hex_a_01.xml b/binaries/data/mods/public/art/actors/props/units/shields/gaul_shield_spear_hex_a_01.xml
index 6ea19ac73b..6159a38d28 100644
--- a/binaries/data/mods/public/art/actors/props/units/shields/gaul_shield_spear_hex_a_01.xml
+++ b/binaries/data/mods/public/art/actors/props/units/shields/gaul_shield_spear_hex_a_01.xml
@@ -11,26 +11,26 @@
     </variant>
   </group>
   <group>
-    <variant frequency="1" file="shields/celt_shield_01.xml" name="Player-Color-01"/>
-    <variant frequency="1" file="shields/celt_shield_02.xml" name="Player-Color-02"/>
-    <variant frequency="1" file="shields/celt_shield_03.xml" name="Player-Color-03"/>
-    <variant frequency="1" file="shields/celt_shield_04.xml" name="Player-Color-04"/>
-    <variant frequency="1" file="shields/celt_shield_05.xml" name="Player-Color-05"/>
-    <variant frequency="1" file="shields/celt_shield_06.xml" name="Player-Color-06"/>
-    <variant frequency="1" file="shields/celt_shield_07.xml" name="Player-Color-07"/>
-    <variant frequency="1" file="shields/celt_shield_08.xml" name="Player-Color-08"/>
-    <variant frequency="1" file="shields/celt_shield_09.xml" name="Player-Color-09"/>
-    <variant frequency="1" file="shields/celt_shield_10.xml" name="Player-Color-10"/>
-    <variant frequency="1" file="shields/celt_shield_11.xml" name="Player-Color-11"/>
-    <variant frequency="1" file="shields/celt_shield_12.xml" name="Player-Color-12"/>
-    <variant frequency="1" file="shields/celt_shield_13.xml" name="Player-Color-13"/>
-    <variant frequency="1" file="shields/celt_shield_14.xml" name="Player-Color-14"/>
-    <variant frequency="1" file="shields/celt_shield_15.xml" name="Player-Color-15"/>
-    <variant frequency="1" file="shields/gaul_shield_01.xml" name="Gaul-01"/>
-    <variant frequency="1" file="shields/gaul_shield_02.xml" name="Gaul-02"/>
-    <variant frequency="1" file="shields/gaul_shield_03.xml" name="Gaul-03"/>
-    <variant frequency="1" file="shields/gaul_shield_04.xml" name="Gaul-04"/>
-    <variant frequency="1" file="shields/gaul_shield_05.xml" name="Gaul-05"/>
+    <variant frequency="1" file="shields/celt_shield_01.xml" name="Hex-A-01-Player-Color-01"/>
+    <variant frequency="1" file="shields/celt_shield_02.xml" name="Hex-A-01-Player-Color-02"/>
+    <variant frequency="1" file="shields/celt_shield_03.xml" name="Hex-A-01-Player-Color-03"/>
+    <variant frequency="1" file="shields/celt_shield_04.xml" name="Hex-A-01-Player-Color-04"/>
+    <variant frequency="1" file="shields/celt_shield_05.xml" name="Hex-A-01-Player-Color-05"/>
+    <variant frequency="1" file="shields/celt_shield_06.xml" name="Hex-A-01-Player-Color-06"/>
+    <variant frequency="1" file="shields/celt_shield_07.xml" name="Hex-A-01-Player-Color-07"/>
+    <variant frequency="1" file="shields/celt_shield_08.xml" name="Hex-A-01-Player-Color-08"/>
+    <variant frequency="1" file="shields/celt_shield_09.xml" name="Hex-A-01-Player-Color-09"/>
+    <variant frequency="1" file="shields/celt_shield_10.xml" name="Hex-A-01-Player-Color-10"/>
+    <variant frequency="1" file="shields/celt_shield_11.xml" name="Hex-A-01-Player-Color-11"/>
+    <variant frequency="1" file="shields/celt_shield_12.xml" name="Hex-A-01-Player-Color-12"/>
+    <variant frequency="1" file="shields/celt_shield_13.xml" name="Hex-A-01-Player-Color-13"/>
+    <variant frequency="1" file="shields/celt_shield_14.xml" name="Hex-A-01-Player-Color-14"/>
+    <variant frequency="1" file="shields/celt_shield_15.xml" name="Hex-A-01-Player-Color-15"/>
+    <variant frequency="1" file="shields/gaul_shield_01.xml" name="Hex-A-01-Gaul-01"/>
+    <variant frequency="1" file="shields/gaul_shield_02.xml" name="Hex-A-01-Gaul-02"/>
+    <variant frequency="1" file="shields/gaul_shield_03.xml" name="Hex-A-01-Gaul-03"/>
+    <variant frequency="1" file="shields/gaul_shield_04.xml" name="Hex-A-01-Gaul-04"/>
+    <variant frequency="1" file="shields/gaul_shield_05.xml" name="Hex-A-01-Gaul-05"/>
   </group>
   <group>
     <variant frequency="1" name="Spina-a">
diff --git a/binaries/data/mods/public/art/actors/props/units/shields/gaul_shield_spear_hex_a_02.xml b/binaries/data/mods/public/art/actors/props/units/shields/gaul_shield_spear_hex_a_02.xml
index a7a4ec2327..28c4a30dda 100644
--- a/binaries/data/mods/public/art/actors/props/units/shields/gaul_shield_spear_hex_a_02.xml
+++ b/binaries/data/mods/public/art/actors/props/units/shields/gaul_shield_spear_hex_a_02.xml
@@ -11,26 +11,26 @@
     </variant>
   </group>
   <group>
-    <variant frequency="1" file="shields/celt_shield_01.xml" name="Player-Color-01"/>
-    <variant frequency="1" file="shields/celt_shield_02.xml" name="Player-Color-02"/>
-    <variant frequency="1" file="shields/celt_shield_03.xml" name="Player-Color-03"/>
-    <variant frequency="1" file="shields/celt_shield_04.xml" name="Player-Color-04"/>
-    <variant frequency="1" file="shields/celt_shield_05.xml" name="Player-Color-05"/>
-    <variant frequency="1" file="shields/celt_shield_06.xml" name="Player-Color-06"/>
-    <variant frequency="1" file="shields/celt_shield_07.xml" name="Player-Color-07"/>
-    <variant frequency="1" file="shields/celt_shield_08.xml" name="Player-Color-08"/>
-    <variant frequency="1" file="shields/celt_shield_09.xml" name="Player-Color-09"/>
-    <variant frequency="1" file="shields/celt_shield_10.xml" name="Player-Color-10"/>
-    <variant frequency="1" file="shields/celt_shield_11.xml" name="Player-Color-11"/>
-    <variant frequency="1" file="shields/celt_shield_12.xml" name="Player-Color-12"/>
-    <variant frequency="1" file="shields/celt_shield_13.xml" name="Player-Color-13"/>
-    <variant frequency="1" file="shields/celt_shield_14.xml" name="Player-Color-14"/>
-    <variant frequency="1" file="shields/celt_shield_15.xml" name="Player-Color-15"/>
-    <variant frequency="1" file="shields/gaul_shield_01.xml" name="Gaul-01"/>
-    <variant frequency="1" file="shields/gaul_shield_02.xml" name="Gaul-02"/>
-    <variant frequency="1" file="shields/gaul_shield_03.xml" name="Gaul-03"/>
-    <variant frequency="1" file="shields/gaul_shield_04.xml" name="Gaul-04"/>
-    <variant frequency="1" file="shields/gaul_shield_05.xml" name="Gaul-05"/>
+    <variant frequency="1" file="shields/celt_shield_01.xml" name="Hex-A-02-Player-Color-01"/>
+    <variant frequency="1" file="shields/celt_shield_02.xml" name="Hex-A-02-Player-Color-02"/>
+    <variant frequency="1" file="shields/celt_shield_03.xml" name="Hex-A-02-Player-Color-03"/>
+    <variant frequency="1" file="shields/celt_shield_04.xml" name="Hex-A-02-Player-Color-04"/>
+    <variant frequency="1" file="shields/celt_shield_05.xml" name="Hex-A-02-Player-Color-05"/>
+    <variant frequency="1" file="shields/celt_shield_06.xml" name="Hex-A-02-Player-Color-06"/>
+    <variant frequency="1" file="shields/celt_shield_07.xml" name="Hex-A-02-Player-Color-07"/>
+    <variant frequency="1" file="shields/celt_shield_08.xml" name="Hex-A-02-Player-Color-08"/>
+    <variant frequency="1" file="shields/celt_shield_09.xml" name="Hex-A-02-Player-Color-09"/>
+    <variant frequency="1" file="shields/celt_shield_10.xml" name="Hex-A-02-Player-Color-10"/>
+    <variant frequency="1" file="shields/celt_shield_11.xml" name="Hex-A-02-Player-Color-11"/>
+    <variant frequency="1" file="shields/celt_shield_12.xml" name="Hex-A-02-Player-Color-12"/>
+    <variant frequency="1" file="shields/celt_shield_13.xml" name="Hex-A-02-Player-Color-13"/>
+    <variant frequency="1" file="shields/celt_shield_14.xml" name="Hex-A-02-Player-Color-14"/>
+    <variant frequency="1" file="shields/celt_shield_15.xml" name="Hex-A-02-Player-Color-15"/>
+    <variant frequency="1" file="shields/gaul_shield_01.xml" name="Hex-A-02-Gaul-01"/>
+    <variant frequency="1" file="shields/gaul_shield_02.xml" name="Hex-A-02-Gaul-02"/>
+    <variant frequency="1" file="shields/gaul_shield_03.xml" name="Hex-A-02-Gaul-03"/>
+    <variant frequency="1" file="shields/gaul_shield_04.xml" name="Hex-A-02-Gaul-04"/>
+    <variant frequency="1" file="shields/gaul_shield_05.xml" name="Hex-A-02-Gaul-05"/>
   </group>
   <group>
     <variant frequency="1" name="Spina-b">
diff --git a/binaries/data/mods/public/art/actors/props/units/shields/gaul_shield_spear_hex_a_03.xml b/binaries/data/mods/public/art/actors/props/units/shields/gaul_shield_spear_hex_a_03.xml
index a7a4ec2327..0d06ba6f61 100644
--- a/binaries/data/mods/public/art/actors/props/units/shields/gaul_shield_spear_hex_a_03.xml
+++ b/binaries/data/mods/public/art/actors/props/units/shields/gaul_shield_spear_hex_a_03.xml
@@ -11,26 +11,26 @@
     </variant>
   </group>
   <group>
-    <variant frequency="1" file="shields/celt_shield_01.xml" name="Player-Color-01"/>
-    <variant frequency="1" file="shields/celt_shield_02.xml" name="Player-Color-02"/>
-    <variant frequency="1" file="shields/celt_shield_03.xml" name="Player-Color-03"/>
-    <variant frequency="1" file="shields/celt_shield_04.xml" name="Player-Color-04"/>
-    <variant frequency="1" file="shields/celt_shield_05.xml" name="Player-Color-05"/>
-    <variant frequency="1" file="shields/celt_shield_06.xml" name="Player-Color-06"/>
-    <variant frequency="1" file="shields/celt_shield_07.xml" name="Player-Color-07"/>
-    <variant frequency="1" file="shields/celt_shield_08.xml" name="Player-Color-08"/>
-    <variant frequency="1" file="shields/celt_shield_09.xml" name="Player-Color-09"/>
-    <variant frequency="1" file="shields/celt_shield_10.xml" name="Player-Color-10"/>
-    <variant frequency="1" file="shields/celt_shield_11.xml" name="Player-Color-11"/>
-    <variant frequency="1" file="shields/celt_shield_12.xml" name="Player-Color-12"/>
-    <variant frequency="1" file="shields/celt_shield_13.xml" name="Player-Color-13"/>
-    <variant frequency="1" file="shields/celt_shield_14.xml" name="Player-Color-14"/>
-    <variant frequency="1" file="shields/celt_shield_15.xml" name="Player-Color-15"/>
-    <variant frequency="1" file="shields/gaul_shield_01.xml" name="Gaul-01"/>
-    <variant frequency="1" file="shields/gaul_shield_02.xml" name="Gaul-02"/>
-    <variant frequency="1" file="shields/gaul_shield_03.xml" name="Gaul-03"/>
-    <variant frequency="1" file="shields/gaul_shield_04.xml" name="Gaul-04"/>
-    <variant frequency="1" file="shields/gaul_shield_05.xml" name="Gaul-05"/>
+    <variant frequency="1" file="shields/celt_shield_01.xml" name="Hex-A-03-Player-Color-01"/>
+    <variant frequency="1" file="shields/celt_shield_02.xml" name="Hex-A-03-Player-Color-02"/>
+    <variant frequency="1" file="shields/celt_shield_03.xml" name="Hex-A-03-Player-Color-03"/>
+    <variant frequency="1" file="shields/celt_shield_04.xml" name="Hex-A-03-Player-Color-04"/>
+    <variant frequency="1" file="shields/celt_shield_05.xml" name="Hex-A-03-Player-Color-05"/>
+    <variant frequency="1" file="shields/celt_shield_06.xml" name="Hex-A-03-Player-Color-06"/>
+    <variant frequency="1" file="shields/celt_shield_07.xml" name="Hex-A-03-Player-Color-07"/>
+    <variant frequency="1" file="shields/celt_shield_08.xml" name="Hex-A-03-Player-Color-08"/>
+    <variant frequency="1" file="shields/celt_shield_09.xml" name="Hex-A-03-Player-Color-09"/>
+    <variant frequency="1" file="shields/celt_shield_10.xml" name="Hex-A-03-Player-Color-10"/>
+    <variant frequency="1" file="shields/celt_shield_11.xml" name="Hex-A-03-Player-Color-11"/>
+    <variant frequency="1" file="shields/celt_shield_12.xml" name="Hex-A-03-Player-Color-12"/>
+    <variant frequency="1" file="shields/celt_shield_13.xml" name="Hex-A-03-Player-Color-13"/>
+    <variant frequency="1" file="shields/celt_shield_14.xml" name="Hex-A-03-Player-Color-14"/>
+    <variant frequency="1" file="shields/celt_shield_15.xml" name="Hex-A-03-Player-Color-15"/>
+    <variant frequency="1" file="shields/gaul_shield_01.xml" name="Hex-A-03-Gaul-01"/>
+    <variant frequency="1" file="shields/gaul_shield_02.xml" name="Hex-A-03-Gaul-02"/>
+    <variant frequency="1" file="shields/gaul_shield_03.xml" name="Hex-A-03-Gaul-03"/>
+    <variant frequency="1" file="shields/gaul_shield_04.xml" name="Hex-A-03-Gaul-04"/>
+    <variant frequency="1" file="shields/gaul_shield_05.xml" name="Hex-A-03-Gaul-05"/>
   </group>
   <group>
     <variant frequency="1" name="Spina-b">
diff --git a/binaries/data/mods/public/art/actors/props/units/shields/gaul_shield_spear_oval_b_01.xml b/binaries/data/mods/public/art/actors/props/units/shields/gaul_shield_spear_oval_b_01.xml
index bcbfd4c35e..8385f00086 100644
--- a/binaries/data/mods/public/art/actors/props/units/shields/gaul_shield_spear_oval_b_01.xml
+++ b/binaries/data/mods/public/art/actors/props/units/shields/gaul_shield_spear_oval_b_01.xml
@@ -11,27 +11,27 @@
     </variant>
   </group>
   <group>
-    <variant frequency="1" file="shields/celt_shield_01.xml" name="Player-Color-01"/>
-    <variant frequency="1" file="shields/celt_shield_02.xml" name="Player-Color-02"/>
-    <variant frequency="1" file="shields/celt_shield_03.xml" name="Player-Color-03"/>
-    <variant frequency="1" file="shields/celt_shield_04.xml" name="Player-Color-04"/>
-    <variant frequency="1" file="shields/celt_shield_05.xml" name="Player-Color-05"/>
-    <variant frequency="1" file="shields/celt_shield_06.xml" name="Player-Color-06"/>
-    <variant frequency="1" file="shields/celt_shield_07.xml" name="Player-Color-07"/>
-    <variant frequency="1" file="shields/celt_shield_08.xml" name="Player-Color-08"/>
-    <variant frequency="1" file="shields/celt_shield_09.xml" name="Player-Color-09"/>
-    <variant frequency="1" file="shields/celt_shield_10.xml" name="Player-Color-10"/>
-    <variant frequency="1" file="shields/celt_shield_11.xml" name="Player-Color-11"/>
-    <variant frequency="1" file="shields/celt_shield_12.xml" name="Player-Color-12"/>
-    <variant frequency="1" file="shields/celt_shield_13.xml" name="Player-Color-13"/>
-    <variant frequency="1" file="shields/celt_shield_14.xml" name="Player-Color-14"/>
-    <variant frequency="1" file="shields/celt_shield_15.xml" name="Player-Color-15"/>
-    <variant frequency="1" file="shields/gaul_shield_01.xml" name="Gaul-01"/>
-    <variant frequency="1" file="shields/gaul_shield_02.xml" name="Gaul-02"/>
-    <variant frequency="1" file="shields/gaul_shield_03.xml" name="Gaul-03"/>
-    <variant frequency="1" file="shields/gaul_shield_04.xml" name="Gaul-04"/>
-    <variant frequency="1" file="shields/gaul_shield_05.xml" name="Gaul-05"/>
-    <variant frequency="1" file="shields/gaul_shield_06.xml" name="Gaul-06"/>
+    <variant frequency="1" file="shields/celt_shield_01.xml" name="spear-OVAL-B-01-Player-Color-01"/>
+    <variant frequency="1" file="shields/celt_shield_02.xml" name="spear-OVAL-B-01-Player-Color-02"/>
+    <variant frequency="1" file="shields/celt_shield_03.xml" name="spear-OVAL-B-01-Player-Color-03"/>
+    <variant frequency="1" file="shields/celt_shield_04.xml" name="spear-OVAL-B-01-Player-Color-04"/>
+    <variant frequency="1" file="shields/celt_shield_05.xml" name="spear-OVAL-B-01-Player-Color-05"/>
+    <variant frequency="1" file="shields/celt_shield_06.xml" name="spear-OVAL-B-01-Player-Color-06"/>
+    <variant frequency="1" file="shields/celt_shield_07.xml" name="spear-OVAL-B-01-Player-Color-07"/>
+    <variant frequency="1" file="shields/celt_shield_08.xml" name="spear-OVAL-B-01-Player-Color-08"/>
+    <variant frequency="1" file="shields/celt_shield_09.xml" name="spear-OVAL-B-01-Player-Color-09"/>
+    <variant frequency="1" file="shields/celt_shield_10.xml" name="spear-OVAL-B-01-Player-Color-10"/>
+    <variant frequency="1" file="shields/celt_shield_11.xml" name="spear-OVAL-B-01-Player-Color-11"/>
+    <variant frequency="1" file="shields/celt_shield_12.xml" name="spear-OVAL-B-01-Player-Color-12"/>
+    <variant frequency="1" file="shields/celt_shield_13.xml" name="spear-OVAL-B-01-Player-Color-13"/>
+    <variant frequency="1" file="shields/celt_shield_14.xml" name="spear-OVAL-B-01-Player-Color-14"/>
+    <variant frequency="1" file="shields/celt_shield_15.xml" name="spear-OVAL-B-01-Player-Color-15"/>
+    <variant frequency="1" file="shields/gaul_shield_01.xml" name="spear-OVAL-B-01-Gaul-01"/>
+    <variant frequency="1" file="shields/gaul_shield_02.xml" name="spear-OVAL-B-01-Gaul-02"/>
+    <variant frequency="1" file="shields/gaul_shield_03.xml" name="spear-OVAL-B-01-Gaul-03"/>
+    <variant frequency="1" file="shields/gaul_shield_04.xml" name="spear-OVAL-B-01-Gaul-04"/>
+    <variant frequency="1" file="shields/gaul_shield_05.xml" name="spear-OVAL-B-01-Gaul-05"/>
+    <variant frequency="1" file="shields/gaul_shield_06.xml" name="spear-OVAL-B-01-Gaul-06"/>
   </group>
   <group>
     <variant frequency="1" name="Spina-a">
diff --git a/binaries/data/mods/public/art/actors/props/units/shields/gaul_shield_spear_oval_b_02.xml b/binaries/data/mods/public/art/actors/props/units/shields/gaul_shield_spear_oval_b_02.xml
index a67a7f59f0..87a0f4eaf5 100644
--- a/binaries/data/mods/public/art/actors/props/units/shields/gaul_shield_spear_oval_b_02.xml
+++ b/binaries/data/mods/public/art/actors/props/units/shields/gaul_shield_spear_oval_b_02.xml
@@ -11,27 +11,27 @@
     </variant>
   </group>
   <group>
-    <variant frequency="1" file="shields/celt_shield_01.xml" name="Player-Color-01"/>
-    <variant frequency="1" file="shields/celt_shield_02.xml" name="Player-Color-02"/>
-    <variant frequency="1" file="shields/celt_shield_03.xml" name="Player-Color-03"/>
-    <variant frequency="1" file="shields/celt_shield_04.xml" name="Player-Color-04"/>
-    <variant frequency="1" file="shields/celt_shield_05.xml" name="Player-Color-05"/>
-    <variant frequency="1" file="shields/celt_shield_06.xml" name="Player-Color-06"/>
-    <variant frequency="1" file="shields/celt_shield_07.xml" name="Player-Color-07"/>
-    <variant frequency="1" file="shields/celt_shield_08.xml" name="Player-Color-08"/>
-    <variant frequency="1" file="shields/celt_shield_09.xml" name="Player-Color-09"/>
-    <variant frequency="1" file="shields/celt_shield_10.xml" name="Player-Color-10"/>
-    <variant frequency="1" file="shields/celt_shield_11.xml" name="Player-Color-11"/>
-    <variant frequency="1" file="shields/celt_shield_12.xml" name="Player-Color-12"/>
-    <variant frequency="1" file="shields/celt_shield_13.xml" name="Player-Color-13"/>
-    <variant frequency="1" file="shields/celt_shield_14.xml" name="Player-Color-14"/>
-    <variant frequency="1" file="shields/celt_shield_15.xml" name="Player-Color-15"/>
-    <variant frequency="1" file="shields/gaul_shield_01.xml" name="Gaul-01"/>
-    <variant frequency="1" file="shields/gaul_shield_02.xml" name="Gaul-02"/>
-    <variant frequency="1" file="shields/gaul_shield_03.xml" name="Gaul-03"/>
-    <variant frequency="1" file="shields/gaul_shield_04.xml" name="Gaul-04"/>
-    <variant frequency="1" file="shields/gaul_shield_05.xml" name="Gaul-05"/>
-    <variant frequency="1" file="shields/gaul_shield_06.xml" name="Gaul-06"/>
+    <variant frequency="1" file="shields/celt_shield_01.xml" name="spear-OVAL-B-02-Player-Color-01"/>
+    <variant frequency="1" file="shields/celt_shield_02.xml" name="spear-OVAL-B-02-Player-Color-02"/>
+    <variant frequency="1" file="shields/celt_shield_03.xml" name="spear-OVAL-B-02-Player-Color-03"/>
+    <variant frequency="1" file="shields/celt_shield_04.xml" name="spear-OVAL-B-02-Player-Color-04"/>
+    <variant frequency="1" file="shields/celt_shield_05.xml" name="spear-OVAL-B-02-Player-Color-05"/>
+    <variant frequency="1" file="shields/celt_shield_06.xml" name="spear-OVAL-B-02-Player-Color-06"/>
+    <variant frequency="1" file="shields/celt_shield_07.xml" name="spear-OVAL-B-02-Player-Color-07"/>
+    <variant frequency="1" file="shields/celt_shield_08.xml" name="spear-OVAL-B-02-Player-Color-08"/>
+    <variant frequency="1" file="shields/celt_shield_09.xml" name="spear-OVAL-B-02-Player-Color-09"/>
+    <variant frequency="1" file="shields/celt_shield_10.xml" name="spear-OVAL-B-02-Player-Color-10"/>
+    <variant frequency="1" file="shields/celt_shield_11.xml" name="spear-OVAL-B-02-Player-Color-11"/>
+    <variant frequency="1" file="shields/celt_shield_12.xml" name="spear-OVAL-B-02-Player-Color-12"/>
+    <variant frequency="1" file="shields/celt_shield_13.xml" name="spear-OVAL-B-02-Player-Color-13"/>
+    <variant frequency="1" file="shields/celt_shield_14.xml" name="spear-OVAL-B-02-Player-Color-14"/>
+    <variant frequency="1" file="shields/celt_shield_15.xml" name="spear-OVAL-B-02-Player-Color-15"/>
+    <variant frequency="1" file="shields/gaul_shield_01.xml" name="spear-OVAL-B-02-Gaul-01"/>
+    <variant frequency="1" file="shields/gaul_shield_02.xml" name="spear-OVAL-B-02-Gaul-02"/>
+    <variant frequency="1" file="shields/gaul_shield_03.xml" name="spear-OVAL-B-02-Gaul-03"/>
+    <variant frequency="1" file="shields/gaul_shield_04.xml" name="spear-OVAL-B-02-Gaul-04"/>
+    <variant frequency="1" file="shields/gaul_shield_05.xml" name="spear-OVAL-B-02-Gaul-05"/>
+    <variant frequency="1" file="shields/gaul_shield_06.xml" name="spear-OVAL-B-02-Gaul-06"/>
   </group>
   <group>
     <variant frequency="1" name="Spina-a">
diff --git a/binaries/data/mods/public/art/actors/props/units/shields/gaul_shield_spear_oval_b_03.xml b/binaries/data/mods/public/art/actors/props/units/shields/gaul_shield_spear_oval_b_03.xml
index 331dc4eb65..a3c00744a3 100644
--- a/binaries/data/mods/public/art/actors/props/units/shields/gaul_shield_spear_oval_b_03.xml
+++ b/binaries/data/mods/public/art/actors/props/units/shields/gaul_shield_spear_oval_b_03.xml
@@ -12,27 +12,27 @@
     </variant>
   </group>
   <group>
-    <variant frequency="1" file="shields/celt_shield_01.xml" name="Player-Color-01"/>
-    <variant frequency="1" file="shields/celt_shield_02.xml" name="Player-Color-02"/>
-    <variant frequency="1" file="shields/celt_shield_03.xml" name="Player-Color-03"/>
-    <variant frequency="1" file="shields/celt_shield_04.xml" name="Player-Color-04"/>
-    <variant frequency="1" file="shields/celt_shield_05.xml" name="Player-Color-05"/>
-    <variant frequency="1" file="shields/celt_shield_06.xml" name="Player-Color-06"/>
-    <variant frequency="1" file="shields/celt_shield_07.xml" name="Player-Color-07"/>
-    <variant frequency="1" file="shields/celt_shield_08.xml" name="Player-Color-08"/>
-    <variant frequency="1" file="shields/celt_shield_09.xml" name="Player-Color-09"/>
-    <variant frequency="1" file="shields/celt_shield_10.xml" name="Player-Color-10"/>
-    <variant frequency="1" file="shields/celt_shield_11.xml" name="Player-Color-11"/>
-    <variant frequency="1" file="shields/celt_shield_12.xml" name="Player-Color-12"/>
-    <variant frequency="1" file="shields/celt_shield_13.xml" name="Player-Color-13"/>
-    <variant frequency="1" file="shields/celt_shield_14.xml" name="Player-Color-14"/>
-    <variant frequency="1" file="shields/celt_shield_15.xml" name="Player-Color-15"/>
-    <variant frequency="1" file="shields/gaul_shield_01.xml" name="Gaul-01"/>
-    <variant frequency="1" file="shields/gaul_shield_02.xml" name="Gaul-02"/>
-    <variant frequency="1" file="shields/gaul_shield_03.xml" name="Gaul-03"/>
-    <variant frequency="1" file="shields/gaul_shield_04.xml" name="Gaul-04"/>
-    <variant frequency="1" file="shields/gaul_shield_05.xml" name="Gaul-05"/>
-    <variant frequency="1" file="shields/gaul_shield_06.xml" name="Gaul-06"/>
+    <variant frequency="1" file="shields/celt_shield_01.xml" name="OVAL-B-03-Player-Color-01"/>
+    <variant frequency="1" file="shields/celt_shield_02.xml" name="OVAL-B-03-Player-Color-02"/>
+    <variant frequency="1" file="shields/celt_shield_03.xml" name="OVAL-B-03-Player-Color-03"/>
+    <variant frequency="1" file="shields/celt_shield_04.xml" name="OVAL-B-03-Player-Color-04"/>
+    <variant frequency="1" file="shields/celt_shield_05.xml" name="OVAL-B-03-Player-Color-05"/>
+    <variant frequency="1" file="shields/celt_shield_06.xml" name="OVAL-B-03-Player-Color-06"/>
+    <variant frequency="1" file="shields/celt_shield_07.xml" name="OVAL-B-03-Player-Color-07"/>
+    <variant frequency="1" file="shields/celt_shield_08.xml" name="OVAL-B-03-Player-Color-08"/>
+    <variant frequency="1" file="shields/celt_shield_09.xml" name="OVAL-B-03-Player-Color-09"/>
+    <variant frequency="1" file="shields/celt_shield_10.xml" name="OVAL-B-03-Player-Color-10"/>
+    <variant frequency="1" file="shields/celt_shield_11.xml" name="OVAL-B-03-Player-Color-11"/>
+    <variant frequency="1" file="shields/celt_shield_12.xml" name="OVAL-B-03-Player-Color-12"/>
+    <variant frequency="1" file="shields/celt_shield_13.xml" name="OVAL-B-03-Player-Color-13"/>
+    <variant frequency="1" file="shields/celt_shield_14.xml" name="OVAL-B-03-Player-Color-14"/>
+    <variant frequency="1" file="shields/celt_shield_15.xml" name="OVAL-B-03-Player-Color-15"/>
+    <variant frequency="1" file="shields/gaul_shield_01.xml" name="OVAL-B-03-Gaul-01"/>
+    <variant frequency="1" file="shields/gaul_shield_02.xml" name="OVAL-B-03-Gaul-02"/>
+    <variant frequency="1" file="shields/gaul_shield_03.xml" name="OVAL-B-03-Gaul-03"/>
+    <variant frequency="1" file="shields/gaul_shield_04.xml" name="OVAL-B-03-Gaul-04"/>
+    <variant frequency="1" file="shields/gaul_shield_05.xml" name="OVAL-B-03-Gaul-05"/>
+    <variant frequency="1" file="shields/gaul_shield_06.xml" name="OVAL-B-03-Gaul-06"/>
   </group>
   <group>
     <variant frequency="1" name="Spina-a">
diff --git a/binaries/data/mods/public/art/actors/props/units/shields/gaul_shield_spear_oval_c_01.xml b/binaries/data/mods/public/art/actors/props/units/shields/gaul_shield_spear_oval_c_01.xml
index a5fb14b241..385994d81d 100644
--- a/binaries/data/mods/public/art/actors/props/units/shields/gaul_shield_spear_oval_c_01.xml
+++ b/binaries/data/mods/public/art/actors/props/units/shields/gaul_shield_spear_oval_c_01.xml
@@ -11,27 +11,27 @@
     </variant>
   </group>
   <group>
-    <variant frequency="1" file="shields/celt_shield_01.xml" name="Player-Color-01"/>
-    <variant frequency="1" file="shields/celt_shield_02.xml" name="Player-Color-02"/>
-    <variant frequency="1" file="shields/celt_shield_03.xml" name="Player-Color-03"/>
-    <variant frequency="1" file="shields/celt_shield_04.xml" name="Player-Color-04"/>
-    <variant frequency="1" file="shields/celt_shield_05.xml" name="Player-Color-05"/>
-    <variant frequency="1" file="shields/celt_shield_06.xml" name="Player-Color-06"/>
-    <variant frequency="1" file="shields/celt_shield_07.xml" name="Player-Color-07"/>
-    <variant frequency="1" file="shields/celt_shield_08.xml" name="Player-Color-08"/>
-    <variant frequency="1" file="shields/celt_shield_09.xml" name="Player-Color-09"/>
-    <variant frequency="1" file="shields/celt_shield_10.xml" name="Player-Color-10"/>
-    <variant frequency="1" file="shields/celt_shield_11.xml" name="Player-Color-11"/>
-    <variant frequency="1" file="shields/celt_shield_12.xml" name="Player-Color-12"/>
-    <variant frequency="1" file="shields/celt_shield_13.xml" name="Player-Color-13"/>
-    <variant frequency="1" file="shields/celt_shield_14.xml" name="Player-Color-14"/>
-    <variant frequency="1" file="shields/celt_shield_15.xml" name="Player-Color-15"/>
-    <variant frequency="1" file="shields/gaul_shield_01.xml" name="Gaul-01"/>
-    <variant frequency="1" file="shields/gaul_shield_02.xml" name="Gaul-02"/>
-    <variant frequency="1" file="shields/gaul_shield_03.xml" name="Gaul-03"/>
-    <variant frequency="1" file="shields/gaul_shield_04.xml" name="Gaul-04"/>
-    <variant frequency="1" file="shields/gaul_shield_05.xml" name="Gaul-05"/>
-    <variant frequency="1" file="shields/gaul_shield_06.xml" name="Gaul-06"/>
+    <variant frequency="1" file="shields/celt_shield_01.xml" name="OVAL-C-01-Player-Color-01"/>
+    <variant frequency="1" file="shields/celt_shield_02.xml" name="OVAL-C-01-Player-Color-02"/>
+    <variant frequency="1" file="shields/celt_shield_03.xml" name="OVAL-C-01-Player-Color-03"/>
+    <variant frequency="1" file="shields/celt_shield_04.xml" name="OVAL-C-01-Player-Color-04"/>
+    <variant frequency="1" file="shields/celt_shield_05.xml" name="OVAL-C-01-Player-Color-05"/>
+    <variant frequency="1" file="shields/celt_shield_06.xml" name="OVAL-C-01-Player-Color-06"/>
+    <variant frequency="1" file="shields/celt_shield_07.xml" name="OVAL-C-01-Player-Color-07"/>
+    <variant frequency="1" file="shields/celt_shield_08.xml" name="OVAL-C-01-Player-Color-08"/>
+    <variant frequency="1" file="shields/celt_shield_09.xml" name="OVAL-C-01-Player-Color-09"/>
+    <variant frequency="1" file="shields/celt_shield_10.xml" name="OVAL-C-01-Player-Color-10"/>
+    <variant frequency="1" file="shields/celt_shield_11.xml" name="OVAL-C-01-Player-Color-11"/>
+    <variant frequency="1" file="shields/celt_shield_12.xml" name="OVAL-C-01-Player-Color-12"/>
+    <variant frequency="1" file="shields/celt_shield_13.xml" name="OVAL-C-01-Player-Color-13"/>
+    <variant frequency="1" file="shields/celt_shield_14.xml" name="OVAL-C-01-Player-Color-14"/>
+    <variant frequency="1" file="shields/celt_shield_15.xml" name="OVAL-C-01-Player-Color-15"/>
+    <variant frequency="1" file="shields/gaul_shield_01.xml" name="OVAL-C-01-Gaul-01"/>
+    <variant frequency="1" file="shields/gaul_shield_02.xml" name="OVAL-C-01-Gaul-02"/>
+    <variant frequency="1" file="shields/gaul_shield_03.xml" name="OVAL-C-01-Gaul-03"/>
+    <variant frequency="1" file="shields/gaul_shield_04.xml" name="OVAL-C-01-Gaul-04"/>
+    <variant frequency="1" file="shields/gaul_shield_05.xml" name="OVAL-C-01-Gaul-05"/>
+    <variant frequency="1" file="shields/gaul_shield_06.xml" name="OVAL-C-01-Gaul-06"/>
   </group>
   <group>
     <variant frequency="1" name="Spina-a">
diff --git a/binaries/data/mods/public/art/actors/props/units/shields/gaul_shield_spear_oval_c_02.xml b/binaries/data/mods/public/art/actors/props/units/shields/gaul_shield_spear_oval_c_02.xml
index 080aed24e7..3784dfaf80 100644
--- a/binaries/data/mods/public/art/actors/props/units/shields/gaul_shield_spear_oval_c_02.xml
+++ b/binaries/data/mods/public/art/actors/props/units/shields/gaul_shield_spear_oval_c_02.xml
@@ -11,27 +11,27 @@
     </variant>
   </group>
   <group>
-    <variant frequency="1" file="shields/celt_shield_01.xml" name="Player-Color-01"/>
-    <variant frequency="1" file="shields/celt_shield_02.xml" name="Player-Color-02"/>
-    <variant frequency="1" file="shields/celt_shield_03.xml" name="Player-Color-03"/>
-    <variant frequency="1" file="shields/celt_shield_04.xml" name="Player-Color-04"/>
-    <variant frequency="1" file="shields/celt_shield_05.xml" name="Player-Color-05"/>
-    <variant frequency="1" file="shields/celt_shield_06.xml" name="Player-Color-06"/>
-    <variant frequency="1" file="shields/celt_shield_07.xml" name="Player-Color-07"/>
-    <variant frequency="1" file="shields/celt_shield_08.xml" name="Player-Color-08"/>
-    <variant frequency="1" file="shields/celt_shield_09.xml" name="Player-Color-09"/>
-    <variant frequency="1" file="shields/celt_shield_10.xml" name="Player-Color-10"/>
-    <variant frequency="1" file="shields/celt_shield_11.xml" name="Player-Color-11"/>
-    <variant frequency="1" file="shields/celt_shield_12.xml" name="Player-Color-12"/>
-    <variant frequency="1" file="shields/celt_shield_13.xml" name="Player-Color-13"/>
-    <variant frequency="1" file="shields/celt_shield_14.xml" name="Player-Color-14"/>
-    <variant frequency="1" file="shields/celt_shield_15.xml" name="Player-Color-15"/>
-    <variant frequency="1" file="shields/gaul_shield_01.xml" name="Gaul-01"/>
-    <variant frequency="1" file="shields/gaul_shield_02.xml" name="Gaul-02"/>
-    <variant frequency="1" file="shields/gaul_shield_03.xml" name="Gaul-03"/>
-    <variant frequency="1" file="shields/gaul_shield_04.xml" name="Gaul-04"/>
-    <variant frequency="1" file="shields/gaul_shield_05.xml" name="Gaul-05"/>
-    <variant frequency="1" file="shields/gaul_shield_06.xml" name="Gaul-06"/>
+    <variant frequency="1" file="shields/celt_shield_01.xml" name="OVAL-C-02-Player-Color-01"/>
+    <variant frequency="1" file="shields/celt_shield_02.xml" name="OVAL-C-02-Player-Color-02"/>
+    <variant frequency="1" file="shields/celt_shield_03.xml" name="OVAL-C-02-Player-Color-03"/>
+    <variant frequency="1" file="shields/celt_shield_04.xml" name="OVAL-C-02-Player-Color-04"/>
+    <variant frequency="1" file="shields/celt_shield_05.xml" name="OVAL-C-02-Player-Color-05"/>
+    <variant frequency="1" file="shields/celt_shield_06.xml" name="OVAL-C-02-Player-Color-06"/>
+    <variant frequency="1" file="shields/celt_shield_07.xml" name="OVAL-C-02-Player-Color-07"/>
+    <variant frequency="1" file="shields/celt_shield_08.xml" name="OVAL-C-02-Player-Color-08"/>
+    <variant frequency="1" file="shields/celt_shield_09.xml" name="OVAL-C-02-Player-Color-09"/>
+    <variant frequency="1" file="shields/celt_shield_10.xml" name="OVAL-C-02-Player-Color-10"/>
+    <variant frequency="1" file="shields/celt_shield_11.xml" name="OVAL-C-02-Player-Color-11"/>
+    <variant frequency="1" file="shields/celt_shield_12.xml" name="OVAL-C-02-Player-Color-12"/>
+    <variant frequency="1" file="shields/celt_shield_13.xml" name="OVAL-C-02-Player-Color-13"/>
+    <variant frequency="1" file="shields/celt_shield_14.xml" name="OVAL-C-02-Player-Color-14"/>
+    <variant frequency="1" file="shields/celt_shield_15.xml" name="OVAL-C-02-Player-Color-15"/>
+    <variant frequency="1" file="shields/gaul_shield_01.xml" name="OVAL-C-02-Gaul-01"/>
+    <variant frequency="1" file="shields/gaul_shield_02.xml" name="OVAL-C-02-Gaul-02"/>
+    <variant frequency="1" file="shields/gaul_shield_03.xml" name="OVAL-C-02-Gaul-03"/>
+    <variant frequency="1" file="shields/gaul_shield_04.xml" name="OVAL-C-02-Gaul-04"/>
+    <variant frequency="1" file="shields/gaul_shield_05.xml" name="OVAL-C-02-Gaul-05"/>
+    <variant frequency="1" file="shields/gaul_shield_06.xml" name="OVAL-C-02-Gaul-06"/>
   </group>
   <group>
     <variant frequency="1" name="Spina-a">
diff --git a/binaries/data/mods/public/art/actors/props/units/shields/gaul_shield_spear_oval_c_03.xml b/binaries/data/mods/public/art/actors/props/units/shields/gaul_shield_spear_oval_c_03.xml
index a9de12553a..ef6f5d2ce5 100644
--- a/binaries/data/mods/public/art/actors/props/units/shields/gaul_shield_spear_oval_c_03.xml
+++ b/binaries/data/mods/public/art/actors/props/units/shields/gaul_shield_spear_oval_c_03.xml
@@ -12,27 +12,27 @@
     </variant>
   </group>
   <group>
-    <variant frequency="1" file="shields/celt_shield_01.xml" name="Player-Color-01"/>
-    <variant frequency="1" file="shields/celt_shield_02.xml" name="Player-Color-02"/>
-    <variant frequency="1" file="shields/celt_shield_03.xml" name="Player-Color-03"/>
-    <variant frequency="1" file="shields/celt_shield_04.xml" name="Player-Color-04"/>
-    <variant frequency="1" file="shields/celt_shield_05.xml" name="Player-Color-05"/>
-    <variant frequency="1" file="shields/celt_shield_06.xml" name="Player-Color-06"/>
-    <variant frequency="1" file="shields/celt_shield_07.xml" name="Player-Color-07"/>
-    <variant frequency="1" file="shields/celt_shield_08.xml" name="Player-Color-08"/>
-    <variant frequency="1" file="shields/celt_shield_09.xml" name="Player-Color-09"/>
-    <variant frequency="1" file="shields/celt_shield_10.xml" name="Player-Color-10"/>
-    <variant frequency="1" file="shields/celt_shield_11.xml" name="Player-Color-11"/>
-    <variant frequency="1" file="shields/celt_shield_12.xml" name="Player-Color-12"/>
-    <variant frequency="1" file="shields/celt_shield_13.xml" name="Player-Color-13"/>
-    <variant frequency="1" file="shields/celt_shield_14.xml" name="Player-Color-14"/>
-    <variant frequency="1" file="shields/celt_shield_15.xml" name="Player-Color-15"/>
-    <variant frequency="1" file="shields/gaul_shield_01.xml" name="Gaul-01"/>
-    <variant frequency="1" file="shields/gaul_shield_02.xml" name="Gaul-02"/>
-    <variant frequency="1" file="shields/gaul_shield_03.xml" name="Gaul-03"/>
-    <variant frequency="1" file="shields/gaul_shield_04.xml" name="Gaul-04"/>
-    <variant frequency="1" file="shields/gaul_shield_05.xml" name="Gaul-05"/>
-    <variant frequency="1" file="shields/gaul_shield_06.xml" name="Gaul-06"/>
+    <variant frequency="1" file="shields/celt_shield_01.xml" name="spear-OVAL-C-03-Player-Color-01"/>
+    <variant frequency="1" file="shields/celt_shield_02.xml" name="spear-OVAL-C-03-Player-Color-02"/>
+    <variant frequency="1" file="shields/celt_shield_03.xml" name="spear-OVAL-C-03-Player-Color-03"/>
+    <variant frequency="1" file="shields/celt_shield_04.xml" name="spear-OVAL-C-03-Player-Color-04"/>
+    <variant frequency="1" file="shields/celt_shield_05.xml" name="spear-OVAL-C-03-Player-Color-05"/>
+    <variant frequency="1" file="shields/celt_shield_06.xml" name="spear-OVAL-C-03-Player-Color-06"/>
+    <variant frequency="1" file="shields/celt_shield_07.xml" name="spear-OVAL-C-03-Player-Color-07"/>
+    <variant frequency="1" file="shields/celt_shield_08.xml" name="spear-OVAL-C-03-Player-Color-08"/>
+    <variant frequency="1" file="shields/celt_shield_09.xml" name="spear-OVAL-C-03-Player-Color-09"/>
+    <variant frequency="1" file="shields/celt_shield_10.xml" name="spear-OVAL-C-03-Player-Color-10"/>
+    <variant frequency="1" file="shields/celt_shield_11.xml" name="spear-OVAL-C-03-Player-Color-11"/>
+    <variant frequency="1" file="shields/celt_shield_12.xml" name="spear-OVAL-C-03-Player-Color-12"/>
+    <variant frequency="1" file="shields/celt_shield_13.xml" name="spear-OVAL-C-03-Player-Color-13"/>
+    <variant frequency="1" file="shields/celt_shield_14.xml" name="spear-OVAL-C-03-Player-Color-14"/>
+    <variant frequency="1" file="shields/celt_shield_15.xml" name="spear-OVAL-C-03-Player-Color-15"/>
+    <variant frequency="1" file="shields/gaul_shield_01.xml" name="spear-OVAL-C-03-Gaul-01"/>
+    <variant frequency="1" file="shields/gaul_shield_02.xml" name="spear-OVAL-C-03-Gaul-02"/>
+    <variant frequency="1" file="shields/gaul_shield_03.xml" name="spear-OVAL-C-03-Gaul-03"/>
+    <variant frequency="1" file="shields/gaul_shield_04.xml" name="spear-OVAL-C-03-Gaul-04"/>
+    <variant frequency="1" file="shields/gaul_shield_05.xml" name="spear-OVAL-C-03-Gaul-05"/>
+    <variant frequency="1" file="shields/gaul_shield_06.xml" name="spear-OVAL-C-03-Gaul-06"/>
   </group>
   <group>
     <variant frequency="1" name="Spina-a">