diff --git a/test/functional/README.md b/test/functional/README.md
index d6ce490ab3..b3d34c72fd 100644
--- a/test/functional/README.md
+++ b/test/functional/README.md
@@ -133,7 +133,7 @@ Each `TestInstance` consists of:
     acceptance is tested against the given outcome.
 
 - For examples of tests written in this framework, see
-  `invalidblockrequest.py` and `p2p-fullblocktest.py`.
+  `invalidblockrequest.py` and `feature_block.py`.
 
 ### test-framework modules
 
diff --git a/test/functional/assumevalid.py b/test/functional/feature_assumevalid.py
similarity index 100%
rename from test/functional/assumevalid.py
rename to test/functional/feature_assumevalid.py
diff --git a/test/functional/bip68-sequence.py b/test/functional/feature_bip68_sequence.py
similarity index 100%
rename from test/functional/bip68-sequence.py
rename to test/functional/feature_bip68_sequence.py
diff --git a/test/functional/bip9-softforks.py b/test/functional/feature_bip9_softforks.py
similarity index 100%
rename from test/functional/bip9-softforks.py
rename to test/functional/feature_bip9_softforks.py
diff --git a/test/functional/p2p-fullblocktest.py b/test/functional/feature_block.py
similarity index 100%
rename from test/functional/p2p-fullblocktest.py
rename to test/functional/feature_block.py
diff --git a/test/functional/bip65-cltv-p2p.py b/test/functional/feature_cltv.py
similarity index 100%
rename from test/functional/bip65-cltv-p2p.py
rename to test/functional/feature_cltv.py
diff --git a/test/functional/conf_args.py b/test/functional/feature_config_args.py
similarity index 100%
rename from test/functional/conf_args.py
rename to test/functional/feature_config_args.py
diff --git a/test/functional/bip68-112-113-p2p.py b/test/functional/feature_csv_activation.py
similarity index 100%
rename from test/functional/bip68-112-113-p2p.py
rename to test/functional/feature_csv_activation.py
diff --git a/test/functional/dbcrash.py b/test/functional/feature_dbcrash.py
similarity index 100%
rename from test/functional/dbcrash.py
rename to test/functional/feature_dbcrash.py
diff --git a/test/functional/bipdersig-p2p.py b/test/functional/feature_dersig.py
similarity index 100%
rename from test/functional/bipdersig-p2p.py
rename to test/functional/feature_dersig.py
diff --git a/test/functional/smartfees.py b/test/functional/feature_fee_estimation.py
similarity index 100%
rename from test/functional/smartfees.py
rename to test/functional/feature_fee_estimation.py
diff --git a/test/functional/maxuploadtarget.py b/test/functional/feature_maxuploadtarget.py
similarity index 100%
rename from test/functional/maxuploadtarget.py
rename to test/functional/feature_maxuploadtarget.py
diff --git a/test/functional/minchainwork.py b/test/functional/feature_minchainwork.py
similarity index 100%
rename from test/functional/minchainwork.py
rename to test/functional/feature_minchainwork.py
diff --git a/test/functional/notifications.py b/test/functional/feature_notifications.py
similarity index 100%
rename from test/functional/notifications.py
rename to test/functional/feature_notifications.py
diff --git a/test/functional/nulldummy.py b/test/functional/feature_nulldummy.py
similarity index 100%
rename from test/functional/nulldummy.py
rename to test/functional/feature_nulldummy.py
diff --git a/test/functional/proxy_test.py b/test/functional/feature_proxy.py
similarity index 100%
rename from test/functional/proxy_test.py
rename to test/functional/feature_proxy.py
diff --git a/test/functional/pruning.py b/test/functional/feature_pruning.py
similarity index 100%
rename from test/functional/pruning.py
rename to test/functional/feature_pruning.py
diff --git a/test/functional/replace-by-fee.py b/test/functional/feature_rbf.py
similarity index 100%
rename from test/functional/replace-by-fee.py
rename to test/functional/feature_rbf.py
diff --git a/test/functional/reindex.py b/test/functional/feature_reindex.py
similarity index 100%
rename from test/functional/reindex.py
rename to test/functional/feature_reindex.py
diff --git a/test/functional/segwit.py b/test/functional/feature_segwit.py
similarity index 100%
rename from test/functional/segwit.py
rename to test/functional/feature_segwit.py
diff --git a/test/functional/uacomment.py b/test/functional/feature_uacomment.py
similarity index 100%
rename from test/functional/uacomment.py
rename to test/functional/feature_uacomment.py
diff --git a/test/functional/p2p-versionbits-warning.py b/test/functional/feature_versionbits_warning.py
similarity index 100%
rename from test/functional/p2p-versionbits-warning.py
rename to test/functional/feature_versionbits_warning.py
diff --git a/test/functional/test_runner.py b/test/functional/test_runner.py
index b8b6ee98bf..6aad0f9b9d 100755
--- a/test/functional/test_runner.py
+++ b/test/functional/test_runner.py
@@ -58,10 +58,10 @@ BASE_SCRIPTS= [
     'wallet-hd.py',
     'walletbackup.py',
     # vv Tests less than 5m vv
-    'p2p-fullblocktest.py',
+    'feature_block.py',
     'fundrawtransaction.py',
     'p2p-compactblocks.py',
-    'segwit.py',
+    'feature_segwit.py',
     # vv Tests less than 2m vv
     'wallet.py',
     'wallet-accounts.py',
@@ -76,10 +76,10 @@ BASE_SCRIPTS= [
     'merkle_blocks.py',
     'receivedby.py',
     'abandonconflict.py',
-    'bip68-112-113-p2p.py',
+    'feature_csv_activation.py',
     'rawtransactions.py',
     'address_types.py',
-    'reindex.py',
+    'feature_reindex.py',
     # vv Tests less than 30s vv
     'keypool-topup.py',
     'zmq_test.py',
@@ -97,7 +97,7 @@ BASE_SCRIPTS= [
     'multiwallet.py --usecli',
     'httpbasics.py',
     'multi_rpc.py',
-    'proxy_test.py',
+    'feature_proxy.py',
     'signrawtransactions.py',
     'disconnect_ban.py',
     'decodescript.py',
@@ -110,11 +110,11 @@ BASE_SCRIPTS= [
     'prioritise_transaction.py',
     'invalidblockrequest.py',
     'invalidtxrequest.py',
-    'p2p-versionbits-warning.py',
+    'feature_versionbits_warning.py',
     'preciousblock.py',
     'importprunedfunds.py',
     'signmessages.py',
-    'nulldummy.py',
+    'feature_nulldummy.py',
     'import-rescan.py',
     'mining.py',
     'bumpfee.py',
@@ -122,17 +122,17 @@ BASE_SCRIPTS= [
     'listsinceblock.py',
     'p2p-leaktests.py',
     'wallet-encryption.py',
-    'bipdersig-p2p.py',
-    'bip65-cltv-p2p.py',
+    'feature_dersig.py',
+    'feature_cltv.py',
     'uptime.py',
     'resendwallettransactions.py',
-    'minchainwork.py',
+    'feature_minchainwork.py',
     'p2p-fingerprint.py',
-    'uacomment.py',
+    'feature_uacomment.py',
     'p2p-acceptblock.py',
     'feature_logging.py',
     'node_network_limited.py',
-    'conf_args.py',
+    'feature_config_args.py',
     # Don't append tests at the end to avoid merge conflicts
     # Put them in a random line within the section that fits their approximate run-time
 ]
@@ -140,29 +140,29 @@ BASE_SCRIPTS= [
 EXTENDED_SCRIPTS = [
     # These tests are not run by the travis build process.
     # Longest test should go first, to favor running tests in parallel
-    'pruning.py',
+    'feature_pruning.py',
     # vv Tests less than 20m vv
-    'smartfees.py',
+    'feature_fee_estimation.py',
     # vv Tests less than 5m vv
-    'maxuploadtarget.py',
+    'feature_maxuploadtarget.py',
     'mempool_packages.py',
-    'dbcrash.py',
+    'feature_dbcrash.py',
     # vv Tests less than 2m vv
-    'bip68-sequence.py',
+    'feature_bip68_sequence.py',
     'getblocktemplate_longpoll.py',
     'p2p-timeouts.py',
     # vv Tests less than 60s vv
-    'bip9-softforks.py',
+    'feature_bip9_softforks.py',
     'p2p-feefilter.py',
     'rpcbind_test.py',
     # vv Tests less than 30s vv
-    'assumevalid.py',
+    'feature_assumevalid.py',
     'example_test.py',
     'txn_doublespend.py',
     'txn_clone.py --mineblock',
-    'notifications.py',
+    'feature_notifications.py',
     'invalidateblock.py',
-    'replace-by-fee.py',
+    'feature_rbf.py',
 ]
 
 # Place EXTENDED_SCRIPTS first since it has the 3 longest running tests
@@ -474,7 +474,7 @@ class TestResult():
 def check_script_prefixes():
     """Check that no more than `EXPECTED_VIOLATION_COUNT` of the
        test scripts don't start with one of the allowed name prefixes."""
-    EXPECTED_VIOLATION_COUNT = 77
+    EXPECTED_VIOLATION_COUNT = 60
 
     # LEEWAY is provided as a transition measure, so that pull-requests
     # that introduce new tests that don't conform with the naming