Renamed variables in line with last commit