diff --git a/mappings/net/minecraft/server/world/ChunkLevelIndexedProcessor.mapping b/mappings/net/minecraft/server/world/ChunkPosLevelPropagator.mapping
similarity index 55%
rename from mappings/net/minecraft/server/world/ChunkLevelIndexedProcessor.mapping
rename to mappings/net/minecraft/server/world/ChunkPosLevelPropagator.mapping
index 72ef2786d5..d28f3b4544 100644
--- a/mappings/net/minecraft/server/world/ChunkLevelIndexedProcessor.mapping
+++ b/mappings/net/minecraft/server/world/ChunkPosLevelPropagator.mapping
@@ -1,8 +1,6 @@
-CLASS ut net/minecraft/server/world/ChunkLevelIndexedProcessor
+CLASS ut net/minecraft/server/world/ChunkPosLevelPropagator
 	METHOD <init> (III)V
 		ARG 1 levelCount
 		ARG 2 initLevelCapacity
 		ARG 3 initTotalCapacity
-	METHOD b getBaseLevel (J)I
-		ARG 1 chunkPos
 	METHOD b scheduleNewLevelUpdate (JIZ)V
diff --git a/mappings/net/minecraft/util/LevelIndexedProcessor.mapping b/mappings/net/minecraft/util/LevelIndexedProcessor.mapping
deleted file mode 100644
index 1aa842e22c..0000000000
--- a/mappings/net/minecraft/util/LevelIndexedProcessor.mapping
+++ /dev/null
@@ -1,71 +0,0 @@
-CLASS cje net/minecraft/util/LevelIndexedProcessor
-	CLASS cje$1
-		METHOD rehash (I)V
-			ARG 1 newN
-	CLASS cje$2
-		METHOD rehash (I)V
-			ARG 1 newN
-	FIELD a maxLevelCount I
-	FIELD b toProcess [Lit/unimi/dsi/fastutil/longs/LongLinkedOpenHashSet;
-	FIELD c levels Lit/unimi/dsi/fastutil/longs/Long2ByteFunction;
-	FIELD d minUnprocessedLevel I
-	FIELD e hasUpdates Z
-	METHOD <init> (III)V
-		ARG 1 levelCount
-		ARG 2 initLevelCapacity
-		ARG 3 initTotalCapacity
-	METHOD a updateMinUnprocessed (I)V
-		ARG 1 maxLevel
-	METHOD a minLevel (II)I
-		ARG 1 level
-		ARG 2 max
-	METHOD a isInvalidIndex (J)Z
-		ARG 1 index
-	METHOD a setLevel (JI)V
-		ARG 1 index
-		ARG 3 level
-	METHOD a addWithLevel (JII)V
-		ARG 1 id
-		ARG 3 level
-		ARG 4 targetLevel
-	METHOD a removeFromLevel (JIIZ)V
-		ARG 1 index
-		ARG 3 level
-		ARG 4 maxLevel
-		ARG 5 removeFromLevelMap
-	METHOD a processLevel (JIZ)V
-		ARG 1 index
-		ARG 3 level
-	METHOD a getMergedLevel (JJI)I
-		ARG 1 position
-		ARG 3 source
-		ARG 5 newLevel
-	METHOD a scheduleUpdate (JJIIIZ)V
-		ARG 1 sourceIndex
-		ARG 3 updateIndex
-		ARG 5 newBaseLevelAtUpdate
-		ARG 6 currentLevelAtUpdate
-		ARG 7 oldLevelAtUpdate
-		ARG 8 modeFlag
-	METHOD a scheduleNewLevelUpdate (JJIZ)V
-		ARG 1 sourceIndex
-		ARG 3 updateIndex
-		ARG 5 lastLevel
-	METHOD b hasLevelUpdates ()Z
-	METHOD b updateLevels (I)I
-		ARG 1 maxSteps
-	METHOD b getBaseLevel (JJI)I
-		ARG 1 source
-		ARG 3 position
-		ARG 5 previousLevel
-	METHOD b scheduleUpdateRecursively (JJIZ)V
-		ARG 1 sourceIndex
-		ARG 3 updateIndex
-		ARG 5 sourceLevel
-		ARG 6 modeFlag
-	METHOD c getLevel (J)I
-		ARG 1 index
-	METHOD e remove (J)V
-		ARG 1 index
-	METHOD f scheduleNewUpdate (J)V
-		ARG 1 idx
diff --git a/mappings/net/minecraft/util/LevelPropagator.mapping b/mappings/net/minecraft/util/LevelPropagator.mapping
new file mode 100644
index 0000000000..51770a2d96
--- /dev/null
+++ b/mappings/net/minecraft/util/LevelPropagator.mapping
@@ -0,0 +1,73 @@
+CLASS cje net/minecraft/util/LevelPropagator
+	CLASS cje$1
+		METHOD rehash (I)V
+			ARG 1 newN
+	CLASS cje$2
+		METHOD rehash (I)V
+			ARG 1 newN
+	FIELD a levelCount I
+	FIELD b levelToIds [Lit/unimi/dsi/fastutil/longs/LongLinkedOpenHashSet;
+	FIELD c idToLevel Lit/unimi/dsi/fastutil/longs/Long2ByteFunction;
+	FIELD d minLevel I
+	FIELD e hasUpdates Z
+	METHOD <init> (III)V
+		ARG 1 levelCount
+		ARG 2 initLevelCapacity
+		ARG 3 initTotalCapacity
+	METHOD a updateMinLevel (I)V
+		ARG 1 limitLevel
+	METHOD a minLevel (II)I
+		ARG 1 level
+		ARG 2 max
+	METHOD a isInvalid (J)Z
+		ARG 1 id
+	METHOD a setLevel (JI)V
+		ARG 1 id
+		ARG 3 level
+	METHOD a add (JII)V
+		ARG 1 id
+		ARG 3 level
+		ARG 4 targetLevel
+	METHOD a removeFromLevel (JIIZ)V
+		ARG 1 id
+		ARG 3 level
+		ARG 4 maxLevel
+		ARG 5 removeFromLevelMap
+	METHOD a updateNeighborsRecursively (JIZ)V
+		ARG 1 id
+		ARG 3 targetLevel
+		ARG 4 mergeAsMin
+	METHOD a getMergedLevel (JJI)I
+		ARG 1 id
+		ARG 3 sourceId
+		ARG 5 limitLevel
+	METHOD a update (JJIIIZ)V
+		ARG 1 sourceId
+		ARG 3 id
+		ARG 5 limitLevel
+		ARG 6 targetLevel
+		ARG 7 currentLevel
+		ARG 8 mergeAsMin
+	METHOD a update (JJIZ)V
+		ARG 1 causingId
+		ARG 3 id
+		ARG 5 limitLevel
+		ARG 6 mergeAsMin
+	METHOD b hasLevelUpdates ()Z
+	METHOD b updateAllRecursively (I)I
+		ARG 1 maxSteps
+	METHOD b getUpdatedLevel (JJI)I
+		ARG 1 sourceId
+		ARG 3 id
+		ARG 5 currentLevel
+	METHOD b updateRecursively (JJIZ)V
+		ARG 1 sourceId
+		ARG 3 id
+		ARG 5 level
+		ARG 6 mergeAsMin
+	METHOD c getLevel (J)I
+		ARG 1 id
+	METHOD e remove (J)V
+		ARG 1 id
+	METHOD f update (J)V
+		ARG 1 id
diff --git a/mappings/net/minecraft/util/SectionRelativeLevelPropagator.mapping b/mappings/net/minecraft/util/SectionRelativeLevelPropagator.mapping
new file mode 100644
index 0000000000..168d72a40f
--- /dev/null
+++ b/mappings/net/minecraft/util/SectionRelativeLevelPropagator.mapping
@@ -0,0 +1 @@
+CLASS uz net/minecraft/util/SectionRelativeLevelPropagator
diff --git a/mappings/net/minecraft/village/PointOfInterestStorage.mapping b/mappings/net/minecraft/village/PointOfInterestStorage.mapping
index f1959dcc76..6d011a120a 100644
--- a/mappings/net/minecraft/village/PointOfInterestStorage.mapping
+++ b/mappings/net/minecraft/village/PointOfInterestStorage.mapping
@@ -1,7 +1,6 @@
 CLASS apg net/minecraft/village/PointOfInterestStorage
-	CLASS apg$a LevelProcessor
-		FIELD b levels Lit/unimi/dsi/fastutil/longs/Long2ByteMap;
-		METHOD a updateLevels ()V
+	CLASS apg$a PathfindingFavorProvider
+		FIELD b pathfindingFavors Lit/unimi/dsi/fastutil/longs/Long2ByteMap;
 	CLASS apg$b OccupationStatus
 		FIELD a HAS_SPACE Lapg$b;
 		FIELD b IS_OCCUPIED Lapg$b;
diff --git a/mappings/uz.mapping b/mappings/uz.mapping
deleted file mode 100644
index 6be5ab06a5..0000000000
--- a/mappings/uz.mapping
+++ /dev/null
@@ -1,2 +0,0 @@
-CLASS uz
-	METHOD b scheduleNewLevelUpdate (JIZ)V