Renamed circle to swatch