Consistent naming of macros