Rename all flags containing the substring -souper to have -souper at the start

This has bugged me for a while. It's pretty clear at this point that we
should be more consistent about this as we add more flags.