Datasource category naming fix