Rename a few macros
4 files changed