Refactor to camel case