Rename DataProvider to Provider