Switch to more generic 'label'
Switch from 'data' to 'dataset'