Rename identifier to storage