diff --git a/binaries/data/mods/public/audio/attack/impact/shield_metal.xml b/binaries/data/mods/public/audio/attack/impact/shield_metal.xml
index c0dadab6cb..4a1d5757d1 100644
--- a/binaries/data/mods/public/audio/attack/impact/shield_metal.xml
+++ b/binaries/data/mods/public/audio/attack/impact/shield_metal.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="no" ?>
 <SoundGroup>
 	<Gain>1</Gain>
-	<Priority>100</Priority>
+	<Priority>80</Priority>
 	<ConeGain>1</ConeGain>
 	<Looping>0</Looping>
 	<RandOrder>1</RandOrder>
@@ -9,19 +9,19 @@
 	<RandPitch>1</RandPitch>
 	<Threshold>1</Threshold>
 	<Path>audio/attack/impact/</Path>
-	<Sound>shieldimpmetal_22.ogg</Sound>
-	<Sound>shieldimpmetal_21.ogg</Sound>
-	<Sound>shieldimpmetal_26.ogg</Sound>
-	<Sound>shieldimpmetal_23.ogg</Sound>
-	<Sound>shieldimpmetal_24.ogg</Sound>
-	<Sound>shieldimpmetal_25.ogg</Sound>
-	<Sound>shieldimpmetal_213.ogg</Sound>
-	<Sound>shieldimpmetal_27.ogg</Sound>
-	<Sound>shieldimpmetal_28.ogg</Sound>
-	<Sound>shieldimpmetal_29.ogg</Sound>
-	<Sound>shieldimpmetal_210.ogg</Sound>
-	<Sound>shieldimpmetal_211.ogg</Sound>
-	<Sound>shieldimpmetal_212.ogg</Sound>
-	<Sound>shieldimpmetal_215.ogg</Sound>
-	<Sound>shieldimpmetal_214.ogg</Sound>
+	<Sound>shield_metal_01.ogg</Sound>
+	<Sound>shield_metal_02.ogg</Sound>
+	<Sound>shield_metal_03.ogg</Sound>
+	<Sound>shield_metal_04.ogg</Sound>
+	<Sound>shield_metal_05.ogg</Sound>
+	<Sound>shield_metal_06.ogg</Sound>
+	<Sound>shield_metal_07.ogg</Sound>
+	<Sound>shield_metal_08.ogg</Sound>
+	<Sound>shield_metal_09.ogg</Sound>
+	<Sound>shield_metal_10.ogg</Sound>
+	<Sound>shield_metal_11.ogg</Sound>
+	<Sound>shield_metal_12.ogg</Sound>
+	<Sound>shield_metal_13.ogg</Sound>
+	<Sound>shield_metal_14.ogg</Sound>
+	<Sound>shield_metal_15.ogg</Sound>
 </SoundGroup>
diff --git a/binaries/data/mods/public/audio/attack/impact/shieldimpmetal_21.ogg b/binaries/data/mods/public/audio/attack/impact/shield_metal_01.ogg
similarity index 100%
rename from binaries/data/mods/public/audio/attack/impact/shieldimpmetal_21.ogg
rename to binaries/data/mods/public/audio/attack/impact/shield_metal_01.ogg
diff --git a/binaries/data/mods/public/audio/attack/impact/shieldimpmetal_210.ogg b/binaries/data/mods/public/audio/attack/impact/shield_metal_02.ogg
similarity index 100%
rename from binaries/data/mods/public/audio/attack/impact/shieldimpmetal_210.ogg
rename to binaries/data/mods/public/audio/attack/impact/shield_metal_02.ogg
diff --git a/binaries/data/mods/public/audio/attack/impact/shieldimpmetal_211.ogg b/binaries/data/mods/public/audio/attack/impact/shield_metal_03.ogg
similarity index 100%
rename from binaries/data/mods/public/audio/attack/impact/shieldimpmetal_211.ogg
rename to binaries/data/mods/public/audio/attack/impact/shield_metal_03.ogg
diff --git a/binaries/data/mods/public/audio/attack/impact/shieldimpmetal_212.ogg b/binaries/data/mods/public/audio/attack/impact/shield_metal_04.ogg
similarity index 100%
rename from binaries/data/mods/public/audio/attack/impact/shieldimpmetal_212.ogg
rename to binaries/data/mods/public/audio/attack/impact/shield_metal_04.ogg
diff --git a/binaries/data/mods/public/audio/attack/impact/shieldimpmetal_213.ogg b/binaries/data/mods/public/audio/attack/impact/shield_metal_05.ogg
similarity index 100%
rename from binaries/data/mods/public/audio/attack/impact/shieldimpmetal_213.ogg
rename to binaries/data/mods/public/audio/attack/impact/shield_metal_05.ogg
diff --git a/binaries/data/mods/public/audio/attack/impact/shieldimpmetal_214.ogg b/binaries/data/mods/public/audio/attack/impact/shield_metal_06.ogg
similarity index 100%
rename from binaries/data/mods/public/audio/attack/impact/shieldimpmetal_214.ogg
rename to binaries/data/mods/public/audio/attack/impact/shield_metal_06.ogg
diff --git a/binaries/data/mods/public/audio/attack/impact/shieldimpmetal_215.ogg b/binaries/data/mods/public/audio/attack/impact/shield_metal_07.ogg
similarity index 100%
rename from binaries/data/mods/public/audio/attack/impact/shieldimpmetal_215.ogg
rename to binaries/data/mods/public/audio/attack/impact/shield_metal_07.ogg
diff --git a/binaries/data/mods/public/audio/attack/impact/shieldimpmetal_22.ogg b/binaries/data/mods/public/audio/attack/impact/shield_metal_08.ogg
similarity index 100%
rename from binaries/data/mods/public/audio/attack/impact/shieldimpmetal_22.ogg
rename to binaries/data/mods/public/audio/attack/impact/shield_metal_08.ogg
diff --git a/binaries/data/mods/public/audio/attack/impact/shieldimpmetal_23.ogg b/binaries/data/mods/public/audio/attack/impact/shield_metal_09.ogg
similarity index 100%
rename from binaries/data/mods/public/audio/attack/impact/shieldimpmetal_23.ogg
rename to binaries/data/mods/public/audio/attack/impact/shield_metal_09.ogg
diff --git a/binaries/data/mods/public/audio/attack/impact/shieldimpmetal_24.ogg b/binaries/data/mods/public/audio/attack/impact/shield_metal_10.ogg
similarity index 100%
rename from binaries/data/mods/public/audio/attack/impact/shieldimpmetal_24.ogg
rename to binaries/data/mods/public/audio/attack/impact/shield_metal_10.ogg
diff --git a/binaries/data/mods/public/audio/attack/impact/shieldimpmetal_25.ogg b/binaries/data/mods/public/audio/attack/impact/shield_metal_11.ogg
similarity index 100%
rename from binaries/data/mods/public/audio/attack/impact/shieldimpmetal_25.ogg
rename to binaries/data/mods/public/audio/attack/impact/shield_metal_11.ogg
diff --git a/binaries/data/mods/public/audio/attack/impact/shieldimpmetal_26.ogg b/binaries/data/mods/public/audio/attack/impact/shield_metal_12.ogg
similarity index 100%
rename from binaries/data/mods/public/audio/attack/impact/shieldimpmetal_26.ogg
rename to binaries/data/mods/public/audio/attack/impact/shield_metal_12.ogg
diff --git a/binaries/data/mods/public/audio/attack/impact/shieldimpmetal_27.ogg b/binaries/data/mods/public/audio/attack/impact/shield_metal_13.ogg
similarity index 100%
rename from binaries/data/mods/public/audio/attack/impact/shieldimpmetal_27.ogg
rename to binaries/data/mods/public/audio/attack/impact/shield_metal_13.ogg
diff --git a/binaries/data/mods/public/audio/attack/impact/shieldimpmetal_28.ogg b/binaries/data/mods/public/audio/attack/impact/shield_metal_14.ogg
similarity index 100%
rename from binaries/data/mods/public/audio/attack/impact/shieldimpmetal_28.ogg
rename to binaries/data/mods/public/audio/attack/impact/shield_metal_14.ogg
diff --git a/binaries/data/mods/public/audio/attack/impact/shieldimpmetal_29.ogg b/binaries/data/mods/public/audio/attack/impact/shield_metal_15.ogg
similarity index 100%
rename from binaries/data/mods/public/audio/attack/impact/shieldimpmetal_29.ogg
rename to binaries/data/mods/public/audio/attack/impact/shield_metal_15.ogg
diff --git a/binaries/data/mods/public/audio/attack/impact/shield_wood.xml b/binaries/data/mods/public/audio/attack/impact/shield_wood.xml
new file mode 100644
index 0000000000..f9637aba4c
--- /dev/null
+++ b/binaries/data/mods/public/audio/attack/impact/shield_wood.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8" standalone="no" ?>
+<SoundGroup>
+	<Gain>1</Gain>
+	<Priority>80</Priority>
+	<ConeGain>1</ConeGain>
+	<Looping>0</Looping>
+	<RandOrder>1</RandOrder>
+	<RandGain>1</RandGain>
+	<RandPitch>1</RandPitch>
+	<Threshold>1</Threshold>
+	<Path>audio/attack/impact/</Path>
+	<Sound>shield_wood_01.ogg</Sound>
+	<Sound>shield_wood_02.ogg</Sound>
+	<Sound>shield_wood_03.ogg</Sound>
+	<Sound>shield_wood_04.ogg</Sound>
+	<Sound>shield_wood_05.ogg</Sound>
+	<Sound>shield_wood_06.ogg</Sound>
+	<Sound>shield_wood_07.ogg</Sound>
+	<Sound>shield_wood_08.ogg</Sound>
+	<Sound>shield_wood_09.ogg</Sound>
+	<Sound>shield_wood_10.ogg</Sound>
+	<Sound>shield_wood_11.ogg</Sound>
+	<Sound>shield_wood_12.ogg</Sound>
+	<Sound>shield_wood_13.ogg</Sound>
+	<Sound>shield_wood_14.ogg</Sound>
+	<Sound>shield_wood_15.ogg</Sound>
+	<Sound>shield_wood_16.ogg</Sound>
+</SoundGroup>
diff --git a/binaries/data/mods/public/audio/attack/impact/shieldimpwooden_21.ogg b/binaries/data/mods/public/audio/attack/impact/shield_wood_01.ogg
similarity index 100%
rename from binaries/data/mods/public/audio/attack/impact/shieldimpwooden_21.ogg
rename to binaries/data/mods/public/audio/attack/impact/shield_wood_01.ogg
diff --git a/binaries/data/mods/public/audio/attack/impact/shieldimpwooden_210.ogg b/binaries/data/mods/public/audio/attack/impact/shield_wood_02.ogg
similarity index 100%
rename from binaries/data/mods/public/audio/attack/impact/shieldimpwooden_210.ogg
rename to binaries/data/mods/public/audio/attack/impact/shield_wood_02.ogg
diff --git a/binaries/data/mods/public/audio/attack/impact/shieldimpwooden_211.ogg b/binaries/data/mods/public/audio/attack/impact/shield_wood_03.ogg
similarity index 100%
rename from binaries/data/mods/public/audio/attack/impact/shieldimpwooden_211.ogg
rename to binaries/data/mods/public/audio/attack/impact/shield_wood_03.ogg
diff --git a/binaries/data/mods/public/audio/attack/impact/shieldimpwooden_212.ogg b/binaries/data/mods/public/audio/attack/impact/shield_wood_04.ogg
similarity index 100%
rename from binaries/data/mods/public/audio/attack/impact/shieldimpwooden_212.ogg
rename to binaries/data/mods/public/audio/attack/impact/shield_wood_04.ogg
diff --git a/binaries/data/mods/public/audio/attack/impact/shieldimpwooden_213.ogg b/binaries/data/mods/public/audio/attack/impact/shield_wood_05.ogg
similarity index 100%
rename from binaries/data/mods/public/audio/attack/impact/shieldimpwooden_213.ogg
rename to binaries/data/mods/public/audio/attack/impact/shield_wood_05.ogg
diff --git a/binaries/data/mods/public/audio/attack/impact/shieldimpwooden_214.ogg b/binaries/data/mods/public/audio/attack/impact/shield_wood_06.ogg
similarity index 100%
rename from binaries/data/mods/public/audio/attack/impact/shieldimpwooden_214.ogg
rename to binaries/data/mods/public/audio/attack/impact/shield_wood_06.ogg
diff --git a/binaries/data/mods/public/audio/attack/impact/shieldimpwooden_215.ogg b/binaries/data/mods/public/audio/attack/impact/shield_wood_07.ogg
similarity index 100%
rename from binaries/data/mods/public/audio/attack/impact/shieldimpwooden_215.ogg
rename to binaries/data/mods/public/audio/attack/impact/shield_wood_07.ogg
diff --git a/binaries/data/mods/public/audio/attack/impact/shieldimpwooden_216.ogg b/binaries/data/mods/public/audio/attack/impact/shield_wood_08.ogg
similarity index 100%
rename from binaries/data/mods/public/audio/attack/impact/shieldimpwooden_216.ogg
rename to binaries/data/mods/public/audio/attack/impact/shield_wood_08.ogg
diff --git a/binaries/data/mods/public/audio/attack/impact/shieldimpwooden_22.ogg b/binaries/data/mods/public/audio/attack/impact/shield_wood_09.ogg
similarity index 100%
rename from binaries/data/mods/public/audio/attack/impact/shieldimpwooden_22.ogg
rename to binaries/data/mods/public/audio/attack/impact/shield_wood_09.ogg
diff --git a/binaries/data/mods/public/audio/attack/impact/shieldimpwooden_23.ogg b/binaries/data/mods/public/audio/attack/impact/shield_wood_10.ogg
similarity index 100%
rename from binaries/data/mods/public/audio/attack/impact/shieldimpwooden_23.ogg
rename to binaries/data/mods/public/audio/attack/impact/shield_wood_10.ogg
diff --git a/binaries/data/mods/public/audio/attack/impact/shieldimpwooden_24.ogg b/binaries/data/mods/public/audio/attack/impact/shield_wood_11.ogg
similarity index 100%
rename from binaries/data/mods/public/audio/attack/impact/shieldimpwooden_24.ogg
rename to binaries/data/mods/public/audio/attack/impact/shield_wood_11.ogg
diff --git a/binaries/data/mods/public/audio/attack/impact/shieldimpwooden_25.ogg b/binaries/data/mods/public/audio/attack/impact/shield_wood_12.ogg
similarity index 100%
rename from binaries/data/mods/public/audio/attack/impact/shieldimpwooden_25.ogg
rename to binaries/data/mods/public/audio/attack/impact/shield_wood_12.ogg
diff --git a/binaries/data/mods/public/audio/attack/impact/shieldimpwooden_26.ogg b/binaries/data/mods/public/audio/attack/impact/shield_wood_13.ogg
similarity index 100%
rename from binaries/data/mods/public/audio/attack/impact/shieldimpwooden_26.ogg
rename to binaries/data/mods/public/audio/attack/impact/shield_wood_13.ogg
diff --git a/binaries/data/mods/public/audio/attack/impact/shieldimpwooden_27.ogg b/binaries/data/mods/public/audio/attack/impact/shield_wood_14.ogg
similarity index 100%
rename from binaries/data/mods/public/audio/attack/impact/shieldimpwooden_27.ogg
rename to binaries/data/mods/public/audio/attack/impact/shield_wood_14.ogg
diff --git a/binaries/data/mods/public/audio/attack/impact/shieldimpwooden_28.ogg b/binaries/data/mods/public/audio/attack/impact/shield_wood_15.ogg
similarity index 100%
rename from binaries/data/mods/public/audio/attack/impact/shieldimpwooden_28.ogg
rename to binaries/data/mods/public/audio/attack/impact/shield_wood_15.ogg
diff --git a/binaries/data/mods/public/audio/attack/impact/shieldimpwooden_29.ogg b/binaries/data/mods/public/audio/attack/impact/shield_wood_16.ogg
similarity index 100%
rename from binaries/data/mods/public/audio/attack/impact/shieldimpwooden_29.ogg
rename to binaries/data/mods/public/audio/attack/impact/shield_wood_16.ogg
diff --git a/binaries/data/mods/public/audio/attack/impact/shield_wooden.xml b/binaries/data/mods/public/audio/attack/impact/shield_wooden.xml
deleted file mode 100644
index 5f974e3970..0000000000
--- a/binaries/data/mods/public/audio/attack/impact/shield_wooden.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no" ?>
-<SoundGroup>
-	<Gain>1</Gain>
-	<Priority>100</Priority>
-	<ConeGain>1</ConeGain>
-	<Looping>0</Looping>
-	<RandOrder>1</RandOrder>
-	<RandGain>1</RandGain>
-	<RandPitch>1</RandPitch>
-	<Threshold>1</Threshold>
-	<Path>audio/attack/impact/</Path>
-	<Sound>shieldimpwooden_27.ogg</Sound>
-	<Sound>shieldimpwooden_21.ogg</Sound>
-	<Sound>shieldimpwooden_22.ogg</Sound>
-	<Sound>shieldimpwooden_23.ogg</Sound>
-	<Sound>shieldimpwooden_24.ogg</Sound>
-	<Sound>shieldimpwooden_25.ogg</Sound>
-	<Sound>shieldimpwooden_26.ogg</Sound>
-	<Sound>shieldimpwooden_212.ogg</Sound>
-	<Sound>shieldimpwooden_28.ogg</Sound>
-	<Sound>shieldimpwooden_29.ogg</Sound>
-	<Sound>shieldimpwooden_210.ogg</Sound>
-	<Sound>shieldimpwooden_211.ogg</Sound>
-	<Sound>shieldimpwooden_216.ogg</Sound>
-	<Sound>shieldimpwooden_213.ogg</Sound>
-	<Sound>shieldimpwooden_214.ogg</Sound>
-	<Sound>shieldimpwooden_215.ogg</Sound>
-</SoundGroup>