new file mode 100644
--- /dev/null
+++ b/browser/config/mozconfigs/linux64/nightly-fuzzing-ccov
@@ -0,0 +1,38 @@
+MOZ_AUTOMATION_L10N_CHECK=0
+# We still need to build with debug symbols
+ac_add_options --disable-debug
+ac_add_options --enable-optimize="-O2 -gline-tables-only"
+
+#add-on signing is checked but not enforced
+MOZ_REQUIRE_SIGNING=0
+# Enable MOZ_ALLOW_LEGACY_EXTENSIONS
+ac_add_options "MOZ_ALLOW_LEGACY_EXTENSIONS=1"
+
+. $topsrcdir/build/mozconfig.stylo
+
+# ASan specific options on Linux
+ac_add_options --enable-valgrind
+
+. $topsrcdir/build/unix/mozconfig.asan
+ac_add_options --disable-elf-hack
+
+ac_add_options --disable-sandbox
+ac_add_options --disable-profiling
+ac_add_options --disable-warnings-as-errors
+ac_add_options --enable-coverage
+
+export CFLAGS="--coverage"
+export CXXFLAGS="--coverage"
+export LDFLAGS="--coverage"
+
+ac_add_options --enable-fuzzing
+unset MOZ_STDCXX_COMPAT
+
+# Package js shell.
+export MOZ_PACKAGE_JSSHELL=1
+
+# Need this to prevent name conflicts with the normal nightly build packages
+export MOZ_PKG_SPECIAL=asan-ccov
+
+. "$topsrcdir/build/mozconfig.common.override"
+

deleted file mode 100644
--- a/browser/config/mozconfigs/linux64/nightly-fuzzing-cov
+++ /dev/null
@@ -1,38 +0,0 @@
-MOZ_AUTOMATION_L10N_CHECK=0
-# We still need to build with debug symbols
-ac_add_options --disable-debug
-ac_add_options --enable-optimize="-O2 -gline-tables-only"
-
-#add-on signing is checked but not enforced
-MOZ_REQUIRE_SIGNING=0
-# Enable MOZ_ALLOW_LEGACY_EXTENSIONS
-ac_add_options "MOZ_ALLOW_LEGACY_EXTENSIONS=1"
-
-. $topsrcdir/build/mozconfig.stylo
-
-# ASan specific options on Linux
-ac_add_options --enable-valgrind
-
-. $topsrcdir/build/unix/mozconfig.asan
-ac_add_options --disable-elf-hack
-
-ac_add_options --disable-sandbox
-ac_add_options --disable-profiling
-ac_add_options --disable-warnings-as-errors
-ac_add_options --enable-coverage
-
-export CFLAGS="--coverage"
-export CXXFLAGS="--coverage"
-export LDFLAGS="--coverage"
-
-ac_add_options --enable-fuzzing
-unset MOZ_STDCXX_COMPAT
-
-# Package js shell.
-export MOZ_PACKAGE_JSSHELL=1
-
-# Need this to prevent name conflicts with the normal nightly build packages
-export MOZ_PKG_SPECIAL=asan-cov
-
-. "$topsrcdir/build/mozconfig.common.override"
-

--- a/taskcluster/ci/build/linux.yml
+++ b/taskcluster/ci/build/linux.yml
@@ -589,17 +589,17 @@ linux64-asan-fuzzing/opt:
         - linux64-rust
         - linux64-rust-size
         - linux64-sccache
 
 linux64-asan-fuzzing-ccov/opt:
     description: "Linux64 Fuzzing Opt ASAN w/ Coverage"
     index:
         product: firefox
-        job-name: linux64-fuzzing-asan-opt-cov
+        job-name: linux64-ccov-fuzzing-asan-opt
     treeherder:
         platform: linux64/asan
         symbol: Bocf
     run-on-projects: ['mozilla-central', 'try']
     worker-type: aws-provisioner-v1/gecko-{level}-b-linux
     worker:
         env:
             PERFHERDER_EXTRA_OPTIONS: asan-fuzzing-ccov
@@ -607,17 +607,17 @@ linux64-asan-fuzzing-ccov/opt:
     run:
         using: mozharness
         actions: [get-secrets build check-test update]
         config:
             - builds/releng_base_firefox.py
             - builds/releng_base_linux_64_builds.py
         script: "mozharness/scripts/fx_desktop_build.py"
         secrets: true
-        custom-build-variant-cfg: fuzzing-cov
+        custom-build-variant-cfg: fuzzing-ccov
         tooltool-downloads: public
         need-xvfb: true
     toolchains:
         - linux64-clang
         - linux64-gcc
         - linux64-rust
         - linux64-rust-size
         - linux64-sccache

new file mode 100644
--- /dev/null
+++ b/testing/mozharness/configs/builds/releng_sub_linux_configs/64_fuzzing_ccov.py
@@ -0,0 +1,30 @@
+import os
+
+config = {
+    'default_actions': [
+        'clobber',
+        'build',
+        'check-test',
+        # 'update',
+    ],
+    'stage_platform': 'linux64-fuzzing-ccov',
+    #### 64 bit build specific #####
+    'env': {
+        'MOZBUILD_STATE_PATH': os.path.join(os.getcwd(), '.mozbuild'),
+        'MOZ_AUTOMATION': '1',
+        'DISPLAY': ':2',
+        'HG_SHARE_BASE_DIR': '/builds/hg-shared',
+        'MOZ_OBJDIR': '%(abs_obj_dir)s',
+        'TINDERBOX_OUTPUT': '1',
+        'TOOLTOOL_CACHE': '/builds/tooltool_cache',
+        'TOOLTOOL_HOME': '/builds',
+        'MOZ_CRASHREPORTER_NO_REPORT': '1',
+        'LC_ALL': 'C',
+        'ASAN_OPTIONS': 'detect_leaks=0',
+        ## 64 bit specific
+        'PATH': '/usr/local/bin:/bin:\
+/usr/bin:/usr/local/sbin:/usr/sbin:/sbin',
+    },
+    'mozconfig_variant': 'nightly-fuzzing-ccov',
+    #######################
+}

deleted file mode 100644
--- a/testing/mozharness/configs/builds/releng_sub_linux_configs/64_fuzzing_cov.py
+++ /dev/null
@@ -1,30 +0,0 @@
-import os
-
-config = {
-    'default_actions': [
-        'clobber',
-        'build',
-        'check-test',
-        # 'update',
-    ],
-    'stage_platform': 'linux64-fuzzing-cov',
-    #### 64 bit build specific #####
-    'env': {
-        'MOZBUILD_STATE_PATH': os.path.join(os.getcwd(), '.mozbuild'),
-        'MOZ_AUTOMATION': '1',
-        'DISPLAY': ':2',
-        'HG_SHARE_BASE_DIR': '/builds/hg-shared',
-        'MOZ_OBJDIR': '%(abs_obj_dir)s',
-        'TINDERBOX_OUTPUT': '1',
-        'TOOLTOOL_CACHE': '/builds/tooltool_cache',
-        'TOOLTOOL_HOME': '/builds',
-        'MOZ_CRASHREPORTER_NO_REPORT': '1',
-        'LC_ALL': 'C',
-        'ASAN_OPTIONS': 'detect_leaks=0',
-        ## 64 bit specific
-        'PATH': '/usr/local/bin:/bin:\
-/usr/bin:/usr/local/sbin:/usr/sbin:/sbin',
-    },
-    'mozconfig_variant': 'nightly-fuzzing-cov',
-    #######################
-}

--- a/testing/mozharness/mozharness/mozilla/building/buildbase.py
+++ b/testing/mozharness/mozharness/mozilla/building/buildbase.py
@@ -409,17 +409,17 @@ class BuildOptionParser(object):
         'cross-debug': 'builds/releng_sub_%s_configs/%s_cross_debug.py',
         'cross-debug-searchfox': 'builds/releng_sub_%s_configs/%s_cross_debug_searchfox.py',
         'cross-debug-artifact': 'builds/releng_sub_%s_configs/%s_cross_debug_artifact.py',
         'cross-noopt-debug': 'builds/releng_sub_%s_configs/%s_cross_noopt_debug.py',
         'cross-fuzzing-asan': 'builds/releng_sub_%s_configs/%s_cross_fuzzing_asan.py',
         'cross-artifact': 'builds/releng_sub_%s_configs/%s_cross_artifact.py',
         'debug': 'builds/releng_sub_%s_configs/%s_debug.py',
         'fuzzing-debug': 'builds/releng_sub_%s_configs/%s_fuzzing_debug.py',
-        'fuzzing-cov': 'builds/releng_sub_%s_configs/%s_fuzzing_cov.py',
+        'fuzzing-ccov': 'builds/releng_sub_%s_configs/%s_fuzzing_ccov.py',
         'asan-and-debug': 'builds/releng_sub_%s_configs/%s_asan_and_debug.py',
         'asan-tc-and-debug': 'builds/releng_sub_%s_configs/%s_asan_tc_and_debug.py',
         'lto-tc': 'builds/releng_sub_%s_configs/%s_lto_tc.py',
         'lto-tc-and-debug': 'builds/releng_sub_%s_configs/%s_lto_tc_and_debug.py',
         'stat-and-debug': 'builds/releng_sub_%s_configs/%s_stat_and_debug.py',
         'code-coverage-debug': 'builds/releng_sub_%s_configs/%s_code_coverage_debug.py',
         'code-coverage-opt': 'builds/releng_sub_%s_configs/%s_code_coverage_opt.py',
         'source': 'builds/releng_sub_%s_configs/%s_source.py',