Renamed vars in mapreduce to make more sense
Updated live templates