diff --git a/src/app/(protected)/workorders/_components/wizard/wizard-field-select-options.tsx b/src/app/(protected)/workorders/_components/wizard/wizard-field-select-options.tsx
index 7c2771d7..4dd7381d 100644
--- a/src/app/(protected)/workorders/_components/wizard/wizard-field-select-options.tsx
+++ b/src/app/(protected)/workorders/_components/wizard/wizard-field-select-options.tsx
@@ -49,41 +49,45 @@ export function WizardFieldSelectOptions({
             No matches
           </Text>
         ) : (
-          options.map((o) => (
+          options.map((option) => (
             <button
-              key={o.key}
+              key={option.key}
               type="button"
-              disabled={o.disabled}
-              title={o.title}
+              disabled={option.disabled}
+              title={option.title}
               onClick={() => {
-                if (o.disabled) return;
-                onPick(o.key);
+                if (option.disabled) return;
+                onPick(option.key);
               }}
               className={
-                o.disabled
+                option.disabled
                   ? "flex w-full cursor-not-allowed items-center gap-2 rounded px-2 py-1.5 opacity-50"
                   : "flex w-full items-center gap-2 rounded px-2 py-1.5 transition-colors hover:bg-[#F9FAFB]"
               }
             >
-              {o.left != null && <span className="flex shrink-0 items-center">{o.left}</span>}
+              {option.left != null && (
+                <span className="flex shrink-0 items-center">{option.left}</span>
+              )}
               <span className="min-w-0 flex-1 text-left">
                 <span
                   className="block truncate text-[12px]"
                   style={{ color: "var(--color-text-primary)" }}
                 >
-                  {o.label}
+                  {option.label}
                 </span>
-                {Boolean(o.description) && (
+                {Boolean(option.description) && (
                   <span
                     className="mt-0.5 block truncate text-[11px]"
                     style={{ color: "var(--color-text-muted)" }}
                   >
-                    {o.description}
+                    {option.description}
                   </span>
                 )}
               </span>
-              {o.right != null && <span className="flex shrink-0 items-center">{o.right}</span>}
-              {value === o.key && (
+              {option.right != null && (
+                <span className="flex shrink-0 items-center">{option.right}</span>
+              )}
+              {value === option.key && (
                 <Check size={10} className="shrink-0" style={{ color: "var(--color-primary)" }} />
               )}
             </button>
diff --git a/src/app/(protected)/workorders/_components/wizard/wizard-step-vendor-time.tsx b/src/app/(protected)/workorders/_components/wizard/wizard-step-vendor-time.tsx
index 82e7e955..e28272e3 100644
--- a/src/app/(protected)/workorders/_components/wizard/wizard-step-vendor-time.tsx
+++ b/src/app/(protected)/workorders/_components/wizard/wizard-step-vendor-time.tsx
@@ -116,12 +116,12 @@ function WizardVendorDetail({
 }
 
 function buildWizardStatusOptions(closabilityGaps: string[]) {
-  return ALL_WIZARD_STATUSES.map((s) => {
-    const isCompletedBlocked = s === "Completed" && closabilityGaps.length > 0;
+  return ALL_WIZARD_STATUSES.map((status) => {
+    const isCompletedBlocked = status === "Completed" && closabilityGaps.length > 0;
     return {
-      key: s,
-      label: s,
-      left: <ColorDot color={WIZARD_STATUS_DOTS[s]} />,
+      key: status,
+      label: status,
+      left: <ColorDot color={WIZARD_STATUS_DOTS[status]} />,
       disabled: isCompletedBlocked,
       title: isCompletedBlocked ? formatClosabilityMissingTitle(closabilityGaps) : undefined,
     };
@@ -262,9 +262,9 @@ export function WizardStepVendorTime({
           search={false}
           icon={<ColorDot color={statusDotColor} />}
           options={buildWizardStatusOptions(closabilityGaps)}
-          onPick={(s) => {
-            if (s === "Completed" && closabilityGaps.length > 0) return;
-            onUpdate("status", s as WizardWOStatus);
+          onPick={(status) => {
+            if (status === "Completed" && closabilityGaps.length > 0) return;
+            onUpdate("status", status as WizardWOStatus);
           }}
         />
       </div>
diff --git a/src/domain/work-orders/mappers/work-order-mapper.ts b/src/domain/work-orders/mappers/work-order-mapper.ts
index 75d6ef68..303b03fa 100644
--- a/src/domain/work-orders/mappers/work-order-mapper.ts
+++ b/src/domain/work-orders/mappers/work-order-mapper.ts
@@ -3,7 +3,7 @@ import {
   readDetailDocStatus,
   readDetailMediaCount,
   readDetailWoType,
-} from "@/domain/work-orders/mappers/read-detail-closability-fields";
+} from "@/domain/work-orders/utils/read-detail-closability-fields";
 import type {
   EmployeeOption,
   LocationOption,
diff --git a/src/domain/work-orders/mappers/read-detail-closability-fields.ts b/src/domain/work-orders/utils/read-detail-closability-fields.ts
similarity index 100%
rename from src/domain/work-orders/mappers/read-detail-closability-fields.ts
rename to src/domain/work-orders/utils/read-detail-closability-fields.ts
diff --git a/src/test/domain/work-orders/utils/wo-closability.test.ts b/src/test/domain/work-orders/utils/wo-closability.test.ts
index b855a61c..c900ccec 100644
--- a/src/test/domain/work-orders/utils/wo-closability.test.ts
+++ b/src/test/domain/work-orders/utils/wo-closability.test.ts
@@ -1,5 +1,5 @@
 import { describe, expect, it } from "vitest";
-import { readDetailWoType } from "@/domain/work-orders/mappers/read-detail-closability-fields";
+import { readDetailWoType } from "@/domain/work-orders/utils/read-detail-closability-fields";
 import type { WorkOrderDetail } from "@/domain/work-orders/types/work-order-detail";
 import { EMPTY_WIZARD_DRAFT } from "@/domain/work-orders/types/work-order-wizard";
 import type { WoClosabilityInput } from "@/domain/work-orders/utils/wo-closability";