Index: user.drush.inc
===================================================================
--- user.drush.inc
+++ user.drush.inc
@@ -10,21 +10,21 @@
  */
 function user_drush_help($section) {
   switch ($section) {
-    case 'drush:user info':
+    case 'drush:user-info':
       return dt("Display information about a user identified by username, uid or email address.");
-    case 'drush:user block':
+    case 'drush:user-block':
       return dt("Block the specified user(s).");
-    case 'drush:user unblock':
+    case 'drush:user-unblock':
       return dt("Unblock the specified user(s).");
-    case 'drush:user add role':
+    case 'drush:user-add-role':
       return dt("Add a role to the specified user accounts.");
-    case 'drush:user remove role':
+    case 'drush:user-remove-role':
       return dt("Remove a role from the specified user accounts.");
-    case 'drush:user create':
+    case 'drush:user-create':
       return dt("Create a user account.");
-    case 'drush:user cancel':
+    case 'drush:user-cancel':
       return dt("Cancel a user account.");
-    case 'drush:user password':
+    case 'drush:user-password':
       return dt("(Re)Set the password for the given user account.");
   }
 }
@@ -33,7 +33,7 @@
  * Implementation of hook_drush_command().
  */
 function user_drush_command() {
-  $items['user info'] = array(
+  $items['user-info'] = array(
     'callback' => 'drush_user_info',
     'description' => 'Print information about the specified user(s).',
     'examples' => array(
@@ -46,7 +46,7 @@
     'drupal dependencies' => array('user'),
     'core' => array('5','6','7'),
   );
-  $items['user block'] = array(
+  $items['user-block'] = array(
     'callback' => 'drush_user_block',
     'description' => 'Block the specified user(s).',
     'examples' => array(
@@ -61,7 +61,7 @@
     'drupal dependencies' => array('user'),
     'core' => array('5','6','7'),
   );
-  $items['user unblock'] = array(
+  $items['user-unblock'] = array(
     'callback' => 'drush_user_unblock',
     'description' => 'Unblock the specified user(s).',
     'arguments' => array(
@@ -79,7 +79,7 @@
     'drupal dependencies' => array('user'),
     'core' => array('5','6','7'),
   );
-  $items['user add role'] = array(
+  $items['user-add-role'] = array(
     'callback' => 'drush_user_add_role',
     'description' => 'Add a role to the specified user accounts.',
     'examples' => array(
@@ -94,7 +94,7 @@
     'drupal dependencies' => array('user'),
     'core' => array('5','6','7'),
   );
-  $items['user remove role'] = array(
+  $items['user-remove-role'] = array(
     'callback' => 'drush_user_remove_role',
     'description' => 'Remove a role from the specified user accounts.',
     'examples' => array(
@@ -109,7 +109,7 @@
     'drupal dependencies' => array('user'),
     'core' => array('5','6','7'),
   );
-  $items['user create'] = array(
+  $items['user-create'] = array(
     'callback' => 'drush_user_create',
     'description' => 'Create a user account with the specified name.',
     'arguments' => array(
@@ -126,7 +126,7 @@
     'drupal dependencies' => array('user'),
     'core' => array('5','6','7'),
   );
-  $items['user cancel'] = array(
+  $items['user-cancel'] = array(
     'callback' => 'drush_user_cancel',
     'description' => 'Cancel a user account with the specified name.',
     'arguments' => array(
@@ -139,7 +139,7 @@
     'drupal dependencies' => array('user'),
     'core' => array('5','6','7'),
   );
-  $items['user password'] = array(
+  $items['user-password'] = array(
     'callback' => 'drush_user_password',
     'description' => '(Re)Set the password for the user account with the specified name.',
     'arguments' => array(