diff --git a/src/main/java/com/songoda/ultimatestacker/UltimateStacker.java b/src/main/java/com/songoda/ultimatestacker/UltimateStacker.java
index 1395a0c..2d421fc 100644
--- a/src/main/java/com/songoda/ultimatestacker/UltimateStacker.java
+++ b/src/main/java/com/songoda/ultimatestacker/UltimateStacker.java
@@ -106,6 +106,7 @@ public class UltimateStacker extends JavaPlugin {
         for (EntityType value : EntityType.values()) {
             if (value.isSpawnable() && value.isAlive() && !value.toString().contains("ARMOR")) {
                 mobFile.getConfig().addDefault("Mobs." + value.name() + ".Enabled", true);
+                mobFile.getConfig().addDefault("Mobs." + value.name() + ".Display Name", Methods.formatText(value.name().toLowerCase().replace("_", " "), true));
                 mobFile.getConfig().addDefault("Mobs." + value.name() + ".Max Stack Size", -1);
             }
         }
@@ -271,16 +272,6 @@ public class UltimateStacker extends JavaPlugin {
         this.reloadConfig();
     }
 
-    public Entity getEntityByUniqueId(UUID uniqueId) {
-        for (World world : Bukkit.getWorlds()) {
-            for (Entity entity : world.getLivingEntities()) {
-                if (entity.getUniqueId().equals(uniqueId))
-                    return entity;
-            }
-        }
-        return null;
-    }
-
     public boolean spawnersEnabled() {
         if (this.getServer().getPluginManager().isPluginEnabled("EpicSpawners")) return false;
         return this.getConfig().getBoolean("Main.Stack Spawners");
diff --git a/src/main/java/com/songoda/ultimatestacker/utils/Methods.java b/src/main/java/com/songoda/ultimatestacker/utils/Methods.java
index 9b0ac73..1364b1f 100644
--- a/src/main/java/com/songoda/ultimatestacker/utils/Methods.java
+++ b/src/main/java/com/songoda/ultimatestacker/utils/Methods.java
@@ -176,7 +176,7 @@ public class Methods {
 
     public static String compileEntityName(Entity entity, int amount) {
         String nameFormat = UltimateStacker.getInstance().getConfig().getString("Entity.Name Format");
-        String displayName = Methods.formatText(entity.getType().name().toLowerCase().replace("_", " "), true);
+        String displayName = Methods.formatText(UltimateStacker.getInstance().getMobFile().getConfig().getString("Mobs." + entity.getType().name() + ".Display Name"));
 
         nameFormat = nameFormat.replace("{TYPE}", displayName);
         nameFormat = nameFormat.replace("{AMT}", Integer.toString(amount));