diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/NovaApiMetadata.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/NovaApiMetadata.java
index 75eae94c1c..74ff180dd5 100644
--- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/NovaApiMetadata.java
+++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/NovaApiMetadata.java
@@ -93,7 +93,7 @@ public class NovaApiMetadata extends BaseRestApiMetadata {
          super(NovaClient.class, NovaAsyncClient.class);
           id("openstack-nova")
          .name("OpenStack Nova Diablo+ API")
-         .identityName("tenantIdOrName:user")
+         .identityName("tenantName:user or user")
          .credentialName("password")
          .documentation(URI.create("http://api.openstack.org/"))
          .version("1.1")
diff --git a/apis/swift/src/main/java/org/jclouds/openstack/swift/SwiftApiMetadata.java b/apis/swift/src/main/java/org/jclouds/openstack/swift/SwiftApiMetadata.java
index c77c04acf6..1b1e25bf9b 100644
--- a/apis/swift/src/main/java/org/jclouds/openstack/swift/SwiftApiMetadata.java
+++ b/apis/swift/src/main/java/org/jclouds/openstack/swift/SwiftApiMetadata.java
@@ -83,7 +83,7 @@ public class SwiftApiMetadata extends BaseRestApiMetadata {
          super(syncClient, asyncClient);
          id("swift")
          .name("OpenStack Swift Pre-Diablo API")
-         .identityName("tenantId:user")
+         .identityName("tenantName:user or user")
          .credentialName("password")
          .documentation(URI.create("http://api.openstack.org/"))
          .version("1.0")
diff --git a/labs/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/GlanceApiMetadata.java b/labs/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/GlanceApiMetadata.java
index a3c1adbbfe..f5a63d0ab8 100644
--- a/labs/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/GlanceApiMetadata.java
+++ b/labs/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/GlanceApiMetadata.java
@@ -80,7 +80,7 @@ public class GlanceApiMetadata extends BaseRestApiMetadata {
          super(GlanceClient.class, GlanceAsyncClient.class);
           id("openstack-glance")
          .name("OpenStack Glance API")
-         .identityName("tenantId:user")
+         .identityName("tenantName:user or user")
          .credentialName("password")
          .documentation(URI.create("http://glance.openstack.org/glanceapi.html"))
          .version("1.0")
diff --git a/labs/openstack-quantum/src/main/java/org/jclouds/openstack/quantum/v1_0/QuantumApiMetadata.java b/labs/openstack-quantum/src/main/java/org/jclouds/openstack/quantum/v1_0/QuantumApiMetadata.java
index e1082fcd65..cb99c31f57 100644
--- a/labs/openstack-quantum/src/main/java/org/jclouds/openstack/quantum/v1_0/QuantumApiMetadata.java
+++ b/labs/openstack-quantum/src/main/java/org/jclouds/openstack/quantum/v1_0/QuantumApiMetadata.java
@@ -79,7 +79,7 @@ public class QuantumApiMetadata extends BaseRestApiMetadata {
          super(QuantumClient.class, QuantumAsyncClient.class);
           id("openstack-quantum")
          .name("OpenStack Quantum API")
-         .identityName("tenantId:user")
+         .identityName("tenantName:user or user")
          .credentialName("password")
          .documentation(URI.create("http://docs.openstack.org/api/openstack-network/1.0/content/"))
          .version("1.0")