diff --git a/mappings/net/minecraft/block/entity/trial_spawner/EntityDetector.mapping b/mappings/net/minecraft/block/entity/trialspawner/EntityDetector.mapping
similarity index 87%
rename from mappings/net/minecraft/block/entity/trial_spawner/EntityDetector.mapping
rename to mappings/net/minecraft/block/entity/trialspawner/EntityDetector.mapping
index f3aa71a7db..f50331ef25 100644
--- a/mappings/net/minecraft/block/entity/trial_spawner/EntityDetector.mapping
+++ b/mappings/net/minecraft/block/entity/trialspawner/EntityDetector.mapping
@@ -1,4 +1,4 @@
-CLASS net/minecraft/class_8962 net/minecraft/block/entity/trial_spawner/EntityDetector
+CLASS net/minecraft/class_8962 net/minecraft/block/entity/trialspawner/EntityDetector
 	FIELD field_47356 PLAYER Lnet/minecraft/class_8962;
 	FIELD field_47357 SHEEP Lnet/minecraft/class_8962;
 	METHOD detect (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;I)Ljava/util/List;
diff --git a/mappings/net/minecraft/block/entity/trial_spawner/TrialSpawnerData.mapping b/mappings/net/minecraft/block/entity/trialspawner/TrialSpawnerData.mapping
similarity index 96%
rename from mappings/net/minecraft/block/entity/trial_spawner/TrialSpawnerData.mapping
rename to mappings/net/minecraft/block/entity/trialspawner/TrialSpawnerData.mapping
index 4464cd0eb9..acfeb1ed85 100644
--- a/mappings/net/minecraft/block/entity/trial_spawner/TrialSpawnerData.mapping
+++ b/mappings/net/minecraft/block/entity/trialspawner/TrialSpawnerData.mapping
@@ -1,4 +1,4 @@
-CLASS net/minecraft/class_8966 net/minecraft/block/entity/trial_spawner/TrialSpawnerData
+CLASS net/minecraft/class_8966 net/minecraft/block/entity/trialspawner/TrialSpawnerData
 	FIELD field_47369 SPAWN_DATA_KEY Ljava/lang/String;
 	FIELD field_47371 players Ljava/util/Set;
 	FIELD field_47372 spawnedMobsAlive Ljava/util/Set;
diff --git a/mappings/net/minecraft/block/entity/trial_spawner/TrialSpawnerLogic.mapping b/mappings/net/minecraft/block/entity/trialspawner/TrialSpawnerLogic.mapping
similarity index 95%
rename from mappings/net/minecraft/block/entity/trial_spawner/TrialSpawnerLogic.mapping
rename to mappings/net/minecraft/block/entity/trialspawner/TrialSpawnerLogic.mapping
index a692cca209..3851006ee3 100644
--- a/mappings/net/minecraft/block/entity/trial_spawner/TrialSpawnerLogic.mapping
+++ b/mappings/net/minecraft/block/entity/trialspawner/TrialSpawnerLogic.mapping
@@ -1,4 +1,4 @@
-CLASS net/minecraft/class_8963 net/minecraft/block/entity/trial_spawner/TrialSpawnerLogic
+CLASS net/minecraft/class_8963 net/minecraft/block/entity/trialspawner/TrialSpawnerLogic
 	FIELD field_47363 data Lnet/minecraft/class_8966;
 	FIELD field_47364 owner Lnet/minecraft/class_8963$class_8964;
 	FIELD field_47365 entityDetector Lnet/minecraft/class_8962;
diff --git a/mappings/net/minecraft/block/TrialSpawnerState.mapping b/mappings/net/minecraft/block/enums/TrialSpawnerState.mapping
similarity index 97%
rename from mappings/net/minecraft/block/TrialSpawnerState.mapping
rename to mappings/net/minecraft/block/enums/TrialSpawnerState.mapping
index ba56c95c7d..127071bf2d 100644
--- a/mappings/net/minecraft/block/TrialSpawnerState.mapping
+++ b/mappings/net/minecraft/block/enums/TrialSpawnerState.mapping
@@ -1,4 +1,4 @@
-CLASS net/minecraft/class_8967 net/minecraft/block/TrialSpawnerState
+CLASS net/minecraft/class_8967 net/minecraft/block/enums/TrialSpawnerState
 	FIELD field_47390 EJECT_REWARDS_COOLDOWN I
 	FIELD field_47391 id Ljava/lang/String;
 	FIELD field_47392 luminance I
diff --git a/mappings/net/minecraft/client/render/block/entity/MobSpawnerBlockEntityRenderer.mapping b/mappings/net/minecraft/client/render/block/entity/MobSpawnerBlockEntityRenderer.mapping
index 94e0b6ffe5..9e514b41ab 100644
--- a/mappings/net/minecraft/client/render/block/entity/MobSpawnerBlockEntityRenderer.mapping
+++ b/mappings/net/minecraft/client/render/block/entity/MobSpawnerBlockEntityRenderer.mapping
@@ -4,7 +4,7 @@ CLASS net/minecraft/class_839 net/minecraft/client/render/block/entity/MobSpawne
 		ARG 1 ctx
 	METHOD method_55253 render (FLnet/minecraft/class_4587;Lnet/minecraft/class_4597;ILnet/minecraft/class_1297;Lnet/minecraft/class_898;DD)V
 		ARG 0 tickDelta
-		ARG 1 matirces
+		ARG 1 matrices
 		ARG 2 vertexConsumers
 		ARG 3 light
 		ARG 4 entity