revert renaming, updates for storage list