Fixed variable names to proper upper and lower cases