Refactoring: renaming and organizing constants.