Renamed variables to reflect changed nature of input data