diff --git a/binaries/data/mods/public/art/actors/props/structures/construction/scaf_cart_wall_medium.xml b/binaries/data/mods/public/art/actors/props/structures/construction/scaf_cart_wall_medium.xml
index 9be436b758..ca01a2bb75 100644
--- a/binaries/data/mods/public/art/actors/props/structures/construction/scaf_cart_wall_medium.xml
+++ b/binaries/data/mods/public/art/actors/props/structures/construction/scaf_cart_wall_medium.xml
@@ -2,7 +2,7 @@
 <actor version="1">
   <castshadow/>
   <group>
-    <variant frequency="1" name="Scout_Tower">
+    <variant frequency="1" name="Medium Carthaginian Wall Scaffold">
       <mesh>structural/kart_wall_medium_b_scaffolding.dae</mesh>
       <props>
         <prop actor="props/structures/decals/dirt_2x2.xml" attachpoint="root"/>
@@ -11,7 +11,7 @@
         <texture file="structural/kart_struct.dds" name="baseTex"/>
         <texture file="structural/kart_struct_spec.png" name="specTex"/>
         <texture file="structural/kart_struct_norm.png" name="normTex"/>
-        <texture file="structural/ao/kart_wall_medium_b_scaffolding_AO.png" name="aoTex"/>
+        <texture file="structural/ao/kart_wall_medium_b_scaffolding.png" name="aoTex"/>
       </textures>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/structures/britons/wall_medium.xml b/binaries/data/mods/public/art/actors/structures/britons/wall_medium.xml
index 61fc53318e..8a61ad49fd 100644
--- a/binaries/data/mods/public/art/actors/structures/britons/wall_medium.xml
+++ b/binaries/data/mods/public/art/actors/structures/britons/wall_medium.xml
@@ -2,22 +2,13 @@
 <actor version="1">
   <castshadow/>
   <group>
-    <variant name="norm">
-      <mesh>structural/brit_wall_med.dae</mesh>
-      <textures>
-        <texture file="structural/celt_struct.dds" name="baseTex"/>
-        <texture file="structural/celt_struct_norm.png" name="normTex"/>
-        <texture file="structural/celt_struct_spec.png" name="specTex"/>
-        <texture file="structural/ao/brit_wall_med_AO.png" name="aoTex"/>
-      </textures>
-    </variant>
-    <variant name="test">
-      <mesh>structural/brit_wall_med.dae</mesh>
+    <variant frequency="1" name="Medium Brittonic Wall">
+      <mesh>structural/brit_wall_medium.dae</mesh>
       <textures>
         <texture file="structural/brit_struct.png" name="baseTex"/>
         <texture file="structural/celt_struct_norm.png" name="normTex"/>
         <texture file="structural/celt_struct_spec.png" name="specTex"/>
-        <texture file="structural/ao/brit_wall_med_AO.png" name="aoTex"/>
+        <texture file="structural/ao/brit_wall_medium.png" name="aoTex"/>
       </textures>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/structures/carthaginians/fndn_wall_med.xml b/binaries/data/mods/public/art/actors/structures/carthaginians/fndn_wall_medium.xml
similarity index 97%
rename from binaries/data/mods/public/art/actors/structures/carthaginians/fndn_wall_med.xml
rename to binaries/data/mods/public/art/actors/structures/carthaginians/fndn_wall_medium.xml
index 39663e0a6b..df11bebdf1 100644
--- a/binaries/data/mods/public/art/actors/structures/carthaginians/fndn_wall_med.xml
+++ b/binaries/data/mods/public/art/actors/structures/carthaginians/fndn_wall_medium.xml
@@ -27,7 +27,7 @@
         <texture file="structural/kart_struct.dds" name="baseTex"/>
         <texture file="structural/kart_struct_norm.png" name="normTex"/>
         <texture file="structural/kart_struct_spec.png" name="specTex"/>
-        <texture file="structural/ao/kart_wall_medium_b_scaffolding_AO.png" name="aoTex"/>
+        <texture file="structural/ao/kart_wall_medium_b_scaffolding.png" name="aoTex"/>
       </textures>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/structures/carthaginians/wall_med.xml b/binaries/data/mods/public/art/actors/structures/carthaginians/wall_med.xml
deleted file mode 100644
index 18a10ac177..0000000000
--- a/binaries/data/mods/public/art/actors/structures/carthaginians/wall_med.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant frequency="1" name="wall segment medium">
-      <mesh>structural/kart_wall_medium.dae</mesh>
-      <textures><texture file="structural/kart_struct.dds" name="baseTex"/></textures>
-    </variant>
-  </group>
-  <group>
-    <variant name="alive" frequency="1"/>
-    <variant name="death">
-      <props>
-        <prop actor="particle/destruction_smoke_small.xml" attachpoint="root"/>
-        <prop actor="particle/destruction_dust_small.xml" attachpoint="root"/>
-        <prop actor="particle/destruction_dust_small_gray.xml" attachpoint="root"/>
-      </props>
-    </variant>
-  </group>
-  <material>player_trans.xml</material>
-</actor>
diff --git a/binaries/data/mods/public/art/actors/structures/kushites/wall_med.xml b/binaries/data/mods/public/art/actors/structures/kushites/wall_medium.xml
similarity index 90%
rename from binaries/data/mods/public/art/actors/structures/kushites/wall_med.xml
rename to binaries/data/mods/public/art/actors/structures/kushites/wall_medium.xml
index a61153596a..e3ed6293ea 100644
--- a/binaries/data/mods/public/art/actors/structures/kushites/wall_med.xml
+++ b/binaries/data/mods/public/art/actors/structures/kushites/wall_medium.xml
@@ -2,8 +2,8 @@
 <actor version="1">
   <castshadow/>
   <group>
-    <variant frequency="1" name="Base">
-      <mesh>structural/kush_wall_med.dae</mesh>
+    <variant frequency="1" name="Medium Kushite Wall">
+      <mesh>structural/kush_wall_medium.dae</mesh>
       <textures>
         <texture file="structural/kush_struct.png" name="baseTex"/>
         <texture file="structural/kush_struct_spec.png" name="specTex"/>
diff --git a/binaries/data/mods/public/art/actors/structures/seleucids/wall_gate.xml b/binaries/data/mods/public/art/actors/structures/seleucids/wall_gate.xml
index 9bb3499ee3..176bb8f1d1 100644
--- a/binaries/data/mods/public/art/actors/structures/seleucids/wall_gate.xml
+++ b/binaries/data/mods/public/art/actors/structures/seleucids/wall_gate.xml
@@ -2,7 +2,7 @@
 <actor version="1">
   <castshadow/>
   <group>
-    <variant frequency="1" name="Seleucid_Civic_Centre">
+    <variant frequency="1" name="Seleucid Wall Gate">
       <mesh>structural/sele_wall_gate.dae</mesh>
       <props>
         <prop actor="props/structures/seleucids/gate.xml" attachpoint="root"/>
@@ -11,7 +11,7 @@
         <texture file="structural/Sele_struct_2.png" name="baseTex"/>
         <texture file="structural/Sele_struct_2_norm.png" name="normTex"/>
         <texture file="structural/Sele_struct_2_spec.png" name="specTex"/>
-        <texture file="structural/ao/sele_wall_gate_AO.png" name="aoTex"/>
+        <texture file="structural/ao/sele_wall_gate.png" name="aoTex"/>
       </textures>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/structures/seleucids/wall_long.xml b/binaries/data/mods/public/art/actors/structures/seleucids/wall_long.xml
index 96738fadea..402c4fef93 100644
--- a/binaries/data/mods/public/art/actors/structures/seleucids/wall_long.xml
+++ b/binaries/data/mods/public/art/actors/structures/seleucids/wall_long.xml
@@ -2,7 +2,7 @@
 <actor version="1">
   <castshadow/>
   <group>
-    <variant frequency="1" name="Seleucid_Civic_Centre">
+    <variant frequency="1" name="Long Seleucid Wall">
       <animations>
         <animation event="0.5" load="0.0" name="attack_ranged" speed="100"/>
       </animations>
@@ -11,7 +11,7 @@
         <texture file="structural/Sele_struct_2.png" name="baseTex"/>
         <texture file="structural/Sele_struct_2_norm.png" name="normTex"/>
         <texture file="structural/Sele_struct_2_spec.png" name="specTex"/>
-        <texture file="structural/ao/sele_wall_long_AO.png" name="aoTex"/>
+        <texture file="structural/ao/sele_wall_long.png" name="aoTex"/>
       </textures>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/structures/seleucids/wall_med.xml b/binaries/data/mods/public/art/actors/structures/seleucids/wall_medium.xml
similarity index 84%
rename from binaries/data/mods/public/art/actors/structures/seleucids/wall_med.xml
rename to binaries/data/mods/public/art/actors/structures/seleucids/wall_medium.xml
index a6863c7b97..f6b8acfec9 100644
--- a/binaries/data/mods/public/art/actors/structures/seleucids/wall_med.xml
+++ b/binaries/data/mods/public/art/actors/structures/seleucids/wall_medium.xml
@@ -2,16 +2,16 @@
 <actor version="1">
   <castshadow/>
   <group>
-    <variant frequency="1" name="Seleucid_Civic_Centre">
+    <variant frequency="1" name="Medium Seleucid Wall">
       <animations>
         <animation event="0.5" load="0.0" name="attack_ranged" speed="100"/>
       </animations>
-      <mesh>structural/sele_wall_med.dae</mesh>
+      <mesh>structural/sele_wall_medium.dae</mesh>
       <textures>
         <texture file="structural/Sele_struct_2.png" name="baseTex"/>
         <texture file="structural/Sele_struct_2_norm.png" name="normTex"/>
         <texture file="structural/Sele_struct_2_spec.png" name="specTex"/>
-        <texture file="structural/ao/sele_wall_medium_AO.png" name="aoTex"/>
+        <texture file="structural/ao/sele_wall_medium.png" name="aoTex"/>
       </textures>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/structures/seleucids/wall_short.xml b/binaries/data/mods/public/art/actors/structures/seleucids/wall_short.xml
index 7fd411076c..68452e6894 100644
--- a/binaries/data/mods/public/art/actors/structures/seleucids/wall_short.xml
+++ b/binaries/data/mods/public/art/actors/structures/seleucids/wall_short.xml
@@ -2,7 +2,7 @@
 <actor version="1">
   <castshadow/>
   <group>
-    <variant frequency="1" name="Seleucid_Civic_Centre">
+    <variant frequency="1" name="Short Seleucid Wall">
       <animations>
         <animation event="0.5" load="0.0" name="attack_ranged" speed="100"/>
       </animations>
@@ -11,7 +11,7 @@
         <texture file="structural/Sele_struct_2.png" name="baseTex"/>
         <texture file="structural/Sele_struct_2_norm.png" name="normTex"/>
         <texture file="structural/Sele_struct_2_spec.png" name="specTex"/>
-        <texture file="structural/ao/sele_wall_short_AO.png" name="aoTex"/>
+        <texture file="structural/ao/sele_wall_short.png" name="aoTex"/>
       </textures>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/structures/seleucids/wall_tower.xml b/binaries/data/mods/public/art/actors/structures/seleucids/wall_tower.xml
index becce151db..4ac77403e4 100644
--- a/binaries/data/mods/public/art/actors/structures/seleucids/wall_tower.xml
+++ b/binaries/data/mods/public/art/actors/structures/seleucids/wall_tower.xml
@@ -2,7 +2,7 @@
 <actor version="1">
   <castshadow/>
   <group>
-    <variant frequency="1" name="Seleucid_Civic_Centre">
+    <variant frequency="1" name="Seleucid Wall Tower">
       <animations>
         <animation event="0.5" load="0.0" name="attack_ranged" speed="100"/>
       </animations>
@@ -16,7 +16,7 @@
         <texture file="structural/Sele_struct_2.png" name="baseTex"/>
         <texture file="structural/Sele_struct_2_norm.png" name="normTex"/>
         <texture file="structural/Sele_struct_2_spec.png" name="specTex"/>
-        <texture file="structural/ao/sele_wall_tower_AO.png" name="aoTex"/>
+        <texture file="structural/ao/sele_wall_tower.png" name="aoTex"/>
       </textures>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/meshes/props/decal_struct_wall_med.dae b/binaries/data/mods/public/art/meshes/props/decal_struct_wall_med.dae
deleted file mode 100644
index 7219b102eb..0000000000
--- a/binaries/data/mods/public/art/meshes/props/decal_struct_wall_med.dae
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:65127b901547ca77827bced0b1742220c0db30c1becb9a2bcfd370752fbeecfe
-size 5861
diff --git a/binaries/data/mods/public/art/meshes/structural/brit_wall_med.dae b/binaries/data/mods/public/art/meshes/structural/brit_wall_med.dae
deleted file mode 100644
index 5b32c6c755..0000000000
--- a/binaries/data/mods/public/art/meshes/structural/brit_wall_med.dae
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e9e6b593d642aec2e9ba2cc34133ece3a50f18960d79fe4aaee3349627fc97fd
-size 260846
diff --git a/binaries/data/mods/public/art/meshes/structural/brit_wall_medium.dae b/binaries/data/mods/public/art/meshes/structural/brit_wall_medium.dae
new file mode 100644
index 0000000000..1c18eb35cd
--- /dev/null
+++ b/binaries/data/mods/public/art/meshes/structural/brit_wall_medium.dae
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d528c3da19147cbf06284e13249d29a0f3eb7f77b31b82ef0cab9dafb77f4925
+size 260847
diff --git a/binaries/data/mods/public/art/meshes/structural/kush_wall_med.dae b/binaries/data/mods/public/art/meshes/structural/kush_wall_med.dae
deleted file mode 100644
index 121ce21cf8..0000000000
--- a/binaries/data/mods/public/art/meshes/structural/kush_wall_med.dae
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7d5481b708d9240e55a948e7291e2755da6039806c419c0fcff19cb053e7b641
-size 241679
diff --git a/binaries/data/mods/public/art/meshes/structural/kush_wall_medium.dae b/binaries/data/mods/public/art/meshes/structural/kush_wall_medium.dae
new file mode 100644
index 0000000000..69cbda7e77
--- /dev/null
+++ b/binaries/data/mods/public/art/meshes/structural/kush_wall_medium.dae
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1ac4dce70b247062d9849c572023ff24d1803907ce97a6e6250ce32c0013c148
+size 241680
diff --git a/binaries/data/mods/public/art/meshes/structural/sele_wall_med.dae b/binaries/data/mods/public/art/meshes/structural/sele_wall_med.dae
deleted file mode 100644
index 438d5f2b9b..0000000000
--- a/binaries/data/mods/public/art/meshes/structural/sele_wall_med.dae
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5947574b0184e2f3b0b33d5c831a75c0758a7f26c2db6ab68bf65ea82d7a4172
-size 124087
diff --git a/binaries/data/mods/public/art/meshes/structural/sele_wall_medium.dae b/binaries/data/mods/public/art/meshes/structural/sele_wall_medium.dae
new file mode 100644
index 0000000000..bae7d8d040
--- /dev/null
+++ b/binaries/data/mods/public/art/meshes/structural/sele_wall_medium.dae
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:daa90b698ba756698625795577638cfe8dd619bef360aed1fd6d12326c4fa17a
+size 124088
diff --git a/binaries/data/mods/public/art/textures/skins/structural/ao/brit_wall_med_AO.png b/binaries/data/mods/public/art/textures/skins/structural/ao/brit_wall_medium.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/structural/ao/brit_wall_med_AO.png
rename to binaries/data/mods/public/art/textures/skins/structural/ao/brit_wall_medium.png
diff --git a/binaries/data/mods/public/art/textures/skins/structural/ao/kart_wall_medium_b_scaffolding_AO.png b/binaries/data/mods/public/art/textures/skins/structural/ao/kart_wall_medium_b_scaffolding.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/structural/ao/kart_wall_medium_b_scaffolding_AO.png
rename to binaries/data/mods/public/art/textures/skins/structural/ao/kart_wall_medium_b_scaffolding.png
diff --git a/binaries/data/mods/public/art/textures/skins/structural/ao/sele_wall_gate_AO.png b/binaries/data/mods/public/art/textures/skins/structural/ao/sele_wall_gate.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/structural/ao/sele_wall_gate_AO.png
rename to binaries/data/mods/public/art/textures/skins/structural/ao/sele_wall_gate.png
diff --git a/binaries/data/mods/public/art/textures/skins/structural/ao/sele_wall_long_AO.png b/binaries/data/mods/public/art/textures/skins/structural/ao/sele_wall_long.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/structural/ao/sele_wall_long_AO.png
rename to binaries/data/mods/public/art/textures/skins/structural/ao/sele_wall_long.png
diff --git a/binaries/data/mods/public/art/textures/skins/structural/ao/sele_wall_medium_AO.png b/binaries/data/mods/public/art/textures/skins/structural/ao/sele_wall_medium.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/structural/ao/sele_wall_medium_AO.png
rename to binaries/data/mods/public/art/textures/skins/structural/ao/sele_wall_medium.png
diff --git a/binaries/data/mods/public/art/textures/skins/structural/ao/sele_wall_short_AO.png b/binaries/data/mods/public/art/textures/skins/structural/ao/sele_wall_short.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/structural/ao/sele_wall_short_AO.png
rename to binaries/data/mods/public/art/textures/skins/structural/ao/sele_wall_short.png
diff --git a/binaries/data/mods/public/art/textures/skins/structural/ao/sele_wall_tower_AO.png b/binaries/data/mods/public/art/textures/skins/structural/ao/sele_wall_tower.png
similarity index 100%
rename from binaries/data/mods/public/art/textures/skins/structural/ao/sele_wall_tower_AO.png
rename to binaries/data/mods/public/art/textures/skins/structural/ao/sele_wall_tower.png
diff --git a/binaries/data/mods/public/simulation/templates/structures/cart_wall_medium.xml b/binaries/data/mods/public/simulation/templates/structures/cart_wall_medium.xml
index 25e235d287..5167c0a6ca 100644
--- a/binaries/data/mods/public/simulation/templates/structures/cart_wall_medium.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/cart_wall_medium.xml
@@ -27,7 +27,7 @@
   </Obstruction>
   <VisualActor>
     <Actor>structures/carthaginians/wall_medium.xml</Actor>
-    <FoundationActor>structures/carthaginians/fndn_wall_med.xml</FoundationActor>
+    <FoundationActor>structures/carthaginians/fndn_wall_medium.xml</FoundationActor>
   </VisualActor>
   <WallPiece>
     <Length>24.0</Length>
diff --git a/binaries/data/mods/public/simulation/templates/structures/kush_wall_medium.xml b/binaries/data/mods/public/simulation/templates/structures/kush_wall_medium.xml
index 94bcaa675c..fa93d6cdeb 100644
--- a/binaries/data/mods/public/simulation/templates/structures/kush_wall_medium.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/kush_wall_medium.xml
@@ -32,7 +32,7 @@
     <Static width="26.0" depth="8.0"/>
   </Obstruction>
   <VisualActor>
-    <Actor>structures/kushites/wall_med.xml</Actor>
+    <Actor>structures/kushites/wall_medium.xml</Actor>
   </VisualActor>
   <WallPiece>
     <Length>22.9</Length>
diff --git a/binaries/data/mods/public/simulation/templates/structures/sele_wall_medium.xml b/binaries/data/mods/public/simulation/templates/structures/sele_wall_medium.xml
index 01174977ed..9baa14743b 100644
--- a/binaries/data/mods/public/simulation/templates/structures/sele_wall_medium.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/sele_wall_medium.xml
@@ -13,7 +13,7 @@
     <Static width="24.0" depth="6.0"/>
   </Obstruction>
   <VisualActor>
-    <Actor>structures/seleucids/wall_med.xml</Actor>
+    <Actor>structures/seleucids/wall_medium.xml</Actor>
   </VisualActor>
   <WallPiece>
     <Length>21.1</Length>