diff --git a/doc/source/command-objects/account.rst b/doc/source/command-objects/object-store-account.rst
similarity index 50%
rename from doc/source/command-objects/account.rst
rename to doc/source/command-objects/object-store-account.rst
index db4ad9b16e..bdc9393eaa 100644
--- a/doc/source/command-objects/account.rst
+++ b/doc/source/command-objects/object-store-account.rst
@@ -1,43 +1,43 @@
-=======
-account
-=======
+====================
+object store account
+====================
 
 Object Store v1
 
-account set
------------
+object store account set
+------------------------
 
 Set account properties
 
-.. program:: account set
+.. program:: object store account set
 .. code:: bash
 
-    os account set
+    os object store account set
         [--property <key=value> [...] ]
 
 .. option:: --property <key=value>
 
     Set a property on this account (repeat option to set multiple properties)
 
-account show
-------------
+object store account show
+-------------------------
 
 Display account details
 
-.. program:: account show
+.. program:: object store account show
 .. code:: bash
 
-    os account show
+    os object store account show
 
-account unset
--------------
+object store account unset
+--------------------------
 
 Unset account properties
 
-.. program:: account unset
+.. program:: object store account unset
 .. code:: bash
 
-    os account unset
+    os object store account unset
         [--property <key>]
 
 .. option:: --property <key>
diff --git a/setup.cfg b/setup.cfg
index 6c72bbc7d5..2498a3d355 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -332,9 +332,9 @@ openstack.network.v2 =
     network_show = openstackclient.network.v2.network:ShowNetwork
 
 openstack.object_store.v1 =
-    account_set = openstackclient.object.v1.account:SetAccount
-    account_show = openstackclient.object.v1.account:ShowAccount
-    account_unset = openstackclient.object.v1.account:UnsetAccount
+    object_store_account_set = openstackclient.object.v1.account:SetAccount
+    object_store_account_show = openstackclient.object.v1.account:ShowAccount
+    object_store_account_unset = openstackclient.object.v1.account:UnsetAccount
     container_create = openstackclient.object.v1.container:CreateContainer
     container_delete = openstackclient.object.v1.container:DeleteContainer
     container_list = openstackclient.object.v1.container:ListContainer