diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping
index 03ea63ec68..f6c366397f 100644
--- a/mappings/net/minecraft/entity/Entity.mapping
+++ b/mappings/net/minecraft/entity/Entity.mapping
@@ -19,7 +19,7 @@ CLASS ahm net/minecraft/entity/Entity
 	FIELD Z chunkY I
 	FIELD aA SILENT Lpx;
 	FIELD aB NO_GRAVITY Lpx;
-	FIELD aC STATUS Lpx;
+	FIELD aC POSE Lpx;
 	FIELD aD invulnerable Z
 	FIELD aE scoreboardTags Ljava/util/Set;
 	FIELD aG pistonMovementDelta [D
@@ -79,7 +79,7 @@ CLASS ahm net/minecraft/entity/Entity
 	METHOD V kill ()V
 	METHOD W getDataTracker ()Lqa;
 	METHOD Y invalidate ()V
-	METHOD Z getStatus ()Laif;
+	METHOD Z getPose ()Laif;
 	METHOD a shouldRenderAtDistance (D)Z
 		ARG 1 distance
 	METHOD a setPositionAnglesAndUpdate (DDDFF)V
@@ -110,7 +110,7 @@ CLASS ahm net/minecraft/entity/Entity
 		ARG 2 target
 	METHOD a move (Laia;Lcnl;)V
 		ARG 1 type
-	METHOD a getSizeForStatus (Laif;)Lahn;
+	METHOD a getSize (Laif;)Lahn;
 	METHOD a getEyeHeight (Laif;Lahn;)F
 	METHOD a onStruckByLightning (Lapp;)V
 	METHOD a interactAt (Larz;Lcnl;Lagg;)Lagh;
@@ -218,7 +218,7 @@ CLASS ahm net/minecraft/entity/Entity
 	METHOD b setEntityFlag (IZ)V
 		ARG 1 index
 	METHOD b isInvulnerableTo (Lagv;)Z
-	METHOD b setStatus (Laif;)V
+	METHOD b setPose (Laif;)V
 	METHOD b onPlayerCollision (Larz;)V
 	METHOD b interact (Larz;Lagg;)Z
 		ARG 1 player
@@ -346,5 +346,6 @@ CLASS ahm net/minecraft/entity/Entity
 	METHOD u setPositionAndAngles (Lahm;)V
 	METHOD u_ initDataTracker ()V
 	METHOD w hasPassenger (Lahm;)Z
+	METHOD x_ refreshSize ()V
 	METHOD y getPermissionLevel ()I
 	METHOD y_ getPistonBehavior ()Lcgw;
diff --git a/mappings/net/minecraft/entity/data/TrackedDataHandlerRegistry.mapping b/mappings/net/minecraft/entity/data/TrackedDataHandlerRegistry.mapping
index 6b00425aab..74514648d8 100644
--- a/mappings/net/minecraft/entity/data/TrackedDataHandlerRegistry.mapping
+++ b/mappings/net/minecraft/entity/data/TrackedDataHandlerRegistry.mapping
@@ -16,6 +16,7 @@ CLASS pz net/minecraft/entity/data/TrackedDataHandlerRegistry
 	FIELD o OPTIONAL_UUID Lpy;
 	FIELD p TAG_COMPOUND Lpy;
 	FIELD q VILLAGER_DATA Lpy;
+	FIELD s ENTITY_POSE Lpy;
 	METHOD a get (I)Lpy;
 		ARG 0 id
 	METHOD a register (Lpy;)V
diff --git a/mappings/net/minecraft/entity/mob/PhantomEntity.mapping b/mappings/net/minecraft/entity/mob/PhantomEntity.mapping
index 490f3dfeb7..df6bc7dfe3 100644
--- a/mappings/net/minecraft/entity/mob/PhantomEntity.mapping
+++ b/mappings/net/minecraft/entity/mob/PhantomEntity.mapping
@@ -2,5 +2,5 @@ CLASS aqp net/minecraft/entity/mob/PhantomEntity
 	CLASS aqp$f PhantomLookControl
 	CLASS aqp$g PhantomMoveControl
 	FIELD b SIZE Lpx;
-	METHOD a setSize (I)V
-	METHOD l getSize ()I
+	METHOD a setPhantomSize (I)V
+	METHOD l getPhantomSize ()I
diff --git a/mappings/net/minecraft/entity/player/PlayerEntity.mapping b/mappings/net/minecraft/entity/player/PlayerEntity.mapping
index fd13e78c42..b88d3371ce 100644
--- a/mappings/net/minecraft/entity/player/PlayerEntity.mapping
+++ b/mappings/net/minecraft/entity/player/PlayerEntity.mapping
@@ -8,7 +8,7 @@ CLASS arz net/minecraft/entity/player/PlayerEntity
 		FIELD f NOT_SAFE Larz$a;
 	FIELD bA container Latu;
 	FIELD bB hungerManager Lats;
-	FIELD b STATUS_TO_SIZE Ljava/util/Map;
+	FIELD b SIZES Ljava/util/Map;
 	FIELD bM isInWater Z
 	FIELD bN abilities Larw;
 	FIELD bO experience I