Renamed module macros.