Renamed macros