Datasource can no longer have blank names