Update invirt-host-master with some package renames