Fix camel case and add some helper classes.