diff --git a/mappings/net/minecraft/nbt/NbtElement.mapping b/mappings/net/minecraft/nbt/NbtElement.mapping
index fc74fa6707..c17bc2bed4 100644
--- a/mappings/net/minecraft/nbt/NbtElement.mapping
+++ b/mappings/net/minecraft/nbt/NbtElement.mapping
@@ -1,9 +1,9 @@
 CLASS net/minecraft/class_2520 net/minecraft/nbt/NbtElement
 	COMMENT Represents an NBT element.
-	FIELD field_33250 NULL_TYPE B
-		COMMENT The numeric ID of an NBT null value. Is {@value}.
+	FIELD field_33250 END_TYPE B
+		COMMENT The numeric ID of an NBT end value. Is {@value}.
 		COMMENT
-		COMMENT @see NbtNull
+		COMMENT @see NbtEnd
 	FIELD field_33251 BYTE_TYPE B
 		COMMENT The numeric ID of an NBT byte value. Is {@value}.
 		COMMENT
diff --git a/mappings/net/minecraft/nbt/NbtEnd.mapping b/mappings/net/minecraft/nbt/NbtEnd.mapping
new file mode 100644
index 0000000000..470571e92d
--- /dev/null
+++ b/mappings/net/minecraft/nbt/NbtEnd.mapping
@@ -0,0 +1,9 @@
+CLASS net/minecraft/class_2491 net/minecraft/nbt/NbtEnd
+	COMMENT Represents the NBT end value.
+	COMMENT Defines the end of an {@link NbtCompound} object during serialization,
+	COMMENT and is the type of an empty {@link NbtList}.
+	FIELD field_21032 TYPE Lnet/minecraft/class_4614;
+	FIELD field_21033 INSTANCE Lnet/minecraft/class_2491;
+		COMMENT A dummy instance of the NBT end. It will never appear nested in any parsed NBT
+		COMMENT structure and should never be used as NBT compound values or list elements.
+	FIELD field_33193 SIZE I
diff --git a/mappings/net/minecraft/nbt/NbtNull.mapping b/mappings/net/minecraft/nbt/NbtNull.mapping
deleted file mode 100644
index 4de75bf1ef..0000000000
--- a/mappings/net/minecraft/nbt/NbtNull.mapping
+++ /dev/null
@@ -1,8 +0,0 @@
-CLASS net/minecraft/class_2491 net/minecraft/nbt/NbtNull
-	COMMENT Represents the NBT null value.
-	COMMENT Defines the end of an NBT compound object,
-	COMMENT represents nonexistent values in an NBT compound object,
-	COMMENT and is the type of empty NBT lists.
-	FIELD field_21032 TYPE Lnet/minecraft/class_4614;
-	FIELD field_21033 INSTANCE Lnet/minecraft/class_2491;
-	FIELD field_33193 SIZE I
diff --git a/mappings/net/minecraft/nbt/scanner/NbtScanner.mapping b/mappings/net/minecraft/nbt/scanner/NbtScanner.mapping
index 4089b479ac..9875b6b01e 100644
--- a/mappings/net/minecraft/nbt/scanner/NbtScanner.mapping
+++ b/mappings/net/minecraft/nbt/scanner/NbtScanner.mapping
@@ -5,7 +5,7 @@ CLASS net/minecraft/class_6836 net/minecraft/nbt/scanner/NbtScanner
 	COMMENT <p>Call format: start -> VisitBody
 	COMMENT <br>
 	COMMENT VisitBody:<br>
-	COMMENT { visitNull | visitString | visitByte | visitShort | visitInt<br>
+	COMMENT { visitEnd | visitString | visitByte | visitShort | visitInt<br>
 	COMMENT | visitLong | visitFloat | visitDouble | visitByteArray<br>
 	COMMENT | visitIntArray | visitLongArray<br>
 	COMMENT | visitListMeta -> [startListItem -> VisitBody]* -> endNested<br>
@@ -13,7 +13,7 @@ CLASS net/minecraft/class_6836 net/minecraft/nbt/scanner/NbtScanner
 	COMMENT }
 	COMMENT
 	COMMENT <p>The visit order is depth-first.
-	METHOD method_39856 visitNull ()Lnet/minecraft/class_6836$class_6838;
+	METHOD method_39856 visitEnd ()Lnet/minecraft/class_6836$class_6838;
 	METHOD method_39857 visitByte (B)Lnet/minecraft/class_6836$class_6838;
 		ARG 1 value
 	METHOD method_39858 visitDouble (D)Lnet/minecraft/class_6836$class_6838;
diff --git a/mappings/net/minecraft/nbt/visitor/NbtElementVisitor.mapping b/mappings/net/minecraft/nbt/visitor/NbtElementVisitor.mapping
index d9de1b43ab..bb0057478b 100644
--- a/mappings/net/minecraft/nbt/visitor/NbtElementVisitor.mapping
+++ b/mappings/net/minecraft/nbt/visitor/NbtElementVisitor.mapping
@@ -8,7 +8,7 @@ CLASS net/minecraft/class_5627 net/minecraft/nbt/visitor/NbtElementVisitor
 		ARG 1 compound
 	METHOD method_32293 visitDouble (Lnet/minecraft/class_2489;)V
 		ARG 1 element
-	METHOD method_32294 visitNull (Lnet/minecraft/class_2491;)V
+	METHOD method_32294 visitEnd (Lnet/minecraft/class_2491;)V
 		ARG 1 element
 	METHOD method_32295 visitFloat (Lnet/minecraft/class_2494;)V
 		ARG 1 element
diff --git a/unpick-definitions/nbt_type_ids.unpick b/unpick-definitions/nbt_type_ids.unpick
index 3e3fffdad7..bf12357abc 100644
--- a/unpick-definitions/nbt_type_ids.unpick
+++ b/unpick-definitions/nbt_type_ids.unpick
@@ -1,6 +1,6 @@
 v2
 
-constant nbt_type_ids net/minecraft/nbt/NbtElement NULL_TYPE
+constant nbt_type_ids net/minecraft/nbt/NbtElement END_TYPE
 constant nbt_type_ids net/minecraft/nbt/NbtElement BYTE_TYPE
 constant nbt_type_ids net/minecraft/nbt/NbtElement SHORT_TYPE
 constant nbt_type_ids net/minecraft/nbt/NbtElement INT_TYPE