Rename macros to mixins