diff --git a/api-ref/src/wadls/identity-api/src/v2.0/OS-KSADM/samples/user.json b/api-ref/src/wadls/identity-api/src/v2.0/OS-KSADM/samples/user.json
index 75d1508b9..903dab79c 100644
--- a/api-ref/src/wadls/identity-api/src/v2.0/OS-KSADM/samples/user.json
+++ b/api-ref/src/wadls/identity-api/src/v2.0/OS-KSADM/samples/user.json
@@ -1,7 +1,7 @@
 {
   "user": {
     "id": "u1000",
-    "username": "jqsmith",
+    "name": "jqsmith",
     "email": "john.smith@example.org",
     "enabled": true
   }
diff --git a/api-ref/src/wadls/identity-api/src/v2.0/OS-KSADM/samples/user.xml b/api-ref/src/wadls/identity-api/src/v2.0/OS-KSADM/samples/user.xml
index ccaf7ec4f..40ca2a6f9 100644
--- a/api-ref/src/wadls/identity-api/src/v2.0/OS-KSADM/samples/user.xml
+++ b/api-ref/src/wadls/identity-api/src/v2.0/OS-KSADM/samples/user.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <user xmlns="http://docs.openstack.org/identity/api/v2.0"
       enabled="true" email="john.smith@example.org"
-      username="jqsmith" id="u1000"/>
+      name="jqsmith" id="u1000"/>
diff --git a/api-ref/src/wadls/identity-api/src/v2.0/OS-KSADM/samples/users.json b/api-ref/src/wadls/identity-api/src/v2.0/OS-KSADM/samples/users.json
index 9bedcca75..2189ad173 100644
--- a/api-ref/src/wadls/identity-api/src/v2.0/OS-KSADM/samples/users.json
+++ b/api-ref/src/wadls/identity-api/src/v2.0/OS-KSADM/samples/users.json
@@ -1,16 +1,16 @@
 {
     "users":[{
             "id": "u1000",
-            "username": "jqsmith",
+            "name": "jqsmith",
             "email": "john.smith@example.org",
             "enabled": true
         },
         {
             "id": "u1001",
-            "username": "jqsmith",
+            "name": "jqsmith",
             "email": "john.smith@example.org",
             "enabled": true
         }
     ],
     "users_links":[]
-}
\ No newline at end of file
+}
diff --git a/api-ref/src/wadls/identity-api/src/v2.0/OS-KSADM/samples/users.xml b/api-ref/src/wadls/identity-api/src/v2.0/OS-KSADM/samples/users.xml
index 01b321da7..5b045c970 100644
--- a/api-ref/src/wadls/identity-api/src/v2.0/OS-KSADM/samples/users.xml
+++ b/api-ref/src/wadls/identity-api/src/v2.0/OS-KSADM/samples/users.xml
@@ -2,8 +2,8 @@
 <users xmlns="http://docs.openstack.org/identity/api/v2.0">
     <user xmlns="http://docs.openstack.org/identity/api/v2.0"
           enabled="true" email="john.smith@example.org"
-          username="jqsmith" id="u1000"/>
+          name="jqsmith" id="u1000"/>
     <user xmlns="http://docs.openstack.org/identity/api/v2.0"
           enabled="true" email="john.smith@example.org"
-          username="jqsmith" id="u1001"/>
+          name="jqsmith" id="u1001"/>
 </users>
diff --git a/api-ref/src/wadls/identity-api/src/v2.0/OS-KSADM/samples/userwithoutid.json b/api-ref/src/wadls/identity-api/src/v2.0/OS-KSADM/samples/userwithoutid.json
index 760500f70..cf7e1e6e7 100644
--- a/api-ref/src/wadls/identity-api/src/v2.0/OS-KSADM/samples/userwithoutid.json
+++ b/api-ref/src/wadls/identity-api/src/v2.0/OS-KSADM/samples/userwithoutid.json
@@ -1,6 +1,6 @@
 {
   "user": {
-    "username": "jqsmith",
+    "name": "jqsmith",
     "email": "john.smith@example.org",
     "enabled": true,
     "OS-KSADM:password": "secrete"
diff --git a/api-ref/src/wadls/identity-api/src/v2.0/OS-KSADM/samples/userwithoutid.xml b/api-ref/src/wadls/identity-api/src/v2.0/OS-KSADM/samples/userwithoutid.xml
index e5775d44a..3de7c76d2 100644
--- a/api-ref/src/wadls/identity-api/src/v2.0/OS-KSADM/samples/userwithoutid.xml
+++ b/api-ref/src/wadls/identity-api/src/v2.0/OS-KSADM/samples/userwithoutid.xml
@@ -2,5 +2,5 @@
 <user xmlns="http://docs.openstack.org/identity/api/v2.0"
       xmlns:OS-KSADM="http://docs.openstack.org/identity/api/ext/OS-KSADM/v1.0"
       enabled="true" email="john.smith@example.org"
-      username="jqsmith"
+      name="jqsmith"
       OS-KSADM:password="secrete"/>
diff --git a/api-ref/src/wadls/identity-api/src/v2.0/samples/user.json b/api-ref/src/wadls/identity-api/src/v2.0/samples/user.json
index 75d1508b9..903dab79c 100644
--- a/api-ref/src/wadls/identity-api/src/v2.0/samples/user.json
+++ b/api-ref/src/wadls/identity-api/src/v2.0/samples/user.json
@@ -1,7 +1,7 @@
 {
   "user": {
     "id": "u1000",
-    "username": "jqsmith",
+    "name": "jqsmith",
     "email": "john.smith@example.org",
     "enabled": true
   }
diff --git a/api-ref/src/wadls/identity-api/src/v2.0/samples/user.xml b/api-ref/src/wadls/identity-api/src/v2.0/samples/user.xml
index ccaf7ec4f..40ca2a6f9 100644
--- a/api-ref/src/wadls/identity-api/src/v2.0/samples/user.xml
+++ b/api-ref/src/wadls/identity-api/src/v2.0/samples/user.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <user xmlns="http://docs.openstack.org/identity/api/v2.0"
       enabled="true" email="john.smith@example.org"
-      username="jqsmith" id="u1000"/>
+      name="jqsmith" id="u1000"/>
diff --git a/api-ref/src/wadls/identity-api/src/v2.0/samples/users.json b/api-ref/src/wadls/identity-api/src/v2.0/samples/users.json
index 08db72b57..d4fca0109 100644
--- a/api-ref/src/wadls/identity-api/src/v2.0/samples/users.json
+++ b/api-ref/src/wadls/identity-api/src/v2.0/samples/users.json
@@ -1,16 +1,16 @@
 {
     "users":[{
             "id":"u1000",
-            "username":"jqsmith",
+            "name":"jqsmith",
             "email":"john.smith@example.org",
             "enabled":true
         },
         {
             "id":"u1001",
-            "username":"jqsmith",
+            "name":"jqsmith",
             "email":"john.smith@example.org",
             "enabled":true
         }
     ],
     "users_links":[]
-}
\ No newline at end of file
+}
diff --git a/api-ref/src/wadls/identity-api/src/v2.0/samples/users.xml b/api-ref/src/wadls/identity-api/src/v2.0/samples/users.xml
index 01b321da7..5b045c970 100644
--- a/api-ref/src/wadls/identity-api/src/v2.0/samples/users.xml
+++ b/api-ref/src/wadls/identity-api/src/v2.0/samples/users.xml
@@ -2,8 +2,8 @@
 <users xmlns="http://docs.openstack.org/identity/api/v2.0">
     <user xmlns="http://docs.openstack.org/identity/api/v2.0"
           enabled="true" email="john.smith@example.org"
-          username="jqsmith" id="u1000"/>
+          name="jqsmith" id="u1000"/>
     <user xmlns="http://docs.openstack.org/identity/api/v2.0"
           enabled="true" email="john.smith@example.org"
-          username="jqsmith" id="u1001"/>
+          name="jqsmith" id="u1001"/>
 </users>
diff --git a/api-ref/src/wadls/identity-api/src/v2.0/samples/userwithoutid.json b/api-ref/src/wadls/identity-api/src/v2.0/samples/userwithoutid.json
index 2a8918112..eedd3d0d1 100644
--- a/api-ref/src/wadls/identity-api/src/v2.0/samples/userwithoutid.json
+++ b/api-ref/src/wadls/identity-api/src/v2.0/samples/userwithoutid.json
@@ -1,6 +1,6 @@
 {
   "user": {
-    "username": "jqsmith",
+    "name": "jqsmith",
     "email": "john.smith@example.org",
     "enabled": true
 	}
diff --git a/api-ref/src/wadls/identity-api/src/v2.0/samples/userwithoutid.xml b/api-ref/src/wadls/identity-api/src/v2.0/samples/userwithoutid.xml
index 3e875beb8..7eddb37c9 100644
--- a/api-ref/src/wadls/identity-api/src/v2.0/samples/userwithoutid.xml
+++ b/api-ref/src/wadls/identity-api/src/v2.0/samples/userwithoutid.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <user xmlns="http://docs.openstack.org/identity/api/v2.0"
       enabled="true" email="john.smith@example.org"
-      username="jqsmith"/>
+      name="jqsmith"/>
diff --git a/api-ref/src/wadls/identity-api/src/v2.0/wadl/OS-KSADM-admin.wadl b/api-ref/src/wadls/identity-api/src/v2.0/wadl/OS-KSADM-admin.wadl
index bec4588d4..7f2915328 100644
--- a/api-ref/src/wadls/identity-api/src/v2.0/wadl/OS-KSADM-admin.wadl
+++ b/api-ref/src/wadls/identity-api/src/v2.0/wadl/OS-KSADM-admin.wadl
@@ -418,12 +418,6 @@
             <para role="shortdesc">Adds a user.</para>
         </wadl:doc>
         <request>
-            <param name="user" style="plain" required="true"
-                type="xsd:string">
-                <wadl:doc xmlns="http://docbook.org/ns/docbook"
-                    xml:lang="EN"><para>The user
-                    name.</para></wadl:doc>
-            </param>
             <representation mediaType="application/xml"
                 element="identity:user">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook"
@@ -431,8 +425,8 @@
                     <xsdxt:code
                         href="../OS-KSADM/samples/userwithoutid.xml"/>
                 </wadl:doc>
-                <param name="user" style="plain" path="/identity:user"
-                    type="UserForCreate">
+                <param name="name" style="plain" path="/identity:user"
+                    type="String">
                     <wadl:doc xmlns="http://docbook.org/ns/docbook"
                         xml:lang="EN">The user name.</wadl:doc>
                 </param>
diff --git a/api-ref/src/wadls/identity-api/src/v2.0/xsd/OS-KSADM.xsd b/api-ref/src/wadls/identity-api/src/v2.0/xsd/OS-KSADM.xsd
index 8ab48ee01..bbd47e8f7 100644
--- a/api-ref/src/wadls/identity-api/src/v2.0/xsd/OS-KSADM.xsd
+++ b/api-ref/src/wadls/identity-api/src/v2.0/xsd/OS-KSADM.xsd
@@ -119,12 +119,4 @@
         </complexContent>
     </complexType>
 
-    <complexType name="UserForCreate">
-        <complexContent>
-            <extension base="identity:User">
-                <attribute ref="OS-KSADM:password" use="optional"/>
-            </extension>
-        </complexContent>
-    </complexType>
-
 </schema>