Fixing naming issues.

Constants and enums should be ALL_CAPS.