kpvs: fix heading deviation/variation names/tests