Renamed map-util to map_util.