Made variable names consistent

Updated variables written in CAPS to be consistent with style rules