diff --git a/src/generated/resources/.cache/b69ee8a2655365569b979911c0440daa8c470ac2 b/src/generated/resources/.cache/b69ee8a2655365569b979911c0440daa8c470ac2
index ea090c8fe..e45c89ce8 100644
--- a/src/generated/resources/.cache/b69ee8a2655365569b979911c0440daa8c470ac2
+++ b/src/generated/resources/.cache/b69ee8a2655365569b979911c0440daa8c470ac2
@@ -1,4 +1,4 @@
-// 1.21.1	2025-05-21T23:37:51.9812731	Item Models: superbwarfare
+// 1.21.1	2025-05-21T23:39:01.6719818	Item Models: superbwarfare
 6c48f5010e7e2b8cd4d3ff85c8de45cf56f53268 assets/superbwarfare/models/item/aa_12.json
 fb3a995587b2c253571c3160ff02c2ad8c73ecf8 assets/superbwarfare/models/item/aa_12_base.json
 13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/aa_12_blueprint.json
@@ -137,7 +137,10 @@ e141044945c8a873fc0df3dcf9e7a486726c0807 assets/superbwarfare/models/item/m_60_i
 6c66b12b6402a01d28c5e514c04ba8fb3d23519b assets/superbwarfare/models/item/m_79_base.json
 13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/m_79_blueprint.json
 a16e65b4895406036d6348e601f1520f994b3795 assets/superbwarfare/models/item/m_79_icon.json
+2d78407b25edb7e54aa3171c6e4c13e4f65d4990 assets/superbwarfare/models/item/m_870.json
+c5161c419b3b090c08e65010825e18c0fbb5d343 assets/superbwarfare/models/item/m_870_base.json
 13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/m_870_blueprint.json
+c9c299481da1b79f3413b876d60f1bad7d891122 assets/superbwarfare/models/item/m_870_icon.json
 13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/m_98b_blueprint.json
 26848edc4a8e0971321c5fccb47dd7d0e89a9f18 assets/superbwarfare/models/item/netherite_action.json
 f5b4fc1445373e6acfaa077e109de693c624eb1e assets/superbwarfare/models/item/netherite_barrel.json
diff --git a/src/generated/resources/assets/superbwarfare/models/item/m_870.json b/src/generated/resources/assets/superbwarfare/models/item/m_870.json
new file mode 100644
index 000000000..3ebc94dbf
--- /dev/null
+++ b/src/generated/resources/assets/superbwarfare/models/item/m_870.json
@@ -0,0 +1,28 @@
+{
+  "parent": "minecraft:item/generated",
+  "base": {
+    "parent": "superbwarfare:item/m_870_base"
+  },
+  "gui_light": "front",
+  "loader": "neoforge:separate_transforms",
+  "perspectives": {
+    "fixed": {
+      "parent": "superbwarfare:lod/m_870"
+    },
+    "ground": {
+      "parent": "superbwarfare:lod/m_870"
+    },
+    "gui": {
+      "parent": "superbwarfare:item/m_870_icon"
+    },
+    "head": {
+      "parent": "superbwarfare:lod/m_870"
+    },
+    "thirdperson_lefthand": {
+      "parent": "superbwarfare:lod/m_870"
+    },
+    "thirdperson_righthand": {
+      "parent": "superbwarfare:lod/m_870"
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/superbwarfare/models/item/m_870_base.json b/src/generated/resources/assets/superbwarfare/models/item/m_870_base.json
new file mode 100644
index 000000000..0330118bc
--- /dev/null
+++ b/src/generated/resources/assets/superbwarfare/models/item/m_870_base.json
@@ -0,0 +1,6 @@
+{
+  "parent": "superbwarfare:displaysettings/m_870.item",
+  "textures": {
+    "layer0": "superbwarfare:item/m_870"
+  }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/superbwarfare/models/item/m_870_icon.json b/src/generated/resources/assets/superbwarfare/models/item/m_870_icon.json
new file mode 100644
index 000000000..b8912c437
--- /dev/null
+++ b/src/generated/resources/assets/superbwarfare/models/item/m_870_icon.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "superbwarfare:item/m_870_icon"
+  }
+}
\ No newline at end of file
diff --git a/src/main/java/com/atsuishio/superbwarfare/client/model/item/M870ItemModel.java b/src/main/java/com/atsuishio/superbwarfare/client/model/item/M870ItemModel.java
index 51ac0485f..19ca5caf6 100644
--- a/src/main/java/com/atsuishio/superbwarfare/client/model/item/M870ItemModel.java
+++ b/src/main/java/com/atsuishio/superbwarfare/client/model/item/M870ItemModel.java
@@ -19,17 +19,17 @@ public class M870ItemModel extends GeoModel<M870Item> {
 
     @Override
     public ResourceLocation getAnimationResource(M870Item animatable) {
-        return Mod.loc("animations/m870.animation.json");
+        return Mod.loc("animations/m_870.animation.json");
     }
 
     @Override
     public ResourceLocation getModelResource(M870Item animatable) {
-        return Mod.loc("geo/m870.geo.json");
+        return Mod.loc("geo/m_870.geo.json");
     }
 
     @Override
     public ResourceLocation getTextureResource(M870Item animatable) {
-        return Mod.loc("textures/item/m870.png");
+        return Mod.loc("textures/item/m_870.png");
     }
 
     @Override
diff --git a/src/main/java/com/atsuishio/superbwarfare/datagen/ModItemModelProvider.java b/src/main/java/com/atsuishio/superbwarfare/datagen/ModItemModelProvider.java
index 83c2d8d7b..337434471 100644
--- a/src/main/java/com/atsuishio/superbwarfare/datagen/ModItemModelProvider.java
+++ b/src/main/java/com/atsuishio/superbwarfare/datagen/ModItemModelProvider.java
@@ -45,6 +45,7 @@ public class ModItemModelProvider extends ItemModelProvider {
         gunItem(ModItems.M_60);
         gunItem(ModItems.M_79);
         gunItem(ModItems.M_1911);
+        gunItem(ModItems.M_870);
 
         simpleItem(ModItems.EMPTY_PERK, "perk/");
 
diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/shotgun/M870Item.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/shotgun/M870Item.java
index e0e833dd3..1907526de 100644
--- a/src/main/java/com/atsuishio/superbwarfare/item/gun/shotgun/M870Item.java
+++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/shotgun/M870Item.java
@@ -47,30 +47,30 @@ public class M870Item extends GunItem implements GeoItem {
         var data = GunData.from(stack);
 
         if (data.bolt.actionTimer.get() > 0) {
-            return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m870.shift"));
+            return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m_870.shift"));
         }
 
         if (data.reload.stage() == 1 && data.reload.prepareLoadTimer.get() > 0) {
-            return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m870.preparealt"));
+            return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m_870.preparealt"));
         }
 
         if (data.reload.stage() == 1 && data.reload.prepareTimer.get() > 0) {
-            return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m870.prepare"));
+            return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m_870.prepare"));
         }
 
         if (data.loadIndex.get() == 0 && data.reload.stage() == 2) {
-            return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m870.iterativeload"));
+            return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m_870.iterativeload"));
         }
 
         if (data.loadIndex.get() == 1 && data.reload.stage() == 2) {
-            return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m870.iterativeload2"));
+            return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m_870.iterativeload2"));
         }
 
         if (data.reload.stage() == 3) {
-            return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m870.finish"));
+            return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m_870.finish"));
         }
 
-        return event.setAndContinue(RawAnimation.begin().thenLoop("animation.m870.idle"));
+        return event.setAndContinue(RawAnimation.begin().thenLoop("animation.m_870.idle"));
     }
 
     private PlayState idlePredicate(AnimationState<M870Item> event) {
@@ -87,13 +87,13 @@ public class M870Item extends GunItem implements GeoItem {
                 && ClientEventHandler.drawTime < 0.01
                 && !data.reloading()) {
             if (ClientEventHandler.tacticalSprint) {
-                return event.setAndContinue(RawAnimation.begin().thenLoop("animation.m870.run_fast"));
+                return event.setAndContinue(RawAnimation.begin().thenLoop("animation.m_870.run_fast"));
             } else {
-                return event.setAndContinue(RawAnimation.begin().thenLoop("animation.m870.run"));
+                return event.setAndContinue(RawAnimation.begin().thenLoop("animation.m_870.run"));
             }
         }
 
-        event.getController().setAnimation(RawAnimation.begin().thenLoop("animation.m870.idle"));
+        event.getController().setAnimation(RawAnimation.begin().thenLoop("animation.m_870.idle"));
         return PlayState.CONTINUE;
     }
 
@@ -119,7 +119,7 @@ public class M870Item extends GunItem implements GeoItem {
 
     @Override
     public ResourceLocation getGunIcon() {
-        return Mod.loc("textures/gun_icon/m870_icon.png");
+        return Mod.loc("textures/gun_icon/m_870_icon.png");
     }
 
     @Override
diff --git a/src/main/resources/assets/superbwarfare/animations/m870.animation.json b/src/main/resources/assets/superbwarfare/animations/m_870.animation.json
similarity index 99%
rename from src/main/resources/assets/superbwarfare/animations/m870.animation.json
rename to src/main/resources/assets/superbwarfare/animations/m_870.animation.json
index 429e63de7..a7430c215 100644
--- a/src/main/resources/assets/superbwarfare/animations/m870.animation.json
+++ b/src/main/resources/assets/superbwarfare/animations/m_870.animation.json
@@ -1,11 +1,11 @@
 {
 	"format_version": "1.8.0",
 	"animations": {
-		"animation.m870.idle": {
+		"animation.m_870.idle": {
 			"loop": true,
 			"animation_length": 0.25
 		},
-		"animation.m870.run": {
+		"animation.m_870.run": {
 			"loop": true,
 			"animation_length": 0.8,
 			"bones": {
@@ -72,7 +72,7 @@
 				}
 			}
 		},
-		"animation.m870.run_fast": {
+		"animation.m_870.run_fast": {
 			"loop": true,
 			"animation_length": 0.7,
 			"bones": {
@@ -193,7 +193,7 @@
 				}
 			}
 		},
-		"animation.m870.prepare": {
+		"animation.m_870.prepare": {
 			"animation_length": 0.75,
 			"bones": {
 				"main": {
@@ -291,7 +291,7 @@
 				}
 			}
 		},
-		"animation.m870.preparealt": {
+		"animation.m_870.preparealt": {
 			"loop": "hold_on_last_frame",
 			"animation_length": 2,
 			"bones": {
@@ -756,7 +756,7 @@
 				}
 			}
 		},
-		"animation.m870.iterativeload": {
+		"animation.m_870.iterativeload": {
 			"animation_length": 0.8,
 			"bones": {
 				"main": {
@@ -972,7 +972,7 @@
 				}
 			}
 		},
-		"animation.m870.iterativeload2": {
+		"animation.m_870.iterativeload2": {
 			"animation_length": 0.8,
 			"bones": {
 				"main": {
@@ -1188,7 +1188,7 @@
 				}
 			}
 		},
-		"animation.m870.shift": {
+		"animation.m_870.shift": {
 			"loop": "hold_on_last_frame",
 			"animation_length": 1,
 			"bones": {
@@ -1419,7 +1419,7 @@
 				}
 			}
 		},
-		"animation.m870.finish": {
+		"animation.m_870.finish": {
 			"animation_length": 0.75,
 			"bones": {
 				"main": {
diff --git a/src/main/resources/assets/superbwarfare/geo/m870.geo.json b/src/main/resources/assets/superbwarfare/geo/m_870.geo.json
similarity index 99%
rename from src/main/resources/assets/superbwarfare/geo/m870.geo.json
rename to src/main/resources/assets/superbwarfare/geo/m_870.geo.json
index 078038b1a..17dbecd52 100644
--- a/src/main/resources/assets/superbwarfare/geo/m870.geo.json
+++ b/src/main/resources/assets/superbwarfare/geo/m_870.geo.json
@@ -3,7 +3,7 @@
 	"minecraft:geometry": [
 		{
 			"description": {
-				"identifier": "geometry.m870",
+				"identifier": "geometry.m_870",
 				"texture_width": 64,
 				"texture_height": 64,
 				"visible_bounds_width": 15,
diff --git a/src/main/resources/assets/superbwarfare/models/displaysettings/m870.item.json b/src/main/resources/assets/superbwarfare/models/displaysettings/m_870.item.json
similarity index 100%
rename from src/main/resources/assets/superbwarfare/models/displaysettings/m870.item.json
rename to src/main/resources/assets/superbwarfare/models/displaysettings/m_870.item.json
diff --git a/src/main/resources/assets/superbwarfare/models/item/m_870.json b/src/main/resources/assets/superbwarfare/models/item/m_870.json
deleted file mode 100644
index d0cd39c24..000000000
--- a/src/main/resources/assets/superbwarfare/models/item/m_870.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-	"loader": "neoforge:separate_transforms",
-	"gui_light": "front",
-	"base": {
-		"parent": "superbwarfare:item/m_870_base"
-	},
-	"perspectives": {
-		"gui": {
-			"parent": "superbwarfare:item/m_870_icon"
-		},
-		"thirdperson_righthand": {
-			"parent": "superbwarfare:item/m8703d"
-		},
-		"thirdperson_lefthand": {
-			"parent": "superbwarfare:item/m8703d"
-		},
-		"ground": {
-			"parent": "superbwarfare:item/m8703d"
-		},
-		"fixed": {
-			"parent": "superbwarfare:item/m8703d"
-		},
-		"head": {
-			"parent": "superbwarfare:item/m8703d"
-		}
-	}
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/superbwarfare/models/item/m_870_base.json b/src/main/resources/assets/superbwarfare/models/item/m_870_base.json
deleted file mode 100644
index 2e2d7c1a5..000000000
--- a/src/main/resources/assets/superbwarfare/models/item/m_870_base.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "parent": "superbwarfare:displaysettings/m870.item",
-  "textures": {
-    "layer0": "superbwarfare:item/m870"
-  }
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/superbwarfare/models/item/m_870_icon.json b/src/main/resources/assets/superbwarfare/models/item/m_870_icon.json
deleted file mode 100644
index 6d2a526d8..000000000
--- a/src/main/resources/assets/superbwarfare/models/item/m_870_icon.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "parent": "item/generated",
-  "textures": {
-    "layer0": "superbwarfare:item/m870_icon"
-  }
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/superbwarfare/models/item/m8703d.json b/src/main/resources/assets/superbwarfare/models/lod/m_870.json
similarity index 99%
rename from src/main/resources/assets/superbwarfare/models/item/m8703d.json
rename to src/main/resources/assets/superbwarfare/models/lod/m_870.json
index 763659a32..739bfb4c2 100644
--- a/src/main/resources/assets/superbwarfare/models/item/m8703d.json
+++ b/src/main/resources/assets/superbwarfare/models/lod/m_870.json
@@ -2,7 +2,7 @@
 	"credit": "Made with Blockbench",
 	"texture_size": [32, 32],
 	"textures": {
-		"1": "superbwarfare:item/m8703d"
+		"1": "superbwarfare:item/lod/m_870"
 	},
 	"elements": [
 		{
diff --git a/src/main/resources/assets/superbwarfare/textures/gun_icon/m870_icon.png b/src/main/resources/assets/superbwarfare/textures/gun_icon/m_870_icon.png
similarity index 100%
rename from src/main/resources/assets/superbwarfare/textures/gun_icon/m870_icon.png
rename to src/main/resources/assets/superbwarfare/textures/gun_icon/m_870_icon.png
diff --git a/src/main/resources/assets/superbwarfare/textures/item/m8703d.png b/src/main/resources/assets/superbwarfare/textures/item/lod/m_870.png
similarity index 100%
rename from src/main/resources/assets/superbwarfare/textures/item/m8703d.png
rename to src/main/resources/assets/superbwarfare/textures/item/lod/m_870.png
diff --git a/src/main/resources/assets/superbwarfare/textures/item/m870.png b/src/main/resources/assets/superbwarfare/textures/item/m_870.png
similarity index 100%
rename from src/main/resources/assets/superbwarfare/textures/item/m870.png
rename to src/main/resources/assets/superbwarfare/textures/item/m_870.png
diff --git a/src/main/resources/assets/superbwarfare/textures/item/m870_icon.png b/src/main/resources/assets/superbwarfare/textures/item/m_870_icon.png
similarity index 100%
rename from src/main/resources/assets/superbwarfare/textures/item/m870_icon.png
rename to src/main/resources/assets/superbwarfare/textures/item/m_870_icon.png