Improve storage naming and messages