diff --git a/src/app/components/client/FixNavigation.tsx b/src/app/components/client/FixNavigation.tsx
index c0ca2c6d66..2b9668cced 100644
--- a/src/app/components/client/FixNavigation.tsx
+++ b/src/app/components/client/FixNavigation.tsx
@@ -83,7 +83,7 @@ export const Steps = (props: {
     </div>
   );
   const dataBrokerStepCompleted = hasCompletedStepSection(props.data, "Scan");
-  // TODO: Waiting for criteria for data brokers under maintenace to be determined
+  // TODO: MNTOR-3880 Waiting for criteria for data brokers under maintenace to be determined
   // && hasCompletedStepSection(props.data, "DataBrokerManualRemoval");
 
   return (
diff --git a/src/app/components/client/exposure_card/ExposureCard.test.tsx b/src/app/components/client/exposure_card/ExposureCard.test.tsx
index b1d467d0ec..f64da0bf60 100644
--- a/src/app/components/client/exposure_card/ExposureCard.test.tsx
+++ b/src/app/components/client/exposure_card/ExposureCard.test.tsx
@@ -15,7 +15,7 @@ import Meta, {
   DataBrokerManualRemoved,
   DataBrokerRemoved,
   DataBrokerRequestedRemoval,
-  // TODO: Waiting for criteria for data brokers under maintenace to be determined
+  // TODO: MNTOR-3880 Waiting for criteria for data brokers under maintenace to be determined
   // DataBrokerRemovalUnderMaintenance,
   // DataBrokerRemovalUnderMaintenanceFixed,
 } from "./ExposureCard.stories";
@@ -76,7 +76,7 @@ describe("ScanResultCard", () => {
     expect(innerDescription).toBeInTheDocument();
   });
 
-  // TODO: Waiting for criteria for data brokers under maintenace to be determined
+  // TODO: MNTOR-3880 Waiting for criteria for data brokers under maintenace to be determined
   // Data broker removal under maintenance
   // eslint-disable-next-line jest/no-commented-out-tests
   // it("shows the right description for a scan result card with removal under maintenance status", () => {
@@ -93,7 +93,7 @@ describe("ScanResultCard", () => {
   //   expect(innerDescription).toBeInTheDocument();
   // });
 
-  // TODO: Waiting for criteria for data brokers under maintenace to be determined
+  // TODO: MNTOR-3880 Waiting for criteria for data brokers under maintenace to be determined
   // Data broker removal under maintenance resolved
   // eslint-disable-next-line jest/no-commented-out-tests
   // it("shows the right description for a scan result card with removal under maintenance status that's been resolved", () => {
@@ -122,7 +122,7 @@ describe("ScanResultCard", () => {
     expect(innerDescription).toBeInTheDocument();
   });
 
-  // TODO: Waiting for criteria for data brokers under maintenace to be determined
+  // TODO: MNTOR-3880 Waiting for criteria for data brokers under maintenace to be determined
   // Data broker removal under maintenance
   // eslint-disable-next-line jest/no-commented-out-tests
   // it("shows the right description for a scan result card where removal is under maintenance", () => {
diff --git a/src/app/components/client/exposure_card/ScanResultCard.tsx b/src/app/components/client/exposure_card/ScanResultCard.tsx
index 5738ddb3ce..0efe3776aa 100644
--- a/src/app/components/client/exposure_card/ScanResultCard.tsx
+++ b/src/app/components/client/exposure_card/ScanResultCard.tsx
@@ -119,7 +119,7 @@ export const ScanResultCard = (props: ScanResultCardProps) => {
     // Data broker cards manually resolved do not change their status to "removed";
     // instead, we track them using the "manually_resolved" property.
 
-    // TODO: Waiting for criteria for data brokers under maintenace to be determined
+    // TODO: MNTOR-3880 Waiting for criteria for data brokers under maintenace to be determined
     // if (scanResult.broker_status === "removal_under_maintenance") {
     //   if (scanResult.manually_resolved) {
     //     return l10n.getFragment(
@@ -252,7 +252,7 @@ export const ScanResultCard = (props: ScanResultCardProps) => {
       );
     }
 
-    // TODO: Waiting for criteria for data brokers under maintenace to be determined
+    // TODO: MNTOR-3880 Waiting for criteria for data brokers under maintenace to be determined
     // if (props.scanResult.broker_status === "removal_under_maintenance") {
     //   return <span>{props.resolutionCta}</span>;
     // }
@@ -328,7 +328,7 @@ export const ScanResultCard = (props: ScanResultCardProps) => {
             <dd>
               <StatusPill
                 // isRemovalUnderMaintenance={
-                //   // TODO: Waiting for criteria for data brokers under maintenace to be determined
+                //   // TODO: MNTOR-3880 Waiting for criteria for data brokers under maintenace to be determined
                 //   // scanResult.broker_status === "removal_under_maintenance"
                 // }
                 exposure={scanResult}
diff --git a/src/app/components/server/StatusPill.tsx b/src/app/components/server/StatusPill.tsx
index a040affc76..a06c30e650 100644
--- a/src/app/components/server/StatusPill.tsx
+++ b/src/app/components/server/StatusPill.tsx
@@ -30,7 +30,7 @@ type ExposureProps = { exposure: Exposure };
 export type Props = (DirectTypeProps | ExposureProps) & {
   enabledFeatureFlags?: FeatureFlagName[];
   note?: string;
-  // TODO: Waiting for criteria for data brokers under maintenace to be determined
+  // TODO: MNTOR-3880 Waiting for criteria for data brokers under maintenace to be determined
   // isRemovalUnderMaintenance?: boolean;
 };
 
@@ -77,7 +77,7 @@ type StatusLabelProps = {
   exposure?: Exposure;
   pillType: string;
   l10n: ExtendedReactLocalization;
-  // TODO: Waiting for criteria for data brokers under maintenace to be determined
+  // TODO: MNTOR-3880 Waiting for criteria for data brokers under maintenace to be determined
   // isDataBrokerUnderMaintenance?: boolean;
 };
 
@@ -89,7 +89,7 @@ const getStatusLabel = (props: StatusLabelProps): string => {
   if (manuallyRemoved) {
     return props.l10n.getString("status-pill-removed");
   }
-  // TODO: Waiting for criteria for data brokers under maintenace to be determined
+  // TODO: MNTOR-3880 Waiting for criteria for data brokers under maintenace to be determined
   // if (props.isDataBrokerUnderMaintenance) {
   //   return props.l10n.getString("status-pill-action-needed");
   // }
@@ -111,7 +111,7 @@ const getStatusLabel = (props: StatusLabelProps): string => {
 export const getExposureStatus = (
   exposure: Exposure,
   additionalRemovalStatusesEnabled: boolean,
-  // TODO: Waiting for criteria for data brokers under maintenace to be determined
+  // TODO: MNTOR-3880 Waiting for criteria for data brokers under maintenace to be determined
   // isRemovalUnderMaintenance: boolean,
 ): StatusPillType => {
   if (isScanResult(exposure)) {
diff --git a/src/app/functions/server/getRelevantGuidedSteps.test.ts b/src/app/functions/server/getRelevantGuidedSteps.test.ts
index a7e19f29f2..91e96b8d17 100644
--- a/src/app/functions/server/getRelevantGuidedSteps.test.ts
+++ b/src/app/functions/server/getRelevantGuidedSteps.test.ts
@@ -561,7 +561,7 @@ describe("getNextGuidedStep", () => {
       ).toBe("Done");
     });
 
-    // TODO: Waiting for criteria for data brokers under maintenace to be determined
+    // TODO: MNTOR-3880 Waiting for criteria for data brokers under maintenace to be determined
     // eslint-disable-next-line jest/no-commented-out-tests
     // it("links to the removal under maintenance step if a user has scan resutls with a data broker that has a removal under maintenance status", () => {
     //   expect(
diff --git a/src/app/functions/server/getRelevantGuidedSteps.ts b/src/app/functions/server/getRelevantGuidedSteps.ts
index 280028a613..34e0877616 100644
--- a/src/app/functions/server/getRelevantGuidedSteps.ts
+++ b/src/app/functions/server/getRelevantGuidedSteps.ts
@@ -136,7 +136,7 @@ export function isEligibleForStep(
   stepId: StepLink["id"],
 ): boolean {
   // Only premium users can see the manual data broker removal flow, once they have run a scan
-  // TODO: Waiting for criteria for data brokers under maintenace to be determined
+  // TODO: MNTOR-3880 Waiting for criteria for data brokers under maintenace to be determined
   // if (stepId === "DataBrokerManualRemoval") {
   //   const dataBrokersRequireManualRemoval =
   //     data.latestScanData?.results?.some((result) => {
@@ -245,7 +245,7 @@ export function hasCompletedStep(
   data: StepDeterminationData,
   stepId: StepLink["id"],
 ): boolean {
-  // TODO: Waiting for criteria for data brokers under maintenace to be determined
+  // TODO: MNTOR-3880 Waiting for criteria for data brokers under maintenace to be determined
   // if (stepId === "DataBrokerManualRemoval") {
   //   return (
   //     data.latestScanData?.results?.every(