Don't use underscores in (new) bottle filenames.

Closes #14270