I'm not thrilled about difference in naming of models for V2 and V3