Change uploaders. _and_fill -> _to_fill, _and_fit -> _to_fit