Refactoring of names and titles