diff --git a/gfx/NeoDays/pngs_large_20x20/wielded/3371_overlay_male_wielded_m4a1_0.png b/gfx/NeoDays/pngs_large_20x20/wielded/3371_overlay_male_wielded_modular_m4_carbine_0.png
similarity index 100%
rename from gfx/NeoDays/pngs_large_20x20/wielded/3371_overlay_male_wielded_m4a1_0.png
rename to gfx/NeoDays/pngs_large_20x20/wielded/3371_overlay_male_wielded_modular_m4_carbine_0.png
diff --git a/gfx/NeoDays/pngs_large_20x20/wielded/3372_overlay_male_wielded_m16a4_0.png b/gfx/NeoDays/pngs_large_20x20/wielded/3372_overlay_male_wielded_modular_m16a4_0.png
similarity index 100%
rename from gfx/NeoDays/pngs_large_20x20/wielded/3372_overlay_male_wielded_m16a4_0.png
rename to gfx/NeoDays/pngs_large_20x20/wielded/3372_overlay_male_wielded_modular_m16a4_0.png
diff --git a/gfx/NeoDays/pngs_large_20x20/wielded/3459_overlay_female_wielded_m4a1_0.png b/gfx/NeoDays/pngs_large_20x20/wielded/3459_overlay_female_wielded_modular_m4_carbine_0.png
similarity index 100%
rename from gfx/NeoDays/pngs_large_20x20/wielded/3459_overlay_female_wielded_m4a1_0.png
rename to gfx/NeoDays/pngs_large_20x20/wielded/3459_overlay_female_wielded_modular_m4_carbine_0.png
diff --git a/gfx/NeoDays/pngs_large_20x20/wielded/3460_overlay_female_wielded_m16a4_0.png b/gfx/NeoDays/pngs_large_20x20/wielded/3460_overlay_female_wielded_modular_m16a4_0.png
similarity index 100%
rename from gfx/NeoDays/pngs_large_20x20/wielded/3460_overlay_female_wielded_m16a4_0.png
rename to gfx/NeoDays/pngs_large_20x20/wielded/3460_overlay_female_wielded_modular_m16a4_0.png
diff --git a/gfx/NeoDays/pngs_large_20x20/wielded/overlay_female_wielded_m16a4_0.json b/gfx/NeoDays/pngs_large_20x20/wielded/overlay_female_wielded_m16a4_0.json
deleted file mode 100644
index 5af4fb958a..0000000000
--- a/gfx/NeoDays/pngs_large_20x20/wielded/overlay_female_wielded_m16a4_0.json
+++ /dev/null
@@ -1 +0,0 @@
-{"id": ["overlay_female_wielded_m16a4", "overlay_female_wielded_colt_ro635"], "fg": ["3460_overlay_female_wielded_m16a4_0"], "rotates": false, "bg": []}
diff --git a/gfx/NeoDays/pngs_large_20x20/wielded/overlay_female_wielded_m4a1_overlay_female_wielded_h&k416a5_0.json b/gfx/NeoDays/pngs_large_20x20/wielded/overlay_female_wielded_m4a1_overlay_female_wielded_h&k416a5_0.json
deleted file mode 100644
index f795061a5c..0000000000
--- a/gfx/NeoDays/pngs_large_20x20/wielded/overlay_female_wielded_m4a1_overlay_female_wielded_h&k416a5_0.json
+++ /dev/null
@@ -1 +0,0 @@
-{"id": ["overlay_female_wielded_m4a1", "overlay_female_wielded_h&k416a5"], "fg": ["3459_overlay_female_wielded_m4a1_0"], "rotates": false, "bg": []}
\ No newline at end of file
diff --git a/gfx/NeoDays/pngs_large_20x20/wielded/overlay_female_wielded_ar15.png b/gfx/NeoDays/pngs_large_20x20/wielded/overlay_female_wielded_modular_ar15.png
similarity index 100%
rename from gfx/NeoDays/pngs_large_20x20/wielded/overlay_female_wielded_ar15.png
rename to gfx/NeoDays/pngs_large_20x20/wielded/overlay_female_wielded_modular_ar15.png
diff --git a/gfx/NeoDays/pngs_large_20x20/wielded/overlay_female_wielded_modular_m16a4_0.json b/gfx/NeoDays/pngs_large_20x20/wielded/overlay_female_wielded_modular_m16a4_0.json
new file mode 100644
index 0000000000..5ebdff71f9
--- /dev/null
+++ b/gfx/NeoDays/pngs_large_20x20/wielded/overlay_female_wielded_modular_m16a4_0.json
@@ -0,0 +1 @@
+{"id": ["overlay_female_wielded_modular_m16a4", "overlay_female_wielded_colt_ro635"], "fg": ["3460_overlay_female_wielded_modular_m16a4_0"], "rotates": false, "bg": []}
diff --git a/gfx/NeoDays/pngs_large_20x20/wielded/overlay_female_wielded_modular_m4_carbine_overlay_female_wielded_h&k416a5_0.json b/gfx/NeoDays/pngs_large_20x20/wielded/overlay_female_wielded_modular_m4_carbine_overlay_female_wielded_h&k416a5_0.json
new file mode 100644
index 0000000000..3d19647825
--- /dev/null
+++ b/gfx/NeoDays/pngs_large_20x20/wielded/overlay_female_wielded_modular_m4_carbine_overlay_female_wielded_h&k416a5_0.json
@@ -0,0 +1 @@
+{"id": ["overlay_female_wielded_modular_m4_carbine", "overlay_female_wielded_h&k416a5"], "fg": ["3459_overlay_female_wielded_modular_m4_carbine_0"], "rotates": false, "bg": []}
diff --git a/gfx/NeoDays/pngs_large_20x20/wielded/overlay_male_wielded_m16a4_0.json b/gfx/NeoDays/pngs_large_20x20/wielded/overlay_male_wielded_m16a4_0.json
deleted file mode 100644
index 26e1aa9729..0000000000
--- a/gfx/NeoDays/pngs_large_20x20/wielded/overlay_male_wielded_m16a4_0.json
+++ /dev/null
@@ -1 +0,0 @@
-{"id": ["overlay_male_wielded_m16a4", "overlay_male_wielded_colt_ro635"], "fg": ["3372_overlay_male_wielded_m16a4_0"], "rotates": false, "bg": []}
diff --git a/gfx/NeoDays/pngs_large_20x20/wielded/overlay_male_wielded_m4a1_overlay_male_wielded_h&k416a5_0.json b/gfx/NeoDays/pngs_large_20x20/wielded/overlay_male_wielded_m4a1_overlay_male_wielded_h&k416a5_0.json
deleted file mode 100644
index 56b758790b..0000000000
--- a/gfx/NeoDays/pngs_large_20x20/wielded/overlay_male_wielded_m4a1_overlay_male_wielded_h&k416a5_0.json
+++ /dev/null
@@ -1 +0,0 @@
-{"id": ["overlay_male_wielded_m4a1", "overlay_male_wielded_h&k416a5"], "fg": ["3371_overlay_male_wielded_m4a1_0"], "rotates": false, "bg": []}
\ No newline at end of file
diff --git a/gfx/NeoDays/pngs_large_20x20/wielded/overlay_male_wielded_ar15.png b/gfx/NeoDays/pngs_large_20x20/wielded/overlay_male_wielded_modular_ar15.png
similarity index 100%
rename from gfx/NeoDays/pngs_large_20x20/wielded/overlay_male_wielded_ar15.png
rename to gfx/NeoDays/pngs_large_20x20/wielded/overlay_male_wielded_modular_ar15.png
diff --git a/gfx/NeoDays/pngs_large_20x20/wielded/overlay_male_wielded_modular_m16a4_0.json b/gfx/NeoDays/pngs_large_20x20/wielded/overlay_male_wielded_modular_m16a4_0.json
new file mode 100644
index 0000000000..e3fb57d775
--- /dev/null
+++ b/gfx/NeoDays/pngs_large_20x20/wielded/overlay_male_wielded_modular_m16a4_0.json
@@ -0,0 +1 @@
+{"id": ["overlay_male_wielded_modular_m16a4", "overlay_male_wielded_colt_ro635"], "fg": ["3372_overlay_male_wielded_modular_m16a4_0"], "rotates": false, "bg": []}
diff --git a/gfx/NeoDays/pngs_large_20x20/wielded/overlay_male_wielded_modular_m4_carbine_overlay_male_wielded_h&k416a5_0.json b/gfx/NeoDays/pngs_large_20x20/wielded/overlay_male_wielded_modular_m4_carbine_overlay_male_wielded_h&k416a5_0.json
new file mode 100644
index 0000000000..746cfa0c0a
--- /dev/null
+++ b/gfx/NeoDays/pngs_large_20x20/wielded/overlay_male_wielded_modular_m4_carbine_overlay_male_wielded_h&k416a5_0.json
@@ -0,0 +1 @@
+{"id": ["overlay_male_wielded_modular_m4_carbine", "overlay_male_wielded_h&k416a5"], "fg": ["3371_overlay_male_wielded_modular_m4_carbine_0"], "rotates": false, "bg": []}