diff --git a/src/Analytics.js b/src/Analytics.js
index d85d635b28..3a8c5d6e10 100644
--- a/src/Analytics.js
+++ b/src/Analytics.js
@@ -66,7 +66,7 @@ const customVariables = {
     },
     'User Type': {
         id: 3,
-        expl: _td('Whether or not you\'re logged in (we don\'t record your user name)'),
+        expl: _td('Whether or not you\'re logged in (we don\'t record your username)'),
         example: 'Logged In',
     },
     'Chosen Language': {
diff --git a/src/components/structures/auth/Registration.js b/src/components/structures/auth/Registration.js
index edf419137e..3a63115a43 100644
--- a/src/components/structures/auth/Registration.js
+++ b/src/components/structures/auth/Registration.js
@@ -255,7 +255,7 @@ module.exports = React.createClass({
                 errMsg = _t("Only use lower case letters, numbers and '=_-./'");
                 break;
             case "RegistrationForm.ERR_USERNAME_BLANK":
-                errMsg = _t('You need to enter a user name.');
+                errMsg = _t('You need to enter a username.');
                 break;
             default:
                 console.error("Unknown error code: %s", errCode);
diff --git a/src/components/views/auth/PasswordLogin.js b/src/components/views/auth/PasswordLogin.js
index 6021fc911f..40f4c1178a 100644
--- a/src/components/views/auth/PasswordLogin.js
+++ b/src/components/views/auth/PasswordLogin.js
@@ -93,7 +93,7 @@ class PasswordLogin extends React.Component {
             case PasswordLogin.LOGIN_FIELD_MXID:
                 username = this.state.username;
                 if (!username) {
-                    error = _t('The user name field must not be blank.');
+                    error = _t('The username field must not be blank.');
                 }
                 break;
             case PasswordLogin.LOGIN_FIELD_PHONE:
@@ -193,7 +193,7 @@ class PasswordLogin extends React.Component {
                     placeholder={SdkConfig.get().disable_custom_urls ?
                                       _t("Username on %(hs)s", {
                                         hs: this.props.hsUrl.replace(/^https?:\/\//, ''),
-                                      }) : _t("User name")}
+                                      }) : _t("Username")}
                     value={this.state.username}
                     autoFocus
                 />;
diff --git a/src/components/views/auth/RegistrationForm.js b/src/components/views/auth/RegistrationForm.js
index b38d8ca361..571040188b 100644
--- a/src/components/views/auth/RegistrationForm.js
+++ b/src/components/views/auth/RegistrationForm.js
@@ -305,7 +305,7 @@ module.exports = React.createClass({
             <input className="mx_Login_submit" type="submit" value={_t("Register")} />
         );
 
-        const placeholderUserName = _t("User name");
+        const placeholderUsername = _t("Username");
 
         return (
             <div>
@@ -313,7 +313,7 @@ module.exports = React.createClass({
                     { emailSection }
                     { phoneSection }
                     <input type="text" ref="username"
-                        placeholder={placeholderUserName} defaultValue={this.props.defaultUsername}
+                        placeholder={placeholderUsername} defaultValue={this.props.defaultUsername}
                         className={this._classForField(FIELD_USERNAME, 'mx_Login_field')}
                         onBlur={function() {self.validateField(FIELD_USERNAME);}} />
                     <br />
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index db157ba7b0..13f9b03876 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -4,7 +4,7 @@
     "Failed to verify email address: make sure you clicked the link in the email": "Failed to verify email address: make sure you clicked the link in the email",
     "The platform you're on": "The platform you're on",
     "The version of Riot.im": "The version of Riot.im",
-    "Whether or not you're logged in (we don't record your user name)": "Whether or not you're logged in (we don't record your user name)",
+    "Whether or not you're logged in (we don't record your username)": "Whether or not you're logged in (we don't record your username)",
     "Your language of choice": "Your language of choice",
     "Which officially provided instance you are using, if any": "Which officially provided instance you are using, if any",
     "Whether or not you're using the Richtext mode of the Rich Text Editor": "Whether or not you're using the Richtext mode of the Rich Text Editor",
@@ -305,7 +305,7 @@
     "Uploading report": "Uploading report",
     "Waiting for response from server": "Waiting for response from server",
     "Messages containing my display name": "Messages containing my display name",
-    "Messages containing my user name": "Messages containing my user name",
+    "Messages containing my username": "Messages containing my username",
     "Messages containing @room": "Messages containing @room",
     "Messages in one-to-one chats": "Messages in one-to-one chats",
     "Encrypted messages in one-to-one chats": "Encrypted messages in one-to-one chats",
@@ -1180,11 +1180,11 @@
     "Code": "Code",
     "Start authentication": "Start authentication",
     "The email field must not be blank.": "The email field must not be blank.",
-    "The user name field must not be blank.": "The user name field must not be blank.",
+    "The username field must not be blank.": "The username field must not be blank.",
     "The phone number field must not be blank.": "The phone number field must not be blank.",
     "The password field must not be blank.": "The password field must not be blank.",
     "Username on %(hs)s": "Username on %(hs)s",
-    "User name": "User name",
+    "Username": "Username",
     "Mobile phone number": "Mobile phone number",
     "Not sure of your password? <a>Set a new one</a>": "Not sure of your password? <a>Set a new one</a>",
     "%(serverName)s Matrix ID": "%(serverName)s Matrix ID",
@@ -1406,7 +1406,7 @@
     "This doesn't look like a valid phone number.": "This doesn't look like a valid phone number.",
     "An email address is required to register on this homeserver.": "An email address is required to register on this homeserver.",
     "A phone number is required to register on this homeserver.": "A phone number is required to register on this homeserver.",
-    "You need to enter a user name.": "You need to enter a user name.",
+    "You need to enter a username.": "You need to enter a username.",
     "An unknown error occurred.": "An unknown error occurred.",
     "Create your account": "Create your account",
     "Commands": "Commands",
diff --git a/src/notifications/VectorPushRulesDefinitions.js b/src/notifications/VectorPushRulesDefinitions.js
index 3df2e70774..402a69e7a6 100644
--- a/src/notifications/VectorPushRulesDefinitions.js
+++ b/src/notifications/VectorPushRulesDefinitions.js
@@ -83,7 +83,7 @@ module.exports = {
     // Messages containing user's username (localpart/MXID)
     ".m.rule.contains_user_name": new VectorPushRuleDefinition({
         kind: "override",
-        description: _td("Messages containing my user name"), // passed through _t() translation in src/components/views/settings/Notifications.js
+        description: _td("Messages containing my username"), // passed through _t() translation in src/components/views/settings/Notifications.js
         vectorStateToActions: { // The actions for each vector state, or null to disable the rule.
             on: StandardActions.ACTION_NOTIFY,
             loud: StandardActions.ACTION_HIGHLIGHT_DEFAULT_SOUND,