Rename some macros

No match.