diff --git a/pom.xml b/pom.xml
index d947a9a3..711cf514 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.bukkit</groupId>
     <artifactId>bukkit</artifactId>
-    <version>1.2.4-R1.1-SNAPSHOT</version>
+    <version>1.2.5-R0.1-SNAPSHOT</version>
     <name>Bukkit</name>
     <url>http://www.bukkit.org</url>
 
diff --git a/src/main/java/org/bukkit/command/defaults/BanCommand.java b/src/main/java/org/bukkit/command/defaults/BanCommand.java
index 6e3d0ba1..aa7f3534 100644
--- a/src/main/java/org/bukkit/command/defaults/BanCommand.java
+++ b/src/main/java/org/bukkit/command/defaults/BanCommand.java
@@ -30,6 +30,6 @@ public class BanCommand extends VanillaCommand {
 
     @Override
     public boolean matches(String input) {
-        return input.startsWith("ban ") || input.equalsIgnoreCase("ban");
+        return input.equalsIgnoreCase("ban");
     }
 }
diff --git a/src/main/java/org/bukkit/command/defaults/BanIpCommand.java b/src/main/java/org/bukkit/command/defaults/BanIpCommand.java
index e2c1c527..bb089890 100644
--- a/src/main/java/org/bukkit/command/defaults/BanIpCommand.java
+++ b/src/main/java/org/bukkit/command/defaults/BanIpCommand.java
@@ -29,6 +29,6 @@ public class BanIpCommand extends VanillaCommand {
 
     @Override
     public boolean matches(String input) {
-        return input.startsWith("ban-ip ") || input.equalsIgnoreCase("ban-ip");
+        return input.equalsIgnoreCase("ban-ip");
     }
 }
diff --git a/src/main/java/org/bukkit/command/defaults/BanListCommand.java b/src/main/java/org/bukkit/command/defaults/BanListCommand.java
index d4dad1db..57c37c44 100644
--- a/src/main/java/org/bukkit/command/defaults/BanListCommand.java
+++ b/src/main/java/org/bukkit/command/defaults/BanListCommand.java
@@ -32,6 +32,6 @@ public class BanListCommand extends VanillaCommand {
 
     @Override
     public boolean matches(String input) {
-        return input.startsWith("banlist ") || input.equalsIgnoreCase("banlist");
+        return input.equalsIgnoreCase("banlist");
     }
 }
diff --git a/src/main/java/org/bukkit/command/defaults/DeopCommand.java b/src/main/java/org/bukkit/command/defaults/DeopCommand.java
index ef7ab2f1..e5c9a1ec 100644
--- a/src/main/java/org/bukkit/command/defaults/DeopCommand.java
+++ b/src/main/java/org/bukkit/command/defaults/DeopCommand.java
@@ -37,6 +37,6 @@ public class DeopCommand extends VanillaCommand {
 
     @Override
     public boolean matches(String input) {
-        return input.startsWith("deop ") || input.equalsIgnoreCase("deop");
+        return input.equalsIgnoreCase("deop");
     }
 }
diff --git a/src/main/java/org/bukkit/command/defaults/ExpCommand.java b/src/main/java/org/bukkit/command/defaults/ExpCommand.java
index 721a7d7a..674e6e00 100644
--- a/src/main/java/org/bukkit/command/defaults/ExpCommand.java
+++ b/src/main/java/org/bukkit/command/defaults/ExpCommand.java
@@ -43,6 +43,6 @@ public class ExpCommand extends VanillaCommand {
 
     @Override
     public boolean matches(String input) {
-        return input.startsWith("xp ") || input.equalsIgnoreCase("xp");
+        return input.equalsIgnoreCase("xp");
     }
 }
diff --git a/src/main/java/org/bukkit/command/defaults/GameModeCommand.java b/src/main/java/org/bukkit/command/defaults/GameModeCommand.java
index da52629f..c1694219 100644
--- a/src/main/java/org/bukkit/command/defaults/GameModeCommand.java
+++ b/src/main/java/org/bukkit/command/defaults/GameModeCommand.java
@@ -58,6 +58,6 @@ public class GameModeCommand extends VanillaCommand {
 
     @Override
     public boolean matches(String input) {
-        return input.startsWith("gamemode ") || input.equalsIgnoreCase("gamemode");
+        return input.equalsIgnoreCase("gamemode");
     }
 }
diff --git a/src/main/java/org/bukkit/command/defaults/GiveCommand.java b/src/main/java/org/bukkit/command/defaults/GiveCommand.java
index 156c2809..fffed0c9 100644
--- a/src/main/java/org/bukkit/command/defaults/GiveCommand.java
+++ b/src/main/java/org/bukkit/command/defaults/GiveCommand.java
@@ -62,6 +62,6 @@ public class GiveCommand extends VanillaCommand {
 
     @Override
     public boolean matches(String input) {
-        return input.startsWith("give ") || input.equalsIgnoreCase("give");
+        return input.equalsIgnoreCase("give");
     }
 }
diff --git a/src/main/java/org/bukkit/command/defaults/HelpCommand.java b/src/main/java/org/bukkit/command/defaults/HelpCommand.java
index a85babb2..ddc77f04 100644
--- a/src/main/java/org/bukkit/command/defaults/HelpCommand.java
+++ b/src/main/java/org/bukkit/command/defaults/HelpCommand.java
@@ -96,7 +96,7 @@ public class HelpCommand extends VanillaCommand {
 
     @Override
     public boolean matches(String input) {
-        return input.startsWith("help") || input.startsWith("?");
+        return input.equalsIgnoreCase("help") || input.equalsIgnoreCase("?");
     }
 
     protected HelpTopic findPossibleMatches(String searchString) {
diff --git a/src/main/java/org/bukkit/command/defaults/KickCommand.java b/src/main/java/org/bukkit/command/defaults/KickCommand.java
index 85feeb54..e30a28e7 100644
--- a/src/main/java/org/bukkit/command/defaults/KickCommand.java
+++ b/src/main/java/org/bukkit/command/defaults/KickCommand.java
@@ -36,6 +36,6 @@ public class KickCommand extends VanillaCommand {
 
     @Override
     public boolean matches(String input) {
-        return input.startsWith("kick ") || input.equalsIgnoreCase("kick");
+        return input.equalsIgnoreCase("kick");
     }
 }
diff --git a/src/main/java/org/bukkit/command/defaults/KillCommand.java b/src/main/java/org/bukkit/command/defaults/KillCommand.java
index 0fe80db4..e9d6f2a7 100644
--- a/src/main/java/org/bukkit/command/defaults/KillCommand.java
+++ b/src/main/java/org/bukkit/command/defaults/KillCommand.java
@@ -34,6 +34,6 @@ public class KillCommand extends VanillaCommand {
 
     @Override
     public boolean matches(String input) {
-        return input.startsWith("kill");
+        return input.equalsIgnoreCase("kill");
     }
 }
diff --git a/src/main/java/org/bukkit/command/defaults/ListCommand.java b/src/main/java/org/bukkit/command/defaults/ListCommand.java
index 67f58fa4..009e4421 100644
--- a/src/main/java/org/bukkit/command/defaults/ListCommand.java
+++ b/src/main/java/org/bukkit/command/defaults/ListCommand.java
@@ -37,6 +37,6 @@ public class ListCommand extends VanillaCommand {
 
     @Override
     public boolean matches(String input) {
-        return input.startsWith("list");
+        return input.equalsIgnoreCase("list");
     }
 }
diff --git a/src/main/java/org/bukkit/command/defaults/MeCommand.java b/src/main/java/org/bukkit/command/defaults/MeCommand.java
index f181b4fe..d76b84fe 100644
--- a/src/main/java/org/bukkit/command/defaults/MeCommand.java
+++ b/src/main/java/org/bukkit/command/defaults/MeCommand.java
@@ -36,6 +36,6 @@ public class MeCommand extends VanillaCommand {
 
     @Override
     public boolean matches(String input) {
-        return input.startsWith("me ") || input.equalsIgnoreCase("me");
+        return input.equalsIgnoreCase("me");
     }
 }
diff --git a/src/main/java/org/bukkit/command/defaults/OpCommand.java b/src/main/java/org/bukkit/command/defaults/OpCommand.java
index 2b41dfc9..1878507a 100644
--- a/src/main/java/org/bukkit/command/defaults/OpCommand.java
+++ b/src/main/java/org/bukkit/command/defaults/OpCommand.java
@@ -37,6 +37,6 @@ public class OpCommand extends VanillaCommand {
 
     @Override
     public boolean matches(String input) {
-        return input.startsWith("op ") || input.equalsIgnoreCase("op");
+        return input.equalsIgnoreCase("op");
     }
 }
diff --git a/src/main/java/org/bukkit/command/defaults/PardonCommand.java b/src/main/java/org/bukkit/command/defaults/PardonCommand.java
index d7636c7f..76e409bf 100644
--- a/src/main/java/org/bukkit/command/defaults/PardonCommand.java
+++ b/src/main/java/org/bukkit/command/defaults/PardonCommand.java
@@ -29,6 +29,6 @@ public class PardonCommand extends VanillaCommand {
 
     @Override
     public boolean matches(String input) {
-        return input.startsWith("pardon ") || input.equalsIgnoreCase("pardon");
+        return input.equalsIgnoreCase("pardon");
     }
 }
diff --git a/src/main/java/org/bukkit/command/defaults/PardonIpCommand.java b/src/main/java/org/bukkit/command/defaults/PardonIpCommand.java
index 732161ff..4cc4e652 100644
--- a/src/main/java/org/bukkit/command/defaults/PardonIpCommand.java
+++ b/src/main/java/org/bukkit/command/defaults/PardonIpCommand.java
@@ -29,6 +29,6 @@ public class PardonIpCommand extends VanillaCommand {
 
     @Override
     public boolean matches(String input) {
-        return input.startsWith("pardon-ip ") || input.equalsIgnoreCase("pardon-ip");
+        return input.equalsIgnoreCase("pardon-ip");
     }
 }
diff --git a/src/main/java/org/bukkit/command/defaults/SaveCommand.java b/src/main/java/org/bukkit/command/defaults/SaveCommand.java
index d73983d2..08d8edf9 100644
--- a/src/main/java/org/bukkit/command/defaults/SaveCommand.java
+++ b/src/main/java/org/bukkit/command/defaults/SaveCommand.java
@@ -32,6 +32,6 @@ public class SaveCommand extends VanillaCommand {
 
     @Override
     public boolean matches(String input) {
-        return input.startsWith("save-all");
+        return input.equalsIgnoreCase("save-all");
     }
 }
diff --git a/src/main/java/org/bukkit/command/defaults/SaveOffCommand.java b/src/main/java/org/bukkit/command/defaults/SaveOffCommand.java
index 67f9b407..628b88c1 100644
--- a/src/main/java/org/bukkit/command/defaults/SaveOffCommand.java
+++ b/src/main/java/org/bukkit/command/defaults/SaveOffCommand.java
@@ -28,6 +28,6 @@ public class SaveOffCommand extends VanillaCommand {
 
     @Override
     public boolean matches(String input) {
-        return input.startsWith("save-off");
+        return input.equalsIgnoreCase("save-off");
     }
 }
diff --git a/src/main/java/org/bukkit/command/defaults/SaveOnCommand.java b/src/main/java/org/bukkit/command/defaults/SaveOnCommand.java
index 84be37f8..7e90252c 100644
--- a/src/main/java/org/bukkit/command/defaults/SaveOnCommand.java
+++ b/src/main/java/org/bukkit/command/defaults/SaveOnCommand.java
@@ -28,6 +28,6 @@ public class SaveOnCommand extends VanillaCommand {
 
     @Override
     public boolean matches(String input) {
-        return input.startsWith("save-on");
+        return input.equalsIgnoreCase("save-on");
     }
 }
diff --git a/src/main/java/org/bukkit/command/defaults/SayCommand.java b/src/main/java/org/bukkit/command/defaults/SayCommand.java
index 41ce50ef..90485287 100644
--- a/src/main/java/org/bukkit/command/defaults/SayCommand.java
+++ b/src/main/java/org/bukkit/command/defaults/SayCommand.java
@@ -41,6 +41,6 @@ public class SayCommand extends VanillaCommand {
 
     @Override
     public boolean matches(String input) {
-        return input.startsWith("say ") || input.equalsIgnoreCase("say");
+        return input.equalsIgnoreCase("say");
     }
 }
diff --git a/src/main/java/org/bukkit/command/defaults/StopCommand.java b/src/main/java/org/bukkit/command/defaults/StopCommand.java
index 5097317b..2b8ee082 100644
--- a/src/main/java/org/bukkit/command/defaults/StopCommand.java
+++ b/src/main/java/org/bukkit/command/defaults/StopCommand.java
@@ -24,6 +24,6 @@ public class StopCommand extends VanillaCommand {
 
     @Override
     public boolean matches(String input) {
-        return input.startsWith("stop");
+        return input.equalsIgnoreCase("stop");
     }
 }
diff --git a/src/main/java/org/bukkit/command/defaults/TeleportCommand.java b/src/main/java/org/bukkit/command/defaults/TeleportCommand.java
index 42ab9fd5..79ae480c 100644
--- a/src/main/java/org/bukkit/command/defaults/TeleportCommand.java
+++ b/src/main/java/org/bukkit/command/defaults/TeleportCommand.java
@@ -40,6 +40,6 @@ public class TeleportCommand extends VanillaCommand {
 
     @Override
     public boolean matches(String input) {
-        return input.startsWith("tp ") || input.equalsIgnoreCase("tp");
+        return input.equalsIgnoreCase("tp");
     }
 }
diff --git a/src/main/java/org/bukkit/command/defaults/TellCommand.java b/src/main/java/org/bukkit/command/defaults/TellCommand.java
index 4cc31bc8..41c566e9 100644
--- a/src/main/java/org/bukkit/command/defaults/TellCommand.java
+++ b/src/main/java/org/bukkit/command/defaults/TellCommand.java
@@ -50,6 +50,6 @@ public class TellCommand extends VanillaCommand {
 
     @Override
     public boolean matches(String input) {
-        return input.startsWith("tell ") || input.equalsIgnoreCase("tell");
+        return input.equalsIgnoreCase("tell");
     }
 }
diff --git a/src/main/java/org/bukkit/command/defaults/TimeCommand.java b/src/main/java/org/bukkit/command/defaults/TimeCommand.java
index 77ec55bb..81c60148 100644
--- a/src/main/java/org/bukkit/command/defaults/TimeCommand.java
+++ b/src/main/java/org/bukkit/command/defaults/TimeCommand.java
@@ -60,6 +60,6 @@ public class TimeCommand extends VanillaCommand {
 
     @Override
     public boolean matches(String input) {
-        return input.startsWith("time ") || input.equalsIgnoreCase("time");
+        return input.equalsIgnoreCase("time");
     }
 }
diff --git a/src/main/java/org/bukkit/command/defaults/ToggleDownfallCommand.java b/src/main/java/org/bukkit/command/defaults/ToggleDownfallCommand.java
index f5f8c217..e81710e1 100644
--- a/src/main/java/org/bukkit/command/defaults/ToggleDownfallCommand.java
+++ b/src/main/java/org/bukkit/command/defaults/ToggleDownfallCommand.java
@@ -42,6 +42,6 @@ public class ToggleDownfallCommand extends VanillaCommand {
 
     @Override
     public boolean matches(String input) {
-        return input.startsWith("toggledownfall");
+        return input.equalsIgnoreCase("toggledownfall");
     }
 }
diff --git a/src/main/java/org/bukkit/command/defaults/WhitelistCommand.java b/src/main/java/org/bukkit/command/defaults/WhitelistCommand.java
index eb928877..d0fd8578 100644
--- a/src/main/java/org/bukkit/command/defaults/WhitelistCommand.java
+++ b/src/main/java/org/bukkit/command/defaults/WhitelistCommand.java
@@ -86,6 +86,6 @@ public class WhitelistCommand extends VanillaCommand {
 
     @Override
     public boolean matches(String input) {
-        return input.startsWith("whitelist ") || input.equalsIgnoreCase("whitelist");
+        return input.equalsIgnoreCase("whitelist");
     }
 }