rename from browser/config/mozconfigs/linux32/l10n-mozconfig-devedition
rename to browser/config/mozconfigs/linux32/devedition-l10n

rename from browser/config/mozconfigs/linux32/l10n-mozconfig
rename to browser/config/mozconfigs/linux32/nightly-l10n

rename from browser/config/mozconfigs/linux64/l10n-mozconfig-devedition
rename to browser/config/mozconfigs/linux64/devedition-l10n

rename from browser/config/mozconfigs/linux64/l10n-mozconfig
rename to browser/config/mozconfigs/linux64/nightly-l10n

rename from browser/config/mozconfigs/macosx64/l10n-mozconfig-devedition
rename to browser/config/mozconfigs/macosx64/devedition-l10n

rename from browser/config/mozconfigs/macosx64/l10n-mozconfig
rename to browser/config/mozconfigs/macosx64/nightly-l10n

rename from browser/config/mozconfigs/win32/l10n-mozconfig-devedition
rename to browser/config/mozconfigs/win32/devedition-l10n

rename from browser/config/mozconfigs/win32/l10n-mozconfig
rename to browser/config/mozconfigs/win32/nightly-l10n

rename from browser/config/mozconfigs/win64/l10n-mozconfig-devedition
rename to browser/config/mozconfigs/win64/devedition-l10n

rename from browser/config/mozconfigs/win64/l10n-mozconfig
rename to browser/config/mozconfigs/win64/nightly-l10n

--- a/testing/mozharness/configs/merge_day/central_to_beta.py
+++ b/testing/mozharness/configs/merge_day/central_to_beta.py
@@ -17,21 +17,21 @@ config = {
         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"]
     ] + [
         # File, from, to
         (f, "ac_add_options --with-branding=browser/branding/nightly",
         "ac_add_options --enable-official-branding")
-        for f in ["browser/config/mozconfigs/linux32/l10n-mozconfig",
-                  "browser/config/mozconfigs/linux64/l10n-mozconfig",
-                  "browser/config/mozconfigs/win32/l10n-mozconfig",
-                  "browser/config/mozconfigs/win64/l10n-mozconfig",
-                  "browser/config/mozconfigs/macosx64/l10n-mozconfig"]
+        for f in ["browser/config/mozconfigs/linux32/nightly-l10n",
+                  "browser/config/mozconfigs/linux64/nightly-l10n",
+                  "browser/config/mozconfigs/win32/nightly-l10n",
+                  "browser/config/mozconfigs/win64/nightly-l10n",
+                  "browser/config/mozconfigs/macosx64/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"]
     ] + [

--- a/testing/mozharness/configs/single_locale/linux.py
+++ b/testing/mozharness/configs/single_locale/linux.py
@@ -1,15 +1,15 @@
 import os
 
 config = {
     "platform": "linux",
     "stage_product": "firefox",
     "update_platform": "Linux_x86-gcc3",
-    "l10n_mozconfig": "%(branch)s/browser/config/mozconfigs/linux32/l10n-mozconfig",
+    "l10n_mozconfig": "%(branch)s/browser/config/mozconfigs/linux32/nightly-l10n",
     "bootstrap_env": {
         "MOZ_OBJDIR": "obj-l10n",
         "EN_US_BINARY_URL": "%(en_us_binary_url)s",
         "LOCALE_MERGEDIR": "%(abs_merge_dir)s/",
         "MOZ_UPDATE_CHANNEL": "%(update_channel)s",
         "DIST": "%(abs_objdir)s",
         "LOCALE_MERGEDIR": "%(abs_merge_dir)s/",
         "L10NBASEDIR": "../../l10n",

--- a/testing/mozharness/configs/single_locale/linux64.py
+++ b/testing/mozharness/configs/single_locale/linux64.py
@@ -1,15 +1,15 @@
 import os
 
 config = {
     "platform": "linux64",
     "stage_product": "firefox",
     "update_platform": "Linux_x86_64-gcc3",
-    "l10n_mozconfig": "%(branch)s/browser/config/mozconfigs/linux64/l10n-mozconfig",
+    "l10n_mozconfig": "%(branch)s/browser/config/mozconfigs/linux64/nightly-l10n",
     "bootstrap_env": {
         "MOZ_OBJDIR": "obj-l10n",
         "EN_US_BINARY_URL": "%(en_us_binary_url)s",
         "LOCALE_MERGEDIR": "%(abs_merge_dir)s/",
         "MOZ_UPDATE_CHANNEL": "%(update_channel)s",
         "DIST": "%(abs_objdir)s",
         "LOCALE_MERGEDIR": "%(abs_merge_dir)s/",
         "L10NBASEDIR": "../../l10n",

--- a/testing/mozharness/configs/single_locale/linux64_devedition.py
+++ b/testing/mozharness/configs/single_locale/linux64_devedition.py
@@ -1,15 +1,15 @@
 import os
 
 config = {
     "platform": "linux64",
     "stage_product": "firefox",
     "update_platform": "Linux_x86_64-gcc3",
-    "l10n_mozconfig": "%(branch)s/browser/config/mozconfigs/linux64/l10n-mozconfig-devedition",
+    "l10n_mozconfig": "%(branch)s/browser/config/mozconfigs/linux64/devedition-l10n",
     "bootstrap_env": {
         "MOZ_OBJDIR": "obj-l10n",
         "EN_US_BINARY_URL": "%(en_us_binary_url)s",
         "LOCALE_MERGEDIR": "%(abs_merge_dir)s/",
         "MOZ_UPDATE_CHANNEL": "%(update_channel)s",
         "DIST": "%(abs_objdir)s",
         "LOCALE_MERGEDIR": "%(abs_merge_dir)s/",
         "L10NBASEDIR": "../../l10n",

--- a/testing/mozharness/configs/single_locale/linux_devedition.py
+++ b/testing/mozharness/configs/single_locale/linux_devedition.py
@@ -1,15 +1,15 @@
 import os
 
 config = {
     "platform": "linux",
     "stage_product": "firefox",
     "update_platform": "Linux_x86-gcc3",
-    "l10n_mozconfig": "%(branch)s/browser/config/mozconfigs/linux32/l10n-mozconfig-devedition",
+    "l10n_mozconfig": "%(branch)s/browser/config/mozconfigs/linux32/devedition-l10n",
     "bootstrap_env": {
         "MOZ_OBJDIR": "obj-l10n",
         "EN_US_BINARY_URL": "%(en_us_binary_url)s",
         "LOCALE_MERGEDIR": "%(abs_merge_dir)s/",
         "MOZ_UPDATE_CHANNEL": "%(update_channel)s",
         "DIST": "%(abs_objdir)s",
         "LOCALE_MERGEDIR": "%(abs_merge_dir)s/",
         "L10NBASEDIR": "../../l10n",

--- a/testing/mozharness/configs/single_locale/macosx64.py
+++ b/testing/mozharness/configs/single_locale/macosx64.py
@@ -1,15 +1,15 @@
 import os
 
 config = {
     "platform": "macosx64",
     "stage_product": "firefox",
     "update_platform": "Darwin_x86_64-gcc3",
-    "l10n_mozconfig": "%(branch)s/browser/config/mozconfigs/macosx64/l10n-mozconfig",
+    "l10n_mozconfig": "%(branch)s/browser/config/mozconfigs/macosx64/nightly-l10n",
     "bootstrap_env": {
         "SHELL": '/bin/bash',
         "MOZ_OBJDIR": "obj-l10n",
         "EN_US_BINARY_URL": "%(en_us_binary_url)s",
         "MOZ_UPDATE_CHANNEL": "%(update_channel)s",
         "MOZ_PKG_PLATFORM": "mac",
         # "IS_NIGHTLY": "yes",
         "DIST": "%(abs_objdir)s",

--- a/testing/mozharness/configs/single_locale/macosx64_devedition.py
+++ b/testing/mozharness/configs/single_locale/macosx64_devedition.py
@@ -1,15 +1,15 @@
 import os
 
 config = {
     "platform": "macosx64",
     "stage_product": "firefox",
     "update_platform": "Darwin_x86_64-gcc3",
-    "l10n_mozconfig": "%(branch)s/browser/config/mozconfigs/macosx64/l10n-mozconfig-devedition",
+    "l10n_mozconfig": "%(branch)s/browser/config/mozconfigs/macosx64/devedition-l10n",
     "bootstrap_env": {
         "SHELL": '/bin/bash',
         "MOZ_OBJDIR": "obj-l10n",
         "EN_US_BINARY_URL": "%(en_us_binary_url)s",
         "MOZ_UPDATE_CHANNEL": "%(update_channel)s",
         "MOZ_PKG_PLATFORM": "mac",
         # "IS_NIGHTLY": "yes",
         "DIST": "%(abs_objdir)s",

--- a/testing/mozharness/configs/single_locale/tc_linux32.py
+++ b/testing/mozharness/configs/single_locale/tc_linux32.py
@@ -1,16 +1,16 @@
 import os
 
 EN_US_BINARY_URL = "%(en_us_binary_url)s"
 
 config = {
     "locales_file": "src/browser/locales/all-locales",
     "tools_repo": "https://hg.mozilla.org/build/tools",
-    "l10n_mozconfig": "src/browser/config/mozconfigs/linux32/l10n-mozconfig",
+    "l10n_mozconfig": "src/browser/config/mozconfigs/linux32/nightly-l10n",
     "bootstrap_env": {
         "NO_MERCURIAL_SETUP_CHECK": "1",
         "MOZ_OBJDIR": "obj-l10n",
         "EN_US_BINARY_URL": os.environ.get("EN_US_BINARY_URL", EN_US_BINARY_URL),
         "LOCALE_MERGEDIR": "%(abs_merge_dir)s/",
         "MOZ_UPDATE_CHANNEL": "%(update_channel)s",
         "DIST": "%(abs_objdir)s",
         "LOCALE_MERGEDIR": "%(abs_merge_dir)s/",

--- a/testing/mozharness/configs/single_locale/tc_linux64.py
+++ b/testing/mozharness/configs/single_locale/tc_linux64.py
@@ -1,16 +1,16 @@
 import os
 
 EN_US_BINARY_URL = "%(en_us_binary_url)s"
 
 config = {
     "locales_file": "src/browser/locales/all-locales",
     "tools_repo": "https://hg.mozilla.org/build/tools",
-    "l10n_mozconfig": "src/browser/config/mozconfigs/linux64/l10n-mozconfig",
+    "l10n_mozconfig": "src/browser/config/mozconfigs/linux64/nightly-l10n",
     "bootstrap_env": {
         "NO_MERCURIAL_SETUP_CHECK": "1",
         "MOZ_OBJDIR": "obj-l10n",
         "EN_US_BINARY_URL": os.environ.get("EN_US_BINARY_URL", EN_US_BINARY_URL),
         "LOCALE_MERGEDIR": "%(abs_merge_dir)s/",
         "MOZ_UPDATE_CHANNEL": "%(update_channel)s",
         "DIST": "%(abs_objdir)s",
         "LOCALE_MERGEDIR": "%(abs_merge_dir)s/",

--- a/testing/mozharness/configs/single_locale/tc_macosx64.py
+++ b/testing/mozharness/configs/single_locale/tc_macosx64.py
@@ -1,16 +1,16 @@
 import os
 
 EN_US_BINARY_URL = "%(en_us_binary_url)s"
 
 config = {
     "locales_file": "src/browser/locales/all-locales",
     "tools_repo": "https://hg.mozilla.org/build/tools",
-    "l10n_mozconfig": "src/browser/config/mozconfigs/macosx64/l10n-mozconfig",
+    "l10n_mozconfig": "src/browser/config/mozconfigs/macosx64/nightly-l10n",
     "bootstrap_env": {
         "NO_MERCURIAL_SETUP_CHECK": "1",
         "MOZ_OBJDIR": "obj-l10n",
         "EN_US_BINARY_URL": os.environ.get("EN_US_BINARY_URL", EN_US_BINARY_URL),
         "LOCALE_MERGEDIR": "%(abs_merge_dir)s/",
         "MOZ_UPDATE_CHANNEL": "%(update_channel)s",
         "DIST": "%(abs_objdir)s",
         "LOCALE_MERGEDIR": "%(abs_merge_dir)s/",

--- a/testing/mozharness/configs/single_locale/win32.py
+++ b/testing/mozharness/configs/single_locale/win32.py
@@ -1,16 +1,16 @@
 import os
 import sys
 
 config = {
     "platform": "win32",
     "stage_product": "firefox",
     "update_platform": "WINNT_x86-msvc",
-    "l10n_mozconfig": "%(branch)s/browser/config/mozconfigs/win32/l10n-mozconfig",
+    "l10n_mozconfig": "%(branch)s/browser/config/mozconfigs/win32/nightly-l10n",
     "bootstrap_env": {
         "MOZ_OBJDIR": "obj-l10n",
         "EN_US_BINARY_URL": "%(en_us_binary_url)s",
         "LOCALE_MERGEDIR": "%(abs_merge_dir)s",
         "MOZ_UPDATE_CHANNEL": "%(update_channel)s",
         "DIST": "%(abs_objdir)s",
         "L10NBASEDIR": "../../l10n",
         "MOZ_MAKE_COMPLETE_MAR": "1",

--- a/testing/mozharness/configs/single_locale/win32_devedition.py
+++ b/testing/mozharness/configs/single_locale/win32_devedition.py
@@ -1,16 +1,16 @@
 import os
 import sys
 
 config = {
     "platform": "win32",
     "stage_product": "firefox",
     "update_platform": "WINNT_x86-msvc",
-    "l10n_mozconfig": "%(branch)s/browser/config/mozconfigs/win32/l10n-mozconfig-devedition",
+    "l10n_mozconfig": "%(branch)s/browser/config/mozconfigs/win32/devedition-l10n",
     "bootstrap_env": {
         "MOZ_OBJDIR": "obj-l10n",
         "EN_US_BINARY_URL": "%(en_us_binary_url)s",
         "LOCALE_MERGEDIR": "%(abs_merge_dir)s",
         "MOZ_UPDATE_CHANNEL": "%(update_channel)s",
         "DIST": "%(abs_objdir)s",
         "L10NBASEDIR": "../../l10n",
         "MOZ_MAKE_COMPLETE_MAR": "1",

--- a/testing/mozharness/configs/single_locale/win64.py
+++ b/testing/mozharness/configs/single_locale/win64.py
@@ -1,16 +1,16 @@
 import os
 import sys
 
 config = {
     "platform": "win64",
     "stage_product": "firefox",
     "update_platform": "WINNT_x86_64-msvc",
-    "l10n_mozconfig": "%(branch)s/browser/config/mozconfigs/win64/l10n-mozconfig",
+    "l10n_mozconfig": "%(branch)s/browser/config/mozconfigs/win64/nightly-l10n",
     "bootstrap_env": {
         "MOZ_OBJDIR": "obj-l10n",
         "EN_US_BINARY_URL": "%(en_us_binary_url)s",
         "MOZ_UPDATE_CHANNEL": "%(update_channel)s",
         "DIST": "%(abs_objdir)s",
         "LOCALE_MERGEDIR": "%(abs_merge_dir)s",
         "L10NBASEDIR": "../../l10n",
         "MOZ_MAKE_COMPLETE_MAR": "1",

--- a/testing/mozharness/configs/single_locale/win64_devedition.py
+++ b/testing/mozharness/configs/single_locale/win64_devedition.py
@@ -1,16 +1,16 @@
 import os
 import sys
 
 config = {
     "platform": "win64",
     "stage_product": "firefox",
     "update_platform": "WINNT_x86_64-msvc",
-    "l10n_mozconfig": "%(branch)s/browser/config/mozconfigs/win64/l10n-mozconfig-devedition",
+    "l10n_mozconfig": "%(branch)s/browser/config/mozconfigs/win64/devedition-l10n",
     "bootstrap_env": {
         "MOZ_OBJDIR": "obj-l10n",
         "EN_US_BINARY_URL": "%(en_us_binary_url)s",
         "MOZ_UPDATE_CHANNEL": "%(update_channel)s",
         "DIST": "%(abs_objdir)s",
         "LOCALE_MERGEDIR": "%(abs_merge_dir)s",
         "L10NBASEDIR": "../../l10n",
         "MOZ_MAKE_COMPLETE_MAR": "1",