Refactoring names and addresses