diff --git a/src/com/projectkorra/projectkorra/Element.java b/src/com/projectkorra/projectkorra/Element.java
index ed95e5d1..a017f5a1 100644
--- a/src/com/projectkorra/projectkorra/Element.java
+++ b/src/com/projectkorra/projectkorra/Element.java
@@ -102,8 +102,7 @@ public class Element {
 	}
 	
 	public String getPrefix() {
-		String prefix = this.plugin.getName().equalsIgnoreCase("ProjectKorra") ? this.getColor() + ConfigManager.languageConfig.get().getString("Chat.Prefixes." + name) + " " : ChatColor.WHITE + "[Nonbender] ";
-		return prefix;
+		return getColor() + "[" + getName() + (getType() != null ? getType().getBender() : "") + "] ";
 	}
 	
 	public ChatColor getColor() {
diff --git a/src/com/projectkorra/projectkorra/configuration/ConfigManager.java b/src/com/projectkorra/projectkorra/configuration/ConfigManager.java
index 2e397ecf..53cc41e0 100644
--- a/src/com/projectkorra/projectkorra/configuration/ConfigManager.java
+++ b/src/com/projectkorra/projectkorra/configuration/ConfigManager.java
@@ -44,12 +44,6 @@ public class ConfigManager {
 			
 			config.addDefault("Chat.Enable", true);
 			config.addDefault("Chat.Format", "<name>: <message>");
-			config.addDefault("Chat.Prefixes.Air", "[Airbender]");
-			config.addDefault("Chat.Prefixes.Water", "[Waterbender]");
-			config.addDefault("Chat.Prefixes.Earth", "[Earthbender]");
-			config.addDefault("Chat.Prefixes.Fire", "[Firebender]");
-			config.addDefault("Chat.Prefixes.Chi", "[Chiblocker]");
-			config.addDefault("Chat.Prefixes.Avatar", "[Avatar]");
 			config.addDefault("Chat.Colors.Avatar", "DARK_PURPLE");
 			config.addDefault("Chat.Colors.Air", "GRAY");
 			config.addDefault("Chat.Colors.AirSub", "DARK_GRAY");