diff --git a/spfx/src/webparts/siteAdmin/SiteAdminWebPart.manifest.json b/spfx/src/webparts/siteAdmin/SiteAdminWebPart.manifest.json
index 6c5469f..b6495bd 100644
--- a/spfx/src/webparts/siteAdmin/SiteAdminWebPart.manifest.json
+++ b/spfx/src/webparts/siteAdmin/SiteAdminWebPart.manifest.json
@@ -113,7 +113,6 @@
         "WebPropSearchPropertyDescription": "The custom property to set for search.",
         "WebPropSearchPropertyKey": "",
         "WebPropSearchPropertyLabel": "Search Property:",
-        "WebPropSearchPropertyReportName": "Search Property",
         "WebPropSearchPropertyTabName": "",
         "WebPropSearchScope": false,
         "WebPropSearchScopeDescription": "The search scope for the site to target. Default is 'Site'.",
diff --git a/spfx/src/webparts/siteAdmin/SiteAdminWebPart.ts b/spfx/src/webparts/siteAdmin/SiteAdminWebPart.ts
index 7abaeaf..781c546 100644
--- a/spfx/src/webparts/siteAdmin/SiteAdminWebPart.ts
+++ b/spfx/src/webparts/siteAdmin/SiteAdminWebPart.ts
@@ -104,6 +104,20 @@ export interface ISiteAdminWebPartProps {
   ReportsDocSearchFileExt: string;
   ReportsDocSearchKeywords: string;
   ReportsDocSearchRegexPatterns: string;
+  ReportNameDLP: string;
+  ReportNameDocRetention: string;
+  ReportNameExternalShares: string;
+  ReportNameExternalUsers: string;
+  ReportNamePermissions: string;
+  ReportNameRetention: string;
+  ReportNameSearchAgents: string;
+  ReportNameSearchDocs: string;
+  ReportNameSearchEEEU: string;
+  ReportNameSearchProp: string;
+  ReportNameSearchUsers: string;
+  ReportNameSensitivityLabels: string;
+  ReportNameSharingLinks: string;
+  ReportNameUniquePermissions: string;
   ReportsSecureFileText: string;
   ReportsOversharedGroups: string;
   SensitivityLabelFileExt: string;
@@ -177,7 +191,6 @@ export interface ISiteAdminWebPartProps {
   WebPropSearchPropertyKey: string;
   WebPropSearchPropertyLabel: string;
   WebPropSearchPropertyManagedProperty: string;
-  WebPropSearchPropertyReportName: string;
   WebPropSearchPropertyTabName: string;
   WebPropSearchPropertyValues: string;
   WebPropSearchScope: boolean;
@@ -234,6 +247,22 @@ declare const SiteAdmin: {
     maxStorageSize?: number;
     siteAttestation?: boolean;
     siteAttestationText?: string;
+    reportNames?: {
+      dlp: string;
+      docRetention: string;
+      externalShares: string;
+      externalUsers: string;
+      permissions: string;
+      retention: string;
+      searchAgents: string;
+      searchDocs: string;
+      searchEEEU: string;
+      searchProp: string;
+      searchUsers: string;
+      sensitivityLabels: string;
+      sharingLinks: string;
+      uniquePermissions: string;
+    }
     reportProps?: {
       docRententionYears?: string;
       dlpFileExt?: string;
@@ -249,7 +278,6 @@ declare const SiteAdmin: {
       key: string;
       label: string;
       managedProperty: string;
-      reportName: string;
       tabName: string;
       values: string;
     }
@@ -688,11 +716,6 @@ export default class SiteAdminWebPart extends BaseClientSideWebPart<ISiteAdminWe
                   description: "The custom tab name for this property.",
                   value: this.properties.WebPropSearchPropertyTabName
                 }),
-                PropertyPaneTextField("WebPropSearchPropertyReportName", {
-                  label: strings.WebPropSearchPropertyReportName,
-                  description: "The report name to for this custom property.",
-                  value: this.properties.WebPropSearchPropertyReportName
-                }),
                 PropertyPaneTextField("WebPropSearchPropertyLabel", {
                   label: strings.WebPropSearchPropertyLabel,
                   description: "The label to display for the custom property in the form.",
@@ -815,6 +838,85 @@ export default class SiteAdminWebPart extends BaseClientSideWebPart<ISiteAdminWe
             }
           ]
         },
+        {
+          groups: [
+            {
+              groupName: "Report Names",
+              groupFields: [
+                PropertyPaneTextField("ReportNameDLP", {
+                  label: "Data Loss Prevention (DLP):",
+                  description: "The report name displayed in the form.",
+                  value: this.properties.ReportNameDLP
+                }),
+                PropertyPaneTextField("HideReportDocRetention", {
+                  label: "Document Retention:",
+                  description: "The report name displayed in the form.",
+                  value: this.properties.ReportNameDocRetention
+                }),
+                PropertyPaneTextField("HideReportExternalShares", {
+                  label: "External Shares:",
+                  description: "The report name displayed in the form.",
+                  value: this.properties.ReportNameExternalShares
+                }),
+                PropertyPaneTextField("HideReportExternalUsers", {
+                  label: "External Users:",
+                  description: "The report name displayed in the form.",
+                  value: this.properties.ReportNameExternalUsers
+                }),
+                PropertyPaneTextField("HideReportPermissions", {
+                  label: "Permissions:",
+                  description: "The report name displayed in the form.",
+                  value: this.properties.ReportNamePermissions
+                }),
+                PropertyPaneTextField("HideReportRetention", {
+                  label: "Retention:",
+                  description: "The report name displayed in the form.",
+                  value: this.properties.ReportNameRetention
+                }),
+                PropertyPaneTextField("HideReportSearchAgents", {
+                  label: "Search Agents:",
+                  description: "The report name displayed in the form.",
+                  value: this.properties.ReportNameSearchAgents
+                }),
+                PropertyPaneTextField("HideReportSearchDocs", {
+                  label: "Document Search:",
+                  description: "The report name displayed in the form.",
+                  value: this.properties.ReportNameSearchDocs
+                }),
+                PropertyPaneTextField("HideReportSearchEEEU", {
+                  label: "Search EEEU:",
+                  description: "The report name displayed in the form.",
+                  value: this.properties.ReportNameSearchEEEU
+                }),
+                PropertyPaneTextField("HideReportSearchProp", {
+                  label: "Search Property:",
+                  description: "The report name displayed in the form.",
+                  value: this.properties.ReportNameSearchProp
+                }),
+                PropertyPaneTextField("HideReportSearchUsers", {
+                  label: "Search Users:",
+                  description: "The report name displayed in the form.",
+                  value: this.properties.ReportNameSearchUsers
+                }),
+                PropertyPaneTextField("HideReportSensitivityLabels", {
+                  label: "Sensitivity Labels:",
+                  description: "The report name displayed in the form.",
+                  value: this.properties.ReportNameSensitivityLabels
+                }),
+                PropertyPaneTextField("HideReportSharingLinks", {
+                  label: "Sharing Links:",
+                  description: "The report name displayed in the form.",
+                  value: this.properties.ReportNameSharingLinks
+                }),
+                PropertyPaneTextField("HideReportUniquePermissions", {
+                  label: "Unique Permissions:",
+                  description: "The report name displayed in the form.",
+                  value: this.properties.ReportNameUniquePermissions
+                })
+              ]
+            }
+          ]
+        },
         {
           groups: [
             {
@@ -959,6 +1061,22 @@ export default class SiteAdminWebPart extends BaseClientSideWebPart<ISiteAdminWe
       maxRequests: this.properties.MaxRequests,
       maxStorageDesc: this.properties.MaxStorageDescription,
       maxStorageSize,
+      reportNames: {
+        dlp: this.properties.ReportNameDLP,
+        docRetention: this.properties.ReportNameDocRetention,
+        externalShares: this.properties.ReportNameExternalShares,
+        externalUsers: this.properties.ReportNameExternalUsers,
+        permissions: this.properties.ReportNamePermissions,
+        retention: this.properties.ReportNameRetention,
+        searchAgents: this.properties.ReportNameSearchAgents,
+        searchDocs: this.properties.ReportNameSearchDocs,
+        searchEEEU: this.properties.ReportNameSearchEEEU,
+        searchProp: this.properties.ReportNameSearchProp,
+        searchUsers: this.properties.ReportNameSearchUsers,
+        sensitivityLabels: this.properties.ReportNameSensitivityLabels,
+        sharingLinks: this.properties.ReportNameSharingLinks,
+        uniquePermissions: this.properties.ReportNameUniquePermissions
+      },
       reportProps: {
         dlpFileExt: this.properties.ReportsDLPFileExt,
         docRententionYears: this.properties.ReportsDocRententionYears,
@@ -974,7 +1092,6 @@ export default class SiteAdminWebPart extends BaseClientSideWebPart<ISiteAdminWe
         key: this.properties.WebPropSearchPropertyKey,
         label: this.properties.WebPropSearchPropertyLabel,
         managedProperty: this.properties.WebPropSearchPropertyManagedProperty,
-        reportName: this.properties.WebPropSearchPropertyReportName,
         tabName: this.properties.WebPropSearchPropertyTabName,
         values: this.properties.WebPropSearchPropertyValues
       },
diff --git a/spfx/src/webparts/siteAdmin/loc/en-us.js b/spfx/src/webparts/siteAdmin/loc/en-us.js
index cff0d53..704c3b9 100644
--- a/spfx/src/webparts/siteAdmin/loc/en-us.js
+++ b/spfx/src/webparts/siteAdmin/loc/en-us.js
@@ -41,7 +41,6 @@ define([], function () {
     "WebPropSearchPropertyDescription": "Description",
     "WebPropSearchPropertyLabel": "Label",
     "WebPropSearchPropertyManagedProperty": "Managed Property",
-    "WebPropSearchPropertyReportName": "Report Name",
     "WebPropSearchPropertyTabName": "Tab Name",
     "WebPropSearchPropertyValues": "Values",
     "WebPropSearchScope": "Search Scope",
diff --git a/spfx/src/webparts/siteAdmin/loc/mystrings.d.ts b/spfx/src/webparts/siteAdmin/loc/mystrings.d.ts
index fecd301..bd017c2 100644
--- a/spfx/src/webparts/siteAdmin/loc/mystrings.d.ts
+++ b/spfx/src/webparts/siteAdmin/loc/mystrings.d.ts
@@ -40,7 +40,6 @@ declare interface ISiteAdminWebPartStrings {
   WebPropSearchPropertyDescription: string;
   WebPropSearchPropertyLabel: string;
   WebPropSearchPropertyManagedProperty: string;
-  WebPropSearchPropertyReportName: string;
   WebPropSearchPropertyTabName: string;
   WebPropSearchPropertyValues: string;
   WebPropSearchScope: string;
diff --git a/src/app.ts b/src/app.ts
index 8f219bc..0e3f161 100644
--- a/src/app.ts
+++ b/src/app.ts
@@ -8,7 +8,7 @@ import Strings from "./strings";
 import { Security } from "./security";
 import { SiteAttestationForm } from "./siteAttestationForm";
 import { Tabs } from "./tabs";
-import { IReportProps } from "./tabs/reports";
+import { IReportNames, IReportProps } from "./tabs/reports";
 import { ISearchProps } from "./tabs/searchProp";
 
 // App Properties
@@ -55,6 +55,7 @@ export interface IAppProps {
     maxRequests?: number;
     maxStorageDesc?: string;
     maxStorageSize?: number;
+    reportNames?: IReportNames;
     reportProps?: IReportProps;
     searchProps?: ISearchProps;
     siteAttestation?: boolean;
diff --git a/src/tabs/lists.ts b/src/tabs/lists.ts
index f979155..86175ea 100644
--- a/src/tabs/lists.ts
+++ b/src/tabs/lists.ts
@@ -601,7 +601,7 @@ export class ListsTab {
         // DLP
         if (typeof (this._appProps.hideReports.dlp) === "undefined" || this._appProps.hideReports.dlp != true) {
             items.push({
-                text: "Data Loss Prevention",
+                text: this._appProps.reportNames.dlp || "Data Loss Prevention",
                 data: "Finds files that has DLP applied to it.",
                 value: ReportTypes.DLP
             });
@@ -612,7 +612,7 @@ export class ListsTab {
             // Ensure it's a library
             if (isLibrary) {
                 items.push({
-                    text: "Search Agents",
+                    text: this._appProps.reportNames.searchAgents || "Search Agents",
                     data: "Search the library for agents.",
                     value: ReportTypes.SearchAgents
                 });
@@ -623,7 +623,7 @@ export class ListsTab {
         if (isLibrary && item.DriveId) {
             if (typeof (this._appProps.hideReports.searchDocs) === "undefined" || this._appProps.hideReports.searchDocs != true) {
                 items.push({
-                    text: "Search Documents",
+                    text: this._appProps.reportNames.searchDocs || "Search Documents",
                     data: "Search for documents using regex patterns.",
                     value: ReportTypes.SearchDocs
                 });
@@ -633,7 +633,7 @@ export class ListsTab {
         // Search EEEU
         if (typeof (this._appProps.hideReports.searchEEEU) === "undefined" || this._appProps.hideReports.searchEEEU != true) {
             items.push({
-                text: "Search EEEU",
+                text: this._appProps.reportNames.searchEEEU || "Search EEEU",
                 data: "Search for the 'Every' and 'Everyone exception external users' accounts.",
                 value: ReportTypes.SearchEEEU
             });
@@ -644,7 +644,7 @@ export class ListsTab {
             // See if we are displaying this option
             if (typeof (this._appProps.hideReports.sensitivityLabels) === "undefined" || this._appProps.hideReports.sensitivityLabels != true) {
                 items.push({
-                    text: "Sensitivity Labels",
+                    text: this._appProps.reportNames.sensitivityLabels || "Sensitivity Labels",
                     data: "Click to view sensitivity label options.",
                     value: ReportTypes.SensitivityLabels
                 });
@@ -654,7 +654,7 @@ export class ListsTab {
         // Unique Permissions
         if (typeof (this._appProps.hideReports.uniquePermissions) === "undefined" || this._appProps.hideReports.uniquePermissions != true) {
             items.push({
-                text: "Unique Permissions",
+                text: this._appProps.reportNames.uniquePermissions || "Unique Permissions",
                 data: "Scans for items that have unique permissions.",
                 value: ReportTypes.UniquePermissions
             });
diff --git a/src/tabs/reports.ts b/src/tabs/reports.ts
index c691347..fc42b4d 100644
--- a/src/tabs/reports.ts
+++ b/src/tabs/reports.ts
@@ -5,6 +5,24 @@ import * as Reports from "../reports";
 import { ViewPermissions } from "../reports/viewPermissions";
 import { ISearchProps } from "./searchProp";
 
+// Report Names
+export interface IReportNames {
+    dlp: string;
+    docRetention: string;
+    externalShares: string;
+    externalUsers: string;
+    permissions: string;
+    retention: string;
+    searchAgents: string;
+    searchDocs: string;
+    searchEEEU: string;
+    searchProp: string;
+    searchUsers: string;
+    sensitivityLabels: string;
+    sharingLinks: string;
+    uniquePermissions: string;
+}
+
 // Report Properties
 export interface IReportProps {
     dlpFileExt?: string;
@@ -85,65 +103,65 @@ export class ReportsTab {
         // Add the reports
         if (typeof (this._appProps.hideReports.dlp) === "undefined" || this._appProps.hideReports.dlp != true) {
             items.push({
-                text: "Data Loss Prevention",
+                text: this._appProps.reportNames.dlp || "Data Loss Prevention",
                 data: "Finds files that has DLP applied to it.",
                 value: ReportTypes.DLP
             });
         }
         if (typeof (this._appProps.hideReports.docRetention) === "undefined" || this._appProps.hideReports.docRetention != true) {
             items.push({
-                text: "Document Retention",
+                text: this._appProps.reportNames.docRetention || "Document Retention",
                 data: "Find documents older than a specified date.",
                 value: ReportTypes.DocRetention
             });
         }
         if (typeof (this._appProps.hideReports.externalShares) === "undefined" || this._appProps.hideReports.externalShares != true) {
             items.push({
-                text: "External Shares",
+                text: this._appProps.reportNames.externalShares || "External Shares",
                 data: "Scans for documents that have been shared externally.",
                 value: ReportTypes.ExternalShares
             });
         }
         if (typeof (this._appProps.hideReports.externalUsers) === "undefined" || this._appProps.hideReports.externalUsers != true) {
             items.push({
-                text: "External Users",
+                text: this._appProps.reportNames.externalUsers || "External Users",
                 data: "Scans the user information list for 'external' user accounts.",
                 value: ReportTypes.ExternalUsers
             });
         }
         if (typeof (this._appProps.hideReports.permissions) === "undefined" || this._appProps.hideReports.permissions != true) {
             items.push({
-                text: "Permissions",
+                text: this._appProps.reportNames.permissions || "Permissions",
                 data: "Scans all users/groups that have permissions to the site.",
                 value: ReportTypes.Permissions
             });
         }
         if (typeof (this._appProps.hideReports.searchAgents) === "undefined" || this._appProps.hideReports.searchAgents != true) {
             items.push({
-                text: "Search Agents",
+                text: this._appProps.reportNames.searchAgents || "Search Agents",
                 data: "Searches all libraries for agent files in the site.",
                 value: ReportTypes.SearchAgents
             });
         }
         if (typeof (this._appProps.hideReports.searchDocs) === "undefined" || this._appProps.hideReports.searchDocs != true) {
             items.push({
-                text: "Search Documents",
+                text: this._appProps.reportNames.searchDocs || "Search Documents",
                 data: "Find documents by keywords.",
                 value: ReportTypes.SearchDocs
             });
         }
         if (typeof (this._appProps.hideReports.searchEEEU) === "undefined" || this._appProps.hideReports.searchEEEU != true) {
             items.push({
-                text: "Search EEEU",
+                text: this._appProps.reportNames.searchEEEU || "Search EEEU",
                 data: "Search for the 'Every' and 'Everyone exception external users' accounts.",
                 value: ReportTypes.SearchEEEU
             });
         }
         if (typeof (this._appProps.hideReports.searchProp) === "undefined" || this._appProps.hideReports.searchProp != true) {
             // Ensure the property is set
-            if (this._searchProps.reportName) {
+            if (this._searchProps.key) {
                 items.push({
-                    text: this._searchProps.reportName || "Search Property",
+                    text: this._appProps.reportNames.searchProp || "Search Property",
                     data: "Find sites by search property.",
                     value: ReportTypes.SearchProp,
                     isDisabled: this._searchProps.managedProperty && DataSource.SearchPropItems ? false : true
@@ -152,28 +170,28 @@ export class ReportsTab {
         }
         if (typeof (this._appProps.hideReports.searchUsers) === "undefined" || this._appProps.hideReports.searchUsers != true) {
             items.push({
-                text: "Search Users",
+                text: this._appProps.reportNames.searchUsers || "Search Users",
                 data: "Search users by keyword or account.",
                 value: ReportTypes.SearchUsers
             });
         }
         if (typeof (this._appProps.hideReports.sensitivityLabels) === "undefined" || this._appProps.hideReports.sensitivityLabels != true) {
             items.push({
-                text: "Sensitivity Labels",
+                text: this._appProps.reportNames.sensitivityLabels || "Sensitivity Labels",
                 data: "Search for files that have sensitivity labels.",
                 value: ReportTypes.SensitivityLabels
             });
         }
         if (typeof (this._appProps.hideReports.sharingLinks) === "undefined" || this._appProps.hideReports.sharingLinks != true) {
             items.push({
-                text: "Sharing Links",
+                text: this._appProps.reportNames.sharingLinks || "Sharing Links",
                 data: "Scans for any 'Sharing Link' groups.",
                 value: ReportTypes.SharingLinks
             });
         }
         if (typeof (this._appProps.hideReports.uniquePermissions) === "undefined" || this._appProps.hideReports.uniquePermissions != true) {
             items.push({
-                text: "Unique Permissions",
+                text: this._appProps.reportNames.uniquePermissions || "Unique Permissions",
                 data: "Scans for items that have unique permissions.",
                 value: ReportTypes.UniquePermissions
             });
diff --git a/src/tabs/searchProp.ts b/src/tabs/searchProp.ts
index d2c4c18..deb1754 100644
--- a/src/tabs/searchProp.ts
+++ b/src/tabs/searchProp.ts
@@ -7,7 +7,6 @@ export interface ISearchProps {
     key: string;
     label: string;
     managedProperty: string;
-    reportName: string;
     tabName: string;
     values: string;
 }