diff --git a/build.gradle.kts b/build.gradle.kts
index 3e6781615..5e8e22ec2 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -11,6 +11,7 @@ toothpick {
     forkVersion = "git-$forkName-$versionTag"
 
     minecraftVersion = "1.16.4"
+    nmsPackage = "1_16_R3"
     nmsRevision = "R0.1-SNAPSHOT"
 
     upstream = "Paper"
diff --git a/buildSrc/src/main/kotlin/ConfigureSubprojects.kt b/buildSrc/src/main/kotlin/ConfigureSubprojects.kt
index b79e3a7a0..5e9806bd4 100644
--- a/buildSrc/src/main/kotlin/ConfigureSubprojects.kt
+++ b/buildSrc/src/main/kotlin/ConfigureSubprojects.kt
@@ -77,11 +77,10 @@ private fun Project.configureServerProject() {
         }
 
         // Don't like to do this but sadly have to do this for compatibility reasons
-        val relocVersion = toothpick.minecraftVersion.replace(".", "_")
-        relocate("org.bukkit.craftbukkit", "org.bukkit.craftbukkit.v$relocVersion") {
+        relocate("org.bukkit.craftbukkit", "org.bukkit.craftbukkit.v${toothpick.nmsPackage}") {
             exclude("org.bukkit.craftbukkit.Main*")
         }
-        relocate("net.minecraft.server", "net.minecraft.server.v$relocVersion")
+        relocate("net.minecraft.server", "net.minecraft.server.v${toothpick.nmsPackage}")
     }
     tasks.getByName("build") {
         dependsOn(shadowJar)
diff --git a/buildSrc/src/main/kotlin/ToothpickExtension.kt b/buildSrc/src/main/kotlin/ToothpickExtension.kt
index 3afc3d118..966c33b4e 100644
--- a/buildSrc/src/main/kotlin/ToothpickExtension.kt
+++ b/buildSrc/src/main/kotlin/ToothpickExtension.kt
@@ -13,6 +13,7 @@ open class ToothpickExtension(objects: ObjectFactory) {
     lateinit var groupId: String
     lateinit var minecraftVersion: String
     lateinit var nmsRevision: String
+    lateinit var nmsPackage: String
 
     lateinit var upstream: String
     val upstreamLowercase