rename devicestorage for clarity