--- a/browser/components/places/content/places.js
+++ b/browser/components/places/content/places.js
@@ -36,17 +36,17 @@ var PlacesOrganizer = {
     "editBMPanel_keywordRow",
   ],
 
   _initFolderTree() {
     var leftPaneRoot = PlacesUIUtils.leftPaneFolderId;
     this._places.place = "place:excludeItems=1&expandQueries=0&folder=" + leftPaneRoot;
   },
 
-  selectLeftPaneQuery: function PO_selectLeftPaneQuery(aQueryName) {
+  selectLeftPaneBuiltIn(aQueryName) {
     var itemId = PlacesUIUtils.leftPaneQueries[aQueryName];
     this._places.selectItems([itemId]);
     // Forcefully expand all-bookmarks
     if (aQueryName == "AllBookmarks" || aQueryName == "History")
       PlacesUtils.asContainer(this._places.selectedNode).containerOpen = true;
   },
 
   /**
@@ -72,17 +72,17 @@ var PlacesOrganizer = {
         switch (typeof container) {
           case "number":
             this._places.selectItems([container], false);
             break;
           case "string":
             if (container.substr(0, 6) == "place:")
               this._places.selectPlaceURI(container);
             else if (container in PlacesUIUtils.leftPaneQueries)
-              this.selectLeftPaneQuery(container);
+              this.selectLeftPaneBuiltIn(container);
             else
               throw new Error("Invalid container found: " + container);
             break;
           default:
             throw new Error("Invalid container type found: " + container);
         }
         PlacesUtils.asContainer(this._places.selectedNode).containerOpen = true;
       }

--- a/browser/components/places/tests/browser/browser_0_library_left_pane_migration.js
+++ b/browser/components/places/tests/browser/browser_0_library_left_pane_migration.js
@@ -73,15 +73,15 @@ add_task(async function() {
 
   // Check version has been upgraded.
   version = PlacesUtils.annotations.getItemAnnotation(leftPaneRoot,
                                                       PlacesUIUtils.ORGANIZER_FOLDER_ANNO);
   is(version, PlacesUIUtils.ORGANIZER_LEFTPANE_VERSION,
      "Left pane version has been correctly upgraded");
 
   // Check left pane is populated.
-  organizer.PlacesOrganizer.selectLeftPaneQuery("History");
+  organizer.PlacesOrganizer.selectLeftPaneBuiltIn("History");
   is(organizer.PlacesOrganizer._places.selectedNode.itemId,
      PlacesUIUtils.leftPaneQueries.History,
      "Library left pane is populated and working");
 
   await promiseLibraryClosed(organizer);
 });

--- a/browser/components/places/tests/browser/browser_bookmarkProperties_editTagContainer.js
+++ b/browser/components/places/tests/browser/browser_bookmarkProperties_editTagContainer.js
@@ -14,17 +14,17 @@ add_task(async function() {
   PlacesUtils.tagging.tagURI(uri, ["tag1"]);
 
   let library = await promiseLibrary();
   let PlacesOrganizer = library.PlacesOrganizer;
   registerCleanupFunction(async function() {
     await promiseLibraryClosed(library);
   });
 
-  PlacesOrganizer.selectLeftPaneQuery("Tags");
+  PlacesOrganizer.selectLeftPaneBuiltIn("Tags");
   let tree = PlacesOrganizer._places;
   let tagsContainer = tree.selectedNode;
   tagsContainer.containerOpen = true;
   let fooTag = tagsContainer.getChild(0);
   let tagNode = fooTag;
   tree.selectNode(fooTag);
   Assert.equal(tagNode.title, "tag1", "tagNode title is correct");
 

--- a/browser/components/places/tests/browser/browser_copy_query_without_tree.js
+++ b/browser/components/places/tests/browser/browser_copy_query_without_tree.js
@@ -12,51 +12,51 @@ add_task(async function copy_toolbar_sho
 
   let library = await promiseLibrary();
 
   registerCleanupFunction(function() {
     library.close();
     PlacesUtils.bookmarks.removeFolderChildren(PlacesUtils.unfiledBookmarksFolderId);
   });
 
-  library.PlacesOrganizer.selectLeftPaneQuery("BookmarksToolbar");
+  library.PlacesOrganizer.selectLeftPaneBuiltIn("BookmarksToolbar");
 
   await promiseClipboard(function() { library.PlacesOrganizer._places.controller.copy(); },
                          PlacesUtils.TYPE_X_MOZ_PLACE);
 
-  library.PlacesOrganizer.selectLeftPaneQuery("UnfiledBookmarks");
+  library.PlacesOrganizer.selectLeftPaneBuiltIn("UnfiledBookmarks");
 
   await library.ContentTree.view.controller.paste();
 
   let toolbarCopyNode = library.ContentTree.view.view.nodeForTreeIndex(0);
   is(toolbarCopyNode.type,
      Ci.nsINavHistoryResultNode.RESULT_TYPE_FOLDER_SHORTCUT,
      "copy is still a folder shortcut");
 
   PlacesUtils.bookmarks.removeItem(toolbarCopyNode.itemId);
-  library.PlacesOrganizer.selectLeftPaneQuery("BookmarksToolbar");
+  library.PlacesOrganizer.selectLeftPaneBuiltIn("BookmarksToolbar");
   is(library.PlacesOrganizer._places.selectedNode.type,
      Ci.nsINavHistoryResultNode.RESULT_TYPE_FOLDER_SHORTCUT,
      "original is still a folder shortcut");
 });
 
 add_task(async function copy_history_query() {
   let library = await promiseLibrary();
 
-  library.PlacesOrganizer.selectLeftPaneQuery("History");
+  library.PlacesOrganizer.selectLeftPaneBuiltIn("History");
 
   await promiseClipboard(function() { library.PlacesOrganizer._places.controller.copy(); },
                          PlacesUtils.TYPE_X_MOZ_PLACE);
 
-  library.PlacesOrganizer.selectLeftPaneQuery("UnfiledBookmarks");
+  library.PlacesOrganizer.selectLeftPaneBuiltIn("UnfiledBookmarks");
   await library.ContentTree.view.controller.paste();
 
   let historyCopyNode = library.ContentTree.view.view.nodeForTreeIndex(0);
   is(historyCopyNode.type,
      Ci.nsINavHistoryResultNode.RESULT_TYPE_QUERY,
      "copy is still a query");
 
   PlacesUtils.bookmarks.removeItem(historyCopyNode.itemId);
-  library.PlacesOrganizer.selectLeftPaneQuery("History");
+  library.PlacesOrganizer.selectLeftPaneBuiltIn("History");
   is(library.PlacesOrganizer._places.selectedNode.type,
      Ci.nsINavHistoryResultNode.RESULT_TYPE_QUERY,
      "original is still a query");
 });

--- a/browser/components/places/tests/browser/browser_cutting_bookmarks.js
+++ b/browser/components/places/tests/browser/browser_cutting_bookmarks.js
@@ -41,28 +41,28 @@ add_task(async function() {
   await selectBookmarksIn(organizer, bookmarks, "BookmarksToolbar");
 
   await promiseClipboard(() => {
     info("Cutting selection");
     ContentTree.view.controller.cut();
   }, PlacesUtils.TYPE_X_MOZ_PLACE);
 
   info("Selecting UnfiledBookmarks in the left pane");
-  PlacesOrganizer.selectLeftPaneQuery("UnfiledBookmarks");
+  PlacesOrganizer.selectLeftPaneBuiltIn("UnfiledBookmarks");
   info("Pasting clipboard");
   await ContentTree.view.controller.paste();
 
   await selectBookmarksIn(organizer, bookmarks, "UnfiledBookmarks");
 });
 
 var selectBookmarksIn = async function(organizer, bookmarks, aLeftPaneQuery) {
   let PlacesOrganizer = organizer.PlacesOrganizer;
   let ContentTree = organizer.ContentTree;
   info("Selecting " + aLeftPaneQuery + " in the left pane");
-  PlacesOrganizer.selectLeftPaneQuery(aLeftPaneQuery);
+  PlacesOrganizer.selectLeftPaneBuiltIn(aLeftPaneQuery);
 
   for (let {guid} of bookmarks) {
     let bookmark = await PlacesUtils.bookmarks.fetch(guid);
     is(bookmark.parentGuid, PlacesUtils.getConcreteItemGuid(PlacesOrganizer._places.selectedNode),
         "Bookmark has the right parent");
   }
 
   info("Selecting the bookmarks in the right pane");

--- a/browser/components/places/tests/browser/browser_forgetthissite_single.js
+++ b/browser/components/places/tests/browser/browser_forgetthissite_single.js
@@ -26,17 +26,17 @@ add_task(async function() {
   // Cleanup.
   await PlacesTestUtils.clearHistory();
 });
 
 var testForgetThisSiteVisibility = async function(selectionCount) {
   let organizer = await promiseLibrary();
 
   // Select History in the left pane.
-  organizer.PlacesOrganizer.selectLeftPaneQuery("History");
+  organizer.PlacesOrganizer.selectLeftPaneBuiltIn("History");
   let PO = organizer.PlacesOrganizer;
   let histContainer = PO._places.selectedNode.QueryInterface(Ci.nsINavHistoryContainerResultNode);
   histContainer.containerOpen = true;
   PO._places.selectNode(histContainer.getChild(0));
 
   // Select the first history entry.
   let doc = organizer.document;
   let tree = doc.getElementById("placeContent");

--- a/browser/components/places/tests/browser/browser_library_batch_delete.js
+++ b/browser/components/places/tests/browser/browser_library_batch_delete.js
@@ -39,17 +39,17 @@ add_task(async function test_create_and_
                                              PlacesUtils.bookmarks.DEFAULT_INDEX,
                                              "bm" + i);
       }
     }
   }, null);
 
   // Select and open the left pane "History" query.
   let PO = gLibrary.PlacesOrganizer;
-  PO.selectLeftPaneQuery("UnfiledBookmarks");
+  PO.selectLeftPaneBuiltIn("UnfiledBookmarks");
   Assert.notEqual(PO._places.selectedNode, null, "Selected unsorted bookmarks");
 
   let unsortedNode = PlacesUtils.asContainer(PO._places.selectedNode);
   unsortedNode.containerOpen = true;
   Assert.equal(unsortedNode.childCount, 2, "Unsorted node has 2 children");
   let folderNode = unsortedNode.getChild(0);
   Assert.equal(folderNode.title, "deleteme", "Folder found in unsorted bookmarks");
   // Check delete command is available.
@@ -71,18 +71,18 @@ add_task(async function test_create_and_
   Assert.equal(PO._places.selectedNode.title, "keepme", "Folder node selected");
   unsortedNode.containerOpen = false;
 });
 
 add_task(async function test_ensure_correct_selection_and_functionality() {
   let PO = gLibrary.PlacesOrganizer;
   let ContentTree = gLibrary.ContentTree;
   // Move selection forth and back.
-  PO.selectLeftPaneQuery("History");
-  PO.selectLeftPaneQuery("UnfiledBookmarks");
+  PO.selectLeftPaneBuiltIn("History");
+  PO.selectLeftPaneBuiltIn("UnfiledBookmarks");
   // Now select the "keepme" folder in the right pane and delete it.
   ContentTree.view.selectNode(ContentTree.view.result.root.getChild(0));
   Assert.equal(ContentTree.view.selectedNode.title, "keepme",
     "Found folder in content pane");
   // Test live update.
   PlacesUtils.bookmarks.insertBookmark(PlacesUtils.unfiledBookmarksFolderId,
                                        makeURI(TEST_URL),
                                        PlacesUtils.bookmarks.DEFAULT_INDEX,

--- a/browser/components/places/tests/browser/browser_library_commands.js
+++ b/browser/components/places/tests/browser/browser_library_commands.js
@@ -19,17 +19,17 @@ add_task(async function test_date_contai
   let library = await promiseLibrary();
   info("Ensure date containers under History cannot be cut but can be deleted");
 
   await PlacesTestUtils.addVisits(TEST_URI);
 
   // Select and open the left pane "History" query.
   let PO = library.PlacesOrganizer;
 
-  PO.selectLeftPaneQuery("History");
+  PO.selectLeftPaneBuiltIn("History");
   isnot(PO._places.selectedNode, null, "We correctly selected History");
 
   // Check that both delete and cut commands are disabled, cause this is
   // a child of the left pane folder.
   ok(PO._places.controller.isCommandEnabled("cmd_copy"),
      "Copy command is enabled");
   ok(!PO._places.controller.isCommandEnabled("cmd_cut"),
      "Cut command is disabled");
@@ -76,17 +76,17 @@ add_task(async function test_date_contai
 
 add_task(async function test_query_on_toolbar() {
   let library = await promiseLibrary();
   info("Ensure queries can be cut or deleted");
 
   // Select and open the left pane "Bookmarks Toolbar" folder.
   let PO = library.PlacesOrganizer;
 
-  PO.selectLeftPaneQuery("BookmarksToolbar");
+  PO.selectLeftPaneBuiltIn("BookmarksToolbar");
   isnot(PO._places.selectedNode, null, "We have a valid selection");
   is(PlacesUtils.getConcreteItemId(PO._places.selectedNode),
      PlacesUtils.toolbarFolderId,
      "We have correctly selected bookmarks toolbar node.");
 
   // Check that both cut and delete commands are disabled, cause this is a child
   // of AllBookmarksFolderId.
   ok(PO._places.controller.isCommandEnabled("cmd_copy"),
@@ -145,17 +145,17 @@ add_task(async function test_search_cont
                                        index: 0 });
 
   let library = await promiseLibrary();
   info("Ensure query contents can be cut or deleted");
 
   // Select and open the left pane "Bookmarks Toolbar" folder.
   let PO = library.PlacesOrganizer;
 
-  PO.selectLeftPaneQuery("BookmarksToolbar");
+  PO.selectLeftPaneBuiltIn("BookmarksToolbar");
   isnot(PO._places.selectedNode, null, "We have a valid selection");
   is(PlacesUtils.getConcreteItemId(PO._places.selectedNode),
      PlacesUtils.toolbarFolderId,
      "We have correctly selected bookmarks toolbar node.");
 
   let searchBox = library.document.getElementById("searchFilter");
   searchBox.value = "example";
   library.PlacesSearchBox.search(searchBox.value);
@@ -183,17 +183,17 @@ add_task(async function test_tags() {
   PlacesUtils.tagging.tagURI(NetUtil.newURI("http://example.com/"), ["test"]);
 
   let library = await promiseLibrary();
   info("Ensure query contents can be cut or deleted");
 
   // Select and open the left pane "Bookmarks Toolbar" folder.
   let PO = library.PlacesOrganizer;
 
-  PO.selectLeftPaneQuery("Tags");
+  PO.selectLeftPaneBuiltIn("Tags");
   let tagsNode = PO._places.selectedNode;
   isnot(tagsNode, null, "We have a valid selection");
   let tagsTitle = PlacesUtils.getString("TagsFolderTitle");
   is(tagsNode.title, tagsTitle,
      "Tags has been properly selected");
 
   // Check that both cut and delete commands are disabled.
   ok(PO._places.controller.isCommandEnabled("cmd_copy"),

--- a/browser/components/places/tests/browser/browser_library_delete_bookmarks_in_tags.js
+++ b/browser/components/places/tests/browser/browser_library_delete_bookmarks_in_tags.js
@@ -40,17 +40,17 @@ add_task(async function test_tags() {
     PlacesUtils.tagging.tagURI(uris[i], ["test"]);
   }
 
   let library = await promiseLibrary();
 
   // Select and open the left pane "Bookmarks Toolbar" folder.
   let PO = library.PlacesOrganizer;
 
-  PO.selectLeftPaneQuery("Tags");
+  PO.selectLeftPaneBuiltIn("Tags");
   let tagsNode = PO._places.selectedNode;
   Assert.notEqual(tagsNode, null, "Should have a valid selection");
   let tagsTitle = PlacesUtils.getString("TagsFolderTitle");
   Assert.equal(tagsNode.title, tagsTitle,
                "Should have selected the Tags node");
 
   // Now select the tag.
   PlacesUtils.asContainer(tagsNode).containerOpen = true;

--- a/browser/components/places/tests/browser/browser_library_delete_tags.js
+++ b/browser/components/places/tests/browser/browser_library_delete_tags.js
@@ -23,17 +23,17 @@ add_task(async function test_tags() {
                                        index: 0 });
   PlacesUtils.tagging.tagURI(TEST_URI, ["test"]);
 
   let library = await promiseLibrary();
 
   // Select and open the left pane "Bookmarks Toolbar" folder.
   let PO = library.PlacesOrganizer;
 
-  PO.selectLeftPaneQuery("Tags");
+  PO.selectLeftPaneBuiltIn("Tags");
   let tagsNode = PO._places.selectedNode;
   Assert.notEqual(tagsNode, null, "Should have a valid selection");
   let tagsTitle = PlacesUtils.getString("TagsFolderTitle");
   Assert.equal(tagsNode.title, tagsTitle,
                "Should have selected the Tags node");
 
   // Now select the tag.
   PlacesUtils.asContainer(tagsNode).containerOpen = true;

--- a/browser/components/places/tests/browser/browser_library_infoBox.js
+++ b/browser/components/places/tests/browser/browser_library_infoBox.js
@@ -20,26 +20,26 @@ add_task(async function() {
   info("Bug 430148 - Remove or hide the more/less button in details pane...");
   let PO = gLibrary.PlacesOrganizer;
   let ContentTree = gLibrary.ContentTree;
   let infoBoxExpanderWrapper = getAndCheckElmtById("infoBoxExpanderWrapper");
 
   await PlacesTestUtils.addVisits("http://www.mozilla.org/");
 
   // open all bookmarks node
-  PO.selectLeftPaneQuery("AllBookmarks");
+  PO.selectLeftPaneBuiltIn("AllBookmarks");
   isnot(PO._places.selectedNode, null,
         "Correctly selected all bookmarks node.");
   checkInfoBoxSelected();
   ok(infoBoxExpanderWrapper.hidden,
       "Expander button is hidden for all bookmarks node.");
   checkAddInfoFieldsCollapsed(PO);
 
   // open history node
-  PO.selectLeftPaneQuery("History");
+  PO.selectLeftPaneBuiltIn("History");
   isnot(PO._places.selectedNode, null, "Correctly selected history node.");
   checkInfoBoxSelected();
   ok(infoBoxExpanderWrapper.hidden,
       "Expander button is hidden for history node.");
   checkAddInfoFieldsCollapsed(PO);
 
   // open history child node
   var historyNode = PO._places.selectedNode.
@@ -59,17 +59,17 @@ add_task(async function() {
   view.selection.select(0);
   ok(infoBoxExpanderWrapper.hidden,
       "Expander button is hidden for history item.");
   checkAddInfoFieldsCollapsed(PO);
 
   historyNode.containerOpen = false;
 
   // open bookmarks menu node
-  PO.selectLeftPaneQuery("BookmarksMenu");
+  PO.selectLeftPaneBuiltIn("BookmarksMenu");
   isnot(PO._places.selectedNode, null,
         "Correctly selected bookmarks menu node.");
   checkInfoBoxSelected();
   ok(infoBoxExpanderWrapper.hidden,
       "Expander button is hidden for bookmarks menu node.");
   checkAddInfoFieldsCollapsed(PO);
 
   // open recently bookmarked node
@@ -152,9 +152,8 @@ function checkAddInfoFieldsNotCollapsed(
      `Some additional info field should not be collapsed.`);
 }
 
 function getAndCheckElmtById(id) {
   var elmt = gLibrary.document.getElementById(id);
   isnot(elmt, null, "Correctly got element: #" + id);
   return elmt;
 }
-

--- a/browser/components/places/tests/browser/browser_library_left_pane_middleclick.js
+++ b/browser/components/places/tests/browser/browser_library_left_pane_middleclick.js
@@ -17,17 +17,17 @@ add_task(async function test_setup() {
     ["places.history.enabled", false]
   ]});
 
   // Open Library window.
   gLibrary = await promiseLibrary();
 
   registerCleanupFunction(async () => {
     // We must close "Other Bookmarks" ready for other tests.
-    gLibrary.PlacesOrganizer.selectLeftPaneQuery("UnfiledBookmarks");
+    gLibrary.PlacesOrganizer.selectLeftPaneBuiltIn("UnfiledBookmarks");
     gLibrary.PlacesOrganizer._places.selectedNode.containerOpen = false;
 
     await PlacesUtils.bookmarks.eraseEverything();
 
     // Close Library window.
     await promiseLibraryClosed(gLibrary);
   });
 });
@@ -46,17 +46,17 @@ add_task(async function test_open_folder
     children: [{
       title: "Folder",
       type: PlacesUtils.bookmarks.TYPE_FOLDER,
       children,
     }],
   });
 
   // Select unsorted bookmarks root in the left pane.
-  gLibrary.PlacesOrganizer.selectLeftPaneQuery("UnfiledBookmarks");
+  gLibrary.PlacesOrganizer.selectLeftPaneBuiltIn("UnfiledBookmarks");
   Assert.notEqual(gLibrary.PlacesOrganizer._places.selectedNode, null,
         "We correctly have selection in the Library left pane");
 
   // Get our bookmark in the right pane.
   var folderNode = gLibrary.ContentTree.view.view.nodeForTreeIndex(0);
   Assert.equal(folderNode.title, "Folder", "Found folder in the right pane");
 
   gLibrary.PlacesOrganizer._places.selectedNode.containerOpen = true;

--- a/browser/components/places/tests/browser/browser_library_middleclick.js
+++ b/browser/components/places/tests/browser/browser_library_middleclick.js
@@ -24,17 +24,17 @@ add_task(async function test_setup() {
   // Ensure the database is empty.
   await PlacesUtils.bookmarks.eraseEverything();
 
   // Open Library window.
   gLibrary = await promiseLibrary();
 
   registerCleanupFunction(async () => {
     // We must close "Other Bookmarks" ready for other tests.
-    gLibrary.PlacesOrganizer.selectLeftPaneQuery("UnfiledBookmarks");
+    gLibrary.PlacesOrganizer.selectLeftPaneBuiltIn("UnfiledBookmarks");
     gLibrary.PlacesOrganizer._places.selectedNode.containerOpen = false;
 
     await PlacesUtils.bookmarks.eraseEverything();
 
     // Close Library window.
     await promiseLibraryClosed(gLibrary);
   });
 });
@@ -48,17 +48,17 @@ gTests.push({
     // Add a new unsorted bookmark.
     this._bookmark = await PlacesUtils.bookmarks.insert({
       parentGuid: PlacesUtils.bookmarks.unfiledGuid,
       title: "Title",
       url: this.URIs[0],
     });
 
     // Select unsorted bookmarks root in the left pane.
-    gLibrary.PlacesOrganizer.selectLeftPaneQuery("UnfiledBookmarks");
+    gLibrary.PlacesOrganizer.selectLeftPaneBuiltIn("UnfiledBookmarks");
     Assert.notEqual(gLibrary.PlacesOrganizer._places.selectedNode, null,
       "We correctly have selection in the Library left pane");
 
     // Get our bookmark in the right pane.
     var bookmarkNode = gLibrary.ContentTree.view.view.nodeForTreeIndex(0);
     Assert.equal(bookmarkNode.uri, this.URIs[0], "Found bookmark in the right pane");
   },
 
@@ -89,17 +89,17 @@ gTests.push({
       children: [{
         title: "Folder",
         type: PlacesUtils.bookmarks.TYPE_FOLDER,
         children,
       }],
     });
 
     // Select unsorted bookmarks root in the left pane.
-    gLibrary.PlacesOrganizer.selectLeftPaneQuery("UnfiledBookmarks");
+    gLibrary.PlacesOrganizer.selectLeftPaneBuiltIn("UnfiledBookmarks");
     isnot(gLibrary.PlacesOrganizer._places.selectedNode, null,
           "We correctly have selection in the Library left pane");
     // Get our bookmark in the right pane.
     var folderNode = gLibrary.ContentTree.view.view.nodeForTreeIndex(0);
     is(folderNode.title, "Folder", "Found folder in the right pane");
   },
 
   async cleanup() {
@@ -144,20 +144,18 @@ gTests.push({
     var queryString = hs.queriesToQueryString([query], 1, options);
     this._query = await PlacesUtils.bookmarks.insert({
       index: 0, // it must be the first
       parentGuid: PlacesUtils.bookmarks.unfiledGuid,
       title: "Query",
       url: queryString,
     });
 
-    gLibrary.PlacesOrganizer.selectLeftPaneQuery("Query");
-
     // Select unsorted bookmarks root in the left pane.
-    gLibrary.PlacesOrganizer.selectLeftPaneQuery("UnfiledBookmarks");
+    gLibrary.PlacesOrganizer.selectLeftPaneBuiltIn("UnfiledBookmarks");
     isnot(gLibrary.PlacesOrganizer._places.selectedNode, null,
           "We correctly have selection in the Library left pane");
     // Get our bookmark in the right pane.
     var folderNode = gLibrary.ContentTree.view.view.nodeForTreeIndex(0);
     is(folderNode.title, "Query", "Found query in the right pane");
   },
 
   async cleanup() {

--- a/browser/components/places/tests/browser/browser_library_openFlatContainer.js
+++ b/browser/components/places/tests/browser/browser_library_openFlatContainer.js
@@ -22,17 +22,17 @@ add_task(async function() {
 
   let library = await promiseLibrary("AllBookmarks");
   registerCleanupFunction(async function() {
     await promiseLibraryClosed(library);
     await PlacesUtils.bookmarks.eraseEverything();
   });
 
   // Select unfiled later, to ensure it's closed.
-  library.PlacesOrganizer.selectLeftPaneQuery("UnfiledBookmarks");
+  library.PlacesOrganizer.selectLeftPaneBuiltIn("UnfiledBookmarks");
   ok(!library.PlacesOrganizer._places.selectedNode.containerOpen,
      "Unfiled container is closed");
 
   let folderNode = library.ContentTree.view.view.nodeForTreeIndex(0);
   is(folderNode.bookmarkGuid, bookmarks[0].guid,
      "Found the expected folder in the right pane");
   // Select the folder node in the right pane.
   library.ContentTree.view.selectNode(folderNode);

--- a/browser/components/places/tests/browser/browser_library_panel_leak.js
+++ b/browser/components/places/tests/browser/browser_library_panel_leak.js
@@ -24,17 +24,17 @@ function test() {
     isnot(contentTree, null, "Sanity check: placeContent tree should exist");
     isnot(organizer.PlacesOrganizer, null, "Sanity check: PlacesOrganizer should exist");
     isnot(organizer.gEditItemOverlay, null, "Sanity check: gEditItemOverlay should exist");
 
     ok(organizer.gEditItemOverlay.initialized, "gEditItemOverlay is initialized");
     isnot(organizer.gEditItemOverlay.itemId, -1, "Editing a bookmark");
 
     // Select History in the left pane.
-    organizer.PlacesOrganizer.selectLeftPaneQuery("History");
+    organizer.PlacesOrganizer.selectLeftPaneBuiltIn("History");
     // Select the first history entry.
     let selection = contentTree.view.selection;
     selection.clearSelection();
     selection.rangedSelect(0, 0, true);
     // Check the panel is editing the history entry.
     is(organizer.gEditItemOverlay.itemId, -1, "Editing an history entry");
     // Close Library window.
     organizer.close();

--- a/browser/components/places/tests/browser/browser_paste_bookmarks.js
+++ b/browser/components/places/tests/browser/browser_paste_bookmarks.js
@@ -19,33 +19,33 @@ add_task(async function setup() {
   });
 
   PlacesOrganizer = organizer.PlacesOrganizer;
   ContentTree = organizer.ContentTree;
 });
 
 add_task(async function paste() {
   info("Selecting BookmarksToolbar in the left pane");
-  PlacesOrganizer.selectLeftPaneQuery("BookmarksToolbar");
+  PlacesOrganizer.selectLeftPaneBuiltIn("BookmarksToolbar");
 
   let bookmark = await PlacesUtils.bookmarks.insert({
     parentGuid: PlacesUtils.bookmarks.toolbarGuid,
     url: TEST_URL,
     title: "0"
   });
 
   ContentTree.view.selectItems([bookmark.guid]);
 
   await promiseClipboard(() => {
     info("Cutting selection");
     ContentTree.view.controller.cut();
   }, PlacesUtils.TYPE_X_MOZ_PLACE);
 
   info("Selecting UnfiledBookmarks in the left pane");
-  PlacesOrganizer.selectLeftPaneQuery("UnfiledBookmarks");
+  PlacesOrganizer.selectLeftPaneBuiltIn("UnfiledBookmarks");
 
   info("Pasting clipboard");
   await ContentTree.view.controller.paste();
 
   let tree = await PlacesUtils.promiseBookmarksTree(PlacesUtils.bookmarks.unfiledGuid);
 
   Assert.equal(tree.children.length, 1,
                "Should be one bookmark in the unfiled folder.");
@@ -55,17 +55,17 @@ add_task(async function paste() {
                "Should have the correct URL");
 
   await PlacesUtils.bookmarks.remove(tree.children[0].guid);
 });
 
 
 add_task(async function paste_check_indexes() {
   info("Selecting BookmarksToolbar in the left pane");
-  PlacesOrganizer.selectLeftPaneQuery("BookmarksToolbar");
+  PlacesOrganizer.selectLeftPaneBuiltIn("BookmarksToolbar");
 
   let copyChildren = [];
   let targetChildren = [];
   for (let i = 0; i < 10; i++) {
     copyChildren.push({
       url: `${TEST_URL}${i}`,
       title: `Copy ${i}`
     });
@@ -93,17 +93,17 @@ add_task(async function paste_check_inde
   ]);
 
   await promiseClipboard(() => {
     info("Cutting multiple selection");
     ContentTree.view.controller.cut();
   }, PlacesUtils.TYPE_X_MOZ_PLACE);
 
   info("Selecting UnfiledBookmarks in the left pane");
-  PlacesOrganizer.selectLeftPaneQuery("UnfiledBookmarks");
+  PlacesOrganizer.selectLeftPaneBuiltIn("UnfiledBookmarks");
 
   ContentTree.view.selectItems([targetBookmarks[4].guid]);
 
   info("Pasting clipboard");
   await ContentTree.view.controller.paste();
 
   let tree = await PlacesUtils.promiseBookmarksTree(PlacesUtils.bookmarks.unfiledGuid);
 
@@ -132,17 +132,17 @@ add_task(async function paste_check_inde
                  `Should be the expected item at index ${i}`);
   }
 
   await PlacesUtils.bookmarks.eraseEverything();
 });
 
 add_task(async function paste_check_indexes_same_folder() {
   info("Selecting BookmarksToolbar in the left pane");
-  PlacesOrganizer.selectLeftPaneQuery("BookmarksToolbar");
+  PlacesOrganizer.selectLeftPaneBuiltIn("BookmarksToolbar");
 
   let copyChildren = [];
   for (let i = 0; i < 10; i++) {
     copyChildren.push({
       url: `${TEST_URL}${i}`,
       title: `Copy ${i}`
     });
   }
@@ -219,17 +219,17 @@ add_task(async function paste_from_diffe
 
   xferable.addDataFlavor(PlacesUtils.TYPE_X_MOZ_PLACE);
   xferable.setTransferData(PlacesUtils.TYPE_X_MOZ_PLACE, PlacesUtils.toISupportsString(data),
                            data.length * 2);
 
   Services.clipboard.setData(xferable, null, Ci.nsIClipboard.kGlobalClipboard);
 
   info("Selecting UnfiledBookmarks in the left pane");
-  PlacesOrganizer.selectLeftPaneQuery("UnfiledBookmarks");
+  PlacesOrganizer.selectLeftPaneBuiltIn("UnfiledBookmarks");
 
   info("Pasting clipboard");
   await ContentTree.view.controller.paste();
 
   let tree = await PlacesUtils.promiseBookmarksTree(PlacesUtils.bookmarks.unfiledGuid);
 
   Assert.equal(tree.children.length, 1,
                "Should be one bookmark in the unfiled folder.");

--- a/browser/components/places/tests/browser/browser_paste_into_tags.js
+++ b/browser/components/places/tests/browser/browser_paste_into_tags.js
@@ -41,17 +41,17 @@ add_task(async function() {
 
   let populate = () => copyHistNode(PlacesOrganizer, ContentTree);
   await promiseClipboard(populate, PlacesUtils.TYPE_X_MOZ_PLACE);
 
   focusTag(PlacesOrganizer);
   await PlacesOrganizer._places.controller.paste();
 
   // re-focus the history again
-  PlacesOrganizer.selectLeftPaneQuery("History");
+  PlacesOrganizer.selectLeftPaneBuiltIn("History");
   let histContainer = PlacesOrganizer._places.selectedNode;
   PlacesUtils.asContainer(histContainer);
   histContainer.containerOpen = true;
   PlacesOrganizer._places.selectNode(histContainer.getChild(0));
   let histNode = ContentTree.view.view.nodeForTreeIndex(0);
   ok(histNode, "histNode exists: " + histNode.title);
 
   // check to see if the history node is tagged!
@@ -62,17 +62,17 @@ add_task(async function() {
   let bookmarks = [];
   await PlacesUtils.bookmarks.fetch({url: MOZURISPEC}, bm => {
     bookmarks.push(bm);
   });
   ok(bookmarks.length > 0, "bookmark exists for the tagged history item");
 
   // is the bookmark visible in the UI?
   // get the Unsorted Bookmarks node
-  PlacesOrganizer.selectLeftPaneQuery("UnfiledBookmarks");
+  PlacesOrganizer.selectLeftPaneBuiltIn("UnfiledBookmarks");
 
   // now we can see what is in the ContentTree tree
   let unsortedNode = ContentTree.view.view.nodeForTreeIndex(1);
   ok(unsortedNode, "unsortedNode is not null: " + unsortedNode.uri);
   is(unsortedNode.uri, MOZURISPEC.spec, "node uri's are the same");
 
   await promiseLibraryClosed(organizer);
 
@@ -82,30 +82,30 @@ add_task(async function() {
   tags = PlacesUtils.tagging.getTagsForURI(TEST_URL);
   is(tags.length, 0, "tags are gone");
 
   await PlacesUtils.bookmarks.eraseEverything();
   await PlacesTestUtils.clearHistory();
 });
 
 function focusTag(PlacesOrganizer) {
-  PlacesOrganizer.selectLeftPaneQuery("Tags");
+  PlacesOrganizer.selectLeftPaneBuiltIn("Tags");
   let tags = PlacesOrganizer._places.selectedNode;
   tags.containerOpen = true;
   let fooTag = tags.getChild(0);
   let tagNode = fooTag;
   PlacesOrganizer._places.selectNode(fooTag);
   is(tagNode.title, "foo", "tagNode title is foo");
   let ip = PlacesOrganizer._places.insertionPoint;
   ok(ip.isTag, "IP is a tag");
 }
 
 function copyHistNode(PlacesOrganizer, ContentTree) {
   // focus the history object
-  PlacesOrganizer.selectLeftPaneQuery("History");
+  PlacesOrganizer.selectLeftPaneBuiltIn("History");
   let histContainer = PlacesOrganizer._places.selectedNode;
   PlacesUtils.asContainer(histContainer);
   histContainer.containerOpen = true;
   PlacesOrganizer._places.selectNode(histContainer.getChild(0));
   let histNode = ContentTree.view.view.nodeForTreeIndex(0);
   ContentTree.view.selectNode(histNode);
   is(histNode.uri, MOZURISPEC.spec,
      "historyNode exists: " + histNode.uri);