Switch to camelcase

Code should be more on par with rest of codebase.