diff --git a/client/src/app/hooks/table-controls/active-row/getActiveRowDerivedState.ts b/client/src/app/hooks/table-controls/active-item/getActiveItemDerivedState.ts
similarity index 95%
rename from client/src/app/hooks/table-controls/active-row/getActiveRowDerivedState.ts
rename to client/src/app/hooks/table-controls/active-item/getActiveItemDerivedState.ts
index a2240c3c8b..508be877fc 100644
--- a/client/src/app/hooks/table-controls/active-row/getActiveRowDerivedState.ts
+++ b/client/src/app/hooks/table-controls/active-item/getActiveItemDerivedState.ts
@@ -1,5 +1,5 @@
 import { KeyWithValueType } from "@app/utils/type-utils";
-import { IActiveRowState } from "./useActiveRowState";
+import { IActiveRowState } from "./useActiveItemState";
 
 export interface IActiveRowDerivedStateArgs<TItem> {
   currentPageItems: TItem[];
diff --git a/client/src/app/hooks/table-controls/active-item/index.ts b/client/src/app/hooks/table-controls/active-item/index.ts
new file mode 100644
index 0000000000..afa4d418ff
--- /dev/null
+++ b/client/src/app/hooks/table-controls/active-item/index.ts
@@ -0,0 +1,4 @@
+export * from "./useActiveItemState";
+export * from "./getActiveItemDerivedState";
+export * from "./useActiveItemPropHelpers";
+export * from "./useActiveItemEffects";
diff --git a/client/src/app/hooks/table-controls/active-row/useActiveRowEffects.ts b/client/src/app/hooks/table-controls/active-item/useActiveItemEffects.ts
similarity index 85%
rename from client/src/app/hooks/table-controls/active-row/useActiveRowEffects.ts
rename to client/src/app/hooks/table-controls/active-item/useActiveItemEffects.ts
index b9cee730ff..d03c2b8f0f 100644
--- a/client/src/app/hooks/table-controls/active-row/useActiveRowEffects.ts
+++ b/client/src/app/hooks/table-controls/active-item/useActiveItemEffects.ts
@@ -1,6 +1,6 @@
 import * as React from "react";
-import { getActiveRowDerivedState } from "./getActiveRowDerivedState";
-import { IActiveRowState } from "./useActiveRowState";
+import { getActiveRowDerivedState } from "./getActiveItemDerivedState";
+import { IActiveRowState } from "./useActiveItemState";
 
 export interface IUseActiveRowEffectsArgs<TItem> {
   isLoading?: boolean;
diff --git a/client/src/app/hooks/table-controls/active-row/useActiveRowPropHelpers.ts b/client/src/app/hooks/table-controls/active-item/useActiveItemPropHelpers.ts
similarity index 90%
rename from client/src/app/hooks/table-controls/active-row/useActiveRowPropHelpers.ts
rename to client/src/app/hooks/table-controls/active-item/useActiveItemPropHelpers.ts
index 7f5729e1e9..718784f5e2 100644
--- a/client/src/app/hooks/table-controls/active-row/useActiveRowPropHelpers.ts
+++ b/client/src/app/hooks/table-controls/active-item/useActiveItemPropHelpers.ts
@@ -2,12 +2,12 @@ import { TrProps } from "@patternfly/react-table";
 import {
   IActiveRowDerivedStateArgs,
   getActiveRowDerivedState,
-} from "./getActiveRowDerivedState";
-import { IActiveRowState } from "./useActiveRowState";
+} from "./getActiveItemDerivedState";
+import { IActiveRowState } from "./useActiveItemState";
 import {
   IUseActiveRowEffectsArgs,
   useActiveRowEffects,
-} from "./useActiveRowEffects";
+} from "./useActiveItemEffects";
 
 // Args that should be passed into useTableControlProps
 export type IActiveRowPropHelpersExternalArgs<TItem> =
diff --git a/client/src/app/hooks/table-controls/active-row/useActiveRowState.ts b/client/src/app/hooks/table-controls/active-item/useActiveItemState.ts
similarity index 100%
rename from client/src/app/hooks/table-controls/active-row/useActiveRowState.ts
rename to client/src/app/hooks/table-controls/active-item/useActiveItemState.ts
diff --git a/client/src/app/hooks/table-controls/active-row/index.ts b/client/src/app/hooks/table-controls/active-row/index.ts
deleted file mode 100644
index c60b50340d..0000000000
--- a/client/src/app/hooks/table-controls/active-row/index.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export * from "./useActiveRowState";
-export * from "./getActiveRowDerivedState";
-export * from "./useActiveRowPropHelpers";
-export * from "./useActiveRowEffects";
diff --git a/client/src/app/hooks/table-controls/index.ts b/client/src/app/hooks/table-controls/index.ts
index 4c06b16c9d..9145da1f37 100644
--- a/client/src/app/hooks/table-controls/index.ts
+++ b/client/src/app/hooks/table-controls/index.ts
@@ -9,4 +9,4 @@ export * from "./filtering";
 export * from "./sorting";
 export * from "./pagination";
 export * from "./expansion";
-export * from "./active-row";
+export * from "./active-item";
diff --git a/client/src/app/hooks/table-controls/types.ts b/client/src/app/hooks/table-controls/types.ts
index 7d5e087506..2f8f5ce989 100644
--- a/client/src/app/hooks/table-controls/types.ts
+++ b/client/src/app/hooks/table-controls/types.ts
@@ -29,7 +29,7 @@ import {
   IActiveRowPropHelpersExternalArgs,
   IActiveRowState,
   IActiveRowStateArgs,
-} from "./active-row";
+} from "./active-item";
 import {
   PaginationProps,
   ToolbarItemProps,
diff --git a/client/src/app/hooks/table-controls/useTableControlProps.ts b/client/src/app/hooks/table-controls/useTableControlProps.ts
index 8985f5de90..f6fb2dc0fd 100644
--- a/client/src/app/hooks/table-controls/useTableControlProps.ts
+++ b/client/src/app/hooks/table-controls/useTableControlProps.ts
@@ -6,7 +6,7 @@ import { ITableControls, IUseTableControlPropsArgs } from "./types";
 import { useFilterPropHelpers } from "./filtering";
 import { useSortPropHelpers } from "./sorting";
 import { usePaginationPropHelpers } from "./pagination";
-import { useActiveRowPropHelpers } from "./active-row";
+import { useActiveRowPropHelpers } from "./active-item";
 import { useExpansionPropHelpers } from "./expansion";
 import { handlePropagatedRowClick } from "./utils";
 
diff --git a/client/src/app/hooks/table-controls/useTableControlState.ts b/client/src/app/hooks/table-controls/useTableControlState.ts
index 7f873571a1..1f8554f59f 100644
--- a/client/src/app/hooks/table-controls/useTableControlState.ts
+++ b/client/src/app/hooks/table-controls/useTableControlState.ts
@@ -7,7 +7,7 @@ import {
 import { useFilterState } from "./filtering";
 import { useSortState } from "./sorting";
 import { usePaginationState } from "./pagination";
-import { useActiveRowState } from "./active-row";
+import { useActiveRowState } from "./active-item";
 import { useExpansionState } from "./expansion";
 
 export const useTableControlState = <