Make vagrant naming sane and consistent