map -> map_, to avoid shadowing built-in map() func
Merge pull request #8657 from cvrebert/patch-2

map -> map_, to avoid shadowing built-in map() func