Update storage naming conventions