Fixed camel case of various variables