diff --git a/data/pc/1.21.11/protocol.json b/data/pc/1.21.11/protocol.json
index 999308042..13c903c31 100644
--- a/data/pc/1.21.11/protocol.json
+++ b/data/pc/1.21.11/protocol.json
@@ -32,6 +32,7 @@
     "registryEntryHolder": "native",
     "registryEntryHolderSet": "native",
     "lpVec3": "native",
+    "nbtOptionalLengthPrefixed": "native",
     "ByteArray": [
       "buffer",
       {
@@ -4927,11 +4928,8 @@
           "type": "string"
         },
         {
-          "name": "nbt",
-          "type": [
-            "option",
-            "anonymousNbt"
-          ]
+          "name": "payload",
+          "type": "nbtOptionalLengthPrefixed"
         }
       ]
     ]
diff --git a/data/pc/1.21.6/proto.yml b/data/pc/1.21.6/proto.yml
index 36d6cc051..73424080b 100644
--- a/data/pc/1.21.6/proto.yml
+++ b/data/pc/1.21.6/proto.yml
@@ -33,6 +33,7 @@
    anonOptionalNbt: native
    registryEntryHolder: native
    registryEntryHolderSet: native
+   nbtOptionalLengthPrefixed: native
    ByteArray: ["buffer", { "countType": "varint" }]
    string: ["pstring", { "countType": "varint" }]
    vec2f:
@@ -1330,7 +1331,7 @@
    # MC: ServerboundCustomClickActionPacket
    packet_common_custom_click_action:
       id: string
-      nbt?: anonymousNbt
+      payload: nbtOptionalLengthPrefixed
 
 ^handshaking.toClient.types:
    packet:
diff --git a/data/pc/1.21.6/protocol.json b/data/pc/1.21.6/protocol.json
index 4397a4ea3..a36a0ee02 100644
--- a/data/pc/1.21.6/protocol.json
+++ b/data/pc/1.21.6/protocol.json
@@ -31,6 +31,7 @@
     "anonOptionalNbt": "native",
     "registryEntryHolder": "native",
     "registryEntryHolderSet": "native",
+    "nbtOptionalLengthPrefixed": "native",
     "ByteArray": [
       "buffer",
       {
@@ -3618,11 +3619,8 @@
           "type": "string"
         },
         {
-          "name": "nbt",
-          "type": [
-            "option",
-            "anonymousNbt"
-          ]
+          "name": "payload",
+          "type": "nbtOptionalLengthPrefixed"
         }
       ]
     ]
diff --git a/data/pc/1.21.8/proto.yml b/data/pc/1.21.8/proto.yml
index ff000ed06..e138056e9 100644
--- a/data/pc/1.21.8/proto.yml
+++ b/data/pc/1.21.8/proto.yml
@@ -33,6 +33,7 @@
    anonOptionalNbt: native
    registryEntryHolder: native
    registryEntryHolderSet: native
+   nbtOptionalLengthPrefixed: native
    ByteArray: ["buffer", { "countType": "varint" }]
    string: ["pstring", { "countType": "varint" }]
    vec2f:
@@ -1330,7 +1331,7 @@
    # MC: ServerboundCustomClickActionPacket
    packet_common_custom_click_action:
       id: string
-      nbt?: anonymousNbt
+      payload: nbtOptionalLengthPrefixed
 
 ^handshaking.toClient.types:
    packet:
diff --git a/data/pc/1.21.8/protocol.json b/data/pc/1.21.8/protocol.json
index 86899ca20..e9f3077aa 100644
--- a/data/pc/1.21.8/protocol.json
+++ b/data/pc/1.21.8/protocol.json
@@ -31,6 +31,7 @@
     "anonOptionalNbt": "native",
     "registryEntryHolder": "native",
     "registryEntryHolderSet": "native",
+    "nbtOptionalLengthPrefixed": "native",
     "ByteArray": [
       "buffer",
       {
@@ -3615,11 +3616,8 @@
           "type": "string"
         },
         {
-          "name": "nbt",
-          "type": [
-            "option",
-            "anonymousNbt"
-          ]
+          "name": "payload",
+          "type": "nbtOptionalLengthPrefixed"
         }
       ]
     ]
diff --git a/data/pc/1.21.9/proto.yml b/data/pc/1.21.9/proto.yml
index ad0c57a54..18656ec2e 100644
--- a/data/pc/1.21.9/proto.yml
+++ b/data/pc/1.21.9/proto.yml
@@ -33,6 +33,7 @@
    anonOptionalNbt: native
    registryEntryHolder: native
    registryEntryHolderSet: native
+   nbtOptionalLengthPrefixed: native
    lpVec3: native
    ByteArray: ["buffer", { "countType": "varint" }]
    string: ["pstring", { "countType": "varint" }]
@@ -1560,7 +1561,7 @@
    # MC: ServerboundCustomClickActionPacket
    packet_common_custom_click_action:
       id: string
-      nbt?: anonymousNbt
+      payload: nbtOptionalLengthPrefixed
 
 ^handshaking.toClient.types:
    packet:
diff --git a/data/pc/1.21.9/protocol.json b/data/pc/1.21.9/protocol.json
index d8f565bab..540de2f44 100644
--- a/data/pc/1.21.9/protocol.json
+++ b/data/pc/1.21.9/protocol.json
@@ -31,6 +31,7 @@
     "anonOptionalNbt": "native",
     "registryEntryHolder": "native",
     "registryEntryHolderSet": "native",
+    "nbtOptionalLengthPrefixed": "native",
     "lpVec3": "native",
     "ByteArray": [
       "buffer",
@@ -4637,11 +4638,8 @@
           "type": "string"
         },
         {
-          "name": "nbt",
-          "type": [
-            "option",
-            "anonymousNbt"
-          ]
+          "name": "payload",
+          "type": "nbtOptionalLengthPrefixed"
         }
       ]
     ]
diff --git a/data/pc/latest/proto.yml b/data/pc/latest/proto.yml
index 3853be73a..1bb996473 100644
--- a/data/pc/latest/proto.yml
+++ b/data/pc/latest/proto.yml
@@ -34,6 +34,7 @@
    registryEntryHolder: native
    registryEntryHolderSet: native
    lpVec3: native
+   nbtOptionalLengthPrefixed: native
    ByteArray: ["buffer", { "countType": "varint" }]
    string: ["pstring", { "countType": "varint" }]
    vec2f:
@@ -1637,7 +1638,7 @@
    # MC: ServerboundCustomClickActionPacket
    packet_common_custom_click_action:
       id: string
-      nbt?: anonymousNbt
+      payload: nbtOptionalLengthPrefixed
 
 ^handshaking.toClient.types:
    packet: