Rename macro to avoid possible future collision
3 files changed