Changed return symbols to all caps
Changed symbols that represent constants to *-strings