Rename cvp to cvp_gen