diff --git a/api-ref/src/wadls/volume-api/src/common.ent b/api-ref/src/wadls/volume-api/src/common.ent
index ceaa0e008..5c2342adc 100644
--- a/api-ref/src/wadls/volume-api/src/common.ent
+++ b/api-ref/src/wadls/volume-api/src/common.ent
@@ -260,8 +260,8 @@
     xmlns:wadl="http://wadl.dev.java.net/2009/02"
     xml:lang="EN">
     <para>
-      Set to <code>usage=True</code> to show quota usage. Default is
-      <code>False</code>.
+      Set to <code>usage=true</code> to show quota usage. Default is
+      <code>false</code>.
     </para>
   </wadl:doc>
 </param>'>
@@ -938,7 +938,7 @@
     xml:lang="EN">
     <para>
       The in use data size. Visible only if you set the
-      <code>usage=True</code> query parameter.
+      <code>usage=true</code> query parameter.
     </para>
   </wadl:doc>
 </param>
@@ -950,7 +950,7 @@
     xml:lang="EN">
     <para>
       Reserved volume size. Visible only if you set the
-      <code>usage=True</code> query parameter.
+      <code>usage=true</code> query parameter.
     </para>
   </wadl:doc>
 </param>'>
@@ -1847,7 +1847,7 @@
     xmlns:wadl="http://wadl.dev.java.net/2009/02"
     xml:lang="EN">
     <para>
-      Enables public or private visibility. Set to <code>True</code> to
+      Enables public or private visibility. Set to <code>true</code> to
       make the back end publicly visible.
     </para>
   </wadl:doc>
@@ -3200,9 +3200,9 @@
     xml:lang="EN">
     <para>
       The backup mode. A valid value is
-      <code>True</code> for incremental backup mode or
-      <code>False</code> for full backup mode.
-      Default is <code>False</code>.
+      <code>true</code> for incremental backup mode or
+      <code>false</code> for full backup mode.
+      Default is <code>false</code>.
     </para>
   </wadl:doc>
 </param>
@@ -3214,7 +3214,7 @@
     xml:lang="EN">
     <para>
       Indicates whether to backup, even if the volume is attached.
-      Default is <code>False</code>.
+      Default is <code>false</code>.
     </para>
   </wadl:doc>
 </param>'>
@@ -3401,8 +3401,8 @@
     xml:lang="EN">
     <para>
       Indicates whether the backup mode is incremental.
-      If this value is <code>True</code>, the backup mode is incremental.
-      If this value is <code>False</code>, the backup mode is full.
+      If this value is <code>true</code>, the backup mode is incremental.
+      If this value is <code>false</code>, the backup mode is full.
     </para>
   </wadl:doc>
 </param>
@@ -3413,7 +3413,7 @@
     xmlns:wadl="http://wadl.dev.java.net/2009/02"
     xml:lang="EN">
     <para>
-      If this value is <code>True</code>, the backup depends on other backups.
+      If this value is <code>true</code>, the backup depends on other backups.
     </para>
   </wadl:doc>
 </param>'>
diff --git a/api-ref/src/wadls/volume-api/src/v1/samples/os-user-quotas/user-quotas-update-request.json b/api-ref/src/wadls/volume-api/src/v1/samples/os-user-quotas/user-quotas-update-request.json
index b322b2a87..6e5195f9a 100644
--- a/api-ref/src/wadls/volume-api/src/v1/samples/os-user-quotas/user-quotas-update-request.json
+++ b/api-ref/src/wadls/volume-api/src/v1/samples/os-user-quotas/user-quotas-update-request.json
@@ -1,6 +1,6 @@
 {
     "quota_set": {
-        "force": "True",
+        "force": true,
         "instances": 9
     }
 }
diff --git a/api-ref/src/wadls/volume-api/src/v1/samples/os-user-quotas/user-quotas-update-request.xml b/api-ref/src/wadls/volume-api/src/v1/samples/os-user-quotas/user-quotas-update-request.xml
index c5084d44e..dd58ed24d 100644
--- a/api-ref/src/wadls/volume-api/src/v1/samples/os-user-quotas/user-quotas-update-request.xml
+++ b/api-ref/src/wadls/volume-api/src/v1/samples/os-user-quotas/user-quotas-update-request.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <quota_set id="fake_tenant">
-  <force>True</force>
+  <force>true</force>
   <instances>9</instances>
 </quota_set>
diff --git a/api-ref/src/wadls/volume-api/src/v2/samples/backups/backup-create-request.json b/api-ref/src/wadls/volume-api/src/v2/samples/backups/backup-create-request.json
index b90f9cc13..c7f8a74d5 100644
--- a/api-ref/src/wadls/volume-api/src/v2/samples/backups/backup-create-request.json
+++ b/api-ref/src/wadls/volume-api/src/v2/samples/backups/backup-create-request.json
@@ -4,6 +4,6 @@
         "description": null,
         "name": "backup001",
         "volume_id": "64f5d2fb-d836-4063-b7e2-544d5c1ff607",
-        "incremental": "True"
+        "incremental": true
     }
 }
diff --git a/api-ref/src/wadls/volume-api/src/v2/samples/backups/backup-show-response.json b/api-ref/src/wadls/volume-api/src/v2/samples/backups/backup-show-response.json
index 1a536e1ec..c4fe0ffc4 100644
--- a/api-ref/src/wadls/volume-api/src/v2/samples/backups/backup-show-response.json
+++ b/api-ref/src/wadls/volume-api/src/v2/samples/backups/backup-show-response.json
@@ -21,7 +21,7 @@
         "size": 1,
         "status": "available",
         "volume_id": "e5185058-943a-4cb4-96d9-72c184c337d6",
-        "is_incremental": "True",
-        "has_dependent_backups": "False"
+        "is_incremental": true,
+        "has_dependent_backups": false
     }
 }
diff --git a/api-ref/src/wadls/volume-api/src/v2/samples/backups/backups-list-detailed-response.json b/api-ref/src/wadls/volume-api/src/v2/samples/backups/backups-list-detailed-response.json
index e4e5ea829..d729ada68 100644
--- a/api-ref/src/wadls/volume-api/src/v2/samples/backups/backups-list-detailed-response.json
+++ b/api-ref/src/wadls/volume-api/src/v2/samples/backups/backups-list-detailed-response.json
@@ -22,8 +22,8 @@
             "size": 1,
             "status": "available",
             "volume_id": "e5185058-943a-4cb4-96d9-72c184c337d6",
-            "is_incremental": "True",
-            "has_dependent_backups": "False"
+            "is_incremental": true,
+            "has_dependent_backups": false
         },
         {
             "availability_zone": "az1",
@@ -47,8 +47,8 @@
             "size": 1,
             "status": "available",
             "volume_id": "e5185058-943a-4cb4-96d9-72c184c337d6",
-            "is_incremental": "True",
-            "has_dependent_backups": "False"
+            "is_incremental": true,
+            "has_dependent_backups": false
         }
     ]
 }
diff --git a/api-ref/src/wadls/volume-api/src/v2/samples/consistencygroups/consistency-group-delete-request.json b/api-ref/src/wadls/volume-api/src/v2/samples/consistencygroups/consistency-group-delete-request.json
index 4a3138939..8ad8745e7 100644
--- a/api-ref/src/wadls/volume-api/src/v2/samples/consistencygroups/consistency-group-delete-request.json
+++ b/api-ref/src/wadls/volume-api/src/v2/samples/consistencygroups/consistency-group-delete-request.json
@@ -1,5 +1,5 @@
 {
     "consistencygroup": {
-        "force": "False"
+        "force": false
     }
 }
diff --git a/api-ref/src/wadls/volume-api/src/v2/samples/os-vol-image-meta/image-metadata-show-request.json b/api-ref/src/wadls/volume-api/src/v2/samples/os-vol-image-meta/image-metadata-show-request.json
index 39f60e87a..f84e8261d 100644
--- a/api-ref/src/wadls/volume-api/src/v2/samples/os-vol-image-meta/image-metadata-show-request.json
+++ b/api-ref/src/wadls/volume-api/src/v2/samples/os-vol-image-meta/image-metadata-show-request.json
@@ -9,7 +9,7 @@
         "availability_zone": "az2",
         "description": "Volume imported from existingLV",
         "volume_type": null,
-        "bootable": "True",
+        "bootable": true,
         "metadata": {
             "key1": "value1",
             "key2": "value2"
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
index 39f60e87a..f84e8261d 100644
--- 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
@@ -9,7 +9,7 @@
         "availability_zone": "az2",
         "description": "Volume imported from existingLV",
         "volume_type": null,
-        "bootable": "True",
+        "bootable": true,
         "metadata": {
             "key1": "value1",
             "key2": "value2"
diff --git a/api-ref/src/wadls/volume-api/src/v2/samples/scheduler-stats/pools-list-detailed-response.json b/api-ref/src/wadls/volume-api/src/v2/samples/scheduler-stats/pools-list-detailed-response.json
index cdedc78aa..3fc28a299 100644
--- a/api-ref/src/wadls/volume-api/src/v2/samples/scheduler-stats/pools-list-detailed-response.json
+++ b/api-ref/src/wadls/volume-api/src/v2/samples/scheduler-stats/pools-list-detailed-response.json
@@ -10,7 +10,7 @@
                 "reserved_percentage": 0,
                 "driver_version": "1.0.0",
                 "storage_protocol": "iSCSI",
-                "QoS_support": "False"
+                "QoS_support": false
             }
         },
         {
@@ -23,7 +23,7 @@
                 "reserved_percentage": 0,
                 "driver_version": "1.0.1",
                 "storage_protocol": "iSER",
-                "QoS_support": "True"
+                "QoS_support": true
             }
         }
     ]
diff --git a/api-ref/src/wadls/volume-api/src/v2/samples/user-quotas-update-request.json b/api-ref/src/wadls/volume-api/src/v2/samples/user-quotas-update-request.json
index b322b2a87..6e5195f9a 100644
--- a/api-ref/src/wadls/volume-api/src/v2/samples/user-quotas-update-request.json
+++ b/api-ref/src/wadls/volume-api/src/v2/samples/user-quotas-update-request.json
@@ -1,6 +1,6 @@
 {
     "quota_set": {
-        "force": "True",
+        "force": true,
         "instances": 9
     }
 }
diff --git a/api-ref/src/wadls/volume-api/src/v2/samples/user-quotas-update-request.xml b/api-ref/src/wadls/volume-api/src/v2/samples/user-quotas-update-request.xml
index c5084d44e..dd58ed24d 100644
--- a/api-ref/src/wadls/volume-api/src/v2/samples/user-quotas-update-request.xml
+++ b/api-ref/src/wadls/volume-api/src/v2/samples/user-quotas-update-request.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <quota_set id="fake_tenant">
-  <force>True</force>
+  <force>true</force>
   <instances>9</instances>
 </quota_set>
diff --git a/api-ref/src/wadls/volume-api/src/v2/samples/volumes/volumes-list-detailed-response.json b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/volumes-list-detailed-response.json
index 6424653e9..e91029c14 100644
--- a/api-ref/src/wadls/volume-api/src/v2/samples/volumes/volumes-list-detailed-response.json
+++ b/api-ref/src/wadls/volume-api/src/v2/samples/volumes/volumes-list-detailed-response.json
@@ -34,7 +34,7 @@
             "os-vol-tenant-attr:tenant_id": "bab7d5c60cd041a0a36f7c4b6e1dd978",
             "os-vol-mig-status-attr:migstat": null,
             "metadata": {
-                "readonly": "False",
+                "readonly": false,
                 "attached_mode": "rw"
             },
             "status": "in-use",
diff --git a/api-ref/src/wadls/volume-api/src/v2/wadl/scheduler-stats-v2.wadl b/api-ref/src/wadls/volume-api/src/v2/wadl/scheduler-stats-v2.wadl
index e66a73c53..a42cbd7b3 100644
--- a/api-ref/src/wadls/volume-api/src/v2/wadl/scheduler-stats-v2.wadl
+++ b/api-ref/src/wadls/volume-api/src/v2/wadl/scheduler-stats-v2.wadl
@@ -43,9 +43,9 @@
                             pool names in the response.
                         </para>
                         <para>
-                            Set to <code>True</code> to show pool details. Set
-                            to <code>False</code> to show only pool names.
-                            Default is <code>False</code>.
+                            Set to <code>true</code> to show pool details. Set
+                            to <code>false</code> to show only pool names.
+                            Default is <code>false</code>.
                         </para>
                     </wadl:doc>
                 </param>
diff --git a/api-ref/src/wadls/volume-api/src/v2/wadl/volumes-v2.wadl b/api-ref/src/wadls/volume-api/src/v2/wadl/volumes-v2.wadl
index a1c6994e2..2175aa2b4 100644
--- a/api-ref/src/wadls/volume-api/src/v2/wadl/volumes-v2.wadl
+++ b/api-ref/src/wadls/volume-api/src/v2/wadl/volumes-v2.wadl
@@ -1229,7 +1229,7 @@
                         xml:lang="EN">
                         <para>
                             Indicates whether to snapshot, even if the volume
-                            is attached. Default is <code>False</code>.
+                            is attached. Default is <code>false</code>.
                         </para>
                     </wadl:doc>
                 </param>