diff --git a/src/main/java/net/minecraft/server/NetServerHandler.java b/src/main/java/net/minecraft/server/NetServerHandler.java
index ebf2d34d2c..0f20fc1c32 100644
--- a/src/main/java/net/minecraft/server/NetServerHandler.java
+++ b/src/main/java/net/minecraft/server/NetServerHandler.java
@@ -432,7 +432,7 @@ implements ICommandListener {
             // CraftBukkit start
             PlayerChatEvent event = new PlayerChatEvent(Type.PLAYER_CHAT, player, s);
             server.getPluginManager().callEvent(event);
-            s = (new StringBuilder()).append("<").append(event.getPlayer().getName()).append("> ").append(event.getMessage()).toString();
+            s = (new StringBuilder()).append("<").append(event.getPlayer().getDisplayName()).append("> ").append(event.getMessage()).toString();
             if (event.isCancelled()) return;
             // CraftBukkit stop
 
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/CraftPlayer.java
index 406e127a6d..e3b093d221 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftPlayer.java
@@ -52,7 +52,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
         return name;
     }
 
-    public void getDisplayName(final String name) {
+    public void setDisplayName(final String name) {
         this.name = name;
     }