Rename variables to camel case