Fix a storage bug where datasets got wrong names
Fix another storage typo bug