Added support for using underscores in names inside the naming conventio...

...ns.