--- a/layout/reftests/moz.build
+++ b/layout/reftests/moz.build
@@ -63,19 +63,19 @@ with Files('backgrounds/**'):
     BUG_COMPONENT = ('Core', 'Layout')
 with Files('bidi/**'):
     BUG_COMPONENT = ('Core', 'Layout: Text')
 with Files('border-image/**'):
     BUG_COMPONENT = ('Core', 'Layout')
 with Files('border-radius/**'):
     BUG_COMPONENT = ('Core', 'Layout')
 with Files('box/**'):
-    BUG_COMPONENT = ('Core', 'XP Toolkit/Widgets: XUL')
+    BUG_COMPONENT = ('Core', 'XUL')
 with Files('box-ordinal/**'):
-    BUG_COMPONENT = ('Core', 'XP Toolkit/Widgets: XUL')
+    BUG_COMPONENT = ('Core', 'XUL')
 with Files('box-properties/**'):
     BUG_COMPONENT = ('Core', 'Layout')
 with Files('box-shadow/**'):
     BUG_COMPONENT = ('Core', 'Layout')
 with Files('box-sizing/**'):
     BUG_COMPONENT = ('Core', 'Layout')
 with Files('bugs/**'):
     BUG_COMPONENT = ('Core', 'Layout')
@@ -307,13 +307,13 @@ with Files('w3c-css/submitted/variables/
     BUG_COMPONENT = ('Core', 'CSS Parsing and Computation')
 with Files('webcomponents/**'):
     BUG_COMPONENT = ('Core', 'DOM')
 with Files('webm-video/**'):
     BUG_COMPONENT = ('Core', 'Audio/Video')
 with Files('writing-mode/**'):
     BUG_COMPONENT = ('Core', 'Layout: Block and Inline')
 with Files('xul/**'):
-    BUG_COMPONENT = ('Core', 'XP Toolkit/Widgets: XUL')
+    BUG_COMPONENT = ('Core', 'XUL')
 with Files('xul-document-load/**'):
-    BUG_COMPONENT = ('Core', 'XP Toolkit/Widgets: XUL')
+    BUG_COMPONENT = ('Core', 'XUL')
 with Files('z-index/**'):
     BUG_COMPONENT = ('Core', 'Layout')

--- a/layout/xul/grid/moz.build
+++ b/layout/xul/grid/moz.build
@@ -1,16 +1,16 @@
 # -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 with Files('**'):
-    BUG_COMPONENT = ('Core', 'XP Toolkit/Widgets: XUL')
+    BUG_COMPONENT = ('Core', 'XUL')
 
 EXPORTS += [
     'nsGrid.h',
     'nsGridCell.h',
     'nsGridLayout2.h',
     'nsGridRow.h',
     'nsGridRowGroupLayout.h',
     'nsGridRowLayout.h',

--- a/layout/xul/moz.build
+++ b/layout/xul/moz.build
@@ -1,16 +1,16 @@
 # -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 with Files('**'):
-    BUG_COMPONENT = ('Core', 'XP Toolkit/Widgets: XUL')
+    BUG_COMPONENT = ('Core', 'XUL')
 
 with Files('*Menu*'):
     BUG_COMPONENT = ('Core', 'XP Toolkit/Widgets: Menus')
 
 if CONFIG['ENABLE_TESTS']:
     MOCHITEST_MANIFESTS += ['test/mochitest.ini']
     MOCHITEST_CHROME_MANIFESTS += ['test/chrome.ini']
     BROWSER_CHROME_MANIFESTS += ['test/browser.ini']

--- a/layout/xul/tree/moz.build
+++ b/layout/xul/tree/moz.build
@@ -1,16 +1,16 @@
 # -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 with Files('**'):
-    BUG_COMPONENT = ('Core', 'XP Toolkit/Widgets: XUL')
+    BUG_COMPONENT = ('Core', 'XUL')
 
 XPIDL_SOURCES += [
     'nsITreeBoxObject.idl',
     'nsITreeColumns.idl',
     'nsITreeContentView.idl',
     'nsITreeSelection.idl',
     'nsITreeView.idl',
 ]

--- a/toolkit/content/moz.build
+++ b/toolkit/content/moz.build
@@ -184,17 +184,17 @@ with Files('tests/widgets/*audiocontrols
     BUG_COMPONENT = ('Toolkit', 'Video/Audio Controls')
 with Files('tests/widgets/*898940*'):
     BUG_COMPONENT = ('Toolkit', 'Video/Audio Controls')
 
 with Files('tests/widgets/*contextmenu*'):
     BUG_COMPONENT = ('Firefox', 'Menus')
 
 with Files('tests/widgets/*editor*'):
-    BUG_COMPONENT = ('Core', 'XP Toolkit/Widgets: XUL')
+    BUG_COMPONENT = ('Core', 'XUL')
 
 with Files('tests/widgets/*menubar*'):
     BUG_COMPONENT = ('Core', 'XUL')
 
 with Files('tests/widgets/*capture*'):
     BUG_COMPONENT = ('Core', 'Event Handling')
 
 with Files('tests/widgets/*popup*'):