diff --git a/buildkit/cli.py b/buildkit/cli.py
index 1901df36..61bdd9b7 100644
--- a/buildkit/cli.py
+++ b/buildkit/cli.py
@@ -22,7 +22,7 @@ from pathlib import Path
 
 from . import config
 from . import source_retrieval
-from . import substitute_domains
+from . import domain_substitution
 from .common import CONFIG_BUNDLES_DIR, get_resources_dir, get_logger
 from .config import ConfigBundle
 
@@ -222,7 +222,7 @@ def _add_subdom(subparsers):
     def _callback(args):
         try:
             if not args.only or args.only == 'tree':
-                substitute_domains.process_tree_with_bundle(args.bundle, args.tree)
+                domain_substitution.process_tree_with_bundle(args.bundle, args.tree)
             if not args.only or args.only == 'patches':
                 pass
         except FileNotFoundError as exc:
diff --git a/buildkit/substitute_domains.py b/buildkit/domain_substitution.py
similarity index 100%
rename from buildkit/substitute_domains.py
rename to buildkit/domain_substitution.py
diff --git a/developer_utilities/invert_domain_substitution.py b/developer_utilities/invert_domain_substitution.py
index 47481473..231ed787 100755
--- a/developer_utilities/invert_domain_substitution.py
+++ b/developer_utilities/invert_domain_substitution.py
@@ -14,7 +14,7 @@ import sys
 from pathlib import Path
 
 sys.path.insert(0, str(Path(__file__).resolve().parent.parent))
-from buildkit import substitute_domains
+from buildkit import domain_substitution
 from buildkit.common import get_logger
 from buildkit.config import ConfigBundle
 sys.path.pop(0)
@@ -28,7 +28,7 @@ def main(arg_list=None):
     args = parser.parse_args(args=arg_list)
 
     try:
-        substitute_domains.process_bundle_patches(args.bundle, invert=True)
+        domain_substitution.process_bundle_patches(args.bundle, invert=True)
     except ValueError:
         get_logger().exception('A regex pair is not invertible')
         parser.exit(status=1)