diff --git a/openstackclient/compute/v2/agent.py b/openstackclient/compute/v2/agent.py
index c8fb6ccc0d..ae7ba9620c 100644
--- a/openstackclient/compute/v2/agent.py
+++ b/openstackclient/compute/v2/agent.py
@@ -26,7 +26,7 @@ from openstackclient.common import utils
 
 
 class CreateAgent(show.ShowOne):
-    """Create agent command"""
+    """Create compute agent command"""
 
     log = logging.getLogger(__name__ + ".CreateAgent")
 
@@ -75,7 +75,7 @@ class CreateAgent(show.ShowOne):
 
 
 class DeleteAgent(command.Command):
-    """Delete agent command"""
+    """Delete compute agent command"""
 
     log = logging.getLogger(__name__ + ".DeleteAgent")
 
@@ -95,7 +95,7 @@ class DeleteAgent(command.Command):
 
 
 class ListAgent(lister.Lister):
-    """List agent command"""
+    """List compute agent command"""
 
     log = logging.getLogger(__name__ + ".ListAgent")
 
@@ -127,7 +127,7 @@ class ListAgent(lister.Lister):
 
 
 class SetAgent(show.ShowOne):
-    """Set agent command"""
+    """Set compute agent command"""
 
     log = logging.getLogger(__name__ + ".SetAgent")
 
diff --git a/setup.cfg b/setup.cfg
index a2c34e145a..8852757be0 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -40,10 +40,10 @@ openstack.common =
     quota_show = openstackclient.common.quota:ShowQuota
 
 openstack.compute.v2 =
-    agent_create = openstackclient.compute.v2.agent:CreateAgent
-    agent_delete = openstackclient.compute.v2.agent:DeleteAgent
-    agent_list = openstackclient.compute.v2.agent:ListAgent
-    agent_set = openstackclient.compute.v2.agent:SetAgent
+    compute_agent_create = openstackclient.compute.v2.agent:CreateAgent
+    compute_agent_delete = openstackclient.compute.v2.agent:DeleteAgent
+    compute_agent_list = openstackclient.compute.v2.agent:ListAgent
+    compute_agent_set = openstackclient.compute.v2.agent:SetAgent
 
     aggregate_add_host = openstackclient.compute.v2.aggregate:AddAggregateHost
     aggregate_create = openstackclient.compute.v2.aggregate:CreateAggregate