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 d28fe345a5..90860f262c 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
@@ -74,6 +74,7 @@ export const ManageImportsDetails: React.FC = () => {
   const tableControls = useLocalTableControls({
     tableName: "manage-imports-details",
     idProperty: "Application Name",
+    dataNameProperty: "Application Name",
     items: imports || [],
     columnNames: {
       name: t("terms.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 3bcf7d0a23..ec7883a8cb 100644
--- a/client/src/app/pages/applications/manage-imports/manage-imports.tsx
+++ b/client/src/app/pages/applications/manage-imports/manage-imports.tsx
@@ -80,6 +80,7 @@ export const ManageImports: React.FC = () => {
   const tableControls = useLocalTableControls({
     tableName: "manage-imports",
     idProperty: "id",
+    dataNameProperty: "filename",
     items: importSummaries,
     columnNames: {
       importTime: "Import Time",
diff --git a/client/src/app/pages/archetypes/archetypes-page.tsx b/client/src/app/pages/archetypes/archetypes-page.tsx
index ccbfbc9c60..29fea0940f 100644
--- a/client/src/app/pages/archetypes/archetypes-page.tsx
+++ b/client/src/app/pages/archetypes/archetypes-page.tsx
@@ -196,6 +196,7 @@ const Archetypes: React.FC = () => {
     persistTo: "urlParams",
     persistenceKeyPrefix: TablePersistenceKeyPrefix.archetypes,
     idProperty: "id",
+    dataNameProperty: "name",
     items: archetypes,
     isLoading: isFetching,
     hasActionsColumn: true,
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 ff0715b5fe..efea63d633 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
@@ -103,6 +103,7 @@ const AssessmentSettings: React.FC = () => {
   const tableControls = useLocalTableControls({
     tableName: "questionnaires-table",
     idProperty: "id",
+    dataNameProperty: "name",
     items: questionnaires || [],
     columnNames: {
       required: "Required",
diff --git a/client/src/app/pages/assessment/components/assessment-actions/components/questionnaires-table.tsx b/client/src/app/pages/assessment/components/assessment-actions/components/questionnaires-table.tsx
index 48384839e4..6302f0a01d 100644
--- a/client/src/app/pages/assessment/components/assessment-actions/components/questionnaires-table.tsx
+++ b/client/src/app/pages/assessment/components/assessment-actions/components/questionnaires-table.tsx
@@ -39,6 +39,7 @@ const QuestionnairesTable: React.FC<QuestionnairesTableProps> = ({
   const tableControls = useLocalTableControls({
     tableName: "questionnaires-table",
     idProperty: "id",
+    dataNameProperty: "name",
     items: questionnaires || [],
     columnNames: {
       questionnaires: tableName,
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 03f57a333d..285f4cad61 100644
--- a/client/src/app/pages/controls/business-services/business-services.tsx
+++ b/client/src/app/pages/controls/business-services/business-services.tsx
@@ -83,7 +83,8 @@ export const BusinessServices: React.FC = () => {
 
   const tableControls = useLocalTableControls({
     tableName: "business-services-table",
-    idProperty: "name",
+    idProperty: "id",
+    dataNameProperty: "name",
     items: businessServices,
     columnNames: {
       name: t("terms.name"),
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 b3b6220610..d6b76d6e2f 100644
--- a/client/src/app/pages/controls/job-functions/job-functions.tsx
+++ b/client/src/app/pages/controls/job-functions/job-functions.tsx
@@ -57,7 +57,8 @@ export const JobFunctions: React.FC = () => {
 
   const tableControls = useLocalTableControls({
     tableName: "job-functions-table",
-    idProperty: "name",
+    idProperty: "id",
+    dataNameProperty: "name",
     items: jobFunctions || [],
     columnNames: {
       name: t("terms.name"),
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 32d4144cac..6cae4e9c37 100644
--- a/client/src/app/pages/controls/stakeholder-groups/stakeholder-groups.tsx
+++ b/client/src/app/pages/controls/stakeholder-groups/stakeholder-groups.tsx
@@ -100,7 +100,8 @@ export const StakeholderGroups: React.FC = () => {
 
   const tableControls = useLocalTableControls({
     tableName: "stakeholder-groups-table",
-    idProperty: "name",
+    idProperty: "id",
+    dataNameProperty: "name",
     items: stakeholderGroups,
     columnNames: {
       name: "Name",
diff --git a/client/src/app/pages/controls/stakeholders/stakeholders.tsx b/client/src/app/pages/controls/stakeholders/stakeholders.tsx
index 9011223fdd..d5e52cfe08 100644
--- a/client/src/app/pages/controls/stakeholders/stakeholders.tsx
+++ b/client/src/app/pages/controls/stakeholders/stakeholders.tsx
@@ -96,7 +96,8 @@ export const Stakeholders: React.FC = () => {
 
   const tableControls = useLocalTableControls({
     tableName: "stakeholders-table",
-    idProperty: "email",
+    idProperty: "id",
+    dataNameProperty: "name",
     items: stakeholders,
     columnNames: {
       email: "Email",
diff --git a/client/src/app/pages/controls/tags/tags.tsx b/client/src/app/pages/controls/tags/tags.tsx
index fd25898175..6698adc124 100644
--- a/client/src/app/pages/controls/tags/tags.tsx
+++ b/client/src/app/pages/controls/tags/tags.tsx
@@ -162,7 +162,8 @@ export const Tags: React.FC = () => {
 
   const tableControls = useLocalTableControls({
     tableName: "business-services-table",
-    idProperty: "name",
+    idProperty: "id",
+    dataNameProperty: "name",
     items: tagCategories,
     columnNames: {
       tagCategory: t("terms.tagCategory"),
diff --git a/client/src/app/pages/external/jira/trackers.tsx b/client/src/app/pages/external/jira/trackers.tsx
index 43130fa648..2a1dba255a 100644
--- a/client/src/app/pages/external/jira/trackers.tsx
+++ b/client/src/app/pages/external/jira/trackers.tsx
@@ -93,7 +93,8 @@ export const JiraTrackers: React.FC = () => {
 
   const tableControls = useLocalTableControls({
     tableName: "jira-Tracker-table",
-    idProperty: "name",
+    idProperty: "id",
+    dataNameProperty: "name",
     items: trackers,
     columnNames: {
       name: `${t("terms.instance")} name`,
diff --git a/client/src/app/pages/identities/identities.tsx b/client/src/app/pages/identities/identities.tsx
index b10f14ca52..1fe2d68703 100644
--- a/client/src/app/pages/identities/identities.tsx
+++ b/client/src/app/pages/identities/identities.tsx
@@ -143,7 +143,8 @@ export const Identities: React.FC = () => {
 
   const tableControls = useLocalTableControls({
     tableName: "identities-table",
-    idProperty: "name",
+    idProperty: "id",
+    dataNameProperty: "name",
     items: identities,
     columnNames: {
       name: t("terms.name"),
@@ -276,7 +277,7 @@ export const Identities: React.FC = () => {
                     />
                     <Th width={25} {...getThProps({ columnKey: "type" })} />
 
-                    {/* 
+                    {/*
                     //TODO: Enable conditional rendering for createdBy column
                     <Th {...getThProps({ columnKey: "createdBy" })} /> */}
                   </TableHeaderContentWithControls>
@@ -340,7 +341,7 @@ export const Identities: React.FC = () => {
                           >
                             {typeFormattedString?.value}
                           </Td>
-                          {/* 
+                          {/*
                           Todo: Enable conditional rendering for createdBy column
                           <Td
                             width={10}
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 a0783edca4..d427f528e9 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
@@ -101,7 +101,8 @@ export const ManageApplicationsForm: React.FC<ManageApplicationsFormProps> = ({
 
   const tableControls = useLocalTableControls({
     tableName: "manage-applications-table",
-    idProperty: "name",
+    idProperty: "id",
+    dataNameProperty: "name",
     items: availableApplications,
     columnNames: {
       name: "Application Name",
diff --git a/client/src/app/pages/migration-waves/components/stakeholders-table.tsx b/client/src/app/pages/migration-waves/components/stakeholders-table.tsx
index fb2ab2c879..b2f32ac4c3 100644
--- a/client/src/app/pages/migration-waves/components/stakeholders-table.tsx
+++ b/client/src/app/pages/migration-waves/components/stakeholders-table.tsx
@@ -19,7 +19,8 @@ export const WaveStakeholdersTable: React.FC<IWaveStakeholdersTableProps> = ({
 }) => {
   const tableControls = useLocalTableControls({
     tableName: "wave-stakeholders-table",
-    idProperty: "name",
+    idProperty: "id",
+    dataNameProperty: "name",
     items: migrationWave.allStakeholders,
     columnNames: {
       name: "Name",
diff --git a/client/src/app/pages/migration-waves/components/wave-applications-table.tsx b/client/src/app/pages/migration-waves/components/wave-applications-table.tsx
index a922a7f448..2ff190fa23 100644
--- a/client/src/app/pages/migration-waves/components/wave-applications-table.tsx
+++ b/client/src/app/pages/migration-waves/components/wave-applications-table.tsx
@@ -36,7 +36,8 @@ export const WaveApplicationsTable: React.FC<IWaveApplicationsTableProps> = ({
 
   const tableControls = useLocalTableControls({
     tableName: "wave-applications-table",
-    idProperty: "name",
+    idProperty: "id",
+    dataNameProperty: "name",
     items: migrationWave.fullApplications,
     columnNames: {
       appName: "Name",
diff --git a/client/src/app/pages/migration-waves/components/wave-status-table.tsx b/client/src/app/pages/migration-waves/components/wave-status-table.tsx
index 8e26a22e9e..80689f20c9 100644
--- a/client/src/app/pages/migration-waves/components/wave-status-table.tsx
+++ b/client/src/app/pages/migration-waves/components/wave-status-table.tsx
@@ -62,7 +62,8 @@ export const WaveStatusTable: React.FC<IWaveStatusTableProps> = ({
 
   const tableControls = useLocalTableControls({
     tableName: "wave-applications-table",
-    idProperty: "name",
+    idProperty: "id",
+    dataNameProperty: "name",
     items: migrationWave.fullApplications,
     columnNames: {
       appName: "Application name",