From 8b504c895a302a8a16e378714b749d4604c63d1e Mon Sep 17 00:00:00 2001
From: The MMGen Project <mmgen@tuta.io>
Date: Mon, 17 Mar 2025 18:29:11 +0300
Subject: [PATCH] modtest.py, daemontest.py: remove prefixes from test files

---
 pyproject.toml                                 | 10 +++++-----
 test/daemontest_d/{ut_exec.py => exec.py}      |  2 +-
 test/daemontest_d/{ut_msg.py => msg.py}        |  2 +-
 test/daemontest_d/{ut_rpc.py => rpc.py}        |  2 +-
 test/daemontest_d/{ut_tx.py => tx.py}          |  2 +-
 test/include/unit_test.py                      |  8 +++-----
 test/modtest_d/{ut_addrlist.py => addrlist.py} |  2 +-
 .../{ut_addrparse.py => addrparse.py}          |  4 ++--
 test/modtest_d/{ut_amt.py => amt.py}           |  2 +-
 test/modtest_d/{ut_baseconv.py => baseconv.py} |  2 +-
 test/modtest_d/{ut_bip39.py => bip39.py}       |  2 +-
 test/modtest_d/{ut_bip_hd.py => bip_hd.py}     |  2 +-
 test/modtest_d/{ut_cashaddr.py => cashaddr.py} |  2 +-
 test/modtest_d/{ut_dep.py => dep.py}           |  2 +-
 test/modtest_d/{ut_devtools.py => devtools.py} |  2 +-
 test/modtest_d/{ut_ecc.py => ecc.py}           |  2 +-
 test/modtest_d/{ut_flags.py => flags.py}       |  2 +-
 test/modtest_d/{ut_gen.py => gen.py}           |  2 +-
 .../{ut_indexed_dict.py => indexed_dict.py}    |  2 +-
 test/modtest_d/{ut_lockable.py => lockable.py} |  2 +-
 test/modtest_d/{ut_misc.py => misc.py}         |  2 +-
 test/modtest_d/{ut_mn_entry.py => mn_entry.py} |  2 +-
 test/modtest_d/{ut_obj.py => obj.py}           |  2 +-
 test/modtest_d/{ut_scrypt.py => scrypt.py}     |  2 +-
 .../{ut_seedsplit.py => seedsplit.py}          |  2 +-
 test/modtest_d/{ut_subseed.py => subseed.py}   |  2 +-
 test/modtest_d/{ut_testdep.py => testdep.py}   |  2 +-
 test/modtest_d/{ut_tx.py => tx.py}             |  2 +-
 test/modtest_d/{ut_util.py => util.py}         |  2 +-
 test/modtest_d/{ut_xmrseed.py => xmrseed.py}   |  2 +-
 test/test-release.d/cfg.sh                     |  2 +-
 test/tooltest2_d/data.py                       | 18 +++++++++---------
 32 files changed, 47 insertions(+), 49 deletions(-)
 rename test/daemontest_d/{ut_exec.py => exec.py} (98%)
 rename test/daemontest_d/{ut_msg.py => msg.py} (98%)
 rename test/daemontest_d/{ut_rpc.py => rpc.py} (99%)
 rename test/daemontest_d/{ut_tx.py => tx.py} (98%)
 rename test/modtest_d/{ut_addrlist.py => addrlist.py} (97%)
 rename test/modtest_d/{ut_addrparse.py => addrparse.py} (96%)
 rename test/modtest_d/{ut_amt.py => amt.py} (97%)
 rename test/modtest_d/{ut_baseconv.py => baseconv.py} (99%)
 rename test/modtest_d/{ut_bip39.py => bip39.py} (99%)
 rename test/modtest_d/{ut_bip_hd.py => bip_hd.py} (99%)
 rename test/modtest_d/{ut_cashaddr.py => cashaddr.py} (99%)
 rename test/modtest_d/{ut_dep.py => dep.py} (98%)
 rename test/modtest_d/{ut_devtools.py => devtools.py} (97%)
 rename test/modtest_d/{ut_ecc.py => ecc.py} (98%)
 rename test/modtest_d/{ut_flags.py => flags.py} (96%)
 rename test/modtest_d/{ut_gen.py => gen.py} (97%)
 rename test/modtest_d/{ut_indexed_dict.py => indexed_dict.py} (94%)
 rename test/modtest_d/{ut_lockable.py => lockable.py} (98%)
 rename test/modtest_d/{ut_misc.py => misc.py} (99%)
 rename test/modtest_d/{ut_mn_entry.py => mn_entry.py} (96%)
 rename test/modtest_d/{ut_obj.py => obj.py} (99%)
 rename test/modtest_d/{ut_scrypt.py => scrypt.py} (97%)
 rename test/modtest_d/{ut_seedsplit.py => seedsplit.py} (98%)
 rename test/modtest_d/{ut_subseed.py => subseed.py} (98%)
 rename test/modtest_d/{ut_testdep.py => testdep.py} (95%)
 rename test/modtest_d/{ut_tx.py => tx.py} (99%)
 rename test/modtest_d/{ut_util.py => util.py} (98%)
 rename test/modtest_d/{ut_xmrseed.py => xmrseed.py} (98%)

diff --git a/pyproject.toml b/pyproject.toml
index bb8836e9..175d21df 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -36,10 +36,10 @@ ignore = [
 ]
 "test/include/common.py"        = [ "F821" ]         # undefined name 'cfg'
 "test/misc/input_func.py"       = [ "F401" ]         # imported but unused
-"test/modtest_d/ut_cashaddr.py" = [ "F841" ]         # assigned to but never used
-"test/modtest_d/ut_dep.py"      = [ "F401" ]         # imported but unused
-"test/modtest_d/ut_testdep.py"  = [ "F401" ]         # imported but unused
-"test/modtest_d/ut_obj.py"      = [ "F841" ]         # assigned to but never used
+"test/modtest_d/cashaddr.py"    = [ "F841" ]         # assigned to but never used
+"test/modtest_d/dep.py"         = [ "F401" ]         # imported but unused
+"test/modtest_d/testdep.py"     = [ "F401" ]         # imported but unused
+"test/modtest_d/obj.py"         = [ "F841" ]         # assigned to but never used
 "test/objtest_d/*"              = [ "F401" ]         # imported but unused
 "test/objattrtest_d/*"          = [ "F401" ]         # imported but unused
 "test/overlay/fakemods/*"       = [ "F403", "F405" ] # `import *` used
@@ -61,7 +61,7 @@ ignore = [
 	"pyethereum",
 	"rlp",
 	"main_split.py",
-	"ut_tx.py",
+	"tx.py",
 ]
 ignored-modules = [ # ignored for no-member, otherwise checked
 	"mmgen.proto.secp256k1.secp256k1",
diff --git a/test/daemontest_d/ut_exec.py b/test/daemontest_d/exec.py
similarity index 98%
rename from test/daemontest_d/ut_exec.py
rename to test/daemontest_d/exec.py
index b1b3ed01..97a938d5 100755
--- a/test/daemontest_d/ut_exec.py
+++ b/test/daemontest_d/exec.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 
 """
-test.daemontest_d.ut_exec: unit test for the MMGen suite's Daemon class
+test.daemontest_d.exec: unit test for the MMGen suite's Daemon class
 """
 
 from subprocess import run, PIPE
diff --git a/test/daemontest_d/ut_msg.py b/test/daemontest_d/msg.py
similarity index 98%
rename from test/daemontest_d/ut_msg.py
rename to test/daemontest_d/msg.py
index 9fbec2b8..e8e62284 100755
--- a/test/daemontest_d/ut_msg.py
+++ b/test/daemontest_d/msg.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 
 """
-test.daemontest_d.ut_msg: message signing unit tests for the MMGen suite
+test.daemontest_d.msg: message signing unit tests for the MMGen suite
 """
 
 import os
diff --git a/test/daemontest_d/ut_rpc.py b/test/daemontest_d/rpc.py
similarity index 99%
rename from test/daemontest_d/ut_rpc.py
rename to test/daemontest_d/rpc.py
index 06da34d4..41d1c21a 100755
--- a/test/daemontest_d/ut_rpc.py
+++ b/test/daemontest_d/rpc.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 
 """
-test.daemontest_d.ut_rpc: RPC unit test for the MMGen suite
+test.daemontest_d.rpc: RPC unit test for the MMGen suite
 """
 
 import sys, os
diff --git a/test/daemontest_d/ut_tx.py b/test/daemontest_d/tx.py
similarity index 98%
rename from test/daemontest_d/ut_tx.py
rename to test/daemontest_d/tx.py
index c6af05df..10b36886 100755
--- a/test/daemontest_d/ut_tx.py
+++ b/test/daemontest_d/tx.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 
 """
-test.daemontest_d.ut_tx: TX daemon tests for the MMGen suite
+test.daemontest_d.tx: TX daemon tests for the MMGen suite
 """
 
 import json
diff --git a/test/include/unit_test.py b/test/include/unit_test.py
index 4a6f478b..c60fae5a 100755
--- a/test/include/unit_test.py
+++ b/test/include/unit_test.py
@@ -77,8 +77,6 @@ type(cfg)._reset_ok += ('use_internal_keccak_module', 'debug_addrlist')
 
 set_globals(cfg)
 
-file_pfx = 'ut_'
-
 test_type = {
 	'modtest.py':    'unit',
 	'daemontest.py': 'daemon',
@@ -88,7 +86,7 @@ test_subdir = gc.prog_name.removesuffix('.py') + '_d'
 
 test_dir = os.path.join(repo_root, 'test', test_subdir)
 
-all_tests = sorted(fn[len(file_pfx):-len('.py')] for fn in os.listdir(test_dir) if fn.startswith(file_pfx))
+all_tests = sorted(fn.removesuffix('.py') for fn in os.listdir(test_dir) if not fn.startswith('_'))
 
 exclude = cfg.exclude.split(',') if cfg.exclude else []
 
@@ -105,7 +103,7 @@ if cfg.list:
 if cfg.list_subtests:
 	def gen():
 		for test in all_tests:
-			mod = importlib.import_module(f'test.{test_subdir}.{file_pfx}{test}')
+			mod = importlib.import_module(f'test.{test_subdir}.{test}')
 			if hasattr(mod, 'unit_tests'):
 				t = getattr(mod, 'unit_tests')
 				subtests = [k for k, v in t.__dict__.items() if type(v).__name__ == 'function' and k[0] != '_']
@@ -154,7 +152,7 @@ class UnitTestHelpers:
 tests_seen = []
 
 def run_test(test, subtest=None):
-	mod = importlib.import_module(f'test.{test_subdir}.{file_pfx}{test}')
+	mod = importlib.import_module(f'test.{test_subdir}.{test}')
 
 	def run_subtest(t, subtest):
 		subtest_disp = subtest.replace('_', '-')
diff --git a/test/modtest_d/ut_addrlist.py b/test/modtest_d/addrlist.py
similarity index 97%
rename from test/modtest_d/ut_addrlist.py
rename to test/modtest_d/addrlist.py
index 91661d3e..65ce0530 100755
--- a/test/modtest_d/ut_addrlist.py
+++ b/test/modtest_d/addrlist.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 
 """
-test.modtest_d.ut_addrlist: address list unit tests for the MMGen suite
+test.modtest_d.addrlist: address list unit tests for the MMGen suite
 """
 
 from mmgen.color import blue
diff --git a/test/modtest_d/ut_addrparse.py b/test/modtest_d/addrparse.py
similarity index 96%
rename from test/modtest_d/ut_addrparse.py
rename to test/modtest_d/addrparse.py
index 13eaea93..5aa644ba 100755
--- a/test/modtest_d/ut_addrparse.py
+++ b/test/modtest_d/addrparse.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 
 """
-test.modtest_d.ut_addrparse: address parsing tests for the MMGen suite
+test.modtest_d.addrparse: address parsing tests for the MMGen suite
 """
 
 from mmgen.color import yellow, cyan
@@ -21,7 +21,7 @@ vectors = {
 		{'std': 'ltc1qvmqas4maw7lg9clqu6kqu9zq9cluvllnst5pxs'}
 	],
 	'xmr_mainnet': [
-		{ # ut_xmrseed.vectors[0]:
+		{ # xmrseed.vectors[0]:
 		'std': '42ey1afDFnn4886T7196doS9GPMzexD9gXpsZJDwVjeRVdFCSoHnv7KPbBeGpzJBzHRCAs9UxqeoyFQMYbqSWYTfJJQAWDm',
 		# https://github.com/monero-project/monero/tests/functional_tests/integrated_address.py
 		'int': '4CMe2PUhs4J4886T7196doS9GPMzexD9gXpsZJDwVjeRVdFCSoHnv7KPbBeGpzJBzHRCAs9UxqeoyFQMYbqSWYTfSbLRB61BQVATzerHGj',
diff --git a/test/modtest_d/ut_amt.py b/test/modtest_d/amt.py
similarity index 97%
rename from test/modtest_d/ut_amt.py
rename to test/modtest_d/amt.py
index 2b32f2b8..810b316f 100755
--- a/test/modtest_d/ut_amt.py
+++ b/test/modtest_d/amt.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 
 """
-test.modtest_d.ut_amt: CoinAmt unit tests for the MMGen suite
+test.modtest_d.amt: CoinAmt unit tests for the MMGen suite
 """
 
 from decimal import Decimal
diff --git a/test/modtest_d/ut_baseconv.py b/test/modtest_d/baseconv.py
similarity index 99%
rename from test/modtest_d/ut_baseconv.py
rename to test/modtest_d/baseconv.py
index 8f867f7b..9d8bb283 100755
--- a/test/modtest_d/ut_baseconv.py
+++ b/test/modtest_d/baseconv.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 
 """
-test.modtest_d.ut_baseconv: Base conversion unit test for the MMGen suite
+test.modtest_d.baseconv: Base conversion unit test for the MMGen suite
 """
 
 from mmgen.util import msg, msg_r
diff --git a/test/modtest_d/ut_bip39.py b/test/modtest_d/bip39.py
similarity index 99%
rename from test/modtest_d/ut_bip39.py
rename to test/modtest_d/bip39.py
index b2ac9f64..87b53d6c 100755
--- a/test/modtest_d/ut_bip39.py
+++ b/test/modtest_d/bip39.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 
 """
-test.modtest_d.ut_bip39: BIP39 unit test for the MMGen suite
+test.modtest_d.bip39: BIP39 unit test for the MMGen suite
 """
 
 from mmgen.color import blue, orange, purple
diff --git a/test/modtest_d/ut_bip_hd.py b/test/modtest_d/bip_hd.py
similarity index 99%
rename from test/modtest_d/ut_bip_hd.py
rename to test/modtest_d/bip_hd.py
index 568e8497..f7361660 100755
--- a/test/modtest_d/ut_bip_hd.py
+++ b/test/modtest_d/bip_hd.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 
 """
-test.modtest_d.ut_bip_hd: bip_hd unit test for the MMGen suite
+test.modtest_d.bip_hd: bip_hd unit test for the MMGen suite
 """
 
 from mmgen.color import gray, pink, blue
diff --git a/test/modtest_d/ut_cashaddr.py b/test/modtest_d/cashaddr.py
similarity index 99%
rename from test/modtest_d/ut_cashaddr.py
rename to test/modtest_d/cashaddr.py
index cd0c146d..51f0fccd 100755
--- a/test/modtest_d/ut_cashaddr.py
+++ b/test/modtest_d/cashaddr.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 
 """
-test.modtest_d.ut_cashaddr: unit test for the BCH cashaddr module
+test.modtest_d.cashaddr: unit test for the BCH cashaddr module
 """
 
 altcoin_dep = True
diff --git a/test/modtest_d/ut_dep.py b/test/modtest_d/dep.py
similarity index 98%
rename from test/modtest_d/ut_dep.py
rename to test/modtest_d/dep.py
index a9fe4e99..256b32dc 100755
--- a/test/modtest_d/ut_dep.py
+++ b/test/modtest_d/dep.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 
 """
-test.modtest_d.ut_dep: dependency unit tests for the MMGen suite
+test.modtest_d.dep: dependency unit tests for the MMGen suite
 
   Test whether dependencies are installed and functional.
   No data verification is performed.
diff --git a/test/modtest_d/ut_devtools.py b/test/modtest_d/devtools.py
similarity index 97%
rename from test/modtest_d/ut_devtools.py
rename to test/modtest_d/devtools.py
index aad9fdaa..70689afc 100755
--- a/test/modtest_d/ut_devtools.py
+++ b/test/modtest_d/devtools.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 
 """
-test.modtest_d.ut_devtools: devtools unit tests for the MMGen suite
+test.modtest_d.devtools: devtools unit tests for the MMGen suite
 """
 
 import os, json
diff --git a/test/modtest_d/ut_ecc.py b/test/modtest_d/ecc.py
similarity index 98%
rename from test/modtest_d/ut_ecc.py
rename to test/modtest_d/ecc.py
index 4587516b..f504a041 100755
--- a/test/modtest_d/ut_ecc.py
+++ b/test/modtest_d/ecc.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 
 """
-test.modtest_d.ut_ecc: elliptic curve unit test for the MMGen suite
+test.modtest_d.ecc: elliptic curve unit test for the MMGen suite
 """
 
 from mmgen.proto.secp256k1.secp256k1 import pubkey_gen, pubkey_tweak_add, pubkey_check
diff --git a/test/modtest_d/ut_flags.py b/test/modtest_d/flags.py
similarity index 96%
rename from test/modtest_d/ut_flags.py
rename to test/modtest_d/flags.py
index 8d9eb342..beb5ea01 100755
--- a/test/modtest_d/ut_flags.py
+++ b/test/modtest_d/flags.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 
 """
-test.modtest_d.ut_flags: unit test for the MMGen suite's ClassFlags class
+test.modtest_d.flags: unit test for the MMGen suite's ClassFlags class
 """
 
 from mmgen.flags import ClassOpts, ClassFlags
diff --git a/test/modtest_d/ut_gen.py b/test/modtest_d/gen.py
similarity index 97%
rename from test/modtest_d/ut_gen.py
rename to test/modtest_d/gen.py
index 0053f345..e94ff45c 100755
--- a/test/modtest_d/ut_gen.py
+++ b/test/modtest_d/gen.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 
 """
-test.modtest_d.ut_gen: key/address generation unit tests for the MMGen suite
+test.modtest_d.gen: key/address generation unit tests for the MMGen suite
 """
 
 from mmgen.color import blue
diff --git a/test/modtest_d/ut_indexed_dict.py b/test/modtest_d/indexed_dict.py
similarity index 94%
rename from test/modtest_d/ut_indexed_dict.py
rename to test/modtest_d/indexed_dict.py
index 02d6be2b..ecdf880a 100755
--- a/test/modtest_d/ut_indexed_dict.py
+++ b/test/modtest_d/indexed_dict.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 
 """
-test.modtest_d.ut_indexed_dict: IndexedDict class unit test for the MMGen suite
+test.modtest_d.indexed_dict: IndexedDict class unit test for the MMGen suite
 """
 
 from mmgen.util import msg, msg_r, die
diff --git a/test/modtest_d/ut_lockable.py b/test/modtest_d/lockable.py
similarity index 98%
rename from test/modtest_d/ut_lockable.py
rename to test/modtest_d/lockable.py
index 41cb2318..1148c1cf 100755
--- a/test/modtest_d/ut_lockable.py
+++ b/test/modtest_d/lockable.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 
 """
-test.modtest_d.ut_lockable: unit test for the MMGen suite's Lockable class
+test.modtest_d.lockable: unit test for the MMGen suite's Lockable class
 """
 
 from decimal import Decimal
diff --git a/test/modtest_d/ut_misc.py b/test/modtest_d/misc.py
similarity index 99%
rename from test/modtest_d/ut_misc.py
rename to test/modtest_d/misc.py
index 5d95f0d9..bbb50568 100755
--- a/test/modtest_d/ut_misc.py
+++ b/test/modtest_d/misc.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 
 """
-test.modtest_d.ut_misc: miscellaneous unit tests for the MMGen suite
+test.modtest_d.misc: miscellaneous unit tests for the MMGen suite
 """
 
 import re, time
diff --git a/test/modtest_d/ut_mn_entry.py b/test/modtest_d/mn_entry.py
similarity index 96%
rename from test/modtest_d/ut_mn_entry.py
rename to test/modtest_d/mn_entry.py
index 53259c59..97e725c3 100755
--- a/test/modtest_d/ut_mn_entry.py
+++ b/test/modtest_d/mn_entry.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 
 """
-test.modtest_d.ut_mn_entry: Mnemonic user entry unit test for the MMGen suite
+test.modtest_d.mn_entry: Mnemonic user entry unit test for the MMGen suite
 """
 
 from mmgen.mn_entry import mn_entry
diff --git a/test/modtest_d/ut_obj.py b/test/modtest_d/obj.py
similarity index 99%
rename from test/modtest_d/ut_obj.py
rename to test/modtest_d/obj.py
index 87f8ad90..2d88b498 100755
--- a/test/modtest_d/ut_obj.py
+++ b/test/modtest_d/obj.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 
 """
-test.modtest_d.ut_obj: data object unit tests for the MMGen suite
+test.modtest_d.obj: data object unit tests for the MMGen suite
 """
 
 from decimal import Decimal, getcontext
diff --git a/test/modtest_d/ut_scrypt.py b/test/modtest_d/scrypt.py
similarity index 97%
rename from test/modtest_d/ut_scrypt.py
rename to test/modtest_d/scrypt.py
index 4588a2d4..60751f44 100755
--- a/test/modtest_d/ut_scrypt.py
+++ b/test/modtest_d/scrypt.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 
 """
-test.modtest_d.ut_scrypt: password hashing unit test for the MMGen suite
+test.modtest_d.scrypt: password hashing unit test for the MMGen suite
 """
 
 from mmgen.util import msg, msg_r
diff --git a/test/modtest_d/ut_seedsplit.py b/test/modtest_d/seedsplit.py
similarity index 98%
rename from test/modtest_d/ut_seedsplit.py
rename to test/modtest_d/seedsplit.py
index d6526e42..2195d9eb 100755
--- a/test/modtest_d/ut_seedsplit.py
+++ b/test/modtest_d/seedsplit.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 
 """
-test.modtest_d.ut_seedsplit: seed splitting unit test for the MMGen suite
+test.modtest_d.seedsplit: seed splitting unit test for the MMGen suite
 """
 
 from mmgen.util import msg, msg_r
diff --git a/test/modtest_d/ut_subseed.py b/test/modtest_d/subseed.py
similarity index 98%
rename from test/modtest_d/ut_subseed.py
rename to test/modtest_d/subseed.py
index a39b90ef..40875d35 100755
--- a/test/modtest_d/ut_subseed.py
+++ b/test/modtest_d/subseed.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 
 """
-test.modtest_d.ut_subseed: subseed unit test for the MMGen suite
+test.modtest_d.subseed: subseed unit test for the MMGen suite
 """
 
 from mmgen.util import msg, msg_r
diff --git a/test/modtest_d/ut_testdep.py b/test/modtest_d/testdep.py
similarity index 95%
rename from test/modtest_d/ut_testdep.py
rename to test/modtest_d/testdep.py
index 86243ead..56b4d195 100755
--- a/test/modtest_d/ut_testdep.py
+++ b/test/modtest_d/testdep.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 
 """
-test.modtest_d.ut_testdep: test dependency unit tests for the MMGen suite
+test.modtest_d.testdep: test dependency unit tests for the MMGen suite
 """
 
 import os
diff --git a/test/modtest_d/ut_tx.py b/test/modtest_d/tx.py
similarity index 99%
rename from test/modtest_d/ut_tx.py
rename to test/modtest_d/tx.py
index 8b5d4f68..7a5cd490 100755
--- a/test/modtest_d/ut_tx.py
+++ b/test/modtest_d/tx.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 
 """
-test.modtest_d.ut_tx: TX unit tests for the MMGen suite
+test.modtest_d.tx: TX unit tests for the MMGen suite
 """
 
 import os
diff --git a/test/modtest_d/ut_util.py b/test/modtest_d/util.py
similarity index 98%
rename from test/modtest_d/ut_util.py
rename to test/modtest_d/util.py
index f855ce62..8eabb26f 100755
--- a/test/modtest_d/ut_util.py
+++ b/test/modtest_d/util.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 
 """
-test.modtest_d.ut_misc: utility unit tests for the MMGen suite
+test.modtest_d.misc: utility unit tests for the MMGen suite
 """
 
 from mmgen.color import cyan
diff --git a/test/modtest_d/ut_xmrseed.py b/test/modtest_d/xmrseed.py
similarity index 98%
rename from test/modtest_d/ut_xmrseed.py
rename to test/modtest_d/xmrseed.py
index 6daaf82d..f7ef1e70 100755
--- a/test/modtest_d/ut_xmrseed.py
+++ b/test/modtest_d/xmrseed.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 
 """
-test.modtest_d.ut_xmrseed: Monero mnemonic unit test for the MMGen suite
+test.modtest_d.xmrseed: Monero mnemonic unit test for the MMGen suite
 """
 
 altcoin_dep = True
diff --git a/test/test-release.d/cfg.sh b/test/test-release.d/cfg.sh
index 0af8a16e..5a2f4211 100755
--- a/test/test-release.d/cfg.sh
+++ b/test/test-release.d/cfg.sh
@@ -89,7 +89,7 @@ init_tests() {
 		b $pylint $PYLINT_OPTS test
 		b $pylint $PYLINT_OPTS --disable=relative-beyond-top-level test/cmdtest_d
 		a $pylint $PYLINT_OPTS --ignore-paths '.*/eth/.*' mmgen
-		a $pylint $PYLINT_OPTS --ignore-paths '.*/ut_dep.py,.*/ut_testdep.py' test
+		a $pylint $PYLINT_OPTS --ignore-paths '.*/dep.py,.*/testdep.py' test
 		a $pylint $PYLINT_OPTS --ignore-paths '.*/ct_ethdev.py' --disable=relative-beyond-top-level test/cmdtest_d
 		- $pylint $PYLINT_OPTS examples
 	"
diff --git a/test/tooltest2_d/data.py b/test/tooltest2_d/data.py
index 759b861a..a74683c3 100755
--- a/test/tooltest2_d/data.py
+++ b/test/tooltest2_d/data.py
@@ -23,9 +23,9 @@ from mmgen.bip39 import is_bip39_mnemonic
 from mmgen.baseconv import is_mmgen_mnemonic, is_b58_str
 from mmgen.xmrseed import is_xmrseed
 
-from ..modtest_d.ut_baseconv import unit_test as ut_baseconv
-from ..modtest_d.ut_bip39 import unit_tests as ut_bip39
-from ..modtest_d.ut_xmrseed import unit_tests as ut_xmrseed
+from ..modtest_d.baseconv import unit_test as baseconv
+from ..modtest_d.bip39 import unit_tests as bip39
+from ..modtest_d.xmrseed import unit_tests as xmrseed
 
 from ..include.common import cfg, sample_text
 proto = cfg._proto
@@ -110,14 +110,14 @@ zec_pubhex1 = 'e6a4edbff547f21bcc2a825b6cf70f06e266a452d2da9d6dc5c1da3d99d7e996f
 tests = {
 	'Mnemonic': {
 		'hex2mn': (
-			[([a[0]], b) for a, b in ut_baseconv.vectors['mmgen']] +
-			[([a, 'fmt=bip39'], b) for a, b in ut_bip39.vectors] +
-			[([a, 'fmt=xmrseed'], b) for a, b in ut_xmrseed.vectors]
+			[([a[0]], b) for a, b in baseconv.vectors['mmgen']] +
+			[([a, 'fmt=bip39'], b) for a, b in bip39.vectors] +
+			[([a, 'fmt=xmrseed'], b) for a, b in xmrseed.vectors]
 		),
 		'mn2hex': (
-			[([b, 'fmt=mmgen'], a[0]) for a, b in ut_baseconv.vectors['mmgen']] +
-			[([b, 'fmt=bip39'], a) for a, b in ut_bip39.vectors] +
-			[([b, 'fmt=xmrseed'], a) for a, b in ut_xmrseed.vectors]
+			[([b, 'fmt=mmgen'], a[0]) for a, b in baseconv.vectors['mmgen']] +
+			[([b, 'fmt=bip39'], a) for a, b in bip39.vectors] +
+			[([b, 'fmt=xmrseed'], a) for a, b in xmrseed.vectors]
 		),
 		'mn_rand128': [
 			([], is_mmgen_mnemonic, ['-r0']),