diff --git a/v2.0/src/ch_identity-service-api.xml b/v2.0/src/ch_identity-service-api.xml
index ac1ece03..cbaff331 100644
--- a/v2.0/src/ch_identity-service-api.xml
+++ b/v2.0/src/ch_identity-service-api.xml
@@ -5,11 +5,6 @@
 <!ENTITY mdash  "&#x2014;">
 <!ENTITY hellip "&#x2026;">
 <!ENTITY plusmn "&#xB1;">
-<!-- Useful for describing APIs -->
-<!ENTITY GET    '<command xmlns="http://docbook.org/ns/docbook">GET</command>'>
-<!ENTITY PUT    '<command xmlns="http://docbook.org/ns/docbook">PUT</command>'>
-<!ENTITY POST   '<command xmlns="http://docbook.org/ns/docbook">POST</command>'>
-<!ENTITY DELETE '<command xmlns="http://docbook.org/ns/docbook">DELETE</command>'>
 ]>
 <chapter xmlns="http://docbook.org/ns/docbook"
     xmlns:xlink="http://www.w3.org/1999/xlink"
@@ -38,97 +33,72 @@
             xlink:href="http://docs.openstack.org/admin-guide-cloud/content/"
                 ><citetitle>OpenStack Cloud Administrator
                 Guide</citetitle></link>.</para>
-    <table rules="all">
-        <caption>Authentication header</caption>
-        <thead>
-            <tr>
-                <td>Header type</td>
-                <td>Name</td>
-                <td>Value</td>
-            </tr>
-        </thead>
-        <tbody>
-            <tr>
-                <td>HTTP/1.1 Request</td>
-                <td>X-Auth-Token</td>
-                <td>txfa8426a08eaf</td>
-            </tr>
-        </tbody>
-    </table>
-    <section xml:id="versions">
+    <section xml:id="admin-versions">
         <title>Versions</title>
         <wadl:resources xmlns:wadl="http://wadl.dev.java.net/2009/02">
-            <wadl:resource
-                href="http://git.openstack.org/cgit/openstack/api-site/plain/api-ref/src/wadls/identity-api/src/v2.0/wadl/identity-admin.wadl#version">
-                <wadl:method href="#getVersionInfo"/>
+            <wadl:resource href="http://git.openstack.org/cgit/openstack/api-site/plain/api-ref/src/wadls/identity-api/src/v2.0/wadl/identity-admin.wadl#admin-version">
+                <wadl:method href="#admin-getVersionInfo"/>
             </wadl:resource>
         </wadl:resources>
     </section>
-    <section xml:id="extensions">
+    <section xml:id="admin-extensions">
         <title>Extensions</title>
         <wadl:resources xmlns:wadl="http://wadl.dev.java.net/2009/02">
-            <wadl:resource
-                href="http://git.openstack.org/cgit/openstack/api-site/plain/api-ref/src/wadls/identity-api/src/v2.0/wadl/identity-admin.wadl#extension">
-                <wadl:method href="#listExtensions"/>
+            <wadl:resource href="http://git.openstack.org/cgit/openstack/api-site/plain/api-ref/src/wadls/identity-api/src/v2.0/wadl/identity-admin.wadl#admin-extensions">
+                <wadl:method href="#admin-listExtensions-v2.0"/>
             </wadl:resource>
-            <wadl:resource
-                href="http://git.openstack.org/cgit/openstack/api-site/plain/api-ref/src/wadls/identity-api/src/v2.0/wadl/identity-admin.wadl#extension">
-                <wadl:method href="#getExtension"/>
+            <wadl:resource href="http://git.openstack.org/cgit/openstack/api-site/plain/api-ref/src/wadls/identity-api/src/v2.0/wadl/identity-admin.wadl#admin-extension">
+                <wadl:method href="#admin-getExtension-v2.0"/>
             </wadl:resource>
         </wadl:resources>
     </section>
-    <section xml:id="tokens">
+    <section xml:id="admin-tokens">
         <title>Tokens</title>
         <wadl:resources xmlns:wadl="http://wadl.dev.java.net/2009/02">
-
-            <wadl:resource
-                href="http://git.openstack.org/cgit/openstack/api-site/plain/api-ref/src/wadls/identity-api/src/v2.0/wadl/identity-admin.wadl#tokens">
-                <wadl:method href="#authenticate"/>
+            <wadl:resource href="http://git.openstack.org/cgit/openstack/api-site/plain/api-ref/src/wadls/identity-api/src/v2.0/wadl/identity-admin.wadl#admin-tokens">
+                <wadl:method href="#admin-authenticate"/>
             </wadl:resource>
-            <wadl:resource
-                href="http://git.openstack.org/cgit/openstack/api-site/plain/api-ref/src/wadls/identity-api/src/v2.0/wadl/identity-admin.wadl#tokenById">
-                <wadl:method href="#validateToken-admin"/>
-                <wadl:method href="#checkToken-admin"/>
+            <wadl:resource href="http://git.openstack.org/cgit/openstack/api-site/plain/api-ref/src/wadls/identity-api/src/v2.0/wadl/identity-admin.wadl#admin-tokenById">
+                <wadl:method href="#admin-validateToken"/>
+                <wadl:method href="#admin-checkToken"/>
             </wadl:resource>
         </wadl:resources>
     </section>
-    <section xml:id="users">
+    <section xml:id="admin-users">
         <title>Users</title>
         <wadl:resources xmlns:wadl="http://wadl.dev.java.net/2009/02">
-
-            <wadl:resource
-                href="http://git.openstack.org/cgit/openstack/api-site/plain/api-ref/src/wadls/identity-api/src/v2.0/wadl/identity-admin.wadl#name">
-                <wadl:method href="#getUserByName"/>
+            <wadl:resource href="http://git.openstack.org/cgit/openstack/api-site/plain/api-ref/src/wadls/identity-api/src/v2.0/wadl/identity-admin.wadl#admin-users">
+                <wadl:method href="#admin-addUser"/>
             </wadl:resource>
-            <wadl:resource
-                href="http://git.openstack.org/cgit/openstack/api-site/plain/api-ref/src/wadls/identity-api/src/v2.0/wadl/identity-admin.wadl#userid">
-                <wadl:method href="#getUserById"/>
+            <wadl:resource href="http://git.openstack.org/cgit/openstack/api-site/plain/api-ref/src/wadls/identity-api/src/v2.0/wadl/identity-admin.wadl#admin-userId">
+                <wadl:method href="#admin-updateUser"/>
+                <wadl:method href="#admin-deleteUser"/>
             </wadl:resource>
-            <wadl:resource
-                href="http://git.openstack.org/cgit/openstack/api-site/plain/api-ref/src/wadls/identity-api/src/v2.0/wadl/identity-admin.wadl#userRoles">
-                <wadl:method href="#listUserGlobalRoles"/>
+            <wadl:resource href="http://git.openstack.org/cgit/openstack/api-site/plain/api-ref/src/wadls/identity-api/src/v2.0/wadl/identity-admin.wadl#admin-name">
+                <wadl:method href="#admin-getUserByName"/>
+            </wadl:resource>
+            <wadl:resource href="http://git.openstack.org/cgit/openstack/api-site/plain/api-ref/src/wadls/identity-api/src/v2.0/wadl/identity-admin.wadl#admin-userid">
+                <wadl:method href="#admin-getUserById"/>
+            </wadl:resource>
+            <wadl:resource href="http://git.openstack.org/cgit/openstack/api-site/plain/api-ref/src/wadls/identity-api/src/v2.0/wadl/identity-admin.wadl#admin-userRoles">
+                <wadl:method href="#admin-listUserGlobalRoles"/>
             </wadl:resource>
         </wadl:resources>
     </section>
-    <section xml:id="tenants">
+    <section xml:id="admin-tenants">
         <title>Tenants</title>
         <wadl:resources xmlns:wadl="http://wadl.dev.java.net/2009/02">
-            <wadl:resource
-                href="http://git.openstack.org/cgit/openstack/api-site/plain/api-ref/src/wadls/identity-api/src/v2.0/wadl/identity-admin.wadl#tenants">
-
-                <wadl:method href="#listTenants"/>
-                <wadl:method href="#getTenantByName"/>
+            <wadl:resource href="http://git.openstack.org/cgit/openstack/api-site/plain/api-ref/src/wadls/identity-api/src/v2.0/wadl/identity-admin.wadl#admin-tenants">
+                <wadl:method href="#admin-listTenants"/>
+                <wadl:method href="#admin-getTenantByName"/>
+            </wadl:resource>
+            <wadl:resource href="http://git.openstack.org/cgit/openstack/api-site/plain/api-ref/src/wadls/identity-api/src/v2.0/wadl/identity-admin.wadl#admin-tenantById">
+                <wadl:method href="#admin-getTenantById"/>
             </wadl:resource>
             <wadl:resource
-                href="http://git.openstack.org/cgit/openstack/api-site/plain/api-ref/src/wadls/identity-api/src/v2.0/wadl/identity-admin.wadl#tenantById">
-                <wadl:method href="#getTenantById"/>
-            </wadl:resource>
-
-            <wadl:resource
-                href="http://git.openstack.org/cgit/openstack/api-site/plain/api-ref/src/wadls/identity-api/src/v2.0/wadl/identity-admin.wadl#userRolesForTenant">
-                <wadl:method href="#listRolesForUserOnTenant"/>
+                href="http://git.openstack.org/cgit/openstack/api-site/plain/api-ref/src/wadls/identity-api/src/v2.0/wadl/identity-admin.wadl#admin-userRolesForTenant">
+                <wadl:method href="#admin-listRolesForUserOnTenant"/>
             </wadl:resource>
         </wadl:resources>
     </section>
-
 </chapter>