diff --git a/modules/user/user.module b/modules/user/user.module
index 72880f7..066613e 100644
--- a/modules/user/user.module
+++ b/modules/user/user.module
@@ -1218,7 +1218,7 @@ function user_account_form_validate($form, &$form_state) {
         form_set_error('name', $error);
       }
       elseif ((bool) db_select('users')->fields('users', array('uid'))->condition('uid', $account->uid, '<>')->condition('name', db_like($form_state['values']['name']), 'LIKE')->range(0, 1)->execute()->fetchField()) {
-        form_set_error('name', t('The name %name is already taken.', array('%name' => $form_state['values']['name'])));
+        form_set_error('name', t('The username %name is already taken.', array('%name' => $form_state['values']['name'])));
       }
     }
 
diff --git a/modules/user/user.test b/modules/user/user.test
index b53db07..dad5a4b 100644
--- a/modules/user/user.test
+++ b/modules/user/user.test
@@ -1745,12 +1745,12 @@ class UserEditTestCase extends DrupalWebTestCase {
     // Test that error message appears when attempting to use a non-unique user name.
     $edit['name'] = $user2->name;
     $this->drupalPost("user/$user1->uid/edit", $edit, t('Save'));
-    $this->assertRaw(t('The name %name is already taken.', array('%name' => $edit['name'])));
+    $this->assertRaw(t('The username %name is already taken.', array('%name' => $edit['name'])));
 
     // Repeat the test with user pictures enabled, which modifies the form.
     variable_set('user_pictures', 1);
     $this->drupalPost("user/$user1->uid/edit", $edit, t('Save'));
-    $this->assertRaw(t('The name %name is already taken.', array('%name' => $edit['name'])));
+    $this->assertRaw(t('The username %name is already taken.', array('%name' => $edit['name'])));
 
     // Check that filling out a single password field does not validate.
     $edit = array();