zr107.c: Consistent naming conventions - NW