Rename vm-noname to vm-master during conversion
Rename on_host to hypervisor