diff --git a/routing/dht/dht.go b/routing/dht/dht.go
index f8e5e0202..074815a18 100644
--- a/routing/dht/dht.go
+++ b/routing/dht/dht.go
@@ -622,7 +622,7 @@ func (dht *IpfsDHT) addPeerList(key u.Key, peers []*PBDHTMessage_PBPeer) []*peer
 			continue
 		}
 		// Dont add someone who is already on the list
-		p := dht.network.Find(u.Key(prov.GetId()))
+		p := dht.network.GetPeer(u.Key(prov.GetId()))
 		if p == nil {
 			u.DOut("given provider %s was not in our network already.\n", peer.ID(prov.GetId()).Pretty())
 			var err error
diff --git a/swarm/interface.go b/swarm/interface.go
index a1c7abf11..3d506df79 100644
--- a/swarm/interface.go
+++ b/swarm/interface.go
@@ -8,7 +8,7 @@ import (
 )
 
 type Network interface {
-	Find(u.Key) *peer.Peer
+	GetPeer(u.Key) *peer.Peer
 	Listen() error
 	ConnectNew(*ma.Multiaddr) (*peer.Peer, error)
 	GetConnection(id peer.ID, addr *ma.Multiaddr) (*peer.Peer, error)
diff --git a/swarm/swarm.go b/swarm/swarm.go
index eecb3518d..0a3d13bf0 100644
--- a/swarm/swarm.go
+++ b/swarm/swarm.go
@@ -390,7 +390,8 @@ func (s *Swarm) muxChan(ch *Chan, typ PBWrapper_MessageType) {
 	}
 }
 
-func (s *Swarm) Find(key u.Key) *peer.Peer {
+// GetPeer returns the peer in the swarm with given key id.
+func (s *Swarm) GetPeer(key u.Key) *peer.Peer {
 	s.connsLock.RLock()
 	defer s.connsLock.RUnlock()
 	conn, found := s.conns[key]