Chaged enums to uppercase for consistency.