diff --git a/openstackclient/identity/v2_0/token.py b/openstackclient/identity/v2_0/token.py
index 793354cf6f..c503ac57fa 100644
--- a/openstackclient/identity/v2_0/token.py
+++ b/openstackclient/identity/v2_0/token.py
@@ -23,7 +23,7 @@ from cliff import show
 
 
 class CreateToken(show.ShowOne):
-    """Create token command"""
+    """Issue token command"""
 
     log = logging.getLogger(__name__ + '.CreateToken')
 
@@ -40,7 +40,7 @@ class CreateToken(show.ShowOne):
 
 
 class DeleteToken(command.Command):
-    """Delete token command"""
+    """Revoke token command"""
 
     log = logging.getLogger(__name__ + '.DeleteToken')
 
diff --git a/openstackclient/identity/v3/token.py b/openstackclient/identity/v3/token.py
index 3cc78cd7a8..452a7ae567 100644
--- a/openstackclient/identity/v3/token.py
+++ b/openstackclient/identity/v3/token.py
@@ -186,7 +186,7 @@ class CreateRequestToken(show.ShowOne):
 
 
 class CreateToken(show.ShowOne):
-    """Create token command"""
+    """Issue token command"""
 
     log = logging.getLogger(__name__ + '.CreateToken')
 
diff --git a/setup.cfg b/setup.cfg
index a1252cb8fe..9970a4b2bd 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -151,8 +151,8 @@ openstack.identity.v2_0 =
     service_list =openstackclient.identity.v2_0.service:ListService
     service_show =openstackclient.identity.v2_0.service:ShowService
 
-    token_create =openstackclient.identity.v2_0.token:CreateToken
-    token_delete =openstackclient.identity.v2_0.token:DeleteToken
+    token_issue =openstackclient.identity.v2_0.token:CreateToken
+    token_revoke =openstackclient.identity.v2_0.token:DeleteToken
 
     user_role_list = openstackclient.identity.v2_0.role:ListUserRole
 
@@ -236,7 +236,7 @@ openstack.identity.v3 =
     service_show = openstackclient.identity.v3.service:ShowService
     service_set = openstackclient.identity.v3.service:SetService
 
-    token_create = openstackclient.identity.v3.token:CreateToken
+    token_issue = openstackclient.identity.v3.token:CreateToken
 
     user_create = openstackclient.identity.v3.user:CreateUser
     user_delete = openstackclient.identity.v3.user:DeleteUser