Variable names

Made variable names consistent with the rest of the code