Rename ABCMK macros for consistency