added support for multi-word and hyphenated names