Make names and addresses consistent