diff --git a/furniture-3d-system/src/app/intake/non-integrated/NonIntegratedDetailClient.tsx b/furniture-3d-system/src/app/intake/non-integrated/NonIntegratedDetailClient.tsx
index 0e60e472..fef98b1e 100644
--- a/furniture-3d-system/src/app/intake/non-integrated/NonIntegratedDetailClient.tsx
+++ b/furniture-3d-system/src/app/intake/non-integrated/NonIntegratedDetailClient.tsx
@@ -582,6 +582,11 @@ import {
   normalizeFirstQualityRowsForPayload,
   type ProductFirstQualityDisplayRow,
 } from "./firstQualityHelpers";
+import {
+  getProductFactoryModelAutofillKey,
+  getSkuFactoryModelKey,
+  getSkuPackageGroupKey,
+} from "./productFactoryKeyHelpers";
 import {
   MATERIAL_TYPE_OPTIONS,
   PLANNING_LAYOUT_AUDIENCE_OPTIONS,
@@ -3554,21 +3559,6 @@ function resolveAutoAwareBarcode(
   return fallbackBarcode;
 }
 
-function getSkuPackageGroupKey(sku: Pick<NonIntegratedSkuItem, "id" | "packageGroupId">) {
-  return sku.packageGroupId.trim() || sku.id;
-}
-
-function getSkuFactoryModelKey(sku: Pick<NonIntegratedSkuItem, "model">) {
-  return sku.model.trim();
-}
-
-function getProductFactoryModelAutofillKey(
-  skuId: string,
-  key: ProductFactoryEditableKey,
-) {
-  return `${skuId}:${key}`;
-}
-
 function hasPackageSharedFactoryRowContent(row: NonIntegratedFactoryRow) {
   return Array.from(PACKAGE_SHARED_PRODUCT_FACTORY_PURCHASING_KEYS).some((key) =>
     row[key].trim(),
diff --git a/furniture-3d-system/src/app/intake/non-integrated/productFactoryKeyHelpers.ts b/furniture-3d-system/src/app/intake/non-integrated/productFactoryKeyHelpers.ts
new file mode 100644
index 00000000..f4cc6c4a
--- /dev/null
+++ b/furniture-3d-system/src/app/intake/non-integrated/productFactoryKeyHelpers.ts
@@ -0,0 +1,21 @@
+import type { NonIntegratedSkuItem } from "./nonIntegratedStorage";
+import type { ProductFactoryEditableKey } from "./skuFieldConfig";
+
+export function getSkuPackageGroupKey(
+  sku: Pick<NonIntegratedSkuItem, "id" | "packageGroupId">,
+) {
+  return sku.packageGroupId.trim() || sku.id;
+}
+
+export function getSkuFactoryModelKey(
+  sku: Pick<NonIntegratedSkuItem, "model">,
+) {
+  return sku.model.trim();
+}
+
+export function getProductFactoryModelAutofillKey(
+  skuId: string,
+  key: ProductFactoryEditableKey,
+) {
+  return `${skuId}:${key}`;
+}