More camel case fixes