diff --git a/api-ref/src/wadls/orchestration-api/src/v1/orchestration-api.wadl b/api-ref/src/wadls/orchestration-api/src/v1/orchestration-api.wadl
index a1c778877..6096ee9e4 100644
--- a/api-ref/src/wadls/orchestration-api/src/v1/orchestration-api.wadl
+++ b/api-ref/src/wadls/orchestration-api/src/v1/orchestration-api.wadl
@@ -22,14 +22,15 @@
       </resource>
       <resource id="version" path="//v1">
          <resource id="tenant_id" path="{tenant_id}">
-            <param xmlns="http://wadl.dev.java.net/2009/02" name="tenant_id" style="template">
-            <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 tenant. A tenant is also known as an account
-                  or project.
-               </para>
-            </wadl:doc>
+            <param xmlns="http://wadl.dev.java.net/2009/02" name="tenant_id"
+               required="true" style="template" type="csapi:UUID">
+               <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 tenant.
+                     A tenant is also known as an account or project.
+                  </para>
+               </wadl:doc>
             </param>
             <resource id="stacks" path="stacks">
                <method href="#stack_create"/>
@@ -57,21 +58,22 @@
                      <method href="#stack_events_find"/>
                   </resource>
                   <resource path="{stack_id}" id="stack_id">
-                     <param xmlns="http://wadl.dev.java.net/2009/02" name="stack_id" style="template"
+                     <param xmlns="http://wadl.dev.java.net/2009/02"
+                        name="stack_id" style="template" 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 stack ID.
-                        </para>
-                     </wadl:doc>
+                        <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 stack.
+                           </para>
+                        </wadl:doc>
                      </param>
                      <method href="#stack_show"/>
                      <method href="#stack_update"/>
                      <method href="#stack_delete"/>
                      <resource path="preview" id="update_preview">
-                       <method href="#stack_update_preview"/>
+                        <method href="#stack_update_preview"/>
                      </resource>
                      <resource path="abandon" id="abandon">
                         <method href="#stack_abandon"/>
@@ -83,15 +85,16 @@
                      <resource path="snapshots" id="snapshots2">
                         <resource path="{snapshot_id}"
                            id="snapshot_id_snapshots">
-                           <param xmlns="http://wadl.dev.java.net/2009/02" name="snapshot_id"
-                              style="template" required="true">
-                           <wadl:doc
-                              xmlns="http://docbook.org/ns/docbook" xmlns:wadl="http://wadl.dev.java.net/2009/02"
-                              xml:lang="EN">
-                              <para>
-                                 The snapshot ID.
-                              </para>
-                           </wadl:doc>
+                           <param xmlns="http://wadl.dev.java.net/2009/02"
+                              name="snapshot_id" style="template"
+                              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 <code>snapshot</code>.
+                                 </para>
+                              </wadl:doc>
                            </param>
                            <method href="#stack_show_snapshot"/>
                            <method href="#stack_delete_snapshot"/>
@@ -106,7 +109,8 @@
                               <wadl:doc
                                  xmlns="http://docbook.org/ns/docbook" xmlns:wadl="http://wadl.dev.java.net/2009/02"
                                  xml:lang="EN">
-                                 <para>The snapshot ID.
+                                 <para>
+                                    The UUID of the snapshot.
                                  </para>
                               </wadl:doc>
                               </param>
@@ -166,18 +170,19 @@
                            </resource>
                            <resource path="events"
                               id="events3">
-                              <resource path="{event_id}"
-                                 id="event_id">
-                                 <param xmlns="http://wadl.dev.java.net/2009/02" name="event_id"
-                                    style="template" required="true">
-                                 <wadl:doc
-                                    xmlns="http://docbook.org/ns/docbook" xmlns:wadl="http://wadl.dev.java.net/2009/02"
-                                    xml:lang="EN">
-                                    <para>
-                                       The ID of an event that is related to
-                                       the resource in the stack.
-                                    </para>
-                                 </wadl:doc>
+                              <resource path="{event_id}" id="event_id">
+                                 <param xmlns="http://wadl.dev.java.net/2009/02"
+                                    name="event_id" style="template"
+                                    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 event that is
+                                          related to the resource in the stack.
+                                       </para>
+                                    </wadl:doc>
                                  </param>
                                  <method href="#event_show"/>
                               </resource>
@@ -234,15 +239,16 @@
                path="software_configs">
                <method href="#software_config_create"/>
                <resource path="{config_id}" id="config_id">
-                  <param xmlns="http://wadl.dev.java.net/2009/02" name="config_id" style="template"
+                  <param xmlns="http://wadl.dev.java.net/2009/02"
+                     name="config_id" style="template" 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 configuration ID.
-                     </para>
-                  </wadl:doc>
+                     <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 configuration.
+                        </para>
+                     </wadl:doc>
                   </param>
                   <method href="#software_config_show"/>
                   <method href="#software_config_delete"/>
@@ -254,15 +260,17 @@
                <method href="#software_deployment_create"/>
                <resource path="{deployment_id}"
                   id="deployment_id">
-                  <param xmlns="http://wadl.dev.java.net/2009/02" name="deployment_id" style="template"
+                  <param xmlns="http://wadl.dev.java.net/2009/02"
+                     name="deployment_id" style="template" 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 deployment ID.
-                     </para>
-                  </wadl:doc>
+                     <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 deployment.
+                        </para>
+                     </wadl:doc>
                   </param>
                   <method href="#software_deployment_show"/>
                   <method href="#software_deployment_update"/>
@@ -270,16 +278,18 @@
                </resource>
                <resource id="deployment_metadata" path="metadata">
                   <resource path="{server_id}" id="server_id">
-                     <param xmlns="http://wadl.dev.java.net/2009/02" name="server_id" style="template"
+                     <param xmlns="http://wadl.dev.java.net/2009/02"
+                        name="server_id" style="template" 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 ID of the server for which to fetch
-                           configuration metadata.
-                        </para>
-                     </wadl:doc>
+                        <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 server for which to fetch
+                              configuration metadata.
+                           </para>
+                        </wadl:doc>
                      </param>
                      <method
                         href="#software_deployment_metadata"/>
@@ -611,13 +621,14 @@
                </para>
             </wadl:doc>
             </param>
-            <param xmlns="http://wadl.dev.java.net/2009/02" name="stack_id" style="plain" required="true">
-            <wadl:doc xmlns="http://docbook.org/ns/docbook" xmlns:wadl="http://wadl.dev.java.net/2009/02"
-               xml:lang="EN">
-               <para>
-                  The system-assigned ID for the stack.
-               </para>
-            </wadl:doc>
+            <param xmlns="http://wadl.dev.java.net/2009/02" name="stack_id"
+               style="plain" required="true" type="csapi:UUID">
+               <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 system-assigned stack.
+                  </para>
+               </wadl:doc>
             </param>
             <param xmlns="http://wadl.dev.java.net/2009/02" name="links" style="plain"
                required="true">
@@ -2122,25 +2133,25 @@
                   href="samples/deployment-create-request.json"/>
             </wadl:doc>
             <param xmlns="http://wadl.dev.java.net/2009/02"
-             name="config_id" style="plain" required="true">
-            <wadl:doc xmlns="http://docbook.org/ns/docbook"
-               xml:lang="EN">
-               <para>
-                  The ID of the software configuration resource that
-                  runs when applying to the server.
-               </para>
-            </wadl:doc>
+               name="config_id" style="plain" required="true"
+               type="csapi:UUID">
+               <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
+                  <para>
+                     The UUID of the software configuration resource that
+                     runs when applying to the server.
+                  </para>
+               </wadl:doc>
             </param>
             <param xmlns="http://wadl.dev.java.net/2009/02"
-             name="server_id" style="plain" required="true">
-            <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 compute server to which the
-                  configuration applies.
-               </para>
-            </wadl:doc>
+               name="server_id" style="plain" required="true"
+               type="csapi:UUID">
+               <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 compute server to which the
+                     configuration applies.
+                  </para>
+               </wadl:doc>
             </param>
             <param xmlns="http://wadl.dev.java.net/2009/02"
              name="action" style="plain" required="true">
@@ -2234,18 +2245,19 @@
                   href="samples/deployment-update-request.json"/>
             </wadl:doc>
             <param xmlns="http://wadl.dev.java.net/2009/02"
-             name="config_id" style="plain" required="true">
-            <wadl:doc xmlns="http://docbook.org/ns/docbook"
-               xmlns:wadl="http://wadl.dev.java.net/2009/02"
-               xml:lang="EN">
-               <para>
-                  ID of the software configuration resource to run when
-                  applying to the server. This ID might not be the same
-                  configuration ID with which the deployment was created
-                  because ephemeral configurations are created throughout the
-                  life cycle of the deployment.
-               </para>
-            </wadl:doc>
+               name="config_id" style="plain" required="true"
+               type="csapi:UUID">
+               <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 software configuration resource to run
+                     when applying to the server. This UUID might not be the
+                     same configuration UUID with which the deployment was
+                     created because ephemeral configurations are created
+                     throughout the life cycle of the deployment.
+                  </para>
+               </wadl:doc>
             </param>
             <param xmlns="http://wadl.dev.java.net/2009/02"
              name="action" style="plain" required="true">