Renamed IdMatcher to CellIdMatcher.
Renamed GeometryInput to GeometryInputMapper.