Removing old overrides
Ensuring more consistent naming of sum enumerations containing reserved words