Fixed camel case of various variables and statics