Camel case and other misc changes.