Change all references of Vapid to V (again)