Storage naming refactor