Under Config -> Switches -> Naming - Add an option to remove underscores from folder names.
This would seem to make sense, since you can already select options here to remove dots and replace with spaces and/or replace spaces with underscores.
thanks!