Made variable names consistent with rest of code