Change ConnectionMaker from being focused on PeerName to being focused on address