diff --git a/src/client_cli/cmdTemplate/templateList.go b/src/client_cli/cmdTemplate/templateList.go
index bf9e5176e44c6ec4b0d82c566aaf793cbf9d0803..a258e028f258fdbf6958b1bc93ae89ceffb2e3c5 100644
--- a/src/client_cli/cmdTemplate/templateList.go
+++ b/src/client_cli/cmdTemplate/templateList.go
@@ -9,7 +9,7 @@ func (cmd *List)GetName() string {
 }
  
 func (cmd *List)GetDesc() string {
-	return "List templates that can be listed by the user"
+	return "List available templates"
 }
 
 func (cmd *List)PrintUsage() {
diff --git a/src/client_cli/cmdUser/userWhoami.go b/src/client_cli/cmdUser/userWhoami.go
index 4efd4b668ad17e026108a60a028839f0e98f08d6..cfed13b8422416f99e0bfe8081f7744bca54b231 100644
--- a/src/client_cli/cmdUser/userWhoami.go
+++ b/src/client_cli/cmdUser/userWhoami.go
@@ -14,7 +14,7 @@ func (cmd *Whoami)GetName() string {
 }
  
 func (cmd *Whoami)GetDesc() string {
-	return "Display the user's details"
+	return "Display the authenticated user's details"
 }
 
 func (cmd *Whoami)PrintUsage() {
diff --git a/src/client_cli/cmdVM/vmList.go b/src/client_cli/cmdVM/vmList.go
index 6aed8213d48021da984b16072fe6b05b49f61afa..c0690118e4973448f2f961f349dfc69f5491b769 100644
--- a/src/client_cli/cmdVM/vmList.go
+++ b/src/client_cli/cmdVM/vmList.go
@@ -9,7 +9,7 @@ func (cmd *List)GetName() string {
 }
  
 func (cmd *List)GetDesc() string {
-	return "List VMs that can be listed by the user"
+	return "List VMs that can be listed"
 }
 
 func (cmd *List)PrintUsage() {
diff --git a/src/client_cli/cmdVM/vmListAttach.go b/src/client_cli/cmdVM/vmListAttach.go
index 8567df47d6c539310123ab97ef4265b267c2af4c..c10ccfcb1a9cffe5aa0bf80b6344a9c26e73b42d 100644
--- a/src/client_cli/cmdVM/vmListAttach.go
+++ b/src/client_cli/cmdVM/vmListAttach.go
@@ -9,7 +9,7 @@ func (cmd *ListAttach)GetName() string {
 }
  
 func (cmd *ListAttach)GetDesc() string {
-	return "List VMs the user can attach to"
+	return "List VMs that can be attached to"
 }
 
 func (cmd *ListAttach)PrintUsage() {
diff --git a/src/client_cli/cmdVM/vmListDel.go b/src/client_cli/cmdVM/vmListDel.go
index 3d27107d38f3cee54597074cff82eb5943daa56a..7701bac75a73e548d525762cd0aa2c77846db7dd 100644
--- a/src/client_cli/cmdVM/vmListDel.go
+++ b/src/client_cli/cmdVM/vmListDel.go
@@ -9,7 +9,7 @@ func (cmd *ListDel)GetName() string {
 }
  
 func (cmd *ListDel)GetDesc() string {
-	return "List VMs the user can delete"
+	return "List VMs that can be deleted"
 }
 
 func (cmd *ListDel)PrintUsage() {
diff --git a/src/client_cli/cmdVM/vmListEdit.go b/src/client_cli/cmdVM/vmListEdit.go
index 2fe522bb9923621891a9341743de3b881587cb0c..47b3356692cc41919cc6a95c656602b40e8f7a67 100644
--- a/src/client_cli/cmdVM/vmListEdit.go
+++ b/src/client_cli/cmdVM/vmListEdit.go
@@ -9,7 +9,7 @@ func (cmd *ListEdit)GetName() string {
 }
  
 func (cmd *ListEdit)GetDesc() string {
-	return "List VMs the user can edit"
+	return "List VMs that can be edited"
 }
 
 func (cmd *ListEdit)PrintUsage() {
diff --git a/src/client_cli/cmdVM/vmListEditAccess.go b/src/client_cli/cmdVM/vmListEditAccess.go
index c7db4da3d781713708c35f34ad84c2e369de7630..d8fa17daecf020ecb230ef5585e66c124c4c1b11 100644
--- a/src/client_cli/cmdVM/vmListEditAccess.go
+++ b/src/client_cli/cmdVM/vmListEditAccess.go
@@ -9,7 +9,7 @@ func (cmd *ListEditAccess)GetName() string {
 }
  
 func (cmd *ListEditAccess)GetDesc() string {
-	return "List VMs the user can edit the VM access for"
+	return "List VMs that can have their VM access edited"
 }
 
 func (cmd *ListEditAccess)PrintUsage() {
diff --git a/src/client_cli/cmdVM/vmListStart.go b/src/client_cli/cmdVM/vmListStart.go
index 96a34bfc17ddeecb243effe5e751f696751d54ff..66a486b7194b72c2eced633d69546b04517a0690 100644
--- a/src/client_cli/cmdVM/vmListStart.go
+++ b/src/client_cli/cmdVM/vmListStart.go
@@ -9,7 +9,7 @@ func (cmd *ListStart)GetName() string {
 }
  
 func (cmd *ListStart)GetDesc() string {
-	return "List VMs the user can start"
+	return "List VMs that can be started"
 }
 
 func (cmd *ListStart)PrintUsage() {
diff --git a/src/client_cli/cmdVM/vmListStop.go b/src/client_cli/cmdVM/vmListStop.go
index 534be4070f91123530f6d58246babf2d6cca19b8..e7e8a2e1b172037d39cabd29807aa78bec1c1c52 100644
--- a/src/client_cli/cmdVM/vmListStop.go
+++ b/src/client_cli/cmdVM/vmListStop.go
@@ -9,7 +9,7 @@ func (cmd *ListStop)GetName() string {
 }
  
 func (cmd *ListStop)GetDesc() string {
-	return "List VMs the user can stop"
+	return "List VMs that can be stopped"
 }
 
 func (cmd *ListStop)PrintUsage() {