Minor cleanup
More datasource renaming