Change names of macros