Switch to camel case naming style