diff --git a/mappings/ahq.mapping b/mappings/ahq.mapping
deleted file mode 100644
index ec19a9fd9e..0000000000
--- a/mappings/ahq.mapping
+++ /dev/null
@@ -1,2 +0,0 @@
-CLASS ahq
-	METHOD a tick ()V
diff --git a/mappings/ahr.mapping b/mappings/ahr.mapping
deleted file mode 100644
index 8819f02401..0000000000
--- a/mappings/ahr.mapping
+++ /dev/null
@@ -1,2 +0,0 @@
-CLASS ahr
-	METHOD a tick ()V
diff --git a/mappings/net/minecraft/entity/LivingEntity.mapping b/mappings/net/minecraft/entity/LivingEntity.mapping
index a81c534d6a..74639988e3 100644
--- a/mappings/net/minecraft/entity/LivingEntity.mapping
+++ b/mappings/net/minecraft/entity/LivingEntity.mapping
@@ -97,21 +97,21 @@ CLASS agr net/minecraft/entity/LivingEntity
 	METHOD cp getPotionEffects ()Ljava/util/Collection;
 	METHOD cr isUndead ()Z
 	METHOD cs getHealth ()F
-	METHOD cw getSoundDeath ()Lxf;
+	METHOD cw getDeathSound ()Lxf;
 	METHOD cz getDamageTracker ()Lafq;
 	METHOD d applyDamage (Lafr;F)V
 		ARG 1 damageSource
 	METHOD d isPotionEffective (Lagb;)Z
 	METHOD db getActiveItem ()Lavs;
 	METHOD dh isFallFlying ()Z
-	METHOD e getSoundHurt (Lafr;)Lxf;
+	METHOD e getHurtSound (Lafr;)Lxf;
 	METHOD f setSprinting (Z)V
 	METHOD h getYaw (F)F
 	METHOD j setHeadPitch (F)V
 	METHOD k updateMovement ()V
 	METHOD k setYaw (F)V
 	METHOD l setHealth (F)V
-	METHOD m getSoundFall (I)Lxf;
+	METHOD m getFallSound (I)Lxf;
 	METHOD n initAi ()V
 	METHOD n setStuckArrows (I)V
 	METHOD o doJump (Z)V
diff --git a/mappings/net/minecraft/entity/ai/control/BodyControl.mapping b/mappings/net/minecraft/entity/ai/control/BodyControl.mapping
new file mode 100644
index 0000000000..6de177ce43
--- /dev/null
+++ b/mappings/net/minecraft/entity/ai/control/BodyControl.mapping
@@ -0,0 +1,4 @@
+CLASS aho net/minecraft/entity/ai/control/BodyControl
+	FIELD a entity Lagr;
+	METHOD <init> (Lagr;)V
+		ARG 1 entity
diff --git a/mappings/net/minecraft/entity/ai/control/DolphinLookControl.mapping b/mappings/net/minecraft/entity/ai/control/DolphinLookControl.mapping
new file mode 100644
index 0000000000..3a0d4b27e7
--- /dev/null
+++ b/mappings/net/minecraft/entity/ai/control/DolphinLookControl.mapping
@@ -0,0 +1,4 @@
+CLASS ahq net/minecraft/entity/ai/control/DolphinLookControl
+	METHOD <init> (Lags;I)V
+		ARG 1 entity
+	METHOD a tick ()V
diff --git a/mappings/net/minecraft/entity/ai/control/JumpControl.mapping b/mappings/net/minecraft/entity/ai/control/JumpControl.mapping
index 2843375655..c344ee28a5 100644
--- a/mappings/net/minecraft/entity/ai/control/JumpControl.mapping
+++ b/mappings/net/minecraft/entity/ai/control/JumpControl.mapping
@@ -1,5 +1,7 @@
 CLASS ahs net/minecraft/entity/ai/control/JumpControl
 	FIELD a active Z
 	FIELD b entity Lags;
+	METHOD <init> (Lags;)V
+		ARG 1 entity
 	METHOD a setActive ()V
 	METHOD b tick ()V
diff --git a/mappings/net/minecraft/entity/ai/control/MoveControl.mapping b/mappings/net/minecraft/entity/ai/control/MoveControl.mapping
index 0ebc0da7ab..f4c4cd6981 100644
--- a/mappings/net/minecraft/entity/ai/control/MoveControl.mapping
+++ b/mappings/net/minecraft/entity/ai/control/MoveControl.mapping
@@ -1,3 +1,5 @@
 CLASS ahu net/minecraft/entity/ai/control/MoveControl
 	FIELD a entity Lags;
+	METHOD <init> (Lags;)V
+		ARG 1 entity
 	METHOD a tick ()V
diff --git a/mappings/net/minecraft/entity/ai/control/ParrotMoveControl.mapping b/mappings/net/minecraft/entity/ai/control/ParrotMoveControl.mapping
new file mode 100644
index 0000000000..fcfa4e939f
--- /dev/null
+++ b/mappings/net/minecraft/entity/ai/control/ParrotMoveControl.mapping
@@ -0,0 +1,4 @@
+CLASS ahr net/minecraft/entity/ai/control/ParrotMoveControl
+	METHOD <init> (Lags;)V
+		ARG 1 entity
+	METHOD a tick ()V
diff --git a/mappings/net/minecraft/entity/boss/EntityWither.mapping b/mappings/net/minecraft/entity/boss/EntityWither.mapping
index 3229e77e2e..0c78244b14 100644
--- a/mappings/net/minecraft/entity/boss/EntityWither.mapping
+++ b/mappings/net/minecraft/entity/boss/EntityWither.mapping
@@ -5,7 +5,7 @@ CLASS anw net/minecraft/entity/boss/EntityWither
 	FIELD bD INVUL_TIMER Lpn;
 	FIELD b TRACKED_ENTITY_ID_2 Lpn;
 	FIELD c TRACKED_ENTITY_ID_3 Lpn;
-	METHOD D getSoundAmbient ()Lxf;
+	METHOD D getAmbientSound ()Lxf;
 	METHOD G checkDespawn ()V
 	METHOD H mobTick ()V
 	METHOD a setTrackedEntityId (II)V
@@ -29,11 +29,11 @@ CLASS anw net/minecraft/entity/boss/EntityWither
 		ARG 1 fallDistance
 	METHOD c addPotionEffect (Lagb;)Z
 	METHOD cb initAttributes ()V
-	METHOD cw getSoundDeath ()Lxf;
+	METHOD cw getDeathSound ()Lxf;
 	METHOD d setInvulTimer (I)V
 	METHOD d isPotionEffective (Lagb;)Z
 	METHOD dA getInvulTimer ()I
-	METHOD e getSoundHurt (Lafr;)Lxf;
+	METHOD e getHurtSound (Lafr;)Lxf;
 	METHOD k updateMovement ()V
 	METHOD n initAi ()V
 	METHOD n canStartRiding (Lagi;)Z
diff --git a/mappings/net/minecraft/entity/boss/dragon/EnderDragonEntity.mapping b/mappings/net/minecraft/entity/boss/dragon/EnderDragonEntity.mapping
index 4c4b2e4dd1..d10718f6d8 100644
--- a/mappings/net/minecraft/entity/boss/dragon/EnderDragonEntity.mapping
+++ b/mappings/net/minecraft/entity/boss/dragon/EnderDragonEntity.mapping
@@ -11,7 +11,7 @@ CLASS anc net/minecraft/entity/boss/dragon/EnderDragonEntity
 	FIELD bQ LOGGER Lorg/apache/logging/log4j/Logger;
 	FIELD bR fight Lbrg;
 	FIELD bS phaseManager Lant;
-	METHOD D getSoundAmbient ()Lxf;
+	METHOD D getAmbientSound ()Lxf;
 	METHOD G checkDespawn ()V
 	METHOD K_ getPartDamageWorld ()Lbaq;
 	METHOD U kill ()V
@@ -33,7 +33,7 @@ CLASS anc net/minecraft/entity/boss/dragon/EnderDragonEntity
 	METHOD cI getSoundVolume ()F
 	METHOD cb initAttributes ()V
 	METHOD cd updatePostDeath ()V
-	METHOD e getSoundHurt (Lafr;)Lxf;
+	METHOD e getHurtSound (Lafr;)Lxf;
 	METHOD k updateMovement ()V
 	METHOD n canStartRiding (Lagi;)Z
 	METHOD x_ initDataTracker ()V
diff --git a/mappings/net/minecraft/entity/decoration/ArmorStandEntity.mapping b/mappings/net/minecraft/entity/decoration/ArmorStandEntity.mapping
index 93626eb02f..c8c57761c2 100644
--- a/mappings/net/minecraft/entity/decoration/ArmorStandEntity.mapping
+++ b/mappings/net/minecraft/entity/decoration/ArmorStandEntity.mapping
@@ -58,9 +58,9 @@ CLASS any net/minecraft/entity/decoration/ArmorStandEntity
 	METHOD c setLeftArmRotation (Lfl;)V
 	METHOD cS doPushLogic ()V
 	METHOD cX getMainHand ()Lagq;
-	METHOD cw getSoundDeath ()Lxf;
+	METHOD cw getDeathSound ()Lxf;
 	METHOD d setRightArmRotation (Lfl;)V
-	METHOD e getSoundHurt (Lafr;)Lxf;
+	METHOD e getHurtSound (Lafr;)Lxf;
 	METHOD e setLeftLegRotation (Lfl;)V
 	METHOD f setRightLegRotation (Lfl;)V
 	METHOD g deserializePose (Lhp;)V
@@ -68,7 +68,7 @@ CLASS any net/minecraft/entity/decoration/ArmorStandEntity
 	METHOD j setHeadPitch (F)V
 	METHOD k setYaw (F)V
 	METHOD l isSmall ()Z
-	METHOD m getSoundFall (I)Lxf;
+	METHOD m getFallSound (I)Lxf;
 	METHOD n shouldShowArms ()Z
 	METHOD o shouldHideBasePlate ()Z
 	METHOD p isShotFromCrossbow ()Z
diff --git a/mappings/net/minecraft/entity/mob/BlazeEntity.mapping b/mappings/net/minecraft/entity/mob/BlazeEntity.mapping
index 4841a5ebcd..21ce84f5c3 100644
--- a/mappings/net/minecraft/entity/mob/BlazeEntity.mapping
+++ b/mappings/net/minecraft/entity/mob/BlazeEntity.mapping
@@ -5,7 +5,7 @@ CLASS aoq net/minecraft/entity/mob/BlazeEntity
 		METHOD d onRemove ()V
 		METHOD e tick ()V
 	FIELD c BLAZE_FLAGS Lpn;
-	METHOD D getSoundAmbient ()Lxf;
+	METHOD D getAmbientSound ()Lxf;
 	METHOD H mobTick ()V
 	METHOD a setFireActive (Z)V
 	METHOD aA getLightmapCoordinates ()I
@@ -13,8 +13,8 @@ CLASS aoq net/minecraft/entity/mob/BlazeEntity
 	METHOD c handleFallDamage (FF)V
 		ARG 1 fallDistance
 	METHOD cb initAttributes ()V
-	METHOD cw getSoundDeath ()Lxf;
-	METHOD e getSoundHurt (Lafr;)Lxf;
+	METHOD cw getDeathSound ()Lxf;
+	METHOD e getHurtSound (Lafr;)Lxf;
 	METHOD k updateMovement ()V
 	METHOD l isFireActive ()Z
 	METHOD n initAi ()V
diff --git a/mappings/net/minecraft/entity/mob/CreeperEntity.mapping b/mappings/net/minecraft/entity/mob/CreeperEntity.mapping
index 66a586c684..0cba8e30ab 100644
--- a/mappings/net/minecraft/entity/mob/CreeperEntity.mapping
+++ b/mappings/net/minecraft/entity/mob/CreeperEntity.mapping
@@ -18,11 +18,11 @@ CLASS aos net/minecraft/entity/mob/CreeperEntity
 	METHOD c handleFallDamage (FF)V
 		ARG 1 fallDistance
 	METHOD cb initAttributes ()V
-	METHOD cw getSoundDeath ()Lxf;
+	METHOD cw getDeathSound ()Lxf;
 	METHOD dA getFuseSpeed ()I
 	METHOD dB getIgnited ()Z
 	METHOD dC setIgnited ()V
-	METHOD e getSoundHurt (Lafr;)Lxf;
+	METHOD e getHurtSound (Lafr;)Lxf;
 	METHOD l isCharged ()Z
 	METHOD n initAi ()V
 	METHOD x_ initDataTracker ()V
diff --git a/mappings/net/minecraft/entity/mob/DrownedEntity.mapping b/mappings/net/minecraft/entity/mob/DrownedEntity.mapping
index 5f9d91b86b..5d8822058b 100644
--- a/mappings/net/minecraft/entity/mob/DrownedEntity.mapping
+++ b/mappings/net/minecraft/entity/mob/DrownedEntity.mapping
@@ -11,7 +11,10 @@ CLASS aou net/minecraft/entity/mob/DrownedEntity
 		METHOD a canStart ()Z
 		METHOD b shouldContinue ()Z
 		METHOD c start ()V
-	CLASS aou$e
+	CLASS aou$e DrownedMoveControl
+		FIELD i drowned Laou;
+		METHOD <init> (Laou;)V
+			ARG 1 drowned
 		METHOD a tick ()V
 	CLASS aou$f
 		METHOD a canStart ()Z
@@ -23,7 +26,7 @@ CLASS aou net/minecraft/entity/mob/DrownedEntity
 		METHOD a canStart ()Z
 		METHOD c start ()V
 		METHOD d onRemove ()V
-	METHOD D getSoundAmbient ()Lxf;
+	METHOD D getAmbientSound ()Lxf;
 	METHOD a initEquipment (Lafa;)V
 	METHOD a attack (Lagr;F)V
 		ARG 1 target
@@ -32,7 +35,7 @@ CLASS aou net/minecraft/entity/mob/DrownedEntity
 	METHOD af getSoundSwim ()Lxf;
 	METHOD b createNavigation (Lbaq;)Lakt;
 	METHOD by canFly ()Z
-	METHOD cw getSoundDeath ()Lxf;
+	METHOD cw getDeathSound ()Lxf;
 	METHOD dB getSoundStep ()Lxf;
 	METHOD dC getSkull ()Lavs;
-	METHOD e getSoundHurt (Lafr;)Lxf;
+	METHOD e getHurtSound (Lafr;)Lxf;
diff --git a/mappings/net/minecraft/entity/mob/ElderGuardianEntity.mapping b/mappings/net/minecraft/entity/mob/ElderGuardianEntity.mapping
index 1d80d23bcd..4fe50fcc11 100644
--- a/mappings/net/minecraft/entity/mob/ElderGuardianEntity.mapping
+++ b/mappings/net/minecraft/entity/mob/ElderGuardianEntity.mapping
@@ -1,6 +1,6 @@
 CLASS aov net/minecraft/entity/mob/ElderGuardianEntity
-	METHOD D getSoundAmbient ()Lxf;
+	METHOD D getAmbientSound ()Lxf;
 	METHOD H mobTick ()V
 	METHOD cb initAttributes ()V
-	METHOD cw getSoundDeath ()Lxf;
-	METHOD e getSoundHurt (Lafr;)Lxf;
+	METHOD cw getDeathSound ()Lxf;
+	METHOD e getHurtSound (Lafr;)Lxf;
diff --git a/mappings/net/minecraft/entity/mob/EndermanEntity.mapping b/mappings/net/minecraft/entity/mob/EndermanEntity.mapping
index 576c2aab6f..23c7b64d98 100644
--- a/mappings/net/minecraft/entity/mob/EndermanEntity.mapping
+++ b/mappings/net/minecraft/entity/mob/EndermanEntity.mapping
@@ -16,7 +16,7 @@ CLASS aow net/minecraft/entity/mob/EndermanEntity
 	FIELD bC ANGRY Lpn;
 	FIELD bE ageWhenTargetSet I
 	FIELD c CARRIED_BLOCK Lpn;
-	METHOD D getSoundAmbient ()Lxf;
+	METHOD D getAmbientSound ()Lxf;
 	METHOD H mobTick ()V
 	METHOD a damage (Lafr;F)Z
 		ARG 1 source
@@ -29,10 +29,10 @@ CLASS aow net/minecraft/entity/mob/EndermanEntity
 		ARG 1 tag
 	METHOD bH getEyeHeight ()F
 	METHOD cb initAttributes ()V
-	METHOD cw getSoundDeath ()Lxf;
+	METHOD cw getDeathSound ()Lxf;
 	METHOD dB getCarriedBlock ()Lboj;
 	METHOD dC isAngry ()Z
-	METHOD e getSoundHurt (Lafr;)Lxf;
+	METHOD e getHurtSound (Lafr;)Lxf;
 	METHOD f setTarget (Lagr;)V
 	METHOD k updateMovement ()V
 	METHOD n initAi ()V
diff --git a/mappings/net/minecraft/entity/mob/EndermiteEntity.mapping b/mappings/net/minecraft/entity/mob/EndermiteEntity.mapping
index 16f2d27fd8..7b4403e387 100644
--- a/mappings/net/minecraft/entity/mob/EndermiteEntity.mapping
+++ b/mappings/net/minecraft/entity/mob/EndermiteEntity.mapping
@@ -1,5 +1,5 @@
 CLASS aox net/minecraft/entity/mob/EndermiteEntity
-	METHOD D getSoundAmbient ()Lxf;
+	METHOD D getAmbientSound ()Lxf;
 	METHOD U_ update ()V
 	METHOD a playStepSound (Let;Lboj;)V
 		ARG 1 pos
@@ -10,8 +10,8 @@ CLASS aox net/minecraft/entity/mob/EndermiteEntity
 		ARG 1 tag
 	METHOD bH getEyeHeight ()F
 	METHOD cb initAttributes ()V
-	METHOD cw getSoundDeath ()Lxf;
-	METHOD e getSoundHurt (Lafr;)Lxf;
+	METHOD cw getDeathSound ()Lxf;
+	METHOD e getHurtSound (Lafr;)Lxf;
 	METHOD k updateMovement ()V
 	METHOD k setYaw (F)V
 	METHOD n initAi ()V
diff --git a/mappings/net/minecraft/entity/mob/EvokerEntity.mapping b/mappings/net/minecraft/entity/mob/EvokerEntity.mapping
index 135f03b59e..8d33fe508a 100644
--- a/mappings/net/minecraft/entity/mob/EvokerEntity.mapping
+++ b/mappings/net/minecraft/entity/mob/EvokerEntity.mapping
@@ -32,7 +32,7 @@ CLASS aoz net/minecraft/entity/mob/EvokerEntity
 		METHOD k getSoundPrepare ()Lxf;
 		METHOD m getInitialCooldown ()I
 	FIELD bC wololoTarget Lame;
-	METHOD D getSoundAmbient ()Lxf;
+	METHOD D getAmbientSound ()Lxf;
 	METHOD H mobTick ()V
 	METHOD U_ update ()V
 	METHOD a setWololoTarget (Lame;)V
@@ -41,9 +41,9 @@ CLASS aoz net/minecraft/entity/mob/EvokerEntity
 	METHOD b serializeCustomData (Lhp;)V
 		ARG 1 tag
 	METHOD cb initAttributes ()V
-	METHOD cw getSoundDeath ()Lxf;
+	METHOD cw getDeathSound ()Lxf;
 	METHOD dP getWololoTarget ()Lame;
-	METHOD e getSoundHurt (Lafr;)Lxf;
+	METHOD e getHurtSound (Lafr;)Lxf;
 	METHOD n initAi ()V
 	METHOD r isTeammate (Lagi;)Z
 	METHOD x_ initDataTracker ()V
diff --git a/mappings/net/minecraft/entity/mob/GhastEntity.mapping b/mappings/net/minecraft/entity/mob/GhastEntity.mapping
index 9d80bac631..cc5d1bd785 100644
--- a/mappings/net/minecraft/entity/mob/GhastEntity.mapping
+++ b/mappings/net/minecraft/entity/mob/GhastEntity.mapping
@@ -2,7 +2,10 @@ CLASS apa net/minecraft/entity/mob/GhastEntity
 	CLASS apa$a
 		METHOD a canStart ()Z
 		METHOD e tick ()V
-	CLASS apa$b
+	CLASS apa$b GhastMoveControl
+		FIELD i ghast Lapa;
+		METHOD <init> (Lapa;)V
+			ARG 1 ghast
 		METHOD a tick ()V
 	CLASS apa$c ShootFireballGoal
 		FIELD a cooldown I
@@ -17,7 +20,7 @@ CLASS apa net/minecraft/entity/mob/GhastEntity
 		METHOD c start ()V
 	FIELD a SHOOTING Lpn;
 	FIELD b fireballStrength I
-	METHOD D getSoundAmbient ()Lxf;
+	METHOD D getAmbientSound ()Lxf;
 	METHOD M getLimitPerChunk ()I
 	METHOD U_ update ()V
 	METHOD a damage (Lafr;F)Z
@@ -31,9 +34,9 @@ CLASS apa net/minecraft/entity/mob/GhastEntity
 	METHOD bX getSoundCategory ()Lxh;
 	METHOD cI getSoundVolume ()F
 	METHOD cb initAttributes ()V
-	METHOD cw getSoundDeath ()Lxf;
+	METHOD cw getDeathSound ()Lxf;
 	METHOD ds getFireballStrength ()I
-	METHOD e getSoundHurt (Lafr;)Lxf;
+	METHOD e getHurtSound (Lafr;)Lxf;
 	METHOD l isShooting ()Z
 	METHOD n initAi ()V
 	METHOD x_ initDataTracker ()V
diff --git a/mappings/net/minecraft/entity/mob/GuardianEntity.mapping b/mappings/net/minecraft/entity/mob/GuardianEntity.mapping
index ab79f28f85..3fabc81f51 100644
--- a/mappings/net/minecraft/entity/mob/GuardianEntity.mapping
+++ b/mappings/net/minecraft/entity/mob/GuardianEntity.mapping
@@ -6,19 +6,22 @@ CLASS apc net/minecraft/entity/mob/GuardianEntity
 		METHOD d onRemove ()V
 		METHOD e tick ()V
 	CLASS apc$c GuardianMoveControl
+		FIELD i guardian Lapc;
+		METHOD <init> (Lapc;)V
+			ARG 1 guardian
 		METHOD a tick ()V
 	METHOD <init> (Lagm;Lbaq;)V
 		ARG 1 type
 		ARG 2 world
-	METHOD D getSoundAmbient ()Lxf;
+	METHOD D getAmbientSound ()Lxf;
 	METHOD a damage (Lafr;F)Z
 		ARG 1 source
 	METHOD a onTrackedDataSet (Lpn;)V
 	METHOD b createNavigation (Lbaq;)Lakt;
 	METHOD bH getEyeHeight ()F
 	METHOD cb initAttributes ()V
-	METHOD cw getSoundDeath ()Lxf;
-	METHOD e getSoundHurt (Lafr;)Lxf;
+	METHOD cw getDeathSound ()Lxf;
+	METHOD e getHurtSound (Lafr;)Lxf;
 	METHOD k updateMovement ()V
 	METHOD n initAi ()V
 	METHOD x_ initDataTracker ()V
diff --git a/mappings/net/minecraft/entity/mob/HostileEntity.mapping b/mappings/net/minecraft/entity/mob/HostileEntity.mapping
index 093cbe8ae8..f1c3b00593 100644
--- a/mappings/net/minecraft/entity/mob/HostileEntity.mapping
+++ b/mappings/net/minecraft/entity/mob/HostileEntity.mapping
@@ -10,7 +10,7 @@ CLASS aph net/minecraft/entity/mob/HostileEntity
 	METHOD bX getSoundCategory ()Lxh;
 	METHOD cb initAttributes ()V
 	METHOD ce canDropLootAndXp ()Z
-	METHOD cw getSoundDeath ()Lxf;
-	METHOD e getSoundHurt (Lafr;)Lxf;
+	METHOD cw getDeathSound ()Lxf;
+	METHOD e getHurtSound (Lafr;)Lxf;
 	METHOD k updateMovement ()V
-	METHOD m getSoundFall (I)Lxf;
+	METHOD m getFallSound (I)Lxf;
diff --git a/mappings/net/minecraft/entity/mob/HuskEntity.mapping b/mappings/net/minecraft/entity/mob/HuskEntity.mapping
index 01192f946e..5a43b0715d 100644
--- a/mappings/net/minecraft/entity/mob/HuskEntity.mapping
+++ b/mappings/net/minecraft/entity/mob/HuskEntity.mapping
@@ -1,6 +1,6 @@
 CLASS apd net/minecraft/entity/mob/HuskEntity
-	METHOD D getSoundAmbient ()Lxf;
-	METHOD cw getSoundDeath ()Lxf;
+	METHOD D getAmbientSound ()Lxf;
+	METHOD cw getDeathSound ()Lxf;
 	METHOD dB getSoundStep ()Lxf;
 	METHOD dC getSkull ()Lavs;
-	METHOD e getSoundHurt (Lafr;)Lxf;
+	METHOD e getHurtSound (Lafr;)Lxf;
diff --git a/mappings/net/minecraft/entity/mob/IllagerBeastEntity.mapping b/mappings/net/minecraft/entity/mob/IllagerBeastEntity.mapping
index 667cc49aa0..58e63de73a 100644
--- a/mappings/net/minecraft/entity/mob/IllagerBeastEntity.mapping
+++ b/mappings/net/minecraft/entity/mob/IllagerBeastEntity.mapping
@@ -4,7 +4,7 @@ CLASS ape net/minecraft/entity/mob/IllagerBeastEntity
 			ARG 0 entity
 			ARG 1 world
 		METHOD a createPathNodeNavigator ()Lcfz;
-	METHOD D getSoundAmbient ()Lxf;
+	METHOD D getAmbientSound ()Lxf;
 	METHOD D canSee (Lagi;)Z
 	METHOD a playStepSound (Let;Lboj;)V
 		ARG 1 pos
@@ -15,7 +15,7 @@ CLASS ape net/minecraft/entity/mob/IllagerBeastEntity
 	METHOD b serializeCustomData (Lhp;)V
 		ARG 1 tag
 	METHOD cb initAttributes ()V
-	METHOD cw getSoundDeath ()Lxf;
-	METHOD e getSoundHurt (Lafr;)Lxf;
+	METHOD cw getDeathSound ()Lxf;
+	METHOD e getHurtSound (Lafr;)Lxf;
 	METHOD k updateMovement ()V
 	METHOD n initAi ()V
diff --git a/mappings/net/minecraft/entity/mob/IllusionerEntity.mapping b/mappings/net/minecraft/entity/mob/IllusionerEntity.mapping
index d7a4773d49..9ed4e537d0 100644
--- a/mappings/net/minecraft/entity/mob/IllusionerEntity.mapping
+++ b/mappings/net/minecraft/entity/mob/IllusionerEntity.mapping
@@ -13,14 +13,14 @@ CLASS apf net/minecraft/entity/mob/IllusionerEntity
 		METHOD i startTimeDelay ()I
 		METHOD j castSpell ()V
 		METHOD k getSoundPrepare ()Lxf;
-	METHOD D getSoundAmbient ()Lxf;
+	METHOD D getAmbientSound ()Lxf;
 	METHOD a attack (Lagr;F)V
 		ARG 1 target
 	METHOD a (Lbar;Lafa;Lagu;Lahc;Lhp;)Lahc;
 		ARG 3 difficulty
 	METHOD cb initAttributes ()V
-	METHOD cw getSoundDeath ()Lxf;
-	METHOD e getSoundHurt (Lafr;)Lxf;
+	METHOD cw getDeathSound ()Lxf;
+	METHOD e getHurtSound (Lafr;)Lxf;
 	METHOD k updateMovement ()V
 	METHOD n initAi ()V
 	METHOD r isTeammate (Lagi;)Z
diff --git a/mappings/net/minecraft/entity/mob/MagmaCubeEntity.mapping b/mappings/net/minecraft/entity/mob/MagmaCubeEntity.mapping
index 1e610a9c9b..88767dc706 100644
--- a/mappings/net/minecraft/entity/mob/MagmaCubeEntity.mapping
+++ b/mappings/net/minecraft/entity/mob/MagmaCubeEntity.mapping
@@ -5,5 +5,5 @@ CLASS apg net/minecraft/entity/mob/MagmaCubeEntity
 	METHOD c handleFallDamage (FF)V
 		ARG 1 fallDistance
 	METHOD cb initAttributes ()V
-	METHOD cw getSoundDeath ()Lxf;
-	METHOD e getSoundHurt (Lafr;)Lxf;
+	METHOD cw getDeathSound ()Lxf;
+	METHOD e getHurtSound (Lafr;)Lxf;
diff --git a/mappings/net/minecraft/entity/mob/MobEntity.mapping b/mappings/net/minecraft/entity/mob/MobEntity.mapping
index 749106bac6..3c4c958865 100644
--- a/mappings/net/minecraft/entity/mob/MobEntity.mapping
+++ b/mappings/net/minecraft/entity/mob/MobEntity.mapping
@@ -12,18 +12,21 @@ CLASS ags net/minecraft/entity/mob/MobEntity
 	FIELD bJ lootTableSeed J
 	FIELD bK leashed Z
 	FIELD bL holdingEntity Lagi;
+	FIELD b bodyControl Laho;
 	FIELD bM leashTag Lhp;
 	FIELD b_ experiencePoints I
-	FIELD bv actionMove Lahu;
-	FIELD bw actionJump Lahs;
+	FIELD bv moveControl Lahu;
+	FIELD bw jumpControl Lahs;
+	FIELD bx navigation Lakt;
 	FIELD by goalSelector Laip;
 	FIELD bz targetSelector Laip;
 	FIELD c target Lagr;
+	FIELD f lookControl Laht;
 	METHOD <init> (Lagm;Lbaq;)V
 		ARG 1 type
 		ARG 2 world
-	METHOD A playSoundAmbient ()V
-	METHOD D getSoundAmbient ()Lxf;
+	METHOD A playAmbientSound ()V
+	METHOD D getAmbientSound ()Lxf;
 	METHOD F getLootTableId ()Lpy;
 	METHOD G checkDespawn ()V
 	METHOD H mobTick ()V
@@ -77,11 +80,14 @@ CLASS ags net/minecraft/entity/mob/MobEntity
 	METHOD f setTarget (Lagr;)V
 	METHOD k updateMovement ()V
 	METHOD n initAi ()V
-	METHOD p getActionLook ()Laht;
+	METHOD o createBodyControl ()Laho;
+	METHOD p getLookControl ()Laht;
 	METHOD p setCanPickUpLoot (Z)V
 	METHOD q setAiDisabled (Z)V
+	METHOD r getMoveControl ()Lahu;
 	METHOD r setLeftHanded (Z)V
-	METHOD s getActionJump ()Lahs;
+	METHOD s getJumpControl ()Lahs;
+	METHOD t getNavigation ()Lakt;
 	METHOD u getVisibilityCache ()Laky;
 	METHOD v getTarget ()Lagr;
 	METHOD x_ initDataTracker ()V
diff --git a/mappings/net/minecraft/entity/mob/PhantomEntity.mapping b/mappings/net/minecraft/entity/mob/PhantomEntity.mapping
index 6f0d43f171..61116099ca 100644
--- a/mappings/net/minecraft/entity/mob/PhantomEntity.mapping
+++ b/mappings/net/minecraft/entity/mob/PhantomEntity.mapping
@@ -11,9 +11,11 @@ CLASS apj net/minecraft/entity/mob/PhantomEntity
 		METHOD a canStart ()Z
 		METHOD c start ()V
 		METHOD e tick ()V
-	CLASS apj$f
+	CLASS apj$f PhantomLookControl
+		METHOD <init> (Lapj;Lags;)V
+			ARG 2 entity
 		METHOD a tick ()V
-	CLASS apj$g
+	CLASS apj$g PhantomMoveControl
 		METHOD a tick ()V
 	CLASS apj$i
 		METHOD a canStart ()Z
@@ -21,7 +23,7 @@ CLASS apj net/minecraft/entity/mob/PhantomEntity
 		METHOD c start ()V
 		METHOD d onRemove ()V
 		METHOD e tick ()V
-	METHOD D getSoundAmbient ()Lxf;
+	METHOD D getAmbientSound ()Lxf;
 	METHOD H mobTick ()V
 	METHOD U_ update ()V
 	METHOD a shouldRender (D)Z
@@ -37,8 +39,9 @@ CLASS apj net/minecraft/entity/mob/PhantomEntity
 	METHOD bX getSoundCategory ()Lxh;
 	METHOD cI getSoundVolume ()F
 	METHOD cb initAttributes ()V
-	METHOD cw getSoundDeath ()Lxf;
-	METHOD e getSoundHurt (Lafr;)Lxf;
+	METHOD cw getDeathSound ()Lxf;
+	METHOD e getHurtSound (Lafr;)Lxf;
 	METHOD k updateMovement ()V
 	METHOD n initAi ()V
+	METHOD o createBodyControl ()Laho;
 	METHOD x_ initDataTracker ()V
diff --git a/mappings/net/minecraft/entity/mob/PigZombieEntity.mapping b/mappings/net/minecraft/entity/mob/PigZombieEntity.mapping
index 9348387ac1..447268cb0b 100644
--- a/mappings/net/minecraft/entity/mob/PigZombieEntity.mapping
+++ b/mappings/net/minecraft/entity/mob/PigZombieEntity.mapping
@@ -1,7 +1,7 @@
 CLASS apk net/minecraft/entity/mob/PigZombieEntity
 	CLASS apk$a
 		METHOD a canStart ()Z
-	METHOD D getSoundAmbient ()Lxf;
+	METHOD D getAmbientSound ()Lxf;
 	METHOD H mobTick ()V
 	METHOD a initEquipment (Lafa;)V
 	METHOD a damage (Lafr;F)Z
@@ -15,6 +15,6 @@ CLASS apk net/minecraft/entity/mob/PigZombieEntity
 	METHOD b serializeCustomData (Lhp;)V
 		ARG 1 tag
 	METHOD cb initAttributes ()V
-	METHOD cw getSoundDeath ()Lxf;
+	METHOD cw getDeathSound ()Lxf;
 	METHOD dC getSkull ()Lavs;
-	METHOD e getSoundHurt (Lafr;)Lxf;
+	METHOD e getHurtSound (Lafr;)Lxf;
diff --git a/mappings/net/minecraft/entity/mob/PillagerEntity.mapping b/mappings/net/minecraft/entity/mob/PillagerEntity.mapping
index d03e899fd8..cb24198611 100644
--- a/mappings/net/minecraft/entity/mob/PillagerEntity.mapping
+++ b/mappings/net/minecraft/entity/mob/PillagerEntity.mapping
@@ -1,5 +1,5 @@
 CLASS apl net/minecraft/entity/mob/PillagerEntity
-	METHOD D getSoundAmbient ()Lxf;
+	METHOD D getAmbientSound ()Lxf;
 	METHOD a initEquipment (Lafa;)V
 	METHOD a attack (Lagr;F)V
 		ARG 1 target
@@ -10,8 +10,8 @@ CLASS apl net/minecraft/entity/mob/PillagerEntity
 	METHOD b serializeCustomData (Lhp;)V
 		ARG 1 tag
 	METHOD cb initAttributes ()V
-	METHOD cw getSoundDeath ()Lxf;
-	METHOD e getSoundHurt (Lafr;)Lxf;
+	METHOD cw getDeathSound ()Lxf;
+	METHOD e getHurtSound (Lafr;)Lxf;
 	METHOD n initAi ()V
 	METHOD r isTeammate (Lagi;)Z
 	METHOD s setArmsRaised (Z)V
diff --git a/mappings/net/minecraft/entity/mob/ShulkerEntity.mapping b/mappings/net/minecraft/entity/mob/ShulkerEntity.mapping
index 69fdeb160f..5a20886fb2 100644
--- a/mappings/net/minecraft/entity/mob/ShulkerEntity.mapping
+++ b/mappings/net/minecraft/entity/mob/ShulkerEntity.mapping
@@ -19,8 +19,8 @@ CLASS apo net/minecraft/entity/mob/ShulkerEntity
 	FIELD a ATTACHED_FACE Lpn;
 	FIELD b ATTACHED_BLOCK Lpn;
 	FIELD c PEEK_AMOUNT Lpn;
-	METHOD A playSoundAmbient ()V
-	METHOD D getSoundAmbient ()Lxf;
+	METHOD A playAmbientSound ()V
+	METHOD D getAmbientSound ()Lxf;
 	METHOD U_ update ()V
 	METHOD a setPositionAndRotations (DDDFFIZ)V
 		ARG 1 x
@@ -43,13 +43,14 @@ CLASS apo net/minecraft/entity/mob/ShulkerEntity
 	METHOD bH getEyeHeight ()F
 	METHOD bX getSoundCategory ()Lxh;
 	METHOD cb initAttributes ()V
-	METHOD cw getSoundDeath ()Lxf;
+	METHOD cw getDeathSound ()Lxf;
 	METHOD dA getAttachedBlock ()Let;
 	METHOD dB getPeekAmount ()I
 	METHOD dz getAttachedFace ()Ley;
-	METHOD e getSoundHurt (Lafr;)Lxf;
+	METHOD e getHurtSound (Lafr;)Lxf;
 	METHOD g setAttachedBlock (Let;)V
 	METHOD i pushAwayFrom (Lagi;)V
 	METHOD k updateMovement ()V
 	METHOD n initAi ()V
+	METHOD o createBodyControl ()Laho;
 	METHOD x_ initDataTracker ()V
diff --git a/mappings/net/minecraft/entity/mob/SilverfishEntity.mapping b/mappings/net/minecraft/entity/mob/SilverfishEntity.mapping
index 8d16e8ca17..31d5e54779 100644
--- a/mappings/net/minecraft/entity/mob/SilverfishEntity.mapping
+++ b/mappings/net/minecraft/entity/mob/SilverfishEntity.mapping
@@ -6,7 +6,7 @@ CLASS app net/minecraft/entity/mob/SilverfishEntity
 	CLASS app$b
 		METHOD a canStart ()Z
 		METHOD e tick ()V
-	METHOD D getSoundAmbient ()Lxf;
+	METHOD D getAmbientSound ()Lxf;
 	METHOD U_ update ()V
 	METHOD a damage (Lafr;F)Z
 		ARG 1 source
@@ -15,7 +15,7 @@ CLASS app net/minecraft/entity/mob/SilverfishEntity
 	METHOD aK getHeightOffset ()D
 	METHOD bH getEyeHeight ()F
 	METHOD cb initAttributes ()V
-	METHOD cw getSoundDeath ()Lxf;
-	METHOD e getSoundHurt (Lafr;)Lxf;
+	METHOD cw getDeathSound ()Lxf;
+	METHOD e getHurtSound (Lafr;)Lxf;
 	METHOD k setYaw (F)V
 	METHOD n initAi ()V
diff --git a/mappings/net/minecraft/entity/mob/SkeletonEntity.mapping b/mappings/net/minecraft/entity/mob/SkeletonEntity.mapping
index f49f95f3a5..9056bd31b8 100644
--- a/mappings/net/minecraft/entity/mob/SkeletonEntity.mapping
+++ b/mappings/net/minecraft/entity/mob/SkeletonEntity.mapping
@@ -1,5 +1,5 @@
 CLASS apq net/minecraft/entity/mob/SkeletonEntity
-	METHOD D getSoundAmbient ()Lxf;
+	METHOD D getAmbientSound ()Lxf;
 	METHOD a dropEquipment (Lafr;IZ)V
-	METHOD cw getSoundDeath ()Lxf;
-	METHOD e getSoundHurt (Lafr;)Lxf;
+	METHOD cw getDeathSound ()Lxf;
+	METHOD e getHurtSound (Lafr;)Lxf;
diff --git a/mappings/net/minecraft/entity/mob/SkeletonHorseEntity.mapping b/mappings/net/minecraft/entity/mob/SkeletonHorseEntity.mapping
index e7a6eacc77..e55e00d965 100644
--- a/mappings/net/minecraft/entity/mob/SkeletonHorseEntity.mapping
+++ b/mappings/net/minecraft/entity/mob/SkeletonHorseEntity.mapping
@@ -1,5 +1,5 @@
 CLASS amt net/minecraft/entity/mob/SkeletonHorseEntity
-	METHOD D getSoundAmbient ()Lxf;
+	METHOD D getAmbientSound ()Lxf;
 	METHOD a createChild (Lagf;)Lagf;
 	METHOD a interactMob (Laqj;Lafb;)Z
 		ARG 1 player
@@ -10,6 +10,6 @@ CLASS amt net/minecraft/entity/mob/SkeletonHorseEntity
 	METHOD b serializeCustomData (Lhp;)V
 		ARG 1 tag
 	METHOD cb initAttributes ()V
-	METHOD cw getSoundDeath ()Lxf;
-	METHOD e getSoundHurt (Lafr;)Lxf;
+	METHOD cw getDeathSound ()Lxf;
+	METHOD e getHurtSound (Lafr;)Lxf;
 	METHOD k updateMovement ()V
diff --git a/mappings/net/minecraft/entity/mob/SlimeEntity.mapping b/mappings/net/minecraft/entity/mob/SlimeEntity.mapping
index 6e89fd27ef..1694557a8d 100644
--- a/mappings/net/minecraft/entity/mob/SlimeEntity.mapping
+++ b/mappings/net/minecraft/entity/mob/SlimeEntity.mapping
@@ -10,7 +10,10 @@ CLASS apr net/minecraft/entity/mob/SlimeEntity
 	CLASS apr$c
 		METHOD a canStart ()Z
 		METHOD e tick ()V
-	CLASS apr$d
+	CLASS apr$d SlimeMoveControl
+		FIELD k slime Lapr;
+		METHOD <init> (Lapr;)V
+			ARG 1 slime
 		METHOD a tick ()V
 	CLASS apr$e
 		METHOD a canStart ()Z
@@ -32,9 +35,9 @@ CLASS apr net/minecraft/entity/mob/SlimeEntity
 		ARG 1 tag
 	METHOD bH getEyeHeight ()F
 	METHOD cI getSoundVolume ()F
-	METHOD cw getSoundDeath ()Lxf;
+	METHOD cw getDeathSound ()Lxf;
 	METHOD dy getSize ()I
-	METHOD e getSoundHurt (Lafr;)Lxf;
+	METHOD e getHurtSound (Lafr;)Lxf;
 	METHOD i pushAwayFrom (Lagi;)V
 	METHOD n initAi ()V
 	METHOD x_ initDataTracker ()V
diff --git a/mappings/net/minecraft/entity/mob/SpiderEntity.mapping b/mappings/net/minecraft/entity/mob/SpiderEntity.mapping
index dd1791f3b3..c0277ec50d 100644
--- a/mappings/net/minecraft/entity/mob/SpiderEntity.mapping
+++ b/mappings/net/minecraft/entity/mob/SpiderEntity.mapping
@@ -8,7 +8,7 @@ CLASS apt net/minecraft/entity/mob/SpiderEntity
 	METHOD <init> (Lagm;Lbaq;)V
 		ARG 1 type
 		ARG 2 world
-	METHOD D getSoundAmbient ()Lxf;
+	METHOD D getAmbientSound ()Lxf;
 	METHOD U_ update ()V
 	METHOD a (Lbar;Lafa;Lagu;Lahc;Lhp;)Lahc;
 		ARG 3 difficulty
@@ -20,9 +20,9 @@ CLASS apt net/minecraft/entity/mob/SpiderEntity
 	METHOD bH getEyeHeight ()F
 	METHOD bj stickInWeb ()V
 	METHOD cb initAttributes ()V
-	METHOD cw getSoundDeath ()Lxf;
+	METHOD cw getDeathSound ()Lxf;
 	METHOD d isPotionEffective (Lagb;)Z
-	METHOD e getSoundHurt (Lafr;)Lxf;
+	METHOD e getHurtSound (Lafr;)Lxf;
 	METHOD l getCanClimb ()Z
 	METHOD n initAi ()V
 	METHOD x_ initDataTracker ()V
diff --git a/mappings/net/minecraft/entity/mob/StrayEntity.mapping b/mappings/net/minecraft/entity/mob/StrayEntity.mapping
index fd6b17c02a..4272331cfe 100644
--- a/mappings/net/minecraft/entity/mob/StrayEntity.mapping
+++ b/mappings/net/minecraft/entity/mob/StrayEntity.mapping
@@ -1,4 +1,4 @@
 CLASS apu net/minecraft/entity/mob/StrayEntity
-	METHOD D getSoundAmbient ()Lxf;
-	METHOD cw getSoundDeath ()Lxf;
-	METHOD e getSoundHurt (Lafr;)Lxf;
+	METHOD D getAmbientSound ()Lxf;
+	METHOD cw getDeathSound ()Lxf;
+	METHOD e getHurtSound (Lafr;)Lxf;
diff --git a/mappings/net/minecraft/entity/mob/VexEntity.mapping b/mappings/net/minecraft/entity/mob/VexEntity.mapping
index e936baeb87..1527e72ea1 100644
--- a/mappings/net/minecraft/entity/mob/VexEntity.mapping
+++ b/mappings/net/minecraft/entity/mob/VexEntity.mapping
@@ -10,9 +10,10 @@ CLASS apv net/minecraft/entity/mob/VexEntity
 			ARG 0 entity
 		METHOD a canStart ()Z
 		METHOD c start ()V
-	CLASS apv$c
+	CLASS apv$c VexMoveControl
 		METHOD <init> (Lapv;Lapv;)V
 			ARG 0 enttiyVex
+			ARG 2 vex
 		METHOD a tick ()V
 	CLASS apv$d LookAtTargetGoal
 		METHOD a canStart ()Z
@@ -22,7 +23,7 @@ CLASS apv net/minecraft/entity/mob/VexEntity
 	FIELD bD lifeTicks I
 	FIELD b owner Lags;
 	FIELD c bounds Let;
-	METHOD D getSoundAmbient ()Lxf;
+	METHOD D getAmbientSound ()Lxf;
 	METHOD U_ update ()V
 	METHOD a setLifeTicks (I)V
 	METHOD a initEquipment (Lafa;)V
@@ -37,9 +38,9 @@ CLASS apv net/minecraft/entity/mob/VexEntity
 	METHOD b serializeCustomData (Lhp;)V
 		ARG 1 tag
 	METHOD cb initAttributes ()V
-	METHOD cw getSoundDeath ()Lxf;
+	METHOD cw getDeathSound ()Lxf;
 	METHOD dA getBounds ()Let;
-	METHOD e getSoundHurt (Lafr;)Lxf;
+	METHOD e getHurtSound (Lafr;)Lxf;
 	METHOD g setBounds (Let;)V
 	METHOD l getOwner ()Lags;
 	METHOD n initAi ()V
diff --git a/mappings/net/minecraft/entity/mob/VindicatorEntity.mapping b/mappings/net/minecraft/entity/mob/VindicatorEntity.mapping
index 554fd48e35..51dfa29b1d 100644
--- a/mappings/net/minecraft/entity/mob/VindicatorEntity.mapping
+++ b/mappings/net/minecraft/entity/mob/VindicatorEntity.mapping
@@ -2,7 +2,7 @@ CLASS apw net/minecraft/entity/mob/VindicatorEntity
 	CLASS apw$a VindicatorBreakDoorGoal
 	CLASS apw$b
 		METHOD a canStart ()Z
-	METHOD D getSoundAmbient ()Lxf;
+	METHOD D getAmbientSound ()Lxf;
 	METHOD H mobTick ()V
 	METHOD a initEquipment (Lafa;)V
 	METHOD a (Lbar;Lafa;Lagu;Lahc;Lhp;)Lahc;
@@ -13,8 +13,8 @@ CLASS apw net/minecraft/entity/mob/VindicatorEntity
 		ARG 1 tag
 	METHOD b setCustomName (Lja;)V
 	METHOD cb initAttributes ()V
-	METHOD cw getSoundDeath ()Lxf;
-	METHOD e getSoundHurt (Lafr;)Lxf;
+	METHOD cw getDeathSound ()Lxf;
+	METHOD e getHurtSound (Lafr;)Lxf;
 	METHOD n initAi ()V
 	METHOD r isTeammate (Lagi;)Z
 	METHOD x_ initDataTracker ()V
diff --git a/mappings/net/minecraft/entity/mob/WitchEntity.mapping b/mappings/net/minecraft/entity/mob/WitchEntity.mapping
index 80864eeb07..ba9b755fc2 100644
--- a/mappings/net/minecraft/entity/mob/WitchEntity.mapping
+++ b/mappings/net/minecraft/entity/mob/WitchEntity.mapping
@@ -1,13 +1,13 @@
 CLASS apx net/minecraft/entity/mob/WitchEntity
 	FIELD bC DRINKING Lpn;
-	METHOD D getSoundAmbient ()Lxf;
+	METHOD D getAmbientSound ()Lxf;
 	METHOD a attack (Lagr;F)V
 		ARG 1 target
 	METHOD a setDrinking (Z)V
 	METHOD bH getEyeHeight ()F
 	METHOD cb initAttributes ()V
-	METHOD cw getSoundDeath ()Lxf;
-	METHOD e getSoundHurt (Lafr;)Lxf;
+	METHOD cw getDeathSound ()Lxf;
+	METHOD e getHurtSound (Lafr;)Lxf;
 	METHOD k updateMovement ()V
 	METHOD l isDrinking ()Z
 	METHOD n initAi ()V
diff --git a/mappings/net/minecraft/entity/mob/WitherSkeletonEntity.mapping b/mappings/net/minecraft/entity/mob/WitherSkeletonEntity.mapping
index 3225f8afaf..0f4c90fa61 100644
--- a/mappings/net/minecraft/entity/mob/WitherSkeletonEntity.mapping
+++ b/mappings/net/minecraft/entity/mob/WitherSkeletonEntity.mapping
@@ -1,10 +1,10 @@
 CLASS apy net/minecraft/entity/mob/WitherSkeletonEntity
-	METHOD D getSoundAmbient ()Lxf;
+	METHOD D getAmbientSound ()Lxf;
 	METHOD a initEquipment (Lafa;)V
 	METHOD a dropEquipment (Lafr;IZ)V
 	METHOD a (Lbar;Lafa;Lagu;Lahc;Lhp;)Lahc;
 		ARG 3 difficulty
 	METHOD bH getEyeHeight ()F
-	METHOD cw getSoundDeath ()Lxf;
+	METHOD cw getDeathSound ()Lxf;
 	METHOD d isPotionEffective (Lagb;)Z
-	METHOD e getSoundHurt (Lafr;)Lxf;
+	METHOD e getHurtSound (Lafr;)Lxf;
diff --git a/mappings/net/minecraft/entity/mob/ZombieEntity.mapping b/mappings/net/minecraft/entity/mob/ZombieEntity.mapping
index 486fd6efcc..ed06884e15 100644
--- a/mappings/net/minecraft/entity/mob/ZombieEntity.mapping
+++ b/mappings/net/minecraft/entity/mob/ZombieEntity.mapping
@@ -7,7 +7,7 @@ CLASS apz net/minecraft/entity/mob/ZombieEntity
 	METHOD <init> (Lagm;Lbaq;)V
 		ARG 1 type
 		ARG 2 world
-	METHOD D getSoundAmbient ()Lxf;
+	METHOD D getAmbientSound ()Lxf;
 	METHOD U_ update ()V
 	METHOD a setSize (FF)V
 		ARG 1 width
@@ -27,12 +27,12 @@ CLASS apz net/minecraft/entity/mob/ZombieEntity
 		ARG 1 tag
 	METHOD bH getEyeHeight ()F
 	METHOD cb initAttributes ()V
-	METHOD cw getSoundDeath ()Lxf;
+	METHOD cw getDeathSound ()Lxf;
 	METHOD dB getSoundStep ()Lxf;
 	METHOD dC getSkull ()Lavs;
 	METHOD dI canBreakDoors ()Z
 	METHOD dz hasArmsRaised ()Z
-	METHOD e getSoundHurt (Lafr;)Lxf;
+	METHOD e getHurtSound (Lafr;)Lxf;
 	METHOD k updateMovement ()V
 	METHOD n initAi ()V
 	METHOD s setArmsRaised (Z)V
diff --git a/mappings/net/minecraft/entity/mob/ZombieHorseEntity.mapping b/mappings/net/minecraft/entity/mob/ZombieHorseEntity.mapping
index d370e5ef09..a5eea43768 100644
--- a/mappings/net/minecraft/entity/mob/ZombieHorseEntity.mapping
+++ b/mappings/net/minecraft/entity/mob/ZombieHorseEntity.mapping
@@ -1,8 +1,8 @@
 CLASS amv net/minecraft/entity/mob/ZombieHorseEntity
-	METHOD D getSoundAmbient ()Lxf;
+	METHOD D getAmbientSound ()Lxf;
 	METHOD a createChild (Lagf;)Lagf;
 	METHOD a interactMob (Laqj;Lafb;)Z
 		ARG 1 player
 	METHOD cb initAttributes ()V
-	METHOD cw getSoundDeath ()Lxf;
-	METHOD e getSoundHurt (Lafr;)Lxf;
+	METHOD cw getDeathSound ()Lxf;
+	METHOD e getHurtSound (Lafr;)Lxf;
diff --git a/mappings/net/minecraft/entity/mob/ZombieVillagerEntity.mapping b/mappings/net/minecraft/entity/mob/ZombieVillagerEntity.mapping
index 100fd5f34c..dd73b65e79 100644
--- a/mappings/net/minecraft/entity/mob/ZombieVillagerEntity.mapping
+++ b/mappings/net/minecraft/entity/mob/ZombieVillagerEntity.mapping
@@ -2,7 +2,7 @@ CLASS aqa net/minecraft/entity/mob/ZombieVillagerEntity
 	FIELD a CONVERTING Lpn;
 	FIELD bC conversionTimer I
 	FIELD b PROFESSION Lpn;
-	METHOD D getSoundAmbient ()Lxf;
+	METHOD D getAmbientSound ()Lxf;
 	METHOD U_ update ()V
 	METHOD a setProfession (I)V
 	METHOD a interactMob (Laqj;Lafb;)Z
@@ -15,11 +15,11 @@ CLASS aqa net/minecraft/entity/mob/ZombieVillagerEntity
 	METHOD b serializeCustomData (Lhp;)V
 		ARG 1 tag
 	METHOD cJ getSoundPitch ()F
-	METHOD cw getSoundDeath ()Lxf;
+	METHOD cw getDeathSound ()Lxf;
 	METHOD dB getSoundStep ()Lxf;
 	METHOD dC getSkull ()Lavs;
 	METHOD dG getProfession ()I
 	METHOD dJ isConverting ()Z
 	METHOD dK finishConversion ()V
-	METHOD e getSoundHurt (Lafr;)Lxf;
+	METHOD e getHurtSound (Lafr;)Lxf;
 	METHOD x_ initDataTracker ()V
diff --git a/mappings/net/minecraft/entity/passive/BatEntity.mapping b/mappings/net/minecraft/entity/passive/BatEntity.mapping
index e3a8384734..3bc911325d 100644
--- a/mappings/net/minecraft/entity/passive/BatEntity.mapping
+++ b/mappings/net/minecraft/entity/passive/BatEntity.mapping
@@ -1,7 +1,7 @@
 CLASS ali net/minecraft/entity/passive/BatEntity
 	FIELD a BAT_FLAGS Lpn;
 	METHOD C pushAway (Lagi;)V
-	METHOD D getSoundAmbient ()Lxf;
+	METHOD D getAmbientSound ()Lxf;
 	METHOD H mobTick ()V
 	METHOD U_ update ()V
 	METHOD a damage (Lafr;F)Z
@@ -19,7 +19,7 @@ CLASS ali net/minecraft/entity/passive/BatEntity
 	METHOD cJ getSoundPitch ()F
 	METHOD cS doPushLogic ()V
 	METHOD cb initAttributes ()V
-	METHOD cw getSoundDeath ()Lxf;
-	METHOD e getSoundHurt (Lafr;)Lxf;
+	METHOD cw getDeathSound ()Lxf;
+	METHOD e getHurtSound (Lafr;)Lxf;
 	METHOD l isRoosting ()Z
 	METHOD x_ initDataTracker ()V
diff --git a/mappings/net/minecraft/entity/passive/CatEntity.mapping b/mappings/net/minecraft/entity/passive/CatEntity.mapping
index 28d79b3571..cea1ff7011 100644
--- a/mappings/net/minecraft/entity/passive/CatEntity.mapping
+++ b/mappings/net/minecraft/entity/passive/CatEntity.mapping
@@ -19,7 +19,7 @@ CLASS alo net/minecraft/entity/passive/CatEntity
 	FIELD bI CAT_TYPE Lpn;
 	FIELD bL COLLAR_COLOR Lpn;
 	FIELD bM fleeGoal Lalo$a;
-	METHOD D getSoundAmbient ()Lxf;
+	METHOD D getAmbientSound ()Lxf;
 	METHOD H mobTick ()V
 	METHOD U_ update ()V
 	METHOD a createChild (Lagf;)Lagf;
@@ -38,11 +38,11 @@ CLASS alo net/minecraft/entity/passive/CatEntity
 	METHOD c handleFallDamage (FF)V
 		ARG 1 fallDistance
 	METHOD cb initAttributes ()V
-	METHOD cw getSoundDeath ()Lxf;
+	METHOD cw getDeathSound ()Lxf;
 	METHOD dA onTamedChanged ()V
 	METHOD dJ getOcelotType ()I
 	METHOD dM getCollarColor ()Lauo;
-	METHOD e getSoundHurt (Lafr;)Lxf;
+	METHOD e getHurtSound (Lafr;)Lxf;
 	METHOD n initAi ()V
 	METHOD p getOcelotType (I)V
 	METHOD x_ initDataTracker ()V
diff --git a/mappings/net/minecraft/entity/passive/ChickenEntity.mapping b/mappings/net/minecraft/entity/passive/ChickenEntity.mapping
index 47f53cd823..ec7ae2b3f1 100644
--- a/mappings/net/minecraft/entity/passive/ChickenEntity.mapping
+++ b/mappings/net/minecraft/entity/passive/ChickenEntity.mapping
@@ -1,6 +1,6 @@
 CLASS alp net/minecraft/entity/passive/ChickenEntity
 	FIELD bI eggLayTime I
-	METHOD D getSoundAmbient ()Lxf;
+	METHOD D getAmbientSound ()Lxf;
 	METHOD a createChild (Lagf;)Lagf;
 	METHOD a playStepSound (Let;Lboj;)V
 		ARG 1 pos
@@ -13,7 +13,7 @@ CLASS alp net/minecraft/entity/passive/ChickenEntity
 	METHOD c handleFallDamage (FF)V
 		ARG 1 fallDistance
 	METHOD cb initAttributes ()V
-	METHOD cw getSoundDeath ()Lxf;
-	METHOD e getSoundHurt (Lafr;)Lxf;
+	METHOD cw getDeathSound ()Lxf;
+	METHOD e getHurtSound (Lafr;)Lxf;
 	METHOD k updateMovement ()V
 	METHOD n initAi ()V
diff --git a/mappings/net/minecraft/entity/passive/CodEntity.mapping b/mappings/net/minecraft/entity/passive/CodEntity.mapping
index a47aa2ccd9..3537820171 100644
--- a/mappings/net/minecraft/entity/passive/CodEntity.mapping
+++ b/mappings/net/minecraft/entity/passive/CodEntity.mapping
@@ -1,4 +1,4 @@
 CLASS alq net/minecraft/entity/passive/CodEntity
-	METHOD D getSoundAmbient ()Lxf;
-	METHOD cw getSoundDeath ()Lxf;
-	METHOD e getSoundHurt (Lafr;)Lxf;
+	METHOD D getAmbientSound ()Lxf;
+	METHOD cw getDeathSound ()Lxf;
+	METHOD e getHurtSound (Lafr;)Lxf;
diff --git a/mappings/net/minecraft/entity/passive/CowEntity.mapping b/mappings/net/minecraft/entity/passive/CowEntity.mapping
index da94e6beed..226b4f779b 100644
--- a/mappings/net/minecraft/entity/passive/CowEntity.mapping
+++ b/mappings/net/minecraft/entity/passive/CowEntity.mapping
@@ -2,7 +2,7 @@ CLASS alr net/minecraft/entity/passive/CowEntity
 	METHOD <init> (Lagm;Lbaq;)V
 		ARG 1 type
 		ARG 2 world
-	METHOD D getSoundAmbient ()Lxf;
+	METHOD D getAmbientSound ()Lxf;
 	METHOD a createChild (Lagf;)Lagf;
 	METHOD a interactMob (Laqj;Lafb;)Z
 		ARG 1 player
@@ -12,6 +12,6 @@ CLASS alr net/minecraft/entity/passive/CowEntity
 	METHOD bH getEyeHeight ()F
 	METHOD cI getSoundVolume ()F
 	METHOD cb initAttributes ()V
-	METHOD cw getSoundDeath ()Lxf;
-	METHOD e getSoundHurt (Lafr;)Lxf;
+	METHOD cw getDeathSound ()Lxf;
+	METHOD e getHurtSound (Lafr;)Lxf;
 	METHOD n initAi ()V
diff --git a/mappings/net/minecraft/entity/passive/DolphinEntity.mapping b/mappings/net/minecraft/entity/passive/DolphinEntity.mapping
index dc22a2965f..1a2e4dde33 100644
--- a/mappings/net/minecraft/entity/passive/DolphinEntity.mapping
+++ b/mappings/net/minecraft/entity/passive/DolphinEntity.mapping
@@ -1,5 +1,8 @@
 CLASS als net/minecraft/entity/passive/DolphinEntity
-	CLASS als$a
+	CLASS als$a DolphinMoveControl
+		FIELD i dolphin Lals;
+		METHOD <init> (Lals;)V
+			ARG 1 dolphin
 		METHOD a tick ()V
 	CLASS als$b
 		METHOD a canStart ()Z
@@ -19,7 +22,7 @@ CLASS als net/minecraft/entity/passive/DolphinEntity
 		METHOD c start ()V
 		METHOD d onRemove ()V
 		METHOD e tick ()V
-	METHOD D getSoundAmbient ()Lxf;
+	METHOD D getAmbientSound ()Lxf;
 	METHOD U_ update ()V
 	METHOD a canBeLeashedBy (Laqj;)Z
 	METHOD a interactMob (Laqj;Lafb;)Z
@@ -36,8 +39,8 @@ CLASS als net/minecraft/entity/passive/DolphinEntity
 	METHOD bH getEyeHeight ()F
 	METHOD bh getMaxBreath ()I
 	METHOD cb initAttributes ()V
-	METHOD cw getSoundDeath ()Lxf;
-	METHOD e getSoundHurt (Lafr;)Lxf;
+	METHOD cw getDeathSound ()Lxf;
+	METHOD e getHurtSound (Lafr;)Lxf;
 	METHOD n initAi ()V
 	METHOD n canStartRiding (Lagi;)Z
 	METHOD x_ initDataTracker ()V
diff --git a/mappings/net/minecraft/entity/passive/DonkeyEntity.mapping b/mappings/net/minecraft/entity/passive/DonkeyEntity.mapping
index 07e1dd5716..3e3eb322c5 100644
--- a/mappings/net/minecraft/entity/passive/DonkeyEntity.mapping
+++ b/mappings/net/minecraft/entity/passive/DonkeyEntity.mapping
@@ -1,5 +1,5 @@
 CLASS amo net/minecraft/entity/passive/DonkeyEntity
-	METHOD D getSoundAmbient ()Lxf;
+	METHOD D getAmbientSound ()Lxf;
 	METHOD a createChild (Lagf;)Lagf;
-	METHOD cw getSoundDeath ()Lxf;
-	METHOD e getSoundHurt (Lafr;)Lxf;
+	METHOD cw getDeathSound ()Lxf;
+	METHOD e getHurtSound (Lafr;)Lxf;
diff --git a/mappings/net/minecraft/entity/passive/FishEntity.mapping b/mappings/net/minecraft/entity/passive/FishEntity.mapping
index be223bb26e..3f652f857a 100644
--- a/mappings/net/minecraft/entity/passive/FishEntity.mapping
+++ b/mappings/net/minecraft/entity/passive/FishEntity.mapping
@@ -1,5 +1,8 @@
 CLASS alk net/minecraft/entity/passive/FishEntity
-	CLASS alk$a
+	CLASS alk$a FishMoveControl
+		FIELD i fish Lalk;
+		METHOD <init> (Lalk;)V
+			ARG 1 fish
 		METHOD a tick ()V
 	CLASS alk$b
 		METHOD a canStart ()Z
diff --git a/mappings/net/minecraft/entity/passive/GolemEntity.mapping b/mappings/net/minecraft/entity/passive/GolemEntity.mapping
index c915f27083..3ee0162681 100644
--- a/mappings/net/minecraft/entity/passive/GolemEntity.mapping
+++ b/mappings/net/minecraft/entity/passive/GolemEntity.mapping
@@ -2,8 +2,8 @@ CLASS all net/minecraft/entity/passive/GolemEntity
 	METHOD <init> (Lagm;Lbaq;)V
 		ARG 1 type
 		ARG 2 world
-	METHOD D getSoundAmbient ()Lxf;
+	METHOD D getAmbientSound ()Lxf;
 	METHOD c handleFallDamage (FF)V
 		ARG 1 fallDistance
-	METHOD cw getSoundDeath ()Lxf;
-	METHOD e getSoundHurt (Lafr;)Lxf;
+	METHOD cw getDeathSound ()Lxf;
+	METHOD e getHurtSound (Lafr;)Lxf;
diff --git a/mappings/net/minecraft/entity/passive/HorseBaseEntity.mapping b/mappings/net/minecraft/entity/passive/HorseBaseEntity.mapping
index 1e6a058cf5..7cf10b0984 100644
--- a/mappings/net/minecraft/entity/passive/HorseBaseEntity.mapping
+++ b/mappings/net/minecraft/entity/passive/HorseBaseEntity.mapping
@@ -6,7 +6,7 @@ CLASS amn net/minecraft/entity/passive/HorseBaseEntity
 	METHOD <init> (Lagm;Lbaq;)V
 		ARG 1 type
 		ARG 2 world
-	METHOD D getSoundAmbient ()Lxf;
+	METHOD D getAmbientSound ()Lxf;
 	METHOD H_ canJump ()Z
 	METHOD J_ stopJumping ()V
 	METHOD M getLimitPerChunk ()I
@@ -32,7 +32,7 @@ CLASS amn net/minecraft/entity/passive/HorseBaseEntity
 		ARG 1 fallDistance
 	METHOD cI getSoundVolume ()F
 	METHOD cb initAttributes ()V
-	METHOD cw getSoundDeath ()Lxf;
+	METHOD cw getDeathSound ()Lxf;
 	METHOD d setHorseFlag (IZ)V
 		ARG 1 index
 	METHOD dB getInventorySize ()I
@@ -42,7 +42,7 @@ CLASS amn net/minecraft/entity/passive/HorseBaseEntity
 	METHOD dQ isBred ()Z
 	METHOD dR getTemper ()I
 	METHOD dW isSaddled ()Z
-	METHOD e getSoundHurt (Lafr;)Lxf;
+	METHOD e getHurtSound (Lafr;)Lxf;
 	METHOD k updateMovement ()V
 	METHOD n initAi ()V
 	METHOD p getHorseFlag (I)Z
diff --git a/mappings/net/minecraft/entity/passive/HorseEntity.mapping b/mappings/net/minecraft/entity/passive/HorseEntity.mapping
index 946d24f298..4accaafcc3 100644
--- a/mappings/net/minecraft/entity/passive/HorseEntity.mapping
+++ b/mappings/net/minecraft/entity/passive/HorseEntity.mapping
@@ -7,7 +7,7 @@ CLASS amp net/minecraft/entity/passive/HorseEntity
 	FIELD bS HORSE_MARKING_TEX_ID [Ljava/lang/String;
 	FIELD bT textureLocation Ljava/lang/String;
 	FIELD bU textureLayers [Ljava/lang/String;
-	METHOD D getSoundAmbient ()Lxf;
+	METHOD D getAmbientSound ()Lxf;
 	METHOD U_ update ()V
 	METHOD a onInvChange (Laev;)V
 	METHOD a createChild (Lagf;)Lagf;
@@ -20,12 +20,12 @@ CLASS amp net/minecraft/entity/passive/HorseEntity
 	METHOD b serializeCustomData (Lhp;)V
 		ARG 1 tag
 	METHOD cb initAttributes ()V
-	METHOD cw getSoundDeath ()Lxf;
+	METHOD cw getDeathSound ()Lxf;
 	METHOD dA getTextureLocation ()Ljava/lang/String;
 	METHOD dD getTextureLayers ()[Ljava/lang/String;
 	METHOD dI getArmorType ()Lamq;
 	METHOD dz getVariant ()I
-	METHOD e getSoundHurt (Lafr;)Lxf;
+	METHOD e getHurtSound (Lafr;)Lxf;
 	METHOD eh clearTextureInfo ()V
 	METHOD ei initTextureInfo ()V
 	METHOD h setArmorTypeFromStack (Lavs;)V
diff --git a/mappings/net/minecraft/entity/passive/IronGolemEntity.mapping b/mappings/net/minecraft/entity/passive/IronGolemEntity.mapping
index 3c50e53193..d1fb052221 100644
--- a/mappings/net/minecraft/entity/passive/IronGolemEntity.mapping
+++ b/mappings/net/minecraft/entity/passive/IronGolemEntity.mapping
@@ -12,9 +12,9 @@ CLASS alu net/minecraft/entity/passive/IronGolemEntity
 		ARG 1 tag
 	METHOD b canTrack (Ljava/lang/Class;)Z
 	METHOD cb initAttributes ()V
-	METHOD cw getSoundDeath ()Lxf;
+	METHOD cw getDeathSound ()Lxf;
 	METHOD dB isPlayerCreated ()Z
-	METHOD e getSoundHurt (Lafr;)Lxf;
+	METHOD e getHurtSound (Lafr;)Lxf;
 	METHOD k updateMovement ()V
 	METHOD l getVillageProperties ()Lald;
 	METHOD n initAi ()V
diff --git a/mappings/net/minecraft/entity/passive/LlamaEntity.mapping b/mappings/net/minecraft/entity/passive/LlamaEntity.mapping
index ec1619792d..2e17ed321c 100644
--- a/mappings/net/minecraft/entity/passive/LlamaEntity.mapping
+++ b/mappings/net/minecraft/entity/passive/LlamaEntity.mapping
@@ -6,7 +6,7 @@ CLASS amr net/minecraft/entity/passive/LlamaEntity
 		METHOD b shouldContinue ()Z
 	FIELD bM ATTR_STRENGTH Lpn;
 	FIELD bO ATTR_VARIANT Lpn;
-	METHOD D getSoundAmbient ()Lxf;
+	METHOD D getAmbientSound ()Lxf;
 	METHOD a onInvChange (Laev;)V
 	METHOD a createChild (Lagf;)Lagf;
 	METHOD a attack (Lagr;F)V
@@ -24,9 +24,9 @@ CLASS amr net/minecraft/entity/passive/LlamaEntity
 	METHOD c handleFallDamage (FF)V
 		ARG 1 fallDistance
 	METHOD cb initAttributes ()V
-	METHOD cw getSoundDeath ()Lxf;
+	METHOD cw getDeathSound ()Lxf;
 	METHOD dB getInventorySize ()I
-	METHOD e getSoundHurt (Lafr;)Lxf;
+	METHOD e getHurtSound (Lafr;)Lxf;
 	METHOD eh getStrength ()I
 	METHOD ei getVariant ()I
 	METHOD n initAi ()V
diff --git a/mappings/net/minecraft/entity/passive/MuleEntity.mapping b/mappings/net/minecraft/entity/passive/MuleEntity.mapping
index d1307bd97c..49ea7cbe93 100644
--- a/mappings/net/minecraft/entity/passive/MuleEntity.mapping
+++ b/mappings/net/minecraft/entity/passive/MuleEntity.mapping
@@ -1,4 +1,4 @@
 CLASS ams net/minecraft/entity/passive/MuleEntity
-	METHOD D getSoundAmbient ()Lxf;
-	METHOD cw getSoundDeath ()Lxf;
-	METHOD e getSoundHurt (Lafr;)Lxf;
+	METHOD D getAmbientSound ()Lxf;
+	METHOD cw getDeathSound ()Lxf;
+	METHOD e getHurtSound (Lafr;)Lxf;
diff --git a/mappings/net/minecraft/entity/passive/OcelotEntity.mapping b/mappings/net/minecraft/entity/passive/OcelotEntity.mapping
index c08716b36f..1f79eb6a6c 100644
--- a/mappings/net/minecraft/entity/passive/OcelotEntity.mapping
+++ b/mappings/net/minecraft/entity/passive/OcelotEntity.mapping
@@ -2,7 +2,7 @@ CLASS alw net/minecraft/entity/passive/OcelotEntity
 	CLASS alw$a OcelotFleeGoal
 		METHOD a canStart ()Z
 		METHOD b shouldContinue ()Z
-	METHOD D getSoundAmbient ()Lxf;
+	METHOD D getAmbientSound ()Lxf;
 	METHOD H mobTick ()V
 	METHOD a damage (Lafr;F)Z
 		ARG 1 source
@@ -18,7 +18,7 @@ CLASS alw net/minecraft/entity/passive/OcelotEntity
 	METHOD c handleFallDamage (FF)V
 		ARG 1 fallDistance
 	METHOD cb initAttributes ()V
-	METHOD cw getSoundDeath ()Lxf;
-	METHOD e getSoundHurt (Lafr;)Lxf;
+	METHOD cw getDeathSound ()Lxf;
+	METHOD e getHurtSound (Lafr;)Lxf;
 	METHOD n initAi ()V
 	METHOD x_ initDataTracker ()V
diff --git a/mappings/net/minecraft/entity/passive/PandaEntity.mapping b/mappings/net/minecraft/entity/passive/PandaEntity.mapping
index caa7e979ad..5352a119bd 100644
--- a/mappings/net/minecraft/entity/passive/PandaEntity.mapping
+++ b/mappings/net/minecraft/entity/passive/PandaEntity.mapping
@@ -10,7 +10,10 @@ CLASS alx net/minecraft/entity/passive/PandaEntity
 		METHOD b shouldContinue ()Z
 		METHOD c start ()V
 		METHOD d onRemove ()V
-	CLASS alx$f
+	CLASS alx$f PandaMoveControl
+		FIELD i panda Lalx;
+		METHOD <init> (Lalx;)V
+			ARG 1 panda
 		METHOD a tick ()V
 	CLASS alx$g
 		METHOD a canStart ()Z
@@ -30,7 +33,7 @@ CLASS alx net/minecraft/entity/passive/PandaEntity
 		METHOD a canStart ()Z
 		METHOD b shouldContinue ()Z
 		METHOD c start ()V
-	METHOD D getSoundAmbient ()Lxf;
+	METHOD D getAmbientSound ()Lxf;
 	METHOD U_ update ()V
 	METHOD a damage (Lafr;F)Z
 		ARG 1 source
@@ -48,7 +51,7 @@ CLASS alx net/minecraft/entity/passive/PandaEntity
 	METHOD b serializeCustomData (Lhp;)V
 		ARG 1 tag
 	METHOD cb initAttributes ()V
-	METHOD cw getSoundDeath ()Lxf;
-	METHOD e getSoundHurt (Lafr;)Lxf;
+	METHOD cw getDeathSound ()Lxf;
+	METHOD e getHurtSound (Lafr;)Lxf;
 	METHOD n initAi ()V
 	METHOD x_ initDataTracker ()V
diff --git a/mappings/net/minecraft/entity/passive/ParrotEntity.mapping b/mappings/net/minecraft/entity/passive/ParrotEntity.mapping
index c92a29f85d..bee9246a75 100644
--- a/mappings/net/minecraft/entity/passive/ParrotEntity.mapping
+++ b/mappings/net/minecraft/entity/passive/ParrotEntity.mapping
@@ -1,7 +1,7 @@
 CLASS aly net/minecraft/entity/passive/ParrotEntity
 	FIELD bL ATTR_VARIANT Lpn;
 	METHOD C pushAway (Lagi;)V
-	METHOD D getSoundAmbient ()Lxf;
+	METHOD D getAmbientSound ()Lxf;
 	METHOD a damage (Lafr;F)Z
 		ARG 1 source
 	METHOD a createChild (Lagf;)Lagf;
@@ -22,9 +22,9 @@ CLASS aly net/minecraft/entity/passive/ParrotEntity
 		ARG 1 fallDistance
 	METHOD cJ getSoundPitch ()F
 	METHOD cb initAttributes ()V
-	METHOD cw getSoundDeath ()Lxf;
+	METHOD cw getDeathSound ()Lxf;
 	METHOD dJ getVariant ()I
-	METHOD e getSoundHurt (Lafr;)Lxf;
+	METHOD e getHurtSound (Lafr;)Lxf;
 	METHOD k updateMovement ()V
 	METHOD n initAi ()V
 	METHOD p setVariant (I)V
diff --git a/mappings/net/minecraft/entity/passive/PigEntity.mapping b/mappings/net/minecraft/entity/passive/PigEntity.mapping
index b2a3e3ce1c..4e32a51df0 100644
--- a/mappings/net/minecraft/entity/passive/PigEntity.mapping
+++ b/mappings/net/minecraft/entity/passive/PigEntity.mapping
@@ -1,6 +1,6 @@
 CLASS alz net/minecraft/entity/passive/PigEntity
 	FIELD bC SADDLED Lpn;
-	METHOD D getSoundAmbient ()Lxf;
+	METHOD D getAmbientSound ()Lxf;
 	METHOD a createChild (Lagf;)Lagf;
 	METHOD a onStruckByLightning (Laoi;)V
 	METHOD a interactMob (Laqj;Lafb;)Z
@@ -14,9 +14,9 @@ CLASS alz net/minecraft/entity/passive/PigEntity
 	METHOD b serializeCustomData (Lhp;)V
 		ARG 1 tag
 	METHOD cb initAttributes ()V
-	METHOD cw getSoundDeath ()Lxf;
+	METHOD cw getDeathSound ()Lxf;
 	METHOD dz isSaddled ()Z
-	METHOD e getSoundHurt (Lafr;)Lxf;
+	METHOD e getHurtSound (Lafr;)Lxf;
 	METHOD n initAi ()V
 	METHOD s setSaddled (Z)V
 	METHOD x_ initDataTracker ()V
diff --git a/mappings/net/minecraft/entity/passive/PolarBearEntity.mapping b/mappings/net/minecraft/entity/passive/PolarBearEntity.mapping
index f0887e2f1b..86022f644f 100644
--- a/mappings/net/minecraft/entity/passive/PolarBearEntity.mapping
+++ b/mappings/net/minecraft/entity/passive/PolarBearEntity.mapping
@@ -8,7 +8,7 @@ CLASS ama net/minecraft/entity/passive/PolarBearEntity
 		METHOD d onRemove ()V
 	CLASS ama$e
 		METHOD a canStart ()Z
-	METHOD D getSoundAmbient ()Lxf;
+	METHOD D getAmbientSound ()Lxf;
 	METHOD U_ update ()V
 	METHOD a createChild (Lagf;)Lagf;
 	METHOD a (Lbar;Lafa;Lagu;Lahc;Lhp;)Lahc;
@@ -16,7 +16,7 @@ CLASS ama net/minecraft/entity/passive/PolarBearEntity
 	METHOD a playStepSound (Let;Lboj;)V
 		ARG 1 pos
 	METHOD cb initAttributes ()V
-	METHOD cw getSoundDeath ()Lxf;
-	METHOD e getSoundHurt (Lafr;)Lxf;
+	METHOD cw getDeathSound ()Lxf;
+	METHOD e getHurtSound (Lafr;)Lxf;
 	METHOD n initAi ()V
 	METHOD x_ initDataTracker ()V
diff --git a/mappings/net/minecraft/entity/passive/PufferfishEntity.mapping b/mappings/net/minecraft/entity/passive/PufferfishEntity.mapping
index ba8628066d..b80aacec01 100644
--- a/mappings/net/minecraft/entity/passive/PufferfishEntity.mapping
+++ b/mappings/net/minecraft/entity/passive/PufferfishEntity.mapping
@@ -4,7 +4,7 @@ CLASS amb net/minecraft/entity/passive/PufferfishEntity
 		METHOD b shouldContinue ()Z
 		METHOD c start ()V
 		METHOD d onRemove ()V
-	METHOD D getSoundAmbient ()Lxf;
+	METHOD D getAmbientSound ()Lxf;
 	METHOD U_ update ()V
 	METHOD a setSize (FF)V
 		ARG 1 width
@@ -13,8 +13,8 @@ CLASS amb net/minecraft/entity/passive/PufferfishEntity
 	METHOD a onTrackedDataSet (Lpn;)V
 	METHOD b serializeCustomData (Lhp;)V
 		ARG 1 tag
-	METHOD cw getSoundDeath ()Lxf;
-	METHOD e getSoundHurt (Lafr;)Lxf;
+	METHOD cw getDeathSound ()Lxf;
+	METHOD e getHurtSound (Lafr;)Lxf;
 	METHOD k updateMovement ()V
 	METHOD n initAi ()V
 	METHOD x_ initDataTracker ()V
diff --git a/mappings/net/minecraft/entity/passive/RabbitEntity.mapping b/mappings/net/minecraft/entity/passive/RabbitEntity.mapping
index f85b4f5195..ee1022da76 100644
--- a/mappings/net/minecraft/entity/passive/RabbitEntity.mapping
+++ b/mappings/net/minecraft/entity/passive/RabbitEntity.mapping
@@ -1,10 +1,16 @@
 CLASS amc net/minecraft/entity/passive/RabbitEntity
 	CLASS amc$b RabbitFleeGoal
 		METHOD a canStart ()Z
-	CLASS amc$d HopControl
+	CLASS amc$d RabbitJumpControl
+		FIELD c rabbit Lamc;
+		METHOD <init> (Lamc;Lamc;)V
+			ARG 2 rabbit
 		METHOD b tick ()V
 		METHOD c isActive ()Z
-	CLASS amc$e
+	CLASS amc$e RabbitMoveControl
+		FIELD i rabbit Lamc;
+		METHOD <init> (Lamc;)V
+			ARG 1 rabbit
 		METHOD a tick ()V
 	CLASS amc$f
 		METHOD e tick ()V
@@ -14,7 +20,7 @@ CLASS amc net/minecraft/entity/passive/RabbitEntity
 		METHOD e tick ()V
 	FIELD bC RABBIT_TYPE Lpn;
 	FIELD bD KILLER_BUNNY Lpy;
-	METHOD D getSoundAmbient ()Lxf;
+	METHOD D getAmbientSound ()Lxf;
 	METHOD H mobTick ()V
 	METHOD a damage (Lafr;F)Z
 		ARG 1 source
@@ -29,9 +35,9 @@ CLASS amc net/minecraft/entity/passive/RabbitEntity
 		ARG 1 tag
 	METHOD bX getSoundCategory ()Lxh;
 	METHOD cb initAttributes ()V
-	METHOD cw getSoundDeath ()Lxf;
+	METHOD cw getDeathSound ()Lxf;
 	METHOD dB getRabbitType ()I
-	METHOD e getSoundHurt (Lafr;)Lxf;
+	METHOD e getHurtSound (Lafr;)Lxf;
 	METHOD k updateMovement ()V
 	METHOD n initAi ()V
 	METHOD o doJump (Z)V
diff --git a/mappings/net/minecraft/entity/passive/SalmonEntity.mapping b/mappings/net/minecraft/entity/passive/SalmonEntity.mapping
index 7f3d94c01f..5894b027ef 100644
--- a/mappings/net/minecraft/entity/passive/SalmonEntity.mapping
+++ b/mappings/net/minecraft/entity/passive/SalmonEntity.mapping
@@ -1,4 +1,4 @@
 CLASS amd net/minecraft/entity/passive/SalmonEntity
-	METHOD D getSoundAmbient ()Lxf;
-	METHOD cw getSoundDeath ()Lxf;
-	METHOD e getSoundHurt (Lafr;)Lxf;
+	METHOD D getAmbientSound ()Lxf;
+	METHOD cw getDeathSound ()Lxf;
+	METHOD e getHurtSound (Lafr;)Lxf;
diff --git a/mappings/net/minecraft/entity/passive/SheepEntity.mapping b/mappings/net/minecraft/entity/passive/SheepEntity.mapping
index a05d17ac50..8f7bdfb57c 100644
--- a/mappings/net/minecraft/entity/passive/SheepEntity.mapping
+++ b/mappings/net/minecraft/entity/passive/SheepEntity.mapping
@@ -3,7 +3,7 @@ CLASS ame net/minecraft/entity/passive/SheepEntity
 		METHOD a canUse (Laqj;)Z
 			ARG 0 player
 	FIELD bC COLOR Lpn;
-	METHOD D getSoundAmbient ()Lxf;
+	METHOD D getAmbientSound ()Lxf;
 	METHOD F getLootTableId ()Lpy;
 	METHOD H mobTick ()V
 	METHOD a createChild (Lagf;)Lagf;
@@ -23,10 +23,10 @@ CLASS ame net/minecraft/entity/passive/SheepEntity
 		ARG 1 tag
 	METHOD bH getEyeHeight ()F
 	METHOD cb initAttributes ()V
-	METHOD cw getSoundDeath ()Lxf;
+	METHOD cw getDeathSound ()Lxf;
 	METHOD dA getColor ()Lauo;
 	METHOD dB isSheared ()Z
-	METHOD e getSoundHurt (Lafr;)Lxf;
+	METHOD e getHurtSound (Lafr;)Lxf;
 	METHOD k updateMovement ()V
 	METHOD n initAi ()V
 	METHOD s setSheared (Z)V
diff --git a/mappings/net/minecraft/entity/passive/SnowmanEntity.mapping b/mappings/net/minecraft/entity/passive/SnowmanEntity.mapping
index 7c0fdc1210..1cb4178efe 100644
--- a/mappings/net/minecraft/entity/passive/SnowmanEntity.mapping
+++ b/mappings/net/minecraft/entity/passive/SnowmanEntity.mapping
@@ -1,6 +1,6 @@
 CLASS amg net/minecraft/entity/passive/SnowmanEntity
 	FIELD a SNOWMAN_FLAGS Lpn;
-	METHOD D getSoundAmbient ()Lxf;
+	METHOD D getAmbientSound ()Lxf;
 	METHOD a attack (Lagr;F)V
 		ARG 1 target
 	METHOD a interactMob (Laqj;Lafb;)Z
@@ -12,8 +12,8 @@ CLASS amg net/minecraft/entity/passive/SnowmanEntity
 		ARG 1 tag
 	METHOD bH getEyeHeight ()F
 	METHOD cb initAttributes ()V
-	METHOD cw getSoundDeath ()Lxf;
-	METHOD e getSoundHurt (Lafr;)Lxf;
+	METHOD cw getDeathSound ()Lxf;
+	METHOD e getHurtSound (Lafr;)Lxf;
 	METHOD k updateMovement ()V
 	METHOD l hasPumpkin ()Z
 	METHOD n initAi ()V
diff --git a/mappings/net/minecraft/entity/passive/SquidEntity.mapping b/mappings/net/minecraft/entity/passive/SquidEntity.mapping
index 77275eef76..c0ab0d8714 100644
--- a/mappings/net/minecraft/entity/passive/SquidEntity.mapping
+++ b/mappings/net/minecraft/entity/passive/SquidEntity.mapping
@@ -6,13 +6,13 @@ CLASS amh net/minecraft/entity/passive/SquidEntity
 	CLASS amh$b
 		METHOD a canStart ()Z
 		METHOD e tick ()V
-	METHOD D getSoundAmbient ()Lxf;
+	METHOD D getAmbientSound ()Lxf;
 	METHOD a damage (Lafr;F)Z
 		ARG 1 source
 	METHOD bH getEyeHeight ()F
 	METHOD cI getSoundVolume ()F
 	METHOD cb initAttributes ()V
-	METHOD cw getSoundDeath ()Lxf;
-	METHOD e getSoundHurt (Lafr;)Lxf;
+	METHOD cw getDeathSound ()Lxf;
+	METHOD e getHurtSound (Lafr;)Lxf;
 	METHOD k updateMovement ()V
 	METHOD n initAi ()V
diff --git a/mappings/net/minecraft/entity/passive/TropicalFishEntity.mapping b/mappings/net/minecraft/entity/passive/TropicalFishEntity.mapping
index bb292f0349..7f5cef75a6 100644
--- a/mappings/net/minecraft/entity/passive/TropicalFishEntity.mapping
+++ b/mappings/net/minecraft/entity/passive/TropicalFishEntity.mapping
@@ -1,11 +1,11 @@
 CLASS ami net/minecraft/entity/passive/TropicalFishEntity
-	METHOD D getSoundAmbient ()Lxf;
+	METHOD D getAmbientSound ()Lxf;
 	METHOD a (Lbar;Lafa;Lagu;Lahc;Lhp;)Lahc;
 		ARG 3 difficulty
 	METHOD a deserializeCustomData (Lhp;)V
 		ARG 1 tag
 	METHOD b serializeCustomData (Lhp;)V
 		ARG 1 tag
-	METHOD cw getSoundDeath ()Lxf;
-	METHOD e getSoundHurt (Lafr;)Lxf;
+	METHOD cw getDeathSound ()Lxf;
+	METHOD e getHurtSound (Lafr;)Lxf;
 	METHOD x_ initDataTracker ()V
diff --git a/mappings/net/minecraft/entity/passive/TurtleEntity.mapping b/mappings/net/minecraft/entity/passive/TurtleEntity.mapping
index 27836a5f2f..cf3d96ddf3 100644
--- a/mappings/net/minecraft/entity/passive/TurtleEntity.mapping
+++ b/mappings/net/minecraft/entity/passive/TurtleEntity.mapping
@@ -15,6 +15,9 @@ CLASS amj net/minecraft/entity/passive/TurtleEntity
 		METHOD b shouldContinue ()Z
 		METHOD e tick ()V
 	CLASS amj$e TurtleMoveControl
+		FIELD i turtle Lamj;
+		METHOD <init> (Lamj;)V
+			ARG 1 turtle
 		METHOD a tick ()V
 	CLASS amj$f
 		METHOD a canStart ()Z
@@ -36,7 +39,7 @@ CLASS amj net/minecraft/entity/passive/TurtleEntity
 		METHOD c start ()V
 		METHOD d onRemove ()V
 		METHOD e tick ()V
-	METHOD D getSoundAmbient ()Lxf;
+	METHOD D getAmbientSound ()Lxf;
 	METHOD a createChild (Lagf;)Lagf;
 	METHOD a onStruckByLightning (Laoi;)V
 	METHOD a canBeLeashedBy (Laqj;)Z
@@ -52,8 +55,8 @@ CLASS amj net/minecraft/entity/passive/TurtleEntity
 		ARG 1 tag
 	METHOD by canFly ()Z
 	METHOD cb initAttributes ()V
-	METHOD cw getSoundDeath ()Lxf;
-	METHOD e getSoundHurt (Lafr;)Lxf;
+	METHOD cw getDeathSound ()Lxf;
+	METHOD e getHurtSound (Lafr;)Lxf;
 	METHOD k updateMovement ()V
 	METHOD n initAi ()V
 	METHOD x_ initDataTracker ()V
diff --git a/mappings/net/minecraft/entity/passive/VillagerEntity.mapping b/mappings/net/minecraft/entity/passive/VillagerEntity.mapping
index da28d1a028..6e682c414f 100644
--- a/mappings/net/minecraft/entity/passive/VillagerEntity.mapping
+++ b/mappings/net/minecraft/entity/passive/VillagerEntity.mapping
@@ -6,7 +6,7 @@ CLASS aqe net/minecraft/entity/passive/VillagerEntity
 	FIELD bT inventory Lafk;
 	METHOD <init> (Lbaq;I)V
 		ARG 1 world
-	METHOD D getSoundAmbient ()Lxf;
+	METHOD D getAmbientSound ()Lxf;
 	METHOD H mobTick ()V
 	METHOD O_ getCurrentCustomer ()Laqj;
 	METHOD Q getDisplayName ()Lja;
@@ -32,11 +32,11 @@ CLASS aqe net/minecraft/entity/passive/VillagerEntity
 	METHOD b_ getRecipes (Laqj;)Lazw;
 	METHOD c getVillagerWorld ()Lbaq;
 	METHOD cb initAttributes ()V
-	METHOD cw getSoundDeath ()Lxf;
+	METHOD cw getDeathSound ()Lxf;
 	METHOD d getVillagerPos ()Let;
 	METHOD d setVillagerType (I)V
 	METHOD dE getInventory ()Lafk;
 	METHOD dz getVillagerType ()I
-	METHOD e getSoundHurt (Lafr;)Lxf;
+	METHOD e getHurtSound (Lafr;)Lxf;
 	METHOD n initAi ()V
 	METHOD x_ initDataTracker ()V
diff --git a/mappings/net/minecraft/entity/passive/WolfEntity.mapping b/mappings/net/minecraft/entity/passive/WolfEntity.mapping
index c277834429..18bd9e95f2 100644
--- a/mappings/net/minecraft/entity/passive/WolfEntity.mapping
+++ b/mappings/net/minecraft/entity/passive/WolfEntity.mapping
@@ -5,7 +5,7 @@ CLASS aml net/minecraft/entity/passive/WolfEntity
 		METHOD e tick ()V
 	FIELD bG WOLF_HEALTH Lpn;
 	FIELD bI COLLAR_COLOR Lpn;
-	METHOD D getSoundAmbient ()Lxf;
+	METHOD D getAmbientSound ()Lxf;
 	METHOD H mobTick ()V
 	METHOD M getLimitPerChunk ()I
 	METHOD U_ update ()V
@@ -25,9 +25,9 @@ CLASS aml net/minecraft/entity/passive/WolfEntity
 	METHOD bH getEyeHeight ()F
 	METHOD cI getSoundVolume ()F
 	METHOD cb initAttributes ()V
-	METHOD cw getSoundDeath ()Lxf;
+	METHOD cw getDeathSound ()Lxf;
 	METHOD dK isAngry ()Z
-	METHOD e getSoundHurt (Lafr;)Lxf;
+	METHOD e getHurtSound (Lafr;)Lxf;
 	METHOD f setTarget (Lagr;)V
 	METHOD k updateMovement ()V
 	METHOD n initAi ()V
diff --git a/mappings/net/minecraft/entity/player/PlayerEntity.mapping b/mappings/net/minecraft/entity/player/PlayerEntity.mapping
index 821f318483..ede4065a3c 100644
--- a/mappings/net/minecraft/entity/player/PlayerEntity.mapping
+++ b/mappings/net/minecraft/entity/player/PlayerEntity.mapping
@@ -124,7 +124,7 @@ CLASS aqj net/minecraft/entity/player/PlayerEntity
 	METHOD cV getAbsorptionAmount ()F
 	METHOD cX getMainHand ()Lagq;
 	METHOD cb initAttributes ()V
-	METHOD cw getSoundDeath ()Lxf;
+	METHOD cw getDeathSound ()Lxf;
 	METHOD d addExperience (I)V
 	METHOD d applyDamage (Lafr;F)V
 		ARG 1 damageSource
@@ -144,7 +144,7 @@ CLASS aqj net/minecraft/entity/player/PlayerEntity
 	METHOD dx getSpawnPosition ()Let;
 	METHOD dy isSpawnForced ()Z
 	METHOD dz getEnchantmentTableSeed ()I
-	METHOD e getSoundHurt (Lafr;)Lxf;
+	METHOD e getHurtSound (Lafr;)Lxf;
 	METHOD e canSeePlayer (Laqj;)Z
 	METHOD f attack (Lagi;)V
 	METHOD g createCooldownManager ()Lavo;
@@ -152,7 +152,7 @@ CLASS aqj net/minecraft/entity/player/PlayerEntity
 	METHOD i pushAwayFrom (Lagi;)V
 	METHOD i setShoulderEntityRight (Lhp;)V
 	METHOD k updateMovement ()V
-	METHOD m getSoundFall (I)Lxf;
+	METHOD m getFallSound (I)Lxf;
 	METHOD n initAi ()V
 	METHOD p isShotFromCrossbow ()Z
 	METHOD p setScore (I)V