Renamed vars in mapreduce to make more sense