diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping
index 3afc1e0733..3bc2b1e3db 100644
--- a/mappings/net/minecraft/entity/Entity.mapping
+++ b/mappings/net/minecraft/entity/Entity.mapping
@@ -65,7 +65,7 @@ CLASS afv net/minecraft/entity/Entity
 	METHOD E updatePortalCooldown ()V
 	METHOD O_ getName ()Lix;
 	METHOD P_ hasCustomName ()Z
-	METHOD Q ()Lix;
+	METHOD Q getDisplayedName ()Lix;
 	METHOD R getFactory ()Lafz;
 	METHOD S getEntityId ()I
 	METHOD S_ update ()V
diff --git a/mappings/net/minecraft/entity/mob/IMonster.mapping b/mappings/net/minecraft/entity/mob/IMonster.mapping
deleted file mode 100644
index 3baac38d0f..0000000000
--- a/mappings/net/minecraft/entity/mob/IMonster.mapping
+++ /dev/null
@@ -1 +0,0 @@
-CLASS aog net/minecraft/entity/mob/IMonster
diff --git a/mappings/net/minecraft/entity/mob/Monster.mapping b/mappings/net/minecraft/entity/mob/Monster.mapping
new file mode 100644
index 0000000000..14a98b1a98
--- /dev/null
+++ b/mappings/net/minecraft/entity/mob/Monster.mapping
@@ -0,0 +1 @@
+CLASS aog net/minecraft/entity/mob/Monster
diff --git a/mappings/net/minecraft/entity/passive/EntityVillager.mapping b/mappings/net/minecraft/entity/passive/EntityVillager.mapping
index 6e2d9f0d95..054e08bc2a 100644
--- a/mappings/net/minecraft/entity/passive/EntityVillager.mapping
+++ b/mappings/net/minecraft/entity/passive/EntityVillager.mapping
@@ -11,7 +11,7 @@ CLASS apm net/minecraft/entity/passive/EntityVillager
 	METHOD F getLootTableId ()Lpu;
 	METHOD I mobTick ()V
 	METHOD N_ getCurrentCustomer ()Lapr;
-	METHOD Q ()Lix;
+	METHOD Q getDisplayedName ()Lix;
 	METHOD a onDeath (Lafe;)V
 		ARG 0 damageSource
 	METHOD a createChild (Lafs;)Lafs;
diff --git a/mappings/net/minecraft/entity/player/EntityPlayer.mapping b/mappings/net/minecraft/entity/player/EntityPlayer.mapping
index 00e9198e8d..89e74e030b 100644
--- a/mappings/net/minecraft/entity/player/EntityPlayer.mapping
+++ b/mappings/net/minecraft/entity/player/EntityPlayer.mapping
@@ -41,7 +41,7 @@ CLASS apr net/minecraft/entity/player/EntityPlayer
 	FIELD e spawnPosition Leq;
 	FIELD f spawnForced Z
 	METHOD O_ getName ()Lix;
-	METHOD Q ()Lix;
+	METHOD Q getDisplayedName ()Lix;
 	METHOD S_ update ()V
 	METHOD T_ stopRiding ()V
 	METHOD X invalidate ()V
diff --git a/mappings/net/minecraft/util/CustomNameable.mapping b/mappings/net/minecraft/util/CustomNameable.mapping
index 40361ab763..85f60126a7 100644
--- a/mappings/net/minecraft/util/CustomNameable.mapping
+++ b/mappings/net/minecraft/util/CustomNameable.mapping
@@ -1,4 +1,4 @@
 CLASS aev net/minecraft/util/CustomNameable
 	METHOD O_ getName ()Lix;
 	METHOD P_ hasCustomName ()Z
-	METHOD Q ()Lix;
+	METHOD Q getDisplayedName ()Lix;
diff --git a/mappings/net/minecraft/village/SimpleVillager.mapping b/mappings/net/minecraft/village/SimpleVillager.mapping
index 0375b6b8e7..69e6832d61 100644
--- a/mappings/net/minecraft/village/SimpleVillager.mapping
+++ b/mappings/net/minecraft/village/SimpleVillager.mapping
@@ -7,7 +7,7 @@ CLASS apk net/minecraft/village/SimpleVillager
 		ARG 0 player
 		ARG 1 displayName
 	METHOD N_ getCurrentCustomer ()Lapr;
-	METHOD Q getNameComponent ()Lix;
+	METHOD Q getDisplayedName ()Lix;
 	METHOD a onSellingItem (Lauv;)V
 		ARG 0 stack
 	METHOD a useRecipe (Layz;)V
diff --git a/mappings/net/minecraft/village/IVillager.mapping b/mappings/net/minecraft/village/Villager.mapping
similarity index 81%
rename from mappings/net/minecraft/village/IVillager.mapping
rename to mappings/net/minecraft/village/Villager.mapping
index a83e04773c..f4b04513a6 100644
--- a/mappings/net/minecraft/village/IVillager.mapping
+++ b/mappings/net/minecraft/village/Villager.mapping
@@ -1,6 +1,6 @@
-CLASS ayy net/minecraft/village/IVillager
+CLASS ayy net/minecraft/village/Villager
 	METHOD N_ getCurrentCustomer ()Lapr;
-	METHOD Q getNameComponent ()Lix;
+	METHOD Q getDisplayedName ()Lix;
 	METHOD a onSellingItem (Lauv;)V
 		ARG 0 stack
 	METHOD a useRecipe (Layz;)V