diff --git a/src/GroupAddressPicker.js b/src/GroupAddressPicker.js
index 9131a89e5d2..2928137f9df 100644
--- a/src/GroupAddressPicker.js
+++ b/src/GroupAddressPicker.js
@@ -73,7 +73,7 @@ export function showGroupAddRoomDialog(groupId) {
             title: _t("Add rooms to the community"),
             description: description,
             extraNode: checkboxContainer,
-            placeholder: _t("Room name or alias"),
+            placeholder: _t("Room name or address"),
             button: _t("Add to community"),
             pickerType: 'room',
             validAddressTypes: ['mx-room-id'],
diff --git a/src/SlashCommands.tsx b/src/SlashCommands.tsx
index aac42b67406..b205af477db 100644
--- a/src/SlashCommands.tsx
+++ b/src/SlashCommands.tsx
@@ -441,8 +441,8 @@ export const Commands = [
     new Command({
         command: 'join',
         aliases: ['j', 'goto'],
-        args: '<room-alias>',
-        description: _td('Joins room with given alias'),
+        args: '<room-address>',
+        description: _td('Joins room with given address'),
         runFn: function(_, args) {
             if (args) {
                 // Note: we support 2 versions of this command. The first is
@@ -553,7 +553,7 @@ export const Commands = [
     }),
     new Command({
         command: 'part',
-        args: '[<room-alias>]',
+        args: '[<room-address>]',
         description: _td('Leave room'),
         runFn: function(roomId, args) {
             const cli = MatrixClientPeg.get();
@@ -585,7 +585,7 @@ export const Commands = [
                         }
                         if (targetRoomId) break;
                     }
-                    if (!targetRoomId) return reject(_t('Unrecognised room alias:') + ' ' + roomAlias);
+                    if (!targetRoomId) return reject(_t('Unrecognised room address:') + ' ' + roomAlias);
                 }
             }
 
diff --git a/src/components/structures/GroupView.js b/src/components/structures/GroupView.js
index 3b32e5c9074..cae9e096a67 100644
--- a/src/components/structures/GroupView.js
+++ b/src/components/structures/GroupView.js
@@ -92,7 +92,7 @@ const CategoryRoomList = createReactClass({
         Modal.createTrackedDialog('Add Rooms to Group Summary', '', AddressPickerDialog, {
             title: _t('Add rooms to the community summary'),
             description: _t("Which rooms would you like to add to this summary?"),
-            placeholder: _t("Room name or alias"),
+            placeholder: _t("Room name or address"),
             button: _t("Add to summary"),
             pickerType: 'room',
             validAddressTypes: ['mx-room-id'],
diff --git a/src/components/structures/RoomDirectory.js b/src/components/structures/RoomDirectory.js
index 0b07c10c8a4..03cf06ec3fc 100644
--- a/src/components/structures/RoomDirectory.js
+++ b/src/components/structures/RoomDirectory.js
@@ -199,7 +199,7 @@ export default createReactClass({
 
         let desc;
         if (alias) {
-            desc = _t('Delete the room alias %(alias)s and remove %(name)s from the directory?', {alias: alias, name: name});
+            desc = _t('Delete the room address %(alias)s and remove %(name)s from the directory?', {alias, name});
         } else {
             desc = _t('Remove %(name)s from the directory?', {name: name});
         }
@@ -216,7 +216,7 @@ export default createReactClass({
 
                 MatrixClientPeg.get().setRoomDirectoryVisibility(room.room_id, 'private').then(() => {
                     if (!alias) return;
-                    step = _t('delete the alias.');
+                    step = _t('delete the address.');
                     return MatrixClientPeg.get().deleteAlias(alias);
                 }).then(() => {
                     modal.close();
diff --git a/src/components/views/create_room/RoomAlias.js b/src/components/views/create_room/RoomAlias.js
index bc5dec1468d..5bdfdde08d1 100644
--- a/src/components/views/create_room/RoomAlias.js
+++ b/src/components/views/create_room/RoomAlias.js
@@ -98,7 +98,7 @@ export default createReactClass({
 
     render: function() {
         return (
-            <input type="text" className="mx_RoomAlias" placeholder={_t("Alias (optional)")}
+            <input type="text" className="mx_RoomAlias" placeholder={_t("Address (optional)")}
                 onChange={this.onValueChanged} onFocus={this.onFocus} onBlur={this.onBlur}
                 value={this.props.alias} />
         );
diff --git a/src/components/views/dialogs/CreateRoomDialog.js b/src/components/views/dialogs/CreateRoomDialog.js
index 88e90627e8b..ec53f99b783 100644
--- a/src/components/views/dialogs/CreateRoomDialog.js
+++ b/src/components/views/dialogs/CreateRoomDialog.js
@@ -180,7 +180,7 @@ export default createReactClass({
         let publicPrivateLabel;
         let aliasField;
         if (this.state.isPublic) {
-            publicPrivateLabel = (<p>{_t("Set a room alias to easily share your room with other people.")}</p>);
+            publicPrivateLabel = (<p>{_t("Set a room address to easily share your room with other people.")}</p>);
             const domain = MatrixClientPeg.get().getDomain();
             aliasField = (
                 <div className="mx_CreateRoomDialog_aliasContainer">
diff --git a/src/components/views/elements/RoomAliasField.js b/src/components/views/elements/RoomAliasField.js
index d3de6a5d349..ee189139719 100644
--- a/src/components/views/elements/RoomAliasField.js
+++ b/src/components/views/elements/RoomAliasField.js
@@ -45,7 +45,7 @@ export default class RoomAliasField extends React.PureComponent {
         const maxlength = 255 - this.props.domain.length - 2;   // 2 for # and :
         return (
                 <Field
-                    label={_t("Room alias")}
+                    label={_t("Room address")}
                     className="mx_RoomAliasField"
                     prefix={poundSign}
                     postfix={domain}
@@ -87,7 +87,7 @@ export default class RoomAliasField extends React.PureComponent {
             }, {
                 key: "required",
                 test: async ({ value, allowEmpty }) => allowEmpty || !!value,
-                invalid: () => _t("Please provide a room alias"),
+                invalid: () => _t("Please provide a room address"),
             }, {
                 key: "taken",
                 final: true,
@@ -107,8 +107,8 @@ export default class RoomAliasField extends React.PureComponent {
                         return !!err.errcode;
                     }
                 },
-                valid: () => _t("This alias is available to use"),
-                invalid: () => _t("This alias is already in use"),
+                valid: () => _t("This address is available to use"),
+                invalid: () => _t("This address is already in use"),
             },
         ],
     });
diff --git a/src/components/views/room_settings/AliasSettings.js b/src/components/views/room_settings/AliasSettings.js
index 3994d783906..37d1e66e980 100644
--- a/src/components/views/room_settings/AliasSettings.js
+++ b/src/components/views/room_settings/AliasSettings.js
@@ -220,10 +220,10 @@ export default class AliasSettings extends React.Component {
             }
         }).catch((err) => {
             console.error(err);
-            Modal.createTrackedDialog('Error creating alias', '', ErrorDialog, {
-                title: _t("Error creating alias"),
+            Modal.createTrackedDialog('Error creating address', '', ErrorDialog, {
+                title: _t("Error creating address"),
                 description: _t(
-                    "There was an error creating that alias. It may not be allowed by the server " +
+                    "There was an error creating that address. It may not be allowed by the server " +
                     "or a temporary failure occurred.",
                 ),
             });
@@ -245,15 +245,15 @@ export default class AliasSettings extends React.Component {
             console.error(err);
             let description;
             if (err.errcode === "M_FORBIDDEN") {
-                description = _t("You don't have permission to delete the alias.");
+                description = _t("You don't have permission to delete the address.");
             } else {
                 description = _t(
-                    "There was an error removing that alias. It may no longer exist or a temporary " +
+                    "There was an error removing that address. It may no longer exist or a temporary " +
                     "error occurred.",
                 );
             }
-            Modal.createTrackedDialog('Error removing alias', '', ErrorDialog, {
-                title: _t("Error removing alias"),
+            Modal.createTrackedDialog('Error removing address', '', ErrorDialog, {
+                title: _t("Error removing address"),
                 description,
             });
         });
diff --git a/src/components/views/settings/tabs/room/SecurityRoomSettingsTab.js b/src/components/views/settings/tabs/room/SecurityRoomSettingsTab.js
index eb2b885a229..c67596a3a52 100644
--- a/src/components/views/settings/tabs/room/SecurityRoomSettingsTab.js
+++ b/src/components/views/settings/tabs/room/SecurityRoomSettingsTab.js
@@ -247,7 +247,7 @@ export default class SecurityRoomSettingsTab extends React.Component {
                 <div className='mx_SecurityRoomSettingsTab_warning'>
                     <img src={require("../../../../../../res/img/warning.svg")} width={15} height={15} />
                     <span>
-                        {_t("To link to this room, please add an alias.")}
+                        {_t("To link to this room, please add an address.")}
                     </span>
                 </div>
             );
diff --git a/src/components/views/settings/tabs/user/MjolnirUserSettingsTab.js b/src/components/views/settings/tabs/user/MjolnirUserSettingsTab.js
index d22b7ec183c..f1fe5f2556f 100644
--- a/src/components/views/settings/tabs/user/MjolnirUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/MjolnirUserSettingsTab.js
@@ -84,7 +84,7 @@ export default class MjolnirUserSettingsTab extends React.Component {
             const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
             Modal.createTrackedDialog('Failed to subscribe to Mjolnir list', '', ErrorDialog, {
                 title: _t('Error subscribing to list'),
-                description: _t('Please verify the room ID or alias and try again.'),
+                description: _t('Please verify the room ID or address and try again.'),
             });
         } finally {
             this.setState({busy: false});
@@ -305,7 +305,7 @@ export default class MjolnirUserSettingsTab extends React.Component {
                         <form onSubmit={this._onSubscribeList} autoComplete="off">
                             <Field
                                 type="text"
-                                label={_t("Room ID or alias of ban list")}
+                                label={_t("Room ID or address of ban list")}
                                 value={this.state.newList}
                                 onChange={this._onNewListChanged}
                             />
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index ae8ed90402b..3bbad1d5858 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -114,7 +114,7 @@
     "Which rooms would you like to add to this community?": "Which rooms would you like to add to this community?",
     "Show these rooms to non-members on the community page and room list?": "Show these rooms to non-members on the community page and room list?",
     "Add rooms to the community": "Add rooms to the community",
-    "Room name or alias": "Room name or alias",
+    "Room name or address": "Room name or address",
     "Add to community": "Add to community",
     "Failed to invite the following users to %(groupId)s:": "Failed to invite the following users to %(groupId)s:",
     "Failed to invite users to community": "Failed to invite users to community",
@@ -183,9 +183,9 @@
     "Use an identity server": "Use an identity server",
     "Use an identity server to invite by email. Click continue to use the default identity server (%(defaultIdentityServerName)s) or manage in Settings.": "Use an identity server to invite by email. Click continue to use the default identity server (%(defaultIdentityServerName)s) or manage in Settings.",
     "Use an identity server to invite by email. Manage in Settings.": "Use an identity server to invite by email. Manage in Settings.",
-    "Joins room with given alias": "Joins room with given alias",
+    "Joins room with given address": "Joins room with given address",
     "Leave room": "Leave room",
-    "Unrecognised room alias:": "Unrecognised room alias:",
+    "Unrecognised room address:": "Unrecognised room address:",
     "Kicks user with given id": "Kicks user with given id",
     "Bans user with given id": "Bans user with given id",
     "Unbans user with given ID": "Unbans user with given ID",
@@ -788,7 +788,7 @@
     "Error adding ignored user/server": "Error adding ignored user/server",
     "Something went wrong. Please try again or view your console for hints.": "Something went wrong. Please try again or view your console for hints.",
     "Error subscribing to list": "Error subscribing to list",
-    "Please verify the room ID or alias and try again.": "Please verify the room ID or alias and try again.",
+    "Please verify the room ID or address and try again.": "Please verify the room ID or address and try again.",
     "Error removing ignored user/server": "Error removing ignored user/server",
     "Error unsubscribing from list": "Error unsubscribing from list",
     "Please try again or view your console for hints.": "Please try again or view your console for hints.",
@@ -815,7 +815,7 @@
     "Subscribed lists": "Subscribed lists",
     "Subscribing to a ban list will cause you to join it!": "Subscribing to a ban list will cause you to join it!",
     "If this isn't what you want, please use a different tool to ignore users.": "If this isn't what you want, please use a different tool to ignore users.",
-    "Room ID or alias of ban list": "Room ID or alias of ban list",
+    "Room ID or address of ban list": "Room ID or address of ban list",
     "Subscribe": "Subscribe",
     "Notifications": "Notifications",
     "Start automatically after system login": "Start automatically after system login",
@@ -916,7 +916,7 @@
     "Once enabled, encryption for a room cannot be disabled. Messages sent in an encrypted room cannot be seen by the server, only by the participants of the room. Enabling encryption may prevent many bots and bridges from working correctly. <a>Learn more about encryption.</a>": "Once enabled, encryption for a room cannot be disabled. Messages sent in an encrypted room cannot be seen by the server, only by the participants of the room. Enabling encryption may prevent many bots and bridges from working correctly. <a>Learn more about encryption.</a>",
     "Guests cannot join this room even if explicitly invited.": "Guests cannot join this room even if explicitly invited.",
     "Click here to fix": "Click here to fix",
-    "To link to this room, please add an alias.": "To link to this room, please add an alias.",
+    "To link to this room, please add an address.": "To link to this room, please add an address.",
     "Only people who have been invited": "Only people who have been invited",
     "Anyone who knows the room's link, apart from guests": "Anyone who knows the room's link, apart from guests",
     "Anyone who knows the room's link, including guests": "Anyone who knows the room's link, including guests",
@@ -1187,11 +1187,11 @@
     "Error updating main address": "Error updating main address",
     "There was an error updating the room's main address. It may not be allowed by the server or a temporary failure occurred.": "There was an error updating the room's main address. It may not be allowed by the server or a temporary failure occurred.",
     "There was an error updating the room's alternative addresses. It may not be allowed by the server or a temporary failure occurred.": "There was an error updating the room's alternative addresses. It may not be allowed by the server or a temporary failure occurred.",
-    "Error creating alias": "Error creating alias",
-    "There was an error creating that alias. It may not be allowed by the server or a temporary failure occurred.": "There was an error creating that alias. It may not be allowed by the server or a temporary failure occurred.",
-    "You don't have permission to delete the alias.": "You don't have permission to delete the alias.",
-    "There was an error removing that alias. It may no longer exist or a temporary error occurred.": "There was an error removing that alias. It may no longer exist or a temporary error occurred.",
-    "Error removing alias": "Error removing alias",
+    "Error creating address": "Error creating address",
+    "There was an error creating that address. It may not be allowed by the server or a temporary failure occurred.": "There was an error creating that address. It may not be allowed by the server or a temporary failure occurred.",
+    "You don't have permission to delete the address.": "You don't have permission to delete the address.",
+    "There was an error removing that address. It may no longer exist or a temporary error occurred.": "There was an error removing that address. It may no longer exist or a temporary error occurred.",
+    "Error removing address": "Error removing address",
     "Main address": "Main address",
     "not specified": "not specified",
     "This room has no local addresses": "This room has no local addresses",
@@ -1484,12 +1484,12 @@
     "Custom level": "Custom level",
     "Unable to load event that was replied to, it either does not exist or you do not have permission to view it.": "Unable to load event that was replied to, it either does not exist or you do not have permission to view it.",
     "<a>In reply to</a> <pill>": "<a>In reply to</a> <pill>",
-    "Room alias": "Room alias",
+    "Room address": "Room address",
     "e.g. my-room": "e.g. my-room",
     "Some characters not allowed": "Some characters not allowed",
-    "Please provide a room alias": "Please provide a room alias",
-    "This alias is available to use": "This alias is available to use",
-    "This alias is already in use": "This alias is already in use",
+    "Please provide a room address": "Please provide a room address",
+    "This address is available to use": "This address is available to use",
+    "This address is already in use": "This address is already in use",
     "Room directory": "Room directory",
     "Sign in with single sign-on": "Sign in with single sign-on",
     "And %(count)s more...|other": "And %(count)s more...",
@@ -1556,7 +1556,7 @@
     "example": "example",
     "Create": "Create",
     "Please enter a name for the room": "Please enter a name for the room",
-    "Set a room alias to easily share your room with other people.": "Set a room alias to easily share your room with other people.",
+    "Set a room address to easily share your room with other people.": "Set a room address to easily share your room with other people.",
     "This room is private, and can only be joined by invitation.": "This room is private, and can only be joined by invitation.",
     "Enable end-to-end encryption": "Enable end-to-end encryption",
     "You can’t disable this later. Bridges & most bots won’t work yet.": "You can’t disable this later. Bridges & most bots won’t work yet.",
@@ -1807,7 +1807,7 @@
     "Private Chat": "Private Chat",
     "Public Chat": "Public Chat",
     "Custom": "Custom",
-    "Alias (optional)": "Alias (optional)",
+    "Address (optional)": "Address (optional)",
     "Reject invitation": "Reject invitation",
     "Are you sure you want to reject the invitation?": "Are you sure you want to reject the invitation?",
     "Unable to reject invite": "Unable to reject invite",
@@ -2001,11 +2001,11 @@
     "Riot failed to get the protocol list from the homeserver. The homeserver may be too old to support third party networks.": "Riot failed to get the protocol list from the homeserver. The homeserver may be too old to support third party networks.",
     "Riot failed to get the public room list.": "Riot failed to get the public room list.",
     "The homeserver may be unavailable or overloaded.": "The homeserver may be unavailable or overloaded.",
-    "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Delete the room alias %(alias)s and remove %(name)s from the directory?",
+    "Delete the room address %(alias)s and remove %(name)s from the directory?": "Delete the room address %(alias)s and remove %(name)s from the directory?",
     "Remove %(name)s from the directory?": "Remove %(name)s from the directory?",
     "Remove from Directory": "Remove from Directory",
     "remove %(name)s from the directory.": "remove %(name)s from the directory.",
-    "delete the alias.": "delete the alias.",
+    "delete the address.": "delete the address.",
     "The server may be unavailable or overloaded": "The server may be unavailable or overloaded",
     "Unable to join network": "Unable to join network",
     "Riot does not know how to join a room on this network": "Riot does not know how to join a room on this network",