Change MapReduce to map-reduce; fixes #471