diff --git a/api/src/main/java/com/viaversion/viaversion/api/protocol/version/ProtocolVersion.java b/api/src/main/java/com/viaversion/viaversion/api/protocol/version/ProtocolVersion.java
index 73b0aa275..ac9462185 100644
--- a/api/src/main/java/com/viaversion/viaversion/api/protocol/version/ProtocolVersion.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/protocol/version/ProtocolVersion.java
@@ -76,7 +76,7 @@ public class ProtocolVersion {
     public static final ProtocolVersion v1_16_2 = register(751, "1.16.2");
     public static final ProtocolVersion v1_16_3 = register(753, "1.16.3");
     public static final ProtocolVersion v1_16_4 = register(754, "1.16.4/5", new VersionRange("1.16", 4, 5));
-    public static final ProtocolVersion v1_17 = register(755, 29, "1.17");
+    public static final ProtocolVersion v1_17 = register(755, 30, "1.17");
     public static final ProtocolVersion unknown = register(-1, "UNKNOWN");
 
     public static ProtocolVersion register(int version, String name) {
diff --git a/common/src/main/resources/assets/viaversion/data/mapping-1.17.json b/common/src/main/resources/assets/viaversion/data/mapping-1.17.json
index 690da3572..02e28cb5e 100644
--- a/common/src/main/resources/assets/viaversion/data/mapping-1.17.json
+++ b/common/src/main/resources/assets/viaversion/data/mapping-1.17.json
@@ -246,20 +246,20 @@
     "243": "minecraft:azalea_leaves[distance=6,persistent=false]",
     "244": "minecraft:azalea_leaves[distance=7,persistent=true]",
     "245": "minecraft:azalea_leaves[distance=7,persistent=false]",
-    "246": "minecraft:azalea_leaves_flowers[distance=1,persistent=true]",
-    "247": "minecraft:azalea_leaves_flowers[distance=1,persistent=false]",
-    "248": "minecraft:azalea_leaves_flowers[distance=2,persistent=true]",
-    "249": "minecraft:azalea_leaves_flowers[distance=2,persistent=false]",
-    "250": "minecraft:azalea_leaves_flowers[distance=3,persistent=true]",
-    "251": "minecraft:azalea_leaves_flowers[distance=3,persistent=false]",
-    "252": "minecraft:azalea_leaves_flowers[distance=4,persistent=true]",
-    "253": "minecraft:azalea_leaves_flowers[distance=4,persistent=false]",
-    "254": "minecraft:azalea_leaves_flowers[distance=5,persistent=true]",
-    "255": "minecraft:azalea_leaves_flowers[distance=5,persistent=false]",
-    "256": "minecraft:azalea_leaves_flowers[distance=6,persistent=true]",
-    "257": "minecraft:azalea_leaves_flowers[distance=6,persistent=false]",
-    "258": "minecraft:azalea_leaves_flowers[distance=7,persistent=true]",
-    "259": "minecraft:azalea_leaves_flowers[distance=7,persistent=false]",
+    "246": "minecraft:flowering_azalea_leaves[distance=1,persistent=true]",
+    "247": "minecraft:flowering_azalea_leaves[distance=1,persistent=false]",
+    "248": "minecraft:flowering_azalea_leaves[distance=2,persistent=true]",
+    "249": "minecraft:flowering_azalea_leaves[distance=2,persistent=false]",
+    "250": "minecraft:flowering_azalea_leaves[distance=3,persistent=true]",
+    "251": "minecraft:flowering_azalea_leaves[distance=3,persistent=false]",
+    "252": "minecraft:flowering_azalea_leaves[distance=4,persistent=true]",
+    "253": "minecraft:flowering_azalea_leaves[distance=4,persistent=false]",
+    "254": "minecraft:flowering_azalea_leaves[distance=5,persistent=true]",
+    "255": "minecraft:flowering_azalea_leaves[distance=5,persistent=false]",
+    "256": "minecraft:flowering_azalea_leaves[distance=6,persistent=true]",
+    "257": "minecraft:flowering_azalea_leaves[distance=6,persistent=false]",
+    "258": "minecraft:flowering_azalea_leaves[distance=7,persistent=true]",
+    "259": "minecraft:flowering_azalea_leaves[distance=7,persistent=false]",
     "260": "minecraft:sponge",
     "261": "minecraft:wet_sponge",
     "262": "minecraft:glass",
@@ -20413,7 +20413,7 @@
     "66": "acacia_leaves",
     "67": "dark_oak_leaves",
     "68": "azalea_leaves",
-    "69": "azalea_leaves_flowers",
+    "69": "flowering_azalea_leaves",
     "70": "sponge",
     "71": "wet_sponge",
     "72": "glass",
@@ -21384,7 +21384,7 @@
     "137": "minecraft:acacia_leaves",
     "138": "minecraft:dark_oak_leaves",
     "139": "minecraft:azalea_leaves",
-    "140": "minecraft:azalea_leaves_flowers",
+    "140": "minecraft:flowering_azalea_leaves",
     "141": "minecraft:sponge",
     "142": "minecraft:wet_sponge",
     "143": "minecraft:glass",
diff --git a/gradle.properties b/gradle.properties
index 5f905c925..21f4aa306 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,5 +1,5 @@
 # Project properties - we put these here so they can be modified without causing a recompile of the build scripts
-projectVersion=4.0.0-1.17-pre1-SNAPSHOT
+projectVersion=4.0.0-1.17-pre2-SNAPSHOT
 
 # Gradle properties
 org.gradle.daemon=true