renamed some macros