Renamed RasterDataSource -> RasterSource & ValueDataSource -> ValueSource