Renamed some ms macros