From 86c2214e8f80ecb0092c1cc063ef6410a880f12e Mon Sep 17 00:00:00 2001
From: Benjy Stanton <2545065+benjystanton@users.noreply.github.com>
Date: Tue, 27 Oct 2026 09:37:31 +0000
Subject: [PATCH 1/2] Update content

---
 app/views/payments/claims/invalid-postcode.html          | 2 +-
 app/views/payments/claims/patient-outside-age-range.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/payments/claims/invalid-postcode.html b/app/views/payments/claims/invalid-postcode.html
index 5a8e32a6..3f97ca87 100644
--- a/app/views/payments/claims/invalid-postcode.html
+++ b/app/views/payments/claims/invalid-postcode.html
@@ -8,7 +8,7 @@
 {# {% set resubmitPage = "N/A" %} #}
 {% set helpContent %}
 <h2 class="nhsuk-heading-m nhsuk-u-margin-top-9">What this means</h2>
-<p>According to NHSBSA, the patient's postcode is invalid. They therefore cannot accept the claim.</p>
+<p>According to NHSBSA, the patient's postcode is invalid. NHSBSA therefore cannot accept the claim.</p>
 <p>For more information, <a href="/payments/manage-your-service" rel="noreferrer noopener" target="_blank">contact NHSBSA - MYS (opens in new tab)</a>.</p>
 {% endset %}
 
diff --git a/app/views/payments/claims/patient-outside-age-range.html b/app/views/payments/claims/patient-outside-age-range.html
index 752d6c91..b29dce75 100644
--- a/app/views/payments/claims/patient-outside-age-range.html
+++ b/app/views/payments/claims/patient-outside-age-range.html
@@ -8,7 +8,7 @@
 {# {% set resubmitPage = "N/A" %} #}
 {% set helpContent %}
 <h2 class="nhsuk-heading-m nhsuk-u-margin-top-9">What this means</h2>
-<p>According to NHSBSA, the patient is not within the age range for the vaccine product given. They therefore cannot accept the claim.</p>
+<p>According to NHSBSA, the patient is not within the age range for the vaccine product given. NHSBSA therefore cannot accept the claim.</p>
 <p>For more information, <a href="/payments/manage-your-service" rel="noreferrer noopener" target="_blank">contact NHSBSA - MYS (opens in new tab)</a>.</p>
 {% endset %}
 

From c3f90acdd5a8137004378bf76103b1fbac1d23cd Mon Sep 17 00:00:00 2001
From: Benjy Stanton <2545065+benjystanton@users.noreply.github.com>
Date: Tue, 27 Oct 2026 16:59:13 +0000
Subject: [PATCH 2/2] Update content and change from payment to claims

---
 app/routes/prototype-admin.js                 |  6 +--
 app/views/{payments => claims}/index.html     | 28 ++++++-------
 .../issues}/_claim-template.html              |  2 +-
 .../claims => claims/issues}/adult-flu.html   | 12 +++---
 .../issues}/childhood-flu.html                | 12 +++---
 .../claims => claims/issues}/covid-19.html    | 12 +++---
 .../issues}/invalid-postcode.html             | 10 ++---
 .../issues}/out-of-season-flu.html            | 10 ++---
 .../issues}/patient-outside-age-range.html    | 10 ++---
 .../manage-your-service.html                  |  0
 .../records/_record-template.html             |  0
 .../records/adele-purple.html                 |  4 +-
 .../records/aisha-khan.html                   |  4 +-
 .../records/amira-ahmed.html                  |  4 +-
 .../records/chloe-williams.html               |  4 +-
 .../records/daniel-oconnor.html               |  4 +-
 .../records/ella-foster.html                  |  4 +-
 app/views/claims/records/elodie-shaw.html     | 19 +++++++++
 .../records/ethan-cooper.html                 |  4 +-
 .../records/fatima-hussain.html               |  4 +-
 .../records/grace-nguyen.html                 |  4 +-
 .../records/henry-walker.html                 |  4 +-
 app/views/claims/records/idris-ali.html       | 19 +++++++++
 .../records/james-wilson.html                 |  4 +-
 .../records/joshua-clarke.html                |  4 +-
 app/views/claims/records/kian-mahmood.html    | 19 +++++++++
 app/views/claims/records/layla-dawson.html    | 19 +++++++++
 .../records/lewis-morgan.html                 |  4 +-
 .../records/liam-carter.html                  |  4 +-
 .../records/mia-roberts.html                  |  4 +-
 app/views/claims/records/niamh-byrne.html     | 19 +++++++++
 .../records/noah-patel.html                   |  4 +-
 .../records/oliver-bennett.html               |  4 +-
 app/views/claims/records/poppy-jenkins.html   | 19 +++++++++
 .../records/priya-patel.html                  |  4 +-
 app/views/claims/records/reuben-walsh.html    | 19 +++++++++
 .../records/ruby-evans.html                   |  4 +-
 .../records/sophia-turner.html                |  4 +-
 app/views/claims/records/toby-fraser.html     | 19 +++++++++
 .../records/zoe-hughes.html                   |  4 +-
 .../resubmit/_resubmit-template.html          |  0
 .../resubmit/adult-flu.html                   | 10 ++---
 .../resubmit/childhood-flu.html               | 10 ++---
 .../resubmit/covid-19.html                    | 10 ++---
 .../_rejected-claims-table-adult-flu.html     | 20 ++++-----
 .../_rejected-claims-table-childhood-flu.html | 10 ++---
 .../_rejected-claims-table-covid-19.html      | 42 +++++++++----------
 ...jected-claims-table-out-of-season-flu.html | 32 +++++++-------
 ...laims-table-patient-outside-age-range.html |  2 +-
 .../_rejected-claims-table-postcode.html      |  6 +--
 .../includes/_preset-scenarios-table.html     |  6 +--
 app/views/includes/header.html                | 10 ++---
 app/views/record-vaccinations/patient.html    |  4 +-
 53 files changed, 326 insertions(+), 174 deletions(-)
 rename app/views/{payments => claims}/index.html (81%)
 rename app/views/{payments/claims => claims/issues}/_claim-template.html (94%)
 rename app/views/{payments/claims => claims/issues}/adult-flu.html (66%)
 rename app/views/{payments/claims => claims/issues}/childhood-flu.html (65%)
 rename app/views/{payments/claims => claims/issues}/covid-19.html (66%)
 rename app/views/{payments/claims => claims/issues}/invalid-postcode.html (61%)
 rename app/views/{payments/claims => claims/issues}/out-of-season-flu.html (66%)
 rename app/views/{payments/claims => claims/issues}/patient-outside-age-range.html (62%)
 rename app/views/{payments => claims}/manage-your-service.html (100%)
 rename app/views/{payments => claims}/records/_record-template.html (100%)
 rename app/views/{payments => claims}/records/adele-purple.html (82%)
 rename app/views/{payments => claims}/records/aisha-khan.html (82%)
 rename app/views/{payments => claims}/records/amira-ahmed.html (83%)
 rename app/views/{payments => claims}/records/chloe-williams.html (82%)
 rename app/views/{payments => claims}/records/daniel-oconnor.html (82%)
 rename app/views/{payments => claims}/records/ella-foster.html (82%)
 create mode 100644 app/views/claims/records/elodie-shaw.html
 rename app/views/{payments => claims}/records/ethan-cooper.html (82%)
 rename app/views/{payments => claims}/records/fatima-hussain.html (82%)
 rename app/views/{payments => claims}/records/grace-nguyen.html (82%)
 rename app/views/{payments => claims}/records/henry-walker.html (82%)
 create mode 100644 app/views/claims/records/idris-ali.html
 rename app/views/{payments => claims}/records/james-wilson.html (82%)
 rename app/views/{payments => claims}/records/joshua-clarke.html (82%)
 create mode 100644 app/views/claims/records/kian-mahmood.html
 create mode 100644 app/views/claims/records/layla-dawson.html
 rename app/views/{payments => claims}/records/lewis-morgan.html (82%)
 rename app/views/{payments => claims}/records/liam-carter.html (82%)
 rename app/views/{payments => claims}/records/mia-roberts.html (82%)
 create mode 100644 app/views/claims/records/niamh-byrne.html
 rename app/views/{payments => claims}/records/noah-patel.html (81%)
 rename app/views/{payments => claims}/records/oliver-bennett.html (82%)
 create mode 100644 app/views/claims/records/poppy-jenkins.html
 rename app/views/{payments => claims}/records/priya-patel.html (82%)
 create mode 100644 app/views/claims/records/reuben-walsh.html
 rename app/views/{payments => claims}/records/ruby-evans.html (81%)
 rename app/views/{payments => claims}/records/sophia-turner.html (82%)
 create mode 100644 app/views/claims/records/toby-fraser.html
 rename app/views/{payments => claims}/records/zoe-hughes.html (81%)
 rename app/views/{payments => claims}/resubmit/_resubmit-template.html (100%)
 rename app/views/{payments => claims}/resubmit/adult-flu.html (52%)
 rename app/views/{payments => claims}/resubmit/childhood-flu.html (51%)
 rename app/views/{payments => claims}/resubmit/covid-19.html (52%)
 rename app/views/{payments => claims}/tables/_rejected-claims-table-adult-flu.html (84%)
 rename app/views/{payments => claims}/tables/_rejected-claims-table-childhood-flu.html (86%)
 rename app/views/{payments => claims}/tables/_rejected-claims-table-covid-19.html (83%)
 rename app/views/{payments => claims}/tables/_rejected-claims-table-out-of-season-flu.html (80%)
 rename app/views/{payments => claims}/tables/_rejected-claims-table-patient-outside-age-range.html (89%)
 rename app/views/{payments => claims}/tables/_rejected-claims-table-postcode.html (83%)

diff --git a/app/routes/prototype-admin.js b/app/routes/prototype-admin.js
index bcd0ca76..72de9a77 100644
--- a/app/routes/prototype-admin.js
+++ b/app/routes/prototype-admin.js
@@ -581,15 +581,15 @@ module.exports = (router) => {
   })
 
   // ----------------------------------------------------------------
-  // Preset: Pharmacy Lead Admin with Payments and appointments (Tara Mills, FA424)
+  // Preset: Pharmacy Lead Admin with claims and appointments (Tara Mills, FA424)
   // ----------------------------------------------------------------
 
-  router.get('/prototype-setup/preset/pharmacy-lead-admin-payments', (req, res) => {
+  router.get('/prototype-setup/preset/pharmacy-lead-admin-claims', (req, res) => {
     resetSession(req)
     const data = req.session.data
     data.currentUserId = '7863542190631'
     data.currentOrganisationId = 'FA424'
-    data.showPaymentsLink = true
+    data.showClaimsLink = true
     setAppointmentsInterfaceForUserOrganisations(data, data.currentUserId, true)
     setupBatchesForOrg(data, 'FA424')
     addRandomUsers(data, 'FA424', 10)
diff --git a/app/views/payments/index.html b/app/views/claims/index.html
similarity index 81%
rename from app/views/payments/index.html
rename to app/views/claims/index.html
index ad418f8a..668c3bc3 100644
--- a/app/views/payments/index.html
+++ b/app/views/claims/index.html
@@ -1,10 +1,10 @@
 {% extends 'layout.html' %}
 
-{% set pageName = "Payments" %}
+{% set pageName = "Claims for payment" %}
 
-{% set canShowPayments = true %}
 
-{% set currentSection = "payments" %}
+
+{% set currentSection = "claims" %}
 
 {% block content %}
 
@@ -13,7 +13,7 @@
 
       <h1 class="nhsuk-heading-l">{{ pageName }}</h1>
 
-      <p class="nhsuk-u-margin-bottom-6">This shows claims that NHSBSA is rejecting. It only includes data for the current seasonal campaign.</p>
+      <p class="nhsuk-u-margin-bottom-6 nhsuk-u-reading-width">This page shows claims for national flu and COVID-19 vaccinations that NHSBSA is rejecting. It includes data for the past 6 months.</p>
 
       {% set paymentIssuesContent %}
 
@@ -42,7 +42,7 @@ <h1 class="nhsuk-heading-l">{{ pageName }}</h1>
                 text: "10"
               },
               {
-                html: "<a href='claims/adult-flu?status=rejected' class='nhsuk-u-margin-right-3'>View</a>"
+                html: "<a href='issues/adult-flu?status=rejected' class='nhsuk-u-margin-right-3'>View</a>"
               }
             ] if data.adultFluResubmitted != "true"
             ,
@@ -54,7 +54,7 @@ <h1 class="nhsuk-heading-l">{{ pageName }}</h1>
                 text: "4"
               },
               {
-                html: "<a href='claims/childhood-flu?status=rejected' class='nhsuk-u-margin-right-3'>View</a>"
+                html: "<a href='issues/childhood-flu?status=rejected' class='nhsuk-u-margin-right-3'>View</a>"
               }
             ] if data.childhoodFluResubmitted != "true"
             ,
@@ -66,7 +66,7 @@ <h1 class="nhsuk-heading-l">{{ pageName }}</h1>
                 text: "21"
               },
               {
-                html: "<a href='claims/covid-19?status=rejected' class='nhsuk-u-margin-right-3'>View</a>"
+                html: "<a href='issues/covid-19?status=rejected' class='nhsuk-u-margin-right-3'>View</a>"
               }
             ] if data.covid19Resubmitted != "true"
             ,
@@ -78,7 +78,7 @@ <h1 class="nhsuk-heading-l">{{ pageName }}</h1>
                 text: "8"
               },
               {
-                html: "<a href='claims/out-of-season-flu?status=rejected' class='nhsuk-u-margin-right-3'>View</a>"
+                html: "<a href='issues/out-of-season-flu?status=rejected' class='nhsuk-u-margin-right-3'>View</a>"
               }
             ]
             ,
@@ -90,7 +90,7 @@ <h1 class="nhsuk-heading-l">{{ pageName }}</h1>
                 text: "3"
               },
               {
-                html: "<a href='claims/invalid-postcode?status=rejected' class='nhsuk-u-margin-right-3'>View</a>"
+                html: "<a href='issues/invalid-postcode?status=rejected' class='nhsuk-u-margin-right-3'>View</a>"
               }
             ]
             ,
@@ -102,7 +102,7 @@ <h1 class="nhsuk-heading-l">{{ pageName }}</h1>
                 text: "1"
               },
               {
-                html: "<a href='claims/patient-outside-age-range?status=rejected' class='nhsuk-u-margin-right-3'>View</a>"
+                html: "<a href='issues/patient-outside-age-range?status=rejected' class='nhsuk-u-margin-right-3'>View</a>"
               }
             ]
           ]
@@ -139,7 +139,7 @@ <h1 class="nhsuk-heading-l">{{ pageName }}</h1>
                 text: "10"
               },
               {
-                html: "<a href='claims/adult-flu?status=resubmitting' class='nhsuk-u-margin-right-3'>View</a>"
+                html: "<a href='issues/adult-flu?status=resubmitting' class='nhsuk-u-margin-right-3'>View</a>"
               }
             ] if data.adultFluResubmitted == "true"
             ,
@@ -151,7 +151,7 @@ <h1 class="nhsuk-heading-l">{{ pageName }}</h1>
                 text: "4"
               },
               {
-                html: "<a href='claims/childhood-flu?status=resubmitted' class='nhsuk-u-margin-right-3'>View</a>"
+                html: "<a href='issues/childhood-flu?status=resubmitted' class='nhsuk-u-margin-right-3'>View</a>"
               }
             ] if data.childhoodFluResubmitted == "true"
             ,
@@ -163,7 +163,7 @@ <h1 class="nhsuk-heading-l">{{ pageName }}</h1>
                 text: "21"
               },
               {
-                html: "<a href='claims/covid-19?status=resubmitted' class='nhsuk-u-margin-right-3'>View</a>"
+                html: "<a href='issues/covid-19?status=resubmitted' class='nhsuk-u-margin-right-3'>View</a>"
               }
             ] if data.covid19Resubmitted == "true"
           ]
@@ -190,7 +190,7 @@ <h1 class="nhsuk-heading-l">{{ pageName }}</h1>
             ]
           }) }}
 
-          <p>There may be other reasons a claim gets rejected by NHSBSA. Only the most common reasons are listed here.</p>
+          <p class="nhsuk-u-reading-width">There may be other reasons a claim gets rejected by NHSBSA. Only the most common reasons are listed here.</p>
 
     </div>
   </div>
diff --git a/app/views/payments/claims/_claim-template.html b/app/views/claims/issues/_claim-template.html
similarity index 94%
rename from app/views/payments/claims/_claim-template.html
rename to app/views/claims/issues/_claim-template.html
index 9e5bfdac..0bc8eb7b 100644
--- a/app/views/payments/claims/_claim-template.html
+++ b/app/views/claims/issues/_claim-template.html
@@ -13,7 +13,7 @@ <h1 class="nhsuk-heading-l">{{ pageName }}</h1>
       <div class="nhsuk-button-group">
         {{ button({
               text: "Register on MYS (opens in new tab)",
-              href: "/payments/manage-your-service",
+              href: "/claims/manage-your-service",
               attributes: {
                 rel: "noreferrer noopener",
                 target: "_blank"
diff --git a/app/views/payments/claims/adult-flu.html b/app/views/claims/issues/adult-flu.html
similarity index 66%
rename from app/views/payments/claims/adult-flu.html
rename to app/views/claims/issues/adult-flu.html
index 51d0bd87..634f4411 100644
--- a/app/views/payments/claims/adult-flu.html
+++ b/app/views/claims/issues/adult-flu.html
@@ -1,15 +1,15 @@
 {% extends 'layout.html' %}
-{% set canShowPayments = true %}
-{% set currentSection = "payments" %}
+
+{% set currentSection = "claims" %}
 
 {# Update these for each page #}
 {% set mysService = "adult flu vaccinations" %}
 {% set pageName = "Not registered for " + mysService %}
-{% set resubmitPage = "/payments/resubmit/adult-flu" %}
+{% set resubmitPage = "/claims/resubmit/adult-flu" %}
 {% set helpContent %}
 <h2 class="nhsuk-heading-m nhsuk-u-margin-top-9">How to fix this</h2>
 <p>According to NHSBSA, this pharmacy is not registered for the {{ mysService }} service on the MYS portal.</p>
-<p>You need to register on MYS as soon as possible and then return to the payments dashboard to resubmit your claims.</p>
+<p>You need to register on MYS as soon as possible and then return to the claims dashboard to resubmit your claims.</p>
 {% endset %}
 
 {% block beforeContent %}
@@ -20,6 +20,6 @@ <h2 class="nhsuk-heading-m nhsuk-u-margin-top-9">How to fix this</h2>
 {% endblock %}
 
 {% block content %}
-  {% include "payments/claims/_claim-template.html" %}
-  {% include "payments/tables/_rejected-claims-table-adult-flu.html" %}
+  {% include "claims/issues/_claim-template.html" %}
+  {% include "claims/tables/_rejected-claims-table-adult-flu.html" %}
 {% endblock %}
\ No newline at end of file
diff --git a/app/views/payments/claims/childhood-flu.html b/app/views/claims/issues/childhood-flu.html
similarity index 65%
rename from app/views/payments/claims/childhood-flu.html
rename to app/views/claims/issues/childhood-flu.html
index e66f12d8..db2cd3d6 100644
--- a/app/views/payments/claims/childhood-flu.html
+++ b/app/views/claims/issues/childhood-flu.html
@@ -1,15 +1,15 @@
 {% extends 'layout.html' %}
-{% set canShowPayments = true %}
-{% set currentSection = "payments" %}
+
+{% set currentSection = "claims" %}
 
 {# Update these for each page #}
 {% set mysService = "childhood flu vaccinations" %}
 {% set pageName = "Not registered for " + mysService %}
-{% set resubmitPage = "/payments/resubmit/childhood-flu" %}
+{% set resubmitPage = "/claims/resubmit/childhood-flu" %}
 {% set helpContent %}
 <h2 class="nhsuk-heading-m nhsuk-u-margin-top-9">How to fix this</h2>
 <p>According to NHSBSA, this pharmacy is not registered for the {{ mysService }} service on the MYS portal.</p>
-<p>You need to register on MYS as soon as possible and then return to the payments dashboard to resubmit your claims.</p>
+<p>You need to register on MYS as soon as possible and then return to the claims dashboard to resubmit your claims.</p>
 {% endset %}
 
 {% block beforeContent %}
@@ -20,6 +20,6 @@ <h2 class="nhsuk-heading-m nhsuk-u-margin-top-9">How to fix this</h2>
 {% endblock %}
 
 {% block content %}
-  {% include "payments/claims/_claim-template.html" %}
-  {% include "payments/tables/_rejected-claims-table-childhood-flu.html" %}
+  {% include "claims/issues/_claim-template.html" %}
+  {% include "claims/tables/_rejected-claims-table-childhood-flu.html" %}
 {% endblock %}
\ No newline at end of file
diff --git a/app/views/payments/claims/covid-19.html b/app/views/claims/issues/covid-19.html
similarity index 66%
rename from app/views/payments/claims/covid-19.html
rename to app/views/claims/issues/covid-19.html
index 427423fe..4c020a26 100644
--- a/app/views/payments/claims/covid-19.html
+++ b/app/views/claims/issues/covid-19.html
@@ -1,15 +1,15 @@
 {% extends 'layout.html' %}
-{% set canShowPayments = true %}
-{% set currentSection = "payments" %}
+
+{% set currentSection = "claims" %}
 
 {# Update these for each page #}
 {% set mysService = "COVID-19 vaccinations" %}
 {% set pageName = "Not registered for " + mysService %}
-{% set resubmitPage = "/payments/resubmit/covid-19" %}
+{% set resubmitPage = "/claims/resubmit/covid-19" %}
 {% set helpContent %}
 <h2 class="nhsuk-heading-m nhsuk-u-margin-top-9">How to fix this</h2>
 <p>According to NHSBSA, this pharmacy is not registered for the {{ mysService }} service on the MYS portal.</p>
-<p>You need to register on MYS as soon as possible and then return to the payments dashboard to resubmit your claims.</p>
+<p>You need to register on MYS as soon as possible and then return to the claims dashboard to resubmit your claims.</p>
 {% endset %}
 
 {% block beforeContent %}
@@ -20,6 +20,6 @@ <h2 class="nhsuk-heading-m nhsuk-u-margin-top-9">How to fix this</h2>
 {% endblock %}
 
 {% block content %}
-  {% include "payments/claims/_claim-template.html" %}
-  {% include "payments/tables/_rejected-claims-table-covid-19.html" %}
+  {% include "claims/issues/_claim-template.html" %}
+  {% include "claims/tables/_rejected-claims-table-covid-19.html" %}
 {% endblock %}
\ No newline at end of file
diff --git a/app/views/payments/claims/invalid-postcode.html b/app/views/claims/issues/invalid-postcode.html
similarity index 61%
rename from app/views/payments/claims/invalid-postcode.html
rename to app/views/claims/issues/invalid-postcode.html
index 3f97ca87..8edd3bd2 100644
--- a/app/views/payments/claims/invalid-postcode.html
+++ b/app/views/claims/issues/invalid-postcode.html
@@ -1,6 +1,6 @@
 {% extends 'layout.html' %}
-{% set canShowPayments = true %}
-{% set currentSection = "payments" %}
+
+{% set currentSection = "claims" %}
 
 {# Update these for each page #}
 {# {% set mysService = "N/A" %} #}
@@ -9,7 +9,7 @@
 {% set helpContent %}
 <h2 class="nhsuk-heading-m nhsuk-u-margin-top-9">What this means</h2>
 <p>According to NHSBSA, the patient's postcode is invalid. NHSBSA therefore cannot accept the claim.</p>
-<p>For more information, <a href="/payments/manage-your-service" rel="noreferrer noopener" target="_blank">contact NHSBSA - MYS (opens in new tab)</a>.</p>
+<p>For more information, <a href="/claims/manage-your-service" rel="noreferrer noopener" target="_blank">contact NHSBSA - MYS (opens in new tab)</a>.</p>
 {% endset %}
 
 {% block beforeContent %}
@@ -20,6 +20,6 @@ <h2 class="nhsuk-heading-m nhsuk-u-margin-top-9">What this means</h2>
 {% endblock %}
 
 {% block content %}
-  {% include "payments/claims/_claim-template.html" %}
-  {% include "payments/tables/_rejected-claims-table-postcode.html" %}
+  {% include "claims/issues/_claim-template.html" %}
+  {% include "claims/tables/_rejected-claims-table-postcode.html" %}
 {% endblock %}
\ No newline at end of file
diff --git a/app/views/payments/claims/out-of-season-flu.html b/app/views/claims/issues/out-of-season-flu.html
similarity index 66%
rename from app/views/payments/claims/out-of-season-flu.html
rename to app/views/claims/issues/out-of-season-flu.html
index 0f8f8556..4f436a40 100644
--- a/app/views/payments/claims/out-of-season-flu.html
+++ b/app/views/claims/issues/out-of-season-flu.html
@@ -1,6 +1,6 @@
 {% extends 'layout.html' %}
-{% set canShowPayments = true %}
-{% set currentSection = "payments" %}
+
+{% set currentSection = "claims" %}
 
 {# Update these for each page #}
 {# {% set mysService = "N/A" %} #}
@@ -10,7 +10,7 @@
 <h2 class="nhsuk-heading-m nhsuk-u-margin-top-9">What this means</h2>
 <p>NHSBSA does not accept claims for flu vaccinations given outside the dates of the seasonal vaccination programme.</p>
 <p>If a mistake was made when recording the date the vaccination was given, you can delete the record and create a new record.</p>
-<p>For more information, <a href="/payments/manage-your-service" rel="noreferrer noopener" target="_blank">contact NHSBSA - MYS (opens in new tab)</a>.</p>
+<p>For more information, <a href="/claims/manage-your-service" rel="noreferrer noopener" target="_blank">contact NHSBSA - MYS (opens in new tab)</a>.</p>
 {% endset %}
 
 {% block beforeContent %}
@@ -21,6 +21,6 @@ <h2 class="nhsuk-heading-m nhsuk-u-margin-top-9">What this means</h2>
 {% endblock %}
 
 {% block content %}
-  {% include "payments/claims/_claim-template.html" %}
-  {% include "payments/tables/_rejected-claims-table-out-of-season-flu.html" %}
+  {% include "claims/issues/_claim-template.html" %}
+  {% include "claims/tables/_rejected-claims-table-out-of-season-flu.html" %}
 {% endblock %}
\ No newline at end of file
diff --git a/app/views/payments/claims/patient-outside-age-range.html b/app/views/claims/issues/patient-outside-age-range.html
similarity index 62%
rename from app/views/payments/claims/patient-outside-age-range.html
rename to app/views/claims/issues/patient-outside-age-range.html
index b29dce75..ea79a35b 100644
--- a/app/views/payments/claims/patient-outside-age-range.html
+++ b/app/views/claims/issues/patient-outside-age-range.html
@@ -1,6 +1,6 @@
 {% extends 'layout.html' %}
-{% set canShowPayments = true %}
-{% set currentSection = "payments" %}
+
+{% set currentSection = "claims" %}
 
 {# Update these for each page #}
 {# {% set mysService = "N/A" %} #}
@@ -9,7 +9,7 @@
 {% set helpContent %}
 <h2 class="nhsuk-heading-m nhsuk-u-margin-top-9">What this means</h2>
 <p>According to NHSBSA, the patient is not within the age range for the vaccine product given. NHSBSA therefore cannot accept the claim.</p>
-<p>For more information, <a href="/payments/manage-your-service" rel="noreferrer noopener" target="_blank">contact NHSBSA - MYS (opens in new tab)</a>.</p>
+<p>For more information, <a href="/claims/manage-your-service" rel="noreferrer noopener" target="_blank">contact NHSBSA - MYS (opens in new tab)</a>.</p>
 {% endset %}
 
 {% block beforeContent %}
@@ -20,6 +20,6 @@ <h2 class="nhsuk-heading-m nhsuk-u-margin-top-9">What this means</h2>
 {% endblock %}
 
 {% block content %}
-  {% include "payments/claims/_claim-template.html" %}
-  {% include "payments/tables/_rejected-claims-table-patient-outside-age-range.html" %}
+  {% include "claims/issues/_claim-template.html" %}
+  {% include "claims/tables/_rejected-claims-table-patient-outside-age-range.html" %}
 {% endblock %}
\ No newline at end of file
diff --git a/app/views/payments/manage-your-service.html b/app/views/claims/manage-your-service.html
similarity index 100%
rename from app/views/payments/manage-your-service.html
rename to app/views/claims/manage-your-service.html
diff --git a/app/views/payments/records/_record-template.html b/app/views/claims/records/_record-template.html
similarity index 100%
rename from app/views/payments/records/_record-template.html
rename to app/views/claims/records/_record-template.html
diff --git a/app/views/payments/records/adele-purple.html b/app/views/claims/records/adele-purple.html
similarity index 82%
rename from app/views/payments/records/adele-purple.html
rename to app/views/claims/records/adele-purple.html
index d4dbf1d8..d237b15e 100644
--- a/app/views/payments/records/adele-purple.html
+++ b/app/views/claims/records/adele-purple.html
@@ -2,7 +2,7 @@
 
 {% set pageName = "Adele Purple’s flu vaccination record" %}
 {% set currentSection = "records" %}
-{% set canShowPayments = true %}
+
 {% set patientName = "Adele Purple" %}
 {% set nhsNumber = "9951742954" %}
 {% set vaccinationDate = "21 October 2026" %}
@@ -15,5 +15,5 @@
 {% endblock %}
 
 {% block content %}
-  {% include "payments/records/_record-template.html" %}
+  {% include "claims/records/_record-template.html" %}
 {% endblock %}
diff --git a/app/views/payments/records/aisha-khan.html b/app/views/claims/records/aisha-khan.html
similarity index 82%
rename from app/views/payments/records/aisha-khan.html
rename to app/views/claims/records/aisha-khan.html
index 5a105ada..b381db85 100644
--- a/app/views/payments/records/aisha-khan.html
+++ b/app/views/claims/records/aisha-khan.html
@@ -2,7 +2,7 @@
 
 {% set pageName = "Aisha Khan’s flu vaccination record" %}
 {% set currentSection = "records" %}
-{% set canShowPayments = true %}
+
 {% set patientName = "Aisha Khan" %}
 {% set nhsNumber = "9128473650" %}
 {% set vaccinationDate = "20 October 2026" %}
@@ -15,5 +15,5 @@
 {% endblock %}
 
 {% block content %}
-  {% include "payments/records/_record-template.html" %}
+  {% include "claims/records/_record-template.html" %}
 {% endblock %}
diff --git a/app/views/payments/records/amira-ahmed.html b/app/views/claims/records/amira-ahmed.html
similarity index 83%
rename from app/views/payments/records/amira-ahmed.html
rename to app/views/claims/records/amira-ahmed.html
index 89f62e5d..1ca91afe 100644
--- a/app/views/payments/records/amira-ahmed.html
+++ b/app/views/claims/records/amira-ahmed.html
@@ -2,7 +2,7 @@
 
 {% set pageName = "Amira Ahmed’s flu vaccination record" %}
 {% set currentSection = "records" %}
-{% set canShowPayments = true %}
+
 {% set patientName = "Amira Ahmed" %}
 {% set nhsNumber = "9064821735" %}
 {% set vaccinationDate = "14 October 2026" %}
@@ -17,5 +17,5 @@
 {% endblock %}
 
 {% block content %}
-  {% include "payments/records/_record-template.html" %}
+  {% include "claims/records/_record-template.html" %}
 {% endblock %}
diff --git a/app/views/payments/records/chloe-williams.html b/app/views/claims/records/chloe-williams.html
similarity index 82%
rename from app/views/payments/records/chloe-williams.html
rename to app/views/claims/records/chloe-williams.html
index cce4f05d..27b1c7ba 100644
--- a/app/views/payments/records/chloe-williams.html
+++ b/app/views/claims/records/chloe-williams.html
@@ -2,7 +2,7 @@
 
 {% set pageName = "Chloe Williams’s flu vaccination record" %}
 {% set currentSection = "records" %}
-{% set canShowPayments = true %}
+
 {% set patientName = "Chloe Williams" %}
 {% set nhsNumber = "9726413508" %}
 {% set vaccinationDate = "12 October 2026" %}
@@ -15,5 +15,5 @@
 {% endblock %}
 
 {% block content %}
-  {% include "payments/records/_record-template.html" %}
+  {% include "claims/records/_record-template.html" %}
 {% endblock %}
diff --git a/app/views/payments/records/daniel-oconnor.html b/app/views/claims/records/daniel-oconnor.html
similarity index 82%
rename from app/views/payments/records/daniel-oconnor.html
rename to app/views/claims/records/daniel-oconnor.html
index 824256fd..edacccf4 100644
--- a/app/views/payments/records/daniel-oconnor.html
+++ b/app/views/claims/records/daniel-oconnor.html
@@ -2,7 +2,7 @@
 
 {% set pageName = "Daniel O’Connor’s flu vaccination record" %}
 {% set currentSection = "records" %}
-{% set canShowPayments = true %}
+
 {% set patientName = "Daniel O’Connor" %}
 {% set nhsNumber = "9347162085" %}
 {% set vaccinationDate = "19 October 2026" %}
@@ -15,5 +15,5 @@
 {% endblock %}
 
 {% block content %}
-  {% include "payments/records/_record-template.html" %}
+  {% include "claims/records/_record-template.html" %}
 {% endblock %}
diff --git a/app/views/payments/records/ella-foster.html b/app/views/claims/records/ella-foster.html
similarity index 82%
rename from app/views/payments/records/ella-foster.html
rename to app/views/claims/records/ella-foster.html
index b08738ec..fe3bdf18 100644
--- a/app/views/payments/records/ella-foster.html
+++ b/app/views/claims/records/ella-foster.html
@@ -2,7 +2,7 @@
 
 {% set pageName = "Ella Foster’s flu vaccination record" %}
 {% set currentSection = "records" %}
-{% set canShowPayments = true %}
+
 {% set patientName = "Ella Foster" %}
 {% set nhsNumber = "9745120368" %}
 {% set vaccinationDate = "11 October 2026" %}
@@ -15,5 +15,5 @@
 {% endblock %}
 
 {% block content %}
-  {% include "payments/records/_record-template.html" %}
+  {% include "claims/records/_record-template.html" %}
 {% endblock %}
diff --git a/app/views/claims/records/elodie-shaw.html b/app/views/claims/records/elodie-shaw.html
new file mode 100644
index 00000000..5b565e58
--- /dev/null
+++ b/app/views/claims/records/elodie-shaw.html
@@ -0,0 +1,19 @@
+{% extends 'layout.html' %}
+
+{% set pageName = "Elodie Shaw’s flu vaccination record" %}
+{% set currentSection = "records" %}
+
+{% set patientName = "Elodie Shaw" %}
+{% set nhsNumber = "9951742954" %}
+{% set vaccinationDate = "21 August 2026" %}
+
+{% block beforeContent %}
+  {{ backLink({
+    href: "javascript:window.history.back()",
+    text: "Back"
+  }) }}
+{% endblock %}
+
+{% block content %}
+  {% include "claims/records/_record-template.html" %}
+{% endblock %}
diff --git a/app/views/payments/records/ethan-cooper.html b/app/views/claims/records/ethan-cooper.html
similarity index 82%
rename from app/views/payments/records/ethan-cooper.html
rename to app/views/claims/records/ethan-cooper.html
index e34aac0a..a8690b8c 100644
--- a/app/views/payments/records/ethan-cooper.html
+++ b/app/views/claims/records/ethan-cooper.html
@@ -2,7 +2,7 @@
 
 {% set pageName = "Ethan Cooper’s flu vaccination record" %}
 {% set currentSection = "records" %}
-{% set canShowPayments = true %}
+
 {% set patientName = "Ethan Cooper" %}
 {% set nhsNumber = "9456021378" %}
 {% set vaccinationDate = "2 October 2026" %}
@@ -15,5 +15,5 @@
 {% endblock %}
 
 {% block content %}
-  {% include "payments/records/_record-template.html" %}
+  {% include "claims/records/_record-template.html" %}
 {% endblock %}
diff --git a/app/views/payments/records/fatima-hussain.html b/app/views/claims/records/fatima-hussain.html
similarity index 82%
rename from app/views/payments/records/fatima-hussain.html
rename to app/views/claims/records/fatima-hussain.html
index d96b4a3d..5ea7dc89 100644
--- a/app/views/payments/records/fatima-hussain.html
+++ b/app/views/claims/records/fatima-hussain.html
@@ -2,7 +2,7 @@
 
 {% set pageName = "Fatima Hussain’s flu vaccination record" %}
 {% set currentSection = "records" %}
-{% set canShowPayments = true %}
+
 {% set patientName = "Fatima Hussain" %}
 {% set nhsNumber = "9516248037" %}
 {% set vaccinationDate = "16 October 2026" %}
@@ -15,5 +15,5 @@
 {% endblock %}
 
 {% block content %}
-  {% include "payments/records/_record-template.html" %}
+  {% include "claims/records/_record-template.html" %}
 {% endblock %}
diff --git a/app/views/payments/records/grace-nguyen.html b/app/views/claims/records/grace-nguyen.html
similarity index 82%
rename from app/views/payments/records/grace-nguyen.html
rename to app/views/claims/records/grace-nguyen.html
index c7418279..9c72865d 100644
--- a/app/views/payments/records/grace-nguyen.html
+++ b/app/views/claims/records/grace-nguyen.html
@@ -2,7 +2,7 @@
 
 {% set pageName = "Grace Nguyen’s flu vaccination record" %}
 {% set currentSection = "records" %}
-{% set canShowPayments = true %}
+
 {% set patientName = "Grace Nguyen" %}
 {% set nhsNumber = "9658240137" %}
 {% set vaccinationDate = "7 October 2026" %}
@@ -15,5 +15,5 @@
 {% endblock %}
 
 {% block content %}
-  {% include "payments/records/_record-template.html" %}
+  {% include "claims/records/_record-template.html" %}
 {% endblock %}
diff --git a/app/views/payments/records/henry-walker.html b/app/views/claims/records/henry-walker.html
similarity index 82%
rename from app/views/payments/records/henry-walker.html
rename to app/views/claims/records/henry-walker.html
index b4208619..b539603e 100644
--- a/app/views/payments/records/henry-walker.html
+++ b/app/views/claims/records/henry-walker.html
@@ -2,7 +2,7 @@
 
 {% set pageName = "Henry Walker’s flu vaccination record" %}
 {% set currentSection = "records" %}
-{% set canShowPayments = true %}
+
 {% set patientName = "Henry Walker" %}
 {% set nhsNumber = "9418276503" %}
 {% set vaccinationDate = "4 October 2026" %}
@@ -15,5 +15,5 @@
 {% endblock %}
 
 {% block content %}
-  {% include "payments/records/_record-template.html" %}
+  {% include "claims/records/_record-template.html" %}
 {% endblock %}
diff --git a/app/views/claims/records/idris-ali.html b/app/views/claims/records/idris-ali.html
new file mode 100644
index 00000000..db836235
--- /dev/null
+++ b/app/views/claims/records/idris-ali.html
@@ -0,0 +1,19 @@
+{% extends 'layout.html' %}
+
+{% set pageName = "Idris Ali’s flu vaccination record" %}
+{% set currentSection = "records" %}
+
+{% set patientName = "Idris Ali" %}
+{% set nhsNumber = "9128473650" %}
+{% set vaccinationDate = "20 August 2026" %}
+
+{% block beforeContent %}
+  {{ backLink({
+    href: "javascript:window.history.back()",
+    text: "Back"
+  }) }}
+{% endblock %}
+
+{% block content %}
+  {% include "claims/records/_record-template.html" %}
+{% endblock %}
diff --git a/app/views/payments/records/james-wilson.html b/app/views/claims/records/james-wilson.html
similarity index 82%
rename from app/views/payments/records/james-wilson.html
rename to app/views/claims/records/james-wilson.html
index 57d5949c..c539292e 100644
--- a/app/views/payments/records/james-wilson.html
+++ b/app/views/claims/records/james-wilson.html
@@ -2,7 +2,7 @@
 
 {% set pageName = "James Wilson’s flu vaccination record" %}
 {% set currentSection = "records" %}
-{% set canShowPayments = true %}
+
 {% set patientName = "James Wilson" %}
 {% set nhsNumber = "No data" %}
 {% set vaccinationDate = "17 October 2026" %}
@@ -15,5 +15,5 @@
 {% endblock %}
 
 {% block content %}
-  {% include "payments/records/_record-template.html" %}
+  {% include "claims/records/_record-template.html" %}
 {% endblock %}
diff --git a/app/views/payments/records/joshua-clarke.html b/app/views/claims/records/joshua-clarke.html
similarity index 82%
rename from app/views/payments/records/joshua-clarke.html
rename to app/views/claims/records/joshua-clarke.html
index e0a3aefe..28671b5d 100644
--- a/app/views/payments/records/joshua-clarke.html
+++ b/app/views/claims/records/joshua-clarke.html
@@ -2,7 +2,7 @@
 
 {% set pageName = "Joshua Clarke’s flu vaccination record" %}
 {% set currentSection = "records" %}
-{% set canShowPayments = true %}
+
 {% set patientName = "Joshua Clarke" %}
 {% set nhsNumber = "9873150426" %}
 {% set vaccinationDate = "15 October 2026" %}
@@ -15,5 +15,5 @@
 {% endblock %}
 
 {% block content %}
-  {% include "payments/records/_record-template.html" %}
+  {% include "claims/records/_record-template.html" %}
 {% endblock %}
diff --git a/app/views/claims/records/kian-mahmood.html b/app/views/claims/records/kian-mahmood.html
new file mode 100644
index 00000000..0e4eab7c
--- /dev/null
+++ b/app/views/claims/records/kian-mahmood.html
@@ -0,0 +1,19 @@
+{% extends 'layout.html' %}
+
+{% set pageName = "Kian Mahmood’s flu vaccination record" %}
+{% set currentSection = "records" %}
+
+{% set patientName = "Kian Mahmood" %}
+{% set nhsNumber = "9064821735" %}
+{% set vaccinationDate = "14 August 2026" %}
+
+{% block beforeContent %}
+  {{ backLink({
+    href: "javascript:window.history.back()",
+    text: "Back"
+  }) }}
+{% endblock %}
+
+{% block content %}
+  {% include "claims/records/_record-template.html" %}
+{% endblock %}
diff --git a/app/views/claims/records/layla-dawson.html b/app/views/claims/records/layla-dawson.html
new file mode 100644
index 00000000..5c650a05
--- /dev/null
+++ b/app/views/claims/records/layla-dawson.html
@@ -0,0 +1,19 @@
+{% extends 'layout.html' %}
+
+{% set pageName = "Layla Dawson’s flu vaccination record" %}
+{% set currentSection = "records" %}
+
+{% set patientName = "Layla Dawson" %}
+{% set nhsNumber = "" %}
+{% set vaccinationDate = "17 August 2026" %}
+
+{% block beforeContent %}
+  {{ backLink({
+    href: "javascript:window.history.back()",
+    text: "Back"
+  }) }}
+{% endblock %}
+
+{% block content %}
+  {% include "claims/records/_record-template.html" %}
+{% endblock %}
diff --git a/app/views/payments/records/lewis-morgan.html b/app/views/claims/records/lewis-morgan.html
similarity index 82%
rename from app/views/payments/records/lewis-morgan.html
rename to app/views/claims/records/lewis-morgan.html
index 5b21ab61..caac0101 100644
--- a/app/views/payments/records/lewis-morgan.html
+++ b/app/views/claims/records/lewis-morgan.html
@@ -2,7 +2,7 @@
 
 {% set pageName = "Lewis Morgan’s flu vaccination record" %}
 {% set currentSection = "records" %}
-{% set canShowPayments = true %}
+
 {% set patientName = "Lewis Morgan" %}
 {% set nhsNumber = "9450718263" %}
 {% set vaccinationDate = "13 October 2026" %}
@@ -15,5 +15,5 @@
 {% endblock %}
 
 {% block content %}
-  {% include "payments/records/_record-template.html" %}
+  {% include "claims/records/_record-template.html" %}
 {% endblock %}
diff --git a/app/views/payments/records/liam-carter.html b/app/views/claims/records/liam-carter.html
similarity index 82%
rename from app/views/payments/records/liam-carter.html
rename to app/views/claims/records/liam-carter.html
index e9be75a9..e6e2df19 100644
--- a/app/views/payments/records/liam-carter.html
+++ b/app/views/claims/records/liam-carter.html
@@ -2,7 +2,7 @@
 
 {% set pageName = "Liam Carter’s flu vaccination record" %}
 {% set currentSection = "records" %}
-{% set canShowPayments = true %}
+
 {% set patientName = "Liam Carter" %}
 {% set nhsNumber = "9374051286" %}
 {% set vaccinationDate = "8 October 2026" %}
@@ -15,5 +15,5 @@
 {% endblock %}
 
 {% block content %}
-  {% include "payments/records/_record-template.html" %}
+  {% include "claims/records/_record-template.html" %}
 {% endblock %}
diff --git a/app/views/payments/records/mia-roberts.html b/app/views/claims/records/mia-roberts.html
similarity index 82%
rename from app/views/payments/records/mia-roberts.html
rename to app/views/claims/records/mia-roberts.html
index 7b6c1cf9..13faa0d7 100644
--- a/app/views/payments/records/mia-roberts.html
+++ b/app/views/claims/records/mia-roberts.html
@@ -2,7 +2,7 @@
 
 {% set pageName = "Mia Roberts’s flu vaccination record" %}
 {% set currentSection = "records" %}
-{% set canShowPayments = true %}
+
 {% set patientName = "Mia Roberts" %}
 {% set nhsNumber = "9765031842" %}
 {% set vaccinationDate = "5 October 2026" %}
@@ -15,5 +15,5 @@
 {% endblock %}
 
 {% block content %}
-  {% include "payments/records/_record-template.html" %}
+  {% include "claims/records/_record-template.html" %}
 {% endblock %}
diff --git a/app/views/claims/records/niamh-byrne.html b/app/views/claims/records/niamh-byrne.html
new file mode 100644
index 00000000..fa865ade
--- /dev/null
+++ b/app/views/claims/records/niamh-byrne.html
@@ -0,0 +1,19 @@
+{% extends 'layout.html' %}
+
+{% set pageName = "Niamh Byrne’s flu vaccination record" %}
+{% set currentSection = "records" %}
+
+{% set patientName = "Niamh Byrne" %}
+{% set nhsNumber = "9873150426" %}
+{% set vaccinationDate = "15 August 2026" %}
+
+{% block beforeContent %}
+  {{ backLink({
+    href: "javascript:window.history.back()",
+    text: "Back"
+  }) }}
+{% endblock %}
+
+{% block content %}
+  {% include "claims/records/_record-template.html" %}
+{% endblock %}
diff --git a/app/views/payments/records/noah-patel.html b/app/views/claims/records/noah-patel.html
similarity index 81%
rename from app/views/payments/records/noah-patel.html
rename to app/views/claims/records/noah-patel.html
index 0f11f517..11f56491 100644
--- a/app/views/payments/records/noah-patel.html
+++ b/app/views/claims/records/noah-patel.html
@@ -2,7 +2,7 @@
 
 {% set pageName = "Noah Patel’s flu vaccination record" %}
 {% set currentSection = "records" %}
-{% set canShowPayments = true %}
+
 {% set patientName = "Noah Patel" %}
 {% set nhsNumber = "9207314685" %}
 {% set vaccinationDate = "6 October 2026" %}
@@ -15,5 +15,5 @@
 {% endblock %}
 
 {% block content %}
-  {% include "payments/records/_record-template.html" %}
+  {% include "claims/records/_record-template.html" %}
 {% endblock %}
diff --git a/app/views/payments/records/oliver-bennett.html b/app/views/claims/records/oliver-bennett.html
similarity index 82%
rename from app/views/payments/records/oliver-bennett.html
rename to app/views/claims/records/oliver-bennett.html
index 686fa5b0..91e4f233 100644
--- a/app/views/payments/records/oliver-bennett.html
+++ b/app/views/claims/records/oliver-bennett.html
@@ -2,7 +2,7 @@
 
 {% set pageName = "Oliver Bennett’s flu vaccination record" %}
 {% set currentSection = "records" %}
-{% set canShowPayments = true %}
+
 {% set patientName = "Oliver Bennett" %}
 {% set nhsNumber = "9018357642" %}
 {% set vaccinationDate = "10 October 2026" %}
@@ -15,5 +15,5 @@
 {% endblock %}
 
 {% block content %}
-  {% include "payments/records/_record-template.html" %}
+  {% include "claims/records/_record-template.html" %}
 {% endblock %}
diff --git a/app/views/claims/records/poppy-jenkins.html b/app/views/claims/records/poppy-jenkins.html
new file mode 100644
index 00000000..c7d51563
--- /dev/null
+++ b/app/views/claims/records/poppy-jenkins.html
@@ -0,0 +1,19 @@
+{% extends 'layout.html' %}
+
+{% set pageName = "Poppy Jenkins’s flu vaccination record" %}
+{% set currentSection = "records" %}
+
+{% set patientName = "Poppy Jenkins" %}
+{% set nhsNumber = "9347162085" %}
+{% set vaccinationDate = "19 August 2026" %}
+
+{% block beforeContent %}
+  {{ backLink({
+    href: "javascript:window.history.back()",
+    text: "Back"
+  }) }}
+{% endblock %}
+
+{% block content %}
+  {% include "claims/records/_record-template.html" %}
+{% endblock %}
diff --git a/app/views/payments/records/priya-patel.html b/app/views/claims/records/priya-patel.html
similarity index 82%
rename from app/views/payments/records/priya-patel.html
rename to app/views/claims/records/priya-patel.html
index 30dab7de..8842d76d 100644
--- a/app/views/payments/records/priya-patel.html
+++ b/app/views/claims/records/priya-patel.html
@@ -2,7 +2,7 @@
 
 {% set pageName = "Priya Patel’s flu vaccination record" %}
 {% set currentSection = "records" %}
-{% set canShowPayments = true %}
+
 {% set patientName = "Priya Patel" %}
 {% set nhsNumber = "9682037415" %}
 {% set vaccinationDate = "18 October 2026" %}
@@ -15,5 +15,5 @@
 {% endblock %}
 
 {% block content %}
-  {% include "payments/records/_record-template.html" %}
+  {% include "claims/records/_record-template.html" %}
 {% endblock %}
diff --git a/app/views/claims/records/reuben-walsh.html b/app/views/claims/records/reuben-walsh.html
new file mode 100644
index 00000000..2ab521ce
--- /dev/null
+++ b/app/views/claims/records/reuben-walsh.html
@@ -0,0 +1,19 @@
+{% extends 'layout.html' %}
+
+{% set pageName = "Reuben Walsh’s flu vaccination record" %}
+{% set currentSection = "records" %}
+
+{% set patientName = "Reuben Walsh" %}
+{% set nhsNumber = "9682037415" %}
+{% set vaccinationDate = "18 August 2026" %}
+
+{% block beforeContent %}
+  {{ backLink({
+    href: "javascript:window.history.back()",
+    text: "Back"
+  }) }}
+{% endblock %}
+
+{% block content %}
+  {% include "claims/records/_record-template.html" %}
+{% endblock %}
diff --git a/app/views/payments/records/ruby-evans.html b/app/views/claims/records/ruby-evans.html
similarity index 81%
rename from app/views/payments/records/ruby-evans.html
rename to app/views/claims/records/ruby-evans.html
index e686dfc9..02cbd559 100644
--- a/app/views/payments/records/ruby-evans.html
+++ b/app/views/claims/records/ruby-evans.html
@@ -2,7 +2,7 @@
 
 {% set pageName = "Ruby Evans’s flu vaccination record" %}
 {% set currentSection = "records" %}
-{% set canShowPayments = true %}
+
 {% set patientName = "Ruby Evans" %}
 {% set nhsNumber = "9017642853" %}
 {% set vaccinationDate = "1 October 2026" %}
@@ -15,5 +15,5 @@
 {% endblock %}
 
 {% block content %}
-  {% include "payments/records/_record-template.html" %}
+  {% include "claims/records/_record-template.html" %}
 {% endblock %}
diff --git a/app/views/payments/records/sophia-turner.html b/app/views/claims/records/sophia-turner.html
similarity index 82%
rename from app/views/payments/records/sophia-turner.html
rename to app/views/claims/records/sophia-turner.html
index 53045607..e3e23d46 100644
--- a/app/views/payments/records/sophia-turner.html
+++ b/app/views/claims/records/sophia-turner.html
@@ -2,7 +2,7 @@
 
 {% set pageName = "Sophia Turner’s flu vaccination record" %}
 {% set currentSection = "records" %}
-{% set canShowPayments = true %}
+
 {% set patientName = "Sophia Turner" %}
 {% set nhsNumber = "9824106375" %}
 {% set vaccinationDate = "9 October 2026" %}
@@ -15,5 +15,5 @@
 {% endblock %}
 
 {% block content %}
-  {% include "payments/records/_record-template.html" %}
+  {% include "claims/records/_record-template.html" %}
 {% endblock %}
diff --git a/app/views/claims/records/toby-fraser.html b/app/views/claims/records/toby-fraser.html
new file mode 100644
index 00000000..e7f61b28
--- /dev/null
+++ b/app/views/claims/records/toby-fraser.html
@@ -0,0 +1,19 @@
+{% extends 'layout.html' %}
+
+{% set pageName = "Toby Fraser’s flu vaccination record" %}
+{% set currentSection = "records" %}
+
+{% set patientName = "Toby Fraser" %}
+{% set nhsNumber = "9516248037" %}
+{% set vaccinationDate = "16 August 2026" %}
+
+{% block beforeContent %}
+  {{ backLink({
+    href: "javascript:window.history.back()",
+    text: "Back"
+  }) }}
+{% endblock %}
+
+{% block content %}
+  {% include "claims/records/_record-template.html" %}
+{% endblock %}
diff --git a/app/views/payments/records/zoe-hughes.html b/app/views/claims/records/zoe-hughes.html
similarity index 81%
rename from app/views/payments/records/zoe-hughes.html
rename to app/views/claims/records/zoe-hughes.html
index d76c4984..344b040b 100644
--- a/app/views/payments/records/zoe-hughes.html
+++ b/app/views/claims/records/zoe-hughes.html
@@ -2,7 +2,7 @@
 
 {% set pageName = "Zoe Hughes’s flu vaccination record" %}
 {% set currentSection = "records" %}
-{% set canShowPayments = true %}
+
 {% set patientName = "Zoe Hughes" %}
 {% set nhsNumber = "9837246150" %}
 {% set vaccinationDate = "3 October 2026" %}
@@ -15,5 +15,5 @@
 {% endblock %}
 
 {% block content %}
-  {% include "payments/records/_record-template.html" %}
+  {% include "claims/records/_record-template.html" %}
 {% endblock %}
diff --git a/app/views/payments/resubmit/_resubmit-template.html b/app/views/claims/resubmit/_resubmit-template.html
similarity index 100%
rename from app/views/payments/resubmit/_resubmit-template.html
rename to app/views/claims/resubmit/_resubmit-template.html
diff --git a/app/views/payments/resubmit/adult-flu.html b/app/views/claims/resubmit/adult-flu.html
similarity index 52%
rename from app/views/payments/resubmit/adult-flu.html
rename to app/views/claims/resubmit/adult-flu.html
index b0de03da..37f23283 100644
--- a/app/views/payments/resubmit/adult-flu.html
+++ b/app/views/claims/resubmit/adult-flu.html
@@ -1,12 +1,12 @@
 {% extends 'layout.html' %}
-{% set canShowPayments = true %}
-{% set currentSection = "payments" %}
+
+{% set currentSection = "claims" %}
 {% set pageName = "Resubmit" %}
 
 {# Update these for each page #}
 {% set claimCount = 10 %}
-{% set previousPage = "/payments/claims/adult-flu" %}
-{% set nextPage = "/payments/?adultFluResubmitted=true#resubmitted" %}
+{% set previousPage = "/claims/issues/adult-flu" %}
+{% set nextPage = "/claims/?adultFluResubmitted=true#resubmitted" %}
 
 {% block beforeContent %}
   {{ backLink({
@@ -16,5 +16,5 @@
 {% endblock %}
 
 {% block content %}
-  {% include "payments/resubmit/_resubmit-template.html" %}
+  {% include "claims/resubmit/_resubmit-template.html" %}
 {% endblock %}
\ No newline at end of file
diff --git a/app/views/payments/resubmit/childhood-flu.html b/app/views/claims/resubmit/childhood-flu.html
similarity index 51%
rename from app/views/payments/resubmit/childhood-flu.html
rename to app/views/claims/resubmit/childhood-flu.html
index 8bbafaf9..b165d282 100644
--- a/app/views/payments/resubmit/childhood-flu.html
+++ b/app/views/claims/resubmit/childhood-flu.html
@@ -1,12 +1,12 @@
 {% extends 'layout.html' %}
-{% set canShowPayments = true %}
-{% set currentSection = "payments" %}
+
+{% set currentSection = "claims" %}
 {% set pageName = "Resubmit" %}
 
 {# Update these for each page #}
 {% set claimCount = 4 %}
-{% set previousPage = "/payments/claims/childhood-flu" %}
-{% set nextPage = "/payments/?childhoodFluResubmitted=true#resubmitted" %}
+{% set previousPage = "/claims/issues/childhood-flu" %}
+{% set nextPage = "/claims/?childhoodFluResubmitted=true#resubmitted" %}
 
 {% block beforeContent %}
   {{ backLink({
@@ -16,5 +16,5 @@
 {% endblock %}
 
 {% block content %}
-  {% include "payments/resubmit/_resubmit-template.html" %}
+  {% include "claims/resubmit/_resubmit-template.html" %}
 {% endblock %}
\ No newline at end of file
diff --git a/app/views/payments/resubmit/covid-19.html b/app/views/claims/resubmit/covid-19.html
similarity index 52%
rename from app/views/payments/resubmit/covid-19.html
rename to app/views/claims/resubmit/covid-19.html
index ad221159..83a08363 100644
--- a/app/views/payments/resubmit/covid-19.html
+++ b/app/views/claims/resubmit/covid-19.html
@@ -1,12 +1,12 @@
 {% extends 'layout.html' %}
-{% set canShowPayments = true %}
-{% set currentSection = "payments" %}
+
+{% set currentSection = "claims" %}
 {% set pageName = "Resubmit" %}
 
 {# Update these for each page #}
 {% set claimCount = 21 %}
-{% set previousPage = "/payments/claims/covid-19" %}
-{% set nextPage = "/payments/?covid19Resubmitted=true#resubmitted" %}
+{% set previousPage = "/claims/issues/covid-19" %}
+{% set nextPage = "/claims/?covid19Resubmitted=true#resubmitted" %}
 
 {% block beforeContent %}
   {{ backLink({
@@ -16,5 +16,5 @@
 {% endblock %}
 
 {% block content %}
-  {% include "payments/resubmit/_resubmit-template.html" %}
+  {% include "claims/resubmit/_resubmit-template.html" %}
 {% endblock %}
\ No newline at end of file
diff --git a/app/views/payments/tables/_rejected-claims-table-adult-flu.html b/app/views/claims/tables/_rejected-claims-table-adult-flu.html
similarity index 84%
rename from app/views/payments/tables/_rejected-claims-table-adult-flu.html
rename to app/views/claims/tables/_rejected-claims-table-adult-flu.html
index a2ee3412..107e8204 100644
--- a/app/views/payments/tables/_rejected-claims-table-adult-flu.html
+++ b/app/views/claims/tables/_rejected-claims-table-adult-flu.html
@@ -24,7 +24,7 @@
         rows: [
           [
             {
-              html: "<a href='/payments/records/adele-purple'>Adele Purple</a><br><span class='nhsuk-hint'>9951742954</span>"
+              html: "<a href='/claims/records/adele-purple'>Adele Purple</a><br><span class='nhsuk-hint'>9951742954</span>"
             },
             {
               text: "21 Oct 2026"
@@ -41,7 +41,7 @@
           ],
           [
             {
-              html: "<a href='/payments/records/aisha-khan'>Aisha Khan</a><br><span class='nhsuk-hint'>9128473650</span>"
+              html: "<a href='/claims/records/aisha-khan'>Aisha Khan</a><br><span class='nhsuk-hint'>9128473650</span>"
             },
             {
               text: "20 Oct 2026"
@@ -58,7 +58,7 @@
           ],
           [
             {
-              html: "<a href='/payments/records/daniel-oconnor'>Daniel O'Connor</a><br><span class='nhsuk-hint'>9347162085</span>"
+              html: "<a href='/claims/records/daniel-oconnor'>Daniel O'Connor</a><br><span class='nhsuk-hint'>9347162085</span>"
             },
             {
               text: "19 Oct 2026"
@@ -75,7 +75,7 @@
           ],
           [
             {
-              html: "<a href='/payments/records/priya-patel'>Priya Patel</a><br><span class='nhsuk-hint'>9682037415</span>"
+              html: "<a href='/claims/records/priya-patel'>Priya Patel</a><br><span class='nhsuk-hint'>9682037415</span>"
             },
             {
               text: "18 Oct 2026"
@@ -92,7 +92,7 @@
           ],
           [
             {
-              html: "<a href='/payments/records/james-wilson'>James Wilson</a><br><span class='nhsuk-hint'></span>"
+              html: "<a href='/claims/records/james-wilson'>James Wilson</a><br><span class='nhsuk-hint'></span>"
             },
             {
               text: "17 Oct 2026"
@@ -109,7 +109,7 @@
           ],
           [
             {
-              html: "<a href='/payments/records/fatima-hussain'>Fatima Hussain</a><br><span class='nhsuk-hint'>9516248037</span>"
+              html: "<a href='/claims/records/fatima-hussain'>Fatima Hussain</a><br><span class='nhsuk-hint'>9516248037</span>"
             },
             {
               text: "16 Oct 2026"
@@ -126,7 +126,7 @@
           ],
           [
             {
-              html: "<a href='/payments/records/joshua-clarke'>Joshua Clarke</a><br><span class='nhsuk-hint'>9873150426</span>"
+              html: "<a href='/claims/records/joshua-clarke'>Joshua Clarke</a><br><span class='nhsuk-hint'>9873150426</span>"
             },
             {
               text: "15 Oct 2026"
@@ -143,7 +143,7 @@
           ],
           [
             {
-              html: "<a href='/payments/records/amira-ahmed'>Amira Ahmed</a><br><span class='nhsuk-hint'>9064821735</span>"
+              html: "<a href='/claims/records/amira-ahmed'>Amira Ahmed</a><br><span class='nhsuk-hint'>9064821735</span>"
             },
             {
               text: "14 Oct 2026"
@@ -160,7 +160,7 @@
           ],
           [
             {
-              html: "<a href='/payments/records/lewis-morgan'>Lewis Morgan</a><br><span class='nhsuk-hint'>9450718263</span>"
+              html: "<a href='/claims/records/lewis-morgan'>Lewis Morgan</a><br><span class='nhsuk-hint'>9450718263</span>"
             },
             {
               text: "13 Oct 2026"
@@ -177,7 +177,7 @@
           ],
           [
             {
-              html: "<a href='/payments/records/chloe-williams'>Chloe Williams</a><br><span class='nhsuk-hint'>9726413508</span>"
+              html: "<a href='/claims/records/chloe-williams'>Chloe Williams</a><br><span class='nhsuk-hint'>9726413508</span>"
             },
             {
               text: "12 Oct 2026"
diff --git a/app/views/payments/tables/_rejected-claims-table-childhood-flu.html b/app/views/claims/tables/_rejected-claims-table-childhood-flu.html
similarity index 86%
rename from app/views/payments/tables/_rejected-claims-table-childhood-flu.html
rename to app/views/claims/tables/_rejected-claims-table-childhood-flu.html
index 4f36d383..5fcc910c 100644
--- a/app/views/payments/tables/_rejected-claims-table-childhood-flu.html
+++ b/app/views/claims/tables/_rejected-claims-table-childhood-flu.html
@@ -24,7 +24,7 @@
         rows: [
           [
             {
-              html: "<a href='/payments/records/adele-purple'>Adele Purple</a><br><span class='nhsuk-hint'>9951742954</span>"
+              html: "<a href='/claims/records/adele-purple'>Adele Purple</a><br><span class='nhsuk-hint'>9951742954</span>"
             },
             {
               text: "21 Oct 2026"
@@ -41,7 +41,7 @@
           ],
           [
             {
-              html: "<a href='/payments/records/aisha-khan'>Aisha Khan</a><br><span class='nhsuk-hint'>9128473650</span>"
+              html: "<a href='/claims/records/aisha-khan'>Aisha Khan</a><br><span class='nhsuk-hint'>9128473650</span>"
             },
             {
               text: "20 Oct 2026"
@@ -58,7 +58,7 @@
           ],
           [
             {
-              html: "<a href='/payments/records/daniel-oconnor'>Daniel O'Connor</a><br><span class='nhsuk-hint'>9347162085</span>"
+              html: "<a href='/claims/records/daniel-oconnor'>Daniel O'Connor</a><br><span class='nhsuk-hint'>9347162085</span>"
             },
             {
               text: "19 Oct 2026"
@@ -75,7 +75,7 @@
           ],
           [
             {
-              html: "<a href='/payments/records/priya-patel'>Priya Patel</a><br><span class='nhsuk-hint'>9682037415</span>"
+              html: "<a href='/claims/records/priya-patel'>Priya Patel</a><br><span class='nhsuk-hint'>9682037415</span>"
             },
             {
               text: "18 Oct 2026"
@@ -121,7 +121,7 @@
         rows: [
           [
             {
-              html: "<a href='/payments/records/priya-patel'>Priya Patel</a><br><span class='nhsuk-hint'>9682037415</span>"
+              html: "<a href='/claims/records/priya-patel'>Priya Patel</a><br><span class='nhsuk-hint'>9682037415</span>"
             },
             {
               text: "18 Oct 2026"
diff --git a/app/views/payments/tables/_rejected-claims-table-covid-19.html b/app/views/claims/tables/_rejected-claims-table-covid-19.html
similarity index 83%
rename from app/views/payments/tables/_rejected-claims-table-covid-19.html
rename to app/views/claims/tables/_rejected-claims-table-covid-19.html
index 1f8823c3..aed61aa1 100644
--- a/app/views/payments/tables/_rejected-claims-table-covid-19.html
+++ b/app/views/claims/tables/_rejected-claims-table-covid-19.html
@@ -24,7 +24,7 @@
         rows: [
           [
             {
-              html: "<a href='/payments/records/adele-purple'>Adele Purple</a><br><span class='nhsuk-hint'>9951742954</span>"
+              html: "<a href='/claims/records/adele-purple'>Adele Purple</a><br><span class='nhsuk-hint'>9951742954</span>"
             },
             {
               text: "21 Oct 2026"
@@ -41,7 +41,7 @@
           ],
           [
             {
-              html: "<a href='/payments/records/aisha-khan'>Aisha Khan</a><br><span class='nhsuk-hint'>9128473650</span>"
+              html: "<a href='/claims/records/aisha-khan'>Aisha Khan</a><br><span class='nhsuk-hint'>9128473650</span>"
             },
             {
               text: "20 Oct 2026"
@@ -58,7 +58,7 @@
           ],
           [
             {
-              html: "<a href='/payments/records/daniel-oconnor'>Daniel O'Connor</a><br><span class='nhsuk-hint'>9347162085</span>"
+              html: "<a href='/claims/records/daniel-oconnor'>Daniel O'Connor</a><br><span class='nhsuk-hint'>9347162085</span>"
             },
             {
               text: "19 Oct 2026"
@@ -75,7 +75,7 @@
           ],
           [
             {
-              html: "<a href='/payments/records/priya-patel'>Priya Patel</a><br><span class='nhsuk-hint'>9682037415</span>"
+              html: "<a href='/claims/records/priya-patel'>Priya Patel</a><br><span class='nhsuk-hint'>9682037415</span>"
             },
             {
               text: "18 Oct 2026"
@@ -92,7 +92,7 @@
           ],
           [
             {
-              html: "<a href='/payments/records/james-wilson'>James Wilson</a><br><span class='nhsuk-hint'></span>"
+              html: "<a href='/claims/records/james-wilson'>James Wilson</a><br><span class='nhsuk-hint'></span>"
             },
             {
               text: "17 Oct 2026"
@@ -109,7 +109,7 @@
           ],
           [
             {
-              html: "<a href='/payments/records/fatima-hussain'>Fatima Hussain</a><br><span class='nhsuk-hint'>9516248037</span>"
+              html: "<a href='/claims/records/fatima-hussain'>Fatima Hussain</a><br><span class='nhsuk-hint'>9516248037</span>"
             },
             {
               text: "16 Oct 2026"
@@ -126,7 +126,7 @@
           ],
           [
             {
-              html: "<a href='/payments/records/joshua-clarke'>Joshua Clarke</a><br><span class='nhsuk-hint'>9873150426</span>"
+              html: "<a href='/claims/records/joshua-clarke'>Joshua Clarke</a><br><span class='nhsuk-hint'>9873150426</span>"
             },
             {
               text: "15 Oct 2026"
@@ -143,7 +143,7 @@
           ],
           [
             {
-              html: "<a href='/payments/records/amira-ahmed'>Amira Ahmed</a><br><span class='nhsuk-hint'>9064821735</span>"
+              html: "<a href='/claims/records/amira-ahmed'>Amira Ahmed</a><br><span class='nhsuk-hint'>9064821735</span>"
             },
             {
               text: "14 Oct 2026"
@@ -160,7 +160,7 @@
           ],
           [
             {
-              html: "<a href='/payments/records/lewis-morgan'>Lewis Morgan</a><br><span class='nhsuk-hint'>9450718263</span>"
+              html: "<a href='/claims/records/lewis-morgan'>Lewis Morgan</a><br><span class='nhsuk-hint'>9450718263</span>"
             },
             {
               text: "13 Oct 2026"
@@ -177,7 +177,7 @@
           ],
           [
             {
-              html: "<a href='/payments/records/chloe-williams'>Chloe Williams</a><br><span class='nhsuk-hint'>9726413508</span>"
+              html: "<a href='/claims/records/chloe-williams'>Chloe Williams</a><br><span class='nhsuk-hint'>9726413508</span>"
             },
             {
               text: "12 Oct 2026"
@@ -194,7 +194,7 @@
           ],
           [
             {
-              html: "<a href='/payments/records/ella-foster'>Ella Foster</a><br><span class='nhsuk-hint'>9745120368</span>"
+              html: "<a href='/claims/records/ella-foster'>Ella Foster</a><br><span class='nhsuk-hint'>9745120368</span>"
             },
             {
               text: "11 Oct 2026"
@@ -211,7 +211,7 @@
           ],
           [
             {
-              html: "<a href='/payments/records/oliver-bennett'>Oliver Bennett</a><br><span class='nhsuk-hint'>9018357642</span>"
+              html: "<a href='/claims/records/oliver-bennett'>Oliver Bennett</a><br><span class='nhsuk-hint'>9018357642</span>"
             },
             {
               text: "10 Oct 2026"
@@ -228,7 +228,7 @@
           ],
           [
             {
-              html: "<a href='/payments/records/sophia-turner'>Sophia Turner</a><br><span class='nhsuk-hint'>9824106375</span>"
+              html: "<a href='/claims/records/sophia-turner'>Sophia Turner</a><br><span class='nhsuk-hint'>9824106375</span>"
             },
             {
               text: "9 Oct 2026"
@@ -245,7 +245,7 @@
           ],
           [
             {
-              html: "<a href='/payments/records/liam-carter'>Liam Carter</a><br><span class='nhsuk-hint'>9374051286</span>"
+              html: "<a href='/claims/records/liam-carter'>Liam Carter</a><br><span class='nhsuk-hint'>9374051286</span>"
             },
             {
               text: "8 Oct 2026"
@@ -262,7 +262,7 @@
           ],
           [
             {
-              html: "<a href='/payments/records/grace-nguyen'>Grace Nguyen</a><br><span class='nhsuk-hint'>9658240137</span>"
+              html: "<a href='/claims/records/grace-nguyen'>Grace Nguyen</a><br><span class='nhsuk-hint'>9658240137</span>"
             },
             {
               text: "7 Oct 2026"
@@ -279,7 +279,7 @@
           ],
           [
             {
-              html: "<a href='/payments/records/noah-patel'>Noah Patel</a><br><span class='nhsuk-hint'>9207314685</span>"
+              html: "<a href='/claims/records/noah-patel'>Noah Patel</a><br><span class='nhsuk-hint'>9207314685</span>"
             },
             {
               text: "6 Oct 2026"
@@ -296,7 +296,7 @@
           ],
           [
             {
-              html: "<a href='/payments/records/mia-roberts'>Mia Roberts</a><br><span class='nhsuk-hint'>9765031842</span>"
+              html: "<a href='/claims/records/mia-roberts'>Mia Roberts</a><br><span class='nhsuk-hint'>9765031842</span>"
             },
             {
               text: "5 Oct 2026"
@@ -313,7 +313,7 @@
           ],
           [
             {
-              html: "<a href='/payments/records/henry-walker'>Henry Walker</a><br><span class='nhsuk-hint'>9418276503</span>"
+              html: "<a href='/claims/records/henry-walker'>Henry Walker</a><br><span class='nhsuk-hint'>9418276503</span>"
             },
             {
               text: "4 Oct 2026"
@@ -330,7 +330,7 @@
           ],
           [
             {
-              html: "<a href='/payments/records/zoe-hughes'>Zoe Hughes</a><br><span class='nhsuk-hint'>9837246150</span>"
+              html: "<a href='/claims/records/zoe-hughes'>Zoe Hughes</a><br><span class='nhsuk-hint'>9837246150</span>"
             },
             {
               text: "3 Oct 2026"
@@ -347,7 +347,7 @@
           ],
           [
             {
-              html: "<a href='/payments/records/ethan-cooper'>Ethan Cooper</a><br><span class='nhsuk-hint'>9456021378</span>"
+              html: "<a href='/claims/records/ethan-cooper'>Ethan Cooper</a><br><span class='nhsuk-hint'>9456021378</span>"
             },
             {
               text: "2 Oct 2026"
@@ -364,7 +364,7 @@
           ],
           [
             {
-              html: "<a href='/payments/records/ruby-evans'>Ruby Evans</a><br><span class='nhsuk-hint'>9017642853</span>"
+              html: "<a href='/claims/records/ruby-evans'>Ruby Evans</a><br><span class='nhsuk-hint'>9017642853</span>"
             },
             {
               text: "1 Oct 2026"
diff --git a/app/views/payments/tables/_rejected-claims-table-out-of-season-flu.html b/app/views/claims/tables/_rejected-claims-table-out-of-season-flu.html
similarity index 80%
rename from app/views/payments/tables/_rejected-claims-table-out-of-season-flu.html
rename to app/views/claims/tables/_rejected-claims-table-out-of-season-flu.html
index a86f23bc..ce1b7c9f 100644
--- a/app/views/payments/tables/_rejected-claims-table-out-of-season-flu.html
+++ b/app/views/claims/tables/_rejected-claims-table-out-of-season-flu.html
@@ -24,10 +24,10 @@
         rows: [
           [
             {
-              html: "<a href='/payments/records/adele-purple'>Adele Purple</a><br><span class='nhsuk-hint'>9951742954</span>"
+              html: "<a href='/claims/records/elodie-shaw'>Elodie Shaw</a><br><span class='nhsuk-hint'>9951742954</span>"
             },
             {
-              text: "21 Oct 2026"
+              text: "21 Aug 2026"
             },
             {
               text: "RAV-A7m2K9pQ1x"
@@ -41,10 +41,10 @@
           ],
           [
             {
-              html: "<a href='/payments/records/aisha-khan'>Aisha Khan</a><br><span class='nhsuk-hint'>9128473650</span>"
+              html: "<a href='/claims/records/idris-ali'>Idris Ali</a><br><span class='nhsuk-hint'>9128473650</span>"
             },
             {
-              text: "20 Oct 2026"
+              text: "20 Aug 2026"
             },
             {
               text: "RAV-4B8cD2eF6g"
@@ -58,10 +58,10 @@
           ],
           [
             {
-              html: "<a href='/payments/records/daniel-oconnor'>Daniel O'Connor</a><br><span class='nhsuk-hint'>9347162085</span>"
+              html: "<a href='/claims/records/poppy-jenkins'>Poppy Jenkins</a><br><span class='nhsuk-hint'>9347162085</span>"
             },
             {
-              text: "19 Oct 2026"
+              text: "19 Aug 2026"
             },
             {
               text: "RAV-H3j5K7m9N2"
@@ -75,10 +75,10 @@
           ],
           [
             {
-              html: "<a href='/payments/records/priya-patel'>Priya Patel</a><br><span class='nhsuk-hint'>9682037415</span>"
+              html: "<a href='/claims/records/reuben-walsh'>Reuben Walsh</a><br><span class='nhsuk-hint'>9682037415</span>"
             },
             {
-              text: "18 Oct 2026"
+              text: "18 Aug 2026"
             },
             {
               text: "RAV-pQ4rS6tU8v"
@@ -92,10 +92,10 @@
           ],
           [
             {
-              html: "<a href='/payments/records/james-wilson'>James Wilson</a><br><span class='nhsuk-hint'></span>"
+              html: "<a href='/claims/records/layla-dawson'>Layla Dawson</a><br><span class='nhsuk-hint'></span>"
             },
             {
-              text: "17 Oct 2026"
+              text: "17 Aug 2026"
             },
             {
               text: "RAV-W1x3Y5z7A9"
@@ -109,10 +109,10 @@
           ],
           [
             {
-              html: "<a href='/payments/records/fatima-hussain'>Fatima Hussain</a><br><span class='nhsuk-hint'>9516248037</span>"
+              html: "<a href='/claims/records/toby-fraser'>Toby Fraser</a><br><span class='nhsuk-hint'>9516248037</span>"
             },
             {
-              text: "16 Oct 2026"
+              text: "16 Aug 2026"
             },
             {
               text: "RAV-bC2dE4fG6h"
@@ -126,10 +126,10 @@
           ],
           [
             {
-              html: "<a href='/payments/records/joshua-clarke'>Joshua Clarke</a><br><span class='nhsuk-hint'>9873150426</span>"
+              html: "<a href='/claims/records/niamh-byrne'>Niamh Byrne</a><br><span class='nhsuk-hint'>9873150426</span>"
             },
             {
-              text: "15 Oct 2026"
+              text: "15 Aug 2026"
             },
             {
               text: "RAV-J8k0L2mN4p"
@@ -143,10 +143,10 @@
           ],
           [
             {
-              html: "<a href='/payments/records/amira-ahmed'>Amira Ahmed</a><br><span class='nhsuk-hint'>9064821735</span>"
+              html: "<a href='/claims/records/kian-mahmood'>Kian Mahmood</a><br><span class='nhsuk-hint'>9064821735</span>"
             },
             {
-              text: "14 Oct 2026"
+              text: "14 Aug 2026"
             },
             {
               text: "RAV-qR5sT7uV9w"
diff --git a/app/views/payments/tables/_rejected-claims-table-patient-outside-age-range.html b/app/views/claims/tables/_rejected-claims-table-patient-outside-age-range.html
similarity index 89%
rename from app/views/payments/tables/_rejected-claims-table-patient-outside-age-range.html
rename to app/views/claims/tables/_rejected-claims-table-patient-outside-age-range.html
index 90795566..765bdc66 100644
--- a/app/views/payments/tables/_rejected-claims-table-patient-outside-age-range.html
+++ b/app/views/claims/tables/_rejected-claims-table-patient-outside-age-range.html
@@ -24,7 +24,7 @@
         rows: [
           [
             {
-              html: "<a href='/payments/records/amira-ahmed'>Amira Ahmed</a><br><span class='nhsuk-hint'>9064821735</span>"
+              html: "<a href='/claims/records/amira-ahmed'>Amira Ahmed</a><br><span class='nhsuk-hint'>9064821735</span>"
             },
             {
               text: "14 Oct 2026"
diff --git a/app/views/payments/tables/_rejected-claims-table-postcode.html b/app/views/claims/tables/_rejected-claims-table-postcode.html
similarity index 83%
rename from app/views/payments/tables/_rejected-claims-table-postcode.html
rename to app/views/claims/tables/_rejected-claims-table-postcode.html
index ee4f71a4..65377e10 100644
--- a/app/views/payments/tables/_rejected-claims-table-postcode.html
+++ b/app/views/claims/tables/_rejected-claims-table-postcode.html
@@ -24,7 +24,7 @@
         rows: [
           [
             {
-              html: "<a href='/payments/records/adele-purple'>Adele Purple</a><br><span class='nhsuk-hint'>9951742954</span>"
+              html: "<a href='/claims/records/adele-purple'>Adele Purple</a><br><span class='nhsuk-hint'>9951742954</span>"
             },
             {
               text: "21 Oct 2026"
@@ -41,7 +41,7 @@
           ],
           [
             {
-              html: "<a href='/payments/records/aisha-khan'>Aisha Khan</a><br><span class='nhsuk-hint'>9128473650</span>"
+              html: "<a href='/claims/records/aisha-khan'>Aisha Khan</a><br><span class='nhsuk-hint'>9128473650</span>"
             },
             {
               text: "20 Oct 2026"
@@ -59,7 +59,7 @@
           ],
           [
             {
-              html: "<a href='/payments/records/priya-patel'>Priya Patel</a><br><span class='nhsuk-hint'>9682037415</span>"
+              html: "<a href='/claims/records/priya-patel'>Priya Patel</a><br><span class='nhsuk-hint'>9682037415</span>"
             },
             {
               text: "18 Oct 2026"
diff --git a/app/views/includes/_preset-scenarios-table.html b/app/views/includes/_preset-scenarios-table.html
index 2316038e..922bb847 100644
--- a/app/views/includes/_preset-scenarios-table.html
+++ b/app/views/includes/_preset-scenarios-table.html
@@ -12,12 +12,12 @@
         scenarioDetails: "Lead admin at a pharmacy. Includes generated users and vaccination records."
       },
       {
-        presetLabel: "Lead admin, single pharmacy (payments and appointments)",
-        presetPath: "/prototype-setup/preset/pharmacy-lead-admin-payments",
+        presetLabel: "Lead admin, single pharmacy (claims and appointments)",
+        presetPath: "/prototype-setup/preset/pharmacy-lead-admin-claims",
         userName: "Tara Mills",
         userEmail: "tara.mills@nhs.net",
         role: "Lead administrator",
-        scenarioDetails: "Pharmacy scenario with payments and appointments enabled."
+        scenarioDetails: "Pharmacy scenario with claims and appointments enabled."
       },
       {
         presetLabel: "Recorder, single pharmacy",
diff --git a/app/views/includes/header.html b/app/views/includes/header.html
index 88b9fa51..d8f5e6ae 100644
--- a/app/views/includes/header.html
+++ b/app/views/includes/header.html
@@ -47,12 +47,12 @@
     active: (currentSection == "home")
   }), navigationItems) %}
 
-  <!-- Payments -->
-   {% if canShowPayments or data.showPaymentsLink %}
+  <!-- Claims -->
+   {% if data.showClaimsLink %}
   {% set navigationItems = (navigationItems.push({
-    href: "/payments/",
-    text: "Payments",
-    active: (currentSection == "payments")
+    href: "/claims/",
+    text: "Claims",
+    active: (currentSection == "claims")
   }), navigationItems) %}
   {% endif %}
 
diff --git a/app/views/record-vaccinations/patient.html b/app/views/record-vaccinations/patient.html
index b6691c55..125533b1 100644
--- a/app/views/record-vaccinations/patient.html
+++ b/app/views/record-vaccinations/patient.html
@@ -15,14 +15,14 @@
     NHSBSA is rejecting claims for vaccinations recorded at Pickfords Pharmacy (FA424).
   </p>
   <p class="nhsuk-notification-banner__heading">
-    <a class="nhsuk-notification-banner__link" href="/payments/">Check your payments dashboard</a>
+    <a class="nhsuk-notification-banner__link" href="/claims/">Check your claims dashboard </a>
   </p>
   {% endset %}
 
   <div class="nhsuk-grid-row">
     <div class="nhsuk-grid-column-two-thirds">
 
-      {% if data.showPaymentsLink %}
+      {% if data.showClaimsLink %}
       {{ notificationBanner({
         heading: {
           html: html,