remove positional/component variants, rename some props.