From 9d059d207ec2b400d5e138fc794d9a2a6ec3e144 Mon Sep 17 00:00:00 2001
From: nulmete <nicoulmete1@gmail.com>
Date: Mon, 23 Feb 2026 16:09:34 -0300
Subject: [PATCH 1/3] Migrate some 'Query' occurrences to 'Report'

---
 .../components/forms/validators/validate_query/index.ts     | 2 +-
 .../components/modals/ShowQueryModal/ShowQueryModal.tsx     | 4 ++--
 .../LiveResults/LiveResultsHeading/LiveResultsHeading.tsx   | 6 +++---
 .../AdvancedOptionsModal/AdvancedOptionsModal.tsx           | 4 ++--
 .../hosts/details/HostQueryReport/HQRTable/HQRTable.tsx     | 2 +-
 frontend/pages/labels/EditLabelPage/EditLabelPage.tests.tsx | 2 +-
 frontend/pages/labels/NewLabelPage/NewLabelPage.tsx         | 2 +-
 .../components/DynamicLabelForm/DynamicLabelForm.tests.tsx  | 2 +-
 .../labels/components/DynamicLabelForm/DynamicLabelForm.tsx | 2 +-
 .../PolicyPage/components/PolicyForm/PolicyForm.tsx         | 2 +-
 .../PolicyPage/components/PolicyResults/PolicyResults.tsx   | 2 +-
 .../queries/details/QueryDetailsPage/QueryDetailsPage.tsx   | 2 +-
 .../queries/edit/components/EditQueryForm/EditQueryForm.tsx | 4 ++--
 .../queries/edit/components/QueryResults/QueryResults.tsx   | 2 +-
 14 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/frontend/components/forms/validators/validate_query/index.ts b/frontend/components/forms/validators/validate_query/index.ts
index 110ae9cef66..7737cd78d23 100644
--- a/frontend/components/forms/validators/validate_query/index.ts
+++ b/frontend/components/forms/validators/validate_query/index.ts
@@ -1,6 +1,6 @@
 import { Parser } from "node-sql-parser";
 
-export const EMPTY_QUERY_ERR = "Query text must be present";
+export const EMPTY_QUERY_ERR = "Report text must be present";
 export const INVALID_SYNTAX_ERR = "Syntax error. Please review before saving.";
 
 const invalidQueryResponse = (message: string) => {
diff --git a/frontend/components/modals/ShowQueryModal/ShowQueryModal.tsx b/frontend/components/modals/ShowQueryModal/ShowQueryModal.tsx
index 7c2d5337cc0..9077c52a482 100644
--- a/frontend/components/modals/ShowQueryModal/ShowQueryModal.tsx
+++ b/frontend/components/modals/ShowQueryModal/ShowQueryModal.tsx
@@ -21,7 +21,7 @@ const ShowQueryModal = ({
 }: IShowQueryModalProps): JSX.Element => {
   return (
     <Modal
-      title="Query"
+      title="Report"
       onExit={onCancel}
       onEnter={onCancel}
       className={baseClass}
@@ -29,7 +29,7 @@ const ShowQueryModal = ({
       <div className={baseClass}>
         <SQLEditor
           value={query}
-          name="Query"
+          name="Report"
           wrapperClassName={`${baseClass}__text-editor-wrapper`}
           wrapEnabled
           readOnly
diff --git a/frontend/components/queries/LiveResults/LiveResultsHeading/LiveResultsHeading.tsx b/frontend/components/queries/LiveResults/LiveResultsHeading/LiveResultsHeading.tsx
index 605367eec30..bf576613bf7 100644
--- a/frontend/components/queries/LiveResults/LiveResultsHeading/LiveResultsHeading.tsx
+++ b/frontend/components/queries/LiveResults/LiveResultsHeading/LiveResultsHeading.tsx
@@ -61,8 +61,8 @@ interface ILiveResultsHeadingProps {
   onClickDone: (evt: React.MouseEvent<HTMLButtonElement>) => void;
   onClickRunAgain: (evt: React.MouseEvent<HTMLButtonElement>) => void;
   onClickStop: (evt: React.MouseEvent<HTMLButtonElement>) => void;
-  /** Whether this is a live run of a policy or a query */
-  resultsType?: "query" | "policy";
+  /** Whether this is a live run of a policy or a report */
+  resultsType?: "report" | "policy";
 }
 
 const LiveResultsHeading = ({
@@ -75,7 +75,7 @@ const LiveResultsHeading = ({
   onClickDone,
   onClickRunAgain,
   onClickStop,
-  resultsType = "query",
+  resultsType = "report",
 }: ILiveResultsHeadingProps) => {
   const percentResponded =
     numHostsTargeted > 0
diff --git a/frontend/pages/SoftwarePage/SoftwareTitleDetailsPage/AdvancedOptionsModal/AdvancedOptionsModal.tsx b/frontend/pages/SoftwarePage/SoftwareTitleDetailsPage/AdvancedOptionsModal/AdvancedOptionsModal.tsx
index 8f17704cfdf..069a49bf39b 100644
--- a/frontend/pages/SoftwarePage/SoftwareTitleDetailsPage/AdvancedOptionsModal/AdvancedOptionsModal.tsx
+++ b/frontend/pages/SoftwarePage/SoftwareTitleDetailsPage/AdvancedOptionsModal/AdvancedOptionsModal.tsx
@@ -45,7 +45,7 @@ const AdvancedOptionsModal = ({
               <SQLEditor
                 readOnly
                 value={preInstallQuery}
-                label="Query"
+                label="Report"
                 name="preInstallQuery"
                 maxLines={10}
                 helpText={
@@ -53,7 +53,7 @@ const AdvancedOptionsModal = ({
                     Software will be installed only if the{" "}
                     <CustomLink
                       className={`${baseClass}__table-link`}
-                      text="query returns results"
+                      text="report returns results"
                       url="https://fleetdm.com/tables"
                       newTab
                     />
diff --git a/frontend/pages/hosts/details/HostQueryReport/HQRTable/HQRTable.tsx b/frontend/pages/hosts/details/HostQueryReport/HQRTable/HQRTable.tsx
index 1fd1c602e87..0c0131fe285 100644
--- a/frontend/pages/hosts/details/HostQueryReport/HQRTable/HQRTable.tsx
+++ b/frontend/pages/hosts/details/HostQueryReport/HQRTable/HQRTable.tsx
@@ -111,7 +111,7 @@ const HQRTable = ({
           variant="inverse"
         >
           <>
-            Show query <Icon name="eye" />
+            Show report <Icon name="eye" />
           </>
         </Button>
         <Button
diff --git a/frontend/pages/labels/EditLabelPage/EditLabelPage.tests.tsx b/frontend/pages/labels/EditLabelPage/EditLabelPage.tests.tsx
index 62ca04ca1b9..522c1dc3f36 100644
--- a/frontend/pages/labels/EditLabelPage/EditLabelPage.tests.tsx
+++ b/frontend/pages/labels/EditLabelPage/EditLabelPage.tests.tsx
@@ -50,7 +50,7 @@ describe("EditLabelPage", () => {
     render(<EditLabelPage {...routerProps} />);
 
     // waiting for the message to render
-    const queryLabel = await screen.findByText("Query");
+    const queryLabel = await screen.findByText("Report");
     const platformLabel = await screen.findByText("Platform");
 
     expect(queryLabel).toBeInTheDocument();
diff --git a/frontend/pages/labels/NewLabelPage/NewLabelPage.tsx b/frontend/pages/labels/NewLabelPage/NewLabelPage.tsx
index ce1c6df2afd..3342303a241 100644
--- a/frontend/pages/labels/NewLabelPage/NewLabelPage.tsx
+++ b/frontend/pages/labels/NewLabelPage/NewLabelPage.tsx
@@ -444,7 +444,7 @@ const NewLabelPage = ({
               onChange={onQueryChange}
               onBlur={onInputBlur}
               value={labelQuery}
-              label="Query"
+              label="Report"
               labelActionComponent={
                 showOpenSidebarButton ? (
                   <Button variant="inverse" onClick={onOpenSidebar}>
diff --git a/frontend/pages/labels/components/DynamicLabelForm/DynamicLabelForm.tests.tsx b/frontend/pages/labels/components/DynamicLabelForm/DynamicLabelForm.tests.tsx
index 0d79fa854e2..71765f8f1ac 100644
--- a/frontend/pages/labels/components/DynamicLabelForm/DynamicLabelForm.tests.tsx
+++ b/frontend/pages/labels/components/DynamicLabelForm/DynamicLabelForm.tests.tsx
@@ -10,7 +10,7 @@ describe("DynamicLabelForm", () => {
   it("should render the Fleet Ace and Select Platform input", () => {
     render(<DynamicLabelForm onSave={noop} onCancel={noop} teamName={null} />);
 
-    expect(screen.getByText("Query")).toBeInTheDocument();
+    expect(screen.getByText("Report")).toBeInTheDocument();
     expect(screen.getByText("All platforms")).toBeInTheDocument();
   });
 
diff --git a/frontend/pages/labels/components/DynamicLabelForm/DynamicLabelForm.tsx b/frontend/pages/labels/components/DynamicLabelForm/DynamicLabelForm.tsx
index 3e275170e13..7d603dc1384 100644
--- a/frontend/pages/labels/components/DynamicLabelForm/DynamicLabelForm.tsx
+++ b/frontend/pages/labels/components/DynamicLabelForm/DynamicLabelForm.tsx
@@ -133,7 +133,7 @@ const DynamicLabelForm = ({
               name="query"
               onChange={onQueryChange}
               value={query}
-              label="Query"
+              label="Report"
               labelActionComponent={renderLabelComponent()}
               readOnly={isEditing}
               onLoad={onLoad}
diff --git a/frontend/pages/policies/PolicyPage/components/PolicyForm/PolicyForm.tsx b/frontend/pages/policies/PolicyPage/components/PolicyForm/PolicyForm.tsx
index 3577aaa2891..01dc5b5dab4 100644
--- a/frontend/pages/policies/PolicyPage/components/PolicyForm/PolicyForm.tsx
+++ b/frontend/pages/policies/PolicyPage/components/PolicyForm/PolicyForm.tsx
@@ -738,7 +738,7 @@ const PolicyForm = ({
           <SQLEditor
             value={lastEditedQueryBody}
             error={errors.query}
-            label="Query"
+            label="Report"
             labelActionComponent={renderLabelComponent()}
             name="query editor"
             onLoad={onLoad}
diff --git a/frontend/pages/policies/PolicyPage/components/PolicyResults/PolicyResults.tsx b/frontend/pages/policies/PolicyPage/components/PolicyResults/PolicyResults.tsx
index 6b76eea93aa..c64a6387113 100644
--- a/frontend/pages/policies/PolicyPage/components/PolicyResults/PolicyResults.tsx
+++ b/frontend/pages/policies/PolicyPage/components/PolicyResults/PolicyResults.tsx
@@ -118,7 +118,7 @@ const PolicyResults = ({
           variant="inverse"
         >
           <>
-            Show query <Icon name="eye" />
+            Show report <Icon name="eye" />
           </>
         </Button>
         <Button
diff --git a/frontend/pages/queries/details/QueryDetailsPage/QueryDetailsPage.tsx b/frontend/pages/queries/details/QueryDetailsPage/QueryDetailsPage.tsx
index 0b81955e57c..858e0eb4bab 100644
--- a/frontend/pages/queries/details/QueryDetailsPage/QueryDetailsPage.tsx
+++ b/frontend/pages/queries/details/QueryDetailsPage/QueryDetailsPage.tsx
@@ -289,7 +289,7 @@ const QueryDetailsPage = ({
                   onClick={onShowQueryModal}
                   variant="inverse"
                 >
-                  Show query
+                  Show report
                 </Button>
                 {canLiveQuery && (
                   <div
diff --git a/frontend/pages/queries/edit/components/EditQueryForm/EditQueryForm.tsx b/frontend/pages/queries/edit/components/EditQueryForm/EditQueryForm.tsx
index 6270e34c786..80143521ced 100644
--- a/frontend/pages/queries/edit/components/EditQueryForm/EditQueryForm.tsx
+++ b/frontend/pages/queries/edit/components/EditQueryForm/EditQueryForm.tsx
@@ -616,7 +616,7 @@ const EditQueryForm = ({
         <SQLEditor
           value={lastEditedQueryBody}
           name="query editor"
-          label="Query"
+          label="Report"
           wrapperClassName={`${baseClass}__text-editor-wrapper`}
           readOnly={
             (!isObserverPlus && !isAnyTeamObserverPlus) || savedQueryMode
@@ -729,7 +729,7 @@ const EditQueryForm = ({
           <SQLEditor
             value={lastEditedQueryBody}
             error={errors.query}
-            label="Query"
+            label="Report"
             labelActionComponent={renderLabelComponent()}
             name="query editor"
             onLoad={onLoad}
diff --git a/frontend/pages/queries/edit/components/QueryResults/QueryResults.tsx b/frontend/pages/queries/edit/components/QueryResults/QueryResults.tsx
index b764bce7c46..3479106b212 100644
--- a/frontend/pages/queries/edit/components/QueryResults/QueryResults.tsx
+++ b/frontend/pages/queries/edit/components/QueryResults/QueryResults.tsx
@@ -188,7 +188,7 @@ const QueryResults = ({
           variant="inverse"
         >
           <>
-            Show query <Icon name="eye" />
+            Show report <Icon name="eye" />
           </>
         </Button>
         <Button

From b1cc5e88d12eac7d5ab6c3041bbc9232d058e58a Mon Sep 17 00:00:00 2001
From: nulmete <nicoulmete1@gmail.com>
Date: Mon, 23 Feb 2026 17:07:18 -0300
Subject: [PATCH 2/3] Scott's feedback

---
 frontend/components/forms/validators/validate_query/index.ts  | 2 +-
 frontend/components/modals/ShowQueryModal/ShowQueryModal.tsx  | 2 +-
 .../AdvancedOptionsModal/AdvancedOptionsModal.tsx             | 2 +-
 .../pages/hosts/details/HostQueryReport/HQRTable/HQRTable.tsx | 2 +-
 frontend/pages/labels/NewLabelPage/NewLabelPage.tsx           | 2 +-
 .../labels/components/DynamicLabelForm/DynamicLabelForm.tsx   | 2 +-
 .../policies/PolicyPage/components/PolicyForm/PolicyForm.tsx  | 2 +-
 .../PolicyPage/components/PolicyResults/PolicyResults.tsx     | 2 +-
 .../queries/details/QueryDetailsPage/QueryDetailsPage.tsx     | 2 +-
 .../queries/edit/components/EditQueryForm/EditQueryForm.tsx   | 4 ++--
 .../queries/edit/components/QueryResults/QueryResults.tsx     | 2 +-
 11 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/frontend/components/forms/validators/validate_query/index.ts b/frontend/components/forms/validators/validate_query/index.ts
index 7737cd78d23..110ae9cef66 100644
--- a/frontend/components/forms/validators/validate_query/index.ts
+++ b/frontend/components/forms/validators/validate_query/index.ts
@@ -1,6 +1,6 @@
 import { Parser } from "node-sql-parser";
 
-export const EMPTY_QUERY_ERR = "Report text must be present";
+export const EMPTY_QUERY_ERR = "Query text must be present";
 export const INVALID_SYNTAX_ERR = "Syntax error. Please review before saving.";
 
 const invalidQueryResponse = (message: string) => {
diff --git a/frontend/components/modals/ShowQueryModal/ShowQueryModal.tsx b/frontend/components/modals/ShowQueryModal/ShowQueryModal.tsx
index 9077c52a482..8d64272b844 100644
--- a/frontend/components/modals/ShowQueryModal/ShowQueryModal.tsx
+++ b/frontend/components/modals/ShowQueryModal/ShowQueryModal.tsx
@@ -29,7 +29,7 @@ const ShowQueryModal = ({
       <div className={baseClass}>
         <SQLEditor
           value={query}
-          name="Report"
+          name="Query"
           wrapperClassName={`${baseClass}__text-editor-wrapper`}
           wrapEnabled
           readOnly
diff --git a/frontend/pages/SoftwarePage/SoftwareTitleDetailsPage/AdvancedOptionsModal/AdvancedOptionsModal.tsx b/frontend/pages/SoftwarePage/SoftwareTitleDetailsPage/AdvancedOptionsModal/AdvancedOptionsModal.tsx
index 069a49bf39b..0b65affec5d 100644
--- a/frontend/pages/SoftwarePage/SoftwareTitleDetailsPage/AdvancedOptionsModal/AdvancedOptionsModal.tsx
+++ b/frontend/pages/SoftwarePage/SoftwareTitleDetailsPage/AdvancedOptionsModal/AdvancedOptionsModal.tsx
@@ -45,7 +45,7 @@ const AdvancedOptionsModal = ({
               <SQLEditor
                 readOnly
                 value={preInstallQuery}
-                label="Report"
+                label="Query"
                 name="preInstallQuery"
                 maxLines={10}
                 helpText={
diff --git a/frontend/pages/hosts/details/HostQueryReport/HQRTable/HQRTable.tsx b/frontend/pages/hosts/details/HostQueryReport/HQRTable/HQRTable.tsx
index 0c0131fe285..1fd1c602e87 100644
--- a/frontend/pages/hosts/details/HostQueryReport/HQRTable/HQRTable.tsx
+++ b/frontend/pages/hosts/details/HostQueryReport/HQRTable/HQRTable.tsx
@@ -111,7 +111,7 @@ const HQRTable = ({
           variant="inverse"
         >
           <>
-            Show report <Icon name="eye" />
+            Show query <Icon name="eye" />
           </>
         </Button>
         <Button
diff --git a/frontend/pages/labels/NewLabelPage/NewLabelPage.tsx b/frontend/pages/labels/NewLabelPage/NewLabelPage.tsx
index 3342303a241..ce1c6df2afd 100644
--- a/frontend/pages/labels/NewLabelPage/NewLabelPage.tsx
+++ b/frontend/pages/labels/NewLabelPage/NewLabelPage.tsx
@@ -444,7 +444,7 @@ const NewLabelPage = ({
               onChange={onQueryChange}
               onBlur={onInputBlur}
               value={labelQuery}
-              label="Report"
+              label="Query"
               labelActionComponent={
                 showOpenSidebarButton ? (
                   <Button variant="inverse" onClick={onOpenSidebar}>
diff --git a/frontend/pages/labels/components/DynamicLabelForm/DynamicLabelForm.tsx b/frontend/pages/labels/components/DynamicLabelForm/DynamicLabelForm.tsx
index 7d603dc1384..3e275170e13 100644
--- a/frontend/pages/labels/components/DynamicLabelForm/DynamicLabelForm.tsx
+++ b/frontend/pages/labels/components/DynamicLabelForm/DynamicLabelForm.tsx
@@ -133,7 +133,7 @@ const DynamicLabelForm = ({
               name="query"
               onChange={onQueryChange}
               value={query}
-              label="Report"
+              label="Query"
               labelActionComponent={renderLabelComponent()}
               readOnly={isEditing}
               onLoad={onLoad}
diff --git a/frontend/pages/policies/PolicyPage/components/PolicyForm/PolicyForm.tsx b/frontend/pages/policies/PolicyPage/components/PolicyForm/PolicyForm.tsx
index 01dc5b5dab4..3577aaa2891 100644
--- a/frontend/pages/policies/PolicyPage/components/PolicyForm/PolicyForm.tsx
+++ b/frontend/pages/policies/PolicyPage/components/PolicyForm/PolicyForm.tsx
@@ -738,7 +738,7 @@ const PolicyForm = ({
           <SQLEditor
             value={lastEditedQueryBody}
             error={errors.query}
-            label="Report"
+            label="Query"
             labelActionComponent={renderLabelComponent()}
             name="query editor"
             onLoad={onLoad}
diff --git a/frontend/pages/policies/PolicyPage/components/PolicyResults/PolicyResults.tsx b/frontend/pages/policies/PolicyPage/components/PolicyResults/PolicyResults.tsx
index c64a6387113..6b76eea93aa 100644
--- a/frontend/pages/policies/PolicyPage/components/PolicyResults/PolicyResults.tsx
+++ b/frontend/pages/policies/PolicyPage/components/PolicyResults/PolicyResults.tsx
@@ -118,7 +118,7 @@ const PolicyResults = ({
           variant="inverse"
         >
           <>
-            Show report <Icon name="eye" />
+            Show query <Icon name="eye" />
           </>
         </Button>
         <Button
diff --git a/frontend/pages/queries/details/QueryDetailsPage/QueryDetailsPage.tsx b/frontend/pages/queries/details/QueryDetailsPage/QueryDetailsPage.tsx
index 858e0eb4bab..0b81955e57c 100644
--- a/frontend/pages/queries/details/QueryDetailsPage/QueryDetailsPage.tsx
+++ b/frontend/pages/queries/details/QueryDetailsPage/QueryDetailsPage.tsx
@@ -289,7 +289,7 @@ const QueryDetailsPage = ({
                   onClick={onShowQueryModal}
                   variant="inverse"
                 >
-                  Show report
+                  Show query
                 </Button>
                 {canLiveQuery && (
                   <div
diff --git a/frontend/pages/queries/edit/components/EditQueryForm/EditQueryForm.tsx b/frontend/pages/queries/edit/components/EditQueryForm/EditQueryForm.tsx
index 80143521ced..6270e34c786 100644
--- a/frontend/pages/queries/edit/components/EditQueryForm/EditQueryForm.tsx
+++ b/frontend/pages/queries/edit/components/EditQueryForm/EditQueryForm.tsx
@@ -616,7 +616,7 @@ const EditQueryForm = ({
         <SQLEditor
           value={lastEditedQueryBody}
           name="query editor"
-          label="Report"
+          label="Query"
           wrapperClassName={`${baseClass}__text-editor-wrapper`}
           readOnly={
             (!isObserverPlus && !isAnyTeamObserverPlus) || savedQueryMode
@@ -729,7 +729,7 @@ const EditQueryForm = ({
           <SQLEditor
             value={lastEditedQueryBody}
             error={errors.query}
-            label="Report"
+            label="Query"
             labelActionComponent={renderLabelComponent()}
             name="query editor"
             onLoad={onLoad}
diff --git a/frontend/pages/queries/edit/components/QueryResults/QueryResults.tsx b/frontend/pages/queries/edit/components/QueryResults/QueryResults.tsx
index 3479106b212..b764bce7c46 100644
--- a/frontend/pages/queries/edit/components/QueryResults/QueryResults.tsx
+++ b/frontend/pages/queries/edit/components/QueryResults/QueryResults.tsx
@@ -188,7 +188,7 @@ const QueryResults = ({
           variant="inverse"
         >
           <>
-            Show report <Icon name="eye" />
+            Show query <Icon name="eye" />
           </>
         </Button>
         <Button

From a5e306163bb15dec280ffd0f4e2aaf0e41e721d0 Mon Sep 17 00:00:00 2001
From: nulmete <nicoulmete1@gmail.com>
Date: Mon, 23 Feb 2026 17:09:32 -0300
Subject: [PATCH 3/3] Missing changes from Scott's feedback

---
 frontend/components/modals/ShowQueryModal/ShowQueryModal.tsx    | 2 +-
 .../AdvancedOptionsModal/AdvancedOptionsModal.tsx               | 2 +-
 frontend/pages/labels/EditLabelPage/EditLabelPage.tests.tsx     | 2 +-
 .../components/DynamicLabelForm/DynamicLabelForm.tests.tsx      | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/frontend/components/modals/ShowQueryModal/ShowQueryModal.tsx b/frontend/components/modals/ShowQueryModal/ShowQueryModal.tsx
index 8d64272b844..7c2d5337cc0 100644
--- a/frontend/components/modals/ShowQueryModal/ShowQueryModal.tsx
+++ b/frontend/components/modals/ShowQueryModal/ShowQueryModal.tsx
@@ -21,7 +21,7 @@ const ShowQueryModal = ({
 }: IShowQueryModalProps): JSX.Element => {
   return (
     <Modal
-      title="Report"
+      title="Query"
       onExit={onCancel}
       onEnter={onCancel}
       className={baseClass}
diff --git a/frontend/pages/SoftwarePage/SoftwareTitleDetailsPage/AdvancedOptionsModal/AdvancedOptionsModal.tsx b/frontend/pages/SoftwarePage/SoftwareTitleDetailsPage/AdvancedOptionsModal/AdvancedOptionsModal.tsx
index 0b65affec5d..8f17704cfdf 100644
--- a/frontend/pages/SoftwarePage/SoftwareTitleDetailsPage/AdvancedOptionsModal/AdvancedOptionsModal.tsx
+++ b/frontend/pages/SoftwarePage/SoftwareTitleDetailsPage/AdvancedOptionsModal/AdvancedOptionsModal.tsx
@@ -53,7 +53,7 @@ const AdvancedOptionsModal = ({
                     Software will be installed only if the{" "}
                     <CustomLink
                       className={`${baseClass}__table-link`}
-                      text="report returns results"
+                      text="query returns results"
                       url="https://fleetdm.com/tables"
                       newTab
                     />
diff --git a/frontend/pages/labels/EditLabelPage/EditLabelPage.tests.tsx b/frontend/pages/labels/EditLabelPage/EditLabelPage.tests.tsx
index 522c1dc3f36..62ca04ca1b9 100644
--- a/frontend/pages/labels/EditLabelPage/EditLabelPage.tests.tsx
+++ b/frontend/pages/labels/EditLabelPage/EditLabelPage.tests.tsx
@@ -50,7 +50,7 @@ describe("EditLabelPage", () => {
     render(<EditLabelPage {...routerProps} />);
 
     // waiting for the message to render
-    const queryLabel = await screen.findByText("Report");
+    const queryLabel = await screen.findByText("Query");
     const platformLabel = await screen.findByText("Platform");
 
     expect(queryLabel).toBeInTheDocument();
diff --git a/frontend/pages/labels/components/DynamicLabelForm/DynamicLabelForm.tests.tsx b/frontend/pages/labels/components/DynamicLabelForm/DynamicLabelForm.tests.tsx
index 71765f8f1ac..0d79fa854e2 100644
--- a/frontend/pages/labels/components/DynamicLabelForm/DynamicLabelForm.tests.tsx
+++ b/frontend/pages/labels/components/DynamicLabelForm/DynamicLabelForm.tests.tsx
@@ -10,7 +10,7 @@ describe("DynamicLabelForm", () => {
   it("should render the Fleet Ace and Select Platform input", () => {
     render(<DynamicLabelForm onSave={noop} onCancel={noop} teamName={null} />);
 
-    expect(screen.getByText("Report")).toBeInTheDocument();
+    expect(screen.getByText("Query")).toBeInTheDocument();
     expect(screen.getByText("All platforms")).toBeInTheDocument();
   });