Rename 'devices' to 'storage' and other minor fixes.