diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 28c6d3d..dbfdd4a 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,8 +1,7 @@
 [versions]
 mixin = "0.8.5"
 mixinextras = "0.3.5"
-#geyser = "2.7.0-SNAPSHOT"
-geyser = "custom-item-api-v2-SNAPSHOT"
+geyser = "2.9.3-SNAPSHOT"
 auto-service = "1.0.1"
 pack-converter = "3.4.1-SNAPSHOT"
 indra = "3.1.3"
@@ -21,12 +20,9 @@ neoforge-version = "21.11.6-beta"
 [libraries]
 mixin = { group = "org.spongepowered", name = "mixin", version.ref = "mixin" }
 mixinextras = { module = "io.github.llamalad7:mixinextras-common", version.ref = "mixinextras" }
-#geyser-api = { group = "org.geysermc.geyser", name = "api", version.ref = "geyser" }
-#geyser-core = { group = "org.geysermc.geyser", name = "core", version.ref = "geyser" }
-#geyser-fabric = { group = "org.geysermc.geyser", name = "fabric", version.ref = "geyser" }
-geyser-api = { group = "com.github.Novampr.Geyser", name = "api", version.ref = "geyser" }
-geyser-core = { group = "com.github.Novampr.Geyser", name = "core", version.ref = "geyser" }
-geyser-fabric = { group = "com.github.Novampr.Geyser", name = "fabric", version.ref = "geyser" }
+geyser-api = { group = "org.geysermc.geyser", name = "api", version.ref = "geyser" }
+geyser-core = { group = "org.geysermc.geyser", name = "core", version.ref = "geyser" }
+geyser-fabric = { group = "org.geysermc.geyser", name = "fabric", version.ref = "geyser" }
 auto-service = { group = "com.google.auto.service", name = "auto-service", version.ref = "auto-service" }
 pack-converter = { group = "org.geysermc.pack", name = "converter", version.ref = "pack-converter" }
 indra = { group = "net.kyori", name  = "indra-common", version.ref = "indra" }
diff --git a/shared/src/main/java/org/geysermc/hydraulic/component/ComponentConverter.java b/shared/src/main/java/org/geysermc/hydraulic/component/ComponentConverter.java
index 9b1630f..a42bb74 100644
--- a/shared/src/main/java/org/geysermc/hydraulic/component/ComponentConverter.java
+++ b/shared/src/main/java/org/geysermc/hydraulic/component/ComponentConverter.java
@@ -96,7 +96,7 @@ public static void setGeyserComponents(DataComponentMap componentMap, CustomItem
             );
         });
         addComponentConversion(DataComponents.TOOL, (component, map, definition, options) -> {
-            JavaToolProperties.Builder toolProperties = JavaToolProperties.builder()
+            JavaTool.Builder toolProperties = JavaTool.builder()
                     .canDestroyBlocksInCreative(component.canDestroyBlocksInCreative())
                     .defaultMiningSpeed(component.defaultMiningSpeed());
 
@@ -104,7 +104,7 @@ public static void setGeyserComponents(DataComponentMap componentMap, CustomItem
                 if (toolRule.speed().isEmpty()) continue;
 
                 toolProperties.rule(
-                        JavaToolProperties.Rule.of(toHolders(toolRule.blocks()), toolRule.speed().get())
+                        JavaTool.Rule.of(toHolders(toolRule.blocks()), toolRule.speed().get())
                 );
             }