diff --git a/src/rpc/avalanche.cpp b/src/rpc/avalanche.cpp
--- a/src/rpc/avalanche.cpp
+++ b/src/rpc/avalanche.cpp
@@ -794,7 +794,8 @@
                 "",
                 "",
                 {{
-                    {RPCResult::Type::NUM, "peerid", "The peer id"},
+                    {RPCResult::Type::NUM, "avalanche_peerid",
+                     "The avalanche internal peer identifier"},
                     {RPCResult::Type::STR_HEX, "proofid",
                      "The avalanche proof id used by this peer"},
                     {RPCResult::Type::STR_HEX, "proof",
@@ -802,7 +803,7 @@
                     {RPCResult::Type::NUM, "nodecount",
                      "The number of nodes for this peer"},
                     {RPCResult::Type::ARR,
-                     "nodes",
+                     "node_list",
                      "",
                      {
                          {RPCResult::Type::NUM, "nodeid",
@@ -828,7 +829,7 @@
                                  const avalanche::Peer &peer) {
                 UniValue obj(UniValue::VOBJ);
 
-                obj.pushKV("peerid", uint64_t(peer.peerid));
+                obj.pushKV("avalanche_peerid", uint64_t(peer.peerid));
                 obj.pushKV("proofid", peer.getProofId().ToString());
                 obj.pushKV("proof", peer.proof->ToHex());
 
@@ -838,7 +839,7 @@
                 });
 
                 obj.pushKV("nodecount", uint64_t(peer.node_count));
-                obj.pushKV("nodes", nodes);
+                obj.pushKV("node_list", nodes);
 
                 return obj;
             };
diff --git a/test/functional/abc_p2p_getavaaddr.py b/test/functional/abc_p2p_getavaaddr.py
--- a/test/functional/abc_p2p_getavaaddr.py
+++ b/test/functional/abc_p2p_getavaaddr.py
@@ -183,7 +183,7 @@
                 return False
 
             for avapeer in avapeers:
-                if len(avapeer['nodes']) != num_avanode:
+                if avapeer['nodecount'] != num_avanode:
                     return False
 
             return True
diff --git a/test/functional/abc_rpc_getavalanchepeerinfo.py b/test/functional/abc_rpc_getavalanchepeerinfo.py
--- a/test/functional/abc_rpc_getavalanchepeerinfo.py
+++ b/test/functional/abc_rpc_getavalanchepeerinfo.py
@@ -68,11 +68,12 @@
         assert_equal(len(avapeerinfo), peercount)
         for i, peer in enumerate(avapeerinfo):
             proofid_hex = f"{avalanche_proof_from_hex(proofs[i]).proofid:0{64}x}"
-            assert_equal(peer["peerid"], i)
+            assert_equal(peer["avalanche_peerid"], i)
             assert_equal(peer["proofid"], proofid_hex)
             assert_equal(peer["proof"], proofs[i])
             assert_equal(peer["nodecount"], nodecount)
-            assert_equal(set(peer["nodes"]), set([n.nodeid for n in nodes[i]]))
+            assert_equal(set(peer["node_list"]), set(
+                [n.nodeid for n in nodes[i]]))
 
         self.log.info("Testing with a specified proofid")
 
diff --git a/test/functional/test_framework/avatools.py b/test/functional/test_framework/avatools.py
--- a/test/functional/test_framework/avatools.py
+++ b/test/functional/test_framework/avatools.py
@@ -150,8 +150,7 @@
 
 
 def get_proof_ids(node):
-    return [int(node.decodeavalancheproof(peer['proof'])['proofid'], 16)
-            for peer in node.getavalanchepeerinfo()]
+    return [int(peer['proofid'], 16) for peer in node.getavalanchepeerinfo()]
 
 
 def wait_for_proof(node, proofid_hex, timeout=60, expect_orphan=None):