--- a/common.py
+++ b/common.py
@@ -116,16 +116,17 @@ def normalizeName(name, product=None, mi
         'hamachi': 'ham',
         'wasabi': 'wsb',
         'graphics': 'gfx',
         'flame': 'flm',
         'dolphin': 'dph',
         'nexus-5': 'n5',
         'firefox_tag_source': 'fx_tag_src',
         'firefox_tag_l10n': 'fx_tag_l10n',
+        'firefox': 'fx',
         'fennec_tag_source': 'm_tag_src',
         'fennec_tag_l10n': 'm_tag_l10n',
         'thunderbird_tag_source': 't_tag_src',
         'thunderbird_tag_l10n': 't_tag_l10n',
         'start_uptake_monitoring': 'ut',
         'final': 'fnl',
         'verification': 'vrfy',
         'shipping': 'shp',

--- a/misc.py
+++ b/misc.py
@@ -3353,30 +3353,30 @@ def generateReleasePromotionObjects(conf
         mh_cfg = {
             "script_name": "scripts/desktop_l10n.py",
             "extra_args": [
                 "--branch-config", "single_locale/%s.py" % name,
                 "--platform-config", "single_locale/%s.py" % platform,
                 "--environment-config", env_config,
                 "--balrog-config", balrog_config,
             ],
-            "use_credentials_file": True,
             "script_timeout": 1800,
             "script_maxtime": 7200,
         }
 
         l10n_factory = makeMHFactory(config, pf,
             mh_cfg=mh_cfg,
             signingServers=secrets.get(pf.get("dep_signing_servers")),
+            use_credentials_file=True,
         )
         l10n_builder = {
             "name": l10n_buildername,
             "factory": l10n_factory,
             "builddir": l10n_buildername,
-            "slavebuilddir": normalizeName(l10n_buildername, config["product_name"]),
+            "slavebuilddir": normalizeName(l10n_buildername),
             "slavenames": pf["slaves"],
             "category": name,
             "properties": {
                 "branch": name,
                 "platform": "l10n",
                 "product": pf["product_name"],
                 "repo_path": config["repo_path"],
                 "script_repo_revision": config["mozharness_tag"],