diff --git a/keystone/content/admin/identityadminguide.pdf b/keystone/content/admin/identityadminguide.pdf
index f2ab9251e4..e21e0b7a89 100644
Binary files a/keystone/content/admin/identityadminguide.pdf and b/keystone/content/admin/identityadminguide.pdf differ
diff --git a/keystone/content/common/samples/ext-getuser.json b/keystone/content/common/samples/ext-getuser.json
index 14217ba973..7c06815793 100644
--- a/keystone/content/common/samples/ext-getuser.json
+++ b/keystone/content/common/samples/ext-getuser.json
@@ -1,6 +1,6 @@
 {
   "user": {
-    "groups": {
+    "roles": {
       "values": [
         {
           "tenantId": "1234",
@@ -8,7 +8,8 @@
         }
       ]
     },
-    "id": "jqsmith",
+    "id": "u1000",
+    "username": "jqsmith",
     "tenantId": "1234",
     "email": "john.smith@example.org",
     "enabled": true,
diff --git a/keystone/content/common/samples/ext-getuser.xml b/keystone/content/common/samples/ext-getuser.xml
index bf0a9c6e96..43e707be02 100644
--- a/keystone/content/common/samples/ext-getuser.xml
+++ b/keystone/content/common/samples/ext-getuser.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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>
+      tenantId="1234" id="u1000" username="jqsmith">
+    <roles>
+        <role tenantId="1234" id="Admin"/>
+    </roles>
     <metadata
         xmlns="http://docs.rackspacecloud.com/identity/api/ext/meta/v2.0">
         <meta key="MetaKey1">MetaValue1</meta>
diff --git a/keystone/content/common/samples/getuser-1.json b/keystone/content/common/samples/getuser-1.json
index 5d7ee76f3b..be8ebd66fa 100644
--- a/keystone/content/common/samples/getuser-1.json
+++ b/keystone/content/common/samples/getuser-1.json
@@ -1,6 +1,6 @@
 {
   "user": {
-    "groups": {
+    "roles": {
       "values": [
         {
           "tenantId": "1234",
@@ -8,18 +8,17 @@
         }, {
           "tenantId": "1234",
           "id": "DBUser"
-        }, {
-          "id": "Super"
         }
       ],
       "links": [
         {
           "rel": "next",
-          "href": "http://identity.api.openstack.org/v2.0/tenants/1234/users/jqsmith/groups?marker=Super"
+          "href": "http://identity.api.openstack.org/v2.0/tenants/1234/users/u1000/roles?marker=Super"
         }
       ]
     },
-    "id": "jqsmith",
+    "id": "u1000",
+    "username": "jqsmith",
     "tenantId": "1234",
     "email": "john.smith@example.org",
     "enabled": true
diff --git a/keystone/content/common/samples/getuser-1.xml b/keystone/content/common/samples/getuser-1.xml
index cc0f5fc663..61cd862a1b 100644
--- a/keystone/content/common/samples/getuser-1.xml
+++ b/keystone/content/common/samples/getuser-1.xml
@@ -3,12 +3,11 @@
       xmlns:atom="http://www.w3.org/2005/Atom"
       enabled="true" email="john.smith@example.org"
       tenantId="1234" id="jqsmith">
-    <groups>
-        <group tenantId="1234" id="Admin"/>
-        <group tenantId="1234" id="DBUser"/>
-        <group id="Super"/>
+    <roles>
+        <role tenantId="1234" id="Admin"/>
+        <role tenantId="1234" id="DBUser"/>
         <atom:link
             rel="next"
-            href="http://identity.api.openstack.org/v2.0/tenants/1234/users/jqsmith/groups?marker=Super"/>
-    </groups>
+            href="http://identity.api.openstack.org/v2.0/tenants/1234/users/u1000/groups?marker=Super"/>
+    </roles>
 </user>
diff --git a/keystone/content/common/samples/samplerequestheader.json b/keystone/content/common/samples/samplerequestheader.txt
similarity index 100%
rename from keystone/content/common/samples/samplerequestheader.json
rename to keystone/content/common/samples/samplerequestheader.txt
diff --git a/keystone/content/common/samples/sampleresponseheader.json b/keystone/content/common/samples/sampleresponseheader.txt
similarity index 100%
rename from keystone/content/common/samples/sampleresponseheader.json
rename to keystone/content/common/samples/sampleresponseheader.txt
diff --git a/keystone/content/common/samples/service.json b/keystone/content/common/samples/service.json
index 552576f41c..1b31aac4f1 100644
--- a/keystone/content/common/samples/service.json
+++ b/keystone/content/common/samples/service.json
@@ -1,6 +1,7 @@
 {
   "service": {
     "id": "nova",
+    "type": "compute",
     "description": "A description ..."
   }
 }
diff --git a/keystone/content/common/samples/service.xml b/keystone/content/common/samples/service.xml
index a534365d4e..9c6d4eab0e 100644
--- a/keystone/content/common/samples/service.xml
+++ b/keystone/content/common/samples/service.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <service xmlns="http://docs.openstack.org/identity/api/v2.0" id="nova"
- description="All Access" />
+ type="compute" description="All Access" />
diff --git a/keystone/content/common/samples/services.json b/keystone/content/common/samples/services.json
index 4b29973850..6a0ac8e218 100644
--- a/keystone/content/common/samples/services.json
+++ b/keystone/content/common/samples/services.json
@@ -2,10 +2,12 @@
   "services": [
     {
       "id": "nova",
-      "description": "All access"
+      "type": "compute",
+      "description": "Computers in the Cloud"
     }, {
       "id": "glance",
-      "description": "Guest Access"
+      "type": "image-service",
+      "description": "Server Images"
     }
   ]
 }
diff --git a/keystone/content/common/samples/services.xml b/keystone/content/common/samples/services.xml
index 04e8586340..dd5327efe5 100644
--- a/keystone/content/common/samples/services.xml
+++ b/keystone/content/common/samples/services.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <services xmlns="http://docs.openstack.org/identity/api/v2.0">
-  <service id="Nova" description="Openstack Service" />
-  <service id="Glance" description="Openstack Service" />
+  <service id="Nova" type="compute" description="Openstack Service" />
+  <service id="Glance" type="image-service" description="Openstack Service" />
 </services>
\ No newline at end of file
diff --git a/keystone/content/common/samples/tenant.json b/keystone/content/common/samples/tenant.json
index 0a33a50c1d..794a61ce46 100644
--- a/keystone/content/common/samples/tenant.json
+++ b/keystone/content/common/samples/tenant.json
@@ -1,6 +1,7 @@
 {
   "tenant": {
     "id": "1234",
+    "name": "ACME corp",
     "description": "A description ...",
     "enabled": true
   }
diff --git a/keystone/content/common/samples/tenant.xml b/keystone/content/common/samples/tenant.xml
index 83210f87b5..ce0137bebe 100644
--- a/keystone/content/common/samples/tenant.xml
+++ b/keystone/content/common/samples/tenant.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <tenant xmlns="http://docs.openstack.org/identity/api/v2.0"
-        enabled="true" id="1234">
+        enabled="true" id="1234" name="ACME Corp">
     <description>A description...</description>
 </tenant>
diff --git a/keystone/content/common/samples/tenants-1.json b/keystone/content/common/samples/tenants-1.json
index 3e1498fd44..4f845760f6 100644
--- a/keystone/content/common/samples/tenants-1.json
+++ b/keystone/content/common/samples/tenants-1.json
@@ -3,6 +3,7 @@
     "values": [
       {
         "id": "1234",
+        "name": "ACME corp",
         "description": "A description ...",
         "enabled": true
       }
diff --git a/keystone/content/common/samples/tenants-1.xml b/keystone/content/common/samples/tenants-1.xml
index 18fcbfd345..e486649ebe 100644
--- a/keystone/content/common/samples/tenants-1.xml
+++ b/keystone/content/common/samples/tenants-1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <tenants xmlns="http://docs.openstack.org/identity/api/v2.0"
          xmlns:atom="http://www.w3.org/2005/Atom">
-    <tenant enabled="true" id="1234">
+    <tenant enabled="true" id="1234" name="ACME Corp">
         <description>A description...</description>
     </tenant>
     <atom:link
diff --git a/keystone/content/common/samples/tenants-2.json b/keystone/content/common/samples/tenants-2.json
index 05615072c4..c966c50561 100644
--- a/keystone/content/common/samples/tenants-2.json
+++ b/keystone/content/common/samples/tenants-2.json
@@ -3,6 +3,7 @@
     "values": [
       {
         "id": "3645",
+        "name": "Iron Works",
         "description": "A description ...",
         "enabled": true
       }
diff --git a/keystone/content/common/samples/tenants-2.xml b/keystone/content/common/samples/tenants-2.xml
index 4ad53477fd..7b049c402f 100644
--- a/keystone/content/common/samples/tenants-2.xml
+++ b/keystone/content/common/samples/tenants-2.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <tenants xmlns="http://docs.openstack.org/identity/api/v2.0"
          xmlns:atom="http://www.w3.org/2005/Atom">
-    <tenant enabled="true" id="3645">
+    <tenant enabled="true" id="3645" name="Iron Works">
         <description>A description...</description>
     </tenant>
     <atom:link
diff --git a/keystone/content/common/samples/tenants-3.json b/keystone/content/common/samples/tenants-3.json
index 28c538a1af..8546234ff9 100644
--- a/keystone/content/common/samples/tenants-3.json
+++ b/keystone/content/common/samples/tenants-3.json
@@ -3,6 +3,7 @@
     "values": [
       {
         "id": "9999",
+        "name": "Bigz",
         "description": "A description ...",
         "enabled": true
       }
diff --git a/keystone/content/common/samples/tenants-3.xml b/keystone/content/common/samples/tenants-3.xml
index 7bbd88a760..a0edcadb3d 100644
--- a/keystone/content/common/samples/tenants-3.xml
+++ b/keystone/content/common/samples/tenants-3.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <tenants xmlns="http://docs.openstack.org/identity/api/v2.0"
          xmlns:atom="http://www.w3.org/2005/Atom">
-    <tenant enabled="true" id="9999">
+    <tenant enabled="true" id="9999" name="Bigz">
         <description>A description...</description>
     </tenant>
     <atom:link
diff --git a/keystone/content/common/samples/tenants.json b/keystone/content/common/samples/tenants.json
index 13a6ea6b0d..c0f2b5d63d 100644
--- a/keystone/content/common/samples/tenants.json
+++ b/keystone/content/common/samples/tenants.json
@@ -3,10 +3,12 @@
     "values": [
       {
         "id": "1234",
+        "name": "ACME Corp",
         "description": "A description ...",
         "enabled": true
       }, {
         "id": "3456",
+        "name": "Iron Works",
         "description": "A description ...",
         "enabled": true
       }
diff --git a/keystone/content/common/samples/tenants.xml b/keystone/content/common/samples/tenants.xml
index 2a9e9c3b5c..ac5fa2d982 100644
--- a/keystone/content/common/samples/tenants.xml
+++ b/keystone/content/common/samples/tenants.xml
@@ -5,10 +5,10 @@ Date: Sun, 1 Jan 2011 9:00:00 GMT
 
 <?xml version="1.0" encoding="UTF-8"?>
 <tenants xmlns="http://docs.openstack.org/identity/api/v2.0">
-    <tenant enabled="true" id="1234">
+    <tenant enabled="true" id="1234" name="ACME Corp">
         <description>A description...</description>
     </tenant>
-    <tenant enabled="true" id="3645">
+    <tenant enabled="true" id="3645" name="Iron Works">
         <description>A description...</description>
     </tenant>
 </tenants>
diff --git a/keystone/content/common/samples/updatedtenant.json b/keystone/content/common/samples/updatedtenant.json
index c63c3d9a33..2acf53d13d 100644
--- a/keystone/content/common/samples/updatedtenant.json
+++ b/keystone/content/common/samples/updatedtenant.json
@@ -1,6 +1,7 @@
 {
   "tenant": {
     "id": "1234",
+    "name": "ACME Corp",
     "description": "A NEW description...",
     "enabled": true
   }
diff --git a/keystone/content/common/samples/updatedtenant.xml b/keystone/content/common/samples/updatedtenant.xml
index 51999a4d5d..5b36701aed 100644
--- a/keystone/content/common/samples/updatedtenant.xml
+++ b/keystone/content/common/samples/updatedtenant.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <tenant xmlns="http://docs.openstack.org/identity/api/v2.0"
-        enabled="true" id="1234">
+        enabled="true" id="1234" name="ACME Corp">
     <description>A NEW description...</description>
 </tenant>
diff --git a/keystone/content/common/samples/user.json b/keystone/content/common/samples/user.json
new file mode 100644
index 0000000000..3106b4b929
--- /dev/null
+++ b/keystone/content/common/samples/user.json
@@ -0,0 +1,8 @@
+{
+  "user": {
+    "id": "jqsmith",
+    "tenantId": "1234",
+    "email": "john.smith@example.org",
+    "enabled": true
+	}
+}
diff --git a/keystone/content/common/samples/user.xml b/keystone/content/common/samples/user.xml
new file mode 100644
index 0000000000..fb776a6be0
--- /dev/null
+++ b/keystone/content/common/samples/user.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<user xmlns="http://docs.openstack.org/identity/api/v2.0"
+      enabled="true" email="john.smith@example.org"
+      tenantId="1234" id="jqsmith">
+</user>
diff --git a/keystone/content/common/samples/validatetoken.json b/keystone/content/common/samples/validatetoken.json
index b0c74b7cc6..3eff4601e8 100644
--- a/keystone/content/common/samples/validatetoken.json
+++ b/keystone/content/common/samples/validatetoken.json
@@ -9,15 +9,12 @@
       "username": "jqsmith",
       "roles": [
         {
-          "roleId": "Admin",
-          "id": 1,
+          "id": "Admin",
           "tenantId": "one"
         }, {
-          "roleId": "Admin",
-          "id": 1
+          "id": "compute:cloud_admin"
         }
-      ],
-      "defaultTenantId": "1234"
+      ]
     }
   }
 }
diff --git a/keystone/content/common/samples/validatetoken.xml b/keystone/content/common/samples/validatetoken.xml
index bb13f70db0..8e454f382e 100644
--- a/keystone/content/common/samples/validatetoken.xml
+++ b/keystone/content/common/samples/validatetoken.xml
@@ -6,9 +6,9 @@
 	<user username="jqsmith">
 		<roles xmlns="http://docs.openstack.org/identity/api/v2.0">
 			<role xmlns="http://docs.openstack.org/identity/api/v2.0"
-				id="4" roleId="Admin" tenantId="1234"/>
+				id="Admin" tenantId="1234"/>
 			<role xmlns="http://docs.openstack.org/identity/api/v2.0"
-				id="4" roleId="Admin"/>
+				id="Admin"/>
 		</roles>
 	</user>
 </auth>
diff --git a/keystone/content/service/identitydevguide.pdf b/keystone/content/service/identitydevguide.pdf
index f2ab9251e4..ab1f53fe78 100644
Binary files a/keystone/content/service/identitydevguide.pdf and b/keystone/content/service/identitydevguide.pdf differ