--- a/b2g/installer/package-manifest.in
+++ b/b2g/installer/package-manifest.in
@@ -113,251 +113,251 @@
 #endif
 #endif
 #ifdef MOZ_WEBSPEECH_MODELS
 @RESPATH@/models/
 #endif
 
 ; [Components]
 @RESPATH@/components/components.manifest
-@RESPATH@/components/alerts.xpt
+@RESPATH@/components/toolkit_components_alerts.xpt
 #ifdef ACCESSIBILITY
 #ifdef XP_WIN32
 @BINPATH@/AccessibleMarshal.dll
 #endif
-@RESPATH@/components/accessibility.xpt
+@RESPATH@/components/accessible_interfaces.xpt
 #endif
-@RESPATH@/components/appshell.xpt
-@RESPATH@/components/appstartup.xpt
-@RESPATH@/components/autocomplete.xpt
-@RESPATH@/components/autoconfig.xpt
-@RESPATH@/components/browsercompsbase.xpt
-@RESPATH@/components/browser-element.xpt
-@RESPATH@/components/browser-feeds.xpt
+@RESPATH@/components/xpfe_appshell.xpt
+@RESPATH@/components/toolkit_components_startup_public.xpt
+@RESPATH@/components/toolkit_components_autocomplete.xpt
+@RESPATH@/components/extensions_pref_autoconfig_public.xpt
+@RESPATH@/components/browser_components.xpt
+@RESPATH@/components/dom_browser-element.xpt
+@RESPATH@/components/browser_components_feeds.xpt
 @RESPATH@/components/caps.xpt
 @RESPATH@/components/chardet.xpt
 @RESPATH@/components/chrome.xpt
-@RESPATH@/components/commandhandler.xpt
-@RESPATH@/components/commandlines.xpt
-@RESPATH@/components/composer.xpt
-@RESPATH@/components/content_events.xpt
-@RESPATH@/components/content_geckomediaplugins.xpt
-@RESPATH@/components/content_html.xpt
-@RESPATH@/components/content_xslt.xpt
-@RESPATH@/components/cookie.xpt
-@RESPATH@/components/directory.xpt
-@RESPATH@/components/diskspacewatcher.xpt
-@RESPATH@/components/docshell.xpt
-@RESPATH@/components/dom.xpt
-@RESPATH@/components/dom_activities.xpt
-@RESPATH@/components/dom_apps.xpt
-@RESPATH@/components/dom_newapps.xpt
+@RESPATH@/components/embedding_components_commandhandler.xpt
+@RESPATH@/components/toolkit_components_commandlines.xpt
+@RESPATH@/components/editor_composer.xpt
+@RESPATH@/components/dom_events.xpt
+@RESPATH@/components/dom_media_gmp.xpt
+@RESPATH@/components/dom_html.xpt
+@RESPATH@/components/dom_xslt.xpt
+@RESPATH@/components/extensions_cookie.xpt
+@RESPATH@/components/xpfe_components_directory.xpt
+@RESPATH@/components/toolkit_components_diskspacewatcher.xpt
+@RESPATH@/components/docshell_base.xpt
+@RESPATH@/components/dom_base.xpt
+@RESPATH@/components/dom_activities_interfaces.xpt
+@RESPATH@/components/dom_interfaces_apps.xpt
+@RESPATH@/components/dom_newapps_interfaces.xpt
 @RESPATH@/components/dom_audiochannel.xpt
-@RESPATH@/components/dom_base.xpt
+@RESPATH@/components/dom_interfaces_base.xpt
 @RESPATH@/components/dom_system.xpt
 @RESPATH@/components/dom_workers.xpt
 #ifdef MOZ_WIDGET_GONK
 @RESPATH@/components/dom_wifi.xpt
 @RESPATH@/components/dom_system_gonk.xpt
 #endif
 #ifdef MOZ_B2G_RIL
 @RESPATH@/components/dom_wappush.xpt
 @RESPATH@/components/dom_mobileconnection.xpt
 #endif
 #ifdef MOZ_B2G_BT
 @RESPATH@/components/dom_bluetooth.xpt
 #endif
 #ifdef MOZ_B2G_CAMERA
 @RESPATH@/components/dom_camera.xpt
 #endif
-@RESPATH@/components/dom_canvas.xpt
+@RESPATH@/components/dom_interfaces_canvas.xpt
 @RESPATH@/components/dom_contacts.xpt
 @RESPATH@/components/dom_alarm.xpt
-@RESPATH@/components/dom_core.xpt
-@RESPATH@/components/dom_css.xpt
-@RESPATH@/components/dom_events.xpt
-@RESPATH@/components/dom_geolocation.xpt
+@RESPATH@/components/dom_interfaces_core.xpt
+@RESPATH@/components/dom_interfaces_css.xpt
+@RESPATH@/components/dom_interfaces_events.xpt
+@RESPATH@/components/dom_interfaces_geolocation.xpt
 @RESPATH@/components/dom_ipc.xpt
 @RESPATH@/components/dom_media.xpt
-@RESPATH@/components/dom_network.xpt
+@RESPATH@/components/dom_network_interfaces.xpt
 #ifdef MOZ_SECUREELEMENT
 @RESPATH@/components/dom_secureelement.xpt
 #endif
 #ifdef MOZ_NFC
 @RESPATH@/components/dom_nfc.xpt
 #endif
-@RESPATH@/components/dom_notification.xpt
-@RESPATH@/components/dom_html.xpt
-@RESPATH@/components/dom_offline.xpt
-@RESPATH@/components/dom_payment.xpt
-@RESPATH@/components/dom_json.xpt
-@RESPATH@/components/dom_messages.xpt
+@RESPATH@/components/dom_interfaces_notification.xpt
+@RESPATH@/components/dom_interfaces_html.xpt
+@RESPATH@/components/dom_interfaces_offline.xpt
+@RESPATH@/components/dom_payment_interfaces.xpt
+@RESPATH@/components/dom_interfaces_json.xpt
+@RESPATH@/components/dom_messages_interfaces.xpt
 @RESPATH@/components/dom_power.xpt
-@RESPATH@/components/dom_push.xpt
+@RESPATH@/components/dom_interfaces_push.xpt
 @RESPATH@/components/dom_quota.xpt
-@RESPATH@/components/dom_range.xpt
-@RESPATH@/components/dom_security.xpt
-@RESPATH@/components/dom_settings.xpt
-@RESPATH@/components/dom_permissionsettings.xpt
-@RESPATH@/components/dom_sidebar.xpt
-@RESPATH@/components/dom_cellbroadcast.xpt
-@RESPATH@/components/dom_icc.xpt
-@RESPATH@/components/dom_mobilemessage.xpt
-@RESPATH@/components/dom_storage.xpt
-@RESPATH@/components/dom_stylesheets.xpt
+@RESPATH@/components/dom_interfaces_range.xpt
+@RESPATH@/components/dom_interfaces_security.xpt
+@RESPATH@/components/dom_interfaces_settings.xpt
+@RESPATH@/components/dom_interfaces_permission.xpt
+@RESPATH@/components/dom_interfaces_sidebar.xpt
+@RESPATH@/components/dom_cellbroadcast_interfaces.xpt
+@RESPATH@/components/dom_icc_interfaces.xpt
+@RESPATH@/components/dom_mobilemessage_interfaces.xpt
+@RESPATH@/components/dom_interfaces_storage.xpt
+@RESPATH@/components/dom_interfaces_stylesheets.xpt
 @RESPATH@/components/dom_telephony.xpt
 @RESPATH@/components/dom_threads.xpt
-@RESPATH@/components/dom_traversal.xpt
+@RESPATH@/components/dom_interfaces_traversal.xpt
 @RESPATH@/components/dom_tv.xpt
 @RESPATH@/components/dom_inputport.xpt
 @RESPATH@/components/dom_views.xpt
 @RESPATH@/components/dom_voicemail.xpt
 #ifdef MOZ_WEBSPEECH
-@RESPATH@/components/dom_webspeechrecognition.xpt
+@RESPATH@/components/dom_media_webspeech_recognition.xpt
 #endif
-@RESPATH@/components/dom_xbl.xpt
-@RESPATH@/components/dom_xpath.xpt
-@RESPATH@/components/dom_xul.xpt
+@RESPATH@/components/dom_interfaces_xbl.xpt
+@RESPATH@/components/dom_interfaces_xpath.xpt
+@RESPATH@/components/dom_interfaces_xul.xpt
 @RESPATH@/components/dom_time.xpt
 @RESPATH@/components/dom_engineeringmode.xpt
-@RESPATH@/components/dom_presentation.xpt
-@RESPATH@/components/downloads.xpt
+@RESPATH@/components/dom_presentation_interfaces.xpt
+@RESPATH@/components/toolkit_components_downloads.xpt
 @RESPATH@/components/editor.xpt
-@RESPATH@/components/embed_base.xpt
-@RESPATH@/components/extensions.xpt
-@RESPATH@/components/exthandler.xpt
-@RESPATH@/components/exthelper.xpt
-@RESPATH@/components/fastfind.xpt
-@RESPATH@/components/feeds.xpt
+@RESPATH@/components/embedding.xpt
+@RESPATH@/components/toolkit_mozapps_extensions.xpt
+@RESPATH@/components/uriloader_exthandler.xpt
+@RESPATH@/components/toolkit_components_exthelper.xpt
+@RESPATH@/components/toolkit_components_typeaheadfind.xpt
+@RESPATH@/components/toolkit_components_feeds.xpt
 #ifdef MOZ_GTK
-@RESPATH@/components/filepicker.xpt
+@RESPATH@/components/toolkit_components_filepicker.xpt
 #endif
-@RESPATH@/components/find.xpt
-@RESPATH@/components/gfx.xpt
+@RESPATH@/components/embedding_components_find.xpt
+@RESPATH@/components/gfx_src.xpt
 @RESPATH@/components/hal.xpt
-@RESPATH@/components/html5.xpt
-@RESPATH@/components/htmlparser.xpt
-@RESPATH@/components/identity.xpt
-@RESPATH@/components/imglib2.xpt
-@RESPATH@/components/inspector.xpt
-@RESPATH@/components/intl.xpt
-@RESPATH@/components/jar.xpt
-@RESPATH@/components/jsdebugger.xpt
-@RESPATH@/components/jsdownloads.xpt
-@RESPATH@/components/jsinspector.xpt
+@RESPATH@/components/parser_html.xpt
+@RESPATH@/components/parser_htmlparser.xpt
+@RESPATH@/components/toolkit_identity.xpt
+@RESPATH@/components/image.xpt
+@RESPATH@/components/layout_inspector.xpt
+@RESPATH@/components/intl_strres.xpt
+@RESPATH@/components/modules_libjar.xpt
+@RESPATH@/components/js_ductwork_debugger.xpt
+@RESPATH@/components/toolkit_components_jsdownloads_public.xpt
+@RESPATH@/components/devtools_server.xpt
 @RESPATH@/components/layout_base.xpt
 @RESPATH@/components/layout_style.xpt
 #ifdef NS_PRINTING
 @RESPATH@/components/layout_printing.xpt
 #endif
 @RESPATH@/components/layout_xul_tree.xpt
 @RESPATH@/components/layout_xul.xpt
-@RESPATH@/components/locale.xpt
-@RESPATH@/components/lwbrk.xpt
+@RESPATH@/components/intl_locale.xpt
+@RESPATH@/components/intl_lwbrk.xpt
 #ifdef MOZ_ENABLE_PROFILER_SPS
-@RESPATH@/components/memory_profiler.xpt
+@RESPATH@/components/tools_memory-profiler.xpt
 #endif
-@RESPATH@/components/migration.xpt
-@RESPATH@/components/mimetype.xpt
-@RESPATH@/components/mozfind.xpt
-@RESPATH@/components/necko_about.xpt
-@RESPATH@/components/necko_cache.xpt
-@RESPATH@/components/necko_cache2.xpt
-@RESPATH@/components/necko_cookie.xpt
-@RESPATH@/components/necko_dns.xpt
-@RESPATH@/components/necko_file.xpt
-@RESPATH@/components/necko_ftp.xpt
-@RESPATH@/components/necko_http.xpt
-@RESPATH@/components/necko_mdns.xpt
-@RESPATH@/components/necko_res.xpt
-@RESPATH@/components/necko_socket.xpt
-@RESPATH@/components/necko_strconv.xpt
-@RESPATH@/components/necko_streamconv_converters.xpt
-@RESPATH@/components/necko_viewsource.xpt
-@RESPATH@/components/necko_websocket.xpt
-@RESPATH@/components/necko_wifi.xpt
-@RESPATH@/components/necko_wyciwyg.xpt
+@RESPATH@/components/browser_components_migration.xpt
+@RESPATH@/components/netwerk_mime.xpt
+@RESPATH@/components/toolkit_components_find.xpt
+@RESPATH@/components/netwerk_protocol_about.xpt
+@RESPATH@/components/netwerk_cache.xpt
+@RESPATH@/components/netwerk_cache2.xpt
+@RESPATH@/components/netwerk_cookie.xpt
+@RESPATH@/components/netwerk_dns.xpt
+@RESPATH@/components/netwerk_protocol_file.xpt
+@RESPATH@/components/netwerk_protocol_ftp.xpt
+@RESPATH@/components/netwerk_protocol_http.xpt
+@RESPATH@/components/netwerk_dns_mdns.xpt
+@RESPATH@/components/netwerk_protocol_res.xpt
+@RESPATH@/components/netwerk_socket.xpt
+@RESPATH@/components/netwerk_streamconv.xpt
+@RESPATH@/components/netwerk_streamconv_converters.xpt
+@RESPATH@/components/netwerk_protocol_viewsource.xpt
+@RESPATH@/components/netwerk_protocol_websocket.xpt
+@RESPATH@/components/netwerk_wifi.xpt
+@RESPATH@/components/netwerk_protocol_wyciwyg.xpt
 #ifdef MOZ_RTSP
 @RESPATH@/components/necko_rtsp.xpt
 #endif
-@RESPATH@/components/necko.xpt
-@RESPATH@/components/loginmgr.xpt
-@RESPATH@/components/parentalcontrols.xpt
+@RESPATH@/components/netwerk_base.xpt
+@RESPATH@/components/toolkit_components_passwordmgr.xpt
+@RESPATH@/components/toolkit_components_parentalcontrols.xpt
 #ifdef MOZ_WEBRTC
-@RESPATH@/components/peerconnection.xpt
+@RESPATH@/components/dom_media_bridge.xpt
 #endif
-@RESPATH@/components/places.xpt
-@RESPATH@/components/plugin.xpt
-@RESPATH@/components/pref.xpt
-@RESPATH@/components/prefetch.xpt
+@RESPATH@/components/toolkit_components_places.xpt
+@RESPATH@/components/dom_plugins_base.xpt
+@RESPATH@/components/modules_libpref.xpt
+@RESPATH@/components/uriloader_prefetch.xpt
 #ifdef MOZ_ENABLE_PROFILER_SPS
-@RESPATH@/components/profiler.xpt
+@RESPATH@/components/tools_profiler.xpt
 #endif
 @RESPATH@/components/proxyObject.xpt
-@RESPATH@/components/rdf.xpt
-@RESPATH@/components/satchel.xpt
-@RESPATH@/components/saxparser.xpt
-@RESPATH@/components/sessionstore.xpt
+@RESPATH@/components/rdf_base.xpt
+@RESPATH@/components/toolkit_components_satchel.xpt
+@RESPATH@/components/parser_xml.xpt
+@RESPATH@/components/browser_components_sessionstore.xpt
 #ifdef MOZ_SERVICES_SYNC
 @RESPATH@/components/services-crypto.xpt
 #endif
-@RESPATH@/components/services-crypto-component.xpt
-@RESPATH@/components/captivedetect.xpt
-@RESPATH@/components/shellservice.xpt
-@RESPATH@/components/shistory.xpt
-@RESPATH@/components/spellchecker.xpt
+@RESPATH@/components/services_crypto_component.xpt
+@RESPATH@/components/toolkit_components_captivedetect.xpt
+@RESPATH@/components/browser_components_shell.xpt
+@RESPATH@/components/docshell_shistory.xpt
+@RESPATH@/components/extensions_spellcheck_idl.xpt
 @RESPATH@/components/storage.xpt
-@RESPATH@/components/telemetry.xpt
-@RESPATH@/components/toolkit_asyncshutdown.xpt
-@RESPATH@/components/toolkit_filewatcher.xpt
-@RESPATH@/components/toolkit_finalizationwitness.xpt
-@RESPATH@/components/toolkit_formautofill.xpt
-@RESPATH@/components/toolkit_osfile.xpt
-@RESPATH@/components/toolkit_securityreporter.xpt
-@RESPATH@/components/toolkit_perfmonitoring.xpt
+@RESPATH@/components/toolkit_components_telemetry.xpt
+@RESPATH@/components/toolkit_components_asyncshutdown.xpt
+@RESPATH@/components/toolkit_components_filewatcher.xpt
+@RESPATH@/components/toolkit_components_finalizationwitness.xpt
+@RESPATH@/components/toolkit_components_formautofill.xpt
+@RESPATH@/components/toolkit_components_osfile.xpt
+@RESPATH@/components/toolkit_components_securityreporter.xpt
+@RESPATH@/components/toolkit_components_perfmonitoring.xpt
 @RESPATH@/components/toolkit_components_timermanager.xpt
-@RESPATH@/components/toolkit_xulstore.xpt
-@RESPATH@/components/toolkitprofile.xpt
+@RESPATH@/components/toolkit_components_xulstore.xpt
+@RESPATH@/components/toolkit_profile.xpt
 #ifdef MOZ_ENABLE_XREMOTE
-@RESPATH@/components/toolkitremote.xpt
+@RESPATH@/components/toolkit_components_remote.xpt
 #endif
-@RESPATH@/components/txtsvc.xpt
-@RESPATH@/components/txmgr.xpt
+@RESPATH@/components/editor_txtsvc.xpt
+@RESPATH@/components/editor_txmgr.xpt
 #ifdef MOZ_USE_NATIVE_UCONV
 @RESPATH@/components/ucnative.xpt
 #endif
-@RESPATH@/components/uconv.xpt
-@RESPATH@/components/unicharutil.xpt
-@RESPATH@/components/update.xpt
-@RESPATH@/components/uriloader.xpt
-@RESPATH@/components/urlformatter.xpt
-@RESPATH@/components/webBrowser_core.xpt
-@RESPATH@/components/webbrowserpersist.xpt
+@RESPATH@/components/intl_uconv.xpt
+@RESPATH@/components/intl_unicharutil.xpt
+@RESPATH@/components/toolkit_mozapps_update.xpt
+@RESPATH@/components/uriloader_base.xpt
+@RESPATH@/components/toolkit_components_urlformatter.xpt
+@RESPATH@/components/embedding_browser.xpt
+@RESPATH@/components/embedding_components_webbrowserpersist.xpt
 @RESPATH@/components/webshell_idls.xpt
 @RESPATH@/components/widget.xpt
 #ifdef XP_MACOSX
 @RESPATH@/components/widget_cocoa.xpt
 #endif
 #ifdef ANDROID
 @RESPATH@/components/widget_android.xpt
 #endif
-@RESPATH@/components/windowds.xpt
-@RESPATH@/components/windowwatcher.xpt
+@RESPATH@/components/xpfe_components_windowds.xpt
+@RESPATH@/components/embedding_components_windowwatcher.xpt
 @RESPATH@/components/xpcom_base.xpt
 @RESPATH@/components/xpcom_system.xpt
 @RESPATH@/components/xpcom_components.xpt
 @RESPATH@/components/xpcom_ds.xpt
 @RESPATH@/components/xpcom_io.xpt
 @RESPATH@/components/xpcom_threads.xpt
-@RESPATH@/components/xpcom_xpti.xpt
-@RESPATH@/components/xpconnect.xpt
-@RESPATH@/components/xulapp.xpt
-@RESPATH@/components/xul.xpt
-@RESPATH@/components/xultmpl.xpt
-@RESPATH@/components/zipwriter.xpt
+@RESPATH@/components/xpcom_reflect_xptinfo.xpt
+@RESPATH@/components/js_xpconnect_idl.xpt
+@RESPATH@/components/toolkit_xre.xpt
+@RESPATH@/components/dom_xul.xpt
+@RESPATH@/components/dom_xul_templates.xpt
+@RESPATH@/components/modules_libjar_zipwriter.xpt
 
 ; JavaScript components
 @RESPATH@/components/RequestSync.manifest
 @RESPATH@/components/RequestSyncManager.js
 @RESPATH@/components/RequestSyncScheduler.js
 @RESPATH@/components/ChromeNotifications.js
 @RESPATH@/components/ChromeNotifications.manifest
 @RESPATH@/components/ConsoleAPI.manifest
@@ -584,17 +584,17 @@
 @RESPATH@/components/contentAreaDropListener.manifest
 @RESPATH@/components/contentAreaDropListener.js
 @RESPATH@/components/messageWakeupService.js
 @RESPATH@/components/messageWakeupService.manifest
 @RESPATH@/components/SettingsManager.js
 @RESPATH@/components/SettingsManager.manifest
 @RESPATH@/components/SettingsService.js
 @RESPATH@/components/SettingsService.manifest
-@RESPATH@/components/webvtt.xpt
+@RESPATH@/components/dom_media_webvtt.xpt
 @RESPATH@/components/WebVTT.manifest
 @RESPATH@/components/WebVTTParserWrapper.js
 #ifdef MOZ_NFC
 @RESPATH@/components/nsNfc.manifest
 @RESPATH@/components/nsNfc.js
 @RESPATH@/components/Nfc.manifest
 @RESPATH@/components/Nfc.js
 @RESPATH@/components/NfcContentHelper.manifest
@@ -690,20 +690,20 @@
 ; Modules
 @RESPATH@/modules/*
 
 ; Safe Browsing
 @RESPATH@/components/nsURLClassifier.manifest
 @RESPATH@/components/nsUrlClassifierHashCompleter.js
 @RESPATH@/components/nsUrlClassifierListManager.js
 @RESPATH@/components/nsUrlClassifierLib.js
-@RESPATH@/components/url-classifier.xpt
+@RESPATH@/components/toolkit_components_url-classifier.xpt
 
 ; Private Browsing
-@RESPATH@/components/privatebrowsing.xpt
+@RESPATH@/components/toolkit_components_privatebrowsing.xpt
 @RESPATH@/components/PrivateBrowsing.manifest
 @RESPATH@/components/PrivateBrowsingTrackingProtectionWhitelist.js
 
 ; Security Reports
 @RESPATH@/components/SecurityReporter.manifest
 @RESPATH@/components/SecurityReporter.js
 
 ; Signed Packaged Content
@@ -798,24 +798,24 @@
 @RESPATH@/res/language.properties
 @RESPATH@/res/entityTables/*
 #ifdef XP_MACOSX
 @RESPATH@/res/MainMenu.nib/
 #endif
 
 ; svg
 @RESPATH@/res/svg.css
-@RESPATH@/components/dom_svg.xpt
-@RESPATH@/components/dom_smil.xpt
+@RESPATH@/components/dom_interfaces_svg.xpt
+@RESPATH@/components/dom_interfaces_smil.xpt
 
 ; [Personal Security Manager]
 ;
 @BINPATH@/@DLL_PREFIX@nssckbi@DLL_SUFFIX@
-@RESPATH@/components/pipnss.xpt
-@RESPATH@/components/pippki.xpt
+@RESPATH@/components/security_manager_ssl.xpt
+@RESPATH@/components/security_manager_pki.xpt
 @BINPATH@/@DLL_PREFIX@nss3@DLL_SUFFIX@
 #ifndef MOZ_FOLD_LIBS
 @BINPATH@/@DLL_PREFIX@nssutil3@DLL_SUFFIX@
 @BINPATH@/@DLL_PREFIX@smime3@DLL_SUFFIX@
 @BINPATH@/@DLL_PREFIX@ssl3@DLL_SUFFIX@
 #endif
 @BINPATH@/@DLL_PREFIX@softokn3@DLL_SUFFIX@
 #if defined(XP_LINUX) && !defined(ANDROID)
@@ -929,26 +929,26 @@ bin/libfreebl_32int64_3.so
 @RESPATH@/components/PresentationRequestUIGlue.js
 @RESPATH@/components/KillSwitch.js
 
 #ifndef MOZ_WIDGET_GONK
 @RESPATH@/components/SimulatorScreen.js
 #endif
 
 @RESPATH@/components/FxAccountsUIGlue.js
-@RESPATH@/components/services_fxaccounts.xpt
+@RESPATH@/components/services_fxaccounts_interfaces.xpt
 
 @RESPATH@/components/MobileIdentity.manifest
 @RESPATH@/components/MobileIdentity.js
 @RESPATH@/components/dom_mobileidentity.xpt
 @RESPATH@/components/MobileIdentityUIGlue.js
 @RESPATH@/components/services_mobileidentity.xpt
 
 #ifdef MOZ_WEBSPEECH
-@RESPATH@/components/dom_webspeechsynth.xpt
+@RESPATH@/components/dom_media_webspeech_synth.xpt
 #endif
 
 #ifdef XP_MACOSX
 @BINPATH@/@DLL_PREFIX@plugin_child_interpose@DLL_SUFFIX@
 #endif
 
 #ifdef PACKAGE_GAIA
 [gaia]

--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -132,220 +132,220 @@
 #ifdef XP_UNIX
 #ifndef XP_MACOSX
 @RESPATH@/run-mozilla.sh
 #endif
 #endif
 
 ; [Components]
 @RESPATH@/browser/components/components.manifest
-@RESPATH@/components/alerts.xpt
+@RESPATH@/components/toolkit_components_alerts.xpt
 #ifdef ACCESSIBILITY
 #ifdef XP_WIN32
 @BINPATH@/AccessibleMarshal.dll
 #endif
-@RESPATH@/components/accessibility.xpt
+@RESPATH@/components/accessible_interfaces.xpt
 #endif
-@RESPATH@/components/appshell.xpt
-@RESPATH@/components/appstartup.xpt
-@RESPATH@/components/autocomplete.xpt
-@RESPATH@/components/autoconfig.xpt
-@RESPATH@/components/browser-element.xpt
-@RESPATH@/browser/components/browsercompsbase.xpt
-@RESPATH@/browser/components/browser-feeds.xpt
+@RESPATH@/components/xpfe_appshell.xpt
+@RESPATH@/components/toolkit_components_startup_public.xpt
+@RESPATH@/components/toolkit_components_autocomplete.xpt
+@RESPATH@/components/extensions_pref_autoconfig_public.xpt
+@RESPATH@/components/dom_browser-element.xpt
+@RESPATH@/browser/components/browser_components.xpt
+@RESPATH@/browser/components/browser_components_feeds.xpt
 @RESPATH@/components/caps.xpt
 @RESPATH@/components/chrome.xpt
-@RESPATH@/components/commandhandler.xpt
-@RESPATH@/components/commandlines.xpt
-@RESPATH@/components/composer.xpt
-@RESPATH@/components/content_events.xpt
-@RESPATH@/components/content_html.xpt
-@RESPATH@/components/content_geckomediaplugins.xpt
+@RESPATH@/components/embedding_components_commandhandler.xpt
+@RESPATH@/components/toolkit_components_commandlines.xpt
+@RESPATH@/components/editor_composer.xpt
+@RESPATH@/components/dom_events.xpt
+@RESPATH@/components/dom_html.xpt
+@RESPATH@/components/dom_media_gmp.xpt
 #ifdef MOZ_WEBRTC
-@RESPATH@/components/content_webrtc.xpt
+@RESPATH@/components/dom_media_webrtc.xpt
 #endif
-@RESPATH@/components/content_xslt.xpt
-@RESPATH@/components/cookie.xpt
-@RESPATH@/components/directory.xpt
-@RESPATH@/components/docshell.xpt
-@RESPATH@/components/dom.xpt
+@RESPATH@/components/dom_xslt.xpt
+@RESPATH@/components/extensions_cookie.xpt
+@RESPATH@/components/xpfe_components_directory.xpt
+@RESPATH@/components/docshell_base.xpt
+@RESPATH@/components/dom_base.xpt
 #ifdef MOZ_ACTIVITIES
-@RESPATH@/components/dom_activities.xpt
-@RESPATH@/components/dom_messages.xpt
+@RESPATH@/components/dom_activities_interfaces.xpt
+@RESPATH@/components/dom_messages_interfaces.xpt
 #endif
-@RESPATH@/components/dom_apps.xpt
-@RESPATH@/components/dom_newapps.xpt
-@RESPATH@/components/dom_base.xpt
+@RESPATH@/components/dom_interfaces_apps.xpt
+@RESPATH@/components/dom_newapps_interfaces.xpt
+@RESPATH@/components/dom_interfaces_base.xpt
 @RESPATH@/components/dom_system.xpt
 #ifdef MOZ_B2G_BT
 @RESPATH@/components/dom_bluetooth.xpt
 #endif
-@RESPATH@/components/dom_canvas.xpt
+@RESPATH@/components/dom_interfaces_canvas.xpt
 @RESPATH@/components/dom_alarm.xpt
-@RESPATH@/components/dom_core.xpt
-@RESPATH@/components/dom_css.xpt
-@RESPATH@/components/dom_events.xpt
-@RESPATH@/components/dom_geolocation.xpt
+@RESPATH@/components/dom_interfaces_core.xpt
+@RESPATH@/components/dom_interfaces_css.xpt
+@RESPATH@/components/dom_interfaces_events.xpt
+@RESPATH@/components/dom_interfaces_geolocation.xpt
 @RESPATH@/components/dom_media.xpt
-@RESPATH@/components/dom_network.xpt
-@RESPATH@/components/dom_notification.xpt
-@RESPATH@/components/dom_html.xpt
-@RESPATH@/components/dom_icc.xpt
+@RESPATH@/components/dom_network_interfaces.xpt
+@RESPATH@/components/dom_interfaces_notification.xpt
+@RESPATH@/components/dom_interfaces_html.xpt
+@RESPATH@/components/dom_icc_interfaces.xpt
 @RESPATH@/components/dom_ipc.xpt
-@RESPATH@/components/dom_offline.xpt
-@RESPATH@/components/dom_json.xpt
+@RESPATH@/components/dom_interfaces_offline.xpt
+@RESPATH@/components/dom_interfaces_json.xpt
 @RESPATH@/components/dom_power.xpt
-@RESPATH@/components/dom_push.xpt
+@RESPATH@/components/dom_interfaces_push.xpt
 @RESPATH@/components/dom_quota.xpt
-@RESPATH@/components/dom_range.xpt
-@RESPATH@/components/dom_security.xpt
-@RESPATH@/components/dom_settings.xpt
-@RESPATH@/components/dom_permissionsettings.xpt
-@RESPATH@/components/dom_sidebar.xpt
-@RESPATH@/components/dom_cellbroadcast.xpt
-@RESPATH@/components/dom_mobilemessage.xpt
-@RESPATH@/components/dom_storage.xpt
-@RESPATH@/components/dom_stylesheets.xpt
+@RESPATH@/components/dom_interfaces_range.xpt
+@RESPATH@/components/dom_interfaces_security.xpt
+@RESPATH@/components/dom_interfaces_settings.xpt
+@RESPATH@/components/dom_interfaces_permission.xpt
+@RESPATH@/components/dom_interfaces_sidebar.xpt
+@RESPATH@/components/dom_cellbroadcast_interfaces.xpt
+@RESPATH@/components/dom_mobilemessage_interfaces.xpt
+@RESPATH@/components/dom_interfaces_storage.xpt
+@RESPATH@/components/dom_interfaces_stylesheets.xpt
 @RESPATH@/components/dom_telephony.xpt
-@RESPATH@/components/dom_traversal.xpt
+@RESPATH@/components/dom_interfaces_traversal.xpt
 @RESPATH@/components/dom_tv.xpt
 @RESPATH@/components/dom_voicemail.xpt
 #ifdef MOZ_WEBSPEECH
-@RESPATH@/components/dom_webspeechrecognition.xpt
+@RESPATH@/components/dom_media_webspeech_recognition.xpt
 #endif
 @RESPATH@/components/dom_workers.xpt
-@RESPATH@/components/dom_xbl.xpt
-@RESPATH@/components/dom_xpath.xpt
-@RESPATH@/components/dom_xul.xpt
+@RESPATH@/components/dom_interfaces_xbl.xpt
+@RESPATH@/components/dom_interfaces_xpath.xpt
+@RESPATH@/components/dom_interfaces_xul.xpt
 #ifdef MOZ_GAMEPAD
-@RESPATH@/components/dom_gamepad.xpt
+@RESPATH@/components/dom_interfaces_gamepad.xpt
 #endif
-@RESPATH@/components/dom_payment.xpt
-@RESPATH@/components/dom_presentation.xpt
-@RESPATH@/components/downloads.xpt
+@RESPATH@/components/dom_payment_interfaces.xpt
+@RESPATH@/components/dom_presentation_interfaces.xpt
+@RESPATH@/components/toolkit_components_downloads.xpt
 @RESPATH@/components/editor.xpt
-@RESPATH@/components/embed_base.xpt
-@RESPATH@/components/extensions.xpt
-@RESPATH@/components/exthandler.xpt
-@RESPATH@/components/exthelper.xpt
-@RESPATH@/components/fastfind.xpt
-@RESPATH@/components/feeds.xpt
+@RESPATH@/components/embedding.xpt
+@RESPATH@/components/toolkit_mozapps_extensions.xpt
+@RESPATH@/components/uriloader_exthandler.xpt
+@RESPATH@/components/toolkit_components_exthelper.xpt
+@RESPATH@/components/toolkit_components_typeaheadfind.xpt
+@RESPATH@/components/toolkit_components_feeds.xpt
 #ifdef MOZ_GTK
-@RESPATH@/components/filepicker.xpt
+@RESPATH@/components/toolkit_components_filepicker.xpt
 #endif
-@RESPATH@/components/find.xpt
-@RESPATH@/components/gfx.xpt
-@RESPATH@/components/html5.xpt
-@RESPATH@/components/htmlparser.xpt
-@RESPATH@/components/identity.xpt
-@RESPATH@/components/imglib2.xpt
-@RESPATH@/components/inspector.xpt
-@RESPATH@/components/intl.xpt
-@RESPATH@/components/jar.xpt
-@RESPATH@/components/jsdebugger.xpt
-@RESPATH@/components/jsdownloads.xpt
-@RESPATH@/browser/components/jsinspector.xpt
+@RESPATH@/components/embedding_components_find.xpt
+@RESPATH@/components/gfx_src.xpt
+@RESPATH@/components/parser_html.xpt
+@RESPATH@/components/parser_htmlparser.xpt
+@RESPATH@/components/toolkit_identity.xpt
+@RESPATH@/components/image.xpt
+@RESPATH@/components/layout_inspector.xpt
+@RESPATH@/components/intl_strres.xpt
+@RESPATH@/components/modules_libjar.xpt
+@RESPATH@/components/js_ductwork_debugger.xpt
+@RESPATH@/components/toolkit_components_jsdownloads_public.xpt
+@RESPATH@/browser/components/devtools_server.xpt
 @RESPATH@/components/layout_base.xpt
 @RESPATH@/components/layout_style.xpt
 #ifdef NS_PRINTING
 @RESPATH@/components/layout_printing.xpt
 #endif
 @RESPATH@/components/layout_xul_tree.xpt
 @RESPATH@/components/layout_xul.xpt
-@RESPATH@/components/locale.xpt
-@RESPATH@/components/lwbrk.xpt
+@RESPATH@/components/intl_locale.xpt
+@RESPATH@/components/intl_lwbrk.xpt
 #ifdef MOZ_ENABLE_PROFILER_SPS
-@RESPATH@/components/memory_profiler.xpt
+@RESPATH@/components/tools_memory-profiler.xpt
 #endif
-@RESPATH@/browser/components/migration.xpt
-@RESPATH@/components/mimetype.xpt
-@RESPATH@/components/mozfind.xpt
-@RESPATH@/components/necko_about.xpt
-@RESPATH@/components/necko_cache.xpt
-@RESPATH@/components/necko_cache2.xpt
-@RESPATH@/components/necko_cookie.xpt
-@RESPATH@/components/necko_dns.xpt
-@RESPATH@/components/necko_file.xpt
-@RESPATH@/components/necko_ftp.xpt
-@RESPATH@/components/necko_http.xpt
-@RESPATH@/components/necko_mdns.xpt
-@RESPATH@/components/necko_res.xpt
-@RESPATH@/components/necko_socket.xpt
-@RESPATH@/components/necko_strconv.xpt
-@RESPATH@/components/necko_streamconv_converters.xpt
-@RESPATH@/components/necko_viewsource.xpt
-@RESPATH@/components/necko_websocket.xpt
+@RESPATH@/browser/components/browser_components_migration.xpt
+@RESPATH@/components/netwerk_mime.xpt
+@RESPATH@/components/toolkit_components_find.xpt
+@RESPATH@/components/netwerk_protocol_about.xpt
+@RESPATH@/components/netwerk_cache.xpt
+@RESPATH@/components/netwerk_cache2.xpt
+@RESPATH@/components/netwerk_cookie.xpt
+@RESPATH@/components/netwerk_dns.xpt
+@RESPATH@/components/netwerk_protocol_file.xpt
+@RESPATH@/components/netwerk_protocol_ftp.xpt
+@RESPATH@/components/netwerk_protocol_http.xpt
+@RESPATH@/components/netwerk_dns_mdns.xpt
+@RESPATH@/components/netwerk_protocol_res.xpt
+@RESPATH@/components/netwerk_socket.xpt
+@RESPATH@/components/netwerk_streamconv.xpt
+@RESPATH@/components/netwerk_streamconv_converters.xpt
+@RESPATH@/components/netwerk_protocol_viewsource.xpt
+@RESPATH@/components/netwerk_protocol_websocket.xpt
 #ifdef NECKO_WIFI
-@RESPATH@/components/necko_wifi.xpt
+@RESPATH@/components/netwerk_wifi.xpt
 #endif
-@RESPATH@/components/necko_wyciwyg.xpt
-@RESPATH@/components/necko.xpt
-@RESPATH@/components/loginmgr.xpt
-@RESPATH@/components/parentalcontrols.xpt
+@RESPATH@/components/netwerk_protocol_wyciwyg.xpt
+@RESPATH@/components/netwerk_base.xpt
+@RESPATH@/components/toolkit_components_passwordmgr.xpt
+@RESPATH@/components/toolkit_components_parentalcontrols.xpt
 #ifdef MOZ_WEBRTC
-@RESPATH@/components/peerconnection.xpt
+@RESPATH@/components/dom_media_bridge.xpt
 #endif
-@RESPATH@/components/places.xpt
-@RESPATH@/components/plugin.xpt
-@RESPATH@/components/pref.xpt
-@RESPATH@/components/prefetch.xpt
+@RESPATH@/components/toolkit_components_places.xpt
+@RESPATH@/components/dom_plugins_base.xpt
+@RESPATH@/components/modules_libpref.xpt
+@RESPATH@/components/uriloader_prefetch.xpt
 #ifdef MOZ_ENABLE_PROFILER_SPS
-@RESPATH@/components/profiler.xpt
+@RESPATH@/components/tools_profiler.xpt
 #endif
-@RESPATH@/components/rdf.xpt
-@RESPATH@/components/satchel.xpt
-@RESPATH@/components/saxparser.xpt
-@RESPATH@/browser/components/sessionstore.xpt
-@RESPATH@/components/services-crypto-component.xpt
-@RESPATH@/components/captivedetect.xpt
-@RESPATH@/browser/components/shellservice.xpt
-@RESPATH@/components/shistory.xpt
-@RESPATH@/components/spellchecker.xpt
+@RESPATH@/components/rdf_base.xpt
+@RESPATH@/components/toolkit_components_satchel.xpt
+@RESPATH@/components/parser_xml.xpt
+@RESPATH@/browser/components/browser_components_sessionstore.xpt
+@RESPATH@/components/services_crypto_component.xpt
+@RESPATH@/components/toolkit_components_captivedetect.xpt
+@RESPATH@/browser/components/browser_components_shell.xpt
+@RESPATH@/components/docshell_shistory.xpt
+@RESPATH@/components/extensions_spellcheck_idl.xpt
 @RESPATH@/components/storage.xpt
-@RESPATH@/components/toolkit_asyncshutdown.xpt
-@RESPATH@/components/toolkit_filewatcher.xpt
-@RESPATH@/components/toolkit_finalizationwitness.xpt
-@RESPATH@/components/toolkit_formautofill.xpt
-@RESPATH@/components/toolkit_osfile.xpt
-@RESPATH@/components/toolkit_securityreporter.xpt
-@RESPATH@/components/toolkit_perfmonitoring.xpt
+@RESPATH@/components/toolkit_components_asyncshutdown.xpt
+@RESPATH@/components/toolkit_components_filewatcher.xpt
+@RESPATH@/components/toolkit_components_finalizationwitness.xpt
+@RESPATH@/components/toolkit_components_formautofill.xpt
+@RESPATH@/components/toolkit_components_osfile.xpt
+@RESPATH@/components/toolkit_components_securityreporter.xpt
+@RESPATH@/components/toolkit_components_perfmonitoring.xpt
 @RESPATH@/components/toolkit_components_timermanager.xpt
-@RESPATH@/components/toolkit_xulstore.xpt
-@RESPATH@/components/toolkitprofile.xpt
+@RESPATH@/components/toolkit_components_xulstore.xpt
+@RESPATH@/components/toolkit_profile.xpt
 #ifdef MOZ_ENABLE_XREMOTE
-@RESPATH@/components/toolkitremote.xpt
+@RESPATH@/components/toolkit_components_remote.xpt
 #endif
-@RESPATH@/components/txtsvc.xpt
-@RESPATH@/components/txmgr.xpt
-@RESPATH@/components/uconv.xpt
-@RESPATH@/components/unicharutil.xpt
-@RESPATH@/components/update.xpt
-@RESPATH@/components/uriloader.xpt
-@RESPATH@/components/urlformatter.xpt
-@RESPATH@/components/webBrowser_core.xpt
-@RESPATH@/components/webbrowserpersist.xpt
+@RESPATH@/components/editor_txtsvc.xpt
+@RESPATH@/components/editor_txmgr.xpt
+@RESPATH@/components/intl_uconv.xpt
+@RESPATH@/components/intl_unicharutil.xpt
+@RESPATH@/components/toolkit_mozapps_update.xpt
+@RESPATH@/components/uriloader_base.xpt
+@RESPATH@/components/toolkit_components_urlformatter.xpt
+@RESPATH@/components/embedding_browser.xpt
+@RESPATH@/components/embedding_components_webbrowserpersist.xpt
 @RESPATH@/components/widget.xpt
 #ifdef XP_MACOSX
 @RESPATH@/components/widget_cocoa.xpt
 #endif
-@RESPATH@/components/windowds.xpt
-@RESPATH@/components/windowwatcher.xpt
+@RESPATH@/components/xpfe_components_windowds.xpt
+@RESPATH@/components/embedding_components_windowwatcher.xpt
 @RESPATH@/components/xpcom_base.xpt
 @RESPATH@/components/xpcom_system.xpt
 @RESPATH@/components/xpcom_components.xpt
 @RESPATH@/components/xpcom_ds.xpt
 @RESPATH@/components/xpcom_io.xpt
 @RESPATH@/components/xpcom_threads.xpt
-@RESPATH@/components/xpcom_xpti.xpt
-@RESPATH@/components/xpconnect.xpt
-@RESPATH@/components/xulapp.xpt
-@RESPATH@/components/xul.xpt
-@RESPATH@/components/xultmpl.xpt
-@RESPATH@/components/zipwriter.xpt
-@RESPATH@/components/telemetry.xpt
+@RESPATH@/components/xpcom_reflect_xptinfo.xpt
+@RESPATH@/components/js_xpconnect_idl.xpt
+@RESPATH@/components/toolkit_xre.xpt
+@RESPATH@/components/dom_xul.xpt
+@RESPATH@/components/dom_xul_templates.xpt
+@RESPATH@/components/modules_libjar_zipwriter.xpt
+@RESPATH@/components/toolkit_components_telemetry.xpt
 
 ; JavaScript components
 @RESPATH@/components/ChromeNotifications.js
 @RESPATH@/components/ChromeNotifications.manifest
 @RESPATH@/components/ConsoleAPI.manifest
 @RESPATH@/components/ConsoleAPIStorage.js
 @RESPATH@/components/BrowserElementParent.manifest
 @RESPATH@/components/BrowserElementParent.js
@@ -365,17 +365,17 @@
 @RESPATH@/browser/components/nsSetDefaultBrowser.manifest
 @RESPATH@/browser/components/nsSetDefaultBrowser.js
 @RESPATH@/browser/components/devtools-startup.manifest
 @RESPATH@/browser/components/devtools-startup.js
 @RESPATH@/browser/components/webideCli.js
 @RESPATH@/browser/components/webideComponents.manifest
 @RESPATH@/browser/components/Experiments.manifest
 @RESPATH@/browser/components/ExperimentsService.js
-@RESPATH@/browser/components/browser-newtab.xpt
+@RESPATH@/browser/components/browser_components_newtab.xpt
 @RESPATH@/browser/components/aboutNewTabService.js
 @RESPATH@/browser/components/NewTabComponents.manifest
 @RESPATH@/components/Downloads.manifest
 @RESPATH@/components/DownloadLegacy.js
 @RESPATH@/components/BrowserPageThumbs.manifest
 @RESPATH@/components/crashmonitor.manifest
 @RESPATH@/components/nsCrashMonitor.js
 @RESPATH@/components/SiteSpecificUserAgent.js
@@ -389,17 +389,17 @@
 @RESPATH@/components/nsLoginManager.js
 @RESPATH@/components/nsLoginManagerPrompter.js
 @RESPATH@/components/storage-json.js
 @RESPATH@/components/crypto-SDR.js
 @RESPATH@/components/TooltipTextProvider.js
 @RESPATH@/components/TooltipTextProvider.manifest
 @RESPATH@/components/jsconsole-clhandler.manifest
 @RESPATH@/components/jsconsole-clhandler.js
-@RESPATH@/components/webvtt.xpt
+@RESPATH@/components/dom_media_webvtt.xpt
 @RESPATH@/components/WebVTT.manifest
 @RESPATH@/components/WebVTTParserWrapper.js
 #ifdef MOZ_GTK
 @RESPATH@/components/nsFilePicker.manifest
 @RESPATH@/components/nsFilePicker.js
 #endif
 @RESPATH@/components/nsHelperAppDlg.manifest
 @RESPATH@/components/nsHelperAppDlg.js
@@ -573,17 +573,17 @@
 #endif
 
 @RESPATH@/chrome/marionette@JAREXT@
 @RESPATH@/chrome/marionette.manifest
 @RESPATH@/components/MarionetteComponents.manifest
 @RESPATH@/components/marionettecomponent.js
 
 #ifdef MOZ_WEBSPEECH
-@RESPATH@/components/dom_webspeechsynth.xpt
+@RESPATH@/components/dom_media_webspeech_synth.xpt
 #endif
 
 @RESPATH@/components/nsAsyncShutdown.manifest
 @RESPATH@/components/nsAsyncShutdown.js
 
 @RESPATH@/components/PresentationDeviceInfoManager.manifest
 @RESPATH@/components/PresentationDeviceInfoManager.js
 @RESPATH@/components/BuiltinProviders.manifest
@@ -609,21 +609,21 @@
 @RESPATH@/modules/*
 
 ; Safe Browsing
 #ifdef MOZ_URL_CLASSIFIER
 @RESPATH@/components/nsURLClassifier.manifest
 @RESPATH@/components/nsUrlClassifierHashCompleter.js
 @RESPATH@/components/nsUrlClassifierListManager.js
 @RESPATH@/components/nsUrlClassifierLib.js
-@RESPATH@/components/url-classifier.xpt
+@RESPATH@/components/toolkit_components_url-classifier.xpt
 #endif
 
 ; Private Browsing
-@RESPATH@/components/privatebrowsing.xpt
+@RESPATH@/components/toolkit_components_privatebrowsing.xpt
 @RESPATH@/components/PrivateBrowsing.manifest
 @RESPATH@/components/PrivateBrowsingTrackingProtectionWhitelist.js
 
 ; Security Reports
 @RESPATH@/components/SecurityReporter.manifest
 @RESPATH@/components/SecurityReporter.js
 
 ; Signed Packaged Content
@@ -745,18 +745,18 @@
 @RESPATH@/res/language.properties
 @RESPATH@/res/entityTables/*
 #ifdef XP_MACOSX
 @RESPATH@/res/MainMenu.nib/
 #endif
 
 ; svg
 @RESPATH@/res/svg.css
-@RESPATH@/components/dom_svg.xpt
-@RESPATH@/components/dom_smil.xpt
+@RESPATH@/components/dom_interfaces_svg.xpt
+@RESPATH@/components/dom_interfaces_smil.xpt
 
 ; [Personal Security Manager]
 ;
 ; NSS libraries are signed in the staging directory,
 ; meaning their .chk files are created there directly.
 ;
 #ifndef MOZ_SYSTEM_NSS
 #if defined(XP_LINUX) && !defined(ANDROID)
@@ -773,18 +773,18 @@
 @BINPATH@/@DLL_PREFIX@nssutil3@DLL_SUFFIX@
 @BINPATH@/@DLL_PREFIX@smime3@DLL_SUFFIX@
 @BINPATH@/@DLL_PREFIX@ssl3@DLL_SUFFIX@
 #endif
 @BINPATH@/@DLL_PREFIX@softokn3@DLL_SUFFIX@
 #endif
 @RESPATH@/chrome/pippki@JAREXT@
 @RESPATH@/chrome/pippki.manifest
-@RESPATH@/components/pipnss.xpt
-@RESPATH@/components/pippki.xpt
+@RESPATH@/components/security_manager_ssl.xpt
+@RESPATH@/components/security_manager_pki.xpt
 
 ; For process sandboxing
 #if defined(MOZ_SANDBOX)
 #if defined(XP_WIN)
 @BINPATH@/@DLL_PREFIX@sandboxbroker@DLL_SUFFIX@
 #if defined(WOW_HELPER)
 @BINPATH@/wow_helper.exe
 #endif
@@ -815,17 +815,17 @@ bin/libfreebl_32int64_3.so
 @BINPATH@/maintenanceservice_installer.exe
 #endif
 
 ; [Crash Reporter]
 ;
 #ifdef MOZ_CRASHREPORTER
 @RESPATH@/components/CrashService.manifest
 @RESPATH@/components/CrashService.js
-@RESPATH@/components/toolkit_crashservice.xpt
+@RESPATH@/components/toolkit_components_crashes.xpt
 #ifdef XP_MACOSX
 @BINPATH@/crashreporter.app/
 #else
 @BINPATH@/crashreporter@BIN_SUFFIX@
 @RESPATH@/crashreporter.ini
 #ifdef XP_UNIX
 @RESPATH@/Throbber-small.gif
 #endif

--- a/js/xpconnect/tests/components/js/xpctest.manifest
+++ b/js/xpconnect/tests/components/js/xpctest.manifest
@@ -20,9 +20,9 @@ component {90ec5c9e-f6da-406b-9a38-14d00
 contract @mozilla.org/js/xpc/test/js/TestInterfaceAll;1 {90ec5c9e-f6da-406b-9a38-14d00f59db76}
 
 component {38dd78aa-467f-4fad-8dcf-4383a743e235} xpctest_returncode_child.js
 contract @mozilla.org/js/xpc/test/js/ReturnCodeChild;1 {38dd78aa-467f-4fad-8dcf-4383a743e235}
 
 component {e86573c4-a384-441a-8c92-7b99e8575b28} xpctest_utils.js
 contract @mozilla.org/js/xpc/test/js/TestUtils;1 {e86573c4-a384-441a-8c92-7b99e8575b28}
 
-interfaces xpctest.xpt
+interfaces js_xpconnect_tests_idl.xpt

--- a/js/xpconnect/tests/components/native/xpctest.manifest
+++ b/js/xpconnect/tests/components/native/xpctest.manifest
@@ -1,1 +1,1 @@
-interfaces xpctest.xpt
+interfaces js_xpconnect_tests_idl.xpt

--- a/js/xpconnect/tests/idl/moz.build
+++ b/js/xpconnect/tests/idl/moz.build
@@ -10,16 +10,17 @@ XPIDL_SOURCES += [
     'xpctest_interfaces.idl',
     'xpctest_params.idl',
     'xpctest_returncode.idl',
     'xpctest_utils.idl',
 ]
 
 XPIDL_MODULE = 'xpctest'
 
-# XXX: This relies on xpctest.xpt being created in dist/bin/components/ during
-# the export tier AND TEST_HARNESS_FILES being processed after that.
+# XXX: This relies on js_xpconnect_tests_idl.xpt being created in
+# dist/bin/components/ during the export tier AND TEST_HARNESS_FILES
+# being processed after that.
 TEST_HARNESS_FILES.xpcshell.js.xpconnect.tests.components.native.components += [
-    '!/dist/bin/components/xpctest.xpt',
+    '!/dist/bin/components/js_xpconnect_tests_idl.xpt',
 ]
 TEST_HARNESS_FILES.xpcshell.js.xpconnect.tests.components.js += [
-    '!/dist/bin/components/xpctest.xpt',
+    '!/dist/bin/components/js_xpconnect_tests_idl.xpt',
 ]

--- a/mobile/android/installer/package-manifest.in
+++ b/mobile/android/installer/package-manifest.in
@@ -82,193 +82,193 @@
 [browser]
 ; [Base Browser Files]
 @BINPATH@/application.ini
 @BINPATH@/platform.ini
 @BINPATH@/blocklist.xml
 
 ; [Components]
 @BINPATH@/components/components.manifest
-@BINPATH@/components/alerts.xpt
+@BINPATH@/components/toolkit_components_alerts.xpt
 #ifdef ACCESSIBILITY
-@BINPATH@/components/accessibility.xpt
+@BINPATH@/components/accessible_interfaces.xpt
 #endif
-@BINPATH@/components/appshell.xpt
-@BINPATH@/components/appstartup.xpt
-@BINPATH@/components/autocomplete.xpt
-@BINPATH@/components/autoconfig.xpt
-@BINPATH@/components/browser-element.xpt
+@BINPATH@/components/xpfe_appshell.xpt
+@BINPATH@/components/toolkit_components_startup_public.xpt
+@BINPATH@/components/toolkit_components_autocomplete.xpt
+@BINPATH@/components/extensions_pref_autoconfig_public.xpt
+@BINPATH@/components/dom_browser-element.xpt
 @BINPATH@/components/caps.xpt
 @BINPATH@/components/chrome.xpt
-@BINPATH@/components/commandhandler.xpt
-@BINPATH@/components/commandlines.xpt
-@BINPATH@/components/composer.xpt
-@BINPATH@/components/content_events.xpt
-@BINPATH@/components/content_geckomediaplugins.xpt
-@BINPATH@/components/content_html.xpt
-@BINPATH@/components/content_webrtc.xpt
-@BINPATH@/components/content_xslt.xpt
-@BINPATH@/components/cookie.xpt
-@BINPATH@/components/directory.xpt
-@BINPATH@/components/docshell.xpt
-@BINPATH@/components/dom.xpt
-@BINPATH@/components/dom_activities.xpt
-@BINPATH@/components/dom_apps.xpt
-@BINPATH@/components/dom_newapps.xpt
+@BINPATH@/components/embedding_components_commandhandler.xpt
+@BINPATH@/components/toolkit_components_commandlines.xpt
+@BINPATH@/components/editor_composer.xpt
+@BINPATH@/components/dom_events.xpt
+@BINPATH@/components/dom_media_gmp.xpt
+@BINPATH@/components/dom_html.xpt
+@BINPATH@/components/dom_media_webrtc.xpt
+@BINPATH@/components/dom_xslt.xpt
+@BINPATH@/components/extensions_cookie.xpt
+@BINPATH@/components/xpfe_components_directory.xpt
+@BINPATH@/components/docshell_base.xpt
 @BINPATH@/components/dom_base.xpt
-@BINPATH@/components/dom_canvas.xpt
-@BINPATH@/components/dom_core.xpt
-@BINPATH@/components/dom_css.xpt
-@BINPATH@/components/dom_events.xpt
-@BINPATH@/components/dom_geolocation.xpt
+@BINPATH@/components/dom_activities_interfaces.xpt
+@BINPATH@/components/dom_interfaces_apps.xpt
+@BINPATH@/components/dom_newapps_interfaces.xpt
+@BINPATH@/components/dom_interfaces_base.xpt
+@BINPATH@/components/dom_interfaces_canvas.xpt
+@BINPATH@/components/dom_interfaces_core.xpt
+@BINPATH@/components/dom_interfaces_css.xpt
+@BINPATH@/components/dom_interfaces_events.xpt
+@BINPATH@/components/dom_interfaces_geolocation.xpt
 @BINPATH@/components/dom_ipc.xpt
 @BINPATH@/components/dom_media.xpt
-@BINPATH@/components/dom_messages.xpt
-@BINPATH@/components/dom_network.xpt
-@BINPATH@/components/dom_notification.xpt
-@BINPATH@/components/dom_html.xpt
-@BINPATH@/components/dom_offline.xpt
-@BINPATH@/components/dom_json.xpt
+@BINPATH@/components/dom_messages_interfaces.xpt
+@BINPATH@/components/dom_network_interfaces.xpt
+@BINPATH@/components/dom_interfaces_notification.xpt
+@BINPATH@/components/dom_interfaces_html.xpt
+@BINPATH@/components/dom_interfaces_offline.xpt
+@BINPATH@/components/dom_interfaces_json.xpt
 @BINPATH@/components/dom_power.xpt
 #ifdef MOZ_ANDROID_GCM
-@BINPATH@/components/dom_push.xpt
+@BINPATH@/components/dom_interfaces_push.xpt
 #endif
 @BINPATH@/components/dom_quota.xpt
-@BINPATH@/components/dom_range.xpt
-@BINPATH@/components/dom_security.xpt
-@BINPATH@/components/dom_settings.xpt
-@BINPATH@/components/dom_permissionsettings.xpt
-@BINPATH@/components/dom_sidebar.xpt
-@BINPATH@/components/dom_mobilemessage.xpt
-@BINPATH@/components/dom_storage.xpt
-@BINPATH@/components/dom_stylesheets.xpt
+@BINPATH@/components/dom_interfaces_range.xpt
+@BINPATH@/components/dom_interfaces_security.xpt
+@BINPATH@/components/dom_interfaces_settings.xpt
+@BINPATH@/components/dom_interfaces_permission.xpt
+@BINPATH@/components/dom_interfaces_sidebar.xpt
+@BINPATH@/components/dom_mobilemessage_interfaces.xpt
+@BINPATH@/components/dom_interfaces_storage.xpt
+@BINPATH@/components/dom_interfaces_stylesheets.xpt
 @BINPATH@/components/dom_system.xpt
-@BINPATH@/components/dom_traversal.xpt
+@BINPATH@/components/dom_interfaces_traversal.xpt
 @BINPATH@/components/dom_tv.xpt
 #ifdef MOZ_WEBSPEECH
-@BINPATH@/components/dom_webspeechrecognition.xpt
+@BINPATH@/components/dom_media_webspeech_recognition.xpt
 #endif
-@BINPATH@/components/dom_xbl.xpt
-@BINPATH@/components/dom_xpath.xpt
-@BINPATH@/components/dom_xul.xpt
+@BINPATH@/components/dom_interfaces_xbl.xpt
+@BINPATH@/components/dom_interfaces_xpath.xpt
+@BINPATH@/components/dom_interfaces_xul.xpt
 #ifdef MOZ_GAMEPAD
-@BINPATH@/components/dom_gamepad.xpt
+@BINPATH@/components/dom_interfaces_gamepad.xpt
 #endif
-@BINPATH@/components/dom_presentation.xpt
-@BINPATH@/components/downloads.xpt
+@BINPATH@/components/dom_presentation_interfaces.xpt
+@BINPATH@/components/toolkit_components_downloads.xpt
 @BINPATH@/components/editor.xpt
-@BINPATH@/components/embed_base.xpt
-@BINPATH@/components/extensions.xpt
-@BINPATH@/components/exthandler.xpt
-@BINPATH@/components/exthelper.xpt
-@BINPATH@/components/fastfind.xpt
-@BINPATH@/components/feeds.xpt
-@BINPATH@/components/find.xpt
-@BINPATH@/components/gfx.xpt
-@BINPATH@/components/html5.xpt
-@BINPATH@/components/htmlparser.xpt
-@BINPATH@/components/imglib2.xpt
-@BINPATH@/components/inspector.xpt
-@BINPATH@/components/intl.xpt
-@BINPATH@/components/jar.xpt
-@BINPATH@/components/jsdebugger.xpt
-@BINPATH@/components/jsdownloads.xpt
-@BINPATH@/components/jsinspector.xpt
+@BINPATH@/components/embedding.xpt
+@BINPATH@/components/toolkit_mozapps_extensions.xpt
+@BINPATH@/components/uriloader_exthandler.xpt
+@BINPATH@/components/toolkit_components_exthelper.xpt
+@BINPATH@/components/toolkit_components_typeaheadfind.xpt
+@BINPATH@/components/toolkit_components_feeds.xpt
+@BINPATH@/components/embedding_components_find.xpt
+@BINPATH@/components/gfx_src.xpt
+@BINPATH@/components/parser_html.xpt
+@BINPATH@/components/parser_htmlparser.xpt
+@BINPATH@/components/image.xpt
+@BINPATH@/components/layout_inspector.xpt
+@BINPATH@/components/intl_strres.xpt
+@BINPATH@/components/modules_libjar.xpt
+@BINPATH@/components/js_ductwork_debugger.xpt
+@BINPATH@/components/toolkit_components_jsdownloads_public.xpt
+@BINPATH@/components/devtools_server.xpt
 @BINPATH@/components/layout_base.xpt
 @BINPATH@/components/layout_style.xpt
 #ifdef NS_PRINTING
 @BINPATH@/components/layout_printing.xpt
 #endif
 @BINPATH@/components/layout_xul_tree.xpt
 @BINPATH@/components/layout_xul.xpt
-@BINPATH@/components/locale.xpt
-@BINPATH@/components/lwbrk.xpt
+@BINPATH@/components/intl_locale.xpt
+@BINPATH@/components/intl_lwbrk.xpt
 #ifdef MOZ_ENABLE_PROFILER_SPS
-@BINPATH@/components/memory_profiler.xpt
+@BINPATH@/components/tools_memory-profiler.xpt
 #endif
-@BINPATH@/components/mimetype.xpt
-@BINPATH@/components/mozfind.xpt
-@BINPATH@/components/necko_about.xpt
-@BINPATH@/components/necko_cache.xpt
-@BINPATH@/components/necko_cache2.xpt
-@BINPATH@/components/necko_cookie.xpt
-@BINPATH@/components/necko_dns.xpt
-@BINPATH@/components/necko_file.xpt
-@BINPATH@/components/necko_ftp.xpt
-@BINPATH@/components/necko_http.xpt
-@BINPATH@/components/necko_mdns.xpt
-@BINPATH@/components/necko_res.xpt
-@BINPATH@/components/necko_socket.xpt
-@BINPATH@/components/necko_strconv.xpt
-@BINPATH@/components/necko_streamconv_converters.xpt
-@BINPATH@/components/necko_viewsource.xpt
-@BINPATH@/components/necko_websocket.xpt
+@BINPATH@/components/netwerk_mime.xpt
+@BINPATH@/components/toolkit_components_find.xpt
+@BINPATH@/components/netwerk_protocol_about.xpt
+@BINPATH@/components/netwerk_cache.xpt
+@BINPATH@/components/netwerk_cache2.xpt
+@BINPATH@/components/netwerk_cookie.xpt
+@BINPATH@/components/netwerk_dns.xpt
+@BINPATH@/components/netwerk_protocol_file.xpt
+@BINPATH@/components/netwerk_protocol_ftp.xpt
+@BINPATH@/components/netwerk_protocol_http.xpt
+@BINPATH@/components/netwerk_dns_mdns.xpt
+@BINPATH@/components/netwerk_protocol_res.xpt
+@BINPATH@/components/netwerk_socket.xpt
+@BINPATH@/components/netwerk_streamconv.xpt
+@BINPATH@/components/netwerk_streamconv_converters.xpt
+@BINPATH@/components/netwerk_protocol_viewsource.xpt
+@BINPATH@/components/netwerk_protocol_websocket.xpt
 #ifdef NECKO_WIFI
-@BINPATH@/components/necko_wifi.xpt
+@BINPATH@/components/netwerk_wifi.xpt
 #endif
-@BINPATH@/components/necko_wyciwyg.xpt
-@BINPATH@/components/necko.xpt
-@BINPATH@/components/loginmgr.xpt
-@BINPATH@/components/parentalcontrols.xpt
+@BINPATH@/components/netwerk_protocol_wyciwyg.xpt
+@BINPATH@/components/netwerk_base.xpt
+@BINPATH@/components/toolkit_components_passwordmgr.xpt
+@BINPATH@/components/toolkit_components_parentalcontrols.xpt
 #ifdef MOZ_WEBRTC
-@BINPATH@/components/peerconnection.xpt
+@BINPATH@/components/dom_media_bridge.xpt
 #endif
-@BINPATH@/components/plugin.xpt
-@BINPATH@/components/pref.xpt
-@BINPATH@/components/prefetch.xpt
+@BINPATH@/components/dom_plugins_base.xpt
+@BINPATH@/components/modules_libpref.xpt
+@BINPATH@/components/uriloader_prefetch.xpt
 #ifdef MOZ_ENABLE_PROFILER_SPS
-@BINPATH@/components/profiler.xpt
+@BINPATH@/components/tools_profiler.xpt
 #endif
-@BINPATH@/components/rdf.xpt
-@BINPATH@/components/satchel.xpt
-@BINPATH@/components/saxparser.xpt
-@BINPATH@/components/services-crypto-component.xpt
-@BINPATH@/components/captivedetect.xpt
-@BINPATH@/components/shistory.xpt
-@BINPATH@/components/spellchecker.xpt
+@BINPATH@/components/rdf_base.xpt
+@BINPATH@/components/toolkit_components_satchel.xpt
+@BINPATH@/components/parser_xml.xpt
+@BINPATH@/components/services_crypto_component.xpt
+@BINPATH@/components/toolkit_components_captivedetect.xpt
+@BINPATH@/components/docshell_shistory.xpt
+@BINPATH@/components/extensions_spellcheck_idl.xpt
 @BINPATH@/components/storage.xpt
-@BINPATH@/components/telemetry.xpt
-@BINPATH@/components/toolkit_asyncshutdown.xpt
-@BINPATH@/components/toolkit_filewatcher.xpt
-@BINPATH@/components/toolkit_finalizationwitness.xpt
-@BINPATH@/components/toolkit_formautofill.xpt
-@BINPATH@/components/toolkit_osfile.xpt
-@BINPATH@/components/toolkit_securityreporter.xpt
-@BINPATH@/components/toolkit_perfmonitoring.xpt
+@BINPATH@/components/toolkit_components_telemetry.xpt
+@BINPATH@/components/toolkit_components_asyncshutdown.xpt
+@BINPATH@/components/toolkit_components_filewatcher.xpt
+@BINPATH@/components/toolkit_components_finalizationwitness.xpt
+@BINPATH@/components/toolkit_components_formautofill.xpt
+@BINPATH@/components/toolkit_components_osfile.xpt
+@BINPATH@/components/toolkit_components_securityreporter.xpt
+@BINPATH@/components/toolkit_components_perfmonitoring.xpt
 @BINPATH@/components/toolkit_components_timermanager.xpt
-@BINPATH@/components/toolkit_xulstore.xpt
-@BINPATH@/components/toolkitprofile.xpt
+@BINPATH@/components/toolkit_components_xulstore.xpt
+@BINPATH@/components/toolkit_profile.xpt
 #ifdef MOZ_ENABLE_XREMOTE
-@BINPATH@/components/toolkitremote.xpt
+@BINPATH@/components/toolkit_components_remote.xpt
 #endif
-@BINPATH@/components/txtsvc.xpt
-@BINPATH@/components/txmgr.xpt
-@BINPATH@/components/uconv.xpt
-@BINPATH@/components/unicharutil.xpt
-@BINPATH@/components/update.xpt
-@BINPATH@/components/uriloader.xpt
-@BINPATH@/components/urlformatter.xpt
-@BINPATH@/components/webBrowser_core.xpt
-@BINPATH@/components/webbrowserpersist.xpt
+@BINPATH@/components/editor_txtsvc.xpt
+@BINPATH@/components/editor_txmgr.xpt
+@BINPATH@/components/intl_uconv.xpt
+@BINPATH@/components/intl_unicharutil.xpt
+@BINPATH@/components/toolkit_mozapps_update.xpt
+@BINPATH@/components/uriloader_base.xpt
+@BINPATH@/components/toolkit_components_urlformatter.xpt
+@BINPATH@/components/embedding_browser.xpt
+@BINPATH@/components/embedding_components_webbrowserpersist.xpt
 @BINPATH@/components/widget.xpt
 @BINPATH@/components/widget_android.xpt
-@BINPATH@/components/windowds.xpt
-@BINPATH@/components/windowwatcher.xpt
+@BINPATH@/components/xpfe_components_windowds.xpt
+@BINPATH@/components/embedding_components_windowwatcher.xpt
 @BINPATH@/components/xpcom_base.xpt
 @BINPATH@/components/xpcom_system.xpt
 @BINPATH@/components/xpcom_components.xpt
 @BINPATH@/components/xpcom_ds.xpt
 @BINPATH@/components/xpcom_io.xpt
 @BINPATH@/components/xpcom_threads.xpt
-@BINPATH@/components/xpcom_xpti.xpt
-@BINPATH@/components/xpconnect.xpt
-@BINPATH@/components/xulapp.xpt
-@BINPATH@/components/xul.xpt
-@BINPATH@/components/xultmpl.xpt
-@BINPATH@/components/zipwriter.xpt
+@BINPATH@/components/xpcom_reflect_xptinfo.xpt
+@BINPATH@/components/js_xpconnect_idl.xpt
+@BINPATH@/components/toolkit_xre.xpt
+@BINPATH@/components/dom_xul.xpt
+@BINPATH@/components/dom_xul_templates.xpt
+@BINPATH@/components/modules_libjar_zipwriter.xpt
 
 ; JavaScript components
 @BINPATH@/components/RequestSync.manifest
 @BINPATH@/components/RequestSyncManager.js
 @BINPATH@/components/RequestSyncScheduler.js
 @BINPATH@/components/ChromeNotifications.js
 @BINPATH@/components/ChromeNotifications.manifest
 @BINPATH@/components/ConsoleAPI.manifest
@@ -319,17 +319,17 @@
 @BINPATH@/components/addonManager.js
 @BINPATH@/components/amContentHandler.js
 @BINPATH@/components/amInstallTrigger.js
 @BINPATH@/components/amWebInstallListener.js
 @BINPATH@/components/nsBlocklistService.js
 #ifndef RELEASE_BUILD
 @BINPATH@/components/TabSource.js
 #endif
-@BINPATH@/components/webvtt.xpt
+@BINPATH@/components/dom_media_webvtt.xpt
 @BINPATH@/components/WebVTT.manifest
 @BINPATH@/components/WebVTTParserWrapper.js
 
 #ifdef MOZ_UPDATER
 @BINPATH@/components/nsUpdateService.manifest
 @BINPATH@/components/nsUpdateService.js
 @BINPATH@/components/nsUpdateServiceStub.js
 #endif
@@ -396,17 +396,17 @@
 @BINPATH@/components/PeerConnection.js
 @BINPATH@/components/PeerConnection.manifest
 #endif
 
 @BINPATH@/components/CaptivePortalDetectComponents.manifest
 @BINPATH@/components/captivedetect.js
 
 #ifdef MOZ_WEBSPEECH
-@BINPATH@/components/dom_webspeechsynth.xpt
+@BINPATH@/components/dom_media_webspeech_synth.xpt
 #endif
 
 #ifdef MOZ_DEBUG
 @BINPATH@/components/TestInterfaceJS.js
 @BINPATH@/components/TestInterfaceJS.manifest
 @BINPATH@/components/TestInterfaceJSMaplike.js
 #endif
 
@@ -435,21 +435,21 @@
 @BINPATH@/modules/*
 
 #ifdef MOZ_SAFE_BROWSING
 ; Safe Browsing
 @BINPATH@/components/nsURLClassifier.manifest
 @BINPATH@/components/nsUrlClassifierHashCompleter.js
 @BINPATH@/components/nsUrlClassifierListManager.js
 @BINPATH@/components/nsUrlClassifierLib.js
-@BINPATH@/components/url-classifier.xpt
+@BINPATH@/components/toolkit_components_url-classifier.xpt
 #endif
 
 ; Private Browsing
-@BINPATH@/components/privatebrowsing.xpt
+@BINPATH@/components/toolkit_components_privatebrowsing.xpt
 @BINPATH@/components/PrivateBrowsing.manifest
 @BINPATH@/components/PrivateBrowsingTrackingProtectionWhitelist.js
 
 ; Security Reports
 @BINPATH@/components/SecurityReporter.manifest
 @BINPATH@/components/SecurityReporter.js
 
 ; [Browser Chrome Files]
@@ -502,22 +502,22 @@
 #ifndef MOZ_ANDROID_EXCLUDE_FONTS
 @BINPATH@/res/fonts/*
 #else
 @BINPATH@/res/fonts/*.properties
 #endif
 
 ; svg
 @BINPATH@/res/svg.css
-@BINPATH@/components/dom_svg.xpt
-@BINPATH@/components/dom_smil.xpt
+@BINPATH@/components/dom_interfaces_svg.xpt
+@BINPATH@/components/dom_interfaces_smil.xpt
 
 ; [Personal Security Manager]
 ;
-@BINPATH@/components/pipnss.xpt
+@BINPATH@/components/security_manager_ssl.xpt
 
 ; For process sandboxing
 #if defined(MOZ_SANDBOX)
 @BINPATH@/@DLL_PREFIX@mozsandbox@DLL_SUFFIX@
 #endif
 
 ; [Crash Reporter]
 ; CrashService is not used on Android but the ini files are required for L10N
@@ -538,17 +538,17 @@
 @BINPATH@/components/ContentDispatchChooser.js
 @BINPATH@/components/ContentPermissionPrompt.js
 @BINPATH@/components/ImageBlockingPolicy.js
 @BINPATH@/components/DirectoryProvider.js
 @BINPATH@/components/FilePicker.js
 @BINPATH@/components/HelperAppDialog.js
 @BINPATH@/components/LoginManagerPrompter.js
 @BINPATH@/components/MobileComponents.manifest
-@BINPATH@/components/MobileComponents.xpt
+@BINPATH@/components/mobile_android_components.xpt
 @BINPATH@/components/NSSDialogService.js
 @BINPATH@/components/PresentationDevicePrompt.js
 @BINPATH@/components/PromptService.js
 @BINPATH@/components/SessionStore.js
 @BINPATH@/components/SiteSpecificUserAgent.js
 @BINPATH@/components/Snippets.js
 
 @BINPATH@/components/XPIDialogService.js

--- a/netwerk/test/httpserver/httpd.manifest
+++ b/netwerk/test/httpserver/httpd.manifest
@@ -1,3 +1,3 @@
 component {54ef6f81-30af-4b1d-ac55-8ba811293e41} httpd.js
 contract @mozilla.org/server/jshttp;1 {54ef6f81-30af-4b1d-ac55-8ba811293e41}
-interfaces test_necko.xpt
+interfaces netwerk_test_httpserver.xpt

--- a/python/mozbuild/mozbuild/action/test_archive.py
+++ b/python/mozbuild/mozbuild/action/test_archive.py
@@ -216,17 +216,17 @@ ARCHIVE_FILES = {
             'dest': 'bin',
         },
         {
             'source': buildconfig.topobjdir,
             'base': 'dist/bin/components',
             'patterns': [
                 'httpd.js',
                 'httpd.manifest',
-                'test_necko.xpt',
+                'netwerk_test_httpserver.xpt',
             ],
             'dest': 'bin/components',
         },
         {
             'source': buildconfig.topsrcdir,
             'base': 'build/pgo/certs',
             'pattern': '**',
             'dest': 'certs',

--- a/python/mozbuild/mozbuild/frontend/emitter.py
+++ b/python/mozbuild/mozbuild/frontend/emitter.py
@@ -1003,27 +1003,19 @@ class TreeMetadataEmitter(LoggingMixin):
         sub.output_path = path.translated
         sub.relpath = path
 
         return sub
 
     def _process_xpidl(self, context):
         # XPIDL source files get processed and turned into .h and .xpt files.
         # If there are multiple XPIDL files in a directory, they get linked
-        # together into a final .xpt, which has the name defined by
-        # XPIDL_MODULE.
-        xpidl_module = context['XPIDL_MODULE']
-
-        if context['XPIDL_SOURCES'] and not xpidl_module:
-            raise SandboxValidationError('XPIDL_MODULE must be defined if '
-                'XPIDL_SOURCES is defined.', context)
-
-        if xpidl_module and not context['XPIDL_SOURCES']:
-            raise SandboxValidationError('XPIDL_MODULE cannot be defined '
-                'unless there are XPIDL_SOURCES', context)
+        # together into a final .xpt, which has the name defined by the
+        # relative source directory.
+        xpidl_module = context.relsrcdir.replace('/', '_')
 
         if context['XPIDL_SOURCES'] and context['DIST_INSTALL'] is False:
             self.log(logging.WARN, 'mozbuild_warning', dict(
                 path=context.main_path),
                 '{path}: DIST_INSTALL = False has no effect on XPIDL_SOURCES.')
 
         for idl in context['XPIDL_SOURCES']:
             yield XPIDLFile(context, mozpath.join(context.srcdir, idl),

copy from python/mozbuild/mozbuild/test/backend/data/xpidl/moz.build
copy to python/mozbuild/mozbuild/test/backend/data/xpidl/interfaces/moz.build

--- a/python/mozbuild/mozbuild/test/backend/data/xpidl/moz.build
+++ b/python/mozbuild/mozbuild/test/backend/data/xpidl/moz.build
@@ -1,6 +1,5 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # Any copyright is dedicated to the Public Domain.
 # http://creativecommons.org/publicdomain/zero/1.0/
 
-XPIDL_MODULE = 'my_module'
-XPIDL_SOURCES = ['bar.idl', 'foo.idl']
+DIRS += ['interfaces']

--- a/python/mozbuild/mozbuild/test/backend/test_recursivemake.py
+++ b/python/mozbuild/mozbuild/test/backend/test_recursivemake.py
@@ -598,20 +598,20 @@ class TestRecursiveMakeBackend(BackendTe
         self.assertTrue(os.path.isfile(mozpath.join(install_dir, 'xpidl')))
 
         m = InstallManifest(path=mozpath.join(install_dir, 'dist_idl'))
         self.assertEqual(len(m), 2)
         self.assertIn('bar.idl', m)
         self.assertIn('foo.idl', m)
 
         m = InstallManifest(path=mozpath.join(install_dir, 'xpidl'))
-        self.assertIn('.deps/my_module.pp', m)
+        self.assertIn('.deps/interfaces.pp', m)
 
         m = InstallManifest(path=os.path.join(install_dir, 'dist_bin'))
-        self.assertIn('components/my_module.xpt', m)
+        self.assertIn('components/interfaces.xpt', m)
         self.assertIn('components/interfaces.manifest', m)
 
         m = InstallManifest(path=mozpath.join(install_dir, 'dist_include'))
         self.assertIn('foo.h', m)
 
         p = mozpath.join(env.topobjdir, 'config/makefiles/xpidl')
         self.assertTrue(os.path.isdir(p))
 

deleted file mode 100644
--- a/python/mozbuild/mozbuild/test/frontend/data/xpidl-module-no-sources/moz.build
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# Any copyright is dedicated to the Public Domain.
-# http://creativecommons.org/publicdomain/zero/1.0/
-
-XPIDL_MODULE = 'xpidl_module'

--- a/python/mozbuild/mozbuild/test/frontend/test_emitter.py
+++ b/python/mozbuild/mozbuild/test/frontend/test_emitter.py
@@ -790,23 +790,16 @@ class TestEmitterBasic(unittest.TestCase
             self.assertIsInstance(obj, JARManifest)
             self.assertIsInstance(obj.path, Path)
 
     def test_jar_manifests_multiple_files(self):
         with self.assertRaisesRegexp(SandboxValidationError, 'limited to one value'):
             reader = self.reader('jar-manifests-multiple-files')
             self.read_topsrcdir(reader)
 
-    def test_xpidl_module_no_sources(self):
-        """XPIDL_MODULE without XPIDL_SOURCES should be rejected."""
-        with self.assertRaisesRegexp(SandboxValidationError, 'XPIDL_MODULE '
-            'cannot be defined'):
-            reader = self.reader('xpidl-module-no-sources')
-            self.read_topsrcdir(reader)
-
     def test_missing_local_includes(self):
         """LOCAL_INCLUDES containing non-existent directories should be rejected."""
         with self.assertRaisesRegexp(SandboxValidationError, 'Path specified in '
             'LOCAL_INCLUDES does not exist'):
             reader = self.reader('missing-local-includes')
             self.read_topsrcdir(reader)
 
     def test_library_defines(self):

--- a/testing/xpcshell/remotexpcshelltests.py
+++ b/testing/xpcshell/remotexpcshelltests.py
@@ -416,18 +416,18 @@ class XPCShellRemote(xpcshell.XPCShellTe
         local = os.path.join(self.localBin, "components/httpd.js")
         remoteFile = remoteJoin(self.remoteComponentsDir, "httpd.js")
         self.device.pushFile(local, remoteFile)
 
         local = os.path.join(self.localBin, "components/httpd.manifest")
         remoteFile = remoteJoin(self.remoteComponentsDir, "httpd.manifest")
         self.device.pushFile(local, remoteFile)
 
-        local = os.path.join(self.localBin, "components/test_necko.xpt")
-        remoteFile = remoteJoin(self.remoteComponentsDir, "test_necko.xpt")
+        local = os.path.join(self.localBin, "components/netwerk_test_httpserver.xpt")
+        remoteFile = remoteJoin(self.remoteComponentsDir, "netwerk_test_httpserver.xpt")
         self.device.pushFile(local, remoteFile)
 
         if self.options.localAPK:
             remoteFile = remoteJoin(self.remoteBinDir, os.path.basename(self.options.localAPK))
             self.device.pushFile(self.options.localAPK, remoteFile)
 
         self.pushLibs()
 

--- a/xpcom/tests/moz.build
+++ b/xpcom/tests/moz.build
@@ -80,17 +80,17 @@ if CONFIG['MOZ_DEBUG'] and CONFIG['OS_AR
     # FIXME bug 523392: TestDeadlockDetector doesn't like Windows
     # FIXME bug 523378: also fails on OS X
     GeckoCppUnitTests([
         'TestDeadlockDetector',
         'TestDeadlockDetectorScalability',
     ])
 
 TEST_HARNESS_FILES.xpcshell.xpcom.tests.unit += [
-    '!/dist/bin/components/xpcomtest.xpt',
+    '!/dist/bin/components/xpcom_tests.xpt',
 ]
 
 XPIDL_MODULE = 'xpcomtest'
 XPIDL_SOURCES += [
     'NotXPCOMTest.idl',
 ]
 
 # Don't add our test-only .xpt files to the normal manifests

--- a/xpcom/tests/unit/xpcomtest.manifest
+++ b/xpcom/tests/unit/xpcomtest.manifest
@@ -1,1 +1,1 @@
-interfaces xpcomtest.xpt
+interfaces xpcom_tests.xpt

--- a/xpcom/tests/unit/xpcshell.ini
+++ b/xpcom/tests/unit/xpcshell.ini
@@ -1,20 +1,20 @@
 [DEFAULT]
 head = head_xpcom.js
 tail =
 skip-if = toolkit == 'gonk'
 support-files =
   bug725015.manifest
   compmgr_warnings.manifest
   data/**
-  xpcomtest.xpt
+  xpcom_tests.xpt
   xpcomtest.manifest
 generated-files =
-  xpcomtest.xpt
+  xpcom_tests.xpt
 
 [test_bug121341.js]
 [test_bug325418.js]
 [test_bug332389.js]
 [test_bug333505.js]
 [test_bug364285-1.js]
 # Bug 902073: test fails consistently on Android x86
 skip-if = os == "android"