diff --git a/mappings/net/minecraft/block/AbstractBlock.mapping b/mappings/net/minecraft/block/AbstractBlock.mapping
index 27dc8430bc..f45c337b9a 100644
--- a/mappings/net/minecraft/block/AbstractBlock.mapping
+++ b/mappings/net/minecraft/block/AbstractBlock.mapping
@@ -315,8 +315,10 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock
 			ARG 2 resistance
 		METHOD method_9630 copy (Lnet/minecraft/class_4970;)Lnet/minecraft/class_4970$class_2251;
 			ARG 0 block
-		METHOD method_9631 lightLevel (Ljava/util/function/ToIntFunction;)Lnet/minecraft/class_4970$class_2251;
-			ARG 1 levelFunction
+		METHOD method_9631 luminance (Ljava/util/function/ToIntFunction;)Lnet/minecraft/class_4970$class_2251;
+			COMMENT Specifies the light level emitted by a block.
+			ARG 1 luminance
+				COMMENT a per block state light level, with values between 0 and 15
 		METHOD method_9632 strength (F)Lnet/minecraft/class_4970$class_2251;
 			ARG 1 strength
 		METHOD method_9634 noCollision ()Lnet/minecraft/class_4970$class_2251;
@@ -514,6 +516,7 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock
 			ARG 1 world
 			ARG 2 pos
 		METHOD method_26213 getLuminance ()I
+			COMMENT Returns the light level emitted by this block state.
 		METHOD method_26214 getHardness (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)F
 			ARG 1 world
 			ARG 2 pos
diff --git a/mappings/net/minecraft/block/entity/ChestBlockEntity.mapping b/mappings/net/minecraft/block/entity/ChestBlockEntity.mapping
index bda3d1a62f..7d8d46b03d 100644
--- a/mappings/net/minecraft/block/entity/ChestBlockEntity.mapping
+++ b/mappings/net/minecraft/block/entity/ChestBlockEntity.mapping
@@ -14,13 +14,13 @@ CLASS net/minecraft/class_2595 net/minecraft/block/entity/ChestBlockEntity
 	METHOD method_11050 playSound (Lnet/minecraft/class_3414;)V
 	METHOD method_17765 countViewers (Lnet/minecraft/class_1937;Lnet/minecraft/class_2624;III)I
 		ARG 0 world
-		ARG 1 container
-		ARG 2 ticksOpen
-		ARG 3 x
-		ARG 4 y
+		ARG 1 inventory
+		ARG 2 x
+		ARG 3 y
+		ARG 4 z
 	METHOD method_20364 tickViewerCount (Lnet/minecraft/class_1937;Lnet/minecraft/class_2624;IIIII)I
 		ARG 0 world
-		ARG 1 blockEntity
+		ARG 1 inventory
 		ARG 2 ticksOpen
 		ARG 3 x
 		ARG 4 y
diff --git a/mappings/net/minecraft/client/gui/hud/ChatListenerHud.mapping b/mappings/net/minecraft/client/gui/hud/ChatHudListener.mapping
similarity index 59%
rename from mappings/net/minecraft/client/gui/hud/ChatListenerHud.mapping
rename to mappings/net/minecraft/client/gui/hud/ChatHudListener.mapping
index 1aa88e9062..8e18d3512f 100644
--- a/mappings/net/minecraft/client/gui/hud/ChatListenerHud.mapping
+++ b/mappings/net/minecraft/client/gui/hud/ChatHudListener.mapping
@@ -1,4 +1,4 @@
-CLASS net/minecraft/class_335 net/minecraft/client/gui/hud/ChatListenerHud
+CLASS net/minecraft/class_335 net/minecraft/client/gui/hud/ChatHudListener
 	FIELD field_2056 client Lnet/minecraft/class_310;
 	METHOD <init> (Lnet/minecraft/class_310;)V
 		ARG 1 client
diff --git a/mappings/net/minecraft/client/gui/screen/CommandSuggestor.mapping b/mappings/net/minecraft/client/gui/screen/CommandSuggestor.mapping
index e4a34ee9ea..f606a86a8d 100644
--- a/mappings/net/minecraft/client/gui/screen/CommandSuggestor.mapping
+++ b/mappings/net/minecraft/client/gui/screen/CommandSuggestor.mapping
@@ -4,7 +4,7 @@ CLASS net/minecraft/class_4717 net/minecraft/client/gui/screen/CommandSuggestor
 	FIELD field_21598 owner Lnet/minecraft/class_437;
 	FIELD field_21599 textField Lnet/minecraft/class_342;
 	FIELD field_21600 textRenderer Lnet/minecraft/class_327;
-	FIELD field_21601 slashRequired Z
+	FIELD field_21601 slashOptional Z
 	FIELD field_21602 suggestingWhenEmpty Z
 	FIELD field_21603 inWindowIndexOffset I
 	FIELD field_21604 maxSuggestionSize I
diff --git a/mappings/net/minecraft/server/command/CommandSource.mapping b/mappings/net/minecraft/command/CommandSource.mapping
similarity index 98%
rename from mappings/net/minecraft/server/command/CommandSource.mapping
rename to mappings/net/minecraft/command/CommandSource.mapping
index 71a1deae7c..69584656e8 100644
--- a/mappings/net/minecraft/server/command/CommandSource.mapping
+++ b/mappings/net/minecraft/command/CommandSource.mapping
@@ -1,4 +1,4 @@
-CLASS net/minecraft/class_2172 net/minecraft/server/command/CommandSource
+CLASS net/minecraft/class_2172 net/minecraft/command/CommandSource
 	METHOD method_17771 getBlockPositionSuggestions ()Ljava/util/Collection;
 	METHOD method_17772 getPositionSuggestions ()Ljava/util/Collection;
 	METHOD method_29310 getWorldKeys ()Ljava/util/Set;
diff --git a/mappings/net/minecraft/network/packet/c2s/play/SelectVillagerTradeC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/SelectMerchantTradeC2SPacket.mapping
similarity index 82%
rename from mappings/net/minecraft/network/packet/c2s/play/SelectVillagerTradeC2SPacket.mapping
rename to mappings/net/minecraft/network/packet/c2s/play/SelectMerchantTradeC2SPacket.mapping
index 0a3251d833..51189ff060 100644
--- a/mappings/net/minecraft/network/packet/c2s/play/SelectVillagerTradeC2SPacket.mapping
+++ b/mappings/net/minecraft/network/packet/c2s/play/SelectMerchantTradeC2SPacket.mapping
@@ -1,4 +1,4 @@
-CLASS net/minecraft/class_2863 net/minecraft/network/packet/c2s/play/SelectVillagerTradeC2SPacket
+CLASS net/minecraft/class_2863 net/minecraft/network/packet/c2s/play/SelectMerchantTradeC2SPacket
 	FIELD field_13036 tradeId I
 	METHOD <init> (I)V
 		ARG 1 tradeId