Fix naming, storage to store