Remove 'V2' from scheme name