diff --git a/mappings/net/minecraft/datafixers/fixes/ChoiceTypesFix.mapping b/mappings/net/minecraft/datafixers/fixes/ChoiceTypesFix.mapping
new file mode 100644
index 0000000000..1014eed900
--- /dev/null
+++ b/mappings/net/minecraft/datafixers/fixes/ChoiceTypesFix.mapping
@@ -0,0 +1,9 @@
+CLASS net/minecraft/class_3553 net/minecraft/datafixers/fixes/ChoiceTypesFix
+	FIELD field_15779 name Ljava/lang/String;
+	FIELD field_15780 types Lcom/mojang/datafixers/DSL$TypeReference;
+	METHOD <init> (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;Lcom/mojang/datafixers/DSL$TypeReference;)V
+		ARG 1 outputSchema
+		ARG 2 name
+		ARG 3 types
+	METHOD method_15476 (Ljava/lang/String;Lcom/mojang/datafixers/types/templates/TaggedChoice$TaggedChoiceType;Lcom/mojang/datafixers/types/templates/TaggedChoice$TaggedChoiceType;)Lcom/mojang/datafixers/TypeRewriteRule;
+		ARG 1 name
diff --git a/mappings/net/minecraft/datafixers/fixes/FixChoiceTypes.mapping b/mappings/net/minecraft/datafixers/fixes/FixChoiceTypes.mapping
deleted file mode 100644
index e2f9e38cdc..0000000000
--- a/mappings/net/minecraft/datafixers/fixes/FixChoiceTypes.mapping
+++ /dev/null
@@ -1,7 +0,0 @@
-CLASS net/minecraft/class_3553 net/minecraft/datafixers/fixes/FixChoiceTypes
-	FIELD field_15779 name Ljava/lang/String;
-	FIELD field_15780 types Lcom/mojang/datafixers/DSL$TypeReference;
-	METHOD <init> (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;Lcom/mojang/datafixers/DSL$TypeReference;)V
-		ARG 1 ouputSchema
-		ARG 2 name
-		ARG 3 types
diff --git a/mappings/net/minecraft/datafixers/fixes/FixItemName.mapping b/mappings/net/minecraft/datafixers/fixes/ItemNameFix.mapping
similarity index 84%
rename from mappings/net/minecraft/datafixers/fixes/FixItemName.mapping
rename to mappings/net/minecraft/datafixers/fixes/ItemNameFix.mapping
index 1935cdb74c..0a369f61f7 100644
--- a/mappings/net/minecraft/datafixers/fixes/FixItemName.mapping
+++ b/mappings/net/minecraft/datafixers/fixes/ItemNameFix.mapping
@@ -1,4 +1,4 @@
-CLASS net/minecraft/class_1182 net/minecraft/datafixers/fixes/FixItemName
+CLASS net/minecraft/class_1182 net/minecraft/datafixers/fixes/ItemNameFix
 	FIELD field_5676 name Ljava/lang/String;
 	METHOD <init> (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;)V
 		ARG 1 outputSchema