--- a/browser/components/about/AboutRedirector.cpp
+++ b/browser/components/about/AboutRedirector.cpp
@@ -86,17 +86,17 @@ static const RedirEntry kRedirMap[] = {
     nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |
     nsIAboutModule::URI_MUST_LOAD_IN_CHILD |
     nsIAboutModule::ALLOW_SCRIPT |
     nsIAboutModule::MAKE_LINKABLE |
     nsIAboutModule::ENABLE_INDEXED_DB },
   // the newtab's actual URL will be determined when the channel is created
   { "newtab", "about:blank",
     nsIAboutModule::ALLOW_SCRIPT },
-  { "preferences", "chrome://browser/content/preferences/in-content-new/preferences.xul",
+  { "preferences", "chrome://browser/content/preferences/in-content/preferences.xul",
     nsIAboutModule::ALLOW_SCRIPT },
   { "downloads", "chrome://browser/content/downloads/contentAreaDownloadsView.xul",
     nsIAboutModule::ALLOW_SCRIPT },
 #ifdef MOZ_SERVICES_HEALTHREPORT
   { "healthreport", "chrome://browser/content/abouthealthreport/abouthealth.xhtml",
     nsIAboutModule::ALLOW_SCRIPT },
 #endif
   { "accounts", "chrome://browser/content/aboutaccounts/aboutaccounts.xhtml",
@@ -153,18 +153,18 @@ AboutRedirector::NewChannel(nsIURI* aURI
 
       if (path.EqualsLiteral("newtab")) {
         // let the aboutNewTabService decide where to redirect
         nsCOMPtr<nsIAboutNewTabService> aboutNewTabService =
           do_GetService("@mozilla.org/browser/aboutnewtab-service;1", &rv);
         NS_ENSURE_SUCCESS(rv, rv);
         rv = aboutNewTabService->GetDefaultURL(url);
         NS_ENSURE_SUCCESS(rv, rv);
-      } else if (path.EqualsLiteral("preferences") && sUseOldPreferences) {
-        url.AssignASCII("chrome://browser/content/preferences/in-content-old/preferences.xul");
+      } else if (path.EqualsLiteral("preferences") && !sUseOldPreferences) {
+        url.AssignASCII("chrome://browser/content/preferences/in-content-new/preferences.xul");
       }
       // fall back to the specified url in the map
       if (url.IsEmpty()) {
         url.AssignASCII(redir.url);
       }
 
       nsCOMPtr<nsIChannel> tempChannel;
       nsCOMPtr<nsIURI> tempURI;

rename from browser/components/preferences/in-content-old/advanced.js
rename to browser/components/preferences/in-content/advanced.js

rename from browser/components/preferences/in-content-old/advanced.xul
rename to browser/components/preferences/in-content/advanced.xul
--- a/browser/components/preferences/in-content-old/advanced.xul
+++ b/browser/components/preferences/in-content/advanced.xul
@@ -1,16 +1,16 @@
 # 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/.
 
 <!-- Advanced panel -->
 
 <script type="application/javascript"
-        src="chrome://browser/content/preferences/in-content-old/advanced.js"/>
+        src="chrome://browser/content/preferences/in-content/advanced.js"/>
 
 <preferences id="advancedPreferences" hidden="true" data-category="paneAdvanced">
   <preference id="browser.preferences.advanced.selectedTabIndex"
               name="browser.preferences.advanced.selectedTabIndex"
               type="int"/>
 
   <!-- General tab -->
   <preference id="accessibility.browsewithcaret"

rename from browser/components/preferences/in-content-old/applications.js
rename to browser/components/preferences/in-content/applications.js

rename from browser/components/preferences/in-content-old/applications.xul
rename to browser/components/preferences/in-content/applications.xul
--- a/browser/components/preferences/in-content-old/applications.xul
+++ b/browser/components/preferences/in-content/applications.xul
@@ -1,16 +1,16 @@
 # 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/.
 
 <!-- Applications panel -->
 
 <script type="application/javascript"
-        src="chrome://browser/content/preferences/in-content-old/applications.js"/>
+        src="chrome://browser/content/preferences/in-content/applications.js"/>
 
 <preferences id="feedsPreferences" hidden="true" data-category="paneApplications">
   <preference id="browser.feeds.handler"
               name="browser.feeds.handler"
               type="string"/>
   <preference id="browser.feeds.handler.default"
               name="browser.feeds.handler.default"
               type="string"/>

rename from browser/components/preferences/in-content-old/containers.js
rename to browser/components/preferences/in-content/containers.js

rename from browser/components/preferences/in-content-old/containers.xul
rename to browser/components/preferences/in-content/containers.xul
--- a/browser/components/preferences/in-content-old/containers.xul
+++ b/browser/components/preferences/in-content/containers.xul
@@ -1,16 +1,16 @@
 # 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/.
 
 <!-- Containers panel -->
 
 <script type="application/javascript"
-        src="chrome://browser/content/preferences/in-content-old/containers.js"/>
+        src="chrome://browser/content/preferences/in-content/containers.js"/>
 
 <preferences id="containerPreferences" hidden="true" data-category="paneContainer">
   <!-- Containers -->
   <preference id="privacy.userContext.enabled"
               name="privacy.userContext.enabled"
               type="bool"/>
 
 </preferences>

rename from browser/components/preferences/in-content-old/content.js
rename to browser/components/preferences/in-content/content.js

rename from browser/components/preferences/in-content-old/content.xul
rename to browser/components/preferences/in-content/content.xul
--- a/browser/components/preferences/in-content-old/content.xul
+++ b/browser/components/preferences/in-content/content.xul
@@ -25,17 +25,17 @@
   <preference id="browser.translation.detectLanguage"
               name="browser.translation.detectLanguage"
               type="bool"/>
 </preferences>
 
 <script type="application/javascript"
         src="chrome://mozapps/content/preferences/fontbuilder.js"/>
 <script type="application/javascript"
-        src="chrome://browser/content/preferences/in-content-old/content.js"/>
+        src="chrome://browser/content/preferences/in-content/content.js"/>
 
 <hbox id="header-content"
       class="header"
       hidden="true"
       data-category="paneContent">
   <label class="header-name" flex="1">&paneContent.title;</label>
   <html:a class="help-button" target="_blank" aria-label="&helpButton.label;"></html:a>
 </hbox>

rename from browser/components/preferences/in-content-old/jar.mn
rename to browser/components/preferences/in-content/jar.mn
--- a/browser/components/preferences/in-content-old/jar.mn
+++ b/browser/components/preferences/in-content/jar.mn
@@ -1,18 +1,18 @@
 # 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/.
 
 browser.jar:
-   content/browser/preferences/in-content-old/preferences.js
-*  content/browser/preferences/in-content-old/preferences.xul
-   content/browser/preferences/in-content-old/subdialogs.js
+   content/browser/preferences/in-content/preferences.js
+*  content/browser/preferences/in-content/preferences.xul
+   content/browser/preferences/in-content/subdialogs.js
 
-   content/browser/preferences/in-content-old/main.js
-   content/browser/preferences/in-content-old/privacy.js
-   content/browser/preferences/in-content-old/containers.js
-   content/browser/preferences/in-content-old/advanced.js
-   content/browser/preferences/in-content-old/applications.js
-   content/browser/preferences/in-content-old/content.js
-   content/browser/preferences/in-content-old/sync.js
-   content/browser/preferences/in-content-old/security.js
-   content/browser/preferences/in-content-old/search.js
+   content/browser/preferences/in-content/main.js
+   content/browser/preferences/in-content/privacy.js
+   content/browser/preferences/in-content/containers.js
+   content/browser/preferences/in-content/advanced.js
+   content/browser/preferences/in-content/applications.js
+   content/browser/preferences/in-content/content.js
+   content/browser/preferences/in-content/sync.js
+   content/browser/preferences/in-content/security.js
+   content/browser/preferences/in-content/search.js

rename from browser/components/preferences/in-content-old/main.js
rename to browser/components/preferences/in-content/main.js

rename from browser/components/preferences/in-content-old/main.xul
rename to browser/components/preferences/in-content/main.xul
--- a/browser/components/preferences/in-content-old/main.xul
+++ b/browser/components/preferences/in-content/main.xul
@@ -1,16 +1,16 @@
 # 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/.
 
 <!-- General panel -->
 
 <script type="application/javascript"
-        src="chrome://browser/content/preferences/in-content-old/main.js"/>
+        src="chrome://browser/content/preferences/in-content/main.js"/>
 
 <stringbundle id="bundlePreferences" src="chrome://browser/locale/preferences.properties"/>
 
 <preferences id="mainPreferences" hidden="true" data-category="paneGeneral">
 
 #ifdef E10S_TESTING_ONLY
     <preference id="browser.tabs.remote.autostart"
                 name="browser.tabs.remote.autostart"

rename from browser/components/preferences/in-content-old/moz.build
rename to browser/components/preferences/in-content/moz.build

rename from browser/components/preferences/in-content-old/preferences.js
rename to browser/components/preferences/in-content/preferences.js

rename from browser/components/preferences/in-content-old/preferences.xul
rename to browser/components/preferences/in-content/preferences.xul
--- a/browser/components/preferences/in-content-old/preferences.xul
+++ b/browser/components/preferences/in-content/preferences.xul
@@ -3,22 +3,22 @@
    - 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/. -->
 
 <?xml-stylesheet href="chrome://global/skin/global.css"?>
 
 <?xml-stylesheet href="chrome://browser/skin/preferences/preferences.css"?>
 <?xml-stylesheet href="chrome://global/skin/in-content/common.css"?>
 <?xml-stylesheet
-  href="chrome://browser/skin/preferences/in-content-old/preferences.css"?>
+  href="chrome://browser/skin/preferences/in-content/preferences.css"?>
 <?xml-stylesheet
   href="chrome://browser/content/preferences/handlers.css"?>
 <?xml-stylesheet href="chrome://browser/skin/preferences/applications.css"?>
-<?xml-stylesheet href="chrome://browser/skin/preferences/in-content-old/search.css"?>
-<?xml-stylesheet href="chrome://browser/skin/preferences/in-content-old/containers.css"?>
+<?xml-stylesheet href="chrome://browser/skin/preferences/in-content/search.css"?>
+<?xml-stylesheet href="chrome://browser/skin/preferences/in-content/containers.css"?>
 
 <!DOCTYPE page [
 <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
 <!ENTITY % globalPreferencesDTD SYSTEM "chrome://global/locale/preferences.dtd">
 <!ENTITY % preferencesDTD SYSTEM
   "chrome://browser/locale/preferences-old/preferences.dtd">
 <!ENTITY % privacyDTD SYSTEM "chrome://browser/locale/preferences-old/privacy.dtd">
 <!ENTITY % tabsDTD SYSTEM "chrome://browser/locale/preferences-old/tabs.dtd">
@@ -64,23 +64,23 @@
       disablefastfind="true"
 #ifdef USE_WIN_TITLE_STYLE
       title="&prefWindow.titleWin;">
 #else
       title="&prefWindow.title;">
 #endif
 
   <html:link rel="shortcut icon"
-              href="chrome://browser/skin/preferences/in-content-old/favicon.ico"/>
+              href="chrome://browser/skin/preferences/in-content/favicon.ico"/>
 
   <script type="application/javascript"
           src="chrome://browser/content/utilityOverlay.js"/>
   <script type="application/javascript"
-          src="chrome://browser/content/preferences/in-content-old/preferences.js"/>
-  <script src="chrome://browser/content/preferences/in-content-old/subdialogs.js"/>
+          src="chrome://browser/content/preferences/in-content/preferences.js"/>
+  <script src="chrome://browser/content/preferences/in-content/subdialogs.js"/>
 
   <stringbundle id="bundleBrand"
                 src="chrome://branding/locale/brand.properties"/>
   <stringbundle id="bundlePreferences"
                 src="chrome://browser/locale/preferences-old/preferences.properties"/>
 
   <stringbundleset id="appManagerBundleset">
     <stringbundle id="appManagerBundle"

rename from browser/components/preferences/in-content-old/privacy.js
rename to browser/components/preferences/in-content/privacy.js

rename from browser/components/preferences/in-content-old/privacy.xul
rename to browser/components/preferences/in-content/privacy.xul
--- a/browser/components/preferences/in-content-old/privacy.xul
+++ b/browser/components/preferences/in-content/privacy.xul
@@ -1,16 +1,16 @@
 # 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/.
 
 <!-- Privacy panel -->
 
 <script type="application/javascript"
-        src="chrome://browser/content/preferences/in-content-old/privacy.js"/>
+        src="chrome://browser/content/preferences/in-content/privacy.js"/>
 
 <preferences id="privacyPreferences" hidden="true" data-category="panePrivacy">
 
   <!-- Tracking -->
   <preference id="privacy.trackingprotection.enabled"
               name="privacy.trackingprotection.enabled"
               type="bool"/>
   <preference id="privacy.trackingprotection.pbmode.enabled"

rename from browser/components/preferences/in-content-old/search.js
rename to browser/components/preferences/in-content/search.js

rename from browser/components/preferences/in-content-old/search.xul
rename to browser/components/preferences/in-content/search.xul
--- a/browser/components/preferences/in-content-old/search.xul
+++ b/browser/components/preferences/in-content/search.xul
@@ -10,17 +10,17 @@
 
       <preference id="browser.search.hiddenOneOffs"
                   name="browser.search.hiddenOneOffs"
                   type="unichar"/>
 
     </preferences>
 
     <script type="application/javascript"
-            src="chrome://browser/content/preferences/in-content-old/search.js"/>
+            src="chrome://browser/content/preferences/in-content/search.js"/>
 
     <stringbundle id="engineManagerBundle" src="chrome://browser/locale/engineManager.properties"/>
 
     <hbox id="header-search"
           class="header"
           hidden="true"
           data-category="paneSearch">
       <label class="header-name" flex="1">&paneSearch.title;</label>

rename from browser/components/preferences/in-content-old/security.js
rename to browser/components/preferences/in-content/security.js

rename from browser/components/preferences/in-content-old/security.xul
rename to browser/components/preferences/in-content/security.xul
--- a/browser/components/preferences/in-content-old/security.xul
+++ b/browser/components/preferences/in-content/security.xul
@@ -1,16 +1,16 @@
 # 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/.
 
 <!-- Security panel -->
 
 <script type="application/javascript"
-        src="chrome://browser/content/preferences/in-content-old/security.js"/>
+        src="chrome://browser/content/preferences/in-content/security.js"/>
 
 <preferences id="securityPreferences" hidden="true" data-category="paneSecurity">
   <!-- XXX buttons -->
   <preference id="pref.privacy.disable_button.view_passwords"
               name="pref.privacy.disable_button.view_passwords"
               type="bool"/>
   <preference id="pref.privacy.disable_button.view_passwords_exceptions"
               name="pref.privacy.disable_button.view_passwords_exceptions"

rename from browser/components/preferences/in-content-old/subdialogs.js
rename to browser/components/preferences/in-content/subdialogs.js
--- a/browser/components/preferences/in-content-old/subdialogs.js
+++ b/browser/components/preferences/in-content/subdialogs.js
@@ -13,18 +13,18 @@ var gSubDialog = {
   _isClosing: false,
   _frame: null,
   _overlay: null,
   _box: null,
   _openedURL: null,
   _injectedStyleSheets: [
     "chrome://browser/skin/preferences/preferences.css",
     "chrome://global/skin/in-content/common.css",
-    "chrome://browser/skin/preferences/in-content-old/preferences.css",
-    "chrome://browser/skin/preferences/in-content-old/dialog.css",
+    "chrome://browser/skin/preferences/in-content/preferences.css",
+    "chrome://browser/skin/preferences/in-content/dialog.css",
   ],
   _resizeObserver: null,
 
   init() {
     this._frame = document.getElementById("dialogFrame");
     this._overlay = document.getElementById("dialogOverlay");
     this._box = document.getElementById("dialogBox");
     this._closeButton = document.getElementById("dialogClose");

rename from browser/components/preferences/in-content-old/sync.js
rename to browser/components/preferences/in-content/sync.js

rename from browser/components/preferences/in-content-old/sync.xul
rename to browser/components/preferences/in-content/sync.xul
--- a/browser/components/preferences/in-content-old/sync.xul
+++ b/browser/components/preferences/in-content/sync.xul
@@ -21,17 +21,17 @@
               name="services.sync.engine.prefs"
               type="bool"/>
   <preference id="engine.passwords"
               name="services.sync.engine.passwords"
               type="bool"/>
 </preferences>
 
 <script type="application/javascript"
-        src="chrome://browser/content/preferences/in-content-old/sync.js"/>
+        src="chrome://browser/content/preferences/in-content/sync.js"/>
 
 <hbox id="header-sync"
       class="header"
       hidden="true"
       data-category="paneSync">
   <label class="header-name" flex="1">&paneSync.title;</label>
   <html:a class="help-button text-link" target="_blank" aria-label="&helpButton.label;"></html:a>
 </hbox>

rename from browser/components/preferences/in-content-old/tests/.eslintrc.js
rename to browser/components/preferences/in-content/tests/.eslintrc.js

rename from browser/components/preferences/in-content-old/tests/browser.ini
rename to browser/components/preferences/in-content/tests/browser.ini

rename from browser/components/preferences/in-content-old/tests/browser_advanced_siteData.js
rename to browser/components/preferences/in-content/tests/browser_advanced_siteData.js
--- a/browser/components/preferences/in-content-old/tests/browser_advanced_siteData.js
+++ b/browser/components/preferences/in-content/tests/browser_advanced_siteData.js
@@ -6,20 +6,20 @@
 const { classes: Cc, interfaces: Ci, utils: Cu, results: Cr } = Components;
 
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 /* import-globals-from ../../../../../testing/modules/sinon-1.16.1.js */
 Services.scriptloader.loadSubScript("resource://testing-common/sinon-1.16.1.js");
 
 const TEST_QUOTA_USAGE_HOST = "example.com";
 const TEST_QUOTA_USAGE_ORIGIN = "https://" + TEST_QUOTA_USAGE_HOST;
-const TEST_QUOTA_USAGE_URL = TEST_QUOTA_USAGE_ORIGIN + "/browser/browser/components/preferences/in-content-old/tests/site_data_test.html";
+const TEST_QUOTA_USAGE_URL = TEST_QUOTA_USAGE_ORIGIN + "/browser/browser/components/preferences/in-content/tests/site_data_test.html";
 const TEST_OFFLINE_HOST = "example.org";
 const TEST_OFFLINE_ORIGIN = "https://" + TEST_OFFLINE_HOST;
-const TEST_OFFLINE_URL = TEST_OFFLINE_ORIGIN + "/browser/browser/components/preferences/in-content-old/tests/offline/offline.html";
+const TEST_OFFLINE_URL = TEST_OFFLINE_ORIGIN + "/browser/browser/components/preferences/in-content/tests/offline/offline.html";
 const REMOVE_DIALOG_URL = "chrome://browser/content/preferences/siteDataRemoveSelected.xul";
 
 const { NetUtil } = Cu.import("resource://gre/modules/NetUtil.jsm", {});
 const { DownloadUtils } = Cu.import("resource://gre/modules/DownloadUtils.jsm", {});
 const { SiteDataManager } = Cu.import("resource:///modules/SiteDataManager.jsm", {});
 const { OfflineAppCacheHelper } = Cu.import("resource:///modules/offlineAppCache.jsm", {});
 
 const mockOfflineAppCacheHelper = {

rename from browser/components/preferences/in-content-old/tests/browser_advanced_update.js
rename to browser/components/preferences/in-content/tests/browser_advanced_update.js

rename from browser/components/preferences/in-content-old/tests/browser_applications_selection.js
rename to browser/components/preferences/in-content/tests/browser_applications_selection.js

rename from browser/components/preferences/in-content-old/tests/browser_basic_rebuild_fonts_test.js
rename to browser/components/preferences/in-content/tests/browser_basic_rebuild_fonts_test.js

rename from browser/components/preferences/in-content-old/tests/browser_bug1018066_resetScrollPosition.js
rename to browser/components/preferences/in-content/tests/browser_bug1018066_resetScrollPosition.js

rename from browser/components/preferences/in-content-old/tests/browser_bug1020245_openPreferences_to_paneContent.js
rename to browser/components/preferences/in-content/tests/browser_bug1020245_openPreferences_to_paneContent.js

rename from browser/components/preferences/in-content-old/tests/browser_bug1184989_prevent_scrolling_when_preferences_flipped.js
rename to browser/components/preferences/in-content/tests/browser_bug1184989_prevent_scrolling_when_preferences_flipped.js

rename from browser/components/preferences/in-content-old/tests/browser_bug1184989_prevent_scrolling_when_preferences_flipped.xul
rename to browser/components/preferences/in-content/tests/browser_bug1184989_prevent_scrolling_when_preferences_flipped.xul

rename from browser/components/preferences/in-content-old/tests/browser_bug410900.js
rename to browser/components/preferences/in-content/tests/browser_bug410900.js

rename from browser/components/preferences/in-content-old/tests/browser_bug705422.js
rename to browser/components/preferences/in-content/tests/browser_bug705422.js

rename from browser/components/preferences/in-content-old/tests/browser_bug731866.js
rename to browser/components/preferences/in-content/tests/browser_bug731866.js

rename from browser/components/preferences/in-content-old/tests/browser_bug795764_cachedisabled.js
rename to browser/components/preferences/in-content/tests/browser_bug795764_cachedisabled.js

rename from browser/components/preferences/in-content-old/tests/browser_change_app_handler.js
rename to browser/components/preferences/in-content/tests/browser_change_app_handler.js

rename from browser/components/preferences/in-content-old/tests/browser_connection.js
rename to browser/components/preferences/in-content/tests/browser_connection.js

rename from browser/components/preferences/in-content-old/tests/browser_connection_bug388287.js
rename to browser/components/preferences/in-content/tests/browser_connection_bug388287.js

rename from browser/components/preferences/in-content-old/tests/browser_cookies_exceptions.js
rename to browser/components/preferences/in-content/tests/browser_cookies_exceptions.js

rename from browser/components/preferences/in-content-old/tests/browser_defaultbrowser_alwayscheck.js
rename to browser/components/preferences/in-content/tests/browser_defaultbrowser_alwayscheck.js

rename from browser/components/preferences/in-content-old/tests/browser_healthreport.js
rename to browser/components/preferences/in-content/tests/browser_healthreport.js

rename from browser/components/preferences/in-content-old/tests/browser_homepages_filter_aboutpreferences.js
rename to browser/components/preferences/in-content/tests/browser_homepages_filter_aboutpreferences.js

rename from browser/components/preferences/in-content-old/tests/browser_notifications_do_not_disturb.js
rename to browser/components/preferences/in-content/tests/browser_notifications_do_not_disturb.js

rename from browser/components/preferences/in-content-old/tests/browser_performance.js
rename to browser/components/preferences/in-content/tests/browser_performance.js

rename from browser/components/preferences/in-content-old/tests/browser_permissions_urlFieldHidden.js
rename to browser/components/preferences/in-content/tests/browser_permissions_urlFieldHidden.js

rename from browser/components/preferences/in-content-old/tests/browser_privacypane_1.js
rename to browser/components/preferences/in-content/tests/browser_privacypane_1.js

rename from browser/components/preferences/in-content-old/tests/browser_privacypane_3.js
rename to browser/components/preferences/in-content/tests/browser_privacypane_3.js

rename from browser/components/preferences/in-content-old/tests/browser_privacypane_4.js
rename to browser/components/preferences/in-content/tests/browser_privacypane_4.js

rename from browser/components/preferences/in-content-old/tests/browser_privacypane_5.js
rename to browser/components/preferences/in-content/tests/browser_privacypane_5.js

rename from browser/components/preferences/in-content-old/tests/browser_privacypane_8.js
rename to browser/components/preferences/in-content/tests/browser_privacypane_8.js

rename from browser/components/preferences/in-content-old/tests/browser_proxy_backup.js
rename to browser/components/preferences/in-content/tests/browser_proxy_backup.js

rename from browser/components/preferences/in-content-old/tests/browser_sanitizeOnShutdown_prefLocked.js
rename to browser/components/preferences/in-content/tests/browser_sanitizeOnShutdown_prefLocked.js

rename from browser/components/preferences/in-content-old/tests/browser_searchsuggestions.js
rename to browser/components/preferences/in-content/tests/browser_searchsuggestions.js

rename from browser/components/preferences/in-content-old/tests/browser_security.js
rename to browser/components/preferences/in-content/tests/browser_security.js

rename from browser/components/preferences/in-content-old/tests/browser_subdialogs.js
rename to browser/components/preferences/in-content/tests/browser_subdialogs.js

rename from browser/components/preferences/in-content-old/tests/browser_telemetry.js
rename to browser/components/preferences/in-content/tests/browser_telemetry.js

rename from browser/components/preferences/in-content-old/tests/head.js
rename to browser/components/preferences/in-content/tests/head.js
--- a/browser/components/preferences/in-content-old/tests/head.js
+++ b/browser/components/preferences/in-content/tests/head.js
@@ -1,14 +1,14 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
 Components.utils.import("resource://gre/modules/Promise.jsm");
 
-// Tests within /browser/components/preferences/in-content-old/tests/
+// Tests within /browser/components/preferences/in-content/tests/
 // test the "old" preferences organization, before it was reorganized.
 // Thus, all of these tests should revert back to the "oldOrganization"
 // before running.
 Services.prefs.setBoolPref("browser.preferences.useOldOrganization", true);
 registerCleanupFunction(function() {
   Services.prefs.clearUserPref("browser.preferences.useOldOrganization");
 });
 

rename from browser/components/preferences/in-content-old/tests/offline/manifest.appcache
rename to browser/components/preferences/in-content/tests/offline/manifest.appcache

rename from browser/components/preferences/in-content-old/tests/offline/offline.html
rename to browser/components/preferences/in-content/tests/offline/offline.html

rename from browser/components/preferences/in-content-old/tests/privacypane_tests_perwindow.js
rename to browser/components/preferences/in-content/tests/privacypane_tests_perwindow.js

rename from browser/components/preferences/in-content-old/tests/site_data_test.html
rename to browser/components/preferences/in-content/tests/site_data_test.html

rename from browser/components/preferences/in-content-old/tests/subdialog.xul
rename to browser/components/preferences/in-content/tests/subdialog.xul

rename from browser/components/preferences/in-content-old/tests/subdialog2.xul
rename to browser/components/preferences/in-content/tests/subdialog2.xul

--- a/browser/components/preferences/moz.build
+++ b/browser/components/preferences/moz.build
@@ -1,22 +1,22 @@
 # -*- 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/.
 
 DIRS += [
 	'in-content-new',
-	'in-content-old'
+	'in-content'
 ]
 
 BROWSER_CHROME_MANIFESTS += [
     'in-content-new/tests/browser.ini',
-    'in-content-old/tests/browser.ini'
+    'in-content/tests/browser.ini'
 ]
 
 for var in ('MOZ_APP_NAME', 'MOZ_MACBUNDLE_NAME'):
     DEFINES[var] = CONFIG[var]
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'gtk2', 'gtk3', 'cocoa'):
     DEFINES['HAVE_SHELL_SERVICE'] = 1
 

--- a/browser/installer/allowed-dupes.mn
+++ b/browser/installer/allowed-dupes.mn
@@ -6,26 +6,26 @@
 #
 
 # updater on osx is bug 1311194
 LaunchServices/org.mozilla.updater
 updater.app/Contents/MacOS/org.mozilla.updater
 updater.app/Contents/PkgInfo
 browser/chrome.manifest
 # browser preferences fork is bug 1349689
-browser/chrome/browser/content/browser/preferences/in-content-old/advanced.js
-browser/chrome/browser/content/browser/preferences/in-content-old/applications.js
-browser/chrome/browser/content/browser/preferences/in-content-old/containers.js
-browser/chrome/browser/content/browser/preferences/in-content-old/content.js
-browser/chrome/browser/content/browser/preferences/in-content-old/main.js
-browser/chrome/browser/content/browser/preferences/in-content-old/preferences.js
-browser/chrome/browser/content/browser/preferences/in-content-old/privacy.js
-browser/chrome/browser/content/browser/preferences/in-content-old/search.js
-browser/chrome/browser/content/browser/preferences/in-content-old/security.js
-browser/chrome/browser/content/browser/preferences/in-content-old/sync.js
+browser/chrome/browser/content/browser/preferences/in-content/advanced.js
+browser/chrome/browser/content/browser/preferences/in-content/applications.js
+browser/chrome/browser/content/browser/preferences/in-content/containers.js
+browser/chrome/browser/content/browser/preferences/in-content/content.js
+browser/chrome/browser/content/browser/preferences/in-content/main.js
+browser/chrome/browser/content/browser/preferences/in-content/preferences.js
+browser/chrome/browser/content/browser/preferences/in-content/privacy.js
+browser/chrome/browser/content/browser/preferences/in-content/search.js
+browser/chrome/browser/content/browser/preferences/in-content/security.js
+browser/chrome/browser/content/browser/preferences/in-content/sync.js
 browser/chrome/browser/content/browser/preferences/in-content-new/advanced.js
 browser/chrome/browser/content/browser/preferences/in-content-new/applications.js
 browser/chrome/browser/content/browser/preferences/in-content-new/containers.js
 browser/chrome/browser/content/browser/preferences/in-content-new/content.js
 browser/chrome/browser/content/browser/preferences/in-content-new/main.js
 browser/chrome/browser/content/browser/preferences/in-content-new/preferences.js
 browser/chrome/browser/content/browser/preferences/in-content-new/privacy.js
 browser/chrome/browser/content/browser/preferences/in-content-new/search.js
@@ -52,22 +52,22 @@ browser/chrome/en-US/locale/browser/pref
 browser/chrome/en-US/locale/browser/preferences/search.dtd
 browser/chrome/en-US/locale/browser/preferences/security.dtd
 browser/chrome/en-US/locale/browser/preferences/main.dtd
 browser/chrome/en-US/locale/browser/preferences/content.dtd
 browser/chrome/en-US/locale/browser/preferences/sync.dtd
 browser/chrome/en-US/locale/browser/preferences/privacy.dtd
 browser/chrome/en-US/locale/browser/preferences/advanced.dtd
 browser/chrome/en-US/locale/browser/preferences/preferences.properties
-browser/chrome/browser/skin/classic/browser/preferences/in-content-old/search.css
-browser/chrome/browser/skin/classic/browser/preferences/in-content-old/containers.css
-browser/chrome/browser/skin/classic/browser/preferences/in-content-old/favicon.ico
-browser/chrome/browser/skin/classic/browser/preferences/in-content-old/icons.svg
-browser/chrome/browser/skin/classic/browser/preferences/in-content-old/preferences.css
-browser/chrome/browser/skin/classic/browser/preferences/in-content-old/dialog.css
+browser/chrome/browser/skin/classic/browser/preferences/in-content/search.css
+browser/chrome/browser/skin/classic/browser/preferences/in-content/containers.css
+browser/chrome/browser/skin/classic/browser/preferences/in-content/favicon.ico
+browser/chrome/browser/skin/classic/browser/preferences/in-content/icons.svg
+browser/chrome/browser/skin/classic/browser/preferences/in-content/preferences.css
+browser/chrome/browser/skin/classic/browser/preferences/in-content/dialog.css
 browser/chrome/browser/skin/classic/browser/preferences/in-content-new/search.css
 browser/chrome/browser/skin/classic/browser/preferences/in-content-new/containers.css
 browser/chrome/browser/skin/classic/browser/preferences/in-content-new/favicon.ico
 browser/chrome/browser/skin/classic/browser/preferences/in-content-new/icons.svg
 browser/chrome/browser/skin/classic/browser/preferences/in-content-new/preferences.css
 browser/chrome/browser/skin/classic/browser/preferences/in-content-new/dialog.css
 # browser branding / themes is bug 1313106
 browser/chrome/browser/content/branding/icon128.png

--- a/browser/themes/linux/jar.mn
+++ b/browser/themes/linux/jar.mn
@@ -60,19 +60,19 @@ browser.jar:
   skin/classic/browser/places/organizer.xml           (places/organizer.xml)
   skin/classic/browser/places/query.png               (places/query.png)
   skin/classic/browser/places/tag.png                 (places/tag.png)
   skin/classic/browser/places/toolbarDropMarker.png   (places/toolbarDropMarker.png)
   skin/classic/browser/places/unsortedBookmarks.png   (places/unsortedBookmarks.png)
   skin/classic/browser/places/downloads.png           (places/downloads.png)
   skin/classic/browser/preferences/alwaysAsk.png      (preferences/alwaysAsk.png)
   skin/classic/browser/preferences/preferences.css    (preferences/preferences.css)
-* skin/classic/browser/preferences/in-content-old/preferences.css (preferences/in-content-old/preferences.css)
+* skin/classic/browser/preferences/in-content/preferences.css (preferences/in-content/preferences.css)
 * skin/classic/browser/preferences/in-content-new/preferences.css     (preferences/in-content-new/preferences.css)
-* skin/classic/browser/preferences/in-content-old/dialog.css      (preferences/in-content-old/dialog.css)
+* skin/classic/browser/preferences/in-content/dialog.css      (preferences/in-content/dialog.css)
 * skin/classic/browser/preferences/in-content-new/dialog.css          (preferences/in-content-new/dialog.css)
   skin/classic/browser/preferences/applications.css   (preferences/applications.css)
   skin/classic/browser/social/services-16.png         (social/services-16.png)
   skin/classic/browser/social/services-64.png         (social/services-64.png)
   skin/classic/browser/tabbrowser/alltabs.png         (tabbrowser/alltabs.png)
   skin/classic/browser/tabbrowser/alltabs-inverted.png (tabbrowser/alltabs-inverted.png)
   skin/classic/browser/tabbrowser/newtab.svg                (tabbrowser/newtab.svg)
   skin/classic/browser/tabbrowser/newtab-inverted.svg       (tabbrowser/newtab-inverted.svg)

rename from browser/themes/linux/preferences/in-content-old/dialog.css
rename to browser/themes/linux/preferences/in-content/dialog.css

rename from browser/themes/linux/preferences/in-content-old/preferences.css
rename to browser/themes/linux/preferences/in-content/preferences.css

--- a/browser/themes/osx/jar.mn
+++ b/browser/themes/osx/jar.mn
@@ -93,19 +93,19 @@ browser.jar:
   skin/classic/browser/places/tag.png                       (places/tag.png)
   skin/classic/browser/places/tag@2x.png                    (places/tag@2x.png)
   skin/classic/browser/places/downloads.png                 (places/downloads.png)
   skin/classic/browser/places/livemark-item.png             (places/livemark-item.png)
   skin/classic/browser/preferences/alwaysAsk.png            (preferences/alwaysAsk.png)
   skin/classic/browser/preferences/application.png          (preferences/application.png)
   skin/classic/browser/preferences/saveFile.png             (preferences/saveFile.png)
 * skin/classic/browser/preferences/preferences.css          (preferences/preferences.css)
-* skin/classic/browser/preferences/in-content-old/preferences.css (preferences/in-content-old/preferences.css)
+* skin/classic/browser/preferences/in-content/preferences.css (preferences/in-content/preferences.css)
 * skin/classic/browser/preferences/in-content-new/preferences.css     (preferences/in-content-new/preferences.css)
-* skin/classic/browser/preferences/in-content-old/dialog.css      (preferences/in-content-old/dialog.css)
+* skin/classic/browser/preferences/in-content/dialog.css      (preferences/in-content/dialog.css)
 * skin/classic/browser/preferences/in-content-new/dialog.css          (preferences/in-content-new/dialog.css)
   skin/classic/browser/preferences/applications.css         (preferences/applications.css)
   skin/classic/browser/social/services-16.png               (social/services-16.png)
   skin/classic/browser/social/services-16@2x.png            (social/services-16@2x.png)
   skin/classic/browser/social/services-64.png               (social/services-64.png)
   skin/classic/browser/social/services-64@2x.png            (social/services-64@2x.png)
   skin/classic/browser/tabbrowser/alltabs-box-bkgnd-icon.png             (tabbrowser/alltabs-box-bkgnd-icon.png)
   skin/classic/browser/tabbrowser/alltabs-box-bkgnd-icon@2x.png          (tabbrowser/alltabs-box-bkgnd-icon@2x.png)

rename from browser/themes/osx/preferences/in-content-old/dialog.css
rename to browser/themes/osx/preferences/in-content/dialog.css

rename from browser/themes/osx/preferences/in-content-old/preferences.css
rename to browser/themes/osx/preferences/in-content/preferences.css

--- a/browser/themes/shared/incontentprefs-old/preferences.inc.css
+++ b/browser/themes/shared/incontentprefs-old/preferences.inc.css
@@ -65,45 +65,45 @@ treecol {
  * preferences.js, so use collapse instead of display: none; if it's hidden
  */
 #categories > .category[hidden="true"] {
   display: -moz-box;
   visibility: collapse;
 }
 
 #category-general > .category-icon {
-  list-style-image: url("chrome://browser/skin/preferences/in-content-old/icons.svg#general");
+  list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#general");
 }
 
 #category-search > .category-icon {
-  list-style-image: url("chrome://browser/skin/preferences/in-content-old/icons.svg#search");
+  list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#search");
 }
 
 #category-content > .category-icon {
-  list-style-image: url("chrome://browser/skin/preferences/in-content-old/icons.svg#content");
+  list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#content");
 }
 
 #category-application > .category-icon {
-  list-style-image: url("chrome://browser/skin/preferences/in-content-old/icons.svg#applications");
+  list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#applications");
 }
 
 #category-privacy > .category-icon {
-  list-style-image: url("chrome://browser/skin/preferences/in-content-old/icons.svg#privacy");
+  list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#privacy");
 }
 
 #category-security > .category-icon {
-  list-style-image: url("chrome://browser/skin/preferences/in-content-old/icons.svg#security");
+  list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#security");
 }
 
 #category-sync > .category-icon {
-  list-style-image: url("chrome://browser/skin/preferences/in-content-old/icons.svg#sync");
+  list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#sync");
 }
 
 #category-advanced > .category-icon {
-  list-style-image: url("chrome://browser/skin/preferences/in-content-old/icons.svg#advanced");
+  list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#advanced");
 }
 
 @media (max-width: 800px) {
   .category-name {
     display: none;
   }
 }
 

--- a/browser/themes/shared/jar.inc.mn
+++ b/browser/themes/shared/jar.inc.mn
@@ -74,20 +74,20 @@
   skin/classic/browser/newtab/close.png                        (../shared/newtab/close.png)
   skin/classic/browser/newtab/controls.svg                     (../shared/newtab/controls.svg)
   skin/classic/browser/panel-icons.svg                         (../shared/panel-icons.svg)
   skin/classic/browser/preferences/in-content-new/favicon.ico      (../shared/incontentprefs/favicon.ico)
   skin/classic/browser/preferences/in-content-new/icons.svg        (../shared/incontentprefs/icons.svg)
   skin/classic/browser/preferences/in-content-new/search.css       (../shared/incontentprefs/search.css)
   skin/classic/browser/preferences/in-content-new/siteDataSettings.css (../shared/incontentprefs/siteDataSettings.css)
 * skin/classic/browser/preferences/in-content-new/containers.css   (../shared/incontentprefs/containers.css)
-  skin/classic/browser/preferences/in-content-old/favicon.ico      (../shared/incontentprefs-old/favicon.ico)
-  skin/classic/browser/preferences/in-content-old/icons.svg        (../shared/incontentprefs-old/icons.svg)
-  skin/classic/browser/preferences/in-content-old/search.css       (../shared/incontentprefs-old/search.css)
-* skin/classic/browser/preferences/in-content-old/containers.css   (../shared/incontentprefs-old/containers.css)
+  skin/classic/browser/preferences/in-content/favicon.ico      (../shared/incontentprefs-old/favicon.ico)
+  skin/classic/browser/preferences/in-content/icons.svg        (../shared/incontentprefs-old/icons.svg)
+  skin/classic/browser/preferences/in-content/search.css       (../shared/incontentprefs-old/search.css)
+* skin/classic/browser/preferences/in-content/containers.css   (../shared/incontentprefs-old/containers.css)
 * skin/classic/browser/preferences/containers.css              (../shared/preferences/containers.css)
   skin/classic/browser/fxa/default-avatar.svg                  (../shared/fxa/default-avatar.svg)
   skin/classic/browser/fxa/logo.png                            (../shared/fxa/logo.png)
   skin/classic/browser/fxa/logo@2x.png                         (../shared/fxa/logo@2x.png)
   skin/classic/browser/fxa/sync-illustration.svg               (../shared/fxa/sync-illustration.svg)
   skin/classic/browser/fxa/android.png                         (../shared/fxa/android.png)
   skin/classic/browser/fxa/android@2x.png                      (../shared/fxa/android@2x.png)
   skin/classic/browser/fxa/ios.png                             (../shared/fxa/ios.png)

--- a/browser/themes/windows/jar.mn
+++ b/browser/themes/windows/jar.mn
@@ -87,19 +87,19 @@ browser.jar:
   skin/classic/browser/places/allBookmarks.png                 (places/allBookmarks.png)
   skin/classic/browser/places/unsortedBookmarks.png            (places/unsortedBookmarks.png)
   skin/classic/browser/places/downloads.png                    (places/downloads.png)
   skin/classic/browser/places/livemark-item.png                (places/livemark-item.png)
   skin/classic/browser/preferences/alwaysAsk.png               (preferences/alwaysAsk.png)
   skin/classic/browser/preferences/application.png             (preferences/application.png)
   skin/classic/browser/preferences/saveFile.png                (preferences/saveFile.png)
   skin/classic/browser/preferences/preferences.css             (preferences/preferences.css)
-* skin/classic/browser/preferences/in-content-old/preferences.css  (preferences/in-content-old/preferences.css)
+* skin/classic/browser/preferences/in-content/preferences.css  (preferences/in-content/preferences.css)
 * skin/classic/browser/preferences/in-content-new/preferences.css      (preferences/in-content-new/preferences.css)
-* skin/classic/browser/preferences/in-content-old/dialog.css       (preferences/in-content-old/dialog.css)
+* skin/classic/browser/preferences/in-content/dialog.css       (preferences/in-content/dialog.css)
 * skin/classic/browser/preferences/in-content-new/dialog.css           (preferences/in-content-new/dialog.css)
   skin/classic/browser/preferences/applications.css            (preferences/applications.css)
   skin/classic/browser/social/services-16.png                  (social/services-16.png)
   skin/classic/browser/social/services-64.png                  (social/services-64.png)
   skin/classic/browser/tabbrowser/newtab.svg                   (tabbrowser/newtab.svg)
   skin/classic/browser/tabbrowser/newtab-win7.svg          (tabbrowser/newtab-win7.svg)
   skin/classic/browser/tabbrowser/newtab-inverted.svg          (tabbrowser/newtab-inverted.svg)
   skin/classic/browser/tabbrowser/newtab-inverted-win7.svg (tabbrowser/newtab-inverted-win7.svg)

rename from browser/themes/windows/preferences/in-content-old/dialog.css
rename to browser/themes/windows/preferences/in-content/dialog.css

rename from browser/themes/windows/preferences/in-content-old/preferences.css
rename to browser/themes/windows/preferences/in-content/preferences.css
--- a/browser/themes/windows/preferences/in-content-old/preferences.css
+++ b/browser/themes/windows/preferences/in-content/preferences.css
@@ -1,45 +1,45 @@
 /* - 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/. */
 
 %include ../../../shared/incontentprefs-old/preferences.inc.css
 
 @media (-moz-windows-default-theme: 0) {
   #category-general > .category-icon {
-    list-style-image: url("chrome://browser/skin/preferences/in-content-old/icons.svg#general-native");
+    list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#general-native");
   }
 
   #category-search > .category-icon {
-    list-style-image: url("chrome://browser/skin/preferences/in-content-old/icons.svg#search-native");
+    list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#search-native");
   }
 
   #category-content > .category-icon {
-    list-style-image: url("chrome://browser/skin/preferences/in-content-old/icons.svg#content-native");
+    list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#content-native");
   }
 
   #category-application > .category-icon {
-    list-style-image: url("chrome://browser/skin/preferences/in-content-old/icons.svg#applications-native");
+    list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#applications-native");
   }
 
   #category-privacy > .category-icon {
-    list-style-image: url("chrome://browser/skin/preferences/in-content-old/icons.svg#privacy-native");
+    list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#privacy-native");
   }
 
   #category-security > .category-icon {
-    list-style-image: url("chrome://browser/skin/preferences/in-content-old/icons.svg#security-native");
+    list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#security-native");
   }
 
   #category-sync > .category-icon {
-    list-style-image: url("chrome://browser/skin/preferences/in-content-old/icons.svg#sync-native");
+    list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#sync-native");
   }
 
   #category-advanced > .category-icon {
-    list-style-image: url("chrome://browser/skin/preferences/in-content-old/icons.svg#advanced-native");
+    list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#advanced-native");
   }
 }
 
 .actionsMenu > .menulist-label-box > .menulist-icon {
   margin-inline-end: 9px;
 }
 
 textbox + button,