diff --git a/ccnode/ccnodehandlers.py b/ccnode/ccnodehandlers.py
index b9318a711518c7178e24b9a71853794a4891b31f..4bbc8b593e7401ed0aeaba289ce678d2ff7254c1 100644
--- a/ccnode/ccnodehandlers.py
+++ b/ccnode/ccnodehandlers.py
@@ -155,7 +155,7 @@ class NodeHandler(RpcHandler):
             return vms_info
 
     @pure
-    def stop_vm(self, vm_names=None, stop_mode=SOFT_VM_POWEROFF):
+    def stop_vm(self, vm_names=None, force=False):
         '''
         Stop the specified list of vm names
         This method do a soft shutdown on the Virtual Machine
diff --git a/ccnode/kvm.py b/ccnode/kvm.py
index b90d7fcc79e71443573f39c1221f1b415ba389a3..5cb04722e3bbfe16555e550364263b97e91a2952 100644
--- a/ccnode/kvm.py
+++ b/ccnode/kvm.py
@@ -52,7 +52,7 @@ class KvmHypervisor(LibvirtHypervisor):
                 return
         raise VMError('Virtual Machine %s not found: '% name)
 
-    def stop_vm(self, name, stop_mode=SOFT_VM_POWEROFF):
+    def stop_vm(self, name, force=False):
         '''
         Poweroff the specifed vm with the specified options
 
@@ -61,7 +61,7 @@ class KvmHypervisor(LibvirtHypervisor):
         '''
         for vm in self._vm_list:
             if vm.get_name() == name:
-                vm.shutdown() if stop_mode else vm.force_poweroff()
+                vm.force_poweroff() if force else vm.shutdown()
                 return
         raise VMError('Virtual Machine %s not found: ' % name)   
 
diff --git a/ccnode/libvirtwrapper.py b/ccnode/libvirtwrapper.py
index 527c696c332b6199b9b021c40ac39540fb7538fb..a1f8a07780aba60981b3a67d97bcd6e9c8282b6f 100644
--- a/ccnode/libvirtwrapper.py
+++ b/ccnode/libvirtwrapper.py
@@ -42,9 +42,6 @@ VM_START_STATES = {
     'paused' : 0
     }
 
-SOFT_VM_POWEROFF = True
-FORCE_VM_POWEROFF = False
-
 # Storage Pools
 
 POOL_STATE = (