Better handle hyphens in names.