Finish catalog zone 'zone' and 'zones' to 'catz' and 'catzs' renaming

There are leftovers from the previous refactoring effort, which left some function declarations and comments in the header file unchanged.

Finish the renaming.