diff --git a/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-cells-v2.1.wadl b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-cells-v2.1.wadl
index fa31cedfe..6c3ae428b 100644
--- a/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-cells-v2.1.wadl
+++ b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-cells-v2.1.wadl
@@ -8,7 +8,7 @@
     xmlns:xsd="http://www.w3.org/2001/XMLSchema"
     xmlns:csapi="http://docs.openstack.org/compute/api/v1.1">
     <resources base="https://servers.api.openstack.com"
-        xml:id="os-cell-v2.1">
+        xml:id="os-cells-v2.1">
         <resource id="v2.1" path="//v2.1">
             <resource id="os-cells" path="os-cells">
                 <method href="#listcell"/>
diff --git a/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-certificates-v2.1.wadl b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-certificates-v2.1.wadl
index 8a5d8f6ca..503d66b65 100644
--- a/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-certificates-v2.1.wadl
+++ b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-certificates-v2.1.wadl
@@ -6,7 +6,7 @@
     xmlns:wadl="http://wadl.dev.java.net/2009/02"
     xmlns:xsd="http://docs.rackspacecloud.com/xsd/v1.0"
     xmlns:xsdxt="http://docs.rackspacecloud.com/xsd-ext/v1.0">
-    <resources base="https://servers.api.openstack.com" xml:id="os-certificate-v2.1">
+    <resources base="https://servers.api.openstack.com" xml:id="os-certificates-v2.1">
         <resource id="v2.1" path="//v2.1">
             <resource id="os-certificates" path="os-certificates">
                 <method href="#createcertificate"/>
diff --git a/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-disk-config-v2.1.wadl b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-disk-config-v2.1.wadl
index cf15de323..f6b180d58 100644
--- a/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-disk-config-v2.1.wadl
+++ b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-disk-config-v2.1.wadl
@@ -8,7 +8,7 @@
     xmlns:csapi="http://docs.openstack.org/compute/api/v2"
     xmlns:wadl="http://wadl.dev.java.net/2009/02">
     <resources base="https://servers.api.openstack.com"
-        xml:id="disk-config">
+        xml:id="os-disk-config-v2.1">
         <resource id="version" type="#VersionDetails" path="//v2">
             <resource id="tenant_id" path="{tenant_id}">
                 <param name="tenant_id" style="template"
diff --git a/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-flavor-manage-v2.1.wadl b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-flavor-manage-v2.1.wadl
index 57bab5c6f..30b8c9d21 100644
--- a/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-flavor-manage-v2.1.wadl
+++ b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-flavor-manage-v2.1.wadl
@@ -6,7 +6,7 @@
     xmlns:wadl="http://wadl.dev.java.net/2009/02"
     xmlns:xsd="http://docs.rackspacecloud.com/xsd/v1.0"
     xmlns:xsdxt="http://docs.rackspacecloud.com/xsd-ext/v1.0">
-    <resources base="http://www.example.com" xml:id="flavor-manage-v2.1">
+    <resources base="http://www.example.com" xml:id="os-flavor-manage-v2.1">
         <resource path="//v2.1">
             <resource path="flavors" id="flavors">
                 <method href="#create-flavors"/>
diff --git a/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-flavors-v2.1.wadl b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-flavors-v2.1.wadl
index 3eba53a42..7b5a7b2ac 100644
--- a/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-flavors-v2.1.wadl
+++ b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-flavors-v2.1.wadl
@@ -7,7 +7,7 @@
     xmlns:xsd="http://docs.rackspacecloud.com/xsd/v1.0"
     xmlns:xsdxt="http://docs.rackspacecloud.com/xsd-ext/v1.0">
     <resources base="https://servers.api.openstack.com"
-        xml:id="flavors_v2.1">
+        xml:id="os-flavors-v2.1">
         <resource id="v2.1" path="//v2.1">
             <resource id="flavors" path="flavors">
                 <method href="#getflavorbrief"/>
diff --git a/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-flavorspecs-v2.1.wadl b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-flavorspecs-v2.1.wadl
index 225d9a081..e89da128a 100644
--- a/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-flavorspecs-v2.1.wadl
+++ b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-flavorspecs-v2.1.wadl
@@ -6,7 +6,7 @@
     xmlns:wadl="http://wadl.dev.java.net/2009/02"
     xmlns:xsd="http://docs.rackspacecloud.com/xsd/v1.0"
     xmlns:xsdxt="http://docs.rackspacecloud.com/xsd-ext/v1.0">
-    <resources base="https://servers.api.openstack.com" xml:id="flavorsspecs-v2.1">
+    <resources base="https://servers.api.openstack.com" xml:id="os-flavorsspecs-v2.1">
         <resource id="v2.1" path="//v2.1">
             <resource id="flavors" path="flavors">
                 <resource id="flavor_id" path="{flavor_id}">
diff --git a/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-floating-ips-bulk-v2.1.wadl b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-floating-ips-bulk-v2.1.wadl
index 2602e37d9..4afb17bd7 100644
--- a/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-floating-ips-bulk-v2.1.wadl
+++ b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-floating-ips-bulk-v2.1.wadl
@@ -7,7 +7,7 @@
     xmlns:xsd="http://docs.rackspacecloud.com/xsd/v1.0"
     xmlns:xsdxt="http://docs.rackspacecloud.com/xsd-ext/v1.0">
     <resources base="https://servers.api.openstack.com"
-        xml:id="os-floating-ips-v2.1">
+        xml:id="os-floating-ips-bulk-v2.1">
         <resource id="v2.1" path="//v2.1">
             <resource id="os-floating-ips-bulk"
                 path="os-floating-ips-bulk">
diff --git a/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-limits-v2.1.wadl b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-limits-v2.1.wadl
index 2749eaa87..82475eb8e 100644
--- a/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-limits-v2.1.wadl
+++ b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-limits-v2.1.wadl
@@ -6,7 +6,7 @@
     xmlns:wadl="http://wadl.dev.java.net/2009/02"
     xmlns:xsd="http://docs.rackspacecloud.com/xsd/v1.0"
     xmlns:xsdxt="http://docs.rackspacecloud.com/xsd-ext/v1.0">
-    <resources base="https://servers.api.openstack.com" xml:id="limits-v2.1">
+    <resources base="https://servers.api.openstack.com" xml:id="os-limits-v2.1">
         <resource id="v2.1" path="//v2.1">
             <resource id="limits" path="limits">
                 <method href="#getlimits"/>
diff --git a/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-quota-sets-v2.1.wadl b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-quota-sets-v2.1.wadl
index 5546e603b..45c0e685c 100644
--- a/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-quota-sets-v2.1.wadl
+++ b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-quota-sets-v2.1.wadl
@@ -10,7 +10,7 @@
         xml:id="os-quota-sets-v2.1">
         <resource id="v2.1" path="//v2.1">
             <resource id="os-quota-sets" path="os-quota-sets">
-                <resource id="tenant_id " path="{tenant_id}">
+                <resource id="tenant_id" path="{tenant_id}">
                     <method href="#deletequota"/>
                     <method href="#forceupdatequota"/>
                     <method href="#updatesquotatenant"/>
diff --git a/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-server-diagnostics-v2.1.wadl b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-server-diagnostics-v2.1.wadl
index f3f9323df..361fbf92f 100644
--- a/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-server-diagnostics-v2.1.wadl
+++ b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-server-diagnostics-v2.1.wadl
@@ -7,7 +7,7 @@
     xmlns:xsd="http://docs.rackspacecloud.com/xsd/v1.0"
     xmlns:xsdxt="http://docs.rackspacecloud.com/xsd-ext/v1.0">
     <resources base="https://servers.api.openstack.com"
-        xml:id="os-server-shelve-v2.1">
+        xml:id="os-server-diagnostics-v2.1">
         <resource id="v2.1" path="//v2.1">
             <resource id="Servers" path="servers">
                 <resource path="{server_id}" id="server_id">
diff --git a/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-server-password-v2.1.wadl b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-server-password-v2.1.wadl
index c7c42979e..3cc91a702 100644
--- a/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-server-password-v2.1.wadl
+++ b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-server-password-v2.1.wadl
@@ -7,7 +7,7 @@
     xmlns:xsd="http://docs.rackspacecloud.com/xsd/v1.0"
     xmlns:xsdxt="http://docs.rackspacecloud.com/xsd-ext/v1.0">
     <resources base="https://servers.api.openstack.com"
-        xml:id="os-server-shelve-v2.1">
+        xml:id="os-server-password-v2.1">
         <resource id="v2.1" path="//v2.1">
             <resource id="Servers" path="servers">
                 <resource id="server_id" path="{server_id}">
diff --git a/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-shelve-v2.1.wadl b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-shelve-v2.1.wadl
index 4f55f89bf..5d4ba73a0 100644
--- a/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-shelve-v2.1.wadl
+++ b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-shelve-v2.1.wadl
@@ -7,7 +7,7 @@
     xmlns:xsd="http://docs.rackspacecloud.com/xsd/v1.0"
     xmlns:xsdxt="http://docs.rackspacecloud.com/xsd-ext/v1.0">
     <resources base="https://servers.api.openstack.com"
-        xml:id="os-server-shelve-v2.1">
+        xml:id="os-shelve-v2.1">
         <resource id="v2.1" path="//v2.1">
             <resource id="servers" path="servers">
                 <resource id="server_id" path="{server_id}">
diff --git a/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-used-limits-v2.1.wadl b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-used-limits-v2.1.wadl
index 2283f8364..4cfe4ce53 100644
--- a/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-used-limits-v2.1.wadl
+++ b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-used-limits-v2.1.wadl
@@ -14,7 +14,7 @@
     xmlns:xsd="http://docs.rackspacecloud.com/xsd/v1.0"
     xmlns:xsdxt="http://docs.rackspacecloud.com/xsd-ext/v1.0">
     <resources base="https://servers.api.openstack.com"
-        xml:id="os-simple-tenant-usage-v2.1">
+        xml:id="os-used-limits-v2.1">
         <resource id="v2.1" path="//v2.1">
             <resource id="Limits" path="limits">
                 <method href="#getLimits"/>
diff --git a/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-versions-v2.1.wadl b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-versions-v2.1.wadl
index 2904a1b12..d8fbf5e74 100644
--- a/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-versions-v2.1.wadl
+++ b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-versions-v2.1.wadl
@@ -7,7 +7,7 @@
     xmlns:xsd="http://docs.rackspacecloud.com/xsd/v1.0"
     xmlns:xsdxt="http://docs.rackspacecloud.com/xsd-ext/v1.0">
     <resources base="https://servers.api.openstack.com"
-        xml:id="versions-v2.1">
+        xml:id="os-versions-v2.1">
         <resource id="versions" path="//">
             <method href="#listVersionsv2.1"/>
        </resource>
diff --git a/api-ref/src/wadls/compute-api/src/v2/ext/os-quota-sets.wadl b/api-ref/src/wadls/compute-api/src/v2/ext/os-quota-sets.wadl
index 9c624be23..791dbe6f9 100644
--- a/api-ref/src/wadls/compute-api/src/v2/ext/os-quota-sets.wadl
+++ b/api-ref/src/wadls/compute-api/src/v2/ext/os-quota-sets.wadl
@@ -311,7 +311,7 @@
                         title="cores"><para>A cores
                         object.</para></wadl:doc>
                 </param>
-                <param name="fixed_ips " style="plain" required="true"
+                <param name="fixed_ips" style="plain" required="true"
                     type="xsd:string">
                     <wadl:doc xml:lang="EN"
                         xmlns="http://docbook.org/ns/docbook"
@@ -339,7 +339,7 @@
                             injected_file_content_bytes
                         object.</para></wadl:doc>
                 </param>
-                <param name="injected_file_path_bytes " style="plain"
+                <param name="injected_file_path_bytes" style="plain"
                     required="true" type="xsd:string">
                     <wadl:doc xml:lang="EN"
                         xmlns="http://docbook.org/ns/docbook"
diff --git a/api-ref/src/wadls/volume-api/src/v1/common.ent b/api-ref/src/wadls/volume-api/src/v1/common.ent
index 35d02a7ef..033809128 100644
--- a/api-ref/src/wadls/volume-api/src/v1/common.ent
+++ b/api-ref/src/wadls/volume-api/src/v1/common.ent
@@ -17,7 +17,7 @@
                         <para>The number of instance cores allowed for
                             each tenant.</para></wadl:doc>
                 </param>
-                <param name="fixed_ips " style="plain"
+                <param name="fixed_ips" style="plain"
                     required="false"
                     xmlns="http://wadl.dev.java.net/2009/02"
                     type="xsd:int">
@@ -58,7 +58,7 @@
                         <para>The number of bytes of content allowed
                             for each injected file.</para></wadl:doc>
                 </param>
-                <param name="injected_file_path_bytes " style="plain"
+                <param name="injected_file_path_bytes" style="plain"
                     xmlns="http://wadl.dev.java.net/2009/02"
                     required="false" type="xsd:int">
                     <wadl:doc xmlns="http://docbook.org/ns/docbook"
@@ -147,7 +147,7 @@
                         <para>The number of instance cores allowed for
                             each tenant.</para></wadl:doc>
                 </param>
-                <param name="fixed_ips " style="plain" required="true"
+                <param name="fixed_ips" style="plain" required="true"
                     xmlns="http://wadl.dev.java.net/2009/02"
                     type="xsd:int">
                     <wadl:doc xmlns="http://docbook.org/ns/docbook"
@@ -187,7 +187,7 @@
                         <para>The number of bytes of content allowed
                             for each injected file.</para></wadl:doc>
                 </param>
-                <param name="injected_file_path_bytes " style="plain"
+                <param name="injected_file_path_bytes" style="plain"
                     xmlns="http://wadl.dev.java.net/2009/02"
                     required="true" type="xsd:int">
                     <wadl:doc xmlns="http://docbook.org/ns/docbook"
diff --git a/api-ref/src/wadls/volume-api/src/v1/os-quota-sets.wadl b/api-ref/src/wadls/volume-api/src/v1/os-quota-sets.wadl
index eea14dee9..b53f3e101 100644
--- a/api-ref/src/wadls/volume-api/src/v1/os-quota-sets.wadl
+++ b/api-ref/src/wadls/volume-api/src/v1/os-quota-sets.wadl
@@ -306,7 +306,7 @@
                         title="cores"><para>A cores
                         object.</para></wadl:doc>
                 </param>
-                <param name="fixed_ips " style="plain" required="true"
+                <param name="fixed_ips" style="plain" required="true"
                     type="xsd:string">
                     <wadl:doc xml:lang="EN"
                         xmlns="http://docbook.org/ns/docbook"
@@ -334,7 +334,7 @@
                             injected_file_content_bytes
                         object.</para></wadl:doc>
                 </param>
-                <param name="injected_file_path_bytes " style="plain"
+                <param name="injected_file_path_bytes" style="plain"
                     required="true" type="xsd:string">
                     <wadl:doc xml:lang="EN"
                         xmlns="http://docbook.org/ns/docbook"
diff --git a/api-ref/src/wadls/volume-api/src/v2/os-quota-sets.wadl b/api-ref/src/wadls/volume-api/src/v2/os-quota-sets.wadl
index 3b15e9204..0181789ae 100644
--- a/api-ref/src/wadls/volume-api/src/v2/os-quota-sets.wadl
+++ b/api-ref/src/wadls/volume-api/src/v2/os-quota-sets.wadl
@@ -304,7 +304,7 @@
                         title="cores"><para>A cores
                         object.</para></wadl:doc>
                 </param>
-                <param name="fixed_ips " style="plain" required="true"
+                <param name="fixed_ips" style="plain" required="true"
                     type="xsd:string">
                     <wadl:doc xml:lang="EN"
                         xmlns="http://docbook.org/ns/docbook"
@@ -332,7 +332,7 @@
                             injected_file_content_bytes
                         object.</para></wadl:doc>
                 </param>
-                <param name="injected_file_path_bytes " style="plain"
+                <param name="injected_file_path_bytes" style="plain"
                     required="true" type="xsd:string">
                     <wadl:doc xml:lang="EN"
                         xmlns="http://docbook.org/ns/docbook"