N1Kv: more name changes from N1k to N1kv for consistency