diff --git a/browser/components/library/moz.build b/browser/components/library/moz.build
index a1571929c1f3..e3c67c30645b 100644
--- a/browser/components/library/moz.build
+++ b/browser/components/library/moz.build
@@ -8,4 +8,4 @@ JAR_MANIFESTS += ['jar.mn']
 FINAL_LIBRARY = 'browsercomps'
 
 with Files('**'):
-    BUG_COMPONENT = ('Firefox', 'Library')
+    BUG_COMPONENT = ('Firefox', 'New Tab Page')
diff --git a/browser/components/syncedtabs/moz.build b/browser/components/syncedtabs/moz.build
index 93c98e65df09..cdee0c283a81 100644
--- a/browser/components/syncedtabs/moz.build
+++ b/browser/components/syncedtabs/moz.build
@@ -20,5 +20,5 @@ EXTRA_JS_MODULES.syncedtabs += [
 ]
 
 with Files('**'):
-    BUG_COMPONENT = ('Firefox', 'Synced tabs')
+    BUG_COMPONENT = ('Firefox', 'Sync')
 
diff --git a/browser/extensions/report-site-issue/moz.build b/browser/extensions/report-site-issue/moz.build
index 8893b3dfef02..a7a359ee84f1 100644
--- a/browser/extensions/report-site-issue/moz.build
+++ b/browser/extensions/report-site-issue/moz.build
@@ -34,4 +34,4 @@ FINAL_TARGET_FILES.features['webcompat-reporter@mozilla.org'].icons += [
 BROWSER_CHROME_MANIFESTS += ['test/browser/browser.ini']
 
 with Files('**'):
-    BUG_COMPONENT = ('Web Compatibility Tools', 'General')
+    BUG_COMPONENT = ('Web Compatibility', 'Tooling & Investigations')
diff --git a/browser/extensions/webcompat/moz.build b/browser/extensions/webcompat/moz.build
index d15f816d75f2..5d9804a4911b 100644
--- a/browser/extensions/webcompat/moz.build
+++ b/browser/extensions/webcompat/moz.build
@@ -78,4 +78,4 @@ FINAL_TARGET_FILES.features['webcompat@mozilla.org']['lib'] += [
 ]
 
 with Files('**'):
-  BUG_COMPONENT = ('Web Compatibility Tools', 'Go Faster')
+  BUG_COMPONENT = ('Web Compatibility', 'Tooling & Investigations')
diff --git a/docshell/test/moz.build b/docshell/test/moz.build
index 057723355c76..e797f80e9fd2 100644
--- a/docshell/test/moz.build
+++ b/docshell/test/moz.build
@@ -79,7 +79,7 @@ with Files('mochitest/*402210*'):
     BUG_COMPONENT = ('Core', 'DOM: Security')
 
 with Files('mochitest/*509055*'):
-    BUG_COMPONENT = ('Core', 'History: Global')
+    BUG_COMPONENT = ('Firefox', 'Bookmarks & History')
 
 with Files('mochitest/*511449*'):
     BUG_COMPONENT = ('Core', 'Widget: Cocoa')
diff --git a/dom/reporting/moz.build b/dom/reporting/moz.build
index cb27303436cb..5c54b2ae8015 100644
--- a/dom/reporting/moz.build
+++ b/dom/reporting/moz.build
@@ -39,7 +39,7 @@ IPDL_SOURCES += [
 include('/ipc/chromium/chromium-config.mozbuild')
 
 with Files('**'):
-    BUG_COMPONENT = ('DOM', 'Security')
+    BUG_COMPONENT = ('Core', 'DOM: Security')
 
 FINAL_LIBRARY = 'xul'
 
diff --git a/dom/tests/moz.build b/dom/tests/moz.build
index 6d8657a9c429..e8c3af7eca69 100644
--- a/dom/tests/moz.build
+++ b/dom/tests/moz.build
@@ -17,13 +17,13 @@ with Files("browser/*unload*"):
     BUG_COMPONENT = ("Core", "DOM: Events")
 
 with Files("browser/*1238427*"):
-    BUG_COMPONENT = ("Core", "Geolocation")
+    BUG_COMPONENT = ("Core", "DOM: Geolocation")
 
 with Files("browser/*Geolocation*"):
-    BUG_COMPONENT = ("Core", "Geolocation")
+    BUG_COMPONENT = ("Core", "DOM: Geolocation")
 
 with Files("browser/*geo_*"):
-    BUG_COMPONENT = ("Core", "Geolocation")
+    BUG_COMPONENT = ("Core", "DOM: Geolocation")
 
 with Files("browser/browser_cancel_keydown_keypress_event.js"):
     BUG_COMPONENT = ("Core", "DOM: UI Events & Focus Handling")
@@ -80,7 +80,7 @@ with Files("mochitest/general/**"):
     BUG_COMPONENT = ("Core", "DOM: Core & HTML")
 
 with Files("mochitest/geolocation/**"):
-    BUG_COMPONENT = ("Core", "Geolocation")
+    BUG_COMPONENT = ("Core", "DOM: Geolocation")
 
 with Files("mochitest/localstorage/**"):
     BUG_COMPONENT = ("Core", "Storage: localStorage & sessionStorage")
@@ -140,7 +140,7 @@ with Files("unit/**"):
     BUG_COMPONENT = ("Core", "DOM: Core & HTML")
 
 with Files("unit/*geolocation*"):
-    BUG_COMPONENT = ("Core", "Geolocation")
+    BUG_COMPONENT = ("Core", "DOM: Geolocation")
 
 with Files("unit/test_bug465752.js"):
     BUG_COMPONENT = ("Core", "CSS Parsing and Computation")
diff --git a/layout/xul/moz.build b/layout/xul/moz.build
index 43408b667a7a..9b9a961ce887 100644
--- a/layout/xul/moz.build
+++ b/layout/xul/moz.build
@@ -8,7 +8,7 @@ with Files('**'):
     BUG_COMPONENT = ('Core', 'XUL')
 
 with Files('*Menu*'):
-    BUG_COMPONENT = ('Core', 'XP Toolkit/Widgets: Menus')
+    BUG_COMPONENT = ('Firefox', 'Menus')
 
 if CONFIG['ENABLE_TESTS']:
     MOCHITEST_MANIFESTS += ['test/mochitest.ini']
diff --git a/mobile/android/app/moz.build b/mobile/android/app/moz.build
index a4b9a62a6890..c9b84969cfde 100644
--- a/mobile/android/app/moz.build
+++ b/mobile/android/app/moz.build
@@ -5,13 +5,10 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 with Files('**'):
-    BUG_COMPONENT = ('Firefox for Android', 'Build Config & IDE Support')
-
-with Files('mobile*'):
     BUG_COMPONENT = ('Firefox for Android', 'General')
 
 with Files('omnijar/**'):
-    BUG_COMPONENT = ('Firefox for Android', 'Build Config & IDE Support')
+    BUG_COMPONENT = ('Firefox for Android', 'General')
 
 for var in ('APP_NAME', 'APP_VERSION'):
     DEFINES[var] = CONFIG['MOZ_%s' % var]
diff --git a/mobile/android/base/moz.build b/mobile/android/base/moz.build
index 7eda59ea532f..27e71633831a 100644
--- a/mobile/android/base/moz.build
+++ b/mobile/android/base/moz.build
@@ -5,7 +5,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 with Files('**'):
-    BUG_COMPONENT = ('Firefox for Android', 'Build Config & IDE Support')
+    BUG_COMPONENT = ('Firefox for Android', 'General')
 
 with Files('locales/**'):
     BUG_COMPONENT = ('Firefox for Android', 'General')
diff --git a/mobile/android/installer/moz.build b/mobile/android/installer/moz.build
index 3d00e1d0b143..f37a72d23b7c 100644
--- a/mobile/android/installer/moz.build
+++ b/mobile/android/installer/moz.build
@@ -5,4 +5,4 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 with Files('**'):
-    BUG_COMPONENT = ('Firefox for Android', 'Build Config & IDE Support')
+    BUG_COMPONENT = ('Firefox for Android', 'General')
diff --git a/mobile/android/moz.build b/mobile/android/moz.build
index bada8f55c972..a938140c8e15 100644
--- a/mobile/android/moz.build
+++ b/mobile/android/moz.build
@@ -5,14 +5,14 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 with Files('**'):
-    BUG_COMPONENT = ('Firefox for Android', 'Build Config & IDE Support')
+    BUG_COMPONENT = ('Firefox for Android', 'General')
     SCHEDULES.exclusive = ['android']
 
 with Files('branding/**'):
     BUG_COMPONENT = ('Firefox for Android', 'General')
 
 with Files('config/**'):
-    BUG_COMPONENT = ('Firefox for Android', 'Build Config & IDE Support')
+    BUG_COMPONENT = ('Firefox for Android', 'General')
 
 with Files('docs/**'):
     BUG_COMPONENT = ('Firefox for Android', 'General')
@@ -30,7 +30,7 @@ with Files('geckoview_example/**'):
     BUG_COMPONENT = ('GeckoView', 'General')
 
 with Files('gradle/**'):
-    BUG_COMPONENT = ('Firefox for Android', 'Build Config & IDE Support')
+    BUG_COMPONENT = ('Firefox for Android', 'General')
 
 with Files('themes/**'):
     BUG_COMPONENT = ('Firefox for Android', 'Theme and Visual Design')
diff --git a/mobile/locales/moz.build b/mobile/locales/moz.build
index adb2ef014615..55e5814194e5 100644
--- a/mobile/locales/moz.build
+++ b/mobile/locales/moz.build
@@ -5,6 +5,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 with Files('**'):
-    BUG_COMPONENT = ('Firefox for Android', 'Locale Switching')
+    BUG_COMPONENT = ('Firefox for Android', 'Locale switching and selection')
 
-JAR_MANIFESTS += ['jar.mn']
\ No newline at end of file
+JAR_MANIFESTS += ['jar.mn']
diff --git a/moz.build b/moz.build
index 9a5e699e2c5e..8f6a16e2cb3d 100644
--- a/moz.build
+++ b/moz.build
@@ -38,7 +38,7 @@ with Files('GNUmakefile'):
     BUG_COMPONENT = ('Firefox Build System', 'General')
 
 with Files('*gradle*'):
-    BUG_COMPONENT = ('Firefox for Android', 'Build Config & IDE Support')
+    BUG_COMPONENT = ('Firefox for Android', 'General')
     SCHEDULES.exclusive = ['android']
 
 with Files('*.json'):
diff --git a/python/moz.build b/python/moz.build
index 3947f488562d..44558abc51ed 100644
--- a/python/moz.build
+++ b/python/moz.build
@@ -24,7 +24,7 @@ with Files('mozbuild/**'):
     BUG_COMPONENT = ('Firefox Build System', 'General')
 
 with Files('mozlint/**'):
-    BUG_COMPONENT = ('Testing', 'Lint')
+    BUG_COMPONENT = ('Firefox Build System', 'Linting and Formatting')
 
 with Files('mozversioncontrol/**'):
     BUG_COMPONENT = ('Firefox Build System', 'General')
@@ -33,7 +33,7 @@ with Files('l10n/**'):
     BUG_COMPONENT = ('Firefox Build System', 'General')
 
 with Files('mozrelease/**'):
-    BUG_COMPONENT = ('Release Engineering', 'Release Automation')
+    BUG_COMPONENT = ('Release Engineering', 'General')
 
 with Files('mach_commands.py'):
     BUG_COMPONENT = ('Testing', 'Python Test')
diff --git a/services/fxaccounts/moz.build b/services/fxaccounts/moz.build
index 624d10edf7b0..f9cf0d34374e 100644
--- a/services/fxaccounts/moz.build
+++ b/services/fxaccounts/moz.build
@@ -5,7 +5,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 with Files('**'):
-    BUG_COMPONENT = ('Core', 'fxAccounts')
+    BUG_COMPONENT = ('Firefox', 'Firefox Accounts')
 
 DIRS += ['interfaces']
 
diff --git a/testing/config/moz.build b/testing/config/moz.build
index 00ae548740df..f894b6e5893e 100644
--- a/testing/config/moz.build
+++ b/testing/config/moz.build
@@ -18,4 +18,4 @@ with Files("telemetry*"):
     BUG_COMPONENT = ("Toolkit", "Telemetry")
 
 with Files("tooltool-manifests/**"):
-    BUG_COMPONENT = ("Release Engineering", "Mozharness")
+    BUG_COMPONENT = ("Release Engineering", "Applications: MozharnessCore")
diff --git a/testing/modules/moz.build b/testing/modules/moz.build
index b02a9d41581c..370370f308ce 100644
--- a/testing/modules/moz.build
+++ b/testing/modules/moz.build
@@ -36,4 +36,4 @@ with Files("tests/xpcshell/**"):
     BUG_COMPONENT = ("Testing", "XPCShell Harness")
 
 with Files("tests/browser/**"):
-    BUG_COMPONENT = ("Testing", "BrowserTest")
+    BUG_COMPONENT = ("Testing", "General")
diff --git a/testing/tps/moz.build b/testing/tps/moz.build
index 7821d44e50d3..06a74e1bfc5b 100644
--- a/testing/tps/moz.build
+++ b/testing/tps/moz.build
@@ -5,4 +5,4 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 with Files("**"):
-    BUG_COMPONENT = ("Testing", "TPS")
+    BUG_COMPONENT = ("Testing", "General")
diff --git a/testing/web-platform/moz.build b/testing/web-platform/moz.build
index f85c1b2af58f..f984cd00b90a 100644
--- a/testing/web-platform/moz.build
+++ b/testing/web-platform/moz.build
@@ -76,7 +76,7 @@ with Files("mozilla/tests/placeholder"):
     BUG_COMPONENT = ("Testing", "web-platform-tests")
 
 with Files("mozilla/tests/wasm/**"):
-    BUG_COMPONENT = ("Core", "Javascript: Web Assembly")
+    BUG_COMPONENT = ("Core", "Javascript: WebAssembly")
 
 with Files("update/**"):
     BUG_COMPONENT = ("Testing", "web-platform-tests")
@@ -481,7 +481,7 @@ with Files("tests/gamepad/**"):
     BUG_COMPONENT = ("Core", "DOM: Device Interfaces")
 
 with Files("tests/geolocation-API/**"):
-    BUG_COMPONENT = ("Core", "Geolocation")
+    BUG_COMPONENT = ("Core", "DOM: Geolocation")
 
 with Files("tests/gyroscope/**"):
     BUG_COMPONENT = ("Core", "DOM: Device Interfaces")
@@ -624,7 +624,7 @@ with Files("tests/pointerlock/**"):
     BUG_COMPONENT = ("Core", "DOM: Events")
 
 with Files("tests/preload/**"):
-    BUG_COMPONENT = ("Core", "DOM: Core & Html")
+    BUG_COMPONENT = ("Core", "DOM: Core & HTML")
 
 with Files("tests/presentation-api/**"):
     BUG_COMPONENT = ("Core", "DOM: Core & HTML")
@@ -682,7 +682,7 @@ with Files("tests/storage/**"):
     BUG_COMPONENT = ("Core", "Storage: Quota Manager")
 
 with Files("tests/streams/**"):
-    BUG_COMPONENT = ("Core", "Javascript Engine")
+    BUG_COMPONENT = ("Core", "JavaScript Engine")
 
 with Files("tests/subresource-integrity/**"):
     BUG_COMPONENT = ("Core", "DOM: Security")
@@ -724,7 +724,7 @@ with Files("tests/wai-aria/**"):
     BUG_COMPONENT = ("Core", "Disability Access APIs")
 
 with Files("tests/wasm/**"):
-    BUG_COMPONENT = ("Core", "Javascript: Web Assembly")
+    BUG_COMPONENT = ("Core", "Javascript: WebAssembly")
 
 with Files("tests/web-animations/**"):
     BUG_COMPONENT = ("Core", "DOM: Animation")
@@ -763,10 +763,10 @@ with Files("tests/webusb/**"):
     BUG_COMPONENT = ("Core", "DOM: Device Interfaces")
 
 with Files("tests/webvr/**"):
-    BUG_COMPONENT = ("Core", "DOM: WebVR")
+    BUG_COMPONENT = ("Core", "WebVR")
 
 with Files("tests/webxr/**"):
-    BUG_COMPONENT = ("Core", "DOM: WebVR")
+    BUG_COMPONENT = ("Core", "WebVR")
 
 with Files("tests/webvtt/**"):
     BUG_COMPONENT = ("Core", "Audio/Video: Playback")
diff --git a/third_party/python/moz.build b/third_party/python/moz.build
index 0d59c88d3621..296a8b77ccc8 100644
--- a/third_party/python/moz.build
+++ b/third_party/python/moz.build
@@ -27,13 +27,13 @@ with Files('dlmanager/**'):
     BUG_COMPONENT = ('Firefox Build System', 'General')
 
 with Files('enum34/**'):
-    BUG_COMPONENT = ('Release Engineering', 'General Automation')
+    BUG_COMPONENT = ('Release Engineering', 'General')
 
 with Files('futures/**'):
     BUG_COMPONENT = ('Firefox Build System', 'General')
 
 with Files('jsmin/**'):
-    BUG_COMPONENT = ('Firefox for Android', 'Build Config & IDE Support')
+    BUG_COMPONENT = ('Firefox for Android', 'General')
 
 with Files('lldbutils/**'):
     BUG_COMPONENT = ('Core', 'General')
@@ -45,7 +45,7 @@ with Files('mohawk/**'):
     BUG_COMPONENT = ('Taskcluster', 'Platform Libraries')
 
 with Files('mozilla-version/**'):
-    BUG_COMPONENT = ('Release Engineering', 'General Automation')
+    BUG_COMPONENT = ('Release Engineering', 'General')
 
 with Files('psutil/**'):
     BUG_COMPONENT = ('Firefox Build System', 'General')
@@ -54,7 +54,7 @@ with Files('py/**'):
     BUG_COMPONENT = ('Firefox Build System', 'General')
 
 with Files('pyasn1/**'):
-    BUG_COMPONENT = ('Release Engineering', 'General Automation')
+    BUG_COMPONENT = ('Release Engineering', 'General')
 
 with Files('pyasn1-modules/**'):
     BUG_COMPONENT = ('Core', 'Security: PSM')
diff --git a/toolkit/content/moz.build b/toolkit/content/moz.build
index d8c68335a97c..32029df0434e 100644
--- a/toolkit/content/moz.build
+++ b/toolkit/content/moz.build
@@ -164,9 +164,9 @@ with Files('tests/chrome/*451540*'):
     BUG_COMPONENT = ('Toolkit', 'Find Toolbar')
 
 with Files('tests/chrome/*557987*'):
-    BUG_COMPONENT = ('Core', 'XP Toolkit/Widgets: Menus')
+    BUG_COMPONENT = ('Firefox', 'Menus')
 with Files('tests/chrome/*562554*'):
-    BUG_COMPONENT = ('Core', 'XP Toolkit/Widgets: Menus')
+    BUG_COMPONENT = ('Firefox', 'Menus')
 
 with Files('tests/chrome/*570192*'):
     BUG_COMPONENT = ('Firefox', 'Session Restore')
diff --git a/toolkit/modules/moz.build b/toolkit/modules/moz.build
index 2a779822857a..19d8edd95f1c 100644
--- a/toolkit/modules/moz.build
+++ b/toolkit/modules/moz.build
@@ -79,7 +79,7 @@ with Files('IndexedDB.jsm'):
     BUG_COMPONENT = ('Toolkit', 'Async Tooling')
 
 with Files('InlineSpellChecker*.jsm'):
-    BUG_COMPONENT = ('Core', 'Spell Checker')
+    BUG_COMPONENT = ('Core', 'Spelling checker')
 
 with Files('Integration.jsm'):
     BUG_COMPONENT = ('Toolkit', 'Async Tooling')
diff --git a/toolkit/mozapps/extensions/test/moz.build b/toolkit/mozapps/extensions/test/moz.build
index 5b1a725b6364..3c78515e9400 100644
--- a/toolkit/mozapps/extensions/test/moz.build
+++ b/toolkit/mozapps/extensions/test/moz.build
@@ -18,7 +18,7 @@ XPCSHELL_TESTS_MANIFESTS += [
 ]
 
 with Files('xpcshell/rs-blocklist/**'):
-    BUG_COMPONENT = ('Toolkit', 'Blockist Implementation')
+    BUG_COMPONENT = ('Toolkit', 'Blocklist Implementation')
 
 with Files('xpcshell/xml-blocklist/**'):
-    BUG_COMPONENT = ('Toolkit', 'Blockist Implementation')
+    BUG_COMPONENT = ('Toolkit', 'Blocklist Implementation')
diff --git a/tools/moz.build b/tools/moz.build
index 4b6174986f4f..d71e883b28ed 100644
--- a/tools/moz.build
+++ b/tools/moz.build
@@ -45,7 +45,7 @@ with Files("tryselect/selectors/release.py"):
     BUG_COMPONENT = ("Release Engineering", "General")
 
 with Files("update-packaging/**"):
-    BUG_COMPONENT = ("Release Engineering", "Other")
+    BUG_COMPONENT = ("Release Engineering", "General")
 
 with Files("update-verify/**"):
     BUG_COMPONENT = ("Release Engineering", "Release Automation: Updates")
diff --git a/widget/android/bindings/moz.build b/widget/android/bindings/moz.build
index 30cb31878b23..02b726af564b 100644
--- a/widget/android/bindings/moz.build
+++ b/widget/android/bindings/moz.build
@@ -5,7 +5,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 with Files("**"):
-    BUG_COMPONENT = ("Firefox for Android", "Graphics, Panning and Zooming")
+    BUG_COMPONENT = ("Firefox for Android", "General")
 
 # List of stems to generate .cpp and .h files for.  To add a stem, add it to
 # this list and ensure that $(stem)-classes.txt exists in this directory.