Halfway through replacing vmtype with tenancy+vmtype