More consistent storage names (only with underscores, no dash)