Update to new vmware naming scheme