diff --git a/examples/halving-calculator.py b/examples/halving-calculator.py
index 4bff7ab0..13f10829 100755
--- a/examples/halving-calculator.py
+++ b/examples/halving-calculator.py
@@ -1,7 +1,16 @@
 #!/usr/bin/env python3
+#
+# mmgen = Multi-Mode GENerator, a command-line cryptocurrency wallet
+# Copyright (C)2013-2022 The MMGen Project <mmgen@tuta.io>
+# Licensed under the GNU General Public License, Version 3:
+#   https://www.gnu.org/licenses
+# Public project repositories:
+#   https://github.com/mmgen/mmgen
+#   https://gitlab.com/mmgen/mmgen
 
-# Demonstrates use of the MMGen asyncio/aiohttp JSON-RPC interface
-# https://github.com/mmgen/mmgen
+"""
+examples.halving-calculator.py: Demonstrate use of the MMGen asyncio/aiohttp JSON-RPC interface
+"""
 
 import time
 from decimal import Decimal
diff --git a/mmgen/addr.py b/mmgen/addr.py
index 5edc5202..38779de3 100755
--- a/mmgen/addr.py
+++ b/mmgen/addr.py
@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-addr.py: MMGen address-related types
+addr: MMGen address-related types
 """
 
 from collections import namedtuple
diff --git a/mmgen/addrdata.py b/mmgen/addrdata.py
index 30dc1edd..9e8c7843 100755
--- a/mmgen/addrdata.py
+++ b/mmgen/addrdata.py
@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-addrdata.py: MMGen AddrData and related classes
+addrdata: MMGen AddrData and related classes
 """
 
 from .util import vmsg,fmt,die
diff --git a/mmgen/addrfile.py b/mmgen/addrfile.py
index 3b18c7fc..7a9f732f 100755
--- a/mmgen/addrfile.py
+++ b/mmgen/addrfile.py
@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-addrfile.py:  Address and password file classes for the MMGen suite
+addrfile: Address and password file classes for the MMGen suite
 """
 
 from .util import msg,qmsg,qmsg_r,die,capfirst
diff --git a/mmgen/addrgen.py b/mmgen/addrgen.py
index 6f95f851..6fceffe2 100755
--- a/mmgen/addrgen.py
+++ b/mmgen/addrgen.py
@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-addrgen.py: Address generation initialization code for the MMGen suite
+addrgen: Address generation initialization code for the MMGen suite
 """
 
 from .keygen import KeyGenerator # convenience import
diff --git a/mmgen/addrlist.py b/mmgen/addrlist.py
index da3b9969..1f366ec9 100755
--- a/mmgen/addrlist.py
+++ b/mmgen/addrlist.py
@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-addrlist.py: Address list classes for the MMGen suite
+addrlist: Address list classes for the MMGen suite
 """
 
 from .util import qmsg,qmsg_r,suf,make_chksum_N,Msg,die
diff --git a/mmgen/amt.py b/mmgen/amt.py
index a83bcea5..36c13e20 100755
--- a/mmgen/amt.py
+++ b/mmgen/amt.py
@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-amt.py: MMGen CoinAmt and related classes
+amt: MMGen CoinAmt and related classes
 """
 
 from decimal import Decimal
diff --git a/mmgen/base_obj.py b/mmgen/base_obj.py
index 33235ac9..c583feed 100755
--- a/mmgen/base_obj.py
+++ b/mmgen/base_obj.py
@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-base_obj.py: base objects with no internal imports for the MMGen suite
+base_obj: base objects with no internal imports for the MMGen suite
 """
 
 class AsyncInit(type):
diff --git a/mmgen/baseconv.py b/mmgen/baseconv.py
index b78e8c6b..b5c4dee3 100755
--- a/mmgen/baseconv.py
+++ b/mmgen/baseconv.py
@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-baseconv.py:  base conversion class for the MMGen suite
+baseconv: base conversion class for the MMGen suite
 """
 
 from collections import namedtuple
diff --git a/mmgen/cfg.py b/mmgen/cfg.py
index 5ea61fc2..27b0af7a 100755
--- a/mmgen/cfg.py
+++ b/mmgen/cfg.py
@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-cfg.py: API for the MMGen runtime configuration file and related files
+cfg: API for the MMGen runtime configuration file and related files
 """
 
 # NB: This module is used by override_globals_from_cfg_file(), which is called before
diff --git a/mmgen/color.py b/mmgen/color.py
index aaa44c76..977ba782 100755
--- a/mmgen/color.py
+++ b/mmgen/color.py
@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-color.py:  color handling for the MMGen suite
+color: color handling for the MMGen suite
 """
 
 _colors = {
diff --git a/mmgen/common.py b/mmgen/common.py
index 4a640e5a..30238128 100755
--- a/mmgen/common.py
+++ b/mmgen/common.py
@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-common.py:  Common imports for all MMGen scripts
+common: Common imports for all MMGen scripts
 """
 
 import sys,os
diff --git a/mmgen/contrib/license.py b/mmgen/contrib/license.py
index c2d9e6f6..1182e004 100755
--- a/mmgen/contrib/license.py
+++ b/mmgen/contrib/license.py
@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-license.py:  Copyright notice and text of GPLv3
+contrib.license: Copyright notice and text of GPLv3
 """
 
 from ..globalvars import g
diff --git a/mmgen/crypto.py b/mmgen/crypto.py
index 5b9ccedc..f7bad60f 100755
--- a/mmgen/crypto.py
+++ b/mmgen/crypto.py
@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-crypto.py: Random number, password hashing and symmetric encryption routines for the MMGen suite
+crypto: Random number, password hashing and symmetric encryption routines for the MMGen suite
 """
 
 import os
diff --git a/mmgen/daemon.py b/mmgen/daemon.py
index 2f56ad36..cf4acddb 100755
--- a/mmgen/daemon.py
+++ b/mmgen/daemon.py
@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-daemon.py:  Daemon control interface for the MMGen suite
+daemon: Daemon control interface for the MMGen suite
 """
 
 import os,time,importlib
diff --git a/mmgen/derive.py b/mmgen/derive.py
index f5ef135c..c9dda622 100755
--- a/mmgen/derive.py
+++ b/mmgen/derive.py
@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-derive.py: coin private key secret derivation for the MMGen suite
+derive: coin private key secret derivation for the MMGen suite
 """
 
 from collections import namedtuple
diff --git a/mmgen/devinit.py b/mmgen/devinit.py
index de55506e..82c3707b 100755
--- a/mmgen/devinit.py
+++ b/mmgen/devinit.py
@@ -9,7 +9,7 @@
 #   https://gitlab.com/mmgen/mmgen
 
 """
-devinit.py: Developer tools init/launch code for the MMGen suite
+devinit: Developer tools init/launch code for the MMGen suite
 """
 
 devtools_funcs = {
diff --git a/mmgen/devtools.py b/mmgen/devtools.py
index d2f8571d..757cb28a 100755
--- a/mmgen/devtools.py
+++ b/mmgen/devtools.py
@@ -9,7 +9,7 @@
 #   https://gitlab.com/mmgen/mmgen
 
 """
-devtools.py: Developer tools for the MMGen suite
+devtools: Developer tools for the MMGen suite
 """
 
 import sys
diff --git a/mmgen/exception.py b/mmgen/exception.py
index 70330147..d66eef12 100755
--- a/mmgen/exception.py
+++ b/mmgen/exception.py
@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-mmgen.exception: Exception classes for the MMGen suite
+exception: Exception classes for the MMGen suite
 """
 
 class MMGenError(Exception):
diff --git a/mmgen/filename.py b/mmgen/filename.py
index a0aeff96..371efb8f 100755
--- a/mmgen/filename.py
+++ b/mmgen/filename.py
@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-filename.py:  File and MMGenFile classes and methods for the MMGen suite
+filename: File and MMGenFile classes and methods for the MMGen suite
 """
 
 import sys,os
diff --git a/mmgen/fileutil.py b/mmgen/fileutil.py
index f8704cf3..2f109b9e 100755
--- a/mmgen/fileutil.py
+++ b/mmgen/fileutil.py
@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-fileutil.py: Routines that read, write, execute or stat files
+fileutil: Routines that read, write, execute or stat files
 """
 
 import sys,os
diff --git a/mmgen/flags.py b/mmgen/flags.py
index a6f3c190..5fa8d981 100755
--- a/mmgen/flags.py
+++ b/mmgen/flags.py
@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-flags.py:  Class flags and opts for the MMGen suite
+flags: Class flags and opts for the MMGen suite
 """
 
 from .base_obj import AttrCtrl,Lockable
diff --git a/mmgen/globalvars.py b/mmgen/globalvars.py
index 5e82c8db..dc1549d9 100755
--- a/mmgen/globalvars.py
+++ b/mmgen/globalvars.py
@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-globalvars.py:  Constants and configuration options for the MMGen suite
+globalvars: Constants and configuration options for the MMGen suite
 """
 
 import sys,os
diff --git a/mmgen/help.py b/mmgen/help.py
index 5cc0985f..d9dd2bbd 100755
--- a/mmgen/help.py
+++ b/mmgen/help.py
@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-help.py:  help notes for MMGen suite commands
+help: help notes for MMGen suite commands
 """
 
 def help_notes_func(proto,po,k):
diff --git a/mmgen/key.py b/mmgen/key.py
index 544539bc..07bf829e 100755
--- a/mmgen/key.py
+++ b/mmgen/key.py
@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-key.py: MMGen public and private key objects
+key: MMGen public and private key objects
 """
 
 from .objmethods import Hilite,InitErrors,MMGenObject
diff --git a/mmgen/keygen.py b/mmgen/keygen.py
index 03639a03..660f2df5 100755
--- a/mmgen/keygen.py
+++ b/mmgen/keygen.py
@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-keygen.py: Public key generation initialization code for the MMGen suite
+keygen: Public key generation initialization code for the MMGen suite
 """
 
 from collections import namedtuple
diff --git a/mmgen/main.py b/mmgen/main.py
index cd789f81..d32f50ec 100755
--- a/mmgen/main.py
+++ b/mmgen/main.py
@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-main.py - Script launcher for the MMGen project
+main: Script launcher for the MMGen project
 """
 
 def launch(mod,package='mmgen'):
diff --git a/mmgen/main_msg.py b/mmgen/main_msg.py
index 6385e751..ecfabff7 100755
--- a/mmgen/main_msg.py
+++ b/mmgen/main_msg.py
@@ -9,7 +9,7 @@
 #   https://gitlab.com/mmgen/mmgen
 
 """
-mmgen.main_msg: Message signing operations for the MMGen suite
+mmgen-msg: Message signing operations for the MMGen suite
 """
 
 from .base_obj import AsyncInit
diff --git a/mmgen/main_seedjoin.py b/mmgen/main_seedjoin.py
index ea525272..8d8f96f5 100755
--- a/mmgen/main_seedjoin.py
+++ b/mmgen/main_seedjoin.py
@@ -17,8 +17,8 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-mmgen/main_seedjoin: Regenerate an MMGen deterministic wallet from seed shares
-                     created by 'mmgen-seedsplit'
+mmgen-seedjoin: Regenerate an MMGen deterministic wallet from seed shares
+                created by 'mmgen-seedsplit'
 """
 
 from .common import *
diff --git a/mmgen/main_wallet.py b/mmgen/main_wallet.py
index c54a5867..df09e145 100755
--- a/mmgen/main_wallet.py
+++ b/mmgen/main_wallet.py
@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-mmgen/main_wallet:  Entry point for MMGen wallet-related scripts
+main_wallet: Entry point for MMGen wallet-related scripts
 """
 
 import os
diff --git a/mmgen/main_xmrwallet.py b/mmgen/main_xmrwallet.py
index cfc827bf..a6b219e8 100755
--- a/mmgen/main_xmrwallet.py
+++ b/mmgen/main_xmrwallet.py
@@ -17,8 +17,8 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-mmgen/main_xmrwallet: Perform various Monero wallet operations for addresses
-                      in an MMGen XMR key-address file
+mmgen-xmrwallet: Perform various Monero wallet operations for addresses
+                 in an MMGen XMR key-address file
 """
 
 from .common import *
diff --git a/mmgen/obj.py b/mmgen/obj.py
index fd75dfe8..6323958c 100755
--- a/mmgen/obj.py
+++ b/mmgen/obj.py
@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-obj.py: MMGen native classes
+obj: MMGen native classes
 """
 
 import sys,os,re,unicodedata
diff --git a/mmgen/objmethods.py b/mmgen/objmethods.py
index 05ced4c3..0e1f8425 100755
--- a/mmgen/objmethods.py
+++ b/mmgen/objmethods.py
@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-objmethods.py: Mixin classes for MMGen data objects
+objmethods: Mixin classes for MMGen data objects
 """
 
 import unicodedata
diff --git a/mmgen/opts.py b/mmgen/opts.py
index 6c6e87da..49d1c52c 100755
--- a/mmgen/opts.py
+++ b/mmgen/opts.py
@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-opts.py:  MMGen-specific options processing after generic processing by share.Opts
+opts: MMGen-specific options processing after generic processing by share.Opts
 """
 import sys,os,stat
 
diff --git a/mmgen/passwdlist.py b/mmgen/passwdlist.py
index 0be35659..8335700f 100755
--- a/mmgen/passwdlist.py
+++ b/mmgen/passwdlist.py
@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-passwdlist.py: Password list class for the MMGen suite
+passwdlist: Password list class for the MMGen suite
 """
 
 from collections import namedtuple
diff --git a/mmgen/proto/bch/params.py b/mmgen/proto/bch/params.py
index 1ae23195..fd30160f 100755
--- a/mmgen/proto/bch/params.py
+++ b/mmgen/proto/bch/params.py
@@ -9,7 +9,7 @@
 #   https://gitlab.com/mmgen/mmgen
 
 """
-Bitcoin Cash protocol
+proto.bch.params: Bitcoin Cash protocol
 """
 
 from ..btc.params import mainnet,_finfo
diff --git a/mmgen/proto/btc/params.py b/mmgen/proto/btc/params.py
index 00c25356..637efd50 100755
--- a/mmgen/proto/btc/params.py
+++ b/mmgen/proto/btc/params.py
@@ -9,7 +9,7 @@
 #   https://gitlab.com/mmgen/mmgen
 
 """
-Bitcoin protocol
+proto.btc.params: Bitcoin protocol
 """
 
 from ...protocol import CoinProtocol,decoded_wif,decoded_addr,_finfo,_nw
diff --git a/mmgen/proto/btc/tw/bal.py b/mmgen/proto/btc/tw/bal.py
index b0b76991..0af0d63a 100755
--- a/mmgen/proto/btc/tw/bal.py
+++ b/mmgen/proto/btc/tw/bal.py
@@ -9,7 +9,7 @@
 #   https://gitlab.com/mmgen/mmgen
 
 """
-proto.btc.twbal: Bitcoin base protocol tracking wallet balance class
+proto.btc.tw.bal: Bitcoin base protocol tracking wallet balance class
 """
 
 from ....tw.bal import TwGetBalance
diff --git a/mmgen/proto/etc/params.py b/mmgen/proto/etc/params.py
index 0c61f04a..79ddde07 100755
--- a/mmgen/proto/etc/params.py
+++ b/mmgen/proto/etc/params.py
@@ -9,7 +9,7 @@
 #   https://gitlab.com/mmgen/mmgen
 
 """
-Ethereum Classic protocol
+proto.etc.params: Ethereum Classic protocol
 """
 
 from ..eth.params import mainnet
diff --git a/mmgen/proto/eth/params.py b/mmgen/proto/eth/params.py
index 18d4afe9..64782774 100755
--- a/mmgen/proto/eth/params.py
+++ b/mmgen/proto/eth/params.py
@@ -9,7 +9,7 @@
 #   https://gitlab.com/mmgen/mmgen
 
 """
-Ethereum protocol
+proto.eth.params: Ethereum protocol
 """
 
 from ...globalvars import g
diff --git a/mmgen/proto/eth/tw/bal.py b/mmgen/proto/eth/tw/bal.py
index 2031593f..879efbc8 100755
--- a/mmgen/proto/eth/tw/bal.py
+++ b/mmgen/proto/eth/tw/bal.py
@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-proto.eth.twbal: Ethereum tracking wallet getbalance class
+proto.eth.tw.bal: Ethereum tracking wallet getbalance class
 """
 
 from ....tw.ctl import TwCtl
diff --git a/mmgen/proto/eth/tw/ctl.py b/mmgen/proto/eth/tw/ctl.py
index a56ec500..b0ba3f13 100755
--- a/mmgen/proto/eth/tw/ctl.py
+++ b/mmgen/proto/eth/tw/ctl.py
@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-proto.eth.twctl: Ethereum tracking wallet control class
+proto.eth.tw.ctl: Ethereum tracking wallet control class
 """
 
 from ....util import msg,ymsg,die
diff --git a/mmgen/proto/ltc/params.py b/mmgen/proto/ltc/params.py
index 92b8a8cd..494b9b49 100755
--- a/mmgen/proto/ltc/params.py
+++ b/mmgen/proto/ltc/params.py
@@ -9,7 +9,7 @@
 #   https://gitlab.com/mmgen/mmgen
 
 """
-Litecoin protocol
+proto.ltc.params: Litecoin protocol
 """
 
 from ..btc.params import mainnet
diff --git a/mmgen/proto/xmr/params.py b/mmgen/proto/xmr/params.py
index 92942c82..77dfdaae 100755
--- a/mmgen/proto/xmr/params.py
+++ b/mmgen/proto/xmr/params.py
@@ -9,7 +9,7 @@
 #   https://gitlab.com/mmgen/mmgen
 
 """
-Monero protocol
+proto.xmr.params: Monero protocol
 """
 
 from collections import namedtuple
diff --git a/mmgen/proto/zec/params.py b/mmgen/proto/zec/params.py
index 248d79f4..3c5f6633 100755
--- a/mmgen/proto/zec/params.py
+++ b/mmgen/proto/zec/params.py
@@ -9,7 +9,7 @@
 #   https://gitlab.com/mmgen/mmgen
 
 """
-Zcash protocol
+proto.zec.params: Zcash protocol
 """
 
 from ..btc.params import mainnet
diff --git a/mmgen/protocol.py b/mmgen/protocol.py
index 000d6bb6..4106a1f2 100755
--- a/mmgen/protocol.py
+++ b/mmgen/protocol.py
@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-protocol.py: Coin protocol base classes and initializer
+protocol: Coin protocol base classes and initializer
 """
 
 from collections import namedtuple
diff --git a/mmgen/rpc.py b/mmgen/rpc.py
index 7519e995..377b4cc1 100755
--- a/mmgen/rpc.py
+++ b/mmgen/rpc.py
@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-rpc.py:  Cryptocoin RPC library for the MMGen suite
+rpc: Cryptocoin RPC library for the MMGen suite
 """
 
 import base64,json,asyncio,importlib
diff --git a/mmgen/seed.py b/mmgen/seed.py
index 2f28846d..2b8c3ba6 100755
--- a/mmgen/seed.py
+++ b/mmgen/seed.py
@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-seed.py:  Seed-related classes and methods for the MMGen suite
+seed: Seed-related classes and methods for the MMGen suite
 """
 
 from .util import make_chksum_8,hexdigits_uc
diff --git a/mmgen/seedsplit.py b/mmgen/seedsplit.py
index f7061c17..ce8c8f11 100755
--- a/mmgen/seedsplit.py
+++ b/mmgen/seedsplit.py
@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-seedsplit.py: Seed split classes and methods for the MMGen suite
+seedsplit: Seed split classes and methods for the MMGen suite
 """
 
 from .globalvars import g
diff --git a/mmgen/sha2.py b/mmgen/sha2.py
index 8bd5e595..c708916d 100755
--- a/mmgen/sha2.py
+++ b/mmgen/sha2.py
@@ -17,9 +17,9 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-sha2.py: A non-optimized but very compact implementation of the SHA2 hash
-         algorithm for the MMGen suite.  Implements SHA256, SHA512 and
-         SHA256Compress (unpadded SHA256, required for Zcash addresses)
+sha2: A non-optimized but very compact implementation of the SHA2 hash
+      algorithm for the MMGen suite.  Implements SHA256, SHA512 and
+      SHA256Compress (unpadded SHA256, required for Zcash addresses)
 """
 
 # IMPORTANT NOTE: Since GMP precision is platform-dependent, generated constants
diff --git a/mmgen/share/Opts.py b/mmgen/share/Opts.py
index 314333bd..35e6311e 100755
--- a/mmgen/share/Opts.py
+++ b/mmgen/share/Opts.py
@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-Opts.py:  Generic options parsing
+share.Opts: Generic options parsing
 """
 
 import sys,re
diff --git a/mmgen/subseed.py b/mmgen/subseed.py
index 24c1f410..56c9ff60 100755
--- a/mmgen/subseed.py
+++ b/mmgen/subseed.py
@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-subseed.py:  Subseed classes and methods for the MMGen suite
+subseed: Subseed classes and methods for the MMGen suite
 """
 
 from .color import green
diff --git a/mmgen/term.py b/mmgen/term.py
index b2623e9f..77da8e96 100755
--- a/mmgen/term.py
+++ b/mmgen/term.py
@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-term.py:  Terminal classes for the MMGen suite
+term: Terminal classes for the MMGen suite
 """
 
 import sys,os,time
diff --git a/mmgen/test.py b/mmgen/test.py
index 94a84ef7..18241a43 100755
--- a/mmgen/test.py
+++ b/mmgen/test.py
@@ -9,7 +9,7 @@
 #   https://gitlab.com/mmgen/mmgen
 
 """
-test.py: functions required by the MMGen test suite
+test: functions required by the MMGen test suite
 """
 
 import sys
diff --git a/mmgen/tool/api.py b/mmgen/tool/api.py
index 03a01228..0bbc5c62 100755
--- a/mmgen/tool/api.py
+++ b/mmgen/tool/api.py
@@ -17,8 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-tool/api.py:
-    Python interface to selected commands from the 'mmgen-tool' utility
+tool.api: Python interface to selected commands from the 'mmgen-tool' utility
 """
 
 from .common import tool_cmd_base
diff --git a/mmgen/tool/coin.py b/mmgen/tool/coin.py
index 3dd2ad35..6fdbca19 100755
--- a/mmgen/tool/coin.py
+++ b/mmgen/tool/coin.py
@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-tool/coin.py: Cryptocoin routines for the 'mmgen-tool' utility
+tool.coin: Cryptocoin routines for the 'mmgen-tool' utility
 """
 
 from collections import namedtuple
diff --git a/mmgen/tool/common.py b/mmgen/tool/common.py
index e2e69799..7194bdac 100755
--- a/mmgen/tool/common.py
+++ b/mmgen/tool/common.py
@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-tool/common.py: Base class and shared routines for the 'mmgen-tool' utility
+tool.common: Base class and shared routines for the 'mmgen-tool' utility
 """
 
 from ..objmethods import MMGenObject
diff --git a/mmgen/tool/file.py b/mmgen/tool/file.py
index b61d49ef..b6766787 100755
--- a/mmgen/tool/file.py
+++ b/mmgen/tool/file.py
@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-tool/file.py: Address and transaction file routines for the 'mmgen-tool' utility
+tool.file: Address and transaction file routines for the 'mmgen-tool' utility
 """
 
 from .common import tool_cmd_base,options_annot_str
diff --git a/mmgen/tool/filecrypt.py b/mmgen/tool/filecrypt.py
index 87f8fb61..3cc662bd 100755
--- a/mmgen/tool/filecrypt.py
+++ b/mmgen/tool/filecrypt.py
@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-tool/filecrypt.py: File encryption/decryption routines for the 'mmgen-tool' utility
+tool.filecrypt: File encryption/decryption routines for the 'mmgen-tool' utility
 """
 
 import os
diff --git a/mmgen/tool/fileutil.py b/mmgen/tool/fileutil.py
index 29801e8b..a3c41e9e 100755
--- a/mmgen/tool/fileutil.py
+++ b/mmgen/tool/fileutil.py
@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-tool/fileutil.py: File routines for the 'mmgen-tool' utility
+tool.fileutil: File routines for the 'mmgen-tool' utility
 """
 
 import os
diff --git a/mmgen/tool/help.py b/mmgen/tool/help.py
index 1360fe31..f9e9ab41 100755
--- a/mmgen/tool/help.py
+++ b/mmgen/tool/help.py
@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-tool/help.py: Help screen routines for the 'mmgen-tool' utility
+tool.help: Help screen routines for the 'mmgen-tool' utility
 """
 
 from .common import tool_cmd_base
diff --git a/mmgen/tool/mnemonic.py b/mmgen/tool/mnemonic.py
index 5ee8d7fd..9af838b8 100755
--- a/mmgen/tool/mnemonic.py
+++ b/mmgen/tool/mnemonic.py
@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-tool/mnemonic.py: Mnemonic routines for the 'mmgen-tool' utility
+tool.mnemonic: Mnemonic routines for the 'mmgen-tool' utility
 """
 
 from collections import namedtuple
diff --git a/mmgen/tool/rpc.py b/mmgen/tool/rpc.py
index fbcef4f5..0e9fffb0 100755
--- a/mmgen/tool/rpc.py
+++ b/mmgen/tool/rpc.py
@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-tool/rpc.py: JSON/RPC routines for the 'mmgen-tool' utility
+tool.rpc: JSON/RPC routines for the 'mmgen-tool' utility
 """
 
 from .common import tool_cmd_base,options_annot_str
diff --git a/mmgen/tool/util.py b/mmgen/tool/util.py
index 9fcb14f4..f205208c 100755
--- a/mmgen/tool/util.py
+++ b/mmgen/tool/util.py
@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-tool/util.py: Utility commands for the 'mmgen-tool' utility
+tool.util: Utility commands for the 'mmgen-tool' utility
 """
 
 from .common import tool_cmd_base
diff --git a/mmgen/tool/wallet.py b/mmgen/tool/wallet.py
index 381348b9..f76c32e5 100755
--- a/mmgen/tool/wallet.py
+++ b/mmgen/tool/wallet.py
@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-tool/wallet.py: Wallet routines for the 'mmgen-tool' utility
+tool.wallet: Wallet routines for the 'mmgen-tool' utility
 """
 
 from .common import tool_cmd_base
diff --git a/mmgen/tw/bal.py b/mmgen/tw/bal.py
index aa5cd437..3e4d7949 100755
--- a/mmgen/tw/bal.py
+++ b/mmgen/tw/bal.py
@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-twbal: Tracking wallet getbalance class for the MMGen suite
+tw.bal: Tracking wallet getbalance class for the MMGen suite
 """
 
 from collections import namedtuple
diff --git a/mmgen/tw/ctl.py b/mmgen/tw/ctl.py
index c879571b..040f4e41 100755
--- a/mmgen/tw/ctl.py
+++ b/mmgen/tw/ctl.py
@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-twctl: Tracking wallet control class for the MMGen suite
+tw.ctl: Tracking wallet control class for the MMGen suite
 """
 
 import json
diff --git a/mmgen/tx/file.py b/mmgen/tx/file.py
index 86d28fa6..f5ae9542 100755
--- a/mmgen/tx/file.py
+++ b/mmgen/tx/file.py
@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-tx.file:  Transaction file operations for the MMGen suite
+tx.file: Transaction file operations for the MMGen suite
 """
 
 from ..common import *
diff --git a/mmgen/ui.py b/mmgen/ui.py
index f795a89b..8e3357c8 100755
--- a/mmgen/ui.py
+++ b/mmgen/ui.py
@@ -9,7 +9,7 @@
 #   https://gitlab.com/mmgen/mmgen
 
 """
-ui.py: Interactive user interface functions for the MMGen suite
+ui: Interactive user interface functions for the MMGen suite
 """
 
 import sys,os
diff --git a/mmgen/util.py b/mmgen/util.py
index 0f166514..6936b7de 100755
--- a/mmgen/util.py
+++ b/mmgen/util.py
@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-util.py: Frequently-used variables, classes and utility functions for the MMGen suite
+util: Frequently-used variables, classes and utility functions for the MMGen suite
 """
 
 import sys,os,time,re
diff --git a/mmgen/util2.py b/mmgen/util2.py
index 06ac2520..1bfa2150 100755
--- a/mmgen/util2.py
+++ b/mmgen/util2.py
@@ -9,7 +9,7 @@
 #   https://gitlab.com/mmgen/mmgen
 
 """
-util2.py: Less frequently-used variables, classes and utility functions for the MMGen suite
+util2: Less frequently-used variables, classes and utility functions for the MMGen suite
 """
 
 import re,time
diff --git a/mmgen/xmrseed.py b/mmgen/xmrseed.py
index b2fc5a95..5b197201 100755
--- a/mmgen/xmrseed.py
+++ b/mmgen/xmrseed.py
@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-xmrseed.py: Monero mnemonic conversion class for the MMGen suite
+xmrseed: Monero mnemonic conversion class for the MMGen suite
 """
 
 from .baseconv import baseconv
diff --git a/scripts/gendiff.py b/scripts/gendiff.py
index 143efd81..0b6a1b80 100755
--- a/scripts/gendiff.py
+++ b/scripts/gendiff.py
@@ -1,6 +1,8 @@
 #!/usr/bin/env python3
 
 """
+scripts/gendiff.py:
+
 Clean up control characters and trailing whitespace in the listed source files
 and create a unified diff between them.
 
diff --git a/scripts/uninstall-mmgen.py b/scripts/uninstall-mmgen.py
index a6892c2c..2ff3ee1c 100755
--- a/scripts/uninstall-mmgen.py
+++ b/scripts/uninstall-mmgen.py
@@ -16,10 +16,6 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-"""
-uninstall-mmgen.py - Uninstall MMGen from a system
-"""
-
 import sys,os
 
 def normalize_path(p):
diff --git a/test/colortest.py b/test/colortest.py
index 859076ce..a65bce34 100755
--- a/test/colortest.py
+++ b/test/colortest.py
@@ -4,7 +4,7 @@
 # Copyright (C)2013-2022 The MMGen Project <mmgen@tuta.io>
 
 """
-colortest.py:  test color handling for the MMGen suite
+test/colortest.py: test color handling for the MMGen suite
 """
 
 import include.tests_header
diff --git a/test/gentest.py b/test/gentest.py
index 6d1fe532..8e043c69 100755
--- a/test/gentest.py
+++ b/test/gentest.py
@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-test/gentest.py:  Cryptocoin key/address generation tests for the MMGen suite
+test/gentest.py: Cryptocoin key/address generation tests for the MMGen suite
 """
 
 import sys,os
diff --git a/test/hashfunc.py b/test/hashfunc.py
index 049062f5..15c3157e 100755
--- a/test/hashfunc.py
+++ b/test/hashfunc.py
@@ -15,6 +15,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
 """
 test/hashfunc.py: Test internal implementations of SHA256, SHA512 and Keccak256
 """
diff --git a/test/include/coin_daemon_control.py b/test/include/coin_daemon_control.py
index a698656c..f04703fe 100755
--- a/test/include/coin_daemon_control.py
+++ b/test/include/coin_daemon_control.py
@@ -1,4 +1,16 @@
 #!/usr/bin/env python3
+#
+# mmgen = Multi-Mode GENerator, a command-line cryptocurrency wallet
+# Copyright (C)2013-2022 The MMGen Project <mmgen@tuta.io>
+# Licensed under the GNU General Public License, Version 3:
+#   https://www.gnu.org/licenses
+# Public project repositories:
+#   https://github.com/mmgen/mmgen
+#   https://gitlab.com/mmgen/mmgen
+
+"""
+test.include.coin_daemon_control: Start and stop daemons for the MMGen test suite
+"""
 
 from .tests_header import repo_root
 from mmgen.common import *
diff --git a/test/include/common.py b/test/include/common.py
index d0baf992..845006a4 100755
--- a/test/include/common.py
+++ b/test/include/common.py
@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-common.py: Shared routines and data for the MMGen test suites
+test.include.common: Shared routines and data for the MMGen test suites
 """
 
 import os
diff --git a/test/include/pexpect.py b/test/include/pexpect.py
index e040f9d4..72bf9489 100755
--- a/test/include/pexpect.py
+++ b/test/include/pexpect.py
@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-test/pexpect.py: pexpect implementation for MMGen test suites
+test.include.pexpect: pexpect implementation for MMGen test suites
 """
 
 import sys,os,time
diff --git a/test/misc/tool_api_test.py b/test/misc/tool_api_test.py
index bd57c43a..af1a2734 100755
--- a/test/misc/tool_api_test.py
+++ b/test/misc/tool_api_test.py
@@ -4,7 +4,7 @@
 # Copyright (C)2013-2022 The MMGen Project <mmgen@tuta.io>
 
 """
-tool_api_test.py: test the MMGen suite tool API
+test.misc.tool_api_test: test the MMGen suite tool API
 """
 
 import sys,os
diff --git a/test/objattrtest.py b/test/objattrtest.py
index 9f78a248..b1291f48 100755
--- a/test/objattrtest.py
+++ b/test/objattrtest.py
@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-test/objattrtest.py:  Test immutable attributes of MMGen data objects
+test/objattrtest.py: Test immutable attributes of MMGen data objects
 """
 
 # TODO: test 'typeconv' during instance creation
diff --git a/test/objattrtest_py_d/oat_btc_mainnet.py b/test/objattrtest_py_d/oat_btc_mainnet.py
index 88313c90..56ab2182 100755
--- a/test/objattrtest_py_d/oat_btc_mainnet.py
+++ b/test/objattrtest_py_d/oat_btc_mainnet.py
@@ -4,8 +4,7 @@
 # Copyright (C)2013-2022 The MMGen Project <mmgen@tuta.io>
 
 """
-test.objattrtest_py_d.oat_btc_mainnet:
-    BTC mainnet test vectors for MMGen data objects
+test.objattrtest_py_d.oat_btc_mainnet: BTC mainnet test vectors for MMGen data objects
 """
 
 from .oat_common import *
diff --git a/test/objtest.py b/test/objtest.py
index f10bb332..0ad683e7 100755
--- a/test/objtest.py
+++ b/test/objtest.py
@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-test/objtest.py:  Test MMGen data objects
+test/objtest.py: Test MMGen data objects
 """
 
 import sys,os,re
diff --git a/test/overlay/__init__.py b/test/overlay/__init__.py
index 4d4b6ff6..76aa7653 100644
--- a/test/overlay/__init__.py
+++ b/test/overlay/__init__.py
@@ -1,3 +1,17 @@
+#!/usr/bin/env python3
+#
+# mmgen = Multi-Mode GENerator, a command-line cryptocurrency wallet
+# Copyright (C)2013-2022 The MMGen Project <mmgen@tuta.io>
+# Licensed under the GNU General Public License, Version 3:
+#   https://www.gnu.org/licenses
+# Public project repositories:
+#   https://github.com/mmgen/mmgen
+#   https://gitlab.com/mmgen/mmgen
+
+"""
+test.overlay.__init__: Initialize the MMGen test suite overlay tree
+"""
+
 import sys,os,shutil
 
 def get_overlay_tree_dir(repo_root):
diff --git a/test/scrambletest.py b/test/scrambletest.py
index 3a47c429..bbdd00bd 100755
--- a/test/scrambletest.py
+++ b/test/scrambletest.py
@@ -18,7 +18,7 @@
 
 """
 test/scrambletest.py: seed scrambling and addrlist data generation tests for all
-supported coins + passwords
+                      supported coins + passwords
 """
 
 import sys,os
diff --git a/test/start-coin-daemons.py b/test/start-coin-daemons.py
index 744061fe..8f36c41c 100755
--- a/test/start-coin-daemons.py
+++ b/test/start-coin-daemons.py
@@ -1,3 +1,7 @@
 #!/usr/bin/env python3
 
+"""
+test/start-coin-daemons.py: Start daemons for the MMGen test suite
+"""
+
 import include.coin_daemon_control
diff --git a/test/stop-coin-daemons.py b/test/stop-coin-daemons.py
index 744061fe..83387058 100755
--- a/test/stop-coin-daemons.py
+++ b/test/stop-coin-daemons.py
@@ -1,3 +1,7 @@
 #!/usr/bin/env python3
 
+"""
+test/stop-coin-daemons.py: Stop daemons for the MMGen test suite
+"""
+
 import include.coin_daemon_control
diff --git a/test/test_py_d/common.py b/test/test_py_d/common.py
index 5a143bc7..e8bf4132 100755
--- a/test/test_py_d/common.py
+++ b/test/test_py_d/common.py
@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-common.py: Shared routines and data for the test.py test suite
+test.test_py_d.common: Shared routines and data for the test.py test suite
 """
 
 import os
diff --git a/test/test_py_d/input.py b/test/test_py_d/input.py
index 99e9fdc9..be83fb5a 100755
--- a/test/test_py_d/input.py
+++ b/test/test_py_d/input.py
@@ -7,7 +7,7 @@
 # Licensed according to the terms of GPL Version 3.  See LICENSE for details.
 
 """
-input.py: Shared input routines for the test.py test suite
+test.test_py_d.input: Shared input routines for the test.py test suite
 """
 
 import os,time
diff --git a/test/test_py_d/ts_autosign.py b/test/test_py_d/ts_autosign.py
index 90b9b158..92f38617 100755
--- a/test/test_py_d/ts_autosign.py
+++ b/test/test_py_d/ts_autosign.py
@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-ts_autosign.py: Autosign tests for the test.py test suite
+test.test_py_d.ts_autosign: Autosign tests for the test.py test suite
 """
 
 import os,shutil
diff --git a/test/test_py_d/ts_base.py b/test/test_py_d/ts_base.py
index e334a83d..0ac51095 100755
--- a/test/test_py_d/ts_base.py
+++ b/test/test_py_d/ts_base.py
@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-ts_base.py: Base class for the test.py test suite
+test.test_py_d.ts_base: Base class for the test.py test suite
 """
 
 import os
diff --git a/test/test_py_d/ts_cfg.py b/test/test_py_d/ts_cfg.py
index f6677fd9..648e0b85 100755
--- a/test/test_py_d/ts_cfg.py
+++ b/test/test_py_d/ts_cfg.py
@@ -7,7 +7,7 @@
 # Licensed according to the terms of GPL Version 3.  See LICENSE for details.
 
 """
-ts_cfg.py: CfgFile tests for the MMGen test.py test suite
+test.test_py_d.ts_cfg: CfgFile tests for the MMGen test.py test suite
 """
 
 import shutil
diff --git a/test/test_py_d/ts_chainsplit.py b/test/test_py_d/ts_chainsplit.py
index d0c00a74..28ae367b 100755
--- a/test/test_py_d/ts_chainsplit.py
+++ b/test/test_py_d/ts_chainsplit.py
@@ -17,8 +17,8 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-ts_chainsplit.py: Forking scenario tests for the test.py test suite
-This module is currently non-functional
+test.test_py_d.ts_chainsplit: Forking scenario tests for the test.py test suite
+This module is unmaintained and currently non-functional
 """
 import os
 from mmgen.globalvars import g
diff --git a/test/test_py_d/ts_ethdev.py b/test/test_py_d/ts_ethdev.py
index 5e2a0fef..36a4282d 100755
--- a/test/test_py_d/ts_ethdev.py
+++ b/test/test_py_d/ts_ethdev.py
@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-ts_ethdev.py: Ethdev tests for the test.py test suite
+test.test_py_d.ts_ethdev: Ethdev tests for the test.py test suite
 """
 
 import sys,os,re,shutil,asyncio,json
diff --git a/test/test_py_d/ts_input.py b/test/test_py_d/ts_input.py
index 8db4c21e..faf76023 100755
--- a/test/test_py_d/ts_input.py
+++ b/test/test_py_d/ts_input.py
@@ -7,7 +7,7 @@
 # Licensed according to the terms of GPL Version 3.  See LICENSE for details.
 
 """
-ts_input.py: user input tests for the MMGen test.py test suite
+test.test_py_d.ts_input: user input tests for the MMGen test.py test suite
 """
 
 import time
diff --git a/test/test_py_d/ts_main.py b/test/test_py_d/ts_main.py
index b3b540b7..9e268b4c 100755
--- a/test/test_py_d/ts_main.py
+++ b/test/test_py_d/ts_main.py
@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-ts_main.py: Basic operations tests for the test.py test suite
+test.test_py_d.ts_main: Basic operations tests for the test.py test suite
 """
 
 from mmgen.globalvars import g
diff --git a/test/test_py_d/ts_misc.py b/test/test_py_d/ts_misc.py
index f1d99eb9..9942433f 100755
--- a/test/test_py_d/ts_misc.py
+++ b/test/test_py_d/ts_misc.py
@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-ts_misc.py: Miscellaneous test groups for the test.py test suite
+test.test_py_d.ts_misc: Miscellaneous test groups for the test.py test suite
 """
 
 from mmgen.globalvars import g
diff --git a/test/test_py_d/ts_opts.py b/test/test_py_d/ts_opts.py
index f6b62450..bbda62b5 100755
--- a/test/test_py_d/ts_opts.py
+++ b/test/test_py_d/ts_opts.py
@@ -7,7 +7,7 @@
 # Licensed according to the terms of GPL Version 3.  See LICENSE for details.
 
 """
-ts_opts.py: options processing tests for the MMGen test.py test suite
+test.test_py_d.ts_opts: options processing tests for the MMGen test.py test suite
 """
 
 from ..include.common import *
diff --git a/test/test_py_d/ts_ref.py b/test/test_py_d/ts_ref.py
index 9fca5f99..f257ddb9 100755
--- a/test/test_py_d/ts_ref.py
+++ b/test/test_py_d/ts_ref.py
@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-ts_ref.py: Reference file tests for the test.py test suite
+test.test_py_d.ts_ref: Reference file tests for the test.py test suite
 """
 
 import os
diff --git a/test/test_py_d/ts_ref_3seed.py b/test/test_py_d/ts_ref_3seed.py
index 6cfae3dd..93b4824a 100755
--- a/test/test_py_d/ts_ref_3seed.py
+++ b/test/test_py_d/ts_ref_3seed.py
@@ -17,8 +17,8 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-ts_ref_3seed.py: Saved and generated reference file tests for 128, 192 and
-                 256-bit seeds for the test.py test suite
+test.test_py_d.ts_ref_3seed: Saved and generated reference file tests for 128,
+                             192 and 256-bit seeds for the test.py test suite
 """
 
 from mmgen.globalvars import g
diff --git a/test/test_py_d/ts_ref_altcoin.py b/test/test_py_d/ts_ref_altcoin.py
index 209dc13c..c57cdaf7 100755
--- a/test/test_py_d/ts_ref_altcoin.py
+++ b/test/test_py_d/ts_ref_altcoin.py
@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-ts_ref_altcoin.py: Altcoin reference file tests for the test.py test suite
+test.test_py_d.ts_ref_altcoin: Altcoin reference file tests for the test.py test suite
 """
 
 import os
diff --git a/test/test_py_d/ts_regtest.py b/test/test_py_d/ts_regtest.py
index 9bd2606b..f6b85c01 100755
--- a/test/test_py_d/ts_regtest.py
+++ b/test/test_py_d/ts_regtest.py
@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-ts_regtest.py: Regtest tests for the test.py test suite
+test.test_py_d.ts_regtest: Regtest tests for the test.py test suite
 """
 
 import os,json,time
diff --git a/test/test_py_d/ts_seedsplit.py b/test/test_py_d/ts_seedsplit.py
index 8a56a2aa..93b6f291 100755
--- a/test/test_py_d/ts_seedsplit.py
+++ b/test/test_py_d/ts_seedsplit.py
@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-ts_seedsplit.py: Seed split/join tests for the test.py test suite
+test.test_py_d.ts_seedsplit: Seed split/join tests for the test.py test suite
 """
 
 from mmgen.globalvars import g
diff --git a/test/test_py_d/ts_shared.py b/test/test_py_d/ts_shared.py
index b65a19f2..8c486e10 100755
--- a/test/test_py_d/ts_shared.py
+++ b/test/test_py_d/ts_shared.py
@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-ts_shared.py: Shared methods for the test.py test suite
+test.test_py_d.ts_shared: Shared methods for the test.py test suite
 """
 
 import os
diff --git a/test/test_py_d/ts_tool.py b/test/test_py_d/ts_tool.py
index 40992bca..d05c5578 100755
--- a/test/test_py_d/ts_tool.py
+++ b/test/test_py_d/ts_tool.py
@@ -7,7 +7,7 @@
 # Licensed according to the terms of GPL Version 3.  See LICENSE for details.
 
 """
-ts_tool.py: tool tests for the MMGen test.py test suite
+test.test_py_d.ts_tool: tool tests for the MMGen test.py test suite
 """
 
 from ..include.common import *
diff --git a/test/test_py_d/ts_wallet.py b/test/test_py_d/ts_wallet.py
index ddd70b1c..24b63e65 100755
--- a/test/test_py_d/ts_wallet.py
+++ b/test/test_py_d/ts_wallet.py
@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-ts_wallet.py: Wallet conversion tests for the test.py test suite
+test.test_py_d.ts_wallet: Wallet conversion tests for the test.py test suite
 """
 
 import os
diff --git a/test/test_py_d/ts_xmrwallet.py b/test/test_py_d/ts_xmrwallet.py
index 8bfb7380..e45e7a6f 100755
--- a/test/test_py_d/ts_xmrwallet.py
+++ b/test/test_py_d/ts_xmrwallet.py
@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-ts_xmrwallet.py: xmrwallet tests for the test.py test suite
+test.test_py_d.ts_xmrwallet: xmrwallet tests for the test.py test suite
 """
 
 import sys,os,atexit,asyncio,shutil
diff --git a/test/tooltest.py b/test/tooltest.py
index 6b0fe8b8..bcf74907 100755
--- a/test/tooltest.py
+++ b/test/tooltest.py
@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-test/tooltest.py:  Tests for the 'mmgen-tool' utility
+test/tooltest.py: Tests for the 'mmgen-tool' utility
 """
 
 import sys,os,binascii
diff --git a/test/tooltest2.py b/test/tooltest2.py
index 187e58a7..2c365403 100755
--- a/test/tooltest2.py
+++ b/test/tooltest2.py
@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-test/tooltest2.py:  Simple tests for the 'mmgen-tool' utility
+test/tooltest2.py: Simple tests for the 'mmgen-tool' utility
 """
 
 # TODO: move all non-interactive 'mmgen-tool' tests in 'test.py' here
diff --git a/test/unit_tests.py b/test/unit_tests.py
index 257acd3b..22073076 100755
--- a/test/unit_tests.py
+++ b/test/unit_tests.py
@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-test/unit_tests.py:  Unit tests for the MMGen suite
+test/unit_tests.py: Unit tests for the MMGen suite
 """
 
 import sys,os,time,importlib,platform
diff --git a/test/unit_tests_d/__init__.py b/test/unit_tests_d/__init__.py
index eee82427..de29f6a1 100755
--- a/test/unit_tests_d/__init__.py
+++ b/test/unit_tests_d/__init__.py
@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+
 """
 test.unit_tests_d.__init__: shared data for unit tests for the MMGen suite
 """
diff --git a/test/unit_tests_d/ut_addrlist.py b/test/unit_tests_d/ut_addrlist.py
index 48f65199..ad5ab1e9 100755
--- a/test/unit_tests_d/ut_addrlist.py
+++ b/test/unit_tests_d/ut_addrlist.py
@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+
 """
 test.unit_tests_d.ut_addrlist: address list unit tests for the MMGen suite
 """
diff --git a/test/unit_tests_d/ut_addrparse.py b/test/unit_tests_d/ut_addrparse.py
index 2e2191bb..d61ab455 100755
--- a/test/unit_tests_d/ut_addrparse.py
+++ b/test/unit_tests_d/ut_addrparse.py
@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+
 """
 test/unit_tests_d/ut_addrparse: address parsing tests for the MMGen suite
 """
diff --git a/test/unit_tests_d/ut_baseconv.py b/test/unit_tests_d/ut_baseconv.py
index a9c00713..c7ecfae9 100755
--- a/test/unit_tests_d/ut_baseconv.py
+++ b/test/unit_tests_d/ut_baseconv.py
@@ -1,6 +1,7 @@
 #!/usr/bin/env python3
+
 """
-test/unit_tests_d/ut_baseconv.py: Base conversion unit test for the MMGen suite
+test.unit_tests_d.ut_baseconv: Base conversion unit test for the MMGen suite
 """
 
 from mmgen.common import *
diff --git a/test/unit_tests_d/ut_bip39.py b/test/unit_tests_d/ut_bip39.py
index 697ff9f4..f7bb591c 100755
--- a/test/unit_tests_d/ut_bip39.py
+++ b/test/unit_tests_d/ut_bip39.py
@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+
 """
 test/unit_tests_d/ut_bip39: BIP39 unit test for the MMGen suite
 """
diff --git a/test/unit_tests_d/ut_daemon.py b/test/unit_tests_d/ut_daemon.py
index d824165d..f8e44aea 100755
--- a/test/unit_tests_d/ut_daemon.py
+++ b/test/unit_tests_d/ut_daemon.py
@@ -1,6 +1,7 @@
 #!/usr/bin/env python3
+
 """
-test/unit_tests_d/ut_daemon.py: unit test for the MMGen suite's Daemon class
+test.unit_tests_d.ut_daemon: unit test for the MMGen suite's Daemon class
 """
 
 from subprocess import run,DEVNULL
diff --git a/test/unit_tests_d/ut_dep.py b/test/unit_tests_d/ut_dep.py
index 435746b0..31f9f97e 100755
--- a/test/unit_tests_d/ut_dep.py
+++ b/test/unit_tests_d/ut_dep.py
@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+
 """
 test.unit_tests_d.ut_dep: dependency unit tests for the MMGen suite
 
diff --git a/test/unit_tests_d/ut_devtools.py b/test/unit_tests_d/ut_devtools.py
index ab537b0e..729fab04 100755
--- a/test/unit_tests_d/ut_devtools.py
+++ b/test/unit_tests_d/ut_devtools.py
@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+
 """
 test.unit_tests_d.ut_devtools: devtools unit tests for the MMGen suite
 """
diff --git a/test/unit_tests_d/ut_flags.py b/test/unit_tests_d/ut_flags.py
index 227b61f0..bda3662c 100755
--- a/test/unit_tests_d/ut_flags.py
+++ b/test/unit_tests_d/ut_flags.py
@@ -1,6 +1,7 @@
 #!/usr/bin/env python3
+
 """
-test/unit_tests_d/ut_flags.py: unit test for the MMGen suite's ClassFlags class
+test.unit_tests_d.ut_flags: unit test for the MMGen suite's ClassFlags class
 """
 
 from mmgen.common import *
diff --git a/test/unit_tests_d/ut_gen.py b/test/unit_tests_d/ut_gen.py
index 07f36a08..f520610e 100755
--- a/test/unit_tests_d/ut_gen.py
+++ b/test/unit_tests_d/ut_gen.py
@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+
 """
 test.unit_tests_d.ut_gen: key/address generation unit tests for the MMGen suite
 """
diff --git a/test/unit_tests_d/ut_indexed_dict.py b/test/unit_tests_d/ut_indexed_dict.py
index 66248610..9be7d45d 100755
--- a/test/unit_tests_d/ut_indexed_dict.py
+++ b/test/unit_tests_d/ut_indexed_dict.py
@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+
 """
 test/unit_tests_d/ut_indexed_dict: IndexedDict class unit test for the MMGen suite
 """
diff --git a/test/unit_tests_d/ut_lockable.py b/test/unit_tests_d/ut_lockable.py
index 3cf45045..04a172ee 100755
--- a/test/unit_tests_d/ut_lockable.py
+++ b/test/unit_tests_d/ut_lockable.py
@@ -1,6 +1,7 @@
 #!/usr/bin/env python3
+
 """
-test/unit_tests_d/ut_lockable.py: unit test for the MMGen suite's Lockable class
+test.unit_tests_d.ut_lockable: unit test for the MMGen suite's Lockable class
 """
 
 from mmgen.common import *
diff --git a/test/unit_tests_d/ut_mn_entry.py b/test/unit_tests_d/ut_mn_entry.py
index 8c38306a..519eca87 100755
--- a/test/unit_tests_d/ut_mn_entry.py
+++ b/test/unit_tests_d/ut_mn_entry.py
@@ -1,6 +1,7 @@
 #!/usr/bin/env python3
+
 """
-test/unit_tests_d/ut_mn_entry.py: Mnemonic user entry unit test for the MMGen suite
+test.unit_tests_d.ut_mn_entry: Mnemonic user entry unit test for the MMGen suite
 """
 
 from mmgen.util import msg,msg_r,qmsg,qmsg_r
diff --git a/test/unit_tests_d/ut_msg.py b/test/unit_tests_d/ut_msg.py
index 87575321..954a3ea8 100755
--- a/test/unit_tests_d/ut_msg.py
+++ b/test/unit_tests_d/ut_msg.py
@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+
 """
 test.unit_tests_d.ut_msg: message signing unit tests for the MMGen suite
 """
diff --git a/test/unit_tests_d/ut_obj.py b/test/unit_tests_d/ut_obj.py
index d436c952..8744f465 100755
--- a/test/unit_tests_d/ut_obj.py
+++ b/test/unit_tests_d/ut_obj.py
@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+
 """
 test.unit_tests_d.ut_obj: data object unit tests for the MMGen suite
 """
diff --git a/test/unit_tests_d/ut_rpc.py b/test/unit_tests_d/ut_rpc.py
index e7080240..0f4b7af7 100755
--- a/test/unit_tests_d/ut_rpc.py
+++ b/test/unit_tests_d/ut_rpc.py
@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+
 """
 test.unit_tests_d.ut_rpc: RPC unit test for the MMGen suite
 """
diff --git a/test/unit_tests_d/ut_scrypt.py b/test/unit_tests_d/ut_scrypt.py
index b2728eeb..be5e365e 100755
--- a/test/unit_tests_d/ut_scrypt.py
+++ b/test/unit_tests_d/ut_scrypt.py
@@ -1,6 +1,7 @@
 #!/usr/bin/env python3
+
 """
-test/unit_tests_d/ut_scrypt.py: password hashing unit test for the MMGen suite
+test.unit_tests_d.ut_scrypt: password hashing unit test for the MMGen suite
 """
 
 from ..include.common import *
diff --git a/test/unit_tests_d/ut_seedsplit.py b/test/unit_tests_d/ut_seedsplit.py
index 86b2e9c1..9400aad4 100755
--- a/test/unit_tests_d/ut_seedsplit.py
+++ b/test/unit_tests_d/ut_seedsplit.py
@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+
 """
 test/unit_tests_d/ut_seedsplit: seed splitting unit test for the MMGen suite
 """
diff --git a/test/unit_tests_d/ut_subseed.py b/test/unit_tests_d/ut_subseed.py
index 023e91d4..11df41b8 100755
--- a/test/unit_tests_d/ut_subseed.py
+++ b/test/unit_tests_d/ut_subseed.py
@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+
 """
 test/unit_tests_d/ut_subseed: subseed unit test for the MMGen suite
 """
diff --git a/test/unit_tests_d/ut_testdep.py b/test/unit_tests_d/ut_testdep.py
index 168af18b..af3317c2 100755
--- a/test/unit_tests_d/ut_testdep.py
+++ b/test/unit_tests_d/ut_testdep.py
@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+
 """
 test.unit_tests_d.ut_testdep: test dependency unit tests for the MMGen suite
 """
diff --git a/test/unit_tests_d/ut_tx.py b/test/unit_tests_d/ut_tx.py
index 7d8363d3..c66b72a1 100755
--- a/test/unit_tests_d/ut_tx.py
+++ b/test/unit_tests_d/ut_tx.py
@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+
 """
 test.unit_tests_d.ut_tx: TX unit tests for the MMGen suite
 """
diff --git a/test/unit_tests_d/ut_tx_deserialize.py b/test/unit_tests_d/ut_tx_deserialize.py
index 3289f605..cc3134dd 100755
--- a/test/unit_tests_d/ut_tx_deserialize.py
+++ b/test/unit_tests_d/ut_tx_deserialize.py
@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+
 """
 test/unit_tests_d/ut_tx_deserialize: TX deserialization unit tests for the MMGen suite
 """
diff --git a/test/unit_tests_d/ut_xmrseed.py b/test/unit_tests_d/ut_xmrseed.py
index 35b5bd92..c09eae90 100755
--- a/test/unit_tests_d/ut_xmrseed.py
+++ b/test/unit_tests_d/ut_xmrseed.py
@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+
 """
 test/unit_tests_d/ut_xmrseed: Monero mnemonic unit test for the MMGen suite
 """