diff --git a/src/cli/onevm b/src/cli/onevm
index 1f10b9bb81..6ad1c6b3a7 100755
--- a/src/cli/onevm
+++ b/src/cli/onevm
@@ -950,7 +950,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         This command also accepts a template, the full list of configuration
         attributes are (not all supported via options):
         OS       = ["ARCH", "MACHINE", "KERNEL", "INITRD", "BOOTLOADER", "BOOT"]
-        FEATURES = ["ACPI", "PAE", "APIC", "LOCALTIME", "HYPERV", "DEVICE_MODE"]
+        FEATURES = ["ACPI", "PAE", "APIC", "LOCALTIME", "HYPERV", "DEVICE_MODEL"]
         INPUT    = ["TYPE", "BUS"]
         GRAPHICS = ["TYPE", "LISTEN", "PASSWD", "KEYMAP" ]
         RAW      = ["DATA", "DATA_VMX", "TYPE"]
diff --git a/src/oca/ruby/opennebula/virtual_machine.rb b/src/oca/ruby/opennebula/virtual_machine.rb
index c4775acf3e..586c2761b9 100644
--- a/src/oca/ruby/opennebula/virtual_machine.rb
+++ b/src/oca/ruby/opennebula/virtual_machine.rb
@@ -680,7 +680,7 @@ module OpenNebula
         #  will replace the existing ones or delete it if empty. Attributes that
         #  can be updated are: INPUT/{TYPE, BUS}; RAW/{TYPE, DATA, DATA_VMX},
         #  OS/{BOOT, BOOTLOADER, ARCH, MACHINE, KERNEL, INITRD},
-        #  FEATURES/{ACPI, APIC, PAE, LOCALTIME, HYPERV, DEVICE_MODE},
+        #  FEATURES/{ACPI, APIC, PAE, LOCALTIME, HYPERV, DEVICE_MODEL},
         #  and GRAPHICS/{TYPE, LISTEN, PASSWD, KEYMAP}
         # @return [nil, OpenNebula::Error] nil in case of success, Error
         #   otherwise
diff --git a/src/vm/VirtualMachine.cc b/src/vm/VirtualMachine.cc
index 7352ae18c5..4b12d5ea32 100644
--- a/src/vm/VirtualMachine.cc
+++ b/src/vm/VirtualMachine.cc
@@ -4926,7 +4926,7 @@ int VirtualMachine::updateconf(VirtualMachineTemplate& tmpl, string &err)
     // Update FEATURES:
     // -------------------------------------------------------------------------
     string features_names[] = {"PAE", "ACPI", "APIC", "LOCALTIME", "HYPERV",
-        "DEVICE_MODE"};
+        "DEVICE_MODEL"};
 
     replace_vector_values(obj_template, &tmpl, "FEATURES", features_names, 6);