From bbe29abaa368427fa1c2964673d68acf5d02a8c0 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Wed, 27 Aug 2025 16:50:33 +0200
Subject: [PATCH] standardize on versionName as spelling

---
 fdroidserver/checkupdates.py      | 2 +-
 fdroidserver/common.py            | 8 ++++----
 fdroidserver/import_subcommand.py | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/fdroidserver/checkupdates.py b/fdroidserver/checkupdates.py
index 2632a7b0..3cf7a821 100644
--- a/fdroidserver/checkupdates.py
+++ b/fdroidserver/checkupdates.py
@@ -233,7 +233,7 @@ def check_tags(app: metadata.App, pattern: str) -> tuple[str, int, str]:
             if verex:
                 m = re.search(verex, filecontent)
                 if not m:
-                    logging.debug(f"UpdateCheckData regex {verex} for version name"
+                    logging.debug(f"UpdateCheckData regex {verex} for versionName"
                                   f" has no match in tag {tag}")
                     continue
 
diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index 66c84eec..e03e58c5 100644
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -2211,7 +2211,7 @@ def parse_androidmanifests(paths, app):
                                 version = matches
 
                             else:
-                                # If build.gradle contains applicationNameSuffix add it to the end of version name
+                                # If build.gradle contains applicationNameSuffix add it to the end of versionName
                                 matches = vnssearch_g(line)
                                 if matches and temp_version_name:
                                     name_suffix = matches.group(2)
@@ -2294,7 +2294,7 @@ def parse_androidmanifests(paths, app):
         logging.debug("..got package={0}, version={1}, vercode={2}"
                       .format(package, version, vercode))
 
-        # Always grab the package name and version name in case they are not
+        # Always grab the package name and versionName in case they are not
         # together with the highest versionCode
         if max_package is None and package is not None:
             max_package = package
@@ -2610,7 +2610,7 @@ def prepare_source(vcs, app, build, build_dir, srclib_dir, extlib_dir, onserver=
 
     # Insert versionCode and number into the manifest if necessary
     if build.forceversion:
-        logging.info("Changing the version name")
+        logging.info("Changing the versionName")
         for path in manifest_paths(root_dir, flavors):
             if not os.path.isfile(path):
                 continue
@@ -2950,7 +2950,7 @@ def get_apk_id(apkfile):
     -------
     appid
     versionCode
-    version name
+    versionName
 
     """
     try:
diff --git a/fdroidserver/import_subcommand.py b/fdroidserver/import_subcommand.py
index 16c4ad36..017ebe54 100644
--- a/fdroidserver/import_subcommand.py
+++ b/fdroidserver/import_subcommand.py
@@ -352,7 +352,7 @@ def main():
         if not appid:
             raise FDroidException(_("Couldn't find Application ID"))
         if not versionName:
-            logging.warning(_('Could not find latest version name'))
+            logging.warning(_('Could not find latest versionName'))
         if not versionCode:
             logging.warning(_('Could not find latest versionCode'))
     else: