Changed constants to uppercase