Added more adequate names for some data sources options.