renamed macros