This still has `V2` in the class name.