Made variable names consistent