Update CMA/CMD wording to Maneuver Class