Renamed all macros to correct name and deactivated again