diff --git a/mappings/net/minecraft/advancement/AdvancementDisplay.mapping b/mappings/net/minecraft/advancement/AdvancementDisplay.mapping
index 709ed448a7..46e2db9177 100644
--- a/mappings/net/minecraft/advancement/AdvancementDisplay.mapping
+++ b/mappings/net/minecraft/advancement/AdvancementDisplay.mapping
@@ -16,7 +16,8 @@ CLASS z net/minecraft/advancement/AdvancementDisplay
 	METHOD a getTitle ()Ljm;
 	METHOD a setPosition (FF)V
 		ARG 1 xPos
-	METHOD a deserialize (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lz;
+	METHOD a iconFromJson (Lcom/google/gson/JsonObject;)Lbbq;
+	METHOD a fromJson (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lz;
 		ARG 0 obj
 		ARG 1 context
 	METHOD a toPacket (Ljc;)V
diff --git a/mappings/net/minecraft/advancement/AdvancementPosition.mapping b/mappings/net/minecraft/advancement/AdvancementPositioner.mapping
similarity index 51%
rename from mappings/net/minecraft/advancement/AdvancementPosition.mapping
rename to mappings/net/minecraft/advancement/AdvancementPositioner.mapping
index a5bdb3fe80..3530011998 100644
--- a/mappings/net/minecraft/advancement/AdvancementPosition.mapping
+++ b/mappings/net/minecraft/advancement/AdvancementPositioner.mapping
@@ -1,4 +1,4 @@
-CLASS ac net/minecraft/advancement/AdvancementPosition
+CLASS ac net/minecraft/advancement/AdvancementPositioner
 	FIELD a advancement Lq;
 	FIELD b parent Lac;
 	FIELD c previousSibling Lac;
@@ -9,19 +9,23 @@ CLASS ac net/minecraft/advancement/AdvancementPosition
 	FIELD h depth I
 	FIELD i row F
 	FIELD j relativeRowInSiblings F
-	METHOD a initRecursively ()V
-	METHOD a increaseRow (F)V
+	METHOD a calculateRecursively ()V
+	METHOD a increaseRowRecursively (F)V
 		ARG 1 deltaRow
-	METHOD a positMinRow (FIF)F
+	METHOD a findMinRowRecursively (FIF)F
 		ARG 1 deltaRow
 		ARG 2 depth
 		ARG 3 minRow
-	METHOD a postInit (Lac;)Lac;
+	METHOD a onFinishCalculation (Lac;)Lac;
 		ARG 1 last
+	METHOD a pushDown (Lac;F)V
+		ARG 2 extraRowDistance
 	METHOD a getLast (Lac;Lac;)Lac;
-	METHOD a arrangeForRoot (Lq;)V
-	METHOD a adjust (Lq;Lac;)Lac;
-		ARG 2 childPosition
+	METHOD a arrangeForTree (Lq;)V
+		ARG 0 root
+	METHOD a findChildrenRecursively (Lq;Lac;)Lac;
+		ARG 2 lastChild
+	METHOD b onFinishChildrenCalculation ()V
 	METHOD c getFirstChild ()Lac;
 	METHOD d getLastChild ()Lac;
 	METHOD e apply ()V
diff --git a/mappings/net/minecraft/advancement/SimpleAdvancement.mapping b/mappings/net/minecraft/advancement/SimpleAdvancement.mapping
index 3637a063e5..09ee30f2be 100644
--- a/mappings/net/minecraft/advancement/SimpleAdvancement.mapping
+++ b/mappings/net/minecraft/advancement/SimpleAdvancement.mapping
@@ -1,5 +1,5 @@
 CLASS q net/minecraft/advancement/SimpleAdvancement
-	CLASS q$a Builder
+	CLASS q$a Task
 		FIELD a parentId Lqr;
 		FIELD b parentObj Lq;
 		FIELD c display Lz;
@@ -10,7 +10,7 @@ CLASS q net/minecraft/advancement/SimpleAdvancement
 		METHOD a create ()Lq$a;
 		METHOD a criteriaMerger (Lab;)Lq$a;
 		METHOD a display (Lbgv;Ljm;Ljm;Lqr;Laa;ZZZ)Lq$a;
-		METHOD a deserialize (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lq$a;
+		METHOD a fromJson (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lq$a;
 			ARG 0 obj
 			ARG 1 context
 		METHOD a criterion (Ljava/lang/String;Lv;)Lq$a;
@@ -19,14 +19,14 @@ CLASS q net/minecraft/advancement/SimpleAdvancement
 			ARG 1 conditions
 		METHOD a build (Ljava/util/function/Consumer;Ljava/lang/String;)Lq;
 		METHOD a findParent (Ljava/util/function/Function;)Z
-		METHOD a serialize (Ljc;)V
+		METHOD a toPacket (Ljc;)V
 		METHOD a parent (Lq;)Lq$a;
 		METHOD a parent (Lqr;)Lq$a;
 		METHOD a rewards (Lt$a;)Lq$a;
 		METHOD a rewards (Lt;)Lq$a;
 		METHOD a display (Lz;)Lq$a;
 		METHOD b toJson ()Lcom/google/gson/JsonObject;
-		METHOD b deserialize (Ljc;)Lq$a;
+		METHOD b fromPacket (Ljc;)Lq$a;
 			ARG 0 buf
 		METHOD b build (Lqr;)Lq;
 		METHOD c getCriteria ()Ljava/util/Map;
diff --git a/mappings/net/minecraft/advancement/criterion/Criterion.mapping b/mappings/net/minecraft/advancement/criterion/Criterion.mapping
index 27860c885b..53931b1b05 100644
--- a/mappings/net/minecraft/advancement/criterion/Criterion.mapping
+++ b/mappings/net/minecraft/advancement/criterion/Criterion.mapping
@@ -8,7 +8,7 @@ CLASS x net/minecraft/advancement/criterion/Criterion
 		METHOD equals (Ljava/lang/Object;)Z
 			ARG 1 o
 	METHOD a getId ()Lqr;
-	METHOD a deserializeConditions (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Ly;
+	METHOD a conditionsFromJson (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Ly;
 		ARG 1 obj
 	METHOD a endTracking (Lra;)V
 	METHOD a beginTrackingCondition (Lra;Lx$a;)V
diff --git a/mappings/net/minecraft/advancement/criterion/CriterionProgress.mapping b/mappings/net/minecraft/advancement/criterion/CriterionProgress.mapping
index 4278202321..b493c5a1bb 100644
--- a/mappings/net/minecraft/advancement/criterion/CriterionProgress.mapping
+++ b/mappings/net/minecraft/advancement/criterion/CriterionProgress.mapping
@@ -2,10 +2,10 @@ CLASS w net/minecraft/advancement/criterion/CriterionProgress
 	FIELD a FORMAT Ljava/text/SimpleDateFormat;
 	FIELD b obtained Ljava/util/Date;
 	METHOD a isObtained ()Z
-	METHOD a create (Ljava/lang/String;)Lw;
-	METHOD a serialize (Ljc;)V
+	METHOD a obtainedAt (Ljava/lang/String;)Lw;
+	METHOD a toPacket (Ljc;)V
 	METHOD b obtain ()V
-	METHOD b deserialize (Ljc;)Lw;
+	METHOD b fromPacket (Ljc;)Lw;
 	METHOD c reset ()V
 	METHOD d getObtainedDate ()Ljava/util/Date;
-	METHOD e serialize ()Lcom/google/gson/JsonElement;
+	METHOD e toJson ()Lcom/google/gson/JsonElement;