Allow "-" in filenames

- adds another replace-with-underscore next to "."-replacement