Fix macro redefinition errors
Move the offending macros to class-scope enums
System updates will be applied on Nov 25th between 7am and 9am, EST (UTC-05:00). This site will have intermittent downtime during that time.
Move the offending macros to class-scope enums