Renamed the macros