Second addendum to #28 - Do not override the source names for data providers.