--- a/dom/media/encoder/moz.build
+++ b/dom/media/encoder/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', 'Video/Audio: Recording')
+    BUG_COMPONENT = ('Core', 'Audio/Video: Recording')
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
     DIRS += ['fmp4_muxer']
 
 EXPORTS += [
     'ContainerWriter.h',
     'EncodedFrameContainer.h',
     'MediaEncoder.h',

--- a/layout/generic/moz.build
+++ b/layout/generic/moz.build
@@ -60,17 +60,17 @@ with Files('nsAbsoluteContainingBlock.*'
 
 with Files('Sticky*'):
     BUG_COMPONENT = ('Core', 'Layout: R & A Pos')
 
 with Files('nsPluginFrame.*'):
     BUG_COMPONENT = ('Core', 'Plug-ins')
 
 with Files('nsVideoFrame.*'):
-    BUG_COMPONENT = ('Core', 'Video/Audio')
+    BUG_COMPONENT = ('Core', 'Audio/Video')
 
 with Files('*Selection*'):
     BUG_COMPONENT = ('Core', 'Selection')
 
 EXPORTS += [
     'AsyncScrollBase.h',
     'nsCanvasFrame.h',
     'nsContainerFrame.h',

--- a/layout/media/moz.build
+++ b/layout/media/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', 'Video/Audio')
+    BUG_COMPONENT = ('Core', 'Audio/Video')
 
 # media/webrtc/signaling/test/common.build uses the gkmedias library,
 # expecting at least some of what it contains to be linked, but not libxul,
 # so we need to keep an independent pseudo-library, as well as the OS_LIBS
 # on Windows for them to propagate there.
 Library('gkmedias')
 
 FINAL_LIBRARY = 'xul'

--- a/layout/reftests/moz.build
+++ b/layout/reftests/moz.build
@@ -205,17 +205,17 @@ with Files('marquee/**'):
     BUG_COMPONENT = ('Core', 'CSS Parsing and Computation')
 with Files('mathml/**'):
     BUG_COMPONENT = ('Core', 'MathML')
 with Files('native-theme/**'):
     BUG_COMPONENT = ('Core', 'Layout')
 with Files('object/**'):
     BUG_COMPONENT = ('Core', 'DOM')
 with Files('ogg-video/**'):
-    BUG_COMPONENT = ('Core', 'Video/Audio')
+    BUG_COMPONENT = ('Core', 'Audio/Video')
 with Files('outline/**'):
     BUG_COMPONENT = ('Core', 'Layout')
 with Files('pagination/**'):
     BUG_COMPONENT = ('Core', 'Layout')
 with Files('percent-overflow-sizing/**'):
     BUG_COMPONENT = ('Core', 'Layout')
 with Files('pixel-rounding/**'):
     BUG_COMPONENT = ('Core', 'Layout')
@@ -303,17 +303,17 @@ with Files('w3c-css/submitted/ui3/**'):
     BUG_COMPONENT = ('Core', 'Layout')
 with Files('w3c-css/submitted/values3/**'):
     BUG_COMPONENT = ('Core', 'CSS Parsing and Computation')
 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', 'Video/Audio')
+    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')
 with Files('xul-document-load/**'):
     BUG_COMPONENT = ('Core', 'XP Toolkit/Widgets: XUL')
 with Files('z-index/**'):
     BUG_COMPONENT = ('Core', 'Layout')

--- a/media/libogg/moz.build
+++ b/media/libogg/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', 'Video/Audio')
+    BUG_COMPONENT = ('Core', 'Audio/Video')
 
 EXPORTS.ogg += [
     'include/ogg/config_types.h',
     'include/ogg/ogg.h',
     'include/ogg/os_types.h',
 ]
 
 UNIFIED_SOURCES += [

--- a/media/libopus/moz.build
+++ b/media/libopus/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', 'Video/Audio')
+    BUG_COMPONENT = ('Core', 'Audio/Video')
 
 EXPORTS.opus += [
     'include/opus.h',
     'include/opus_defines.h',
     'include/opus_multistream.h',
     'include/opus_types.h',
 ]
 

--- a/media/libtheora/moz.build
+++ b/media/libtheora/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', 'Video/Audio')
+    BUG_COMPONENT = ('Core', 'Audio/Video')
 
 EXPORTS.theora += [
     'include/theora/codec.h',
     'include/theora/theoradec.h',
     'include/theora/theoraenc.h',
 ]
 
 # We allow warnings for third-party code that can be updated from upstream.

--- a/media/libtremor/moz.build
+++ b/media/libtremor/moz.build
@@ -1,11 +1,11 @@
 # -*- 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', 'Video/Audio')
+    BUG_COMPONENT = ('Core', 'Audio/Video')
 
 DIRS += ['include/tremor', 'lib']
 

--- a/media/libvorbis/moz.build
+++ b/media/libvorbis/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', 'Video/Audio')
+    BUG_COMPONENT = ('Core', 'Audio/Video')
 
 EXPORTS.vorbis += [
     'include/vorbis/codec.h',
     'include/vorbis/vorbisenc.h',
 ]
 
 UNIFIED_SOURCES += [
     'lib/vorbis_analysis.c',

--- a/media/libvpx/moz.build
+++ b/media/libvpx/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', 'Video/Audio')
+    BUG_COMPONENT = ('Core', 'Audio/Video')
 
 include('sources.mozbuild')
 
 if CONFIG['VPX_USE_YASM']:
     USE_YASM = True
 
 # Linux, Mac and Win share file lists for x86* but not configurations.
 if CONFIG['CPU_ARCH'] == 'x86_64':

--- a/media/psshparser/moz.build
+++ b/media/psshparser/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', 'Video/Audio')
+    BUG_COMPONENT = ('Core', 'Audio/Video')
 
 EXPORTS.psshparser += [
     'PsshParser.h',
 ]
 
 UNIFIED_SOURCES += [
     'PsshParser.cpp',
 ]

--- a/toolkit/components/mediasniffer/moz.build
+++ b/toolkit/components/mediasniffer/moz.build
@@ -14,9 +14,9 @@ UNIFIED_SOURCES += [
     'mp3sniff.c',
     'nsMediaSniffer.cpp',
     'nsMediaSnifferModule.cpp',
 ]
 
 FINAL_LIBRARY = 'xul'
 
 with Files('**'):
-    BUG_COMPONENT = ('Core', 'Video/Audio')
+    BUG_COMPONENT = ('Core', 'Audio/Video')