diff --git a/src/vmm_mad/exec/one_vmm_exec.rb b/src/vmm_mad/exec/one_vmm_exec.rb
index 6a3f10b4d1..7d08bddb99 100755
--- a/src/vmm_mad/exec/one_vmm_exec.rb
+++ b/src/vmm_mad/exec/one_vmm_exec.rb
@@ -620,9 +620,8 @@ class ExecDriver < VirtualMachineDriver
 
         snap_id_xpath = "VM/TEMPLATE/SNAPSHOT[ACTIVE='YES']/SNAPSHOT_ID"
         snap_id       = xml_data.elements[snap_id_xpath].text.to_i
-        snapshot_name = "onesnap-#{snap_id}"
 
-        do_action("#{deploy_id} #{snapshot_name}",
+        do_action("#{deploy_id} #{snap_id}",
                     id,
                     host,
                     ACTION[:snapshot_create],
diff --git a/src/vmm_mad/remotes/kvm/snapshot_create b/src/vmm_mad/remotes/kvm/snapshot_create
index fc9775be49..ffe5b64f6a 100755
--- a/src/vmm_mad/remotes/kvm/snapshot_create
+++ b/src/vmm_mad/remotes/kvm/snapshot_create
@@ -20,7 +20,9 @@ source $(dirname $0)/kvmrc
 source $(dirname $0)/../../scripts_common.sh
 
 DOMAIN="$1"
-NAME="$2"
+SNAP_ID="$2"
+
+NAME="snapshot-${SNAP_ID}"
 
 exec_and_log "virsh --connect $LIBVIRT_URI snapshot-create-as $DOMAIN $NAME" \
                 "Could not create snapshot $NAME for domain $DOMAIN."