--- a/devtools/client/framework/test/browser_toolbox_view_source_01.js
+++ b/devtools/client/framework/test/browser_toolbox_view_source_01.js
@@ -5,33 +5,33 @@
  * Tests that Toolbox#viewSourceInDebugger works when debugger is not
  * yet opened.
  */
 
 var URL = `${URL_ROOT}doc_viewsource.html`;
 var JS_URL = `${URL_ROOT}code_math.js`;
 
 function *viewSource() {
-  let toolbox = yield loadToolbox(URL);
+  let toolbox = yield openNewTabAndToolbox(URL);
 
   yield toolbox.viewSourceInDebugger(JS_URL, 2);
 
   let debuggerPanel = toolbox.getPanel("jsdebugger");
   ok(debuggerPanel, "The debugger panel was opened.");
   is(toolbox.currentToolId, "jsdebugger", "The debugger panel was selected.");
 
   let { DebuggerView } = debuggerPanel.panelWin;
   let Sources = DebuggerView.Sources;
 
   is(Sources.selectedValue, getSourceActor(Sources, JS_URL),
     "The correct source is shown in the debugger.");
   is(DebuggerView.editor.getCursor().line + 1, 2,
     "The correct line is highlighted in the debugger's source editor.");
 
-  yield unloadToolbox(toolbox);
+  yield closeToolboxAndTab(toolbox);
   finish();
 }
 
 function test () {
   Task.spawn(viewSource).then(finish, (aError) => {
     ok(false, "Got an error: " + aError.message + "\n" + aError.stack);
     finish();
   });

--- a/devtools/client/framework/test/browser_toolbox_view_source_02.js
+++ b/devtools/client/framework/test/browser_toolbox_view_source_02.js
@@ -4,17 +4,17 @@
 /**
  * Tests that Toolbox#viewSourceInDebugger works when debugger is already loaded.
  */
 
 var URL = `${URL_ROOT}doc_viewsource.html`;
 var JS_URL = `${URL_ROOT}code_math.js`;
 
 function *viewSource() {
-  let toolbox = yield loadToolbox(URL);
+  let toolbox = yield openNewTabAndToolbox(URL);
   let { panelWin: debuggerWin } = yield toolbox.selectTool("jsdebugger");
   let debuggerEvents = debuggerWin.EVENTS;
   let { DebuggerView } = debuggerWin;
   let Sources = DebuggerView.Sources;
 
   yield debuggerWin.once(debuggerEvents.SOURCE_SHOWN);
   ok("A source was shown in the debugger.");
 
@@ -29,17 +29,17 @@ function *viewSource() {
   ok(debuggerPanel, "The debugger panel was opened.");
   is(toolbox.currentToolId, "jsdebugger", "The debugger panel was selected.");
 
   is(Sources.selectedValue, getSourceActor(Sources, JS_URL),
     "The correct source is shown in the debugger.");
   is(DebuggerView.editor.getCursor().line + 1, 2,
     "The correct line is highlighted in the debugger's source editor.");
 
-  yield unloadToolbox(toolbox);
+  yield closeToolboxAndTab(toolbox);
   finish();
 }
 
 function test () {
   Task.spawn(viewSource).then(finish, (aError) => {
     ok(false, "Got an error: " + aError.message + "\n" + aError.stack);
     finish();
   });

--- a/devtools/client/framework/test/browser_toolbox_view_source_03.js
+++ b/devtools/client/framework/test/browser_toolbox_view_source_03.js
@@ -5,33 +5,33 @@
  * Tests that Toolbox#viewSourceInStyleEditor works when style editor is not
  * yet opened.
  */
 
 var URL = `${URL_ROOT}doc_viewsource.html`;
 var CSS_URL = `${URL_ROOT}doc_theme.css`;
 
 function *viewSource() {
-  let toolbox = yield loadToolbox(URL);
+  let toolbox = yield openNewTabAndToolbox(URL);
 
   let fileFound = yield toolbox.viewSourceInStyleEditor(CSS_URL, 2);
   ok(fileFound, "viewSourceInStyleEditor should resolve to true if source found.");
 
   let stylePanel = toolbox.getPanel("styleeditor");
   ok(stylePanel, "The style editor panel was opened.");
   is(toolbox.currentToolId, "styleeditor", "The style editor panel was selected.");
 
   let { UI } = stylePanel;
 
   is(UI.selectedEditor.styleSheet.href, CSS_URL,
     "The correct source is shown in the style editor.");
   is(UI.selectedEditor.sourceEditor.getCursor().line + 1, 2,
     "The correct line is highlighted in the style editor's source editor.");
 
-  yield unloadToolbox(toolbox);
+  yield closeToolboxAndTab(toolbox);
   finish();
 }
 
 function test () {
   Task.spawn(viewSource).then(finish, (aError) => {
     ok(false, "Got an error: " + aError.message + "\n" + aError.stack);
     finish();
   });

--- a/devtools/client/framework/test/browser_toolbox_view_source_04.js
+++ b/devtools/client/framework/test/browser_toolbox_view_source_04.js
@@ -3,34 +3,34 @@
 
 /**
  * Tests that Toolbox#viewSourceInScratchpad works.
  */
 
 var URL = `${URL_ROOT}doc_viewsource.html`;
 
 function *viewSource() {
-  let toolbox = yield loadToolbox(URL);
+  let toolbox = yield openNewTabAndToolbox(URL);
   let win = yield openScratchpadWindow();
   let { Scratchpad: scratchpad } = win;
 
   // Brahm's Cello Sonata No.1, Op.38 now in the scratchpad
   scratchpad.setText("E G B C B\nA B A G A B\nG E");
   let scratchpadURL = scratchpad.uniqueName;
 
   // Now select another tool for focus
   yield toolbox.selectTool("webconsole");
 
   yield toolbox.viewSourceInScratchpad(scratchpadURL, 2);
 
   is(scratchpad.editor.getCursor().line, 2,
     "The correct line is highlighted in scratchpad's editor.");
 
   win.close();
-  yield unloadToolbox(toolbox);
+  yield closeToolboxAndTab(toolbox);
   finish();
 }
 
 function test () {
   Task.spawn(viewSource).then(finish, (aError) => {
     ok(false, "Got an error: " + aError.message + "\n" + aError.stack);
     finish();
   });

--- a/devtools/client/framework/test/shared-head.js
+++ b/devtools/client/framework/test/shared-head.js
@@ -183,25 +183,25 @@ function waitForTick() {
 }
 
 /**
  * Add a new tab and open the toolbox in it.
  * @param {String} url The URL for the tab to be opened.
  * @return {Promise} Resolves when the tab has been added, loaded and the
  * toolbox has been opened. Resolves to the toolbox.
  */
-var loadToolbox = Task.async(function*(url) {
+var openNewTabAndToolbox = Task.async(function*(url) {
   let tab = yield addTab(url);
   let toolbox = yield gDevTools.showToolbox(TargetFactory.forTab(tab));
   return toolbox;
 });
 
 /**
  * Close a toolbox and the current tab.
  * @param {Toolbox} toolbox The toolbox to close.
  * @return {Promise} Resolves when the toolbox and tab have been destroyed and
  * closed.
  */
-function unloadToolbox(toolbox) {
+function closeToolboxAndTab(toolbox) {
   return toolbox.destroy().then(function() {
     gBrowser.removeCurrentTab();
   });
 }