From aedcdf5f24aa270e1058b731e0152ec92fe4990a Mon Sep 17 00:00:00 2001
From: Diane Fleming <diflemin@cisco.com>
Date: Tue, 8 Dec 2015 15:10:11 -0600
Subject: [PATCH] Update volume API v1 and v2 to make these changes

- Spell-check and remove passive voice from api-site
- Renamed api-ref/src/wadls/volume-api/src/v1/api_samples
  and api-ref/src/wadls/volume-api/src/v2/api_samples
  to .../samples
- Renamed code samples using this naming convention:
  <resource>-<action>-request.json or <resource>-<action>-response.json.
  For example, volume-create-request.json and volume-create-response.json.
- Removed unused code samples
- Made method names consistent throughout - use list<resource> for list
  operations, show<resource> for show operations, and so on.
- Changed csapi:uuid -> csapi:UUID

Change-Id: I61f33e093c2ec882680d85e9cb3f7c450107496e
Partial-Bug: #1521244
---
 api-ref/src/docbkx/ch_blockstorage-api-v1.xml |  72 ++--
 api-ref/src/docbkx/ch_blockstorage-api-v2.xml | 134 ++++----
 api-ref/src/wadls/common_project.ent          |  78 ++---
 .../quotas-user-show-get-resp.json            |  16 -
 .../quotas-user-show-get-resp.xml             |  14 -
 .../v1/api_samples/versionv1-get-resp.json    |  28 --
 .../quotas-defaults-show-response.json}       |   2 +-
 .../quotas-defaults-show-response.xml}        |   0
 .../os-quota-sets/quotas-show-response.json}  |   2 +-
 .../os-quota-sets/quotas-show-response.xml}   |   0
 .../os-quota-sets/quotas-update-request.json} |   2 +-
 .../os-quota-sets/quotas-update-request.xml}  |   2 +-
 .../quotas-update-response.json}              |   2 +-
 .../os-quota-sets/quotas-update-response.xml} |   0
 .../user-quotas-show-detail-response.json}    |   2 +-
 .../user-quotas-show-response.json}           |   2 +-
 .../user-quotas-show-response.xml}            |   0
 .../user-quotas-update-request.json}          |   2 +-
 .../user-quotas-update-request.xml}           |   0
 .../user-quotas-update-response.json}         |   2 +-
 .../user-quotas-update-response.xml}          |   0
 .../volumes/snapshot-create-request.json}     |   2 +-
 .../volumes/snapshot-create-request.xml}      |   0
 .../snapshot-metadata-show-response.json}     |   2 +-
 .../snapshot-metadata-show-response.xml}      |   0
 .../snapshot-metadata-update-request.json}    |   2 +-
 .../snapshot-metadata-update-request.xml}     |   0
 .../snapshot-metadata-update-response.json}   |   2 +-
 .../snapshot-metadata-update-response.xml}    |   0
 .../volumes/snapshot-show-response.json}      |   2 +-
 .../volumes/snapshot-show-response.xml}       |   0
 .../volumes/snapshots-list-response.json}     |   0
 .../volumes/snapshots-list-response.xml}      |   0
 .../volumes/version-show-response.json}       |   0
 .../volumes/versions-list-response.json}      |   0
 .../volumes/volume-create-request.json}       |   2 +-
 .../volumes/volume-create-request.xml}        |   0
 .../volumes/volume-show-response.json}        |   0
 .../volumes/volume-show-response.xml}         |   0
 .../volumes/volume-type-create-request.json}  |   0
 .../volumes/volume-type-create-request.xml}   |   0
 .../volumes/volume-type-show-response.json}   |   0
 .../volumes/volume-type-show-response.xml}    |   0
 .../volumes/volume-types-list-response.json}  |   2 +-
 .../volumes/volume-types-list-response.xml}   |   0
 .../volumes/volumes-list-response.json}       |   0
 .../volumes/volumes-list-response.xml}        |   0
 .../src/v1/{ => wadl}/os-quota-sets-v1.wadl   | 109 ++----
 .../volumes-v1.wadl}                          | 211 ++++++------
 .../src/v2/api_samples/qos_create_request.xml |   2 -
 .../v2/api_samples/qos_create_response.xml    |  11 -
 .../qos_details_show_response.json            |  21 --
 .../src/v2/api_samples/qos_update_request.xml |   2 -
 .../v2/api_samples/versionv2-get-resp.json    |  22 --
 .../src/wadls/volume-api/src/v2/common.ent    | 308 ++++++++++++++++-
 .../v2/grammar/requests/create-snapshot.json  |  40 ---
 .../grammar/requests/create-volume-type.json  |  33 --
 .../v2/grammar/requests/create-volume.json    |  75 ----
 .../requests/update-snapshot-metadata.json    |  24 --
 .../v2/grammar/requests/update-snapshot.json  |  27 --
 .../v2/grammar/requests/update-volume.json    |  25 --
 .../src/v2/os-backend-capabilities-v2.wadl    |  68 ----
 .../src/v2/os-volume-type-access-v2.wadl      |  75 ----
 .../backups/backup-create-request.json}       |   0
 .../backups/backup-create-response.json}      |   2 +-
 .../backups/backup-force-delete-request.json} |   0
 .../backup-record-export-response.json}       |   0
 .../backup-record-import-request.json}        |   0
 .../backup-record-import-response.json}       |   0
 .../backups/backup-restore-request.json}      |   0
 .../backups/backup-restore-response.json}     |   2 +-
 .../backups/backup-show-response.json}        |   0
 .../backups-list-detailed-response.json}      |   0
 .../backups/backups-list-response.json}       |   2 +-
 .../backend-capabilities-response.json}       |   0
 .../cgsnapshots-create-request.json           |   0
 .../cgsnapshots-create-response.json          |   0
 .../cgsnapshots-list-detailed-response.json   |   0
 .../cgsnapshots-list-response.json            |   0
 .../cgsnapshots-show-response.json            |   0
 ...istency-group-create-from-src-request.json |   0
 .../consistency-group-create-request.json     |   0
 .../consistency-group-create-response.json    |   0
 .../consistency-group-delete-request.json     |   0
 .../consistency-group-show-response.json}     |   0
 .../consistency-group-update-request.json     |   0
 ...stency-groups-list-detailed-response.json} |   0
 .../consistency-groups-list-response.json}    |   0
 .../host-attach-request.json}                 |   2 +-
 .../limits/limits-show-response.json}         |   2 +-
 .../limits/limits-show-response.xml}          |   0
 .../quotas-show-defaults-response.json}       |   0
 .../quotas-show-defaults-response.xml}        |   0
 .../os-quota-sets/quotas-show-response.json}  |   0
 .../os-quota-sets/quotas-show-response.xml}   |   0
 .../os-quota-sets/quotas-update-request.json} |   0
 .../os-quota-sets/quotas-update-request.xml}  |   0
 .../quotas-update-response.json}              |   0
 .../os-quota-sets/quotas-update-response.xml} |   0
 .../quotas-user-show-detailed-response.json}  |   0
 .../quotas-user-show-response.json}           |   0
 .../quotas-user-show-response.xml}            |   0
 .../image-metadata-show-request.json}         |   0
 .../image-metadata-show-response.json}        |   0
 .../volume-manage-request.json                |  18 +
 .../volume-manage-response.json               |  33 ++
 .../volume-transfer-accept-request.json       |   0
 .../volume-transfer-accept-response.json      |   0
 .../volume-transfer-create-request.json       |   0
 .../volume-transfer-create-response.json      |   0
 .../volume-transfer-show-response.json        |   0
 ...ume-transfers-list-detailed-response.json} |   0
 .../volume-transfers-list-response.json}      |   0
 .../volume-create-request.json}               |   0
 .../volume-create-request.xml}                |   0
 .../volume-create-response.json}              |   0
 .../volume-create-response.xml}               |   0
 .../qos-specs/qos-create-request.json}        |   2 +-
 .../samples/qos-specs/qos-create-request.xml  |   2 +
 .../qos-specs/qos-create-response.json        |  21 ++
 .../samples/qos-specs/qos-create-response.xml |   9 +
 .../qos-list-response.json}                   |   2 +-
 .../qos-list-response.xml}                    |   0
 .../qos-specs/qos-show-response.json}         |   2 +-
 .../qos-specs/qos-show-response.xml}          |   0
 .../qos-specs/qos-update-request.json}        |   2 +-
 .../samples/qos-specs/qos-update-request.xml  |   2 +
 .../qos-specs/qos-update-response.json}       |   2 +-
 .../qos-specs/qos-update-response.xml}        |   0
 .../qos-specs}/qos_show_response.json         |   2 +-
 .../qos-specs}/qos_show_response.xml          |   0
 .../pools-list-detailed-response.json}        |   0
 .../user-quotas-show-response.json}           |   2 +-
 .../user-quotas-show-response.xml}            |   0
 .../user-quotas-update-request.json}          |   2 +-
 .../user-quotas-update-request.xml}           |   0
 .../samples/user-quotas-update-response.json} |   2 +-
 .../user-quotas-update-response.xml}          |   0
 .../extensions-list-response.json}            |   2 +-
 .../extensions-list-response.xml}             |   0
 .../volumes/snapshot-create-request.json}     |   2 +-
 .../volumes/snapshot-create-request.xml}      |   0
 .../volumes/snapshot-create-response.json}    |   2 +-
 .../volumes/snapshot-create-response.xml}     |   0
 .../snapshot-metadata-show-response.json}     |   0
 .../snapshot-metadata-show-response.xml}      |   0
 .../snapshot-metadata-update-request.json}    |   2 +-
 .../snapshot-metadata-update-request.xml}     |   0
 .../snapshot-metadata-update-response.json}   |   2 +-
 .../snapshot-metadata-update-response.xml}    |   0
 .../volumes/snapshot-show-response.json}      |   2 +-
 .../volumes/snapshot-show-response.xml}       |   0
 .../volumes/snapshot-update-request.json}     |   0
 .../volumes/snapshot-update-request.xml}      |   0
 .../volumes/snapshot-update-response.json}    |   0
 .../volumes/snapshot-update-response.xml}     |   0
 .../snapshots-list-detailed-response.json}    |   0
 .../snapshots-list-detailed-response.xml}     |   0
 .../volumes/snapshots-list-response.json}     |   0
 .../volumes/snapshots-list-response.xml}      |   0
 .../volumes/version-show-response.json}       |   2 +-
 .../samples/volumes/version-show-response.xml |  17 +
 .../volumes/version-v2-show-response.json     |  44 +++
 .../volumes/versions-response.json}           |  16 +-
 .../v2/samples/volumes/versions-response.xml  |  17 +
 .../volumes/volume-attach-request.json}       |   0
 .../volumes/volume-create-request.json}       |   0
 .../volumes/volume-create-request.xml}        |   0
 .../volumes/volume-create-response.json}      |   0
 .../volumes/volume-create-response.xml}       |   0
 .../volumes/volume-extend-request.json}       |   0
 .../volumes/volume-force-detach-request.json} |   0
 .../volume-image-metadata-set-request.json}   |   0
 .../volume-image-metadata-unset-request.json} |   0
 .../volume-metadata-show-response.json        |   0
 .../volume-metadata-show-response.xml         |   0
 .../volume-metadata-update-request.json       |   0
 .../volume-metadata-update-request.xml        |   0
 .../volume-metadata-update-response.json      |   0
 .../volume-metadata-update-response.xml       |   0
 .../volume-replica-promote-request.json}      |   0
 .../volume-replica-reenable-request.json}     |   0
 .../volumes/volume-show-response.json}        |   0
 .../volumes/volume-show-response.xml}         |   0
 .../volumes/volume-status-reset-request.json} |   0
 .../volumes/volume-type-create-request.json}  |   0
 .../volumes/volume-type-create-request.xml}   |   0
 .../volumes/volume-type-show-request.json}    |   2 +-
 .../volumes/volume-type-show-request.xml}     |   0
 .../volumes/volume-type-show-response.json}   |   0
 .../volumes/volume-type-show-response.xml}    |   0
 .../volumes/volume-types-list-response.json}  |   2 +-
 .../volumes/volume-types-list-response.xml}   |   0
 .../volumes/volume-unmanage-request.json}     |   0
 .../volumes/volume-update-request.json}       |   0
 .../volumes/volume-update-request.xml}        |   0
 .../volumes/volume-update-response.json}      |   0
 .../volumes/volume-update-response.xml}       |   0
 .../volumes-list-detailed-response.json}      |   0
 .../volumes-list-detailed-response.xml}       |   0
 .../volumes/volumes-list-response.json}       |   2 +-
 .../volumes/volumes-list-response.xml}        |   0
 .../backups-v2.wadl}                          |  79 ++---
 .../src/v2/wadl/capabilities-v2.wadl          |  54 +++
 .../src/v2/{ => wadl}/cgsnapshots-v2.wadl     |  31 +-
 .../v2/{ => wadl}/consistencygroups-v2.wadl   |  61 ++--
 .../limits-v2.wadl}                           |  28 +-
 .../os-attach-interfaces-v2.wadl}             | 137 ++++----
 .../src/v2/{ => wadl}/os-quota-sets-v2.wadl   |  96 ++----
 .../v2/{ => wadl}/os-vol-image-meta-v2.wadl   |  40 ++-
 .../v2/{ => wadl}/os-volume-manage-v2.wadl    |  34 +-
 .../os-volume-transfer-v2.wadl}               |  66 ++--
 .../qos-specs-v2.wadl}                        | 256 ++++++--------
 .../scheduler-stats-v2.wadl}                  |  38 +--
 .../volumes-v2.wadl}                          | 320 +++++++++---------
 215 files changed, 1347 insertions(+), 1547 deletions(-)
 delete mode 100644 api-ref/src/wadls/volume-api/src/v1/api_samples/os-quota-sets/quotas-user-show-get-resp.json
 delete mode 100644 api-ref/src/wadls/volume-api/src/v1/api_samples/os-quota-sets/quotas-user-show-get-resp.xml
 delete mode 100644 api-ref/src/wadls/volume-api/src/v1/api_samples/versionv1-get-resp.json
 rename api-ref/src/wadls/volume-api/src/v1/{api_samples/os-quota-sets/quotas-show-defaults-get-resp.json => samples/os-quota-sets/quotas-defaults-show-response.json} (99%)
 rename api-ref/src/wadls/volume-api/src/v1/{api_samples/os-quota-sets/quotas-show-defaults-get-resp.xml => samples/os-quota-sets/quotas-defaults-show-response.xml} (100%)
 rename api-ref/src/wadls/volume-api/src/v1/{api_samples/os-quota-sets/quotas-show-get-resp.json => samples/os-quota-sets/quotas-show-response.json} (99%)
 rename api-ref/src/wadls/volume-api/src/v1/{api_samples/os-quota-sets/quotas-show-get-resp.xml => samples/os-quota-sets/quotas-show-response.xml} (100%)
 rename api-ref/src/wadls/volume-api/src/v1/{api_samples/os-quota-sets/quotas-update-post-req.json => samples/os-quota-sets/quotas-update-request.json} (96%)
 rename api-ref/src/wadls/volume-api/src/v1/{api_samples/os-quota-sets/quotas-update-post-req.xml => samples/os-quota-sets/quotas-update-request.xml} (89%)
 rename api-ref/src/wadls/volume-api/src/v1/{api_samples/os-quota-sets/quotas-update-post-resp.json => samples/os-quota-sets/quotas-update-response.json} (99%)
 rename api-ref/src/wadls/volume-api/src/v1/{api_samples/os-quota-sets/quotas-update-post-resp.xml => samples/os-quota-sets/quotas-update-response.xml} (100%)
 rename api-ref/src/wadls/volume-api/src/v1/{api_samples/os-quota-sets/quotas-user-show-detail-get-resp.json => samples/os-user-quotas/user-quotas-show-detail-response.json} (99%)
 rename api-ref/src/wadls/volume-api/src/v1/{api_samples/os-user-quotas/user-quotas-show-get-resp.json => samples/os-user-quotas/user-quotas-show-response.json} (99%)
 rename api-ref/src/wadls/volume-api/src/v1/{api_samples/os-user-quotas/user-quotas-show-get-resp.xml => samples/os-user-quotas/user-quotas-show-response.xml} (100%)
 rename api-ref/src/wadls/volume-api/src/v1/{api_samples/os-user-quotas/user-quotas-update-post-req.json => samples/os-user-quotas/user-quotas-update-request.json} (97%)
 rename api-ref/src/wadls/volume-api/src/v1/{api_samples/os-user-quotas/user-quotas-update-post-req.xml => samples/os-user-quotas/user-quotas-update-request.xml} (100%)
 rename api-ref/src/wadls/volume-api/src/{v2/api_samples/os-user-quotas/user-quotas-update-post-resp.json => v1/samples/os-user-quotas/user-quotas-update-response.json} (99%)
 rename api-ref/src/wadls/volume-api/src/v1/{api_samples/os-user-quotas/user-quotas-update-post-resp.xml => samples/os-user-quotas/user-quotas-update-response.xml} (100%)
 rename api-ref/src/wadls/volume-api/src/v1/{api_samples/snapshot_create.json => samples/volumes/snapshot-create-request.json} (98%)
 rename api-ref/src/wadls/volume-api/src/v1/{api_samples/snapshot_create.xml => samples/volumes/snapshot-create-request.xml} (100%)
 rename api-ref/src/wadls/volume-api/src/v1/{api_samples/snapshot_metadata_response.json => samples/volumes/snapshot-metadata-show-response.json} (99%)
 rename api-ref/src/wadls/volume-api/src/v1/{api_samples/snapshot_metadata_response.xml => samples/volumes/snapshot-metadata-show-response.xml} (100%)
 rename api-ref/src/wadls/volume-api/src/v1/{api_samples/snapshot_update_metadata_request.json => samples/volumes/snapshot-metadata-update-request.json} (95%)
 rename api-ref/src/wadls/volume-api/src/v1/{api_samples/snapshot_update_metadata_request.xml => samples/volumes/snapshot-metadata-update-request.xml} (100%)
 rename api-ref/src/wadls/volume-api/src/v1/{api_samples/snapshot_update_metadata_response.json => samples/volumes/snapshot-metadata-update-response.json} (95%)
 rename api-ref/src/wadls/volume-api/src/v1/{api_samples/snapshot_update_metadata_response.xml => samples/volumes/snapshot-metadata-update-response.xml} (100%)
 rename api-ref/src/wadls/volume-api/src/v1/{api_samples/snapshot_show.json => samples/volumes/snapshot-show-response.json} (99%)
 rename api-ref/src/wadls/volume-api/src/v1/{api_samples/snapshot_show.xml => samples/volumes/snapshot-show-response.xml} (100%)
 rename api-ref/src/wadls/volume-api/src/v1/{api_samples/snapshot_list_simple.json => samples/volumes/snapshots-list-response.json} (100%)
 rename api-ref/src/wadls/volume-api/src/v1/{api_samples/snapshot_list_simple.xml => samples/volumes/snapshots-list-response.xml} (100%)
 rename api-ref/src/wadls/volume-api/src/v1/{api_samples/version-get-resp.json => samples/volumes/version-show-response.json} (100%)
 rename api-ref/src/wadls/volume-api/src/v1/{api_samples/cinder-versions-response.json => samples/volumes/versions-list-response.json} (100%)
 rename api-ref/src/wadls/volume-api/src/v1/{api_samples/volume_create.json => samples/volumes/volume-create-request.json} (99%)
 rename api-ref/src/wadls/volume-api/src/v1/{api_samples/volume_create.xml => samples/volumes/volume-create-request.xml} (100%)
 rename api-ref/src/wadls/volume-api/src/v1/{api_samples/volume_show.json => samples/volumes/volume-show-response.json} (100%)
 rename api-ref/src/wadls/volume-api/src/v1/{api_samples/volume_show.xml => samples/volumes/volume-show-response.xml} (100%)
 rename api-ref/src/wadls/volume-api/src/v1/{api_samples/volume_type_create_request.json => samples/volumes/volume-type-create-request.json} (100%)
 rename api-ref/src/wadls/volume-api/src/v1/{api_samples/volume_type_create_request.xml => samples/volumes/volume-type-create-request.xml} (100%)
 rename api-ref/src/wadls/volume-api/src/{v2/api_samples/volume_type_show.json => v1/samples/volumes/volume-type-show-response.json} (100%)
 rename api-ref/src/wadls/volume-api/src/v1/{api_samples/volume_type_show.xml => samples/volumes/volume-type-show-response.xml} (100%)
 rename api-ref/src/wadls/volume-api/src/v1/{api_samples/volume_type_list.json => samples/volumes/volume-types-list-response.json} (99%)
 rename api-ref/src/wadls/volume-api/src/v1/{api_samples/volume_type_list.xml => samples/volumes/volume-types-list-response.xml} (100%)
 rename api-ref/src/wadls/volume-api/src/v1/{api_samples/volume_list_simple.json => samples/volumes/volumes-list-response.json} (100%)
 rename api-ref/src/wadls/volume-api/src/v1/{api_samples/volume_list_simple.xml => samples/volumes/volumes-list-response.xml} (100%)
 rename api-ref/src/wadls/volume-api/src/v1/{ => wadl}/os-quota-sets-v1.wadl (78%)
 rename api-ref/src/wadls/volume-api/src/v1/{volume-api-v1.wadl => wadl/volumes-v1.wadl} (76%)
 delete mode 100644 api-ref/src/wadls/volume-api/src/v2/api_samples/qos_create_request.xml
 delete mode 100644 api-ref/src/wadls/volume-api/src/v2/api_samples/qos_create_response.xml
 delete mode 100644 api-ref/src/wadls/volume-api/src/v2/api_samples/qos_details_show_response.json
 delete mode 100644 api-ref/src/wadls/volume-api/src/v2/api_samples/qos_update_request.xml
 delete mode 100644 api-ref/src/wadls/volume-api/src/v2/api_samples/versionv2-get-resp.json
 delete mode 100644 api-ref/src/wadls/volume-api/src/v2/grammar/requests/create-snapshot.json
 delete mode 100644 api-ref/src/wadls/volume-api/src/v2/grammar/requests/create-volume-type.json
 delete mode 100644 api-ref/src/wadls/volume-api/src/v2/grammar/requests/create-volume.json
 delete mode 100644 api-ref/src/wadls/volume-api/src/v2/grammar/requests/update-snapshot-metadata.json
 delete mode 100644 api-ref/src/wadls/volume-api/src/v2/grammar/requests/update-snapshot.json
 delete mode 100644 api-ref/src/wadls/volume-api/src/v2/grammar/requests/update-volume.json
 delete mode 100644 api-ref/src/wadls/volume-api/src/v2/os-backend-capabilities-v2.wadl
 delete mode 100644 api-ref/src/wadls/volume-api/src/v2/os-volume-type-access-v2.wadl
 rename api-ref/src/wadls/volume-api/src/v2/{api_samples/backup/backup_create_request.json => samples/backups/backup-create-request.json} (100%)
 rename api-ref/src/wadls/volume-api/src/v2/{api_samples/backup/backup_create_response.json => samples/backups/backup-create-response.json} (99%)
 rename api-ref/src/wadls/volume-api/src/v2/{api_samples/backup/backup_force_delete_request.json => samples/backups/backup-force-delete-request.json} (100%)
 rename api-ref/src/wadls/volume-api/src/v2/{api_samples/backup/backup_export_record_response.json => samples/backups/backup-record-export-response.json} (100%)
 rename api-ref/src/wadls/volume-api/src/v2/{api_samples/backup/backup_import_record_request.json => samples/backups/backup-record-import-request.json} (100%)
 rename api-ref/src/wadls/volume-api/src/v2/{api_samples/backup/backup_import_record_response.json => samples/backups/backup-record-import-response.json} (100%)
 rename api-ref/src/wadls/volume-api/src/v2/{api_samples/backup/backup_restore_request.json => samples/backups/backup-restore-request.json} (100%)
 rename api-ref/src/wadls/volume-api/src/v2/{api_samples/backup/backup_restore_response.json => samples/backups/backup-restore-response.json} (98%)
 rename api-ref/src/wadls/volume-api/src/v2/{api_samples/backup/backup_show_response.json => samples/backups/backup-show-response.json} (100%)
 rename api-ref/src/wadls/volume-api/src/v2/{api_samples/backup/backup_list_detail_response.json => samples/backups/backups-list-detailed-response.json} (100%)
 rename api-ref/src/wadls/volume-api/src/v2/{api_samples/backup/backup_list_simple_response.json => samples/backups/backups-list-response.json} (99%)
 rename api-ref/src/wadls/volume-api/src/v2/{api_samples/backend-capabilities/backend-capabilities-resp.json => samples/capabilities/backend-capabilities-response.json} (100%)
 rename api-ref/src/wadls/volume-api/src/v2/{api_samples => samples}/cgsnapshots/cgsnapshots-create-request.json (100%)
 rename api-ref/src/wadls/volume-api/src/v2/{api_samples => samples}/cgsnapshots/cgsnapshots-create-response.json (100%)
 rename api-ref/src/wadls/volume-api/src/v2/{api_samples => samples}/cgsnapshots/cgsnapshots-list-detailed-response.json (100%)
 rename api-ref/src/wadls/volume-api/src/v2/{api_samples => samples}/cgsnapshots/cgsnapshots-list-response.json (100%)
 rename api-ref/src/wadls/volume-api/src/v2/{api_samples => samples}/cgsnapshots/cgsnapshots-show-response.json (100%)
 rename api-ref/src/wadls/volume-api/src/v2/{api_samples => samples}/consistencygroups/consistency-group-create-from-src-request.json (100%)
 rename api-ref/src/wadls/volume-api/src/v2/{api_samples => samples}/consistencygroups/consistency-group-create-request.json (100%)
 rename api-ref/src/wadls/volume-api/src/v2/{api_samples => samples}/consistencygroups/consistency-group-create-response.json (100%)
 rename api-ref/src/wadls/volume-api/src/v2/{api_samples => samples}/consistencygroups/consistency-group-delete-request.json (100%)
 rename api-ref/src/wadls/volume-api/src/v2/{api_samples/consistencygroups/consistency-group-response.json => samples/consistencygroups/consistency-group-show-response.json} (100%)
 rename api-ref/src/wadls/volume-api/src/v2/{api_samples => samples}/consistencygroups/consistency-group-update-request.json (100%)
 rename api-ref/src/wadls/volume-api/src/v2/{api_samples/consistencygroups/consistency-group-list-detailed-response.json => samples/consistencygroups/consistency-groups-list-detailed-response.json} (100%)
 rename api-ref/src/wadls/volume-api/src/v2/{api_samples/consistencygroups/consistency-group-list-response.json => samples/consistencygroups/consistency-groups-list-response.json} (100%)
 rename api-ref/src/wadls/volume-api/src/v2/{api_samples/host_attach_request.json => samples/host-attach-request.json} (96%)
 rename api-ref/src/wadls/volume-api/src/v2/{api_samples/limits/limits-show-get-resp.json => samples/limits/limits-show-response.json} (99%)
 rename api-ref/src/wadls/volume-api/src/v2/{api_samples/limits/limits-show-get-resp.xml => samples/limits/limits-show-response.xml} (100%)
 rename api-ref/src/wadls/volume-api/src/v2/{api_samples/os-quota-sets/quotas-show-defaults-get-resp.json => samples/os-quota-sets/quotas-show-defaults-response.json} (100%)
 rename api-ref/src/wadls/volume-api/src/v2/{api_samples/os-quota-sets/quotas-show-defaults-get-resp.xml => samples/os-quota-sets/quotas-show-defaults-response.xml} (100%)
 rename api-ref/src/wadls/volume-api/src/v2/{api_samples/os-quota-sets/quotas-show-get-resp.json => samples/os-quota-sets/quotas-show-response.json} (100%)
 rename api-ref/src/wadls/volume-api/src/v2/{api_samples/os-quota-sets/quotas-show-get-resp.xml => samples/os-quota-sets/quotas-show-response.xml} (100%)
 rename api-ref/src/wadls/volume-api/src/v2/{api_samples/os-quota-sets/quotas-update-post-req.json => samples/os-quota-sets/quotas-update-request.json} (100%)
 rename api-ref/src/wadls/volume-api/src/v2/{api_samples/os-quota-sets/quotas-update-post-req.xml => samples/os-quota-sets/quotas-update-request.xml} (100%)
 rename api-ref/src/wadls/volume-api/src/v2/{api_samples/os-quota-sets/quotas-update-post-resp.json => samples/os-quota-sets/quotas-update-response.json} (100%)
 rename api-ref/src/wadls/volume-api/src/v2/{api_samples/os-quota-sets/quotas-update-post-resp.xml => samples/os-quota-sets/quotas-update-response.xml} (100%)
 rename api-ref/src/wadls/volume-api/src/v2/{api_samples/os-quota-sets/quotas-user-show-detail-get-resp.json => samples/os-quota-sets/quotas-user-show-detailed-response.json} (100%)
 rename api-ref/src/wadls/volume-api/src/v2/{api_samples/os-quota-sets/quotas-user-show-get-resp.json => samples/os-quota-sets/quotas-user-show-response.json} (100%)
 rename api-ref/src/wadls/volume-api/src/v2/{api_samples/os-quota-sets/quotas-user-show-get-resp.xml => samples/os-quota-sets/quotas-user-show-response.xml} (100%)
 rename api-ref/src/wadls/volume-api/src/v2/{api_samples/os-manage-existing/manage_existing_request.json => samples/os-vol-image-meta/image-metadata-show-request.json} (100%)
 rename api-ref/src/wadls/volume-api/src/v2/{api_samples/os-manage-existing/manage_existing_response.json => samples/os-vol-image-meta/image-metadata-show-response.json} (100%)
 create mode 100644 api-ref/src/wadls/volume-api/src/v2/samples/os-volume-manage/volume-manage-request.json
 create mode 100644 api-ref/src/wadls/volume-api/src/v2/samples/os-volume-manage/volume-manage-response.json
 rename api-ref/src/wadls/volume-api/src/v2/{api_samples => samples}/os-volume-transfer/volume-transfer-accept-request.json (100%)
 rename api-ref/src/wadls/volume-api/src/v2/{api_samples => samples}/os-volume-transfer/volume-transfer-accept-response.json (100%)
 rename api-ref/src/wadls/volume-api/src/v2/{api_samples => samples}/os-volume-transfer/volume-transfer-create-request.json (100%)
 rename api-ref/src/wadls/volume-api/src/v2/{api_samples => samples}/os-volume-transfer/volume-transfer-create-response.json (100%)
 rename api-ref/src/wadls/volume-api/src/v2/{api_samples => samples}/os-volume-transfer/volume-transfer-show-response.json (100%)
 rename api-ref/src/wadls/volume-api/src/v2/{api_samples/os-volume-transfer/volume-transfer-list-details-response.json => samples/os-volume-transfer/volume-transfers-list-detailed-response.json} (100%)
 rename api-ref/src/wadls/volume-api/src/v2/{api_samples/os-volume-transfer/volume-transfer-list-response.json => samples/os-volume-transfer/volume-transfers-list-response.json} (100%)
 rename api-ref/src/wadls/volume-api/src/v2/{api_samples/os-volume-type-access/volume_create_request.json => samples/os-volume-type-access/volume-create-request.json} (100%)
 rename api-ref/src/wadls/volume-api/src/v2/{api_samples/os-volume-type-access/volume_create_request.xml => samples/os-volume-type-access/volume-create-request.xml} (100%)
 rename api-ref/src/wadls/volume-api/src/v2/{api_samples/os-volume-type-access/volume_create_response.json => samples/os-volume-type-access/volume-create-response.json} (100%)
 rename api-ref/src/wadls/volume-api/src/v2/{api_samples/os-volume-type-access/volume_create_response.xml => samples/os-volume-type-access/volume-create-response.xml} (100%)
 rename api-ref/src/wadls/volume-api/src/v2/{api_samples/qos_create_request.json => samples/qos-specs/qos-create-request.json} (98%)
 create mode 100644 api-ref/src/wadls/volume-api/src/v2/samples/qos-specs/qos-create-request.xml
 create mode 100644 api-ref/src/wadls/volume-api/src/v2/samples/qos-specs/qos-create-response.json
 create mode 100644 api-ref/src/wadls/volume-api/src/v2/samples/qos-specs/qos-create-response.xml
 rename api-ref/src/wadls/volume-api/src/v2/samples/{list-qos-response.json => qos-specs/qos-list-response.json} (99%)
 rename api-ref/src/wadls/volume-api/src/v2/samples/{list-qos-response.xml => qos-specs/qos-list-response.xml} (100%)
 rename api-ref/src/wadls/volume-api/src/v2/{api_samples/qos_create_response.json => samples/qos-specs/qos-show-response.json} (99%)
 rename api-ref/src/wadls/volume-api/src/v2/{api_samples/qos_details_show_response.xml => samples/qos-specs/qos-show-response.xml} (100%)
 rename api-ref/src/wadls/volume-api/src/v2/{api_samples/qos_update_request.json => samples/qos-specs/qos-update-request.json} (96%)
 create mode 100644 api-ref/src/wadls/volume-api/src/v2/samples/qos-specs/qos-update-request.xml
 rename api-ref/src/wadls/volume-api/src/v2/{api_samples/qos_update_response.json => samples/qos-specs/qos-update-response.json} (96%)
 rename api-ref/src/wadls/volume-api/src/v2/{api_samples/qos_update_response.xml => samples/qos-specs/qos-update-response.xml} (100%)
 rename api-ref/src/wadls/volume-api/src/v2/{api_samples => samples/qos-specs}/qos_show_response.json (99%)
 rename api-ref/src/wadls/volume-api/src/v2/{api_samples => samples/qos-specs}/qos_show_response.xml (100%)
 rename api-ref/src/wadls/volume-api/src/v2/{api_samples/list-pools-detail.json => samples/scheduler-stats/pools-list-detailed-response.json} (100%)
 rename api-ref/src/wadls/volume-api/src/v2/{api_samples/os-user-quotas/user-quotas-show-get-resp.json => samples/user-quotas-show-response.json} (99%)
 rename api-ref/src/wadls/volume-api/src/v2/{api_samples/os-user-quotas/user-quotas-show-get-resp.xml => samples/user-quotas-show-response.xml} (100%)
 rename api-ref/src/wadls/volume-api/src/v2/{api_samples/os-user-quotas/user-quotas-update-post-req.json => samples/user-quotas-update-request.json} (97%)
 rename api-ref/src/wadls/volume-api/src/v2/{api_samples/os-user-quotas/user-quotas-update-post-req.xml => samples/user-quotas-update-request.xml} (100%)
 rename api-ref/src/wadls/volume-api/src/{v1/api_samples/os-user-quotas/user-quotas-update-post-resp.json => v2/samples/user-quotas-update-response.json} (99%)
 rename api-ref/src/wadls/volume-api/src/v2/{api_samples/os-user-quotas/user-quotas-update-post-resp.xml => samples/user-quotas-update-response.xml} (100%)
 rename api-ref/src/wadls/volume-api/src/v2/samples/{cinder-extensions-response.json => volumes/extensions-list-response.json} (99%)
 rename api-ref/src/wadls/volume-api/src/v2/samples/{cinder-extensions-response.xml => volumes/extensions-list-response.xml} (100%)
 rename api-ref/src/wadls/volume-api/src/v2/{api_samples/snapshot_create_request.json => samples/volumes/snapshot-create-request.json} (98%)
 rename api-ref/src/wadls/volume-api/src/v2/{api_samples/snapshot_create_request.xml => samples/volumes/snapshot-create-request.xml} (100%)
 rename api-ref/src/wadls/volume-api/src/v2/{api_samples/snapshot_create_response.json => samples/volumes/snapshot-create-response.json} (99%)
 rename api-ref/src/wadls/volume-api/src/v2/{api_samples/snapshot_create_response.xml => samples/volumes/snapshot-create-response.xml} (100%)
 rename api-ref/src/wadls/volume-api/src/v2/{api_samples/snapshot_metadata_response.json => samples/volumes/snapshot-metadata-show-response.json} (100%)
 rename api-ref/src/wadls/volume-api/src/v2/{api_samples/snapshot_metadata_response.xml => samples/volumes/snapshot-metadata-show-response.xml} (100%)
 rename api-ref/src/wadls/volume-api/src/v2/{api_samples/snapshot_update_metadata_request.json => samples/volumes/snapshot-metadata-update-request.json} (95%)
 rename api-ref/src/wadls/volume-api/src/v2/{api_samples/snapshot_update_metadata_request.xml => samples/volumes/snapshot-metadata-update-request.xml} (100%)
 rename api-ref/src/wadls/volume-api/src/v2/{api_samples/snapshot_update_metadata_response.json => samples/volumes/snapshot-metadata-update-response.json} (95%)
 rename api-ref/src/wadls/volume-api/src/v2/{api_samples/snapshot_update_metadata_response.xml => samples/volumes/snapshot-metadata-update-response.xml} (100%)
 rename api-ref/src/wadls/volume-api/src/v2/{api_samples/snapshot_show_response.json => samples/volumes/snapshot-show-response.json} (99%)
 rename api-ref/src/wadls/volume-api/src/v2/{api_samples/snapshot_show_response.xml => samples/volumes/snapshot-show-response.xml} (100%)
 rename api-ref/src/wadls/volume-api/src/v2/{api_samples/snapshot_update_request.json => samples/volumes/snapshot-update-request.json} (100%)
 rename api-ref/src/wadls/volume-api/src/v2/{api_samples/snapshot_update_request.xml => samples/volumes/snapshot-update-request.xml} (100%)
 rename api-ref/src/wadls/volume-api/src/v2/{api_samples/snapshot_update_response.json => samples/volumes/snapshot-update-response.json} (100%)
 rename api-ref/src/wadls/volume-api/src/v2/{api_samples/snapshot_update_response.xml => samples/volumes/snapshot-update-response.xml} (100%)
 rename api-ref/src/wadls/volume-api/src/v2/{api_samples/snapshot_list_detail_response.json => samples/volumes/snapshots-list-detailed-response.json} (100%)
 rename api-ref/src/wadls/volume-api/src/v2/{api_samples/snapshot_list_detail_response.xml => samples/volumes/snapshots-list-detailed-response.xml} (100%)
 rename api-ref/src/wadls/volume-api/src/v2/{api_samples/snapshot_list_simple_response.json => samples/volumes/snapshots-list-response.json} (100%)
 rename api-ref/src/wadls/volume-api/src/v2/{api_samples/snapshot_list_simple_response.xml => samples/volumes/snapshots-list-response.xml} (100%)
 rename api-ref/src/wadls/volume-api/src/v2/{api_samples/version-get-resp.json => samples/volumes/version-show-response.json} (99%)
 create mode 100644 api-ref/src/wadls/volume-api/src/v2/samples/volumes/version-show-response.xml
 create mode 100644 api-ref/src/wadls/volume-api/src/v2/samples/volumes/version-v2-show-response.json
 rename api-ref/src/wadls/volume-api/src/v2/{api_samples/cinder-versions-response.json => samples/volumes/versions-response.json} (54%)
 create mode 100644 api-ref/src/wadls/volume-api/src/v2/samples/volumes/versions-response.xml
 rename api-ref/src/wadls/volume-api/src/v2/{api_samples/volume_attach_request.json => samples/volumes/volume-attach-request.json} (100%)
 rename api-ref/src/wadls/volume-api/src/v2/{api_samples/volume_create_request.json => samples/volumes/volume-create-request.json} (100%)
 rename api-ref/src/wadls/volume-api/src/v2/{api_samples/volume_create_request.xml => samples/volumes/volume-create-request.xml} (100%)
 rename api-ref/src/wadls/volume-api/src/v2/{api_samples/volume_create_response.json => samples/volumes/volume-create-response.json} (100%)
 rename api-ref/src/wadls/volume-api/src/v2/{api_samples/volume_create_response.xml => samples/volumes/volume-create-response.xml} (100%)
 rename api-ref/src/wadls/volume-api/src/v2/{api_samples/volume_extend_request.json => samples/volumes/volume-extend-request.json} (100%)
 rename api-ref/src/wadls/volume-api/src/v2/{api_samples/os-force-detach/os-force-detach-request.json => samples/volumes/volume-force-detach-request.json} (100%)
 rename api-ref/src/wadls/volume-api/src/v2/{api_samples/volume_set_image_metadata_request.json => samples/volumes/volume-image-metadata-set-request.json} (100%)
 rename api-ref/src/wadls/volume-api/src/v2/{api_samples/volume_unset_image_metadata_request.json => samples/volumes/volume-image-metadata-unset-request.json} (100%)
 rename api-ref/src/wadls/volume-api/src/v2/{api_samples => samples/volumes}/volume-metadata-show-response.json (100%)
 rename api-ref/src/wadls/volume-api/src/v2/{api_samples => samples/volumes}/volume-metadata-show-response.xml (100%)
 rename api-ref/src/wadls/volume-api/src/v2/{api_samples => samples/volumes}/volume-metadata-update-request.json (100%)
 rename api-ref/src/wadls/volume-api/src/v2/{api_samples => samples/volumes}/volume-metadata-update-request.xml (100%)
 rename api-ref/src/wadls/volume-api/src/v2/{api_samples => samples/volumes}/volume-metadata-update-response.json (100%)
 rename api-ref/src/wadls/volume-api/src/v2/{api_samples => samples/volumes}/volume-metadata-update-response.xml (100%)
 rename api-ref/src/wadls/volume-api/src/v2/{api_samples/os-replica/os-promote-replica-request.json => samples/volumes/volume-replica-promote-request.json} (100%)
 rename api-ref/src/wadls/volume-api/src/v2/{api_samples/os-replica/os-reenable-replica-request.json => samples/volumes/volume-replica-reenable-request.json} (100%)
 rename api-ref/src/wadls/volume-api/src/v2/{api_samples/volume_show_response.json => samples/volumes/volume-show-response.json} (100%)
 rename api-ref/src/wadls/volume-api/src/v2/{api_samples/volume_show_response.xml => samples/volumes/volume-show-response.xml} (100%)
 rename api-ref/src/wadls/volume-api/src/v2/{api_samples/volume_reset_status_request.json => samples/volumes/volume-status-reset-request.json} (100%)
 rename api-ref/src/wadls/volume-api/src/v2/{api_samples/volume_type_create_request.json => samples/volumes/volume-type-create-request.json} (100%)
 rename api-ref/src/wadls/volume-api/src/v2/{api_samples/volume_type_create_request.xml => samples/volumes/volume-type-create-request.xml} (100%)
 rename api-ref/src/wadls/volume-api/src/{v1/api_samples/volume_type_show.json => v2/samples/volumes/volume-type-show-request.json} (98%)
 rename api-ref/src/wadls/volume-api/src/v2/{api_samples/volume_type_show.xml => samples/volumes/volume-type-show-request.xml} (100%)
 rename api-ref/src/wadls/volume-api/src/v2/{api_samples/volume_type_show_response.json => samples/volumes/volume-type-show-response.json} (100%)
 rename api-ref/src/wadls/volume-api/src/v2/{api_samples/volume_type_show_response.xml => samples/volumes/volume-type-show-response.xml} (100%)
 rename api-ref/src/wadls/volume-api/src/v2/{api_samples/volume_type_list_response.json => samples/volumes/volume-types-list-response.json} (99%)
 rename api-ref/src/wadls/volume-api/src/v2/{api_samples/volume_type_list_response.xml => samples/volumes/volume-types-list-response.xml} (100%)
 rename api-ref/src/wadls/volume-api/src/v2/{api_samples/os-unmanage/os-unmanage-request.json => samples/volumes/volume-unmanage-request.json} (100%)
 rename api-ref/src/wadls/volume-api/src/v2/{api_samples/volume_update_request.json => samples/volumes/volume-update-request.json} (100%)
 rename api-ref/src/wadls/volume-api/src/v2/{api_samples/volume_update_request.xml => samples/volumes/volume-update-request.xml} (100%)
 rename api-ref/src/wadls/volume-api/src/v2/{api_samples/volume_update_response.json => samples/volumes/volume-update-response.json} (100%)
 rename api-ref/src/wadls/volume-api/src/v2/{api_samples/volume_update_response.xml => samples/volumes/volume-update-response.xml} (100%)
 rename api-ref/src/wadls/volume-api/src/v2/{api_samples/volume_list_detail_response.json => samples/volumes/volumes-list-detailed-response.json} (100%)
 rename api-ref/src/wadls/volume-api/src/v2/{api_samples/volume_list_detail_response.xml => samples/volumes/volumes-list-detailed-response.xml} (100%)
 rename api-ref/src/wadls/volume-api/src/v2/{api_samples/volume_list_simple_response.json => samples/volumes/volumes-list-response.json} (99%)
 rename api-ref/src/wadls/volume-api/src/v2/{api_samples/volume_list_simple_response.xml => samples/volumes/volumes-list-response.xml} (100%)
 rename api-ref/src/wadls/volume-api/src/v2/{volume-backups-api-v2.wadl => wadl/backups-v2.wadl} (89%)
 create mode 100644 api-ref/src/wadls/volume-api/src/v2/wadl/capabilities-v2.wadl
 rename api-ref/src/wadls/volume-api/src/v2/{ => wadl}/cgsnapshots-v2.wadl (81%)
 rename api-ref/src/wadls/volume-api/src/v2/{ => wadl}/consistencygroups-v2.wadl (75%)
 rename api-ref/src/wadls/volume-api/src/v2/{os-limits-v2.wadl => wadl/limits-v2.wadl} (74%)
 rename api-ref/src/wadls/volume-api/src/v2/{os-attach-v2.wadl => wadl/os-attach-interfaces-v2.wadl} (68%)
 rename api-ref/src/wadls/volume-api/src/v2/{ => wadl}/os-quota-sets-v2.wadl (69%)
 rename api-ref/src/wadls/volume-api/src/v2/{ => wadl}/os-vol-image-meta-v2.wadl (82%)
 rename api-ref/src/wadls/volume-api/src/v2/{ => wadl}/os-volume-manage-v2.wadl (87%)
 rename api-ref/src/wadls/volume-api/src/v2/{os-volume-transfer-api-v2.wadl => wadl/os-volume-transfer-v2.wadl} (87%)
 rename api-ref/src/wadls/volume-api/src/v2/{os-qos-v2.wadl => wadl/qos-specs-v2.wadl} (69%)
 rename api-ref/src/wadls/volume-api/src/v2/{os-vol-pool-v2.wadl => wadl/scheduler-stats-v2.wadl} (85%)
 rename api-ref/src/wadls/volume-api/src/v2/{volume-api-v2.wadl => wadl/volumes-v2.wadl} (85%)

diff --git a/api-ref/src/docbkx/ch_blockstorage-api-v1.xml b/api-ref/src/docbkx/ch_blockstorage-api-v1.xml
index 80098c099..424bccf4a 100644
--- a/api-ref/src/docbkx/ch_blockstorage-api-v1.xml
+++ b/api-ref/src/docbkx/ch_blockstorage-api-v1.xml
@@ -28,25 +28,25 @@
         <listitem><para>IN-USE. The volume is attached to an
                 instance.</para></listitem>
         <listitem><para>DELETING. The volume is being deleted.</para></listitem>
-        <listitem><para>ERROR. An error has occurred with the
-                volume.</para></listitem>
-        <listitem><para>ERROR_DELETING. There was an error deleting the
-                volume.</para></listitem>
+        <listitem><para>ERROR. An error occurred.</para></listitem>
+        <listitem><para>
+            ERROR_DELETING. A volume deletion error occurred.
+            </para></listitem>
     </itemizedlist>
-    <section xml:id="volume-api-v1-versions">
+    <section xml:id="volumes-v1-versions">
         <title>API versions</title>
         <wadl:resources xmlns:wadl="http://wadl.dev.java.net/2009/02">
             <wadl:resource
-                href="../wadls/volume-api/src/v1/volume-api-v1.wadl#versions">
+                href="../wadls/volume-api/src/v1/wadl/volumes-v1.wadl#versions">
                 <wadl:method href="#listVersionsv1"/>
             </wadl:resource>
             <wadl:resource
-                href="../wadls/volume-api/src/v1/volume-api-v1.wadl#version">
+                href="../wadls/volume-api/src/v1/wadl/volumes-v1.wadl#version">
                 <wadl:method href="#showVersionDetailsv1"/>
             </wadl:resource>
         </wadl:resources>
     </section>
-    <section xml:id="volume-api-v1-volumes">
+    <section xml:id="volumes-v1-volumes">
         <title>Volumes</title>
         <para>
           The <code>snapshot_id</code> and <code>source_volid</code>
@@ -57,61 +57,57 @@
         </para>
         <wadl:resources xmlns:wadl="http://wadl.dev.java.net/2009/02">
             <wadl:resource
-                href="../wadls/volume-api/src/v1/volume-api-v1.wadl#volumes">
+                href="../wadls/volume-api/src/v1/wadl/volumes-v1.wadl#volumes">
                 <wadl:method href="#createVolume"/>
-                <wadl:method href="#getVolumesSimple"/>
+                <wadl:method href="#listVolumesSimple"/>
             </wadl:resource>
             <wadl:resource
-                href="../wadls/volume-api/src/v1/volume-api-v1.wadl#detail-volume">
-                <wadl:method href="#getVolumesDetail"/>
+                href="../wadls/volume-api/src/v1/wadl/volumes-v1.wadl#detail-volume">
+                <wadl:method href="#listVolumesDetail"/>
             </wadl:resource>
             <wadl:resource
-                href="../wadls/volume-api/src/v1/volume-api-v1.wadl#volume_id">
-                <wadl:method href="#getVolume"/>
+                href="../wadls/volume-api/src/v1/wadl/volumes-v1.wadl#volume_id">
+                <wadl:method href="#showVolume"/>
                 <wadl:method href="#deleteVolume"/>
             </wadl:resource>
         </wadl:resources>
     </section>
-    <section xml:id="volume-api-v1-types">
+    <section xml:id="volumes-v1-types">
         <title>Volume types</title>
         <wadl:resources xmlns:wadl="http://wadl.dev.java.net/2009/02">
             <wadl:resource
-                href="../wadls/volume-api/src/v1/volume-api-v1.wadl#types">
-                <wadl:method href="#getVolumeTypes"/>
-            </wadl:resource>
-            <wadl:resource
-                href="../wadls/volume-api/src/v1/volume-api-v1.wadl#types">
+                href="../wadls/volume-api/src/v1/wadl/volumes-v1.wadl#types">
+                <wadl:method href="#listVolumeTypes"/>
                 <wadl:method href="#createVolumeType"/>
             </wadl:resource>
             <wadl:resource
-                href="../wadls/volume-api/src/v1/volume-api-v1.wadl#volume_type_id">
-                <wadl:method href="#getVolumeType"/>
-            </wadl:resource>
-            <wadl:resource
-                href="../wadls/volume-api/src/v1/volume-api-v1.wadl#volume_type_id">
+                href="../wadls/volume-api/src/v1/wadl/volumes-v1.wadl#volume_type_id">
+                <wadl:method href="#updateVolumeType"/>
+                <wadl:method href="#updateVolumeTypeExtraSpecs"/>
+                <wadl:method href="#showVolumeType"/>
                 <wadl:method href="#deleteVolumeType"/>
             </wadl:resource>
         </wadl:resources>
     </section>
-    <section xml:id="volume-api-v1-snapshots">
+    <section xml:id="volumes-v1-snapshots">
         <title>Snapshots</title>
         <wadl:resources xmlns:wadl="http://wadl.dev.java.net/2009/02">
             <wadl:resource
-                href="../wadls/volume-api/src/v1/volume-api-v1.wadl#snapshots">
+                href="../wadls/volume-api/src/v1/wadl/volumes-v1.wadl#snapshots">
                 <wadl:method href="#createSnapshot"/>
-                <wadl:method href="#getSnapshotsSimple"/>
+                <wadl:method href="#listSnapshotsSimple"/>
             </wadl:resource>
             <wadl:resource
-                href="../wadls/volume-api/src/v1/volume-api-v1.wadl#detail-snapshots">
-                <wadl:method href="#getSnapshotsDetail"/>
+                href="../wadls/volume-api/src/v1/wadl/volumes-v1.wadl#detail-snapshots">
+                <wadl:method href="#listSnapshotsDetail"/>
             </wadl:resource>
             <wadl:resource
-                href="../wadls/volume-api/src/v1/volume-api-v1.wadl#snapshot_id">
-                <wadl:method href="#getSnapshot"/>
+                href="../wadls/volume-api/src/v1/wadl/volumes-v1.wadl#snapshot_id">
+                <wadl:method href="#showSnapshot"/>
                 <wadl:method href="#deleteSnapshot"/>
             </wadl:resource>
             <wadl:resource
-                href="../wadls/volume-api/src/v1/volume-api-v1.wadl#snapshot-metadata">
+                href="../wadls/volume-api/src/v1/wadl/volumes-v1.wadl#snapshot-metadata">
                 <wadl:method href="#showSnapshotMetadata"/>
                 <wadl:method href="#updateSnapshotMetadata"/>
             </wadl:resource>
@@ -125,20 +121,20 @@
             Shows, updates, and deletes quotas for a tenant.
         </para>
         <wadl:resources xmlns:wadl="http://wadl.dev.java.net/2009/02">
-            <wadl:resource href="../wadls/volume-api/src/v1/os-quota-sets-v1.wadl#tenant_id-quotas-cinder-v1">
+            <wadl:resource href="../wadls/volume-api/src/v1/wadl/os-quota-sets-v1.wadl#tenant_id-quotas-cinder-v1">
                 <wadl:method href="#showQuota"/>
                 <wadl:method href="#updateQuota"/>
                 <wadl:method href="#deleteQuotas"/>
             </wadl:resource>
-            <wadl:resource href="../wadls/volume-api/src/v1/os-quota-sets-v1.wadl#defaults-cinder-v1">
-                <wadl:method href="#getDefaults"/>
+            <wadl:resource href="../wadls/volume-api/src/v1/wadl/os-quota-sets-v1.wadl#defaults-cinder-v1">
+                <wadl:method href="#showQuotaDefaults"/>
             </wadl:resource>
-            <wadl:resource href="../wadls/volume-api/src/v1/os-quota-sets-v1.wadl#user_id-cinder-v1">
+            <wadl:resource href="../wadls/volume-api/src/v1/wadl/os-quota-sets-v1.wadl#user_id-cinder-v1">
                 <wadl:method href="#showQuotaUser"/>
                 <wadl:method href="#updateQuotaUser"/>
                 <wadl:method href="#deleteQuotasUser"/>
             </wadl:resource>
-            <wadl:resource href="../wadls/volume-api/src/v1/os-quota-sets-v1.wadl#user_id-detail-cinder-v1">
+            <wadl:resource href="../wadls/volume-api/src/v1/wadl/os-quota-sets-v1.wadl#user_id-detail-cinder-v1">
                 <wadl:method href="#showQuotaDetailUser"/>
             </wadl:resource>
         </wadl:resources>
diff --git a/api-ref/src/docbkx/ch_blockstorage-api-v2.xml b/api-ref/src/docbkx/ch_blockstorage-api-v2.xml
index 63d4c9d70..0be2f21ab 100644
--- a/api-ref/src/docbkx/ch_blockstorage-api-v2.xml
+++ b/api-ref/src/docbkx/ch_blockstorage-api-v2.xml
@@ -12,21 +12,21 @@
         Manages volumes and snapshots for use with the Block Storage API, also
         known as cinder services.
     </para>
-    <section xml:id="volume-api-v2-versions">
+    <section xml:id="volumes-v2-versions">
         <title>API versions</title>
         <wadl:resources xmlns:wadl="http://wadl.dev.java.net/2009/02">
-            <wadl:resource href="../wadls/volume-api/src/v2/volume-api-v2.wadl#versions">
+            <wadl:resource href="../wadls/volume-api/src/v2/wadl/volumes-v2.wadl#versions">
                 <wadl:method href="#listVersions"/>
             </wadl:resource>
-            <wadl:resource href="../wadls/volume-api/src/v2/volume-api-v2.wadl#version">
+            <wadl:resource href="../wadls/volume-api/src/v2/wadl/volumes-v2.wadl#version">
                 <wadl:method href="#versionDetails"/>
             </wadl:resource>
         </wadl:resources>
     </section>
-    <section xml:id="volume-api-v2-extensions">
+    <section xml:id="volumes-v2-extensions">
         <title>API extensions (extensions)</title>
         <wadl:resources xmlns:wadl="http://wadl.dev.java.net/2009/02">
-            <wadl:resource href="../wadls/volume-api/src/v2/volume-api-v2.wadl#extensions">
+            <wadl:resource href="../wadls/volume-api/src/v2/wadl/volumes-v2.wadl#extensions">
                 <wadl:method href="#listExtensions-cinder-v2"/>
             </wadl:resource>
         </wadl:resources>
@@ -40,10 +40,10 @@
             An absolute limit value of <code>-1</code> indicates that the
             absolute limit for the item is infinite.
         </para>
-        <wadl:resources href="../wadls/volume-api/src/v2/os-limits-v2.wadl"
+        <wadl:resources href="../wadls/volume-api/src/v2/wadl/limits-v2.wadl"
             xmlns:wadl="http://wadl.dev.java.net/2009/02"/>
     </section>
-    <section xml:id="volume-api-v2-volumes">
+    <section xml:id="volumes-v2-volumes">
         <title>Volumes (volumes)</title>
         <para>
             A volume is a detachable block storage device similar to a USB
@@ -95,13 +95,14 @@
                 </tr>
                 <tr>
                     <td><para>error</para></td>
-                    <td><para>An error occurred during volume
-                        creation.</para></td>
+                    <td><para>
+                        A volume creation error occurred.
+                    </para></td>
                 </tr>
                 <tr>
                     <td><para>error_deleting</para></td>
-                    <td><para>An error occurred during volume
-                        deletion.</para></td>
+                    <td><para>
+                        A volume deletion error occurred.</para></td>
                 </tr>
                 <tr>
                     <td><para>backing-up</para></td>
@@ -114,8 +115,7 @@
                 </tr>
                 <tr>
                     <td><para>error_restoring</para></td>
-                    <td><para>An error occurred during backup restoration to a
-                        volume.</para></td>
+                    <td><para>A backup restoration error occurred.</para></td>
                 </tr>
                 <tr>
                     <td><para>error_extending</para></td>
@@ -126,19 +126,19 @@
         </table>
         <para></para>
         <wadl:resources xmlns:wadl="http://wadl.dev.java.net/2009/02">
-            <wadl:resource href="../wadls/volume-api/src/v2/volume-api-v2.wadl#volumes">
+            <wadl:resource href="../wadls/volume-api/src/v2/wadl/volumes-v2.wadl#volumes">
                 <wadl:method href="#createVolume"/>
-                <wadl:method href="#getVolumesSimple"/>
+                <wadl:method href="#listVolumesSimple"/>
             </wadl:resource>
-            <wadl:resource href="../wadls/volume-api/src/v2/volume-api-v2.wadl#detail">
-                <wadl:method href="#getVolumesDetail"/>
+            <wadl:resource href="../wadls/volume-api/src/v2/wadl/volumes-v2.wadl#detail">
+                <wadl:method href="#listVolumesDetail"/>
             </wadl:resource>
-            <wadl:resource href="../wadls/volume-api/src/v2/volume-api-v2.wadl#volume_id">
-                <wadl:method href="#getVolume"/>
+            <wadl:resource href="../wadls/volume-api/src/v2/wadl/volumes-v2.wadl#volume_id">
+                <wadl:method href="#showVolume"/>
                 <wadl:method href="#updateVolume"/>
                 <wadl:method href="#deleteVolume"/>
             </wadl:resource>
-            <wadl:resource href="../wadls/volume-api/src/v2/volume-api-v2.wadl#volume-metadata">
+            <wadl:resource href="../wadls/volume-api/src/v2/wadl/volumes-v2.wadl#volume-metadata">
                 <wadl:method href="#showVolumeMetadata"/>
                 <wadl:method href="#updateVolumeMetadata"/>
             </wadl:resource>
@@ -158,12 +158,12 @@
             administrative role and context.
         </para>
         <wadl:resources xmlns:wadl="http://wadl.dev.java.net/2009/02">
-            <wadl:resource href="../wadls/volume-api/src/v2/os-volume-type-access-v2.wadl#volumes">
-                    <wadl:method href="#createVolumeTypeAccessExt"/>
+            <wadl:resource href="../wadls/volume-api/src/v2/wadl/volumes-v2.wadl#volumes">
+                <wadl:method href="#createVolumeTypeAccessExt"/>
             </wadl:resource>
         </wadl:resources>
     </section>
-    <section xml:id="volume-api-v2-volumes-actions">
+    <section xml:id="volumes-v2-volumes-actions">
         <title>Volume actions (volumes, action)</title>
         <para>
             Extends the size of, resets statuses for, sets image metadata for,
@@ -173,7 +173,7 @@
             storage object associated with it.
         </para>
         <wadl:resources xmlns:wadl="http://wadl.dev.java.net/2009/02">
-            <wadl:resource href="../wadls/volume-api/src/v2/volume-api-v2.wadl#volume-action">
+            <wadl:resource href="../wadls/volume-api/src/v2/wadl/volumes-v2.wadl#volume-action">
                 <wadl:method href="#extendVolume"/>
                 <wadl:method href="#resetVolume"/>
                 <wadl:method href="#setVolumeimagemetadata"/>
@@ -256,7 +256,7 @@
                     </td>
                     <td>
                         <para>
-                            An error has occurred with the backup.
+                            A backup error occurred.
                         </para>
                     </td>
                 </tr>
@@ -280,8 +280,7 @@
                     </td>
                     <td>
                         <para>
-                            An error occurred during backup restoration to a
-                            volume.
+                            A backup restoration error occurred.
                         </para>
                     </td>
                 </tr>
@@ -293,18 +292,18 @@
             in the <code>fail_reason</code> field for the backup.
         </para>
         <wadl:resources xmlns:wadl="http://wadl.dev.java.net/2009/02">
-            <wadl:resource href="../wadls/volume-api/src/v2/volume-backups-api-v2.wadl#backups">
+            <wadl:resource href="../wadls/volume-api/src/v2/wadl/backups-v2.wadl#backups">
                 <wadl:method href="#createBackup"/>
                 <wadl:method href="#listBackups"/>
             </wadl:resource>
-            <wadl:resource href="../wadls/volume-api/src/v2/volume-backups-api-v2.wadl#detail">
+            <wadl:resource href="../wadls/volume-api/src/v2/wadl/backups-v2.wadl#detail">
                 <wadl:method href="#listBackupsDetails"/>
             </wadl:resource>
-            <wadl:resource href="../wadls/volume-api/src/v2/volume-backups-api-v2.wadl#backup_id">
+            <wadl:resource href="../wadls/volume-api/src/v2/wadl/backups-v2.wadl#backup_id">
                 <wadl:method href="#showBackup"/>
                 <wadl:method href="#deleteBackup"/>
             </wadl:resource>
-            <wadl:resource href="../wadls/volume-api/src/v2/volume-backups-api-v2.wadl#restore">
+            <wadl:resource href="../wadls/volume-api/src/v2/wadl/backups-v2.wadl#restore">
                 <wadl:method href="#restoreBackup"/>
             </wadl:resource>
         </wadl:resources>
@@ -315,19 +314,19 @@
             Force-deletes a backup.
         </para>
         <wadl:resources xmlns:wadl="http://wadl.dev.java.net/2009/02">
-            <wadl:resource href="../wadls/volume-api/src/v2/volume-backups-api-v2.wadl#action">
+            <wadl:resource href="../wadls/volume-api/src/v2/wadl/backups-v2.wadl#action">
                 <wadl:method href="#forceDeleteBackup"/>
             </wadl:resource>
         </wadl:resources>
     </section>
-    <section xml:id="os-backend-capabilities-v2">
+    <section xml:id="capabilities-v2">
         <title>Capabilities for storage back ends (capabilities)</title>
         <para>
             Shows capabilities for a storage back end.
         </para>
         <wadl:resources xmlns:wadl="http://wadl.dev.java.net/2009/02">
-            <wadl:resource href="../wadls/volume-api/src/v2/os-backend-capabilities-v2.wadl#hostname">
-                    <wadl:method href="#getBackendCapabilities"/>
+            <wadl:resource href="../wadls/volume-api/src/v2/wadl/capabilities-v2.wadl#hostname">
+                <wadl:method href="#showBackendCapabilities"/>
             </wadl:resource>
         </wadl:resources>
     </section>
@@ -340,25 +339,25 @@
             Shows, updates, and deletes quotas for a tenant.
         </para>
         <wadl:resources xmlns:wadl="http://wadl.dev.java.net/2009/02">
-            <wadl:resource href="../wadls/volume-api/src/v2/os-quota-sets-v2.wadl#tenant_id_cinder_v2">
+            <wadl:resource href="../wadls/volume-api/src/v2/wadl/os-quota-sets-v2.wadl#tenant_id_cinder_v2">
                 <wadl:method href="#showQuota"/>
                 <wadl:method href="#updateQuota"/>
                 <wadl:method href="#deleteQuotas"/>
             </wadl:resource>
-            <wadl:resource href="../wadls/volume-api/src/v2/os-quota-sets-v2.wadl#defaults-cinder-v2">
-                <wadl:method href="#getDefaults"/>
+            <wadl:resource href="../wadls/volume-api/src/v2/wadl/os-quota-sets-v2.wadl#defaults-cinder-v2">
+                <wadl:method href="#showQuotaDefaults"/>
             </wadl:resource>
-            <wadl:resource href="../wadls/volume-api/src/v2/os-quota-sets-v2.wadl#user_id-cinder-v2">
+            <wadl:resource href="../wadls/volume-api/src/v2/wadl/os-quota-sets-v2.wadl#user_id-cinder-v2">
                 <wadl:method href="#showQuotaUser"/>
                 <wadl:method href="#updateQuotaUser"/>
                 <wadl:method href="#deleteQuotasUser"/>
             </wadl:resource>
-            <wadl:resource href="../wadls/volume-api/src/v2/os-quota-sets-v2.wadl#user_id-detail-cinder-v2">
+            <wadl:resource href="../wadls/volume-api/src/v2/wadl/os-quota-sets-v2.wadl#user_id-detail-cinder-v2">
                 <wadl:method href="#showQuotaDetailUser"/>
             </wadl:resource>
         </wadl:resources>
     </section>
-    <section xml:id="os-qos-v2-qos-specs">
+    <section xml:id="qos-specs-v2-qos-specs">
         <title>Quality of service (QoS) specifications (qos-specs)</title>
         <para>
             Administrators only, depending on policy settings.
@@ -369,45 +368,42 @@
             specifications.
         </para>
         <wadl:resources xmlns:wadl="http://wadl.dev.java.net/2009/02">
-            <wadl:resource href="../wadls/volume-api/src/v2/os-qos-v2.wadl#qos-specs">
+            <wadl:resource href="../wadls/volume-api/src/v2/wadl/qos-specs-v2.wadl#qos-specs">
                 <wadl:method href="#createQoSSpec"/>
                 <wadl:method href="#listQoSSpecs"/>
             </wadl:resource>
-            <wadl:resource href="../wadls/volume-api/src/v2/os-qos-v2.wadl#qos_id"/>
-            <wadl:resource href="../wadls/volume-api/src/v2/os-qos-v2.wadl#associate">
+            <wadl:resource href="../wadls/volume-api/src/v2/wadl/qos-specs-v2.wadl#qos_id"/>
+            <wadl:resource href="../wadls/volume-api/src/v2/wadl/qos-specs-v2.wadl#associate">
                 <wadl:method href="#associateQoSSpec"/>
             </wadl:resource>
-            <wadl:resource href="../wadls/volume-api/src/v2/os-qos-v2.wadl#disassociate">
+            <wadl:resource href="../wadls/volume-api/src/v2/wadl/qos-specs-v2.wadl#disassociate">
                 <wadl:method href="#disassociateQoSSpec"/>
             </wadl:resource>
-            <wadl:resource href="../wadls/volume-api/src/v2/os-qos-v2.wadl#disassociate_all">
+            <wadl:resource href="../wadls/volume-api/src/v2/wadl/qos-specs-v2.wadl#disassociate_all">
                 <wadl:method href="#disassociateQoSSpecAll"/>
             </wadl:resource>
-            <wadl:resource href="../wadls/volume-api/src/v2/os-qos-v2.wadl#associations">
-                <wadl:method href="#getQoSAssociations"/>
+            <wadl:resource href="../wadls/volume-api/src/v2/wadl/qos-specs-v2.wadl#associations">
+                <wadl:method href="#listQoSAssociations"/>
             </wadl:resource>
         </wadl:resources>
     </section>
-    <section xml:id="volume-api-v2-types">
+    <section xml:id="volumes-v2-types">
         <title>Volume types (types)</title>
         <wadl:resources xmlns:wadl="http://wadl.dev.java.net/2009/02">
-            <wadl:resource href="../wadls/volume-api/src/v2/volume-api-v2.wadl#types">
-                <wadl:method href="#getVolumeTypes"/>
-            </wadl:resource>
-            <wadl:resource
-                href="../wadls/volume-api/src/v2/volume-api-v2.wadl#types">
+            <wadl:resource href="../wadls/volume-api/src/v2/wadl/volumes-v2.wadl#types">
+                <wadl:method href="#showVolumeTypes"/>
                 <wadl:method href="#createVolumeType"/>
             </wadl:resource>
             <wadl:resource
-                href="../wadls/volume-api/src/v2/volume-api-v2.wadl#volume_type_id">
+                href="../wadls/volume-api/src/v2/wadl/volumes-v2.wadl#volume_type_id">
                 <wadl:method href="#updateVolumeType"/>
                 <wadl:method href="#updateVolumeTypeExtraSpecs"/>
-                <wadl:method href="#getVolumeType"/>
+                <wadl:method href="#showVolumeType"/>
                 <wadl:method href="#deleteVolumeType"/>
             </wadl:resource>
         </wadl:resources>
     </section>
-    <section xml:id="volume-api-v2-snapshots">
+    <section xml:id="volumes-v2-snapshots">
         <title>Volume snapshots (snapshots)</title>
         <para>
             A snapshot is a point-in-time copy of the data that a volume
@@ -472,7 +468,7 @@
                     </td>
                     <td>
                         <para>
-                            An error occurred during snapshot creation.
+                            A snapshot creation error occurred.
                         </para>
                     </td>
                 </tr>
@@ -484,7 +480,7 @@
                     </td>
                     <td>
                         <para>
-                            An error occurred during snapshot deletion.
+                            A snapshot deletion error occurred.
                         </para>
                     </td>
                 </tr>
@@ -492,19 +488,19 @@
         </table>
         <para></para>
         <wadl:resources xmlns:wadl="http://wadl.dev.java.net/2009/02">
-            <wadl:resource href="../wadls/volume-api/src/v2/volume-api-v2.wadl#snapshots">
+            <wadl:resource href="../wadls/volume-api/src/v2/wadl/volumes-v2.wadl#snapshots">
                 <wadl:method href="#createSnapshot"/>
                 <wadl:method href="#listSnapshots"/>
             </wadl:resource>
-            <wadl:resource href="../wadls/volume-api/src/v2/volume-api-v2.wadl#detail-snapshot">
+            <wadl:resource href="../wadls/volume-api/src/v2/wadl/volumes-v2.wadl#detail-snapshot">
                 <wadl:method href="#listSnapshotsDetail"/>
             </wadl:resource>
-            <wadl:resource href="../wadls/volume-api/src/v2/volume-api-v2.wadl#snapshot_id">
+            <wadl:resource href="../wadls/volume-api/src/v2/wadl/volumes-v2.wadl#snapshot_id">
                 <wadl:method href="#showSnapshot"/>
                 <wadl:method href="#updateSnapshot"/>
                 <wadl:method href="#deleteSnapshot"/>
             </wadl:resource>
-            <wadl:resource href="../wadls/volume-api/src/v2/volume-api-v2.wadl#snapshot-metadata">
+            <wadl:resource href="../wadls/volume-api/src/v2/wadl/volumes-v2.wadl#snapshot-metadata">
                 <wadl:method href="#showSnapshotMetadata"/>
                 <wadl:method href="#updateSnapshotMetadata"/>
             </wadl:resource>
@@ -516,14 +512,14 @@
             Creates volumes by using existing storage instead of allocating
             new storage.
         </para>
-        <wadl:resources href="../wadls/volume-api/src/v2/os-volume-manage-v2.wadl"/>
+        <wadl:resources href="../wadls/volume-api/src/v2/wadl/os-volume-manage-v2.wadl"/>
     </section>
     <section xml:id="os-vol-image-meta-v2">
         <title>Volume image metadata extension (os-vol-image-meta)</title>
         <para>
             Shows image metadata that is associated with a volume.
         </para>
-        <wadl:resources href="../wadls/volume-api/src/v2/os-vol-image-meta-v2.wadl"/>
+        <wadl:resources href="../wadls/volume-api/src/v2/wadl/os-vol-image-meta-v2.wadl"/>
     </section>
     <section xml:id="os-vol-pool-v2">
         <title>Back-end storage pools</title>
@@ -531,14 +527,14 @@
             Administrator only. Lists all back-end storage pools that are
             known to the scheduler service.
         </para>
-        <wadl:resources href="../wadls/volume-api/src/v2/os-vol-pool-v2.wadl"/>
+        <wadl:resources href="../wadls/volume-api/src/v2/wadl/scheduler-stats-v2.wadl"/>
     </section>
     <section xml:id="os-vol-transfer-v2">
         <title>Volume transfer</title>
         <para>
             Transfers a volume from one user to another user.
         </para>
-        <wadl:resources href="../wadls/volume-api/src/v2/os-volume-transfer-api-v2.wadl"/>
+        <wadl:resources href="../wadls/volume-api/src/v2/wadl/os-volume-transfer-v2.wadl"/>
     </section>
     <section xml:id="consistencygroups-v2">
         <title>Consistency groups</title>
@@ -554,7 +550,7 @@
             Use the <code>policy.json</code> file to grant permissions
             for these actions to limit roles.
         </para>
-        <wadl:resources href="../wadls/volume-api/src/v2/consistencygroups-v2.wadl"/>
+        <wadl:resources href="../wadls/volume-api/src/v2/wadl/consistencygroups-v2.wadl"/>
     </section>
     <section xml:id="os-cgsnapshots-v2">
         <title>Consistency group snapshots</title>
@@ -562,6 +558,6 @@
             Lists all, lists all with details, shows details for, creates, and
             deletes consistency group snapshots.
         </para>
-        <wadl:resources href="../wadls/volume-api/src/v2/cgsnapshots-v2.wadl"/>
+        <wadl:resources href="../wadls/volume-api/src/v2/wadl/cgsnapshots-v2.wadl"/>
     </section>
 </chapter>
diff --git a/api-ref/src/wadls/common_project.ent b/api-ref/src/wadls/common_project.ent
index 39bb879e3..c8574627c 100644
--- a/api-ref/src/wadls/common_project.ent
+++ b/api-ref/src/wadls/common_project.ent
@@ -1,31 +1,30 @@
 <!-- Pagination request parameters: Limit and Marker -->
 <!ENTITY limitReqParameter '
 <param xmlns="http://wadl.dev.java.net/2009/02" name="limit"
-       style="query" required="false" type="xsd:int">
+    style="query" required="false" type="xsd:int">
     <wadl:doc xmlns="http://docbook.org/ns/docbook"
-              xmlns:wadl="http://wadl.dev.java.net/2009/02"
-              xml:lang="EN">
+        xmlns:wadl="http://wadl.dev.java.net/2009/02"
+        xml:lang="EN">
         <para>
-            Requests a page size of returned items from the query.
-            Returns a number of items up to a limit value. Use the
-            <code>limit</code> parameter to make an initial limited request
-            and use the ID of the last-seen item from the response as the
-            <code>marker</code> parameter value in a subsequent limited
-            request.
+            Requests a page size of items. Returns a number of items up to a
+            limit value. Use the <code>limit</code> parameter to make an
+            initial limited request and use the ID of the last-seen item from
+            the response as the <code>marker</code> parameter value in a
+            subsequent limited request.
         </para>
     </wadl:doc>
 </param>'>
 <!ENTITY markerReqParameter '
 <param xmlns="http://wadl.dev.java.net/2009/02" name="marker"
-       style="query" required="false" type="xsd:string">
+    style="query" required="false" type="xsd:string">
     <wadl:doc xmlns="http://docbook.org/ns/docbook"
-          xmlns:wadl="http://wadl.dev.java.net/2009/02"
-          xml:lang="EN">
+        xmlns:wadl="http://wadl.dev.java.net/2009/02"
+        xml:lang="EN">
         <para>
-            Specifies the ID of the last-seen item. Use the <code>limit</code>
-            parameter to make an initial limited request and use the ID of the
-            last-seen item from the response as the <code>marker</code>
-            parameter value in a subsequent limited request.
+            The ID of the last-seen item. Use the <code>limit</code> parameter
+            to make an initial limited request and use the ID of the last-seen
+            item from the response as the <code>marker</code> parameter value
+            in a subsequent limited request.
         </para>
     </wadl:doc>
 </param>'>
@@ -36,11 +35,11 @@
 <!-- ISO 8601 request parameters  -->
 <!ENTITY before_timestamp-QueryParameter '
 <param xmlns="http://wadl.dev.java.net/2009/02"
-   name="before_timestamp" style="query" required="true"
-   type="xsd:dateTime">
+    name="before_timestamp" style="query" required="true"
+    type="xsd:dateTime">
     <wadl:doc xmlns="http://docbook.org/ns/docbook"
-              xmlns:wadl="http://wadl.dev.java.net/2009/02"
-              xml:lang="EN">
+        xmlns:wadl="http://wadl.dev.java.net/2009/02"
+        xml:lang="EN">
         <para>
             The date and time before which to list usage audits.
         </para>
@@ -65,18 +64,18 @@
 <param xmlns="http://wadl.dev.java.net/2009/02"
     name="changes-since" style="query" required="false" type="xsd:dateTime">
     <wadl:doc xmlns="http://docbook.org/ns/docbook"
-              xmlns:wadl="http://wadl.dev.java.net/2009/02"
-              xml:lang="EN">
+        xmlns:wadl="http://wadl.dev.java.net/2009/02"
+        xml:lang="EN">
         <para>
             The date and time when the image or server last changed status.
         </para>
         <para>
-            Use this query parameter to check for changes since a previous request
-            rather than re-downloading and re-parsing the full status at each
-            polling interval. If data has changed, only the items changed since
-            the <code>changes-since</code> time are returned in the response. If
-            data has not changed since the <code>changes-since</code> time, an
-            empty list is returned.
+            Use this query parameter to check for changes since a previous
+            request rather than re-downloading and re-parsing the full status
+            at each polling interval. If data has changed, the response
+            returns only the items that have changed since the
+            <code>changes-since</code> time. If data has not changed since the
+            <code>changes-since</code> time, the response returns an empty list.
         </para>
         <para>
             For example, issue a &GET; request against the following endpoint to
@@ -86,9 +85,10 @@
         <programlisting>GET /v2/010101/servers?changes-since=2015-01-24T17:08:00Z</programlisting>
         <para>
             To enable you to keep track of changes, this filter also displays
-            images and servers that were deleted if the <code>changes-since</code>
-            value specifies a date in the last 30 days. Items deleted more than 30
-            days ago might be returned, but it is not guaranteed.
+            deleted images and servers if the <code>changes-since</code> value
+            specifies a date in the last 30 days. The response might include
+            items that were deleted more than 30 days ago, but it is not
+            guaranteed.
         </para>
         <para>
             The date and time stamp format is <link
@@ -189,15 +189,17 @@
 </param>'>
 <!ENTITY oauth_nonce-RequestParameter '
 <param xmlns="http://wadl.dev.java.net/2009/02" name="oauth_nonce"
-       style="plain" required="false" type="xsd:string">
+    style="plain" required="false" type="xsd:string">
     <wadl:doc xmlns="http://docbook.org/ns/docbook"
         xmlns:wadl="http://wadl.dev.java.net/2009/02" xml:lang="EN">
         <para>
-            The nonce. This random string is uniquely generated for each
-            request and enables the service provider to verify that a request has never
-            been made before. A nonce helps prevent replay attacks when requests are made
-            over a non-secure channel, such as HTTP. For information, see <link
-            xlink:href="http://oauth.net/core/1.0a/#nonce">Nonce and Timestamp</link>.
+            The nonce. The API generates this unique, random string for each
+            request and enables the service provider to verify that a request
+            has never been made before. A nonce helps prevent replay attacks
+            when requests are made over a non-secure channel, such as HTTP.
+            For information, see <link
+            xlink:href="http://oauth.net/core/1.0a/#nonce">Nonce and
+            Timestamp</link>.
         </para>
     </wadl:doc>
 </param>'>
@@ -693,7 +695,7 @@
             Wed, 26 Aug 2015 19:57:28 GMT</code>.
         </para>
         <para>
-            If not set, this header is not returned by this operation.
+            If not set, this operation does not return this header.
         </para>
     </wadl:doc>
 </param>'>
diff --git a/api-ref/src/wadls/volume-api/src/v1/api_samples/os-quota-sets/quotas-user-show-get-resp.json b/api-ref/src/wadls/volume-api/src/v1/api_samples/os-quota-sets/quotas-user-show-get-resp.json
deleted file mode 100644
index 70d4b66eb..000000000
--- a/api-ref/src/wadls/volume-api/src/v1/api_samples/os-quota-sets/quotas-user-show-get-resp.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "quota_set": {
-        "cores": 20,
-        "floating_ips": 10,
-        "id": "fake_tenant",
-        "injected_file_content_bytes": 10240,
-        "injected_file_path_bytes": 255,
-        "injected_files": 5,
-        "instances": 10,
-        "key_pairs": 100,
-        "metadata_items": 128,
-        "ram": 51200,
-        "security_group_rules": 20,
-        "security_groups": 10
-    }
-}
\ No newline at end of file
diff --git a/api-ref/src/wadls/volume-api/src/v1/api_samples/os-quota-sets/quotas-user-show-get-resp.xml b/api-ref/src/wadls/volume-api/src/v1/api_samples/os-quota-sets/quotas-user-show-get-resp.xml
deleted file mode 100644
index ef52457e0..000000000
--- a/api-ref/src/wadls/volume-api/src/v1/api_samples/os-quota-sets/quotas-user-show-get-resp.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<quota_set id="fake_tenant">
-    <cores>20</cores>
-    <floating_ips>10</floating_ips>
-    <injected_file_content_bytes>10240</injected_file_content_bytes>
-    <injected_file_path_bytes>255</injected_file_path_bytes>
-    <injected_files>5</injected_files>
-    <instances>10</instances>
-    <key_pairs>100</key_pairs>
-    <metadata_items>128</metadata_items>
-    <ram>51200</ram>
-    <security_group_rules>20</security_group_rules>
-    <security_groups>10</security_groups>
-</quota_set>
diff --git a/api-ref/src/wadls/volume-api/src/v1/api_samples/versionv1-get-resp.json b/api-ref/src/wadls/volume-api/src/v1/api_samples/versionv1-get-resp.json
deleted file mode 100644
index 63c8957a2..000000000
--- a/api-ref/src/wadls/volume-api/src/v1/api_samples/versionv1-get-resp.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-    "version": {
-        "id": "v1.0",
-        "links": [
-            {
-                "href": "http://23.253.211.234:8776/v1/",
-                "rel": "self"
-            },
-            {
-                "href": "http://docs.openstack.org/",
-                "rel": "describedby",
-                "type": "text/html"
-            }
-        ],
-        "media-types": [
-            {
-                "base": "application/xml",
-                "type": "application/vnd.openstack.volume+xml;version=1"
-            },
-            {
-                "base": "application/json",
-                "type": "application/vnd.openstack.volume+json;version=1"
-            }
-        ],
-        "status": "DEPRECATED",
-        "updated": "2014-06-28T12:20:21Z"
-    }
-}
diff --git a/api-ref/src/wadls/volume-api/src/v1/api_samples/os-quota-sets/quotas-show-defaults-get-resp.json b/api-ref/src/wadls/volume-api/src/v1/samples/os-quota-sets/quotas-defaults-show-response.json
similarity index 99%
rename from api-ref/src/wadls/volume-api/src/v1/api_samples/os-quota-sets/quotas-show-defaults-get-resp.json
rename to api-ref/src/wadls/volume-api/src/v1/samples/os-quota-sets/quotas-defaults-show-response.json
index 0f5407545..239c64d23 100644
--- a/api-ref/src/wadls/volume-api/src/v1/api_samples/os-quota-sets/quotas-show-defaults-get-resp.json
+++ b/api-ref/src/wadls/volume-api/src/v1/samples/os-quota-sets/quotas-defaults-show-response.json
@@ -14,4 +14,4 @@
         "security_group_rules": 20,
         "security_groups": 10
     }
-}
\ No newline at end of file
+}
diff --git a/api-ref/src/wadls/volume-api/src/v1/api_samples/os-quota-sets/quotas-show-defaults-get-resp.xml b/api-ref/src/wadls/volume-api/src/v1/samples/os-quota-sets/quotas-defaults-show-response.xml
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v1/api_samples/os-quota-sets/quotas-show-defaults-get-resp.xml
rename to api-ref/src/wadls/volume-api/src/v1/samples/os-quota-sets/quotas-defaults-show-response.xml
diff --git a/api-ref/src/wadls/volume-api/src/v1/api_samples/os-quota-sets/quotas-show-get-resp.json b/api-ref/src/wadls/volume-api/src/v1/samples/os-quota-sets/quotas-show-response.json
similarity index 99%
rename from api-ref/src/wadls/volume-api/src/v1/api_samples/os-quota-sets/quotas-show-get-resp.json
rename to api-ref/src/wadls/volume-api/src/v1/samples/os-quota-sets/quotas-show-response.json
index 0f5407545..239c64d23 100644
--- a/api-ref/src/wadls/volume-api/src/v1/api_samples/os-quota-sets/quotas-show-get-resp.json
+++ b/api-ref/src/wadls/volume-api/src/v1/samples/os-quota-sets/quotas-show-response.json
@@ -14,4 +14,4 @@
         "security_group_rules": 20,
         "security_groups": 10
     }
-}
\ No newline at end of file
+}
diff --git a/api-ref/src/wadls/volume-api/src/v1/api_samples/os-quota-sets/quotas-show-get-resp.xml b/api-ref/src/wadls/volume-api/src/v1/samples/os-quota-sets/quotas-show-response.xml
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v1/api_samples/os-quota-sets/quotas-show-get-resp.xml
rename to api-ref/src/wadls/volume-api/src/v1/samples/os-quota-sets/quotas-show-response.xml
diff --git a/api-ref/src/wadls/volume-api/src/v1/api_samples/os-quota-sets/quotas-update-post-req.json b/api-ref/src/wadls/volume-api/src/v1/samples/os-quota-sets/quotas-update-request.json
similarity index 96%
rename from api-ref/src/wadls/volume-api/src/v1/api_samples/os-quota-sets/quotas-update-post-req.json
rename to api-ref/src/wadls/volume-api/src/v1/samples/os-quota-sets/quotas-update-request.json
index 0b78cff30..1f12caa04 100644
--- a/api-ref/src/wadls/volume-api/src/v1/api_samples/os-quota-sets/quotas-update-post-req.json
+++ b/api-ref/src/wadls/volume-api/src/v1/samples/os-quota-sets/quotas-update-request.json
@@ -2,4 +2,4 @@
     "quota_set": {
         "security_groups": 45
     }
-}
\ No newline at end of file
+}
diff --git a/api-ref/src/wadls/volume-api/src/v1/api_samples/os-quota-sets/quotas-update-post-req.xml b/api-ref/src/wadls/volume-api/src/v1/samples/os-quota-sets/quotas-update-request.xml
similarity index 89%
rename from api-ref/src/wadls/volume-api/src/v1/api_samples/os-quota-sets/quotas-update-post-req.xml
rename to api-ref/src/wadls/volume-api/src/v1/samples/os-quota-sets/quotas-update-request.xml
index 4bb7b3a47..596ce56ac 100644
--- a/api-ref/src/wadls/volume-api/src/v1/api_samples/os-quota-sets/quotas-update-post-req.xml
+++ b/api-ref/src/wadls/volume-api/src/v1/samples/os-quota-sets/quotas-update-request.xml
@@ -1,4 +1,4 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <quota_set id="fake_tenant">
   <security_groups>45</security_groups>
-</quota_set>
\ No newline at end of file
+</quota_set>
diff --git a/api-ref/src/wadls/volume-api/src/v1/api_samples/os-quota-sets/quotas-update-post-resp.json b/api-ref/src/wadls/volume-api/src/v1/samples/os-quota-sets/quotas-update-response.json
similarity index 99%
rename from api-ref/src/wadls/volume-api/src/v1/api_samples/os-quota-sets/quotas-update-post-resp.json
rename to api-ref/src/wadls/volume-api/src/v1/samples/os-quota-sets/quotas-update-response.json
index e64b50df6..2be76d472 100644
--- a/api-ref/src/wadls/volume-api/src/v1/api_samples/os-quota-sets/quotas-update-post-resp.json
+++ b/api-ref/src/wadls/volume-api/src/v1/samples/os-quota-sets/quotas-update-response.json
@@ -13,4 +13,4 @@
         "security_group_rules": 20,
         "security_groups": 45
     }
-}
\ No newline at end of file
+}
diff --git a/api-ref/src/wadls/volume-api/src/v1/api_samples/os-quota-sets/quotas-update-post-resp.xml b/api-ref/src/wadls/volume-api/src/v1/samples/os-quota-sets/quotas-update-response.xml
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v1/api_samples/os-quota-sets/quotas-update-post-resp.xml
rename to api-ref/src/wadls/volume-api/src/v1/samples/os-quota-sets/quotas-update-response.xml
diff --git a/api-ref/src/wadls/volume-api/src/v1/api_samples/os-quota-sets/quotas-user-show-detail-get-resp.json b/api-ref/src/wadls/volume-api/src/v1/samples/os-user-quotas/user-quotas-show-detail-response.json
similarity index 99%
rename from api-ref/src/wadls/volume-api/src/v1/api_samples/os-quota-sets/quotas-user-show-detail-get-resp.json
rename to api-ref/src/wadls/volume-api/src/v1/samples/os-user-quotas/user-quotas-show-detail-response.json
index 6948bb67b..53ecff0ba 100644
--- a/api-ref/src/wadls/volume-api/src/v1/api_samples/os-quota-sets/quotas-user-show-detail-get-resp.json
+++ b/api-ref/src/wadls/volume-api/src/v1/samples/os-user-quotas/user-quotas-show-detail-response.json
@@ -61,4 +61,4 @@
             "reserved": 0
         }
     }
-}
\ No newline at end of file
+}
diff --git a/api-ref/src/wadls/volume-api/src/v1/api_samples/os-user-quotas/user-quotas-show-get-resp.json b/api-ref/src/wadls/volume-api/src/v1/samples/os-user-quotas/user-quotas-show-response.json
similarity index 99%
rename from api-ref/src/wadls/volume-api/src/v1/api_samples/os-user-quotas/user-quotas-show-get-resp.json
rename to api-ref/src/wadls/volume-api/src/v1/samples/os-user-quotas/user-quotas-show-response.json
index 0f5407545..239c64d23 100644
--- a/api-ref/src/wadls/volume-api/src/v1/api_samples/os-user-quotas/user-quotas-show-get-resp.json
+++ b/api-ref/src/wadls/volume-api/src/v1/samples/os-user-quotas/user-quotas-show-response.json
@@ -14,4 +14,4 @@
         "security_group_rules": 20,
         "security_groups": 10
     }
-}
\ No newline at end of file
+}
diff --git a/api-ref/src/wadls/volume-api/src/v1/api_samples/os-user-quotas/user-quotas-show-get-resp.xml b/api-ref/src/wadls/volume-api/src/v1/samples/os-user-quotas/user-quotas-show-response.xml
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v1/api_samples/os-user-quotas/user-quotas-show-get-resp.xml
rename to api-ref/src/wadls/volume-api/src/v1/samples/os-user-quotas/user-quotas-show-response.xml
diff --git a/api-ref/src/wadls/volume-api/src/v1/api_samples/os-user-quotas/user-quotas-update-post-req.json b/api-ref/src/wadls/volume-api/src/v1/samples/os-user-quotas/user-quotas-update-request.json
similarity index 97%
rename from api-ref/src/wadls/volume-api/src/v1/api_samples/os-user-quotas/user-quotas-update-post-req.json
rename to api-ref/src/wadls/volume-api/src/v1/samples/os-user-quotas/user-quotas-update-request.json
index cbd6f18af..b322b2a87 100644
--- a/api-ref/src/wadls/volume-api/src/v1/api_samples/os-user-quotas/user-quotas-update-post-req.json
+++ b/api-ref/src/wadls/volume-api/src/v1/samples/os-user-quotas/user-quotas-update-request.json
@@ -3,4 +3,4 @@
         "force": "True",
         "instances": 9
     }
-}
\ No newline at end of file
+}
diff --git a/api-ref/src/wadls/volume-api/src/v1/api_samples/os-user-quotas/user-quotas-update-post-req.xml b/api-ref/src/wadls/volume-api/src/v1/samples/os-user-quotas/user-quotas-update-request.xml
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v1/api_samples/os-user-quotas/user-quotas-update-post-req.xml
rename to api-ref/src/wadls/volume-api/src/v1/samples/os-user-quotas/user-quotas-update-request.xml
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/os-user-quotas/user-quotas-update-post-resp.json b/api-ref/src/wadls/volume-api/src/v1/samples/os-user-quotas/user-quotas-update-response.json
similarity index 99%
rename from api-ref/src/wadls/volume-api/src/v2/api_samples/os-user-quotas/user-quotas-update-post-resp.json
rename to api-ref/src/wadls/volume-api/src/v1/samples/os-user-quotas/user-quotas-update-response.json
index 9fbee648b..553933292 100644
--- a/api-ref/src/wadls/volume-api/src/v2/api_samples/os-user-quotas/user-quotas-update-post-resp.json
+++ b/api-ref/src/wadls/volume-api/src/v1/samples/os-user-quotas/user-quotas-update-response.json
@@ -13,4 +13,4 @@
         "security_group_rules": 20,
         "security_groups": 10
     }
-}
\ No newline at end of file
+}
diff --git a/api-ref/src/wadls/volume-api/src/v1/api_samples/os-user-quotas/user-quotas-update-post-resp.xml b/api-ref/src/wadls/volume-api/src/v1/samples/os-user-quotas/user-quotas-update-response.xml
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v1/api_samples/os-user-quotas/user-quotas-update-post-resp.xml
rename to api-ref/src/wadls/volume-api/src/v1/samples/os-user-quotas/user-quotas-update-response.xml
diff --git a/api-ref/src/wadls/volume-api/src/v1/api_samples/snapshot_create.json b/api-ref/src/wadls/volume-api/src/v1/samples/volumes/snapshot-create-request.json
similarity index 98%
rename from api-ref/src/wadls/volume-api/src/v1/api_samples/snapshot_create.json
rename to api-ref/src/wadls/volume-api/src/v1/samples/volumes/snapshot-create-request.json
index ffe9dd372..cc8ce2865 100644
--- a/api-ref/src/wadls/volume-api/src/v1/api_samples/snapshot_create.json
+++ b/api-ref/src/wadls/volume-api/src/v1/samples/volumes/snapshot-create-request.json
@@ -5,4 +5,4 @@
         "volume_id": "521752a6-acf6-4b2d-bc7a-119f9148cd8c",
         "force": true
     }
-}
\ No newline at end of file
+}
diff --git a/api-ref/src/wadls/volume-api/src/v1/api_samples/snapshot_create.xml b/api-ref/src/wadls/volume-api/src/v1/samples/volumes/snapshot-create-request.xml
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v1/api_samples/snapshot_create.xml
rename to api-ref/src/wadls/volume-api/src/v1/samples/volumes/snapshot-create-request.xml
diff --git a/api-ref/src/wadls/volume-api/src/v1/api_samples/snapshot_metadata_response.json b/api-ref/src/wadls/volume-api/src/v1/samples/volumes/snapshot-metadata-show-response.json
similarity index 99%
rename from api-ref/src/wadls/volume-api/src/v1/api_samples/snapshot_metadata_response.json
rename to api-ref/src/wadls/volume-api/src/v1/samples/volumes/snapshot-metadata-show-response.json
index d833b1f49..68c54641d 100644
--- a/api-ref/src/wadls/volume-api/src/v1/api_samples/snapshot_metadata_response.json
+++ b/api-ref/src/wadls/volume-api/src/v1/samples/volumes/snapshot-metadata-show-response.json
@@ -13,4 +13,4 @@
         "id": "dfcd17fe-3b64-44ba-b95f-1c9c7109ef95",
         "name": "my-snapshot"
     }
-}
\ No newline at end of file
+}
diff --git a/api-ref/src/wadls/volume-api/src/v1/api_samples/snapshot_metadata_response.xml b/api-ref/src/wadls/volume-api/src/v1/samples/volumes/snapshot-metadata-show-response.xml
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v1/api_samples/snapshot_metadata_response.xml
rename to api-ref/src/wadls/volume-api/src/v1/samples/volumes/snapshot-metadata-show-response.xml
diff --git a/api-ref/src/wadls/volume-api/src/v1/api_samples/snapshot_update_metadata_request.json b/api-ref/src/wadls/volume-api/src/v1/samples/volumes/snapshot-metadata-update-request.json
similarity index 95%
rename from api-ref/src/wadls/volume-api/src/v1/api_samples/snapshot_update_metadata_request.json
rename to api-ref/src/wadls/volume-api/src/v1/samples/volumes/snapshot-metadata-update-request.json
index d8c2868a9..75accc1a6 100644
--- a/api-ref/src/wadls/volume-api/src/v1/api_samples/snapshot_update_metadata_request.json
+++ b/api-ref/src/wadls/volume-api/src/v1/samples/volumes/snapshot-metadata-update-request.json
@@ -2,4 +2,4 @@
     "metadata": {
         "key": "v1"
     }
-}
\ No newline at end of file
+}
diff --git a/api-ref/src/wadls/volume-api/src/v1/api_samples/snapshot_update_metadata_request.xml b/api-ref/src/wadls/volume-api/src/v1/samples/volumes/snapshot-metadata-update-request.xml
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v1/api_samples/snapshot_update_metadata_request.xml
rename to api-ref/src/wadls/volume-api/src/v1/samples/volumes/snapshot-metadata-update-request.xml
diff --git a/api-ref/src/wadls/volume-api/src/v1/api_samples/snapshot_update_metadata_response.json b/api-ref/src/wadls/volume-api/src/v1/samples/volumes/snapshot-metadata-update-response.json
similarity index 95%
rename from api-ref/src/wadls/volume-api/src/v1/api_samples/snapshot_update_metadata_response.json
rename to api-ref/src/wadls/volume-api/src/v1/samples/volumes/snapshot-metadata-update-response.json
index d8c2868a9..75accc1a6 100644
--- a/api-ref/src/wadls/volume-api/src/v1/api_samples/snapshot_update_metadata_response.json
+++ b/api-ref/src/wadls/volume-api/src/v1/samples/volumes/snapshot-metadata-update-response.json
@@ -2,4 +2,4 @@
     "metadata": {
         "key": "v1"
     }
-}
\ No newline at end of file
+}
diff --git a/api-ref/src/wadls/volume-api/src/v1/api_samples/snapshot_update_metadata_response.xml b/api-ref/src/wadls/volume-api/src/v1/samples/volumes/snapshot-metadata-update-response.xml
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v1/api_samples/snapshot_update_metadata_response.xml
rename to api-ref/src/wadls/volume-api/src/v1/samples/volumes/snapshot-metadata-update-response.xml
diff --git a/api-ref/src/wadls/volume-api/src/v1/api_samples/snapshot_show.json b/api-ref/src/wadls/volume-api/src/v1/samples/volumes/snapshot-show-response.json
similarity index 99%
rename from api-ref/src/wadls/volume-api/src/v1/api_samples/snapshot_show.json
rename to api-ref/src/wadls/volume-api/src/v1/samples/volumes/snapshot-show-response.json
index 8f5923b58..f1514e860 100644
--- a/api-ref/src/wadls/volume-api/src/v1/api_samples/snapshot_show.json
+++ b/api-ref/src/wadls/volume-api/src/v1/samples/volumes/snapshot-show-response.json
@@ -8,4 +8,4 @@
         "size": 30,
         "created_at": "2012-02-29T03:50:07Z"
     }
-}
\ No newline at end of file
+}
diff --git a/api-ref/src/wadls/volume-api/src/v1/api_samples/snapshot_show.xml b/api-ref/src/wadls/volume-api/src/v1/samples/volumes/snapshot-show-response.xml
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v1/api_samples/snapshot_show.xml
rename to api-ref/src/wadls/volume-api/src/v1/samples/volumes/snapshot-show-response.xml
diff --git a/api-ref/src/wadls/volume-api/src/v1/api_samples/snapshot_list_simple.json b/api-ref/src/wadls/volume-api/src/v1/samples/volumes/snapshots-list-response.json
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v1/api_samples/snapshot_list_simple.json
rename to api-ref/src/wadls/volume-api/src/v1/samples/volumes/snapshots-list-response.json
diff --git a/api-ref/src/wadls/volume-api/src/v1/api_samples/snapshot_list_simple.xml b/api-ref/src/wadls/volume-api/src/v1/samples/volumes/snapshots-list-response.xml
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v1/api_samples/snapshot_list_simple.xml
rename to api-ref/src/wadls/volume-api/src/v1/samples/volumes/snapshots-list-response.xml
diff --git a/api-ref/src/wadls/volume-api/src/v1/api_samples/version-get-resp.json b/api-ref/src/wadls/volume-api/src/v1/samples/volumes/version-show-response.json
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v1/api_samples/version-get-resp.json
rename to api-ref/src/wadls/volume-api/src/v1/samples/volumes/version-show-response.json
diff --git a/api-ref/src/wadls/volume-api/src/v1/api_samples/cinder-versions-response.json b/api-ref/src/wadls/volume-api/src/v1/samples/volumes/versions-list-response.json
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v1/api_samples/cinder-versions-response.json
rename to api-ref/src/wadls/volume-api/src/v1/samples/volumes/versions-list-response.json
diff --git a/api-ref/src/wadls/volume-api/src/v1/api_samples/volume_create.json b/api-ref/src/wadls/volume-api/src/v1/samples/volumes/volume-create-request.json
similarity index 99%
rename from api-ref/src/wadls/volume-api/src/v1/api_samples/volume_create.json
rename to api-ref/src/wadls/volume-api/src/v1/samples/volumes/volume-create-request.json
index 8d337ff21..fbbfe360c 100644
--- a/api-ref/src/wadls/volume-api/src/v1/api_samples/volume_create.json
+++ b/api-ref/src/wadls/volume-api/src/v1/samples/volumes/volume-create-request.json
@@ -9,4 +9,4 @@
         },
         "availability_zone": "us-east1"
     }
-}
\ No newline at end of file
+}
diff --git a/api-ref/src/wadls/volume-api/src/v1/api_samples/volume_create.xml b/api-ref/src/wadls/volume-api/src/v1/samples/volumes/volume-create-request.xml
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v1/api_samples/volume_create.xml
rename to api-ref/src/wadls/volume-api/src/v1/samples/volumes/volume-create-request.xml
diff --git a/api-ref/src/wadls/volume-api/src/v1/api_samples/volume_show.json b/api-ref/src/wadls/volume-api/src/v1/samples/volumes/volume-show-response.json
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v1/api_samples/volume_show.json
rename to api-ref/src/wadls/volume-api/src/v1/samples/volumes/volume-show-response.json
diff --git a/api-ref/src/wadls/volume-api/src/v1/api_samples/volume_show.xml b/api-ref/src/wadls/volume-api/src/v1/samples/volumes/volume-show-response.xml
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v1/api_samples/volume_show.xml
rename to api-ref/src/wadls/volume-api/src/v1/samples/volumes/volume-show-response.xml
diff --git a/api-ref/src/wadls/volume-api/src/v1/api_samples/volume_type_create_request.json b/api-ref/src/wadls/volume-api/src/v1/samples/volumes/volume-type-create-request.json
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v1/api_samples/volume_type_create_request.json
rename to api-ref/src/wadls/volume-api/src/v1/samples/volumes/volume-type-create-request.json
diff --git a/api-ref/src/wadls/volume-api/src/v1/api_samples/volume_type_create_request.xml b/api-ref/src/wadls/volume-api/src/v1/samples/volumes/volume-type-create-request.xml
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v1/api_samples/volume_type_create_request.xml
rename to api-ref/src/wadls/volume-api/src/v1/samples/volumes/volume-type-create-request.xml
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/volume_type_show.json b/api-ref/src/wadls/volume-api/src/v1/samples/volumes/volume-type-show-response.json
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v2/api_samples/volume_type_show.json
rename to api-ref/src/wadls/volume-api/src/v1/samples/volumes/volume-type-show-response.json
diff --git a/api-ref/src/wadls/volume-api/src/v1/api_samples/volume_type_show.xml b/api-ref/src/wadls/volume-api/src/v1/samples/volumes/volume-type-show-response.xml
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v1/api_samples/volume_type_show.xml
rename to api-ref/src/wadls/volume-api/src/v1/samples/volumes/volume-type-show-response.xml
diff --git a/api-ref/src/wadls/volume-api/src/v1/api_samples/volume_type_list.json b/api-ref/src/wadls/volume-api/src/v1/samples/volumes/volume-types-list-response.json
similarity index 99%
rename from api-ref/src/wadls/volume-api/src/v1/api_samples/volume_type_list.json
rename to api-ref/src/wadls/volume-api/src/v1/samples/volumes/volume-types-list-response.json
index d39da2592..dc4ae5046 100644
--- a/api-ref/src/wadls/volume-api/src/v1/api_samples/volume_type_list.json
+++ b/api-ref/src/wadls/volume-api/src/v1/samples/volumes/volume-types-list-response.json
@@ -13,4 +13,4 @@
             "extra_specs": {}
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/api-ref/src/wadls/volume-api/src/v1/api_samples/volume_type_list.xml b/api-ref/src/wadls/volume-api/src/v1/samples/volumes/volume-types-list-response.xml
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v1/api_samples/volume_type_list.xml
rename to api-ref/src/wadls/volume-api/src/v1/samples/volumes/volume-types-list-response.xml
diff --git a/api-ref/src/wadls/volume-api/src/v1/api_samples/volume_list_simple.json b/api-ref/src/wadls/volume-api/src/v1/samples/volumes/volumes-list-response.json
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v1/api_samples/volume_list_simple.json
rename to api-ref/src/wadls/volume-api/src/v1/samples/volumes/volumes-list-response.json
diff --git a/api-ref/src/wadls/volume-api/src/v1/api_samples/volume_list_simple.xml b/api-ref/src/wadls/volume-api/src/v1/samples/volumes/volumes-list-response.xml
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v1/api_samples/volume_list_simple.xml
rename to api-ref/src/wadls/volume-api/src/v1/samples/volumes/volumes-list-response.xml
diff --git a/api-ref/src/wadls/volume-api/src/v1/os-quota-sets-v1.wadl b/api-ref/src/wadls/volume-api/src/v1/wadl/os-quota-sets-v1.wadl
similarity index 78%
rename from api-ref/src/wadls/volume-api/src/v1/os-quota-sets-v1.wadl
rename to api-ref/src/wadls/volume-api/src/v1/wadl/os-quota-sets-v1.wadl
index a2820ac12..85ec08ffe 100644
--- a/api-ref/src/wadls/volume-api/src/v1/os-quota-sets-v1.wadl
+++ b/api-ref/src/wadls/volume-api/src/v1/wadl/os-quota-sets-v1.wadl
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- (C) 2013-2015 OpenStack Foundation, All Rights Reserved -->
 <!DOCTYPE application [
-    <!ENTITY % common  SYSTEM "../v2/common.ent">
+    <!ENTITY % common  SYSTEM "../../v2/common.ent">
     %common;
-    <!ENTITY % common  SYSTEM "../common_project.ent">
+    <!ENTITY % common_project  SYSTEM "../../../../common_project.ent">
     %common_project;
 ]>
 <application xmlns="http://wadl.dev.java.net/2009/02"
@@ -16,62 +16,25 @@
         <resource id="version-cinder-v1" type="#VersionDetails"
             path="//v1">
             <resource id="tenant_id-cinder-v1" path="{tenant_id}">
-                &tenantIdRequestParameter;
+                &tenant_idTemplateParameter;
                 <resource id="os-quota-sets-cinder-for-v1"
                     path="os-quota-sets">
                     <resource path="{tenant_id}"
                         id="tenant_id-quotas-cinder-v1">
-                        <param name="tenant_id" style="template"
-                            type="xsd:string" required="true">
-                            <wadl:doc
-                                xmlns="http://docbook.org/ns/docbook"
-                                xml:lang="EN" title="Project ID">
-                                <para>
-                                    The ID for the tenant for which you want
-                                    to show, update, or delete quotas. This ID
-                                    is different from the first tenant ID that
-                                    you specify in the URI: That ID is for the
-                                    admin tenant.
-                               </para>
-                            </wadl:doc>
-                        </param>
+                        &tenant_idTemplateParameter2;
                         <method href="#showQuota"/>
                         <method href="#updateQuota"/>
                         <method href="#deleteQuotas"/>
                     </resource>
                     <resource path="defaults" id="defaults-cinder-v1">
-                        <method href="#getDefaults"/>
+                        <method href="#showQuotaDefaults"/>
                     </resource>
                     <resource path="{tenant_id}"
                         id="tenantID-cinder-v1">
-                        <param name="tenant_id" style="template"
-                            type="xsd:string" required="true">
-                            <wadl:doc
-                                xmlns="http://docbook.org/ns/docbook"
-                                xml:lang="EN" title="Project ID">
-                                <para>
-                                    The ID of the tenant for which you want to
-                                    show or update quotas. This ID is
-                                    different from the first tenant ID that
-                                    you specify in the URI: That ID is for the
-                                    admin tenant.
-                               </para>
-                            </wadl:doc>
-                        </param>
+                        &tenant_idTemplateParameter2;
                         <resource id="user_id-cinder-v1"
                             path="{user_id}">
-                            <param name="user_id" style="template"
-                                type="xsd:string" required="true">
-                                <wadl:doc
-                                   xmlns="http://docbook.org/ns/docbook"
-                                   xml:lang="EN" title="User ID">
-                                    <para>
-                                        The user ID. Specify in the
-                                        URI as a query string:
-                                        <code>user_id={user_id}</code>.
-                                    </para>
-                                </wadl:doc>
-                            </param>
+                            &user_idTemplateParameter;
                             <method href="#showQuotaUser"/>
                             <method href="#updateQuotaUser"/>
                             <method href="#deleteQuotasUser"/>
@@ -79,18 +42,7 @@
                         <resource id="detail-cinder-v1" path="detail">
                             <resource id="user_id-detail-cinder-v1"
                                 path="{user_id}">
-                                <param name="user_id" style="template"
-                                   type="xsd:string" required="true">
-                                   <wadl:doc
-                                       xmlns="http://docbook.org/ns/docbook"
-                                       xml:lang="EN" title="User ID">
-                                        <para>
-                                            The user ID. Specify in the
-                                            URI as a query string:
-                                            <code>user_id={user_id}</code>.
-                                        </para>
-                                    </wadl:doc>
-                                </param>
+                                &user_idTemplateParameter;
                                 <method href="#showQuotaDetailUser"/>
                             </resource>
                         </resource>
@@ -99,11 +51,11 @@
             </resource>
         </resource>
     </resources>
-    <method name="GET" id="getDefaults">
+    <method name="GET" id="showQuotaDefaults">
         <wadl:doc xml:lang="EN" xmlns="http://docbook.org/ns/docbook"
-            title="Get default quotas">
+            title="Show default quotas">
             <para role="shortdesc">
-                Gets default quotas for a
+                Shows default quotas for a
                 tenant.
             </para>
         </wadl:doc>
@@ -111,18 +63,18 @@
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN"
-                    title="Get default quotas response: JSON">
+                    title="Show default quotas: JSON response">
                     <xsdxt:code
-                        href="api_samples/os-quota-sets/quotas-show-defaults-get-resp.json"
+                        href="../samples/os-quota-sets/quotas-defaults-show-response.json"
                     />
                 </wadl:doc>
             </representation>
             <representation mediaType="application/xml">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN"
-                    title="Get default quotas response: XML">
+                    title="Show default quotas: XML response">
                     <xsdxt:code
-                        href="api_samples/os-quota-sets/quotas-show-defaults-get-resp.xml"
+                        href="../samples/os-quota-sets/quotas-defaults-show-response.xml"
                     />
                 </wadl:doc>&quotaSetsRespParameters; </representation>
         </response>
@@ -144,7 +96,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN" title="Show quotas response: JSON">
                     <xsdxt:code
-                        href="api_samples/os-quota-sets/quotas-show-get-resp.json"
+                        href="../samples/os-quota-sets/quotas-show-response.json"
                     />
                 </wadl:doc>
             </representation>
@@ -152,10 +104,11 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN" title="Show quotas response: XML">
                     <xsdxt:code
-                        href="api_samples/os-quota-sets/quotas-show-get-resp.xml"
+                        href="../samples/os-quota-sets/quotas-show-response.xml"
                     />
-                </wadl:doc>&quotaSetsRespParameters;
-                           &quotasShowResponse;
+                </wadl:doc>
+                &quotaSetsRespParameters;
+                &quotasShowResponse;
             </representation>
         </response>
     </method>
@@ -171,7 +124,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN" title="Update quotas response: JSON">
                     <xsdxt:code
-                        href="api_samples/os-quota-sets/quotas-update-post-req.json"
+                        href="../samples/os-quota-sets/quotas-update-request.json"
                     />
                 </wadl:doc>
             </representation>
@@ -179,7 +132,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN" title="Show quotas response: XML">
                     <xsdxt:code
-                        href="api_samples/os-quota-sets/quotas-update-post-req.xml"
+                        href="../samples/os-quota-sets/quotas-update-request.xml"
                     />
                 </wadl:doc>&quotaSetsReqParameters; </representation>
         </request>
@@ -188,7 +141,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN" title="Update quota response: JSON">
                     <xsdxt:code
-                        href="api_samples/os-quota-sets/quotas-update-post-resp.json"
+                        href="../samples/os-quota-sets/quotas-update-response.json"
                     />
                 </wadl:doc>
             </representation>
@@ -196,7 +149,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN" title="Update quota response: XML">
                     <xsdxt:code
-                        href="api_samples/os-quota-sets/quotas-update-post-resp.xml"
+                        href="../samples/os-quota-sets/quotas-update-response.xml"
                     />
                 </wadl:doc> &quotaSetsRespParameters;
             </representation>
@@ -226,7 +179,7 @@
                     xml:lang="EN"
                     title="Show quotas for user response: JSON">
                     <xsdxt:code
-                        href="api_samples/os-user-quotas/user-quotas-show-get-resp.json"
+                        href="../samples/os-user-quotas/user-quotas-show-response.json"
                     />
                 </wadl:doc>
             </representation>
@@ -235,7 +188,7 @@
                     xml:lang="EN"
                     title="Show quotas for user response: XML">
                     <xsdxt:code
-                        href="api_samples/os-user-quotas/user-quotas-show-get-resp.xml"
+                        href="../samples/os-user-quotas/user-quotas-show-response.xml"
                     />
                 </wadl:doc> &quotaSetsRespParameters;
             </representation>
@@ -254,7 +207,7 @@
                     xml:lang="EN"
                     title="Update quotas for user request: JSON">
                     <xsdxt:code
-                        href="api_samples/os-user-quotas/user-quotas-update-post-req.json"
+                        href="../samples/os-user-quotas/user-quotas-update-request.json"
                     />
                 </wadl:doc>
             </representation>
@@ -263,7 +216,7 @@
                     xml:lang="EN"
                     title="Update quotas for user request: XML">
                     <xsdxt:code
-                        href="api_samples/os-user-quotas/user-quotas-update-post-req.xml"
+                        href="../samples/os-user-quotas/user-quotas-update-request.xml"
                     />
                 </wadl:doc> &quotaSetsReqParameters; </representation>
         </request>
@@ -273,7 +226,7 @@
                     xml:lang="EN"
                     title="Update quotas for user response: JSON">
                     <xsdxt:code
-                        href="api_samples/os-user-quotas/user-quotas-update-post-resp.json"
+                        href="../samples/os-user-quotas/user-quotas-update-response.json"
                     />
                 </wadl:doc>
             </representation>
@@ -282,7 +235,7 @@
                     xml:lang="EN"
                     title="Show quotas for user response: XML">
                     <xsdxt:code
-                        href="api_samples/os-user-quotas/user-quotas-update-post-resp.xml"
+                        href="../samples/os-user-quotas/user-quotas-update-response.xml"
                     />
                 </wadl:doc>&quotaSetsRespParameters; </representation>
         </response>
@@ -311,7 +264,7 @@
                     xmlns="http://docbook.org/ns/docbook"
                     title="Show quota details for user response: JSON">
                     <xsdxt:code
-                        href="api_samples/os-quota-sets/quotas-user-show-detail-get-resp.json"
+                        href="../samples/os-user-quotas/user-quotas-show-detail-response.json"
                     />
                 </wadl:doc>
                 <param name="quota_set" style="plain" required="true"
diff --git a/api-ref/src/wadls/volume-api/src/v1/volume-api-v1.wadl b/api-ref/src/wadls/volume-api/src/v1/wadl/volumes-v1.wadl
similarity index 76%
rename from api-ref/src/wadls/volume-api/src/v1/volume-api-v1.wadl
rename to api-ref/src/wadls/volume-api/src/v1/wadl/volumes-v1.wadl
index c73fce3b5..1a182c4ee 100644
--- a/api-ref/src/wadls/volume-api/src/v1/volume-api-v1.wadl
+++ b/api-ref/src/wadls/volume-api/src/v1/wadl/volumes-v1.wadl
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- (C) 2012-2015 OpenStack Foundation, All Rights Reserved -->
 <!DOCTYPE application [
-    <!ENTITY % common  SYSTEM "../v2/common.ent">
+    <!ENTITY % common  SYSTEM "../../v2/common.ent">
     %common;
-    <!ENTITY % common  SYSTEM "../common_project.ent">
+    <!ENTITY % common_project  SYSTEM "../../../../common_project.ent">
     %common_project;
 ]>
 <application xmlns="http://wadl.dev.java.net/2009/02"
@@ -18,52 +18,39 @@
         </resource>
         <resource id="version" type="#VersionDetails" path="//v1">
             <resource id="tenant_id" path="{tenant_id}">
-                &tenantIdRequestParameter;
+                &tenant_idTemplateParameter;
                 <resource id="volumes" path="volumes">
                     <method href="#createVolume"/>
-                    <method href="#getVolumesSimple"/>
+                    <method href="#listVolumesSimple"/>
                     <resource path="detail" id="detail-volume">
-                        <method href="#getVolumesDetail"/>
+                        <method href="#listVolumesDetail"/>
                     </resource>
                     <resource path="{volume_id}" id="volume_id">
-                        <param name="volume_id" style="template" required="true" type="csapi:UUID">
-                            <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-                                <para>The unique identifier of an existing volume.</para>
-                            </wadl:doc>
-                        </param>
-                        <method href="#getVolume"/>
+                        &volume_idTemplateParameter;
+                        <method href="#showVolume"/>
                         <method href="#deleteVolume"/>
                     </resource>
                 </resource>
                 <resource id="types" path="types">
-                    <method href="#getVolumeTypes"/>
+                    <method href="#listVolumeTypes"/>
                     <method href="#createVolumeType"/>
                     <resource path="{volume_type_id}" id="volume_type_id">
-                        <param name="volume_type_id" style="template" required="true"
-                            type="csapi:UUID">
-                            <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-                                <para>The unique identifier of an existing volume type.</para>
-                            </wadl:doc>
-                        </param>
+                        &vol_type_idTemplateParameter;
                         <method href="#updateVolumeType"/>
                         <method href="#updateVolumeTypeExtraSpecs"/>
-                        <method href="#getVolumeType"/>
+                        <method href="#showVolumeType"/>
                         <method href="#deleteVolumeType"/>
                     </resource>
                 </resource>
                 <resource id="snapshots" path="snapshots">
                     <method href="#createSnapshot"/>
-                    <method href="#getSnapshotsSimple"/>
+                    <method href="#listSnapshotsSimple"/>
                     <resource path="detail" id="detail-snapshots">
-                        <method href="#getSnapshotsDetail"/>
+                        <method href="#listSnapshotsDetail"/>
                     </resource>
                     <resource path="{snapshot_id}" id="snapshot_id">
-                        <param name="snapshot_id" style="template" required="true" type="csapi:UUID">
-                            <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-                                <para>The unique identifier of an existing snapshot.</para>
-                            </wadl:doc>
-                        </param>
-                        <method href="#getSnapshot"/>
+                        &snapshot_idTemplateParameter;
+                        <method href="#showSnapshot"/>
                         <method href="#deleteSnapshot"/>
                         <resource path="metadata" id="snapshot-metadata">
                             <method href="#showSnapshotMetadata"/>
@@ -91,7 +78,7 @@
         <response status="200 300">
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-                    <xsdxt:code href="api_samples/cinder-versions-response.json"/>
+                    <xsdxt:code href="../samples/volumes/versions-list-response.json"/>
                 </wadl:doc>
             </representation>
             <!-- The following call fails - opened bug #1311243 -->
@@ -99,7 +86,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="samples/cinder-versions-response.xml"
+                        href="../samples/volumes/cinder-versions-response.xml"
                     />
                 </wadl:doc>
             </representation>-->
@@ -114,7 +101,7 @@
         <response status="200">
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-                    <xsdxt:code href="api_samples/versionv1-get-resp.json"/>
+                    <xsdxt:code href="../samples/volumes/version-show-response.json"/>
                 </wadl:doc>
             </representation>
             <!-- this call fails - opened bug 1311243 -->
@@ -123,7 +110,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="../api_samples/version-get-resp.xml"/>
+                        href="../samples/version-show-resp.xml"/>
                 </wadl:doc>
                 <param name="location" style="plain" type="xsd:anyURI"
                     required="true"
@@ -138,7 +125,7 @@
         <response status="203">
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-                    <xsdxt:code href="api_samples/versionv1-get-resp.json"/>
+                    <xsdxt:code href="../samples/volumes/version-show-response.json"/>
                 </wadl:doc>
             </representation>
         </response>
@@ -152,17 +139,19 @@
         <request>
             <representation mediaType="application/xml">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-                    <xsdxt:code href="api_samples/volume_create.xml"/>
+                    <xsdxt:code href="../samples/volumes/volume-create-request.xml"/>
                 </wadl:doc>
             </representation>
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-                    <xsdxt:code href="api_samples/volume_create.json"/>
+                    <xsdxt:code href="../samples/volumes/volume-create-request.json"/>
                 </wadl:doc>
                 <param name="volume" style="plain" required="true" type="csapi:string">
                     <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-                        <para>A partial representation of a volume used in the creation
-                            process.</para>
+                        <para>
+                            A partial representation of a volume that the
+                            creation process uses.
+                        </para>
                     </wadl:doc>
                 </param>
                 &createVolumeParameters;
@@ -171,12 +160,12 @@
         <response status="201">
             <representation mediaType="application/xml">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-                    <xsdxt:code href="api_samples/volume_show.xml"/>
+                    <xsdxt:code href="../samples/volumes/volume-show-response.xml"/>
                 </wadl:doc>
             </representation>
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-                    <xsdxt:code href="api_samples/volume_show.json"/>
+                    <xsdxt:code href="../samples/volumes/volume-show-response.json"/>
                 </wadl:doc>
                 <param name="volume" style="plain" required="true" type="csapi:string">
                     <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
@@ -187,7 +176,7 @@
             </representation>
         </response>
     </method>
-    <method name="GET" id="getVolumesSimple">
+    <method name="GET" id="listVolumesSimple">
         <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN" title="List volumes">
             <para role="shortdesc">
                 Lists volumes.
@@ -196,12 +185,12 @@
         <response status="200">
             <representation mediaType="application/xml">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-                    <xsdxt:code href="api_samples/volume_list_simple.xml"/>
+                    <xsdxt:code href="../samples/volumes/volumes-list-response.xml"/>
                 </wadl:doc>
             </representation>
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-                    <xsdxt:code href="api_samples/volume_list_simple.json"/>
+                    <xsdxt:code href="../samples/volumes/volumes-list-response.json"/>
                 </wadl:doc>
                 <param name="volumes" style="plain" required="true" type="csapi:string">
                     <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
@@ -212,7 +201,7 @@
             </representation>
         </response>
     </method>
-    <method name="GET" id="getVolumesDetail">
+    <method name="GET" id="listVolumesDetail">
         <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN"
             title="List volumes, with details">
             <para role="shortdesc">
@@ -222,12 +211,12 @@
         <response status="200">
             <representation mediaType="application/xml">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-                    <xsdxt:code href="api_samples/volume_list_simple.xml"/>
+                    <xsdxt:code href="../samples/volumes/volumes-list-response.xml"/>
                 </wadl:doc>
             </representation>
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-                    <xsdxt:code href="api_samples/volume_list_simple.json"/>
+                    <xsdxt:code href="../samples/volumes/volumes-list-response.json"/>
                 </wadl:doc>
                 <param name="volumes" style="plain" required="true" type="csapi:string">
                     <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
@@ -238,7 +227,7 @@
             </representation>
         </response>
     </method>
-    <method name="GET" id="getVolume">
+    <method name="GET" id="showVolume">
         <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN"
             title="Show volume details">
             <para role="shortdesc">
@@ -248,12 +237,12 @@
         <response status="200">
             <representation mediaType="application/xml">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-                    <xsdxt:code href="api_samples/volume_show.xml"/>
+                    <xsdxt:code href="../samples/volumes/volume-show-response.xml"/>
                 </wadl:doc>
             </representation>
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-                    <xsdxt:code href="api_samples/volume_show.json"/>
+                    <xsdxt:code href="../samples/volumes/volume-show-response.json"/>
                 </wadl:doc>
                 <param name="volume" style="plain" required="true" type="csapi:string">
                     <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
@@ -274,7 +263,7 @@
         </wadl:doc>
         <response status="202"/>
     </method>
-    <method name="GET" id="getVolumeTypes">
+    <method name="GET" id="listVolumeTypes">
         <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN" title="List volume types">
             <para role="shortdesc">
                 Lists volume types.
@@ -283,12 +272,12 @@
         <response status="200">
             <representation mediaType="application/xml">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-                    <xsdxt:code href="api_samples/volume_type_list.xml"/>
+                    <xsdxt:code href="../samples/volumes/volume-types-list-response.xml"/>
                 </wadl:doc>
             </representation>
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-                    <xsdxt:code href="api_samples/volume_type_list.json"/>
+                    <xsdxt:code href="../samples/volumes/volume-types-list-response.json"/>
                 </wadl:doc>
             </representation>
         </response>
@@ -302,18 +291,18 @@
         <request>
             <representation mediaType="application/xml">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-                    <xsdxt:code href="api_samples/volume_type_create_request.xml"/>
+                    <xsdxt:code href="../samples/volumes/volume-type-create-request.xml"/>
                 </wadl:doc>
             </representation>
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-                    <xsdxt:code href="api_samples/volume_type_create_request.json"/>
+                    <xsdxt:code href="../samples/volumes/volume-type-create-request.json"/>
                 </wadl:doc>
                 <param name="volume_type" style="plain" required="true" type="csapi:string">
                     <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
                         <para>
-                            A partial representation of a volume type used in the creation
-                            process.
+                            A partial representation of a volume type that the
+                            creation process uses.
                         </para>
                     </wadl:doc>
                 </param>
@@ -322,12 +311,12 @@
         <response status="200">
             <representation mediaType="application/xml">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-                    <xsdxt:code href="api_samples/volume_type_show.xml"/>
+                    <xsdxt:code href="../samples/volumes/volume-type-show-response.xml"/>
                 </wadl:doc>
             </representation>
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-                    <xsdxt:code href="api_samples/volume_type_show.json"/>
+                    <xsdxt:code href="../samples/volumes/volume-type-show-response.json"/>
                 </wadl:doc>
             </representation>
         </response>
@@ -342,17 +331,19 @@
         <request>
             <representation mediaType="application/xml">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-                    <xsdxt:code href="api_samples/volume_type_create_request.xml"/>
+                    <xsdxt:code href="../samples/volumes/volume-type-create-request.xml"/>
                 </wadl:doc>
             </representation>
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-                    <xsdxt:code href="api_samples/volume_type_create_request.json"/>
+                    <xsdxt:code href="../samples/volumes/volume-type-create-request.json"/>
                 </wadl:doc>
                 <param name="volume_type" style="plain" required="true" type="csapi:string">
                     <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-                        <para>A volume type offers a way to categorize
-                            or group volumes.</para>
+                        <para>
+                            Use volume types to categorize
+                            or group volumes.
+                        </para>
                     </wadl:doc>
                 </param>
             </representation>
@@ -360,12 +351,12 @@
         <response status="200">
             <representation mediaType="application/xml">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-                    <xsdxt:code href="api_samples/volume_type_show.xml"/>
+                    <xsdxt:code href="../samples/volumes/volume-type-show-response.xml"/>
                 </wadl:doc>
             </representation>
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-                    <xsdxt:code href="api_samples/volume_type_show.json"/>
+                    <xsdxt:code href="../samples/volumes/volume-type-show-response.json"/>
                 </wadl:doc>
             </representation>
         </response>
@@ -374,25 +365,23 @@
         <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN"
             title="Update extra specs for a volume type">
             <para role="shortdesc">
-                Updates the extra specifications that are
-                assigned to a volume type.
+                Updates the extra specifications for a volume type.
             </para>
         </wadl:doc>
         <request>
             <representation mediaType="application/xml">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-                    <xsdxt:code href="api_samples/volume_type_create_request.xml"/>
+                    <xsdxt:code href="../samples/volumes/volume-type-create-request.xml"/>
                 </wadl:doc>
             </representation>
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-                    <xsdxt:code href="api_samples/volume_type_create_request.json"/>
+                    <xsdxt:code href="../samples/volumes/volume-type-create-request.json"/>
                 </wadl:doc>
                 <param name="volume_type" style="plain" required="true" type="csapi:string">
                     <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
                         <para>
-                            A volume type. Use to categorize
-                            or group volumes.
+                            A volume type. Use to categorize or group volumes.
                         </para>
                     </wadl:doc>
                 </param>
@@ -400,10 +389,9 @@
                     <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
                         <para>
                             A key and value pair that contains additional
-                            specifications associated with the volume type.
-                            Examples include capabilities, capacity,
-                            compression, and so on, depending on the storage
-                            driver in use.
+                            specifications for the volume type. Examples
+                            include capabilities, capacity, compression, and
+                            so on, depending on the storage driver in use.
                         </para>
                     </wadl:doc>
                 </param>
@@ -412,24 +400,26 @@
         <response status="200">
             <representation mediaType="application/xml">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-                    <xsdxt:code href="api_samples/volume_type_show.xml"/>
+                    <xsdxt:code href="../samples/volumes/volume-type-show-response.xml"/>
                 </wadl:doc>
             </representation>
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-                    <xsdxt:code href="api_samples/volume_type_show.json"/>
+                    <xsdxt:code href="../samples/volumes/volume-type-show-response.json"/>
                 </wadl:doc>
                 <param name="volume" style="plain" required="true" type="csapi:string">
                     <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-                        <para>A partial representation of a volume used in the creation
-                            process.</para>
+                        <para>
+                            A partial representation of a volume that the
+                            creation process uses.
+                        </para>
                     </wadl:doc>
                 </param>
                 &volumeDetailResponseParameters;
             </representation>
         </response>
     </method>
-    <method name="GET" id="getVolumeType">
+    <method name="GET" id="showVolumeType">
         <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN"
             title="Show volume type details">
             <para role="shortdesc">
@@ -439,12 +429,12 @@
         <response status="200">
             <representation mediaType="application/xml">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-                    <xsdxt:code href="api_samples/volume_type_show.xml"/>
+                    <xsdxt:code href="../samples/volumes/volume-type-show-response.xml"/>
                 </wadl:doc>
             </representation>
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-                    <xsdxt:code href="api_samples/volume_type_show.json"/>
+                    <xsdxt:code href="../samples/volumes/volume-type-show-response.json"/>
                 </wadl:doc>
             </representation>
         </response>
@@ -466,17 +456,19 @@
         <request>
             <representation mediaType="application/xml">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-                    <xsdxt:code href="api_samples/snapshot_create.xml"/>
+                    <xsdxt:code href="../samples/volumes/snapshot-create-request.xml"/>
                 </wadl:doc>
             </representation>
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-                    <xsdxt:code href="api_samples/snapshot_create.json"/>
+                    <xsdxt:code href="../samples/volumes/snapshot-create-request.json"/>
                 </wadl:doc>
                 <param name="snapshot" style="plain" required="true" type="csapi:string">
                     <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-                        <para>A partial representation of a snapshot used in the creation
-                            process.</para>
+                        <para>
+                            A partial representation of a snapshot that the
+                            creation process uses.
+                        </para>
                     </wadl:doc>
                 </param>
             </representation>
@@ -484,17 +476,17 @@
         <response status="201">
             <representation mediaType="application/xml">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-                    <xsdxt:code href="api_samples/snapshot_show.xml"/>
+                    <xsdxt:code href="../samples/volumes/snapshot-show-response.xml"/>
                 </wadl:doc>
             </representation>
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-                    <xsdxt:code href="api_samples/snapshot_show.json"/>
+                    <xsdxt:code href="../samples/volumes/snapshot-show-response.json"/>
                 </wadl:doc>
             </representation>
         </response>
     </method>
-    <method name="GET" id="getSnapshotsSimple">
+    <method name="GET" id="listSnapshotsSimple">
         <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN" title="List snapshots">
             <para role="shortdesc">
                 Lists simple snapshots.
@@ -503,17 +495,17 @@
         <response status="200">
             <representation mediaType="application/xml">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-                    <xsdxt:code href="api_samples/snapshot_list_simple.xml"/>
+                    <xsdxt:code href="../samples/volumes/snapshots-list-response.xml"/>
                 </wadl:doc>
             </representation>
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-                    <xsdxt:code href="api_samples/snapshot_list_simple.json"/>
+                    <xsdxt:code href="../samples/volumes/snapshots-list-response.json"/>
                 </wadl:doc>
             </representation>
         </response>
     </method>
-    <method name="GET" id="getSnapshotsDetail">
+    <method name="GET" id="listSnapshotsDetail">
         <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN"
             title="List snapshots with details">
             <para role="shortdesc">Lists all snapshots, with details.</para>
@@ -521,17 +513,17 @@
         <response status="200">
             <representation mediaType="application/xml">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-                    <xsdxt:code href="api_samples/snapshot_list_simple.xml"/>
+                    <xsdxt:code href="../samples/volumes/snapshots-list-response.xml"/>
                 </wadl:doc>
             </representation>
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-                    <xsdxt:code href="api_samples/snapshot_list_simple.json"/>
+                    <xsdxt:code href="../samples/volumes/snapshots-list-response.json"/>
                 </wadl:doc>
             </representation>
         </response>
     </method>
-    <method name="GET" id="getSnapshot">
+    <method name="GET" id="showSnapshot">
         <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN"
             title="Show snapshot details">
             <para role="shortdesc">
@@ -541,12 +533,12 @@
         <response status="200">
             <representation mediaType="application/xml">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-                    <xsdxt:code href="api_samples/snapshot_show.xml"/>
+                    <xsdxt:code href="../samples/volumes/snapshot-show-response.xml"/>
                 </wadl:doc>
             </representation>
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-                    <xsdxt:code href="api_samples/snapshot_show.json"/>
+                    <xsdxt:code href="../samples/volumes/snapshot-show-response.json"/>
                 </wadl:doc>
             </representation>
         </response>
@@ -568,12 +560,12 @@
         <response status="200">
             <representation mediaType="application/xml">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-                    <xsdxt:code href="api_samples/snapshot_metadata_response.xml"/>
+                    <xsdxt:code href="../samples/volumes/snapshot-metadata-show-response.xml"/>
                 </wadl:doc>
             </representation>
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-                    <xsdxt:code href="api_samples/snapshot_metadata_response.json"/>
+                    <xsdxt:code href="../samples/volumes/snapshot-metadata-show-response.json"/>
                 </wadl:doc>
             </representation>
         </response>
@@ -588,12 +580,12 @@
         <request>
             <representation mediaType="application/xml">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-                    <xsdxt:code href="api_samples/snapshot_update_metadata_request.xml"/>
+                    <xsdxt:code href="../samples/volumes/snapshot-metadata-update-request.xml"/>
                 </wadl:doc>
             </representation>
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-                    <xsdxt:code href="api_samples/snapshot_update_metadata_request.json"/>
+                    <xsdxt:code href="../samples/volumes/snapshot-metadata-update-request.json"/>
                 </wadl:doc>
                 <param name="metadata" style="plain" type="xsd:string" required="false">
                     <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
@@ -601,12 +593,19 @@
                             One or more metadata key and value pairs to set or unset for the
                             snapshot.
                         </para>
-                        <para>To unset a metadata key value, specify only the key name.</para>
-                        <para>To set a metadata key value, specify the key and value pair.</para>
-                        <para>The Block Storage server does not respect case-sensitive key names.
-                            For example, if you specify both <code>"key": "v1"</code> and
-                                <code>"KEY": "V1"</code>, the server sets and returns only the
-                                <code>KEY</code> key and value pair.</para>
+                        <para>
+                            To unset a metadata key value, specify only the key name.
+                        </para>
+                        <para>
+                            To set a metadata key value, specify the key and value pair.
+                        </para>
+                        <para>
+                            The Block Storage server does not respect case-
+                            sensitive key names. For example, if you specify
+                            both <code>"key": "v1"</code> and <code>"KEY":
+                            "V1"</code>, the server sets and returns only the
+                            <code>KEY</code> key and value pair.
+                        </para>
                     </wadl:doc>
                 </param>
             </representation>
@@ -614,12 +613,12 @@
         <response status="200">
             <representation mediaType="application/xml">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-                    <xsdxt:code href="api_samples/snapshot_update_metadata_response.xml"/>
+                    <xsdxt:code href="../samples/volumes/snapshot-metadata-update-response.xml"/>
                 </wadl:doc>
             </representation>
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-                    <xsdxt:code href="api_samples/snapshot_update_metadata_response.json"/>
+                    <xsdxt:code href="../samples/volumes/snapshot-metadata-update-response.json"/>
                 </wadl:doc>
             </representation>
         </response>
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/qos_create_request.xml b/api-ref/src/wadls/volume-api/src/v2/api_samples/qos_create_request.xml
deleted file mode 100644
index 5bc57b13f..000000000
--- a/api-ref/src/wadls/volume-api/src/v2/api_samples/qos_create_request.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<qos_specs name="performance-spec" delay="0" throughput="100"/>
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/qos_create_response.xml b/api-ref/src/wadls/volume-api/src/v2/api_samples/qos_create_response.xml
deleted file mode 100644
index 2e26764d9..000000000
--- a/api-ref/src/wadls/volume-api/src/v2/api_samples/qos_create_response.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<qos_specs>
-    <qos_spec consumer="back-end"
-        id="ecfc6e2e-7117-44a4-8eec-f84d04f531a8"
-        name="performance-spec">
-        <specs>
-            <delay>0</delay>
-            <throughput>100</throughput>
-        </specs>
-    </qos_spec>
-</qos_specs>
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/qos_details_show_response.json b/api-ref/src/wadls/volume-api/src/v2/api_samples/qos_details_show_response.json
deleted file mode 100644
index d691eb1f6..000000000
--- a/api-ref/src/wadls/volume-api/src/v2/api_samples/qos_details_show_response.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    "qos_specs": {
-        "specs": {
-            "availability": "100",
-            "numberOfFailures": "0"
-        },
-        "consumer": "back-end",
-        "name": "reliability-spec",
-        "id": "0388d6c6-d5d4-42a3-b289-95205c50dd15"
-    },
-    "links": [
-        {
-            "href": "http://23.253.228.211:8776/v2/e1cf63117ae74309a5bcc2002a23be8b/qos_specs/0388d6c6-d5d4-42a3-b289-95205c50dd15",
-            "rel": "self"
-        },
-        {
-            "href": "http://23.253.228.211:8776/e1cf63117ae74309a5bcc2002a23be8b/qos_specs/0388d6c6-d5d4-42a3-b289-95205c50dd15",
-            "rel": "bookmark"
-        }
-    ]
-}
\ No newline at end of file
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/qos_update_request.xml b/api-ref/src/wadls/volume-api/src/v2/api_samples/qos_update_request.xml
deleted file mode 100644
index d7e8a0807..000000000
--- a/api-ref/src/wadls/volume-api/src/v2/api_samples/qos_update_request.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<qos_specs delay="2" throughput="100"/>
\ No newline at end of file
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/versionv2-get-resp.json b/api-ref/src/wadls/volume-api/src/v2/api_samples/versionv2-get-resp.json
deleted file mode 100644
index e741f7b9f..000000000
--- a/api-ref/src/wadls/volume-api/src/v2/api_samples/versionv2-get-resp.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-    "version": {
-        "id": "v2.0",
-        "links": [
-            {
-                "href": "http://23.253.211.234:8776/v2/v2.0",
-                "rel": "self"
-            }
-        ],
-        "media-types": [
-            {
-                "base": "application/xml",
-                "type": "application/vnd.openstack.volume+xml;version=1"
-            },
-            {
-                "base": "application/json",
-                "type": "application/vnd.openstack.volume+json;version=1"
-            }
-        ],
-        "status": "CURRENT"
-    }
-}
diff --git a/api-ref/src/wadls/volume-api/src/v2/common.ent b/api-ref/src/wadls/volume-api/src/v2/common.ent
index e59305387..1988c66d2 100644
--- a/api-ref/src/wadls/volume-api/src/v2/common.ent
+++ b/api-ref/src/wadls/volume-api/src/v2/common.ent
@@ -38,8 +38,112 @@
    <representation mediaType="application/xml" element="csapi:itemNotFound"/>
    <representation mediaType="application/json"/>
 </response>'>
-<!-- tenantIdRequestParameter -->
-<!ENTITY tenantIdRequestParameter '
+<!ENTITY aliasTemplateParameter '
+<param required="true"
+    xmlns="http://wadl.dev.java.net/2009/02"
+    name="alias" style="template"
+    type="xsd:string">
+    <wadl:doc xmlns="http://docbook.org/ns/docbook"
+      xmlns:wadl="http://wadl.dev.java.net/2009/02"
+      xml:lang="EN">
+      <para>
+        An alias, which is a name for a pointer to a resource. For example, a
+        named extension.
+      </para>
+    </wadl:doc>
+</param>'>
+<!ENTITY backup_idTemplateParameter '
+<param name="backup_id" style="template"
+  required="true" type="csapi:UUID" xmlns="http://wadl.dev.java.net/2009/02">
+  <wadl:doc xmlns="http://docbook.org/ns/docbook"
+    xmlns:wadl="http://wadl.dev.java.net/2009/02"
+    xml:lang="EN">
+    <para>
+      The UUID for a backup.
+    </para>
+  </wadl:doc>
+</param>'>
+<!ENTITY cgsnapshot_idTemplateParameter '
+<param name="cgsnapshot_id" style="template"
+    type="xsd:string" xmlns="http://wadl.dev.java.net/2009/02">
+    <wadl:doc xmlns="http://docbook.org/ns/docbook"
+      xmlns:wadl="http://wadl.dev.java.net/2009/02"
+      xml:lang="EN">
+        <para>
+          The unique identifier of the consistency
+          group snapshot.
+        </para>
+    </wadl:doc>
+</param>'>
+<!ENTITY consistencygroup_idTemplateParameter '
+<param name="consistencygroup_id" style="template"
+    type="xsd:string" xmlns="http://wadl.dev.java.net/2009/02">
+    <wadl:doc xmlns="http://docbook.org/ns/docbook"
+      xmlns:wadl="http://wadl.dev.java.net/2009/02"
+      xml:lang="EN">
+        <para>
+            The unique identifier of the consistency
+            group.
+        </para>
+    </wadl:doc>
+</param>'>
+<!ENTITY hostnameTemplateParameter '
+<param name="hostname" style="template"
+  type="xsd:string" xmlns="http://wadl.dev.java.net/2009/02">
+  <wadl:doc xmlns="http://docbook.org/ns/docbook"
+    xmlns:wadl="http://wadl.dev.java.net/2009/02"
+    xml:lang="EN">
+    <para>
+      The name of the host that hosts the storage back end.
+    </para>
+  </wadl:doc>
+</param>'>
+<!ENTITY interface_idTemplateParameter '
+<param name="attachment_id"
+  style="template" type="csapi:UUID" xmlns="http://wadl.dev.java.net/2009/02">
+  <wadl:doc xmlns="http://docbook.org/ns/docbook"
+    xmlns:wadl="http://wadl.dev.java.net/2009/02"
+    xml:lang="EN">
+    <para>
+      The interface ID.
+    </para>
+  </wadl:doc>
+</param>'>
+<!ENTITY qos_idTemplateParameter '
+<param xmlns="http://wadl.dev.java.net/2009/02"
+  name="qos_id" style="template"
+  type="xsd:string">
+  <wadl:doc xmlns="http://docbook.org/ns/docbook"
+    xmlns:wadl="http://wadl.dev.java.net/2009/02"
+    xml:lang="EN">
+    <para>
+      The ID for the QoS specification.
+    </para>
+  </wadl:doc>
+</param>'>
+<!ENTITY server_idTemplateParameter '
+<param name="server_id" style="template"
+    type="csapi:UUID" xmlns="http://wadl.dev.java.net/2009/02">
+    <wadl:doc xmlns="http://docbook.org/ns/docbook"
+      xmlns:wadl="http://wadl.dev.java.net/2009/02"
+      xml:lang="EN">
+        <para>The UUID for the server of
+           interest to you.</para>
+    </wadl:doc>
+</param>'>
+<!ENTITY snapshot_idTemplateParameter '
+<param name="snapshot_id" style="template"
+    required="true" type="csapi:UUID" xmlns="http://wadl.dev.java.net/2009/02">
+    <wadl:doc xmlns="http://docbook.org/ns/docbook"
+      xmlns:wadl="http://wadl.dev.java.net/2009/02"
+      xml:lang="EN">
+        <para>
+          The UUID of the snapshot.
+       </para>
+   </wadl:doc>
+</param>'>
+<!-- tenant_idTemplateParameter -->
+<!ENTITY tenant_idTemplateParameter '
 <param name="tenant_id" style="template" type="csapi:UUID"
   xmlns="http://wadl.dev.java.net/2009/02">
   <wadl:doc xmlns="http://docbook.org/ns/docbook"
@@ -50,9 +154,67 @@
    </para>
   </wadl:doc>
 </param>'>
+<!ENTITY tenant_idTemplateParameter2 '
+<param name="tenant_id" style="template" type="csapi:UUID"
+  xmlns="http://wadl.dev.java.net/2009/02">
+  <wadl:doc xmlns="http://docbook.org/ns/docbook"
+      xmlns:wadl="http://wadl.dev.java.net/2009/02"
+      xml:lang="EN">
+    <para>
+      The UUID for the tenant for which you want to show, update, or delete
+      quotas. This UUID is different from the first tenant ID that you specify
+      in the URI: That UUID is for the administrative tenant.
+     </para>
+  </wadl:doc>
+</param>'>
+<!ENTITY user_idTemplateParameter '
+<param name="user_id" style="template"
+  type="xsd:string" required="true" xmlns="http://wadl.dev.java.net/2009/02">
+  <wadl:doc xmlns="http://docbook.org/ns/docbook"
+    xmlns:wadl="http://wadl.dev.java.net/2009/02"
+    xml:lang="EN">
+    <para>                       
+      The user ID. Specify in the URI as <code>user_id={user_id}</code>.
+    </para>
+  </wadl:doc>
+</param>'>
+<!ENTITY vol_type_idTemplateParameter '
+<param name="vol_type_id" id="vol_type_id"
+  style="query" type="xsd:string"
+  xmlns="http://wadl.dev.java.net/2009/02">
+  <wadl:doc xmlns="http://docbook.org/ns/docbook"
+    xmlns:wadl="http://wadl.dev.java.net/2009/02"
+    xml:lang="EN">
+    <para>
+      The ID of the volume type.
+    </para>
+  </wadl:doc>
+</param>'>
+<!ENTITY volume_idTemplateParameter '
+<param name="volume_id" style="template"
+  required="true" type="csapi:UUID" xmlns="http://wadl.dev.java.net/2009/02">
+  <wadl:doc xmlns="http://docbook.org/ns/docbook"
+      xmlns:wadl="http://wadl.dev.java.net/2009/02"
+      xml:lang="EN">
+    <para>
+      The UUID of the volume.
+    </para>
+  </wadl:doc>
+</param>'>
+<!ENTITY volume_type_idTemplateParameter '
+<param name="volume_type_id" style="template"
+    required="true" type="csapi:UUID" xmlns="http://wadl.dev.java.net/2009/02">
+    <wadl:doc xmlns="http://docbook.org/ns/docbook"
+      xmlns:wadl="http://wadl.dev.java.net/2009/02"
+      xml:lang="EN">
+      <para>
+        The UUID for an existing volume type.
+      </para>
+    </wadl:doc>
+</param>'>
 <!ENTITY volumeListQueryParameters '
 <param xmlns="http://wadl.dev.java.net/2009/02" name="sort"
- style="query" required="false" type="xsd:string">
+  style="query" required="false" type="xsd:string">
    <wadl:doc xmlns:wadl="http://wadl.dev.java.net/2009/02"
     xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
       <para>
@@ -434,7 +596,7 @@
 </param>
 <param xmlns="http://wadl.dev.java.net/2009/02"
   name="source_volid" style="plain"
-  type="csapi:uuid" required="false">
+  type="csapi:UUID" required="false">
   <wadl:doc xmlns="http://docbook.org/ns/docbook"
     xmlns:wadl="http://wadl.dev.java.net/2009/02"
     xml:lang="EN">
@@ -467,7 +629,7 @@
 </param>
 <param xmlns="http://wadl.dev.java.net/2009/02"
   name="snapshot_id" style="plain"
-  type="csapi:uuid" required="false">
+  type="csapi:UUID" required="false">
   <wadl:doc xmlns="http://docbook.org/ns/docbook"
     xmlns:wadl="http://wadl.dev.java.net/2009/02"
     xml:lang="EN">
@@ -498,7 +660,7 @@
        <para>The volume name.</para></wadl:doc>
 </param>
 <param xmlns="http://wadl.dev.java.net/2009/02"
- name="imageRef" style="plain" type="csapi:uuid"
+ name="imageRef" style="plain" type="csapi:UUID"
     required="false">
     <wadl:doc xmlns="http://docbook.org/ns/docbook"
        xmlns:wadl="http://wadl.dev.java.net/2009/02"
@@ -547,6 +709,107 @@
     </para>
   </wadl:doc>
 </param>' >
+<!ENTITY createVolumeResponseParameters '
+<param xmlns="http://wadl.dev.java.net/2009/02"
+ name="availability_zone" style="plain"
+   type="xsd:string" required="true">
+    <wadl:doc xmlns="http://docbook.org/ns/docbook"
+       xmlns:wadl="http://wadl.dev.java.net/2009/02"
+       xml:lang="EN">
+       <para>The availability zone.</para></wadl:doc>
+</param>
+<param xmlns="http://wadl.dev.java.net/2009/02"
+  name="source_volid" style="plain"
+  type="csapi:UUID" required="true">
+  <wadl:doc xmlns="http://docbook.org/ns/docbook"
+    xmlns:wadl="http://wadl.dev.java.net/2009/02"
+    xml:lang="EN">
+    <para>
+      The UUID of the source volume, if any.
+    </para>
+  </wadl:doc>
+</param>
+<param xmlns="http://wadl.dev.java.net/2009/02"
+ name="description" style="plain"
+   type="xsd:string" required="true">
+    <wadl:doc xmlns="http://docbook.org/ns/docbook"
+       xmlns:wadl="http://wadl.dev.java.net/2009/02"
+       xml:lang="EN">
+       <para>The volume description.</para>
+    </wadl:doc>
+</param>
+<param xmlns="http://wadl.dev.java.net/2009/02"
+ name="multiattach" style="plain"
+   type="xsd:boolean" required="true">
+    <wadl:doc xmlns="http://docbook.org/ns/docbook"
+       xmlns:wadl="http://wadl.dev.java.net/2009/02"
+       xml:lang="EN">
+      <para>
+        If <code>true</code>, this volume can attach to more than one instance.
+      </para>
+    </wadl:doc>
+</param>
+<param xmlns="http://wadl.dev.java.net/2009/02"
+  name="snapshot_id" style="plain"
+  type="csapi:UUID" required="true">
+  <wadl:doc xmlns="http://docbook.org/ns/docbook"
+    xmlns:wadl="http://wadl.dev.java.net/2009/02"
+    xml:lang="EN">
+    <para>
+      The UUID of the source snapshot, if any.
+    </para>
+  </wadl:doc>
+</param>
+<param xmlns="http://wadl.dev.java.net/2009/02"
+  name="size" style="plain" type="xsd:int"
+  required="true">
+  <wadl:doc xmlns="http://docbook.org/ns/docbook"
+    xmlns:wadl="http://wadl.dev.java.net/2009/02"
+    xml:lang="EN">
+    <para>
+      The size of the volume, in gibibytes (GiB).
+    </para>
+  </wadl:doc>
+</param>
+<param xmlns="http://wadl.dev.java.net/2009/02"
+ name="name" style="plain"
+   type="xsd:string" required="true">
+    <wadl:doc xmlns="http://docbook.org/ns/docbook"
+       xmlns:wadl="http://wadl.dev.java.net/2009/02"
+       xml:lang="EN">
+       <para>The volume name.</para></wadl:doc>
+</param>
+<param xmlns="http://wadl.dev.java.net/2009/02"
+  name="imageRef" style="plain" type="csapi:UUID"
+  required="true">
+  <wadl:doc xmlns="http://docbook.org/ns/docbook"
+    xmlns:wadl="http://wadl.dev.java.net/2009/02"
+    xml:lang="EN">
+    <para>
+      The UUID of the source image, if any.
+    </para>
+  </wadl:doc>
+</param>
+<param xmlns="http://wadl.dev.java.net/2009/02"
+ name="volume_type" style="plain"
+   type="xsd:string" required="true">
+    <wadl:doc xmlns="http://docbook.org/ns/docbook"
+       xmlns:wadl="http://wadl.dev.java.net/2009/02"
+       xml:lang="EN">
+       <para>The associated volume type.</para></wadl:doc>
+</param>
+<param xmlns="http://wadl.dev.java.net/2009/02"
+  name="metadata" style="plain" type="xsd:dict"
+  required="true">
+  <wadl:doc xmlns="http://docbook.org/ns/docbook"
+    xmlns:wadl="http://wadl.dev.java.net/2009/02"
+    xml:lang="EN">
+    <para>
+      Metadata key and value pairs that are associated with the
+      volume.
+    </para>
+  </wadl:doc>
+</param>'>
 <!ENTITY isPublicParameterReq '
 <param xmlns="http://wadl.dev.java.net/2009/02"
  name="os-volume-type-access:is_public" style="plain" required="false"
@@ -583,7 +846,7 @@
    </wadl:doc>
 </param>
 <param xmlns="http://wadl.dev.java.net/2009/02" name="id"
-  style="plain" type="csapi:uuid"
+  style="plain" type="csapi:UUID"
   required="true">
   <wadl:doc xmlns="http://docbook.org/ns/docbook"
     xmlns:wadl="http://wadl.dev.java.net/2009/02"
@@ -676,7 +939,7 @@
     </wadl:doc>
 </param>
 <param xmlns="http://wadl.dev.java.net/2009/02" name="snapshot_id" style="plain"
-   type="csapi:uuid" required="true">
+   type="csapi:UUID" required="true">
     <wadl:doc xmlns="http://docbook.org/ns/docbook"
        xmlns:wadl="http://wadl.dev.java.net/2009/02"
        xml:lang="EN">
@@ -687,7 +950,7 @@
 </param>
 <param xmlns="http://wadl.dev.java.net/2009/02"
  name="source_volid" style="plain"
-   type="csapi:uuid" required="true">
+   type="csapi:UUID" required="true">
     <wadl:doc xmlns="http://docbook.org/ns/docbook"
        xmlns:wadl="http://wadl.dev.java.net/2009/02"
        xml:lang="EN">
@@ -709,7 +972,7 @@
   </wadl:doc>
 </param>
 <param xmlns="http://wadl.dev.java.net/2009/02" name="id"
-  style="plain" type="csapi:uuid"
+  style="plain" type="csapi:UUID"
   required="true">
   <wadl:doc xmlns="http://docbook.org/ns/docbook"
     xmlns:wadl="http://wadl.dev.java.net/2009/02"
@@ -815,7 +1078,7 @@
        <para>The associated volume type.</para></wadl:doc>
 </param>
 <param xmlns="http://wadl.dev.java.net/2009/02" name="snapshot_id" style="plain"
-   type="csapi:uuid" required="true">
+   type="csapi:UUID" required="true">
     <wadl:doc xmlns="http://docbook.org/ns/docbook"
        xmlns:wadl="http://wadl.dev.java.net/2009/02"
        xml:lang="EN">
@@ -826,7 +1089,7 @@
 </param>
 <param xmlns="http://wadl.dev.java.net/2009/02"
  name="source_volid" style="plain"
-   type="csapi:uuid" required="true">
+   type="csapi:UUID" required="true">
     <wadl:doc xmlns="http://docbook.org/ns/docbook"
        xmlns:wadl="http://wadl.dev.java.net/2009/02"
        xml:lang="EN">
@@ -848,7 +1111,7 @@
   </wadl:doc>
 </param>
 <param xmlns="http://wadl.dev.java.net/2009/02" name="id"
-  style="plain" type="csapi:uuid"
+  style="plain" type="csapi:UUID"
   required="true">
   <wadl:doc xmlns="http://docbook.org/ns/docbook"
     xmlns:wadl="http://wadl.dev.java.net/2009/02"
@@ -1169,7 +1432,7 @@
       </para>
     </wadl:doc>
 </param>'>
-<!ENTITY getConsistencyGroupsResponseParameters '
+<!ENTITY listConsistencyGroupsResponseParameters '
 <param xmlns="http://wadl.dev.java.net/2009/02"
    name="id" style="plain" required="true"
    type="csapi:UUID">
@@ -1192,7 +1455,7 @@
    </para>
 </wadl:doc>
 </param>'>
-<!ENTITY getConsistencyGroupsDetailResponseParameters '
+<!ENTITY listConsistencyGroupsDetailResponseParameters '
 <param xmlns="http://wadl.dev.java.net/2009/02"
    name="id" style="plain" required="true"
    type="csapi:UUID">
@@ -1499,6 +1762,17 @@
       </para>
    </wadl:doc>
 </param>'>
+<!ENTITY qos_specsParameter '
+<param name="qos_specs" style="plain"
+  type="xsd:dict" required="true" xmlns="http://wadl.dev.java.net/2009/02">
+  <wadl:doc xmlns="http://docbook.org/ns/docbook"
+    xmlns:wadl="http://wadl.dev.java.net/2009/02"
+    xml:lang="EN">
+    <para>
+      A <code>qos_specs</code> object.
+    </para>
+  </wadl:doc>
+</param>'>
 <!ENTITY getCGsnapshotsListResponseParameters '
 <param xmlns="http://wadl.dev.java.net/2009/02"
    name="id" style="plain" required="true"
@@ -1718,7 +1992,7 @@
     </para>
   </wadl:doc>
 </param>
-<param xmlns="http://wadl.dev.java.net/2009/02" name="volume_id" style="plain" type="csapi:uuid"
+<param xmlns="http://wadl.dev.java.net/2009/02" name="volume_id" style="plain" type="csapi:UUID"
   required="true">
   <wadl:doc xmlns="http://docbook.org/ns/docbook"
     xmlns:wadl="http://wadl.dev.java.net/2009/02"
@@ -1738,7 +2012,7 @@
     </para>
   </wadl:doc>
 </param>
-<param xmlns="http://wadl.dev.java.net/2009/02" name="id" style="plain" type="csapi:uuid"
+<param xmlns="http://wadl.dev.java.net/2009/02" name="id" style="plain" type="csapi:UUID"
   required="true">
   <wadl:doc xmlns="http://docbook.org/ns/docbook"
     xmlns:wadl="http://wadl.dev.java.net/2009/02"
diff --git a/api-ref/src/wadls/volume-api/src/v2/grammar/requests/create-snapshot.json b/api-ref/src/wadls/volume-api/src/v2/grammar/requests/create-snapshot.json
deleted file mode 100644
index ba8d3488f..000000000
--- a/api-ref/src/wadls/volume-api/src/v2/grammar/requests/create-snapshot.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-    "$schema": "http://json-schema.org/draft-04/schema#",
-    "id": "http://docs.openstack.org/api/openstack-block-storage/v2/snapshots#post",
-    "type": "object",
-    "properties": {
-        "snapshot": {
-            "id": "http://docs.openstack.org/api/openstack-block-storage/v2/snapshots#post/snapshot",
-            "type": "object",
-            "documentation": "A partial representation of a snapshot used in the creation process.",
-            "properties": {
-                "name": {
-                    "id": "http://docs.openstack.org/api/openstack-block-storage/v2/snapshots#post/snapshot/name",
-                    "type": "string",
-                    "documentation": "Name of the snapshot. The default is None."
-                },
-                "description": {
-                    "id": "http://docs.openstack.org/api/openstack-block-storage/v2/snapshots#post/snapshot/description",
-                    "type": "string",
-                    "documentation": "Description of the snapshot. The default is None."
-                },
-                "volume_id": {
-                    "id": "http://docs.openstack.org/api/openstack-block-storage/v2/snapshots#post/snapshot/volume_id",
-                    "type": "string",
-                    "documentation": "To create a snapshot from an existing volume, specify the ID of the existing volume."
-                },
-                "force": {
-                    "id": "http://docs.openstack.org/api/openstack-block-storage/v2/snapshots#post/snapshot/force",
-                    "type": "boolean",
-                    "documentation": "[True/False] Indicate whether to snapshot, even if the volume is attached. Default==False."
-                }
-            },
-            "required": [
-                "volume_id"
-            ]
-        }
-    },
-    "required": [
-        "snapshot"
-    ]
-}
diff --git a/api-ref/src/wadls/volume-api/src/v2/grammar/requests/create-volume-type.json b/api-ref/src/wadls/volume-api/src/v2/grammar/requests/create-volume-type.json
deleted file mode 100644
index 882f08f00..000000000
--- a/api-ref/src/wadls/volume-api/src/v2/grammar/requests/create-volume-type.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-    "$schema": "http://json-schema.org/draft-04/schema#",
-    "id": "http://docs.openstack.org/api/openstack-block-storage/v2/types#post",
-    "type": "object",
-    "properties": {
-        "volume_type": {
-            "id": "http://docs.openstack.org/api/openstack-block-storage/v2/types#post/volume_type",
-            "type": "object",
-            "documentation": "A partial representation of a volume type used in the creation process.",
-            "properties": {
-                "name": {
-                    "id": "http://docs.openstack.org/api/openstack-block-storage/v2/types#post/volume_type/name",
-                    "type": "string",
-                    "documentation": "The name of the volume type."
-                },
-                "extra_specs": {
-                    "id": "http://docs.openstack.org/api/openstack-block-storage/v2/types#post/volume_type/extra_specs",
-                    "type": "object",
-                    "properties": {
-                        "capabilities": {
-                            "id": "http://docs.openstack.org/api/openstack-block-storage/v2/types#post/volume_type/extra_specs/capabilities",
-                            "type": "string"
-                        }
-                    }
-                }
-            },
-            "required": []
-        }
-    },
-    "required": [
-        "volume_type"
-    ]
-}
diff --git a/api-ref/src/wadls/volume-api/src/v2/grammar/requests/create-volume.json b/api-ref/src/wadls/volume-api/src/v2/grammar/requests/create-volume.json
deleted file mode 100644
index c645c2583..000000000
--- a/api-ref/src/wadls/volume-api/src/v2/grammar/requests/create-volume.json
+++ /dev/null
@@ -1,75 +0,0 @@
-{
-    "$schema": "http://json-schema.org/draft-04/schema#",
-    "id": "http://docs.openstack.org/api/openstack-block-storage/v2",
-    "type": "object",
-    "properties": {
-        "volume": {
-            "id": "http://docs.openstack.org/api/openstack-block-storage/v2/volume#post",
-            "type": "object",
-            "properties": {
-                "availability_zone": {
-                    "id": "http://docs.openstack.org/api/openstack-block-storage/v2/volume#post/availability_zone",
-                    "type": "string",
-                    "documentation": "The availability zone."
-                },
-                "source_volid": {
-                    "id": "http://docs.openstack.org/api/openstack-block-storage/v2/volume#post/source_volid",
-                    "type": "string",
-                    "documentation": "To create a volume from an existing volume, specify the ID of the existing volume. If specified, the volume is created with same size of the source volume."
-                },
-                "description": {
-                    "id": "http://docs.openstack.org/api/openstack-block-storage/v2/volume#post/description",
-                    "type": "string",
-                    "documentation": "The volume description."
-                },
-                "snapshot_id": {
-                    "id": "http://docs.openstack.org/api/openstack-block-storage/v2/volume#post/snapshot_id",
-                    "type": "string",
-                    "documentation": "To create a volume from an existing snapshot, specify the ID of the existing volume snapshot. If specified, the volume is created in same availability zone and with same size of the snapshot."
-                },
-                "size": {
-                    "id": "http://docs.openstack.org/api/openstack-block-storage/v2/volume#post/size",
-                    "type": "integer",
-                    "documentation": "The size of the volume, in GBs."
-                },
-                "name": {
-                    "id": "http://docs.openstack.org/api/openstack-block-storage/v2/volume#post/name",
-                    "type": "string",
-                    "documentation": "The volume name."
-                },
-                "imageRef": {
-                    "id": "http://docs.openstack.org/api/openstack-block-storage/v2/volume#post/imageRef",
-                    "type": "string",
-                    "documentation": "The ID of the image from which you want to create the volume. Required to create a bootable volume."
-                },
-                "volume_type": {
-                    "id": "http://docs.openstack.org/api/openstack-block-storage/v2/volume#post/volume_type",
-                    "type": "string",
-                    "documentation": "The associated volume type."
-                },
-                "bootable": {
-                    "id": "http://docs.openstack.org/api/openstack-block-storage/v2/volume#post/metadata",
-                    "type": "boolean",
-                    "documentation": "Enables or disables the bootable attribute. You can boot an instance from a bootable volume."
-                },
-                "metadata": {
-                    "id": "http://docs.openstack.org/api/openstack-block-storage/v2/volume#post/metadata",
-                    "type": "object",
-                    "documentation": "One or more metadata key and value pairs to associate with the volume.",
-                    "properties": {}
-                },
-                "encrypted": {
-                    "id": "http://docs.openstack.org/api/openstack-block-storage/v2/volume#post/metadata",
-                    "type": "boolean",
-                    "documentation": "Enables or disables encryption of the volume. You must choose the same volume type as the source volume to restore an encrypted backup volume. Must be set to true to encrypt a volume."
-                }
-            },
-            "required": [
-                "size"
-            ]
-        }
-    },
-    "required": [
-        "volume"
-    ]
-}
diff --git a/api-ref/src/wadls/volume-api/src/v2/grammar/requests/update-snapshot-metadata.json b/api-ref/src/wadls/volume-api/src/v2/grammar/requests/update-snapshot-metadata.json
deleted file mode 100644
index 87e395256..000000000
--- a/api-ref/src/wadls/volume-api/src/v2/grammar/requests/update-snapshot-metadata.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "$schema": "http://json-schema.org/draft-04/schema#",
-    "id": "http://docs.openstack.org/api/openstack-block-storage/v2/snapshots/metadata#put",
-    "type": "object",
-    "properties": {
-        "metadata": {
-            "id": "http://docs.openstack.org/api/openstack-block-storage/v2/snapshots/metadata#put/metadata",
-            "type": "object",
-            "documentation": "One or more metadata key and value pairs to set or unset for the snapshot. To unset a metadata key value, specify only the key name. To set a metadata key value, specify the key and value pair. The Block Storage server does not respect case-sensitive key names. For example, if you specify both \"key\": \"v1\" and \"KEY\": \"V1\", the server sets and returns only the KEY key and value pair.",
-            "properties": {
-                "key": {
-                    "id": "http://docs.openstack.org/api/openstack-block-storage/v2/snapshots/metadata#put/metadata/key",
-                    "type": "string"
-                }
-            },
-            "required": [
-                "key"
-            ]
-        }
-    },
-    "required": [
-        "metadata"
-    ]
-}
diff --git a/api-ref/src/wadls/volume-api/src/v2/grammar/requests/update-snapshot.json b/api-ref/src/wadls/volume-api/src/v2/grammar/requests/update-snapshot.json
deleted file mode 100644
index fac0a25bd..000000000
--- a/api-ref/src/wadls/volume-api/src/v2/grammar/requests/update-snapshot.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-    "$schema": "http://json-schema.org/draft-04/schema#",
-    "id": "http://docs.openstack.org/api/openstack-block-storage/v2/snapshots#put",
-    "type": "object",
-    "properties": {
-        "snapshot": {
-            "id": "http://docs.openstack.org/api/openstack-block-storage/v2/snapshots#put/snapshot",
-            "type": "object",
-            "properties": {
-                "name": {
-                    "id": "http://docs.openstack.org/api/openstack-block-storage/v2/snapshots#put/snapshot/name",
-                    "type": "string",
-                    "documentation": "The name of the snapshot."
-                },
-                "description": {
-                    "id": "http://docs.openstack.org/api/openstack-block-storage/v2/snapshots#put/snapshot/description",
-                    "type": "string",
-                    "documentation": "Describes the snapshot."
-                }
-            },
-            "required": []
-        }
-    },
-    "required": [
-        "snapshot"
-    ]
-}
diff --git a/api-ref/src/wadls/volume-api/src/v2/grammar/requests/update-volume.json b/api-ref/src/wadls/volume-api/src/v2/grammar/requests/update-volume.json
deleted file mode 100644
index 147a85068..000000000
--- a/api-ref/src/wadls/volume-api/src/v2/grammar/requests/update-volume.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-    "$schema": "http://json-schema.org/draft-04/schema#",
-    "id": "http://docs.openstack.org/api/openstack-block-storage/v2/volumes#put",
-    "type": "object",
-    "properties": {
-        "volume": {
-            "id": "http://docs.openstack.org/api/openstack-block-storage/v2/volumes#put/volume",
-            "type": "object",
-            "properties": {
-                "name": {
-                    "id": "http://docs.openstack.org/api/openstack-block-storage/v2/volumes#put/volume/name",
-                    "type": "string"
-                },
-                "description": {
-                    "id": "http://docs.openstack.org/api/openstack-block-storage/v2/volumes#put/volume/description",
-                    "type": "string"
-                }
-            },
-            "required": []
-        }
-    },
-    "required": [
-        "volume"
-    ]
-}
diff --git a/api-ref/src/wadls/volume-api/src/v2/os-backend-capabilities-v2.wadl b/api-ref/src/wadls/volume-api/src/v2/os-backend-capabilities-v2.wadl
deleted file mode 100644
index a999d6424..000000000
--- a/api-ref/src/wadls/volume-api/src/v2/os-backend-capabilities-v2.wadl
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- (C) 2014-2015 OpenStack Foundation, All Rights Reserved -->
-<!DOCTYPE application [
-    <!ENTITY % common  SYSTEM "common.ent">
-    %common;
-    <!ENTITY % common_project  SYSTEM "../../../common_project.ent">
-    %common_project;
-]>
-<application xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://wadl.dev.java.net/2009/02 http://www.w3.org/Submission/wadl/wadl.xsd"
- xmlns:csapi="http://docs.openstack.org/api/openstack-block-storage/v2"
- xmlns="http://wadl.dev.java.net/2009/02" xmlns:xsdxt="http://docs.rackspacecloud.com/xsd-ext/v1.0"
- xmlns:wadl="http://wadl.dev.java.net/2009/02" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-    <resources base="https://manage.example.com/"
-        xml:id="backend-capabilities-v2">
-        <resource id="version" path="//v2">
-            <resource id="tenant_id" path="{tenant_id}">
-                <param name="tenant_id" style="template"
-                    type="xsd:string">
-                    <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                        xml:lang="EN">
-                        <para>
-                            The unique identifier of the tenant or
-                            account.
-                        </para>
-                    </wadl:doc>
-                </param>
-                <resource id="capabilities" path="capabilities">
-                    <resource id="hostname" path="{hostname}">
-                        <param name="hostname" style="template"
-                            type="xsd:string">
-                            <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                                xml:lang="EN">
-                                <para>
-                                    The name of the host that hosts the storage back end.
-                                </para>
-                            </wadl:doc>
-                        </param>
-                        <method href="#getBackendCapabilities"/>
-                    </resource>
-                </resource>
-            </resource>
-        </resource>
-    </resources>
-     <method name="GET" id="getBackendCapabilities">
-        <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN"
-            title="Show back-end capabilities">
-            <para role="shortdesc">
-                Shows capabilities for a storage back end.
-            </para>
-        </wadl:doc>
-        <request>
-        </request>
-        <response status="200">
-            <representation mediaType="application/json">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN">
-                    <xsdxt:code
-                        href="api_samples/backend-capabilities/backend-capabilities-resp.json"
-                    />
-                </wadl:doc>
-            </representation>
-            <representation mediaType="application/xml">
-                &backendParametersResponse;
-            </representation>
-        </response>
-    </method>
-</application>
diff --git a/api-ref/src/wadls/volume-api/src/v2/os-volume-type-access-v2.wadl b/api-ref/src/wadls/volume-api/src/v2/os-volume-type-access-v2.wadl
deleted file mode 100644
index 4cd7443e8..000000000
--- a/api-ref/src/wadls/volume-api/src/v2/os-volume-type-access-v2.wadl
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- (C) 2014-2015 OpenStack Foundation, All Rights Reserved -->
-<!DOCTYPE application [
-    <!ENTITY % common  SYSTEM "common.ent">
-    %common;
-    <!ENTITY % common_project  SYSTEM "../../../common_project.ent">
-    %common_project;
-]>
-<application xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://wadl.dev.java.net/2009/02 http://www.w3.org/Submission/wadl/wadl.xsd"
-    xmlns:csapi="http://docs.openstack.org/api/openstack-block-storage/v2"
-    xmlns="http://wadl.dev.java.net/2009/02"
-    xmlns:xsdxt="http://docs.rackspacecloud.com/xsd-ext/v1.0"
-    xmlns:wadl="http://wadl.dev.java.net/2009/02"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    xmlns:xlink="http://www.w3.org/1999/xlink">
-    <resources base="https://manage.example.com/"
-        xml:id="volume-type-access-v2">
-        <resource id="version" path="//v2">
-            <resource id="tenant_id" path="{tenant_id}">
-                &tenantIdRequestParameter;
-                <resource id="volumes" path="volumes">
-                    <method href="#createVolumeTypeAccessExt"/>
-                </resource>
-            </resource>
-        </resource>
-    </resources>
-     <method name="POST" id="createVolumeTypeAccessExt">
-        <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN"
-            title="Create private volume">
-            <para role="shortdesc">
-                Creates a private Block Storage volume.
-            </para>
-        </wadl:doc>
-        <request>
-            <representation mediaType="application/json">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN">
-                    <xsdxt:code
-                        href="api_samples/os-volume-type-access/volume_create_request.json"
-                    />
-                </wadl:doc>
-            </representation>
-            <representation mediaType="application/xml">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN">
-                    <xsdxt:code
-                        href="api_samples/os-volume-type-access/volume_create_request.xml"/>
-                </wadl:doc>
-                &createVolumeParameters;
-                &isPublicParameterReq;
-            </representation>
-        </request>
-        <response status="202">
-            <representation mediaType="application/json">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN">
-                    <xsdxt:code
-                        href="api_samples/os-volume-type-access/volume_create_response.json"
-                    />
-                </wadl:doc>
-            </representation>
-            <representation mediaType="application/xml">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN">
-                    <xsdxt:code
-                        href="api_samples/os-volume-type-access/volume_create_response.xml"
-                    />
-                </wadl:doc>
-                &volumeDetailResponseParameters;
-                &isPublicParameterResp;
-            </representation>
-        </response>
-    </method>
-</application>
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/backup/backup_create_request.json b/api-ref/src/wadls/volume-api/src/v2/samples/backups/backup-create-request.json
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v2/api_samples/backup/backup_create_request.json
rename to api-ref/src/wadls/volume-api/src/v2/samples/backups/backup-create-request.json
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/backup/backup_create_response.json b/api-ref/src/wadls/volume-api/src/v2/samples/backups/backup-create-response.json
similarity index 99%
rename from api-ref/src/wadls/volume-api/src/v2/api_samples/backup/backup_create_response.json
rename to api-ref/src/wadls/volume-api/src/v2/samples/backups/backup-create-response.json
index 68a598c64..e2aec1c8f 100644
--- a/api-ref/src/wadls/volume-api/src/v2/api_samples/backup/backup_create_response.json
+++ b/api-ref/src/wadls/volume-api/src/v2/samples/backups/backup-create-response.json
@@ -13,4 +13,4 @@
         ],
         "name": "backup001"
     }
-}
\ No newline at end of file
+}
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/backup/backup_force_delete_request.json b/api-ref/src/wadls/volume-api/src/v2/samples/backups/backup-force-delete-request.json
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v2/api_samples/backup/backup_force_delete_request.json
rename to api-ref/src/wadls/volume-api/src/v2/samples/backups/backup-force-delete-request.json
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/backup/backup_export_record_response.json b/api-ref/src/wadls/volume-api/src/v2/samples/backups/backup-record-export-response.json
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v2/api_samples/backup/backup_export_record_response.json
rename to api-ref/src/wadls/volume-api/src/v2/samples/backups/backup-record-export-response.json
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/backup/backup_import_record_request.json b/api-ref/src/wadls/volume-api/src/v2/samples/backups/backup-record-import-request.json
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v2/api_samples/backup/backup_import_record_request.json
rename to api-ref/src/wadls/volume-api/src/v2/samples/backups/backup-record-import-request.json
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/backup/backup_import_record_response.json b/api-ref/src/wadls/volume-api/src/v2/samples/backups/backup-record-import-response.json
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v2/api_samples/backup/backup_import_record_response.json
rename to api-ref/src/wadls/volume-api/src/v2/samples/backups/backup-record-import-response.json
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/backup/backup_restore_request.json b/api-ref/src/wadls/volume-api/src/v2/samples/backups/backup-restore-request.json
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v2/api_samples/backup/backup_restore_request.json
rename to api-ref/src/wadls/volume-api/src/v2/samples/backups/backup-restore-request.json
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/backup/backup_restore_response.json b/api-ref/src/wadls/volume-api/src/v2/samples/backups/backup-restore-response.json
similarity index 98%
rename from api-ref/src/wadls/volume-api/src/v2/api_samples/backup/backup_restore_response.json
rename to api-ref/src/wadls/volume-api/src/v2/samples/backups/backup-restore-response.json
index 4896f3aaf..a344ea56c 100644
--- a/api-ref/src/wadls/volume-api/src/v2/api_samples/backup/backup_restore_response.json
+++ b/api-ref/src/wadls/volume-api/src/v2/samples/backups/backup-restore-response.json
@@ -3,4 +3,4 @@
         "backup_id": "2ef47aee-8844-490c-804d-2a8efe561c65",
         "volume_id": "795114e8-7489-40be-a978-83797f2c1dd3"
     }
-}
\ No newline at end of file
+}
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/backup/backup_show_response.json b/api-ref/src/wadls/volume-api/src/v2/samples/backups/backup-show-response.json
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v2/api_samples/backup/backup_show_response.json
rename to api-ref/src/wadls/volume-api/src/v2/samples/backups/backup-show-response.json
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/backup/backup_list_detail_response.json b/api-ref/src/wadls/volume-api/src/v2/samples/backups/backups-list-detailed-response.json
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v2/api_samples/backup/backup_list_detail_response.json
rename to api-ref/src/wadls/volume-api/src/v2/samples/backups/backups-list-detailed-response.json
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/backup/backup_list_simple_response.json b/api-ref/src/wadls/volume-api/src/v2/samples/backups/backups-list-response.json
similarity index 99%
rename from api-ref/src/wadls/volume-api/src/v2/api_samples/backup/backup_list_simple_response.json
rename to api-ref/src/wadls/volume-api/src/v2/samples/backups/backups-list-response.json
index df0e87ba0..8dd7d785a 100644
--- a/api-ref/src/wadls/volume-api/src/v2/api_samples/backup/backup_list_simple_response.json
+++ b/api-ref/src/wadls/volume-api/src/v2/samples/backups/backups-list-response.json
@@ -29,4 +29,4 @@
             "name": "backup002"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/backend-capabilities/backend-capabilities-resp.json b/api-ref/src/wadls/volume-api/src/v2/samples/capabilities/backend-capabilities-response.json
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v2/api_samples/backend-capabilities/backend-capabilities-resp.json
rename to api-ref/src/wadls/volume-api/src/v2/samples/capabilities/backend-capabilities-response.json
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/cgsnapshots/cgsnapshots-create-request.json b/api-ref/src/wadls/volume-api/src/v2/samples/cgsnapshots/cgsnapshots-create-request.json
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v2/api_samples/cgsnapshots/cgsnapshots-create-request.json
rename to api-ref/src/wadls/volume-api/src/v2/samples/cgsnapshots/cgsnapshots-create-request.json
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/cgsnapshots/cgsnapshots-create-response.json b/api-ref/src/wadls/volume-api/src/v2/samples/cgsnapshots/cgsnapshots-create-response.json
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v2/api_samples/cgsnapshots/cgsnapshots-create-response.json
rename to api-ref/src/wadls/volume-api/src/v2/samples/cgsnapshots/cgsnapshots-create-response.json
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/cgsnapshots/cgsnapshots-list-detailed-response.json b/api-ref/src/wadls/volume-api/src/v2/samples/cgsnapshots/cgsnapshots-list-detailed-response.json
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v2/api_samples/cgsnapshots/cgsnapshots-list-detailed-response.json
rename to api-ref/src/wadls/volume-api/src/v2/samples/cgsnapshots/cgsnapshots-list-detailed-response.json
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/cgsnapshots/cgsnapshots-list-response.json b/api-ref/src/wadls/volume-api/src/v2/samples/cgsnapshots/cgsnapshots-list-response.json
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v2/api_samples/cgsnapshots/cgsnapshots-list-response.json
rename to api-ref/src/wadls/volume-api/src/v2/samples/cgsnapshots/cgsnapshots-list-response.json
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/cgsnapshots/cgsnapshots-show-response.json b/api-ref/src/wadls/volume-api/src/v2/samples/cgsnapshots/cgsnapshots-show-response.json
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v2/api_samples/cgsnapshots/cgsnapshots-show-response.json
rename to api-ref/src/wadls/volume-api/src/v2/samples/cgsnapshots/cgsnapshots-show-response.json
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/consistencygroups/consistency-group-create-from-src-request.json b/api-ref/src/wadls/volume-api/src/v2/samples/consistencygroups/consistency-group-create-from-src-request.json
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v2/api_samples/consistencygroups/consistency-group-create-from-src-request.json
rename to api-ref/src/wadls/volume-api/src/v2/samples/consistencygroups/consistency-group-create-from-src-request.json
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/consistencygroups/consistency-group-create-request.json b/api-ref/src/wadls/volume-api/src/v2/samples/consistencygroups/consistency-group-create-request.json
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v2/api_samples/consistencygroups/consistency-group-create-request.json
rename to api-ref/src/wadls/volume-api/src/v2/samples/consistencygroups/consistency-group-create-request.json
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/consistencygroups/consistency-group-create-response.json b/api-ref/src/wadls/volume-api/src/v2/samples/consistencygroups/consistency-group-create-response.json
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v2/api_samples/consistencygroups/consistency-group-create-response.json
rename to api-ref/src/wadls/volume-api/src/v2/samples/consistencygroups/consistency-group-create-response.json
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/consistencygroups/consistency-group-delete-request.json b/api-ref/src/wadls/volume-api/src/v2/samples/consistencygroups/consistency-group-delete-request.json
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v2/api_samples/consistencygroups/consistency-group-delete-request.json
rename to api-ref/src/wadls/volume-api/src/v2/samples/consistencygroups/consistency-group-delete-request.json
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/consistencygroups/consistency-group-response.json b/api-ref/src/wadls/volume-api/src/v2/samples/consistencygroups/consistency-group-show-response.json
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v2/api_samples/consistencygroups/consistency-group-response.json
rename to api-ref/src/wadls/volume-api/src/v2/samples/consistencygroups/consistency-group-show-response.json
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/consistencygroups/consistency-group-update-request.json b/api-ref/src/wadls/volume-api/src/v2/samples/consistencygroups/consistency-group-update-request.json
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v2/api_samples/consistencygroups/consistency-group-update-request.json
rename to api-ref/src/wadls/volume-api/src/v2/samples/consistencygroups/consistency-group-update-request.json
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/consistencygroups/consistency-group-list-detailed-response.json b/api-ref/src/wadls/volume-api/src/v2/samples/consistencygroups/consistency-groups-list-detailed-response.json
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v2/api_samples/consistencygroups/consistency-group-list-detailed-response.json
rename to api-ref/src/wadls/volume-api/src/v2/samples/consistencygroups/consistency-groups-list-detailed-response.json
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/consistencygroups/consistency-group-list-response.json b/api-ref/src/wadls/volume-api/src/v2/samples/consistencygroups/consistency-groups-list-response.json
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v2/api_samples/consistencygroups/consistency-group-list-response.json
rename to api-ref/src/wadls/volume-api/src/v2/samples/consistencygroups/consistency-groups-list-response.json
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/host_attach_request.json b/api-ref/src/wadls/volume-api/src/v2/samples/host-attach-request.json
similarity index 96%
rename from api-ref/src/wadls/volume-api/src/v2/api_samples/host_attach_request.json
rename to api-ref/src/wadls/volume-api/src/v2/samples/host-attach-request.json
index f4d65e215..01d064451 100644
--- a/api-ref/src/wadls/volume-api/src/v2/api_samples/host_attach_request.json
+++ b/api-ref/src/wadls/volume-api/src/v2/samples/host-attach-request.json
@@ -2,4 +2,4 @@
     "os-attach": {
         "host_name": "my_host"
     }
-}
\ No newline at end of file
+}
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/limits/limits-show-get-resp.json b/api-ref/src/wadls/volume-api/src/v2/samples/limits/limits-show-response.json
similarity index 99%
rename from api-ref/src/wadls/volume-api/src/v2/api_samples/limits/limits-show-get-resp.json
rename to api-ref/src/wadls/volume-api/src/v2/samples/limits/limits-show-response.json
index 49605abcf..4235759ea 100644
--- a/api-ref/src/wadls/volume-api/src/v2/api_samples/limits/limits-show-get-resp.json
+++ b/api-ref/src/wadls/volume-api/src/v2/samples/limits/limits-show-response.json
@@ -10,4 +10,4 @@
             "maxTotalVolumes": 10
         }
     }
-}
\ No newline at end of file
+}
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/limits/limits-show-get-resp.xml b/api-ref/src/wadls/volume-api/src/v2/samples/limits/limits-show-response.xml
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v2/api_samples/limits/limits-show-get-resp.xml
rename to api-ref/src/wadls/volume-api/src/v2/samples/limits/limits-show-response.xml
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/os-quota-sets/quotas-show-defaults-get-resp.json b/api-ref/src/wadls/volume-api/src/v2/samples/os-quota-sets/quotas-show-defaults-response.json
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v2/api_samples/os-quota-sets/quotas-show-defaults-get-resp.json
rename to api-ref/src/wadls/volume-api/src/v2/samples/os-quota-sets/quotas-show-defaults-response.json
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/os-quota-sets/quotas-show-defaults-get-resp.xml b/api-ref/src/wadls/volume-api/src/v2/samples/os-quota-sets/quotas-show-defaults-response.xml
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v2/api_samples/os-quota-sets/quotas-show-defaults-get-resp.xml
rename to api-ref/src/wadls/volume-api/src/v2/samples/os-quota-sets/quotas-show-defaults-response.xml
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/os-quota-sets/quotas-show-get-resp.json b/api-ref/src/wadls/volume-api/src/v2/samples/os-quota-sets/quotas-show-response.json
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v2/api_samples/os-quota-sets/quotas-show-get-resp.json
rename to api-ref/src/wadls/volume-api/src/v2/samples/os-quota-sets/quotas-show-response.json
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/os-quota-sets/quotas-show-get-resp.xml b/api-ref/src/wadls/volume-api/src/v2/samples/os-quota-sets/quotas-show-response.xml
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v2/api_samples/os-quota-sets/quotas-show-get-resp.xml
rename to api-ref/src/wadls/volume-api/src/v2/samples/os-quota-sets/quotas-show-response.xml
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/os-quota-sets/quotas-update-post-req.json b/api-ref/src/wadls/volume-api/src/v2/samples/os-quota-sets/quotas-update-request.json
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v2/api_samples/os-quota-sets/quotas-update-post-req.json
rename to api-ref/src/wadls/volume-api/src/v2/samples/os-quota-sets/quotas-update-request.json
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/os-quota-sets/quotas-update-post-req.xml b/api-ref/src/wadls/volume-api/src/v2/samples/os-quota-sets/quotas-update-request.xml
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v2/api_samples/os-quota-sets/quotas-update-post-req.xml
rename to api-ref/src/wadls/volume-api/src/v2/samples/os-quota-sets/quotas-update-request.xml
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/os-quota-sets/quotas-update-post-resp.json b/api-ref/src/wadls/volume-api/src/v2/samples/os-quota-sets/quotas-update-response.json
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v2/api_samples/os-quota-sets/quotas-update-post-resp.json
rename to api-ref/src/wadls/volume-api/src/v2/samples/os-quota-sets/quotas-update-response.json
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/os-quota-sets/quotas-update-post-resp.xml b/api-ref/src/wadls/volume-api/src/v2/samples/os-quota-sets/quotas-update-response.xml
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v2/api_samples/os-quota-sets/quotas-update-post-resp.xml
rename to api-ref/src/wadls/volume-api/src/v2/samples/os-quota-sets/quotas-update-response.xml
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/os-quota-sets/quotas-user-show-detail-get-resp.json b/api-ref/src/wadls/volume-api/src/v2/samples/os-quota-sets/quotas-user-show-detailed-response.json
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v2/api_samples/os-quota-sets/quotas-user-show-detail-get-resp.json
rename to api-ref/src/wadls/volume-api/src/v2/samples/os-quota-sets/quotas-user-show-detailed-response.json
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/os-quota-sets/quotas-user-show-get-resp.json b/api-ref/src/wadls/volume-api/src/v2/samples/os-quota-sets/quotas-user-show-response.json
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v2/api_samples/os-quota-sets/quotas-user-show-get-resp.json
rename to api-ref/src/wadls/volume-api/src/v2/samples/os-quota-sets/quotas-user-show-response.json
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/os-quota-sets/quotas-user-show-get-resp.xml b/api-ref/src/wadls/volume-api/src/v2/samples/os-quota-sets/quotas-user-show-response.xml
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v2/api_samples/os-quota-sets/quotas-user-show-get-resp.xml
rename to api-ref/src/wadls/volume-api/src/v2/samples/os-quota-sets/quotas-user-show-response.xml
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/os-manage-existing/manage_existing_request.json b/api-ref/src/wadls/volume-api/src/v2/samples/os-vol-image-meta/image-metadata-show-request.json
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v2/api_samples/os-manage-existing/manage_existing_request.json
rename to api-ref/src/wadls/volume-api/src/v2/samples/os-vol-image-meta/image-metadata-show-request.json
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/os-manage-existing/manage_existing_response.json b/api-ref/src/wadls/volume-api/src/v2/samples/os-vol-image-meta/image-metadata-show-response.json
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v2/api_samples/os-manage-existing/manage_existing_response.json
rename to api-ref/src/wadls/volume-api/src/v2/samples/os-vol-image-meta/image-metadata-show-response.json
diff --git a/api-ref/src/wadls/volume-api/src/v2/samples/os-volume-manage/volume-manage-request.json b/api-ref/src/wadls/volume-api/src/v2/samples/os-volume-manage/volume-manage-request.json
new file mode 100644
index 000000000..39f60e87a
--- /dev/null
+++ b/api-ref/src/wadls/volume-api/src/v2/samples/os-volume-manage/volume-manage-request.json
@@ -0,0 +1,18 @@
+{
+    "volume": {
+        "host": "geraint-VirtualBox",
+        "ref": {
+            "source-volume-name": "existingLV",
+            "source-volume-id": "1234"
+        },
+        "name": "New Volume",
+        "availability_zone": "az2",
+        "description": "Volume imported from existingLV",
+        "volume_type": null,
+        "bootable": "True",
+        "metadata": {
+            "key1": "value1",
+            "key2": "value2"
+        }
+    }
+}
diff --git a/api-ref/src/wadls/volume-api/src/v2/samples/os-volume-manage/volume-manage-response.json b/api-ref/src/wadls/volume-api/src/v2/samples/os-volume-manage/volume-manage-response.json
new file mode 100644
index 000000000..343ca66bc
--- /dev/null
+++ b/api-ref/src/wadls/volume-api/src/v2/samples/os-volume-manage/volume-manage-response.json
@@ -0,0 +1,33 @@
+{
+    "volume": {
+        "status": "creating",
+        "user_id": "eae1472b5fc5496998a3d06550929e7e",
+        "attachments": [],
+        "links": [
+            {
+                "href": "http://10.0.2.15:8776/v2/87c8522052ca4eed98bc672b4c1a3ddb/volumes/23cf872b-c781-4cd4-847d-5f2ec8cbd91c",
+                "rel": "self"
+            },
+            {
+                "href": "http://10.0.2.15:8776/87c8522052ca4eed98bc672b4c1a3ddb/volumes/23cf872b-c781-4cd4-847d-5f2ec8cbd91c",
+                "rel": "bookmark"
+            }
+        ],
+        "availability_zone": "az2",
+        "bootable": "false",
+        "encrypted": "false",
+        "created_at": "2014-07-18T00:12:54.000000",
+        "description": "Volume imported from existingLV",
+        "os-vol-tenant-attr:tenant_id": "87c8522052ca4eed98bc672b4c1a3ddb",
+        "volume_type": null,
+        "name": "New Volume",
+        "source_volid": null,
+        "snapshot_id": null,
+        "metadata": {
+            "key2": "value2",
+            "key1": "value1"
+        },
+        "id": "23cf872b-c781-4cd4-847d-5f2ec8cbd91c",
+        "size": 0
+    }
+}
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/os-volume-transfer/volume-transfer-accept-request.json b/api-ref/src/wadls/volume-api/src/v2/samples/os-volume-transfer/volume-transfer-accept-request.json
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v2/api_samples/os-volume-transfer/volume-transfer-accept-request.json
rename to api-ref/src/wadls/volume-api/src/v2/samples/os-volume-transfer/volume-transfer-accept-request.json
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/os-volume-transfer/volume-transfer-accept-response.json b/api-ref/src/wadls/volume-api/src/v2/samples/os-volume-transfer/volume-transfer-accept-response.json
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v2/api_samples/os-volume-transfer/volume-transfer-accept-response.json
rename to api-ref/src/wadls/volume-api/src/v2/samples/os-volume-transfer/volume-transfer-accept-response.json
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/os-volume-transfer/volume-transfer-create-request.json b/api-ref/src/wadls/volume-api/src/v2/samples/os-volume-transfer/volume-transfer-create-request.json
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v2/api_samples/os-volume-transfer/volume-transfer-create-request.json
rename to api-ref/src/wadls/volume-api/src/v2/samples/os-volume-transfer/volume-transfer-create-request.json
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/os-volume-transfer/volume-transfer-create-response.json b/api-ref/src/wadls/volume-api/src/v2/samples/os-volume-transfer/volume-transfer-create-response.json
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v2/api_samples/os-volume-transfer/volume-transfer-create-response.json
rename to api-ref/src/wadls/volume-api/src/v2/samples/os-volume-transfer/volume-transfer-create-response.json
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/os-volume-transfer/volume-transfer-show-response.json b/api-ref/src/wadls/volume-api/src/v2/samples/os-volume-transfer/volume-transfer-show-response.json
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v2/api_samples/os-volume-transfer/volume-transfer-show-response.json
rename to api-ref/src/wadls/volume-api/src/v2/samples/os-volume-transfer/volume-transfer-show-response.json
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/os-volume-transfer/volume-transfer-list-details-response.json b/api-ref/src/wadls/volume-api/src/v2/samples/os-volume-transfer/volume-transfers-list-detailed-response.json
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v2/api_samples/os-volume-transfer/volume-transfer-list-details-response.json
rename to api-ref/src/wadls/volume-api/src/v2/samples/os-volume-transfer/volume-transfers-list-detailed-response.json
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/os-volume-transfer/volume-transfer-list-response.json b/api-ref/src/wadls/volume-api/src/v2/samples/os-volume-transfer/volume-transfers-list-response.json
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v2/api_samples/os-volume-transfer/volume-transfer-list-response.json
rename to api-ref/src/wadls/volume-api/src/v2/samples/os-volume-transfer/volume-transfers-list-response.json
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/os-volume-type-access/volume_create_request.json b/api-ref/src/wadls/volume-api/src/v2/samples/os-volume-type-access/volume-create-request.json
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v2/api_samples/os-volume-type-access/volume_create_request.json
rename to api-ref/src/wadls/volume-api/src/v2/samples/os-volume-type-access/volume-create-request.json
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/os-volume-type-access/volume_create_request.xml b/api-ref/src/wadls/volume-api/src/v2/samples/os-volume-type-access/volume-create-request.xml
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v2/api_samples/os-volume-type-access/volume_create_request.xml
rename to api-ref/src/wadls/volume-api/src/v2/samples/os-volume-type-access/volume-create-request.xml
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/os-volume-type-access/volume_create_response.json b/api-ref/src/wadls/volume-api/src/v2/samples/os-volume-type-access/volume-create-response.json
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v2/api_samples/os-volume-type-access/volume_create_response.json
rename to api-ref/src/wadls/volume-api/src/v2/samples/os-volume-type-access/volume-create-response.json
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/os-volume-type-access/volume_create_response.xml b/api-ref/src/wadls/volume-api/src/v2/samples/os-volume-type-access/volume-create-response.xml
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v2/api_samples/os-volume-type-access/volume_create_response.xml
rename to api-ref/src/wadls/volume-api/src/v2/samples/os-volume-type-access/volume-create-response.xml
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/qos_create_request.json b/api-ref/src/wadls/volume-api/src/v2/samples/qos-specs/qos-create-request.json
similarity index 98%
rename from api-ref/src/wadls/volume-api/src/v2/api_samples/qos_create_request.json
rename to api-ref/src/wadls/volume-api/src/v2/samples/qos-specs/qos-create-request.json
index 06fa74a48..c0db909bd 100644
--- a/api-ref/src/wadls/volume-api/src/v2/api_samples/qos_create_request.json
+++ b/api-ref/src/wadls/volume-api/src/v2/samples/qos-specs/qos-create-request.json
@@ -4,4 +4,4 @@
         "name": "reliability-spec",
         "numberOfFailures": "0"
     }
-}
\ No newline at end of file
+}
diff --git a/api-ref/src/wadls/volume-api/src/v2/samples/qos-specs/qos-create-request.xml b/api-ref/src/wadls/volume-api/src/v2/samples/qos-specs/qos-create-request.xml
new file mode 100644
index 000000000..ac772236c
--- /dev/null
+++ b/api-ref/src/wadls/volume-api/src/v2/samples/qos-specs/qos-create-request.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<qos_specs name="performance-spec" delay="0" throughput="100" />
diff --git a/api-ref/src/wadls/volume-api/src/v2/samples/qos-specs/qos-create-response.json b/api-ref/src/wadls/volume-api/src/v2/samples/qos-specs/qos-create-response.json
new file mode 100644
index 000000000..8fbf23376
--- /dev/null
+++ b/api-ref/src/wadls/volume-api/src/v2/samples/qos-specs/qos-create-response.json
@@ -0,0 +1,21 @@
+{
+    "qos_specs": {
+        "specs": {
+            "numberOfFailures": "0",
+            "availability": "100"
+        },
+        "consumer": "back-end",
+        "name": "reliability-spec",
+        "id": "599ef437-1c99-42ec-9fc6-239d0519fef1"
+    },
+    "links": [
+        {
+            "href": "http://23.253.248.171:8776/v2/bab7d5c60cd041a0a36f7c4b6e1dd978/qos_specs/599ef437-1c99-42ec-9fc6-239d0519fef1",
+            "rel": "self"
+        },
+        {
+            "href": "http://23.253.248.171:8776/bab7d5c60cd041a0a36f7c4b6e1dd978/qos_specs/599ef437-1c99-42ec-9fc6-239d0519fef1",
+            "rel": "bookmark"
+        }
+    ]
+}
diff --git a/api-ref/src/wadls/volume-api/src/v2/samples/qos-specs/qos-create-response.xml b/api-ref/src/wadls/volume-api/src/v2/samples/qos-specs/qos-create-response.xml
new file mode 100644
index 000000000..b23932486
--- /dev/null
+++ b/api-ref/src/wadls/volume-api/src/v2/samples/qos-specs/qos-create-response.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<qos_specs>
+    <qos_spec consumer="back-end" id="e1f84cf3-6b1e-4f25-8130-3244f69ec7c1" name="performance-spec">
+        <specs>
+            <delay>0</delay>
+            <throughput>100</throughput>
+        </specs>
+    </qos_spec>
+</qos_specs>
diff --git a/api-ref/src/wadls/volume-api/src/v2/samples/list-qos-response.json b/api-ref/src/wadls/volume-api/src/v2/samples/qos-specs/qos-list-response.json
similarity index 99%
rename from api-ref/src/wadls/volume-api/src/v2/samples/list-qos-response.json
rename to api-ref/src/wadls/volume-api/src/v2/samples/qos-specs/qos-list-response.json
index 6c956dfbf..92f2a6216 100644
--- a/api-ref/src/wadls/volume-api/src/v2/samples/list-qos-response.json
+++ b/api-ref/src/wadls/volume-api/src/v2/samples/qos-specs/qos-list-response.json
@@ -19,4 +19,4 @@
             "id": "ecfc6e2e-7117-44a4-8eec-f84d04f531a8"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/api-ref/src/wadls/volume-api/src/v2/samples/list-qos-response.xml b/api-ref/src/wadls/volume-api/src/v2/samples/qos-specs/qos-list-response.xml
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v2/samples/list-qos-response.xml
rename to api-ref/src/wadls/volume-api/src/v2/samples/qos-specs/qos-list-response.xml
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/qos_create_response.json b/api-ref/src/wadls/volume-api/src/v2/samples/qos-specs/qos-show-response.json
similarity index 99%
rename from api-ref/src/wadls/volume-api/src/v2/api_samples/qos_create_response.json
rename to api-ref/src/wadls/volume-api/src/v2/samples/qos-specs/qos-show-response.json
index d691eb1f6..d9a1dc191 100644
--- a/api-ref/src/wadls/volume-api/src/v2/api_samples/qos_create_response.json
+++ b/api-ref/src/wadls/volume-api/src/v2/samples/qos-specs/qos-show-response.json
@@ -18,4 +18,4 @@
             "rel": "bookmark"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/qos_details_show_response.xml b/api-ref/src/wadls/volume-api/src/v2/samples/qos-specs/qos-show-response.xml
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v2/api_samples/qos_details_show_response.xml
rename to api-ref/src/wadls/volume-api/src/v2/samples/qos-specs/qos-show-response.xml
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/qos_update_request.json b/api-ref/src/wadls/volume-api/src/v2/samples/qos-specs/qos-update-request.json
similarity index 96%
rename from api-ref/src/wadls/volume-api/src/v2/api_samples/qos_update_request.json
rename to api-ref/src/wadls/volume-api/src/v2/samples/qos-specs/qos-update-request.json
index 362308a79..1d3987705 100644
--- a/api-ref/src/wadls/volume-api/src/v2/api_samples/qos_update_request.json
+++ b/api-ref/src/wadls/volume-api/src/v2/samples/qos-specs/qos-update-request.json
@@ -2,4 +2,4 @@
     "qos_specs": {
         "delay": "1"
     }
-}
\ No newline at end of file
+}
diff --git a/api-ref/src/wadls/volume-api/src/v2/samples/qos-specs/qos-update-request.xml b/api-ref/src/wadls/volume-api/src/v2/samples/qos-specs/qos-update-request.xml
new file mode 100644
index 000000000..78524c7ca
--- /dev/null
+++ b/api-ref/src/wadls/volume-api/src/v2/samples/qos-specs/qos-update-request.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<qos_specs delay="2" throughput="100"/>
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/qos_update_response.json b/api-ref/src/wadls/volume-api/src/v2/samples/qos-specs/qos-update-response.json
similarity index 96%
rename from api-ref/src/wadls/volume-api/src/v2/api_samples/qos_update_response.json
rename to api-ref/src/wadls/volume-api/src/v2/samples/qos-specs/qos-update-response.json
index 362308a79..1d3987705 100644
--- a/api-ref/src/wadls/volume-api/src/v2/api_samples/qos_update_response.json
+++ b/api-ref/src/wadls/volume-api/src/v2/samples/qos-specs/qos-update-response.json
@@ -2,4 +2,4 @@
     "qos_specs": {
         "delay": "1"
     }
-}
\ No newline at end of file
+}
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/qos_update_response.xml b/api-ref/src/wadls/volume-api/src/v2/samples/qos-specs/qos-update-response.xml
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v2/api_samples/qos_update_response.xml
rename to api-ref/src/wadls/volume-api/src/v2/samples/qos-specs/qos-update-response.xml
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/qos_show_response.json b/api-ref/src/wadls/volume-api/src/v2/samples/qos-specs/qos_show_response.json
similarity index 99%
rename from api-ref/src/wadls/volume-api/src/v2/api_samples/qos_show_response.json
rename to api-ref/src/wadls/volume-api/src/v2/samples/qos-specs/qos_show_response.json
index 0c2826404..4a5d9db6a 100644
--- a/api-ref/src/wadls/volume-api/src/v2/api_samples/qos_show_response.json
+++ b/api-ref/src/wadls/volume-api/src/v2/samples/qos-specs/qos_show_response.json
@@ -6,4 +6,4 @@
             "id": "a12983c2-83bd-4afa-be9f-ad796573ead6"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/qos_show_response.xml b/api-ref/src/wadls/volume-api/src/v2/samples/qos-specs/qos_show_response.xml
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v2/api_samples/qos_show_response.xml
rename to api-ref/src/wadls/volume-api/src/v2/samples/qos-specs/qos_show_response.xml
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/list-pools-detail.json b/api-ref/src/wadls/volume-api/src/v2/samples/scheduler-stats/pools-list-detailed-response.json
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v2/api_samples/list-pools-detail.json
rename to api-ref/src/wadls/volume-api/src/v2/samples/scheduler-stats/pools-list-detailed-response.json
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/os-user-quotas/user-quotas-show-get-resp.json b/api-ref/src/wadls/volume-api/src/v2/samples/user-quotas-show-response.json
similarity index 99%
rename from api-ref/src/wadls/volume-api/src/v2/api_samples/os-user-quotas/user-quotas-show-get-resp.json
rename to api-ref/src/wadls/volume-api/src/v2/samples/user-quotas-show-response.json
index 0f5407545..239c64d23 100644
--- a/api-ref/src/wadls/volume-api/src/v2/api_samples/os-user-quotas/user-quotas-show-get-resp.json
+++ b/api-ref/src/wadls/volume-api/src/v2/samples/user-quotas-show-response.json
@@ -14,4 +14,4 @@
         "security_group_rules": 20,
         "security_groups": 10
     }
-}
\ No newline at end of file
+}
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/os-user-quotas/user-quotas-show-get-resp.xml b/api-ref/src/wadls/volume-api/src/v2/samples/user-quotas-show-response.xml
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v2/api_samples/os-user-quotas/user-quotas-show-get-resp.xml
rename to api-ref/src/wadls/volume-api/src/v2/samples/user-quotas-show-response.xml
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/os-user-quotas/user-quotas-update-post-req.json b/api-ref/src/wadls/volume-api/src/v2/samples/user-quotas-update-request.json
similarity index 97%
rename from api-ref/src/wadls/volume-api/src/v2/api_samples/os-user-quotas/user-quotas-update-post-req.json
rename to api-ref/src/wadls/volume-api/src/v2/samples/user-quotas-update-request.json
index cbd6f18af..b322b2a87 100644
--- a/api-ref/src/wadls/volume-api/src/v2/api_samples/os-user-quotas/user-quotas-update-post-req.json
+++ b/api-ref/src/wadls/volume-api/src/v2/samples/user-quotas-update-request.json
@@ -3,4 +3,4 @@
         "force": "True",
         "instances": 9
     }
-}
\ No newline at end of file
+}
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/os-user-quotas/user-quotas-update-post-req.xml b/api-ref/src/wadls/volume-api/src/v2/samples/user-quotas-update-request.xml
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v2/api_samples/os-user-quotas/user-quotas-update-post-req.xml
rename to api-ref/src/wadls/volume-api/src/v2/samples/user-quotas-update-request.xml
diff --git a/api-ref/src/wadls/volume-api/src/v1/api_samples/os-user-quotas/user-quotas-update-post-resp.json b/api-ref/src/wadls/volume-api/src/v2/samples/user-quotas-update-response.json
similarity index 99%
rename from api-ref/src/wadls/volume-api/src/v1/api_samples/os-user-quotas/user-quotas-update-post-resp.json
rename to api-ref/src/wadls/volume-api/src/v2/samples/user-quotas-update-response.json
index 9fbee648b..553933292 100644
--- a/api-ref/src/wadls/volume-api/src/v1/api_samples/os-user-quotas/user-quotas-update-post-resp.json
+++ b/api-ref/src/wadls/volume-api/src/v2/samples/user-quotas-update-response.json
@@ -13,4 +13,4 @@
         "security_group_rules": 20,
         "security_groups": 10
     }
-}
\ No newline at end of file
+}
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/os-user-quotas/user-quotas-update-post-resp.xml b/api-ref/src/wadls/volume-api/src/v2/samples/user-quotas-update-response.xml
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v2/api_samples/os-user-quotas/user-quotas-update-post-resp.xml
rename to api-ref/src/wadls/volume-api/src/v2/samples/user-quotas-update-response.xml
diff --git a/api-ref/src/wadls/volume-api/src/v2/samples/cinder-extensions-response.json b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/extensions-list-response.json
similarity index 99%
rename from api-ref/src/wadls/volume-api/src/v2/samples/cinder-extensions-response.json
rename to api-ref/src/wadls/volume-api/src/v2/samples/volumes/extensions-list-response.json
index a2ee9683a..55003a906 100644
--- a/api-ref/src/wadls/volume-api/src/v2/samples/cinder-extensions-response.json
+++ b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/extensions-list-response.json
@@ -209,4 +209,4 @@
             "description": "Services support."
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/api-ref/src/wadls/volume-api/src/v2/samples/cinder-extensions-response.xml b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/extensions-list-response.xml
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v2/samples/cinder-extensions-response.xml
rename to api-ref/src/wadls/volume-api/src/v2/samples/volumes/extensions-list-response.xml
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/snapshot_create_request.json b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/snapshot-create-request.json
similarity index 98%
rename from api-ref/src/wadls/volume-api/src/v2/api_samples/snapshot_create_request.json
rename to api-ref/src/wadls/volume-api/src/v2/samples/volumes/snapshot-create-request.json
index ba6cd172e..3c0fe5d88 100644
--- a/api-ref/src/wadls/volume-api/src/v2/api_samples/snapshot_create_request.json
+++ b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/snapshot-create-request.json
@@ -5,4 +5,4 @@
         "volume_id": "5aa119a8-d25b-45a7-8d1b-88e127885635",
         "force": true
     }
-}
\ No newline at end of file
+}
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/snapshot_create_request.xml b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/snapshot-create-request.xml
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v2/api_samples/snapshot_create_request.xml
rename to api-ref/src/wadls/volume-api/src/v2/samples/volumes/snapshot-create-request.xml
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/snapshot_create_response.json b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/snapshot-create-response.json
similarity index 99%
rename from api-ref/src/wadls/volume-api/src/v2/api_samples/snapshot_create_response.json
rename to api-ref/src/wadls/volume-api/src/v2/samples/volumes/snapshot-create-response.json
index c432145d2..d8901e88d 100644
--- a/api-ref/src/wadls/volume-api/src/v2/api_samples/snapshot_create_response.json
+++ b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/snapshot-create-response.json
@@ -9,4 +9,4 @@
         "id": "ffa9bc5e-1172-4021-acaf-cdcd78a9584d",
         "name": "snap-001"
     }
-}
\ No newline at end of file
+}
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/snapshot_create_response.xml b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/snapshot-create-response.xml
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v2/api_samples/snapshot_create_response.xml
rename to api-ref/src/wadls/volume-api/src/v2/samples/volumes/snapshot-create-response.xml
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/snapshot_metadata_response.json b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/snapshot-metadata-show-response.json
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v2/api_samples/snapshot_metadata_response.json
rename to api-ref/src/wadls/volume-api/src/v2/samples/volumes/snapshot-metadata-show-response.json
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/snapshot_metadata_response.xml b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/snapshot-metadata-show-response.xml
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v2/api_samples/snapshot_metadata_response.xml
rename to api-ref/src/wadls/volume-api/src/v2/samples/volumes/snapshot-metadata-show-response.xml
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/snapshot_update_metadata_request.json b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/snapshot-metadata-update-request.json
similarity index 95%
rename from api-ref/src/wadls/volume-api/src/v2/api_samples/snapshot_update_metadata_request.json
rename to api-ref/src/wadls/volume-api/src/v2/samples/volumes/snapshot-metadata-update-request.json
index 983ce9527..4373b0018 100644
--- a/api-ref/src/wadls/volume-api/src/v2/api_samples/snapshot_update_metadata_request.json
+++ b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/snapshot-metadata-update-request.json
@@ -2,4 +2,4 @@
     "metadata": {
         "key": "v2"
     }
-}
\ No newline at end of file
+}
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/snapshot_update_metadata_request.xml b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/snapshot-metadata-update-request.xml
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v2/api_samples/snapshot_update_metadata_request.xml
rename to api-ref/src/wadls/volume-api/src/v2/samples/volumes/snapshot-metadata-update-request.xml
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/snapshot_update_metadata_response.json b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/snapshot-metadata-update-response.json
similarity index 95%
rename from api-ref/src/wadls/volume-api/src/v2/api_samples/snapshot_update_metadata_response.json
rename to api-ref/src/wadls/volume-api/src/v2/samples/volumes/snapshot-metadata-update-response.json
index 983ce9527..4373b0018 100644
--- a/api-ref/src/wadls/volume-api/src/v2/api_samples/snapshot_update_metadata_response.json
+++ b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/snapshot-metadata-update-response.json
@@ -2,4 +2,4 @@
     "metadata": {
         "key": "v2"
     }
-}
\ No newline at end of file
+}
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/snapshot_update_metadata_response.xml b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/snapshot-metadata-update-response.xml
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v2/api_samples/snapshot_update_metadata_response.xml
rename to api-ref/src/wadls/volume-api/src/v2/samples/volumes/snapshot-metadata-update-response.xml
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/snapshot_show_response.json b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/snapshot-show-response.json
similarity index 99%
rename from api-ref/src/wadls/volume-api/src/v2/api_samples/snapshot_show_response.json
rename to api-ref/src/wadls/volume-api/src/v2/samples/volumes/snapshot-show-response.json
index a36f18890..25a8c6c9d 100644
--- a/api-ref/src/wadls/volume-api/src/v2/api_samples/snapshot_show_response.json
+++ b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/snapshot-show-response.json
@@ -11,4 +11,4 @@
         "id": "2bb856e1-b3d8-4432-a858-09e4ce939389",
         "name": "snap-001"
     }
-}
\ No newline at end of file
+}
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/snapshot_show_response.xml b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/snapshot-show-response.xml
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v2/api_samples/snapshot_show_response.xml
rename to api-ref/src/wadls/volume-api/src/v2/samples/volumes/snapshot-show-response.xml
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/snapshot_update_request.json b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/snapshot-update-request.json
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v2/api_samples/snapshot_update_request.json
rename to api-ref/src/wadls/volume-api/src/v2/samples/volumes/snapshot-update-request.json
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/snapshot_update_request.xml b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/snapshot-update-request.xml
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v2/api_samples/snapshot_update_request.xml
rename to api-ref/src/wadls/volume-api/src/v2/samples/volumes/snapshot-update-request.xml
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/snapshot_update_response.json b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/snapshot-update-response.json
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v2/api_samples/snapshot_update_response.json
rename to api-ref/src/wadls/volume-api/src/v2/samples/volumes/snapshot-update-response.json
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/snapshot_update_response.xml b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/snapshot-update-response.xml
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v2/api_samples/snapshot_update_response.xml
rename to api-ref/src/wadls/volume-api/src/v2/samples/volumes/snapshot-update-response.xml
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/snapshot_list_detail_response.json b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/snapshots-list-detailed-response.json
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v2/api_samples/snapshot_list_detail_response.json
rename to api-ref/src/wadls/volume-api/src/v2/samples/volumes/snapshots-list-detailed-response.json
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/snapshot_list_detail_response.xml b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/snapshots-list-detailed-response.xml
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v2/api_samples/snapshot_list_detail_response.xml
rename to api-ref/src/wadls/volume-api/src/v2/samples/volumes/snapshots-list-detailed-response.xml
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/snapshot_list_simple_response.json b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/snapshots-list-response.json
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v2/api_samples/snapshot_list_simple_response.json
rename to api-ref/src/wadls/volume-api/src/v2/samples/volumes/snapshots-list-response.json
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/snapshot_list_simple_response.xml b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/snapshots-list-response.xml
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v2/api_samples/snapshot_list_simple_response.xml
rename to api-ref/src/wadls/volume-api/src/v2/samples/volumes/snapshots-list-response.xml
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/version-get-resp.json b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/version-show-response.json
similarity index 99%
rename from api-ref/src/wadls/volume-api/src/v2/api_samples/version-get-resp.json
rename to api-ref/src/wadls/volume-api/src/v2/samples/volumes/version-show-response.json
index 0df53b29f..06ba84d07 100644
--- a/api-ref/src/wadls/volume-api/src/v2/api_samples/version-get-resp.json
+++ b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/version-show-response.json
@@ -30,4 +30,4 @@
             }
         ]
     }
-}
\ No newline at end of file
+}
diff --git a/api-ref/src/wadls/volume-api/src/v2/samples/volumes/version-show-response.xml b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/version-show-response.xml
new file mode 100644
index 000000000..38cecbc61
--- /dev/null
+++ b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/version-show-response.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<choices xmlns="http://docs.openstack.org/common/api/v1.0" xmlns:atom="http://www.w3.org/2005/Atom">
+    <version status="SUPPORTED" id="v1.0">
+        <media-types>
+            <media-type base="application/xml" type="application/vnd.openstack.volume+xml;version=1" />
+            <media-type base="application/json" type="application/vnd.openstack.volume+json;version=1" />
+        </media-types>
+        <atom:link href="http://23.253.248.171:8776/v1/v2.xml" rel="self" />
+    </version>
+    <version status="CURRENT" id="v2.0">
+        <media-types>
+            <media-type base="application/xml" type="application/vnd.openstack.volume+xml;version=1" />
+            <media-type base="application/json" type="application/vnd.openstack.volume+json;version=1" />
+        </media-types>
+        <atom:link href="http://23.253.248.171:8776/v2/v2.xml" rel="self" />
+    </version>
+</choices>
diff --git a/api-ref/src/wadls/volume-api/src/v2/samples/volumes/version-v2-show-response.json b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/version-v2-show-response.json
new file mode 100644
index 000000000..2719a8135
--- /dev/null
+++ b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/version-v2-show-response.json
@@ -0,0 +1,44 @@
+{
+    "choices": [
+        {
+            "status": "SUPPORTED",
+            "media-types": [
+                {
+                    "base": "application/xml",
+                    "type": "application/vnd.openstack.volume+xml;version=1"
+                },
+                {
+                    "base": "application/json",
+                    "type": "application/vnd.openstack.volume+json;version=1"
+                }
+            ],
+            "id": "v1.0",
+            "links": [
+                {
+                    "href": "http://23.253.248.171:8776/v1/v2.json",
+                    "rel": "self"
+                }
+            ]
+        },
+        {
+            "status": "CURRENT",
+            "media-types": [
+                {
+                    "base": "application/xml",
+                    "type": "application/vnd.openstack.volume+xml;version=1"
+                },
+                {
+                    "base": "application/json",
+                    "type": "application/vnd.openstack.volume+json;version=1"
+                }
+            ],
+            "id": "v2.0",
+            "links": [
+                {
+                    "href": "http://23.253.248.171:8776/v2/v2.json",
+                    "rel": "self"
+                }
+            ]
+        }
+    ]
+}
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/cinder-versions-response.json b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/versions-response.json
similarity index 54%
rename from api-ref/src/wadls/volume-api/src/v2/api_samples/cinder-versions-response.json
rename to api-ref/src/wadls/volume-api/src/v2/samples/volumes/versions-response.json
index 29b36bd17..03a8df8cc 100644
--- a/api-ref/src/wadls/volume-api/src/v2/api_samples/cinder-versions-response.json
+++ b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/versions-response.json
@@ -1,26 +1,26 @@
 {
     "versions": [
         {
+            "status": "SUPPORTED",
+            "updated": "2014-06-28T12:20:21Z",
             "id": "v1.0",
             "links": [
                 {
-                    "href": "http://23.253.211.234:8776/v1/",
+                    "href": "http://23.253.248.171:8776/v1/",
                     "rel": "self"
                 }
-            ],
-            "status": "DEPRECATED",
-            "updated": "2014-06-28T12:20:21Z"
+            ]
         },
         {
+            "status": "CURRENT",
+            "updated": "2012-11-21T11:33:21Z",
             "id": "v2.0",
             "links": [
                 {
-                    "href": "http://23.253.211.234:8776/v2/",
+                    "href": "http://23.253.248.171:8776/v2/",
                     "rel": "self"
                 }
-            ],
-            "status": "CURRENT",
-            "updated": "2012-11-21T11:33:21Z"
+            ]
         }
     ]
 }
diff --git a/api-ref/src/wadls/volume-api/src/v2/samples/volumes/versions-response.xml b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/versions-response.xml
new file mode 100644
index 000000000..bb4fff452
--- /dev/null
+++ b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/versions-response.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<choices xmlns="http://docs.openstack.org/common/api/v1.0" xmlns:atom="http://www.w3.org/2005/Atom">
+    <version status="SUPPORTED" id="v1.0">
+        <media-types>
+            <media-type base="application/xml" type="application/vnd.openstack.volume+xml;version=1" />
+            <media-type base="application/json" type="application/vnd.openstack.volume+json;version=1" />
+        </media-types>
+        <atom:link href="http://23.253.248.171:8776/v1/.xml" rel="self" />
+    </version>
+    <version status="CURRENT" id="v2.0">
+        <media-types>
+            <media-type base="application/xml" type="application/vnd.openstack.volume+xml;version=1" />
+            <media-type base="application/json" type="application/vnd.openstack.volume+json;version=1" />
+        </media-types>
+        <atom:link href="http://23.253.248.171:8776/v2/.xml" rel="self" />
+    </version>
+</choices>
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/volume_attach_request.json b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/volume-attach-request.json
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v2/api_samples/volume_attach_request.json
rename to api-ref/src/wadls/volume-api/src/v2/samples/volumes/volume-attach-request.json
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/volume_create_request.json b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/volume-create-request.json
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v2/api_samples/volume_create_request.json
rename to api-ref/src/wadls/volume-api/src/v2/samples/volumes/volume-create-request.json
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/volume_create_request.xml b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/volume-create-request.xml
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v2/api_samples/volume_create_request.xml
rename to api-ref/src/wadls/volume-api/src/v2/samples/volumes/volume-create-request.xml
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/volume_create_response.json b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/volume-create-response.json
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v2/api_samples/volume_create_response.json
rename to api-ref/src/wadls/volume-api/src/v2/samples/volumes/volume-create-response.json
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/volume_create_response.xml b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/volume-create-response.xml
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v2/api_samples/volume_create_response.xml
rename to api-ref/src/wadls/volume-api/src/v2/samples/volumes/volume-create-response.xml
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/volume_extend_request.json b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/volume-extend-request.json
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v2/api_samples/volume_extend_request.json
rename to api-ref/src/wadls/volume-api/src/v2/samples/volumes/volume-extend-request.json
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/os-force-detach/os-force-detach-request.json b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/volume-force-detach-request.json
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v2/api_samples/os-force-detach/os-force-detach-request.json
rename to api-ref/src/wadls/volume-api/src/v2/samples/volumes/volume-force-detach-request.json
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/volume_set_image_metadata_request.json b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/volume-image-metadata-set-request.json
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v2/api_samples/volume_set_image_metadata_request.json
rename to api-ref/src/wadls/volume-api/src/v2/samples/volumes/volume-image-metadata-set-request.json
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/volume_unset_image_metadata_request.json b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/volume-image-metadata-unset-request.json
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v2/api_samples/volume_unset_image_metadata_request.json
rename to api-ref/src/wadls/volume-api/src/v2/samples/volumes/volume-image-metadata-unset-request.json
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/volume-metadata-show-response.json b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/volume-metadata-show-response.json
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v2/api_samples/volume-metadata-show-response.json
rename to api-ref/src/wadls/volume-api/src/v2/samples/volumes/volume-metadata-show-response.json
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/volume-metadata-show-response.xml b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/volume-metadata-show-response.xml
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v2/api_samples/volume-metadata-show-response.xml
rename to api-ref/src/wadls/volume-api/src/v2/samples/volumes/volume-metadata-show-response.xml
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/volume-metadata-update-request.json b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/volume-metadata-update-request.json
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v2/api_samples/volume-metadata-update-request.json
rename to api-ref/src/wadls/volume-api/src/v2/samples/volumes/volume-metadata-update-request.json
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/volume-metadata-update-request.xml b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/volume-metadata-update-request.xml
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v2/api_samples/volume-metadata-update-request.xml
rename to api-ref/src/wadls/volume-api/src/v2/samples/volumes/volume-metadata-update-request.xml
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/volume-metadata-update-response.json b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/volume-metadata-update-response.json
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v2/api_samples/volume-metadata-update-response.json
rename to api-ref/src/wadls/volume-api/src/v2/samples/volumes/volume-metadata-update-response.json
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/volume-metadata-update-response.xml b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/volume-metadata-update-response.xml
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v2/api_samples/volume-metadata-update-response.xml
rename to api-ref/src/wadls/volume-api/src/v2/samples/volumes/volume-metadata-update-response.xml
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/os-replica/os-promote-replica-request.json b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/volume-replica-promote-request.json
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v2/api_samples/os-replica/os-promote-replica-request.json
rename to api-ref/src/wadls/volume-api/src/v2/samples/volumes/volume-replica-promote-request.json
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/os-replica/os-reenable-replica-request.json b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/volume-replica-reenable-request.json
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v2/api_samples/os-replica/os-reenable-replica-request.json
rename to api-ref/src/wadls/volume-api/src/v2/samples/volumes/volume-replica-reenable-request.json
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/volume_show_response.json b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/volume-show-response.json
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v2/api_samples/volume_show_response.json
rename to api-ref/src/wadls/volume-api/src/v2/samples/volumes/volume-show-response.json
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/volume_show_response.xml b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/volume-show-response.xml
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v2/api_samples/volume_show_response.xml
rename to api-ref/src/wadls/volume-api/src/v2/samples/volumes/volume-show-response.xml
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/volume_reset_status_request.json b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/volume-status-reset-request.json
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v2/api_samples/volume_reset_status_request.json
rename to api-ref/src/wadls/volume-api/src/v2/samples/volumes/volume-status-reset-request.json
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/volume_type_create_request.json b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/volume-type-create-request.json
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v2/api_samples/volume_type_create_request.json
rename to api-ref/src/wadls/volume-api/src/v2/samples/volumes/volume-type-create-request.json
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/volume_type_create_request.xml b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/volume-type-create-request.xml
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v2/api_samples/volume_type_create_request.xml
rename to api-ref/src/wadls/volume-api/src/v2/samples/volumes/volume-type-create-request.xml
diff --git a/api-ref/src/wadls/volume-api/src/v1/api_samples/volume_type_show.json b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/volume-type-show-request.json
similarity index 98%
rename from api-ref/src/wadls/volume-api/src/v1/api_samples/volume_type_show.json
rename to api-ref/src/wadls/volume-api/src/v2/samples/volumes/volume-type-show-request.json
index 60690e6a6..a91f2e94d 100644
--- a/api-ref/src/wadls/volume-api/src/v1/api_samples/volume_type_show.json
+++ b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/volume-type-show-request.json
@@ -6,4 +6,4 @@
             "capabilities": "gpu"
         }
     }
-}
\ No newline at end of file
+}
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/volume_type_show.xml b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/volume-type-show-request.xml
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v2/api_samples/volume_type_show.xml
rename to api-ref/src/wadls/volume-api/src/v2/samples/volumes/volume-type-show-request.xml
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/volume_type_show_response.json b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/volume-type-show-response.json
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v2/api_samples/volume_type_show_response.json
rename to api-ref/src/wadls/volume-api/src/v2/samples/volumes/volume-type-show-response.json
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/volume_type_show_response.xml b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/volume-type-show-response.xml
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v2/api_samples/volume_type_show_response.xml
rename to api-ref/src/wadls/volume-api/src/v2/samples/volumes/volume-type-show-response.xml
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/volume_type_list_response.json b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/volume-types-list-response.json
similarity index 99%
rename from api-ref/src/wadls/volume-api/src/v2/api_samples/volume_type_list_response.json
rename to api-ref/src/wadls/volume-api/src/v2/samples/volumes/volume-types-list-response.json
index 8049eb592..1d72f923e 100644
--- a/api-ref/src/wadls/volume-api/src/v2/api_samples/volume_type_list_response.json
+++ b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/volume-types-list-response.json
@@ -13,4 +13,4 @@
             "name": "SATA"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/volume_type_list_response.xml b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/volume-types-list-response.xml
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v2/api_samples/volume_type_list_response.xml
rename to api-ref/src/wadls/volume-api/src/v2/samples/volumes/volume-types-list-response.xml
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/os-unmanage/os-unmanage-request.json b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/volume-unmanage-request.json
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v2/api_samples/os-unmanage/os-unmanage-request.json
rename to api-ref/src/wadls/volume-api/src/v2/samples/volumes/volume-unmanage-request.json
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/volume_update_request.json b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/volume-update-request.json
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v2/api_samples/volume_update_request.json
rename to api-ref/src/wadls/volume-api/src/v2/samples/volumes/volume-update-request.json
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/volume_update_request.xml b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/volume-update-request.xml
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v2/api_samples/volume_update_request.xml
rename to api-ref/src/wadls/volume-api/src/v2/samples/volumes/volume-update-request.xml
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/volume_update_response.json b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/volume-update-response.json
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v2/api_samples/volume_update_response.json
rename to api-ref/src/wadls/volume-api/src/v2/samples/volumes/volume-update-response.json
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/volume_update_response.xml b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/volume-update-response.xml
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v2/api_samples/volume_update_response.xml
rename to api-ref/src/wadls/volume-api/src/v2/samples/volumes/volume-update-response.xml
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/volume_list_detail_response.json b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/volumes-list-detailed-response.json
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v2/api_samples/volume_list_detail_response.json
rename to api-ref/src/wadls/volume-api/src/v2/samples/volumes/volumes-list-detailed-response.json
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/volume_list_detail_response.xml b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/volumes-list-detailed-response.xml
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v2/api_samples/volume_list_detail_response.xml
rename to api-ref/src/wadls/volume-api/src/v2/samples/volumes/volumes-list-detailed-response.xml
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/volume_list_simple_response.json b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/volumes-list-response.json
similarity index 99%
rename from api-ref/src/wadls/volume-api/src/v2/api_samples/volume_list_simple_response.json
rename to api-ref/src/wadls/volume-api/src/v2/samples/volumes/volumes-list-response.json
index fef9fd6a4..b3c7cc051 100644
--- a/api-ref/src/wadls/volume-api/src/v2/api_samples/volume_list_simple_response.json
+++ b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/volumes-list-response.json
@@ -29,4 +29,4 @@
             "name": "vol-003"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/api-ref/src/wadls/volume-api/src/v2/api_samples/volume_list_simple_response.xml b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/volumes-list-response.xml
similarity index 100%
rename from api-ref/src/wadls/volume-api/src/v2/api_samples/volume_list_simple_response.xml
rename to api-ref/src/wadls/volume-api/src/v2/samples/volumes/volumes-list-response.xml
diff --git a/api-ref/src/wadls/volume-api/src/v2/volume-backups-api-v2.wadl b/api-ref/src/wadls/volume-api/src/v2/wadl/backups-v2.wadl
similarity index 89%
rename from api-ref/src/wadls/volume-api/src/v2/volume-backups-api-v2.wadl
rename to api-ref/src/wadls/volume-api/src/v2/wadl/backups-v2.wadl
index 06a06cd47..46cc466ef 100644
--- a/api-ref/src/wadls/volume-api/src/v2/volume-backups-api-v2.wadl
+++ b/api-ref/src/wadls/volume-api/src/v2/wadl/backups-v2.wadl
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- (C) 2012-2015 OpenStack Foundation, All Rights Reserved -->
 <!DOCTYPE application [
-    <!ENTITY % common  SYSTEM "common.ent">
+    <!ENTITY % common  SYSTEM "../common.ent">
     %common;
-    <!ENTITY % common_project  SYSTEM "../../../common_project.ent">
+    <!ENTITY % common_project  SYSTEM "../../../../common_project.ent">
     %common_project;
 ]>
 <application xmlns="http://wadl.dev.java.net/2009/02"
@@ -16,15 +16,7 @@
         xml:id="volume-backups-v2">
         <resource id="version" path="//v2">
             <resource id="tenant_id" path="{tenant_id}">
-                <param name="tenant_id" style="template"
-                    type="xsd:string">
-                    <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                        xml:lang="EN">
-                        <para>
-                            The unique identifier of the tenant or account.
-                        </para>
-                    </wadl:doc>
-                </param>
+                &tenant_idTemplateParameter;
                 <resource id="backups" path="backups">
                     <method href="#createBackup"/>
                     <method href="#listBackups"/>
@@ -32,16 +24,7 @@
                         <method href="#listBackupsDetails"/>
                     </resource>
                     <resource path="{backup_id}" id="backup_id">
-                        <param name="backup_id" style="template"
-                            required="true" type="csapi:UUID">
-                            <wadl:doc
-                                xmlns="http://docbook.org/ns/docbook"
-                                xml:lang="EN">
-                                <para>
-                                    The unique identifier for a backup.
-                                </para>
-                            </wadl:doc>
-                        </param>
+                        &backup_idTemplateParameter;
                         <method href="#showBackup"/>
                         <method href="#deleteBackup"/>
                         <resource path="restore" id="restore">
@@ -67,7 +50,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/backup/backup_create_request.json"
+                        href="../samples/backups/backup-create-request.json"
                     />
                 </wadl:doc>
                 <param name="backup" style="plain" type="xsd:string"
@@ -102,10 +85,10 @@
                         null.</para></wadl:doc>
                 </param>
                 <param name="volume_id" style="plain"
-                    type="csapi:uuid" required="true">
+                    type="csapi:UUID" required="true">
                     <wadl:doc xmlns="http://docbook.org/ns/docbook"
                         xml:lang="EN">
-                        <para>The ID of the volume that you want to
+                        <para>The UUID of the volume that you want to
                             back up.</para></wadl:doc>
                 </param>
                 <param name="incremental" style="plain"
@@ -127,7 +110,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/backup/backup_create_response.json"
+                        href="../samples/backups/backup-create-response.json"
                     />
                 </wadl:doc>
                 <param name="backup" style="plain" type="xsd:string"
@@ -137,11 +120,11 @@
                         <para>A <code>backup</code>
                         object.</para></wadl:doc>
                 </param>
-                <param name="id" style="plain" type="csapi:uuid"
+                <param name="id" style="plain" type="csapi:UUID"
                     required="true">
                     <wadl:doc xmlns="http://docbook.org/ns/docbook"
                         xml:lang="EN">
-                        <para>The ID of the backup.</para></wadl:doc>
+                        <para>The UUID of the backup.</para></wadl:doc>
                 </param>
                 <param name="links" style="plain" type="xsd:dict"
                     required="true">
@@ -177,7 +160,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/backup/backup_list_simple_response.json"
+                        href="../samples/backups/backups-list-response.json"
                     />
                 </wadl:doc>
                 <param name="backups" style="plain" type="xsd:string"
@@ -187,11 +170,11 @@
                         <para>A <code>backups</code>
                         object.</para></wadl:doc>
                 </param>
-                <param name="id" style="plain" type="csapi:uuid"
+                <param name="id" style="plain" type="csapi:UUID"
                     required="true">
                     <wadl:doc xmlns="http://docbook.org/ns/docbook"
                         xml:lang="EN">
-                        <para>The ID of the backup.</para></wadl:doc>
+                        <para>The UUID of the backup.</para></wadl:doc>
                 </param>
                 <param name="links" style="plain" type="xsd:dict"
                     required="true">
@@ -227,7 +210,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/backup/backup_list_detail_response.json"
+                        href="../samples/backups/backups-list-detailed-response.json"
                     />
                 </wadl:doc>
                 <param name="backups" style="plain" type="xsd:string"
@@ -266,11 +249,11 @@
                             failure. Otherwise,
                         null.</para></wadl:doc>
                 </param>
-                <param name="id" style="plain" type="csapi:uuid"
+                <param name="id" style="plain" type="csapi:UUID"
                     required="true">
                     <wadl:doc xmlns="http://docbook.org/ns/docbook"
                         xml:lang="EN">
-                        <para>The ID of the backup.</para></wadl:doc>
+                        <para>The UUID of the backup.</para></wadl:doc>
                 </param>
                 <param name="links" style="plain" type="xsd:dict"
                     required="true">
@@ -306,10 +289,10 @@
                             available.</para></wadl:doc>
                 </param>
                 <param name="volume_id" style="plain"
-                    type="csapi:uuid" required="true">
+                    type="csapi:UUID" required="true">
                     <wadl:doc xmlns="http://docbook.org/ns/docbook"
                         xml:lang="EN">
-                        <para>The ID of the volume from which the
+                        <para>The UUID of the volume from which the
                             backup was created.</para></wadl:doc>
                 </param>
                 <param name="is_incremental" style="plain"
@@ -350,7 +333,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/backup/backup_show_response.json"
+                        href="../samples/backups/backup-show-response.json"
                     />
                 </wadl:doc>
                 <param name="backup" style="plain" type="xsd:string"
@@ -389,11 +372,11 @@
                             failure. Otherwise,
                         null.</para></wadl:doc>
                 </param>
-                <param name="id" style="plain" type="csapi:uuid"
+                <param name="id" style="plain" type="csapi:UUID"
                     required="true">
                     <wadl:doc xmlns="http://docbook.org/ns/docbook"
                         xml:lang="EN">
-                        <para>The ID of the backup.</para></wadl:doc>
+                        <para>The UUID of the backup.</para></wadl:doc>
                 </param>
                 <param name="links" style="plain" type="xsd:dict"
                     required="true">
@@ -429,10 +412,10 @@
                             available.</para></wadl:doc>
                 </param>
                 <param name="volume_id" style="plain"
-                    type="csapi:uuid" required="true">
+                    type="csapi:UUID" required="true">
                     <wadl:doc xmlns="http://docbook.org/ns/docbook"
                         xml:lang="EN">
-                        <para>The ID of the volume from which the
+                        <para>The UUID of the volume from which the
                             backup was created.</para></wadl:doc>
                 </param>
                 <param name="is_incremental" style="plain"
@@ -478,8 +461,8 @@
                 Storage volume.
             </para>
             <para>
-                You must specify either the volume ID or name. If you specify
-                both the volume ID and name, the ID takes priority.
+                You must specify either the UUID or name of the volume. If you specify
+                both the UUID and name, the UUID takes priority.
           </para>
         </wadl:doc>
         <request>
@@ -487,7 +470,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/backup/backup_restore_request.json"
+                        href="../samples/backups/backup-restore-request.json"
                     />
                 </wadl:doc>
                 <param name="restore" style="plain" type="xsd:string"
@@ -500,7 +483,7 @@
                 <param name="volume_id" style="plain" type="csapi:UUID"
                     required="false">
                     <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                        xml:lang="EN"><para>The ID of the volume to
+                        xml:lang="EN"><para>The UUID of the volume to
                             which you want to restore a backup.</para>
                     </wadl:doc>
                 </param>
@@ -518,7 +501,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/backup/backup_restore_response.json"
+                        href="../samples/backups/backup-restore-response.json"
                     />
                 </wadl:doc>
                 <param name="restore" style="plain" type="xsd:string"
@@ -531,14 +514,14 @@
                 <param name="backup_id" style="plain" type="csapi:UUID"
                     required="true">
                     <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                        xml:lang="EN"><para>The ID of the
+                        xml:lang="EN"><para>The UUID of the
                             backup.</para>
                     </wadl:doc>
                 </param>
                 <param name="volume_id" style="plain" type="csapi:UUID"
                     required="true">
                     <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                        xml:lang="EN"><para>The ID of the volume to
+                        xml:lang="EN"><para>The UUID of the volume to
                             which the backup was restored.</para>
                     </wadl:doc>
                 </param>
@@ -565,7 +548,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/backup/backup_force_delete_request.json"
+                        href="../samples/backups/backup-force-delete-request.json"
                     />
                 </wadl:doc>
                 <param name="os-force_delete" style="plain" type="xsd:string"
diff --git a/api-ref/src/wadls/volume-api/src/v2/wadl/capabilities-v2.wadl b/api-ref/src/wadls/volume-api/src/v2/wadl/capabilities-v2.wadl
new file mode 100644
index 000000000..281636dbe
--- /dev/null
+++ b/api-ref/src/wadls/volume-api/src/v2/wadl/capabilities-v2.wadl
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- (C) 2014-2015 OpenStack Foundation, All Rights Reserved -->
+<!DOCTYPE application [
+    <!ENTITY % common  SYSTEM "../common.ent">
+    %common;
+    <!ENTITY % common_project  SYSTEM "../../../../common_project.ent">
+    %common_project;
+]>
+<application xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://wadl.dev.java.net/2009/02 http://www.w3.org/Submission/wadl/wadl.xsd"
+    xmlns:csapi="http://docs.openstack.org/api/openstack-block-storage/v2"
+    xmlns="http://wadl.dev.java.net/2009/02"
+    xmlns:xsdxt="http://docs.rackspacecloud.com/xsd-ext/v1.0"
+    xmlns:wadl="http://wadl.dev.java.net/2009/02"
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+    xmlns:xlink="http://www.w3.org/1999/xlink">
+    <resources base="https://manage.example.com/"
+        xml:id="backend-capabilities-v2">
+        <resource id="version" path="//v2">
+            <resource id="tenant_id" path="{tenant_id}">
+                &tenant_idTemplateParameter;
+                <resource id="capabilities" path="capabilities">
+                    <resource id="hostname" path="{hostname}">
+                        &hostnameTemplateParameter;
+                        <method href="#showBackendCapabilities"/>
+                    </resource>
+                </resource>
+            </resource>
+        </resource>
+    </resources>
+     <method name="GET" id="showBackendCapabilities">
+        <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN"
+            title="Show back-end capabilities">
+            <para role="shortdesc">
+                Shows capabilities for a storage back end.
+            </para>
+        </wadl:doc>
+        <request>
+        </request>
+        <response status="200">
+            <representation mediaType="application/json">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                    xml:lang="EN">
+                    <xsdxt:code
+                        href="../samples/capabilities/backend-capabilities-response.json"
+                    />
+                </wadl:doc>
+            </representation>
+            <representation mediaType="application/xml">
+                &backendParametersResponse;
+            </representation>
+        </response>
+    </method>
+</application>
diff --git a/api-ref/src/wadls/volume-api/src/v2/cgsnapshots-v2.wadl b/api-ref/src/wadls/volume-api/src/v2/wadl/cgsnapshots-v2.wadl
similarity index 81%
rename from api-ref/src/wadls/volume-api/src/v2/cgsnapshots-v2.wadl
rename to api-ref/src/wadls/volume-api/src/v2/wadl/cgsnapshots-v2.wadl
index 0f0d0b9a0..51d06ccb5 100644
--- a/api-ref/src/wadls/volume-api/src/v2/cgsnapshots-v2.wadl
+++ b/api-ref/src/wadls/volume-api/src/v2/wadl/cgsnapshots-v2.wadl
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- (C) 2015 OpenStack Foundation, All Rights Reserved -->
 <!DOCTYPE application [
-    <!ENTITY % common  SYSTEM "common.ent">
+    <!ENTITY % common  SYSTEM "../common.ent">
     %common;
-    <!ENTITY % common_project  SYSTEM "../../../common_project.ent">
+    <!ENTITY % common_project  SYSTEM "../../../../common_project.ent">
     %common_project;
 ]>
 <application xmlns="http://wadl.dev.java.net/2009/02"
@@ -17,24 +17,15 @@
     <resources base="https://volume.example.com/" xml:id="cgsnapshots-v2">
         <resource id="version" path="//v2">
             <resource id="tenant_id" path="{tenant_id}">
-                &tenantIdRequestParameter;
+                &tenant_idTemplateParameter;
                 <resource id="cgsnapshots" path="cgsnapshots">
                     <method href="#listCGsnapshots"/>
                     <method href="#createCGsnapshot"/>
                     <resource id="detail" path="detail">
-                        <method href="#getCGsnapshotsDetail-v2"/>
+                        <method href="#listCGsnapshotsDetail-v2"/>
                     </resource>
                     <resource path="{cgsnapshot_id}" id="cgsnapshot_id">
-                        <param name="cgsnapshot_id" style="template"
-                            type="xsd:string">
-                            <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                                xml:lang="EN">
-                                <para>
-                                    The unique identifier of the consistency
-                                    group snapshot.
-                                </para>
-                            </wadl:doc>
-                        </param>
+                        &cgsnapshot_idTemplateParameter;
                         <method href="#showCGsnapshot"/>
                         <method href="#deleteCGsnapshot"/>
                     </resource>
@@ -55,7 +46,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/cgsnapshots/cgsnapshots-list-response.json"
+                        href="../samples/cgsnapshots/cgsnapshots-list-response.json"
                     />
                 </wadl:doc>
             </representation>
@@ -64,7 +55,7 @@
             </representation>
         </response>
     </method>
-    <method name="GET" id="getCGsnapshotsDetail-v2">
+    <method name="GET" id="listCGsnapshotsDetail-v2">
         <wadl:doc xml:lang="EN" title="List consistency group snapshots with details"
             xmlns="http://docbook.org/ns/docbook">
             <para role="shortdesc">
@@ -76,7 +67,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/cgsnapshots/cgsnapshots-list-detailed-response.json"
+                        href="../samples/cgsnapshots/cgsnapshots-list-detailed-response.json"
                     />
                 </wadl:doc>
             </representation>
@@ -97,7 +88,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/cgsnapshots/cgsnapshots-create-request.json"
+                        href="../samples/cgsnapshots/cgsnapshots-create-request.json"
                     />
                 </wadl:doc>
             </representation>
@@ -110,7 +101,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/cgsnapshots/cgsnapshots-create-response.json"/>
+                        href="../samples/cgsnapshots/cgsnapshots-create-response.json"/>
                 </wadl:doc>
             </representation>
             <representation mediaType="application/xml">
@@ -140,7 +131,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/cgsnapshots/cgsnapshots-show-response.json"
+                        href="../samples/cgsnapshots/cgsnapshots-show-response.json"
                     />
                 </wadl:doc>
             </representation>
diff --git a/api-ref/src/wadls/volume-api/src/v2/consistencygroups-v2.wadl b/api-ref/src/wadls/volume-api/src/v2/wadl/consistencygroups-v2.wadl
similarity index 75%
rename from api-ref/src/wadls/volume-api/src/v2/consistencygroups-v2.wadl
rename to api-ref/src/wadls/volume-api/src/v2/wadl/consistencygroups-v2.wadl
index 231161c2f..64d0558dd 100644
--- a/api-ref/src/wadls/volume-api/src/v2/consistencygroups-v2.wadl
+++ b/api-ref/src/wadls/volume-api/src/v2/wadl/consistencygroups-v2.wadl
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- (C) 2015 OpenStack Foundation, All Rights Reserved -->
 <!DOCTYPE application [
-    <!ENTITY % common  SYSTEM "common.ent">
+    <!ENTITY % common  SYSTEM "../common.ent">
     %common;
-    <!ENTITY % common_project  SYSTEM "../../../common_project.ent">
+    <!ENTITY % common_project  SYSTEM "../../../../common_project.ent">
     %common_project;
 ]>
 <application xmlns="http://wadl.dev.java.net/2009/02"
@@ -17,36 +17,19 @@
     <resources base="https://volume.example.com/" xml:id="consistencygroups-v2">
         <resource id="version" path="//v2">
             <resource id="tenant_id" path="{tenant_id}">
-                <param name="tenant_id" style="template"
-                    type="xsd:string">
-                    <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                        xml:lang="EN">
-                        <para>
-                            The unique identifier of the tenant or account.
-                        </para>
-                    </wadl:doc>
-                </param>
+                &tenant_idTemplateParameter;
                 <resource id="consistencygroups" path="consistencygroups">
-                    <method href="#getConsistencygroups-v2"/>
+                    <method href="#listConsistencyGroups-v2"/>
                     <method href="#postConsistencygroups-v2"/>
                     <resource id="detail" path="detail">
-                        <method href="#getConsistencygroupsDetail-v2"/>
+                        <method href="#listConsistencyGroupsDetail-v2"/>
                     </resource>
                     <resource id="create_from_src" path="create_from_src">
                         <method href="#postConsistencygroupsFromSrc-v2"/>
                     </resource>
                     <resource path="{consistencygroup_id}" id="consistencygroup_id">
-                        <param name="consistencygroup_id" style="template"
-                            type="xsd:string">
-                            <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                                xml:lang="EN">
-                                <para>
-                                    The unique identifier of the consistency
-                                    group.
-                                </para>
-                            </wadl:doc>
-                        </param>
-                        <method href="#getConsistencygroup-v2"/>
+                        &consistencygroup_idTemplateParameter;
+                        <method href="#showConsistencyGroup-v2"/>
                         <resource path="delete" id="delete">
                             <method href="#postConsistencygroupDelete-v2"/>
                         </resource>
@@ -59,7 +42,7 @@
         </resource>
     </resources>
     <!-- consistencygroups -->
-    <method name="GET" id="getConsistencygroups-v2">
+    <method name="GET" id="listConsistencyGroups-v2">
         <wadl:doc xml:lang="EN" title="List consistency groups"
             xmlns="http://docbook.org/ns/docbook">
             <para role="shortdesc">
@@ -71,16 +54,16 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/consistencygroups/consistency-group-list-response.json"
+                        href="../samples/consistencygroups/consistency-groups-list-response.json"
                     />
                 </wadl:doc>
             </representation>
             <representation mediaType="application/xml">
-                &getConsistencyGroupsResponseParameters;
+                &listConsistencyGroupsResponseParameters;
             </representation>
         </response>
     </method>
-    <method name="GET" id="getConsistencygroupsDetail-v2">
+    <method name="GET" id="listConsistencyGroupsDetail-v2">
         <wadl:doc xml:lang="EN" title="List consistency groups with details"
             xmlns="http://docbook.org/ns/docbook">
             <para role="shortdesc">
@@ -92,12 +75,12 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/consistencygroups/consistency-group-list-detailed-response.json"
+                        href="../samples/consistencygroups/consistency-groups-list-detailed-response.json"
                     />
                 </wadl:doc>
             </representation>
             <representation mediaType="application/xml">
-                &getConsistencyGroupsDetailResponseParameters;
+                &listConsistencyGroupsDetailResponseParameters;
             </representation>
         </response>
     </method>
@@ -113,7 +96,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/consistencygroups/consistency-group-create-request.json"
+                        href="../samples/consistencygroups/consistency-group-create-request.json"
                     />
                 </wadl:doc>
             </representation>
@@ -126,7 +109,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/consistencygroups/consistency-group-create-response.json"/>
+                        href="../samples/consistencygroups/consistency-group-create-response.json"/>
                 </wadl:doc>
             </representation>
         </response>
@@ -143,7 +126,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/consistencygroups/consistency-group-create-from-src-request.json"
+                        href="../samples/consistencygroups/consistency-group-create-from-src-request.json"
                     />
                 </wadl:doc>
             </representation>
@@ -156,7 +139,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/consistencygroups/consistency-group-create-response.json"/>
+                        href="../samples/consistencygroups/consistency-group-create-response.json"/>
                 </wadl:doc>
             </representation>
         </response>
@@ -173,7 +156,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/consistencygroups/consistency-group-delete-request.json"
+                        href="../samples/consistencygroups/consistency-group-delete-request.json"
                     />
                 </wadl:doc>
             </representation>
@@ -196,7 +179,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/consistencygroups/consistency-group-update-request.json"/>
+                        href="../samples/consistencygroups/consistency-group-update-request.json"/>
                 </wadl:doc>
                 &postConsistencyGroupsUpdateParameters;
             </representation>
@@ -204,7 +187,7 @@
         <response status="202">
         </response>
     </method>
-    <method name="GET" id="getConsistencygroup-v2">
+    <method name="GET" id="showConsistencyGroup-v2">
         <wadl:doc xml:lang="EN" title="Show consistency group details"
             xmlns="http://docbook.org/ns/docbook">
             <para role="shortdesc">
@@ -216,12 +199,12 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/consistencygroups/consistency-group-response.json"
+                        href="../samples/consistencygroups/consistency-group-show-response.json"
                     />
                 </wadl:doc>
             </representation>
             <representation mediaType="application/xml">
-                &getConsistencyGroupsDetailResponseParameters;
+                &listConsistencyGroupsDetailResponseParameters;
             </representation>
         </response>
     </method>
diff --git a/api-ref/src/wadls/volume-api/src/v2/os-limits-v2.wadl b/api-ref/src/wadls/volume-api/src/v2/wadl/limits-v2.wadl
similarity index 74%
rename from api-ref/src/wadls/volume-api/src/v2/os-limits-v2.wadl
rename to api-ref/src/wadls/volume-api/src/v2/wadl/limits-v2.wadl
index 6b0bce04e..9997ed786 100644
--- a/api-ref/src/wadls/volume-api/src/v2/os-limits-v2.wadl
+++ b/api-ref/src/wadls/volume-api/src/v2/wadl/limits-v2.wadl
@@ -1,28 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- (C) 2013-2015 OpenStack Foundation, All Rights Reserved -->
 <!DOCTYPE application [
-    <!ENTITY % common  SYSTEM "common.ent">
+    <!ENTITY % common  SYSTEM "../common.ent">
     %common;
-    <!ENTITY % common  SYSTEM "../common_project.ent">
+    <!ENTITY % common_project  SYSTEM "../../../../common_project.ent">
     %common_project;
 ]>
 <application xmlns="http://wadl.dev.java.net/2009/02"
     xmlns:xsdxt="http://docs.rackspacecloud.com/xsd-ext/v1.0"
     xmlns:csapi="http://docs.openstack.org/api/openstack-block-storage/v2"
     xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    xmlns:wadl="http://wadl.dev.java.net/2009/02">
+    xmlns:wadl="http://wadl.dev.java.net/2009/02"
+    xmlns:xlink="http://www.w3.org/1999/xlink">
     <resources base="https://volume.example.com/"
         xml:id="os-limits-cinder-v2">
         <resource id="version-cinder-v2" type="#VersionDetails"
             path="//v2">
             <resource id="tenant_id-cinder-v2" path="{tenant_id}">
-                <param name="tenant_id" style="template"
-                    type="xsd:string" required="true">
-                    <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                        xml:lang="EN" title="Tenant ID">
-                        <para>The ID for the tenant or project in a
-                            multi-tenancy cloud.</para></wadl:doc>
-                </param>
+                &tenant_idTemplateParameter;
                 <resource id="limits-for-cinder-v2" path="limits">
                     <method href="#showAbsoluteLimits"/>
                 </resource>
@@ -32,8 +27,9 @@
     <method name="GET" id="showAbsoluteLimits">
         <wadl:doc xml:lang="EN" xmlns="http://docbook.org/ns/docbook"
             title="Show absolute limits">
-            <para role="shortdesc">Shows absolute limits for a
-                tenant.</para>
+            <para role="shortdesc">
+                Shows absolute limits for a tenant.
+            </para>
             <para>
                 An absolute limit value of <code>-1</code> indicates that the
                 absolute limit for the item is infinite.
@@ -45,7 +41,7 @@
                     xml:lang="EN"
                     title="Show absolute limits: JSON response">
                     <xsdxt:code
-                        href="api_samples/limits/limits-show-get-resp.json"
+                        href="../samples/limits/limits-show-response.json"
                     />
                 </wadl:doc>
             </representation>
@@ -54,7 +50,7 @@
                     xml:lang="EN"
                     title="Show absolute limits: XML response">
                     <xsdxt:code
-                        href="api_samples/limits/limits-show-get-resp.xml"
+                        href="../samples/limits/limits-show-response.xml"
                     />
                 </wadl:doc>
             </representation>
@@ -65,7 +61,7 @@
                     xml:lang="EN"
                     title="Show absolute limits: JSON response">
                     <xsdxt:code
-                        href="api_samples/limits/limits-show-get-resp.json"
+                        href="../samples/limits/limits-show-response.json"
                     />
                 </wadl:doc>
             </representation>
@@ -74,7 +70,7 @@
                     xml:lang="EN"
                     title="Show absolute limits: XML response">
                     <xsdxt:code
-                        href="api_samples/limits/limits-show-get-resp.xml"
+                        href="../samples/limits/limits-show-response.xml"
                     />
                 </wadl:doc>
             </representation>
diff --git a/api-ref/src/wadls/volume-api/src/v2/os-attach-v2.wadl b/api-ref/src/wadls/volume-api/src/v2/wadl/os-attach-interfaces-v2.wadl
similarity index 68%
rename from api-ref/src/wadls/volume-api/src/v2/os-attach-v2.wadl
rename to api-ref/src/wadls/volume-api/src/v2/wadl/os-attach-interfaces-v2.wadl
index d65ef3ab9..a1c852ec7 100644
--- a/api-ref/src/wadls/volume-api/src/v2/os-attach-v2.wadl
+++ b/api-ref/src/wadls/volume-api/src/v2/wadl/os-attach-interfaces-v2.wadl
@@ -1,5 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- (C) 2014 OpenStack Foundation, All Rights Reserved -->
+<!-- (C) 2014-2015 OpenStack Foundation, All Rights Reserved -->
+<!DOCTYPE application [
+    <!ENTITY % common  SYSTEM "../common.ent">
+    %common;
+    <!ENTITY % common_project  SYSTEM "../../../../common_project.ent">
+    %common_project;
+]>
 <application xmlns="http://wadl.dev.java.net/2009/02"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:xsd="http://www.w3.org/2001/XMLSchema"
@@ -8,44 +14,24 @@
     xmlns:xsdxt="http://docs.rackspacecloud.com/xsd-ext/v1.0"
     xmlns:common="http://docs.openstack.org/common/api/v1.0"
     xmlns:wadl="http://wadl.dev.java.net/2009/02"
-    xmlns:atom="http://www.w3.org/2005/Atom">
+    xmlns:atom="http://www.w3.org/2005/Atom"
+    xmlns:xlink="http://www.w3.org/1999/xlink">
     <resources base="https://servers.api.openstack.com"
         xml:id="os-attach-v2">
         <resource id="version" type="#VersionDetails" path="v2/">
             <resource id="tenantID" path="{tenant_id}">
-                <param name="tenant_id" style="template"
-                    type="xsd:string">
-                    <wadl:doc xml:lang="EN"
-                        xmlns="http://docbook.org/ns/docbook">
-                        <para>The ID for the tenant or account in a
-                            multi-tenancy cloud.</para>
-                    </wadl:doc>
-                </param>
+                &tenant_idTemplateParameter;
                 <resource id="Servers" path="servers">
                     <resource path="{server_id}" id="server_id">
-                        <param name="server_id" style="template"
-                            type="csapi:UUID">
-                            <wadl:doc xml:lang="EN"
-                                xmlns="http://docbook.org/ns/docbook">
-                                <para>The UUID for the server of
-                                   interest to you.</para>
-                            </wadl:doc>
-                        </param>
+                        &server_idTemplateParameter;
                         <resource path="os-attach-interfaces"
                             id="os-attach-interfaces">
                             <method href="#createAttachInterface"/>
                             <method href="#listAttachedInterfaces"/>
                             <resource path="{attachment_id}"
                                 id="attachment_id">
-                                <param name="attachment_id"
-                                   style="template" type="csapi:UUID">
-                                   <wadl:doc xml:lang="EN"
-                                   xmlns="http://docbook.org/ns/docbook">
-                                   <para>The interface ID.</para>
-                                   </wadl:doc>
-                                </param>
-                                <method href="#showAttachedInterface"
-                                />
+                                &interface_idTemplateParameter;
+                                <method href="#showAttachedInterface"/>
                             </resource>
                         </resource>
                     </resource>
@@ -56,15 +42,17 @@
     <method name="POST" id="createAttachInterface">
         <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN"
             title="Create interface">
-            <para role="shortdesc">Creates and uses a port interface
-                to attach the port to a server instance.</para>
+            <para role="shortdesc">
+                Creates and uses a port interface to attach the port to a
+                server instance.
+            </para>
         </wadl:doc>
         <request>
             <representation mediaType="application/json">
                 <wadl:doc xml:lang="EN"
                     xmlns="http://docbook.org/ns/docbook">
                     <xsdxt:code
-                        href="../api_samples/os-attach-interfaces/attach-interfaces-create-req.json"
+                        href="../samples/os-attach-interfaces/attach-interfaces-create-request.json"
                     />
                 </wadl:doc>
             </representation>
@@ -72,24 +60,27 @@
                 <wadl:doc xml:lang="EN"
                     xmlns="http://docbook.org/ns/docbook">
                     <xsdxt:code
-                        href="../api_samples/os-attach-interfaces/attach-interfaces-create-req.xml"
+                        href="../samples/os-attach-interfaces/attach-interfaces-create-request.xml"
                     />
                 </wadl:doc>
                 <param name="interfaceAttachment" style="plain"
                     type="xsd:string" required="true">
                     <wadl:doc xml:lang="EN"
                         xmlns="http://docbook.org/ns/docbook">
-                        <para>Specify the
-                                <code>interfaceAttachment</code>
-                            action in the request body.</para>
+                        <para>
+                            Specify the <code>interfaceAttachment</code>
+                            action in the request body.
+                        </para>
                     </wadl:doc>
                 </param>
-                <param name="port_id" style="plain" type="csapi:uuid"
+                <param name="port_id" style="plain" type="csapi:UUID"
                     required="true">
                     <wadl:doc xml:lang="EN"
                         xmlns="http://docbook.org/ns/docbook">
-                        <para>The ID of the port for which you want to
-                            create an interface.</para>
+                        <para>
+                            The UUID of the port for which you want to create an
+                            interface.
+                        </para>
                     </wadl:doc>
                 </param>
             </representation>
@@ -99,7 +90,7 @@
                 <wadl:doc xml:lang="EN"
                     xmlns="http://docbook.org/ns/docbook">
                     <xsdxt:code
-                        href="../api_samples/os-attach-interfaces/attach-interfaces-create-resp.json"
+                        href="../samples/os-attach-interfaces/attach-interfaces-create-response.json"
                     />
                 </wadl:doc>
             </representation>
@@ -107,36 +98,43 @@
                 <wadl:doc xml:lang="EN"
                     xmlns="http://docbook.org/ns/docbook">
                     <xsdxt:code
-                        href="../api_samples/os-attach-interfaces/attach-interfaces-create-resp.xml"
+                        href="../samples/os-attach-interfaces/attach-interfaces-create-response.xml"
                     />
                 </wadl:doc>
                 <param name="fixed_ips" style="plain"
                     type="xsd:string" required="true">
                     <wadl:doc xml:lang="EN"
                         xmlns="http://docbook.org/ns/docbook">
-                        <para>Fixed IP addresses with subnet
-                            IDs.</para>
+                        <para>
+                            Fixed IP addresses with subnet IDs.
+                        </para>
                     </wadl:doc>
                 </param>
                 <param name="mac_addr" style="plain" type="xsd:string"
                     required="true">
                     <wadl:doc xml:lang="EN"
                         xmlns="http://docbook.org/ns/docbook">
-                        <para>The MAC address.</para>
+                        <para>
+                            The MAC address.
+                        </para>
                     </wadl:doc>
                 </param>
-                <param name="net_id" style="plain" type="csapi:uuid"
+                <param name="net_id" style="plain" type="csapi:UUID"
                     required="true">
                     <wadl:doc xml:lang="EN"
                         xmlns="http://docbook.org/ns/docbook">
-                        <para>The network ID.</para>
+                        <para>
+                            The network ID.
+                        </para>
                     </wadl:doc>
                 </param>
-                <param name="port_id" style="plain" type="csapi:uuid"
+                <param name="port_id" style="plain" type="csapi:UUID"
                     required="true">
                     <wadl:doc xml:lang="EN"
                         xmlns="http://docbook.org/ns/docbook">
-                        <para>The port ID.</para>
+                        <para>
+                            The port ID.
+                        </para>
                     </wadl:doc>
                 </param>
                 <param name="port_state" style="plain"
@@ -144,7 +142,9 @@
                     <wadl:doc xml:lang="EN"
                         xmlns="http://docbook.org/ns/docbook"
                         title="Port state">
-                        <para>The port state.</para>
+                        <para>
+                            The port state.
+                        </para>
                     </wadl:doc>
                 </param>
             </representation>
@@ -153,14 +153,16 @@
     <method name="GET" id="listAttachedInterfaces">
         <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN"
             title="List interfaces">
-            <para role="shortdesc">Lists port interfaces.</para>
+            <para role="shortdesc">
+                Lists port interfaces.
+            </para>
         </wadl:doc>
         <response status="202">
             <representation mediaType="application/json">
                 <wadl:doc xml:lang="EN"
                     xmlns="http://docbook.org/ns/docbook">
                     <xsdxt:code
-                        href="../api_samples/os-attach-interfaces/attach-interfaces-list-resp.json"
+                        href="../samples/os-attach-interfaces/attach-interfaces-list-response.json"
                     />
                 </wadl:doc>
             </representation>
@@ -168,43 +170,53 @@
                 <wadl:doc xml:lang="EN"
                     xmlns="http://docbook.org/ns/docbook">
                     <xsdxt:code
-                        href="../api_samples/os-attach-interfaces/attach-interfaces-list-resp.xml"
+                        href="../samples/os-attach-interfaces/attach-interfaces-list-response.xml"
                     />
                 </wadl:doc>
                 <param name="port_state" style="plain"
                     type="xsd:string" required="true">
                     <wadl:doc xml:lang="EN"
                         xmlns="http://docbook.org/ns/docbook">
-                        <para>The port state.</para>
+                        <para>
+                            The port state.
+                        </para>
                     </wadl:doc>
                 </param>
                 <param name="fixed_ips" style="plain"
                     type="xsd:string" required="true">
                     <wadl:doc xml:lang="EN"
                         xmlns="http://docbook.org/ns/docbook">
-                        <para>Fixed IP addresses with subnet
-                            IDs.</para>
+                        <para>
+                            Fixed IP addresses with subnet
+                            IDs.
+                        </para>
                     </wadl:doc>
                 </param>
                 <param name="mac_addr" style="plain" type="xsd:string"
                     required="true">
                     <wadl:doc xml:lang="EN"
                         xmlns="http://docbook.org/ns/docbook">
-                        <para>The MAC address.</para>
+                        <para>
+                            The MAC address.
+                        </para>
                     </wadl:doc>
                 </param>
-                <param name="net_id" style="plain" type="csapi:uuid"
+                <param name="net_id" style="plain" type="csapi:UUID"
                     required="true">
                     <wadl:doc xml:lang="EN"
                         xmlns="http://docbook.org/ns/docbook">
-                        <para>The network ID.</para>
+                        <para>
+                            The network ID.
+                        </para>
                     </wadl:doc>
                 </param>
-                <param name="port_id" style="plain" type="csapi:uuid"
+                <param name="port_id" style="plain" type="csapi:UUID"
                     required="true">
                     <wadl:doc xml:lang="EN"
                         xmlns="http://docbook.org/ns/docbook">
-                        <para>The port ID.</para>
+                        <para>
+                            The port ID.
+                        </para>
                     </wadl:doc>
                 </param>
             </representation>
@@ -213,15 +225,16 @@
     <method name="GET" id="showAttachedInterface">
         <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN"
             title="Show attached interface details">
-            <para role="shortdesc">Shows details for a
-                port interface.</para>
+            <para role="shortdesc">
+                Shows details for a port interface.
+            </para>
         </wadl:doc>
         <response status="202">
             <representation mediaType="application/json">
                 <wadl:doc xml:lang="EN"
                     xmlns="http://docbook.org/ns/docbook">
                     <xsdxt:code
-                        href="../api_samples/os-attach-interfaces/attach-interfaces-show-resp.json"
+                        href="../samples/os-attach-interfaces/attach-interfaces-show-response.json"
                     />
                 </wadl:doc>
             </representation>
@@ -229,7 +242,7 @@
                 <wadl:doc xml:lang="EN"
                     xmlns="http://docbook.org/ns/docbook">
                     <xsdxt:code
-                        href="../api_samples/os-attach-interfaces/attach-interfaces-show-resp.xml"
+                        href="../samples/os-attach-interfaces/attach-interfaces-show-response.xml"
                     />
                 </wadl:doc>
             </representation>
diff --git a/api-ref/src/wadls/volume-api/src/v2/os-quota-sets-v2.wadl b/api-ref/src/wadls/volume-api/src/v2/wadl/os-quota-sets-v2.wadl
similarity index 69%
rename from api-ref/src/wadls/volume-api/src/v2/os-quota-sets-v2.wadl
rename to api-ref/src/wadls/volume-api/src/v2/wadl/os-quota-sets-v2.wadl
index 83a74670d..f57ee8a14 100644
--- a/api-ref/src/wadls/volume-api/src/v2/os-quota-sets-v2.wadl
+++ b/api-ref/src/wadls/volume-api/src/v2/wadl/os-quota-sets-v2.wadl
@@ -1,75 +1,41 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- (C) 2013-2015 OpenStack Foundation, All Rights Reserved -->
 <!DOCTYPE application [
-    <!ENTITY % common  SYSTEM "common.ent">
+    <!ENTITY % common  SYSTEM "../common.ent">
     %common;
-    <!ENTITY % common  SYSTEM "../common_project.ent">
+    <!ENTITY % common_project  SYSTEM "../../../../common_project.ent">
     %common_project;
 ]>
 <application xmlns="http://wadl.dev.java.net/2009/02"
     xmlns:xsdxt="http://docs.rackspacecloud.com/xsd-ext/v1.0"
     xmlns:csapi="http://docs.openstack.org/api/openstack-block-storage/v2"
     xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    xmlns:wadl="http://wadl.dev.java.net/2009/02">
+    xmlns:wadl="http://wadl.dev.java.net/2009/02"
+    xmlns:xlink="http://www.w3.org/1999/xlink">
     <resources base="https://volume.example.com/"
         xml:id="os-quota-sets-cinder-v2">
         <resource id="version-cinder-v2" type="#VersionDetails"
             path="//v2">
             <resource id="tenant_id-cinder-v2" path="{tenant_id}">
-                &tenantIdRequestParameter;
+                &tenant_idTemplateParameter;
                 <resource id="os-quota-sets-for-cinder-v2"
                     path="os-quota-sets">
                     <resource path="{tenant_id}"
                         id="tenant_id_cinder_v2">
-                        <param name="tenant_id" style="template"
-                            type="xsd:string" required="true">
-                            <wadl:doc
-                                xmlns="http://docbook.org/ns/docbook"
-                                xml:lang="EN" title="Project ID">
-                                <para>
-                                  The ID for the tenant for which you want to
-                                  show, update, or delete quotas. This ID is
-                                  different than the first tenant ID that you
-                                  specify in the URI: That ID is for the admin
-                                  tenant.
-                                 </para>
-                            </wadl:doc>
-                        </param>
+                        &tenant_idTemplateParameter2;
                         <method href="#showQuota"/>
                         <method href="#updateQuota"/>
                         <method href="#deleteQuotas"/>
                     </resource>
                     <resource path="defaults" id="defaults-cinder-v2">
-                        <method href="#getDefaults"/>
+                        <method href="#showQuotaDefaults"/>
                     </resource>
                     <resource path="{tenant_id}"
                         id="tenantID-cinder-v2">
-                        <param name="tenant_id" style="template"
-                            type="xsd:string" required="true">
-                          <wadl:doc
-                              xmlns="http://docbook.org/ns/docbook"
-                              xml:lang="EN" title="Project ID">
-                            <para>
-                              The ID for the tenant for which you want to show
-                              or update quotas. This ID is different than the
-                              first tenant ID that you specify in the URI:
-                              That ID is for the admin tenant.
-                            </para>
-                          </wadl:doc>
-                        </param>
+                        &tenant_idTemplateParameter2;
                         <resource id="user_id-cinder-v2"
                             path="{user_id}">
-                            <param name="user_id" style="template"
-                                type="xsd:string" required="true">
-                              <wadl:doc
-                                 xmlns="http://docbook.org/ns/docbook"
-                                 xml:lang="EN" title="User ID">
-                                 <para>
-                                    The user ID. Specify in the URI as a query
-                                    string: <code>user_id={user_id}</code>.
-                                </para>
-                              </wadl:doc>
-                            </param>
+                            &user_idTemplateParameter;
                             <method href="#showQuotaUser"/>
                             <method href="#updateQuotaUser"/>
                             <method href="#deleteQuotasUser"/>
@@ -77,17 +43,7 @@
                         <resource id="detail-cinder-v2" path="detail">
                           <resource id="user_id-detail-cinder-v2"
                                 path="{user_id}">
-                            <param name="user_id" style="template"
-                               type="xsd:string" required="true">
-                               <wadl:doc
-                               xmlns="http://docbook.org/ns/docbook"
-                               xml:lang="EN" title="User ID">
-                                <para>
-                                  The user ID. Specify in the URI as a query
-                                  string: <code>user_id={user_id}</code>.
-                                </para>
-                              </wadl:doc>
-                            </param>
+                            &user_idTemplateParameter;
                             <method href="#showQuotaDetailUser"/>
                           </resource>
                         </resource>
@@ -96,7 +52,7 @@
             </resource>
         </resource>
     </resources>
-    <method name="GET" id="getDefaults">
+    <method name="GET" id="showQuotaDefaults">
         <wadl:doc xml:lang="EN" xmlns="http://docbook.org/ns/docbook"
             title="Get default quotas">
             <para role="shortdesc">
@@ -109,7 +65,7 @@
                     xml:lang="EN"
                     title="Get default quotas response: JSON">
                     <xsdxt:code
-                        href="api_samples/os-quota-sets/quotas-show-defaults-get-resp.json"
+                        href="../samples/os-quota-sets/quotas-show-defaults-response.json"
                     />
                 </wadl:doc>
             </representation>
@@ -118,7 +74,7 @@
                     xml:lang="EN"
                     title="Get default quotas response: XML">
                     <xsdxt:code
-                        href="api_samples/os-quota-sets/quotas-show-defaults-get-resp.xml"
+                        href="../samples/os-quota-sets/quotas-show-defaults-response.xml"
                     />
                 </wadl:doc>
                 &quotasResponse;
@@ -142,7 +98,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN" title="Show quotas response: JSON">
                     <xsdxt:code
-                        href="api_samples/os-quota-sets/quotas-show-get-resp.json"
+                        href="../samples/os-quota-sets/quotas-show-response.json"
                     />
                 </wadl:doc>
             </representation>
@@ -150,7 +106,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN" title="Show quotas response: XML">
                     <xsdxt:code
-                        href="api_samples/os-quota-sets/quotas-show-get-resp.xml"
+                        href="../samples/os-quota-sets/quotas-show-response.xml"
                     />
                 </wadl:doc>
                  &quotasResponse;
@@ -170,7 +126,7 @@
           <wadl:doc xmlns="http://docbook.org/ns/docbook"
               xml:lang="EN" title="Update quotas response: JSON">
               <xsdxt:code
-                  href="api_samples/os-quota-sets/quotas-update-post-req.json"
+                  href="../samples/os-quota-sets/quotas-update-request.json"
               />
           </wadl:doc>
         </representation>
@@ -178,7 +134,7 @@
           <wadl:doc xmlns="http://docbook.org/ns/docbook"
               xml:lang="EN" title="Show quotas response: XML">
               <xsdxt:code
-                  href="api_samples/os-quota-sets/quotas-update-post-req.xml"
+                  href="../samples/os-quota-sets/quotas-update-request.xml"
               />
           </wadl:doc>
           &quotasResponse;
@@ -189,7 +145,7 @@
               <wadl:doc xmlns="http://docbook.org/ns/docbook"
                   xml:lang="EN" title="Update quota response: JSON">
                   <xsdxt:code
-                      href="api_samples/os-quota-sets/quotas-update-post-resp.json"
+                      href="../samples/os-quota-sets/quotas-update-response.json"
                   />
               </wadl:doc>
             </representation>
@@ -197,7 +153,7 @@
               <wadl:doc xmlns="http://docbook.org/ns/docbook"
                   xml:lang="EN" title="Update quota response: XML">
                   <xsdxt:code
-                      href="api_samples/os-quota-sets/quotas-update-post-resp.xml"
+                      href="../samples/os-quota-sets/quotas-update-response.xml"
                   />
               </wadl:doc>
                &quotasResponse;
@@ -227,7 +183,7 @@
                   xml:lang="EN"
                   title="Show quotas for user response: JSON">
                   <xsdxt:code
-                      href="api_samples/os-quota-sets/quotas-update-post-resp.json"
+                      href="../samples/os-quota-sets/quotas-update-response.json"
                   />
               </wadl:doc>
             </representation>
@@ -236,7 +192,7 @@
                   xml:lang="EN"
                   title="Show quotas for user response: XML">
                   <xsdxt:code
-                      href="api_samples/os-quota-sets/quotas-update-post-resp.xml"
+                      href="../samples/os-quota-sets/quotas-update-response.xml"
                   />
               </wadl:doc>
                &quotasResponse;
@@ -256,7 +212,7 @@
                     xml:lang="EN"
                     title="Update quotas for user request: JSON">
                     <xsdxt:code
-                        href="api_samples/os-quota-sets/quotas-update-post-req.json"
+                        href="../samples/os-quota-sets/quotas-update-request.json"
                     />
                 </wadl:doc>
             </representation>
@@ -265,7 +221,7 @@
                     xml:lang="EN"
                     title="Update quotas for user request: XML">
                     <xsdxt:code
-                        href="api_samples/os-quota-sets/quotas-update-post-req.xml"
+                        href="../samples/os-quota-sets/quotas-update-request.xml"
                     />
                 </wadl:doc>
                 &quotasResponse;
@@ -277,7 +233,7 @@
                     xml:lang="EN"
                     title="Update quotas for user response: JSON">
                     <xsdxt:code
-                        href="api_samples/os-quota-sets/quotas-update-post-resp.json"
+                        href="../samples/os-quota-sets/quotas-update-response.json"
                     />
                 </wadl:doc>
             </representation>
@@ -286,7 +242,7 @@
                     xml:lang="EN"
                     title="Show quotas for user response: XML">
                     <xsdxt:code
-                        href="api_samples/os-quota-sets/quotas-update-post-resp.xml"
+                        href="../samples/os-quota-sets/quotas-update-response.xml"
                     />
                 </wadl:doc>
                 &quotasResponse;
@@ -316,7 +272,7 @@
                 xmlns="http://docbook.org/ns/docbook"
                 title="Show quota details for user response: JSON">
                 <xsdxt:code
-                    href="api_samples/os-quota-sets/quotas-update-post-resp.json"
+                    href="../samples/os-quota-sets/quotas-update-response.json"
                 />
             </wadl:doc>
             &quotasResponse;
diff --git a/api-ref/src/wadls/volume-api/src/v2/os-vol-image-meta-v2.wadl b/api-ref/src/wadls/volume-api/src/v2/wadl/os-vol-image-meta-v2.wadl
similarity index 82%
rename from api-ref/src/wadls/volume-api/src/v2/os-vol-image-meta-v2.wadl
rename to api-ref/src/wadls/volume-api/src/v2/wadl/os-vol-image-meta-v2.wadl
index 22cae8f82..11c2e300a 100644
--- a/api-ref/src/wadls/volume-api/src/v2/os-vol-image-meta-v2.wadl
+++ b/api-ref/src/wadls/volume-api/src/v2/wadl/os-vol-image-meta-v2.wadl
@@ -1,21 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- (C) 2015 OpenStack Foundation, All Rights Reserved -->
+<!DOCTYPE application [
+    <!ENTITY % common  SYSTEM "../common.ent">
+    %common;
+    <!ENTITY % common_project  SYSTEM "../../../../common_project.ent">
+    %common_project;
+]>
 <application xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  xsi:schemaLocation="http://wadl.dev.java.net/2009/02 http://www.w3.org/Submission/wadl/wadl.xsd"
  xmlns:csapi="http://docs.openstack.org/api/openstack-block-storage/v2"
  xmlns="http://wadl.dev.java.net/2009/02" xmlns:xsdxt="http://docs.rackspacecloud.com/xsd-ext/v1.0"
- xmlns:wadl="http://wadl.dev.java.net/2009/02" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+ xmlns:wadl="http://wadl.dev.java.net/2009/02" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:xlink="http://www.w3.org/1999/xlink">
     <resources base="https://manage.example.com/"
         xml:id="os-vol-image-meta-v2">
         <resource id="version" path="//v2">
             <resource id="tenant_id" path="{tenant_id}">
-                <param name="tenant_id" style="template"
-                    type="xsd:string">
-                    <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                        xml:lang="EN">
-                        <para>The unique identifier of the tenant or
-                            account.</para></wadl:doc>
-                </param>
+                &tenant_idTemplateParameter;
                 <resource id="os-vol-image-meta" path="os-vol-image-meta">
                     <method href="#showImageMetadataForVolume"/>
                 </resource>
@@ -26,25 +27,22 @@
         <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN"
             title="Show image metadata for volume">
             <para role="shortdesc">
-                Shows image metadata that is associated with a
-                volume.
+                Shows image metadata for a volume.
+            </para>
+            <para>
+                When the request is made, the caller must specify a reference to an existing storage
+                volume in the <code>ref</code> element. Each storage driver may interpret the
+                existing storage volume reference differently but should accept a reference
+                structure containing either a <code>source-volume-id</code> or
+                <code >source-volume-name</code> element, if possible.
             </para>
-            <para>When the request is made, the caller must specify
-                (in the <parameter>ref</parameter> element) a
-                reference to an existing storage volume. Each storage
-                driver may interpret the existing storage volume
-                reference differently, but should accept a reference
-                structure containing either a
-                <parameter>source-volume-id</parameter> or
-                <parameter>source-volume-name</parameter> element if
-                possible.</para>
         </wadl:doc>
         <request>
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN" title="Show manage existing request: JSON">
                     <xsdxt:code
-                        href="api_samples/os-manage-existing/manage_existing_request.json"
+                        href="../samples/os-vol-image-meta/image-metadata-show-request.json"
                     />
                 </wadl:doc>
                 <param name="volume" style="plain" type="xsd:string"
@@ -129,7 +127,7 @@
                     volume and rounding up to the next
                     gibibyte (GiB).</para>
                     <xsdxt:code
-                        href="api_samples/os-manage-existing/manage_existing_response.json"
+                        href="../samples/os-vol-image-meta/image-metadata-show-response.json"
                     />
                 </wadl:doc>
             </representation>
diff --git a/api-ref/src/wadls/volume-api/src/v2/os-volume-manage-v2.wadl b/api-ref/src/wadls/volume-api/src/v2/wadl/os-volume-manage-v2.wadl
similarity index 87%
rename from api-ref/src/wadls/volume-api/src/v2/os-volume-manage-v2.wadl
rename to api-ref/src/wadls/volume-api/src/v2/wadl/os-volume-manage-v2.wadl
index 7aedfdb41..8ad0f73f8 100644
--- a/api-ref/src/wadls/volume-api/src/v2/os-volume-manage-v2.wadl
+++ b/api-ref/src/wadls/volume-api/src/v2/wadl/os-volume-manage-v2.wadl
@@ -1,23 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- (C) 2012-2015 OpenStack Foundation, All Rights Reserved -->
+<!DOCTYPE application [
+    <!ENTITY % common  SYSTEM "../common.ent">
+    %common;
+    <!ENTITY % common_project  SYSTEM "../../../../common_project.ent">
+    %common_project;
+]>
 <application xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  xsi:schemaLocation="http://wadl.dev.java.net/2009/02 http://www.w3.org/Submission/wadl/wadl.xsd"
  xmlns:csapi="http://docs.openstack.org/api/openstack-block-storage/v2"
  xmlns="http://wadl.dev.java.net/2009/02" xmlns:xsdxt="http://docs.rackspacecloud.com/xsd-ext/v1.0"
- xmlns:wadl="http://wadl.dev.java.net/2009/02" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+ xmlns:wadl="http://wadl.dev.java.net/2009/02" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:xlink="http://www.w3.org/1999/xlink">
     <resources base="https://manage.example.com/"
         xml:id="volume-manage-v2">
         <resource id="version" path="//v2">
             <resource id="tenant_id" path="{tenant_id}">
-                <param name="tenant_id" style="template"
-                    type="xsd:string">
-                    <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                        xml:lang="EN">
-                        <para>
-                            The unique identifier of the tenant or account.
-                        </para>
-                    </wadl:doc>
-                </param>
+                &tenant_idTemplateParameter;
                 <resource id="os-volume-manage" path="os-volume-manage">
                     <method href="#manageExisting"/>
                 </resource>
@@ -36,15 +35,14 @@
                 volume in the <parameter>ref</parameter> parameter in the
                 request. Although each storage driver might interpret this
                 reference differently, the driver should accept a reference
-                structure that contains either a
-                <parameter>source-volume-id</parameter> or
-                <parameter>source-volume-name</parameter>
+                structure that contains either a <parameter>source-volume-
+                id</parameter> or <parameter>source-volume-name</parameter>
                 element, if possible.
             </para>
             <para>
-                 The API chooses the size of the volume by rounding up the
-                 size of the existing storage volume to the next gibibyte
-                 (GiB).
+                The API chooses the size of the volume by rounding up the
+                size of the existing storage volume to the next gibibyte
+                (GiB).
             </para>
         </wadl:doc>
         <request>
@@ -52,7 +50,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN" title="Show manage existing request: JSON">
                     <xsdxt:code
-                        href="api_samples/os-manage-existing/manage_existing_request.json"
+                        href="../samples/os-volume-manage/volume-manage-request.json"
                     />
                 </wadl:doc>
                 <param name="volume" style="plain" type="xsd:string"
@@ -152,7 +150,7 @@
                         response.
                     </para>
                     <xsdxt:code
-                        href="api_samples/os-manage-existing/manage_existing_response.json"
+                        href="../samples/os-volume-manage/volume-manage-response.json"
                     />
                 </wadl:doc>
             </representation>
diff --git a/api-ref/src/wadls/volume-api/src/v2/os-volume-transfer-api-v2.wadl b/api-ref/src/wadls/volume-api/src/v2/wadl/os-volume-transfer-v2.wadl
similarity index 87%
rename from api-ref/src/wadls/volume-api/src/v2/os-volume-transfer-api-v2.wadl
rename to api-ref/src/wadls/volume-api/src/v2/wadl/os-volume-transfer-v2.wadl
index 4981a341e..b14123943 100644
--- a/api-ref/src/wadls/volume-api/src/v2/os-volume-transfer-api-v2.wadl
+++ b/api-ref/src/wadls/volume-api/src/v2/wadl/os-volume-transfer-v2.wadl
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- (C) 2015 OpenStack Foundation, All Rights Reserved -->
 <!DOCTYPE application [
-    <!ENTITY % common  SYSTEM "common.ent">
+    <!ENTITY % common  SYSTEM "../common.ent">
     %common;
-    <!ENTITY % common_project  SYSTEM "../../../common_project.ent">
+    <!ENTITY % common_project  SYSTEM "../../../../common_project.ent">
     %common_project;
 ]>
 <application xmlns="http://wadl.dev.java.net/2009/02"
@@ -16,15 +16,7 @@
         xml:id="volume-transfer-v2">
         <resource id="version" path="//v2">
             <resource id="tenant_id" path="{tenant_id}">
-                <param name="tenant_id" style="template"
-                    type="xsd:string">
-                    <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                        xml:lang="EN">
-                        <para>
-                            The unique identifier of the tenant or account.
-                        </para>
-                    </wadl:doc>
-                </param>
+                &tenant_idTemplateParameter;
                 <resource id="os-volume-transfer" path="os-volume-transfer">
                     <method href="#createVolumeTransfer"/>
                     <method href="#listVolumeTransfer"/>
@@ -42,7 +34,7 @@
                                 </para>
                             </wadl:doc>
                         </param>
-                        <method href="#getVolumeTransfer"/>
+                        <method href="#showVolumeTransfer"/>
                         <method href="#deleteVolumeTransfer"/>
                         <resource path="accept" id="accept">
                             <method href="#acceptVolumeTransfer"/>
@@ -64,7 +56,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/os-volume-transfer/volume-transfer-create-request.json"
+                        href="../samples/os-volume-transfer/volume-transfer-create-request.json"
                     />
                 </wadl:doc>
                 <param name="volume_id" style="plain" type="csapi:UUID"
@@ -72,7 +64,7 @@
                     <wadl:doc xmlns="http://docbook.org/ns/docbook"
                         xml:lang="EN">
                         <para>
-                            The ID of the volume.
+                            The UUID of the volume.
                         </para>
                     </wadl:doc>
                 </param>
@@ -89,15 +81,15 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/os-volume-transfer/volume-transfer-create-response.json"
+                        href="../samples/os-volume-transfer/volume-transfer-create-response.json"
                     />
                 </wadl:doc>
-                <param name="id" style="plain" type="csapi:uuid"
+                <param name="id" style="plain" type="csapi:UUID"
                     required="true">
                     <wadl:doc xmlns="http://docbook.org/ns/docbook"
                         xml:lang="EN">
                         <para>
-                            The ID of the volume transfer.
+                            The UUID of the volume transfer.
                         </para>
                     </wadl:doc>
                 </param>
@@ -119,12 +111,12 @@
                         </para>
                     </wadl:doc>
                 </param>
-                <param name="volume_id" style="plain" type="csapi:uuid"
+                <param name="volume_id" style="plain" type="csapi:UUID"
                     required="true">
                     <wadl:doc xmlns="http://docbook.org/ns/docbook"
                         xml:lang="EN">
                         <para>
-                            The ID of the volume.
+                            The UUID of the volume.
                         </para>
                     </wadl:doc>
                 </param>
@@ -161,15 +153,15 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/os-volume-transfer/volume-transfer-list-response.json"
+                        href="../samples/os-volume-transfer/volume-transfers-list-response.json"
                     />
                 </wadl:doc>
-                <param name="id" style="plain" type="csapi:uuid"
+                <param name="id" style="plain" type="csapi:UUID"
                     required="true">
                     <wadl:doc xmlns="http://docbook.org/ns/docbook"
                         xml:lang="EN">
                         <para>
-                            The ID of the volume transfer.
+                            The UUID of the volume transfer.
                         </para>
                     </wadl:doc>
                 </param>
@@ -187,7 +179,7 @@
                     <wadl:doc xmlns="http://docbook.org/ns/docbook"
                         xml:lang="EN">
                         <para>
-                            The ID of the volume.
+                            The UUID of the volume.
                         </para>
                     </wadl:doc>
                 </param>
@@ -215,15 +207,15 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/os-volume-transfer/volume-transfer-list-details-response.json"
+                        href="../samples/os-volume-transfer/volume-transfers-list-detailed-response.json"
                     />
                 </wadl:doc>
-                <param name="id" style="plain" type="csapi:uuid"
+                <param name="id" style="plain" type="csapi:UUID"
                     required="true">
                     <wadl:doc xmlns="http://docbook.org/ns/docbook"
                         xml:lang="EN">
                         <para>
-                            The ID of the volume transfer.
+                            The UUID of the volume transfer.
                         </para>
                     </wadl:doc>
                 </param>
@@ -250,7 +242,7 @@
                     <wadl:doc xmlns="http://docbook.org/ns/docbook"
                         xml:lang="EN">
                         <para>
-                            The ID of the volume.
+                            The UUID of the volume.
                         </para>
                     </wadl:doc>
                 </param>
@@ -266,7 +258,7 @@
             </representation>
         </response>
     </method>
-    <method name="GET" id="getVolumeTransfer">
+    <method name="GET" id="showVolumeTransfer">
         <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN"
             title="Show volume transfer details">
             <para role="shortdesc">
@@ -278,15 +270,15 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/os-volume-transfer/volume-transfer-show-response.json"
+                        href="../samples/os-volume-transfer/volume-transfer-show-response.json"
                     />
                 </wadl:doc>
-                <param name="id" style="plain" type="csapi:uuid"
+                <param name="id" style="plain" type="csapi:UUID"
                     required="true">
                     <wadl:doc xmlns="http://docbook.org/ns/docbook"
                         xml:lang="EN">
                         <para>
-                            The ID of the volume transfer.
+                            The UUID of the volume transfer.
                         </para>
                     </wadl:doc>
                 </param>
@@ -313,7 +305,7 @@
                     <wadl:doc xmlns="http://docbook.org/ns/docbook"
                         xml:lang="EN">
                         <para>
-                            The ID of the volume.
+                            The UUID of the volume.
                         </para>
                     </wadl:doc>
                 </param>
@@ -350,7 +342,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/os-volume-transfer/volume-transfer-accept-request.json"
+                        href="../samples/os-volume-transfer/volume-transfer-accept-request.json"
                     />
                 </wadl:doc>
                 <param name="auth_key" style="plain" type="xsd:string"
@@ -369,14 +361,14 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/os-volume-transfer/volume-transfer-accept-response.json"
+                        href="../samples/os-volume-transfer/volume-transfer-accept-response.json"
                     />
                 </wadl:doc>
-                <param name="id" style="plain" type="csapi:uuid"
+                <param name="id" style="plain" type="csapi:UUID"
                     required="true">
                     <wadl:doc xmlns="http://docbook.org/ns/docbook"
                         xml:lang="EN">
-                        <para>The ID of the volume transfer.</para></wadl:doc>
+                        <para>The UUID of the volume transfer.</para></wadl:doc>
                 </param>
                 <param name="name" style="plain" type="xsd:string"
                     required="true">
@@ -388,7 +380,7 @@
                     required="true">
                     <wadl:doc xmlns="http://docbook.org/ns/docbook"
                         xml:lang="EN">
-                        <para>The ID of the volume.</para></wadl:doc>
+                        <para>The UUID of the volume.</para></wadl:doc>
                 </param>
                 <param name="links" style="plain" type="xsd:list"
                     required="true">
diff --git a/api-ref/src/wadls/volume-api/src/v2/os-qos-v2.wadl b/api-ref/src/wadls/volume-api/src/v2/wadl/qos-specs-v2.wadl
similarity index 69%
rename from api-ref/src/wadls/volume-api/src/v2/os-qos-v2.wadl
rename to api-ref/src/wadls/volume-api/src/v2/wadl/qos-specs-v2.wadl
index c753a7e5d..9e26b8fa7 100644
--- a/api-ref/src/wadls/volume-api/src/v2/os-qos-v2.wadl
+++ b/api-ref/src/wadls/volume-api/src/v2/wadl/qos-specs-v2.wadl
@@ -1,66 +1,37 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- (C) 2014-2015 OpenStack Foundation, All Rights Reserved -->
 <!DOCTYPE application [
-    <!ENTITY % common  SYSTEM "common.ent">
+    <!ENTITY % common  SYSTEM "../common.ent">
     %common;
-    <!ENTITY % common  SYSTEM "../common_project.ent">
+    <!ENTITY % common_project  SYSTEM "../../../../common_project.ent">
     %common_project;
 ]>
 <application xmlns="http://wadl.dev.java.net/2009/02"
     xmlns:xsdxt="http://docs.rackspacecloud.com/xsd-ext/v1.0"
     xmlns:csapi="http://docs.openstack.org/api/openstack-block-storage/v2"
     xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    xmlns:wadl="http://wadl.dev.java.net/2009/02">
-    <resources base="https://volume.example.com/"
-        xml:id="qos-specs-v2">
+    xmlns:json="http://json-schema.org/schema#"
+    xmlns:wadl="http://wadl.dev.java.net/2009/02"
+    xmlns:xlink="http://www.w3.org/1999/xlink">
+    <resources base="https://volume.example.com/" xml:id="qos-specs-v2">
         <resource id="version" path="//v2">
             <resource id="tenant_id" path="{tenant_id}">
-                <param name="tenant_id" style="template"
-                    type="xsd:string">
-                    <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                        xml:lang="EN">
-                        <para>The unique ID of the tenant or
-                            account.</para></wadl:doc>
-                </param>
+                &tenant_idTemplateParameter;
                 <resource id="qos-specs" path="qos-specs">
                     <method href="#createQoSSpec"/>
                     <method href="#listQoSSpecs"/>
                     <resource id="qos_id" path="{qos_id}">
-                        <param
-                            xmlns="http://wadl.dev.java.net/2009/02"
-                            name="qos_id" style="template"
-                            type="csapi:UUID">
-                            <wadl:doc
-                                xmlns="http://docbook.org/ns/docbook"
-                                xml:lang="EN"><para>The UUID for the
-                                   QoS specification.</para>
-                            </wadl:doc>
-                        </param>
+                        &qos_idTemplateParameter;
                         <method href="#showQoSDetails"/>
                         <method href="#setQoSKey"/>
                         <method href="#deleteQoSSpec"/>
                         <resource id="associate" path="associate">
-                            <param name="vol_type_id" id="vol_type_id"
-                                style="query" type="xsd:string">
-                                <wadl:doc
-                                   xmlns="http://docbook.org/ns/docbook"
-                                   xml:lang="EN">
-                                   <para>The unique ID of the volume
-                                   type.</para></wadl:doc>
-                            </param>
+                           <!--  &vol_type_idTemplateParameter; -->
                             <method href="#associateQoSSpec"/>
                         </resource>
                         <resource id="disassociate"
                             path="disassociate">
-                            <param name="vol_type_id"
-                                id="vol_type_id-disassociate"
-                                style="query" type="xsd:string">
-                                <wadl:doc
-                                   xmlns="http://docbook.org/ns/docbook"
-                                   xml:lang="EN">
-                                   <para>The unique ID of the volume
-                                   type.</para></wadl:doc>
-                            </param>
+                            <!-- &vol_type_idTemplateParameter; -->
                             <method href="#disassociateQoSSpec"/>
                         </resource>
                         <resource id="disassociate_all"
@@ -69,7 +40,7 @@
                         </resource>
                         <resource id="associations"
                             path="associations">
-                            <method href="#getQoSAssociations"/>
+                            <method href="#listQoSAssociations"/>
                         </resource>
                     </resource>
                 </resource>
@@ -84,27 +55,75 @@
             <para role="shortdesc">
                 Creates a QoS specification.
             </para>
+            <para>
+                Specify one or more key and value pairs in the request body.
+            </para>
         </wadl:doc>
         <request>
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/qos_create_request.json"/>
+                        href="../samples/qos-specs/qos-create-request.json"/>
                 </wadl:doc>
             </representation>
             <representation mediaType="application/xml">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/qos_create_request.xml"/>
+                        href="../samples/qos-specs/qos-create-request.xml"/>
                 </wadl:doc>
-                <param name="qos_specs" style="plain"
-                    type="xsd:string" required="true">
+                &qos_specsParameter;
+                <param name="name" style="plain" type="xsd:string"
+                    required="true">
                     <wadl:doc xmlns="http://docbook.org/ns/docbook"
                         xml:lang="EN">
                         <para>
-                            A <code>qos_specs</code> object.
+                            The name of the QoS specification.
+                        </para>
+                    </wadl:doc>
+                </param>
+                <param name="consumer" style="plain" type="xsd:string"
+                    required="false">
+                    <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                        xml:lang="EN">
+                        <para>
+                            The consumer type.
+                        </para>
+                    </wadl:doc>
+                </param>
+            </representation>
+        </request>
+        <response status="202">
+            <representation mediaType="application/json">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                    xml:lang="EN">
+                    <xsdxt:code
+                        href="../samples/qos-specs/qos-create-response.json"/>
+                </wadl:doc>
+            </representation>
+            <representation mediaType="application/xml">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                    xml:lang="EN">
+                    <xsdxt:code
+                        href="../samples/qos-specs/qos-create-response.xml"/>
+                </wadl:doc>
+                &qos_specsParameter;
+                <param name="specs" style="plain" type="xsd:dict"
+                    required="true">
+                    <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                        xml:lang="EN">
+                        <para>
+                            A <code>specs</code> object.
+                        </para>
+                    </wadl:doc>
+                </param>
+                <param name="consumer" style="plain" type="xsd:string"
+                    required="true">
+                    <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                        xml:lang="EN">
+                        <para>
+                            The consumer type.
                         </para>
                     </wadl:doc>
                 </param>
@@ -117,71 +136,23 @@
                         </para>
                     </wadl:doc>
                 </param>
-                <param name="specs" style="plain" required="true"
-                    type="xsd:string">
+                <param name="id" style="plain" type="csapi:UUID"
+                    required="true">
                     <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                        xml:lang="EN" title="specs">
+                        xml:lang="EN">
                         <para>
-                            Specification key and value pairs.
+                            The generated ID for the QoS specification.
                         </para>
                     </wadl:doc>
                 </param>
-            </representation>
-        </request>
-        <response status="202">
-            <representation mediaType="application/json">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN">
-                    <xsdxt:code
-                        href="api_samples/qos_create_response.json"/>
-                </wadl:doc>
-            </representation>
-            <representation mediaType="application/xml">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN">
-                    <xsdxt:code
-                        href="api_samples/qos_create_response.xml"/>
-                </wadl:doc>
-                <param name="qos_specs" style="plain"
-                    type="xsd:string" required="true">
-                    <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                        xml:lang="EN">
-                        <para>A <code>qos_specs</code>
-                        object.</para></wadl:doc>
-                </param>
-                <param name="specs" style="plain" type="xsd:string"
-                    required="true">
-                    <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                        xml:lang="EN">
-                        <para>A <code>specs</code>
-                        object.</para></wadl:doc>
-                </param>
-                <param name="consumer" style="plain" type="xsd:string"
-                    required="true">
-                    <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                        xml:lang="EN">
-                        <para>The consumer type.</para></wadl:doc>
-                </param>
-                <param name="name" style="plain" type="xsd:string"
-                    required="true">
-                    <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                        xml:lang="EN">
-                        <para>The name of the QoS
-                            specification.</para></wadl:doc>
-                </param>
-                <param name="id" style="plain" type="csapi:uuid"
-                    required="true">
-                    <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                        xml:lang="EN">
-                        <para>The generated ID for the QoS
-                            specification.</para></wadl:doc>
-                </param>
                 <param name="links" style="plain" type="xsd:dict"
                     required="true">
                     <wadl:doc xmlns="http://docbook.org/ns/docbook"
                         xml:lang="EN">
-                        <para>The QoS specification
-                        links.</para></wadl:doc>
+                        <para>
+                            The QoS specification links.
+                        </para>
+                    </wadl:doc>
                 </param>
             </representation>
         </response>
@@ -198,22 +169,16 @@
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
-                    <xsdxt:code href="samples/list-qos-response.json"
+                    <xsdxt:code href="../samples/qos-specs/qos-list-response.json"
                     />
                 </wadl:doc>
             </representation>
             <representation mediaType="application/xml">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
-                    <xsdxt:code href="samples/list-qos-response.xml"/>
+                    <xsdxt:code href="../samples/qos-specs/qos-list-response.xml"/>
                 </wadl:doc>
-                <param name="qos_specs" style="plain"
-                    type="xsd:string" required="true">
-                    <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                        xml:lang="EN">
-                        <para>A <code>qos_specs</code>
-                        object.</para></wadl:doc>
-                </param>
+                &qos_specsParameter;
                 <param name="specs" style="plain" required="true"
                     type="xsd:string">
                     <wadl:doc xmlns="http://docbook.org/ns/docbook"
@@ -241,7 +206,7 @@
                         </para>
                     </wadl:doc>
                 </param>
-                <param name="id" style="plain" type="csapi:uuid"
+                <param name="id" style="plain" type="csapi:UUID"
                     required="true">
                     <wadl:doc xmlns="http://docbook.org/ns/docbook"
                         xml:lang="EN">
@@ -258,8 +223,7 @@
         <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN"
             title="Show QoS specification details">
             <para role="shortdesc">
-                Shows details for a QoS
-                specification.
+                Shows details for a QoS specification.
             </para>
         </wadl:doc>
         <response status="200">
@@ -267,7 +231,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/qos_details_show_response.json"
+                        href="../samples/qos-specs/qos-show-response.json"
                     />
                 </wadl:doc>
             </representation>
@@ -275,20 +239,12 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/qos_details_show_response.xml"
+                        href="../samples/qos-specs/qos-show-response.xml"
                     />
                 </wadl:doc>
-                <param name="qos_specs" style="plain"
-                    type="xsd:string" required="true">
-                    <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                        xml:lang="EN">
-                        <para>
-                            A <code>qos_specs</code> object.
-                        </para>
-                    </wadl:doc>
-                </param>
+                &qos_specsParameter;
                 <param name="specs" style="plain" required="true"
-                    type="xsd:string">
+                    type="xsd:dict">
                     <wadl:doc xmlns="http://docbook.org/ns/docbook"
                         xml:lang="EN" title="specs">
                         <para>
@@ -310,18 +266,16 @@
                     <wadl:doc xmlns="http://docbook.org/ns/docbook"
                         xml:lang="EN">
                         <para>
-                            The name of the QoS
-                            specification.
+                            The name of the QoS specification.
                         </para>
                     </wadl:doc>
                 </param>
-                <param name="id" style="plain" type="csapi:uuid"
+                <param name="id" style="plain" type="csapi:UUID"
                     required="true">
                     <wadl:doc xmlns="http://docbook.org/ns/docbook"
                         xml:lang="EN">
                         <para>
-                            The generated ID for the QoS
-                            specification.
+                            The generated ID for the QoS specification.
                         </para>
                     </wadl:doc>
                 </param>
@@ -368,11 +322,11 @@
         <response status="202"/>
     </method>
     <!-- show all QoS spec associations -->
-    <method name="GET" id="getQoSAssociations">
+    <method name="GET" id="listQoSAssociations">
         <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN"
             title="Get all associations for QoS specification">
             <para role="shortdesc">
-                Gets all associations for a QoS specification.
+                Lists all associations for a QoS specification.
             </para>
         </wadl:doc>
         <response status="200">
@@ -380,14 +334,14 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/qos_show_response.xml"/>
+                        href="../samples/qos-specs/qos-show-response.xml"/>
                 </wadl:doc>
             </representation>
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/qos_show_response.json"/>
+                        href="../samples/qos-specs/qos-show-response.json"/>
                 </wadl:doc>
             </representation>
         </response>
@@ -405,24 +359,16 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/qos_update_request.xml"/>
+                        href="../samples/qos-specs/qos-update-request.xml"/>
                 </wadl:doc>
             </representation>
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/qos_update_request.json"/>
+                        href="../samples/qos-specs/qos-update-request.json"/>
                 </wadl:doc>
-                <param name="qos_specs" style="plain"
-                    type="xsd:string" required="true">
-                    <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                        xml:lang="EN">
-                        <para>
-                            A <code>qos_specs</code> object.
-                        </para>
-                    </wadl:doc>
-                </param>
+                &qos_specsParameter;
                 <param name="specs" style="plain" required="true"
                     type="xsd:string">
                     <wadl:doc xmlns="http://docbook.org/ns/docbook"
@@ -439,14 +385,14 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/qos_update_response.xml"/>
+                        href="../samples/qos-specs/qos-update-response.xml"/>
                 </wadl:doc>
             </representation>
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/qos_update_response.json"/>
+                        href="../samples/qos-specs/qos-update-response.json"/>
                 </wadl:doc>
             </representation>
         </response>
@@ -461,21 +407,13 @@
         </wadl:doc>
         <request>
             <representation mediaType="application/json">
-                <param name="qos_id" style="template"
-                    type="xsd:string">
+                <param style="template" required="false" name="force" type="xsd:boolean">
                     <wadl:doc xmlns="http://docbook.org/ns/docbook"
                         xml:lang="EN">
                         <para>
-                            The unique ID of the QoS specification.
-                        </para>
-                    </wadl:doc>
-                </param>
-                <param style="template" required="false" name="force">
-                    <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                        xml:lang="EN">
-                        <para>
-                            Optional flag that indicates whether to delete a
-                            QoS specification, even if it is in-use.
+                            Set to <code>true</code> to delete a QoS
+                            specification, even if it is in-use. Default is
+                            <code>false</code>.
                         </para>
                     </wadl:doc>
                 </param>
diff --git a/api-ref/src/wadls/volume-api/src/v2/os-vol-pool-v2.wadl b/api-ref/src/wadls/volume-api/src/v2/wadl/scheduler-stats-v2.wadl
similarity index 85%
rename from api-ref/src/wadls/volume-api/src/v2/os-vol-pool-v2.wadl
rename to api-ref/src/wadls/volume-api/src/v2/wadl/scheduler-stats-v2.wadl
index ca453f9ab..46a59b3d0 100644
--- a/api-ref/src/wadls/volume-api/src/v2/os-vol-pool-v2.wadl
+++ b/api-ref/src/wadls/volume-api/src/v2/wadl/scheduler-stats-v2.wadl
@@ -1,33 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- (C) 2015 OpenStack Foundation, All Rights Reserved -->
-<application xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-             xsi:schemaLocation="http://wadl.dev.java.net/2009/02 http://www.w3.org/Submission/wadl/wadl.xsd"
-             xmlns:csapi="http://docs.openstack.org/api/openstack-block-storage/v2"
-             xmlns="http://wadl.dev.java.net/2009/02"
-             xmlns:xsdxt="http://docs.rackspacecloud.com/xsd-ext/v1.0"
-             xmlns:wadl="http://wadl.dev.java.net/2009/02"
-            xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-    <resources base="https://manage.example.com/" xml:id="os-vol-pool-v2">
+<!DOCTYPE application [
+    <!ENTITY % common  SYSTEM "../common.ent">
+    %common;
+    <!ENTITY % common_project  SYSTEM "../../../../common_project.ent">
+    %common_project;
+]>
+<application xmlns="http://wadl.dev.java.net/2009/02"
+    xmlns:xsdxt="http://docs.rackspacecloud.com/xsd-ext/v1.0"
+    xmlns:csapi="http://docs.openstack.org/api/openstack-block-storage/v2"
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+    xmlns:json="http://json-schema.org/schema#"
+    xmlns:wadl="http://wadl.dev.java.net/2009/02"
+    xmlns:xlink="http://www.w3.org/1999/xlink">
+    <resources base="https://volume.example.com/" xml:id="scheduler-stats-v2">
         <resource id="version" path="//v2">
             <resource id="tenant_id" path="{tenant_id}">
-                <param name="tenant_id" style="template"
-                    type="xsd:string">
-                    <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                        xml:lang="EN">
-                        <para>
-                            The unique identifier of the tenant or account.
-                        </para>
-                    </wadl:doc>
-                </param>
+                &tenant_idTemplateParameter;
                 <resource id="scheduler-stats" path="scheduler-stats">
                     <resource id="get_pools" path="get_pools">
-                        <method href="#getPools"/>
+                        <method href="#listPools"/>
                     </resource>
                 </resource>
             </resource>
         </resource>
     </resources>
-    <method name="GET" id="getPools">
+    <method name="GET" id="listPools">
         <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN"
             title="List back-end storage pools">
             <para role="shortdesc">
@@ -58,7 +56,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/list-pools-detail.json"
+                        href="../samples/scheduler-stats/pools-list-detailed-response.json"
                     />
                 </wadl:doc>
                 <param name="name" style="plain" type="xsd:string"
diff --git a/api-ref/src/wadls/volume-api/src/v2/volume-api-v2.wadl b/api-ref/src/wadls/volume-api/src/v2/wadl/volumes-v2.wadl
similarity index 85%
rename from api-ref/src/wadls/volume-api/src/v2/volume-api-v2.wadl
rename to api-ref/src/wadls/volume-api/src/v2/wadl/volumes-v2.wadl
index 0728a660a..b17f38a3a 100644
--- a/api-ref/src/wadls/volume-api/src/v2/volume-api-v2.wadl
+++ b/api-ref/src/wadls/volume-api/src/v2/wadl/volumes-v2.wadl
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- (C) 2012-2015 OpenStack Foundation, All Rights Reserved -->
 <!DOCTYPE application [
-    <!ENTITY % common  SYSTEM "common.ent">
+    <!ENTITY % common  SYSTEM "../common.ent">
     %common;
-    <!ENTITY % common_project  SYSTEM "../../../common_project.ent">
+    <!ENTITY % common_project  SYSTEM "../../../../common_project.ent">
     %common_project;
 ]>
 <application xmlns="http://wadl.dev.java.net/2009/02"
@@ -19,46 +19,24 @@
         </resource>
         <resource id="version" type="#VersionDetails" path="//v2">
             <resource id="tenant_id" path="{tenant_id}">
-                &tenantIdRequestParameter;
+                &tenant_idTemplateParameter;
                 <resource id="extensions" type="#ExtensionList"
                     path="extensions">
                     <resource id="extension" path="{alias}">
-                        <param required="true"
-                            xmlns="http://wadl.dev.java.net/2009/02"
-                            name="alias" style="template"
-                            type="xsd:string">
-                            <wadl:doc
-                                xmlns="http://docbook.org/ns/docbook"
-                                xml:lang="EN">
-                                <para>
-                                    An alias, which is a name for a pointer to
-                                    a resource. For example, a named
-                                    extension.
-                               </para>
-                            </wadl:doc>
-                        </param>
-                        <method href="#getExtension-cinder-v2"/>
+                        &aliasTemplateParameter;
+                        <method href="#showExtension-cinder-v2"/>
                     </resource>
                 </resource>
                 <resource id="volumes" path="volumes">
                     <method href="#createVolume"/>
-                    <method href="#getVolumesSimple"/>
+                    <method href="#listVolumesSimple"/>
+                    <method href="#createVolumeTypeAccessExt"/>
                     <resource path="detail" id="detail">
-                        <method href="#getVolumesDetail"/>
+                        <method href="#listVolumesDetail"/>
                     </resource>
                     <resource path="{volume_id}" id="volume_id">
-                        <param name="volume_id" style="template"
-                            required="true" type="csapi:UUID">
-                            <wadl:doc
-                                xmlns="http://docbook.org/ns/docbook"
-                                xml:lang="EN">
-                                <para>
-                                    The UUID of an existing
-                                    volume.
-                                </para>
-                            </wadl:doc>
-                        </param>
-                        <method href="#getVolume"/>
+                        &volume_idTemplateParameter;
+                        <method href="#showVolume"/>
                         <method href="#updateVolume"/>
                         <method href="#deleteVolume"/>
                         <resource path="metadata"
@@ -80,24 +58,14 @@
                     </resource>
                 </resource>
                 <resource id="types" path="types">
-                    <method href="#getVolumeTypes"/>
+                    <method href="#showVolumeTypes"/>
                     <method href="#createVolumeType"/>
                     <resource path="{volume_type_id}"
                         id="volume_type_id">
-                        <param name="volume_type_id" style="template"
-                            required="true" type="csapi:UUID">
-                            <wadl:doc
-                                xmlns="http://docbook.org/ns/docbook"
-                                xml:lang="EN">
-                                <para>
-                                    The UUID for an existing volume
-                                    type.
-                                </para>
-                            </wadl:doc>
-                        </param>
+                        &vol_type_idTemplateParameter;
                         <method href="#updateVolumeType"/>
                         <method href="#updateVolumeTypeExtraSpecs"/>
-                        <method href="#getVolumeType"/>
+                        <method href="#showVolumeType"/>
                         <method href="#deleteVolumeType"/>
                     </resource>
                 </resource>
@@ -108,16 +76,7 @@
                         <method href="#listSnapshotsDetail"/>
                     </resource>
                     <resource path="{snapshot_id}" id="snapshot_id">
-                        <param name="snapshot_id" style="template"
-                            required="true" type="csapi:UUID">
-                            <wadl:doc
-                                xmlns="http://docbook.org/ns/docbook"
-                                xml:lang="EN">
-                                <para>
-                                    The UUID of the snapshot.
-                               </para>
-                           </wadl:doc>
-                        </param>
+                        &snapshot_idTemplateParameter;
                         <method href="#showSnapshot"/>
                         <method href="#updateSnapshot"/>
                         <method href="#deleteSnapshot"/>
@@ -162,19 +121,17 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/cinder-versions-response.json"
+                        href="../samples/volumes/versions-response.json"
                     />
                 </wadl:doc>
             </representation>
-            <!-- The following call fails - opened bug #1311243 -->
-            <!-- <representation mediaType="application/xml">
+            <representation mediaType="application/xml">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/cinder-versions-response.xml"
-                    />
+                        href="../samples/volumes/versions-response.xml"/>
                 </wadl:doc>
-            </representation>-->
+            </representation>
         </response>
     </method>
     <method name="GET" id="versionDetails">
@@ -189,16 +146,14 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/versionv2-get-resp.json"/>
+                        href="../samples/volumes/version-v2-show-response.json"/>
                 </wadl:doc>
             </representation>
-            <!-- this call fails - opened bug 1311243 -->
-            <!--<representation mediaType="application/xml"
-                element="common:version">
+            <representation mediaType="application/xml">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="../api_samples/version-get-resp.xml"/>
+                        href="../samples/volumes/version-show-response.xml"/>
                 </wadl:doc>
                 <param name="location" style="plain" type="xsd:anyURI"
                     required="true"
@@ -208,14 +163,14 @@
                             to a service or server.</para></wadl:doc>
                     <link resource_type="#VersionDetails" rel="self"/>
                 </param>
-            </representation>-->
+            </representation>
         </response>
         <response status="203">
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/versionv2-get-resp.json"/>
+                        href="../samples/volumes/version-v2-show-response.json"/>
                 </wadl:doc>
             </representation>
         </response>
@@ -232,7 +187,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="samples/cinder-extensions-response.json"
+                        href="../samples/volumes/extensions-list-response.json"
                     />
                 </wadl:doc>
             </representation>
@@ -240,7 +195,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="samples/cinder-extensions-response.xml"
+                        href="../samples/volumes/extensions-list-response.xml"
                     />
                 </wadl:doc>
             </representation>
@@ -253,7 +208,7 @@
                 Creates a volume.
             </para>
             <para>
-                To create a bootable volume, include the ID of the image from
+                To create a bootable volume, include the UUID of the image from
                 which you want to create the volume in the
                 <code>imageRef</code> attribute in the request body.
             </para>
@@ -312,7 +267,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/volume_create_request.json"
+                        href="../samples/volumes/volume-create-request.json"
                     />
                 </wadl:doc>
             </representation>
@@ -320,7 +275,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/volume_create_request.xml"/>
+                        href="../samples/volumes/volume-create-request.xml"/>
                 </wadl:doc>
                 &createVolumeParameters;
             </representation>
@@ -330,7 +285,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/volume_create_response.json"
+                        href="../samples/volumes/volume-create-response.json"
                     />
                 </wadl:doc>
             </representation>
@@ -338,14 +293,14 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/volume_create_response.xml"
+                        href="../samples/volumes/volume-create-response.xml"
                     />
                 </wadl:doc>
                 &volumeDetailResponseParameters;
             </representation>
         </response>
     </method>
-    <method name="GET" id="getVolumesSimple">
+    <method name="GET" id="listVolumesSimple">
         <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN"
             title="List volumes">
             <para role="shortdesc">
@@ -364,7 +319,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/volume_list_simple_response.xml"
+                        href="../samples/volumes/volumes-list-response.xml"
                     />
                 </wadl:doc>
             </representation>
@@ -372,14 +327,14 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/volume_list_simple_response.json"
+                        href="../samples/volumes/volumes-list-response.json"
                     />
                 </wadl:doc>
                 &volumeSimpleResponseParameters;
             </representation>
         </response>
     </method>
-    <method name="GET" id="getVolumesDetail">
+    <method name="GET" id="listVolumesDetail">
         <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN"
             title="List volumes with details">
             <para role="shortdesc">
@@ -398,7 +353,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/volume_list_detail_response.xml"
+                        href="../samples/volumes/volumes-list-detailed-response.xml"
                     />
                 </wadl:doc>
             </representation>
@@ -406,14 +361,14 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/volume_list_detail_response.json"
+                        href="../samples/volumes/volumes-list-detailed-response.json"
                     />
                 </wadl:doc>
                 &volumeDetailResponseParameters;
             </representation>
         </response>
     </method>
-    <method name="GET" id="getVolume">
+    <method name="GET" id="showVolume">
         <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN"
             title="Show volume details">
             <para role="shortdesc">
@@ -433,14 +388,14 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/volume_show_response.xml"/>
+                        href="../samples/volumes/volume-show-response.xml"/>
                 </wadl:doc>
             </representation>
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/volume_show_response.json"/>
+                        href="../samples/volumes/volume-show-response.json"/>
                 </wadl:doc>
                 &volumeDetailResponseParameters;
             </representation>
@@ -458,7 +413,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/volume_update_request.xml"/>
+                        href="../samples/volumes/volume-update-request.xml"/>
                 </wadl:doc>
             </representation>
             <representation mediaType="application/json"
@@ -466,7 +421,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/volume_update_request.json"
+                        href="../samples/volumes/volume-update-request.json"
                     />
                 </wadl:doc>
             </representation>
@@ -476,7 +431,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/volume_update_response.xml"
+                        href="../samples/volumes/volume-update-response.xml"
                     />
                 </wadl:doc>
             </representation>
@@ -484,7 +439,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/volume_update_response.json"
+                        href="../samples/volumes/volume-update-response.json"
                     />
                 </wadl:doc>
                 &volumeDetailResponseParameters;
@@ -545,7 +500,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/volume-metadata-show-response.xml"
+                        href="../samples/volumes/volume-metadata-show-response.xml"
                     />
                 </wadl:doc>
             </representation>
@@ -553,7 +508,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/volume-metadata-show-response.json"
+                        href="../samples/volumes/volume-metadata-show-response.json"
                     />
                 </wadl:doc>
             </representation>
@@ -571,7 +526,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/volume-metadata-update-request.xml"
+                        href="../samples/volumes/volume-metadata-update-request.xml"
                     />
                 </wadl:doc>
             </representation>
@@ -579,7 +534,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/volume-metadata-update-request.json"
+                        href="../samples/volumes/volume-metadata-update-request.json"
                     />
                 </wadl:doc>
             </representation>
@@ -589,7 +544,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/volume-metadata-update-response.xml"
+                        href="../samples/volumes/volume-metadata-update-response.xml"
                     />
                 </wadl:doc>
             </representation>
@@ -597,7 +552,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/volume-metadata-update-response.json"
+                        href="../samples/volumes/volume-metadata-update-response.json"
                     />
                 </wadl:doc>
             </representation>
@@ -638,7 +593,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/volume_extend_request.json"
+                        href="../samples/volumes/volume-extend-request.json"
                     />
                 </wadl:doc>
                 <param name="new_size" style="plain"
@@ -668,7 +623,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/volume_reset_status_request.json"
+                        href="../samples/volumes/volume-status-reset-request.json"
                     />
                 </wadl:doc>
                 <param name="status" style="plain"
@@ -707,7 +662,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/volume_set_image_metadata_request.json"
+                        href="../samples/volumes/volume-image-metadata-set-request.json"
                     />
                 </wadl:doc>
                 <param name="os-set_image_metadata" style="plain"
@@ -748,7 +703,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/volume_unset_image_metadata_request.json"
+                        href="../samples/volumes/volume-image-metadata-unset-request.json"
                     />
                 </wadl:doc>
                 <param name="os-unset_image_metadata" style="plain"
@@ -765,7 +720,8 @@
                     <wadl:doc xmlns="http://docbook.org/ns/docbook"
                         xml:lang="EN">
                         <para>
-                            The metadata key name for the metadata that you want to remove.
+                            The metadata key name for the metadata that you
+                            want to remove.
                         </para>
                     </wadl:doc>
                 </param>
@@ -777,8 +733,8 @@
         <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN"
             title="Attach volume to server">
             <para role="shortdesc">
-                Attaches a volume to a server. Specify the <code>os-attach</code> action in the
-                request body.
+                Attaches a volume to a server. Specify the <code>os-
+                attach</code> action in the request body.
             </para>
             <para>Preconditions</para>
             <itemizedlist>
@@ -799,7 +755,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/volume_attach_request.json"
+                        href="../samples/volumes/volume-attach-request.json"
                     />
                 </wadl:doc>
                 &attachVolumeReqParameters;
@@ -818,7 +774,11 @@
             </para>
             <para>Preconditions</para>
             <itemizedlist>
-                <listitem><para>Volume status must be <code>available</code>.</para></listitem>
+                <listitem>
+                    <para>
+                        Volume status must be <code>available</code>.
+                    </para>
+                </listitem>
             </itemizedlist>
         </wadl:doc>
         <request>
@@ -826,7 +786,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/os-unmanage/os-unmanage-request.json"
+                        href="../samples/volumes/volume-unmanage-request.json"
                     />
                 </wadl:doc>
                 &unmanageVolumeReqParameters;
@@ -851,7 +811,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/os-force-detach/os-force-detach-request.json"
+                        href="../samples/volumes/volume-force-detach-request.json"
                     />
                 </wadl:doc>
                 &forcedetachVolumeReqParameters;
@@ -873,7 +833,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/os-replica/os-promote-replica-request.json"
+                        href="../samples/volumes/volume-replica-promote-request.json"
                     />
                 </wadl:doc>
                 &promotereplicaVolumeReqParameters;
@@ -886,7 +846,7 @@
             title="Reenable volume replication">
             <para role="shortdesc">
                 Re-enables replication of a volume. Specify the
-                <code>os-reenable-replica</code> action in the request body.
+                <code>volume-replica-reenable-</code> action in the request body.
             </para>
         </wadl:doc>
         <request>
@@ -894,7 +854,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/os-replica/os-reenable-replica-request.json"
+                        href="../samples/volumes/volume-replica-reenable-request.json"
                     />
                 </wadl:doc>
                 &reenablereplicaVolumeReqParameters;
@@ -902,7 +862,7 @@
         </request>
         <response status="202"/>
     </method>
-    <method name="GET" id="getVolumeTypes">
+    <method name="GET" id="showVolumeTypes">
         <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN"
             title="List volume types">
             <para role="shortdesc">
@@ -914,7 +874,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/volume_type_list_response.xml"
+                        href="../samples/volumes/volume-types-list-response.xml"
                     />
                 </wadl:doc>
             </representation>
@@ -922,7 +882,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/volume_type_list_response.json"
+                        href="../samples/volumes/volume-types-list-response.json"
                     />
                 </wadl:doc>
                 &VolTypeResponseParameters;
@@ -956,14 +916,14 @@
             <representation mediaType="application/xml">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
-                    <xsdxt:code href="api_samples/volume_type_create_request.xml"/>
+                    <xsdxt:code href="../samples/volumes/volume-type-create-request.xml"/>
                 </wadl:doc>
             </representation>
             <representation mediaType="application/json"
                 json:ref="http://docs.openstack.org/api/openstack-block-storage/v2/types#post/volume_type">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
-                    <xsdxt:code href="api_samples/volume_type_create_request.json"
+                    <xsdxt:code href="../samples/volumes/volume-type-create-request.json"
                     />
                 </wadl:doc>
             </representation>
@@ -972,13 +932,13 @@
             <representation mediaType="application/xml">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
-                    <xsdxt:code href="api_samples/volume_type_show_response.xml"/>
+                    <xsdxt:code href="../samples/volumes/volume-type-show-response.xml"/>
                 </wadl:doc>
             </representation>
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
-                    <xsdxt:code href="api_samples/volume_type_show_response.json"/>
+                    <xsdxt:code href="../samples/volumes/volume-type-show-response.json"/>
                 </wadl:doc>
                 &VolTypeResponseParameters;
             </representation>
@@ -1009,12 +969,12 @@
         <request>
             <representation mediaType="application/xml">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-                    <xsdxt:code href="api_samples/volume_type_create_request.xml"/>
+                    <xsdxt:code href="../samples/volumes/volume-type-create-request.xml"/>
                 </wadl:doc>
             </representation>
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-                    <xsdxt:code href="api_samples/volume_type_create_request.json"/>
+                    <xsdxt:code href="../samples/volumes/volume-type-create-request.json"/>
                 </wadl:doc>
                 <param name="volume_type" style="plain" required="true" type="csapi:string">
                     <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
@@ -1028,12 +988,12 @@
         <response status="200">
             <representation mediaType="application/xml">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-                    <xsdxt:code href="api_samples/volume_type_show.xml"/>
+                    <xsdxt:code href="../samples/volumes/volume-type-show-response.xml"/>
                 </wadl:doc>
             </representation>
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-                    <xsdxt:code href="api_samples/volume_type_show.json"/>
+                    <xsdxt:code href="../samples/volumes/volume-type-show-response.json"/>
                 </wadl:doc>
                 &VolTypeResponseParameters;
             </representation>
@@ -1050,12 +1010,12 @@
         <request>
             <representation mediaType="application/xml">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-                    <xsdxt:code href="api_samples/volume_type_create_request.xml"/>
+                    <xsdxt:code href="../samples/volumes/volume-type-create-request.xml"/>
                 </wadl:doc>
             </representation>
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-                    <xsdxt:code href="api_samples/volume_type_create_request.json"/>
+                    <xsdxt:code href="../samples/volumes/volume-type-create-request.json"/>
                 </wadl:doc>
                 <param name="volume_type" style="plain" required="true" type="csapi:string">
                     <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
@@ -1080,18 +1040,18 @@
         <response status="200">
             <representation mediaType="application/xml">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-                    <xsdxt:code href="api_samples/volume_type_show.xml"/>
+                    <xsdxt:code href="../samples/volumes/volume-type-show-response.xml"/>
                 </wadl:doc>
             </representation>
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-                    <xsdxt:code href="api_samples/volume_type_show.json"/>
+                    <xsdxt:code href="../samples/volumes/volume-type-show-response.json"/>
                 </wadl:doc>
                 &VolTypeResponseParameters;
             </representation>
         </response>
     </method>
-    <method name="GET" id="getVolumeType">
+    <method name="GET" id="showVolumeType">
         <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN"
             title="Show volume type details">
             <para role="shortdesc">
@@ -1103,7 +1063,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/volume_type_show_response.json"
+                        href="../samples/volumes/volume-type-show-response.json"
                     />
                 </wadl:doc>
             </representation>
@@ -1111,7 +1071,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/volume_type_show_response.xml"
+                        href="../samples/volumes/volume-type-show-response.xml"
                     />
                 </wadl:doc>
                 &VolTypeResponseParameters;
@@ -1140,7 +1100,8 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/snapshot_create_request.xml"/>
+                        href="../samples/volumes/snapshot-create-request.xml"
+                    />
                 </wadl:doc>
                 <param name="snapshot" style="plain" type="string"
                     required="true">
@@ -1181,13 +1142,13 @@
                         </para>
                     </wadl:doc>
                 </param>
-                <param name="volume_id" style="plain" type="csapi:uuid"
+                <param name="volume_id" style="plain" type="csapi:UUID"
                     required="false">
                     <wadl:doc xmlns="http://docbook.org/ns/docbook"
                         xml:lang="EN">
                         <para>
                             To create a snapshot from an existing volume,
-                            specify the ID of the existing volume.
+                            specify the UUID of the existing volume.
                         </para>
                     </wadl:doc>
                 </param>
@@ -1207,7 +1168,8 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/snapshot_create_request.json"/>
+                        href="../samples/volumes/snapshot-create-request.json"
+                    />
                 </wadl:doc>
             </representation>
         </request>
@@ -1216,14 +1178,15 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/snapshot_create_response.xml"/>
+                        href="../samples/volumes/snapshot-create-response.xml"
+                    />
                 </wadl:doc>
             </representation>
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/snapshot_create_response.json"
+                        href="../samples/volumes/snapshot-create-response.json"
                     />
                 </wadl:doc>
                 &snapshotResponseParameter;
@@ -1250,7 +1213,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/snapshot_list_simple_response.xml"
+                        href="../samples/volumes/snapshots-list-response.xml"
                     />
                 </wadl:doc>
             </representation>
@@ -1258,7 +1221,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/snapshot_list_simple_response.json"
+                        href="../samples/volumes/snapshots-list-response.json"
                     />
                 </wadl:doc>
                 &snapshotsResponseParameter;
@@ -1279,7 +1242,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/snapshot_list_detail_response.xml"
+                        href="../samples/volumes/snapshots-list-detailed-response.xml"
                     />
                 </wadl:doc>
             </representation>
@@ -1287,7 +1250,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/snapshot_list_detail_response.json"
+                        href="../samples/volumes/snapshots-list-detailed-response.json"
                     />
                 </wadl:doc>
                 &snapshotsResponseParameter;
@@ -1301,7 +1264,7 @@
                         </para>
                     </wadl:doc>
                 </param>
-                <param name="os-extended-snapshot-attributes:project_id" style="plain" type="csapi:uuid"
+                <param name="os-extended-snapshot-attributes:project_id" style="plain" type="csapi:UUID"
                     required="true">
                     <wadl:doc xmlns="http://docbook.org/ns/docbook"
                         xml:lang="EN">
@@ -1325,7 +1288,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/snapshot_show_response.xml"
+                        href="../samples/volumes/snapshot-show-response.xml"
                     />
                 </wadl:doc>
             </representation>
@@ -1333,7 +1296,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/snapshot_show_response.json"
+                        href="../samples/volumes/snapshot-show-response.json"
                     />
                 </wadl:doc>
                 &snapshotResponseParameter;
@@ -1347,7 +1310,7 @@
                         </para>
                     </wadl:doc>
                 </param>
-                <param name="os-extended-snapshot-attributes:project_id" style="plain" type="csapi:uuid"
+                <param name="os-extended-snapshot-attributes:project_id" style="plain" type="csapi:UUID"
                     required="true">
                     <wadl:doc xmlns="http://docbook.org/ns/docbook"
                         xml:lang="EN">
@@ -1371,7 +1334,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/snapshot_update_request.xml"
+                        href="../samples/volumes/snapshot-update-request.xml"
                     />
                 </wadl:doc>
             </representation>
@@ -1380,7 +1343,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/snapshot_update_request.json"
+                        href="../samples/volumes/snapshot-update-request.json"
                     />
                 </wadl:doc>
                 <param name="snapshot" style="plain" type="string"
@@ -1429,7 +1392,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/snapshot_update_response.xml"
+                        href="../samples/volumes/snapshot-update-response.xml"
                     />
                 </wadl:doc>
             </representation>
@@ -1437,7 +1400,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/snapshot_update_response.json"
+                        href="../samples/volumes/snapshot-update-response.json"
                     />
                 </wadl:doc>
                 &snapshotResponseParameter;
@@ -1466,7 +1429,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/snapshot_metadata_response.xml"
+                        href="../samples/volumes/snapshot-metadata-show-response.xml"
                     />
                 </wadl:doc>
             </representation>
@@ -1474,7 +1437,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/snapshot_metadata_response.json"
+                        href="../samples/volumes/snapshot-metadata-show-response.json"
                     />
                 </wadl:doc>
                 &snapshotResponseParameter;
@@ -1488,7 +1451,7 @@
                         </para>
                     </wadl:doc>
                 </param>
-                <param name="os-extended-snapshot-attributes:project_id" style="plain" type="csapi:uuid"
+                <param name="os-extended-snapshot-attributes:project_id" style="plain" type="csapi:UUID"
                     required="true">
                     <wadl:doc xmlns="http://docbook.org/ns/docbook"
                         xml:lang="EN">
@@ -1512,7 +1475,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/snapshot_update_metadata_request.xml"
+                        href="../samples/volumes/snapshot-metadata-update-request.xml"
                     />
                 </wadl:doc>
             </representation>
@@ -1521,7 +1484,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/snapshot_update_metadata_request.json"
+                        href="../samples/volumes/snapshot-metadata-update-request.json"
                     />
                 </wadl:doc>
                 <param xmlns="http://wadl.dev.java.net/2009/02" name="metadata" style="plain" type="dict"
@@ -1541,7 +1504,7 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/snapshot_update_metadata_response.xml"
+                        href="../samples/volumes/snapshot-metadata-update-response.xml"
                     />
                 </wadl:doc>
             </representation>
@@ -1549,19 +1512,56 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:code
-                        href="api_samples/snapshot_update_metadata_response.json"
+                        href="../samples/volumes/snapshot-metadata-update-response.json"
                     />
                 </wadl:doc>
-                <param xmlns="http://wadl.dev.java.net/2009/02" name="metadata" style="plain" type="dict"
-                  required="true">
-                  <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xmlns:wadl="http://wadl.dev.java.net/2009/02"
+            </representation>
+        </response>
+    </method>
+    <method name="POST" id="createVolumeTypeAccessExt">
+        <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN"
+            title="Create private volume">
+            <para role="shortdesc">
+                Creates a private Block Storage volume.
+            </para>
+        </wadl:doc>
+        <request>
+            <representation mediaType="application/json">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
-                    <para>
-                      One or more metadata key and value pairs for the snapshot, if any.
-                    </para>
-                  </wadl:doc>
-                </param>
+                    <xsdxt:code
+                        href="../samples/volumes/volume-create-request.json"
+                    />
+                </wadl:doc>
+            </representation>
+            <representation mediaType="application/xml">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                    xml:lang="EN">
+                    <xsdxt:code
+                        href="../samples/volumes/volume-create-request.xml"/>
+                </wadl:doc>
+                &createVolumeParameters;
+                &isPublicParameterReq;
+            </representation>
+        </request>
+        <response status="202">
+            <representation mediaType="application/json">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                    xml:lang="EN">
+                    <xsdxt:code
+                        href="../samples/volumes/volume-create-response.json"
+                    />
+                </wadl:doc>
+            </representation>
+            <representation mediaType="application/xml">
+                <wadl:doc xmlns="http://docbook.org/ns/docbook"
+                    xml:lang="EN">
+                    <xsdxt:code
+                        href="../samples/volumes/volume-create-response.xml"
+                    />
+                </wadl:doc>
+                &createVolumeResponseParameters;
+                &isPublicParameterResp;
             </representation>
         </response>
     </method>