diff --git a/scripts/generate_driver_wrappers.py b/scripts/generate_driver_wrappers.py
index 709f380cd6..5223d459fd 100755
--- a/scripts/generate_driver_wrappers.py
+++ b/scripts/generate_driver_wrappers.py
@@ -163,7 +163,7 @@ def main() -> int:
     """
     Main with command line arguments.
     """
-    def_arg_project_root = build_tree.guess_mbedtls_root()
+    def_arg_project_root = build_tree.guess_project_root()
 
     parser = argparse.ArgumentParser()
     parser.add_argument('--project-root', default=def_arg_project_root,
diff --git a/scripts/generate_ssl_debug_helpers.py b/scripts/generate_ssl_debug_helpers.py
index a0544f1537..af8ef86eed 100755
--- a/scripts/generate_ssl_debug_helpers.py
+++ b/scripts/generate_ssl_debug_helpers.py
@@ -367,7 +367,7 @@ def generate_ssl_debug_helpers(output_directory, mbedtls_root):
         Generate functions of debug helps
     """
     mbedtls_root = os.path.abspath(
-        mbedtls_root or build_tree.guess_mbedtls_root())
+        mbedtls_root or build_tree.guess_project_root())
     with open(os.path.join(mbedtls_root, 'include/mbedtls/ssl.h')) as f:
         source_code = remove_c_comments(f.read())
 
diff --git a/scripts/mbedtls_dev/build_tree.py b/scripts/mbedtls_dev/build_tree.py
index 9c0b5ba964..da455a7f2c 100644
--- a/scripts/mbedtls_dev/build_tree.py
+++ b/scripts/mbedtls_dev/build_tree.py
@@ -24,7 +24,7 @@ def looks_like_root(path: str) -> bool:
 
 def crypto_core_directory(root: Optional[str] = None) -> str:
     if root is None:
-        root = guess_mbedtls_root()
+        root = guess_project_root()
     if looks_like_tf_psa_crypto_root(root):
         return "core"
     elif looks_like_mbedtls_root(root):
@@ -55,10 +55,10 @@ def chdir_to_root() -> None:
     raise Exception('Mbed TLS source tree not found')
 
 
-def guess_mbedtls_root():
-    """Guess mbedTLS source code directory.
+def guess_project_root():
+    """Guess project source code directory.
 
-    Return the first possible mbedTLS root directory
+    Return the first possible project root directory.
     """
     dirs = set({})
     for frame in inspect.stack():
@@ -71,4 +71,4 @@ def guess_mbedtls_root():
             dirs.add(d)
             if looks_like_root(d):
                 return d
-    raise Exception('Mbed TLS source tree not found')
+    raise Exception('Neither Mbed TLS nor TF-PSA-Crypto source tree found')
diff --git a/tests/scripts/audit-validity-dates.py b/tests/scripts/audit-validity-dates.py
index 96b705a281..ab09b4a1e6 100755
--- a/tests/scripts/audit-validity-dates.py
+++ b/tests/scripts/audit-validity-dates.py
@@ -265,7 +265,7 @@ class Auditor:
     @staticmethod
     def find_test_dir():
         """Get the relative path for the Mbed TLS test directory."""
-        return os.path.relpath(build_tree.guess_mbedtls_root() + '/tests')
+        return os.path.relpath(build_tree.guess_project_root() + '/tests')
 
 
 class TestDataAuditor(Auditor):