Naming convention and more pronouns