diff --git a/ccnode/ccnodehandlers.py b/ccnode/ccnodehandlers.py
index d02626be982665b8015df3251d4972fb46d7ae7e..a7cb0bac1b8cd841658bb83b68675c1428be8c7e 100644
--- a/ccnode/ccnodehandlers.py
+++ b/ccnode/ccnodehandlers.py
@@ -24,7 +24,8 @@ TAG_NOT_FOUND_ERROR = 'Tag %s requested but unknown in node handler'
 # Hypervisor
 
 HV_TAG_MAP = {
-    'hostname' : 'get_name',
+    'h' : 'get_name',
+    'hv' : 'get_name',
     'htype' : 'get_hv_type',
     'hver' : 'get_hv_version',
     'arch' : 'get_arch_type',
@@ -40,7 +41,9 @@ HV_TAG_MAP = {
 # Vm
 
 VM_TAG_MAP = {
+    'h' : 'get_name',
     'vm' : 'get_name',
+    'hv' : 'get_hv_name',
     'vcpus' : 'get_vcpu',
     'status' : 'get_status',
     'cpu' : 'get_cpu_percent',
diff --git a/ccnode/libvirtwrapper.py b/ccnode/libvirtwrapper.py
index 9922a88f42cc81ac74adec858ef72a477bdcd9cc..01b558b5ffc4f64c8bb083ccbb245aa9e790745f 100644
--- a/ccnode/libvirtwrapper.py
+++ b/ccnode/libvirtwrapper.py
@@ -127,6 +127,9 @@ class LibvirtVm(VM):
     def get_name(self):
          return self._domain.name()
 
+    def get_hv_name(self):
+        return self._hypervisor.get_name()
+
     def get_used_mem(self):
         return self._domain.info()[2] / KILOBYTE_DIV