diff --git a/setup.cfg b/setup.cfg
index ba5991bc..d7405fd1 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -49,27 +49,46 @@ zaqarclient.api =
     queues.v2 = zaqarclient.queues.v2.api:V2
 
 openstack.messaging.v1 =
-    queue_list = zaqarclient.queues.v1.cli:ListQueues
-    queue_create = zaqarclient.queues.v1.cli:CreateQueue
-    queue_delete = zaqarclient.queues.v1.cli:DeleteQueue
-    queue_exists = zaqarclient.queues.v1.cli:CheckQueueExistence
-    queue_set_metadata = zaqarclient.queues.v1.cli:SetQueueMetadata
-    queue_get_metadata = zaqarclient.queues.v1.cli:GetQueueMetadata
-    queue_stats = zaqarclient.queues.v1.cli:GetQueueStats
-    pool_create = zaqarclient.queues.v1.cli:CreatePool
-    pool_show = zaqarclient.queues.v1.cli:ShowPool
-    pool_update = zaqarclient.queues.v1.cli:UpdatePool
-    pool_delete = zaqarclient.queues.v1.cli:DeletePool
-    pool_list = zaqarclient.queues.v1.cli:ListPools
+    queue_list = zaqarclient.queues.v1.cli:OldListQueues
+    queue_create = zaqarclient.queues.v1.cli:OldCreateQueue
+    queue_delete = zaqarclient.queues.v1.cli:OldDeleteQueue
+    queue_exists = zaqarclient.queues.v1.cli:OldCheckQueueExistence
+    queue_set_metadata = zaqarclient.queues.v1.cli:OldSetQueueMetadata
+    queue_get_metadata = zaqarclient.queues.v1.cli:OldGetQueueMetadata
+    queue_stats = zaqarclient.queues.v1.cli:OldGetQueueStats
+    pool_create = zaqarclient.queues.v1.cli:OldCreatePool
+    pool_show = zaqarclient.queues.v1.cli:OldShowPool
+    pool_update = zaqarclient.queues.v1.cli:OldUpdatePool
+    pool_delete = zaqarclient.queues.v1.cli:OldDeletePool
+    pool_list = zaqarclient.queues.v1.cli:OldListPools
+
+    messaging_queue_list = zaqarclient.queues.v1.cli:ListQueues
+    messaging_queue_create = zaqarclient.queues.v1.cli:CreateQueue
+    messaging_queue_delete = zaqarclient.queues.v1.cli:DeleteQueue
+    messaging_queue_exists = zaqarclient.queues.v1.cli:CheckQueueExistence
+    messaging_queue_set_metadata = zaqarclient.queues.v1.cli:SetQueueMetadata
+    messaging_queue_get_metadata = zaqarclient.queues.v1.cli:GetQueueMetadata
+    messaging_queue_stats = zaqarclient.queues.v1.cli:GetQueueStats
+    messaging_pool_create = zaqarclient.queues.v1.cli:CreatePool
+    messaging_pool_show = zaqarclient.queues.v1.cli:ShowPool
+    messaging_pool_update = zaqarclient.queues.v1.cli:UpdatePool
+    messaging_pool_delete = zaqarclient.queues.v1.cli:DeletePool
+    messaging_pool_list = zaqarclient.queues.v1.cli:ListPools
+
     messaging_flavor_list = zaqarclient.queues.v1.cli:ListFlavors
     messaging_flavor_delete = zaqarclient.queues.v1.cli:DeleteFlavor
     messaging_flavor_update = zaqarclient.queues.v1.cli:UpdateFlavor
     messaging_flavor_show = zaqarclient.queues.v1.cli:ShowFlavor
     messaging_flavor_create = zaqarclient.queues.v1.cli:CreateFlavor
-    claim_create = zaqarclient.queues.v1.cli:CreateClaim
-    claim_query = zaqarclient.queues.v1.cli:QueryClaim
-    claim_renew = zaqarclient.queues.v1.cli:RenewClaim
-    claim_release = zaqarclient.queues.v1.cli:ReleaseClaim
+
+    claim_create = zaqarclient.queues.v1.cli:OldCreateClaim
+    claim_query = zaqarclient.queues.v1.cli:OldQueryClaim
+    claim_renew = zaqarclient.queues.v1.cli:OldRenewClaim
+    claim_release = zaqarclient.queues.v1.cli:OldReleaseClaim
+    messaging_claim_create = zaqarclient.queues.v1.cli:CreateClaim
+    messaging_claim_query = zaqarclient.queues.v1.cli:QueryClaim
+    messaging_claim_renew = zaqarclient.queues.v1.cli:RenewClaim
+    messaging_claim_release = zaqarclient.queues.v1.cli:ReleaseClaim
 
 openstack.messaging.v2 =
     queue_list = zaqarclient.queues.v2.cli:OldListQueues