Rename Storage to Store