Rename Store to Storage.