Fixed some of the variable names

small fixes to the code