Fixed bug with storage name normalization