Fix some CAPS conventions.

All reserved words in uppercase..