diff --git a/client/src/app/components/FilterToolbar/FilterToolbar.tsx b/client/src/app/components/FilterToolbar/FilterToolbar.tsx
index 8987a63432..1638ce7589 100644
--- a/client/src/app/components/FilterToolbar/FilterToolbar.tsx
+++ b/client/src/app/components/FilterToolbar/FilterToolbar.tsx
@@ -32,7 +32,7 @@ export interface IBasicFilterCategory<
   TFilterCategoryKey extends string, // Unique identifiers for each filter category (inferred from key properties if possible)
 > {
   /** For use in the filterValues state object. Must be unique per category. */
-  key: TFilterCategoryKey;
+  categoryKey: TFilterCategoryKey;
   /** Title of the filter as displayed in the filter selection dropdown and filter chip groups. */
   title: string;
   /** Type of filter component to use to select the filter's content. */
@@ -119,22 +119,22 @@ export const FilterToolbar = <TItem, TFilterCategoryKey extends string>({
   const [isCategoryDropdownOpen, setIsCategoryDropdownOpen] =
     React.useState(false);
   const [currentFilterCategoryKey, setCurrentFilterCategoryKey] =
-    React.useState(filterCategories[0].key);
+    React.useState(filterCategories[0].categoryKey);
 
   const onCategorySelect = (
     category: FilterCategory<TItem, TFilterCategoryKey>
   ) => {
-    setCurrentFilterCategoryKey(category.key);
+    setCurrentFilterCategoryKey(category.categoryKey);
     setIsCategoryDropdownOpen(false);
   };
 
   const setFilterValue = (
     category: FilterCategory<TItem, TFilterCategoryKey>,
     newValue: FilterValue
-  ) => setFilterValues({ ...filterValues, [category.key]: newValue });
+  ) => setFilterValues({ ...filterValues, [category.categoryKey]: newValue });
 
   const currentFilterCategory = filterCategories.find(
-    (category) => category.key === currentFilterCategoryKey
+    (category) => category.categoryKey === currentFilterCategoryKey
   );
 
   const filterGroups = filterCategories.reduce(
@@ -157,8 +157,8 @@ export const FilterToolbar = <TItem, TFilterCategoryKey extends string>({
               .map((filterCategory) => {
                 return (
                   <DropdownItem
-                    id={`filter-category-${filterCategory.key}`}
-                    key={filterCategory.key}
+                    id={`filter-category-${filterCategory.categoryKey}`}
+                    key={filterCategory.categoryKey}
                     onClick={() => onCategorySelect(filterCategory)}
                   >
                     {filterCategory.title}
@@ -171,8 +171,8 @@ export const FilterToolbar = <TItem, TFilterCategoryKey extends string>({
     } else {
       return filterCategories.map((category) => (
         <DropdownItem
-          id={`filter-category-${category.key}`}
-          key={category.key}
+          id={`filter-category-${category.categoryKey}`}
+          key={category.categoryKey}
           onClick={() => onCategorySelect(category)}
         >
           {category.title}
@@ -215,13 +215,13 @@ export const FilterToolbar = <TItem, TFilterCategoryKey extends string>({
 
         {filterCategories.map((category) => (
           <FilterControl<TItem, TFilterCategoryKey>
-            key={category.key}
+            key={category.categoryKey}
             category={category}
-            filterValue={filterValues[category.key]}
+            filterValue={filterValues[category.categoryKey]}
             setFilterValue={(newValue) => setFilterValue(category, newValue)}
             showToolbarItem={
               showFiltersSideBySide ||
-              currentFilterCategory?.key === category.key
+              currentFilterCategory?.categoryKey === category.categoryKey
             }
             isDisabled={isDisabled}
           />
diff --git a/client/src/app/components/FilterToolbar/MultiselectFilterControl.tsx b/client/src/app/components/FilterToolbar/MultiselectFilterControl.tsx
index 4662b656c1..e96da52c90 100644
--- a/client/src/app/components/FilterToolbar/MultiselectFilterControl.tsx
+++ b/client/src/app/components/FilterToolbar/MultiselectFilterControl.tsx
@@ -356,7 +356,7 @@ export const MultiselectFilterControl = <TItem,>({
 
   return (
     <ToolbarFilter
-      id={`filter-control-${category.key}`}
+      id={`filter-control-${category.categoryKey}`}
       chips={chips}
       deleteChip={(_, chip) => onFilterClear(chip)}
       deleteChipGroup={onFilterClearAll}
diff --git a/client/src/app/components/FilterToolbar/SearchFilterControl.tsx b/client/src/app/components/FilterToolbar/SearchFilterControl.tsx
index 33c782af4e..02244919e5 100644
--- a/client/src/app/components/FilterToolbar/SearchFilterControl.tsx
+++ b/client/src/app/components/FilterToolbar/SearchFilterControl.tsx
@@ -40,7 +40,7 @@ export const SearchFilterControl = <TItem, TFilterCategoryKey extends string>({
     setFilterValue(trimmedValue ? [trimmedValue.replace(/\s+/g, " ")] : []);
   };
 
-  const id = `${category.key}-input`;
+  const id = `${category.categoryKey}-input`;
   return (
     <ToolbarFilter
       chips={filterValue || []}
diff --git a/client/src/app/components/FilterToolbar/SelectFilterControl.tsx b/client/src/app/components/FilterToolbar/SelectFilterControl.tsx
index 55d077205b..3a2936a439 100644
--- a/client/src/app/components/FilterToolbar/SelectFilterControl.tsx
+++ b/client/src/app/components/FilterToolbar/SelectFilterControl.tsx
@@ -82,7 +82,7 @@ export const SelectFilterControl = <TItem, TFilterCategoryKey extends string>({
 
   return (
     <ToolbarFilter
-      id={`filter-control-${category.key}`}
+      id={`filter-control-${category.categoryKey}`}
       chips={chips}
       deleteChip={(_, chip) => onFilterClear(chip as string)}
       categoryName={category.title}
diff --git a/client/src/app/hooks/table-controls/filtering/getFilterHubRequestParams.ts b/client/src/app/hooks/table-controls/filtering/getFilterHubRequestParams.ts
index 78b74fb721..7cd421ffed 100644
--- a/client/src/app/hooks/table-controls/filtering/getFilterHubRequestParams.ts
+++ b/client/src/app/hooks/table-controls/filtering/getFilterHubRequestParams.ts
@@ -98,7 +98,7 @@ export const getFilterHubRequestParams = <
     const { filterValues } = filterState;
     objectKeys(filterValues).forEach((categoryKey) => {
       const filterCategory = filterCategories?.find(
-        (category) => category.key === categoryKey
+        (category) => category.categoryKey === categoryKey
       );
       const filterValue = filterValues[categoryKey];
       if (!filterCategory || !filterValue) return;
diff --git a/client/src/app/hooks/table-controls/filtering/getLocalFilterDerivedState.ts b/client/src/app/hooks/table-controls/filtering/getLocalFilterDerivedState.ts
index 261a4891a0..d7fe683b4b 100644
--- a/client/src/app/hooks/table-controls/filtering/getLocalFilterDerivedState.ts
+++ b/client/src/app/hooks/table-controls/filtering/getLocalFilterDerivedState.ts
@@ -48,7 +48,7 @@ export const getLocalFilterDerivedState = <
       const values = filterValues[categoryKey];
       if (!values || values.length === 0) return true;
       const filterCategory = filterCategories.find(
-        (category) => category.key === categoryKey
+        (category) => category.categoryKey === categoryKey
       );
       let itemValue = (item as any)[categoryKey];
       if (filterCategory?.getItemValue) {
diff --git a/client/src/app/pages/applications/analysis-wizard/custom-rules.tsx b/client/src/app/pages/applications/analysis-wizard/custom-rules.tsx
index e839cf4b2b..77c6e7ebe3 100644
--- a/client/src/app/pages/applications/analysis-wizard/custom-rules.tsx
+++ b/client/src/app/pages/applications/analysis-wizard/custom-rules.tsx
@@ -118,7 +118,7 @@ export const CustomRules: React.FC = () => {
 
   const filterCategories: FilterCategory<IReadFile, "name">[] = [
     {
-      key: "name",
+      categoryKey: "name",
       title: t("terms.name"),
       type: FilterType.search,
       placeholderText:
diff --git a/client/src/app/pages/applications/applications-table/applications-table.tsx b/client/src/app/pages/applications/applications-table/applications-table.tsx
index 720f0daf5c..379ed748c3 100644
--- a/client/src/app/pages/applications/applications-table/applications-table.tsx
+++ b/client/src/app/pages/applications/applications-table/applications-table.tsx
@@ -338,7 +338,7 @@ export const ApplicationsTable: React.FC = () => {
     }),
     filterCategories: [
       {
-        key: "name",
+        categoryKey: "name",
         title: t("terms.name"),
         type: FilterType.multiselect,
         placeholderText:
@@ -353,7 +353,7 @@ export const ApplicationsTable: React.FC = () => {
         ].map((name) => ({ key: name, value: name })),
       },
       {
-        key: "archetypes",
+        categoryKey: "archetypes",
         title: t("terms.archetypes"),
         type: FilterType.multiselect,
         placeholderText:
@@ -382,7 +382,7 @@ export const ApplicationsTable: React.FC = () => {
         logicOperator: "OR",
       },
       {
-        key: "businessService",
+        categoryKey: "businessService",
         title: t("terms.businessService"),
         placeholderText:
           t("actions.filterBy", {
@@ -398,7 +398,7 @@ export const ApplicationsTable: React.FC = () => {
         getItemValue: (item) => item.businessService?.name || "",
       },
       {
-        key: "identities",
+        categoryKey: "identities",
         title: t("terms.credentialType"),
         placeholderText:
           t("actions.filterBy", {
@@ -423,7 +423,7 @@ export const ApplicationsTable: React.FC = () => {
         },
       },
       {
-        key: "repository",
+        categoryKey: "repository",
         title: t("terms.repositoryType"),
         placeholderText:
           t("actions.filterBy", {
@@ -437,7 +437,7 @@ export const ApplicationsTable: React.FC = () => {
         getItemValue: (item) => item?.repository?.kind || "",
       },
       {
-        key: "binary",
+        categoryKey: "binary",
         title: t("terms.artifact"),
         placeholderText:
           t("actions.filterBy", {
@@ -458,7 +458,7 @@ export const ApplicationsTable: React.FC = () => {
         },
       },
       {
-        key: "tags",
+        categoryKey: "tags",
         title: t("terms.tags"),
         type: FilterType.multiselect,
         placeholderText:
@@ -483,7 +483,7 @@ export const ApplicationsTable: React.FC = () => {
         },
       },
       {
-        key: "risk",
+        categoryKey: "risk",
         title: t("terms.risk"),
         type: FilterType.multiselect,
         placeholderText:
diff --git a/client/src/app/pages/applications/components/application-detail-drawer/application-facts.tsx b/client/src/app/pages/applications/components/application-detail-drawer/application-facts.tsx
index 408d3550c7..4587628fce 100644
--- a/client/src/app/pages/applications/components/application-detail-drawer/application-facts.tsx
+++ b/client/src/app/pages/applications/components/application-detail-drawer/application-facts.tsx
@@ -33,7 +33,7 @@ export const ApplicationFacts: React.FC<IApplicationRiskProps> = ({
 
   const filterCategories: FilterCategory<Fact, "source">[] = [
     {
-      key: "source",
+      categoryKey: "source",
       title: t("terms.source"),
       type: FilterType.multiselect,
       placeholderText: t("terms.source"),
diff --git a/client/src/app/pages/applications/components/application-tags/application-tags.tsx b/client/src/app/pages/applications/components/application-tags/application-tags.tsx
index c33f41a63d..d59d73af44 100644
--- a/client/src/app/pages/applications/components/application-tags/application-tags.tsx
+++ b/client/src/app/pages/applications/components/application-tags/application-tags.tsx
@@ -130,7 +130,7 @@ export const ApplicationTags: React.FC<ApplicationTagsProps> = ({
     "source" | "tagCategory"
   >[] = [
     {
-      key: "source",
+      categoryKey: "source",
       title: t("terms.source"),
       type: FilterType.multiselect,
       placeholderText: t("terms.source"),
@@ -142,7 +142,7 @@ export const ApplicationTags: React.FC<ApplicationTagsProps> = ({
       logicOperator: "OR",
     },
     {
-      key: "tagCategory",
+      categoryKey: "tagCategory",
       title: t("terms.tagCategory"),
       type: FilterType.multiselect,
       placeholderText: t("terms.tagCategory"),
diff --git a/client/src/app/pages/applications/manage-imports-details/manage-imports-details.tsx b/client/src/app/pages/applications/manage-imports-details/manage-imports-details.tsx
index c83e3346ad..e45678f000 100644
--- a/client/src/app/pages/applications/manage-imports-details/manage-imports-details.tsx
+++ b/client/src/app/pages/applications/manage-imports-details/manage-imports-details.tsx
@@ -101,7 +101,7 @@ export const ManageImportsDetails: React.FC = () => {
     "Application Name"
   >[] = [
     {
-      key: "Application Name",
+      categoryKey: "Application Name",
       title: "Application Name",
       type: FilterType.search,
       placeholderText: "Filter by application name...",
diff --git a/client/src/app/pages/applications/manage-imports/manage-imports.tsx b/client/src/app/pages/applications/manage-imports/manage-imports.tsx
index 351ab51e79..a3dddbca96 100644
--- a/client/src/app/pages/applications/manage-imports/manage-imports.tsx
+++ b/client/src/app/pages/applications/manage-imports/manage-imports.tsx
@@ -96,7 +96,7 @@ export const ManageImports: React.FC = () => {
     hasActionsColumn: true,
     filterCategories: [
       {
-        key: "filename",
+        categoryKey: "filename",
         title: t("terms.filename"),
         type: FilterType.search,
         placeholderText:
diff --git a/client/src/app/pages/archetypes/archetypes-page.tsx b/client/src/app/pages/archetypes/archetypes-page.tsx
index f72ab8c27f..6911b91426 100644
--- a/client/src/app/pages/archetypes/archetypes-page.tsx
+++ b/client/src/app/pages/archetypes/archetypes-page.tsx
@@ -217,7 +217,7 @@ const Archetypes: React.FC = () => {
 
     filterCategories: [
       {
-        key: "name",
+        categoryKey: "name",
         title: t("terms.name"),
         type: FilterType.search,
         placeholderText:
@@ -229,7 +229,7 @@ const Archetypes: React.FC = () => {
         },
       },
       {
-        key: "application.name",
+        categoryKey: "application.name",
         title: t("terms.applicationName"),
         type: FilterType.multiselect,
         logicOperator: "OR",
diff --git a/client/src/app/pages/assessment-management/assessment-settings/assessment-settings-page.tsx b/client/src/app/pages/assessment-management/assessment-settings/assessment-settings-page.tsx
index 2cd16dff6c..ff0715b5fe 100644
--- a/client/src/app/pages/assessment-management/assessment-settings/assessment-settings-page.tsx
+++ b/client/src/app/pages/assessment-management/assessment-settings/assessment-settings-page.tsx
@@ -117,7 +117,7 @@ const AssessmentSettings: React.FC = () => {
     hasActionsColumn: true,
     filterCategories: [
       {
-        key: "name",
+        categoryKey: "name",
         title: t("terms.name"),
         type: FilterType.search,
         placeholderText:
diff --git a/client/src/app/pages/controls/business-services/business-services.tsx b/client/src/app/pages/controls/business-services/business-services.tsx
index c5f9608aba..a5b8c63de6 100644
--- a/client/src/app/pages/controls/business-services/business-services.tsx
+++ b/client/src/app/pages/controls/business-services/business-services.tsx
@@ -95,7 +95,7 @@ export const BusinessServices: React.FC = () => {
     hasActionsColumn: true,
     filterCategories: [
       {
-        key: "name",
+        categoryKey: "name",
         title: t("terms.name"),
         type: FilterType.search,
         placeholderText:
@@ -107,7 +107,7 @@ export const BusinessServices: React.FC = () => {
         },
       },
       {
-        key: "description",
+        categoryKey: "description",
         title: t("terms.description"),
         type: FilterType.search,
         placeholderText:
@@ -119,7 +119,7 @@ export const BusinessServices: React.FC = () => {
         },
       },
       {
-        key: "owner",
+        categoryKey: "owner",
         title: t("terms.createdBy"),
         type: FilterType.search,
         placeholderText:
diff --git a/client/src/app/pages/controls/job-functions/job-functions.tsx b/client/src/app/pages/controls/job-functions/job-functions.tsx
index bdcd86276d..5a6fff4498 100644
--- a/client/src/app/pages/controls/job-functions/job-functions.tsx
+++ b/client/src/app/pages/controls/job-functions/job-functions.tsx
@@ -61,7 +61,7 @@ export const JobFunctions: React.FC = () => {
 
   const filterCategories: FilterCategory<JobFunction, "name">[] = [
     {
-      key: "name",
+      categoryKey: "name",
       title: t("terms.name"),
       type: FilterType.search,
       placeholderText:
diff --git a/client/src/app/pages/controls/stakeholder-groups/stakeholder-groups.tsx b/client/src/app/pages/controls/stakeholder-groups/stakeholder-groups.tsx
index eba7a03100..8669ae70d5 100644
--- a/client/src/app/pages/controls/stakeholder-groups/stakeholder-groups.tsx
+++ b/client/src/app/pages/controls/stakeholder-groups/stakeholder-groups.tsx
@@ -115,7 +115,7 @@ export const StakeholderGroups: React.FC = () => {
     hasActionsColumn: true,
     filterCategories: [
       {
-        key: "name",
+        categoryKey: "name",
         title: t("terms.name"),
         type: FilterType.search,
         placeholderText:
@@ -127,7 +127,7 @@ export const StakeholderGroups: React.FC = () => {
         },
       },
       {
-        key: "description",
+        categoryKey: "description",
         title: t("terms.description"),
         type: FilterType.search,
         placeholderText:
@@ -139,7 +139,7 @@ export const StakeholderGroups: React.FC = () => {
         },
       },
       {
-        key: "stakeholders",
+        categoryKey: "stakeholders",
         title: t("terms.stakeholders"),
         type: FilterType.search,
         placeholderText:
diff --git a/client/src/app/pages/controls/stakeholders/stakeholders.tsx b/client/src/app/pages/controls/stakeholders/stakeholders.tsx
index 5fe48a8b3a..e0ab62daf3 100644
--- a/client/src/app/pages/controls/stakeholders/stakeholders.tsx
+++ b/client/src/app/pages/controls/stakeholders/stakeholders.tsx
@@ -112,7 +112,7 @@ export const Stakeholders: React.FC = () => {
     hasActionsColumn: true,
     filterCategories: [
       {
-        key: "email",
+        categoryKey: "email",
         title: t("terms.email"),
         type: FilterType.search,
         placeholderText:
@@ -124,7 +124,7 @@ export const Stakeholders: React.FC = () => {
         },
       },
       {
-        key: "name",
+        categoryKey: "name",
         title: t("terms.name"),
         type: FilterType.search,
         placeholderText:
@@ -136,7 +136,7 @@ export const Stakeholders: React.FC = () => {
         },
       },
       {
-        key: "jobFunction",
+        categoryKey: "jobFunction",
         title: t("terms.jobFunction"),
         type: FilterType.search,
         placeholderText:
@@ -148,7 +148,7 @@ export const Stakeholders: React.FC = () => {
         },
       },
       {
-        key: "stakeholderGroups",
+        categoryKey: "stakeholderGroups",
         title: t("terms.stakeholderGroups"),
         type: FilterType.search,
         placeholderText:
diff --git a/client/src/app/pages/controls/tags/tags.tsx b/client/src/app/pages/controls/tags/tags.tsx
index f00bb7b64a..ca545555a4 100644
--- a/client/src/app/pages/controls/tags/tags.tsx
+++ b/client/src/app/pages/controls/tags/tags.tsx
@@ -170,7 +170,7 @@ export const Tags: React.FC = () => {
     "tags" | "rank" | "color"
   >[] = [
     {
-      key: "tags",
+      categoryKey: "tags",
       title: t("terms.name"),
       type: FilterType.multiselect,
       placeholderText:
@@ -208,7 +208,7 @@ export const Tags: React.FC = () => {
       ),
     },
     {
-      key: "rank",
+      categoryKey: "rank",
       title: t("terms.rank"),
       type: FilterType.search,
       placeholderText:
@@ -220,7 +220,7 @@ export const Tags: React.FC = () => {
       },
     },
     {
-      key: "color",
+      categoryKey: "color",
       title: t("terms.color"),
       type: FilterType.search,
       placeholderText:
diff --git a/client/src/app/pages/dependencies/dependencies.tsx b/client/src/app/pages/dependencies/dependencies.tsx
index 53dee126dd..97db65ce7b 100644
--- a/client/src/app/pages/dependencies/dependencies.tsx
+++ b/client/src/app/pages/dependencies/dependencies.tsx
@@ -63,7 +63,7 @@ export const Dependencies: React.FC = () => {
     filterCategories: [
       ...allAffectedApplicationsFilterCategories,
       {
-        key: "name",
+        categoryKey: "name",
         title: t("terms.name"),
         type: FilterType.search,
         filterGroup: "Dependency",
@@ -74,7 +74,7 @@ export const Dependencies: React.FC = () => {
         getServerFilterValue: (value) => (value ? [`*${value[0]}*`] : []),
       },
       {
-        key: "provider",
+        categoryKey: "provider",
         title: t("terms.language"),
         type: FilterType.search,
         filterGroup: "Dependency",
diff --git a/client/src/app/pages/dependencies/dependency-apps-table.tsx b/client/src/app/pages/dependencies/dependency-apps-table.tsx
index bd8bd9cb18..bddbcdd53d 100644
--- a/client/src/app/pages/dependencies/dependency-apps-table.tsx
+++ b/client/src/app/pages/dependencies/dependency-apps-table.tsx
@@ -68,7 +68,7 @@ export const DependencyAppsTable: React.FC<IDependencyAppsTableProps> = ({
     initialFilterValues: deserializedFilterValues,
     filterCategories: [
       {
-        key: "application.name",
+        categoryKey: "application.name",
         title: "Application Name",
         type: FilterType.search,
         placeholderText:
@@ -78,7 +78,7 @@ export const DependencyAppsTable: React.FC<IDependencyAppsTableProps> = ({
         getServerFilterValue: (value) => (value ? [`*${value[0]}*`] : []),
       },
       {
-        key: "businessService",
+        categoryKey: "businessService",
         title: t("terms.businessService"),
         placeholderText:
           t("actions.filterBy", {
@@ -90,7 +90,7 @@ export const DependencyAppsTable: React.FC<IDependencyAppsTableProps> = ({
           .map((name) => ({ key: name, value: name })),
       },
       {
-        key: "tag.id",
+        categoryKey: "tag.id",
         title: t("terms.tags"),
         type: FilterType.multiselect,
         placeholderText:
diff --git a/client/src/app/pages/external/jira/trackers.tsx b/client/src/app/pages/external/jira/trackers.tsx
index 321d3e4acb..31acc98c3d 100644
--- a/client/src/app/pages/external/jira/trackers.tsx
+++ b/client/src/app/pages/external/jira/trackers.tsx
@@ -106,7 +106,7 @@ export const JiraTrackers: React.FC = () => {
     isPaginationEnabled: true,
     filterCategories: [
       {
-        key: "name",
+        categoryKey: "name",
         title: t("terms.name"),
         type: FilterType.search,
         placeholderText:
@@ -118,7 +118,7 @@ export const JiraTrackers: React.FC = () => {
         },
       },
       {
-        key: "url",
+        categoryKey: "url",
         title: t("terms.url"),
         type: FilterType.search,
         placeholderText:
diff --git a/client/src/app/pages/identities/identities.tsx b/client/src/app/pages/identities/identities.tsx
index 1e897e8774..aac61df676 100644
--- a/client/src/app/pages/identities/identities.tsx
+++ b/client/src/app/pages/identities/identities.tsx
@@ -113,7 +113,7 @@ export const Identities: React.FC = () => {
     "name" | "type" | "createdBy"
   >[] = [
     {
-      key: "name",
+      categoryKey: "name",
       title: "Name",
       type: FilterType.search,
       placeholderText: "Filter by name...",
@@ -122,7 +122,7 @@ export const Identities: React.FC = () => {
       },
     },
     {
-      key: "type",
+      categoryKey: "type",
       title: "Type",
       type: FilterType.select,
       placeholderText: "Filter by type...",
@@ -134,7 +134,7 @@ export const Identities: React.FC = () => {
     ...(isAuthRequired
       ? [
           {
-            key: "createdBy",
+            categoryKey: "createdBy",
             title: "Created By",
             type: FilterType.search,
             placeholderText: "Filter by created by User...",
diff --git a/client/src/app/pages/issues/helpers.ts b/client/src/app/pages/issues/helpers.ts
index 9beb0aad7b..2e58b4234f 100644
--- a/client/src/app/pages/issues/helpers.ts
+++ b/client/src/app/pages/issues/helpers.ts
@@ -48,7 +48,7 @@ export const useSharedAffectedApplicationFilterCategories = <
 
   return [
     {
-      key: "application.name",
+      categoryKey: "application.name",
       title: t("terms.applicationName"),
       filterGroup: IssueFilterGroups.ApplicationInventory,
       type: FilterType.multiselect,
@@ -67,7 +67,7 @@ export const useSharedAffectedApplicationFilterCategories = <
         selectedOptions?.filter(Boolean) ?? [],
     },
     {
-      key: "application.id",
+      categoryKey: "application.id",
       title: t("terms.archetypes"),
       filterGroup: IssueFilterGroups.ApplicationInventory,
       type: FilterType.multiselect,
@@ -101,7 +101,7 @@ export const useSharedAffectedApplicationFilterCategories = <
       },
     },
     {
-      key: "businessService.name",
+      categoryKey: "businessService.name",
       title: t("terms.businessService"),
       filterGroup: IssueFilterGroups.ApplicationInventory,
       placeholderText:
@@ -114,7 +114,7 @@ export const useSharedAffectedApplicationFilterCategories = <
         .map((name) => ({ key: name, value: name })),
     },
     {
-      key: "tag.id",
+      categoryKey: "tag.id",
       title: t("terms.tags"),
       filterGroup: IssueFilterGroups.ApplicationInventory,
       type: FilterType.multiselect,
diff --git a/client/src/app/pages/issues/issue-detail-drawer/issue-affected-files-table.tsx b/client/src/app/pages/issues/issue-detail-drawer/issue-affected-files-table.tsx
index 61048d886e..1018a07691 100644
--- a/client/src/app/pages/issues/issue-detail-drawer/issue-affected-files-table.tsx
+++ b/client/src/app/pages/issues/issue-detail-drawer/issue-affected-files-table.tsx
@@ -52,7 +52,7 @@ export const IssueAffectedFilesTable: React.FC<
     initialSort: { columnKey: "file", direction: "asc" },
     filterCategories: [
       {
-        key: "file",
+        categoryKey: "file",
         title: "File",
         type: FilterType.search,
         placeholderText:
diff --git a/client/src/app/pages/issues/issues-table.tsx b/client/src/app/pages/issues/issues-table.tsx
index 17d2dce479..9e831c3e3a 100644
--- a/client/src/app/pages/issues/issues-table.tsx
+++ b/client/src/app/pages/issues/issues-table.tsx
@@ -117,7 +117,7 @@ export const IssuesTable: React.FC<IIssuesTableProps> = ({ mode }) => {
     filterCategories: [
       ...(mode === "allIssues" ? allIssuesSpecificFilterCategories : []),
       {
-        key: "category",
+        categoryKey: "category",
         title: t("terms.category"),
         filterGroup:
           mode === "allIssues" ? IssueFilterGroups.Issues : undefined,
@@ -129,7 +129,7 @@ export const IssuesTable: React.FC<IIssuesTableProps> = ({ mode }) => {
         getServerFilterValue: (value) => (value ? [`*${value[0]}*`] : []),
       },
       {
-        key: "source",
+        categoryKey: "source",
         title: t("terms.source"),
         filterGroup:
           mode === "allIssues" ? IssueFilterGroups.Issues : undefined,
@@ -153,7 +153,7 @@ export const IssuesTable: React.FC<IIssuesTableProps> = ({ mode }) => {
         },
       },
       {
-        key: "target",
+        categoryKey: "target",
         title: t("terms.target"),
         filterGroup:
           mode === "allIssues" ? IssueFilterGroups.Issues : undefined,
diff --git a/client/src/app/pages/migration-waves/components/manage-applications-form.tsx b/client/src/app/pages/migration-waves/components/manage-applications-form.tsx
index a1166c51e7..461e20305e 100644
--- a/client/src/app/pages/migration-waves/components/manage-applications-form.tsx
+++ b/client/src/app/pages/migration-waves/components/manage-applications-form.tsx
@@ -119,7 +119,7 @@ export const ManageApplicationsForm: React.FC<ManageApplicationsFormProps> = ({
     hasActionsColumn: true,
     filterCategories: [
       {
-        key: "name",
+        categoryKey: "name",
         title: t("terms.name"),
         type: FilterType.search,
         placeholderText:
@@ -131,7 +131,7 @@ export const ManageApplicationsForm: React.FC<ManageApplicationsFormProps> = ({
         },
       },
       {
-        key: "businessService",
+        categoryKey: "businessService",
         title: t("terms.businessService"),
         type: FilterType.select,
         placeholderText:
@@ -149,7 +149,7 @@ export const ManageApplicationsForm: React.FC<ManageApplicationsFormProps> = ({
         ),
       },
       {
-        key: "owner",
+        categoryKey: "owner",
         title: t("terms.owner"),
         type: FilterType.select,
         placeholderText:
diff --git a/client/src/app/pages/migration-waves/migration-waves.tsx b/client/src/app/pages/migration-waves/migration-waves.tsx
index ae44e79e2f..323301eb7d 100644
--- a/client/src/app/pages/migration-waves/migration-waves.tsx
+++ b/client/src/app/pages/migration-waves/migration-waves.tsx
@@ -200,7 +200,7 @@ export const MigrationWaves: React.FC = () => {
     hasActionsColumn: true,
     filterCategories: [
       {
-        key: "name",
+        categoryKey: "name",
         title: t("terms.name"),
         type: FilterType.search,
         placeholderText:
diff --git a/client/src/app/pages/reports/components/identified-risks-table/identified-risks-table.tsx b/client/src/app/pages/reports/components/identified-risks-table/identified-risks-table.tsx
index 86862521aa..4996bf84c7 100644
--- a/client/src/app/pages/reports/components/identified-risks-table/identified-risks-table.tsx
+++ b/client/src/app/pages/reports/components/identified-risks-table/identified-risks-table.tsx
@@ -178,7 +178,7 @@ export const IdentifiedRisksTable: React.FC<IIdentifiedRisksTableProps> = ({
     expandableVariant: "single",
     filterCategories: [
       {
-        key: "questionnaireName",
+        categoryKey: "questionnaireName",
         title: t("terms.questionnaire"),
         type: FilterType.multiselect,
         placeholderText:
@@ -193,7 +193,7 @@ export const IdentifiedRisksTable: React.FC<IIdentifiedRisksTableProps> = ({
         ].map((name) => ({ key: name, value: name })),
       },
       {
-        key: "section",
+        categoryKey: "section",
         title: t("terms.section"),
         type: FilterType.multiselect,
         placeholderText:
@@ -206,7 +206,7 @@ export const IdentifiedRisksTable: React.FC<IIdentifiedRisksTableProps> = ({
         ].map((name) => ({ key: name, value: name })),
       },
       {
-        key: "question",
+        categoryKey: "question",
         title: t("terms.question"),
         type: FilterType.multiselect,
         placeholderText:
@@ -221,7 +221,7 @@ export const IdentifiedRisksTable: React.FC<IIdentifiedRisksTableProps> = ({
         ].map((name) => ({ key: name, value: name })),
       },
       {
-        key: "answer",
+        categoryKey: "answer",
         title: t("terms.answer"),
         type: FilterType.multiselect,
         placeholderText:
@@ -234,7 +234,7 @@ export const IdentifiedRisksTable: React.FC<IIdentifiedRisksTableProps> = ({
         ].map((name) => ({ key: name, value: name })),
       },
       {
-        key: "risk",
+        categoryKey: "risk",
         title: t("terms.risk"),
         type: FilterType.multiselect,
         placeholderText:
diff --git a/client/src/app/pages/review/components/application-assessment-summary-table/application-assessment-summary-table.tsx b/client/src/app/pages/review/components/application-assessment-summary-table/application-assessment-summary-table.tsx
index 62b18bb3ae..da10a3b07d 100644
--- a/client/src/app/pages/review/components/application-assessment-summary-table/application-assessment-summary-table.tsx
+++ b/client/src/app/pages/review/components/application-assessment-summary-table/application-assessment-summary-table.tsx
@@ -83,7 +83,7 @@ export const ApplicationAssessmentSummaryTable: React.FC<
 
   const filterCategories: FilterCategory<ITableItem, "riskValue">[] = [
     {
-      key: "riskValue",
+      categoryKey: "riskValue",
       title: "Risk",
       type: FilterType.select,
       placeholderText: "Filter by name...",