Refactored some constant names.