Implement handling of hyphenated names