Use safer names for macros
2 files changed