Prefer explicit DataProvider's name

fix for #576