diff --git a/include/libtorrent/policy.hpp b/include/libtorrent/policy.hpp
index fa37ff6fa..e5a3199e5 100644
--- a/include/libtorrent/policy.hpp
+++ b/include/libtorrent/policy.hpp
@@ -75,7 +75,7 @@ namespace libtorrent
 		struct peer;
 		// this is called once for every peer we get from
 		// the tracker, pex, lsd or dht.
-		policy::peer* peer_from_tracker(const tcp::endpoint& remote, const peer_id& pid
+		policy::peer* add_peer(const tcp::endpoint& remote, const peer_id& pid
 			, int source, char flags);
 
 		// false means duplicate connection
diff --git a/src/policy.cpp b/src/policy.cpp
index ff4190899..6c7c29d31 100644
--- a/src/policy.cpp
+++ b/src/policy.cpp
@@ -869,7 +869,7 @@ namespace libtorrent
 		return false;
 	}
 
-	policy::peer* policy::peer_from_tracker(tcp::endpoint const& remote, peer_id const& pid
+	policy::peer* policy::add_peer(tcp::endpoint const& remote, peer_id const& pid
 		, int src, char flags)
 	{
 		INVARIANT_CHECK;
diff --git a/src/session_impl.cpp b/src/session_impl.cpp
index 531a1eebb..cc0fc9b11 100644
--- a/src/session_impl.cpp
+++ b/src/session_impl.cpp
@@ -2291,7 +2291,7 @@ namespace aux {
 		(*m_logger) << time_now_string()
 			<< ": added peer from local discovery: " << peer << "\n";
 #endif
-		t->get_policy().peer_from_tracker(peer, peer_id(0), peer_info::lsd, 0);
+		t->get_policy().add_peer(peer, peer_id(0), peer_info::lsd, 0);
 	}
 
 	void session_impl::on_port_mapping(int mapping, int port
diff --git a/src/torrent.cpp b/src/torrent.cpp
index 03c3e3b08..b55ace91c 100644
--- a/src/torrent.cpp
+++ b/src/torrent.cpp
@@ -652,7 +652,7 @@ namespace libtorrent
 				char const* ptr = peers_entry->string_ptr();
 				for (int i = 0; i < num_peers; ++i)
 				{
-					m_policy.peer_from_tracker(read_v4_endpoint<tcp::endpoint>(ptr)
+					m_policy.add_peer(read_v4_endpoint<tcp::endpoint>(ptr)
 						, id, peer_info::resume_data, 0);
 				}
 			}
@@ -663,7 +663,7 @@ namespace libtorrent
 				char const* ptr = banned_peers_entry->string_ptr();
 				for (int i = 0; i < num_peers; ++i)
 				{
-					policy::peer* p = m_policy.peer_from_tracker(read_v4_endpoint<tcp::endpoint>(ptr)
+					policy::peer* p = m_policy.add_peer(read_v4_endpoint<tcp::endpoint>(ptr)
 						, id, peer_info::resume_data, 0);
 					if (p) p->banned = true;
 				}
@@ -676,7 +676,7 @@ namespace libtorrent
 				char const* ptr = peers6_entry->string_ptr();
 				for (int i = 0; i < num_peers; ++i)
 				{
-					m_policy.peer_from_tracker(read_v6_endpoint<tcp::endpoint>(ptr)
+					m_policy.add_peer(read_v6_endpoint<tcp::endpoint>(ptr)
 						, id, peer_info::resume_data, 0);
 				}
 			}
@@ -687,7 +687,7 @@ namespace libtorrent
 				char const* ptr = banned_peers6_entry->string_ptr();
 				for (int i = 0; i < num_peers; ++i)
 				{
-					policy::peer* p = m_policy.peer_from_tracker(read_v6_endpoint<tcp::endpoint>(ptr)
+					policy::peer* p = m_policy.add_peer(read_v6_endpoint<tcp::endpoint>(ptr)
 						, id, peer_info::resume_data, 0);
 					if (p) p->banned = true;
 				}
@@ -707,7 +707,7 @@ namespace libtorrent
 					error_code ec;
 					tcp::endpoint a(address::from_string(ip, ec), (unsigned short)port);
 					if (ec) continue;
-					m_policy.peer_from_tracker(a, id, peer_info::resume_data, 0);
+					m_policy.add_peer(a, id, peer_info::resume_data, 0);
 				}
 			}
 
@@ -724,7 +724,7 @@ namespace libtorrent
 					error_code ec;
 					tcp::endpoint a(address::from_string(ip, ec), (unsigned short)port);
 					if (ec) continue;
-					policy::peer* p = m_policy.peer_from_tracker(a, id, peer_info::resume_data, 0);
+					policy::peer* p = m_policy.add_peer(a, id, peer_info::resume_data, 0);
 					if (p) p->banned = true;
 				}
 			}
@@ -1048,7 +1048,7 @@ namespace libtorrent
 				get_handle(), peers.size()));
 		}
 		std::for_each(peers.begin(), peers.end(), bind(
-			&policy::peer_from_tracker, boost::ref(m_policy), _1, peer_id(0)
+			&policy::add_peer, boost::ref(m_policy), _1, peer_id(0)
 			, peer_info::dht, 0));
 	}
 
@@ -1272,7 +1272,7 @@ namespace libtorrent
 			{
 				// ignore local addresses from the tracker (unless the tracker is local too)
 				if (is_local(a.address()) && !is_local(tracker_ip)) continue;
-				m_policy.peer_from_tracker(a, i->pid, peer_info::tracker, 0);
+				m_policy.add_peer(a, i->pid, peer_info::tracker, 0);
 			}
 		}
 
@@ -1343,7 +1343,7 @@ namespace libtorrent
 			return;
 		}
 			
-		m_policy.peer_from_tracker(*host, pid, peer_info::tracker, 0);
+		m_policy.add_peer(*host, pid, peer_info::tracker, 0);
 	}
 
 	size_type torrent::bytes_left() const
diff --git a/src/torrent_handle.cpp b/src/torrent_handle.cpp
index e59d16e02..1afc40695 100644
--- a/src/torrent_handle.cpp
+++ b/src/torrent_handle.cpp
@@ -637,7 +637,7 @@ namespace libtorrent
 		
 		peer_id id;
 		std::fill(id.begin(), id.end(), 0);
-		t->get_policy().peer_from_tracker(adr, id, source, 0);
+		t->get_policy().add_peer(adr, id, source, 0);
 	}
 
 	void torrent_handle::force_reannounce(
diff --git a/src/ut_pex.cpp b/src/ut_pex.cpp
index 90b42ef1c..e2e79f9cc 100644
--- a/src/ut_pex.cpp
+++ b/src/ut_pex.cpp
@@ -267,7 +267,7 @@ namespace libtorrent { namespace
 					char flags = *fin++;
 					// ignore local addresses unless the peer is local to us
 					if (is_local(adr.address()) && !is_local(m_pc.remote().address())) continue;
-					p.peer_from_tracker(adr, pid, peer_info::pex, flags);
+					p.add_peer(adr, pid, peer_info::pex, flags);
 				} 
 			}
 
@@ -292,7 +292,7 @@ namespace libtorrent { namespace
 					char flags = *fin++;
 					// ignore local addresses unless the peer is local to us
 					if (is_local(adr.address()) && !is_local(m_pc.remote().address())) continue;
-					p.peer_from_tracker(adr, pid, peer_info::pex, flags);
+					p.add_peer(adr, pid, peer_info::pex, flags);
 				} 
 			}
 #endif