Adjust base.polygons to new modules