diff --git a/src/avalanche/peermanager.h b/src/avalanche/peermanager.h
--- a/src/avalanche/peermanager.h
+++ b/src/avalanche/peermanager.h
@@ -113,7 +113,7 @@
 
     bool updateNextRequestTime(NodeId nodeid, TimePoint timeout);
 
-    NodeId getSuitableNodeToQuery();
+    NodeId selectNode();
 
     /**
      * Exposed for tests.
diff --git a/src/avalanche/peermanager.cpp b/src/avalanche/peermanager.cpp
--- a/src/avalanche/peermanager.cpp
+++ b/src/avalanche/peermanager.cpp
@@ -129,7 +129,7 @@
     return nodes.modify(it, [&](Node &n) { n.nextRequestTime = timeout; });
 }
 
-NodeId PeerManager::getSuitableNodeToQuery() {
+NodeId PeerManager::selectNode() {
     for (int retry = 0; retry < SELECT_NODE_MAX_RETRY; retry++) {
         const PeerId p = selectPeer();
 
diff --git a/src/avalanche/processor.cpp b/src/avalanche/processor.cpp
--- a/src/avalanche/processor.cpp
+++ b/src/avalanche/processor.cpp
@@ -401,7 +401,7 @@
 
 NodeId Processor::getSuitableNodeToQuery() {
     LOCK(cs_peerManager);
-    return peerManager->getSuitableNodeToQuery();
+    return peerManager->selectNode();
 }
 
 void Processor::clearTimedoutRequests() {
diff --git a/src/avalanche/test/peermanager_tests.cpp b/src/avalanche/test/peermanager_tests.cpp
--- a/src/avalanche/test/peermanager_tests.cpp
+++ b/src/avalanche/test/peermanager_tests.cpp
@@ -357,7 +357,7 @@
 
     // Create one peer.
     PeerId peerid = pm.addPeer(100);
-    BOOST_CHECK_EQUAL(pm.getSuitableNodeToQuery(), NO_NODE);
+    BOOST_CHECK_EQUAL(pm.selectNode(), NO_NODE);
 
     // Add 4 nodes.
     for (int i = 0; i < 4; i++) {
@@ -365,7 +365,7 @@
     }
 
     for (int i = 0; i < 100; i++) {
-        NodeId n = pm.getSuitableNodeToQuery();
+        NodeId n = pm.selectNode();
         BOOST_CHECK(n >= 0 && n < 4);
         BOOST_CHECK(
             pm.updateNextRequestTime(n, std::chrono::steady_clock::now()));
@@ -375,7 +375,7 @@
     BOOST_CHECK(pm.removeNode(2));
 
     for (int i = 0; i < 100; i++) {
-        NodeId n = pm.getSuitableNodeToQuery();
+        NodeId n = pm.selectNode();
         BOOST_CHECK(n == 0 || n == 1 || n == 3);
         BOOST_CHECK(
             pm.updateNextRequestTime(n, std::chrono::steady_clock::now()));
@@ -386,7 +386,7 @@
                                                 std::chrono::hours(24)));
 
     for (int i = 0; i < 100; i++) {
-        NodeId n = pm.getSuitableNodeToQuery();
+        NodeId n = pm.selectNode();
         BOOST_CHECK(n == 0 || n == 3);
         BOOST_CHECK(
             pm.updateNextRequestTime(n, std::chrono::steady_clock::now()));
@@ -397,7 +397,7 @@
     BOOST_CHECK(pm.addNodeToPeer(altpeer, 3, CPubKey()));
 
     for (int i = 0; i < 100; i++) {
-        NodeId n = pm.getSuitableNodeToQuery();
+        NodeId n = pm.selectNode();
         BOOST_CHECK(n == 0);
         BOOST_CHECK(
             pm.updateNextRequestTime(n, std::chrono::steady_clock::now()));
@@ -409,7 +409,7 @@
     BOOST_CHECK_EQUAL(pm.compact(), 100);
 
     for (int i = 0; i < 100; i++) {
-        NodeId n = pm.getSuitableNodeToQuery();
+        NodeId n = pm.selectNode();
         BOOST_CHECK(n == 3);
         BOOST_CHECK(
             pm.updateNextRequestTime(n, std::chrono::steady_clock::now()));