diff --git a/auth_options.go b/auth_options.go
index efa5961..d26e16a 100644
--- a/auth_options.go
+++ b/auth_options.go
@@ -44,7 +44,7 @@
 	// possible.  This setting defaults to false.
 	AllowReauth bool
 
-	// Token allows users to authenticate (possibly as another user) with an
-	// authentication token.
-	Token string
+	// TokenID allows users to authenticate (possibly as another user) with an
+	// authentication token ID.
+	TokenID string
 }
diff --git a/openstack/identity/v2/tokens/requests.go b/openstack/identity/v2/tokens/requests.go
index 356bf87..074a89e 100644
--- a/openstack/identity/v2/tokens/requests.go
+++ b/openstack/identity/v2/tokens/requests.go
@@ -54,9 +54,9 @@
 		} else {
 			return nil, ErrPasswordRequired
 		}
-	} else if auth.Token != "" {
+	} else if auth.TokenID != "" {
 		authMap["token"] = map[string]interface{}{
-			"id": auth.Token,
+			"id": auth.TokenID,
 		}
 	} else {
 		return nil, fmt.Errorf("You must provide either username/password or tenantID/token values.")