Rename DataManager and StorageProvider methods