diff --git a/mappings/net/minecraft/client/render/DiffuseLighting.mapping b/mappings/net/minecraft/client/render/DiffuseLighting.mapping
index 758fcd4850..a81e379eb5 100644
--- a/mappings/net/minecraft/client/render/DiffuseLighting.mapping
+++ b/mappings/net/minecraft/client/render/DiffuseLighting.mapping
@@ -1,7 +1,7 @@
 CLASS net/minecraft/class_308 net/minecraft/client/render/DiffuseLighting
 	METHOD method_1452 enableForLevel (Lnet/minecraft/class_1159;)V
-		ARG 0 modelMatrix
+		ARG 0 positionMatrix
 	METHOD method_24210 disableGuiDepthLighting ()V
 	METHOD method_24211 enableGuiDepthLighting ()V
 	METHOD method_27869 disableForLevel (Lnet/minecraft/class_1159;)V
-		ARG 0 modelMatrix
+		ARG 0 positionMatrix
diff --git a/mappings/net/minecraft/client/render/WorldRenderer.mapping b/mappings/net/minecraft/client/render/WorldRenderer.mapping
index a0a1039efc..498cc40ecc 100644
--- a/mappings/net/minecraft/client/render/WorldRenderer.mapping
+++ b/mappings/net/minecraft/client/render/WorldRenderer.mapping
@@ -237,7 +237,7 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer
 		ARG 3 hasForcedFrustum
 		ARG 4 spectator
 	METHOD method_3275 captureFrustum (Lnet/minecraft/class_1159;Lnet/minecraft/class_1159;DDDLnet/minecraft/class_4604;)V
-		ARG 1 modelMatrix
+		ARG 1 positionMatrix
 		ARG 3 x
 		ARG 5 y
 		ARG 7 z
diff --git a/mappings/net/minecraft/client/render/block/entity/BeaconBlockEntityRenderer.mapping b/mappings/net/minecraft/client/render/block/entity/BeaconBlockEntityRenderer.mapping
index 23907fe35e..6bf734965d 100644
--- a/mappings/net/minecraft/client/render/block/entity/BeaconBlockEntityRenderer.mapping
+++ b/mappings/net/minecraft/client/render/block/entity/BeaconBlockEntityRenderer.mapping
@@ -4,7 +4,7 @@ CLASS net/minecraft/class_822 net/minecraft/client/render/block/entity/BeaconBlo
 	METHOD <init> (Lnet/minecraft/class_5614$class_5615;)V
 		ARG 1 ctx
 	METHOD method_22740 renderBeamFace (Lnet/minecraft/class_1159;Lnet/minecraft/class_4581;Lnet/minecraft/class_4588;FFFFIIFFFFFFFF)V
-		ARG 0 modelMatrix
+		ARG 0 positionMatrix
 		ARG 1 normalMatrix
 		ARG 2 vertices
 		ARG 3 red
@@ -43,7 +43,7 @@ CLASS net/minecraft/class_822 net/minecraft/client/render/block/entity/BeaconBlo
 		ARG 18 v1
 		ARG 19 v2
 	METHOD method_23076 renderBeamVertex (Lnet/minecraft/class_1159;Lnet/minecraft/class_4581;Lnet/minecraft/class_4588;FFFFIFFFF)V
-		ARG 0 modelMatrix
+		ARG 0 positionMatrix
 		ARG 1 normalMatrix
 		ARG 2 vertices
 		ARG 3 red
diff --git a/mappings/net/minecraft/client/render/entity/DragonFireballEntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/DragonFireballEntityRenderer.mapping
index 9985e5d23a..3ea583b2a6 100644
--- a/mappings/net/minecraft/client/render/entity/DragonFireballEntityRenderer.mapping
+++ b/mappings/net/minecraft/client/render/entity/DragonFireballEntityRenderer.mapping
@@ -3,7 +3,7 @@ CLASS net/minecraft/class_891 net/minecraft/client/render/entity/DragonFireballE
 	FIELD field_4661 TEXTURE Lnet/minecraft/class_2960;
 	METHOD method_23837 produceVertex (Lnet/minecraft/class_4588;Lnet/minecraft/class_1159;Lnet/minecraft/class_4581;IFIII)V
 		ARG 0 vertexConsumer
-		ARG 1 modelMatrix
+		ARG 1 positionMatrix
 		ARG 2 normalMatrix
 		ARG 3 light
 		ARG 4 x
diff --git a/mappings/net/minecraft/client/render/entity/ExperienceOrbEntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/ExperienceOrbEntityRenderer.mapping
index ecba04beb4..04f901311e 100644
--- a/mappings/net/minecraft/client/render/entity/ExperienceOrbEntityRenderer.mapping
+++ b/mappings/net/minecraft/client/render/entity/ExperienceOrbEntityRenderer.mapping
@@ -3,7 +3,7 @@ CLASS net/minecraft/class_902 net/minecraft/client/render/entity/ExperienceOrbEn
 	FIELD field_4701 TEXTURE Lnet/minecraft/class_2960;
 	METHOD method_23171 vertex (Lnet/minecraft/class_4588;Lnet/minecraft/class_1159;Lnet/minecraft/class_4581;FFIIIFFI)V
 		ARG 0 vertexConsumer
-		ARG 1 modelMatrix
+		ARG 1 positionMatrix
 		ARG 2 normalMatrix
 		ARG 3 x
 		ARG 4 y
diff --git a/mappings/net/minecraft/client/render/entity/GuardianEntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/GuardianEntityRenderer.mapping
index 9025663c26..af68e407ed 100644
--- a/mappings/net/minecraft/client/render/entity/GuardianEntityRenderer.mapping
+++ b/mappings/net/minecraft/client/render/entity/GuardianEntityRenderer.mapping
@@ -8,7 +8,7 @@ CLASS net/minecraft/class_907 net/minecraft/client/render/entity/GuardianEntityR
 		ARG 3 layer
 	METHOD method_23173 (Lnet/minecraft/class_4588;Lnet/minecraft/class_1159;Lnet/minecraft/class_4581;FFFIIIFF)V
 		ARG 0 vertexConsumer
-		ARG 1 modelMatrix
+		ARG 1 positionMatrix
 		ARG 2 normalMatrix
 		ARG 3 x
 		ARG 4 y
diff --git a/mappings/net/minecraft/client/render/entity/MobEntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/MobEntityRenderer.mapping
index 7399b89938..07b2efb47e 100644
--- a/mappings/net/minecraft/client/render/entity/MobEntityRenderer.mapping
+++ b/mappings/net/minecraft/client/render/entity/MobEntityRenderer.mapping
@@ -2,7 +2,7 @@ CLASS net/minecraft/class_927 net/minecraft/client/render/entity/MobEntityRender
 	FIELD field_32940 LEASH_PIECE_COUNT I
 	METHOD method_23187 renderLeashPiece (Lnet/minecraft/class_4588;Lnet/minecraft/class_1159;FFFIIIIFFFFIZ)V
 		ARG 0 vertexConsumer
-		ARG 1 modelMatrix
+		ARG 1 positionMatrix
 		ARG 5 leashedEntityBlockLight
 		ARG 6 holdingEntityBlockLight
 		ARG 7 leashedEntitySkyLight
diff --git a/mappings/net/minecraft/client/render/entity/PaintingEntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/PaintingEntityRenderer.mapping
index 32c1799735..7f0dcee2bd 100644
--- a/mappings/net/minecraft/client/render/entity/PaintingEntityRenderer.mapping
+++ b/mappings/net/minecraft/client/render/entity/PaintingEntityRenderer.mapping
@@ -1,6 +1,6 @@
 CLASS net/minecraft/class_928 net/minecraft/client/render/entity/PaintingEntityRenderer
 	METHOD method_23188 vertex (Lnet/minecraft/class_1159;Lnet/minecraft/class_4581;Lnet/minecraft/class_4588;FFFFFIIII)V
-		ARG 1 modelMatrix
+		ARG 1 positionMatrix
 		ARG 2 normalMatrix
 		ARG 3 vertexConsumer
 		ARG 4 x
diff --git a/mappings/net/minecraft/client/render/entity/ProjectileEntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/ProjectileEntityRenderer.mapping
index 4043ad8eb6..3b58ceac21 100644
--- a/mappings/net/minecraft/client/render/entity/ProjectileEntityRenderer.mapping
+++ b/mappings/net/minecraft/client/render/entity/ProjectileEntityRenderer.mapping
@@ -1,6 +1,6 @@
 CLASS net/minecraft/class_876 net/minecraft/client/render/entity/ProjectileEntityRenderer
 	METHOD method_23153 vertex (Lnet/minecraft/class_1159;Lnet/minecraft/class_4581;Lnet/minecraft/class_4588;IIIFFIIII)V
-		ARG 1 modelMatrix
+		ARG 1 positionMatrix
 		ARG 2 normalMatrix
 		ARG 3 vertexConsumer
 		ARG 4 x
diff --git a/mappings/net/minecraft/client/util/math/MatrixStack.mapping b/mappings/net/minecraft/client/util/math/MatrixStack.mapping
index 0b90b3c3ee..ba7b8ef06c 100644
--- a/mappings/net/minecraft/client/util/math/MatrixStack.mapping
+++ b/mappings/net/minecraft/client/util/math/MatrixStack.mapping
@@ -18,7 +18,7 @@ CLASS net/minecraft/class_4587 net/minecraft/client/util/math/MatrixStack
 	METHOD method_23760 peek ()Lnet/minecraft/class_4587$class_4665;
 	METHOD method_34426 loadIdentity ()V
 	CLASS class_4665 Entry
-		FIELD field_21327 modelMatrix Lnet/minecraft/class_1159;
+		FIELD field_21327 positionMatrix Lnet/minecraft/class_1159;
 		FIELD field_21328 normalMatrix Lnet/minecraft/class_4581;
-		METHOD method_23761 getModel ()Lnet/minecraft/class_1159;
-		METHOD method_23762 getNormal ()Lnet/minecraft/class_4581;
+		METHOD method_23761 getPositionMatrix ()Lnet/minecraft/class_1159;
+		METHOD method_23762 getNormalMatrix ()Lnet/minecraft/class_4581;