diff --git a/src/cli/one_helper/onevm_helper.rb b/src/cli/one_helper/onevm_helper.rb
index c324ec4eaf..ecb55c124f 100644
--- a/src/cli/one_helper/onevm_helper.rb
+++ b/src/cli/one_helper/onevm_helper.rb
@@ -82,9 +82,9 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
         :description => "Show all template data"
     }
 
-    HOT = {
-        :name        =>"hot",
-        :large       => "--hot",
+    LIVE = {
+        :name        =>"live",
+        :large       => "--live",
         :description => "The Image will be saved immediately"
     }
 
diff --git a/src/cli/onevm b/src/cli/onevm
index aae5469014..4adb7ae775 100755
--- a/src/cli/onevm
+++ b/src/cli/onevm
@@ -256,7 +256,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         end
     end
 
-    saveas_desc = <<-EOT.unindent
+    disk_snapshot_desc = <<-EOT.unindent
         Sets the specified VM disk to be saved in a new Image. The Image is
         created immediately, but the contents are saved only if the VM is
         shut down gracefully (i.e., using 'onevm shutdown' and not
@@ -267,13 +267,13 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         VM is shut down gracefully (i.e., using 'onevm shutdown' and not 'onevm
         delete')
 
-        If '--hot' is specified, the Image will be saved immediately.
+        If '--live' is specified, the Image will be saved immediately.
 
         States: ANY
     EOT
 
     command :saveas, saveas_desc, :vmid, :diskid, :img_name,
-            :options=>[TYPE, OneVMHelper::HOT] do
+            :options=>[TYPE, OneVMHelper::LIVE] do
         disk_id    = args[1].to_i
         image_name = args[2]
         image_type = options[:type] || ""
@@ -283,7 +283,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
 
         helper.perform_action(args[0],options,verbose) do |vm|
             res = vm.save_as(disk_id, image_name, image_type,
-                options[:hot]==true)
+                options[:live]==true)
 
             if !OpenNebula.is_error?(res)
                 puts "Image ID: #{res}"
@@ -535,13 +535,13 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         end
     end
 
-    attachdisk_desc = <<-EOT.unindent
+    disk_attach_desc = <<-EOT.unindent
         Attaches a disk to a running VM
 
         States: RUNNING
     EOT
 
-    command :attachdisk, attachdisk_desc, :vmid,
+    command :"disk-attach", disk_attach_desc, :vmid,
             :options => [OneVMHelper::FILE, OneVMHelper::IMAGE,
                          TARGET, CACHE] do
 
@@ -577,13 +577,13 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         end
     end
 
-    detachdisk_desc = <<-EOT.unindent
+    disk_detach_desc = <<-EOT.unindent
         Detaches a disk from a running VM
 
         States: RUNNING
     EOT
 
-    command :detachdisk, detachdisk_desc, :vmid, :diskid do
+    command :"disk-detach", disk_detach_desc, :vmid, :diskid do
         diskid = args[1].to_i
 
         helper.perform_action(args[0],options,"Detach disk") do |vm|