diff --git a/api-ref/source/v2/os-vol-pool-v2.inc b/api-ref/source/v2/os-vol-pool-v2.inc
index 71537f56726..183fb522eb7 100644
--- a/api-ref/source/v2/os-vol-pool-v2.inc
+++ b/api-ref/source/v2/os-vol-pool-v2.inc
@@ -37,10 +37,10 @@ Response Parameters
    - updated: updated
    - QoS_support: QoS_support
    - name: name_16
-   - total_capacity: total_capacity
+   - total_capacity_gb: total_capacity
    - volume_backend_name: volume_backend_name
    - capabilities: capabilities
-   - free_capacity: free_capacity
+   - free_capacity_gb: free_capacity
    - driver_version: driver_version
    - reserved_percentage: reserved_percentage
    - storage_protocol: storage_protocol
diff --git a/api-ref/source/v2/parameters.yaml b/api-ref/source/v2/parameters.yaml
index 0fa96e9e4fc..89e50f6b575 100644
--- a/api-ref/source/v2/parameters.yaml
+++ b/api-ref/source/v2/parameters.yaml
@@ -342,7 +342,7 @@ capabilities:
   description: |
     The capabilities for the back end.  The value is
     either ``null`` or a string value that indicates the capabilities
-    for each pool. For example, ``total_capacity`` or ``QoS_support``.
+    for each pool. For example, ``total_capacity_gb`` or ``QoS_support``.
   in: body
   required: true
   type: object
diff --git a/api-ref/source/v2/samples/pools-list-detailed-response.json b/api-ref/source/v2/samples/pools-list-detailed-response.json
index 3fc28a2992f..202713801cc 100644
--- a/api-ref/source/v2/samples/pools-list-detailed-response.json
+++ b/api-ref/source/v2/samples/pools-list-detailed-response.json
@@ -4,8 +4,8 @@
             "name": "pool1",
             "capabilities": {
                 "updated": "2014-10-28T00:00:00-00:00",
-                "total_capacity": 1024,
-                "free_capacity": 100,
+                "total_capacity_gb": 1024,
+                "free_capacity_gb": 100,
                 "volume_backend_name": "pool1",
                 "reserved_percentage": 0,
                 "driver_version": "1.0.0",
@@ -17,8 +17,8 @@
             "name": "pool2",
             "capabilities": {
                 "updated": "2014-10-28T00:00:00-00:00",
-                "total_capacity": 512,
-                "free_capacity": 200,
+                "total_capacity_gb": 512,
+                "free_capacity_gb": 200,
                 "volume_backend_name": "pool2",
                 "reserved_percentage": 0,
                 "driver_version": "1.0.1",
diff --git a/api-ref/source/v3/os-vol-pool-v3.inc b/api-ref/source/v3/os-vol-pool-v3.inc
index 186583ad0d0..36e80b46170 100644
--- a/api-ref/source/v3/os-vol-pool-v3.inc
+++ b/api-ref/source/v3/os-vol-pool-v3.inc
@@ -44,10 +44,10 @@ Response Parameters
    - updated: updated
    - QoS_support: QoS_support
    - name: name_20
-   - total_capacity: total_capacity
+   - total_capacity_gb: total_capacity
    - volume_backend_name: volume_backend_name
    - capabilities: capabilities
-   - free_capacity: free_capacity
+   - free_capacity_gb: free_capacity
    - driver_version: driver_version
    - reserved_percentage: reserved_percentage
    - storage_protocol: storage_protocol
diff --git a/api-ref/source/v3/parameters.yaml b/api-ref/source/v3/parameters.yaml
index 687323bfb44..c04fb8cc9b1 100644
--- a/api-ref/source/v3/parameters.yaml
+++ b/api-ref/source/v3/parameters.yaml
@@ -634,7 +634,7 @@ capabilities:
   description: |
     The capabilities for the back end.  The value is
     either ``null`` or a string value that indicates the capabilities
-    for each pool. For example, ``total_capacity`` or ``QoS_support``.
+    for each pool. For example, ``total_capacity_gb`` or ``QoS_support``.
   in: body
   required: true
   type: object
diff --git a/api-ref/source/v3/samples/pools-list-detailed-response.json b/api-ref/source/v3/samples/pools-list-detailed-response.json
index 3fc28a2992f..202713801cc 100644
--- a/api-ref/source/v3/samples/pools-list-detailed-response.json
+++ b/api-ref/source/v3/samples/pools-list-detailed-response.json
@@ -4,8 +4,8 @@
             "name": "pool1",
             "capabilities": {
                 "updated": "2014-10-28T00:00:00-00:00",
-                "total_capacity": 1024,
-                "free_capacity": 100,
+                "total_capacity_gb": 1024,
+                "free_capacity_gb": 100,
                 "volume_backend_name": "pool1",
                 "reserved_percentage": 0,
                 "driver_version": "1.0.0",
@@ -17,8 +17,8 @@
             "name": "pool2",
             "capabilities": {
                 "updated": "2014-10-28T00:00:00-00:00",
-                "total_capacity": 512,
-                "free_capacity": 200,
+                "total_capacity_gb": 512,
+                "free_capacity_gb": 200,
                 "volume_backend_name": "pool2",
                 "reserved_percentage": 0,
                 "driver_version": "1.0.1",