Storage accounts can't have '-' in their name

We need to adjust the naming standard to say what we do for these. One option is to follow the pattern but just drop the hyphens/minus signs.