Better parsing of names