rename some macros