Change keys enum to camelCase
Add more enums to wrap constants.