diff --git a/devtools/client/webconsole/components/App.js b/devtools/client/webconsole/components/App.js
index 3570d0150087..99cba3b1132e 100644
--- a/devtools/client/webconsole/components/App.js
+++ b/devtools/client/webconsole/components/App.js
@@ -115,7 +115,7 @@ class App extends Component {
       filterBarDisplayMode: PropTypes.oneOf([
         ...Object.values(FILTERBAR_DISPLAY_MODES),
       ]).isRequired,
-      showEvaluationSelector: PropTypes.bool,
+      showEvaluationContextSelector: PropTypes.bool,
     };
   }
 
@@ -293,7 +293,7 @@ class App extends Component {
       reverseSearchInputVisible,
       serviceContainer,
       webConsoleUI,
-      showEvaluationSelector,
+      showEvaluationContextSelector,
     } = this.props;
 
     return editorMode
@@ -303,7 +303,7 @@ class App extends Component {
           dispatch,
           reverseSearchInputVisible,
           serviceContainer,
-          showEvaluationSelector,
+          showEvaluationContextSelector,
           webConsoleUI,
         })
       : null;
@@ -473,7 +473,7 @@ const mapStateToProps = state => ({
   filterBarDisplayMode: state.ui.filterBarDisplayMode,
   eagerEvaluationEnabled: state.prefs.eagerEvaluation,
   autocomplete: state.prefs.autocomplete,
-  showEvaluationSelector: state.ui.showEvaluationSelector,
+  showEvaluationContextSelector: state.ui.showEvaluationContextSelector,
 });
 
 const mapDispatchToProps = dispatch => ({
diff --git a/devtools/client/webconsole/components/Input/EditorToolbar.js b/devtools/client/webconsole/components/Input/EditorToolbar.js
index 5972ee520a8b..1391313aab5c 100644
--- a/devtools/client/webconsole/components/Input/EditorToolbar.js
+++ b/devtools/client/webconsole/components/Input/EditorToolbar.js
@@ -12,8 +12,8 @@ const {
 const dom = require("devtools/client/shared/vendor/react-dom-factories");
 const PropTypes = require("devtools/client/shared/vendor/react-prop-types");
 
-const EvaluationSelector = createFactory(
-  require("devtools/client/webconsole/components/Input/EvaluationSelector")
+const EvaluationContextSelector = createFactory(
+  require("devtools/client/webconsole/components/Input/EvaluationContextSelector")
 );
 
 const actions = require("devtools/client/webconsole/actions/index");
@@ -35,7 +35,7 @@ class EditorToolbar extends Component {
       reverseSearchInputVisible: PropTypes.bool.isRequired,
       serviceContainer: PropTypes.object.isRequired,
       webConsoleUI: PropTypes.object.isRequired,
-      showEvaluationSelector: PropTypes.bool,
+      showEvaluationContextSelector: PropTypes.bool,
     };
   }
 
@@ -58,15 +58,15 @@ class EditorToolbar extends Component {
     );
   }
 
-  renderEvaluationSelector() {
+  renderEvaluationContextSelector() {
     if (
       !this.props.webConsoleUI.wrapper.toolbox ||
-      !this.props.showEvaluationSelector
+      !this.props.showEvaluationContextSelector
     ) {
       return null;
     }
 
-    return EvaluationSelector({
+    return EvaluationContextSelector({
       webConsoleUI: this.props.webConsoleUI,
     });
   }
@@ -101,7 +101,7 @@ class EditorToolbar extends Component {
         },
         l10n.getStr("webconsole.editor.toolbar.executeButton.label")
       ),
-      this.renderEvaluationSelector(),
+      this.renderEvaluationContextSelector(),
       dom.button({
         className:
           "devtools-button webconsole-editor-toolbar-history-prevExpressionButton",
diff --git a/devtools/client/webconsole/components/Input/EvaluationSelector.css b/devtools/client/webconsole/components/Input/EvaluationContextSelector.css
similarity index 100%
rename from devtools/client/webconsole/components/Input/EvaluationSelector.css
rename to devtools/client/webconsole/components/Input/EvaluationContextSelector.css
diff --git a/devtools/client/webconsole/components/Input/EvaluationSelector.js b/devtools/client/webconsole/components/Input/EvaluationContextSelector.js
similarity index 98%
rename from devtools/client/webconsole/components/Input/EvaluationSelector.js
rename to devtools/client/webconsole/components/Input/EvaluationContextSelector.js
index bde6de1a8d2b..d8331e5725c3 100644
--- a/devtools/client/webconsole/components/Input/EvaluationSelector.js
+++ b/devtools/client/webconsole/components/Input/EvaluationContextSelector.js
@@ -36,7 +36,7 @@ loader.lazyGetter(this, "MenuList", function() {
   );
 });
 
-class EvaluationSelector extends Component {
+class EvaluationContextSelector extends Component {
   static get propTypes() {
     return {
       selectThread: PropTypes.func.isRequired,
@@ -155,7 +155,7 @@ const toolboxConnected = connect(
   }),
   undefined,
   { storeKey: "toolbox-store" }
-)(EvaluationSelector);
+)(EvaluationContextSelector);
 
 module.exports = connect(
   state => state,
diff --git a/devtools/client/webconsole/components/Input/JSTerm.js b/devtools/client/webconsole/components/Input/JSTerm.js
index 96a35aeea955..7288d9870378 100644
--- a/devtools/client/webconsole/components/Input/JSTerm.js
+++ b/devtools/client/webconsole/components/Input/JSTerm.js
@@ -64,8 +64,8 @@ const {
 } = require("devtools/client/webconsole/selectors/autocomplete");
 const actions = require("devtools/client/webconsole/actions/index");
 
-const EvaluationSelector = createFactory(
-  require("devtools/client/webconsole/components/Input/EvaluationSelector")
+const EvaluationContextSelector = createFactory(
+  require("devtools/client/webconsole/components/Input/EvaluationContextSelector")
 );
 
 // Constants used for defining the direction of JSTerm input history navigation.
@@ -115,7 +115,7 @@ class JSTerm extends Component {
       editorWidth: PropTypes.number,
       showEditorOnboarding: PropTypes.bool,
       autocomplete: PropTypes.bool,
-      showEvaluationSelector: PropTypes.bool,
+      showEvaluationContextSelector: PropTypes.bool,
       autocompletePopupPosition: PropTypes.string,
     };
   }
@@ -1308,16 +1308,16 @@ class JSTerm extends Component {
     });
   }
 
-  renderEvaluationSelector() {
+  renderEvaluationContextSelector() {
     if (
       !this.props.webConsoleUI.wrapper.toolbox ||
       this.props.editorMode ||
-      !this.props.showEvaluationSelector
+      !this.props.showEvaluationContextSelector
     ) {
       return null;
     }
 
-    return EvaluationSelector(this.props);
+    return EvaluationContextSelector(this.props);
   }
 
   renderEditorOnboarding() {
@@ -1380,7 +1380,7 @@ class JSTerm extends Component {
       },
       dom.div(
         { className: "webconsole-input-buttons" },
-        this.renderEvaluationSelector(),
+        this.renderEvaluationContextSelector(),
         this.renderOpenEditorButton()
       ),
       this.renderEditorOnboarding()
@@ -1396,7 +1396,7 @@ function mapStateToProps(state) {
     getValueFromHistory: direction => getHistoryValue(state, direction),
     autocompleteData: getAutocompleteState(state),
     showEditorOnboarding: state.ui.showEditorOnboarding,
-    showEvaluationSelector: state.ui.showEvaluationSelector,
+    showEvaluationContextSelector: state.ui.showEvaluationContextSelector,
     autocompletePopupPosition: state.prefs.eagerEvaluation ? "top" : "bottom",
   };
 }
diff --git a/devtools/client/webconsole/components/Input/moz.build b/devtools/client/webconsole/components/Input/moz.build
index 86609fa8b4e2..187bd1c9f98f 100644
--- a/devtools/client/webconsole/components/Input/moz.build
+++ b/devtools/client/webconsole/components/Input/moz.build
@@ -8,8 +8,8 @@ DevToolsModules(
     'EagerEvaluation.css',
     'EagerEvaluation.js',
     'EditorToolbar.js',
-    'EvaluationSelector.css',
-    'EvaluationSelector.js',
+    'EvaluationContextSelector.css',
+    'EvaluationContextSelector.js',
     'JSTerm.js',
     'ReverseSearchInput.css',
     'ReverseSearchInput.js',
diff --git a/devtools/client/webconsole/index.html b/devtools/client/webconsole/index.html
index 2ea17caa865a..3a3588273c87 100644
--- a/devtools/client/webconsole/index.html
+++ b/devtools/client/webconsole/index.html
@@ -21,7 +21,7 @@
     <link rel="stylesheet" href="resource://devtools/client/shared/components/splitter/GridElementResizer.css"/>
     <link rel="stylesheet" href="chrome://devtools/content/netmonitor/src/assets/styles/httpi.css"/>
     <link rel="stylesheet" href="resource://devtools/client/webconsole/components/Input/EagerEvaluation.css"/>
-    <link rel="stylesheet" href="resource://devtools/client/webconsole/components/Input/EvaluationSelector.css"/>
+    <link rel="stylesheet" href="resource://devtools/client/webconsole/components/Input/EvaluationContextSelector.css"/>
     <link rel="stylesheet" href="resource://devtools/client/webconsole/components/Input/ReverseSearchInput.css"/>
     <link rel="stylesheet" href="resource://devtools/client/webconsole/components/App.css"/>
     <link rel="stylesheet" href="resource://devtools/client/shared/components/Accordion.css"/>
diff --git a/devtools/client/webconsole/store.js b/devtools/client/webconsole/store.js
index d88c98df4711..fd3c545222bf 100644
--- a/devtools/client/webconsole/store.js
+++ b/devtools/client/webconsole/store.js
@@ -83,7 +83,7 @@ function configureStore(webConsoleUI, options = {}) {
       editorWidth: getIntPref(PREFS.UI.EDITOR_WIDTH),
       showEditorOnboarding: getBoolPref(PREFS.UI.EDITOR_ONBOARDING),
       timestampsVisible: getBoolPref(PREFS.UI.MESSAGE_TIMESTAMP),
-      showEvaluationSelector: getBoolPref(PREFS.UI.CONTEXT_SELECTOR),
+      showEvaluationContextSelector: getBoolPref(PREFS.UI.CONTEXT_SELECTOR),
     }),
   };