diff --git a/src/generated/resources/.cache/b69ee8a2655365569b979911c0440daa8c470ac2 b/src/generated/resources/.cache/b69ee8a2655365569b979911c0440daa8c470ac2
index 64dce23f5..3338d4d82 100644
--- a/src/generated/resources/.cache/b69ee8a2655365569b979911c0440daa8c470ac2
+++ b/src/generated/resources/.cache/b69ee8a2655365569b979911c0440daa8c470ac2
@@ -1,4 +1,4 @@
-// 1.21.1	2025-05-21T21:32:11.461574	Item Models: superbwarfare
+// 1.21.1	2025-05-21T21:33:50.228816	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
@@ -67,7 +67,10 @@ afbfd24461fb7e6b43a8e029f0a894b84d8b6638 assets/superbwarfare/models/item/heavy_
 89750640cc16a7b2d5bc3fc82ec8a53026c0466e assets/superbwarfare/models/item/heavy_armament_module.json
 e7a6de100f377835831211168d98c8d19434af24 assets/superbwarfare/models/item/he_head.json
 d23520b099cb796401635fe75b5b852fc957d4ea assets/superbwarfare/models/item/high_energy_explosives.json
+53b1dfff2243bd3cc6996d68e6268dd1dd5fdbe7 assets/superbwarfare/models/item/hk_416.json
+3d1384927659fd860ed7b10eece61837202bf5f8 assets/superbwarfare/models/item/hk_416_base.json
 13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/hk_416_blueprint.json
+954f6b04fea509ed4572b15810f79364dfb0e63a assets/superbwarfare/models/item/hk_416_icon.json
 a5cf666a970906ba6ac0af9a4d5d52dd0e093dec assets/superbwarfare/models/item/hpj_11_blueprint.json
 13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/hunting_rifle_blueprint.json
 13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/insidious_blueprint.json
diff --git a/src/generated/resources/assets/superbwarfare/models/item/hk_416.json b/src/generated/resources/assets/superbwarfare/models/item/hk_416.json
new file mode 100644
index 000000000..58cf84ce6
--- /dev/null
+++ b/src/generated/resources/assets/superbwarfare/models/item/hk_416.json
@@ -0,0 +1,28 @@
+{
+  "parent": "minecraft:item/generated",
+  "base": {
+    "parent": "superbwarfare:item/hk_416_base"
+  },
+  "gui_light": "front",
+  "loader": "neoforge:separate_transforms",
+  "perspectives": {
+    "fixed": {
+      "parent": "superbwarfare:lod/hk_416"
+    },
+    "ground": {
+      "parent": "superbwarfare:lod/hk_416"
+    },
+    "gui": {
+      "parent": "superbwarfare:item/hk_416_icon"
+    },
+    "head": {
+      "parent": "superbwarfare:lod/hk_416"
+    },
+    "thirdperson_lefthand": {
+      "parent": "superbwarfare:lod/hk_416"
+    },
+    "thirdperson_righthand": {
+      "parent": "superbwarfare:lod/hk_416"
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/superbwarfare/models/item/hk_416_base.json b/src/generated/resources/assets/superbwarfare/models/item/hk_416_base.json
new file mode 100644
index 000000000..b18c17025
--- /dev/null
+++ b/src/generated/resources/assets/superbwarfare/models/item/hk_416_base.json
@@ -0,0 +1,6 @@
+{
+  "parent": "superbwarfare:displaysettings/hk_416.item",
+  "textures": {
+    "layer0": "superbwarfare:item/hk_416"
+  }
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/superbwarfare/models/item/hk_416_icon.json b/src/generated/resources/assets/superbwarfare/models/item/hk_416_icon.json
new file mode 100644
index 000000000..a756597c9
--- /dev/null
+++ b/src/generated/resources/assets/superbwarfare/models/item/hk_416_icon.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "superbwarfare:item/hk_416_icon"
+  }
+}
\ No newline at end of file
diff --git a/src/main/java/com/atsuishio/superbwarfare/client/model/item/Hk416ItemModel.java b/src/main/java/com/atsuishio/superbwarfare/client/model/item/Hk416ItemModel.java
index ca2f9bd92..6096b73fa 100644
--- a/src/main/java/com/atsuishio/superbwarfare/client/model/item/Hk416ItemModel.java
+++ b/src/main/java/com/atsuishio/superbwarfare/client/model/item/Hk416ItemModel.java
@@ -33,12 +33,12 @@ public class Hk416ItemModel extends GeoModel<Hk416Item> {
 
     @Override
     public ResourceLocation getModelResource(Hk416Item animatable) {
-        return Mod.loc("geo/hk416.geo.json");
+        return Mod.loc("geo/hk_416.geo.json");
     }
 
     @Override
     public ResourceLocation getTextureResource(Hk416Item animatable) {
-        return Mod.loc("textures/item/hk416.png");
+        return Mod.loc("textures/item/hk_416.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 5148d9995..0554fc621 100644
--- a/src/main/java/com/atsuishio/superbwarfare/datagen/ModItemModelProvider.java
+++ b/src/main/java/com/atsuishio/superbwarfare/datagen/ModItemModelProvider.java
@@ -35,6 +35,7 @@ public class ModItemModelProvider extends ItemModelProvider {
         gunItem(ModItems.DEVOTION);
         gunItem(ModItems.GLOCK_17);
         gunItem(ModItems.GLOCK_18, "glock_17");
+        gunItem(ModItems.HK_416);
 
         simpleItem(ModItems.EMPTY_PERK, "perk/");
 
diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/Hk416Item.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/Hk416Item.java
index 5a647cb20..420bc150b 100644
--- a/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/Hk416Item.java
+++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/Hk416Item.java
@@ -158,7 +158,7 @@ public class Hk416Item extends GunItem implements GeoItem {
 
     @Override
     public ResourceLocation getGunIcon() {
-        return Mod.loc("textures/gun_icon/hk416_icon.png");
+        return Mod.loc("textures/gun_icon/hk_416_icon.png");
     }
 
     @Override
diff --git a/src/main/resources/assets/superbwarfare/geo/hk416.geo.json b/src/main/resources/assets/superbwarfare/geo/hk_416.geo.json
similarity index 99%
rename from src/main/resources/assets/superbwarfare/geo/hk416.geo.json
rename to src/main/resources/assets/superbwarfare/geo/hk_416.geo.json
index cfbf5d5c0..65c302813 100644
--- a/src/main/resources/assets/superbwarfare/geo/hk416.geo.json
+++ b/src/main/resources/assets/superbwarfare/geo/hk_416.geo.json
@@ -3,7 +3,7 @@
 	"minecraft:geometry": [
 		{
 			"description": {
-				"identifier": "geometry.hk416",
+				"identifier": "geometry.hk_416",
 				"texture_width": 256,
 				"texture_height": 256,
 				"visible_bounds_width": 62,
diff --git a/src/main/resources/assets/superbwarfare/models/displaysettings/hk416.item.json b/src/main/resources/assets/superbwarfare/models/displaysettings/hk_416.item.json
similarity index 100%
rename from src/main/resources/assets/superbwarfare/models/displaysettings/hk416.item.json
rename to src/main/resources/assets/superbwarfare/models/displaysettings/hk_416.item.json
diff --git a/src/main/resources/assets/superbwarfare/models/item/hk416_base.json b/src/main/resources/assets/superbwarfare/models/item/hk416_base.json
deleted file mode 100644
index 538135c92..000000000
--- a/src/main/resources/assets/superbwarfare/models/item/hk416_base.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "parent": "superbwarfare:displaysettings/hk416.item",
-  "textures": {
-    "layer0": "superbwarfare:item/hk416"
-  }
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/superbwarfare/models/item/hk416_icon.json b/src/main/resources/assets/superbwarfare/models/item/hk416_icon.json
deleted file mode 100644
index ecdc357e8..000000000
--- a/src/main/resources/assets/superbwarfare/models/item/hk416_icon.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "parent": "item/generated",
-  "textures": {
-    "layer0": "superbwarfare:item/hk416_a5"
-  }
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/superbwarfare/models/item/hk_416.json b/src/main/resources/assets/superbwarfare/models/item/hk_416.json
deleted file mode 100644
index a247da068..000000000
--- a/src/main/resources/assets/superbwarfare/models/item/hk_416.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-	"loader": "neoforge:separate_transforms",
-	"gui_light": "front",
-	"base": {
-		"parent": "superbwarfare:item/hk416_base"
-	},
-	"perspectives": {
-		"gui": {
-			"parent": "superbwarfare:item/hk416_icon"
-		},
-		"thirdperson_righthand": {
-			"parent": "superbwarfare:item/hk4163d"
-		},
-		"thirdperson_lefthand": {
-			"parent": "superbwarfare:item/hk4163d"
-		},
-		"ground": {
-			"parent": "superbwarfare:item/hk4163d"
-		},
-		"fixed": {
-			"parent": "superbwarfare:item/hk4163d"
-		},
-		"head": {
-			"parent": "superbwarfare:item/hk4163d"
-		}
-	}
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/superbwarfare/models/item/hk4163d.json b/src/main/resources/assets/superbwarfare/models/lod/hk_416.json
similarity index 99%
rename from src/main/resources/assets/superbwarfare/models/item/hk4163d.json
rename to src/main/resources/assets/superbwarfare/models/lod/hk_416.json
index b544f4dae..e593e2c09 100644
--- a/src/main/resources/assets/superbwarfare/models/item/hk4163d.json
+++ b/src/main/resources/assets/superbwarfare/models/lod/hk_416.json
@@ -2,8 +2,8 @@
 	"credit": "Made with Blockbench",
 	"texture_size": [32, 32],
 	"textures": {
-		"0": "superbwarfare:item/hk4163d",
-		"particle": "superbwarfare:item/hk4163d"
+		"0": "superbwarfare:item/lod/hk_416",
+		"particle": "superbwarfare:item/lod/hk_416"
 	},
 	"elements": [
 		{
diff --git a/src/main/resources/assets/superbwarfare/textures/gun_icon/hk416_icon.png b/src/main/resources/assets/superbwarfare/textures/gun_icon/hk_416_icon.png
similarity index 100%
rename from src/main/resources/assets/superbwarfare/textures/gun_icon/hk416_icon.png
rename to src/main/resources/assets/superbwarfare/textures/gun_icon/hk_416_icon.png
diff --git a/src/main/resources/assets/superbwarfare/textures/item/hk416.png b/src/main/resources/assets/superbwarfare/textures/item/hk_416.png
similarity index 100%
rename from src/main/resources/assets/superbwarfare/textures/item/hk416.png
rename to src/main/resources/assets/superbwarfare/textures/item/hk_416.png
diff --git a/src/main/resources/assets/superbwarfare/textures/item/hk416_a5.png b/src/main/resources/assets/superbwarfare/textures/item/hk_416_icon.png
similarity index 100%
rename from src/main/resources/assets/superbwarfare/textures/item/hk416_a5.png
rename to src/main/resources/assets/superbwarfare/textures/item/hk_416_icon.png
diff --git a/src/main/resources/assets/superbwarfare/textures/item/hk4163d.png b/src/main/resources/assets/superbwarfare/textures/item/lod/hk_416.png
similarity index 100%
rename from src/main/resources/assets/superbwarfare/textures/item/hk4163d.png
rename to src/main/resources/assets/superbwarfare/textures/item/lod/hk_416.png