Changed all constants to all upper case