Compare the new peer name to ours as well
Minor changes
Fix peer name being changed 2 times