diff --git a/Minecraft.Client/EnderDragonRenderer.cpp b/Minecraft.Client/EnderDragonRenderer.cpp
index 8b5b248c..424bdff8 100644
--- a/Minecraft.Client/EnderDragonRenderer.cpp
+++ b/Minecraft.Client/EnderDragonRenderer.cpp
@@ -89,6 +89,11 @@ void EnderDragonRenderer::render(shared_ptr<Entity> _mob, double x, double y, do
 	// 4J - dynamic cast required because we aren't using templates/generics in our version
 	shared_ptr<EnderDragon> mob = dynamic_pointer_cast<EnderDragon>(_mob);
 	BossMobGuiInfo::setBossHealth(mob, false);
+    if (!mob->getCustomName().empty())
+    {
+        BossMobGuiInfo::name = mob->getCustomName();
+    }
+
 	MobRenderer::render(mob, x, y, z, rot, a);
 	if (mob->nearestCrystal != nullptr)
 	{
diff --git a/Minecraft.Client/WitherBossRenderer.cpp b/Minecraft.Client/WitherBossRenderer.cpp
index e358c6da..dc1d8f92 100644
--- a/Minecraft.Client/WitherBossRenderer.cpp
+++ b/Minecraft.Client/WitherBossRenderer.cpp
@@ -20,6 +20,10 @@ void WitherBossRenderer::render(shared_ptr<Entity> entity, double x, double y, d
 	shared_ptr<WitherBoss> mob = dynamic_pointer_cast<WitherBoss>(entity);
 
 	BossMobGuiInfo::setBossHealth(mob, true);
+    if (!mob->getCustomName().empty())
+	{
+        BossMobGuiInfo::name = mob->getCustomName();
+	}
 
 	int modelVersion = dynamic_cast<WitherBossModel*>(model)->modelVersion();
 	if (modelVersion != this->modelVersion)
diff --git a/Minecraft.World/EnderDragon.h b/Minecraft.World/EnderDragon.h
index 9f39767e..1bb8f5ce 100644
--- a/Minecraft.World/EnderDragon.h
+++ b/Minecraft.World/EnderDragon.h
@@ -183,7 +183,7 @@ public:
 	double getHeadPartYRotDiff(int partIndex, doubleArray bodyPos, doubleArray partPos);
 	Vec3 *getHeadLookVector(float a);
 
-	virtual wstring getAName() { return app.GetString(IDS_ENDERDRAGON); };
+	virtual wstring getAName() { if (hasCustomName()) return getCustomName(); return app.GetString(IDS_ENDERDRAGON); };
 	virtual float getHealth() { return LivingEntity::getHealth(); };
 	virtual float getMaxHealth() { return LivingEntity::getMaxHealth(); };
 };
diff --git a/Minecraft.World/WitherBoss.h b/Minecraft.World/WitherBoss.h
index 47e2dff1..e066908e 100644
--- a/Minecraft.World/WitherBoss.h
+++ b/Minecraft.World/WitherBoss.h
@@ -105,5 +105,5 @@ public:
 	// 4J Stu - These are required for the BossMob interface
 	virtual float getMaxHealth() { return Monster::getMaxHealth(); };
 	virtual float getHealth() { return Monster::getHealth(); };
-	virtual wstring getAName() { return app.GetString(IDS_WITHER); };
+	virtual wstring getAName() { if (hasCustomName()) return getCustomName(); return app.GetString(IDS_WITHER); };
 };
\ No newline at end of file