diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
index a7b492ea..8ddef0b0 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -136,7 +136,7 @@ public class BungeeCord extends ProxyServer
         getPluginManager().registerCommand( null, new CommandBungee() );
         getPluginManager().registerCommand( null, new CommandPerms() );
         getPluginManager().registerCommand( null, new CommandSend() );
-        getPluginManager().registerCommand( null, new CommandWhois() );
+        getPluginManager().registerCommand( null, new CommandFind() );
 
         registerChannel( "BungeeCord" );
     }
diff --git a/proxy/src/main/java/net/md_5/bungee/command/CommandWhois.java b/proxy/src/main/java/net/md_5/bungee/command/CommandFind.java
similarity index 88%
rename from proxy/src/main/java/net/md_5/bungee/command/CommandWhois.java
rename to proxy/src/main/java/net/md_5/bungee/command/CommandFind.java
index 1035f5d6..023dae18 100644
--- a/proxy/src/main/java/net/md_5/bungee/command/CommandWhois.java
+++ b/proxy/src/main/java/net/md_5/bungee/command/CommandFind.java
@@ -6,12 +6,12 @@ import net.md_5.bungee.api.ProxyServer;
 import net.md_5.bungee.api.connection.ProxiedPlayer;
 import net.md_5.bungee.api.plugin.Command;
 
-public class CommandWhois extends Command
+public class CommandFind extends Command
 {
 
-    public CommandWhois()
+    public CommandFind()
     {
-        super( "whois", "bungeecord.command.whois" );
+        super( "find", "bungeecord.command.find" );
     }
 
     @Override