Cleaned up regexp and allowed support for underscore in names

Changed RegExp