diff --git a/mappings/bbk.mapping b/mappings/bbk.mapping
index 0bac1a5176..6d8570f8eb 100644
--- a/mappings/bbk.mapping
+++ b/mappings/bbk.mapping
@@ -1,3 +1,3 @@
 CLASS bbk
-	METHOD a deserialize (Lhs;)V
-	METHOD b serialize (Lhs;)Lhs;
+	METHOD a fromTag (Lhs;)V
+	METHOD b toTag (Lhs;)Lhs;
diff --git a/mappings/ccl.mapping b/mappings/ccl.mapping
index d18a545f0b..13ac42426e 100644
--- a/mappings/ccl.mapping
+++ b/mappings/ccl.mapping
@@ -1,5 +1,5 @@
 CLASS ccl
 	FIELD a all Lit/unimi/dsi/fastutil/longs/LongSet;
 	FIELD b remaining Lit/unimi/dsi/fastutil/longs/LongSet;
-	METHOD a deserialize (Lhs;)V
-	METHOD b serialize (Lhs;)Lhs;
+	METHOD a fromTag (Lhs;)V
+	METHOD b toTag (Lhs;)Lhs;
diff --git a/mappings/net/minecraft/sortme/Raid.mapping b/mappings/net/minecraft/entity/raid/Raid.mapping
similarity index 71%
rename from mappings/net/minecraft/sortme/Raid.mapping
rename to mappings/net/minecraft/entity/raid/Raid.mapping
index 6d36bb8525..cf3468743c 100644
--- a/mappings/net/minecraft/sortme/Raid.mapping
+++ b/mappings/net/minecraft/entity/raid/Raid.mapping
@@ -1,11 +1,11 @@
-CLASS asf net/minecraft/sortme/Raid
+CLASS asf net/minecraft/entity/raid/Raid
 	CLASS asf$a Member
 		FIELD a VINDICATOR Lasf$a;
 		FIELD b EVOKER Lasf$a;
 		FIELD c PILLAGER Lasf$a;
 		FIELD d WITCH Lasf$a;
 		FIELD e ILLAGER_BEAST Lasf$a;
-	FIELD a illagerBanner Lawo;
+	FIELD a ILLAGER_BANNER Lawo;
 	FIELD d ticksActive J
 	FIELD f world Lbbp;
 	FIELD g markedForRemoval Z
@@ -23,12 +23,17 @@ CLASS asf net/minecraft/sortme/Raid
 	METHOD <init> (ILbbp;Lalq;)V
 		ARG 1 id
 		ARG 2 world
-	METHOD a deserialize (Lhs;)V
-	METHOD b serialize (Lhs;)Lhs;
+	METHOD a setVillageProperties (Lalq;)V
+	METHOD a setWorld (Lbbp;)V
+	METHOD a fromTag (Lhs;)V
+	METHOD b toTag (Lhs;)Lhs;
+	METHOD c getWorld ()Lbbp;
 	METHOD f hasStarted ()Z
 	METHOD g getGroupsSpawned ()I
 	METHOD i getBadOmenLevel ()I
+	METHOD k isMarkedForRemoval ()Z
 	METHOD o getVillageProperties ()Lalq;
-	METHOD q getRaidId ()I
+	METHOD q getId ()I
 	METHOD r isActive ()Z
+	METHOD y markDirty ()V
 	METHOD z getIllagerBanner ()Lawo;
diff --git a/mappings/net/minecraft/entity/raid/RaidManager.mapping b/mappings/net/minecraft/entity/raid/RaidManager.mapping
new file mode 100644
index 0000000000..7669b43df7
--- /dev/null
+++ b/mappings/net/minecraft/entity/raid/RaidManager.mapping
@@ -0,0 +1,13 @@
+CLASS ash net/minecraft/entity/raid/RaidManager
+	FIELD a raids Ljava/util/Map;
+	FIELD c world Lbbp;
+	FIELD d nextAvailableId I
+	FIELD e tick I
+	METHOD a tick ()V
+	METHOD a getRaid (I)Lasf;
+		ARG 1 id
+	METHOD a setWorld (Lbbp;)V
+	METHOD a getOrCreateRaid (Lbbp;Lalq;)Lasf;
+	METHOD a fromTag (Lhs;)V
+	METHOD b toTag (Lhs;)Lhs;
+	METHOD c nextId ()I
diff --git a/mappings/net/minecraft/entity/mob/RaiderEntity.mapping b/mappings/net/minecraft/entity/raid/RaiderEntity.mapping
similarity index 90%
rename from mappings/net/minecraft/entity/mob/RaiderEntity.mapping
rename to mappings/net/minecraft/entity/raid/RaiderEntity.mapping
index 6fc32ad086..c3705cd45c 100644
--- a/mappings/net/minecraft/entity/mob/RaiderEntity.mapping
+++ b/mappings/net/minecraft/entity/raid/RaiderEntity.mapping
@@ -1,4 +1,4 @@
-CLASS asg net/minecraft/entity/mob/RaiderEntity
+CLASS asg net/minecraft/entity/raid/RaiderEntity
 	CLASS asg$a
 		METHOD a canStart ()Z
 		METHOD e tick ()V
diff --git a/mappings/net/minecraft/item/map/MapState.mapping b/mappings/net/minecraft/item/map/MapState.mapping
index c66f485f0e..369fcfe4a3 100644
--- a/mappings/net/minecraft/item/map/MapState.mapping
+++ b/mappings/net/minecraft/item/map/MapState.mapping
@@ -3,5 +3,5 @@ CLASS chy net/minecraft/item/map/MapState
 	FIELD f scale B
 	FIELD g colorArray [B
 	FIELD i icons Ljava/util/Map;
-	METHOD a deserialize (Lhs;)V
-	METHOD b serialize (Lhs;)Lhs;
+	METHOD a fromTag (Lhs;)V
+	METHOD b toTag (Lhs;)Lhs;
diff --git a/mappings/net/minecraft/nbt/PersistedState.mapping b/mappings/net/minecraft/nbt/PersistedState.mapping
index 4cb60d388b..b5f3a73f49 100644
--- a/mappings/net/minecraft/nbt/PersistedState.mapping
+++ b/mappings/net/minecraft/nbt/PersistedState.mapping
@@ -1,9 +1,9 @@
 CLASS chu net/minecraft/nbt/PersistedState
 	FIELD a key Ljava/lang/String;
 	FIELD b dirty Z
-	METHOD a deserialize (Lhs;)V
+	METHOD a fromTag (Lhs;)V
 	METHOD a setDirty (Z)V
-	METHOD b serialize (Lhs;)Lhs;
+	METHOD b toTag (Lhs;)Lhs;
 	METHOD d markDirty ()V
 	METHOD e getDirty ()Z
 	METHOD f getKey ()Ljava/lang/String;
diff --git a/mappings/net/minecraft/scoreboard/ScoreboardState.mapping b/mappings/net/minecraft/scoreboard/ScoreboardState.mapping
index 0d6035a7c9..989c2d0fed 100644
--- a/mappings/net/minecraft/scoreboard/ScoreboardState.mapping
+++ b/mappings/net/minecraft/scoreboard/ScoreboardState.mapping
@@ -6,10 +6,10 @@ CLASS cne net/minecraft/scoreboard/ScoreboardState
 	METHOD a deserializeTeamPlayers (Lcnb;Lhy;)V
 		ARG 1 team
 	METHOD a setScoreboard (Lcnd;)V
-	METHOD a deserialize (Lhs;)V
+	METHOD a fromTag (Lhs;)V
 	METHOD a deserializeTeams (Lhy;)V
 	METHOD b serializeObjectives ()Lhy;
-	METHOD b serialize (Lhs;)Lhs;
+	METHOD b toTag (Lhs;)Lhs;
 	METHOD b deserializeObjectives (Lhy;)V
 	METHOD c deserializeDisplaySlots (Lhs;)V
 	METHOD d serializeSlots (Lhs;)V
diff --git a/mappings/net/minecraft/sortme/RaidState.mapping b/mappings/net/minecraft/sortme/RaidState.mapping
deleted file mode 100644
index 61da149392..0000000000
--- a/mappings/net/minecraft/sortme/RaidState.mapping
+++ /dev/null
@@ -1,9 +0,0 @@
-CLASS ash net/minecraft/sortme/RaidState
-	FIELD a raids Ljava/util/Map;
-	FIELD d nextAvailableId I
-	FIELD e tick I
-	METHOD a tick ()V
-	METHOD a getRaid (I)Lasf;
-	METHOD a deserialize (Lhs;)V
-	METHOD b serialize (Lhs;)Lhs;
-	METHOD c nextId ()I
diff --git a/mappings/net/minecraft/world/World.mapping b/mappings/net/minecraft/world/World.mapping
index dc5e470e36..395abdd3ee 100644
--- a/mappings/net/minecraft/world/World.mapping
+++ b/mappings/net/minecraft/world/World.mapping
@@ -1,5 +1,5 @@
 CLASS bbp net/minecraft/world/World
-	FIELD A raidState Lash;
+	FIELD A raidManager Lash;
 	FIELD B isClient Z
 	FIELD D ambientDarkness I
 	FIELD E ticksSinceLightningClient I
@@ -210,7 +210,7 @@ CLASS bbp net/minecraft/world/World
 		ARG 2 spawnAnimals
 	METHOD aa getTicksSinceLightningClient ()I
 	METHOD ab getVillageManager ()Lals;
-	METHOD ac getRaidState ()Lash;
+	METHOD ac getRaidManager ()Lash;
 	METHOD af getProfiler ()Laeu;
 	METHOD b tickTime ()V
 	METHOD b findVisiblePlayer (DDDD)Z
diff --git a/mappings/net/minecraft/world/WorldVillageManager.mapping b/mappings/net/minecraft/world/WorldVillageManager.mapping
index 83b218d844..122968661f 100644
--- a/mappings/net/minecraft/world/WorldVillageManager.mapping
+++ b/mappings/net/minecraft/world/WorldVillageManager.mapping
@@ -14,10 +14,10 @@ CLASS als net/minecraft/world/WorldVillageManager
 	METHOD a isDoorLeadingOutside (Let;Ley;I)I
 		ARG 1 pos
 		ARG 2 facing
-	METHOD a deserialize (Lhs;)V
+	METHOD a fromTag (Lhs;)V
 	METHOD b getVillages ()Ljava/util/List;
 	METHOD b updateDoorsSeenByVillager (Let;)V
-	METHOD b serialize (Lhs;)Lhs;
+	METHOD b toTag (Lhs;)Lhs;
 	METHOD c getRecentlySeenDoor (Let;)Lalp;
 	METHOD d isRecentVillagerPosition (Let;)Z
 	METHOD g validateVillageProperties ()V