Renamed 'geometryId' -> 'useGeometry' etc.