Refactor the types so we have distinct PV & LV types.