Renamed variables to better reflect their use