rename from mobile/android/config/mozconfigs/android-aarch64/l10n-nightly
rename to mobile/android/config/mozconfigs/android-aarch64/nightly-l10n

rename from mobile/android/config/mozconfigs/android-api-15/l10n-nightly
rename to mobile/android/config/mozconfigs/android-api-15/nightly-l10n

rename from mobile/android/config/mozconfigs/android-x86/l10n-nightly
rename to mobile/android/config/mozconfigs/android-x86/nightly-l10n

--- a/testing/mozharness/configs/merge_day/beta_to_release.py
+++ b/testing/mozharness/configs/merge_day/beta_to_release.py
@@ -13,24 +13,24 @@ config = {
     "replacements": [
         # File, from, to
         ("{}{}".format(d, f),
         "ac_add_options --with-branding=mobile/android/branding/beta",
         "ac_add_options --with-branding=mobile/android/branding/official")
         for d in ["mobile/android/config/mozconfigs/android-api-15/",
                   "mobile/android/config/mozconfigs/android-x86/",
                   "mobile/android/config/mozconfigs/android-aarch64/"]
-        for f in ["debug", "nightly", "l10n-nightly"]
+        for f in ["debug", "nightly", "nightly-l10n"]
     ] + [
         # File, from, to
         (f, "ac_add_options --with-l10n-base=../../mozilla-beta",
         "ac_add_options --with-l10n-base=../../mozilla-release")
-        for f in ["mobile/android/config/mozconfigs/android-api-15/l10n-nightly",
-                  "mobile/android/config/mozconfigs/android-x86/l10n-nightly",
-                  "mobile/android/config/mozconfigs/android-aarch64/l10n-nightly"]
+        for f in ["mobile/android/config/mozconfigs/android-api-15/nightly-l10n",
+                  "mobile/android/config/mozconfigs/android-x86/nightly-l10n",
+                  "mobile/android/config/mozconfigs/android-aarch64/nightly-l10n"]
     ] + [
         # File, from, to
         ("browser/confvars.sh",
          "ACCEPTED_MAR_CHANNEL_IDS=firefox-mozilla-beta,firefox-mozilla-release",
          "ACCEPTED_MAR_CHANNEL_IDS=firefox-mozilla-release"),
         ("browser/confvars.sh",
          "MAR_CHANNEL_ID=firefox-mozilla-beta",
          "MAR_CHANNEL_ID=firefox-mozilla-release"),

--- a/testing/mozharness/configs/merge_day/central_to_beta.py
+++ b/testing/mozharness/configs/merge_day/central_to_beta.py
@@ -12,24 +12,24 @@ config = {
     "replacements": [
         # File, from, to
         ("{}{}".format(d, f),
         "ac_add_options --with-branding=mobile/android/branding/nightly",
         "ac_add_options --with-branding=mobile/android/branding/beta")
         for d in ["mobile/android/config/mozconfigs/android-api-15/",
                   "mobile/android/config/mozconfigs/android-x86/",
                   "mobile/android/config/mozconfigs/android-aarch64/"]
-        for f in ["debug", "nightly", "l10n-nightly"]
+        for f in ["debug", "nightly", "nightly-l10n"]
     ] + [
         # File, from, to
         (f, "ac_add_options --with-l10n-base=../../l10n-central",
         "ac_add_options --with-l10n-base=../../mozilla-beta")
-        for f in ["mobile/android/config/mozconfigs/android-api-15/l10n-nightly",
-                  "mobile/android/config/mozconfigs/android-x86/l10n-nightly",
-                  "mobile/android/config/mozconfigs/android-aarch64/l10n-nightly"]
+        for f in ["mobile/android/config/mozconfigs/android-api-15/nightly-l10n",
+                  "mobile/android/config/mozconfigs/android-x86/nightly-l10n",
+                  "mobile/android/config/mozconfigs/android-aarch64/nightly-l10n"]
     ] + [
         # File, from, to
         (f, "ac_add_options --enable-profiling", "") for f in
         ["mobile/android/config/mozconfigs/android-api-15/nightly",
          "mobile/android/config/mozconfigs/android-x86/nightly",
          "mobile/android/config/mozconfigs/android-aarch64/nightly",]
     ] + [
         # File, from, to

--- a/testing/mozharness/configs/single_locale/ash_android-api-15.py
+++ b/testing/mozharness/configs/single_locale/ash_android-api-15.py
@@ -51,17 +51,17 @@ config = {
         "EN_US_BINARY_URL": EN_US_BINARY_URL,
         "LOCALE_MERGEDIR": "%(abs_merge_dir)s/",
         "MOZ_UPDATE_CHANNEL": MOZ_UPDATE_CHANNEL,
     },
     "upload_branch": "%s-android-api-15" % BRANCH,
     "ssh_key_dir": "~/.ssh",
     "merge_locales": True,
     "mozilla_dir": MOZILLA_DIR,
-    "l10n_mozconfig": "%s/mobile/android/config/mozconfigs/android-api-15/l10n-nightly" % MOZILLA_DIR,
+    "l10n_mozconfig": "%s/mobile/android/config/mozconfigs/android-api-15/nightly-l10n" % MOZILLA_DIR,
     "signature_verification_script": "tools/release/signing/verify-android-signature.sh",
     "stage_product": "mobile",
     "platform": "android",
     "build_type": "api-15-opt",
 
     # Balrog
     "build_target": "Android_arm-eabi-gcc3",
 

--- a/testing/mozharness/configs/single_locale/date_android-api-15.py
+++ b/testing/mozharness/configs/single_locale/date_android-api-15.py
@@ -49,17 +49,17 @@ config = {
         "EN_US_BINARY_URL": os.environ.get("EN_US_BINARY_URL", EN_US_BINARY_URL),
         "LOCALE_MERGEDIR": "%(abs_merge_dir)s/",
         "MOZ_UPDATE_CHANNEL": "nightly-date",
     },
     "upload_branch": "%s-android-api-15" % BRANCH,
     "ssh_key_dir": "~/.ssh",
     "merge_locales": True,
     "mozilla_dir": MOZILLA_DIR,
-    "l10n_mozconfig": "%s/mobile/android/config/mozconfigs/android-api-15/l10n-nightly" % MOZILLA_DIR,
+    "l10n_mozconfig": "%s/mobile/android/config/mozconfigs/android-api-15/nightly-l10n" % MOZILLA_DIR,
     "signature_verification_script": "tools/release/signing/verify-android-signature.sh",
     "stage_product": "mobile",
     "platform": "android",
     "build_type": "api-15-opt",
 
     # Balrog
     "build_target": "Android_arm-eabi-gcc3",
 

--- a/testing/mozharness/configs/single_locale/jamun_android-api-15.py
+++ b/testing/mozharness/configs/single_locale/jamun_android-api-15.py
@@ -48,17 +48,17 @@ config = {
         "EN_US_BINARY_URL": os.environ.get("EN_US_BINARY_URL", EN_US_BINARY_URL),
         "LOCALE_MERGEDIR": "%(abs_merge_dir)s/",
         "MOZ_UPDATE_CHANNEL": "nightly-jamun",
     },
     "upload_branch": "%s-android-api-15" % BRANCH,
     "ssh_key_dir": "~/.ssh",
     "merge_locales": True,
     "mozilla_dir": MOZILLA_DIR,
-    "l10n_mozconfig": "%s/mobile/android/config/mozconfigs/android-api-15/l10n-nightly" % MOZILLA_DIR,
+    "l10n_mozconfig": "%s/mobile/android/config/mozconfigs/android-api-15/nightly-l10n" % MOZILLA_DIR,
     "signature_verification_script": "tools/release/signing/verify-android-signature.sh",
     "stage_product": "mobile",
     "platform": "android",
     "build_type": "api-15-opt",
 
     # Balrog
     "build_target": "Android_arm-eabi-gcc3",
 

--- a/testing/mozharness/configs/single_locale/mozilla-aurora_android-api-15.py
+++ b/testing/mozharness/configs/single_locale/mozilla-aurora_android-api-15.py
@@ -55,17 +55,17 @@ config = {
         "EN_US_BINARY_URL": os.environ.get("EN_US_BINARY_URL", EN_US_BINARY_URL),
         "LOCALE_MERGEDIR": "%(abs_merge_dir)s/",
         "MOZ_UPDATE_CHANNEL": MOZ_UPDATE_CHANNEL,
     },
     "upload_branch": "%s-android-api-15" % BRANCH,
     "ssh_key_dir": "~/.ssh",
     "merge_locales": True,
     "mozilla_dir": MOZILLA_DIR,
-    "l10n_mozconfig": "%s/mobile/android/config/mozconfigs/android-api-15/l10n-nightly" % MOZILLA_DIR,
+    "l10n_mozconfig": "%s/mobile/android/config/mozconfigs/android-api-15/nightly-l10n" % MOZILLA_DIR,
     "signature_verification_script": "tools/release/signing/verify-android-signature.sh",
     "stage_product": "mobile",
     "platform": "android",
     "build_type": "api-15-opt",
 
     # Balrog
     "build_target": "Android_arm-eabi-gcc3",
 

--- a/testing/mozharness/configs/single_locale/mozilla-central_android-api-15.py
+++ b/testing/mozharness/configs/single_locale/mozilla-central_android-api-15.py
@@ -55,17 +55,17 @@ config = {
         "EN_US_BINARY_URL": os.environ.get("EN_US_BINARY_URL", EN_US_BINARY_URL),
         "LOCALE_MERGEDIR": "%(abs_merge_dir)s/",
         "MOZ_UPDATE_CHANNEL": MOZ_UPDATE_CHANNEL,
     },
     "upload_branch": "%s-android-api-15" % BRANCH,
     "ssh_key_dir": "~/.ssh",
     "merge_locales": True,
     "mozilla_dir": MOZILLA_DIR,
-    "l10n_mozconfig": "%s/mobile/android/config/mozconfigs/android-api-15/l10n-nightly" % MOZILLA_DIR,
+    "l10n_mozconfig": "%s/mobile/android/config/mozconfigs/android-api-15/nightly-l10n" % MOZILLA_DIR,
     "signature_verification_script": "tools/release/signing/verify-android-signature.sh",
     "stage_product": "mobile",
     "platform": "android",
     "build_type": "api-15-opt",
 
     # Balrog
     "build_target": "Android_arm-eabi-gcc3",
 

--- a/testing/mozharness/configs/single_locale/tc_android-api-15.py
+++ b/testing/mozharness/configs/single_locale/tc_android-api-15.py
@@ -1,13 +1,13 @@
 config = {
     "stage_platform": "android-api-15",
     "locales_file": "src/mobile/locales/l10n-changesets.json",
     "tools_repo": "https://hg.mozilla.org/build/tools",
-    "l10n_mozconfig": "src/mobile/android/config/mozconfigs/android-api-15/l10n-nightly",
+    "l10n_mozconfig": "src/mobile/android/config/mozconfigs/android-api-15/nightly-l10n",
     "tooltool_config": {
         "manifest": "mobile/android/config/tooltool-manifests/android/releng.manifest",
         "output_dir": "%(abs_work_dir)s/src",
     },
     "tooltool_servers": ['http://relengapi/tooltool/'],
 
     "upload_env": {
         'UPLOAD_HOST': 'localhost',

--- a/testing/mozharness/configs/single_locale/try_android-api-15.py
+++ b/testing/mozharness/configs/single_locale/try_android-api-15.py
@@ -51,17 +51,17 @@ config = {
         "EN_US_BINARY_URL": EN_US_BINARY_URL,
         "LOCALE_MERGEDIR": "%(abs_merge_dir)s/",
         "MOZ_UPDATE_CHANNEL": "try", # XXX Invalid
     },
     "upload_branch": "%s-android-api-15" % BRANCH,
     "ssh_key_dir": "~/.ssh",
     "merge_locales": True,
     "mozilla_dir": MOZILLA_DIR,
-    "l10n_mozconfig": "%s/mobile/android/config/mozconfigs/android-api-15/l10n-nightly" % MOZILLA_DIR,
+    "l10n_mozconfig": "%s/mobile/android/config/mozconfigs/android-api-15/nightly-l10n" % MOZILLA_DIR,
     "signature_verification_script": "tools/release/signing/verify-android-signature.sh",
     "stage_product": "mobile",
     "platform": "android", # XXX Validate
     "build_type": "api-15-opt", # XXX Validate
 
     # Balrog
     "build_target": "Android_arm-eabi-gcc3",