Move to v2.0

39 files changed, 222 insertions, 192 deletions

diff --git a/docs/guide/pom.xml b/docs/guide/pom.xml
index ec944cf4..fd16d6a3 100644
--- a/docs/guide/pom.xml
+++ b/docs/guide/pom.xml
@@ -2,7 +2,7 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
-	<groupId>com.rackspace.idm</groupId>
+	<groupId>org.openstack.identity</groupId>
 	<artifactId>docs</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
 	<packaging>jar</packaging>
diff --git a/docs/guide/src/docbkx/idm.wadl b/docs/guide/src/docbkx/identity.wadl
index 39135b71..2cad5a48 100644
--- a/docs/guide/src/docbkx/idm.wadl
+++ b/docs/guide/src/docbkx/identity.wadl
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <application xmlns="http://wadl.dev.java.net/2009/02"
-             xmlns:idm="http://docs.openstack.org/idm/api/v1.0"
-             xmlns:capi="http://docs.openstack.org/common/api/v1.0"
+             xmlns:identity="http://docs.openstack.org/identity/api/v2.0"
+             xmlns:capi="http://docs.openstack.org/common/api/v2.0"
              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
              xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-             xsi:schemaLocation="http://docs.openstack.org/idm/api/v1.0
+             xsi:schemaLocation="http://docs.openstack.org/identity/api/v2.0
                                  xsd/api.xsd
-                                 http://docs.openstack.org/common/api/v1.0
+                                 http://docs.openstack.org/common/api/v2.0
                                  xsd/api-common.xsd
                                  ">
 
@@ -18,7 +18,7 @@
 
     <!-- We should use SSL in production -->
     <resources base="http://localhost:8080">
-        <resource id="version" path="v1.0">
+        <resource id="version" path="v2.0">
             <method href="#getVersionInfo"/>
             <resource id="extensions" path="extensions">
                 <method href="#getExtensions"/>
@@ -57,13 +57,13 @@
             <representation mediaType="application/json"/>
         </response>
         <response status="400">
-            <representation mediaType="application/xml" element="idm:badRequest"/>
+            <representation mediaType="application/xml" element="identity:badRequest"/>
         </response>
         <response status="500">
-            <representation mediaType="application/xml" element="idm:idmFault"/>
+            <representation mediaType="application/xml" element="identity:identityFault"/>
         </response>
         <response status="503">
-            <representation mediaType="application/xml" element="idm:serviceUnavailable"/>
+            <representation mediaType="application/xml" element="identity:serviceUnavailable"/>
         </response>
         <response status="400 500 503">
             <representation mediaType="application/json"/>
@@ -76,16 +76,16 @@
             <representation mediaType="application/json"/>
         </response>
         <response status="400">
-            <representation mediaType="application/xml" element="idm:badRequest"/>
+            <representation mediaType="application/xml" element="identity:badRequest"/>
         </response>
         <response status="404">
-            <representation mediaType="application/xml" element="idm:itemNotFound"/>
+            <representation mediaType="application/xml" element="identity:itemNotFound"/>
         </response>
         <response status="500">
-            <representation mediaType="application/xml" element="idm:idmFault"/>
+            <representation mediaType="application/xml" element="identity:identityFault"/>
         </response>
         <response status="503">
-            <representation mediaType="application/xml" element="idm:serviceUnavailable"/>
+            <representation mediaType="application/xml" element="identity:serviceUnavailable"/>
         </response>
         <response status="400 404 500 503">
             <representation mediaType="application/json"/>
@@ -99,13 +99,13 @@
             <representation mediaType="application/json"/>
         </response>
         <response status="400">
-            <representation mediaType="application/xml" element="idm:badRequest"/>
+            <representation mediaType="application/xml" element="identity:badRequest"/>
         </response>
         <response status="500">
-            <representation mediaType="application/xml" element="idm:idmFault"/>
+            <representation mediaType="application/xml" element="identity:identityFault"/>
         </response>
         <response status="503">
-            <representation mediaType="application/xml" element="idm:serviceUnavailable"/>
+            <representation mediaType="application/xml" element="identity:serviceUnavailable"/>
         </response>
         <response status="400 500 503">
             <representation mediaType="application/json"/>
@@ -115,27 +115,27 @@
     <!-- Token Operations -->
     <method name="POST" id="authenticate">
         <request>
-            <representation mediaType="application/xml" element="idm:passwordCredentials"/>
+            <representation mediaType="application/xml" element="identity:passwordCredentials"/>
             <representation mediaType="application/json"/>
         </request>
         <response status="200 203">
-            <representation mediaType="application/xml" element="idm:auth"/>
+            <representation mediaType="application/xml" element="identity:auth"/>
             <representation mediaType="application/json"/>
         </response>
         <response status="401">
-            <representation mediaType="application/xml" element="idm:unauthorized"/>
+            <representation mediaType="application/xml" element="identity:unauthorized"/>
         </response>
         <response status="403">
-            <representation mediaType="application/xml" element="idm:userDisabled"/>
+            <representation mediaType="application/xml" element="identity:userDisabled"/>
         </response>
         <response status="400">
-            <representation mediaType="application/xml" element="idm:badRequest"/>
+            <representation mediaType="application/xml" element="identity:badRequest"/>
         </response>
         <response status="500">
-            <representation mediaType="application/xml" element="idm:idmFault"/>
+            <representation mediaType="application/xml" element="identity:identityFault"/>
         </response>
         <response status="503">
-            <representation mediaType="application/xml" element="idm:serviceUnavailable"/>
+            <representation mediaType="application/xml" element="identity:serviceUnavailable"/>
         </response>
         <response status="401 403 400 500 503">
             <representation mediaType="application/json"/>
@@ -148,27 +148,27 @@
                    required="false" type="xsd:string"/>
         </request>
         <response status="200 203">
-            <representation mediaType="application/xml" element="idm:auth"/>
+            <representation mediaType="application/xml" element="identity:auth"/>
             <representation mediaType="application/json"/>
         </response>
         <response status="401">
-            <representation mediaType="application/xml" element="idm:unauthorized"/>
+            <representation mediaType="application/xml" element="identity:unauthorized"/>
         </response>
         <response status="403">
-            <representation mediaType="application/xml" element="idm:forbidden"/>
-            <representation mediaType="application/xml" element="idm:userDisabled"/>
+            <representation mediaType="application/xml" element="identity:forbidden"/>
+            <representation mediaType="application/xml" element="identity:userDisabled"/>
         </response>
         <response status="400">
-            <representation mediaType="application/xml" element="idm:badRequest"/>
+            <representation mediaType="application/xml" element="identity:badRequest"/>
         </response>
         <response status="404">
-            <representation mediaType="application/xml" element="idm:itemNotFound"/>
+            <representation mediaType="application/xml" element="identity:itemNotFound"/>
         </response>
         <response status="500">
-            <representation mediaType="application/xml" element="idm:idmFault"/>
+            <representation mediaType="application/xml" element="identity:identityFault"/>
         </response>
         <response status="503">
-            <representation mediaType="application/xml" element="idm:serviceUnavailable"/>
+            <representation mediaType="application/xml" element="identity:serviceUnavailable"/>
         </response>
         <response status="400 401 403 404 500 503">
             <representation mediaType="application/json"/>
@@ -178,22 +178,22 @@
     <method name="DELETE" id="revokeToken">
         <response status="204"/>
         <response status="401">
-            <representation mediaType="application/xml" element="idm:unauthorized"/>
+            <representation mediaType="application/xml" element="identity:unauthorized"/>
         </response>
         <response status="403">
-            <representation mediaType="application/xml" element="idm:forbidden"/>
+            <representation mediaType="application/xml" element="identity:forbidden"/>
         </response>
         <response status="400">
-            <representation mediaType="application/xml" element="idm:badRequest"/>
+            <representation mediaType="application/xml" element="identity:badRequest"/>
         </response>
         <response status="404">
-            <representation mediaType="application/xml" element="idm:itemNotFound"/>
+            <representation mediaType="application/xml" element="identity:itemNotFound"/>
         </response>
         <response status="500">
-            <representation mediaType="application/xml" element="idm:idmFault"/>
+            <representation mediaType="application/xml" element="identity:identityFault"/>
         </response>
         <response status="503">
-            <representation mediaType="application/xml" element="idm:serviceUnavailable"/>
+            <representation mediaType="application/xml" element="identity:serviceUnavailable"/>
         </response>
         <response status="400 401 403 404 500 503">
             <representation mediaType="application/json"/>
@@ -209,26 +209,26 @@
                    required="false" type="xsd:int"/>
         </request>
         <response status="200 203">
-            <representation mediaType="application/xml" element="idm:tenants"/>
+            <representation mediaType="application/xml" element="identity:tenants"/>
             <representation mediaType="application/json"/>
         </response>
         <response status="401">
-            <representation mediaType="application/xml" element="idm:unauthorized"/>
+            <representation mediaType="application/xml" element="identity:unauthorized"/>
         </response>
         <response status="403">
-            <representation mediaType="application/xml" element="idm:forbidden"/>
+            <representation mediaType="application/xml" element="identity:forbidden"/>
         </response>
         <response status="400">
-            <representation mediaType="application/xml" element="idm:badRequest"/>
+            <representation mediaType="application/xml" element="identity:badRequest"/>
         </response>
         <response status="404">
-            <representation mediaType="application/xml" element="idm:itemNotFound"/>
+            <representation mediaType="application/xml" element="identity:itemNotFound"/>
         </response>
         <response status="500">
-            <representation mediaType="application/xml" element="idm:idmFault"/>
+            <representation mediaType="application/xml" element="identity:identityFault"/>
         </response>
         <response status="503">
-            <representation mediaType="application/xml" element="idm:serviceUnavailable"/>
+            <representation mediaType="application/xml" element="identity:serviceUnavailable"/>
         </response>
         <response status="400 401 403 404 500 503">
             <representation mediaType="application/json"/>
@@ -237,30 +237,30 @@
 
     <method name="POST" id="createTenant">
         <request>
-            <representation mediaType="application/xml" element="idm:tenant"/>
+            <representation mediaType="application/xml" element="identity:tenant"/>
             <representation mediaType="application/json"/>
         </request>
         <response status="201">
-            <representation mediaType="application/xml" element="idm:tenant"/>
+            <representation mediaType="application/xml" element="identity:tenant"/>
             <representation mediaType="application/json"/>
         </response>
         <response status="401">
-            <representation mediaType="application/xml" element="idm:unauthorized"/>
+            <representation mediaType="application/xml" element="identity:unauthorized"/>
         </response>
         <response status="403">
-            <representation mediaType="application/xml" element="idm:forbidden"/>
+            <representation mediaType="application/xml" element="identity:forbidden"/>
         </response>
         <response status="400">
-            <representation mediaType="application/xml" element="idm:badRequest"/>
+            <representation mediaType="application/xml" element="identity:badRequest"/>
         </response>
         <response status="409">
-            <representation mediaType="application/xml" element="idm:tenantConflict"/>
+            <representation mediaType="application/xml" element="identity:tenantConflict"/>
         </response>
         <response status="500">
-            <representation mediaType="application/xml" element="idm:idmFault"/>
+            <representation mediaType="application/xml" element="identity:identityFault"/>
         </response>
         <response status="503">
-            <representation mediaType="application/xml" element="idm:serviceUnavailable"/>
+            <representation mediaType="application/xml" element="identity:serviceUnavailable"/>
         </response>
         <response status="401 403 400 409 500 503">
             <representation mediaType="application/json"/>
@@ -269,26 +269,26 @@
 
     <method name="GET" id="getTenant">
         <response status="200 203">
-            <representation mediaType="application/xml" element="idm:tenant"/>
+            <representation mediaType="application/xml" element="identity:tenant"/>
             <representation mediaType="application/json"/>
         </response>
         <response status="401">
-            <representation mediaType="application/xml" element="idm:unauthorized"/>
+            <representation mediaType="application/xml" element="identity:unauthorized"/>
         </response>
         <response status="403">
-            <representation mediaType="application/xml" element="idm:forbidden"/>
+            <representation mediaType="application/xml" element="identity:forbidden"/>
         </response>
         <response status="400">
-            <representation mediaType="application/xml" element="idm:badRequest"/>
+            <representation mediaType="application/xml" element="identity:badRequest"/>
         </response>
         <response status="404">
-            <representation mediaType="application/xml" element="idm:itemNotFound"/>
+            <representation mediaType="application/xml" element="identity:itemNotFound"/>
         </response>
         <response status="500">
-            <representation mediaType="application/xml" element="idm:idmFault"/>
+            <representation mediaType="application/xml" element="identity:identityFault"/>
         </response>
         <response status="503">
-            <representation mediaType="application/xml" element="idm:serviceUnavailable"/>
+            <representation mediaType="application/xml" element="identity:serviceUnavailable"/>
         </response>
         <response status="400 401 403 404 500 503">
             <representation mediaType="application/json"/>
@@ -297,30 +297,30 @@
 
     <method name="PUT" id="updateTenant">
         <request>
-            <representation mediaType="application/xml" element="idm:tenant"/>
+            <representation mediaType="application/xml" element="identity:tenant"/>
             <representation mediaType="application/json"/>
         </request>
         <response status="200">
-            <representation mediaType="application/xml" element="idm:tenant"/>
+            <representation mediaType="application/xml" element="identity:tenant"/>
             <representation mediaType="application/json"/>
         </response>
         <response status="401">
-            <representation mediaType="application/xml" element="idm:unauthorized"/>
+            <representation mediaType="application/xml" element="identity:unauthorized"/>
         </response>
         <response status="403">
-            <representation mediaType="application/xml" element="idm:forbidden"/>
+            <representation mediaType="application/xml" element="identity:forbidden"/>
         </response>
         <response status="404">
-            <representation mediaType="application/xml" element="idm:itemNotFound"/>
+            <representation mediaType="application/xml" element="identity:itemNotFound"/>
         </response>
         <response status="400">
-            <representation mediaType="application/xml" element="idm:badRequest"/>
+            <representation mediaType="application/xml" element="identity:badRequest"/>
         </response>
         <response status="500">
-            <representation mediaType="application/xml" element="idm:idmFault"/>
+            <representation mediaType="application/xml" element="identity:identityFault"/>
         </response>
         <response status="503">
-            <representation mediaType="application/xml" element="idm:serviceUnavailable"/>
+            <representation mediaType="application/xml" element="identity:serviceUnavailable"/>
         </response>
         <response status="401 403 404 400 500 503">
             <representation mediaType="application/json"/>
@@ -330,22 +330,22 @@
     <method name="DELETE" id="deleteTenant">
         <response status="204"/>
         <response status="401">
-            <representation mediaType="application/xml" element="idm:unauthorized"/>
+            <representation mediaType="application/xml" element="identity:unauthorized"/>
         </response>
         <response status="403">
-            <representation mediaType="application/xml" element="idm:forbidden"/>
+            <representation mediaType="application/xml" element="identity:forbidden"/>
         </response>
         <response status="400">
-            <representation mediaType="application/xml" element="idm:badRequest"/>
+            <representation mediaType="application/xml" element="identity:badRequest"/>
         </response>
         <response status="404">
-            <representation mediaType="application/xml" element="idm:itemNotFound"/>
+            <representation mediaType="application/xml" element="identity:itemNotFound"/>
         </response>
         <response status="500">
-            <representation mediaType="application/xml" element="idm:idmFault"/>
+            <representation mediaType="application/xml" element="identity:identityFault"/>
         </response>
         <response status="503">
-            <representation mediaType="application/xml" element="idm:serviceUnavailable"/>
+            <representation mediaType="application/xml" element="identity:serviceUnavailable"/>
         </response>
         <response status="400 401 403 404 500 503">
             <representation mediaType="application/json"/>
diff --git a/docs/guide/src/docbkx/idmdevguide.xml b/docs/guide/src/docbkx/identitydevguide.xml
index 4b279cef..a7b03264 100644
--- a/docs/guide/src/docbkx/idmdevguide.xml
+++ b/docs/guide/src/docbkx/identitydevguide.xml
@@ -42,7 +42,7 @@
   xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:svg="http://www.w3.org/2000/svg"
   xmlns:m="http://www.w3.org/1998/Math/MathML" xmlns:html="http://www.w3.org/1999/xhtml"
   xmlns:db="http://docbook.org/ns/docbook" version="5.0" status="draft">
-  <title>Cloud Identity Developer Guide</title>
+  <title>Keystone Developer Guide</title>
   <info>
     <author>
       <personname>
@@ -50,16 +50,16 @@
         <surname/>
       </personname>
       <affiliation>
-        <orgname>Rackspace Cloud</orgname>
+        <orgname>OpenStack</orgname>
       </affiliation>
     </author>
     <copyright>
       <year>2010</year>
       <year>2011</year>
-      <holder>Rackspace Hosting, Inc.</holder>
+      <holder>OpenStack</holder>
     </copyright>
-    <releaseinfo>API v1.0</releaseinfo>
-    <productname>Cloud Identity</productname>
+    <releaseinfo>API v2.0</releaseinfo>
+    <productname>Keystone - OpenStack Identity</productname>
     <pubdate>2011-04-23</pubdate>
     <legalnotice role="apache2">
         <annotation>
@@ -79,7 +79,7 @@
   <chapter>
     <title>Overview</title>
     <para>
-        The Cloud Identity Service allows applications to obtain
+        The Keystone Identity Service allows applications to obtain
         tokens that can be used to access OpenStack resources.  This
         document is intended for software developers interested in
         developing applications which utilize the Cloud Identity
@@ -95,7 +95,7 @@
   <chapter>
     <title>Concepts</title>
     <para>
-        The Cloud Identity Service has several key concepts that are
+        The Keystone Identity Service has several key concepts that are
         important to understand:
     </para>
     <section>
@@ -122,6 +122,14 @@
       </para>
     </section>
     <section>
+      <title>Role</title>
+      <para>
+        A role that an identity is associated with that allows it
+        to perform certain operations. Roles are managed by services
+        and operators. Tenant administrators may assign roles to users.
+      </para>
+    </section>
+    <section>
         <title>Group</title>
         <para>
             A group of users. Global groups are managed by
@@ -134,12 +142,12 @@
   </chapter>
   <chapter>
     <title>General API Information</title>
-    <para>The IdM API is implemented using a RESTful web service interface. All requests to
-      authenticate and operate against the IdM API are performed using SSL over HTTP (HTTPS) on TCP
+    <para>The Keystone API is implemented using a RESTful web service interface. All requests to
+      authenticate and operate against the Keystone API are performed using SSL over HTTP (HTTPS) on TCP
       port 443.</para>
     <section>
       <title>Request/Response Types</title>
-      <para> The IdM API supports both the JSON and XML data serialization formats. The request
+      <para> The Keystone API supports both the JSON and XML data serialization formats. The request
         format is specified using the <code>Content-Type</code> header and is required for
         operations that have a request body. The response format can be specified in requests using
         either the <code>Accept</code> header or adding an <code>.xml</code> or <code>.json</code>
@@ -258,7 +266,7 @@
             will not contain a "next" link. The following examples
             illustrate three pages in a collection of tenants.  The
             first page was retrieved via a &GET; to
-            http://idm.api.openstack.org/v1.0/1234/tenants?limit=1.
+            http://identity.api.openstack.org/v2.0/1234/tenants?limit=1.
             In these examples, the <parameter>limit</parameter>
             parameter sets the page size to a single item.
             Subsequent "next" and "previous" links will honor the
@@ -326,15 +334,15 @@
     <section>
         <title>Versions</title>
         <para>
-            The OpenStack IDM API uses both a URI and a MIME
+            The OpenStack Identity API uses both a URI and a MIME
             type versioning scheme. In the URI scheme, the first
             element of the path contains the target version
-            identifier (e.g. https://idm.api.openstack.org/
-            v1.0/&hellip;). The MIME type versioning scheme uses
+            identifier (e.g. https://identity.api.openstack.org/
+            v2.0/&hellip;). The MIME type versioning scheme uses
             HTTP content negotiation where the <code>Accept</code>
             or <code>Content-Type</code> headers contains a MIME
             type that identifies the version
-            (application/vnd.openstack.idm-v1.1+xml). A
+            (application/vnd.openstack.identity-v1.1+xml). A
             version MIME type is always linked to a base MIME type
             (application/xml or application/json). If conflicting
             versions are specified using both an HTTP header and a
@@ -344,8 +352,8 @@
             <title>Request with MIME type versioning</title>
             <literallayout class="monospaced">
 GET /tenants HTTP/1.1
-Host: idm.api.openstack.org
-Accept: application/vnd.openstack.idm-v1.1+xml
+Host: identity.api.openstack.org
+Accept: application/vnd.openstack.identity-v1.1+xml
 X-Auth-Token: eaaafd18-0fed-4b3a-81b4-663c99ec1cbb
             </literallayout>
         </example>
@@ -353,7 +361,7 @@ X-Auth-Token: eaaafd18-0fed-4b3a-81b4-663c99ec1cbb
             <title>Request with URI versioning</title>
             <literallayout class="monospaced">
 GET /v1.1/tenants HTTP/1.1
-Host: idm.api.openstack.org
+Host: identity.api.openstack.org
 Accept: application/xml
 X-Auth-Token: eaaafd18-0fed-4b3a-81b4-663c99ec1cbb
             </literallayout>
@@ -363,7 +371,7 @@ X-Auth-Token: eaaafd18-0fed-4b3a-81b4-663c99ec1cbb
                 The MIME type versioning approach allows for the
                 creating of permanent links, because the version
                 scheme is not specified in the URI path:
-                https://api.idm.openstack.org/tenants/12234.
+                https://api.identity.openstack.org/tenants/12234.
             </para>
         </note>
         <para>
@@ -414,12 +422,12 @@ X-Auth-Token: eaaafd18-0fed-4b3a-81b4-663c99ec1cbb
             <title>Versions List Request</title>
             <literallayout class="monospaced">
 GET HTTP/1.1
-Host: idm.api.openstack.org
+Host: identity.api.openstack.org
             </literallayout>
         </example>
         <simpara>&CODES;<returnvalue>200</returnvalue>, <returnvalue>203</returnvalue></simpara>
         <simpara>&ERROR_CODES; badRequest
-        (<errorcode>400</errorcode>), idmFault
+        (<errorcode>400</errorcode>), identityFault
         (<errorcode>500</errorcode>),
         serviceUnavailable(<errorcode>503</errorcode>)</simpara>
         &NO_REQUEST;
@@ -444,13 +452,13 @@ Host: idm.api.openstack.org
             You can also obtain additional information about a
             specific version by performing a &GET; on the base
             version URL
-            (e.g. https://idm.api.openstack.org/v1.1/).
+            (e.g. https://identity.api.openstack.org/v1.1/).
             Version request URLs should always end with a trailing
             slash (/). If the slash is omitted, the server may
             respond with a <returnvalue>302</returnvalue>
             redirection request. Format extensions may be placed
             after the slash
-            (e.g. https://idm.api.openstack.org/v1.1/.xml). Note
+            (e.g. https://identity.api.openstack.org/v1.1/.xml). Note
             that this is a special case that does not hold true
             for other API requests. In general, requests such as
             /tenants.xml and /tenants/.xml are handled
@@ -460,12 +468,12 @@ Host: idm.api.openstack.org
             <title>Version Details Request</title>
             <literallayout class="monospaced">
 GET HTTP/1.1
-Host: idm.api.openstack.org/v1.1/
+Host: identity.api.openstack.org/v1.1/
             </literallayout>
         </example>
         <simpara>&CODES;<returnvalue>200</returnvalue>, <returnvalue>203</returnvalue></simpara>
         <simpara>&ERROR_CODES; badRequest
-        (<errorcode>400</errorcode>), idmFault
+        (<errorcode>400</errorcode>), identityFault
         (<errorcode>500</errorcode>),
         serviceUnavailable(<errorcode>503</errorcode>)</simpara>
         &NO_REQUEST;
@@ -530,7 +538,7 @@ Host: idm.api.openstack.org/v1.1/
         </informaltable>
         <simpara>&CODES;<returnvalue>200</returnvalue>, <returnvalue>203</returnvalue></simpara>
         <simpara>&ERROR_CODES; badRequest
-        (<errorcode>400</errorcode>), idmFault (<errorcode>500</errorcode>),
+        (<errorcode>400</errorcode>), identityFault (<errorcode>500</errorcode>),
             serviceUnavailable(<errorcode>503</errorcode>)</simpara>
         &NO_REQUEST;
         <para>
@@ -576,7 +584,7 @@ Host: idm.api.openstack.org/v1.1/
         <simpara>&CODES;<returnvalue>200</returnvalue>, <returnvalue>203</returnvalue></simpara>
         <simpara>&ERROR_CODES; itemNotFound
         (<errorcode>404</errorcode>), badRequest
-        (<errorcode>400</errorcode>), idmFault
+        (<errorcode>400</errorcode>), identityFault
         (<errorcode>500</errorcode>),
         serviceUnavailable(<errorcode>503</errorcode>)</simpara>
         &NO_REQUEST;
@@ -633,19 +641,19 @@ Host: idm.api.openstack.org/v1.1/
       <example>
         <title>XML Fault Response</title>
         <programlisting language="xml">
-<xi:include href="samples/idm_fault.xml" parse="text"/>
+<xi:include href="samples/identity_fault.xml" parse="text"/>
 </programlisting>
       </example>
       <example>
         <title>JSON Fault Response</title>
         <programlisting language="javascript">
-<xi:include href="samples/idm_fault.json" parse="text"/>
+<xi:include href="samples/identity_fault.json" parse="text"/>
 </programlisting>
       </example>
       <para>The error code is returned in the body of the response for convenience. The message
         section returns a human readable message. The details section is optional and may contain
         useful information for tracking down an error (e.g a stack trace). </para>
-      <para>The root element of the fault (e.g. idmFault) may change depending on the type of error.
+      <para>The root element of the fault (e.g. identityFault) may change depending on the type of error.
         The following is an example of an itemNotFound error. </para>
       <example>
         <title>XML Not Found Fault</title>
@@ -672,7 +680,7 @@ Host: idm.api.openstack.org/v1.1/
         </thead>
         <tbody>
           <tr align="center">
-            <td>idmFault</td>
+            <td>identityFault</td>
             <td>500, 400</td>
             <td> &CHECK; </td>
           </tr>
@@ -719,8 +727,8 @@ Host: idm.api.openstack.org/v1.1/
         </tbody>
       </table>
       <para>From an XML schema perspective, all API faults are extensions of the base fault type
-          <type>idmFault</type>. When working with a system that binds XML to actual classes (such
-        as JAXB), one should be capable of using <type>idmFault</type> as a “catch-all” if
+          <type>identityFault</type>. When working with a system that binds XML to actual classes (such
+        as JAXB), one should be capable of using <type>identityFault</type> as a “catch-all” if
         there&apos;s no interest in distinguishing between individual fault types. </para>
     </section>
   </chapter>
@@ -747,7 +755,7 @@ Host: idm.api.openstack.org/v1.1/
         </informaltable>
         <simpara>&CODES;<returnvalue>200</returnvalue>, <returnvalue>203</returnvalue></simpara>
         <simpara>&ERROR_CODES; unauthorized (<errorcode>401</errorcode>), userDisabled
-            (<errorcode>403</errorcode>), badRequest (<errorcode>400</errorcode>), idmFault
+            (<errorcode>403</errorcode>), badRequest (<errorcode>400</errorcode>), identityFault
             (<errorcode>500</errorcode>), serviceUnavailable(<errorcode>503</errorcode>)</simpara>
             <para>
                 TenantID is optional and may be used to specify that a
@@ -797,7 +805,7 @@ Host: idm.api.openstack.org/v1.1/
         <simpara>&ERROR_CODES; unauthorized (<errorcode>401</errorcode>), forbidden
             (<returnvalue>403</returnvalue>), userDisabled(<returnvalue>403</returnvalue>),
           badRequest (<errorcode>400</errorcode>), itemNotFound (<errorcode>404</errorcode>),
-            idmFault(<returnvalue>500</returnvalue>),
+            identityFault(<returnvalue>500</returnvalue>),
             serviceUnavailable(<returnvalue>503</returnvalue>)</simpara>
         &NO_REQUEST;
         <para>
@@ -836,7 +844,7 @@ Host: idm.api.openstack.org/v1.1/
         <simpara>&ERROR_CODES; unauthorized (<errorcode>401</errorcode>), forbidden
             (<returnvalue>403</returnvalue>), userDisabled(<returnvalue>403</returnvalue>),
           badRequest (<errorcode>400</errorcode>), itemNotFound (<errorcode>404</errorcode>),
-            idmFault(<returnvalue>500</returnvalue>),
+            identityFault(<returnvalue>500</returnvalue>),
             serviceUnavailable(<returnvalue>503</returnvalue>)</simpara>
         &NO_REQUEST;
       </section>
@@ -858,7 +866,7 @@ Host: idm.api.openstack.org/v1.1/
         <simpara>&CODES;<returnvalue>201</returnvalue></simpara>
         <simpara>&ERROR_CODES; unauthorized (<errorcode>401</errorcode>),
             forbidden(<errorcode>403</errorcode>),
-          badRequest (<errorcode>400</errorcode>), idmFault (<errorcode>500</errorcode>),
+          badRequest (<errorcode>400</errorcode>), identityFault (<errorcode>500</errorcode>),
             serviceUnavailable(<errorcode>503</errorcode>)</simpara>
       <example>
         <title>XML Tenant Create Request</title>
@@ -900,7 +908,7 @@ Host: idm.api.openstack.org/v1.1/
         <simpara>&CODES;<returnvalue>200</returnvalue>, <returnvalue>203</returnvalue></simpara>
         <simpara>&ERROR_CODES; unauthorized (<errorcode>401</errorcode>),
             forbidden(<errorcode>403</errorcode>), overLimit(<errorcode>413</errorcode>),
-          badRequest (<errorcode>400</errorcode>), idmFault (<errorcode>500</errorcode>),
+          badRequest (<errorcode>400</errorcode>), identityFault (<errorcode>500</errorcode>),
             serviceUnavailable(<errorcode>503</errorcode>)</simpara>
         <para>
             The operation returns a list of tenants. The list may be
@@ -936,7 +944,7 @@ Host: idm.api.openstack.org/v1.1/
         <simpara>&CODES;<returnvalue>200</returnvalue>, <returnvalue>203</returnvalue></simpara>
         <simpara>&ERROR_CODES; unauthorized (<errorcode>401</errorcode>),
             forbidden(<errorcode>403</errorcode>), itemNotFound(<errorcode>404</errorcode>),
-          badRequest (<errorcode>400</errorcode>), idmFault (<errorcode>500</errorcode>),
+          badRequest (<errorcode>400</errorcode>), identityFault (<errorcode>500</errorcode>),
             serviceUnavailable(<errorcode>503</errorcode>)</simpara>
         &NO_REQUEST;
         <example>
@@ -967,7 +975,7 @@ Host: idm.api.openstack.org/v1.1/
         <simpara>&CODES;<returnvalue>200</returnvalue></simpara>
         <simpara>&ERROR_CODES; unauthorized (<errorcode>401</errorcode>),
             forbidden(<errorcode>403</errorcode>), itemNotFound(<errorcode>404</errorcode>),
-          badRequest (<errorcode>400</errorcode>), idmFault (<errorcode>500</errorcode>),
+          badRequest (<errorcode>400</errorcode>), identityFault (<errorcode>500</errorcode>),
             serviceUnavailable(<errorcode>503</errorcode>)</simpara>
       <example>
         <title>XML Tenant Update Request</title>
@@ -1009,7 +1017,7 @@ Host: idm.api.openstack.org/v1.1/
           <simpara>&CODES;<returnvalue>204</returnvalue></simpara>
           <simpara>&ERROR_CODES; unauthorized (<errorcode>401</errorcode>), badRequest
             (<errorcode>400</errorcode>), forbidden (<errorcode>403</errorcode>), itemNotFound
-            (<errorcode>404</errorcode>), idmFault (<errorcode>500</errorcode>),
+            (<errorcode>404</errorcode>), identityFault (<errorcode>500</errorcode>),
             serviceUnavailable(<errorcode>503</errorcode>)</simpara>
             &NO_REQUEST;       
         </section>
diff --git a/docs/guide/src/docbkx/samples/auth.xml b/docs/guide/src/docbkx/samples/auth.xml
index df8d69d0..0e114a64 100644
--- a/docs/guide/src/docbkx/samples/auth.xml
+++ b/docs/guide/src/docbkx/samples/auth.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<auth xmlns="http://docs.openstack.org/idm/api/v1.0">
+<auth xmlns="http://docs.openstack.org/identity/api/v2.0">
 	<token expires="2010-11-01T03:32:15-05:00"
            id="ab48a9efdfedb23ty3494"/>
 	<user tenantId="1245" username="jqsmith">
diff --git a/docs/guide/src/docbkx/samples/auth_credentials.xml b/docs/guide/src/docbkx/samples/auth_credentials.xml
index fbdf5633..56bd91d6 100644
--- a/docs/guide/src/docbkx/samples/auth_credentials.xml
+++ b/docs/guide/src/docbkx/samples/auth_credentials.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <passwordCredentials
-    xmlns="http://docs.openstack.org/idm/api/v1.0"
+    xmlns="http://docs.openstack.org/identity/api/v2.0"
     password="P@ssword1" username="testuser"
     tenantId="77654"/>
diff --git a/docs/guide/src/docbkx/samples/choices.json b/docs/guide/src/docbkx/samples/choices.json
index 6b0b2607..b6f31fa1 100644
--- a/docs/guide/src/docbkx/samples/choices.json
+++ b/docs/guide/src/docbkx/samples/choices.json
@@ -7,18 +7,18 @@
                 "links": [
                     {
                         "rel" : "self",
-                        "href" : "http://idm.api.openstack.org/v1.0/tenants/12"
+                        "href" : "http://identity.api.openstack.org/v2.0"
                     }
                 ],
                 "media-types": {
                     "values" : [
                         {
                             "base" : "application/xml",
-                            "type" : "application/vnd.openstack.idm-v1.0+xml"
+                            "type" : "application/vnd.openstack.identity-v1.0+xml"
                         },
                         {
                             "base" : "application/json",
-                            "type" : "application/vnd.openstack.idm-v1.0+json"
+                            "type" : "application/vnd.openstack.identity-v1.0+json"
                         }
                     ]
                 }
@@ -29,18 +29,40 @@
                 "links": [
                     {
                         "rel" : "self",
-                        "href" : "http://idm.api.openstack.org/v1.1/tenants/12"
+                        "href" : "http://identity.api.openstack.org/v1.1"
                     }
                 ],
                 "media-types": {
                     "values" : [
                         {
                             "base" : "application/xml",
-                            "type" : "application/vnd.openstack.idm-v1.1+xml"
+                            "type" : "application/vnd.openstack.identity-v1.1+xml"
                         },
                         {
                             "base" : "application/json",
-                            "type" : "application/vnd.openstack.idm-v1.1+json"
+                            "type" : "application/vnd.openstack.identity-v1.1+json"
+                        }
+                    ]
+                }
+            },
+            {
+                "id" : "v2.0",
+                "status" : "CURRENT",
+                "links": [
+                    {
+                        "rel" : "self",
+                        "href" : "http://identity.api.openstack.org/v2.0"
+                    }
+                ],
+                "media-types": {
+                    "values" : [
+                        {
+                            "base" : "application/xml",
+                            "type" : "application/vnd.openstack.identity-v2.0+xml"
+                        },
+                        {
+                            "base" : "application/json",
+                            "type" : "application/vnd.openstack.identity-v2.0+json"
                         }
                     ]
                 }
diff --git a/docs/guide/src/docbkx/samples/choices.xml b/docs/guide/src/docbkx/samples/choices.xml
index a9a91ece..9d1e8ffb 100644
--- a/docs/guide/src/docbkx/samples/choices.xml
+++ b/docs/guide/src/docbkx/samples/choices.xml
@@ -6,24 +6,24 @@
  <version id="v1.0" status="DEPRECATED">
      <media-types>
          <media-type base="application/xml"
-            type="application/vnd.openstack.idm-v1.0+xml"/>
+            type="application/vnd.openstack.identity-v2.0+xml"/>
          <media-type base="application/json"
-            type="application/vnd.openstack.idm-v1.0+json"/>
+            type="application/vnd.openstack.identity-v2.0+json"/>
      </media-types>
         
      <atom:link rel="self"
-                href="http://idm.api.openstack.org/v1.0/tenants/12"/>
+                href="http://identity.api.openstack.org/v2.0"/>
     </version>
     
     <version id="v1.1" status="CURRENT">
      <media-types>
          <media-type base="application/xml"
-            type="application/vnd.openstack.idm-v1.1+xml"/>
+            type="application/vnd.openstack.identity-v1.1+xml"/>
          <media-type base="application/json"
-            type="application/vnd.openstack.idm-v1.1+json"/>
+            type="application/vnd.openstack.identity-v1.1+json"/>
      </media-types>
         
      <atom:link rel="self"
-                href="http://idm.api.openstack.org/v1.1/tenants/12"/>
+                href="http://identity.api.openstack.org/v1.1"/>
     </version>
 </choices>
diff --git a/docs/guide/src/docbkx/samples/ext-getuser.xml b/docs/guide/src/docbkx/samples/ext-getuser.xml
index 07c185b1..bf0a9c6e 100644
--- a/docs/guide/src/docbkx/samples/ext-getuser.xml
+++ b/docs/guide/src/docbkx/samples/ext-getuser.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<user xmlns="http://docs.openstack.org/idm/api/v1.0"
+<user xmlns="http://docs.openstack.org/identity/api/v2.0"
       enabled="true" email="john.smith@example.org"
       tenantId="1234" id="jqsmith">
     <groups>
         <group tenantId="1234" id="Admin"/>
     </groups>
     <metadata
-        xmlns="http://docs.rackspacecloud.com/idm/api/ext/meta/v1.0">
+        xmlns="http://docs.rackspacecloud.com/identity/api/ext/meta/v2.0">
         <meta key="MetaKey1">MetaValue1</meta>
         <meta key="MetaKey2">MetaValue2</meta>
     </metadata>
diff --git a/docs/guide/src/docbkx/samples/extension.json b/docs/guide/src/docbkx/samples/extension.json
index 1d7e8bb3..68233e90 100644
--- a/docs/guide/src/docbkx/samples/extension.json
+++ b/docs/guide/src/docbkx/samples/extension.json
@@ -1,7 +1,7 @@
 {
   "extension" : {
       "name" : "User Metadata Extension",
-      "namespace" : "http://docs.rackspacecloud.com/idm/api/ext/meta/v1.0",
+      "namespace" : "http://docs.rackspacecloud.com/identity/api/ext/meta/v2.0",
       "alias" : "RS-META",
       "updated" : "2011-01-12T11:22:33-06:00",
       "description" : "Allows associating arbritrary metadata with a user.",
@@ -9,12 +9,12 @@
           {
               "rel" : "describedby",
               "type" : "application/pdf",
-              "href" : "http://docs.rackspacecloud.com/idm/api/ext/idm-meta-20111201.pdf"
+              "href" : "http://docs.rackspacecloud.com/idm/api/ext/identity-meta-20111201.pdf"
           },
           {
               "rel" : "describedby",
               "type" : "application/vnd.sun.wadl+xml",
-              "href" : "http://docs.rackspacecloud.com/idm/api/ext/idm-cbs.wadl"
+              "href" : "http://docs.rackspacecloud.com/identity/api/ext/identity-cbs.wadl"
           }
       ] 
   }
diff --git a/docs/guide/src/docbkx/samples/extension.xml b/docs/guide/src/docbkx/samples/extension.xml
index 8d932f49..d0dbffe9 100644
--- a/docs/guide/src/docbkx/samples/extension.xml
+++ b/docs/guide/src/docbkx/samples/extension.xml
@@ -3,7 +3,7 @@
 <extension xmlns="http://docs.openstack.org/common/api/v1.0"
            xmlns:atom="http://www.w3.org/2005/Atom"
            name="User Metadata Extension"
-           namespace="http://docs.rackspacecloud.com/idm/api/ext/meta/v1.0"
+           namespace="http://docs.rackspacecloud.com/identity/api/ext/meta/v2.0"
            alias="RS-META"
            updated="2011-01-12T11:22:33-06:00">
 
diff --git a/docs/guide/src/docbkx/samples/extensions.json b/docs/guide/src/docbkx/samples/extensions.json
index 11064a90..8b594526 100644
--- a/docs/guide/src/docbkx/samples/extensions.json
+++ b/docs/guide/src/docbkx/samples/extensions.json
@@ -22,7 +22,7 @@
             },
             {
                 "name" : "User Metadata Extension",
-                "namespace" : "http://docs.rackspacecloud.com/idm/api/ext/meta/v1.0",
+                "namespace" : "http://docs.rackspacecloud.com/identity/api/ext/meta/v2.0",
                 "alias" : "RS-META",
                 "updated" : "2011-01-12T11:22:33-06:00",
                 "description" : "Allows associating arbritrary metadata with a user.",
diff --git a/docs/guide/src/docbkx/samples/extensions.xml b/docs/guide/src/docbkx/samples/extensions.xml
index ddd7e173..f0a9a49d 100644
--- a/docs/guide/src/docbkx/samples/extensions.xml
+++ b/docs/guide/src/docbkx/samples/extensions.xml
@@ -22,7 +22,7 @@
     </extension>
     <extension
         name="User Metadata Extension"
-        namespace="http://docs.rackspacecloud.com/idm/api/ext/meta/v1.0"
+        namespace="http://docs.rackspacecloud.com/identity/api/ext/meta/v2.0"
         alias="RS-META"
         updated="2011-01-12T11:22:33-06:00">
         <description>
diff --git a/docs/guide/src/docbkx/samples/getuser-1.json b/docs/guide/src/docbkx/samples/getuser-1.json
index 544d4600..f9afcbd8 100644
--- a/docs/guide/src/docbkx/samples/getuser-1.json
+++ b/docs/guide/src/docbkx/samples/getuser-1.json
@@ -17,7 +17,7 @@
           "links" : [
               {
                   "rel"  : "next",
-                  "href" : "http://idm.api.openstack.org/v1.0/1234/tenants/1234/users/jqsmith/groups?marker=Super"
+                  "href" : "http://identity.api.openstack.org/v2.0/1234/tenants/1234/users/jqsmith/groups?marker=Super"
               }
           ]
       },
diff --git a/docs/guide/src/docbkx/samples/getuser-1.xml b/docs/guide/src/docbkx/samples/getuser-1.xml
index 2b513072..37c67ad7 100644
--- a/docs/guide/src/docbkx/samples/getuser-1.xml
+++ b/docs/guide/src/docbkx/samples/getuser-1.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<user xmlns="http://docs.openstack.org/idm/api/v1.0"
+<user xmlns="http://docs.openstack.org/identity/api/v2.0"
       xmlns:atom="http://www.w3.org/2005/Atom"
       enabled="true" email="john.smith@example.org"
       tenantId="1234" id="jqsmith">
@@ -9,6 +9,6 @@
         <group id="Super"/>
         <atom:link
             rel="next"
-            href="http://idm.api.openstack.org/v1.0/1234/tenants/1234/users/jqsmith/groups?marker=Super"/>
+            href="http://identity.api.openstack.org/v2.0/1234/tenants/1234/users/jqsmith/groups?marker=Super"/>
     </groups>
 </user>
diff --git a/docs/guide/src/docbkx/samples/idm_fault.json b/docs/guide/src/docbkx/samples/identity_fault.json
index 84e3908e..84e3908e 100644
--- a/docs/guide/src/docbkx/samples/idm_fault.json
+++ b/docs/guide/src/docbkx/samples/identity_fault.json
diff --git a/docs/guide/src/docbkx/samples/idm_fault.xml b/docs/guide/src/docbkx/samples/identity_fault.xml
index e0f695f2..0592d948 100644
--- a/docs/guide/src/docbkx/samples/idm_fault.xml
+++ b/docs/guide/src/docbkx/samples/identity_fault.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<idmFault xmlns="http://docs.openstack.org/idm/api/v1.0"
+<idmFault xmlns="http://docs.openstack.org/identity/api/v2.0"
           code="500">
 	<message>Fault</message>
 	<details>Error Details...</details>
diff --git a/docs/guide/src/docbkx/samples/item_not_found.xml b/docs/guide/src/docbkx/samples/item_not_found.xml
index f967b76a..3f78b498 100644
--- a/docs/guide/src/docbkx/samples/item_not_found.xml
+++ b/docs/guide/src/docbkx/samples/item_not_found.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itemNotFound xmlns="http://docs.openstack.org/idm/api/v1.0"
+<itemNotFound xmlns="http://docs.openstack.org/identity/api/v2.0"
               code="404">
 	<message>Item not found.</message>
 	<details>Error Details...</details>
diff --git a/docs/guide/src/docbkx/samples/samplerequestheader.json b/docs/guide/src/docbkx/samples/samplerequestheader.json
index a4647076..7db2a40f 100644
--- a/docs/guide/src/docbkx/samples/samplerequestheader.json
+++ b/docs/guide/src/docbkx/samples/samplerequestheader.json
@@ -1,4 +1,4 @@
 POST /v1.0/token HTTP/1.1
-Host: idm.api.rackspace.com
+Host: identity.api.rackspace.com
 Content-Type: application/json
 Accept: application/xml
\ No newline at end of file
diff --git a/docs/guide/src/docbkx/samples/tenant.xml b/docs/guide/src/docbkx/samples/tenant.xml
index ea6a63dc..83210f87 100644
--- a/docs/guide/src/docbkx/samples/tenant.xml
+++ b/docs/guide/src/docbkx/samples/tenant.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tenant xmlns="http://docs.openstack.org/idm/api/v1.0"
+<tenant xmlns="http://docs.openstack.org/identity/api/v2.0"
         enabled="true" id="1234">
     <description>A description...</description>
 </tenant>
diff --git a/docs/guide/src/docbkx/samples/tenantlock.xml b/docs/guide/src/docbkx/samples/tenantlock.xml
index 9d7081d4..06a68a83 100644
--- a/docs/guide/src/docbkx/samples/tenantlock.xml
+++ b/docs/guide/src/docbkx/samples/tenantlock.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tenant xmlns="http://docs.openstack.org/idm/api/v1.0">
+<tenant xmlns="http://docs.openstack.org/identity/api/v2.0">
     <description>A NEW description...</description>
 </tenant>
diff --git a/docs/guide/src/docbkx/samples/tenants-1.json b/docs/guide/src/docbkx/samples/tenants-1.json
index 6f45f1c8..eb3f1430 100644
--- a/docs/guide/src/docbkx/samples/tenants-1.json
+++ b/docs/guide/src/docbkx/samples/tenants-1.json
@@ -10,7 +10,7 @@
     "links" : [
         {
             "rel" : "next",
-            "href" : "http://idm.api.openstack.org/v1.0/1234/tenants?limit=1&marker=1234"
+            "href" : "http://identity.api.openstack.org/v2.0/1234/tenants?limit=1&marker=1234"
         }
     ]
 }
diff --git a/docs/guide/src/docbkx/samples/tenants-1.xml b/docs/guide/src/docbkx/samples/tenants-1.xml
index 67101816..98786864 100644
--- a/docs/guide/src/docbkx/samples/tenants-1.xml
+++ b/docs/guide/src/docbkx/samples/tenants-1.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tenants xmlns="http://docs.openstack.org/idm/api/v1.0"
+<tenants xmlns="http://docs.openstack.org/identity/api/v2.0"
          xmlns:atom="http://www.w3.org/2005/Atom">
     <tenant enabled="true" id="1234">
         <description>A description...</description>
     </tenant>
     <atom:link
         rel="next"
-        href="http://idm.api.openstack.org/v1.0/1234/tenants?limit=1&amp;marker=1234"/>
+        href="http://identity.api.openstack.org/v2.0/1234/tenants?limit=1&amp;marker=1234"/>
 </tenants>
diff --git a/docs/guide/src/docbkx/samples/tenants-2.json b/docs/guide/src/docbkx/samples/tenants-2.json
index 7cb3ca6b..6d48ad23 100644
--- a/docs/guide/src/docbkx/samples/tenants-2.json
+++ b/docs/guide/src/docbkx/samples/tenants-2.json
@@ -10,11 +10,11 @@
     "links" : [
         {
             "rel" : "next",
-            "href" : "http://idm.api.openstack.org/v1.0/1234/tenants?limit=1&marker=3645"
+            "href" : "http://identity.api.openstack.org/v2.0/1234/tenants?limit=1&marker=3645"
         },
         {
             "rel" : "previous",
-            "href" : "http://idm.api.openstack.org/v1.0/1234/tenants?limit=1"
+            "href" : "http://identity.api.openstack.org/v2.0/1234/tenants?limit=1"
         }
     ]
 }
diff --git a/docs/guide/src/docbkx/samples/tenants-2.xml b/docs/guide/src/docbkx/samples/tenants-2.xml
index 7be4f537..42cc0a18 100644
--- a/docs/guide/src/docbkx/samples/tenants-2.xml
+++ b/docs/guide/src/docbkx/samples/tenants-2.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tenants xmlns="http://docs.openstack.org/idm/api/v1.0"
+<tenants xmlns="http://docs.openstack.org/identity/api/v2.0"
          xmlns:atom="http://www.w3.org/2005/Atom">
     <tenant enabled="true" id="3645">
         <description>A description...</description>
     </tenant>
     <atom:link
         rel="previous"
-        href="http://idm.api.openstack.org/v1.0/1234/tenants?limit=1"/>
+        href="http://identity.api.openstack.org/v2.0/1234/tenants?limit=1"/>
     <atom:link
         rel="next"
-        href="http://idm.api.openstack.org/v1.0/1234/tenants?limit=1&amp;marker=3645"/>
+        href="http://identity.api.openstack.org/v2.0/1234/tenants?limit=1&amp;marker=3645"/>
 </tenants>
diff --git a/docs/guide/src/docbkx/samples/tenants-3.json b/docs/guide/src/docbkx/samples/tenants-3.json
index febcf225..f9030f2e 100644
--- a/docs/guide/src/docbkx/samples/tenants-3.json
+++ b/docs/guide/src/docbkx/samples/tenants-3.json
@@ -10,7 +10,7 @@
     "links" : [
         {
             "rel" : "previous",
-            "href" : "http://idm.api.openstack.org/v1.0/1234/tenants?limit=1&marker=1234"
+            "href" : "http://identity.api.openstack.org/v2.0/1234/tenants?limit=1&marker=1234"
         }
     ]
 }
diff --git a/docs/guide/src/docbkx/samples/tenants-3.xml b/docs/guide/src/docbkx/samples/tenants-3.xml
index 5e5b49fa..89f29370 100644
--- a/docs/guide/src/docbkx/samples/tenants-3.xml
+++ b/docs/guide/src/docbkx/samples/tenants-3.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tenants xmlns="http://docs.openstack.org/idm/api/v1.0"
+<tenants xmlns="http://docs.openstack.org/identity/api/v2.0"
          xmlns:atom="http://www.w3.org/2005/Atom">
     <tenant enabled="true" id="9999">
         <description>A description...</description>
     </tenant>
     <atom:link
         rel="previous"
-        href="http://idm.api.openstack.org/v1.0/1234/tenants?limit=1&amp;marker=1234"/>
+        href="http://identity.api.openstack.org/v2.0/1234/tenants?limit=1&amp;marker=1234"/>
 </tenants>
diff --git a/docs/guide/src/docbkx/samples/tenants.xml b/docs/guide/src/docbkx/samples/tenants.xml
index 9b503ce2..cda2f662 100644
--- a/docs/guide/src/docbkx/samples/tenants.xml
+++ b/docs/guide/src/docbkx/samples/tenants.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tenants xmlns="http://docs.openstack.org/idm/api/v1.0">
+<tenants xmlns="http://docs.openstack.org/identity/api/v2.0">
     <tenant enabled="true" id="1234">
         <description>A description...</description>
     </tenant>
diff --git a/docs/guide/src/docbkx/samples/updatedtenant.xml b/docs/guide/src/docbkx/samples/updatedtenant.xml
index 8bcce9bf..51999a4d 100644
--- a/docs/guide/src/docbkx/samples/updatedtenant.xml
+++ b/docs/guide/src/docbkx/samples/updatedtenant.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tenant xmlns="http://docs.openstack.org/idm/api/v1.0"
+<tenant xmlns="http://docs.openstack.org/identity/api/v2.0"
         enabled="true" id="1234">
     <description>A NEW description...</description>
 </tenant>
diff --git a/docs/guide/src/docbkx/samples/validatetoken.xml b/docs/guide/src/docbkx/samples/validatetoken.xml
index b091c7af..e04742ae 100644
--- a/docs/guide/src/docbkx/samples/validatetoken.xml
+++ b/docs/guide/src/docbkx/samples/validatetoken.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<auth xmlns="http://docs.openstack.org/idm/api/v1.0">
+<auth xmlns="http://docs.openstack.org/identity/api/v2.0">
 	<token expires="2010-11-01T03:32:15-05:00"
            id="ab48a9efdfedb23ty3494"/>
 	<user tenantId="1245" username="jqsmith">
diff --git a/docs/guide/src/docbkx/samples/version-atom.xml b/docs/guide/src/docbkx/samples/version-atom.xml
index 8cf3dc88..13ac3b0b 100644
--- a/docs/guide/src/docbkx/samples/version-atom.xml
+++ b/docs/guide/src/docbkx/samples/version-atom.xml
@@ -2,18 +2,18 @@
 <feed xmlns="http://www.w3.org/2005/Atom">
   <title type="text">About This Version</title>
   <updated>2011-01-21T11:33:21-06:00</updated>
-  <id>http://idm.api.openstack.org/v1.0/</id>
+  <id>http://identity.api.openstack.org/v2.0/</id>
    <author><name>Rackspace</name><uri>http://www.rackspace.com/</uri></author>
-   <link rel="self" href="http://idm.api.openstack.org/v1.0/"/>
+   <link rel="self" href="http://identity.api.openstack.org/v2.0/"/>
    <entry>
-      <id>http://idm.api.openstack.org/v1.0/</id>
+      <id>http://identity.api.openstack.org/v2.0/</id>
       <title type="text">Version v1.0</title>
       <updated>2011-01-21T11:33:21-06:00</updated>
-      <link rel="self" href="http://idm.api.openstack.org/v1.0/"/>
+      <link rel="self" href="http://identity.api.openstack.org/v2.0/"/>
       <link rel="describedby" type="application/pdf"
-           href="http://docs.rackspacecloud.com/idm/api/v1.0/idm-devguide-20110125.pdf"/>
+           href="http://docs.rackspacecloud.com/identity/api/v2.0/idm-devguide-20110125.pdf"/>
       <link rel="describedby" type="application/vnd.sun.wadl+xml"
-           href="http://docs.rackspacecloud.com/idm/api/v1.0/application.wadl"/>
+           href="http://docs.rackspacecloud.com/identity/api/v2.0/application.wadl"/>
       <content type="text">Version v1.0 CURRENT (2011-01-21T11:33:21-06:00)</content>
    </entry>
 </feed>
diff --git a/docs/guide/src/docbkx/samples/version.json b/docs/guide/src/docbkx/samples/version.json
index 74bae5bd..60953de0 100644
--- a/docs/guide/src/docbkx/samples/version.json
+++ b/docs/guide/src/docbkx/samples/version.json
@@ -6,27 +6,27 @@
         "links": [
             {
                 "rel" : "self",
-                "href" : "http://idm.api.openstack.org/v1.0/"
+                "href" : "http://identity.api.openstack.org/v2.0/"
             },
             {
                 "rel" : "describedby",
                 "type" : "application/pdf",
-                "href" : "http://docs.rackspacecloud.com/idm/api/v1.0/idm-devguide-20110125.pdf"
+                "href" : "http://docs.rackspacecloud.com/identity/api/v2.0/idm-devguide-20110125.pdf"
             },
             {
                 "rel" : "describedby",
                 "type" : "application/vnd.sun.wadl+xml",
-                "href" : "http://docs.rackspacecloud.com/idm/api/v1.0/application.wadl"
+                "href" : "http://docs.rackspacecloud.com/identity/api/v2.0/application.wadl"
             }
         ],
         "media-types": [
             {
                 "base" : "application/xml",
-                "type" : "application/vnd.openstack.idm-v1.0+xml"
+                "type" : "application/vnd.openstack.identity-v2.0+xml"
             },
             {
                 "base" : "application/json",
-                "type" : "application/vnd.openstack.idm-v1.0+json"
+                "type" : "application/vnd.openstack.identity-v2.0+json"
             }
         ]
     }
diff --git a/docs/guide/src/docbkx/samples/version.xml b/docs/guide/src/docbkx/samples/version.xml
index 4f499322..08eac21e 100644
--- a/docs/guide/src/docbkx/samples/version.xml
+++ b/docs/guide/src/docbkx/samples/version.xml
@@ -5,19 +5,19 @@
 
      <media-types>
          <media-type base="application/xml"
-            type="application/vnd.openstack.idm-v1.0+xml"/>
+            type="application/vnd.openstack.identity-v2.0+xml"/>
          <media-type base="application/json"
-            type="application/vnd.openstack.idm-v1.0+json"/>
+            type="application/vnd.openstack.identity-v2.0+json"/>
      </media-types>
 
      <atom:link rel="self"
-                href="http://idm.api.openstack.org/v1.0/"/>
+                href="http://identity.api.openstack.org/v2.0/"/>
 
     <atom:link rel="describedby"
                type="application/pdf"
-               href="http://docs.rackspacecloud.com/idm/api/v1.0/idm-devguide-20110125.pdf" />
+               href="http://docs.rackspacecloud.com/identity/api/v2.0/idm-devguide-20110125.pdf" />
 
     <atom:link rel="describedby"
                type="application/vnd.sun.wadl+xml"
-               href="http://docs.rackspacecloud.com/idm/api/v1.0/application.wadl" />
+               href="http://docs.rackspacecloud.com/identity/api/v2.0/application.wadl" />
 </version>
diff --git a/docs/guide/src/docbkx/samples/versions-atom.xml b/docs/guide/src/docbkx/samples/versions-atom.xml
index e75cf416..d9fcade7 100644
--- a/docs/guide/src/docbkx/samples/versions-atom.xml
+++ b/docs/guide/src/docbkx/samples/versions-atom.xml
@@ -2,21 +2,21 @@
 <feed xmlns="http://www.w3.org/2005/Atom">
     <title type="text">Available API Versions</title>
     <updated>2010-12-12T18:30:02.25Z</updated>
-    <id>http://idm.api.openstack.org/</id>
+    <id>http://identity.api.openstack.org/</id>
     <author><name>Rackspace</name><uri>http://www.rackspace.com/</uri></author>
-    <link rel="self" href="http://idm.api.openstack.org/"/>
+    <link rel="self" href="http://identity.api.openstack.org/"/>
     <entry>
-       <id>http://idm.api.openstack.org/v1.1/</id>
+       <id>http://identity.api.openstack.org/v1.1/</id>
        <title type="text">Version v1.1</title>
        <updated>2010-12-12T18:30:02.25Z</updated>
-       <link rel="self" href="http://idm.api.openstack.org/v1.1/"/>
+       <link rel="self" href="http://identity.api.openstack.org/v1.1/"/>
        <content type="text">Version v1.1 CURRENT (2010-12-12T18:30:02.25Z)</content>
     </entry>
     <entry>
-       <id>http://idm.api.openstack.org/v1.0/</id>
+       <id>http://identity.api.openstack.org/v2.0/</id>
        <title type="text">Version v1.0</title>
        <updated>2009-10-09T11:30:00Z</updated>
-       <link rel="self" href="http://idm.api.openstack.org/v1.0/"/>
+       <link rel="self" href="http://identity.api.openstack.org/v2.0/"/>
        <content type="text">Version v1.0 DEPRECATED (2009-10-09T11:30:00Z)</content>
     </entry>
 </feed>
diff --git a/docs/guide/src/docbkx/samples/versions.json b/docs/guide/src/docbkx/samples/versions.json
index 330a26e9..e746b38a 100644
--- a/docs/guide/src/docbkx/samples/versions.json
+++ b/docs/guide/src/docbkx/samples/versions.json
@@ -8,7 +8,7 @@
                 "links": [
                     {
                         "rel" : "self",
-                        "href" : "http://idm.api.openstack.org/v1.0/"
+                        "href" : "http://identity.api.openstack.org/v2.0/"
                     }
                 ]
             },
@@ -19,7 +19,7 @@
                 "links": [
                     {
                         "rel" : "self",
-                        "href" : "http://idm.api.openstack.org/v1.1/"
+                        "href" : "http://identity.api.openstack.org/v1.1/"
                     }
                 ]
             }
diff --git a/docs/guide/src/docbkx/samples/versions.xml b/docs/guide/src/docbkx/samples/versions.xml
index 7c3b1535..67441838 100644
--- a/docs/guide/src/docbkx/samples/versions.xml
+++ b/docs/guide/src/docbkx/samples/versions.xml
@@ -6,13 +6,13 @@
  <version id="v1.0" status="DEPRECATED" 
           updated="2009-10-09T11:30:00Z">
      <atom:link rel="self"
-                href="http://idm.api.openstack.org/v1.0/"/>
+                href="http://identity.api.openstack.org/v2.0/"/>
  </version>
 
  <version id="v1.1" status="CURRENT"
           updated="2010-12-12T18:30:02.25Z">
      <atom:link rel="self"
-                href="http://idm.api.openstack.org/v1.1/"/>
+                href="http://identity.api.openstack.org/v1.1/"/>
  </version>
 
 </versions>
diff --git a/docs/guide/src/docbkx/xsd/api.xsd b/docs/guide/src/docbkx/xsd/api.xsd
index eaa11c17..cedb4026 100644
--- a/docs/guide/src/docbkx/xsd/api.xsd
+++ b/docs/guide/src/docbkx/xsd/api.xsd
@@ -4,9 +4,9 @@
     elementFormDefault="qualified"
     attributeFormDefault="unqualified"
     xmlns="http://www.w3.org/2001/XMLSchema"
-    xmlns:idm="http://docs.openstack.org/idm/api/v1.0"
+    xmlns:idm="http://docs.openstack.org/identity/api/v2.0"
     xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    targetNamespace="http://docs.openstack.org/idm/api/v1.0"
+    targetNamespace="http://docs.openstack.org/identity/api/v2.0"
 >
     <include schemaLocation="token.xsd"/>
     <include schemaLocation="tenant.xsd"/>
diff --git a/docs/guide/src/docbkx/xsd/fault.xsd b/docs/guide/src/docbkx/xsd/fault.xsd
index 8701b9f7..c37c0419 100644
--- a/docs/guide/src/docbkx/xsd/fault.xsd
+++ b/docs/guide/src/docbkx/xsd/fault.xsd
@@ -4,9 +4,9 @@
     elementFormDefault="qualified"
     attributeFormDefault="unqualified"
     xmlns="http://www.w3.org/2001/XMLSchema"
-    xmlns:idm="http://docs.openstack.org/idm/api/v1.0"
+    xmlns:idm="http://docs.openstack.org/identity/api/v2.0"
     xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    targetNamespace="http://docs.openstack.org/idm/api/v1.0"
+    targetNamespace="http://docs.openstack.org/identity/api/v2.0"
 >
     <!-- Fault Elements -->
     <element name="idmFault" type="idm:IDMFault"/>
diff --git a/docs/guide/src/docbkx/xsd/tenant.xsd b/docs/guide/src/docbkx/xsd/tenant.xsd
index 2e4854fb..400ded28 100644
--- a/docs/guide/src/docbkx/xsd/tenant.xsd
+++ b/docs/guide/src/docbkx/xsd/tenant.xsd
@@ -4,11 +4,11 @@
     elementFormDefault="qualified"
     attributeFormDefault="unqualified"
     xmlns="http://www.w3.org/2001/XMLSchema"
-    xmlns:idm="http://docs.openstack.org/idm/api/v1.0"
+    xmlns:idm="http://docs.openstack.org/identity/api/v2.0"
     xmlns:xsd="http://www.w3.org/2001/XMLSchema"
     xmlns:vc="http://www.w3.org/2007/XMLSchema-versioning"
     xmlns:atom="http://www.w3.org/2005/Atom"
-    targetNamespace="http://docs.openstack.org/idm/api/v1.0"
+    targetNamespace="http://docs.openstack.org/identity/api/v2.0"
 >
     <!-- Import ATOM specific schema definitions -->
     <import vc:minVersion="1.1" namespace="http://www.w3.org/2005/Atom"
diff --git a/docs/guide/src/docbkx/xsd/token.xsd b/docs/guide/src/docbkx/xsd/token.xsd
index 80bcb029..de95da4c 100644
--- a/docs/guide/src/docbkx/xsd/token.xsd
+++ b/docs/guide/src/docbkx/xsd/token.xsd
@@ -4,9 +4,9 @@
     elementFormDefault="qualified"
     attributeFormDefault="unqualified"
     xmlns="http://www.w3.org/2001/XMLSchema"
-    xmlns:idm="http://docs.openstack.org/idm/api/v1.0"
+    xmlns:idm="http://docs.openstack.org/identity/api/v2.0"
     xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    targetNamespace="http://docs.openstack.org/idm/api/v1.0"
+    targetNamespace="http://docs.openstack.org/identity/api/v2.0"
 >
     <!-- Elements -->
     <element name="passwordCredentials" type="idm:PasswordCredentials"/>