diff --git a/desktop/app/src/chrome/ShareSheetExportFile.tsx b/desktop/app/src/chrome/ShareSheetExportFile.tsx
index 15e362cbe..e6fdeb38d 100644
--- a/desktop/app/src/chrome/ShareSheetExportFile.tsx
+++ b/desktop/app/src/chrome/ShareSheetExportFile.tsx
@@ -127,8 +127,8 @@ export default class ShareSheetExportFile extends Component<Props, State> {
       );
       this.store.dispatch(unsetShare());
       if (this.state.runInBackground) {
-        new Notification('Sharable Flipper trace created', {
-          body: `Flipper trace exported to the ${this.props.file}`,
+        new Notification('Shareable Flipper Export created', {
+          body: `Saved to ${this.props.file}`,
           requireInteraction: true,
         });
         return;
@@ -215,7 +215,7 @@ export default class ShareSheetExportFile extends Component<Props, State> {
           <ShareSheetPendingDialog
             width={500}
             statusUpdate={statusUpdate}
-            statusMessage="Exporting Flipper trace..."
+            statusMessage="Creating Flipper Export..."
             onCancel={() => this.cancelAndHide(store)}
             onRunInBackground={() => {
               this.setState({runInBackground: true});
diff --git a/desktop/app/src/chrome/ShareSheetExportUrl.tsx b/desktop/app/src/chrome/ShareSheetExportUrl.tsx
index 1c25e6807..45e31f3df 100644
--- a/desktop/app/src/chrome/ShareSheetExportUrl.tsx
+++ b/desktop/app/src/chrome/ShareSheetExportUrl.tsx
@@ -139,7 +139,7 @@ export default class ShareSheetExportUrl extends Component<Props, State> {
       );
       const uploadMarker = `${EXPORT_FLIPPER_TRACE_EVENT}:upload`;
       performance.mark(uploadMarker);
-      statusUpdate('Uploading Flipper Trace...');
+      statusUpdate('Uploading Flipper Export...');
       const result = await reportPlatformFailures(
         shareFlipperData(serializedString),
         `${SHARE_FLIPPER_TRACE_EVENT}`,
@@ -159,7 +159,7 @@ export default class ShareSheetExportUrl extends Component<Props, State> {
       if (flipperUrl) {
         clipboard.writeText(String(flipperUrl));
         this.store.dispatch(setExportURL(flipperUrl));
-        new Notification('Sharable Flipper trace created', {
+        new Notification('Shareable Flipper Export created', {
           body: 'URL copied to clipboard',
           requireInteraction: true,
         });
@@ -216,7 +216,7 @@ export default class ShareSheetExportUrl extends Component<Props, State> {
           <ShareSheetPendingDialog
             width={500}
             statusUpdate={statusUpdate}
-            statusMessage="Uploading Flipper trace..."
+            statusMessage="Uploading Flipper Export..."
             onCancel={this.cancelAndHide(store)}
             onRunInBackground={() => {
               this.setState({runInBackground: true});
@@ -250,7 +250,7 @@ export default class ShareSheetExportUrl extends Component<Props, State> {
                     <InfoText>
                       Flipper's data was successfully uploaded. This URL can be
                       used to share with other Flipper users. Opening it will
-                      import the data from your trace.
+                      import the data from your export.
                     </InfoText>
                     <Copy
                       value={(result as DataExportResult).flipperUrl}
diff --git a/desktop/app/src/utils/pluginStateRecorder.tsx b/desktop/app/src/utils/pluginStateRecorder.tsx
index ea4457375..8725a1b71 100644
--- a/desktop/app/src/utils/pluginStateRecorder.tsx
+++ b/desktop/app/src/utils/pluginStateRecorder.tsx
@@ -65,7 +65,7 @@ async function flipperStartPluginRecording(state: State) {
   };
 
   // Note that we don't use the plugin's own serializeState, as that might interact with the
-  // device state, and is used for exporting Flipper traces.
+  // device state, and is used for creating Flipper Exports.
   pluginRecordingState.startState = await serialize(
     state.pluginStates[pluginKey] || plugin.defaultPersistedState,
   );
diff --git a/desktop/app/src/utils/supportRequestsFormUtils.tsx b/desktop/app/src/utils/supportRequestsFormUtils.tsx
index c0e31a390..62ecc3081 100644
--- a/desktop/app/src/utils/supportRequestsFormUtils.tsx
+++ b/desktop/app/src/utils/supportRequestsFormUtils.tsx
@@ -26,13 +26,13 @@ export function sendDidMountMessage(webview: WebviewTag) {
  *
  * @param webview
  * @param text
- * This helper function is for appending flipper trace in the questions input text field.
- * It also updates the Flipper trace state in the form which makes it pass the validation.
+ * This helper function is for appending flipper export in the questions input text field.
+ * It also updates the Flipper export state in the form which makes it pass the validation.
  * One should use it only for the pages backed by NTUsersFormContainer.react.js
  */
-export function sendFlipperTrace(webview: WebviewTag, text: string) {
+export function sendFlipperExport(webview: WebviewTag, text: string) {
   webview.send('hostMessage', {
-    type: 'flipperTrace',
+    type: 'flipperExport',
     payload: text,
   });
 }
diff --git a/desktop/plugins/layout/index.tsx b/desktop/plugins/layout/index.tsx
index b737957c2..c0fa32c46 100644
--- a/desktop/plugins/layout/index.tsx
+++ b/desktop/plugins/layout/index.tsx
@@ -227,7 +227,7 @@ export default class Layout extends FlipperPlugin<State, any, PersistedState> {
 
   init() {
     if (!this.props.persistedState) {
-      // If the selected plugin from the previous session was layout, then while importing the flipper trace, the redux store doesn't get updated in the first render, due to which the plugin crashes, as it has no persisted state
+      // If the selected plugin from the previous session was layout, then while importing the flipper export, the redux store doesn't get updated in the first render, due to which the plugin crashes, as it has no persisted state
       this.props.setPersistedState(this.constructor.defaultPersistedState);
     }
     // persist searchActive state when moving between plugins to prevent multiple