Update to CAEVO terminology.