Changes for variable names and trying to fix some other things related to variables.