Fixing the name of some macros.