Refactoring Renaming StoreModel to StorageModel