diff --git a/source/ciao-cluster-setup.rst b/source/ciao-cluster-setup.rst
index b344aaa3..1ad39776 100644
--- a/source/ciao-cluster-setup.rst
+++ b/source/ciao-cluster-setup.rst
@@ -384,6 +384,7 @@ specific environment variables:
 * ``CIAO_COMPUTEPORT`` exports the ciao compute alternative port
 * ``CIAO_USERNAME`` exports the ciao username
 * ``CIAO_PASSWORD`` export the ciao password for ``CIAO_USERNAME``
+* ``CIAO_TENANT_NAME`` export the ciao tenant name for the user
 
 For example::
 
@@ -393,6 +394,7 @@ For example::
   export CIAO_IDENTITY=https://ciao-identity.intel.com:35357
   export CIAO_USERNAME=user
   export CIAO_PASSWORD=ciaouser
+  export CIAO_TENANT_NAME=demo
 
   $ source ciao-cli-example.sh
 
@@ -406,6 +408,7 @@ variables and override them:
 * ``CIAO_COMPUTEPORT`` can be defined by the ``--computeport`` option
 * ``CIAO_USERNAME`` can be defined by the ``--username`` option
 * ``CIAO_PASSWORD`` can be defined by the ``--password`` option
+* ``CIAO_TENANT_NAME`` can be defined by the ``--tenant-name`` option
 
 
 Start a workload
@@ -415,24 +418,24 @@ As a valid user, the `ciao-cli`_ tool allows you to start a workload.
 
 First, you may want to know which workloads are available::
 
-  $ ciao-cli -list-workloads
+  $ ciao-cli workload list
 
 Then you can launch one or more workloads::
 
-  $ ciao-cli -launch-instances -workload <workload UUID> -instances <number of instances to launch>
+  $ ciao-cli instance add -workload <workload UUID> -instances <number of instances to launch>
 
 And you can monitor all your instances statuses (``pending`` or ``running``)::
 
-  $ ciao-cli -list-instances
+  $ ciao-cli instance list
 
 Performance data can be obtained (optionally) by adding a specific label
 to all your instances::
 
-  $ ciao-cli -launch-instances -instance-label <instance-label> -workload <workload UUID> -instances <number of instances to launch>
+  $ ciao-cli instance add -label <instance-label> -workload <workload UUID> -instances <number of instances to launch>
 
 And eventually fetch the performance data::
 
-  $ ciao-cli -dump-label <instance-label>
+  $ ciao-cli trace show <instance-label>
 
 You will also see activity related to this launch across your cluster
 components if you have consoles open and logging to standard output as
@@ -461,7 +464,7 @@ Reset your cluster
 First you should delete all instances with the `ciao-cli`_ command line
 tool::
 
-  $ ciao-cli -delete-instance -all-instances
+  $ ciao-cli instance delete -all
 
 On your scheduler node, run the following command::