diff --git a/doc/source/command-objects/compute-agent.rst b/doc/source/command-objects/compute-agent.rst
index b00a981d1f..ae057dc96e 100644
--- a/doc/source/command-objects/compute-agent.rst
+++ b/doc/source/command-objects/compute-agent.rst
@@ -59,7 +59,7 @@ Delete compute agent(s)
 compute agent list
 ------------------
 
-List compute agent command
+List compute agents
 
 .. program:: compute agent list
 .. code:: bash
@@ -74,7 +74,7 @@ List compute agent command
 compute agent set
 -----------------
 
-Set compute agent command
+Set compute agent properties
 
 .. program:: agent set
 .. code:: bash
diff --git a/doc/source/command-objects/compute-service.rst b/doc/source/command-objects/compute-service.rst
index f43b5fa636..67d3eaf7c2 100644
--- a/doc/source/command-objects/compute-service.rst
+++ b/doc/source/command-objects/compute-service.rst
@@ -7,7 +7,7 @@ Compute v2
 compute service delete
 ----------------------
 
-Delete service command
+Delete compute service(s)
 
 .. program:: compute service delete
 .. code:: bash
@@ -23,7 +23,7 @@ Delete service command
 compute service list
 --------------------
 
-List service command
+List compute services
 
 .. program:: compute service list
 .. code:: bash
@@ -50,7 +50,7 @@ List service command
 compute service set
 -------------------
 
-Set service command
+Set compute service properties
 
 .. program:: compute service set
 .. code:: bash
diff --git a/doc/source/command-objects/host.rst b/doc/source/command-objects/host.rst
index 8c34d3fb97..409b834b8d 100644
--- a/doc/source/command-objects/host.rst
+++ b/doc/source/command-objects/host.rst
@@ -9,7 +9,7 @@ The physical computer running a hypervisor.
 host list
 ---------
 
-List all hosts
+List hosts
 
 .. program:: host list
 .. code:: bash
@@ -24,7 +24,7 @@ List all hosts
 host set
 --------
 
-Set host command
+Set host properties
 
 .. program:: host set
 .. code:: bash
diff --git a/openstackclient/compute/v2/agent.py b/openstackclient/compute/v2/agent.py
index 62be2424bf..4d92395511 100644
--- a/openstackclient/compute/v2/agent.py
+++ b/openstackclient/compute/v2/agent.py
@@ -29,7 +29,7 @@ LOG = logging.getLogger(__name__)
 
 
 class CreateAgent(command.ShowOne):
-    """Create compute agent command"""
+    """Create compute agent"""
 
     def get_parser(self, prog_name):
         parser = super(CreateAgent, self).get_parser(prog_name)
@@ -112,7 +112,7 @@ class DeleteAgent(command.Command):
 
 
 class ListAgent(command.Lister):
-    """List compute agent command"""
+    """List compute agents"""
 
     def get_parser(self, prog_name):
         parser = super(ListAgent, self).get_parser(prog_name)
@@ -142,7 +142,7 @@ class ListAgent(command.Lister):
 
 
 class SetAgent(command.Command):
-    """Set compute agent command"""
+    """Set compute agent properties"""
 
     def get_parser(self, prog_name):
         parser = super(SetAgent, self).get_parser(prog_name)
diff --git a/openstackclient/compute/v2/host.py b/openstackclient/compute/v2/host.py
index 7856758933..4785377e27 100644
--- a/openstackclient/compute/v2/host.py
+++ b/openstackclient/compute/v2/host.py
@@ -22,7 +22,7 @@ from openstackclient.i18n import _
 
 
 class ListHost(command.Lister):
-    """List host command"""
+    """List hosts"""
 
     def get_parser(self, prog_name):
         parser = super(ListHost, self).get_parser(prog_name)
@@ -107,7 +107,7 @@ class SetHost(command.Command):
 
 
 class ShowHost(command.Lister):
-    """Show host command"""
+    """Display host details"""
 
     def get_parser(self, prog_name):
         parser = super(ShowHost, self).get_parser(prog_name)
diff --git a/openstackclient/compute/v2/service.py b/openstackclient/compute/v2/service.py
index 2e40dd7f47..1441114baf 100644
--- a/openstackclient/compute/v2/service.py
+++ b/openstackclient/compute/v2/service.py
@@ -29,7 +29,7 @@ LOG = logging.getLogger(__name__)
 
 
 class DeleteService(command.Command):
-    """Delete service command"""
+    """Delete compute service(s)"""
 
     def get_parser(self, prog_name):
         parser = super(DeleteService, self).get_parser(prog_name)
@@ -47,7 +47,7 @@ class DeleteService(command.Command):
 
 
 class ListService(command.Lister):
-    """List service command"""
+    """List compute services"""
 
     def get_parser(self, prog_name):
         parser = super(ListService, self).get_parser(prog_name)
@@ -101,7 +101,7 @@ class ListService(command.Lister):
 
 
 class SetService(command.Command):
-    """Set service command"""
+    """Set compute service properties"""
 
     def get_parser(self, prog_name):
         parser = super(SetService, self).get_parser(prog_name)