Fixed up regexs for more cases.
Replace all "_" with "-" ...

This could potentially backfire.