diff --git a/mappings/net/minecraft/block/Block.mapping b/mappings/net/minecraft/block/Block.mapping
index dfc0e15973..4e6322eb3d 100644
--- a/mappings/net/minecraft/block/Block.mapping
+++ b/mappings/net/minecraft/block/Block.mapping
@@ -6,7 +6,7 @@ CLASS bft net/minecraft/block/Block
 		FIELD a NONE Lbft$b;
 		FIELD b XZ Lbft$b;
 		FIELD c XYZ Lbft$b;
-	CLASS bft$c Builder
+	CLASS bft$c Settings
 		FIELD a material Lced;
 		FIELD b materialColor Lcee;
 		FIELD c collidable Z
diff --git a/mappings/net/minecraft/client/sortme/ClientAdvancementManager.mapping b/mappings/net/minecraft/client/network/ClientAdvancementManager.mapping
similarity index 73%
rename from mappings/net/minecraft/client/sortme/ClientAdvancementManager.mapping
rename to mappings/net/minecraft/client/network/ClientAdvancementManager.mapping
index 62dc25c5e1..ab887ab749 100644
--- a/mappings/net/minecraft/client/sortme/ClientAdvancementManager.mapping
+++ b/mappings/net/minecraft/client/network/ClientAdvancementManager.mapping
@@ -1,4 +1,4 @@
-CLASS czo net/minecraft/client/sortme/ClientAdvancementManager
+CLASS czo net/minecraft/client/network/ClientAdvancementManager
 	FIELD a LOGGER Lorg/apache/logging/log4j/Logger;
 	FIELD b client Lcof;
 	FIELD c manager Lo;
diff --git a/mappings/net/minecraft/client/sortme/ClientCommandSource.mapping b/mappings/net/minecraft/client/network/ClientCommandSource.mapping
similarity index 91%
rename from mappings/net/minecraft/client/sortme/ClientCommandSource.mapping
rename to mappings/net/minecraft/client/network/ClientCommandSource.mapping
index 734c4c85e0..ab27f4cbda 100644
--- a/mappings/net/minecraft/client/sortme/ClientCommandSource.mapping
+++ b/mappings/net/minecraft/client/network/ClientCommandSource.mapping
@@ -1,4 +1,4 @@
-CLASS czs net/minecraft/client/sortme/ClientCommandSource
+CLASS czs net/minecraft/client/network/ClientCommandSource
 	FIELD a networkHandler Lczr;
 	FIELD b client Lcof;
 	FIELD c completionId I
diff --git a/mappings/net/minecraft/client/sortme/ChatMessageType.mapping b/mappings/net/minecraft/client/sortme/ChatMessageType.mapping
new file mode 100644
index 0000000000..13981b412e
--- /dev/null
+++ b/mappings/net/minecraft/client/sortme/ChatMessageType.mapping
@@ -0,0 +1,5 @@
+CLASS iz net/minecraft/client/sortme/ChatMessageType
+	FIELD d id B
+	METHOD a getId ()B
+	METHOD a byId (B)Liz;
+		ARG 0 id
diff --git a/mappings/net/minecraft/item/Item.mapping b/mappings/net/minecraft/item/Item.mapping
index 1ded4fba5f..cfaca9f3b5 100644
--- a/mappings/net/minecraft/item/Item.mapping
+++ b/mappings/net/minecraft/item/Item.mapping
@@ -1,5 +1,5 @@
 CLASS avp net/minecraft/item/Item
-	CLASS avp$a Builder
+	CLASS avp$a Settings
 		FIELD a fullStackSize I
 		FIELD b durability I
 		FIELD c containerItem Lavp;
diff --git a/mappings/net/minecraft/sortme/ItemGroup.mapping b/mappings/net/minecraft/item/ItemGroup.mapping
similarity index 98%
rename from mappings/net/minecraft/sortme/ItemGroup.mapping
rename to mappings/net/minecraft/item/ItemGroup.mapping
index 46e2cbc4bd..f3cff9e661 100644
--- a/mappings/net/minecraft/sortme/ItemGroup.mapping
+++ b/mappings/net/minecraft/item/ItemGroup.mapping
@@ -1,4 +1,4 @@
-CLASS aul net/minecraft/sortme/ItemGroup
+CLASS aul net/minecraft/item/ItemGroup
 	CLASS aul$1
 		METHOD <init> (ILjava/lang/String;)V
 			ARG 0 id
diff --git a/mappings/net/minecraft/sortme/CachedSupplier.mapping b/mappings/net/minecraft/util/LazySupplier.mapping
similarity index 53%
rename from mappings/net/minecraft/sortme/CachedSupplier.mapping
rename to mappings/net/minecraft/util/LazySupplier.mapping
index 7c14725c43..461ce580e7 100644
--- a/mappings/net/minecraft/sortme/CachedSupplier.mapping
+++ b/mappings/net/minecraft/util/LazySupplier.mapping
@@ -1,4 +1,6 @@
-CLASS yn net/minecraft/sortme/CachedSupplier
+CLASS yn net/minecraft/util/LazySupplier
 	FIELD a supplier Ljava/util/function/Supplier;
 	FIELD b type Ljava/lang/Object;
+	METHOD <init> (Ljava/util/function/Supplier;)V
+		ARG 1 delegate
 	METHOD a getType ()Ljava/lang/Object;
diff --git a/mappings/net/minecraft/world/biome/Biome.mapping b/mappings/net/minecraft/world/biome/Biome.mapping
index f85971940c..1bc08620fc 100644
--- a/mappings/net/minecraft/world/biome/Biome.mapping
+++ b/mappings/net/minecraft/world/biome/Biome.mapping
@@ -1,5 +1,5 @@
 CLASS bbr net/minecraft/world/biome/Biome
-	CLASS bbr$a Builder
+	CLASS bbr$a Settings
 		FIELD a surfaceBuilder Lccm;
 		FIELD b precipitation Lbbr$d;
 		FIELD c category Lbbr$b;