From 90734f4163efd62638710be7bebfc28c113427b5 Mon Sep 17 00:00:00 2001
From: Ruby Lavender <67907735+RLavender98@users.noreply.github.com>
Date: Fri, 17 Jan 2025 14:00:24 +0000
Subject: [PATCH 1/5] feat(FN-3675): implement custom typeorm naming strategy
 (#4150)

---
 .../custom-naming-strategy.test.ts            | 51 +++++++++++++++++++
 .../custom-naming-strategy.ts                 | 25 +++++++++
 .../src/sql-db-connection/data-source.ts      |  2 +
 ...-RenameEmbeddedColumnsWithCorrectCasing.ts | 25 +++++++++
 4 files changed, 103 insertions(+)
 create mode 100644 libs/common/src/sql-db-connection/custom-naming-strategy.test.ts
 create mode 100644 libs/common/src/sql-db-connection/custom-naming-strategy.ts
 create mode 100644 libs/common/src/sql-db-connection/migrations/1737038776008-RenameEmbeddedColumnsWithCorrectCasing.ts

diff --git a/libs/common/src/sql-db-connection/custom-naming-strategy.test.ts b/libs/common/src/sql-db-connection/custom-naming-strategy.test.ts
new file mode 100644
index 0000000000..15be3a6a76
--- /dev/null
+++ b/libs/common/src/sql-db-connection/custom-naming-strategy.test.ts
@@ -0,0 +1,51 @@
+import { CustomNamingStrategy } from './custom-naming-strategy';
+
+describe('custom-naming-strategy', () => {
+  describe('CustomNamingStrategy', () => {
+    const strategy = new CustomNamingStrategy();
+
+    describe('columnName', () => {
+      describe('when customName is provided', () => {
+        it.each`
+          customName       | embeddedPrefixes          | expected                  | description
+          ${'custom'}      | ${[]}                     | ${'custom'}               | ${'there are no embedded prefixes'}
+          ${'custom'}      | ${['prefix']}             | ${'prefixCustom'}         | ${'there is one embedded prefixes'}
+          ${'custom'}      | ${['prefix1', 'prefix2']} | ${'prefix1Prefix2Custom'} | ${'there are multiple embedded prefixes'}
+          ${'customName'}  | ${['prefixWord']}         | ${'prefixWordCustomName'} | ${'the inputs are in camel case'}
+          ${'custom_name'} | ${['prefix_word']}        | ${'prefixWordCustomName'} | ${'the inputs are in snake case'}
+          ${'custom name'} | ${['prefix word']}        | ${'prefixWordCustomName'} | ${'the inputs are in space separated'}
+        `(
+          'should return the customName prefixed by all the prefixes in camel case when $description',
+          ({ customName, embeddedPrefixes, expected }: { customName: string; embeddedPrefixes: string[]; expected: string }) => {
+            // Act
+            const result = strategy.columnName('propertyName', customName, embeddedPrefixes);
+
+            // Assert
+            expect(result).toEqual(expected);
+          },
+        );
+      });
+
+      describe('when customName is not provided', () => {
+        it.each`
+          propertyName       | embeddedPrefixes          | expected                    | description
+          ${'property'}      | ${[]}                     | ${'property'}               | ${'there are no embedded prefixes'}
+          ${'property'}      | ${['prefix']}             | ${'prefixProperty'}         | ${'there is one embedded prefixes'}
+          ${'property'}      | ${['prefix1', 'prefix2']} | ${'prefix1Prefix2Property'} | ${'there are multiple embedded prefixes'}
+          ${'propertyName'}  | ${['prefixWord']}         | ${'prefixWordPropertyName'} | ${'the inputs are in camel case'}
+          ${'property_name'} | ${['prefix_word']}        | ${'prefixWordPropertyName'} | ${'the inputs are in snake case'}
+          ${'property name'} | ${['prefix word']}        | ${'prefixWordPropertyName'} | ${'the inputs are in space separated'}
+        `(
+          'should return the propertyName prefixed by all the prefixes in camel case when $description',
+          ({ propertyName, embeddedPrefixes, expected }: { propertyName: string; embeddedPrefixes: string[]; expected: string }) => {
+            // Act
+            const result = strategy.columnName(propertyName, '', embeddedPrefixes);
+
+            // Assert
+            expect(result).toEqual(expected);
+          },
+        );
+      });
+    });
+  });
+});
diff --git a/libs/common/src/sql-db-connection/custom-naming-strategy.ts b/libs/common/src/sql-db-connection/custom-naming-strategy.ts
new file mode 100644
index 0000000000..815d7ec406
--- /dev/null
+++ b/libs/common/src/sql-db-connection/custom-naming-strategy.ts
@@ -0,0 +1,25 @@
+import { DefaultNamingStrategy } from 'typeorm';
+import { camelCase } from 'typeorm/util/StringUtils';
+
+/**
+ * We define our own naming strategy because we are using embedded columns.
+ *
+ * The DefaultNamingStrategy does not handle embedded columns correctly,
+ * removing the casing of the embedded column names.
+ *
+ * e.g. if we have an embedded property 'fooBar', and the prefix 'bazQux'
+ * the default strategy would return 'bazQuxFoobar' instead of 'bazQuxFooBar'.
+ *
+ * Based on discussion here: @link{https://github.com/typeorm/typeorm/issues/7307}.
+ */
+export class CustomNamingStrategy extends DefaultNamingStrategy {
+  columnName(propertyName: string, customName: string, embeddedPrefixes: string[]): string {
+    const name = customName || propertyName;
+
+    if (embeddedPrefixes.length) {
+      return camelCase([...embeddedPrefixes, name].join(' '));
+    }
+
+    return name;
+  }
+}
diff --git a/libs/common/src/sql-db-connection/data-source.ts b/libs/common/src/sql-db-connection/data-source.ts
index 2ca058bc0d..5180f63067 100644
--- a/libs/common/src/sql-db-connection/data-source.ts
+++ b/libs/common/src/sql-db-connection/data-source.ts
@@ -1,6 +1,7 @@
 import { DataSource, DataSourceOptions } from 'typeorm';
 import path from 'path';
 import { sqlDbConfig } from './config';
+import { CustomNamingStrategy } from './custom-naming-strategy';
 
 const { SQL_DB_HOST, SQL_DB_PORT, SQL_DB_USERNAME, SQL_DB_PASSWORD, SQL_DB_NAME, SQL_DB_LOGGING_ENABLED } = sqlDbConfig;
 
@@ -19,6 +20,7 @@ const dataSourceOptions: DataSourceOptions = {
     encrypt: true,
     trustServerCertificate: true,
   },
+  namingStrategy: new CustomNamingStrategy(),
 };
 
 export const SqlDbDataSource = new DataSource(dataSourceOptions);
diff --git a/libs/common/src/sql-db-connection/migrations/1737038776008-RenameEmbeddedColumnsWithCorrectCasing.ts b/libs/common/src/sql-db-connection/migrations/1737038776008-RenameEmbeddedColumnsWithCorrectCasing.ts
new file mode 100644
index 0000000000..b526ceff7c
--- /dev/null
+++ b/libs/common/src/sql-db-connection/migrations/1737038776008-RenameEmbeddedColumnsWithCorrectCasing.ts
@@ -0,0 +1,25 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class RenameEmbeddedColumnsWithCorrectCasing1737038776008 implements MigrationInterface {
+  name = 'RenameEmbeddedColumnsWithCorrectCasing1737038776008';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`
+        EXEC sp_rename "[FeeRecordCorrection].[requestedByUserFirstname]", "requestedByUserFirstName", "COLUMN"
+    `);
+
+    await queryRunner.query(`
+      EXEC sp_rename "[FeeRecordCorrection].[requestedByUserLastname]", "requestedByUserLastName", "COLUMN"
+  `);
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`
+        EXEC sp_rename "[FeeRecordCorrection].[requestedByUserFirstName]", "requestedByUserFirstname", "COLUMN"
+    `);
+
+    await queryRunner.query(`
+      EXEC sp_rename "[FeeRecordCorrection].[requestedByUserLastName]", "requestedByUserLastname", "COLUMN"
+  `);
+  }
+}

From 9d3f2235b3924008c5840f97e26bb28bf8de4819 Mon Sep 17 00:00:00 2001
From: Ruby Lavender <67907735+RLavender98@users.noreply.github.com>
Date: Fri, 17 Jan 2025 16:05:47 +0000
Subject: [PATCH 2/5] feat(FN-3670): correction sent page e2e-tests (#4146)

---
 .../correction-sent.spec.js                   | 91 +++++++++++++++++++
 e2e-tests/portal/cypress/e2e/pages/index.js   |  1 +
 .../record-corrections/correctionSent.js      |  7 ++
 .../confirmation.component-test.js            |  4 +-
 .../_macros/email-confirmation-list.njk       |  2 +-
 .../record-correction/correction-sent.njk     |  2 +-
 6 files changed, 103 insertions(+), 4 deletions(-)
 create mode 100644 e2e-tests/portal/cypress/e2e/journeys/payment-report-officer/record-corrections/feature-flag-enabled/correction-sent.spec.js
 create mode 100644 e2e-tests/portal/cypress/e2e/pages/utilisation-report-service/record-corrections/correctionSent.js

diff --git a/e2e-tests/portal/cypress/e2e/journeys/payment-report-officer/record-corrections/feature-flag-enabled/correction-sent.spec.js b/e2e-tests/portal/cypress/e2e/journeys/payment-report-officer/record-corrections/feature-flag-enabled/correction-sent.spec.js
new file mode 100644
index 0000000000..cc4be76d6b
--- /dev/null
+++ b/e2e-tests/portal/cypress/e2e/journeys/payment-report-officer/record-corrections/feature-flag-enabled/correction-sent.spec.js
@@ -0,0 +1,91 @@
+import {
+  UtilisationReportEntityMockBuilder,
+  FeeRecordCorrectionEntityMockBuilder,
+  PENDING_RECONCILIATION,
+  FeeRecordEntityMockBuilder,
+  FEE_RECORD_STATUS,
+  RECORD_CORRECTION_REASON,
+  getFormattedReportPeriodWithLongMonth,
+} from '@ukef/dtfs2-common';
+import { NODE_TASKS, BANK1_PAYMENT_REPORT_OFFICER1 } from '../../../../../../../e2e-fixtures';
+import relative from '../../../../relativeURL';
+import { provideCorrection, pendingCorrections, correctionSent } from '../../../../pages';
+import { mainHeading } from '../../../../partials';
+
+context('Correction sent page - Fee record correction feature flag enabled', () => {
+  context('When a correction has been provided', () => {
+    const reportPeriod = { start: { month: 1, year: 2021 }, end: { month: 1, year: 2021 } };
+
+    beforeEach(() => {
+      cy.task(NODE_TASKS.DELETE_ALL_FROM_SQL_DB);
+
+      cy.task('getUserFromDbByEmail', BANK1_PAYMENT_REPORT_OFFICER1.email).then((user) => {
+        const { _id, bank } = user;
+        const bankId = bank.id;
+
+        const report = UtilisationReportEntityMockBuilder.forStatus(PENDING_RECONCILIATION)
+          .withUploadedByUserId(_id.toString())
+          .withBankId(bankId)
+          .withReportPeriod(reportPeriod)
+          .build();
+
+        const feeRecord = FeeRecordEntityMockBuilder.forReport(report).withStatus(FEE_RECORD_STATUS.PENDING_CORRECTION).build();
+
+        const pendingCorrection = FeeRecordCorrectionEntityMockBuilder.forFeeRecord(feeRecord)
+          .withId(3)
+          .withIsCompleted(false)
+          .withReasons([RECORD_CORRECTION_REASON.UTILISATION_INCORRECT])
+          .build();
+
+        cy.task(NODE_TASKS.INSERT_UTILISATION_REPORTS_INTO_DB, [report]);
+        cy.task(NODE_TASKS.INSERT_FEE_RECORDS_INTO_DB, [feeRecord]);
+        cy.task(NODE_TASKS.INSERT_FEE_RECORD_CORRECTIONS_INTO_DB, [pendingCorrection]);
+      });
+
+      cy.login(BANK1_PAYMENT_REPORT_OFFICER1);
+      cy.visit(relative(`/utilisation-report-upload`));
+
+      pendingCorrections.row(1).correctionLink().click();
+
+      cy.keyboardInput(provideCorrection.utilisationInput(), '12345.67');
+
+      // Click continue the first time to save and review.
+      cy.clickContinueButton();
+
+      // Click continue again on the review page to submit the correction.
+      cy.clickContinueButton();
+    });
+
+    after(() => {
+      cy.task(NODE_TASKS.DELETE_ALL_FROM_SQL_DB);
+    });
+
+    it('should display confirmation of the record correction submission', () => {
+      const expectedHeading = `${getFormattedReportPeriodWithLongMonth(reportPeriod)} record correction sent to UKEF`;
+
+      cy.assertText(mainHeading(), expectedHeading);
+
+      cy.assertText(correctionSent.emailText(), 'A confirmation email has been sent to:');
+
+      cy.task('getUserFromDbByEmail', BANK1_PAYMENT_REPORT_OFFICER1.email).then((user) => {
+        const { id } = user.bank;
+
+        cy.task(NODE_TASKS.GET_ALL_BANKS).then((banks) => {
+          const bank = banks.find((b) => b.id === id);
+
+          bank.paymentOfficerTeam.emails.forEach((email) => {
+            correctionSent.emailList().should('contain', email);
+          });
+        });
+      });
+
+      cy.assertText(correctionSent.ukefNotifiedText(), 'UKEF will be notified via email that a record has been updated.');
+    });
+
+    it('should redirect to the Report GEF utilisation and fees paid when continue is clicked', () => {
+      cy.clickContinueButton();
+
+      cy.assertText(mainHeading(), 'Report GEF utilisation and fees');
+    });
+  });
+});
diff --git a/e2e-tests/portal/cypress/e2e/pages/index.js b/e2e-tests/portal/cypress/e2e/pages/index.js
index a4d8c2752d..e70d800190 100644
--- a/e2e-tests/portal/cypress/e2e/pages/index.js
+++ b/e2e-tests/portal/cypress/e2e/pages/index.js
@@ -57,6 +57,7 @@ module.exports = {
   confirmation: require('./utilisation-report-service/confirmation'),
   provideCorrection: require('./utilisation-report-service/record-corrections/provideCorrection'),
   reviewCorrection: require('./utilisation-report-service/record-corrections/reviewCorrection'),
+  correctionSent: require('./utilisation-report-service/record-corrections/correctionSent'),
   problemWithService: require('./problem-with-service'),
   pendingCorrections: require('./utilisation-report-service/record-corrections/pendingCorrections'),
 };
diff --git a/e2e-tests/portal/cypress/e2e/pages/utilisation-report-service/record-corrections/correctionSent.js b/e2e-tests/portal/cypress/e2e/pages/utilisation-report-service/record-corrections/correctionSent.js
new file mode 100644
index 0000000000..2ab47f0a43
--- /dev/null
+++ b/e2e-tests/portal/cypress/e2e/pages/utilisation-report-service/record-corrections/correctionSent.js
@@ -0,0 +1,7 @@
+const page = {
+  emailText: () => cy.get('[data-cy="email-text"]'),
+  emailList: () => cy.get('[data-cy="email-list"]'),
+  ukefNotifiedText: () => cy.get('[data-cy="ukef-notified-text"]'),
+};
+
+module.exports = page;
diff --git a/portal/component-tests/utilisation-report-service/confirmation.component-test.js b/portal/component-tests/utilisation-report-service/confirmation.component-test.js
index 1a761b1bd7..eae02374aa 100644
--- a/portal/component-tests/utilisation-report-service/confirmation.component-test.js
+++ b/portal/component-tests/utilisation-report-service/confirmation.component-test.js
@@ -16,8 +16,8 @@ describe(page, () => {
     wrapper.expectText('[data-cy="main-heading"]').toRead(`${reportPeriod} GEF report sent to UKEF`);
   });
 
-  it('should render paragraph', () => {
-    wrapper.expectText('[data-cy="paragraph"]').toRead('A confirmation email has been sent to:');
+  it('should render email confirmation list', () => {
+    wrapper.expectText('[data-cy="email-text"]').toRead('A confirmation email has been sent to:');
     for (const paymentOfficerEmail of paymentOfficerEmails) {
       wrapper.expectElement(`ul.govuk-list > li:contains("${paymentOfficerEmail}")`).toExist();
     }
diff --git a/portal/templates/utilisation-report-service/_macros/email-confirmation-list.njk b/portal/templates/utilisation-report-service/_macros/email-confirmation-list.njk
index 6c99400cd4..467a334ff3 100644
--- a/portal/templates/utilisation-report-service/_macros/email-confirmation-list.njk
+++ b/portal/templates/utilisation-report-service/_macros/email-confirmation-list.njk
@@ -1,7 +1,7 @@
 {% macro render(params) %}
   {% set emails = params.emails %}
 
-  <p class="govuk-body" data-cy="paragraph">
+  <p class="govuk-body" data-cy="email-text">
     A confirmation email has been sent to:
     <ul class="govuk-list govuk-list--bullet" data-cy="email-list">
       {% for email in emails %}
diff --git a/portal/templates/utilisation-report-service/record-correction/correction-sent.njk b/portal/templates/utilisation-report-service/record-correction/correction-sent.njk
index abe60aa51a..b961f2888a 100644
--- a/portal/templates/utilisation-report-service/record-correction/correction-sent.njk
+++ b/portal/templates/utilisation-report-service/record-correction/correction-sent.njk
@@ -16,7 +16,7 @@
         emails: sentToEmails
       }) }}
 
-      <p class="govuk-body">UKEF will be notified via email that a record has been updated.</p>
+      <p class="govuk-body" data-cy="ukef-notified-text">UKEF will be notified via email that a record has been updated.</p>
 
       <a href="/utilisation-report-upload" role="button" class="govuk-button govuk-!-margin-top-6" data-module="govuk-button" data-cy="continue-button">Continue</a>
     </div>

From 12d65eae272119919117483322e3ef6f47ef9d60 Mon Sep 17 00:00:00 2001
From: MarRobSoftwire <108682750+MarRobSoftwire@users.noreply.github.com>
Date: Fri, 17 Jan 2025 16:25:33 +0000
Subject: [PATCH 3/5] test(DTFS2-7675): fix amendments e2e test (#4154)

---
 .../e2e/pages/amendments/what-do-you-need-to-change.js        | 4 ++--
 .../change-facility-value-journey.happy-path.spec.js          | 2 +-
 .../change-facility-value-journey.unhappy-path.spec.js        | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/e2e-tests/gef/cypress/e2e/pages/amendments/what-do-you-need-to-change.js b/e2e-tests/gef/cypress/e2e/pages/amendments/what-do-you-need-to-change.js
index ff5bb527c1..0e7b9c990b 100644
--- a/e2e-tests/gef/cypress/e2e/pages/amendments/what-do-you-need-to-change.js
+++ b/e2e-tests/gef/cypress/e2e/pages/amendments/what-do-you-need-to-change.js
@@ -2,8 +2,8 @@ const whatDoYouNeedToChange = {
   coverEndDateCheckbox: () => cy.get('[data-cy="cover-end-date-checkbox"]'),
   facilityValueCheckbox: () => cy.get('[data-cy="facility-value-checkbox"]'),
   errorSummary: () => cy.get('[data-cy="error-summary"]'),
-  selectionErrorMessage: () => cy.get('[data-cy="selection-error-message"]'),
-  pageTitle: () => cy.get('[data-cy="page-title"]'),
+  amendmentOptionsInlineError: () => cy.get('[data-cy="amendment-options-inline-error"]'),
+  pageHeading: () => cy.get('[data-cy="page-heading"]'),
   backLink: () => cy.get('[data-cy="back-link"]'),
   warning: () => cy.get('[data-cy="warning"]'),
 };
diff --git a/e2e-tests/ukef/cypress/e2e/journeys/portal/amendments/change-facility-value-journey.happy-path.spec.js b/e2e-tests/ukef/cypress/e2e/journeys/portal/amendments/change-facility-value-journey.happy-path.spec.js
index 7a37654cbb..f73bb0d44d 100644
--- a/e2e-tests/ukef/cypress/e2e/journeys/portal/amendments/change-facility-value-journey.happy-path.spec.js
+++ b/e2e-tests/ukef/cypress/e2e/journeys/portal/amendments/change-facility-value-journey.happy-path.spec.js
@@ -62,7 +62,7 @@ context('Amendments - change facility value journey - happy path', () => {
 
     whatDoYouNeedToChange.coverEndDateCheckbox().should('not.be.checked');
     whatDoYouNeedToChange.facilityValueCheckbox().should('not.be.checked');
-    whatDoYouNeedToChange.pageTitle().contains('What do you need to change?');
+    whatDoYouNeedToChange.pageHeading().contains('What do you need to change?');
     whatDoYouNeedToChange.backLink();
     whatDoYouNeedToChange.warning().contains('Check your records for the most up-to-date values');
 
diff --git a/e2e-tests/ukef/cypress/e2e/journeys/portal/amendments/change-facility-value-journey.unhappy-path.spec.js b/e2e-tests/ukef/cypress/e2e/journeys/portal/amendments/change-facility-value-journey.unhappy-path.spec.js
index b524ff4a03..b7512a190a 100644
--- a/e2e-tests/ukef/cypress/e2e/journeys/portal/amendments/change-facility-value-journey.unhappy-path.spec.js
+++ b/e2e-tests/ukef/cypress/e2e/journeys/portal/amendments/change-facility-value-journey.unhappy-path.spec.js
@@ -68,8 +68,8 @@ context('Amendments - change facility value journey - unhappy path', () => {
     whatDoYouNeedToChange.errorSummary().should('be.visible');
     whatDoYouNeedToChange.errorSummary().contains('Select if you need to change the facility cover end date, value or both');
 
-    whatDoYouNeedToChange.selectionErrorMessage().should('be.visible');
-    whatDoYouNeedToChange.selectionErrorMessage().contains('Select if you need to change the facility cover end date, value or both');
+    whatDoYouNeedToChange.amendmentOptionsInlineError().should('be.visible');
+    whatDoYouNeedToChange.amendmentOptionsInlineError().contains('Select if you need to change the facility cover end date, value or both');
   });
 
   it('navigate to facility value page', () => {

From ce63100c926f977f7e91da3f77c60a8b23a77d7f Mon Sep 17 00:00:00 2001
From: MarRobSoftwire <108682750+MarRobSoftwire@users.noreply.github.com>
Date: Fri, 17 Jan 2025 19:05:09 +0000
Subject: [PATCH 4/5] chore(DTFS2-7768): separate portal and tfm amendment
 statuses (#4149)

---
 .../amendments/tfm-amendments-get.api-test.js | 16 +++++-----
 .../tfm-amendments-post.api-test.js           |  4 +--
 .../post-keying-data.api-test.ts              |  6 ++--
 ...ort-completed-effective-amendments.test.ts | 12 ++++----
 ...and-sort-completed-effective-amendments.ts |  4 +--
 .../amendments-by-deal-id-and-status.ts       | 14 ---------
 .../amendments-by-facility-id-and-status.ts   |  9 ------
 .../amendments-by-status.ts                   |  8 -----
 .../aggregate-pipelines/index.ts              | 12 ++++----
 .../lastest-completed-amendment-by-deal-id.ts |  4 +--
 ...test-completed-amendment-by-facility-id.ts |  4 +--
 .../tfm-amendments-by-deal-id-and-status.ts   | 20 +++++++++++++
 ...fm-amendments-by-facility-id-and-status.ts | 15 ++++++++++
 .../tfm-amendments-by-status.ts               | 13 ++++++++
 .../tfm-facilities.repo.ts                    | 30 +++++++++----------
 ...upsertPortalFacilityAmendmentDraft.test.ts |  4 +--
 .../portal/facility-amendment.service.ts      |  4 +--
 ...rtalFacilityAmendmentDraft.service.test.ts |  6 ++--
 .../patch-amendment.controller.test.ts        |  4 +--
 .../facility/put-amendment.controller.test.ts |  4 +--
 .../tfm-get-amendments.controller.ts          | 12 ++++----
 .../tfm-post-amendments.controller.ts         |  6 ++--
 .../schemas/amendment-status.schema.test.ts   |  6 ++--
 .../schemas/amendment-status.schema.ts        |  4 +--
 .../test-data/tfm-facility-amendment.ts       |  6 ++--
 ...xed-fee-adjustment-with-amendments.spec.js |  8 ++---
 .../view-utilisation.spec.js                  |  6 ++--
 gef-ui/test-helpers/mock-amendment.ts         |  4 +--
 libs/common/src/constants/amendments.ts       | 19 +++++++++++-
 .../portal-facility-amendment.ts              |  4 +--
 libs/common/src/types/amendment-status.ts     |  6 ++--
 .../types/mongo-db-models/tfm-facilities.ts   |  5 ++--
 .../gef/amendments/amendments.get.api-test.ts |  4 +--
 .../amendments/amendments.patch.api-test.ts   | 11 +++++--
 .../gef/amendments/amendments.put.api-test.ts | 11 +++++--
 .../amendments/get-amendment.test.ts          |  4 +--
 .../amendments/patch-amendment.test.ts        |  4 +--
 .../amendments/put-amendment.test.ts          |  4 +--
 ...object-on-amendment-completion.api-test.js |  4 +--
 ...-tfm-deal-amendment-completion.api-test.js |  4 +--
 .../src/v1/helpers/amendment.helpers.js       |  4 +--
 .../deal-with-amendment-bss.api-test.js       |  8 ++---
 .../deal-with-amendment-gef.api-test.js       |  6 ++--
 .../helpers/amendment.helpers.js              |  4 +--
 .../helpers/amendment.helpers.test.js         | 30 +++++++++----------
 .../mappings/deal/mapTotals.api-test.js       |  6 ++--
 .../facilities/mapCoverEndDate.api-test.js    |  4 +--
 .../mappings/facilities/mapDates.api-test.js  |  4 +--
 .../facilities/mapFacilityValue.api-test.js   |  4 +--
 ...pFacilityValueExporterCurrency.api-test.js |  4 +--
 .../mappings/facilities/mapTenor.api-test.js  |  4 +--
 .../facilities/mapUkefExposure.api-test.js    |  4 +--
 .../mapUkefExposureValue.api-test.js          |  4 +--
 .../mapGefFacilityDates.test.js               | 14 ++++-----
 .../amendCoverEndDate.controller.js           |  6 ++--
 .../amendFacilityValue.controller.js          |  6 ++--
 .../amendments/amendmentAnswers.controller.js |  6 ++--
 .../amendmentBankReviewDate.controller.js     |  6 ++--
 .../amendmentBankReviewDate.get.test.js       |  4 +--
 .../amendmentEffectiveDate.controller.js      |  6 ++--
 .../amendmentFacilityEndDate.controller.js    |  6 ++--
 .../amendmentFacilityEndDate.get.test.js      |  4 +--
 ...ndmentIsUsingFacilityEndDate.controller.js |  6 ++--
 ...mendmentIsUsingFacilityEndDate.get.test.js |  4 +--
 .../amendments/amendmentOptions.controller.js |  6 ++--
 .../amendmentRequestApproval.controller.js    |  6 ++--
 .../amendmentRequestDate.controller.js        |  8 ++---
 .../amendments/amendmentRequestDate.test.js   | 10 +++----
 .../amendments/bankDecision.controller.js     | 18 +++++------
 ...anagersConditionsAndComments.controller.js | 10 +++----
 .../underwriterManagerDecision.controller.js  | 10 +++----
 .../server/controllers/case/index.js          |  4 +--
 .../server/controllers/case/index.test.js     |  6 ++--
 ...elper.filterAmendmentsByInProgress.test.js | 10 +++----
 .../controllers/helpers/amendments.helper.js  |  4 +--
 .../dealsAndFacilities.helper.deals.test.js   |  6 ++--
 ...alsAndFacilities.helper.facilities.test.js |  6 ++--
 ...DealsIfAmendmentsInProgress.helper.test.js | 10 +++----
 ...FacilitiesIfAmendmentsInProgress.helper.js |  4 +--
 ...itiesIfAmendmentsInProgress.helper.test.js | 10 +++----
 .../server/test-mocks/amendment-test-mocks.js |  8 ++---
 .../mock-data/tfm-facility-amendment.ts       |  4 +--
 utils/data-migration/constant/amendment.js    | 20 -------------
 utils/data-migration/constant/index.js        |  2 --
 84 files changed, 335 insertions(+), 306 deletions(-)
 delete mode 100644 dtfs-central-api/src/repositories/tfm-facilities-repo/aggregate-pipelines/amendments-by-deal-id-and-status.ts
 delete mode 100644 dtfs-central-api/src/repositories/tfm-facilities-repo/aggregate-pipelines/amendments-by-facility-id-and-status.ts
 delete mode 100644 dtfs-central-api/src/repositories/tfm-facilities-repo/aggregate-pipelines/amendments-by-status.ts
 create mode 100644 dtfs-central-api/src/repositories/tfm-facilities-repo/aggregate-pipelines/tfm-amendments-by-deal-id-and-status.ts
 create mode 100644 dtfs-central-api/src/repositories/tfm-facilities-repo/aggregate-pipelines/tfm-amendments-by-facility-id-and-status.ts
 create mode 100644 dtfs-central-api/src/repositories/tfm-facilities-repo/aggregate-pipelines/tfm-amendments-by-status.ts
 delete mode 100644 utils/data-migration/constant/amendment.js

diff --git a/dtfs-central-api/api-tests/v1/tfm/amendments/tfm-amendments-get.api-test.js b/dtfs-central-api/api-tests/v1/tfm/amendments/tfm-amendments-get.api-test.js
index e9d6d9b838..9b69570ae5 100644
--- a/dtfs-central-api/api-tests/v1/tfm/amendments/tfm-amendments-get.api-test.js
+++ b/dtfs-central-api/api-tests/v1/tfm/amendments/tfm-amendments-get.api-test.js
@@ -1,4 +1,4 @@
-const { MONGO_DB_COLLECTIONS, AMENDMENT_STATUS, CURRENCY } = require('@ukef/dtfs2-common');
+const { MONGO_DB_COLLECTIONS, TFM_AMENDMENT_STATUS, CURRENCY } = require('@ukef/dtfs2-common');
 const { generateTfmAuditDetails, generatePortalAuditDetails } = require('@ukef/dtfs2-common/change-stream');
 const { withMongoIdPathParameterValidationTests } = require('@ukef/dtfs2-common/test-cases-backend');
 const wipeDB = require('../../../wipeDB');
@@ -59,7 +59,7 @@ describe('GET TFM amendments', () => {
       const { body: bodyPostResponse } = await testApi
         .post({ auditDetails: generateTfmAuditDetails(MOCK_TFM_USER._id) })
         .to(`/v1/tfm/facilities/${facilityId}/amendments`);
-      const updatePayload = { status: AMENDMENT_STATUS.IN_PROGRESS };
+      const updatePayload = { status: TFM_AMENDMENT_STATUS.IN_PROGRESS };
       await testApi
         .put({ payload: updatePayload, auditDetails: generateTfmAuditDetails(MOCK_TFM_USER._id) })
         .to(`/v1/tfm/facilities/${facilityId}/amendments/${bodyPostResponse.amendmentId}`);
@@ -147,7 +147,7 @@ describe('GET TFM amendments', () => {
       const { body: bodyPostResponse } = await testApi
         .post({ auditDetails: generateTfmAuditDetails(MOCK_TFM_USER._id) })
         .to(`/v1/tfm/facilities/${facilityId}/amendments`);
-      const updatePayload = { status: AMENDMENT_STATUS.IN_PROGRESS };
+      const updatePayload = { status: TFM_AMENDMENT_STATUS.IN_PROGRESS };
       await testApi
         .put({ payload: updatePayload, auditDetails: generateTfmAuditDetails(MOCK_TFM_USER._id) })
         .to(`/v1/tfm/facilities/${facilityId}/amendments/${bodyPostResponse.amendmentId}`);
@@ -207,7 +207,7 @@ describe('GET TFM amendments', () => {
       } = await testApi.post({ auditDetails: generateTfmAuditDetails(MOCK_TFM_USER._id) }).to(`/v1/tfm/facilities/${facilityId}/amendments`);
       await testApi
         .put({
-          payload: { status: AMENDMENT_STATUS.COMPLETED },
+          payload: { status: TFM_AMENDMENT_STATUS.COMPLETED },
           auditDetails: generateTfmAuditDetails(MOCK_TFM_USER._id),
         })
         .to(`/v1/tfm/facilities/${facilityId}/amendments/${amendmentId}`);
@@ -217,7 +217,7 @@ describe('GET TFM amendments', () => {
       } = await testApi.post({ auditDetails: generateTfmAuditDetails(MOCK_TFM_USER._id) }).to(`/v1/tfm/facilities/${facilityId}/amendments`);
       await testApi
         .put({
-          payload: { status: AMENDMENT_STATUS.COMPLETED },
+          payload: { status: TFM_AMENDMENT_STATUS.COMPLETED },
           auditDetails: generateTfmAuditDetails(MOCK_TFM_USER._id),
         })
         .to(`/v1/tfm/facilities/${facilityId}/amendments/${amendmentId2}`);
@@ -292,7 +292,7 @@ describe('GET TFM amendments', () => {
       await testApi
         .put({
           payload: {
-            status: AMENDMENT_STATUS.COMPLETED,
+            status: TFM_AMENDMENT_STATUS.COMPLETED,
             submittedByPim: true,
             requireUkefApproval: false,
             changeFacilityValue: true,
@@ -347,7 +347,7 @@ describe('GET TFM amendments', () => {
       const { body: bodyPostResponse1 } = await testApi
         .post({ auditDetails: generateTfmAuditDetails(MOCK_TFM_USER._id) })
         .to(`/v1/tfm/facilities/${facilityId1}/amendments`);
-      const updatePayload1 = { status: AMENDMENT_STATUS.IN_PROGRESS };
+      const updatePayload1 = { status: TFM_AMENDMENT_STATUS.IN_PROGRESS };
       await testApi
         .put({ payload: updatePayload1, auditDetails: generateTfmAuditDetails(MOCK_TFM_USER._id) })
         .to(`/v1/tfm/facilities/${facilityId1}/amendments/${bodyPostResponse1.amendmentId}`);
@@ -366,7 +366,7 @@ describe('GET TFM amendments', () => {
       const { body: bodyPostResponse2 } = await testApi
         .post({ auditDetails: generateTfmAuditDetails(MOCK_TFM_USER._id) })
         .to(`/v1/tfm/facilities/${facilityId2}/amendments`);
-      const updatePayload2 = { status: AMENDMENT_STATUS.IN_PROGRESS };
+      const updatePayload2 = { status: TFM_AMENDMENT_STATUS.IN_PROGRESS };
       await testApi
         .put({ payload: updatePayload2, auditDetails: generateTfmAuditDetails(MOCK_TFM_USER._id) })
         .to(`/v1/tfm/facilities/${facilityId2}/amendments/${bodyPostResponse2.amendmentId}`);
diff --git a/dtfs-central-api/api-tests/v1/tfm/amendments/tfm-amendments-post.api-test.js b/dtfs-central-api/api-tests/v1/tfm/amendments/tfm-amendments-post.api-test.js
index eb033c4930..8a5fd20bcd 100644
--- a/dtfs-central-api/api-tests/v1/tfm/amendments/tfm-amendments-post.api-test.js
+++ b/dtfs-central-api/api-tests/v1/tfm/amendments/tfm-amendments-post.api-test.js
@@ -1,4 +1,4 @@
-const { MONGO_DB_COLLECTIONS, AUDIT_USER_TYPES, AMENDMENT_STATUS } = require('@ukef/dtfs2-common');
+const { MONGO_DB_COLLECTIONS, AUDIT_USER_TYPES, TFM_AMENDMENT_STATUS } = require('@ukef/dtfs2-common');
 const { generatePortalAuditDetails, generateTfmAuditDetails } = require('@ukef/dtfs2-common/change-stream');
 const { withMongoIdPathParameterValidationTests } = require('@ukef/dtfs2-common/test-cases-backend');
 const wipeDB = require('../../../wipeDB');
@@ -92,7 +92,7 @@ describe('POST TFM amendments', () => {
           .post({ auditDetails: generateTfmAuditDetails(MOCK_TFM_USER._id) })
           .to(`/v1/tfm/facilities/${facilityId}/amendments`);
 
-        const updatePayload1 = { status: AMENDMENT_STATUS.IN_PROGRESS };
+        const updatePayload1 = { status: TFM_AMENDMENT_STATUS.IN_PROGRESS };
         await testApi
           .put({ payload: updatePayload1, auditDetails: generateTfmAuditDetails(MOCK_TFM_USER._id) })
           .to(`/v1/tfm/facilities/${facilityId}/amendments/${bodyPostResponse1.amendmentId}`);
diff --git a/dtfs-central-api/api-tests/v1/utilisation-reports/post-keying-data.api-test.ts b/dtfs-central-api/api-tests/v1/utilisation-reports/post-keying-data.api-test.ts
index cae4ba4704..e0397950d0 100644
--- a/dtfs-central-api/api-tests/v1/utilisation-reports/post-keying-data.api-test.ts
+++ b/dtfs-central-api/api-tests/v1/utilisation-reports/post-keying-data.api-test.ts
@@ -1,7 +1,7 @@
 import { HttpStatusCode } from 'axios';
 import { IsNull, Not } from 'typeorm';
 import {
-  AMENDMENT_STATUS,
+  TFM_AMENDMENT_STATUS,
   convertMillisecondsToSeconds,
   FacilityUtilisationDataEntity,
   FacilityUtilisationDataEntityMockBuilder,
@@ -399,7 +399,7 @@ describe(`POST ${BASE_URL}`, () => {
         {
           ...aTfmFacilityAmendment(),
           value: 350000,
-          status: AMENDMENT_STATUS.COMPLETED,
+          status: TFM_AMENDMENT_STATUS.COMPLETED,
           // Effective dates are stored in unix epoch time in seconds not milliseconds.
           effectiveDate: convertMillisecondsToSeconds(dateAfterReportPeriodEnd.getTime()),
           // 365 days after report period end
@@ -408,7 +408,7 @@ describe(`POST ${BASE_URL}`, () => {
         {
           ...aTfmFacilityAmendment(),
           value: 300000,
-          status: AMENDMENT_STATUS.COMPLETED,
+          status: TFM_AMENDMENT_STATUS.COMPLETED,
           // Effective dates are stored in unix epoch time in seconds not milliseconds.
           effectiveDate: convertMillisecondsToSeconds(dateWithinReportPeriod.getTime()),
           // 730 days after report period end
diff --git a/dtfs-central-api/src/helpers/amendments/filter-and-sort-completed-effective-amendments.test.ts b/dtfs-central-api/src/helpers/amendments/filter-and-sort-completed-effective-amendments.test.ts
index 71f76168be..d678e0aab1 100644
--- a/dtfs-central-api/src/helpers/amendments/filter-and-sort-completed-effective-amendments.test.ts
+++ b/dtfs-central-api/src/helpers/amendments/filter-and-sort-completed-effective-amendments.test.ts
@@ -1,4 +1,4 @@
-import { AMENDMENT_STATUS, convertMillisecondsToSeconds, TfmFacilityAmendment } from '@ukef/dtfs2-common';
+import { TFM_AMENDMENT_STATUS, convertMillisecondsToSeconds, TfmFacilityAmendment } from '@ukef/dtfs2-common';
 import { addDays, subDays } from 'date-fns';
 import { aCompletedTfmFacilityAmendment, aTfmFacilityAmendment } from '../../../test-helpers';
 import { filterAndSortCompletedEffectiveAmendments } from './filter-and-sort-completed-effective-amendments';
@@ -24,10 +24,10 @@ describe('filter-and-sort-completed-effective-amendments', () => {
       const now = new Date();
       const beforeNow = subDays(now, 1);
 
-      const aCompletedAmendment = { ...aTfmFacilityAmendment(), status: AMENDMENT_STATUS.COMPLETED, effectiveDate: beforeNow.getTime() };
+      const aCompletedAmendment = { ...aTfmFacilityAmendment(), status: TFM_AMENDMENT_STATUS.COMPLETED, effectiveDate: beforeNow.getTime() };
       const amendments: TfmFacilityAmendment[] = [
-        { ...aTfmFacilityAmendment(), status: AMENDMENT_STATUS.IN_PROGRESS, effectiveDate: beforeNow.getTime() },
-        { ...aTfmFacilityAmendment(), status: AMENDMENT_STATUS.NOT_STARTED, effectiveDate: beforeNow.getTime() },
+        { ...aTfmFacilityAmendment(), status: TFM_AMENDMENT_STATUS.IN_PROGRESS, effectiveDate: beforeNow.getTime() },
+        { ...aTfmFacilityAmendment(), status: TFM_AMENDMENT_STATUS.NOT_STARTED, effectiveDate: beforeNow.getTime() },
         aCompletedAmendment,
       ];
 
@@ -113,13 +113,13 @@ describe('filter-and-sort-completed-effective-amendments', () => {
         // Arrange
         const firstEffectiveAmendment = {
           ...aTfmFacilityAmendment(),
-          status: AMENDMENT_STATUS.COMPLETED,
+          status: TFM_AMENDMENT_STATUS.COMPLETED,
           effectiveDate: twoDaysBeforeLatestEffectiveDate,
         };
 
         const secondEffectiveAmendment = {
           ...aTfmFacilityAmendment(),
-          status: AMENDMENT_STATUS.COMPLETED,
+          status: TFM_AMENDMENT_STATUS.COMPLETED,
           effectiveDate: oneDayBeforeLatestEffectiveDate,
         };
 
diff --git a/dtfs-central-api/src/helpers/amendments/filter-and-sort-completed-effective-amendments.ts b/dtfs-central-api/src/helpers/amendments/filter-and-sort-completed-effective-amendments.ts
index 3cde8beb1c..9f6cbfb0e8 100644
--- a/dtfs-central-api/src/helpers/amendments/filter-and-sort-completed-effective-amendments.ts
+++ b/dtfs-central-api/src/helpers/amendments/filter-and-sort-completed-effective-amendments.ts
@@ -1,4 +1,4 @@
-import { AMENDMENT_STATUS, FacilityAmendment, isValidDate } from '@ukef/dtfs2-common';
+import { TFM_AMENDMENT_STATUS, FacilityAmendment, isValidDate } from '@ukef/dtfs2-common';
 import { isBefore } from 'date-fns';
 import { orderBy } from 'lodash';
 import { convertTimestampToDate } from '../convert-timestamp-to-date';
@@ -17,7 +17,7 @@ import { convertTimestampToDate } from '../convert-timestamp-to-date';
  */
 export const filterAndSortCompletedEffectiveAmendments = (tfmFacilityAmendments: FacilityAmendment[], latestEffectiveDate: Date): FacilityAmendment[] => {
   const filteredAmendments = tfmFacilityAmendments.filter(({ status, effectiveDate, updatedAt, amendmentId }) => {
-    if (status !== AMENDMENT_STATUS.COMPLETED) {
+    if (status !== TFM_AMENDMENT_STATUS.COMPLETED) {
       return false;
     }
 
diff --git a/dtfs-central-api/src/repositories/tfm-facilities-repo/aggregate-pipelines/amendments-by-deal-id-and-status.ts b/dtfs-central-api/src/repositories/tfm-facilities-repo/aggregate-pipelines/amendments-by-deal-id-and-status.ts
deleted file mode 100644
index b5e3f68a83..0000000000
--- a/dtfs-central-api/src/repositories/tfm-facilities-repo/aggregate-pipelines/amendments-by-deal-id-and-status.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import { ObjectId, Document } from 'mongodb';
-import { AmendmentStatus } from '@ukef/dtfs2-common';
-
-export const amendmentsByDealIdAndStatus = (dealId: string | ObjectId, status: AmendmentStatus): Document[] => [
-  { $match: { 'facilitySnapshot.dealId': { $eq: new ObjectId(dealId) } } },
-  {
-    $addFields: {
-      'amendments.ukefFacilityId': '$facilitySnapshot.ukefFacilityId',
-    },
-  },
-  { $unwind: '$amendments' },
-  { $match: { 'amendments.status': { $eq: status } } },
-  { $project: { _id: false, amendments: true } },
-];
diff --git a/dtfs-central-api/src/repositories/tfm-facilities-repo/aggregate-pipelines/amendments-by-facility-id-and-status.ts b/dtfs-central-api/src/repositories/tfm-facilities-repo/aggregate-pipelines/amendments-by-facility-id-and-status.ts
deleted file mode 100644
index 2a480c9168..0000000000
--- a/dtfs-central-api/src/repositories/tfm-facilities-repo/aggregate-pipelines/amendments-by-facility-id-and-status.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { ObjectId, Document } from 'mongodb';
-import { AmendmentStatus } from '@ukef/dtfs2-common';
-
-export const amendmentsByFacilityIdAndStatus = (facilityId: string | ObjectId, status: AmendmentStatus): Document[] => [
-  { $match: { _id: { $eq: new ObjectId(facilityId) } } },
-  { $unwind: '$amendments' },
-  { $match: { 'amendments.status': { $eq: status } } },
-  { $project: { _id: false, amendments: true } },
-];
diff --git a/dtfs-central-api/src/repositories/tfm-facilities-repo/aggregate-pipelines/amendments-by-status.ts b/dtfs-central-api/src/repositories/tfm-facilities-repo/aggregate-pipelines/amendments-by-status.ts
deleted file mode 100644
index 94f5f3a207..0000000000
--- a/dtfs-central-api/src/repositories/tfm-facilities-repo/aggregate-pipelines/amendments-by-status.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { Document } from 'mongodb';
-import { AmendmentStatus } from '@ukef/dtfs2-common';
-
-export const amendmentsByStatus = (status: AmendmentStatus): Document[] => [
-  { $unwind: '$amendments' },
-  { $match: { 'amendments.status': { $eq: status } } },
-  { $project: { _id: false, amendments: true } },
-];
diff --git a/dtfs-central-api/src/repositories/tfm-facilities-repo/aggregate-pipelines/index.ts b/dtfs-central-api/src/repositories/tfm-facilities-repo/aggregate-pipelines/index.ts
index eda9006514..0d508efc86 100644
--- a/dtfs-central-api/src/repositories/tfm-facilities-repo/aggregate-pipelines/index.ts
+++ b/dtfs-central-api/src/repositories/tfm-facilities-repo/aggregate-pipelines/index.ts
@@ -1,8 +1,8 @@
-import { amendmentsByStatus } from './amendments-by-status';
+import { tfmAmendmentsByStatus } from './tfm-amendments-by-status';
 import { amendmentsByFacilityId } from './amendments-by-facility-id';
 import { amendmentsByDealId } from './amendments-by-deal-id';
-import { amendmentsByFacilityIdAndStatus } from './amendments-by-facility-id-and-status';
-import { amendmentsByDealIdAndStatus } from './amendments-by-deal-id-and-status';
+import { tfmAmendmentsByFacilityIdAndStatus } from './tfm-amendments-by-facility-id-and-status';
+import { tfmAmendmentsByDealIdAndStatus } from './tfm-amendments-by-deal-id-and-status';
 import { latestCompletedTfmAmendmentByFacilityId } from './latest-completed-amendment-by-facility-id';
 import { latestCompletedAmendmentByDealId } from './lastest-completed-amendment-by-deal-id';
 import { allFacilitiesAndFacilityCount } from './all-facilities-and-facility-count';
@@ -10,11 +10,11 @@ import { allFacilitiesAndFacilityCount } from './all-facilities-and-facility-cou
 export { AllFacilitiesAndFacilityCountAggregatePipelineOptions } from './all-facilities-and-facility-count';
 
 export const aggregatePipelines = {
-  amendmentsByStatus,
+  tfmAmendmentsByStatus,
   amendmentsByFacilityId,
   amendmentsByDealId,
-  amendmentsByFacilityIdAndStatus,
-  amendmentsByDealIdAndStatus,
+  tfmAmendmentsByFacilityIdAndStatus,
+  tfmAmendmentsByDealIdAndStatus,
   latestCompletedTfmAmendmentByFacilityId,
   latestCompletedAmendmentByDealId,
   allFacilitiesAndFacilityCount,
diff --git a/dtfs-central-api/src/repositories/tfm-facilities-repo/aggregate-pipelines/lastest-completed-amendment-by-deal-id.ts b/dtfs-central-api/src/repositories/tfm-facilities-repo/aggregate-pipelines/lastest-completed-amendment-by-deal-id.ts
index b76b8e1c23..478ef2e1be 100644
--- a/dtfs-central-api/src/repositories/tfm-facilities-repo/aggregate-pipelines/lastest-completed-amendment-by-deal-id.ts
+++ b/dtfs-central-api/src/repositories/tfm-facilities-repo/aggregate-pipelines/lastest-completed-amendment-by-deal-id.ts
@@ -1,10 +1,10 @@
 import { ObjectId, Document } from 'mongodb';
-import { AMENDMENT_STATUS } from '@ukef/dtfs2-common';
+import { TFM_AMENDMENT_STATUS } from '@ukef/dtfs2-common';
 
 export const latestCompletedAmendmentByDealId = (dealId: string | ObjectId): Document[] => [
   { $match: { 'facilitySnapshot.dealId': { $eq: new ObjectId(dealId) } } },
   { $unwind: '$amendments' },
-  { $match: { 'amendments.status': AMENDMENT_STATUS.COMPLETED } },
+  { $match: { 'amendments.status': TFM_AMENDMENT_STATUS.COMPLETED } },
   { $sort: { 'amendments.updatedAt': -1, 'amendments.version': -1 } },
   { $project: { _id: false, amendments: true } },
   { $limit: 1 },
diff --git a/dtfs-central-api/src/repositories/tfm-facilities-repo/aggregate-pipelines/latest-completed-amendment-by-facility-id.ts b/dtfs-central-api/src/repositories/tfm-facilities-repo/aggregate-pipelines/latest-completed-amendment-by-facility-id.ts
index 3dd04b11e4..e73d63d754 100644
--- a/dtfs-central-api/src/repositories/tfm-facilities-repo/aggregate-pipelines/latest-completed-amendment-by-facility-id.ts
+++ b/dtfs-central-api/src/repositories/tfm-facilities-repo/aggregate-pipelines/latest-completed-amendment-by-facility-id.ts
@@ -1,10 +1,10 @@
 import { ObjectId, Document } from 'mongodb';
-import { AMENDMENT_STATUS, AMENDMENT_TYPES } from '@ukef/dtfs2-common';
+import { TFM_AMENDMENT_STATUS, AMENDMENT_TYPES } from '@ukef/dtfs2-common';
 
 export const latestCompletedTfmAmendmentByFacilityId = (facilityId: string | ObjectId): Document[] => [
   { $match: { _id: { $eq: new ObjectId(facilityId) } } },
   { $unwind: '$amendments' },
-  { $match: { 'amendments.status': { $eq: AMENDMENT_STATUS.COMPLETED }, 'amendments.type': { $ne: AMENDMENT_TYPES.PORTAL } } },
+  { $match: { 'amendments.status': { $eq: TFM_AMENDMENT_STATUS.COMPLETED }, 'amendments.type': { $ne: AMENDMENT_TYPES.PORTAL } } },
   { $sort: { 'amendments.updatedAt': -1, 'amendments.version': -1 } },
   { $project: { _id: false, amendments: true } },
   { $limit: 1 },
diff --git a/dtfs-central-api/src/repositories/tfm-facilities-repo/aggregate-pipelines/tfm-amendments-by-deal-id-and-status.ts b/dtfs-central-api/src/repositories/tfm-facilities-repo/aggregate-pipelines/tfm-amendments-by-deal-id-and-status.ts
new file mode 100644
index 0000000000..e811803302
--- /dev/null
+++ b/dtfs-central-api/src/repositories/tfm-facilities-repo/aggregate-pipelines/tfm-amendments-by-deal-id-and-status.ts
@@ -0,0 +1,20 @@
+import { ObjectId, Document } from 'mongodb';
+import { AMENDMENT_TYPES, TfmAmendmentStatus } from '@ukef/dtfs2-common';
+
+/**
+ * Generate aggregate pipeline to get tfm amendments by deal id and status
+ * @param dealId - the deal id
+ * @param status - the tfm amendment status
+ * @returns aggregate pipeline to get tfm amendments by deal id and status
+ */
+export const tfmAmendmentsByDealIdAndStatus = (dealId: string | ObjectId, status: TfmAmendmentStatus): Document[] => [
+  { $match: { 'facilitySnapshot.dealId': { $eq: new ObjectId(dealId) } } },
+  {
+    $addFields: {
+      'amendments.ukefFacilityId': '$facilitySnapshot.ukefFacilityId',
+    },
+  },
+  { $unwind: '$amendments' },
+  { $match: { 'amendments.status': { $eq: status }, 'amendments.type': { $ne: AMENDMENT_TYPES.PORTAL } } },
+  { $project: { _id: false, amendments: true } },
+];
diff --git a/dtfs-central-api/src/repositories/tfm-facilities-repo/aggregate-pipelines/tfm-amendments-by-facility-id-and-status.ts b/dtfs-central-api/src/repositories/tfm-facilities-repo/aggregate-pipelines/tfm-amendments-by-facility-id-and-status.ts
new file mode 100644
index 0000000000..7436dcdb43
--- /dev/null
+++ b/dtfs-central-api/src/repositories/tfm-facilities-repo/aggregate-pipelines/tfm-amendments-by-facility-id-and-status.ts
@@ -0,0 +1,15 @@
+import { ObjectId, Document } from 'mongodb';
+import { AMENDMENT_TYPES, TfmAmendmentStatus } from '@ukef/dtfs2-common';
+
+/**
+ * Generate aggregate pipeline to get tfm amendments by facility id and status
+ * @param facilityId - the facility id
+ * @param status - the tfm amendment status
+ * @returns aggregate pipeline to get tfm amendments by facility id and status
+ */
+export const tfmAmendmentsByFacilityIdAndStatus = (facilityId: string | ObjectId, status: TfmAmendmentStatus): Document[] => [
+  { $match: { _id: { $eq: new ObjectId(facilityId) } } },
+  { $unwind: '$amendments' },
+  { $match: { 'amendments.status': { $eq: status }, 'amendments.type': { $ne: AMENDMENT_TYPES.PORTAL } } },
+  { $project: { _id: false, amendments: true } },
+];
diff --git a/dtfs-central-api/src/repositories/tfm-facilities-repo/aggregate-pipelines/tfm-amendments-by-status.ts b/dtfs-central-api/src/repositories/tfm-facilities-repo/aggregate-pipelines/tfm-amendments-by-status.ts
new file mode 100644
index 0000000000..1c6242a1b0
--- /dev/null
+++ b/dtfs-central-api/src/repositories/tfm-facilities-repo/aggregate-pipelines/tfm-amendments-by-status.ts
@@ -0,0 +1,13 @@
+import { Document } from 'mongodb';
+import { AMENDMENT_TYPES, TfmAmendmentStatus } from '@ukef/dtfs2-common';
+
+/**
+ * Generate aggregate pipeline to get tfm amendments by status
+ * @param status - the tfm amendment status
+ * @returns aggregate pipeline to get tfm amendments by status
+ */
+export const tfmAmendmentsByStatus = (status: TfmAmendmentStatus): Document[] => [
+  { $unwind: '$amendments' },
+  { $match: { 'amendments.status': { $eq: status }, 'amendments.type': { $ne: AMENDMENT_TYPES.PORTAL } } },
+  { $project: { _id: false, amendments: true } },
+];
diff --git a/dtfs-central-api/src/repositories/tfm-facilities-repo/tfm-facilities.repo.ts b/dtfs-central-api/src/repositories/tfm-facilities-repo/tfm-facilities.repo.ts
index 33fd363732..a4e2fb52f6 100644
--- a/dtfs-central-api/src/repositories/tfm-facilities-repo/tfm-facilities.repo.ts
+++ b/dtfs-central-api/src/repositories/tfm-facilities-repo/tfm-facilities.repo.ts
@@ -4,15 +4,15 @@ import {
   AuditDetails,
   TfmFacility,
   FacilityAmendment,
-  AmendmentStatus,
+  TfmAmendmentStatus,
   FacilityNotFoundError,
   AmendmentNotFoundError,
   AMENDMENT_TYPES,
-  AMENDMENT_STATUS,
   PortalFacilityAmendment,
   GEF_FACILITY_TYPE,
   TfmFacilityAmendment,
   FacilityAmendmentWithUkefId,
+  PORTAL_AMENDMENT_STATUS,
 } from '@ukef/dtfs2-common';
 import { deleteMany, generateAuditDatabaseRecordFromAuditDetails } from '@ukef/dtfs2-common/change-stream';
 import { mongoDbClient } from '../../drivers/db-client';
@@ -128,14 +128,14 @@ export class TfmFacilitiesRepo {
   }
 
   /**
-   * Find amendments by the amendment status
-   * @param status - The amendment status
+   * Find TFM amendments by the amendment status
+   * @param status - The tfm amendment status
    * @returns The found amendments
    */
-  public static async findAmendmentsByStatus(status: AmendmentStatus): Promise<Document[]> {
+  public static async findTfmAmendmentsByStatus(status: TfmAmendmentStatus): Promise<Document[]> {
     const collection = await this.getCollection();
     return await collection
-      .aggregate(aggregatePipelines.amendmentsByStatus(status))
+      .aggregate(aggregatePipelines.tfmAmendmentsByStatus(status))
       .map<Document>((doc) => doc.amendments as Document)
       .toArray();
   }
@@ -154,15 +154,15 @@ export class TfmFacilitiesRepo {
   }
 
   /**
-   * Finds amendments by the facility id and status
+   * Finds tfm amendments by the facility id and status
    * @param facilityId - The facility id
-   * @param status - The amendment status
+   * @param status - The TFM amendment status
    * @returns The found amendments
    */
-  public static async findAmendmentsByFacilityIdAndStatus(facilityId: string | ObjectId, status: AmendmentStatus): Promise<FacilityAmendment[]> {
+  public static async findTfmAmendmentsByFacilityIdAndStatus(facilityId: string | ObjectId, status: TfmAmendmentStatus): Promise<FacilityAmendment[]> {
     const collection = await this.getCollection();
     return await collection
-      .aggregate(aggregatePipelines.amendmentsByFacilityIdAndStatus(facilityId, status))
+      .aggregate(aggregatePipelines.tfmAmendmentsByFacilityIdAndStatus(facilityId, status))
       .map<FacilityAmendment>((doc) => doc.amendments as FacilityAmendment)
       .toArray();
   }
@@ -214,15 +214,15 @@ export class TfmFacilitiesRepo {
   }
 
   /**
-   * Finds amendments by the deal id and status
+   * Finds tfm amendments by the deal id and status
    * @param dealId - The deal id
-   * @param status - The amendment status
+   * @param status - The tfm amendment status
    * @returns The found amendments
    */
-  public static async findAmendmentsByDealIdAndStatus(dealId: string | ObjectId, status: AmendmentStatus): Promise<Document[]> {
+  public static async findTfmAmendmentsByDealIdAndStatus(dealId: string | ObjectId, status: TfmAmendmentStatus): Promise<Document[]> {
     const collection = await this.getCollection();
     return await collection
-      .aggregate(aggregatePipelines.amendmentsByDealIdAndStatus(dealId, status))
+      .aggregate(aggregatePipelines.tfmAmendmentsByDealIdAndStatus(dealId, status))
       .map<Document>((doc) => doc.amendments as Document)
       .toArray();
   }
@@ -332,7 +332,7 @@ export class TfmFacilitiesRepo {
 
     const removeDraftAmendmentsFilter: UpdateFilter<TfmFacility> = {
       $pull: {
-        amendments: { type: AMENDMENT_TYPES.PORTAL, status: { $ne: AMENDMENT_STATUS.COMPLETED } },
+        amendments: { type: AMENDMENT_TYPES.PORTAL, status: { $eq: PORTAL_AMENDMENT_STATUS.DRAFT } },
       },
       $set: { auditRecord: generateAuditDatabaseRecordFromAuditDetails(auditDetails) },
     };
diff --git a/dtfs-central-api/src/repositories/tfm-facilities-repo/tfm-facilities.repo.upsertPortalFacilityAmendmentDraft.test.ts b/dtfs-central-api/src/repositories/tfm-facilities-repo/tfm-facilities.repo.upsertPortalFacilityAmendmentDraft.test.ts
index b78ceda84d..ad5f538d9f 100644
--- a/dtfs-central-api/src/repositories/tfm-facilities-repo/tfm-facilities.repo.upsertPortalFacilityAmendmentDraft.test.ts
+++ b/dtfs-central-api/src/repositories/tfm-facilities-repo/tfm-facilities.repo.upsertPortalFacilityAmendmentDraft.test.ts
@@ -1,5 +1,5 @@
 import { ObjectId, UpdateResult } from 'mongodb';
-import { AMENDMENT_TYPES, MONGO_DB_COLLECTIONS, AMENDMENT_STATUS, FacilityNotFoundError } from '@ukef/dtfs2-common';
+import { AMENDMENT_TYPES, MONGO_DB_COLLECTIONS, FacilityNotFoundError, PORTAL_AMENDMENT_STATUS } from '@ukef/dtfs2-common';
 import { aPortalFacilityAmendment } from '@ukef/dtfs2-common/mock-data-backend';
 import { generateAuditDatabaseRecordFromAuditDetails, generatePortalAuditDetails } from '@ukef/dtfs2-common/change-stream';
 import { TfmFacilitiesRepo } from './tfm-facilities.repo';
@@ -68,7 +68,7 @@ describe('TfmFacilitiesRepo', () => {
       const expectedFindFilter = { _id: { $eq: new ObjectId(facilityId) }, 'facilitySnapshot.dealId': { $eq: new ObjectId(dealId) } };
 
       const expectedFirstUpdateFilter = {
-        $pull: { amendments: { type: AMENDMENT_TYPES.PORTAL, status: { $ne: AMENDMENT_STATUS.COMPLETED } } },
+        $pull: { amendments: { type: AMENDMENT_TYPES.PORTAL, status: { $eq: PORTAL_AMENDMENT_STATUS.DRAFT } } },
         $set: { auditRecord: generateAuditDatabaseRecordFromAuditDetails(auditDetails) },
       };
 
diff --git a/dtfs-central-api/src/services/portal/facility-amendment.service.ts b/dtfs-central-api/src/services/portal/facility-amendment.service.ts
index de8b8f4ff9..d8924d75ab 100644
--- a/dtfs-central-api/src/services/portal/facility-amendment.service.ts
+++ b/dtfs-central-api/src/services/portal/facility-amendment.service.ts
@@ -1,5 +1,4 @@
 import {
-  AMENDMENT_STATUS,
   AMENDMENT_TYPES,
   FacilityAmendmentWithUkefId,
   getUnixTimestampSeconds,
@@ -7,6 +6,7 @@ import {
   PortalAuditDetails,
   PortalFacilityAmendment,
   PortalFacilityAmendmentUserValues,
+  PORTAL_AMENDMENT_STATUS,
 } from '@ukef/dtfs2-common';
 import { ObjectId } from 'mongodb';
 import { findOneUser } from '../../v1/controllers/user/get-user.controller';
@@ -45,7 +45,7 @@ export class PortalFacilityAmendmentService {
       facilityId: new ObjectId(facilityId),
       amendmentId: new ObjectId(),
       type: AMENDMENT_TYPES.PORTAL,
-      status: AMENDMENT_STATUS.IN_PROGRESS,
+      status: PORTAL_AMENDMENT_STATUS.DRAFT,
       createdAt: getUnixTimestampSeconds(new Date()),
       updatedAt: getUnixTimestampSeconds(new Date()),
       createdBy: {
diff --git a/dtfs-central-api/src/services/portal/facility-amendment.upsertPortalFacilityAmendmentDraft.service.test.ts b/dtfs-central-api/src/services/portal/facility-amendment.upsertPortalFacilityAmendmentDraft.service.test.ts
index 67f077b92e..71bef12fe4 100644
--- a/dtfs-central-api/src/services/portal/facility-amendment.upsertPortalFacilityAmendmentDraft.service.test.ts
+++ b/dtfs-central-api/src/services/portal/facility-amendment.upsertPortalFacilityAmendmentDraft.service.test.ts
@@ -9,7 +9,7 @@ import { ObjectId } from 'mongodb';
 import { HttpStatusCode } from 'axios';
 import { getUnixTime } from 'date-fns';
 import { generatePortalAuditDetails } from '@ukef/dtfs2-common/change-stream';
-import { AMENDMENT_STATUS, AMENDMENT_TYPES, InvalidAuditDetailsError } from '@ukef/dtfs2-common';
+import { PORTAL_AMENDMENT_STATUS, AMENDMENT_TYPES, InvalidAuditDetailsError } from '@ukef/dtfs2-common';
 import { aPortalFacilityAmendmentUserValues } from '@ukef/dtfs2-common/mock-data-backend';
 import { PortalFacilityAmendmentService } from './facility-amendment.service';
 import { aPortalUser } from '../../../test-helpers';
@@ -86,7 +86,7 @@ describe('PortalFacilityAmendmentService', () => {
         facilityId: new ObjectId(facilityId),
         amendmentId: expect.any(ObjectId) as ObjectId,
         type: AMENDMENT_TYPES.PORTAL,
-        status: AMENDMENT_STATUS.IN_PROGRESS,
+        status: PORTAL_AMENDMENT_STATUS.DRAFT,
         createdAt: getUnixTime(new Date()),
         updatedAt: getUnixTime(new Date()),
         createdBy: {
@@ -116,7 +116,7 @@ describe('PortalFacilityAmendmentService', () => {
         facilityId: new ObjectId(facilityId),
         amendmentId: expect.any(ObjectId) as ObjectId,
         type: AMENDMENT_TYPES.PORTAL,
-        status: AMENDMENT_STATUS.IN_PROGRESS,
+        status: PORTAL_AMENDMENT_STATUS.DRAFT,
         createdAt: getUnixTime(new Date()),
         updatedAt: getUnixTime(new Date()),
         createdBy: {
diff --git a/dtfs-central-api/src/v1/controllers/portal/facility/patch-amendment.controller.test.ts b/dtfs-central-api/src/v1/controllers/portal/facility/patch-amendment.controller.test.ts
index 5a5d8d86fc..99dacf52d8 100644
--- a/dtfs-central-api/src/v1/controllers/portal/facility/patch-amendment.controller.test.ts
+++ b/dtfs-central-api/src/v1/controllers/portal/facility/patch-amendment.controller.test.ts
@@ -1,6 +1,6 @@
 import { createMocks } from 'node-mocks-http';
 import { HttpStatusCode } from 'axios';
-import { AMENDMENT_STATUS, AMENDMENT_TYPES, API_ERROR_CODE, TestApiError } from '@ukef/dtfs2-common';
+import { PORTAL_AMENDMENT_STATUS, AMENDMENT_TYPES, API_ERROR_CODE, TestApiError } from '@ukef/dtfs2-common';
 import { generatePortalAuditDetails } from '@ukef/dtfs2-common/change-stream';
 import { aPortalFacilityAmendmentUserValues } from '@ukef/dtfs2-common/mock-data-backend';
 import { aPortalUser } from '../../../../../test-helpers';
@@ -12,7 +12,7 @@ const dealId = 'dealId';
 const amendmentId = 'amendmentId';
 const amendment = aPortalFacilityAmendmentUserValues();
 const type = AMENDMENT_TYPES.PORTAL;
-const amendmentStatus = AMENDMENT_STATUS.IN_PROGRESS;
+const amendmentStatus = PORTAL_AMENDMENT_STATUS.DRAFT;
 
 const mockUpdatedAmendment = { facilityId, dealId, amendment, type, status: amendmentStatus };
 
diff --git a/dtfs-central-api/src/v1/controllers/portal/facility/put-amendment.controller.test.ts b/dtfs-central-api/src/v1/controllers/portal/facility/put-amendment.controller.test.ts
index cfbb8df1d6..08fc80636f 100644
--- a/dtfs-central-api/src/v1/controllers/portal/facility/put-amendment.controller.test.ts
+++ b/dtfs-central-api/src/v1/controllers/portal/facility/put-amendment.controller.test.ts
@@ -1,5 +1,5 @@
 import { createMocks } from 'node-mocks-http';
-import { AMENDMENT_STATUS, AMENDMENT_TYPES, API_ERROR_CODE, TestApiError } from '@ukef/dtfs2-common';
+import { PORTAL_AMENDMENT_STATUS, AMENDMENT_TYPES, API_ERROR_CODE, TestApiError } from '@ukef/dtfs2-common';
 import { aPortalFacilityAmendmentUserValues } from '@ukef/dtfs2-common/mock-data-backend';
 import { HttpStatusCode } from 'axios';
 import { generatePortalAuditDetails } from '@ukef/dtfs2-common/change-stream';
@@ -11,7 +11,7 @@ const facilityId = 'facilityId';
 const dealId = 'dealId';
 const amendment = aPortalFacilityAmendmentUserValues();
 
-const mockUpsertedAmendment = { facilityId, dealId, amendment, type: AMENDMENT_TYPES.PORTAL, status: AMENDMENT_STATUS.IN_PROGRESS };
+const mockUpsertedAmendment = { facilityId, dealId, amendment, type: AMENDMENT_TYPES.PORTAL, status: PORTAL_AMENDMENT_STATUS.DRAFT };
 
 const mockUpsertPortalFacilityAmendmentDraft = jest.fn();
 
diff --git a/dtfs-central-api/src/v1/controllers/tfm/amendments/tfm-get-amendments.controller.ts b/dtfs-central-api/src/v1/controllers/tfm/amendments/tfm-get-amendments.controller.ts
index 8c91d053a9..9d1245e1c8 100644
--- a/dtfs-central-api/src/v1/controllers/tfm/amendments/tfm-get-amendments.controller.ts
+++ b/dtfs-central-api/src/v1/controllers/tfm/amendments/tfm-get-amendments.controller.ts
@@ -1,7 +1,7 @@
 import { ObjectId, Document } from 'mongodb';
 import { HttpStatusCode } from 'axios';
 import { Request, Response } from 'express';
-import { Currency, AMENDMENT_STATUS, AMENDMENT_QUERIES, ApiError, API_ERROR_CODE, FacilityAmendment } from '@ukef/dtfs2-common';
+import { Currency, TFM_AMENDMENT_STATUS, AMENDMENT_QUERIES, ApiError, API_ERROR_CODE, FacilityAmendment } from '@ukef/dtfs2-common';
 import { TfmFacilitiesRepo } from '../../../../repositories/tfm-facilities-repo';
 import { AMENDMENT_QUERY_STATUSES } from '../../../../constants';
 
@@ -20,7 +20,7 @@ type CompletedFacilityEndDate =
 
 export const getAllAmendmentsInProgress = async (_req: Request, res: Response) => {
   try {
-    const inProgressAmendments = await TfmFacilitiesRepo.findAmendmentsByStatus(AMENDMENT_STATUS.IN_PROGRESS);
+    const inProgressAmendments = await TfmFacilitiesRepo.findTfmAmendmentsByStatus(TFM_AMENDMENT_STATUS.IN_PROGRESS);
     return res.status(HttpStatusCode.Ok).send(inProgressAmendments);
   } catch (error) {
     console.error('Error getting all in progress amendments:', error);
@@ -96,7 +96,7 @@ export const getAmendmentsByFacilityId = async (req: Request, res: Response) =>
     let amendment: Document | Document[] | null;
     switch (amendmentIdOrStatus) {
       case AMENDMENT_QUERY_STATUSES.IN_PROGRESS: {
-        amendment = (await TfmFacilitiesRepo.findAmendmentsByFacilityIdAndStatus(facilityId, AMENDMENT_STATUS.IN_PROGRESS)).at(0) ?? {};
+        amendment = (await TfmFacilitiesRepo.findTfmAmendmentsByFacilityIdAndStatus(facilityId, TFM_AMENDMENT_STATUS.IN_PROGRESS)).at(0) ?? {};
         break;
       }
       case AMENDMENT_QUERY_STATUSES.COMPLETED:
@@ -110,7 +110,7 @@ export const getAmendmentsByFacilityId = async (req: Request, res: Response) =>
           const latestAmendment = await TfmFacilitiesRepo.findLatestCompletedAmendmentByFacilityId(facilityId);
           amendment = latestAmendment ? mapAmendmentToFacilityEndDateValues(latestAmendment) : {};
         } else {
-          amendment = await TfmFacilitiesRepo.findAmendmentsByFacilityIdAndStatus(facilityId, AMENDMENT_STATUS.COMPLETED);
+          amendment = await TfmFacilitiesRepo.findTfmAmendmentsByFacilityIdAndStatus(facilityId, TFM_AMENDMENT_STATUS.COMPLETED);
         }
         break;
       default:
@@ -144,14 +144,14 @@ export const getAmendmentsByDealId = async (req: Request, res: Response) => {
     let amendment: Document | Document[] | null;
     switch (status) {
       case AMENDMENT_QUERY_STATUSES.IN_PROGRESS:
-        amendment = await TfmFacilitiesRepo.findAmendmentsByDealIdAndStatus(dealId, AMENDMENT_STATUS.IN_PROGRESS);
+        amendment = await TfmFacilitiesRepo.findTfmAmendmentsByDealIdAndStatus(dealId, TFM_AMENDMENT_STATUS.IN_PROGRESS);
         break;
       case AMENDMENT_QUERY_STATUSES.COMPLETED:
         if (type === AMENDMENT_QUERIES.LATEST) {
           const latestAmendment = await TfmFacilitiesRepo.findLatestCompletedAmendmentByDealId(dealId);
           amendment = latestAmendment ? mapAmendmentToLatestValue(latestAmendment) : {};
         } else {
-          amendment = await TfmFacilitiesRepo.findAmendmentsByDealIdAndStatus(dealId, AMENDMENT_STATUS.COMPLETED);
+          amendment = await TfmFacilitiesRepo.findTfmAmendmentsByDealIdAndStatus(dealId, TFM_AMENDMENT_STATUS.COMPLETED);
         }
         break;
       default:
diff --git a/dtfs-central-api/src/v1/controllers/tfm/amendments/tfm-post-amendments.controller.ts b/dtfs-central-api/src/v1/controllers/tfm/amendments/tfm-post-amendments.controller.ts
index 15ed5e9718..0f8a1d1854 100644
--- a/dtfs-central-api/src/v1/controllers/tfm/amendments/tfm-post-amendments.controller.ts
+++ b/dtfs-central-api/src/v1/controllers/tfm/amendments/tfm-post-amendments.controller.ts
@@ -2,7 +2,7 @@ import { Response } from 'express';
 import { HttpStatusCode } from 'axios';
 import { ObjectId } from 'mongodb';
 import { getUnixTime } from 'date-fns';
-import { CustomExpressRequest, ApiError, TfmFacilityAmendment, AUDIT_USER_TYPES, AMENDMENT_STATUS, ApiErrorResponseBody } from '@ukef/dtfs2-common';
+import { CustomExpressRequest, ApiError, TfmFacilityAmendment, AUDIT_USER_TYPES, TFM_AMENDMENT_STATUS, ApiErrorResponseBody } from '@ukef/dtfs2-common';
 import { generateAuditDatabaseRecordFromAuditDetails, validateAuditDetailsAndUserType } from '@ukef/dtfs2-common/change-stream';
 import { PostFacilityAmendmentPayload } from '../../../routes/middleware/payload-validation';
 import { TfmFacilitiesRepo } from '../../../../repositories/tfm-facilities-repo';
@@ -26,7 +26,7 @@ export const postTfmAmendment = async (req: PostTfmAmendmentRequest, res: PostTf
       throw new NotFoundError('The current facility does not exist');
     }
 
-    const inProgressAmendments = await TfmFacilitiesRepo.findAmendmentsByFacilityIdAndStatus(facilityId, AMENDMENT_STATUS.IN_PROGRESS);
+    const inProgressAmendments = await TfmFacilitiesRepo.findTfmAmendmentsByFacilityIdAndStatus(facilityId, TFM_AMENDMENT_STATUS.IN_PROGRESS);
     if (inProgressAmendments.length !== 0) {
       throw new ResourceAlreadyExistsError('The current facility already has an amendment in progress');
     }
@@ -42,7 +42,7 @@ export const postTfmAmendment = async (req: PostTfmAmendmentRequest, res: PostTf
       dealId,
       createdAt: getUnixTime(new Date()),
       updatedAt: getUnixTime(new Date()),
-      status: AMENDMENT_STATUS.NOT_STARTED,
+      status: TFM_AMENDMENT_STATUS.NOT_STARTED,
       version: latestCompletedAmendmentVersion ? latestCompletedAmendmentVersion + 1 : 1,
     };
     await TfmFacilitiesRepo.updateOneById(facilityId, {
diff --git a/dtfs-central-api/src/v1/routes/middleware/payload-validation/schemas/amendment-status.schema.test.ts b/dtfs-central-api/src/v1/routes/middleware/payload-validation/schemas/amendment-status.schema.test.ts
index 01a1b1d444..26927925f8 100644
--- a/dtfs-central-api/src/v1/routes/middleware/payload-validation/schemas/amendment-status.schema.test.ts
+++ b/dtfs-central-api/src/v1/routes/middleware/payload-validation/schemas/amendment-status.schema.test.ts
@@ -1,9 +1,9 @@
-import { AMENDMENT_STATUS, AmendmentStatus } from '@ukef/dtfs2-common';
+import { TFM_AMENDMENT_STATUS, TfmAmendmentStatus } from '@ukef/dtfs2-common';
 import { AmendmentStatusSchema } from './amendment-status.schema';
 
 describe('amendment-status.schema', () => {
   describe('AmendmentStatusSchema', () => {
-    it.each(Object.values(AMENDMENT_STATUS))("sets the 'success' property to true when the amendment status is '%s'", (status) => {
+    it.each(Object.values(TFM_AMENDMENT_STATUS))("sets the 'success' property to true when the amendment status is '%s'", (status) => {
       // Act
       const { success } = AmendmentStatusSchema.safeParse(status);
 
@@ -24,7 +24,7 @@ describe('amendment-status.schema', () => {
 
     it("sets the 'data' property to the parsed amendment status", () => {
       // Arrange
-      const status: AmendmentStatus = 'Completed';
+      const status: TfmAmendmentStatus = 'Completed';
 
       // Act
       const { data } = AmendmentStatusSchema.safeParse(status);
diff --git a/dtfs-central-api/src/v1/routes/middleware/payload-validation/schemas/amendment-status.schema.ts b/dtfs-central-api/src/v1/routes/middleware/payload-validation/schemas/amendment-status.schema.ts
index 22cdf32823..cce90c0c45 100644
--- a/dtfs-central-api/src/v1/routes/middleware/payload-validation/schemas/amendment-status.schema.ts
+++ b/dtfs-central-api/src/v1/routes/middleware/payload-validation/schemas/amendment-status.schema.ts
@@ -1,4 +1,4 @@
 import z from 'zod';
-import { AMENDMENT_STATUS, AmendmentStatus } from '@ukef/dtfs2-common';
+import { TFM_AMENDMENT_STATUS, TfmAmendmentStatus } from '@ukef/dtfs2-common';
 
-export const AmendmentStatusSchema = z.enum(Object.values(AMENDMENT_STATUS) as [AmendmentStatus, ...AmendmentStatus[]]);
+export const AmendmentStatusSchema = z.enum(Object.values(TFM_AMENDMENT_STATUS) as [TfmAmendmentStatus, ...TfmAmendmentStatus[]]);
diff --git a/dtfs-central-api/test-helpers/test-data/tfm-facility-amendment.ts b/dtfs-central-api/test-helpers/test-data/tfm-facility-amendment.ts
index 7f95771ea2..7f554c1c5e 100644
--- a/dtfs-central-api/test-helpers/test-data/tfm-facility-amendment.ts
+++ b/dtfs-central-api/test-helpers/test-data/tfm-facility-amendment.ts
@@ -1,5 +1,5 @@
 import { ObjectId } from 'mongodb';
-import { AMENDMENT_STATUS, TfmFacilityAmendment } from '@ukef/dtfs2-common';
+import { TFM_AMENDMENT_STATUS, TfmFacilityAmendment } from '@ukef/dtfs2-common';
 
 export const aTfmFacilityAmendment = (): TfmFacilityAmendment => ({
   amendmentId: new ObjectId(),
@@ -7,11 +7,11 @@ export const aTfmFacilityAmendment = (): TfmFacilityAmendment => ({
   dealId: new ObjectId(),
   createdAt: new Date().getTime(),
   updatedAt: new Date().getTime(),
-  status: AMENDMENT_STATUS.IN_PROGRESS,
+  status: TFM_AMENDMENT_STATUS.IN_PROGRESS,
   version: 0,
 });
 
 export const aCompletedTfmFacilityAmendment = (): TfmFacilityAmendment => ({
   ...aTfmFacilityAmendment(),
-  status: AMENDMENT_STATUS.COMPLETED,
+  status: TFM_AMENDMENT_STATUS.COMPLETED,
 });
diff --git a/e2e-tests/tfm/cypress/e2e/journeys/utilisation-reports/report-reconciliation/generate-fixed-fee-adjustment-with-amendments.spec.js b/e2e-tests/tfm/cypress/e2e/journeys/utilisation-reports/report-reconciliation/generate-fixed-fee-adjustment-with-amendments.spec.js
index 3133cdc42b..ad6486cdbf 100644
--- a/e2e-tests/tfm/cypress/e2e/journeys/utilisation-reports/report-reconciliation/generate-fixed-fee-adjustment-with-amendments.spec.js
+++ b/e2e-tests/tfm/cypress/e2e/journeys/utilisation-reports/report-reconciliation/generate-fixed-fee-adjustment-with-amendments.spec.js
@@ -4,7 +4,7 @@ import {
   UtilisationReportEntityMockBuilder,
   FacilityUtilisationDataEntityMockBuilder,
   PaymentEntityMockBuilder,
-  AMENDMENT_STATUS,
+  TFM_AMENDMENT_STATUS,
   CURRENCY,
   FEE_RECORD_STATUS,
   convertMillisecondsToSeconds,
@@ -65,21 +65,21 @@ context.skip('Fixed fee calculation uses effective amendment to cover end date a
     },
     amendments: [
       {
-        status: AMENDMENT_STATUS.COMPLETED,
+        status: TFM_AMENDMENT_STATUS.COMPLETED,
         // Effective date is stored as unix epoch time in seconds not milliseconds.
         effectiveDate: convertMillisecondsToSeconds(dateAfterReportPeriodEnd.getTime()),
         // 365 days after report period end
         coverEndDate: new Date('2025-03-01').getTime(),
       },
       {
-        status: AMENDMENT_STATUS.IN_PROGRESS,
+        status: TFM_AMENDMENT_STATUS.IN_PROGRESS,
         // Effective date is stored as unix epoch time in seconds not milliseconds.
         effectiveDate: convertMillisecondsToSeconds(dateBeforeReportPeriodEnd.getTime()),
         // 370 days after report period end
         coverEndDate: new Date('2025-03-06').getTime(),
       },
       {
-        status: AMENDMENT_STATUS.COMPLETED,
+        status: TFM_AMENDMENT_STATUS.COMPLETED,
         // Effective date is stored as unix epoch time in seconds not milliseconds.
         effectiveDate: convertMillisecondsToSeconds(dateBeforeDateBeforeReportPeriodEnd.getTime()),
         // 730 days after report period end
diff --git a/e2e-tests/tfm/cypress/e2e/journeys/utilisation-reports/report-reconciliation/view-utilisation.spec.js b/e2e-tests/tfm/cypress/e2e/journeys/utilisation-reports/report-reconciliation/view-utilisation.spec.js
index e7bdf90aba..da7509c1fa 100644
--- a/e2e-tests/tfm/cypress/e2e/journeys/utilisation-reports/report-reconciliation/view-utilisation.spec.js
+++ b/e2e-tests/tfm/cypress/e2e/journeys/utilisation-reports/report-reconciliation/view-utilisation.spec.js
@@ -1,5 +1,5 @@
 import {
-  AMENDMENT_STATUS,
+  TFM_AMENDMENT_STATUS,
   CURRENCY,
   FEE_RECORD_STATUS,
   FeeRecordEntityMockBuilder,
@@ -63,7 +63,7 @@ context('Users can view utilisation', () => {
       amendments: [
         {
           value: 350000,
-          status: AMENDMENT_STATUS.COMPLETED,
+          status: TFM_AMENDMENT_STATUS.COMPLETED,
           /**
            * This amendment is not in effect for the report in question
            * so should be ignored.
@@ -74,7 +74,7 @@ context('Users can view utilisation', () => {
         },
         {
           value: 300000,
-          status: AMENDMENT_STATUS.COMPLETED,
+          status: TFM_AMENDMENT_STATUS.COMPLETED,
           /**
            * This amendment is in effect for the report in question
            * so it's value should be used.
diff --git a/gef-ui/test-helpers/mock-amendment.ts b/gef-ui/test-helpers/mock-amendment.ts
index 6687ad1c59..8fac2d1933 100644
--- a/gef-ui/test-helpers/mock-amendment.ts
+++ b/gef-ui/test-helpers/mock-amendment.ts
@@ -1,4 +1,4 @@
-import { AMENDMENT_STATUS, AMENDMENT_TYPES, PortalFacilityAmendmentWithUkefId } from '@ukef/dtfs2-common';
+import { PORTAL_AMENDMENT_STATUS, AMENDMENT_TYPES, PortalFacilityAmendmentWithUkefId } from '@ukef/dtfs2-common';
 import { getUnixTime } from 'date-fns';
 
 export class PortalFacilityAmendmentWithUkefIdMockBuilder {
@@ -10,7 +10,7 @@ export class PortalFacilityAmendmentWithUkefIdMockBuilder {
       facilityId: '6776cb6f3e2efb60a50fbc41',
       amendmentId: '6777c4ca826649ec990c1adf',
       type: AMENDMENT_TYPES.PORTAL,
-      status: AMENDMENT_STATUS.IN_PROGRESS,
+      status: PORTAL_AMENDMENT_STATUS.DRAFT,
       createdAt: getUnixTime(new Date()),
       updatedAt: getUnixTime(new Date()),
       createdBy: {
diff --git a/libs/common/src/constants/amendments.ts b/libs/common/src/constants/amendments.ts
index 9d8b232b8c..18f3f555e5 100644
--- a/libs/common/src/constants/amendments.ts
+++ b/libs/common/src/constants/amendments.ts
@@ -1,9 +1,26 @@
-export const AMENDMENT_STATUS = {
+export const TFM_AMENDMENT_STATUS = {
+  /**
+   * Amendment is created but no values have been provided
+   */
   NOT_STARTED: 'Not started',
+  /**
+   * Amendment is in progress. This includes PIM creating the amendment and (if `requireUkefApproval` is true) the underwriting process
+   */
   IN_PROGRESS: 'In progress',
+  /**
+   * Amendment has been completed. It may have been accepted or rejected
+   */
   COMPLETED: 'Completed',
 } as const;
 
+export const PORTAL_AMENDMENT_STATUS = {
+  /**
+   * Amendment is in progress by the maker but not submitted to the checker
+   * This is not displayed in the UI
+   */
+  DRAFT: 'Draft',
+} as const;
+
 export const AMENDMENT_QUERIES = {
   LATEST_VALUE: 'latest-value',
   LATEST_COVER_END_DATE: 'latest-cover-end-date',
diff --git a/libs/common/src/test-helpers/mock-data-backend/portal-facility-amendment.ts b/libs/common/src/test-helpers/mock-data-backend/portal-facility-amendment.ts
index 549c781221..6cf104f655 100644
--- a/libs/common/src/test-helpers/mock-data-backend/portal-facility-amendment.ts
+++ b/libs/common/src/test-helpers/mock-data-backend/portal-facility-amendment.ts
@@ -1,6 +1,6 @@
 import { getUnixTime } from 'date-fns';
 import { ObjectId } from 'mongodb';
-import { AMENDMENT_STATUS, AMENDMENT_TYPES, CURRENCY } from '../../constants';
+import { AMENDMENT_TYPES, CURRENCY, PORTAL_AMENDMENT_STATUS } from '../../constants';
 import { PortalFacilityAmendment } from '../../types';
 import { PortalFacilityAmendmentUserValues } from '../../types/portal/amendment';
 
@@ -27,5 +27,5 @@ export const aPortalFacilityAmendment = (): PortalFacilityAmendment => ({
   dealId: new ObjectId(),
   createdAt: getUnixTime(new Date()),
   updatedAt: getUnixTime(new Date()),
-  status: AMENDMENT_STATUS.IN_PROGRESS,
+  status: PORTAL_AMENDMENT_STATUS.DRAFT,
 });
diff --git a/libs/common/src/types/amendment-status.ts b/libs/common/src/types/amendment-status.ts
index caa662eb5f..17f028cc17 100644
--- a/libs/common/src/types/amendment-status.ts
+++ b/libs/common/src/types/amendment-status.ts
@@ -1,4 +1,6 @@
-import { AMENDMENT_STATUS } from '../constants/amendments';
+import { PORTAL_AMENDMENT_STATUS, TFM_AMENDMENT_STATUS } from '../constants/amendments';
 import { ValuesOf } from './types-helper';
 
-export type AmendmentStatus = ValuesOf<typeof AMENDMENT_STATUS>;
+export type TfmAmendmentStatus = ValuesOf<typeof TFM_AMENDMENT_STATUS>;
+
+export type PortalAmendmentStatus = ValuesOf<typeof PORTAL_AMENDMENT_STATUS>;
diff --git a/libs/common/src/types/mongo-db-models/tfm-facilities.ts b/libs/common/src/types/mongo-db-models/tfm-facilities.ts
index ba9eafda7c..c2dc2e02e7 100644
--- a/libs/common/src/types/mongo-db-models/tfm-facilities.ts
+++ b/libs/common/src/types/mongo-db-models/tfm-facilities.ts
@@ -1,6 +1,6 @@
 import { ObjectId } from 'mongodb';
 import { UnixTimestamp } from '../date';
-import { AmendmentStatus } from '../amendment-status';
+import { PortalAmendmentStatus, TfmAmendmentStatus } from '../amendment-status';
 import { Currency } from '../currency';
 import { Facility } from './facility';
 import { AnyObject } from '../any-object';
@@ -46,7 +46,6 @@ interface BaseAmendment {
   dealId: ObjectId;
   createdAt: UnixTimestamp;
   updatedAt: UnixTimestamp;
-  status: AmendmentStatus;
   changeCoverEndDate?: boolean;
   coverEndDate?: UnixTimestamp | null;
   currentCoverEndDate?: UnixTimestamp | null;
@@ -80,6 +79,7 @@ interface BaseAmendment {
  */
 export interface TfmFacilityAmendment extends BaseAmendment {
   type?: typeof AMENDMENT_TYPES.TFM;
+  status: TfmAmendmentStatus;
   version: number;
   submittedByPim?: boolean;
   sendFirstTaskEmail?: boolean;
@@ -125,6 +125,7 @@ export interface TfmFacilityAmendment extends BaseAmendment {
  */
 export interface PortalFacilityAmendment extends BaseAmendment {
   type: typeof AMENDMENT_TYPES.PORTAL;
+  status: PortalAmendmentStatus;
 }
 
 /**
diff --git a/portal-api/api-tests/v1/gef/amendments/amendments.get.api-test.ts b/portal-api/api-tests/v1/gef/amendments/amendments.get.api-test.ts
index 83daef64fa..1ce4630ad4 100644
--- a/portal-api/api-tests/v1/gef/amendments/amendments.get.api-test.ts
+++ b/portal-api/api-tests/v1/gef/amendments/amendments.get.api-test.ts
@@ -1,5 +1,5 @@
 import { ObjectId } from 'mongodb';
-import { AMENDMENT_STATUS, AMENDMENT_TYPES, AnyObject, PortalFacilityAmendmentWithUkefId, Role } from '@ukef/dtfs2-common';
+import { PORTAL_AMENDMENT_STATUS, AMENDMENT_TYPES, AnyObject, PortalFacilityAmendmentWithUkefId, Role } from '@ukef/dtfs2-common';
 import { HttpStatusCode } from 'axios';
 import app from '../../../../src/createApp';
 import testUserCache from '../../../api-test-users';
@@ -121,7 +121,7 @@ describe('/v1/gef/facilities/:facilityId/amendments/:amendmentId', () => {
           ukefFacilityId: '123',
           createdAt: 1702061978881,
           updatedAt: 1702061978881,
-          status: AMENDMENT_STATUS.IN_PROGRESS,
+          status: PORTAL_AMENDMENT_STATUS.DRAFT,
         };
 
         jest.mocked(getPortalFacilityAmendmentMock).mockResolvedValue(amendment);
diff --git a/portal-api/api-tests/v1/gef/amendments/amendments.patch.api-test.ts b/portal-api/api-tests/v1/gef/amendments/amendments.patch.api-test.ts
index d1b0104e05..bede50fca8 100644
--- a/portal-api/api-tests/v1/gef/amendments/amendments.patch.api-test.ts
+++ b/portal-api/api-tests/v1/gef/amendments/amendments.patch.api-test.ts
@@ -1,5 +1,12 @@
 import { ObjectId } from 'mongodb';
-import { AMENDMENT_STATUS, AMENDMENT_TYPES, AnyObject, PortalFacilityAmendmentUserValues, PortalFacilityAmendmentWithUkefId, Role } from '@ukef/dtfs2-common';
+import {
+  PORTAL_AMENDMENT_STATUS,
+  AMENDMENT_TYPES,
+  AnyObject,
+  PortalFacilityAmendmentUserValues,
+  PortalFacilityAmendmentWithUkefId,
+  Role,
+} from '@ukef/dtfs2-common';
 import { HttpStatusCode } from 'axios';
 import app from '../../../../src/createApp';
 import testUserCache from '../../../api-test-users';
@@ -152,7 +159,7 @@ describe('/v1/gef/facilities/:facilityId/amendments/:amendmentId', () => {
           ukefFacilityId: '123',
           createdAt: 1702061978881,
           updatedAt: 1702061978881,
-          status: AMENDMENT_STATUS.IN_PROGRESS,
+          status: PORTAL_AMENDMENT_STATUS.DRAFT,
         };
 
         jest.mocked(patchPortalFacilityAmendmentMock).mockResolvedValue(amendment);
diff --git a/portal-api/api-tests/v1/gef/amendments/amendments.put.api-test.ts b/portal-api/api-tests/v1/gef/amendments/amendments.put.api-test.ts
index d97fe3bc89..6b41b25737 100644
--- a/portal-api/api-tests/v1/gef/amendments/amendments.put.api-test.ts
+++ b/portal-api/api-tests/v1/gef/amendments/amendments.put.api-test.ts
@@ -1,5 +1,12 @@
 import { ObjectId } from 'mongodb';
-import { AMENDMENT_STATUS, AMENDMENT_TYPES, AnyObject, PortalFacilityAmendmentUserValues, PortalFacilityAmendmentWithUkefId, Role } from '@ukef/dtfs2-common';
+import {
+  PORTAL_AMENDMENT_STATUS,
+  AMENDMENT_TYPES,
+  AnyObject,
+  PortalFacilityAmendmentUserValues,
+  PortalFacilityAmendmentWithUkefId,
+  Role,
+} from '@ukef/dtfs2-common';
 import { HttpStatusCode } from 'axios';
 import app from '../../../../src/createApp';
 import testUserCache from '../../../api-test-users';
@@ -133,7 +140,7 @@ describe('/v1/gef/facilities/:facilityId/amendments', () => {
           ukefFacilityId: '123',
           createdAt: 1702061978881,
           updatedAt: 1702061978881,
-          status: AMENDMENT_STATUS.IN_PROGRESS,
+          status: PORTAL_AMENDMENT_STATUS.DRAFT,
         };
 
         jest.mocked(putPortalFacilityAmendmentMock).mockResolvedValue(amendment);
diff --git a/portal-api/src/v1/controllers/amendments/get-amendment.test.ts b/portal-api/src/v1/controllers/amendments/get-amendment.test.ts
index 0d94788065..a35054ab70 100644
--- a/portal-api/src/v1/controllers/amendments/get-amendment.test.ts
+++ b/portal-api/src/v1/controllers/amendments/get-amendment.test.ts
@@ -1,7 +1,7 @@
 import { ObjectId } from 'mongodb';
 import httpMocks from 'node-mocks-http';
 import { HttpStatusCode } from 'axios';
-import { AMENDMENT_STATUS, AMENDMENT_TYPES, PortalFacilityAmendmentWithUkefId, TestApiError } from '@ukef/dtfs2-common';
+import { PORTAL_AMENDMENT_STATUS, AMENDMENT_TYPES, PortalFacilityAmendmentWithUkefId, TestApiError } from '@ukef/dtfs2-common';
 import api from '../../api';
 import { getAmendment, GetAmendmentRequest } from './get-amendment.controller';
 
@@ -41,7 +41,7 @@ describe('controllers - facility amendment', () => {
         dealId,
         createdAt: 1702061978881,
         updatedAt: 1702061978881,
-        status: AMENDMENT_STATUS.IN_PROGRESS,
+        status: PORTAL_AMENDMENT_STATUS.DRAFT,
       };
 
       jest.mocked(api.getPortalFacilityAmendment).mockResolvedValue(mockPortalAmendmentResponse);
diff --git a/portal-api/src/v1/controllers/amendments/patch-amendment.test.ts b/portal-api/src/v1/controllers/amendments/patch-amendment.test.ts
index a16c61e7ae..e92d334d06 100644
--- a/portal-api/src/v1/controllers/amendments/patch-amendment.test.ts
+++ b/portal-api/src/v1/controllers/amendments/patch-amendment.test.ts
@@ -1,7 +1,7 @@
 import { ObjectId } from 'mongodb';
 import httpMocks from 'node-mocks-http';
 import { HttpStatusCode } from 'axios';
-import { AMENDMENT_STATUS, AMENDMENT_TYPES, aPortalSessionUser, PortalFacilityAmendmentWithUkefId, TestApiError } from '@ukef/dtfs2-common';
+import { PORTAL_AMENDMENT_STATUS, AMENDMENT_TYPES, aPortalSessionUser, PortalFacilityAmendmentWithUkefId, TestApiError } from '@ukef/dtfs2-common';
 import { generatePortalAuditDetails } from '@ukef/dtfs2-common/change-stream';
 import api from '../../api';
 import { patchAmendment, PatchAmendmentRequest } from './patch-amendment.controller';
@@ -54,7 +54,7 @@ describe('controllers - facility amendment', () => {
         dealId,
         createdAt: 1702061978881,
         updatedAt: 1702061978881,
-        status: AMENDMENT_STATUS.IN_PROGRESS,
+        status: PORTAL_AMENDMENT_STATUS.DRAFT,
       };
 
       jest.mocked(api.patchPortalFacilityAmendment).mockResolvedValue(mockPortalAmendmentResponse);
diff --git a/portal-api/src/v1/controllers/amendments/put-amendment.test.ts b/portal-api/src/v1/controllers/amendments/put-amendment.test.ts
index f17265af8f..ae89019238 100644
--- a/portal-api/src/v1/controllers/amendments/put-amendment.test.ts
+++ b/portal-api/src/v1/controllers/amendments/put-amendment.test.ts
@@ -1,7 +1,7 @@
 import { ObjectId } from 'mongodb';
 import httpMocks from 'node-mocks-http';
 import { HttpStatusCode } from 'axios';
-import { AMENDMENT_STATUS, AMENDMENT_TYPES, aPortalSessionUser, PortalFacilityAmendmentWithUkefId, TestApiError } from '@ukef/dtfs2-common';
+import { PORTAL_AMENDMENT_STATUS, AMENDMENT_TYPES, aPortalSessionUser, PortalFacilityAmendmentWithUkefId, TestApiError } from '@ukef/dtfs2-common';
 import { generatePortalAuditDetails } from '@ukef/dtfs2-common/change-stream';
 import api from '../../api';
 import { putAmendment, PutAmendmentRequest } from './put-amendment.controller';
@@ -52,7 +52,7 @@ describe('controllers - facility amendment', () => {
         dealId,
         createdAt: 1702061978881,
         updatedAt: 1702061978881,
-        status: AMENDMENT_STATUS.IN_PROGRESS,
+        status: PORTAL_AMENDMENT_STATUS.DRAFT,
       };
 
       jest.mocked(api.putPortalFacilityAmendment).mockResolvedValue(mockPortalAmendmentResponse);
diff --git a/trade-finance-manager-api/api-tests/v1/amendments/create-amendment-tfm-object-on-amendment-completion.api-test.js b/trade-finance-manager-api/api-tests/v1/amendments/create-amendment-tfm-object-on-amendment-completion.api-test.js
index 68ecab0f01..2c1241e216 100644
--- a/trade-finance-manager-api/api-tests/v1/amendments/create-amendment-tfm-object-on-amendment-completion.api-test.js
+++ b/trade-finance-manager-api/api-tests/v1/amendments/create-amendment-tfm-object-on-amendment-completion.api-test.js
@@ -1,4 +1,4 @@
-const { CURRENCY, AMENDMENT_STATUS, FACILITY_TYPE } = require('@ukef/dtfs2-common');
+const { CURRENCY, TFM_AMENDMENT_STATUS, FACILITY_TYPE } = require('@ukef/dtfs2-common');
 const amendmentController = require('../../../src/v1/controllers/amendment.controller');
 const externalApis = require('../../../src/v1/api');
 const MOCK_GEF_AIN_DEAL = require('../../../src/v1/__mocks__/mock-TFM-deal-AIN-submitted');
@@ -12,7 +12,7 @@ describe('update amendment-tfm on amendment completion', () => {
     dealId: '123',
     facilityId: '321',
     amendmentId: '111',
-    status: AMENDMENT_STATUS.COMPLETED,
+    status: TFM_AMENDMENT_STATUS.COMPLETED,
     effectiveDate: unixTime,
   };
 
diff --git a/trade-finance-manager-api/api-tests/v1/amendments/update-tfm-deal-amendment-completion.api-test.js b/trade-finance-manager-api/api-tests/v1/amendments/update-tfm-deal-amendment-completion.api-test.js
index 340c6d7175..0d56834ec6 100644
--- a/trade-finance-manager-api/api-tests/v1/amendments/update-tfm-deal-amendment-completion.api-test.js
+++ b/trade-finance-manager-api/api-tests/v1/amendments/update-tfm-deal-amendment-completion.api-test.js
@@ -1,6 +1,6 @@
 const { format } = require('date-fns');
 const { generateTfmAuditDetails } = require('@ukef/dtfs2-common/change-stream');
-const { AUDIT_USER_TYPES, AMENDMENT_STATUS } = require('@ukef/dtfs2-common');
+const { AUDIT_USER_TYPES, TFM_AMENDMENT_STATUS } = require('@ukef/dtfs2-common');
 const amendmentController = require('../../../src/v1/controllers/amendment.controller');
 const api = require('../../../src/v1/api');
 const { updateFacilityAmendment } = require('../../helpers/updateFacilityAmendment');
@@ -13,7 +13,7 @@ describe('update tfm-deals on amendment completion', () => {
     dealId: '6463805ebf6e581d581f9ce0',
     facilityId: '64638083a6970b4aec385180',
     amendmentId: '6463808aecc838173927d090',
-    status: AMENDMENT_STATUS.COMPLETED,
+    status: TFM_AMENDMENT_STATUS.COMPLETED,
   };
 
   const mockDeal = {
diff --git a/trade-finance-manager-api/src/v1/helpers/amendment.helpers.js b/trade-finance-manager-api/src/v1/helpers/amendment.helpers.js
index eb78ba62a3..f4742aa256 100644
--- a/trade-finance-manager-api/src/v1/helpers/amendment.helpers.js
+++ b/trade-finance-manager-api/src/v1/helpers/amendment.helpers.js
@@ -1,5 +1,5 @@
 const { format, fromUnixTime } = require('date-fns');
-const { CURRENCY, AMENDMENT_STATUS } = require('@ukef/dtfs2-common');
+const { CURRENCY, TFM_AMENDMENT_STATUS } = require('@ukef/dtfs2-common');
 const api = require('../api');
 const sendTfmEmail = require('../services/send-tfm-email');
 const { UNDERWRITER_MANAGER_DECISIONS } = require('../../constants/amendments');
@@ -284,7 +284,7 @@ const canSendToAcbs = (amendment) => {
   // Ensure at least one of the attribute has been amended
   const hasBeenAmended = amendment.changeCoverEndDate || amendment.changeFacilityValue;
   // Amendment status is marked as `Completed`
-  const completed = amendment.status === AMENDMENT_STATUS.COMPLETED;
+  const completed = amendment.status === TFM_AMENDMENT_STATUS.COMPLETED;
   // Amendment has been submitted by PIM team
   const pim = amendment.submittedByPim;
   // Manual amendment verification
diff --git a/trade-finance-manager-api/src/v1/rest-mappings/deal-with-amendment-bss.api-test.js b/trade-finance-manager-api/src/v1/rest-mappings/deal-with-amendment-bss.api-test.js
index 51d4895901..4238e17177 100644
--- a/trade-finance-manager-api/src/v1/rest-mappings/deal-with-amendment-bss.api-test.js
+++ b/trade-finance-manager-api/src/v1/rest-mappings/deal-with-amendment-bss.api-test.js
@@ -1,5 +1,5 @@
 const { fromUnixTime, format } = require('date-fns');
-const { CURRENCY, AMENDMENT_STATUS } = require('@ukef/dtfs2-common');
+const { CURRENCY, TFM_AMENDMENT_STATUS } = require('@ukef/dtfs2-common');
 const dealReducer = require('./deal');
 const mapDealSnapshot = require('./mappings/deal/mapDealSnapshot');
 const mapDealTfm = require('./mappings/deal/dealTfm/mapDealTfm');
@@ -11,20 +11,20 @@ describe('gef deal with amendments', () => {
   const coverEndDateUnix = 1658403289;
 
   const mockAmendmentValueResponse = {
-    status: AMENDMENT_STATUS.COMPLETED,
+    status: TFM_AMENDMENT_STATUS.COMPLETED,
     value: 5000,
     currency: CURRENCY.GBP,
     amendmentId: '1234',
   };
 
   const mockAmendmentDateResponse = {
-    status: AMENDMENT_STATUS.COMPLETED,
+    status: TFM_AMENDMENT_STATUS.COMPLETED,
     coverEndDate: coverEndDateUnix,
     amendmentId: '1234',
   };
 
   const mockAmendment = {
-    status: AMENDMENT_STATUS.COMPLETED,
+    status: TFM_AMENDMENT_STATUS.COMPLETED,
     coverEndDate: coverEndDateUnix,
     value: 5000,
     currency: CURRENCY.GBP,
diff --git a/trade-finance-manager-api/src/v1/rest-mappings/deal-with-amendment-gef.api-test.js b/trade-finance-manager-api/src/v1/rest-mappings/deal-with-amendment-gef.api-test.js
index 70af58640b..dc5ceb2580 100644
--- a/trade-finance-manager-api/src/v1/rest-mappings/deal-with-amendment-gef.api-test.js
+++ b/trade-finance-manager-api/src/v1/rest-mappings/deal-with-amendment-gef.api-test.js
@@ -1,5 +1,5 @@
 const { fromUnixTime, format } = require('date-fns');
-const { CURRENCY, AMENDMENT_STATUS } = require('@ukef/dtfs2-common');
+const { CURRENCY, TFM_AMENDMENT_STATUS } = require('@ukef/dtfs2-common');
 const dealReducer = require('./deal');
 const mapGefDeal = require('./mappings/gef-deal/mapGefDeal');
 
@@ -10,14 +10,14 @@ describe('gef deal with amendments', () => {
   const coverEndDateUnix = 1658403289;
 
   const mockAmendmentValueResponse = {
-    status: AMENDMENT_STATUS.COMPLETED,
+    status: TFM_AMENDMENT_STATUS.COMPLETED,
     value: 5000,
     currency: CURRENCY.GBP,
     amendmentId: '1234',
   };
 
   const mockAmendmentDateResponse = {
-    status: AMENDMENT_STATUS.COMPLETED,
+    status: TFM_AMENDMENT_STATUS.COMPLETED,
     coverEndDate: coverEndDateUnix,
     amendmentId: '1234',
   };
diff --git a/trade-finance-manager-api/src/v1/rest-mappings/helpers/amendment.helpers.js b/trade-finance-manager-api/src/v1/rest-mappings/helpers/amendment.helpers.js
index 9154d9be2b..ef3ad5e12c 100644
--- a/trade-finance-manager-api/src/v1/rest-mappings/helpers/amendment.helpers.js
+++ b/trade-finance-manager-api/src/v1/rest-mappings/helpers/amendment.helpers.js
@@ -1,4 +1,4 @@
-const { CURRENCY, AMENDMENT_STATUS } = require('@ukef/dtfs2-common');
+const { CURRENCY, TFM_AMENDMENT_STATUS } = require('@ukef/dtfs2-common');
 const { orderBy, cloneDeep } = require('lodash');
 const { formattedNumber } = require('../../../utils/number');
 const { decimalsCount, roundNumber } = require('../../helpers/number');
@@ -83,7 +83,7 @@ const findLatestCompletedAmendment = (amendments) => {
   if (!amendments) {
     return {};
   }
-  const completedAmendments = amendments.filter(({ status }) => status === AMENDMENT_STATUS.COMPLETED);
+  const completedAmendments = amendments.filter(({ status }) => status === TFM_AMENDMENT_STATUS.COMPLETED);
   const sortedAmendments = orderBy(completedAmendments, ['updatedAt', 'version'], ['desc', 'asc']);
 
   /**
diff --git a/trade-finance-manager-api/src/v1/rest-mappings/helpers/amendment.helpers.test.js b/trade-finance-manager-api/src/v1/rest-mappings/helpers/amendment.helpers.test.js
index ce74df5aeb..70f192d551 100644
--- a/trade-finance-manager-api/src/v1/rest-mappings/helpers/amendment.helpers.test.js
+++ b/trade-finance-manager-api/src/v1/rest-mappings/helpers/amendment.helpers.test.js
@@ -1,4 +1,4 @@
-const { CURRENCY, AMENDMENT_STATUS } = require('@ukef/dtfs2-common');
+const { CURRENCY, TFM_AMENDMENT_STATUS } = require('@ukef/dtfs2-common');
 const amendmentHelpers = require('./amendment.helpers');
 
 describe('amendmentChangeValueExportCurrency()', () => {
@@ -159,7 +159,7 @@ describe('calculateAmendmentTotalExposure()', () => {
       {
         updatedAt: new Date('2023-12-12').getTime(),
         version: 0,
-        status: AMENDMENT_STATUS.COMPLETED,
+        status: TFM_AMENDMENT_STATUS.COMPLETED,
         tfm: {
           value: { ...mockAmendmentValueResponse },
         },
@@ -196,9 +196,9 @@ describe('findLatestCompletedAmendment()', () => {
   it('should return an empty object if there are no completed amendments', () => {
     // Arrange
     const amendments = [
-      { ...anAmendmentWithStatus(AMENDMENT_STATUS.IN_PROGRESS) },
-      { ...anAmendmentWithStatus(AMENDMENT_STATUS.IN_PROGRESS) },
-      { ...anAmendmentWithStatus(AMENDMENT_STATUS.IN_PROGRESS) },
+      { ...anAmendmentWithStatus(TFM_AMENDMENT_STATUS.IN_PROGRESS) },
+      { ...anAmendmentWithStatus(TFM_AMENDMENT_STATUS.IN_PROGRESS) },
+      { ...anAmendmentWithStatus(TFM_AMENDMENT_STATUS.IN_PROGRESS) },
     ];
 
     // Act
@@ -213,10 +213,10 @@ describe('findLatestCompletedAmendment()', () => {
     const latestAmendmentTfmObject = { ...anAmendmentTfmObject(), value: 3000, coverEndDate: new Date('2023-12-12').getTime() };
     const anotherAmendmentTfmObject = { ...anAmendmentTfmObject(), value: 1000, coverEndDate: null };
     const amendments = [
-      { ...anAmendmentWithStatus(AMENDMENT_STATUS.IN_PROGRESS), tfm: anotherAmendmentTfmObject },
-      { ...anAmendmentWithStatus(AMENDMENT_STATUS.COMPLETED), tfm: anotherAmendmentTfmObject },
-      { ...anAmendmentWithStatus(AMENDMENT_STATUS.COMPLETED), tfm: latestAmendmentTfmObject },
-      { ...anAmendmentWithStatus(AMENDMENT_STATUS.COMPLETED), tfm: null },
+      { ...anAmendmentWithStatus(TFM_AMENDMENT_STATUS.IN_PROGRESS), tfm: anotherAmendmentTfmObject },
+      { ...anAmendmentWithStatus(TFM_AMENDMENT_STATUS.COMPLETED), tfm: anotherAmendmentTfmObject },
+      { ...anAmendmentWithStatus(TFM_AMENDMENT_STATUS.COMPLETED), tfm: latestAmendmentTfmObject },
+      { ...anAmendmentWithStatus(TFM_AMENDMENT_STATUS.COMPLETED), tfm: null },
     ];
 
     // Act
@@ -250,9 +250,9 @@ describe('findLatestCompletedAmendment()', () => {
     const thirdAmendmentTfmObject = { ...anAmendmentTfmObject(), updatedAt: 1723641633, version: 3 };
 
     const amendments = [
-      { ...anAmendmentWithStatus(AMENDMENT_STATUS.COMPLETED), tfm: firstAmendmentTfmObject },
-      { ...anAmendmentWithStatus(AMENDMENT_STATUS.COMPLETED), tfm: secondAmendmentTfmObject },
-      { ...anAmendmentWithStatus(AMENDMENT_STATUS.COMPLETED), tfm: thirdAmendmentTfmObject },
+      { ...anAmendmentWithStatus(TFM_AMENDMENT_STATUS.COMPLETED), tfm: firstAmendmentTfmObject },
+      { ...anAmendmentWithStatus(TFM_AMENDMENT_STATUS.COMPLETED), tfm: secondAmendmentTfmObject },
+      { ...anAmendmentWithStatus(TFM_AMENDMENT_STATUS.COMPLETED), tfm: thirdAmendmentTfmObject },
     ];
 
     // Act
@@ -283,9 +283,9 @@ describe('findLatestCompletedAmendment()', () => {
     const thirdAmendmentTfmObject = { ...anAmendmentTfmObject(), updatedAt: 1723641633, version: 3 };
 
     const amendments = [
-      { ...anAmendmentWithStatus(AMENDMENT_STATUS.COMPLETED), tfm: firstAmendmentTfmObject },
-      { ...anAmendmentWithStatus(AMENDMENT_STATUS.COMPLETED), tfm: secondAmendmentTfmObject },
-      { ...anAmendmentWithStatus(AMENDMENT_STATUS.COMPLETED), tfm: thirdAmendmentTfmObject },
+      { ...anAmendmentWithStatus(TFM_AMENDMENT_STATUS.COMPLETED), tfm: firstAmendmentTfmObject },
+      { ...anAmendmentWithStatus(TFM_AMENDMENT_STATUS.COMPLETED), tfm: secondAmendmentTfmObject },
+      { ...anAmendmentWithStatus(TFM_AMENDMENT_STATUS.COMPLETED), tfm: thirdAmendmentTfmObject },
     ];
 
     // Act
diff --git a/trade-finance-manager-api/src/v1/rest-mappings/mappings/deal/mapTotals.api-test.js b/trade-finance-manager-api/src/v1/rest-mappings/mappings/deal/mapTotals.api-test.js
index 9af73bc117..f90fa2aa69 100644
--- a/trade-finance-manager-api/src/v1/rest-mappings/mappings/deal/mapTotals.api-test.js
+++ b/trade-finance-manager-api/src/v1/rest-mappings/mappings/deal/mapTotals.api-test.js
@@ -1,4 +1,4 @@
-const { CURRENCY, AMENDMENT_STATUS } = require('@ukef/dtfs2-common');
+const { CURRENCY, TFM_AMENDMENT_STATUS } = require('@ukef/dtfs2-common');
 const mapTotals = require('./mapTotals');
 const { formattedNumber } = require('../../../../utils/number');
 
@@ -131,7 +131,7 @@ describe('mapTotals', () => {
         const facilityMapped = { ...facility };
 
         facilityMapped.amendments[0] = {
-          status: AMENDMENT_STATUS.COMPLETED,
+          status: TFM_AMENDMENT_STATUS.COMPLETED,
           tfm: {
             value: { ...mockAmendmentValueResponse },
           },
@@ -186,7 +186,7 @@ describe('mapTotals', () => {
         const facilityMapped = { ...facility };
 
         facilityMapped.amendments[0] = {
-          status: AMENDMENT_STATUS.COMPLETED,
+          status: TFM_AMENDMENT_STATUS.COMPLETED,
           tfm: {
             value: { ...mockAmendmentValueResponse },
           },
diff --git a/trade-finance-manager-api/src/v1/rest-mappings/mappings/facilities/mapCoverEndDate.api-test.js b/trade-finance-manager-api/src/v1/rest-mappings/mappings/facilities/mapCoverEndDate.api-test.js
index 3c2982cffc..0a4eaac913 100644
--- a/trade-finance-manager-api/src/v1/rest-mappings/mappings/facilities/mapCoverEndDate.api-test.js
+++ b/trade-finance-manager-api/src/v1/rest-mappings/mappings/facilities/mapCoverEndDate.api-test.js
@@ -1,5 +1,5 @@
 const { format, fromUnixTime, set } = require('date-fns');
-const { AMENDMENT_STATUS } = require('@ukef/dtfs2-common');
+const { TFM_AMENDMENT_STATUS } = require('@ukef/dtfs2-common');
 const mapCoverEndDate = require('./mapCoverEndDate');
 const { formatYear } = require('../../../../utils/date');
 
@@ -94,7 +94,7 @@ describe('mapCoverEndDate', () => {
       const mockFacility = {
         amendments: [
           {
-            status: AMENDMENT_STATUS.COMPLETED,
+            status: TFM_AMENDMENT_STATUS.COMPLETED,
             tfm: {
               coverEndDate: coverEndDateUnix,
             },
diff --git a/trade-finance-manager-api/src/v1/rest-mappings/mappings/facilities/mapDates.api-test.js b/trade-finance-manager-api/src/v1/rest-mappings/mappings/facilities/mapDates.api-test.js
index 342ec92b56..4fbfbe1434 100644
--- a/trade-finance-manager-api/src/v1/rest-mappings/mappings/facilities/mapDates.api-test.js
+++ b/trade-finance-manager-api/src/v1/rest-mappings/mappings/facilities/mapDates.api-test.js
@@ -1,5 +1,5 @@
 const { format, fromUnixTime } = require('date-fns');
-const { AMENDMENT_STATUS, FACILITY_TYPE } = require('@ukef/dtfs2-common');
+const { TFM_AMENDMENT_STATUS, FACILITY_TYPE } = require('@ukef/dtfs2-common');
 const mapDates = require('./mapDates');
 const mapCoverEndDate = require('./mapCoverEndDate');
 const mapTenorDate = require('./mapTenorDate');
@@ -114,7 +114,7 @@ describe('mapDates', () => {
 
     mockFacility.amendments = [
       {
-        status: AMENDMENT_STATUS.COMPLETED,
+        status: TFM_AMENDMENT_STATUS.COMPLETED,
         tfm: {
           coverEndDate: coverEndDateUnix,
           amendmentExposurePeriodInMonths: amendmentTenorPeriod,
diff --git a/trade-finance-manager-api/src/v1/rest-mappings/mappings/facilities/mapFacilityValue.api-test.js b/trade-finance-manager-api/src/v1/rest-mappings/mappings/facilities/mapFacilityValue.api-test.js
index 856ea7a137..6858f8de97 100644
--- a/trade-finance-manager-api/src/v1/rest-mappings/mappings/facilities/mapFacilityValue.api-test.js
+++ b/trade-finance-manager-api/src/v1/rest-mappings/mappings/facilities/mapFacilityValue.api-test.js
@@ -1,4 +1,4 @@
-const { CURRENCY, AMENDMENT_STATUS } = require('@ukef/dtfs2-common');
+const { CURRENCY, TFM_AMENDMENT_STATUS } = require('@ukef/dtfs2-common');
 const mapFacilityValue = require('./mapFacilityValue');
 const { formattedNumber } = require('../../../../utils/number');
 
@@ -82,7 +82,7 @@ describe('mapFacilityValue', () => {
       const amendmentValue = 2000;
 
       mockFacility.amendments[0] = {
-        status: AMENDMENT_STATUS.COMPLETED,
+        status: TFM_AMENDMENT_STATUS.COMPLETED,
         tfm: {
           value: {
             value: amendmentValue,
diff --git a/trade-finance-manager-api/src/v1/rest-mappings/mappings/facilities/mapFacilityValueExporterCurrency.api-test.js b/trade-finance-manager-api/src/v1/rest-mappings/mappings/facilities/mapFacilityValueExporterCurrency.api-test.js
index 5d56d4fbb5..f861783661 100644
--- a/trade-finance-manager-api/src/v1/rest-mappings/mappings/facilities/mapFacilityValueExporterCurrency.api-test.js
+++ b/trade-finance-manager-api/src/v1/rest-mappings/mappings/facilities/mapFacilityValueExporterCurrency.api-test.js
@@ -1,4 +1,4 @@
-const { CURRENCY, AMENDMENT_STATUS } = require('@ukef/dtfs2-common');
+const { CURRENCY, TFM_AMENDMENT_STATUS } = require('@ukef/dtfs2-common');
 const mapFacilityValueExportCurrency = require('./mapFacilityValueExportCurrency');
 
 describe('mapFacilityValueExportCurrency()', () => {
@@ -33,7 +33,7 @@ describe('mapFacilityValueExportCurrency()', () => {
   it('should return the new amendment value when latest amendment is complete', () => {
     mockFacility.amendments = [
       {
-        status: AMENDMENT_STATUS.COMPLETED,
+        status: TFM_AMENDMENT_STATUS.COMPLETED,
         tfm: {
           value: { ...mockAmendmentValueResponse },
         },
diff --git a/trade-finance-manager-api/src/v1/rest-mappings/mappings/facilities/mapTenor.api-test.js b/trade-finance-manager-api/src/v1/rest-mappings/mappings/facilities/mapTenor.api-test.js
index 2c50d3c2cf..1788bc37d2 100644
--- a/trade-finance-manager-api/src/v1/rest-mappings/mappings/facilities/mapTenor.api-test.js
+++ b/trade-finance-manager-api/src/v1/rest-mappings/mappings/facilities/mapTenor.api-test.js
@@ -1,4 +1,4 @@
-const { AMENDMENT_STATUS, FACILITY_TYPE } = require('@ukef/dtfs2-common');
+const { TFM_AMENDMENT_STATUS, FACILITY_TYPE } = require('@ukef/dtfs2-common');
 const mapTenor = require('./mapTenor');
 
 describe('mapTenor()', () => {
@@ -91,7 +91,7 @@ describe('mapTenor()', () => {
 
   it('should return tenor from GEF amendment when completed amendment exists', () => {
     mockGefFacility.amendments[0] = {
-      status: AMENDMENT_STATUS.COMPLETED,
+      status: TFM_AMENDMENT_STATUS.COMPLETED,
       tfm: {
         ...mockAmendmentDateResponse,
       },
diff --git a/trade-finance-manager-api/src/v1/rest-mappings/mappings/facilities/mapUkefExposure.api-test.js b/trade-finance-manager-api/src/v1/rest-mappings/mappings/facilities/mapUkefExposure.api-test.js
index 0ad6f7e715..216d923569 100644
--- a/trade-finance-manager-api/src/v1/rest-mappings/mappings/facilities/mapUkefExposure.api-test.js
+++ b/trade-finance-manager-api/src/v1/rest-mappings/mappings/facilities/mapUkefExposure.api-test.js
@@ -1,4 +1,4 @@
-const { CURRENCY, AMENDMENT_STATUS } = require('@ukef/dtfs2-common');
+const { CURRENCY, TFM_AMENDMENT_STATUS } = require('@ukef/dtfs2-common');
 const mapUkefExposure = require('./mapUkefExposure');
 const { formattedNumber } = require('../../../../utils/number');
 const { AMENDMENT_UW_DECISION, AMENDMENT_BANK_DECISION } = require('../../../../constants/deals');
@@ -92,7 +92,7 @@ describe('mapUkefExposure()', () => {
     };
 
     mockFacility.amendments[0] = {
-      status: AMENDMENT_STATUS.COMPLETED,
+      status: TFM_AMENDMENT_STATUS.COMPLETED,
       tfm: {
         exposure: { ...mockAmendmentValueResponse },
       },
diff --git a/trade-finance-manager-api/src/v1/rest-mappings/mappings/facilities/mapUkefExposureValue.api-test.js b/trade-finance-manager-api/src/v1/rest-mappings/mappings/facilities/mapUkefExposureValue.api-test.js
index d1f786e02d..5481f5f39c 100644
--- a/trade-finance-manager-api/src/v1/rest-mappings/mappings/facilities/mapUkefExposureValue.api-test.js
+++ b/trade-finance-manager-api/src/v1/rest-mappings/mappings/facilities/mapUkefExposureValue.api-test.js
@@ -1,4 +1,4 @@
-const { CURRENCY, AMENDMENT_STATUS } = require('@ukef/dtfs2-common');
+const { CURRENCY, TFM_AMENDMENT_STATUS } = require('@ukef/dtfs2-common');
 const mapUkefExposureValue = require('./mapUkefExposureValue');
 const { formattedNumber } = require('../../../../utils/number');
 const { AMENDMENT_UW_DECISION } = require('../../../../constants/deals');
@@ -47,7 +47,7 @@ describe('mapUkefExposureValue()', () => {
 
   it('should return exposure from amendment if amendment completed', () => {
     mockFacility.amendments[0] = {
-      status: AMENDMENT_STATUS.COMPLETED,
+      status: TFM_AMENDMENT_STATUS.COMPLETED,
       tfm: {
         exposure: { ...mockAmendmentValueResponse },
       },
diff --git a/trade-finance-manager-api/src/v1/rest-mappings/mappings/gef-facilities/mapGefFacilityDates.test.js b/trade-finance-manager-api/src/v1/rest-mappings/mappings/gef-facilities/mapGefFacilityDates.test.js
index fd43e9c689..bcd86f2135 100644
--- a/trade-finance-manager-api/src/v1/rest-mappings/mappings/gef-facilities/mapGefFacilityDates.test.js
+++ b/trade-finance-manager-api/src/v1/rest-mappings/mappings/gef-facilities/mapGefFacilityDates.test.js
@@ -1,4 +1,4 @@
-import { AMENDMENT_STATUS } from '@ukef/dtfs2-common';
+import { TFM_AMENDMENT_STATUS } from '@ukef/dtfs2-common';
 
 const { format } = require('date-fns');
 const mapGefFacilityDates = require('./mapGefFacilityDates');
@@ -78,7 +78,7 @@ describe('mapGefFacilityDates', () => {
         {
           updatedAt: 1723641632,
           version: 1,
-          status: AMENDMENT_STATUS.COMPLETED,
+          status: TFM_AMENDMENT_STATUS.COMPLETED,
           tfm: {
             coverEndDate: 1723641632,
           },
@@ -103,7 +103,7 @@ describe('mapGefFacilityDates', () => {
         {
           updatedAt: 1723641632,
           version: 1,
-          status: AMENDMENT_STATUS.COMPLETED,
+          status: TFM_AMENDMENT_STATUS.COMPLETED,
           tfm: {
             coverEndDate: 1723641632,
           },
@@ -127,7 +127,7 @@ describe('mapGefFacilityDates', () => {
         {
           updatedAt: 1723641632,
           version: 1,
-          status: AMENDMENT_STATUS.COMPLETED,
+          status: TFM_AMENDMENT_STATUS.COMPLETED,
           tfm: {
             coverEndDate: 1723641632,
           },
@@ -151,7 +151,7 @@ describe('mapGefFacilityDates', () => {
         {
           updatedAt: 1723641632,
           version: 1,
-          status: AMENDMENT_STATUS.COMPLETED,
+          status: TFM_AMENDMENT_STATUS.COMPLETED,
           tfm: {
             coverEndDate: 1723641632,
           },
@@ -175,7 +175,7 @@ describe('mapGefFacilityDates', () => {
         {
           updatedAt: 1723641632,
           version: 1,
-          status: AMENDMENT_STATUS.COMPLETED,
+          status: TFM_AMENDMENT_STATUS.COMPLETED,
           tfm: {
             coverEndDate: 1723641632,
             isUsingFacilityEndDate: true,
@@ -185,7 +185,7 @@ describe('mapGefFacilityDates', () => {
         {
           updatedAt: 1723641640,
           version: 2,
-          status: AMENDMENT_STATUS.COMPLETED,
+          status: TFM_AMENDMENT_STATUS.COMPLETED,
           tfm: {
             coverEndDate: 1723641640,
           },
diff --git a/trade-finance-manager-ui/server/controllers/case/amendments/amendCoverEndDate.controller.js b/trade-finance-manager-ui/server/controllers/case/amendments/amendCoverEndDate.controller.js
index aa2a148452..14795450a0 100644
--- a/trade-finance-manager-ui/server/controllers/case/amendments/amendCoverEndDate.controller.js
+++ b/trade-finance-manager-ui/server/controllers/case/amendments/amendCoverEndDate.controller.js
@@ -1,5 +1,5 @@
 const { format, fromUnixTime, getUnixTime } = require('date-fns');
-const { AMENDMENT_STATUS } = require('@ukef/dtfs2-common');
+const { TFM_AMENDMENT_STATUS } = require('@ukef/dtfs2-common');
 const { HttpStatusCode } = require('axios');
 const api = require('../../../api');
 const { coverEndDateValidation } = require('./validation/amendCoverEndDateDate.validate');
@@ -32,7 +32,7 @@ const getAmendCoverEndDate = async (req, res) => {
     return res.redirect('/not-found');
   }
 
-  const isEditable = amendment.status === AMENDMENT_STATUS.IN_PROGRESS && amendment.changeCoverEndDate;
+  const isEditable = amendment.status === TFM_AMENDMENT_STATUS.IN_PROGRESS && amendment.changeCoverEndDate;
   const { dealId, coverEndDate } = amendment;
 
   let coverEndDateDay = '';
@@ -82,7 +82,7 @@ const postAmendCoverEndDate = async (req, res) => {
   const { coverEndDate, errorsObject, coverEndDateErrors } = coverEndDateValidation(req.body, currentCoverEndDate);
 
   if (coverEndDateErrors.length) {
-    const isEditable = amendment.status === AMENDMENT_STATUS.IN_PROGRESS && amendment.changeCoverEndDate;
+    const isEditable = amendment.status === TFM_AMENDMENT_STATUS.IN_PROGRESS && amendment.changeCoverEndDate;
     return res.render('case/amendments/amendment-cover-end-date.njk', {
       dealId: amendment.dealId,
       facilityId,
diff --git a/trade-finance-manager-ui/server/controllers/case/amendments/amendFacilityValue.controller.js b/trade-finance-manager-ui/server/controllers/case/amendments/amendFacilityValue.controller.js
index d7809153ef..a81945594c 100644
--- a/trade-finance-manager-ui/server/controllers/case/amendments/amendFacilityValue.controller.js
+++ b/trade-finance-manager-ui/server/controllers/case/amendments/amendFacilityValue.controller.js
@@ -1,4 +1,4 @@
-const { AMENDMENT_STATUS } = require('@ukef/dtfs2-common');
+const { TFM_AMENDMENT_STATUS } = require('@ukef/dtfs2-common');
 const api = require('../../../api');
 const { amendFacilityValueValidation } = require('./validation/amendFacilityValue.validate');
 const { formattedNumber } = require('../../../helpers/number');
@@ -16,7 +16,7 @@ const getAmendFacilityValue = async (req, res) => {
   const { data: latestAmendmentValue } = await api.getLatestCompletedAmendmentValue(facilityId, userToken);
 
   const { dealId, value } = amendment;
-  const isEditable = amendment.status === AMENDMENT_STATUS.IN_PROGRESS && amendment.changeFacilityValue;
+  const isEditable = amendment.status === TFM_AMENDMENT_STATUS.IN_PROGRESS && amendment.changeFacilityValue;
   const { currency } = facility.facilitySnapshot;
   let currentFacilityValue = facility.facilitySnapshot.facilityValueExportCurrency;
 
@@ -57,7 +57,7 @@ const postAmendFacilityValue = async (req, res) => {
   const { dealId } = amendment;
 
   if (amendFacilityValueErrors.length) {
-    const isEditable = amendment.status === AMENDMENT_STATUS.IN_PROGRESS && amendment.changeFacilityValue;
+    const isEditable = amendment.status === TFM_AMENDMENT_STATUS.IN_PROGRESS && amendment.changeFacilityValue;
     return res.render('case/amendments/amendment-facility-value.njk', {
       errors: errorsObject.errors,
       dealId,
diff --git a/trade-finance-manager-ui/server/controllers/case/amendments/amendmentAnswers.controller.js b/trade-finance-manager-ui/server/controllers/case/amendments/amendmentAnswers.controller.js
index 15904268f3..6cf129b8bf 100644
--- a/trade-finance-manager-ui/server/controllers/case/amendments/amendmentAnswers.controller.js
+++ b/trade-finance-manager-ui/server/controllers/case/amendments/amendmentAnswers.controller.js
@@ -1,5 +1,5 @@
 const { format, fromUnixTime, getUnixTime } = require('date-fns');
-const { AMENDMENT_STATUS } = require('@ukef/dtfs2-common');
+const { TFM_AMENDMENT_STATUS } = require('@ukef/dtfs2-common');
 const { HttpStatusCode } = require('axios');
 const api = require('../../../api');
 const { formattedNumber } = require('../../../helpers/number');
@@ -16,7 +16,7 @@ const getAmendmentAnswers = async (req, res) => {
     return res.redirect('/not-found');
   }
 
-  const isEditable = amendment.status === AMENDMENT_STATUS.IN_PROGRESS;
+  const isEditable = amendment.status === TFM_AMENDMENT_STATUS.IN_PROGRESS;
   const requestDate = format(fromUnixTime(amendment.requestDate), 'dd MMM yyyy');
   const coverEndDate = amendment?.coverEndDate ? format(fromUnixTime(amendment.coverEndDate), 'dd MMM yyyy') : '';
   const isUsingFacilityEndDate = amendment?.isUsingFacilityEndDate;
@@ -82,7 +82,7 @@ const postAmendmentAnswers = async (req, res) => {
     }
 
     if (!requireUkefApproval) {
-      payload.status = AMENDMENT_STATUS.COMPLETED;
+      payload.status = TFM_AMENDMENT_STATUS.COMPLETED;
       payload.submissionDate = getUnixTime(new Date());
       payload.automaticApprovalEmail = true;
       // flag to update tfm-deals last updated
diff --git a/trade-finance-manager-ui/server/controllers/case/amendments/amendmentBankReviewDate.controller.js b/trade-finance-manager-ui/server/controllers/case/amendments/amendmentBankReviewDate.controller.js
index cc0d393c52..e14a124cf2 100644
--- a/trade-finance-manager-ui/server/controllers/case/amendments/amendmentBankReviewDate.controller.js
+++ b/trade-finance-manager-ui/server/controllers/case/amendments/amendmentBankReviewDate.controller.js
@@ -1,5 +1,5 @@
 const { HttpStatusCode } = require('axios');
-const { AMENDMENT_STATUS } = require('@ukef/dtfs2-common');
+const { TFM_AMENDMENT_STATUS } = require('@ukef/dtfs2-common');
 const { format, parseISO } = require('date-fns');
 const api = require('../../../api');
 const { bankReviewDateValidation } = require('./validation/amendmentBankReviewDate.validate');
@@ -32,7 +32,7 @@ const getAmendmentBankReviewDate = async (req, res) => {
     return res.redirect(`/case/${amendment.dealId}/facility/${facilityId}/amendment/${amendmentId}/is-using-facility-end-date`);
   }
 
-  const isEditable = amendment.status === AMENDMENT_STATUS.IN_PROGRESS;
+  const isEditable = amendment.status === TFM_AMENDMENT_STATUS.IN_PROGRESS;
 
   const enteredBankReviewDate = bankReviewDate ? parseISO(bankReviewDate) : undefined;
 
@@ -71,7 +71,7 @@ const postAmendmentBankReviewDate = async (req, res) => {
   if (error?.fields) {
     const isFacilityEndDateEnabled = facility.facilitySnapshot.isGef;
 
-    const isEditable = amendment.status === AMENDMENT_STATUS.IN_PROGRESS && amendment.changeCoverEndDate && isFacilityEndDateEnabled;
+    const isEditable = amendment.status === TFM_AMENDMENT_STATUS.IN_PROGRESS && amendment.changeCoverEndDate && isFacilityEndDateEnabled;
 
     const currentBankReviewDate = facility?.facilitySnapshot?.dates?.bankReviewDate
       ? format(parseISO(facility?.facilitySnapshot?.dates?.bankReviewDate), 'dd MMMM yyyy')
diff --git a/trade-finance-manager-ui/server/controllers/case/amendments/amendmentBankReviewDate.get.test.js b/trade-finance-manager-ui/server/controllers/case/amendments/amendmentBankReviewDate.get.test.js
index 64f06feb08..a6ae69c77c 100644
--- a/trade-finance-manager-ui/server/controllers/case/amendments/amendmentBankReviewDate.get.test.js
+++ b/trade-finance-manager-ui/server/controllers/case/amendments/amendmentBankReviewDate.get.test.js
@@ -1,4 +1,4 @@
-import { AMENDMENT_STATUS, FACILITY_TYPE, MAPPED_FACILITY_TYPE, TEAM_IDS } from '@ukef/dtfs2-common';
+import { TFM_AMENDMENT_STATUS, FACILITY_TYPE, MAPPED_FACILITY_TYPE, TEAM_IDS } from '@ukef/dtfs2-common';
 import api from '../../../api';
 import { mockRes } from '../../../test-mocks';
 import {
@@ -139,7 +139,7 @@ describe('amendmentBankReviewDate routes', () => {
     });
 
     it('should render the template with isEditable false when amendment is found but has been completed', async () => {
-      const COMPLETED_AMENDMENT = { ...MOCK_AMENDMENT_COVERENDDATE_CHANGE_USING_BANK_REVIEW_DATE, status: AMENDMENT_STATUS.COMPLETED };
+      const COMPLETED_AMENDMENT = { ...MOCK_AMENDMENT_COVERENDDATE_CHANGE_USING_BANK_REVIEW_DATE, status: TFM_AMENDMENT_STATUS.COMPLETED };
 
       api.getAmendmentById.mockResolvedValueOnce({ status: 200, data: COMPLETED_AMENDMENT });
       api.getFacility = jest.fn().mockResolvedValueOnce(gefFacility);
diff --git a/trade-finance-manager-ui/server/controllers/case/amendments/amendmentEffectiveDate.controller.js b/trade-finance-manager-ui/server/controllers/case/amendments/amendmentEffectiveDate.controller.js
index 7d6bf05f9c..e4448956a6 100644
--- a/trade-finance-manager-ui/server/controllers/case/amendments/amendmentEffectiveDate.controller.js
+++ b/trade-finance-manager-ui/server/controllers/case/amendments/amendmentEffectiveDate.controller.js
@@ -1,5 +1,5 @@
 const { format, fromUnixTime } = require('date-fns');
-const { AMENDMENT_STATUS } = require('@ukef/dtfs2-common');
+const { TFM_AMENDMENT_STATUS } = require('@ukef/dtfs2-common');
 const api = require('../../../api');
 const { effectiveDateValidation } = require('./validation/amendmentEffectiveDate.validate');
 
@@ -17,7 +17,7 @@ const getAmendmentEffectiveDate = async (req, res) => {
   let effectiveDateMonth = '';
   let effectiveDateYear = '';
 
-  const isEditable = amendment.status === AMENDMENT_STATUS.IN_PROGRESS;
+  const isEditable = amendment.status === TFM_AMENDMENT_STATUS.IN_PROGRESS;
   if (amendment.effectiveDate) {
     effectiveDateDay = format(fromUnixTime(amendment.effectiveDate), 'dd');
     effectiveDateMonth = format(fromUnixTime(amendment.effectiveDate), 'M');
@@ -43,7 +43,7 @@ const postAmendmentEffectiveDate = async (req, res) => {
   const { dealId } = amendment;
 
   if (effectiveDateErrors.length) {
-    const isEditable = amendment.status === AMENDMENT_STATUS.IN_PROGRESS;
+    const isEditable = amendment.status === TFM_AMENDMENT_STATUS.IN_PROGRESS;
     return res.render('case/amendments/amendment-effective-date.njk', {
       dealId: amendment.dealId,
       facilityId,
diff --git a/trade-finance-manager-ui/server/controllers/case/amendments/amendmentFacilityEndDate.controller.js b/trade-finance-manager-ui/server/controllers/case/amendments/amendmentFacilityEndDate.controller.js
index 66ebc0d754..232b3d4588 100644
--- a/trade-finance-manager-ui/server/controllers/case/amendments/amendmentFacilityEndDate.controller.js
+++ b/trade-finance-manager-ui/server/controllers/case/amendments/amendmentFacilityEndDate.controller.js
@@ -1,4 +1,4 @@
-const { AMENDMENT_STATUS } = require('@ukef/dtfs2-common');
+const { TFM_AMENDMENT_STATUS } = require('@ukef/dtfs2-common');
 const { HttpStatusCode } = require('axios');
 const { format, parseISO } = require('date-fns');
 const api = require('../../../api');
@@ -32,7 +32,7 @@ const getAmendmentFacilityEndDate = async (req, res) => {
     return res.redirect(`/case/${amendment.dealId}/facility/${facilityId}/amendment/${amendmentId}/is-using-facility-end-date`);
   }
 
-  const isEditable = amendment.status === AMENDMENT_STATUS.IN_PROGRESS;
+  const isEditable = amendment.status === TFM_AMENDMENT_STATUS.IN_PROGRESS;
 
   const enteredFacilityEndDate = facilityEndDate ? parseISO(facilityEndDate) : undefined;
 
@@ -71,7 +71,7 @@ const postAmendmentFacilityEndDate = async (req, res) => {
   if (error?.fields) {
     const isFacilityEndDateEnabled = facility.facilitySnapshot.isGef;
 
-    const isEditable = amendment.status === AMENDMENT_STATUS.IN_PROGRESS && amendment.changeCoverEndDate && isFacilityEndDateEnabled;
+    const isEditable = amendment.status === TFM_AMENDMENT_STATUS.IN_PROGRESS && amendment.changeCoverEndDate && isFacilityEndDateEnabled;
 
     const currentFacilityEndDate = facility?.facilitySnapshot?.dates?.facilityEndDate
       ? format(parseISO(facility?.facilitySnapshot?.dates?.facilityEndDate), 'dd MMMM yyyy')
diff --git a/trade-finance-manager-ui/server/controllers/case/amendments/amendmentFacilityEndDate.get.test.js b/trade-finance-manager-ui/server/controllers/case/amendments/amendmentFacilityEndDate.get.test.js
index 3864e9a61a..26367fd62a 100644
--- a/trade-finance-manager-ui/server/controllers/case/amendments/amendmentFacilityEndDate.get.test.js
+++ b/trade-finance-manager-ui/server/controllers/case/amendments/amendmentFacilityEndDate.get.test.js
@@ -1,4 +1,4 @@
-import { AMENDMENT_STATUS, FACILITY_TYPE, MAPPED_FACILITY_TYPE, TEAM_IDS } from '@ukef/dtfs2-common';
+import { TFM_AMENDMENT_STATUS, FACILITY_TYPE, MAPPED_FACILITY_TYPE, TEAM_IDS } from '@ukef/dtfs2-common';
 import api from '../../../api';
 import { mockRes } from '../../../test-mocks';
 import {
@@ -138,7 +138,7 @@ describe('amendmentFacilityEndDate routes', () => {
     });
 
     it('should render the template with isEditable false when amendment is found but has been completed', async () => {
-      const COMPLETED_AMENDMENT = { ...MOCK_AMENDMENT_COVERENDDATE_CHANGE_USING_FACILITY_ENDDATE, status: AMENDMENT_STATUS.COMPLETED };
+      const COMPLETED_AMENDMENT = { ...MOCK_AMENDMENT_COVERENDDATE_CHANGE_USING_FACILITY_ENDDATE, status: TFM_AMENDMENT_STATUS.COMPLETED };
 
       api.getAmendmentById.mockResolvedValueOnce({ status: 200, data: COMPLETED_AMENDMENT });
       api.getFacility = jest.fn().mockResolvedValueOnce(gefFacility);
diff --git a/trade-finance-manager-ui/server/controllers/case/amendments/amendmentIsUsingFacilityEndDate.controller.js b/trade-finance-manager-ui/server/controllers/case/amendments/amendmentIsUsingFacilityEndDate.controller.js
index a1beee61e2..07f0ae48bd 100644
--- a/trade-finance-manager-ui/server/controllers/case/amendments/amendmentIsUsingFacilityEndDate.controller.js
+++ b/trade-finance-manager-ui/server/controllers/case/amendments/amendmentIsUsingFacilityEndDate.controller.js
@@ -1,4 +1,4 @@
-const { AMENDMENT_STATUS } = require('@ukef/dtfs2-common');
+const { TFM_AMENDMENT_STATUS } = require('@ukef/dtfs2-common');
 const { HttpStatusCode } = require('axios');
 const api = require('../../../api');
 const { isUsingFacilityEndDateValidation } = require('./validation/amendmentIsUsingFacilityEndDate.validate');
@@ -28,7 +28,7 @@ const getAmendmentIsUsingFacilityEndDate = async (req, res) => {
     return res.redirect(`/case/${amendment.dealId}/facility/${facilityId}/amendment/${amendmentId}/amendment-options`);
   }
 
-  const isEditable = amendment.status === AMENDMENT_STATUS.IN_PROGRESS;
+  const isEditable = amendment.status === TFM_AMENDMENT_STATUS.IN_PROGRESS;
 
   return res.render('case/amendments/amendment-is-using-facility-end-date.njk', {
     dealId,
@@ -64,7 +64,7 @@ const postAmendmentIsUsingFacilityEndDate = async (req, res) => {
   if (errors.errorSummary?.length) {
     const isFacilityEndDateEnabled = facility.facilitySnapshot.isGef;
 
-    const isEditable = amendment.status === AMENDMENT_STATUS.IN_PROGRESS && amendment.changeCoverEndDate && isFacilityEndDateEnabled;
+    const isEditable = amendment.status === TFM_AMENDMENT_STATUS.IN_PROGRESS && amendment.changeCoverEndDate && isFacilityEndDateEnabled;
     return res.render('case/amendments/amendment-is-using-facility-end-date.njk', {
       errors,
       dealId,
diff --git a/trade-finance-manager-ui/server/controllers/case/amendments/amendmentIsUsingFacilityEndDate.get.test.js b/trade-finance-manager-ui/server/controllers/case/amendments/amendmentIsUsingFacilityEndDate.get.test.js
index 903db12b55..af5ed1c795 100644
--- a/trade-finance-manager-ui/server/controllers/case/amendments/amendmentIsUsingFacilityEndDate.get.test.js
+++ b/trade-finance-manager-ui/server/controllers/case/amendments/amendmentIsUsingFacilityEndDate.get.test.js
@@ -1,4 +1,4 @@
-import { AMENDMENT_STATUS, FACILITY_TYPE, MAPPED_FACILITY_TYPE, TEAM_IDS } from '@ukef/dtfs2-common';
+import { TFM_AMENDMENT_STATUS, FACILITY_TYPE, MAPPED_FACILITY_TYPE, TEAM_IDS } from '@ukef/dtfs2-common';
 import api from '../../../api';
 import { mockRes } from '../../../test-mocks';
 import { MOCK_AMENDMENT_COVERENDDATE_CHANGE, MOCK_AMENDMENT_FACILITYVALUE_CHANGE } from '../../../test-mocks/amendment-test-mocks';
@@ -97,7 +97,7 @@ describe('amendmentIsUsingFacilityEndDate routes', () => {
     });
 
     it('should render template with isEditable false when amendment is found but the amendment has been completed', async () => {
-      const COMPLETED_AMENDMENT = { ...MOCK_AMENDMENT_COVERENDDATE_CHANGE, status: AMENDMENT_STATUS.COMPLETED };
+      const COMPLETED_AMENDMENT = { ...MOCK_AMENDMENT_COVERENDDATE_CHANGE, status: TFM_AMENDMENT_STATUS.COMPLETED };
 
       api.getAmendmentById.mockResolvedValueOnce({ status: 200, data: COMPLETED_AMENDMENT });
       api.getFacility = jest.fn().mockResolvedValueOnce(gefFacility);
diff --git a/trade-finance-manager-ui/server/controllers/case/amendments/amendmentOptions.controller.js b/trade-finance-manager-ui/server/controllers/case/amendments/amendmentOptions.controller.js
index a3d03f3c93..124d5968b7 100644
--- a/trade-finance-manager-ui/server/controllers/case/amendments/amendmentOptions.controller.js
+++ b/trade-finance-manager-ui/server/controllers/case/amendments/amendmentOptions.controller.js
@@ -1,4 +1,4 @@
-const { AMENDMENT_STATUS } = require('@ukef/dtfs2-common');
+const { TFM_AMENDMENT_STATUS } = require('@ukef/dtfs2-common');
 const api = require('../../../api');
 const { amendmentOptionsValidation } = require('./validation/amendmentOptions.validate');
 
@@ -14,7 +14,7 @@ const getAmendmentOptions = async (req, res) => {
 
   const changeCoverEndDate = amendment.changeCoverEndDate ?? '';
   const changeFacilityValue = amendment.changeFacilityValue ?? '';
-  const isEditable = amendment.status === AMENDMENT_STATUS.IN_PROGRESS;
+  const isEditable = amendment.status === TFM_AMENDMENT_STATUS.IN_PROGRESS;
   const { hasBeenIssued } = facility.facilitySnapshot;
   const { dealId } = amendment;
   return res.render('case/amendments/amendment-options.njk', {
@@ -41,7 +41,7 @@ const postAmendmentOptions = async (req, res) => {
   const { dealId } = amendment;
 
   if (amendmentOptionsValidationErrors.length) {
-    const isEditable = amendment.status === AMENDMENT_STATUS.IN_PROGRESS;
+    const isEditable = amendment.status === TFM_AMENDMENT_STATUS.IN_PROGRESS;
     return res.render('case/amendments/amendment-options.njk', {
       dealId,
       facilityId,
diff --git a/trade-finance-manager-ui/server/controllers/case/amendments/amendmentRequestApproval.controller.js b/trade-finance-manager-ui/server/controllers/case/amendments/amendmentRequestApproval.controller.js
index 0c1fc83df5..e2e13330d4 100644
--- a/trade-finance-manager-ui/server/controllers/case/amendments/amendmentRequestApproval.controller.js
+++ b/trade-finance-manager-ui/server/controllers/case/amendments/amendmentRequestApproval.controller.js
@@ -1,4 +1,4 @@
-const { AMENDMENT_STATUS } = require('@ukef/dtfs2-common');
+const { TFM_AMENDMENT_STATUS } = require('@ukef/dtfs2-common');
 const api = require('../../../api');
 const { requestApprovalValidation } = require('./validation/amendmentRequestApproval.validate');
 const { SUBMISSION_TYPE } = require('../../../constants/amendments');
@@ -14,7 +14,7 @@ const getAmendmentRequestApproval = async (req, res) => {
 
     const { dealId } = amendment;
     const requireUkefApproval = amendment.requireUkefApproval ?? '';
-    const isEditable = amendment.status === AMENDMENT_STATUS.IN_PROGRESS;
+    const isEditable = amendment.status === TFM_AMENDMENT_STATUS.IN_PROGRESS;
 
     return res.render('case/amendments/amendment-request-approval.njk', {
       dealId,
@@ -41,7 +41,7 @@ const postAmendmentRequestApproval = async (req, res) => {
   const { dealId } = amendment;
 
   if (amendmentRequestApprovalErrors.length) {
-    const isEditable = amendment.status === AMENDMENT_STATUS.IN_PROGRESS;
+    const isEditable = amendment.status === TFM_AMENDMENT_STATUS.IN_PROGRESS;
     return res.render('case/amendments/amendment-request-approval.njk', {
       errors: errorsObject.errors,
       dealId,
diff --git a/trade-finance-manager-ui/server/controllers/case/amendments/amendmentRequestDate.controller.js b/trade-finance-manager-ui/server/controllers/case/amendments/amendmentRequestDate.controller.js
index ccfa57d4c6..49442b4f6d 100644
--- a/trade-finance-manager-ui/server/controllers/case/amendments/amendmentRequestDate.controller.js
+++ b/trade-finance-manager-ui/server/controllers/case/amendments/amendmentRequestDate.controller.js
@@ -1,5 +1,5 @@
 const { format, fromUnixTime } = require('date-fns');
-const { AMENDMENT_STATUS } = require('@ukef/dtfs2-common');
+const { TFM_AMENDMENT_STATUS } = require('@ukef/dtfs2-common');
 const api = require('../../../api');
 const { amendmentRequestDateValidation } = require('./validation/amendmentRequestDate.validate');
 
@@ -18,7 +18,7 @@ const getAmendmentRequestDate = async (req, res) => {
     let amendmentRequestDateMonth = '';
     let amendmentRequestDateYear = '';
 
-    const isEditable = amendment.status !== AMENDMENT_STATUS.COMPLETED;
+    const isEditable = amendment.status !== TFM_AMENDMENT_STATUS.COMPLETED;
     if (amendment.requestDate) {
       amendmentRequestDateDay = format(fromUnixTime(amendment.requestDate), 'dd');
       amendmentRequestDateMonth = format(fromUnixTime(amendment.requestDate), 'M');
@@ -54,7 +54,7 @@ const postAmendmentRequestDate = async (req, res) => {
   const { dealId } = amendment;
 
   if (amendmentRequestDateErrors.length) {
-    const isEditable = amendment.status !== AMENDMENT_STATUS.COMPLETED;
+    const isEditable = amendment.status !== TFM_AMENDMENT_STATUS.COMPLETED;
     return res.render('case/amendments/amendment-request-date.njk', {
       dealId,
       facilityId,
@@ -70,7 +70,7 @@ const postAmendmentRequestDate = async (req, res) => {
   try {
     const payload = {
       requestDate: amendmentRequestDate,
-      status: AMENDMENT_STATUS.IN_PROGRESS,
+      status: TFM_AMENDMENT_STATUS.IN_PROGRESS,
       createdBy: {
         username: user.username,
         name: `${user.firstName} ${user.lastName}`,
diff --git a/trade-finance-manager-ui/server/controllers/case/amendments/amendmentRequestDate.test.js b/trade-finance-manager-ui/server/controllers/case/amendments/amendmentRequestDate.test.js
index 2427fb0362..cbeed20f44 100644
--- a/trade-finance-manager-ui/server/controllers/case/amendments/amendmentRequestDate.test.js
+++ b/trade-finance-manager-ui/server/controllers/case/amendments/amendmentRequestDate.test.js
@@ -1,5 +1,5 @@
 import { add, format } from 'date-fns';
-import { TEAM_IDS, AMENDMENT_STATUS } from '@ukef/dtfs2-common';
+import { TEAM_IDS, TFM_AMENDMENT_STATUS } from '@ukef/dtfs2-common';
 
 import api from '../../../api';
 import { mockRes } from '../../../test-mocks';
@@ -35,7 +35,7 @@ describe('controllers - case - amendments', () => {
         api.getAmendmentById = () =>
           Promise.resolve({
             status: 200,
-            data: { status: AMENDMENT_STATUS.IN_PROGRESS, dealId: '4567' },
+            data: { status: TFM_AMENDMENT_STATUS.IN_PROGRESS, dealId: '4567' },
           });
       });
 
@@ -97,7 +97,7 @@ describe('controllers - case - amendments', () => {
         api.getAmendmentById = () =>
           Promise.resolve({
             status: 200,
-            data: { status: AMENDMENT_STATUS.IN_PROGRESS, dealId: '4567' },
+            data: { status: TFM_AMENDMENT_STATUS.IN_PROGRESS, dealId: '4567' },
           });
       });
 
@@ -230,7 +230,7 @@ describe('controllers - case - amendments', () => {
           createdAmendment: {
             amendments: {
               _id: '11111',
-              status: AMENDMENT_STATUS.IN_PROGRESS,
+              status: TFM_AMENDMENT_STATUS.IN_PROGRESS,
             },
           },
           status: 200,
@@ -240,7 +240,7 @@ describe('controllers - case - amendments', () => {
         api.getAmendmentById = () =>
           Promise.resolve({
             status: 200,
-            data: { status: AMENDMENT_STATUS.IN_PROGRESS, dealId: '4567' },
+            data: { status: TFM_AMENDMENT_STATUS.IN_PROGRESS, dealId: '4567' },
           });
 
         const today = new Date();
diff --git a/trade-finance-manager-ui/server/controllers/case/amendments/bankDecision.controller.js b/trade-finance-manager-ui/server/controllers/case/amendments/bankDecision.controller.js
index 644d07e2c9..8924947e77 100644
--- a/trade-finance-manager-ui/server/controllers/case/amendments/bankDecision.controller.js
+++ b/trade-finance-manager-ui/server/controllers/case/amendments/bankDecision.controller.js
@@ -1,5 +1,5 @@
 const { format, fromUnixTime, getUnixTime } = require('date-fns');
-const { AMENDMENT_STATUS } = require('@ukef/dtfs2-common');
+const { TFM_AMENDMENT_STATUS } = require('@ukef/dtfs2-common');
 
 const api = require('../../../api');
 const { AMENDMENT_BANK_DECISION } = require('../../../constants/amendments');
@@ -19,7 +19,7 @@ const getAmendmentBankDecisionChoice = async (req, res) => {
   }
 
   const { user } = req.session;
-  const isEditable = userCanEditBankDecision(amendment, user) && amendment.status === AMENDMENT_STATUS.IN_PROGRESS;
+  const isEditable = userCanEditBankDecision(amendment, user) && amendment.status === TFM_AMENDMENT_STATUS.IN_PROGRESS;
 
   return res.render('case/amendments/amendment-add-banks-decision.njk', {
     amendment,
@@ -41,7 +41,7 @@ const postAmendmentBankDecisionChoice = async (req, res) => {
   }
 
   // checks amendment in progress and user can edit
-  const isEditable = userCanEditBankDecision(amendment, user) && amendment.status === AMENDMENT_STATUS.IN_PROGRESS;
+  const isEditable = userCanEditBankDecision(amendment, user) && amendment.status === TFM_AMENDMENT_STATUS.IN_PROGRESS;
 
   // checks that choice has been filled
   const { errorsObject, amendmentBankDecisionValidationErrors } = amendmentBankDecisionValidation(decision);
@@ -84,7 +84,7 @@ const getAmendmentBankDecisionReceivedDate = async (req, res) => {
   }
 
   const { user } = req.session;
-  const isEditable = userCanEditBankDecision(amendment, user) && amendment.status === AMENDMENT_STATUS.IN_PROGRESS;
+  const isEditable = userCanEditBankDecision(amendment, user) && amendment.status === TFM_AMENDMENT_STATUS.IN_PROGRESS;
 
   // gets date from stored epoch format if user has previously entered it
   const receivedDateDay = amendment?.bankDecision?.receivedDate ? format(fromUnixTime(amendment.bankDecision.receivedDate), 'dd') : '';
@@ -113,7 +113,7 @@ const postAmendmentBankDecisionReceivedDate = async (req, res) => {
     return res.redirect('/not-found');
   }
 
-  const isEditable = userCanEditBankDecision(amendment, user) && amendment.status === AMENDMENT_STATUS.IN_PROGRESS;
+  const isEditable = userCanEditBankDecision(amendment, user) && amendment.status === TFM_AMENDMENT_STATUS.IN_PROGRESS;
 
   // type for id of date input on form and error message
   const type = 'bankDecisionDate';
@@ -170,7 +170,7 @@ const getAmendmentBankDecisionEffectiveDate = async (req, res) => {
   }
 
   const { user } = req.session;
-  const isEditable = userCanEditBankDecision(amendment, user) && amendment.status === AMENDMENT_STATUS.IN_PROGRESS;
+  const isEditable = userCanEditBankDecision(amendment, user) && amendment.status === TFM_AMENDMENT_STATUS.IN_PROGRESS;
 
   // converts date from epoch format to day month year if in database
   const effectiveDateDay = amendment?.bankDecision?.effectiveDate ? format(fromUnixTime(amendment.bankDecision.effectiveDate), 'dd') : '';
@@ -199,7 +199,7 @@ const postAmendmentBankDecisionEffectiveDate = async (req, res) => {
     return res.redirect('/not-found');
   }
 
-  const isEditable = userCanEditBankDecision(amendment, user) && amendment.status === AMENDMENT_STATUS.IN_PROGRESS;
+  const isEditable = userCanEditBankDecision(amendment, user) && amendment.status === TFM_AMENDMENT_STATUS.IN_PROGRESS;
 
   const type = 'bankDecisionDate';
   const message = 'Enter the date the amendment will be effective from';
@@ -250,7 +250,7 @@ const getAmendmentBankDecisionAnswers = async (req, res) => {
   }
 
   const { user } = req.session;
-  const isEditable = userCanEditBankDecision(amendment, user) && amendment.status === AMENDMENT_STATUS.IN_PROGRESS;
+  const isEditable = userCanEditBankDecision(amendment, user) && amendment.status === TFM_AMENDMENT_STATUS.IN_PROGRESS;
 
   // formats received and effective date from epoch
   const receivedDateFormatted = amendment.bankDecision?.receivedDate ? format(fromUnixTime(amendment.bankDecision.receivedDate), 'dd MMM yyyy') : '';
@@ -279,7 +279,7 @@ const postAmendmentBankDecisionAnswers = async (req, res) => {
   try {
     // updates amendment with status to completed and submitted flag as true on bank decision
     const payload = {
-      status: AMENDMENT_STATUS.COMPLETED,
+      status: TFM_AMENDMENT_STATUS.COMPLETED,
       bankDecision: {
         submitted: true,
         banksDecisionEmail: true,
diff --git a/trade-finance-manager-ui/server/controllers/case/amendments/managersConditionsAndComments.controller.js b/trade-finance-manager-ui/server/controllers/case/amendments/managersConditionsAndComments.controller.js
index 3174226bce..e2f54dfaab 100644
--- a/trade-finance-manager-ui/server/controllers/case/amendments/managersConditionsAndComments.controller.js
+++ b/trade-finance-manager-ui/server/controllers/case/amendments/managersConditionsAndComments.controller.js
@@ -1,6 +1,6 @@
 const { format, fromUnixTime, getUnixTime } = require('date-fns');
 const sanitizeHtml = require('sanitize-html');
-const { AMENDMENT_STATUS } = require('@ukef/dtfs2-common');
+const { TFM_AMENDMENT_STATUS } = require('@ukef/dtfs2-common');
 const api = require('../../../api');
 
 const { userCanEditManagersDecision, ukefDecisionRejected, validateUkefDecision } = require('../../helpers');
@@ -19,7 +19,7 @@ const getManagersConditionsAndComments = async (req, res) => {
     }
     const facility = await api.getFacility(facilityId, userToken);
 
-    const isEditable = userCanEditManagersDecision(amendment, user) && amendment.status === AMENDMENT_STATUS.IN_PROGRESS;
+    const isEditable = userCanEditManagersDecision(amendment, user) && amendment.status === TFM_AMENDMENT_STATUS.IN_PROGRESS;
 
     if (amendment?.changeCoverEndDate && amendment?.coverEndDate) {
       amendment.currentCoverEndDate = format(fromUnixTime(amendment.currentCoverEndDate), 'dd MMMM yyyy');
@@ -52,7 +52,7 @@ const postManagersConditionsAndComments = async (req, res) => {
 
   const { data: amendment } = await api.getAmendmentById(facilityId, amendmentId, userToken);
   const facility = await api.getFacility(facilityId, userToken);
-  const isEditable = userCanEditManagersDecision(amendment, user) && amendment.status === AMENDMENT_STATUS.IN_PROGRESS;
+  const isEditable = userCanEditManagersDecision(amendment, user) && amendment.status === TFM_AMENDMENT_STATUS.IN_PROGRESS;
 
   const { errorsObject, amendmentManagersDecisionConditionsErrors } = amendmentManagersDecisionConditionsValidation(req.body, amendment);
 
@@ -120,7 +120,7 @@ const getManagersConditionsAndCommentsSummary = async (req, res) => {
     }
     const facility = await api.getFacility(facilityId, userToken);
 
-    const isEditable = userCanEditManagersDecision(amendment, user) && amendment.status === AMENDMENT_STATUS.IN_PROGRESS;
+    const isEditable = userCanEditManagersDecision(amendment, user) && amendment.status === TFM_AMENDMENT_STATUS.IN_PROGRESS;
 
     if (amendment?.changeCoverEndDate && amendment?.coverEndDate) {
       amendment.currentCoverEndDate = format(fromUnixTime(amendment.currentCoverEndDate), 'dd MMMM yyyy');
@@ -170,7 +170,7 @@ const postManagersConditionsAndCommentsSummary = async (req, res) => {
 
     // sets amendment to complete if declined
     if (ukefDecisionRejected(amendment)) {
-      payload.status = AMENDMENT_STATUS.COMPLETED;
+      payload.status = TFM_AMENDMENT_STATUS.COMPLETED;
     }
 
     const { status } = await api.updateAmendment(facilityId, amendmentId, payload, userToken);
diff --git a/trade-finance-manager-ui/server/controllers/case/amendments/underwriterManagerDecision.controller.js b/trade-finance-manager-ui/server/controllers/case/amendments/underwriterManagerDecision.controller.js
index 4309920ed3..f18f1f8066 100644
--- a/trade-finance-manager-ui/server/controllers/case/amendments/underwriterManagerDecision.controller.js
+++ b/trade-finance-manager-ui/server/controllers/case/amendments/underwriterManagerDecision.controller.js
@@ -1,5 +1,5 @@
 const { format, fromUnixTime } = require('date-fns');
-const { AMENDMENT_STATUS } = require('@ukef/dtfs2-common');
+const { TFM_AMENDMENT_STATUS } = require('@ukef/dtfs2-common');
 const api = require('../../../api');
 
 const { userCanEditManagersDecision } = require('../../helpers');
@@ -21,7 +21,7 @@ const getAmendmentAddUnderwriterManagersDecisionCoverEndDate = async (req, res)
   }
 
   const { user } = req.session;
-  const isEditable = userCanEditManagersDecision(amendment, user) && amendment.status === AMENDMENT_STATUS.IN_PROGRESS;
+  const isEditable = userCanEditManagersDecision(amendment, user) && amendment.status === TFM_AMENDMENT_STATUS.IN_PROGRESS;
 
   if (amendment?.changeCoverEndDate && amendment?.coverEndDate) {
     amendment.currentCoverEndDate = format(fromUnixTime(amendment.currentCoverEndDate), 'dd MMMM yyyy');
@@ -44,7 +44,7 @@ const postAmendmentAddUnderwriterManagersDecisionCoverEndDate = async (req, res)
   const { data: amendment } = await api.getAmendmentById(facilityId, amendmentId, userToken);
 
   if (amendmentUnderwriterManagerValidationErrors.length) {
-    const isEditable = userCanEditManagersDecision(amendment, user) && amendment.status === AMENDMENT_STATUS.IN_PROGRESS;
+    const isEditable = userCanEditManagersDecision(amendment, user) && amendment.status === TFM_AMENDMENT_STATUS.IN_PROGRESS;
     if (amendment?.changeCoverEndDate && amendment?.coverEndDate) {
       amendment.currentCoverEndDate = format(fromUnixTime(amendment.currentCoverEndDate), 'dd MMMM yyyy');
       amendment.coverEndDate = format(fromUnixTime(amendment.coverEndDate), 'dd MMMM yyyy');
@@ -87,7 +87,7 @@ const getAmendmentAddUnderwriterManagersFacilityValue = async (req, res) => {
   }
 
   const { user } = req.session;
-  const isEditable = userCanEditManagersDecision(amendment, user) && amendment.status === AMENDMENT_STATUS.IN_PROGRESS;
+  const isEditable = userCanEditManagersDecision(amendment, user) && amendment.status === TFM_AMENDMENT_STATUS.IN_PROGRESS;
 
   if (amendment?.changeFacilityValue && amendment?.value) {
     amendment.value = amendment?.value ? `${amendment.currency} ${formattedNumber(amendment.value)}` : null;
@@ -110,7 +110,7 @@ const postAmendmentAddUnderwriterManagersFacilityValue = async (req, res) => {
   const { data: amendment } = await api.getAmendmentById(facilityId, amendmentId, userToken);
 
   if (amendmentUnderwriterManagerValidationErrors.length) {
-    const isEditable = userCanEditManagersDecision(amendment, user) && amendment.status === AMENDMENT_STATUS.IN_PROGRESS;
+    const isEditable = userCanEditManagersDecision(amendment, user) && amendment.status === TFM_AMENDMENT_STATUS.IN_PROGRESS;
     if (amendment?.changeFacilityValue && amendment?.value) {
       amendment.value = amendment?.value ? `${amendment.currency} ${formattedNumber(amendment.value)}` : null;
       amendment.currentValue = amendment?.currentValue ? `${amendment.currency} ${formattedNumber(amendment.currentValue)}` : null;
diff --git a/trade-finance-manager-ui/server/controllers/case/index.js b/trade-finance-manager-ui/server/controllers/case/index.js
index a7018f2897..860b59d762 100644
--- a/trade-finance-manager-ui/server/controllers/case/index.js
+++ b/trade-finance-manager-ui/server/controllers/case/index.js
@@ -1,5 +1,5 @@
 const { format, fromUnixTime } = require('date-fns');
-const { AMENDMENT_STATUS, FLASH_TYPES } = require('@ukef/dtfs2-common');
+const { TFM_AMENDMENT_STATUS, FLASH_TYPES } = require('@ukef/dtfs2-common');
 const api = require('../../api');
 const {
   getTask,
@@ -348,7 +348,7 @@ const getCaseFacility = async (req, res) => {
     return res.render('_partials/problem-with-service.njk');
   }
 
-  const hasAmendmentInProgressButton = amendment.status === AMENDMENT_STATUS.IN_PROGRESS;
+  const hasAmendmentInProgressButton = amendment.status === TFM_AMENDMENT_STATUS.IN_PROGRESS;
   const showContinueAmendmentButton = hasAmendmentInProgressButton && !amendment.submittedByPim && showAmendmentButton(deal, req.session.user.teams);
 
   const amendmentsInProgress = getAmendmentsInProgress({ amendments, deal });
diff --git a/trade-finance-manager-ui/server/controllers/case/index.test.js b/trade-finance-manager-ui/server/controllers/case/index.test.js
index 87f741037e..6889093940 100644
--- a/trade-finance-manager-ui/server/controllers/case/index.test.js
+++ b/trade-finance-manager-ui/server/controllers/case/index.test.js
@@ -1,4 +1,4 @@
-import { AMENDMENT_STATUS, DEAL_SUBMISSION_TYPE, DEAL_TYPE, TFM_DEAL_CANCELLATION_STATUS } from '@ukef/dtfs2-common';
+import { TFM_AMENDMENT_STATUS, DEAL_SUBMISSION_TYPE, DEAL_TYPE, TFM_DEAL_CANCELLATION_STATUS } from '@ukef/dtfs2-common';
 import caseController from '.';
 import api from '../../api';
 import { mockRes } from '../../test-mocks';
@@ -68,7 +68,7 @@ describe('controllers - case', () => {
           ukefFacilityId: '1234',
           facilityId: '12345',
           submittedByPim: true,
-          status: AMENDMENT_STATUS.IN_PROGRESS,
+          status: TFM_AMENDMENT_STATUS.IN_PROGRESS,
         },
       ];
 
@@ -765,7 +765,7 @@ describe('controllers - case', () => {
         dealId: '625e99cb88eeeb001e33bf47',
         createdAt: 1652866533,
         updatedAt: 1652876975,
-        status: AMENDMENT_STATUS.IN_PROGRESS,
+        status: TFM_AMENDMENT_STATUS.IN_PROGRESS,
         version: 1,
         createdBy: {},
         requestDate: 1652876967,
diff --git a/trade-finance-manager-ui/server/controllers/helpers/amendments.helper.filterAmendmentsByInProgress.test.js b/trade-finance-manager-ui/server/controllers/helpers/amendments.helper.filterAmendmentsByInProgress.test.js
index 2ffd1f6108..437827f3ca 100644
--- a/trade-finance-manager-ui/server/controllers/helpers/amendments.helper.filterAmendmentsByInProgress.test.js
+++ b/trade-finance-manager-ui/server/controllers/helpers/amendments.helper.filterAmendmentsByInProgress.test.js
@@ -1,23 +1,23 @@
-const { TFM_DEAL_STAGE, AMENDMENT_STATUS } = require('@ukef/dtfs2-common');
+const { TFM_DEAL_STAGE, TFM_AMENDMENT_STATUS } = require('@ukef/dtfs2-common');
 const { getAmendmentsInProgress } = require('./amendments.helper');
 
 const notStartedAmendment = () => ({
-  status: AMENDMENT_STATUS.NOT_STARTED,
+  status: TFM_AMENDMENT_STATUS.NOT_STARTED,
   submittedByPim: false,
 });
 
 const unsubmittedInProgressAmendment = () => ({
-  status: AMENDMENT_STATUS.IN_PROGRESS,
+  status: TFM_AMENDMENT_STATUS.IN_PROGRESS,
   submittedByPim: false,
 });
 
 const submittedInProgressAmendment = () => ({
-  status: AMENDMENT_STATUS.IN_PROGRESS,
+  status: TFM_AMENDMENT_STATUS.IN_PROGRESS,
   submittedByPim: true,
 });
 
 const completedAmendment = () => ({
-  status: AMENDMENT_STATUS.COMPLETED,
+  status: TFM_AMENDMENT_STATUS.COMPLETED,
   submittedByPim: true,
 });
 
diff --git a/trade-finance-manager-ui/server/controllers/helpers/amendments.helper.js b/trade-finance-manager-ui/server/controllers/helpers/amendments.helper.js
index 40378db894..cd306e8ea3 100644
--- a/trade-finance-manager-ui/server/controllers/helpers/amendments.helper.js
+++ b/trade-finance-manager-ui/server/controllers/helpers/amendments.helper.js
@@ -1,4 +1,4 @@
-const { TEAM_IDS, AMENDMENT_STATUS, DEAL_STATUS, TFM_DEAL_STAGE } = require('@ukef/dtfs2-common');
+const { TEAM_IDS, TFM_AMENDMENT_STATUS, DEAL_STATUS, TFM_DEAL_STAGE } = require('@ukef/dtfs2-common');
 const { DECISIONS, DEAL } = require('../../constants');
 const { userIsInTeam } = require('../../helpers/user');
 
@@ -81,7 +81,7 @@ const getAmendmentsInProgress = ({ amendments, deal }) => {
   }
 
   if (Array.isArray(amendments) && amendments.length) {
-    return amendments.filter(({ status, submittedByPim }) => status === AMENDMENT_STATUS.IN_PROGRESS && submittedByPim);
+    return amendments.filter(({ status, submittedByPim }) => status === TFM_AMENDMENT_STATUS.IN_PROGRESS && submittedByPim);
   }
 
   return [];
diff --git a/trade-finance-manager-ui/server/controllers/helpers/dealsAndFacilities.helper.deals.test.js b/trade-finance-manager-ui/server/controllers/helpers/dealsAndFacilities.helper.deals.test.js
index 0ddad68ddf..b2d0633fc5 100644
--- a/trade-finance-manager-ui/server/controllers/helpers/dealsAndFacilities.helper.deals.test.js
+++ b/trade-finance-manager-ui/server/controllers/helpers/dealsAndFacilities.helper.deals.test.js
@@ -1,4 +1,4 @@
-import { AMENDMENT_STATUS } from '@ukef/dtfs2-common';
+import { TFM_AMENDMENT_STATUS } from '@ukef/dtfs2-common';
 import api from '../../api';
 import PageOutOfBoundsError from '../../errors/page-out-of-bounds.error';
 import { mockRes as generateMockRes } from '../../test-mocks';
@@ -40,12 +40,12 @@ describe('controllers - deals', () => {
   };
   const mockAmendments = [
     {
-      status: AMENDMENT_STATUS.IN_PROGRESS,
+      status: TFM_AMENDMENT_STATUS.IN_PROGRESS,
       dealId: '0',
       submittedByPim: true,
     },
     {
-      status: AMENDMENT_STATUS.NOT_STARTED,
+      status: TFM_AMENDMENT_STATUS.NOT_STARTED,
       dealId: '1',
       submittedByPim: true,
     },
diff --git a/trade-finance-manager-ui/server/controllers/helpers/dealsAndFacilities.helper.facilities.test.js b/trade-finance-manager-ui/server/controllers/helpers/dealsAndFacilities.helper.facilities.test.js
index 0b60170f9f..008177fc80 100644
--- a/trade-finance-manager-ui/server/controllers/helpers/dealsAndFacilities.helper.facilities.test.js
+++ b/trade-finance-manager-ui/server/controllers/helpers/dealsAndFacilities.helper.facilities.test.js
@@ -1,4 +1,4 @@
-import { AMENDMENT_STATUS } from '@ukef/dtfs2-common';
+import { TFM_AMENDMENT_STATUS } from '@ukef/dtfs2-common';
 import api from '../../api';
 import PageOutOfBoundsError from '../../errors/page-out-of-bounds.error';
 import { mockRes as generateMockRes } from '../../test-mocks';
@@ -35,11 +35,11 @@ describe('controllers - facilities', () => {
   };
   const mockAmendments = [
     {
-      status: AMENDMENT_STATUS.IN_PROGRESS,
+      status: TFM_AMENDMENT_STATUS.IN_PROGRESS,
       facilityId: '0',
     },
     {
-      status: AMENDMENT_STATUS.NOT_STARTED,
+      status: TFM_AMENDMENT_STATUS.NOT_STARTED,
       facilityId: '1',
     },
   ];
diff --git a/trade-finance-manager-ui/server/controllers/helpers/overrideDealsIfAmendmentsInProgress.helper.test.js b/trade-finance-manager-ui/server/controllers/helpers/overrideDealsIfAmendmentsInProgress.helper.test.js
index ac91cf7316..767bccb48e 100644
--- a/trade-finance-manager-ui/server/controllers/helpers/overrideDealsIfAmendmentsInProgress.helper.test.js
+++ b/trade-finance-manager-ui/server/controllers/helpers/overrideDealsIfAmendmentsInProgress.helper.test.js
@@ -1,4 +1,4 @@
-const { AMENDMENT_STATUS } = require('@ukef/dtfs2-common');
+const { TFM_AMENDMENT_STATUS } = require('@ukef/dtfs2-common');
 const { DEAL } = require('../../constants');
 const { overrideDealsIfAmendmentsInProgress } = require('./overrideDealsIfAmendmentsInProgress.helper');
 
@@ -20,12 +20,12 @@ describe('overrideDealsIfAmendmentsInProgress', () => {
 
   const amendmentsOneCorresponding = [
     {
-      status: AMENDMENT_STATUS.IN_PROGRESS,
+      status: TFM_AMENDMENT_STATUS.IN_PROGRESS,
       dealId: '0',
       submittedByPim: true,
     },
     {
-      status: AMENDMENT_STATUS.NOT_STARTED,
+      status: TFM_AMENDMENT_STATUS.NOT_STARTED,
       dealId: '1',
       submittedByPim: false,
     },
@@ -33,12 +33,12 @@ describe('overrideDealsIfAmendmentsInProgress', () => {
 
   const amendmentsNoneCorresponding = [
     {
-      status: AMENDMENT_STATUS.IN_PROGRESS,
+      status: TFM_AMENDMENT_STATUS.IN_PROGRESS,
       dealId: '2',
       submittedByPim: true,
     },
     {
-      status: AMENDMENT_STATUS.NOT_STARTED,
+      status: TFM_AMENDMENT_STATUS.NOT_STARTED,
       dealId: '1',
       submittedByPim: false,
     },
diff --git a/trade-finance-manager-ui/server/controllers/helpers/overrideFacilitiesIfAmendmentsInProgress.helper.js b/trade-finance-manager-ui/server/controllers/helpers/overrideFacilitiesIfAmendmentsInProgress.helper.js
index dfae497ced..17d7923bda 100644
--- a/trade-finance-manager-ui/server/controllers/helpers/overrideFacilitiesIfAmendmentsInProgress.helper.js
+++ b/trade-finance-manager-ui/server/controllers/helpers/overrideFacilitiesIfAmendmentsInProgress.helper.js
@@ -1,4 +1,4 @@
-const { AMENDMENT_STATUS } = require('@ukef/dtfs2-common');
+const { TFM_AMENDMENT_STATUS } = require('@ukef/dtfs2-common');
 
 const overrideFacilitiesIfAmendmentsInProgress = (facilities, amendments) => {
   // set each facility's hasAmendmentInProgress to true if it has an amendment in progress
@@ -7,7 +7,7 @@ const overrideFacilitiesIfAmendmentsInProgress = (facilities, amendments) => {
       const modifiedFacility = facility;
       // eslint-disable-next-line no-restricted-syntax
       for (const amendment of amendments) {
-        const amendmentIsInProgress = amendment.status === AMENDMENT_STATUS.IN_PROGRESS;
+        const amendmentIsInProgress = amendment.status === TFM_AMENDMENT_STATUS.IN_PROGRESS;
         if (amendmentIsInProgress && amendment.facilityId === facility.facilityId) {
           modifiedFacility.hasAmendmentInProgress = true;
           break;
diff --git a/trade-finance-manager-ui/server/controllers/helpers/overrideFacilitiesIfAmendmentsInProgress.helper.test.js b/trade-finance-manager-ui/server/controllers/helpers/overrideFacilitiesIfAmendmentsInProgress.helper.test.js
index cfd360e272..e1fcb8cb6c 100644
--- a/trade-finance-manager-ui/server/controllers/helpers/overrideFacilitiesIfAmendmentsInProgress.helper.test.js
+++ b/trade-finance-manager-ui/server/controllers/helpers/overrideFacilitiesIfAmendmentsInProgress.helper.test.js
@@ -1,4 +1,4 @@
-const { AMENDMENT_STATUS } = require('@ukef/dtfs2-common');
+const { TFM_AMENDMENT_STATUS } = require('@ukef/dtfs2-common');
 const { overrideFacilitiesIfAmendmentsInProgress } = require('./overrideFacilitiesIfAmendmentsInProgress.helper');
 
 describe('overrideFacilitiesIfAmendmentsInProgress', () => {
@@ -15,22 +15,22 @@ describe('overrideFacilitiesIfAmendmentsInProgress', () => {
 
   const amendmentsOneCorresponding = [
     {
-      status: AMENDMENT_STATUS.IN_PROGRESS,
+      status: TFM_AMENDMENT_STATUS.IN_PROGRESS,
       facilityId: '0',
     },
     {
-      status: AMENDMENT_STATUS.NOT_STARTED,
+      status: TFM_AMENDMENT_STATUS.NOT_STARTED,
       facilityId: '1',
     },
   ];
 
   const amendmentsNoneCorresponding = [
     {
-      status: AMENDMENT_STATUS.IN_PROGRESS,
+      status: TFM_AMENDMENT_STATUS.IN_PROGRESS,
       facilityId: '2',
     },
     {
-      status: AMENDMENT_STATUS.NOT_STARTED,
+      status: TFM_AMENDMENT_STATUS.NOT_STARTED,
       facilityId: '1',
     },
   ];
diff --git a/trade-finance-manager-ui/server/test-mocks/amendment-test-mocks.js b/trade-finance-manager-ui/server/test-mocks/amendment-test-mocks.js
index 948e1a99ef..c9d3094358 100644
--- a/trade-finance-manager-ui/server/test-mocks/amendment-test-mocks.js
+++ b/trade-finance-manager-ui/server/test-mocks/amendment-test-mocks.js
@@ -1,4 +1,4 @@
-const { TEAM_IDS, AMENDMENT_STATUS, FACILITY_TYPE, DEAL_TYPE } = require('@ukef/dtfs2-common');
+const { TEAM_IDS, TFM_AMENDMENT_STATUS, FACILITY_TYPE, DEAL_TYPE } = require('@ukef/dtfs2-common');
 const { AMENDMENTS, DEAL, DECISIONS } = require('../constants');
 
 const MOCK_DEAL = {
@@ -51,7 +51,7 @@ const MOCK_AMENDMENT = {
   dealId: '999',
   ukefFacilityId: '1234567890',
   type: FACILITY_TYPE.CASH,
-  status: AMENDMENT_STATUS.IN_PROGRESS,
+  status: TFM_AMENDMENT_STATUS.IN_PROGRESS,
   submittedByPim: true,
   requireUkefApproval: true,
   leadUnderwriter: null,
@@ -59,13 +59,13 @@ const MOCK_AMENDMENT = {
 
 const MOCK_AMENDMENT_AUTOMATIC_APPROVAL = {
   ...MOCK_AMENDMENT,
-  status: AMENDMENT_STATUS.COMPLETED,
+  status: TFM_AMENDMENT_STATUS.COMPLETED,
   requireUkefApproval: false,
 };
 
 const MOCK_AMENDMENT_UNSUBMITTED = {
   ...MOCK_AMENDMENT,
-  status: AMENDMENT_STATUS.IN_PROGRESS,
+  status: TFM_AMENDMENT_STATUS.IN_PROGRESS,
   submittedByPim: false,
 };
 
diff --git a/utils/create-keying-sheet-tfm-facilities/mock-data/tfm-facility-amendment.ts b/utils/create-keying-sheet-tfm-facilities/mock-data/tfm-facility-amendment.ts
index 3d86582ae9..9e1dbe782c 100644
--- a/utils/create-keying-sheet-tfm-facilities/mock-data/tfm-facility-amendment.ts
+++ b/utils/create-keying-sheet-tfm-facilities/mock-data/tfm-facility-amendment.ts
@@ -1,14 +1,14 @@
 import { ObjectId } from 'mongodb';
 import { faker } from '@faker-js/faker';
 import { addMonths } from 'date-fns';
-import { AMENDMENT_STATUS, TfmFacilityAmendment, UnixTimestamp } from '@ukef/dtfs2-common';
+import { TFM_AMENDMENT_STATUS, TfmFacilityAmendment, UnixTimestamp } from '@ukef/dtfs2-common';
 
 const TODAY = new Date();
 
 const EARLIEST_COVER_END_DATE = addMonths(TODAY, 12);
 const getRandomCoverEndDateTimestamp = (): UnixTimestamp => faker.date.future({ years: 2, refDate: EARLIEST_COVER_END_DATE }).getTime();
 
-const getRandomAmendmentStatus = () => faker.helpers.arrayElement(Object.values(AMENDMENT_STATUS));
+const getRandomAmendmentStatus = () => faker.helpers.arrayElement(Object.values(TFM_AMENDMENT_STATUS));
 
 export const aTfmFacilityAmendmentWithFacilityIdAndDealId = (facilityId: ObjectId, dealId: ObjectId): TfmFacilityAmendment => {
   const amendment: TfmFacilityAmendment = {
diff --git a/utils/data-migration/constant/amendment.js b/utils/data-migration/constant/amendment.js
deleted file mode 100644
index d761e0fa79..0000000000
--- a/utils/data-migration/constant/amendment.js
+++ /dev/null
@@ -1,20 +0,0 @@
-const AMENDMENT_TYPE = {
-  MANUAL: 'Manual',
-  AUTOMATIC: 'Auto',
-};
-
-const AMENDMENT_STATUS = {
-  IN_PROGRESS: 'In progress',
-  COMPLETED: 'Completed',
-};
-
-const AMENDMENT_BANK_DECISION = {
-  PROCEED: 'Proceed',
-  WITHDRAW: 'Withdrawn',
-};
-
-module.exports = {
-  AMENDMENT_STATUS,
-  AMENDMENT_BANK_DECISION,
-  AMENDMENT_TYPE,
-};
diff --git a/utils/data-migration/constant/index.js b/utils/data-migration/constant/index.js
index 941c587fe4..045410cadd 100644
--- a/utils/data-migration/constant/index.js
+++ b/utils/data-migration/constant/index.js
@@ -1,7 +1,6 @@
 const DATABASE = require('./database');
 const DEAL = require('./deal');
 const FACILITY = require('./facility');
-const AMENDMENT = require('./amendment');
 const WORKFLOW = require('./workflow');
 const ROLES = require('./roles');
 
@@ -9,7 +8,6 @@ module.exports = {
   DATABASE,
   DEAL,
   FACILITY,
-  AMENDMENT,
   WORKFLOW,
   ROLES,
 };

From 4f08239e37fa57fe510ba2324949fbb86846f1c3 Mon Sep 17 00:00:00 2001
From: Abhi Markan <32125108+abhi-markan@users.noreply.github.com>
Date: Fri, 17 Jan 2025 19:06:55 +0000
Subject: [PATCH 5/5] fix(DTFS2-7771): update security.txt (#4153)

Co-authored-by: Abhi Markan <amarkan>
---
 libs/common/src/helpers/date.test.ts       | 51 +++++++++++++++-
 libs/common/src/helpers/date.ts            | 19 ++++++
 portal/api-tests/static-routes.api-test.js | 70 ++++++++++++++++++++--
 portal/server/routes/static.js             |  7 ++-
 4 files changed, 139 insertions(+), 8 deletions(-)

diff --git a/libs/common/src/helpers/date.test.ts b/libs/common/src/helpers/date.test.ts
index f93712b0f7..c370ba2232 100644
--- a/libs/common/src/helpers/date.test.ts
+++ b/libs/common/src/helpers/date.test.ts
@@ -1,5 +1,5 @@
 import { formatInTimeZone } from 'date-fns-tz';
-import { getNowAsUtcISOString, getMonthName } from './date';
+import { now, getNowAsUtcISOString, getMonthName, getISO8601, getUnixTimestampSeconds } from './date';
 
 describe('date helpers', () => {
   describe('getNowAsUtcISOString', () => {
@@ -42,4 +42,53 @@ describe('date helpers', () => {
       expect(result).toEqual(expectedMonthName);
     });
   });
+
+  describe('now', () => {
+    it('should return now', () => {
+      // Act
+      const response = now();
+
+      // Assert
+      expect(response).not.toBeNull();
+    });
+
+    it('should have imperative date functions', () => {
+      // Act
+      const response = now();
+
+      // Assert
+      expect(response.getDate()).toBeDefined();
+      expect(response.getMonth()).toBeDefined();
+      expect(response.getFullYear()).toBeDefined();
+    });
+  });
+
+  describe('getISO8601', () => {
+    it('should return the current date and time in ISO 8601 format', () => {
+      // Act
+      const result = getISO8601();
+      const year = now().getFullYear();
+      const month = (now().getMonth() + 1).toString().padStart(2, '0');
+      const date = now().getDate();
+
+      // Assert
+      expect(result).toContain(`${year}-${month}-${date}`);
+      expect(result).toContain('T');
+      expect(result).toContain('Z');
+    });
+  });
+
+  describe('getUnixTimestampSeconds', () => {
+    it('should return the Unix timestamp in seconds for a given date', () => {
+      // Arrange
+      const date = new Date('2023-01-01T00:00:00Z');
+
+      // Act
+      const result = getUnixTimestampSeconds(date);
+      const expected = Math.floor(date.getTime() / 1000);
+
+      // Assert
+      expect(result).toEqual(expected);
+    });
+  });
 });
diff --git a/libs/common/src/helpers/date.ts b/libs/common/src/helpers/date.ts
index 09810821d4..6bd402af82 100644
--- a/libs/common/src/helpers/date.ts
+++ b/libs/common/src/helpers/date.ts
@@ -2,6 +2,18 @@ import { formatInTimeZone } from 'date-fns-tz';
 import { format, getUnixTime } from 'date-fns';
 import { IsoDateTimeStamp, OneIndexedMonth, UnixTimestampSeconds } from '../types/date';
 
+/**
+ * Returns the current date and time.
+ *
+ * @returns {Date} The current date and time.
+ */
+export const now = (): Date => new Date();
+
+/**
+ * Returns the current date and time as a UTC ISO string.
+ *
+ * @returns {IsoDateTimeStamp} The current date and time in UTC formatted as an ISO string.
+ */
 export const getNowAsUtcISOString = (): IsoDateTimeStamp =>
   `${formatInTimeZone(new Date(), '+00:00', 'yyyy-MM-dd')}T${formatInTimeZone(new Date(), '+00:00', 'HH:mm:ss.SSS xxxxxx')}`;
 
@@ -22,3 +34,10 @@ export const getMonthName = (monthNumber: OneIndexedMonth) => {
  * @returns Unix timestamp in seconds
  */
 export const getUnixTimestampSeconds: (date: Date) => UnixTimestampSeconds = getUnixTime;
+
+/**
+ * Returns the current date and time in ISO 8601 format.
+ *
+ * @returns {IsoDateTimeStamp} The current date and time as an ISO 8601 string.
+ */
+export const getISO8601 = (): IsoDateTimeStamp => now().toISOString();
diff --git a/portal/api-tests/static-routes.api-test.js b/portal/api-tests/static-routes.api-test.js
index 553777de0b..a483059e5b 100644
--- a/portal/api-tests/static-routes.api-test.js
+++ b/portal/api-tests/static-routes.api-test.js
@@ -10,23 +10,85 @@ jest.mock('../server/api', () => ({
   validateToken: () => true,
 }));
 
-const { ROLES } = require('@ukef/dtfs2-common');
+const { ROLES, getISO8601 } = require('@ukef/dtfs2-common');
 const { withRoleValidationApiTests } = require('./common-tests/role-validation-api-tests');
 const app = require('../server/createApp');
 const { get } = require('./create-api').createApi(app);
 
 const allRoles = Object.values(ROLES);
 
-describe('static routes', () => {
-  describe('GET /.well-known/security.txt', () => {
+describe('/.well-known/security.txt', () => {
+  describe('GET', () => {
     withRoleValidationApiTests({
       makeRequestWithHeaders: (headers) => get('/.well-known/security.txt', {}, headers),
       whitelistedRoles: allRoles,
       successCode: 200,
     });
+
+    it('should contain contact information', async () => {
+      // Act
+      const response = await get('/.well-known/security.txt');
+
+      // Assert
+      expect(response.text).toContain('Contact: https://hackerone.com/7af14fd9-fe4e-4f39-bea1-8f8a364061b8/embedded_submissions/new');
+      expect(response.text).toContain('Contact: https://www.gov.uk/contact/govuk');
+      expect(response.text).toContain('Contact: https://get-a-guarantee-for-export-finance.service.gov.uk/feedback');
+    });
+
+    it('should contain expires information', async () => {
+      // Act
+      const response = await get('/.well-known/security.txt');
+      // Only get the YYYY-MM-DD
+      const todayDate = getISO8601().split('T')[0];
+
+      // Assert
+      expect(response.text).toContain(`Expires: ${todayDate}`);
+    });
+
+    it('should contain acknowledgments information', async () => {
+      // Act
+      const response = await get('/.well-known/security.txt');
+
+      // Assert
+      expect(response.text).toContain('Acknowledgments: https://get-a-guarantee-for-export-finance.service.gov.uk/thanks.txt');
+    });
+
+    it('should contain prederred language information', async () => {
+      // Act
+      const response = await get('/.well-known/security.txt');
+
+      // Assert
+      expect(response.text).toContain('Preferred-Languages: en');
+    });
+
+    it('should contain canonical information', async () => {
+      // Act
+      const response = await get('/.well-known/security.txt');
+
+      // Assert
+      expect(response.text).toContain('Canonical: https://get-a-guarantee-for-export-finance.service.gov.uk/.well-known/security.txt');
+    });
+
+    it('should contain policy information', async () => {
+      // Act
+      const response = await get('/.well-known/security.txt');
+
+      // Assert
+      expect(response.text).toContain('Policy: https://www.gov.uk/guidance/report-a-vulnerability-on-a-ukef-system');
+    });
+
+    it('should contain hiring information', async () => {
+      // Act
+      const response = await get('/.well-known/security.txt');
+
+      // Assert
+      expect(response.text).toContain('Hiring: https://www.civilservicejobs.service.gov.uk/');
+    });
   });
+});
 
-  describe('GET /thanks.txt', () => {
+describe('/thanks.txt', () => {
+  describe('GET', () => {
     withRoleValidationApiTests({
       makeRequestWithHeaders: (headers) => get('/thanks.txt', {}, headers),
       whitelistedRoles: allRoles,
diff --git a/portal/server/routes/static.js b/portal/server/routes/static.js
index 05d14bd283..637a5cd08c 100644
--- a/portal/server/routes/static.js
+++ b/portal/server/routes/static.js
@@ -1,4 +1,5 @@
-const express = require('express');
+import express from 'express';
+import { getISO8601 } from '@ukef/dtfs2-common';
 
 const router = express.Router();
 
@@ -8,7 +9,7 @@ router.get('/.well-known/security.txt', (req, res) => {
   res.write('Contact: https://www.gov.uk/contact/govuk\n');
   res.write('Contact: https://hackerone.com/7af14fd9-fe4e-4f39-bea1-8f8a364061b8/embedded_submissions/new\n');
   res.write('Contact: https://get-a-guarantee-for-export-finance.service.gov.uk/feedback\n');
-  res.write('Expires: 2024-02-07T00:00:00.000Z\n');
+  res.write(`Expires: ${getISO8601()}\n`);
   res.write('Acknowledgments: https://get-a-guarantee-for-export-finance.service.gov.uk/thanks.txt\n');
   res.write('Preferred-Languages: en\n');
   res.write('Canonical: https://get-a-guarantee-for-export-finance.service.gov.uk/.well-known/security.txt\n');
@@ -28,4 +29,4 @@ router.get('/thanks.txt', (req, res) => {
   res.send();
 });
 
-module.exports = router;
+export default router;