Aggressive renaming. The macros are already checked, so I don't agree with a need for the visibly offensive ALL_CAPS_MULTIPLE_WORDS