Renamed peerClient and peerTracker, to Client and Tracker respectively.