Rename some more variables to follow camelCase convention.