diff --git a/locales/en-US/app.ftl b/locales/en-US/app.ftl
index 0b1ebdaed5..748963e31f 100644
--- a/locales/en-US/app.ftl
+++ b/locales/en-US/app.ftl
@@ -786,8 +786,8 @@ ServiceWorkerManager--hide-notice-button =
 
 StackSettings--implementation-all-frames = All frames
     .title = Do not filter the stack frames
-StackSettings--implementation-javascript2 = JavaScript
-    .title = Show only the stack frames related to JavaScript execution
+StackSettings--implementation-script = Script
+    .title = Show only the stack frames related to script execution
 StackSettings--implementation-native2 = Native
     .title = Show only the stack frames for native code
 
diff --git a/src/components/shared/StackImplementationSetting.js b/src/components/shared/StackImplementationSetting.js
index b55d9d2b19..5f428f62c8 100644
--- a/src/components/shared/StackImplementationSetting.js
+++ b/src/components/shared/StackImplementationSetting.js
@@ -85,7 +85,7 @@ class StackImplementationSettingImpl extends PureComponent<Props> {
           'combined'
         )}
         {this._renderImplementationRadioButton(
-          'StackSettings--implementation-javascript2',
+          'StackSettings--implementation-script',
           'js'
         )}
         {this._renderImplementationRadioButton(
diff --git a/src/test/components/StackSettings.test.js b/src/test/components/StackSettings.test.js
index 069dd2a83d..c5d68d1a02 100644
--- a/src/test/components/StackSettings.test.js
+++ b/src/test/components/StackSettings.test.js
@@ -44,10 +44,10 @@ describe('StackSettings', function () {
     return (element: any).checked;
   }
 
-  it('can change the implementation filter to JavaScript', async function () {
+  it('can change the implementation filter to script', async function () {
     const { getByLabelText, getState } = setup();
     expect(getImplementationFilter(getState())).toEqual('combined');
-    const radioButton = getByLabelText(/JavaScript/);
+    const radioButton = getByLabelText(/Script/);
 
     fireFullClick(radioButton);
 
diff --git a/src/test/components/__snapshots__/FlameGraph.test.js.snap b/src/test/components/__snapshots__/FlameGraph.test.js.snap
index 661d12aac9..7070e5dfa6 100644
--- a/src/test/components/__snapshots__/FlameGraph.test.js.snap
+++ b/src/test/components/__snapshots__/FlameGraph.test.js.snap
@@ -433,16 +433,16 @@ exports[`FlameGraph matches the snapshot 1`] = `
         <input
           class="photon-radio photon-radio-micro"
           id="implementation-radio-js"
-          title="Show only the stack frames related to JavaScript execution"
+          title="Show only the stack frames related to script execution"
           type="radio"
           value="js"
         />
         <label
           class="photon-label photon-label-micro photon-label-horiz-padding"
           for="implementation-radio-js"
-          title="Show only the stack frames related to JavaScript execution"
+          title="Show only the stack frames related to script execution"
         >
-          JavaScript
+          Script
         </label>
         <input
           class="photon-radio photon-radio-micro"
diff --git a/src/test/components/__snapshots__/MarkerChart.test.js.snap b/src/test/components/__snapshots__/MarkerChart.test.js.snap
index e53e60fa3e..8fcde5a714 100644
--- a/src/test/components/__snapshots__/MarkerChart.test.js.snap
+++ b/src/test/components/__snapshots__/MarkerChart.test.js.snap
@@ -447,16 +447,16 @@ exports[`MarkerChart renders the normal marker chart and matches the snapshot 1`
         <input
           class="photon-radio photon-radio-micro"
           id="implementation-radio-js"
-          title="Show only the stack frames related to JavaScript execution"
+          title="Show only the stack frames related to script execution"
           type="radio"
           value="js"
         />
         <label
           class="photon-label photon-label-micro photon-label-horiz-padding"
           for="implementation-radio-js"
-          title="Show only the stack frames related to JavaScript execution"
+          title="Show only the stack frames related to script execution"
         >
-          JavaScript
+          Script
         </label>
         <input
           class="photon-radio photon-radio-micro"
diff --git a/src/test/components/__snapshots__/MarkerTable.test.js.snap b/src/test/components/__snapshots__/MarkerTable.test.js.snap
index 8d97a273fb..724083ddea 100644
--- a/src/test/components/__snapshots__/MarkerTable.test.js.snap
+++ b/src/test/components/__snapshots__/MarkerTable.test.js.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`MarkerTable EmptyReasons shows reasons when a profile has no non-network markers 1`] = `
 <div
@@ -73,16 +73,16 @@ exports[`MarkerTable renders some basic markers and updates when needed 1`] = `
         <input
           class="photon-radio photon-radio-micro"
           id="implementation-radio-js"
-          title="Show only the stack frames related to JavaScript execution"
+          title="Show only the stack frames related to script execution"
           type="radio"
           value="js"
         />
         <label
           class="photon-label photon-label-micro photon-label-horiz-padding"
           for="implementation-radio-js"
-          title="Show only the stack frames related to JavaScript execution"
+          title="Show only the stack frames related to script execution"
         >
-          JavaScript
+          Script
         </label>
         <input
           class="photon-radio photon-radio-micro"
diff --git a/src/test/components/__snapshots__/ProfileCallTreeView.test.js.snap b/src/test/components/__snapshots__/ProfileCallTreeView.test.js.snap
index f347850326..0789545904 100644
--- a/src/test/components/__snapshots__/ProfileCallTreeView.test.js.snap
+++ b/src/test/components/__snapshots__/ProfileCallTreeView.test.js.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`ProfileCallTreeView with JS Allocations matches the snapshot for JS allocations 1`] = `
 <div
@@ -34,16 +34,16 @@ exports[`ProfileCallTreeView with JS Allocations matches the snapshot for JS all
         <input
           class="photon-radio photon-radio-micro"
           id="implementation-radio-js"
-          title="Show only the stack frames related to JavaScript execution"
+          title="Show only the stack frames related to script execution"
           type="radio"
           value="js"
         />
         <label
           class="photon-label photon-label-micro photon-label-horiz-padding"
           for="implementation-radio-js"
-          title="Show only the stack frames related to JavaScript execution"
+          title="Show only the stack frames related to script execution"
         >
-          JavaScript
+          Script
         </label>
         <input
           class="photon-radio photon-radio-micro"
@@ -800,16 +800,16 @@ exports[`ProfileCallTreeView with balanced native allocations matches the snapsh
         <input
           class="photon-radio photon-radio-micro"
           id="implementation-radio-js"
-          title="Show only the stack frames related to JavaScript execution"
+          title="Show only the stack frames related to script execution"
           type="radio"
           value="js"
         />
         <label
           class="photon-label photon-label-micro photon-label-horiz-padding"
           for="implementation-radio-js"
-          title="Show only the stack frames related to JavaScript execution"
+          title="Show only the stack frames related to script execution"
         >
-          JavaScript
+          Script
         </label>
         <input
           class="photon-radio photon-radio-micro"
@@ -1584,16 +1584,16 @@ exports[`ProfileCallTreeView with balanced native allocations matches the snapsh
         <input
           class="photon-radio photon-radio-micro"
           id="implementation-radio-js"
-          title="Show only the stack frames related to JavaScript execution"
+          title="Show only the stack frames related to script execution"
           type="radio"
           value="js"
         />
         <label
           class="photon-label photon-label-micro photon-label-horiz-padding"
           for="implementation-radio-js"
-          title="Show only the stack frames related to JavaScript execution"
+          title="Show only the stack frames related to script execution"
         >
-          JavaScript
+          Script
         </label>
         <input
           class="photon-radio photon-radio-micro"
@@ -2368,16 +2368,16 @@ exports[`ProfileCallTreeView with unbalanced native allocations matches the snap
         <input
           class="photon-radio photon-radio-micro"
           id="implementation-radio-js"
-          title="Show only the stack frames related to JavaScript execution"
+          title="Show only the stack frames related to script execution"
           type="radio"
           value="js"
         />
         <label
           class="photon-label photon-label-micro photon-label-horiz-padding"
           for="implementation-radio-js"
-          title="Show only the stack frames related to JavaScript execution"
+          title="Show only the stack frames related to script execution"
         >
-          JavaScript
+          Script
         </label>
         <input
           class="photon-radio photon-radio-micro"
@@ -3140,16 +3140,16 @@ exports[`ProfileCallTreeView with unbalanced native allocations matches the snap
         <input
           class="photon-radio photon-radio-micro"
           id="implementation-radio-js"
-          title="Show only the stack frames related to JavaScript execution"
+          title="Show only the stack frames related to script execution"
           type="radio"
           value="js"
         />
         <label
           class="photon-label photon-label-micro photon-label-horiz-padding"
           for="implementation-radio-js"
-          title="Show only the stack frames related to JavaScript execution"
+          title="Show only the stack frames related to script execution"
         >
-          JavaScript
+          Script
         </label>
         <input
           class="photon-radio photon-radio-micro"
@@ -3760,16 +3760,16 @@ exports[`calltree/ProfileCallTreeView EmptyReasons shows a reason for a call tre
         <input
           class="photon-radio photon-radio-micro"
           id="implementation-radio-js"
-          title="Show only the stack frames related to JavaScript execution"
+          title="Show only the stack frames related to script execution"
           type="radio"
           value="js"
         />
         <label
           class="photon-label photon-label-micro photon-label-horiz-padding"
           for="implementation-radio-js"
-          title="Show only the stack frames related to JavaScript execution"
+          title="Show only the stack frames related to script execution"
         >
-          JavaScript
+          Script
         </label>
         <input
           class="photon-radio photon-radio-micro"
@@ -3901,16 +3901,16 @@ exports[`calltree/ProfileCallTreeView EmptyReasons shows reasons for being out o
         <input
           class="photon-radio photon-radio-micro"
           id="implementation-radio-js"
-          title="Show only the stack frames related to JavaScript execution"
+          title="Show only the stack frames related to script execution"
           type="radio"
           value="js"
         />
         <label
           class="photon-label photon-label-micro photon-label-horiz-padding"
           for="implementation-radio-js"
-          title="Show only the stack frames related to JavaScript execution"
+          title="Show only the stack frames related to script execution"
         >
-          JavaScript
+          Script
         </label>
         <input
           class="photon-radio photon-radio-micro"
@@ -4042,16 +4042,16 @@ exports[`calltree/ProfileCallTreeView EmptyReasons shows reasons for when sample
           checked=""
           class="photon-radio photon-radio-micro"
           id="implementation-radio-js"
-          title="Show only the stack frames related to JavaScript execution"
+          title="Show only the stack frames related to script execution"
           type="radio"
           value="js"
         />
         <label
           class="photon-label photon-label-micro photon-label-horiz-padding"
           for="implementation-radio-js"
-          title="Show only the stack frames related to JavaScript execution"
+          title="Show only the stack frames related to script execution"
         >
-          JavaScript
+          Script
         </label>
         <input
           class="photon-radio photon-radio-micro"
@@ -4229,16 +4229,16 @@ exports[`calltree/ProfileCallTreeView renders an inverted call tree 1`] = `
         <input
           class="photon-radio photon-radio-micro"
           id="implementation-radio-js"
-          title="Show only the stack frames related to JavaScript execution"
+          title="Show only the stack frames related to script execution"
           type="radio"
           value="js"
         />
         <label
           class="photon-label photon-label-micro photon-label-horiz-padding"
           for="implementation-radio-js"
-          title="Show only the stack frames related to JavaScript execution"
+          title="Show only the stack frames related to script execution"
         >
-          JavaScript
+          Script
         </label>
         <input
           class="photon-radio photon-radio-micro"
@@ -4969,16 +4969,16 @@ exports[`calltree/ProfileCallTreeView renders an unfiltered call tree 1`] = `
         <input
           class="photon-radio photon-radio-micro"
           id="implementation-radio-js"
-          title="Show only the stack frames related to JavaScript execution"
+          title="Show only the stack frames related to script execution"
           type="radio"
           value="js"
         />
         <label
           class="photon-label photon-label-micro photon-label-horiz-padding"
           for="implementation-radio-js"
-          title="Show only the stack frames related to JavaScript execution"
+          title="Show only the stack frames related to script execution"
         >
-          JavaScript
+          Script
         </label>
         <input
           class="photon-radio photon-radio-micro"
@@ -5708,16 +5708,16 @@ exports[`calltree/ProfileCallTreeView renders an unfiltered call tree with filen
         <input
           class="photon-radio photon-radio-micro"
           id="implementation-radio-js"
-          title="Show only the stack frames related to JavaScript execution"
+          title="Show only the stack frames related to script execution"
           type="radio"
           value="js"
         />
         <label
           class="photon-label photon-label-micro photon-label-horiz-padding"
           for="implementation-radio-js"
-          title="Show only the stack frames related to JavaScript execution"
+          title="Show only the stack frames related to script execution"
         >
-          JavaScript
+          Script
         </label>
         <input
           class="photon-radio photon-radio-micro"
@@ -6231,16 +6231,16 @@ exports[`calltree/ProfileCallTreeView renders call tree with some search strings
         <input
           class="photon-radio photon-radio-micro"
           id="implementation-radio-js"
-          title="Show only the stack frames related to JavaScript execution"
+          title="Show only the stack frames related to script execution"
           type="radio"
           value="js"
         />
         <label
           class="photon-label photon-label-micro photon-label-horiz-padding"
           for="implementation-radio-js"
-          title="Show only the stack frames related to JavaScript execution"
+          title="Show only the stack frames related to script execution"
         >
-          JavaScript
+          Script
         </label>
         <input
           class="photon-radio photon-radio-micro"
@@ -6970,16 +6970,16 @@ exports[`calltree/ProfileCallTreeView renders call tree with some search strings
         <input
           class="photon-radio photon-radio-micro"
           id="implementation-radio-js"
-          title="Show only the stack frames related to JavaScript execution"
+          title="Show only the stack frames related to script execution"
           type="radio"
           value="js"
         />
         <label
           class="photon-label photon-label-micro photon-label-horiz-padding"
           for="implementation-radio-js"
-          title="Show only the stack frames related to JavaScript execution"
+          title="Show only the stack frames related to script execution"
         >
-          JavaScript
+          Script
         </label>
         <input
           class="photon-radio photon-radio-micro"
@@ -7637,16 +7637,16 @@ exports[`calltree/ProfileCallTreeView renders call tree with some search strings
         <input
           class="photon-radio photon-radio-micro"
           id="implementation-radio-js"
-          title="Show only the stack frames related to JavaScript execution"
+          title="Show only the stack frames related to script execution"
           type="radio"
           value="js"
         />
         <label
           class="photon-label photon-label-micro photon-label-horiz-padding"
           for="implementation-radio-js"
-          title="Show only the stack frames related to JavaScript execution"
+          title="Show only the stack frames related to script execution"
         >
-          JavaScript
+          Script
         </label>
         <input
           class="photon-radio photon-radio-micro"
@@ -8304,16 +8304,16 @@ exports[`calltree/ProfileCallTreeView renders call tree with some search strings
         <input
           class="photon-radio photon-radio-micro"
           id="implementation-radio-js"
-          title="Show only the stack frames related to JavaScript execution"
+          title="Show only the stack frames related to script execution"
           type="radio"
           value="js"
         />
         <label
           class="photon-label photon-label-micro photon-label-horiz-padding"
           for="implementation-radio-js"
-          title="Show only the stack frames related to JavaScript execution"
+          title="Show only the stack frames related to script execution"
         >
-          JavaScript
+          Script
         </label>
         <input
           class="photon-radio photon-radio-micro"
@@ -8828,16 +8828,16 @@ exports[`calltree/ProfileCallTreeView renders call tree with some search strings
         <input
           class="photon-radio photon-radio-micro"
           id="implementation-radio-js"
-          title="Show only the stack frames related to JavaScript execution"
+          title="Show only the stack frames related to script execution"
           type="radio"
           value="js"
         />
         <label
           class="photon-label photon-label-micro photon-label-horiz-padding"
           for="implementation-radio-js"
-          title="Show only the stack frames related to JavaScript execution"
+          title="Show only the stack frames related to script execution"
         >
-          JavaScript
+          Script
         </label>
         <input
           class="photon-radio photon-radio-micro"
@@ -9352,16 +9352,16 @@ exports[`calltree/ProfileCallTreeView renders call tree with some search strings
         <input
           class="photon-radio photon-radio-micro"
           id="implementation-radio-js"
-          title="Show only the stack frames related to JavaScript execution"
+          title="Show only the stack frames related to script execution"
           type="radio"
           value="js"
         />
         <label
           class="photon-label photon-label-micro photon-label-horiz-padding"
           for="implementation-radio-js"
-          title="Show only the stack frames related to JavaScript execution"
+          title="Show only the stack frames related to script execution"
         >
-          JavaScript
+          Script
         </label>
         <input
           class="photon-radio photon-radio-micro"
diff --git a/src/test/components/__snapshots__/StackChart.test.js.snap b/src/test/components/__snapshots__/StackChart.test.js.snap
index bd0e3dca1d..4be8ea3e05 100644
--- a/src/test/components/__snapshots__/StackChart.test.js.snap
+++ b/src/test/components/__snapshots__/StackChart.test.js.snap
@@ -34,16 +34,16 @@ exports[`CombinedChart renders combined stack chart 1`] = `
         <input
           class="photon-radio photon-radio-micro"
           id="implementation-radio-js"
-          title="Show only the stack frames related to JavaScript execution"
+          title="Show only the stack frames related to script execution"
           type="radio"
           value="js"
         />
         <label
           class="photon-label photon-label-micro photon-label-horiz-padding"
           for="implementation-radio-js"
-          title="Show only the stack frames related to JavaScript execution"
+          title="Show only the stack frames related to script execution"
         >
-          JavaScript
+          Script
         </label>
         <input
           class="photon-radio photon-radio-micro"
@@ -530,16 +530,16 @@ exports[`MarkerChart matches the snapshots for the component and draw log 1`] =
         <input
           class="photon-radio photon-radio-micro"
           id="implementation-radio-js"
-          title="Show only the stack frames related to JavaScript execution"
+          title="Show only the stack frames related to script execution"
           type="radio"
           value="js"
         />
         <label
           class="photon-label photon-label-micro photon-label-horiz-padding"
           for="implementation-radio-js"
-          title="Show only the stack frames related to JavaScript execution"
+          title="Show only the stack frames related to script execution"
         >
-          JavaScript
+          Script
         </label>
         <input
           class="photon-radio photon-radio-micro"
@@ -1060,16 +1060,16 @@ exports[`StackChart matches the snapshot and can display a tooltip with the same
             <input
               class="photon-radio photon-radio-micro"
               id="implementation-radio-js"
-              title="Show only the stack frames related to JavaScript execution"
+              title="Show only the stack frames related to script execution"
               type="radio"
               value="js"
             />
             <label
               class="photon-label photon-label-micro photon-label-horiz-padding"
               for="implementation-radio-js"
-              title="Show only the stack frames related to JavaScript execution"
+              title="Show only the stack frames related to script execution"
             >
-              JavaScript
+              Script
             </label>
             <input
               class="photon-radio photon-radio-micro"
@@ -1757,16 +1757,16 @@ exports[`StackChart matches the snapshot and can display a tooltip: dom 1`] = `
         <input
           class="photon-radio photon-radio-micro"
           id="implementation-radio-js"
-          title="Show only the stack frames related to JavaScript execution"
+          title="Show only the stack frames related to script execution"
           type="radio"
           value="js"
         />
         <label
           class="photon-label photon-label-micro photon-label-horiz-padding"
           for="implementation-radio-js"
-          title="Show only the stack frames related to JavaScript execution"
+          title="Show only the stack frames related to script execution"
         >
-          JavaScript
+          Script
         </label>
         <input
           class="photon-radio photon-radio-micro"
@@ -2259,16 +2259,16 @@ exports[`StackChart works when the user selects the JS allocations option 1`] =
             <input
               class="photon-radio photon-radio-micro"
               id="implementation-radio-js"
-              title="Show only the stack frames related to JavaScript execution"
+              title="Show only the stack frames related to script execution"
               type="radio"
               value="js"
             />
             <label
               class="photon-label photon-label-micro photon-label-horiz-padding"
               for="implementation-radio-js"
-              title="Show only the stack frames related to JavaScript execution"
+              title="Show only the stack frames related to script execution"
             >
-              JavaScript
+              Script
             </label>
             <input
               class="photon-radio photon-radio-micro"
diff --git a/src/test/components/__snapshots__/StackSettings.test.js.snap b/src/test/components/__snapshots__/StackSettings.test.js.snap
index 244cb34585..92c90a6f2d 100644
--- a/src/test/components/__snapshots__/StackSettings.test.js.snap
+++ b/src/test/components/__snapshots__/StackSettings.test.js.snap
@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`StackSettings matches the snapshot 1`] = `
 <div>
@@ -29,16 +29,16 @@ exports[`StackSettings matches the snapshot 1`] = `
         <input
           class="photon-radio photon-radio-micro"
           id="implementation-radio-js"
-          title="Show only the stack frames related to JavaScript execution"
+          title="Show only the stack frames related to script execution"
           type="radio"
           value="js"
         />
         <label
           class="photon-label photon-label-micro photon-label-horiz-padding"
           for="implementation-radio-js"
-          title="Show only the stack frames related to JavaScript execution"
+          title="Show only the stack frames related to script execution"
         >
-          JavaScript
+          Script
         </label>
         <input
           class="photon-radio photon-radio-micro"