diff --git includes/command.inc includes/command.inc
index cabeaf8..066dd63 100644
--- includes/command.inc
+++ includes/command.inc
@@ -96,7 +96,9 @@ function drush_get_commands() {
         if ($command['callback'] != 'drush_command') {
           $required_command_prefix = 'drush_' . $commandfile . '_';
           if ((substr($command['callback'], 0, strlen($required_command_prefix)) == $required_command_prefix)) {
-            $command['command-hook'] = substr($command['callback'], strlen($required_command_prefix));
+            if ($commandfile != substr($command['callback'], 6, strlen($commandfile))) {
+              $command['command-hook'] = substr($command['callback'], strlen($required_command_prefix));
+            }
             $command['callback'] = 'drush_command';
           }
           else {