Changed naming convention away from camel case