diff --git a/doc/source/command-objects/endpoint.rst b/doc/source/command-objects/endpoint.rst
index 9872a58737..817ad49143 100644
--- a/doc/source/command-objects/endpoint.rst
+++ b/doc/source/command-objects/endpoint.rst
@@ -40,7 +40,7 @@ Create new endpoint
 .. _endpoint_create-endpoint:
 .. describe:: <service>
 
-    New endpoint service (name or ID)
+    Service to be associated with new endpoint (name or ID)
 
 *Identity version 3 only*
 
@@ -68,7 +68,7 @@ Create new endpoint
 
 .. describe:: <service>
 
-    New endpoint service (name or ID)
+    Service to be associated with new endpoint(name or ID)
 
 .. describe:: <interface>
 
@@ -92,7 +92,7 @@ Delete endpoint
 .. _endpoint_delete-endpoint:
 .. describe:: <endpoint-id>
 
-    Endpoint ID to delete
+    Endpoint to delete (ID only)
 
 endpoint list
 -------------
@@ -110,7 +110,7 @@ List endpoints
 
 .. option:: --service <service>
 
-    Filter by service
+    Filter by service (name or ID)
 
     *Identity version 3 only*
 
@@ -177,7 +177,7 @@ Set endpoint properties
 .. _endpoint_set-endpoint:
 .. describe:: <endpoint-id>
 
-    Endpoint ID to modify
+    Endpoint to modify (ID only)
 
 endpoint show
 -------------
diff --git a/openstackclient/identity/v2_0/endpoint.py b/openstackclient/identity/v2_0/endpoint.py
index 4ffa363ef7..ee2bab6ff0 100644
--- a/openstackclient/identity/v2_0/endpoint.py
+++ b/openstackclient/identity/v2_0/endpoint.py
@@ -31,7 +31,7 @@ class CreateEndpoint(command.ShowOne):
         parser.add_argument(
             'service',
             metavar='<service>',
-            help=_('New endpoint service (name or ID)'),
+            help=_('Service to be associated with new endpoint (name or ID)'),
         )
         parser.add_argument(
             '--publicurl',
@@ -81,7 +81,7 @@ class DeleteEndpoint(command.Command):
         parser.add_argument(
             'endpoint',
             metavar='<endpoint-id>',
-            help=_('Endpoint ID to delete'),
+            help=_('Endpoint to delete (ID only)'),
         )
         return parser
 
diff --git a/openstackclient/identity/v3/endpoint.py b/openstackclient/identity/v3/endpoint.py
index 367b4e7b1f..2f1cc9f3ce 100644
--- a/openstackclient/identity/v3/endpoint.py
+++ b/openstackclient/identity/v3/endpoint.py
@@ -40,7 +40,7 @@ class CreateEndpoint(command.ShowOne):
         parser.add_argument(
             'service',
             metavar='<service>',
-            help=_('New endpoint service (name or ID)'),
+            help=_('Service to be associated with new endpoint (name or ID)'),
         )
         parser.add_argument(
             'interface',
@@ -102,7 +102,7 @@ class DeleteEndpoint(command.Command):
         parser.add_argument(
             'endpoint',
             metavar='<endpoint-id>',
-            help=_('Endpoint ID to delete'),
+            help=_('Endpoint to delete (ID only)'),
         )
         return parser
 
@@ -121,7 +121,7 @@ class ListEndpoint(command.Lister):
         parser.add_argument(
             '--service',
             metavar='<service>',
-            help=_('Filter by service'),
+            help=_('Filter by service (name or ID)'),
         )
         parser.add_argument(
             '--interface',
@@ -169,7 +169,7 @@ class SetEndpoint(command.Command):
         parser.add_argument(
             'endpoint',
             metavar='<endpoint-id>',
-            help=_('Endpoint ID to modify'),
+            help=_('Endpoint to modify (ID only)'),
         )
         parser.add_argument(
             '--region',