N1Kv: more variable changes from n1k to n1kv.