diff --git a/doc/functional-tests.md b/doc/functional-tests.md
--- a/doc/functional-tests.md
+++ b/doc/functional-tests.md
@@ -235,7 +235,7 @@
 thread.)
 
 - Can be used to write tests where specific P2P protocol behavior is tested.
-Examples tests are `p2p-accept-block.py`, `p2p-compactblocks.py`.
+Examples tests are `p2p_unrequested_blocks.py`, `p2p_compactblocks.py`.
 
 #### Comptool
 
@@ -281,7 +281,7 @@
     acceptance is tested against the given outcome.
 
 - For examples of tests written in this framework, see
-  `invalidblockrequest.py` and `feature_block.py`.
+  `p2p_invalid_block.py` and `feature_block.py`.
 
 ### test-framework modules
 
diff --git a/test/functional/p2p-compactblocks.py b/test/functional/p2p_compactblocks.py
rename from test/functional/p2p-compactblocks.py
rename to test/functional/p2p_compactblocks.py
diff --git a/test/functional/disconnect_ban.py b/test/functional/p2p_disconnect_ban.py
rename from test/functional/disconnect_ban.py
rename to test/functional/p2p_disconnect_ban.py
diff --git a/test/functional/p2p-feefilter.py b/test/functional/p2p_feefilter.py
rename from test/functional/p2p-feefilter.py
rename to test/functional/p2p_feefilter.py
diff --git a/test/functional/p2p-fingerprint.py b/test/functional/p2p_fingerprint.py
rename from test/functional/p2p-fingerprint.py
rename to test/functional/p2p_fingerprint.py
diff --git a/test/functional/invalidblockrequest.py b/test/functional/p2p_invalid_block.py
rename from test/functional/invalidblockrequest.py
rename to test/functional/p2p_invalid_block.py
diff --git a/test/functional/invalidtxrequest.py b/test/functional/p2p_invalid_tx.py
rename from test/functional/invalidtxrequest.py
rename to test/functional/p2p_invalid_tx.py
diff --git a/test/functional/p2p-leaktests.py b/test/functional/p2p_leak.py
rename from test/functional/p2p-leaktests.py
rename to test/functional/p2p_leak.py
diff --git a/test/functional/p2p-mempool.py b/test/functional/p2p_mempool.py
rename from test/functional/p2p-mempool.py
rename to test/functional/p2p_mempool.py
diff --git a/test/functional/node_network_limited.py b/test/functional/p2p_node_network_limited.py
rename from test/functional/node_network_limited.py
rename to test/functional/p2p_node_network_limited.py
diff --git a/test/functional/sendheaders.py b/test/functional/p2p_sendheaders.py
rename from test/functional/sendheaders.py
rename to test/functional/p2p_sendheaders.py
diff --git a/test/functional/p2p-timeouts.py b/test/functional/p2p_timeouts.py
rename from test/functional/p2p-timeouts.py
rename to test/functional/p2p_timeouts.py
diff --git a/test/functional/p2p-acceptblock.py b/test/functional/p2p_unrequested_blocks.py
rename from test/functional/p2p-acceptblock.py
rename to test/functional/p2p_unrequested_blocks.py