Added support for dashes and underscores in names