Renamed map_segment to map_street