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 1e4aa1e82..aa3be114c 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
@@ -302,7 +302,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-response.json"/>
+                  href="samples/heat-versions-resp.json"/>
             </wadl:doc>
          </representation>
       </response>
@@ -483,7 +483,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/stack-list-resp.json"/>
             </wadl:doc>
          </representation>
       </response>
@@ -502,7 +502,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.json"/>
+               <xsdxt:code href="samples/stack-create-req.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"
@@ -543,7 +543,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-resp.json"
                   />
             </wadl:doc>
             <param xmlns="http://wadl.dev.java.net/2009/02" name="stack_name" style="plain" required="true">
@@ -651,7 +651,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.json"/>
+               <xsdxt:code href="samples/stack-create-req.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"
@@ -685,7 +685,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.json"/>
+               <xsdxt:code href="samples/stack-preview-resp.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"
@@ -824,7 +824,7 @@
          <representation mediaType="application/json">
             <wadl:doc xmlns="http://docbook.org/ns/docbook"
                xml:lang="EN">
-               <xsdxt:code href="samples/stack_adopt.json"/>
+               <xsdxt:code href="samples/stack-adopt-req.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"
@@ -891,7 +891,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-resp.json"/>
             </wadl:doc>
          </representation>
       </response>
@@ -912,7 +912,7 @@
             <wadl:doc xmlns="http://docbook.org/ns/docbook"
                xml:lang="EN">
                <xsdxt:code
-                  href="samples/stack_action_suspend.json"/>
+                  href="samples/stack-action-suspend-req.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"
@@ -939,7 +939,7 @@
                xmlns:wadl="http://wadl.dev.java.net/2009/02"
                xml:lang="EN">
                <xsdxt:code
-                  href="samples/stack_action_resume.json"/>
+                  href="samples/stack-action-resume-req.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">
@@ -965,7 +965,7 @@
             <wadl:doc xmlns="http://docbook.org/ns/docbook"
                xml:lang="EN">
                <xsdxt:code
-                  href="samples/stack_action_cancel_update.json"/>
+                  href="samples/stack-action-cancel-update-req.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"
@@ -993,7 +993,7 @@
                xmlns:wadl="http://wadl.dev.java.net/2009/02"
                xml:lang="EN">
                <xsdxt:code
-                  href="samples/stack_action_check.json"/>
+                  href="samples/stack-action-check-req.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">
@@ -1027,7 +1027,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-resp.json"/>
             </wadl:doc>
          </representation>
       </response>
@@ -1047,7 +1047,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-resp.json"/>
             </wadl:doc>
          </representation>
       </response>
@@ -1069,7 +1069,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-resp.json"/>
           </wadl:doc>
         </representation>
       </response>
@@ -1089,7 +1089,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.json"/>
+               <xsdxt:code href="samples/stack-update-req.json"/>
             </wadl:doc>
             &templateUrlParameter;
             &templateParameter;
@@ -1167,7 +1167,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.json"/>
+               <xsdxt:code href="samples/stack-update-req.json"/>
             </wadl:doc>
             &templateUrlParameter;
             &templateParameter;
@@ -1232,7 +1232,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-resp.json"/>
                </wadl:doc>
            </representation>
        </response>
@@ -1255,14 +1255,18 @@
          title="Abandon stack">
          <para role="shortdesc">
             Deletes a stack but leaves its resources intact, and
-            returns data describing the stack and its resources.
+            returns data that describes the stack and its resources.
+         </para>
+         <para>
+            This method can be disabled from the server side. If it is
+            disabled, this call throws an exception.
          </para>
       </wadl:doc>
       <response status="200">
          <representation mediaType="application/json">
             <wadl:doc xmlns="http://docbook.org/ns/docbook"
                xml:lang="EN">
-               <xsdxt:code href="samples/stack_abandon.json"/>
+               <xsdxt:code href="samples/stack-abandon-resp.json"/>
             </wadl:doc>
          </representation>
       </response>
@@ -1283,7 +1287,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-req.json"/>
             </wadl:doc>
             <param xmlns="http://wadl.dev.java.net/2009/02" name="name" style="plain"
                required="true">
@@ -1301,7 +1305,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-resp.json"/>
             </wadl:doc>
          </representation>
       </response>
@@ -1318,7 +1322,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-list-snapshot-resp.json"/>
             </wadl:doc>
          </representation>
       </response>
@@ -1335,7 +1339,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-resp.json"/>
             </wadl:doc>
          </representation>
       </response>
@@ -1375,7 +1379,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-list-outputs-resp.json"/>
             </wadl:doc>
          </representation>
       </response>
@@ -1392,7 +1396,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-resp.json"/>
             </wadl:doc>
          </representation>
       </response>
@@ -1409,7 +1413,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-req.json"
                   />
             </wadl:doc>
             &templateUrlParameter;
@@ -1422,7 +1426,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-resp.json"/>
             </wadl:doc>
             <param xmlns="http://wadl.dev.java.net/2009/02"
              name="Description" style="plain" required="true">
@@ -1528,7 +1532,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-type-list-resp.json"/>
            </wadl:doc>
          </representation>
       </response>
@@ -1552,7 +1556,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.json"/>
+               <xsdxt:code href="samples/resource-schema-resp.json"/>
             </wadl:doc>
          </representation>
       </response>
@@ -1584,7 +1588,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-resp.json"/>
           </wadl:doc>
         </representation>
       </response>
@@ -1654,7 +1658,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/resource-list-resp.json"/>
           </wadl:doc>
         </representation>
       </response>
@@ -1674,7 +1678,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-resp.json"/>
           </wadl:doc>
         </representation>
       </response>
@@ -1693,7 +1697,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-resp.json"/>
             </wadl:doc>
          </representation>
       </response>
@@ -1800,7 +1804,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/event-list-resp.json"/>
             </wadl:doc>
          </representation>
       </response>
@@ -1872,7 +1876,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/event-list-resp.json"/>
             </wadl:doc>
          </representation>
       </response>
@@ -1886,7 +1890,7 @@
          <para role="shortdesc">
             Shows details for an event.
          </para>
-         <xsdxt:code href="samples/event_show_resp.json"/>
+         <xsdxt:code href="samples/event-show-resp.json"/>
       </wadl:doc>
       <response status="200">
          <representation mediaType="application/json"/>
@@ -1904,7 +1908,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.json"/>
+               <xsdxt:code href="samples/build-info-resp.json"/>
             </wadl:doc>
          </representation>
       </response>
@@ -1921,7 +1925,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-req.json"
                   />
             </wadl:doc>
             <param xmlns="http://wadl.dev.java.net/2009/02"
@@ -1993,7 +1997,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-resp.json"
                   />
             </wadl:doc>
          </representation>
@@ -2013,7 +2017,7 @@
          <representation mediaType="application/json">
             <wadl:doc xmlns="http://docbook.org/ns/docbook"
                xml:lang="EN">
-               <xsdxt:code href="samples/config_show.json"/>
+               <xsdxt:code href="samples/config-show-resp.json"/>
             </wadl:doc>
          </representation>
       </response>
@@ -2042,7 +2046,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.json"/>
+               <xsdxt:code href="samples/deployment-list-resp.json"/>
             </wadl:doc>
          </representation>
       </response>
@@ -2067,7 +2071,7 @@
                xmlns:wadl="http://wadl.dev.java.net/2009/02"
                xml:lang="EN">
                <xsdxt:code
-                  href="samples/deployment_metadata.json"/>
+                  href="samples/deployment-metadata-resp.json"/>
             </wadl:doc>
          </representation>
       </response>
@@ -2085,7 +2089,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-req.json"/>
             </wadl:doc>
             <param xmlns="http://wadl.dev.java.net/2009/02"
              name="config_id" style="plain" required="true">
@@ -2160,7 +2164,7 @@
             <wadl:doc xmlns="http://docbook.org/ns/docbook"
                xml:lang="EN">
                <xsdxt:code
-                  href="samples/deployment_create_resp.json"/>
+                  href="samples/deployment-create-resp.json"/>
             </wadl:doc>
          </representation>
       </response>
@@ -2177,7 +2181,7 @@
          <representation mediaType="application/json">
             <wadl:doc xmlns="http://docbook.org/ns/docbook"
                xml:lang="EN">
-               <xsdxt:code href="samples/deployment_show.json"/>
+               <xsdxt:code href="samples/deployment-show-resp.json"/>
             </wadl:doc>
          </representation>
       </response>
@@ -2195,7 +2199,7 @@
             <wadl:doc xmlns="http://docbook.org/ns/docbook"
                xml:lang="EN">
                <xsdxt:code
-                  href="samples/deployment_update_req.json"/>
+                  href="samples/deployment-update-req.json"/>
             </wadl:doc>
             <param xmlns="http://wadl.dev.java.net/2009/02"
              name="config_id" style="plain" required="true">
@@ -2263,7 +2267,7 @@
             <wadl:doc xmlns="http://docbook.org/ns/docbook"
                xml:lang="EN">
                <xsdxt:code
-                  href="samples/deployment_update_resp.json"/>
+                  href="samples/deployment-update-resp.json"/>
             </wadl:doc>
          </representation>
       </response>
@@ -2307,7 +2311,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.json"/>
+               <xsdxt:code href="samples/service-list-resp.json"/>
             </wadl:doc>
          </representation>
       </response>
diff --git a/api-ref/src/wadls/orchestration-api/src/v1/samples/build_info.json b/api-ref/src/wadls/orchestration-api/src/v1/samples/build-info-resp.json
similarity index 98%
rename from api-ref/src/wadls/orchestration-api/src/v1/samples/build_info.json
rename to api-ref/src/wadls/orchestration-api/src/v1/samples/build-info-resp.json
index b5b469643..650200f88 100644
--- a/api-ref/src/wadls/orchestration-api/src/v1/samples/build_info.json
+++ b/api-ref/src/wadls/orchestration-api/src/v1/samples/build-info-resp.json
@@ -5,4 +5,4 @@
     "engine": {
         "revision": "{engine_build_revision}"
     }
-}
\ No newline at end of file
+}
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-req.json
similarity index 99%
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-req.json
index afca6a641..d9f44241b 100644
--- 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-req.json
@@ -25,4 +25,4 @@
     ],
     "config": "#!/bin/sh -x\necho \"Writing to /tmp/$bar\"\necho $foo > /tmp/$bar\necho -n \"The file /tmp/$bar contains `cat /tmp/$bar` for server $deploy_server_id during $deploy_action\" > $heat_outputs_path.result\necho \"Written to /tmp/$bar\"\necho \"Output to stderr\" 1>&2",
     "options": null
-}
\ No newline at end of file
+}
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-resp.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-resp.json
diff --git a/api-ref/src/wadls/orchestration-api/src/v1/samples/config_show.json b/api-ref/src/wadls/orchestration-api/src/v1/samples/config-show-resp.json
similarity index 100%
rename from api-ref/src/wadls/orchestration-api/src/v1/samples/config_show.json
rename to api-ref/src/wadls/orchestration-api/src/v1/samples/config-show-resp.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-req.json
similarity index 99%
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-req.json
index b82cd7dc4..92ad84069 100644
--- 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-req.json
@@ -5,4 +5,4 @@
     "stack_user_project_id": "c024bfada67845ddb17d2b0c0be8cd79",
     "action": "CREATE",
     "status_reason": "Deploy data available"
-}
\ No newline at end of file
+}
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-resp.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-resp.json
diff --git a/api-ref/src/wadls/orchestration-api/src/v1/samples/deployment_list.json b/api-ref/src/wadls/orchestration-api/src/v1/samples/deployment-list-resp.json
similarity index 100%
rename from api-ref/src/wadls/orchestration-api/src/v1/samples/deployment_list.json
rename to api-ref/src/wadls/orchestration-api/src/v1/samples/deployment-list-resp.json
diff --git a/api-ref/src/wadls/orchestration-api/src/v1/samples/deployment_metadata.json b/api-ref/src/wadls/orchestration-api/src/v1/samples/deployment-metadata-resp.json
similarity index 100%
rename from api-ref/src/wadls/orchestration-api/src/v1/samples/deployment_metadata.json
rename to api-ref/src/wadls/orchestration-api/src/v1/samples/deployment-metadata-resp.json
diff --git a/api-ref/src/wadls/orchestration-api/src/v1/samples/deployment_show.json b/api-ref/src/wadls/orchestration-api/src/v1/samples/deployment-show-resp.json
similarity index 100%
rename from api-ref/src/wadls/orchestration-api/src/v1/samples/deployment_show.json
rename to api-ref/src/wadls/orchestration-api/src/v1/samples/deployment-show-resp.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-req.json
similarity index 99%
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-req.json
index 770c17236..a9877f588 100644
--- 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-req.json
@@ -7,4 +7,4 @@
         "result": "The file /tmp/baaaaa contains fooooo for server ec14c864-096e-4e27-bb8a-2c2b4dc6f3f5 during CREATE"
     },
     "status_reason": "Outputs received"
-}
\ No newline at end of file
+}
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-resp.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-resp.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/event-list-resp.json
new file mode 100644
index 000000000..83d8f88c4
--- /dev/null
+++ b/api-ref/src/wadls/orchestration-api/src/v1/samples/event-list-resp.json
@@ -0,0 +1,50 @@
+{
+    "events": [
+        {
+            "resource_name": "port",
+            "event_time": "2014-07-23T08:14:47Z",
+            "links": [
+                {
+                    "href": "http://192.168.123.200:8004/v1/dc4b074874244f7693dd65583733a758/stacks/aws_port/db467ed1-50b5-4a3e-aeb1-396ff1d151c5/resources/port/events/474bfdf0-a450-46ec-a78a-0c7faa404073",
+                    "rel": "self"
+                },
+                {
+                    "href": "http://192.168.123.200:8004/v1/dc4b074874244f7693dd65583733a758/stacks/aws_port/db467ed1-50b5-4a3e-aeb1-396ff1d151c5/resources/port",
+                    "rel": "resource"
+                },
+                {
+                    "href": "http://192.168.123.200:8004/v1/dc4b074874244f7693dd65583733a758/stacks/aws_port/db467ed1-50b5-4a3e-aeb1-396ff1d151c5",
+                    "rel": "stack"
+                }
+            ],
+            "logical_resource_id": "port",
+            "resource_status": "CREATE_FAILED",
+            "resource_status_reason": "NotFound: Subnet f8a699d0-3537-429e-87a5-6b5a8d0c2bf0 could not be found",
+            "physical_resource_id": null,
+            "id": "474bfdf0-a450-46ec-a78a-0c7faa404073"
+        },
+        {
+            "resource_name": "port",
+            "event_time": "2014-07-23T08:14:47Z",
+            "links": [
+                {
+                    "href": "http://192.168.123.200:8004/v1/dc4b074874244f7693dd65583733a758/stacks/aws_port/db467ed1-50b5-4a3e-aeb1-396ff1d151c5/resources/port/events/66fa95b6-e6f8-4f05-b1af-e828f5aba04c",
+                    "rel": "self"
+                },
+                {
+                    "href": "http://192.168.123.200:8004/v1/dc4b074874244f7693dd65583733a758/stacks/aws_port/db467ed1-50b5-4a3e-aeb1-396ff1d151c5/resources/port",
+                    "rel": "resource"
+                },
+                {
+                    "href": "http://192.168.123.200:8004/v1/dc4b074874244f7693dd65583733a758/stacks/aws_port/db467ed1-50b5-4a3e-aeb1-396ff1d151c5",
+                    "rel": "stack"
+                }
+            ],
+            "logical_resource_id": "port",
+            "resource_status": "CREATE_IN_PROGRESS",
+            "resource_status_reason": "state changed",
+            "physical_resource_id": null,
+            "id": "66fa95b6-e6f8-4f05-b1af-e828f5aba04c"
+        }
+    ]
+}
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-resp.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-resp.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/event_list_resp.json
deleted file mode 100644
index f6682d0bc..000000000
--- a/api-ref/src/wadls/orchestration-api/src/v1/samples/event_list_resp.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-    "events": [
-        {
-            "resource_name": "port",
-            "event_time": "2014-07-23T08:14:47Z",
-            "links": [{
-                "href": "http://192.168.123.200:8004/v1/dc4b074874244f7693dd65583733a758/stacks/aws_port/db467ed1-50b5-4a3e-aeb1-396ff1d151c5/resources/port/events/474bfdf0-a450-46ec-a78a-0c7faa404073",
-                "rel": "self"
-            },
-            {
-                "href": "http://192.168.123.200:8004/v1/dc4b074874244f7693dd65583733a758/stacks/aws_port/db467ed1-50b5-4a3e-aeb1-396ff1d151c5/resources/port",
-                "rel": "resource"
-            },
-            {
-                "href": "http://192.168.123.200:8004/v1/dc4b074874244f7693dd65583733a758/stacks/aws_port/db467ed1-50b5-4a3e-aeb1-396ff1d151c5",
-                "rel": "stack"
-            }],
-            "logical_resource_id": "port",
-            "resource_status": "CREATE_FAILED",
-            "resource_status_reason": "NotFound: Subnet f8a699d0-3537-429e-87a5-6b5a8d0c2bf0 could not be found",
-            "physical_resource_id": null,
-            "id": "474bfdf0-a450-46ec-a78a-0c7faa404073"
-        },
-        {
-            "resource_name": "port",
-            "event_time": "2014-07-23T08:14:47Z",
-            "links": [{
-                "href": "http://192.168.123.200:8004/v1/dc4b074874244f7693dd65583733a758/stacks/aws_port/db467ed1-50b5-4a3e-aeb1-396ff1d151c5/resources/port/events/66fa95b6-e6f8-4f05-b1af-e828f5aba04c",
-                "rel": "self"
-            },
-            {
-                "href": "http://192.168.123.200:8004/v1/dc4b074874244f7693dd65583733a758/stacks/aws_port/db467ed1-50b5-4a3e-aeb1-396ff1d151c5/resources/port",
-                "rel": "resource"
-            },
-            {
-                "href": "http://192.168.123.200:8004/v1/dc4b074874244f7693dd65583733a758/stacks/aws_port/db467ed1-50b5-4a3e-aeb1-396ff1d151c5",
-                "rel": "stack"
-            }],
-            "logical_resource_id": "port",
-            "resource_status": "CREATE_IN_PROGRESS",
-            "resource_status_reason": "state changed",
-            "physical_resource_id": null,
-            "id": "66fa95b6-e6f8-4f05-b1af-e828f5aba04c"
-        }
-    ]
-}
\ No newline at end of file
diff --git a/api-ref/src/wadls/orchestration-api/src/v1/samples/heat-versions-response.json b/api-ref/src/wadls/orchestration-api/src/v1/samples/heat-versions-resp.json
similarity index 99%
rename from api-ref/src/wadls/orchestration-api/src/v1/samples/heat-versions-response.json
rename to api-ref/src/wadls/orchestration-api/src/v1/samples/heat-versions-resp.json
index de5dc9f25..e13cf94f3 100644
--- a/api-ref/src/wadls/orchestration-api/src/v1/samples/heat-versions-response.json
+++ b/api-ref/src/wadls/orchestration-api/src/v1/samples/heat-versions-resp.json
@@ -11,4 +11,4 @@
             ]
         }
     ]
-}
\ No newline at end of file
+}
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/resource-list-resp.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/resource-list-resp.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-resp.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-resp.json
diff --git a/api-ref/src/wadls/orchestration-api/src/v1/samples/resource_schema.json b/api-ref/src/wadls/orchestration-api/src/v1/samples/resource-schema-resp.json
similarity index 100%
rename from api-ref/src/wadls/orchestration-api/src/v1/samples/resource_schema.json
rename to api-ref/src/wadls/orchestration-api/src/v1/samples/resource-schema-resp.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-resp.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-resp.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-type-list-resp.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-type-list-resp.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-resp.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-resp.json
diff --git a/api-ref/src/wadls/orchestration-api/src/v1/samples/service_list.json b/api-ref/src/wadls/orchestration-api/src/v1/samples/service-list-resp.json
similarity index 100%
rename from api-ref/src/wadls/orchestration-api/src/v1/samples/service_list.json
rename to api-ref/src/wadls/orchestration-api/src/v1/samples/service-list-resp.json
diff --git a/api-ref/src/wadls/orchestration-api/src/v1/samples/stack_abandon.json b/api-ref/src/wadls/orchestration-api/src/v1/samples/stack-abandon-resp.json
similarity index 99%
rename from api-ref/src/wadls/orchestration-api/src/v1/samples/stack_abandon.json
rename to api-ref/src/wadls/orchestration-api/src/v1/samples/stack-abandon-resp.json
index 99bd30adc..57bd22da2 100644
--- a/api-ref/src/wadls/orchestration-api/src/v1/samples/stack_abandon.json
+++ b/api-ref/src/wadls/orchestration-api/src/v1/samples/stack-abandon-resp.json
@@ -66,4 +66,4 @@
             "metadata": {}
         }
     }
-}
\ No newline at end of file
+}
diff --git a/api-ref/src/wadls/orchestration-api/src/v1/samples/stack_action_cancel_update.json b/api-ref/src/wadls/orchestration-api/src/v1/samples/stack-action-cancel-update-req.json
similarity index 100%
rename from api-ref/src/wadls/orchestration-api/src/v1/samples/stack_action_cancel_update.json
rename to api-ref/src/wadls/orchestration-api/src/v1/samples/stack-action-cancel-update-req.json
diff --git a/api-ref/src/wadls/orchestration-api/src/v1/samples/stack_action_check.json b/api-ref/src/wadls/orchestration-api/src/v1/samples/stack-action-check-req.json
similarity index 100%
rename from api-ref/src/wadls/orchestration-api/src/v1/samples/stack_action_check.json
rename to api-ref/src/wadls/orchestration-api/src/v1/samples/stack-action-check-req.json
diff --git a/api-ref/src/wadls/orchestration-api/src/v1/samples/stack_action_resume.json b/api-ref/src/wadls/orchestration-api/src/v1/samples/stack-action-resume-req.json
similarity index 91%
rename from api-ref/src/wadls/orchestration-api/src/v1/samples/stack_action_resume.json
rename to api-ref/src/wadls/orchestration-api/src/v1/samples/stack-action-resume-req.json
index 008ff18c7..ff00d97a1 100644
--- a/api-ref/src/wadls/orchestration-api/src/v1/samples/stack_action_resume.json
+++ b/api-ref/src/wadls/orchestration-api/src/v1/samples/stack-action-resume-req.json
@@ -1,3 +1,3 @@
 {
     "resume": null
-}
\ No newline at end of file
+}
diff --git a/api-ref/src/wadls/orchestration-api/src/v1/samples/stack_action_suspend.json b/api-ref/src/wadls/orchestration-api/src/v1/samples/stack-action-suspend-req.json
similarity index 91%
rename from api-ref/src/wadls/orchestration-api/src/v1/samples/stack_action_suspend.json
rename to api-ref/src/wadls/orchestration-api/src/v1/samples/stack-action-suspend-req.json
index 7bee70205..8c2206a06 100644
--- a/api-ref/src/wadls/orchestration-api/src/v1/samples/stack_action_suspend.json
+++ b/api-ref/src/wadls/orchestration-api/src/v1/samples/stack-action-suspend-req.json
@@ -1,3 +1,3 @@
 {
     "suspend": null
-}
\ No newline at end of file
+}
diff --git a/api-ref/src/wadls/orchestration-api/src/v1/samples/stack_adopt.json b/api-ref/src/wadls/orchestration-api/src/v1/samples/stack-adopt-req.json
similarity index 100%
rename from api-ref/src/wadls/orchestration-api/src/v1/samples/stack_adopt.json
rename to api-ref/src/wadls/orchestration-api/src/v1/samples/stack-adopt-req.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-resp.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-resp.json
diff --git a/api-ref/src/wadls/orchestration-api/src/v1/samples/stack_create.json b/api-ref/src/wadls/orchestration-api/src/v1/samples/stack-create-req.json
similarity index 100%
rename from api-ref/src/wadls/orchestration-api/src/v1/samples/stack_create.json
rename to api-ref/src/wadls/orchestration-api/src/v1/samples/stack-create-req.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-resp.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-resp.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-resp.json
similarity index 99%
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-resp.json
index 113ea88da..06b05c5c5 100644
--- 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-resp.json
@@ -24,4 +24,4 @@
         "timeout_mins": null,
         "updated_time": null
     }
-}
\ No newline at end of file
+}
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-list-outputs-resp.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-list-outputs-resp.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/stack-list-resp.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/stack-list-resp.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-list-snapshot-resp.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-list-snapshot-resp.json
diff --git a/api-ref/src/wadls/orchestration-api/src/v1/samples/stack_preview.json b/api-ref/src/wadls/orchestration-api/src/v1/samples/stack-preview-resp.json
similarity index 100%
rename from api-ref/src/wadls/orchestration-api/src/v1/samples/stack_preview.json
rename to api-ref/src/wadls/orchestration-api/src/v1/samples/stack-preview-resp.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-resp.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-resp.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-resp.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-resp.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-resp.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-resp.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-req.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-req.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-resp.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-resp.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-resp.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-resp.json
diff --git a/api-ref/src/wadls/orchestration-api/src/v1/samples/stack_update.json b/api-ref/src/wadls/orchestration-api/src/v1/samples/stack-update-req.json
similarity index 100%
rename from api-ref/src/wadls/orchestration-api/src/v1/samples/stack_update.json
rename to api-ref/src/wadls/orchestration-api/src/v1/samples/stack-update-req.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-resp.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-resp.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-req.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-req.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-resp.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-resp.json