Added robust grammatical use of names.