diff --git a/api-ref/source/v1/os-quota-sets-v1.inc b/api-ref/source/v1/os-quota-sets-v1.inc
index 732ccef7587..2885d4fa735 100644
--- a/api-ref/source/v1/os-quota-sets-v1.inc
+++ b/api-ref/source/v1/os-quota-sets-v1.inc
@@ -12,7 +12,7 @@ Shows, updates, and deletes quotas for a tenant.
 Show quota details for user (v1)
 ================================
 
-.. rest_method::  GET /v1/{tenant_id}/os-quota-sets/{tenant_id}/detail/{user_id}
+.. rest_method::  GET /v1/{admin_tenant_id}/os-quota-sets/{tenant_id}/detail/{user_id}
 
 Shows details for quotas for a tenant and user.
 
@@ -24,6 +24,7 @@ Request
 
 .. rest_parameters:: parameters.yaml
 
+   - admin_tenant_id: admin_tenant_id
    - tenant_id: tenant_id
    - user_id: user_id
 
@@ -109,7 +110,7 @@ Response Example
 Show quotas (v1)
 ================
 
-.. rest_method::  GET /v1/{tenant_id}/os-quota-sets/{tenant_id}
+.. rest_method::  GET /v1/{admin_tenant_id}/os-quota-sets/{tenant_id}
 
 Shows quotas for a tenant.
 
@@ -123,6 +124,7 @@ Request
 
 .. rest_parameters:: parameters.yaml
 
+   - admin_tenant_id: admin_tenant_id
    - tenant_id: tenant_id
    - usage: usage
 
@@ -160,7 +162,7 @@ Response Example
 Update quotas (v1)
 ==================
 
-.. rest_method::  PUT /v1/{tenant_id}/os-quota-sets/{tenant_id}
+.. rest_method::  PUT /v1/{admin_tenant_id}/os-quota-sets/{tenant_id}
 
 Updates quotas for a tenant.
 
@@ -188,6 +190,7 @@ Request
    - fixed_ips: fixed_ips
    - injected_file_path_bytes: injected_file_path_bytes
    - security_groups: security_groups
+   - admin_tenant_id: admin_tenant_id
    - tenant_id: tenant_id
 
 Request Example
@@ -230,7 +233,7 @@ Response Example
 Delete quotas (v1)
 ==================
 
-.. rest_method::  DELETE /v1/{tenant_id}/os-quota-sets/{tenant_id}
+.. rest_method::  DELETE /v1/{admin_tenant_id}/os-quota-sets/{tenant_id}
 
 Deletes quotas for a tenant so the quotas revert to default values.
 
@@ -242,6 +245,7 @@ Request
 
 .. rest_parameters:: parameters.yaml
 
+   - admin_tenant_id: admin_tenant_id
    - tenant_id: tenant_id
 
 Response Example
@@ -253,7 +257,7 @@ Response Example
 Show quotas for user (v1)
 =========================
 
-.. rest_method::  GET /v1/{tenant_id}/os-quota-sets/{tenant_id}/{user_id}
+.. rest_method::  GET /v1/{admin_tenant_id}/os-quota-sets/{tenant_id}/{user_id}
 
 Enables an admin user to show quotas for a tenant and user.
 
@@ -267,6 +271,7 @@ Request
 
 .. rest_parameters:: parameters.yaml
 
+   - admin_tenant_id: admin_tenant_id
    - tenant_id: tenant_id
    - user_id: user_id
 
@@ -307,7 +312,7 @@ Response Example
 Update quotas for user (v1)
 ===========================
 
-.. rest_method::  POST /v1/{tenant_id}/os-quota-sets/{tenant_id}/{user_id}
+.. rest_method::  POST /v1/{admin_tenant_id}/os-quota-sets/{tenant_id}/{user_id}
 
 Updates quotas for a tenant and user.
 
@@ -335,6 +340,7 @@ Request
    - fixed_ips: fixed_ips
    - injected_file_path_bytes: injected_file_path_bytes
    - security_groups: security_groups
+   - admin_tenant_id: admin_tenant_id
    - tenant_id: tenant_id
    - user_id: user_id
 
@@ -378,7 +384,7 @@ Response Example
 Delete quotas for user (v1)
 ===========================
 
-.. rest_method::  DELETE /v1/{tenant_id}/os-quota-sets/{tenant_id}/{user_id}
+.. rest_method::  DELETE /v1/{admin_tenant_id}/os-quota-sets/{tenant_id}/{user_id}
 
 Deletes quotas for a user so that the quotas revert to default values.
 
@@ -391,6 +397,7 @@ Request
 
 .. rest_parameters:: parameters.yaml
 
+   - admin_tenant_id: admin_tenant_id
    - tenant_id: tenant_id
    - user_id: user_id
 
diff --git a/api-ref/source/v1/parameters.yaml b/api-ref/source/v1/parameters.yaml
index f30f2be817c..3e4604fcb66 100644
--- a/api-ref/source/v1/parameters.yaml
+++ b/api-ref/source/v1/parameters.yaml
@@ -7,6 +7,12 @@ x-openstack-request-id:
   type: string
 
 # variables in path
+admin_tenant_id:
+  description: |
+    The UUID of the administrative tenant.
+  in: path
+  required: false
+  type: string
 snapshot_id_1:
   description: |
     The UUID of the snapshot.
diff --git a/api-ref/source/v2/capabilities-v2.inc b/api-ref/source/v2/capabilities-v2.inc
index 6f3546c2d3e..59e32fb03ad 100644
--- a/api-ref/source/v2/capabilities-v2.inc
+++ b/api-ref/source/v2/capabilities-v2.inc
@@ -10,10 +10,10 @@ Shows capabilities for a storage back end.
 Show back-end capabilities
 ==========================
 
-.. rest_method::  GET /v2/{tenant_id}/capabilities/{host}
+.. rest_method::  GET /v2/{tenant_id}/capabilities/{hostname}
 
 Shows capabilities for a storage back end on the host.
-The ``host`` takes the form of ``hostname@volume_backend_name``.
+The ``hostname`` takes the form of ``hostname@volume_backend_name``.
 
 
 Normal response codes: 200
diff --git a/api-ref/source/v2/consistencygroups-v2.inc b/api-ref/source/v2/consistencygroups-v2.inc
index 215e9b52673..8879946c3de 100644
--- a/api-ref/source/v2/consistencygroups-v2.inc
+++ b/api-ref/source/v2/consistencygroups-v2.inc
@@ -69,6 +69,7 @@ Request
 
 .. rest_parameters:: parameters.yaml
 
+   - tenant_id: tenant_id
    - description: description_6
    - availability_zone: availability_zone
    - volume_types: volume_types_2
diff --git a/api-ref/source/v2/volumes-v2-volumes-actions.inc b/api-ref/source/v2/volumes-v2-volumes-actions.inc
index 3aa661a5e16..f0e7224a8cc 100644
--- a/api-ref/source/v2/volumes-v2-volumes-actions.inc
+++ b/api-ref/source/v2/volumes-v2-volumes-actions.inc
@@ -218,7 +218,7 @@ Request
    - attachment_id: attachment_id
    - os-detach: os-detach
    - tenant_id: tenant_id
-   - volume_id_1: volume_id
+   - volume_id: volume_id_1
 
 Request Example
 ---------------
diff --git a/api-ref/source/v3/capabilities-v3.inc b/api-ref/source/v3/capabilities-v3.inc
index 3dce1ba0d24..bb2fed37700 100644
--- a/api-ref/source/v3/capabilities-v3.inc
+++ b/api-ref/source/v3/capabilities-v3.inc
@@ -10,10 +10,10 @@ Shows capabilities for a storage back end.
 Show all back-end capabilities
 ==============================
 
-.. rest_method::  GET /v3/{tenant_id}/capabilities/{host}
+.. rest_method::  GET /v3/{tenant_id}/capabilities/{hostname}
 
 Shows capabilities for a storage back end on the host.
-The ``host`` takes the form of ``hostname@volume_backend_name``.
+The ``hostname`` takes the form of ``hostname@volume_backend_name``.
 
 Normal response codes: 200
 Error response codes:
diff --git a/api-ref/source/v3/consistencygroups-v3.inc b/api-ref/source/v3/consistencygroups-v3.inc
index fe6deb5a3fe..caec870a4c5 100644
--- a/api-ref/source/v3/consistencygroups-v3.inc
+++ b/api-ref/source/v3/consistencygroups-v3.inc
@@ -69,6 +69,7 @@ Request
 
 .. rest_parameters:: parameters.yaml
 
+   - tenant_id: tenant_id
    - description: description_6
    - availability_zone: availability_zone
    - volume_types: volume_types_2
diff --git a/api-ref/source/v3/volumes-v3-types.inc b/api-ref/source/v3/volumes-v3-types.inc
index ccef7d963ed..ccc7c311f40 100644
--- a/api-ref/source/v3/volumes-v3-types.inc
+++ b/api-ref/source/v3/volumes-v3-types.inc
@@ -289,7 +289,7 @@ Request
 
 .. rest_parameters:: parameters.yaml
 
-   - volume_type: volume_type
+   - volume_type_id: volume_type_id
    - project_id: project_id_path
 
 
@@ -335,7 +335,7 @@ Request
 
 .. rest_parameters:: parameters.yaml
 
-   - volume_type: volume_type
+   - volume_type_id: volume_type_id
    - project_id: project_id_path
    - encryption_id: encryption_id
 
@@ -358,7 +358,7 @@ Request
 
 .. rest_parameters:: parameters.yaml
 
-   - volume_type: volume_type
+   - volume_type_id: volume_type_id
    - project_id: project_id_path
    - encryption: encryption
    - key_size: key_size
@@ -411,7 +411,7 @@ Request
 
 .. rest_parameters:: parameters.yaml
 
-   - volume_type: volume_type
+   - volume_type_id: volume_type_id
    - project_id: project_id_path
    - encryption_id: encryption_id
    - encryption: encryption