fill: rename shapes to fill.
fill: change argument order.