Correct issues with the regular expressions.

* Should take into account added dashes.
* \w matches underscore. We don't want that.