- Replace dashes with underscores in shell function names, sh doesn't support...

- Replace dashes with underscores in shell function names, sh doesn't support dashes in function names (not happy about the inconsistency, but it'll do for now).