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

This reverts commit 3f5c9ce95cb95a0c6fe2e79dc0caeea33de0a5d3.