diff --git a/browser/base/content/moz.build b/browser/base/content/moz.build
index 54dcdd8b7d96..f91487920fc9 100644
--- a/browser/base/content/moz.build
+++ b/browser/base/content/moz.build
@@ -17,7 +17,7 @@ with Files("test/about/**"):
     BUG_COMPONENT = ("Firefox", "General")
 
 with Files("test/alerts/**"):
-    BUG_COMPONENT = ("Toolkit", "Notifications and Alerts")
+    BUG_COMPONENT = ("Toolkit", "Alerts Service")
 
 with Files("test/captivePortal/**"):
     BUG_COMPONENT = ("Firefox", "General")
@@ -59,7 +59,7 @@ with Files("test/plugins/**"):
     BUG_COMPONENT = ("Core", "Audio/Video: GMP")
 
 with Files("test/popupNotifications/**"):
-    BUG_COMPONENT = ("Toolkit", "Notifications and Alerts")
+    BUG_COMPONENT = ("Toolkit", "PopupNotifications and Notification Bars")
 
 with Files("test/popups/**"):
     BUG_COMPONENT = ("Firefox", "Site Permissions")
diff --git a/browser/components/prompts/moz.build b/browser/components/prompts/moz.build
index dd4e0c8e6a33..98d52d539794 100644
--- a/browser/components/prompts/moz.build
+++ b/browser/components/prompts/moz.build
@@ -3,7 +3,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 with Files("**"):
-    BUG_COMPONENT = ("Toolkit", "Notifications and Alerts")
+    BUG_COMPONENT = ("Toolkit", "Content Prompts")
 
 EXTRA_JS_MODULES += [
     "PromptCollection.sys.mjs",
diff --git a/dom/notification/moz.build b/dom/notification/moz.build
index 6b6974b6d5f6..77c0991cbe3f 100644
--- a/dom/notification/moz.build
+++ b/dom/notification/moz.build
@@ -5,7 +5,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 with Files("**"):
-    BUG_COMPONENT = ("Toolkit", "Notifications and Alerts")
+    BUG_COMPONENT = ("Core", "DOM: Notifications")
 
 EXTRA_JS_MODULES += [
     "NotificationStorage.sys.mjs",
diff --git a/testing/web-platform/moz.build b/testing/web-platform/moz.build
index 43ae04131f1d..4a4c9e719bc0 100644
--- a/testing/web-platform/moz.build
+++ b/testing/web-platform/moz.build
@@ -557,7 +557,7 @@ with Files("tests/netinfo/**"):
     BUG_COMPONENT = ("Core", "DOM: Device Interfaces")
 
 with Files("tests/notifications/**"):
-    BUG_COMPONENT = ("Toolkit", "Notifications and Alerts")
+    BUG_COMPONENT = ("Core", "DOM: Notifications")
 
 with Files("tests/network-error-logging/**"):
     BUG_COMPONENT = ("Core", "DOM: Networking")
diff --git a/toolkit/components/alerts/moz.build b/toolkit/components/alerts/moz.build
index 9a65c4c9fe45..023f5580a29b 100644
--- a/toolkit/components/alerts/moz.build
+++ b/toolkit/components/alerts/moz.build
@@ -42,4 +42,4 @@ FINAL_LIBRARY = "xul"
 JAR_MANIFESTS += ["jar.mn"]
 
 with Files("**"):
-    BUG_COMPONENT = ("Toolkit", "Notifications and Alerts")
+    BUG_COMPONENT = ("Toolkit", "Alerts Service")
diff --git a/toolkit/components/prompts/moz.build b/toolkit/components/prompts/moz.build
index 64a3115cbec4..fc1604a8053a 100644
--- a/toolkit/components/prompts/moz.build
+++ b/toolkit/components/prompts/moz.build
@@ -5,7 +5,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 with Files("**"):
-    BUG_COMPONENT = ("Toolkit", "Notifications and Alerts")
+    BUG_COMPONENT = ("Toolkit", "Content Prompts")
 
 DIRS += ["src"]
 
diff --git a/toolkit/modules/moz.build b/toolkit/modules/moz.build
index dcdf315ceb23..57751213040b 100644
--- a/toolkit/modules/moz.build
+++ b/toolkit/modules/moz.build
@@ -103,7 +103,7 @@ with Files("PermissionsUtils.sys.mjs"):
     BUG_COMPONENT = ("Toolkit", "Add-ons Manager")
 
 with Files("PopupNotifications.sys.mjs"):
-    BUG_COMPONENT = ("Toolkit", "Notifications and Alerts")
+    BUG_COMPONENT = ("Toolkit", "PopupNotifications and Notification Bars")
 
 with Files("PrivateBrowsingUtils.sys.mjs"):
     BUG_COMPONENT = ("Firefox", "Private Browsing")
@@ -121,7 +121,7 @@ with Files("Sqlite.sys.mjs"):
     BUG_COMPONENT = ("Toolkit", "Storage")
 
 with Files("SubDialog.sys.mjs"):
-    BUG_COMPONENT = ("Toolkit", "Notifications and Alerts")
+    BUG_COMPONENT = ("Toolkit", "Content Prompts")
 
 with Files("UpdateUtils.sys.mjs"):
     BUG_COMPONENT = ("Toolkit", "Application Update")
diff --git a/toolkit/mozapps/notificationserver/moz.build b/toolkit/mozapps/notificationserver/moz.build
index 16e8d50f9fc5..935de86c52f0 100644
--- a/toolkit/mozapps/notificationserver/moz.build
+++ b/toolkit/mozapps/notificationserver/moz.build
@@ -5,7 +5,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 with Files("**"):
-    BUG_COMPONENT = ("Toolkit", "Notifications and Alerts")
+    BUG_COMPONENT = ("Toolkit", "Alerts Service")
 
 SharedLibrary("notificationserver")