diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9357bc98a..1efbac14c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1735,13 +1735,13 @@ Changes in [2.4.0-rc.1](https://github.com/matrix-org/matrix-js-sdk/releases/tag
    [\#1021](https://github.com/matrix-org/matrix-js-sdk/pull/1021)
  * Add getIdServer() & doesServerRequireIdServerParam()
    [\#1018](https://github.com/matrix-org/matrix-js-sdk/pull/1018)
- * Make requestToken endpoints work without ID Server
+ * Make requestToken endpoints work without an identity server
    [\#1019](https://github.com/matrix-org/matrix-js-sdk/pull/1019)
  * Fix setIdentityServer
    [\#1016](https://github.com/matrix-org/matrix-js-sdk/pull/1016)
  * Change ICE fallback server and make fallback opt-in
    [\#1015](https://github.com/matrix-org/matrix-js-sdk/pull/1015)
- * Throw an exception if trying to do an ID server request with no ID server
+ * Throw an exception if trying to do an identity server request with no identity server
    [\#1014](https://github.com/matrix-org/matrix-js-sdk/pull/1014)
  * Add setIdentityServerUrl
    [\#1013](https://github.com/matrix-org/matrix-js-sdk/pull/1013)
@@ -3767,7 +3767,7 @@ Other improvements:
    [\#109](https://github.com/matrix-org/matrix-js-sdk/pull/109)
  * Refactor transmitted-messages code
    [\#110](https://github.com/matrix-org/matrix-js-sdk/pull/110)
- * Add a method to the js sdk to look up 3pids on the ID server.
+ * Add a method to the js sdk to look up 3pids on the identity server.
    [\#113](https://github.com/matrix-org/matrix-js-sdk/pull/113)
  * Support for cancelling pending events
    [\#112](https://github.com/matrix-org/matrix-js-sdk/pull/112)
diff --git a/src/client.ts b/src/client.ts
index a560fb2ae..93ab31fe9 100644
--- a/src/client.ts
+++ b/src/client.ts
@@ -4845,7 +4845,7 @@ export class MatrixClient extends EventEmitter {
      * return M_THREEPID_NOT_FOUND or send an email
      * to the address informing them of this (which one is up to the homeserver).
      *
-     * requestEmailToken calls the equivalent API directly on the ID server,
+     * requestEmailToken calls the equivalent API directly on the identity server,
      * therefore bypassing the password reset specific logic.
      *
      * @param {string} email As requestEmailToken
@@ -4920,7 +4920,7 @@ export class MatrixClient extends EventEmitter {
         if (!await this.doesServerSupportSeparateAddAndBind() && this.idBaseUrl) {
             const idServerUrl = url.parse(this.idBaseUrl);
             if (!idServerUrl.host) {
-                throw new Error("Invalid ID server URL: " + this.idBaseUrl);
+                throw new Error("Invalid identity server URL: " + this.idBaseUrl);
             }
             postParams.id_server = idServerUrl.host;
 
@@ -5884,7 +5884,7 @@ export class MatrixClient extends EventEmitter {
      * @param {string} sessionId
      * @param {Object} auth
      * @param {Object} bindThreepids Set key 'email' to true to bind any email
-     *     threepid uses during registration in the ID server. Set 'msisdn' to
+     *     threepid uses during registration in the identity server. Set 'msisdn' to
      *     true to bind msisdn.
      * @param {string} guestAccessToken
      * @param {string} inhibitLogin
@@ -7383,7 +7383,7 @@ export class MatrixClient extends EventEmitter {
      * Submits a MSISDN token to the identity server
      *
      * This is used when submitting the code sent by SMS to a phone number.
-     * The ID server has an equivalent API for email but the js-sdk does
+     * The identity server has an equivalent API for email but the js-sdk does
      * not expose this, since email is normally validated by the user clicking
      * a link rather than entering a code.
      *
@@ -7396,7 +7396,7 @@ export class MatrixClient extends EventEmitter {
      *
      * @return {Promise} Resolves: Object, currently with no parameters.
      * @return {module:http-api.MatrixError} Rejects: with an error response.
-     * @throws Error if No ID server is set
+     * @throws Error if No identity server is set
      */
     public async submitMsisdnToken(
         sid: string,
diff --git a/src/interactive-auth.js b/src/interactive-auth.js
index c1537fe85..cede96c93 100644
--- a/src/interactive-auth.js
+++ b/src/interactive-auth.js
@@ -217,7 +217,7 @@ InteractiveAuth.prototype = {
 
     /**
      * get the client secret used for validation sessions
-     * with the ID server.
+     * with the identity server.
      *
      * @return {string} client secret
      */