diff --git a/common/src/generated/resources/assets/waystones/items/black_portstone.json b/common/src/generated/resources/assets/waystones/items/black_portstone.json
index 21a65e2a..43325327 100644
--- a/common/src/generated/resources/assets/waystones/items/black_portstone.json
+++ b/common/src/generated/resources/assets/waystones/items/black_portstone.json
@@ -1,7 +1,7 @@
 {
   "model": {
     "type": "minecraft:model",
-    "model": "waystones:item/black_portstone",
+    "model": "waystones:item/portstone",
     "tints": [
       {
         "type": "minecraft:constant",
diff --git a/common/src/generated/resources/assets/waystones/items/black_sharestone.json b/common/src/generated/resources/assets/waystones/items/black_sharestone.json
index 3ccd7cd4..7311330e 100644
--- a/common/src/generated/resources/assets/waystones/items/black_sharestone.json
+++ b/common/src/generated/resources/assets/waystones/items/black_sharestone.json
@@ -1,7 +1,7 @@
 {
   "model": {
     "type": "minecraft:model",
-    "model": "waystones:item/black_sharestone",
+    "model": "waystones:item/sharestone",
     "tints": [
       {
         "type": "minecraft:constant",
diff --git a/common/src/generated/resources/assets/waystones/items/blue_portstone.json b/common/src/generated/resources/assets/waystones/items/blue_portstone.json
index 211aa0aa..464ccacc 100644
--- a/common/src/generated/resources/assets/waystones/items/blue_portstone.json
+++ b/common/src/generated/resources/assets/waystones/items/blue_portstone.json
@@ -1,7 +1,7 @@
 {
   "model": {
     "type": "minecraft:model",
-    "model": "waystones:item/blue_portstone",
+    "model": "waystones:item/portstone",
     "tints": [
       {
         "type": "minecraft:constant",
diff --git a/common/src/generated/resources/assets/waystones/items/blue_sharestone.json b/common/src/generated/resources/assets/waystones/items/blue_sharestone.json
index bd4e06e6..0af0c490 100644
--- a/common/src/generated/resources/assets/waystones/items/blue_sharestone.json
+++ b/common/src/generated/resources/assets/waystones/items/blue_sharestone.json
@@ -1,7 +1,7 @@
 {
   "model": {
     "type": "minecraft:model",
-    "model": "waystones:item/blue_sharestone",
+    "model": "waystones:item/sharestone",
     "tints": [
       {
         "type": "minecraft:constant",
diff --git a/common/src/generated/resources/assets/waystones/items/brown_portstone.json b/common/src/generated/resources/assets/waystones/items/brown_portstone.json
index d10bf55f..2a791e48 100644
--- a/common/src/generated/resources/assets/waystones/items/brown_portstone.json
+++ b/common/src/generated/resources/assets/waystones/items/brown_portstone.json
@@ -1,7 +1,7 @@
 {
   "model": {
     "type": "minecraft:model",
-    "model": "waystones:item/brown_portstone",
+    "model": "waystones:item/portstone",
     "tints": [
       {
         "type": "minecraft:constant",
diff --git a/common/src/generated/resources/assets/waystones/items/brown_sharestone.json b/common/src/generated/resources/assets/waystones/items/brown_sharestone.json
index 9d97570a..83bc71b7 100644
--- a/common/src/generated/resources/assets/waystones/items/brown_sharestone.json
+++ b/common/src/generated/resources/assets/waystones/items/brown_sharestone.json
@@ -1,7 +1,7 @@
 {
   "model": {
     "type": "minecraft:model",
-    "model": "waystones:item/brown_sharestone",
+    "model": "waystones:item/sharestone",
     "tints": [
       {
         "type": "minecraft:constant",
diff --git a/common/src/generated/resources/assets/waystones/items/cyan_portstone.json b/common/src/generated/resources/assets/waystones/items/cyan_portstone.json
index accda38e..e29564f2 100644
--- a/common/src/generated/resources/assets/waystones/items/cyan_portstone.json
+++ b/common/src/generated/resources/assets/waystones/items/cyan_portstone.json
@@ -1,7 +1,7 @@
 {
   "model": {
     "type": "minecraft:model",
-    "model": "waystones:item/cyan_portstone",
+    "model": "waystones:item/portstone",
     "tints": [
       {
         "type": "minecraft:constant",
diff --git a/common/src/generated/resources/assets/waystones/items/cyan_sharestone.json b/common/src/generated/resources/assets/waystones/items/cyan_sharestone.json
index f29b9443..7759f7b0 100644
--- a/common/src/generated/resources/assets/waystones/items/cyan_sharestone.json
+++ b/common/src/generated/resources/assets/waystones/items/cyan_sharestone.json
@@ -1,7 +1,7 @@
 {
   "model": {
     "type": "minecraft:model",
-    "model": "waystones:item/cyan_sharestone",
+    "model": "waystones:item/sharestone",
     "tints": [
       {
         "type": "minecraft:constant",
diff --git a/common/src/generated/resources/assets/waystones/items/gray_portstone.json b/common/src/generated/resources/assets/waystones/items/gray_portstone.json
index 15b11690..0645f8bc 100644
--- a/common/src/generated/resources/assets/waystones/items/gray_portstone.json
+++ b/common/src/generated/resources/assets/waystones/items/gray_portstone.json
@@ -1,7 +1,7 @@
 {
   "model": {
     "type": "minecraft:model",
-    "model": "waystones:item/gray_portstone",
+    "model": "waystones:item/portstone",
     "tints": [
       {
         "type": "minecraft:constant",
diff --git a/common/src/generated/resources/assets/waystones/items/gray_sharestone.json b/common/src/generated/resources/assets/waystones/items/gray_sharestone.json
index 0f64ed8c..43aaced1 100644
--- a/common/src/generated/resources/assets/waystones/items/gray_sharestone.json
+++ b/common/src/generated/resources/assets/waystones/items/gray_sharestone.json
@@ -1,7 +1,7 @@
 {
   "model": {
     "type": "minecraft:model",
-    "model": "waystones:item/gray_sharestone",
+    "model": "waystones:item/sharestone",
     "tints": [
       {
         "type": "minecraft:constant",
diff --git a/common/src/generated/resources/assets/waystones/items/green_portstone.json b/common/src/generated/resources/assets/waystones/items/green_portstone.json
index 4657af3e..cae0d6c3 100644
--- a/common/src/generated/resources/assets/waystones/items/green_portstone.json
+++ b/common/src/generated/resources/assets/waystones/items/green_portstone.json
@@ -1,7 +1,7 @@
 {
   "model": {
     "type": "minecraft:model",
-    "model": "waystones:item/green_portstone",
+    "model": "waystones:item/portstone",
     "tints": [
       {
         "type": "minecraft:constant",
diff --git a/common/src/generated/resources/assets/waystones/items/green_sharestone.json b/common/src/generated/resources/assets/waystones/items/green_sharestone.json
index 50eafdbe..20a40365 100644
--- a/common/src/generated/resources/assets/waystones/items/green_sharestone.json
+++ b/common/src/generated/resources/assets/waystones/items/green_sharestone.json
@@ -1,7 +1,7 @@
 {
   "model": {
     "type": "minecraft:model",
-    "model": "waystones:item/green_sharestone",
+    "model": "waystones:item/sharestone",
     "tints": [
       {
         "type": "minecraft:constant",
diff --git a/common/src/generated/resources/assets/waystones/items/light_blue_portstone.json b/common/src/generated/resources/assets/waystones/items/light_blue_portstone.json
index 01fd3890..0303fafa 100644
--- a/common/src/generated/resources/assets/waystones/items/light_blue_portstone.json
+++ b/common/src/generated/resources/assets/waystones/items/light_blue_portstone.json
@@ -1,7 +1,7 @@
 {
   "model": {
     "type": "minecraft:model",
-    "model": "waystones:item/light_blue_portstone",
+    "model": "waystones:item/portstone",
     "tints": [
       {
         "type": "minecraft:constant",
diff --git a/common/src/generated/resources/assets/waystones/items/light_blue_sharestone.json b/common/src/generated/resources/assets/waystones/items/light_blue_sharestone.json
index 96b1efd8..eeb18cc4 100644
--- a/common/src/generated/resources/assets/waystones/items/light_blue_sharestone.json
+++ b/common/src/generated/resources/assets/waystones/items/light_blue_sharestone.json
@@ -1,7 +1,7 @@
 {
   "model": {
     "type": "minecraft:model",
-    "model": "waystones:item/light_blue_sharestone",
+    "model": "waystones:item/sharestone",
     "tints": [
       {
         "type": "minecraft:constant",
diff --git a/common/src/generated/resources/assets/waystones/items/light_gray_portstone.json b/common/src/generated/resources/assets/waystones/items/light_gray_portstone.json
index 63514c34..371c39a4 100644
--- a/common/src/generated/resources/assets/waystones/items/light_gray_portstone.json
+++ b/common/src/generated/resources/assets/waystones/items/light_gray_portstone.json
@@ -1,7 +1,7 @@
 {
   "model": {
     "type": "minecraft:model",
-    "model": "waystones:item/light_gray_portstone",
+    "model": "waystones:item/portstone",
     "tints": [
       {
         "type": "minecraft:constant",
diff --git a/common/src/generated/resources/assets/waystones/items/light_gray_sharestone.json b/common/src/generated/resources/assets/waystones/items/light_gray_sharestone.json
index 35462cd2..542a633a 100644
--- a/common/src/generated/resources/assets/waystones/items/light_gray_sharestone.json
+++ b/common/src/generated/resources/assets/waystones/items/light_gray_sharestone.json
@@ -1,7 +1,7 @@
 {
   "model": {
     "type": "minecraft:model",
-    "model": "waystones:item/light_gray_sharestone",
+    "model": "waystones:item/sharestone",
     "tints": [
       {
         "type": "minecraft:constant",
diff --git a/common/src/generated/resources/assets/waystones/items/lime_portstone.json b/common/src/generated/resources/assets/waystones/items/lime_portstone.json
index 10401339..83d7507c 100644
--- a/common/src/generated/resources/assets/waystones/items/lime_portstone.json
+++ b/common/src/generated/resources/assets/waystones/items/lime_portstone.json
@@ -1,7 +1,7 @@
 {
   "model": {
     "type": "minecraft:model",
-    "model": "waystones:item/lime_portstone",
+    "model": "waystones:item/portstone",
     "tints": [
       {
         "type": "minecraft:constant",
diff --git a/common/src/generated/resources/assets/waystones/items/lime_sharestone.json b/common/src/generated/resources/assets/waystones/items/lime_sharestone.json
index 3c03c2d6..522539d2 100644
--- a/common/src/generated/resources/assets/waystones/items/lime_sharestone.json
+++ b/common/src/generated/resources/assets/waystones/items/lime_sharestone.json
@@ -1,7 +1,7 @@
 {
   "model": {
     "type": "minecraft:model",
-    "model": "waystones:item/lime_sharestone",
+    "model": "waystones:item/sharestone",
     "tints": [
       {
         "type": "minecraft:constant",
diff --git a/common/src/generated/resources/assets/waystones/items/magenta_portstone.json b/common/src/generated/resources/assets/waystones/items/magenta_portstone.json
index 7407b29c..93ef5e8f 100644
--- a/common/src/generated/resources/assets/waystones/items/magenta_portstone.json
+++ b/common/src/generated/resources/assets/waystones/items/magenta_portstone.json
@@ -1,7 +1,7 @@
 {
   "model": {
     "type": "minecraft:model",
-    "model": "waystones:item/magenta_portstone",
+    "model": "waystones:item/portstone",
     "tints": [
       {
         "type": "minecraft:constant",
diff --git a/common/src/generated/resources/assets/waystones/items/magenta_sharestone.json b/common/src/generated/resources/assets/waystones/items/magenta_sharestone.json
index 6afdc910..4af69c0b 100644
--- a/common/src/generated/resources/assets/waystones/items/magenta_sharestone.json
+++ b/common/src/generated/resources/assets/waystones/items/magenta_sharestone.json
@@ -1,7 +1,7 @@
 {
   "model": {
     "type": "minecraft:model",
-    "model": "waystones:item/magenta_sharestone",
+    "model": "waystones:item/sharestone",
     "tints": [
       {
         "type": "minecraft:constant",
diff --git a/common/src/generated/resources/assets/waystones/items/orange_portstone.json b/common/src/generated/resources/assets/waystones/items/orange_portstone.json
index 6ec5b792..afb9fd2b 100644
--- a/common/src/generated/resources/assets/waystones/items/orange_portstone.json
+++ b/common/src/generated/resources/assets/waystones/items/orange_portstone.json
@@ -1,7 +1,7 @@
 {
   "model": {
     "type": "minecraft:model",
-    "model": "waystones:item/orange_portstone",
+    "model": "waystones:item/portstone",
     "tints": [
       {
         "type": "minecraft:constant",
diff --git a/common/src/generated/resources/assets/waystones/items/orange_sharestone.json b/common/src/generated/resources/assets/waystones/items/orange_sharestone.json
index 5daf41cc..ca74d32b 100644
--- a/common/src/generated/resources/assets/waystones/items/orange_sharestone.json
+++ b/common/src/generated/resources/assets/waystones/items/orange_sharestone.json
@@ -1,7 +1,7 @@
 {
   "model": {
     "type": "minecraft:model",
-    "model": "waystones:item/orange_sharestone",
+    "model": "waystones:item/sharestone",
     "tints": [
       {
         "type": "minecraft:constant",
diff --git a/common/src/generated/resources/assets/waystones/items/pink_portstone.json b/common/src/generated/resources/assets/waystones/items/pink_portstone.json
index 39c8d86a..e8a89012 100644
--- a/common/src/generated/resources/assets/waystones/items/pink_portstone.json
+++ b/common/src/generated/resources/assets/waystones/items/pink_portstone.json
@@ -1,7 +1,7 @@
 {
   "model": {
     "type": "minecraft:model",
-    "model": "waystones:item/pink_portstone",
+    "model": "waystones:item/portstone",
     "tints": [
       {
         "type": "minecraft:constant",
diff --git a/common/src/generated/resources/assets/waystones/items/pink_sharestone.json b/common/src/generated/resources/assets/waystones/items/pink_sharestone.json
index e3bc48ee..af4c5e01 100644
--- a/common/src/generated/resources/assets/waystones/items/pink_sharestone.json
+++ b/common/src/generated/resources/assets/waystones/items/pink_sharestone.json
@@ -1,7 +1,7 @@
 {
   "model": {
     "type": "minecraft:model",
-    "model": "waystones:item/pink_sharestone",
+    "model": "waystones:item/sharestone",
     "tints": [
       {
         "type": "minecraft:constant",
diff --git a/common/src/generated/resources/assets/waystones/items/purple_portstone.json b/common/src/generated/resources/assets/waystones/items/purple_portstone.json
index 4460d3c6..18564f56 100644
--- a/common/src/generated/resources/assets/waystones/items/purple_portstone.json
+++ b/common/src/generated/resources/assets/waystones/items/purple_portstone.json
@@ -1,7 +1,7 @@
 {
   "model": {
     "type": "minecraft:model",
-    "model": "waystones:item/purple_portstone",
+    "model": "waystones:item/portstone",
     "tints": [
       {
         "type": "minecraft:constant",
diff --git a/common/src/generated/resources/assets/waystones/items/purple_sharestone.json b/common/src/generated/resources/assets/waystones/items/purple_sharestone.json
index f8bf5498..f2c2a42e 100644
--- a/common/src/generated/resources/assets/waystones/items/purple_sharestone.json
+++ b/common/src/generated/resources/assets/waystones/items/purple_sharestone.json
@@ -1,7 +1,7 @@
 {
   "model": {
     "type": "minecraft:model",
-    "model": "waystones:item/purple_sharestone",
+    "model": "waystones:item/sharestone",
     "tints": [
       {
         "type": "minecraft:constant",
diff --git a/common/src/generated/resources/assets/waystones/items/red_portstone.json b/common/src/generated/resources/assets/waystones/items/red_portstone.json
index 2199f90e..2f762eb2 100644
--- a/common/src/generated/resources/assets/waystones/items/red_portstone.json
+++ b/common/src/generated/resources/assets/waystones/items/red_portstone.json
@@ -1,7 +1,7 @@
 {
   "model": {
     "type": "minecraft:model",
-    "model": "waystones:item/red_portstone",
+    "model": "waystones:item/portstone",
     "tints": [
       {
         "type": "minecraft:constant",
diff --git a/common/src/generated/resources/assets/waystones/items/red_sharestone.json b/common/src/generated/resources/assets/waystones/items/red_sharestone.json
index 76a3a99f..bdf597b0 100644
--- a/common/src/generated/resources/assets/waystones/items/red_sharestone.json
+++ b/common/src/generated/resources/assets/waystones/items/red_sharestone.json
@@ -1,7 +1,7 @@
 {
   "model": {
     "type": "minecraft:model",
-    "model": "waystones:item/red_sharestone",
+    "model": "waystones:item/sharestone",
     "tints": [
       {
         "type": "minecraft:constant",
diff --git a/common/src/generated/resources/assets/waystones/items/warp_plate.json b/common/src/generated/resources/assets/waystones/items/warp_plate.json
index 1acc0599..d54f3094 100644
--- a/common/src/generated/resources/assets/waystones/items/warp_plate.json
+++ b/common/src/generated/resources/assets/waystones/items/warp_plate.json
@@ -1,7 +1,7 @@
 {
   "model": {
     "type": "minecraft:model",
-    "model": "waystones:item/warp_plate",
+    "model": "waystones:block/warp_plate",
     "tints": [
       {
         "type": "minecraft:constant",
diff --git a/common/src/generated/resources/assets/waystones/items/white_portstone.json b/common/src/generated/resources/assets/waystones/items/white_portstone.json
index 8c321931..26b001a8 100644
--- a/common/src/generated/resources/assets/waystones/items/white_portstone.json
+++ b/common/src/generated/resources/assets/waystones/items/white_portstone.json
@@ -1,7 +1,7 @@
 {
   "model": {
     "type": "minecraft:model",
-    "model": "waystones:item/white_portstone",
+    "model": "waystones:item/portstone",
     "tints": [
       {
         "type": "minecraft:constant",
diff --git a/common/src/generated/resources/assets/waystones/items/yellow_portstone.json b/common/src/generated/resources/assets/waystones/items/yellow_portstone.json
index d22c50de..633d6b9b 100644
--- a/common/src/generated/resources/assets/waystones/items/yellow_portstone.json
+++ b/common/src/generated/resources/assets/waystones/items/yellow_portstone.json
@@ -1,7 +1,7 @@
 {
   "model": {
     "type": "minecraft:model",
-    "model": "waystones:item/yellow_portstone",
+    "model": "waystones:item/portstone",
     "tints": [
       {
         "type": "minecraft:constant",
diff --git a/common/src/generated/resources/assets/waystones/items/yellow_sharestone.json b/common/src/generated/resources/assets/waystones/items/yellow_sharestone.json
index 19180f5f..32ca9e1a 100644
--- a/common/src/generated/resources/assets/waystones/items/yellow_sharestone.json
+++ b/common/src/generated/resources/assets/waystones/items/yellow_sharestone.json
@@ -1,7 +1,7 @@
 {
   "model": {
     "type": "minecraft:model",
-    "model": "waystones:item/yellow_sharestone",
+    "model": "waystones:item/sharestone",
     "tints": [
       {
         "type": "minecraft:constant",
diff --git a/fabric/src/main/java/net/blay09/mods/waystones/datagen/ModModelProvider.java b/fabric/src/main/java/net/blay09/mods/waystones/datagen/ModModelProvider.java
index d8917aa3..eaeda3b5 100644
--- a/fabric/src/main/java/net/blay09/mods/waystones/datagen/ModModelProvider.java
+++ b/fabric/src/main/java/net/blay09/mods/waystones/datagen/ModModelProvider.java
@@ -36,7 +36,7 @@ public void generateBlockStateModels(BlockModelGenerators blockStateModelGenerat
                         .select(WarpPlateBlock.WarpPlateStatus.WARPING_INVALID, Variant.variant().with(VariantProperties.MODEL, ResourceLocation.fromNamespaceAndPath(Waystones.MOD_ID, "block/warp_plate")))
                         .select(WarpPlateBlock.WarpPlateStatus.LOCKED, Variant.variant().with(VariantProperties.MODEL, ResourceLocation.fromNamespaceAndPath(Waystones.MOD_ID, "block/warp_plate_locked")))
                 ));
-        blockStateModelGenerator.registerSimpleTintedItemModel(ModBlocks.warpPlate, ModelLocationUtils.getModelLocation(ModBlocks.warpPlate.asItem()), new Constant(0xffc456bd));
+        blockStateModelGenerator.registerSimpleTintedItemModel(ModBlocks.warpPlate, ModelLocationUtils.getModelLocation(ModBlocks.warpPlate), new Constant(0xffc456bd));
         createDoubleBlockWaystone(blockStateModelGenerator, ModBlocks.waystone);
         createDoubleBlockWaystone(blockStateModelGenerator, ModBlocks.sandyWaystone);
         createDoubleBlockWaystone(blockStateModelGenerator, ModBlocks.mossyWaystone);
@@ -90,7 +90,8 @@ private void createSharestone(BlockModelGenerators blockStateModelGenerator, Sha
                         .select(DoubleBlockHalf.LOWER, Variant.variant().with(VariantProperties.MODEL, bottomModelLocation))
                         .select(DoubleBlockHalf.UPPER, Variant.variant().with(VariantProperties.MODEL, topModelLocation)));
         blockStateModelGenerator.blockStateOutput.accept(generator);
-        blockStateModelGenerator.registerSimpleTintedItemModel(block, ModelLocationUtils.getModelLocation(block.asItem()), new Constant(block.getColor().getTextColor()));
+        final var itemModelLocation = ResourceLocation.fromNamespaceAndPath(Waystones.MOD_ID, "item/sharestone");
+        blockStateModelGenerator.registerSimpleTintedItemModel(block, itemModelLocation, new Constant(block.getColor().getTextColor()));
     }
 
     private void createPortstone(BlockModelGenerators blockStateModelGenerator, PortstoneBlock block) {
@@ -102,11 +103,8 @@ private void createPortstone(BlockModelGenerators blockStateModelGenerator, Port
                         .select(DoubleBlockHalf.LOWER, Variant.variant().with(VariantProperties.MODEL, bottomModelLocation))
                         .select(DoubleBlockHalf.UPPER, Variant.variant().with(VariantProperties.MODEL, topModelLocation)));
         blockStateModelGenerator.blockStateOutput.accept(generator);
-        if(block.getColor() != null) {
-            blockStateModelGenerator.registerSimpleTintedItemModel(block, ModelLocationUtils.getModelLocation(block.asItem()), new Constant(block.getColor().getTextColor()));
-        } else {
-            blockStateModelGenerator.registerSimpleItemModel(block, ModelLocationUtils.getModelLocation(block.asItem()));
-        }
+        final var itemModelLocation = ResourceLocation.fromNamespaceAndPath(Waystones.MOD_ID, "item/portstone");
+        blockStateModelGenerator.registerSimpleTintedItemModel(block, itemModelLocation, new Constant(block.getColor().getTextColor()));
     }
 
 }