diff --git a/src/export/bops/mocks/flow.ts b/src/export/bops/mocks/flow.ts
index 6be1bcfe..96ef226a 100644
--- a/src/export/bops/mocks/flow.ts
+++ b/src/export/bops/mocks/flow.ts
@@ -143193,11 +143193,10 @@ export const mockPublishedLDCFlow: FlowGraph = {
         "<p>The site outline is often the same as the property boundary. This includes any gardens or outside spaces.</p><p>You should include:</p><ul><li><p>all the changes up to a public road or pavement</p></li><li><p>any work outside the property boundary (such as dropped kerbs)</p></li><li><p>areas that will be closed off during the work</p></li><li><p>access areas to the works (such as roads and tracks)</p></li></ul>",
       howMeasured:
         "<h2><strong>Ways to provide your site outline</strong></h2><p>You can either:</p><ul><li><p>draw your site outline on this map</p></li><li><p>upload a location plan</p></li></ul><p>You do not need to do both.</p><p>Drawing your site outline on this map helps us accurately identify things that might affect your project. For example, if your site is in a conservation area.</p>",
-      dataFieldArea: "proposal.siteArea",
       definitionImg:
         "https://user-data-8038f15.s3.eu-west-2.amazonaws.com/yrjahw3c/siteplan2.png",
       hideFileUpload: false,
-      dataFieldBoundary: "property.boundary.site",
+      fn: "property.boundary.site",
       titleForUploading: "Upload a location plan",
       descriptionForUploading:
         "<p>Your location plan must:</p><ul><li><p>be based on an accurate, recognisable map</p></li><li><p>be drawn to a scale, labelled, and/or marked with a scale bar</p></li><li><p>show the site outline in red</p></li><li><p>include a<strong> </strong>north point</p></li></ul>",
diff --git a/src/export/digitalPlanning/mocks/flows/planningPermission.ts b/src/export/digitalPlanning/mocks/flows/planningPermission.ts
index ec65e0ec..0a22dc8f 100644
--- a/src/export/digitalPlanning/mocks/flows/planningPermission.ts
+++ b/src/export/digitalPlanning/mocks/flows/planningPermission.ts
@@ -6076,9 +6076,8 @@ export const mockPublishedPlanningPermissionFlow = {
         '<p><a target="_blank" rel="noopener noreferrer nofollow" href="https://www.legislation.gov.uk/uksi/2015/595/article/7">The Town and Country Planning (Development Management Procedure) (England) Order 2015</a>,</p><p><a target="_blank" rel="noopener noreferrer nofollow" href="https://www.gov.uk/government/collections/planning-practice-guidance">Planning Practice Guidance (PPG)</a></p>',
       description:
         "<p>This is not just the outline of your new project. It&apos;s called a red line drawing or location plan. </p><p>It needs to be accurate so we can spot things that might impact your project. If it&apos;s wrong, your application may be invalid.</p><h1>You need to draw:</h1><ul><li><p>the outline of your property boundary - this should be your whole building and land, not just the new project</p></li></ul><h1>You must also include:</h1><ul><li><p>any work outside the property boundary (like a dropped kerb)</p></li><li><p>areas that will be closed off or you&apos;ll need access to during the work (like part of a road)</p></li></ul>",
-      dataFieldArea: "property.boundary.area",
       hideFileUpload: true,
-      dataFieldBoundary: "property.boundary.site",
+      fn: "property.boundary.site",
       titleForUploading: "Upload a location plan",
       descriptionForUploading:
         "<p>Your location plan must:</p><ul><li><p>be based on an accurate, recognisable map</p></li><li><p>be drawn to a scale, labelled, and/or marked with a scale bar</p></li><li><p>show the site outline in red</p></li><li><p>include a<strong> </strong>north point</p></li></ul>",
diff --git a/src/export/digitalPlanning/mocks/flows/priorApproval.ts b/src/export/digitalPlanning/mocks/flows/priorApproval.ts
index 5ac16b68..f026f64f 100644
--- a/src/export/digitalPlanning/mocks/flows/priorApproval.ts
+++ b/src/export/digitalPlanning/mocks/flows/priorApproval.ts
@@ -19204,9 +19204,8 @@ export const mockPublishedPriorApprovalFlow = {
         "<p>The red line shown below should include:</p><ul><li><p>the outline of your property boundary</p></li><li><p>any works outside the property boundary</p></li><li><p>areas that will be closed off or you&apos;ll need access to during the works</p></li></ul><p>If the red line already includes all these, select continue. If not, select More information for guidance on how to amend or redraw the outline.</p>",
       howMeasured:
         '<p>We have pre-populated the map with a red outline that includes the entire property using information from the Land Registry.</p><p>In some cases, this outline might not include all the works or the areas that will be closed off. This might be because you&apos;re proposing works to a public highway (such as a dropped kerb), doing works that involve multiple properties, or works to a building that is part of a larger estate.</p><p>In these cases, you should amend the red outline by dragging the edges, or erase it by clicking the 🗑-icon on the map and draw a new outline.</p><p></p><h1>How to draw and amend the outline</h1><ol><li><p>Move the cursor to the corner you want to start with and click or tap once.</p></li><li><p>Move the cursor to the next corner and click or tap.</p></li><li><p>Repeat until you have the shape you need.</p></li><li><p>Click or tap the last corner again to stop drawing.</p></li><li><p>To amend the outline, click or tap on a line and drag it into a new position.</p></li></ol><img src="https://api.editor.planx.uk/file/public/dni98ojg/Draw_Outline_2.gif">',
-      dataFieldArea: "property.boundary.area",
       hideFileUpload: false,
-      dataFieldBoundary: "property.boundary.site",
+      fn: "property.boundary.site",
       titleForUploading: "Upload a location plan",
       descriptionForUploading:
         "<p>Your location plan must:</p><ul><li><p>be based on an accurate, recognisable map</p></li><li><p>be drawn to a scale, labelled, and/or marked with a scale bar</p></li><li><p>show the site outline in red</p></li><li><p>include a<strong> </strong>north point</p></li></ul>",
diff --git a/src/models/session/mocks/large-real-life-flow.ts b/src/models/session/mocks/large-real-life-flow.ts
index f38275f2..b92b9487 100644
--- a/src/models/session/mocks/large-real-life-flow.ts
+++ b/src/models/session/mocks/large-real-life-flow.ts
@@ -143201,11 +143201,10 @@ export const flow: FlowGraph = {
         "<p>The site outline is often the same as the property boundary. This includes any gardens or outside spaces.</p><p>You should include:</p><ul><li><p>all the changes up to a public road or pavement</p></li><li><p>any work outside the property boundary (such as dropped kerbs)</p></li><li><p>areas that will be closed off during the work</p></li><li><p>access areas to the works (such as roads and tracks)</p></li></ul>",
       howMeasured:
         "<h2><strong>Ways to provide your site outline</strong></h2><p>You can either:</p><ul><li><p>draw your site outline on this map</p></li><li><p>upload a location plan</p></li></ul><p>You do not need to do both.</p><p>Drawing your site outline on this map helps us accurately identify things that might affect your project. For example, if your site is in a conservation area.</p>",
-      dataFieldArea: "proposal.siteArea",
       definitionImg:
         "https://user-data-8038f15.s3.eu-west-2.amazonaws.com/yrjahw3c/siteplan2.png",
       hideFileUpload: false,
-      dataFieldBoundary: "property.boundary.site",
+      fn: "property.boundary.site",
       titleForUploading: "Upload a location plan",
       descriptionForUploading:
         "<p>Your location plan must:</p><ul><li><p>be based on an accurate, recognisable map</p></li><li><p>be drawn to a scale, labelled, and/or marked with a scale bar</p></li><li><p>show the site outline in red</p></li><li><p>include a<strong> </strong>north point</p></li></ul>",