diff --git a/api-ref/src/wadls/object-api/src/os-object-api-1.0.wadl b/api-ref/src/wadls/object-api/src/os-object-api-1.0.wadl
index e7d47bb94..a82ac6abe 100644
--- a/api-ref/src/wadls/object-api/src/os-object-api-1.0.wadl
+++ b/api-ref/src/wadls/object-api/src/os-object-api-1.0.wadl
@@ -83,7 +83,7 @@
         <method href="#showContainerDetails"/>
     </resource_type>
     <resource_type id="ObjectDetails">
-        <method href="#getObject"/>
+        <method href="#showObject"/>
     </resource_type>
     <!--*******************************************************-->
     <!--               All Methods                             -->
@@ -109,7 +109,7 @@
                     xml:lang="EN">
                     <xsdxt:sample>
                         <xsdxt:code
-                            href="samples/info_response.json"
+                            href="samples/capabilities-list-response.json"
                         />
                     </xsdxt:sample>
                 </wadl:doc>
@@ -141,10 +141,10 @@
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
                     xml:lang="EN">
                     <xsdxt:sample>
-                        <xsdxt:code href="samples/endpoint_list_response.json"/>
+                        <xsdxt:code href="samples/endpoints-list-response.json"/>
                     </xsdxt:sample>
                     <xsdxt:sample>
-                        <xsdxt:code href="samples/endpoint_list_response_headers.json"/>
+                        <xsdxt:code href="samples/endpoints-list-response-headers.json"/>
                     </xsdxt:sample>
                 </wadl:doc>
             </representation>
@@ -239,9 +239,9 @@
                     xml:lang="EN"
                     title="List containers response: HTTP and JSON">
                     <xsdxt:code
-                        href="samples/account_containers_list_http_response_json.txt"
+                        href="samples/account-containers-list-http-response-json.txt"
                         /><xsdxt:code
-                        href="samples/account_containers_list_response.json"
+                        href="samples/account-containers-list-response.json"
                     />
                 </wadl:doc>
             </representation>
@@ -250,9 +250,9 @@
                     xml:lang="EN"
                     title="List containers response: HTTP and XML">
                     <xsdxt:code
-                        href="samples/account_containers_list_http_response_xml.txt"/>
+                        href="samples/account-containers-list-http-response-xml.txt"/>
                     <xsdxt:code
-                        href="samples/account_containers_list_response.xml"
+                        href="samples/account-containers-list-response.xml"
                     />
                 </wadl:doc> &content-length-responseHeader-NAMES;
                 &content-type-responseHeader-NAMES;
@@ -285,12 +285,14 @@
                 the existing value.
             </para>
             <para>
-                To delete a metadata header, send an empty value for that header, such as for the
-                <code>X-Account-Meta-Book</code> header. If the tool you use to communicate with
-                Object Storage, such as an older version of cURL, does not support empty headers,
-                send the <code>X-Remove-Account-Meta-{name}</code> header with an arbitrary value.
-                For example, <code>X-Remove-Account-Meta-Book: x</code>. The operation ignores the
-                arbitrary value.
+                To delete a metadata header, send an empty value for that
+                header, such as for the <code>X-Account-Meta-Book</code>
+                header. If the tool you use to communicate with Object
+                Storage, such as an older version of cURL, does not support
+                empty headers, send the <code>X-Remove-Account-Meta-{name}</code>
+                header with an arbitrary value. For
+                example, <code>X-Remove-Account-Meta-Book: x</code>. The
+                operation ignores the arbitrary value.
             </para>
             <para>
                 If the container already has other custom metadata items, a
@@ -492,9 +494,9 @@ Date: Fri, 17 Jan 2014 16:09:56 GMT</programlisting>
                     xml:lang="EN"
                     title="Show container details response: HTTP and JSON">
                     <xsdxt:code
-                        href="samples/object_list_http_response_json.txt"/>
+                        href="samples/objects-list-http-response-json.txt"/>
                     <xsdxt:code
-                        href="samples/object_list_response.json"/>
+                        href="samples/objects-list-response.json"/>
                 </wadl:doc>
             </representation>
             <representation mediaType="application/xml">
@@ -502,9 +504,9 @@ Date: Fri, 17 Jan 2014 16:09:56 GMT</programlisting>
                     xml:lang="EN"
                     title="Show container details response: HTTP and XML">
                     <xsdxt:code
-                        href="samples/object_list_http_response_xml.txt"/>
+                        href="samples/objects-list-http-response-xml.txt"/>
                     <xsdxt:code
-                        href="samples/object_list_response.xml"/>
+                        href="samples/objects-list-response.xml"/>
                 </wadl:doc> &content-length-responseHeader-NAMES;
                 &container-object-count-responseHeader;
                 &accept-ranges-responseHeader;
@@ -785,7 +787,7 @@ Date: Thu, 16 Jan 2014 18:05:31 GMT
     <!--*******************************************************-->
     <!--               Object-level operations                 -->
     <!--*******************************************************-->
-    <method name="GET" id="getObject">
+    <method name="GET" id="showObject">
         <!-- Get object content and metadata -->
         <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN"
             title="Get object content and metadata">
diff --git a/api-ref/src/wadls/object-api/src/samples/account_containers_list_http_request_json.txt b/api-ref/src/wadls/object-api/src/samples/account-containers-list-http-request-json.txt
similarity index 100%
rename from api-ref/src/wadls/object-api/src/samples/account_containers_list_http_request_json.txt
rename to api-ref/src/wadls/object-api/src/samples/account-containers-list-http-request-json.txt
diff --git a/api-ref/src/wadls/object-api/src/samples/account_containers_list_http_request_xml.txt b/api-ref/src/wadls/object-api/src/samples/account-containers-list-http-request-xml.txt
similarity index 100%
rename from api-ref/src/wadls/object-api/src/samples/account_containers_list_http_request_xml.txt
rename to api-ref/src/wadls/object-api/src/samples/account-containers-list-http-request-xml.txt
diff --git a/api-ref/src/wadls/object-api/src/samples/account_containers_list_http_response_json.txt b/api-ref/src/wadls/object-api/src/samples/account-containers-list-http-response-json.txt
similarity index 100%
rename from api-ref/src/wadls/object-api/src/samples/account_containers_list_http_response_json.txt
rename to api-ref/src/wadls/object-api/src/samples/account-containers-list-http-response-json.txt
diff --git a/api-ref/src/wadls/object-api/src/samples/account_containers_list_http_response_xml.txt b/api-ref/src/wadls/object-api/src/samples/account-containers-list-http-response-xml.txt
similarity index 100%
rename from api-ref/src/wadls/object-api/src/samples/account_containers_list_http_response_xml.txt
rename to api-ref/src/wadls/object-api/src/samples/account-containers-list-http-response-xml.txt
diff --git a/api-ref/src/wadls/object-api/src/samples/account_containers_list_response.json b/api-ref/src/wadls/object-api/src/samples/account-containers-list-response.json
similarity index 98%
rename from api-ref/src/wadls/object-api/src/samples/account_containers_list_response.json
rename to api-ref/src/wadls/object-api/src/samples/account-containers-list-response.json
index 87a46c050..4ae34aa4c 100644
--- a/api-ref/src/wadls/object-api/src/samples/account_containers_list_response.json
+++ b/api-ref/src/wadls/object-api/src/samples/account-containers-list-response.json
@@ -9,4 +9,4 @@
         "bytes": 14,
         "name": "marktwain"
     }
-]
\ No newline at end of file
+]
diff --git a/api-ref/src/wadls/object-api/src/samples/account_containers_list_response.xml b/api-ref/src/wadls/object-api/src/samples/account-containers-list-response.xml
similarity index 100%
rename from api-ref/src/wadls/object-api/src/samples/account_containers_list_response.xml
rename to api-ref/src/wadls/object-api/src/samples/account-containers-list-response.xml
diff --git a/api-ref/src/wadls/object-api/src/samples/info_response.json b/api-ref/src/wadls/object-api/src/samples/capabilities-list-response.json
similarity index 100%
rename from api-ref/src/wadls/object-api/src/samples/info_response.json
rename to api-ref/src/wadls/object-api/src/samples/capabilities-list-response.json
diff --git a/api-ref/src/wadls/object-api/src/samples/container_list_http_request.txt b/api-ref/src/wadls/object-api/src/samples/containers-list-http-request.txt
similarity index 100%
rename from api-ref/src/wadls/object-api/src/samples/container_list_http_request.txt
rename to api-ref/src/wadls/object-api/src/samples/containers-list-http-request.txt
diff --git a/api-ref/src/wadls/object-api/src/samples/container_list_http_response.txt b/api-ref/src/wadls/object-api/src/samples/containers-list-http-response.txt
similarity index 100%
rename from api-ref/src/wadls/object-api/src/samples/container_list_http_response.txt
rename to api-ref/src/wadls/object-api/src/samples/containers-list-http-response.txt
diff --git a/api-ref/src/wadls/object-api/src/samples/endpoint_list_response_headers.json b/api-ref/src/wadls/object-api/src/samples/endpoints-list-response-headers.json
similarity index 100%
rename from api-ref/src/wadls/object-api/src/samples/endpoint_list_response_headers.json
rename to api-ref/src/wadls/object-api/src/samples/endpoints-list-response-headers.json
diff --git a/api-ref/src/wadls/object-api/src/samples/endpoint_list_response.json b/api-ref/src/wadls/object-api/src/samples/endpoints-list-response.json
similarity index 100%
rename from api-ref/src/wadls/object-api/src/samples/endpoint_list_response.json
rename to api-ref/src/wadls/object-api/src/samples/endpoints-list-response.json
diff --git a/api-ref/src/wadls/object-api/src/samples/object_list_http_response_json.txt b/api-ref/src/wadls/object-api/src/samples/objects-list-http-response-json.txt
similarity index 100%
rename from api-ref/src/wadls/object-api/src/samples/object_list_http_response_json.txt
rename to api-ref/src/wadls/object-api/src/samples/objects-list-http-response-json.txt
diff --git a/api-ref/src/wadls/object-api/src/samples/object_list_http_response_xml.txt b/api-ref/src/wadls/object-api/src/samples/objects-list-http-response-xml.txt
similarity index 100%
rename from api-ref/src/wadls/object-api/src/samples/object_list_http_response_xml.txt
rename to api-ref/src/wadls/object-api/src/samples/objects-list-http-response-xml.txt
diff --git a/api-ref/src/wadls/object-api/src/samples/object_list_response.json b/api-ref/src/wadls/object-api/src/samples/objects-list-response.json
similarity index 99%
rename from api-ref/src/wadls/object-api/src/samples/object_list_response.json
rename to api-ref/src/wadls/object-api/src/samples/objects-list-response.json
index 5ff27fe15..b104d3a9a 100644
--- a/api-ref/src/wadls/object-api/src/samples/object_list_response.json
+++ b/api-ref/src/wadls/object-api/src/samples/objects-list-response.json
@@ -13,4 +13,4 @@
         "name": "helloworld",
         "content_type": "application/octet-stream"
     }
-]
\ No newline at end of file
+]
diff --git a/api-ref/src/wadls/object-api/src/samples/object_list_response.xml b/api-ref/src/wadls/object-api/src/samples/objects-list-response.xml
similarity index 100%
rename from api-ref/src/wadls/object-api/src/samples/object_list_response.xml
rename to api-ref/src/wadls/object-api/src/samples/objects-list-response.xml