diff --git a/api/identity/lookup.yaml b/api/identity/lookup.yaml
index c02ec3b5..83c3b661 100644
--- a/api/identity/lookup.yaml
+++ b/api/identity/lookup.yaml
@@ -19,7 +19,7 @@ host: localhost:8090
 schemes:
   - https
   - http
-basePath: /_matrix/identity/v1/api
+basePath: /_matrix/identity/api/v1
 produces:
   - application/json
 paths:
diff --git a/api/identity/pubkey.yaml b/api/identity/pubkey.yaml
index c8101281..40d2a237 100644
--- a/api/identity/pubkey.yaml
+++ b/api/identity/pubkey.yaml
@@ -19,7 +19,7 @@ host: localhost:8090
 schemes:
   - https
   - http
-basePath: /_matrix/identity/v1/api
+basePath: /_matrix/identity/api/v1
 produces:
   - application/json
 paths:
diff --git a/specification/identity_service_api.rst b/specification/identity_service_api.rst
index f6e22a1a..3be9d9eb 100644
--- a/specification/identity_service_api.rst
+++ b/specification/identity_service_api.rst
@@ -110,7 +110,7 @@ Creating a session
 
 A client makes a call to::
 
- POST https://my.id.server:8090/_matrix/identity/v1/api/validate/email/requestToken
+ POST https://my.id.server:8090/_matrix/identity/api/v1/validate/email/requestToken
 
  client_secret=monkeys_are_GREAT&
  email=foo@bar.com&
@@ -147,7 +147,7 @@ Validating ownership of an email
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 A user may make either a ``GET`` or a ``POST`` request to
-``/_matrix/identity/v1/api/validate/email/submitToken`` with the following
+``/_matrix/identity/api/v1/validate/email/submitToken`` with the following
 parameters (either as query parameters or URL-encoded POST parameters):
 - ``sid`` the sid for the session, generated by the ``requestToken`` call.
 - ``client_secret`` the client secret which was supplied to the ``requestToken`` call.
@@ -164,7 +164,7 @@ Checking non-published 3pid ownership
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 A client can check whether ownership of a 3pid was validated by making an
-HTTP GET request to ``/_matrix/identity/v1/api/3pid/getValidated3pid``, passing
+HTTP GET request to ``/_matrix/identity/api/v1/3pid/getValidated3pid``, passing
 the ``sid`` and ``client_secret`` as query parameters from the ``requestToken``
 call.
 
@@ -183,7 +183,7 @@ Publishing a validated association
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 An association between a session and a Matrix user ID can be published by making
-a URL-encoded HTTP POST request to ``/_matrix/identity/v1/api/3pid/bind`` with
+a URL-encoded HTTP POST request to ``/_matrix/identity/api/v1/3pid/bind`` with
 the following parameters::
 
  sid=sid&
@@ -256,7 +256,7 @@ At a later point, if the owner of that particular 3pid binds it with a Matrix us
 
 Where the signature is produced using a long-term private key.
 
-Also, the generated ephemeral public key will be listed as valid on requests to ``/_matrix/identity/v1/api/pubkey/ephemeral/isvalid``.
+Also, the generated ephemeral public key will be listed as valid on requests to ``/_matrix/identity/api/v1/pubkey/ephemeral/isvalid``.
 
 Ephemeral invitation signing
 ----------------------------