diff --git a/lib/constants.py b/lib/constants.py
index e61ea3a2533ae6b8f0e83499350d509d48e33a7d..1d33128dd5a2213a36294af5664da19a1a9b1522 100644
--- a/lib/constants.py
+++ b/lib/constants.py
@@ -337,16 +337,15 @@ VNC_BASE_PORT = 5900
 VNC_PASSWORD_FILE = _autoconf.SYSCONFDIR + "/ganeti/vnc-cluster-password"
 VNC_DEFAULT_BIND_ADDRESS = '0.0.0.0'
 
-# HVM NIC types
-HT_HVM_NIC_RTL8139 = "rtl8139"
-HT_HVM_NIC_NE2K_PCI = "ne2k_pci"
-HT_HVM_NIC_NE2K_ISA = "ne2k_isa"
-HT_HVM_DEV_PARAVIRTUAL = "paravirtual"
-HT_HVM_DEV_IOEMU = "ioemu"
-HT_HVM_VALID_NIC_TYPES = frozenset([HT_HVM_NIC_RTL8139, HT_HVM_NIC_NE2K_PCI,
-                                    HT_HVM_NIC_NE2K_ISA,
-                                    HT_HVM_DEV_PARAVIRTUAL])
-HT_HVM_VALID_DISK_TYPES = frozenset([HT_HVM_DEV_PARAVIRTUAL, HT_HVM_DEV_IOEMU])
+# Device types
+HT_NIC_RTL8139 = "rtl8139"
+HT_NIC_NE2K_PCI = "ne2k_pci"
+HT_NIC_NE2K_ISA = "ne2k_isa"
+HT_NIC_PARAVIRTUAL = HT_DISK_PARAVIRTUAL = "paravirtual"
+HT_DISK_IOEMU = "ioemu"
+HT_HVM_VALID_NIC_TYPES = frozenset([HT_NIC_RTL8139, HT_NIC_NE2K_PCI,
+                                    HT_NIC_NE2K_ISA, HT_NIC_PARAVIRTUAL])
+HT_HVM_VALID_DISK_TYPES = frozenset([HT_DISK_PARAVIRTUAL, HT_DISK_IOEMU])
 
 # Cluster Verify steps
 VERIFY_NPLUSONE_MEM = 'nplusone_mem'
@@ -443,8 +442,8 @@ HVC_DEFAULTS = {
   HT_XEN_HVM: {
     HV_BOOT_ORDER: "cd",
     HV_CDROM_IMAGE_PATH: None,
-    HV_NIC_TYPE: HT_HVM_NIC_RTL8139,
-    HV_DISK_TYPE: HT_HVM_DEV_PARAVIRTUAL,
+    HV_NIC_TYPE: HT_NIC_RTL8139,
+    HV_DISK_TYPE: HT_DEV_PARAVIRTUAL,
     HV_VNC_BIND_ADDRESS: '0.0.0.0',
     HV_ACPI: True,
     HV_PAE: True,
diff --git a/lib/hypervisor/hv_xen.py b/lib/hypervisor/hv_xen.py
index 9f4a487d57cd75308daf661ab41c8201f6a5d06d..5a8e4a257f17507e88d204f3cfaa979824f7b5c7 100644
--- a/lib/hypervisor/hv_xen.py
+++ b/lib/hypervisor/hv_xen.py
@@ -617,7 +617,7 @@ class XenHvmHypervisor(XenHypervisor):
     if nic_type is None:
       # ensure old instances don't change
       nic_type_str = ", type=ioemu"
-    elif nic_type == constants.HT_HVM_DEV_PARAVIRTUAL:
+    elif nic_type == constants.HT_NIC_PARAVIRTUAL:
       nic_type_str = ", type=paravirtualized"
     else:
       nic_type_str = ", model=%s, type=ioemu" % nic_type
@@ -632,7 +632,7 @@ class XenHvmHypervisor(XenHypervisor):
     disk_data = cls._GetConfigFileDiskData(instance.disk_template,
                                             block_devices)
     disk_type = instance.hvparams[constants.HV_DISK_TYPE]
-    if disk_type in (None, constants.HT_HVM_DEV_IOEMU):
+    if disk_type in (None, constants.HT_DISK_IOEMU):
       replacement = ",ioemu:hd"
     else:
       replacement = ",hd"