diff --git a/api-ref/src/wadls/dataprocessing-api/src/v1.1/samples/image-registry/image-register-response.json b/api-ref/src/wadls/dataprocessing-api/src/v1.1/samples/image-registry/image-register-response.json
index fdcb5e7af..5851a58ec 100644
--- a/api-ref/src/wadls/dataprocessing-api/src/v1.1/samples/image-registry/image-register-response.json
+++ b/api-ref/src/wadls/dataprocessing-api/src/v1.1/samples/image-registry/image-register-response.json
@@ -4,8 +4,8 @@
         "metadata": {
             "_sahara_description": "Ubuntu image for Hadoop 2.7.1",
             "_sahara_username": "ubuntu",
-            "_sahara_tag_vanilla": "True",
-            "_sahara_tag_2.7.1": "True"
+            "_sahara_tag_vanilla": true,
+            "_sahara_tag_2.7.1": true
         },
         "id": "bb8d12b5-f9bb-49f0-aecb-739b8a9bec89",
         "minDisk": 0,
diff --git a/api-ref/src/wadls/dataprocessing-api/src/v1.1/samples/image-registry/image-show-response.json b/api-ref/src/wadls/dataprocessing-api/src/v1.1/samples/image-registry/image-show-response.json
index 911a899b9..0f09f23f5 100644
--- a/api-ref/src/wadls/dataprocessing-api/src/v1.1/samples/image-registry/image-show-response.json
+++ b/api-ref/src/wadls/dataprocessing-api/src/v1.1/samples/image-registry/image-show-response.json
@@ -3,8 +3,8 @@
         "updated": "2015-02-03T10:29:32Z",
         "metadata": {
             "_sahara_username": "ubuntu",
-            "_sahara_tag_vanilla": "True",
-            "_sahara_tag_2.6.0": "True"
+            "_sahara_tag_vanilla": true,
+            "_sahara_tag_2.6.0": true
         },
         "id": "bb8d12b5-f9bb-49f0-aecb-739b8a9bec89",
         "minDisk": 0,
diff --git a/api-ref/src/wadls/dataprocessing-api/src/v1.1/samples/image-registry/image-tags-add-response.json b/api-ref/src/wadls/dataprocessing-api/src/v1.1/samples/image-registry/image-tags-add-response.json
index 412bc1491..2c66b2930 100644
--- a/api-ref/src/wadls/dataprocessing-api/src/v1.1/samples/image-registry/image-tags-add-response.json
+++ b/api-ref/src/wadls/dataprocessing-api/src/v1.1/samples/image-registry/image-tags-add-response.json
@@ -2,11 +2,11 @@
     "image": {
         "updated": "2015-03-24T10:18:33Z",
         "metadata": {
-            "_sahara_tag_vanilla": "True",
+            "_sahara_tag_vanilla": true,
             "_sahara_description": "Ubuntu image for Hadoop 2.7.1",
             "_sahara_username": "ubuntu",
-            "_sahara_tag_some_other_tag": "True",
-            "_sahara_tag_2.7.1": "True"
+            "_sahara_tag_some_other_tag": true,
+            "_sahara_tag_2.7.1": true
         },
         "id": "bb8d12b5-f9bb-49f0-aecb-739b8a9bec89",
         "minDisk": 0,
diff --git a/api-ref/src/wadls/dataprocessing-api/src/v1.1/samples/image-registry/image-tags-delete-response.json b/api-ref/src/wadls/dataprocessing-api/src/v1.1/samples/image-registry/image-tags-delete-response.json
index 107d49975..44eb13139 100644
--- a/api-ref/src/wadls/dataprocessing-api/src/v1.1/samples/image-registry/image-tags-delete-response.json
+++ b/api-ref/src/wadls/dataprocessing-api/src/v1.1/samples/image-registry/image-tags-delete-response.json
@@ -4,8 +4,8 @@
         "metadata": {
             "_sahara_description": "Ubuntu image for Hadoop 2.7.1",
             "_sahara_username": "ubuntu",
-            "_sahara_tag_vanilla": "True",
-            "_sahara_tag_2.7.1": "True"
+            "_sahara_tag_vanilla": true,
+            "_sahara_tag_2.7.1": true
         },
         "id": "bb8d12b5-f9bb-49f0-aecb-739b8a9bec89",
         "minDisk": 0,
diff --git a/api-ref/src/wadls/dataprocessing-api/src/v1.1/samples/image-registry/images-list-response.json b/api-ref/src/wadls/dataprocessing-api/src/v1.1/samples/image-registry/images-list-response.json
index db10177dd..d40f0c215 100644
--- a/api-ref/src/wadls/dataprocessing-api/src/v1.1/samples/image-registry/images-list-response.json
+++ b/api-ref/src/wadls/dataprocessing-api/src/v1.1/samples/image-registry/images-list-response.json
@@ -5,9 +5,9 @@
             "id": "4118a476-dfdc-4b0e-8d5c-463cba08e9ae",
             "created": "2015-08-06T08:17:14Z",
             "metadata": {
-                "_sahara_tag_2.7.1": "True",
+                "_sahara_tag_2.7.1": true,
                 "_sahara_username": "ubuntu",
-                "_sahara_tag_vanilla": "True"
+                "_sahara_tag_vanilla": true
             },
             "username": "ubuntu",
             "progress": 100,
@@ -28,8 +28,8 @@
             "created": "2015-09-04T11:56:44Z",
             "metadata": {
                 "_sahara_username": "ubuntu",
-                "_sahara_tag_5.4.0": "True",
-                "_sahara_tag_cdh": "True"
+                "_sahara_tag_5.4.0": true,
+                "_sahara_tag_cdh": true
             },
             "username": "ubuntu",
             "progress": 100,
diff --git a/api-ref/src/wadls/dataprocessing-api/src/v1.1/wadl/common.ent b/api-ref/src/wadls/dataprocessing-api/src/v1.1/wadl/common.ent
index 288515a7a..2d0d1fca0 100644
--- a/api-ref/src/wadls/dataprocessing-api/src/v1.1/wadl/common.ent
+++ b/api-ref/src/wadls/dataprocessing-api/src/v1.1/wadl/common.ent
@@ -301,7 +301,7 @@
     xmlns:wadl="http://wadl.dev.java.net/2009/02"
     xml:lang="EN">
     <para>
-      If set to <code>True</code>, the node is public in the cluster.
+      If set to <code>true</code>, the node is public in the cluster.
     </para>
   </wadl:doc>
 </param>
@@ -368,7 +368,7 @@
     xmlns:wadl="http://wadl.dev.java.net/2009/02"
     xml:lang="EN">
     <para>
-      If set to <code>True</code>, the cluster group is automatically secured.
+      If set to <code>true</code>, the cluster group is automatically secured.
     </para>
   </wadl:doc>
 </param>
@@ -379,7 +379,7 @@
     xmlns:wadl="http://wadl.dev.java.net/2009/02"
     xml:lang="EN">
     <para>
-      If set to <code>True</code> the node is the default node in the cluster.
+      If set to <code>true</code> the node is the default node in the cluster.
     </para>
   </wadl:doc>
 </param>