Changed more constants to capital letters.