Renamed 2 macros