Make naming with v2 and v3 consistent