diff --git a/api/identity/definitions/sid.yaml b/api/identity/definitions/sid.yaml
index 0cf04ed8d..c1f1ae646 100644
--- a/api/identity/definitions/sid.yaml
+++ b/api/identity/definitions/sid.yaml
@@ -17,7 +17,7 @@ properties:
     type: string
     description: |
       The session ID. Session IDs are opaque strings generated by the identity
-      service. They must consist entirely of the characters
+      server. They must consist entirely of the characters
       ``[0-9a-zA-Z.=_-]``. Their length must not exceed 255 characters and they
       must not be empty.
     example: "123abc"
diff --git a/api/identity/email_associations.yaml b/api/identity/email_associations.yaml
index b8960dee7..df567c482 100644
--- a/api/identity/email_associations.yaml
+++ b/api/identity/email_associations.yaml
@@ -81,10 +81,10 @@ paths:
         associate the email address with any Matrix user ID. Specifically,
         calls to ``/lookup`` will not show a binding.
 
-        The identity service is free to match the token case-insensitively, or
+        The identity server is free to match the token case-insensitively, or
         carry out other mapping operations such as unicode
         normalisation. Whether to do so is an implementation detail for the
-        identity service. Clients must always pass on the token without
+        identity server. Clients must always pass on the token without
         modification.
 
         Note: for backwards compatibility with previous drafts of this
diff --git a/api/identity/phone_associations.yaml b/api/identity/phone_associations.yaml
index b0e85adf1..bbd8450ed 100644
--- a/api/identity/phone_associations.yaml
+++ b/api/identity/phone_associations.yaml
@@ -83,10 +83,10 @@ paths:
         associate the phone number address with any Matrix user
         ID. Specifically, calls to ``/lookup`` will not show a binding.
 
-        The identity service is free to match the token case-insensitively, or
+        The identity server is free to match the token case-insensitively, or
         carry out other mapping operations such as unicode
         normalisation. Whether to do so is an implementation detail for the
-        identity service. Clients must always pass on the token without
+        identity server. Clients must always pass on the token without
         modification.
 
         Note: for backwards compatibility with previous drafts of this
diff --git a/specification/identity_service_api.rst b/specification/identity_service_api.rst
index 62853998e..6fc74e14c 100644
--- a/specification/identity_service_api.rst
+++ b/specification/identity_service_api.rst
@@ -218,7 +218,7 @@ attempts to perform these actions after the expiry will be rejected, and a new
 session should be created and used instead.
 
 To start a session, the client makes a request to the appropriate
-``/requestToken`` endpoint. The identity service then sends a validation token
+``/requestToken`` endpoint. The identity server then sends a validation token
 to the user, and the user provides the token to the client. The client then
 provides the token to the appropriate ``/submitToken`` endpoint, completing the
 session. At this point, the client should ``/bind`` the third party identifier
@@ -227,12 +227,12 @@ or leave it for another entity to bind.
 Format of a validation token
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-The format of the validation token is left up to the identity service: it
+The format of the validation token is left up to the identity server: it
 should choose one appropriate to the 3PID type. (For example, it would be
 inappropriate to expect a user to copy a long passphrase including punctuation
 from an SMS message into a client.)
 
-Whatever format the identity service uses, the validation token must consist of
+Whatever format the identity server uses, the validation token must consist of
 at most 255 Unicode codepoints. Clients must pass the token through without
 modification.