Fix CLI data source identifiers