Fixed some poorly-named macros that were conflicting with other frameworks.