(#22785) rename collect to map