diff --git a/mappings/net/minecraft/loot/LootTableRanges.mapping b/mappings/net/minecraft/loot/LootTableRanges.mapping
index 46dbf039ea..34c6ff4e6b 100644
--- a/mappings/net/minecraft/loot/LootTableRanges.mapping
+++ b/mappings/net/minecraft/loot/LootTableRanges.mapping
@@ -1,5 +1,5 @@
 CLASS net/minecraft/class_63 net/minecraft/loot/LootTableRanges
-	FIELD field_978 types Ljava/util/Map;
+	FIELD field_978 TYPES Ljava/util/Map;
 	METHOD method_383 fromJson (Lcom/google/gson/JsonElement;Lcom/google/gson/JsonDeserializationContext;)Lnet/minecraft/class_59;
 		ARG 0 json
 		ARG 1 context
diff --git a/mappings/net/minecraft/nbt/NbtHelper.mapping b/mappings/net/minecraft/nbt/NbtHelper.mapping
index 0698b004aa..3bcb027f08 100644
--- a/mappings/net/minecraft/nbt/NbtHelper.mapping
+++ b/mappings/net/minecraft/nbt/NbtHelper.mapping
@@ -48,14 +48,14 @@ CLASS net/minecraft/class_2512 net/minecraft/nbt/NbtHelper
 			COMMENT the data version of the compound tag
 		ARG 4 targetVersion
 			COMMENT the data version to update the tag to
-	METHOD method_25929 fromUuidNew (Ljava/util/UUID;)Lnet/minecraft/class_2495;
+	METHOD method_25929 fromUuid (Ljava/util/UUID;)Lnet/minecraft/class_2495;
 		COMMENT Serializes a {@link UUID} into its equivalent NBT representation.
 		COMMENT
 		COMMENT @since 20w10a
 		ARG 0 uuid
-	METHOD method_25930 toUuidNew (Lnet/minecraft/class_2520;)Ljava/util/UUID;
+	METHOD method_25930 toUuid (Lnet/minecraft/class_2520;)Ljava/util/UUID;
 		COMMENT Deserializes a tag into a {@link UUID}.
-		COMMENT The tag's data must have the same structure as the output of {@link #fromUuidNew}.
+		COMMENT The tag's data must have the same structure as the output of {@link #fromUuid}.
 		COMMENT
 		COMMENT @throws IllegalArgumentException if {@code tag} is not a valid representation of a UUID
 		COMMENT @since 20w10a
diff --git a/mappings/net/minecraft/world/gen/feature/DefaultBiomeFeatures.mapping b/mappings/net/minecraft/world/gen/feature/DefaultBiomeFeatures.mapping
index 7626aab8ae..33a8b7ac83 100644
--- a/mappings/net/minecraft/world/gen/feature/DefaultBiomeFeatures.mapping
+++ b/mappings/net/minecraft/world/gen/feature/DefaultBiomeFeatures.mapping
@@ -321,7 +321,7 @@ CLASS net/minecraft/class_3864 net/minecraft/world/gen/feature/DefaultBiomeFeatu
 		ARG 0 biome
 	METHOD method_24384 addWarpedForestVegetation (Lnet/minecraft/class_1959;)V
 		ARG 0 biome
-	METHOD method_28437 (Lnet/minecraft/class_1959;)V
+	METHOD method_28437 addBadlandsUndergroundStructures (Lnet/minecraft/class_1959;)V
 		ARG 0 biome
 	METHOD method_28438 addNetherOres (Lnet/minecraft/class_1959;II)V
 		ARG 0 biome
@@ -329,7 +329,7 @@ CLASS net/minecraft/class_3864 net/minecraft/world/gen/feature/DefaultBiomeFeatu
 		ARG 2 quartzCount
 	METHOD method_28439 addAncientDebris (Lnet/minecraft/class_1959;)V
 		ARG 0 biome
-	METHOD method_28440 (Lnet/minecraft/class_1959;)V
+	METHOD method_28440 addDefaultUndergroundStructures (Lnet/minecraft/class_1959;)V
 		ARG 0 biome
-	METHOD method_28441 (Lnet/minecraft/class_1959;)V
+	METHOD method_28441 addOceanStructures (Lnet/minecraft/class_1959;)V
 		ARG 0 biome