diff --git a/api-ref/src/wadls/orchestration-api/src/v1/common.ent b/api-ref/src/wadls/orchestration-api/src/v1/common.ent
index 7b433d48b..6eb19ea45 100644
--- a/api-ref/src/wadls/orchestration-api/src/v1/common.ent
+++ b/api-ref/src/wadls/orchestration-api/src/v1/common.ent
@@ -106,13 +106,19 @@
       provider template functionality use this mapping. When you want to
       use a provider template, for example, the Orchestration service
       adds an entry to the <code>files</code> map by using:
-   <itemizedlist>
-   <listitem><para>The URL
-      of the provider template as the name.</para></listitem>
-   <listitem><para>The contents of that file as
-      the value.</para></listitem>
-   </itemizedlist>
    </para>
+   <itemizedlist>
+   <listitem>
+      <para>
+         The URL of the provider template as the name.
+      </para>
+   </listitem>
+   <listitem>
+      <para>
+         The contents of that file as the value.
+      </para>
+   </listitem>
+   </itemizedlist>
    <para>
       Additionally, some template authors encode their user data in a local
       file. The Orchestration client examines the template for the
@@ -145,7 +151,8 @@
 </wadl:doc>
 </param>'>
 <!ENTITY sortKeys '
-   <param xmlns="http://wadl.dev.java.net/2009/02" name="sort_keys" style="query" required="false">
+<param xmlns="http://wadl.dev.java.net/2009/02"
+   name="sort_keys" style="query" required="false">
 <wadl:doc xmlns="http://docbook.org/ns/docbook"
    xmlns:wadl="http://wadl.dev.java.net/2009/02"
    xml:lang="EN">
@@ -167,7 +174,8 @@
 </wadl:doc>
 </param> '>
 <!ENTITY templateUrlParameter '
-<param xmlns="http://wadl.dev.java.net/2009/02" name="template_url" style="plain" required="false">
+<param xmlns="http://wadl.dev.java.net/2009/02"
+   name="template_url" style="plain" required="false">
 <wadl:doc xmlns="http://docbook.org/ns/docbook"
    xmlns:wadl="http://wadl.dev.java.net/2009/02"
    xml:lang="EN">
@@ -254,13 +262,15 @@
 </wadl:doc>
 </param> '>
 <!ENTITY paramNameNParameterOptional '
-<param xmlns="http://wadl.dev.java.net/2009/02" name="param_name-n" style="plain" required="false">
-<wadl:doc xmlns="http://docbook.org/ns/docbook" xmlns:wadl="http://wadl.dev.java.net/2009/02"
-   xml:lang="EN">
-   <para>
-      User-defined parameter names to pass to the template.
-   </para>
-</wadl:doc>
+<param xmlns="http://wadl.dev.java.net/2009/02"
+   name="param_name-n" style="plain" required="false">
+   <wadl:doc xmlns="http://docbook.org/ns/docbook"
+      xmlns:wadl="http://wadl.dev.java.net/2009/02"
+      xml:lang="EN">
+      <para>
+         User-defined parameter names to pass to the template.
+      </para>
+   </wadl:doc>
 </param> '>
 <!ENTITY paramValueNParameter '
 <param xmlns="http://wadl.dev.java.net/2009/02" name="param_value-n" style="plain" required="true">
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 4e7d90708..05800cf4b 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
@@ -18,7 +18,7 @@
    <resources base="https://heat.example.com/"
       xml:id="orchestration-api-v1.0">
       <resource id="versions" path="//">
-         <method href="#getVersions-heat-v1"/>
+         <method href="#listVersions-heat-v1"/>
       </resource>
       <resource id="version" path="//v1">
          <resource id="tenant_id" path="{tenant_id}">
@@ -292,7 +292,7 @@
          </resource>
       </resource>
    </resources>
-   <method name="GET" id="getVersions-heat-v1">
+   <method name="GET" id="listVersions-heat-v1">
       <wadl:doc xml:lang="EN" title="List versions" xmlns:wadl="http://wadl.dev.java.net/2009/02"
          xmlns="http://docbook.org/ns/docbook">
          <para role="shortdesc">
@@ -304,7 +304,7 @@
             <wadl:doc xmlns="http://docbook.org/ns/docbook" xmlns:wadl="http://wadl.dev.java.net/2009/02"
                xml:lang="EN">
                <xsdxt:code
-                  href="samples/heat-versions-resp.json"/>
+                  href="samples/heat-versions-response.json"/>
             </wadl:doc>
          </representation>
       </response>
@@ -485,7 +485,7 @@
          <representation mediaType="application/json">
             <wadl:doc xmlns="http://docbook.org/ns/docbook" xmlns:wadl="http://wadl.dev.java.net/2009/02"
                xml:lang="EN">
-               <xsdxt:code href="samples/stack-list-resp.json"/>
+               <xsdxt:code href="samples/stacks-list-response.json"/>
             </wadl:doc>
          </representation>
       </response>
@@ -504,7 +504,7 @@
          <representation mediaType="application/json">
             <wadl:doc xmlns="http://docbook.org/ns/docbook" xmlns:wadl="http://wadl.dev.java.net/2009/02"
                xml:lang="EN">
-               <xsdxt:code href="samples/stack-create-req.json"/>
+               <xsdxt:code href="samples/stack-create-request.json"/>
             </wadl:doc>
             <param xmlns="http://wadl.dev.java.net/2009/02" name="stack_name" style="plain" required="true">
             <wadl:doc xmlns="http://docbook.org/ns/docbook" xmlns:wadl="http://wadl.dev.java.net/2009/02"
@@ -545,7 +545,7 @@
          <representation mediaType="application/json">
             <wadl:doc xmlns="http://docbook.org/ns/docbook" xmlns:wadl="http://wadl.dev.java.net/2009/02"
                xml:lang="EN">
-               <xsdxt:code href="samples/stack-create-resp.json"
+               <xsdxt:code href="samples/stack-create-response.json"
                   />
             </wadl:doc>
             <param xmlns="http://wadl.dev.java.net/2009/02" name="stack_name" style="plain" required="true">
@@ -653,7 +653,7 @@
          <representation mediaType="application/json">
             <wadl:doc xmlns="http://docbook.org/ns/docbook" xmlns:wadl="http://wadl.dev.java.net/2009/02"
                xml:lang="EN">
-               <xsdxt:code href="samples/stack-create-req.json"/>
+               <xsdxt:code href="samples/stack-create-request.json"/>
             </wadl:doc>
             <param xmlns="http://wadl.dev.java.net/2009/02" name="stack_name" style="plain" required="true">
             <wadl:doc xmlns="http://docbook.org/ns/docbook" xmlns:wadl="http://wadl.dev.java.net/2009/02"
@@ -687,7 +687,7 @@
             <wadl:doc xmlns="http://docbook.org/ns/docbook"
                xmlns:wadl="http://wadl.dev.java.net/2009/02"
                xml:lang="EN">
-               <xsdxt:code href="samples/stack-preview-resp.json"/>
+               <xsdxt:code href="samples/stack-preview-response.json"/>
             </wadl:doc>
             <param xmlns="http://wadl.dev.java.net/2009/02" name="parent" style="plain" required="true">
             <wadl:doc xmlns="http://docbook.org/ns/docbook"
@@ -826,7 +826,7 @@
          <representation mediaType="application/json">
             <wadl:doc xmlns="http://docbook.org/ns/docbook"
                xml:lang="EN">
-               <xsdxt:code href="samples/stack-adopt-req.json"/>
+               <xsdxt:code href="samples/stack-adopt-request.json"/>
             </wadl:doc>
             <param xmlns="http://wadl.dev.java.net/2009/02" name="stack_name" style="plain" required="true">
             <wadl:doc xmlns="http://docbook.org/ns/docbook"
@@ -893,7 +893,7 @@
          <representation mediaType="application/json">
             <wadl:doc xmlns="http://docbook.org/ns/docbook"
                xml:lang="EN">
-               <xsdxt:code href="samples/stack-adopt-resp.json"/>
+               <xsdxt:code href="samples/stack-adopt-response.json"/>
             </wadl:doc>
          </representation>
       </response>
@@ -914,7 +914,7 @@
             <wadl:doc xmlns="http://docbook.org/ns/docbook"
                xml:lang="EN">
                <xsdxt:code
-                  href="samples/stack-action-suspend-req.json"/>
+                  href="samples/stack-action-suspend-request.json"/>
             </wadl:doc>
             <param xmlns="http://wadl.dev.java.net/2009/02" name="suspend" style="plain" required="true">
             <wadl:doc xmlns="http://docbook.org/ns/docbook"
@@ -941,7 +941,7 @@
                xmlns:wadl="http://wadl.dev.java.net/2009/02"
                xml:lang="EN">
                <xsdxt:code
-                  href="samples/stack-action-resume-req.json"/>
+                  href="samples/stack-action-resume-request.json"/>
             </wadl:doc>
             <param xmlns="http://wadl.dev.java.net/2009/02" name="resume" style="plain" required="true">
             <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
@@ -967,7 +967,7 @@
             <wadl:doc xmlns="http://docbook.org/ns/docbook"
                xml:lang="EN">
                <xsdxt:code
-                  href="samples/stack-action-cancel-update-req.json"/>
+                  href="samples/stack-action-cancel-update-request.json"/>
             </wadl:doc>
             <param xmlns="http://wadl.dev.java.net/2009/02" name="cancel_update" style="plain" required="true">
             <wadl:doc xmlns="http://docbook.org/ns/docbook"
@@ -995,7 +995,7 @@
                xmlns:wadl="http://wadl.dev.java.net/2009/02"
                xml:lang="EN">
                <xsdxt:code
-                  href="samples/stack-action-check-req.json"/>
+                  href="samples/stack-action-check-request.json"/>
             </wadl:doc>
             <param xmlns="http://wadl.dev.java.net/2009/02" name="check" style="plain" required="true">
             <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
@@ -1029,7 +1029,7 @@
          <representation mediaType="application/json">
             <wadl:doc xmlns="http://docbook.org/ns/docbook"
                xml:lang="EN">
-               <xsdxt:code href="samples/stack-find-resp.json"/>
+               <xsdxt:code href="samples/stack-find-response.json"/>
             </wadl:doc>
          </representation>
       </response>
@@ -1049,7 +1049,7 @@
          <representation mediaType="application/json">
             <wadl:doc xmlns="http://docbook.org/ns/docbook"
                xml:lang="EN">
-               <xsdxt:code href="samples/stack-show-resp.json"/>
+               <xsdxt:code href="samples/stack-show-response.json"/>
             </wadl:doc>
             &stackResponseParameters;
          </representation>
@@ -1072,7 +1072,7 @@
             <para xmlns="http://docbook.org/ns/docbook">
                Returns the template for a stack.
             </para>
-            <xsdxt:code href="samples/template-show-resp.json"/>
+            <xsdxt:code href="samples/template-show-response.json"/>
           </wadl:doc>
           &templateResponseParameters;
         </representation>
@@ -1093,7 +1093,7 @@
             <wadl:doc xmlns="http://docbook.org/ns/docbook"
                xmlns:wadl="http://wadl.dev.java.net/2009/02"
                xml:lang="EN">
-               <xsdxt:code href="samples/stack-update-req.json"/>
+               <xsdxt:code href="samples/stack-update-request.json"/>
             </wadl:doc>
             &templateUrlParameter;
             &templateParameter;
@@ -1171,7 +1171,7 @@
             <wadl:doc xmlns="http://docbook.org/ns/docbook"
                xmlns:wadl="http://wadl.dev.java.net/2009/02"
                xml:lang="EN">
-               <xsdxt:code href="samples/stack-update-req.json"/>
+               <xsdxt:code href="samples/stack-update-request.json"/>
             </wadl:doc>
             &templateUrlParameter;
             &templateParameter;
@@ -1236,7 +1236,7 @@
            <representation mediaType="application/json">
                <wadl:doc xmlns="http://docbook.org/ns/docbook"
                    xml:lang="EN">
-                   <xsdxt:code href="samples/stack-update-preview-resp.json"/>
+                   <xsdxt:code href="samples/stack-update-preview-response.json"/>
                </wadl:doc>
            </representation>
        </response>
@@ -1270,7 +1270,7 @@
          <representation mediaType="application/json">
             <wadl:doc xmlns="http://docbook.org/ns/docbook"
                xml:lang="EN">
-               <xsdxt:code href="samples/stack-abandon-resp.json"/>
+               <xsdxt:code href="samples/stack-abandon-response.json"/>
             </wadl:doc>
          </representation>
       </response>
@@ -1291,7 +1291,7 @@
          <representation mediaType="application/json">
             <wadl:doc xmlns="http://docbook.org/ns/docbook"
                xml:lang="EN">
-               <xsdxt:code href="samples/stack-snapshot-req.json"/>
+               <xsdxt:code href="samples/stack-snapshot-request.json"/>
             </wadl:doc>
             <param xmlns="http://wadl.dev.java.net/2009/02" name="name" style="plain"
                required="true">
@@ -1309,7 +1309,7 @@
          <representation mediaType="application/json">
             <wadl:doc xmlns="http://docbook.org/ns/docbook"
                xml:lang="EN">
-               <xsdxt:code href="samples/stack-snapshot-resp.json"/>
+               <xsdxt:code href="samples/stack-snapshot-response.json"/>
             </wadl:doc>
          </representation>
       </response>
@@ -1326,7 +1326,7 @@
          <representation mediaType="application/json">
             <wadl:doc xmlns="http://docbook.org/ns/docbook"
                xml:lang="EN">
-               <xsdxt:code href="samples/stack-list-snapshot-resp.json"/>
+               <xsdxt:code href="samples/stack-snapshots-list-response.json"/>
             </wadl:doc>
             &snapshotsParameter;
             &snapshotcommonParameters;
@@ -1345,7 +1345,7 @@
          <representation mediaType="application/json">
             <wadl:doc xmlns="http://docbook.org/ns/docbook"
                xml:lang="EN">
-               <xsdxt:code href="samples/stack-show-snapshot-resp.json"/>
+               <xsdxt:code href="samples/stack-show-snapshot-response.json"/>
             </wadl:doc>
             &snapshotResponseParameters;
             &snapshotcommonParameters;
@@ -1387,7 +1387,7 @@
          <representation mediaType="application/json">
          <wadl:doc xmlns="http://docbook.org/ns/docbook"
                xml:lang="EN">
-               <xsdxt:code href="samples/stack-list-outputs-resp.json"/>
+               <xsdxt:code href="samples/stack-outputs-list-response.json"/>
             </wadl:doc>
          </representation>
       </response>
@@ -1404,7 +1404,7 @@
          <representation mediaType="application/json">
             <wadl:doc xmlns="http://docbook.org/ns/docbook"
                xml:lang="EN">
-               <xsdxt:code href="samples/stack-show-output-resp.json"/>
+               <xsdxt:code href="samples/stack-show-output-response.json"/>
             </wadl:doc>
          </representation>
       </response>
@@ -1421,7 +1421,7 @@
          <representation mediaType="application/json">
             <wadl:doc xmlns="http://docbook.org/ns/docbook"
                xml:lang="EN">
-               <xsdxt:code href="samples/template-validate-req.json"
+               <xsdxt:code href="samples/template-validate-request.json"
                   />
             </wadl:doc>
             &templateUrlParameter;
@@ -1434,7 +1434,7 @@
             <wadl:doc xmlns="http://docbook.org/ns/docbook"
                xmlns:wadl="http://wadl.dev.java.net/2009/02"
                xml:lang="EN">
-               <xsdxt:code href="samples/template-validate-resp.json"/>
+               <xsdxt:code href="samples/template-validate-response.json"/>
             </wadl:doc>
             <param xmlns="http://wadl.dev.java.net/2009/02"
              name="Description" style="plain" required="true">
@@ -1540,7 +1540,7 @@
       <response status="200">
          <representation mediaType="application/json">
            <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-             <xsdxt:code href="samples/resource-type-list-resp.json"/>
+             <xsdxt:code href="samples/resource-types-list-response.json"/>
            </wadl:doc>
          </representation>
       </response>
@@ -1564,7 +1564,7 @@
             <wadl:doc xmlns="http://docbook.org/ns/docbook"
                xmlns:wadl="http://wadl.dev.java.net/2009/02"
                xml:lang="EN">
-               <xsdxt:code href="samples/resource-schema-resp.json"/>
+               <xsdxt:code href="samples/resource-schema-response.json"/>
             </wadl:doc>
             &templateResponseParameters;
          </representation>
@@ -1597,7 +1597,7 @@
       <response status="200">
         <representation mediaType="application/json" >
           <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
-            <xsdxt:code href="samples/resource-type-template-resp.json"/>
+            <xsdxt:code href="samples/resource-type-template-response.json"/>
           </wadl:doc>
         </representation>
       </response>
@@ -1667,7 +1667,7 @@
             <para xmlns="http://docbook.org/ns/docbook">
                Lists resources in a stack, in JSON format.
             </para>
-            <xsdxt:code href="samples/resource-list-resp.json"/>
+            <xsdxt:code href="samples/resources-list-response.json"/>
           </wadl:doc>
           &resourcesParameter;
           &stackresourceResponseParameters;
@@ -1689,7 +1689,7 @@
             <para xmlns="http://docbook.org/ns/docbook">
                Shows resource data for a resource, in JSON format.
             </para>
-            <xsdxt:code href="samples/resource-show-resp.json"/>
+            <xsdxt:code href="samples/resource-show-response.json"/>
           </wadl:doc>
           &stackresourceResponseParameters;
         </representation>
@@ -1709,7 +1709,7 @@
          <representation mediaType="application/json">
             <wadl:doc xmlns="http://docbook.org/ns/docbook"
                xml:lang="EN">
-               <xsdxt:code href="samples/resource-metadata-resp.json"/>
+               <xsdxt:code href="samples/resource-metadata-response.json"/>
             </wadl:doc>
          </representation>
       </response>
@@ -1816,7 +1816,7 @@
          <representation mediaType="application/json">
             <wadl:doc xmlns="http://docbook.org/ns/docbook"
                xml:lang="EN">
-               <xsdxt:code href="samples/event-list-resp.json"/>
+               <xsdxt:code href="samples/events-list-response.json"/>
             </wadl:doc>
          </representation>
       </response>
@@ -1888,7 +1888,7 @@
          <representation mediaType="application/json">
             <wadl:doc xmlns="http://docbook.org/ns/docbook"
                xml:lang="EN">
-               <xsdxt:code href="samples/event-list-resp.json"/>
+               <xsdxt:code href="samples/events-list-response.json"/>
             </wadl:doc>
          </representation>
       </response>
@@ -1902,7 +1902,7 @@
          <para role="shortdesc">
             Shows details for an event.
          </para>
-         <xsdxt:code href="samples/event-show-resp.json"/>
+         <xsdxt:code href="samples/event-show-response.json"/>
       </wadl:doc>
       <response status="200">
          <representation mediaType="application/json"/>
@@ -1920,7 +1920,7 @@
             <wadl:doc xmlns="http://docbook.org/ns/docbook"
                xmlns:wadl="http://wadl.dev.java.net/2009/02"
                xml:lang="EN">
-               <xsdxt:code href="samples/build-info-resp.json"/>
+               <xsdxt:code href="samples/build-info-response.json"/>
             </wadl:doc>
          </representation>
       </response>
@@ -1937,7 +1937,7 @@
             <wadl:doc xmlns="http://docbook.org/ns/docbook"
                xmlns:wadl="http://wadl.dev.java.net/2009/02"
                xml:lang="EN">
-               <xsdxt:code href="samples/config-create-req.json"
+               <xsdxt:code href="samples/config-create-request.json"
                   />
             </wadl:doc>
             <param xmlns="http://wadl.dev.java.net/2009/02"
@@ -2009,7 +2009,7 @@
          <representation mediaType="application/json">
             <wadl:doc xmlns="http://docbook.org/ns/docbook"
                xml:lang="EN">
-               <xsdxt:code href="samples/config-create-resp.json"
+               <xsdxt:code href="samples/config-create-response.json"
                   />
             </wadl:doc>
             &softwareconfigResponseParameters;
@@ -2030,7 +2030,7 @@
          <representation mediaType="application/json">
             <wadl:doc xmlns="http://docbook.org/ns/docbook"
                xml:lang="EN">
-               <xsdxt:code href="samples/config-show-resp.json"/>
+               <xsdxt:code href="samples/config-show-response.json"/>
             </wadl:doc>
             &softwareconfigResponseParameters;
          </representation>
@@ -2060,7 +2060,7 @@
             <wadl:doc xmlns="http://docbook.org/ns/docbook"
                xmlns:wadl="http://wadl.dev.java.net/2009/02"
                xml:lang="EN">
-               <xsdxt:code href="samples/deployment-list-resp.json"/>
+               <xsdxt:code href="samples/deployments-list-response.json"/>
             </wadl:doc>
             &softwaredeploymentResponseParameters;
          </representation>
@@ -2086,7 +2086,7 @@
                xmlns:wadl="http://wadl.dev.java.net/2009/02"
                xml:lang="EN">
                <xsdxt:code
-                  href="samples/deployment-metadata-resp.json"/>
+                  href="samples/deployment-metadata-response.json"/>
             </wadl:doc>
          </representation>
       </response>
@@ -2104,7 +2104,7 @@
                xmlns:wadl="http://wadl.dev.java.net/2009/02"
                xml:lang="EN">
                <xsdxt:code
-                  href="samples/deployment-create-req.json"/>
+                  href="samples/deployment-create-request.json"/>
             </wadl:doc>
             <param xmlns="http://wadl.dev.java.net/2009/02"
              name="config_id" style="plain" required="true">
@@ -2179,7 +2179,7 @@
             <wadl:doc xmlns="http://docbook.org/ns/docbook"
                xml:lang="EN">
                <xsdxt:code
-                  href="samples/deployment-create-resp.json"/>
+                  href="samples/deployment-create-response.json"/>
             </wadl:doc>
             &softwaredeploymentResponseParameters;
          </representation>
@@ -2197,7 +2197,7 @@
          <representation mediaType="application/json">
             <wadl:doc xmlns="http://docbook.org/ns/docbook"
                xml:lang="EN">
-               <xsdxt:code href="samples/deployment-show-resp.json"/>
+               <xsdxt:code href="samples/deployment-show-response.json"/>
             </wadl:doc>
             &softwaredeploymentResponseParameters;
          </representation>
@@ -2216,7 +2216,7 @@
             <wadl:doc xmlns="http://docbook.org/ns/docbook"
                xml:lang="EN">
                <xsdxt:code
-                  href="samples/deployment-update-req.json"/>
+                  href="samples/deployment-update-request.json"/>
             </wadl:doc>
             <param xmlns="http://wadl.dev.java.net/2009/02"
              name="config_id" style="plain" required="true">
@@ -2284,7 +2284,7 @@
             <wadl:doc xmlns="http://docbook.org/ns/docbook"
                xml:lang="EN">
                <xsdxt:code
-                  href="samples/deployment-update-resp.json"/>
+                  href="samples/deployment-update-response.json"/>
             </wadl:doc>
             &softwaredeploymentResponseParameters;
          </representation>
@@ -2329,7 +2329,7 @@
             <wadl:doc xmlns="http://docbook.org/ns/docbook"
                xmlns:wadl="http://wadl.dev.java.net/2009/02"
                xml:lang="EN">
-               <xsdxt:code href="samples/service-list-resp.json"/>
+               <xsdxt:code href="samples/services-list-response.json"/>
             </wadl:doc>
          </representation>
       </response>
diff --git a/api-ref/src/wadls/orchestration-api/src/v1/samples/build-info-resp.json b/api-ref/src/wadls/orchestration-api/src/v1/samples/build-info-response.json
similarity index 100%
rename from api-ref/src/wadls/orchestration-api/src/v1/samples/build-info-resp.json
rename to api-ref/src/wadls/orchestration-api/src/v1/samples/build-info-response.json
diff --git a/api-ref/src/wadls/orchestration-api/src/v1/samples/config-create-req.json b/api-ref/src/wadls/orchestration-api/src/v1/samples/config-create-request.json
similarity index 100%
rename from api-ref/src/wadls/orchestration-api/src/v1/samples/config-create-req.json
rename to api-ref/src/wadls/orchestration-api/src/v1/samples/config-create-request.json
diff --git a/api-ref/src/wadls/orchestration-api/src/v1/samples/config-create-resp.json b/api-ref/src/wadls/orchestration-api/src/v1/samples/config-create-response.json
similarity index 100%
rename from api-ref/src/wadls/orchestration-api/src/v1/samples/config-create-resp.json
rename to api-ref/src/wadls/orchestration-api/src/v1/samples/config-create-response.json
diff --git a/api-ref/src/wadls/orchestration-api/src/v1/samples/config-show-resp.json b/api-ref/src/wadls/orchestration-api/src/v1/samples/config-show-response.json
similarity index 100%
rename from api-ref/src/wadls/orchestration-api/src/v1/samples/config-show-resp.json
rename to api-ref/src/wadls/orchestration-api/src/v1/samples/config-show-response.json
diff --git a/api-ref/src/wadls/orchestration-api/src/v1/samples/deployment-create-req.json b/api-ref/src/wadls/orchestration-api/src/v1/samples/deployment-create-request.json
similarity index 100%
rename from api-ref/src/wadls/orchestration-api/src/v1/samples/deployment-create-req.json
rename to api-ref/src/wadls/orchestration-api/src/v1/samples/deployment-create-request.json
diff --git a/api-ref/src/wadls/orchestration-api/src/v1/samples/deployment-create-resp.json b/api-ref/src/wadls/orchestration-api/src/v1/samples/deployment-create-response.json
similarity index 100%
rename from api-ref/src/wadls/orchestration-api/src/v1/samples/deployment-create-resp.json
rename to api-ref/src/wadls/orchestration-api/src/v1/samples/deployment-create-response.json
diff --git a/api-ref/src/wadls/orchestration-api/src/v1/samples/deployment-metadata-resp.json b/api-ref/src/wadls/orchestration-api/src/v1/samples/deployment-metadata-response.json
similarity index 100%
rename from api-ref/src/wadls/orchestration-api/src/v1/samples/deployment-metadata-resp.json
rename to api-ref/src/wadls/orchestration-api/src/v1/samples/deployment-metadata-response.json
diff --git a/api-ref/src/wadls/orchestration-api/src/v1/samples/deployment-show-resp.json b/api-ref/src/wadls/orchestration-api/src/v1/samples/deployment-show-response.json
similarity index 100%
rename from api-ref/src/wadls/orchestration-api/src/v1/samples/deployment-show-resp.json
rename to api-ref/src/wadls/orchestration-api/src/v1/samples/deployment-show-response.json
diff --git a/api-ref/src/wadls/orchestration-api/src/v1/samples/deployment-update-req.json b/api-ref/src/wadls/orchestration-api/src/v1/samples/deployment-update-request.json
similarity index 100%
rename from api-ref/src/wadls/orchestration-api/src/v1/samples/deployment-update-req.json
rename to api-ref/src/wadls/orchestration-api/src/v1/samples/deployment-update-request.json
diff --git a/api-ref/src/wadls/orchestration-api/src/v1/samples/deployment-update-resp.json b/api-ref/src/wadls/orchestration-api/src/v1/samples/deployment-update-response.json
similarity index 100%
rename from api-ref/src/wadls/orchestration-api/src/v1/samples/deployment-update-resp.json
rename to api-ref/src/wadls/orchestration-api/src/v1/samples/deployment-update-response.json
diff --git a/api-ref/src/wadls/orchestration-api/src/v1/samples/deployment-list-resp.json b/api-ref/src/wadls/orchestration-api/src/v1/samples/deployments-list-response.json
similarity index 100%
rename from api-ref/src/wadls/orchestration-api/src/v1/samples/deployment-list-resp.json
rename to api-ref/src/wadls/orchestration-api/src/v1/samples/deployments-list-response.json
diff --git a/api-ref/src/wadls/orchestration-api/src/v1/samples/event-show-resp.json b/api-ref/src/wadls/orchestration-api/src/v1/samples/event-show-response.json
similarity index 100%
rename from api-ref/src/wadls/orchestration-api/src/v1/samples/event-show-resp.json
rename to api-ref/src/wadls/orchestration-api/src/v1/samples/event-show-response.json
diff --git a/api-ref/src/wadls/orchestration-api/src/v1/samples/event-list-resp.json b/api-ref/src/wadls/orchestration-api/src/v1/samples/events-list-response.json
similarity index 100%
rename from api-ref/src/wadls/orchestration-api/src/v1/samples/event-list-resp.json
rename to api-ref/src/wadls/orchestration-api/src/v1/samples/events-list-response.json
diff --git a/api-ref/src/wadls/orchestration-api/src/v1/samples/heat-versions-resp.json b/api-ref/src/wadls/orchestration-api/src/v1/samples/heat-versions-response.json
similarity index 100%
rename from api-ref/src/wadls/orchestration-api/src/v1/samples/heat-versions-resp.json
rename to api-ref/src/wadls/orchestration-api/src/v1/samples/heat-versions-response.json
diff --git a/api-ref/src/wadls/orchestration-api/src/v1/samples/resource-metadata-resp.json b/api-ref/src/wadls/orchestration-api/src/v1/samples/resource-metadata-response.json
similarity index 100%
rename from api-ref/src/wadls/orchestration-api/src/v1/samples/resource-metadata-resp.json
rename to api-ref/src/wadls/orchestration-api/src/v1/samples/resource-metadata-response.json
diff --git a/api-ref/src/wadls/orchestration-api/src/v1/samples/resource-schema-resp.json b/api-ref/src/wadls/orchestration-api/src/v1/samples/resource-schema-response.json
similarity index 100%
rename from api-ref/src/wadls/orchestration-api/src/v1/samples/resource-schema-resp.json
rename to api-ref/src/wadls/orchestration-api/src/v1/samples/resource-schema-response.json
diff --git a/api-ref/src/wadls/orchestration-api/src/v1/samples/resource-show-resp.json b/api-ref/src/wadls/orchestration-api/src/v1/samples/resource-show-response.json
similarity index 100%
rename from api-ref/src/wadls/orchestration-api/src/v1/samples/resource-show-resp.json
rename to api-ref/src/wadls/orchestration-api/src/v1/samples/resource-show-response.json
diff --git a/api-ref/src/wadls/orchestration-api/src/v1/samples/resource-type-template-resp.json b/api-ref/src/wadls/orchestration-api/src/v1/samples/resource-type-template-response.json
similarity index 100%
rename from api-ref/src/wadls/orchestration-api/src/v1/samples/resource-type-template-resp.json
rename to api-ref/src/wadls/orchestration-api/src/v1/samples/resource-type-template-response.json
diff --git a/api-ref/src/wadls/orchestration-api/src/v1/samples/resource-type-list-resp.json b/api-ref/src/wadls/orchestration-api/src/v1/samples/resource-types-list-response.json
similarity index 100%
rename from api-ref/src/wadls/orchestration-api/src/v1/samples/resource-type-list-resp.json
rename to api-ref/src/wadls/orchestration-api/src/v1/samples/resource-types-list-response.json
diff --git a/api-ref/src/wadls/orchestration-api/src/v1/samples/resource-list-resp.json b/api-ref/src/wadls/orchestration-api/src/v1/samples/resources-list-response.json
similarity index 100%
rename from api-ref/src/wadls/orchestration-api/src/v1/samples/resource-list-resp.json
rename to api-ref/src/wadls/orchestration-api/src/v1/samples/resources-list-response.json
diff --git a/api-ref/src/wadls/orchestration-api/src/v1/samples/service-list-resp.json b/api-ref/src/wadls/orchestration-api/src/v1/samples/services-list-response.json
similarity index 100%
rename from api-ref/src/wadls/orchestration-api/src/v1/samples/service-list-resp.json
rename to api-ref/src/wadls/orchestration-api/src/v1/samples/services-list-response.json
diff --git a/api-ref/src/wadls/orchestration-api/src/v1/samples/stack-abandon-resp.json b/api-ref/src/wadls/orchestration-api/src/v1/samples/stack-abandon-response.json
similarity index 100%
rename from api-ref/src/wadls/orchestration-api/src/v1/samples/stack-abandon-resp.json
rename to api-ref/src/wadls/orchestration-api/src/v1/samples/stack-abandon-response.json
diff --git a/api-ref/src/wadls/orchestration-api/src/v1/samples/stack-action-cancel-update-req.json b/api-ref/src/wadls/orchestration-api/src/v1/samples/stack-action-cancel-update-request.json
similarity index 100%
rename from api-ref/src/wadls/orchestration-api/src/v1/samples/stack-action-cancel-update-req.json
rename to api-ref/src/wadls/orchestration-api/src/v1/samples/stack-action-cancel-update-request.json
diff --git a/api-ref/src/wadls/orchestration-api/src/v1/samples/stack-action-check-req.json b/api-ref/src/wadls/orchestration-api/src/v1/samples/stack-action-check-request.json
similarity index 100%
rename from api-ref/src/wadls/orchestration-api/src/v1/samples/stack-action-check-req.json
rename to api-ref/src/wadls/orchestration-api/src/v1/samples/stack-action-check-request.json
diff --git a/api-ref/src/wadls/orchestration-api/src/v1/samples/stack-action-resume-req.json b/api-ref/src/wadls/orchestration-api/src/v1/samples/stack-action-resume-request.json
similarity index 100%
rename from api-ref/src/wadls/orchestration-api/src/v1/samples/stack-action-resume-req.json
rename to api-ref/src/wadls/orchestration-api/src/v1/samples/stack-action-resume-request.json
diff --git a/api-ref/src/wadls/orchestration-api/src/v1/samples/stack-action-suspend-req.json b/api-ref/src/wadls/orchestration-api/src/v1/samples/stack-action-suspend-request.json
similarity index 100%
rename from api-ref/src/wadls/orchestration-api/src/v1/samples/stack-action-suspend-req.json
rename to api-ref/src/wadls/orchestration-api/src/v1/samples/stack-action-suspend-request.json
diff --git a/api-ref/src/wadls/orchestration-api/src/v1/samples/stack-adopt-req.json b/api-ref/src/wadls/orchestration-api/src/v1/samples/stack-adopt-request.json
similarity index 100%
rename from api-ref/src/wadls/orchestration-api/src/v1/samples/stack-adopt-req.json
rename to api-ref/src/wadls/orchestration-api/src/v1/samples/stack-adopt-request.json
diff --git a/api-ref/src/wadls/orchestration-api/src/v1/samples/stack-adopt-resp.json b/api-ref/src/wadls/orchestration-api/src/v1/samples/stack-adopt-response.json
similarity index 100%
rename from api-ref/src/wadls/orchestration-api/src/v1/samples/stack-adopt-resp.json
rename to api-ref/src/wadls/orchestration-api/src/v1/samples/stack-adopt-response.json
diff --git a/api-ref/src/wadls/orchestration-api/src/v1/samples/stack-create-req.json b/api-ref/src/wadls/orchestration-api/src/v1/samples/stack-create-request.json
similarity index 100%
rename from api-ref/src/wadls/orchestration-api/src/v1/samples/stack-create-req.json
rename to api-ref/src/wadls/orchestration-api/src/v1/samples/stack-create-request.json
diff --git a/api-ref/src/wadls/orchestration-api/src/v1/samples/stack-create-resp.json b/api-ref/src/wadls/orchestration-api/src/v1/samples/stack-create-response.json
similarity index 100%
rename from api-ref/src/wadls/orchestration-api/src/v1/samples/stack-create-resp.json
rename to api-ref/src/wadls/orchestration-api/src/v1/samples/stack-create-response.json
diff --git a/api-ref/src/wadls/orchestration-api/src/v1/samples/stack-find-resp.json b/api-ref/src/wadls/orchestration-api/src/v1/samples/stack-find-response.json
similarity index 100%
rename from api-ref/src/wadls/orchestration-api/src/v1/samples/stack-find-resp.json
rename to api-ref/src/wadls/orchestration-api/src/v1/samples/stack-find-response.json
diff --git a/api-ref/src/wadls/orchestration-api/src/v1/samples/stack-list-outputs-resp.json b/api-ref/src/wadls/orchestration-api/src/v1/samples/stack-outputs-list-response.json
similarity index 100%
rename from api-ref/src/wadls/orchestration-api/src/v1/samples/stack-list-outputs-resp.json
rename to api-ref/src/wadls/orchestration-api/src/v1/samples/stack-outputs-list-response.json
diff --git a/api-ref/src/wadls/orchestration-api/src/v1/samples/stack-preview-resp.json b/api-ref/src/wadls/orchestration-api/src/v1/samples/stack-preview-response.json
similarity index 100%
rename from api-ref/src/wadls/orchestration-api/src/v1/samples/stack-preview-resp.json
rename to api-ref/src/wadls/orchestration-api/src/v1/samples/stack-preview-response.json
diff --git a/api-ref/src/wadls/orchestration-api/src/v1/samples/stack-show-output-resp.json b/api-ref/src/wadls/orchestration-api/src/v1/samples/stack-show-output-response.json
similarity index 100%
rename from api-ref/src/wadls/orchestration-api/src/v1/samples/stack-show-output-resp.json
rename to api-ref/src/wadls/orchestration-api/src/v1/samples/stack-show-output-response.json
diff --git a/api-ref/src/wadls/orchestration-api/src/v1/samples/stack-show-resp.json b/api-ref/src/wadls/orchestration-api/src/v1/samples/stack-show-response.json
similarity index 100%
rename from api-ref/src/wadls/orchestration-api/src/v1/samples/stack-show-resp.json
rename to api-ref/src/wadls/orchestration-api/src/v1/samples/stack-show-response.json
diff --git a/api-ref/src/wadls/orchestration-api/src/v1/samples/stack-show-snapshot-resp.json b/api-ref/src/wadls/orchestration-api/src/v1/samples/stack-show-snapshot-response.json
similarity index 100%
rename from api-ref/src/wadls/orchestration-api/src/v1/samples/stack-show-snapshot-resp.json
rename to api-ref/src/wadls/orchestration-api/src/v1/samples/stack-show-snapshot-response.json
diff --git a/api-ref/src/wadls/orchestration-api/src/v1/samples/stack-snapshot-req.json b/api-ref/src/wadls/orchestration-api/src/v1/samples/stack-snapshot-request.json
similarity index 100%
rename from api-ref/src/wadls/orchestration-api/src/v1/samples/stack-snapshot-req.json
rename to api-ref/src/wadls/orchestration-api/src/v1/samples/stack-snapshot-request.json
diff --git a/api-ref/src/wadls/orchestration-api/src/v1/samples/stack-snapshot-resp.json b/api-ref/src/wadls/orchestration-api/src/v1/samples/stack-snapshot-response.json
similarity index 100%
rename from api-ref/src/wadls/orchestration-api/src/v1/samples/stack-snapshot-resp.json
rename to api-ref/src/wadls/orchestration-api/src/v1/samples/stack-snapshot-response.json
diff --git a/api-ref/src/wadls/orchestration-api/src/v1/samples/stack-list-snapshot-resp.json b/api-ref/src/wadls/orchestration-api/src/v1/samples/stack-snapshots-list-response.json
similarity index 100%
rename from api-ref/src/wadls/orchestration-api/src/v1/samples/stack-list-snapshot-resp.json
rename to api-ref/src/wadls/orchestration-api/src/v1/samples/stack-snapshots-list-response.json
diff --git a/api-ref/src/wadls/orchestration-api/src/v1/samples/stack-update-preview-resp.json b/api-ref/src/wadls/orchestration-api/src/v1/samples/stack-update-preview-response.json
similarity index 100%
rename from api-ref/src/wadls/orchestration-api/src/v1/samples/stack-update-preview-resp.json
rename to api-ref/src/wadls/orchestration-api/src/v1/samples/stack-update-preview-response.json
diff --git a/api-ref/src/wadls/orchestration-api/src/v1/samples/stack-update-req.json b/api-ref/src/wadls/orchestration-api/src/v1/samples/stack-update-request.json
similarity index 100%
rename from api-ref/src/wadls/orchestration-api/src/v1/samples/stack-update-req.json
rename to api-ref/src/wadls/orchestration-api/src/v1/samples/stack-update-request.json
diff --git a/api-ref/src/wadls/orchestration-api/src/v1/samples/stack-list-resp.json b/api-ref/src/wadls/orchestration-api/src/v1/samples/stacks-list-response.json
similarity index 100%
rename from api-ref/src/wadls/orchestration-api/src/v1/samples/stack-list-resp.json
rename to api-ref/src/wadls/orchestration-api/src/v1/samples/stacks-list-response.json
diff --git a/api-ref/src/wadls/orchestration-api/src/v1/samples/template-show-resp.json b/api-ref/src/wadls/orchestration-api/src/v1/samples/template-show-response.json
similarity index 100%
rename from api-ref/src/wadls/orchestration-api/src/v1/samples/template-show-resp.json
rename to api-ref/src/wadls/orchestration-api/src/v1/samples/template-show-response.json
diff --git a/api-ref/src/wadls/orchestration-api/src/v1/samples/template-validate-req.json b/api-ref/src/wadls/orchestration-api/src/v1/samples/template-validate-request.json
similarity index 100%
rename from api-ref/src/wadls/orchestration-api/src/v1/samples/template-validate-req.json
rename to api-ref/src/wadls/orchestration-api/src/v1/samples/template-validate-request.json
diff --git a/api-ref/src/wadls/orchestration-api/src/v1/samples/template-validate-resp.json b/api-ref/src/wadls/orchestration-api/src/v1/samples/template-validate-response.json
similarity index 100%
rename from api-ref/src/wadls/orchestration-api/src/v1/samples/template-validate-resp.json
rename to api-ref/src/wadls/orchestration-api/src/v1/samples/template-validate-response.json