rename some variables to be correctly CamelCased