Fix init macros to use z_ prefix when requested.
4 files changed