diff --git a/common/src/main/resources/assets/cobblemon/models/item/bug_gem_cluster.json b/common/src/main/resources/assets/cobblemon/models/item/bug_gem_cluster.json
index 2409de725e..c4edbc0c96 100644
--- a/common/src/main/resources/assets/cobblemon/models/item/bug_gem_cluster.json
+++ b/common/src/main/resources/assets/cobblemon/models/item/bug_gem_cluster.json
@@ -31,7 +31,7 @@
                           "predicate":  {
                                             "custom_model_data":  3
                                         },
-                          "model":  "cobblemon:item/type_gem_cluster_bug"
+                          "model":  "cobblemon:item/bug_gem_cluster"
                       }
                   ]
 }
\ No newline at end of file
diff --git a/common/src/main/resources/assets/cobblemon/models/item/dark_gem_cluster.json b/common/src/main/resources/assets/cobblemon/models/item/dark_gem_cluster.json
index 44b71cb0a6..9a420691fe 100644
--- a/common/src/main/resources/assets/cobblemon/models/item/dark_gem_cluster.json
+++ b/common/src/main/resources/assets/cobblemon/models/item/dark_gem_cluster.json
@@ -31,7 +31,7 @@
                           "predicate":  {
                                             "custom_model_data":  3
                                         },
-                          "model":  "cobblemon:item/type_gem_cluster_dark"
+                          "model":  "cobblemon:item/dark_gem_cluster"
                       }
                   ]
 }
\ No newline at end of file
diff --git a/common/src/main/resources/assets/cobblemon/models/item/dragon_gem_cluster.json b/common/src/main/resources/assets/cobblemon/models/item/dragon_gem_cluster.json
index f3e7415b81..b87113c48d 100644
--- a/common/src/main/resources/assets/cobblemon/models/item/dragon_gem_cluster.json
+++ b/common/src/main/resources/assets/cobblemon/models/item/dragon_gem_cluster.json
@@ -31,7 +31,7 @@
                           "predicate":  {
                                             "custom_model_data":  3
                                         },
-                          "model":  "cobblemon:item/type_gem_cluster_dragon"
+                          "model":  "cobblemon:item/dragon_gem_cluster"
                       }
                   ]
 }
\ No newline at end of file
diff --git a/common/src/main/resources/assets/cobblemon/models/item/electric_gem_cluster.json b/common/src/main/resources/assets/cobblemon/models/item/electric_gem_cluster.json
index 2167372257..29aad618c6 100644
--- a/common/src/main/resources/assets/cobblemon/models/item/electric_gem_cluster.json
+++ b/common/src/main/resources/assets/cobblemon/models/item/electric_gem_cluster.json
@@ -31,7 +31,7 @@
                           "predicate":  {
                                             "custom_model_data":  3
                                         },
-                          "model":  "cobblemon:item/type_gem_cluster_electric"
+                          "model":  "cobblemon:item/electric_gem_cluster"
                       }
                   ]
 }
\ No newline at end of file
diff --git a/common/src/main/resources/assets/cobblemon/models/item/fairy_gem_cluster.json b/common/src/main/resources/assets/cobblemon/models/item/fairy_gem_cluster.json
index 0f94b3dde6..148d2fd3d4 100644
--- a/common/src/main/resources/assets/cobblemon/models/item/fairy_gem_cluster.json
+++ b/common/src/main/resources/assets/cobblemon/models/item/fairy_gem_cluster.json
@@ -31,7 +31,7 @@
                           "predicate":  {
                                             "custom_model_data":  3
                                         },
-                          "model":  "cobblemon:item/type_gem_cluster_fairy"
+                          "model":  "cobblemon:item/fairy_gem_cluster"
                       }
                   ]
 }
\ No newline at end of file
diff --git a/common/src/main/resources/assets/cobblemon/models/item/fighting_gem_cluster.json b/common/src/main/resources/assets/cobblemon/models/item/fighting_gem_cluster.json
index 577143d221..29458763f6 100644
--- a/common/src/main/resources/assets/cobblemon/models/item/fighting_gem_cluster.json
+++ b/common/src/main/resources/assets/cobblemon/models/item/fighting_gem_cluster.json
@@ -31,7 +31,7 @@
                           "predicate":  {
                                             "custom_model_data":  3
                                         },
-                          "model":  "cobblemon:item/type_gem_cluster_fighting"
+                          "model":  "cobblemon:item/fighting_gem_cluster"
                       }
                   ]
 }
\ No newline at end of file
diff --git a/common/src/main/resources/assets/cobblemon/models/item/fire_gem_cluster.json b/common/src/main/resources/assets/cobblemon/models/item/fire_gem_cluster.json
index a2017c7b2c..a6d0a463ad 100644
--- a/common/src/main/resources/assets/cobblemon/models/item/fire_gem_cluster.json
+++ b/common/src/main/resources/assets/cobblemon/models/item/fire_gem_cluster.json
@@ -31,7 +31,7 @@
                           "predicate":  {
                                             "custom_model_data":  3
                                         },
-                          "model":  "cobblemon:item/type_gem_cluster_fire"
+                          "model":  "cobblemon:item/fire_gem_cluster"
                       }
                   ]
 }
\ No newline at end of file
diff --git a/common/src/main/resources/assets/cobblemon/models/item/flying_gem_cluster.json b/common/src/main/resources/assets/cobblemon/models/item/flying_gem_cluster.json
index 20c8974a0f..facf29c0a8 100644
--- a/common/src/main/resources/assets/cobblemon/models/item/flying_gem_cluster.json
+++ b/common/src/main/resources/assets/cobblemon/models/item/flying_gem_cluster.json
@@ -31,7 +31,7 @@
                           "predicate":  {
                                             "custom_model_data":  3
                                         },
-                          "model":  "cobblemon:item/type_gem_cluster_flying"
+                          "model":  "cobblemon:item/flying_gem_cluster"
                       }
                   ]
 }
\ No newline at end of file
diff --git a/common/src/main/resources/assets/cobblemon/models/item/ghost_gem_cluster.json b/common/src/main/resources/assets/cobblemon/models/item/ghost_gem_cluster.json
index d14a7cc9fe..a53d76a113 100644
--- a/common/src/main/resources/assets/cobblemon/models/item/ghost_gem_cluster.json
+++ b/common/src/main/resources/assets/cobblemon/models/item/ghost_gem_cluster.json
@@ -31,7 +31,7 @@
                           "predicate":  {
                                             "custom_model_data":  3
                                         },
-                          "model":  "cobblemon:item/type_gem_cluster_ghost"
+                          "model":  "cobblemon:item/ghost_gem_cluster"
                       }
                   ]
 }
\ No newline at end of file
diff --git a/common/src/main/resources/assets/cobblemon/models/item/grass_gem_cluster.json b/common/src/main/resources/assets/cobblemon/models/item/grass_gem_cluster.json
index 7598e7d704..dca2b8b555 100644
--- a/common/src/main/resources/assets/cobblemon/models/item/grass_gem_cluster.json
+++ b/common/src/main/resources/assets/cobblemon/models/item/grass_gem_cluster.json
@@ -31,7 +31,7 @@
                           "predicate":  {
                                             "custom_model_data":  3
                                         },
-                          "model":  "cobblemon:item/type_gem_cluster_grass"
+                          "model":  "cobblemon:item/grass_gem_cluster"
                       }
                   ]
 }
\ No newline at end of file
diff --git a/common/src/main/resources/assets/cobblemon/models/item/ground_gem_cluster.json b/common/src/main/resources/assets/cobblemon/models/item/ground_gem_cluster.json
index 45f6bfea21..12e9fc37fa 100644
--- a/common/src/main/resources/assets/cobblemon/models/item/ground_gem_cluster.json
+++ b/common/src/main/resources/assets/cobblemon/models/item/ground_gem_cluster.json
@@ -31,7 +31,7 @@
                           "predicate":  {
                                             "custom_model_data":  3
                                         },
-                          "model":  "cobblemon:item/type_gem_cluster_ground"
+                          "model":  "cobblemon:item/ground_gem_cluster"
                       }
                   ]
 }
\ No newline at end of file
diff --git a/common/src/main/resources/assets/cobblemon/models/item/ice_gem_cluster.json b/common/src/main/resources/assets/cobblemon/models/item/ice_gem_cluster.json
index 9d5ca7861c..f4b674f2f8 100644
--- a/common/src/main/resources/assets/cobblemon/models/item/ice_gem_cluster.json
+++ b/common/src/main/resources/assets/cobblemon/models/item/ice_gem_cluster.json
@@ -31,7 +31,7 @@
                           "predicate":  {
                                             "custom_model_data":  3
                                         },
-                          "model":  "cobblemon:item/type_gem_cluster_ice"
+                          "model":  "cobblemon:item/ice_gem_cluster"
                       }
                   ]
 }
\ No newline at end of file
diff --git a/common/src/main/resources/assets/cobblemon/models/item/normal_gem_cluster.json b/common/src/main/resources/assets/cobblemon/models/item/normal_gem_cluster.json
index e2fa4d88cf..3ca281491c 100644
--- a/common/src/main/resources/assets/cobblemon/models/item/normal_gem_cluster.json
+++ b/common/src/main/resources/assets/cobblemon/models/item/normal_gem_cluster.json
@@ -31,7 +31,7 @@
                           "predicate":  {
                                             "custom_model_data":  3
                                         },
-                          "model":  "cobblemon:item/type_gem_cluster_normal"
+                          "model":  "cobblemon:item/normal_gem_cluster"
                       }
                   ]
 }
\ No newline at end of file
diff --git a/common/src/main/resources/assets/cobblemon/models/item/poison_gem_cluster.json b/common/src/main/resources/assets/cobblemon/models/item/poison_gem_cluster.json
index 0af04a69cd..fefbd80b2b 100644
--- a/common/src/main/resources/assets/cobblemon/models/item/poison_gem_cluster.json
+++ b/common/src/main/resources/assets/cobblemon/models/item/poison_gem_cluster.json
@@ -31,7 +31,7 @@
                           "predicate":  {
                                             "custom_model_data":  3
                                         },
-                          "model":  "cobblemon:item/type_gem_cluster_poison"
+                          "model":  "cobblemon:item/poison_gem_cluster"
                       }
                   ]
 }
\ No newline at end of file
diff --git a/common/src/main/resources/assets/cobblemon/models/item/psychic_gem_cluster.json b/common/src/main/resources/assets/cobblemon/models/item/psychic_gem_cluster.json
index dcbfee8cd1..8bf98c4d82 100644
--- a/common/src/main/resources/assets/cobblemon/models/item/psychic_gem_cluster.json
+++ b/common/src/main/resources/assets/cobblemon/models/item/psychic_gem_cluster.json
@@ -31,7 +31,7 @@
                           "predicate":  {
                                             "custom_model_data":  3
                                         },
-                          "model":  "cobblemon:item/type_gem_cluster_psychic"
+                          "model":  "cobblemon:item/psychic_gem_cluster"
                       }
                   ]
 }
\ No newline at end of file
diff --git a/common/src/main/resources/assets/cobblemon/models/item/rock_gem_cluster.json b/common/src/main/resources/assets/cobblemon/models/item/rock_gem_cluster.json
index a3188d381c..0b55274a93 100644
--- a/common/src/main/resources/assets/cobblemon/models/item/rock_gem_cluster.json
+++ b/common/src/main/resources/assets/cobblemon/models/item/rock_gem_cluster.json
@@ -31,7 +31,7 @@
                           "predicate":  {
                                             "custom_model_data":  3
                                         },
-                          "model":  "cobblemon:item/type_gem_cluster_rock"
+                          "model":  "cobblemon:item/rock_gem_cluster"
                       }
                   ]
 }
\ No newline at end of file
diff --git a/common/src/main/resources/assets/cobblemon/models/item/steel_gem_cluster.json b/common/src/main/resources/assets/cobblemon/models/item/steel_gem_cluster.json
index 66ee83ad66..c5e4eeb640 100644
--- a/common/src/main/resources/assets/cobblemon/models/item/steel_gem_cluster.json
+++ b/common/src/main/resources/assets/cobblemon/models/item/steel_gem_cluster.json
@@ -31,7 +31,7 @@
                           "predicate":  {
                                             "custom_model_data":  3
                                         },
-                          "model":  "cobblemon:item/type_gem_cluster_steel"
+                          "model":  "cobblemon:item/steel_gem_cluster"
                       }
                   ]
 }
\ No newline at end of file
diff --git a/common/src/main/resources/assets/cobblemon/models/item/water_gem_cluster.json b/common/src/main/resources/assets/cobblemon/models/item/water_gem_cluster.json
index b2fcd30f17..898ebb05a2 100644
--- a/common/src/main/resources/assets/cobblemon/models/item/water_gem_cluster.json
+++ b/common/src/main/resources/assets/cobblemon/models/item/water_gem_cluster.json
@@ -31,7 +31,7 @@
                           "predicate":  {
                                             "custom_model_data":  3
                                         },
-                          "model":  "cobblemon:item/type_gem_cluster_water"
+                          "model":  "cobblemon:item/water_gem_cluster"
                       }
                   ]
 }
\ No newline at end of file