Rename some macros