3 macros renamed and changed