Use camel case more consistently