Rename datasource part 2