Rename DataProviderProvider to merely DataProvider in order to save a developer's fingers