Remove all references to PeerName in ConnectionMaker