From 61b1f973dafda8e8797558c0c04eca1cfa6e12f6 Mon Sep 17 00:00:00 2001
From: Phil-NHS <philip.tate@nhs.net>
Date: Tue, 4 Nov 2025 14:07:13 +0000
Subject: [PATCH] TD-6421 NHSUKViewComponents replaced with
 NHSETELViewComponents and Razor to version 8

---
 .gitignore                                                  | 1 +
 .../DigitalLearningSolutions.Web.csproj                     | 6 +++---
 .../ViewModels/Common/AdminRolesViewModel.cs                | 2 +-
 .../Common/ViewComponents/SecondaryNavMenuLinkViewModel.cs  | 2 +-
 .../SuperAdmin/Administrators/ManageRoleViewModel.cs        | 2 +-
 .../TrackingSystem/Centre/Administrator/AdminRoleInputs.cs  | 2 +-
 .../CourseSetup/CourseDetails/CourseOptionInputs.cs         | 2 +-
 .../CourseSetup/CourseDetails/EditCourseOptionsFormData.cs  | 2 +-
 .../Delegates/DelegateGroups/GenerateGroupsViewModel.cs     | 2 +-
 .../Views/Login/ChooseACentre.cshtml                        | 2 +-
 .../Views/MyAccount/EditDetails.cshtml                      | 2 +-
 .../Views/RegisterAdmin/Confirmation.cshtml                 | 2 +-
 .../Views/Shared/Components/ActionLink/Default.cshtml       | 2 +-
 .../Views/Shared/Components/BackLink/Default.cshtml         | 2 +-
 .../Views/Shared/Components/CancelLink/Default.cshtml       | 2 +-
 .../Views/Shared/Components/Checkboxes/Default.cshtml       | 4 ++--
 .../Views/Shared/Components/DateInput/Default.cshtml        | 2 +-
 .../Views/Shared/Components/DateRangeInput/Default.cshtml   | 2 +-
 .../Shared/Components/DictionaryTextInput/Default.cshtml    | 2 +-
 .../Views/Shared/Components/ErrorSummary/Default.cshtml     | 2 +-
 .../Views/Shared/Components/FileInput/Default.cshtml        | 4 ++--
 .../Views/Shared/Components/NumericInput/Default.cshtml     | 4 ++--
 .../Views/Shared/Components/RadioList/Default.cshtml        | 6 +++---
 .../Views/Shared/Components/SelectList/Default.cshtml       | 4 ++--
 .../Views/Shared/Components/SingleCheckbox/Default.cshtml   | 2 +-
 .../Views/Shared/Components/TextArea/Default.cshtml         | 4 ++--
 .../Views/Shared/Components/TextInput/Default.cshtml        | 4 ++--
 .../Views/Shared/_CheckboxItem.cshtml                       | 2 +-
 .../Views/Shared/_TextInputItem.cshtml                      | 2 +-
 .../Views/SuperAdmin/Centres/CentreRoleLimits.cshtml        | 2 +-
 .../Views/SuperAdmin/Users/UserCentreAccounts.cshtml        | 2 +-
 .../Support/RequestSupportTicket/RequestAttachment.cshtml   | 2 +-
 .../CourseSetup/Shared/_EditCourseOptionsFormInputs.cshtml  | 2 +-
 .../TrackingSystem/Delegates/Enrol/EnrolCompleteBy.cshtml   | 2 +-
 DigitalLearningSolutions.Web/Views/_ViewImports.cshtml      | 2 +-
 35 files changed, 45 insertions(+), 44 deletions(-)

diff --git a/.gitignore b/.gitignore
index 74ae0b44e1..eb94082d7c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -514,3 +514,4 @@ DigitalLearningSolutions.Web/Views/Shared/Components/TextArea/Default.cshtml
 DigitalLearningSolutions.Web/Views/Shared/Components/TextInput/Default.cshtml
 /DigitalLearningSolutions.Web/appsettings.Test.json
 /DigitalLearningSolutions.Web/web.config
+/DigitalLearningSolutions.Web/publish-local
diff --git a/DigitalLearningSolutions.Web/DigitalLearningSolutions.Web.csproj b/DigitalLearningSolutions.Web/DigitalLearningSolutions.Web.csproj
index 0057f8da8d..829f1c1776 100644
--- a/DigitalLearningSolutions.Web/DigitalLearningSolutions.Web.csproj
+++ b/DigitalLearningSolutions.Web/DigitalLearningSolutions.Web.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
     <PropertyGroup>
         <TargetFramework>net8.0</TargetFramework>
@@ -70,7 +70,7 @@
         <PackageReference Include="HtmlAgilityPack" Version="1.11.74" />
         <PackageReference Include="HtmlSanitizer" Version="9.0.884" />
         <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="8.0.13" />
-        <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="6.0.24" />
+        <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="8.0.13" />
         <PackageReference Include="Microsoft.Data.SqlClient" Version="6.0.1" />
         <PackageReference Include="Microsoft.FeatureManagement" Version="3.1.0" />
         <PackageReference Include="Microsoft.FeatureManagement.AspNetCore" Version="2.5.1" />
@@ -80,7 +80,7 @@
         </PackageReference>
         <PackageReference Include="Microsoft.VisualStudio.Web.BrowserLink" Version="2.2.0" />
         <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="9.0.0" />
-        <PackageReference Include="NHSUKViewComponents.Web" Version="1.0.29" />
+        <PackageReference Include="NHSETELViewComponents" Version="1.0.0" />
         <PackageReference Include="NodaTime" Version="3.2.1" />
         <PackageReference Include="Npm" Version="3.5.2" />
         <PackageReference Include="Serilog.AspNetCore" Version="7.0.0" />
diff --git a/DigitalLearningSolutions.Web/ViewModels/Common/AdminRolesViewModel.cs b/DigitalLearningSolutions.Web/ViewModels/Common/AdminRolesViewModel.cs
index 209c96761c..04a4a18219 100644
--- a/DigitalLearningSolutions.Web/ViewModels/Common/AdminRolesViewModel.cs
+++ b/DigitalLearningSolutions.Web/ViewModels/Common/AdminRolesViewModel.cs
@@ -5,7 +5,7 @@
     using DigitalLearningSolutions.Web.ViewModels.Common.ViewComponents;
     using DigitalLearningSolutions.Web.ViewModels.TrackingSystem.Centre.Administrator;
     using Microsoft.AspNetCore.Mvc.Rendering;
-    using NHSUKViewComponents.Web.ViewModels;
+    using NHSETELViewComponents.ViewModels;
 
 
     public abstract class AdminRolesViewModel : AdminRolesFormData
diff --git a/DigitalLearningSolutions.Web/ViewModels/Common/ViewComponents/SecondaryNavMenuLinkViewModel.cs b/DigitalLearningSolutions.Web/ViewModels/Common/ViewComponents/SecondaryNavMenuLinkViewModel.cs
index 7908722090..ab284e7794 100644
--- a/DigitalLearningSolutions.Web/ViewModels/Common/ViewComponents/SecondaryNavMenuLinkViewModel.cs
+++ b/DigitalLearningSolutions.Web/ViewModels/Common/ViewComponents/SecondaryNavMenuLinkViewModel.cs
@@ -1,6 +1,6 @@
 namespace DigitalLearningSolutions.Web.ViewModels.Common.ViewComponents
 {
-    using NHSUKViewComponents.Web.ViewModels;
+    using NHSETELViewComponents.ViewModels;
     using System.Collections.Generic;
 
     public class SecondaryNavMenuLinkViewModel : LinkViewModel
diff --git a/DigitalLearningSolutions.Web/ViewModels/SuperAdmin/Administrators/ManageRoleViewModel.cs b/DigitalLearningSolutions.Web/ViewModels/SuperAdmin/Administrators/ManageRoleViewModel.cs
index 65aa7e5ebe..0ebb8cb5ad 100644
--- a/DigitalLearningSolutions.Web/ViewModels/SuperAdmin/Administrators/ManageRoleViewModel.cs
+++ b/DigitalLearningSolutions.Web/ViewModels/SuperAdmin/Administrators/ManageRoleViewModel.cs
@@ -9,7 +9,7 @@
     using DigitalLearningSolutions.Web.Models.Enums;
     using DigitalLearningSolutions.Web.ViewModels.Common;
     using DigitalLearningSolutions.Web.ViewModels.TrackingSystem.Centre.Administrator;
-    using NHSUKViewComponents.Web.ViewModels;
+    using NHSETELViewComponents.ViewModels;
 
     public class ManageRoleViewModel : AdminRolesViewModel
     {
diff --git a/DigitalLearningSolutions.Web/ViewModels/TrackingSystem/Centre/Administrator/AdminRoleInputs.cs b/DigitalLearningSolutions.Web/ViewModels/TrackingSystem/Centre/Administrator/AdminRoleInputs.cs
index 41788bde7f..68727cb8b5 100644
--- a/DigitalLearningSolutions.Web/ViewModels/TrackingSystem/Centre/Administrator/AdminRoleInputs.cs
+++ b/DigitalLearningSolutions.Web/ViewModels/TrackingSystem/Centre/Administrator/AdminRoleInputs.cs
@@ -2,7 +2,7 @@
 {
     using DigitalLearningSolutions.Web.Models.Enums;
     using DigitalLearningSolutions.Web.ViewModels.Common.ViewComponents;
-    using NHSUKViewComponents.Web.ViewModels;
+    using NHSETELViewComponents.ViewModels;
 
     public class AdminRoleInputs
     {
diff --git a/DigitalLearningSolutions.Web/ViewModels/TrackingSystem/CourseSetup/CourseDetails/CourseOptionInputs.cs b/DigitalLearningSolutions.Web/ViewModels/TrackingSystem/CourseSetup/CourseDetails/CourseOptionInputs.cs
index dd03bf70d3..eb863606b4 100644
--- a/DigitalLearningSolutions.Web/ViewModels/TrackingSystem/CourseSetup/CourseDetails/CourseOptionInputs.cs
+++ b/DigitalLearningSolutions.Web/ViewModels/TrackingSystem/CourseSetup/CourseDetails/CourseOptionInputs.cs
@@ -1,6 +1,6 @@
 namespace DigitalLearningSolutions.Web.ViewModels.TrackingSystem.CourseSetup.CourseDetails
 {
-    using NHSUKViewComponents.Web.ViewModels;
+    using NHSETELViewComponents.ViewModels;
 
     public static class CourseOptionsInputs
     {
diff --git a/DigitalLearningSolutions.Web/ViewModels/TrackingSystem/CourseSetup/CourseDetails/EditCourseOptionsFormData.cs b/DigitalLearningSolutions.Web/ViewModels/TrackingSystem/CourseSetup/CourseDetails/EditCourseOptionsFormData.cs
index 5be49a4a93..4036f401a3 100644
--- a/DigitalLearningSolutions.Web/ViewModels/TrackingSystem/CourseSetup/CourseDetails/EditCourseOptionsFormData.cs
+++ b/DigitalLearningSolutions.Web/ViewModels/TrackingSystem/CourseSetup/CourseDetails/EditCourseOptionsFormData.cs
@@ -3,7 +3,7 @@
     using System.Collections.Generic;
     using System.Linq;
     using DigitalLearningSolutions.Data.Models.MultiPageFormData.AddNewCentreCourse;
-    using NHSUKViewComponents.Web.ViewModels;
+    using NHSETELViewComponents.ViewModels;
 
     public class EditCourseOptionsFormData
     {
diff --git a/DigitalLearningSolutions.Web/ViewModels/TrackingSystem/Delegates/DelegateGroups/GenerateGroupsViewModel.cs b/DigitalLearningSolutions.Web/ViewModels/TrackingSystem/Delegates/DelegateGroups/GenerateGroupsViewModel.cs
index 0f6a8008cf..ecf0a9f79b 100644
--- a/DigitalLearningSolutions.Web/ViewModels/TrackingSystem/Delegates/DelegateGroups/GenerateGroupsViewModel.cs
+++ b/DigitalLearningSolutions.Web/ViewModels/TrackingSystem/Delegates/DelegateGroups/GenerateGroupsViewModel.cs
@@ -3,7 +3,7 @@
     using System.Collections.Generic;
     using System.ComponentModel.DataAnnotations;
     using Microsoft.AspNetCore.Mvc.Rendering;
-    using NHSUKViewComponents.Web.ViewModels;
+    using NHSETELViewComponents.ViewModels;
 
     public class GenerateGroupsViewModel
     {
diff --git a/DigitalLearningSolutions.Web/Views/Login/ChooseACentre.cshtml b/DigitalLearningSolutions.Web/Views/Login/ChooseACentre.cshtml
index bd3833805e..8c68f350a7 100644
--- a/DigitalLearningSolutions.Web/Views/Login/ChooseACentre.cshtml
+++ b/DigitalLearningSolutions.Web/Views/Login/ChooseACentre.cshtml
@@ -1,5 +1,5 @@
 @using DigitalLearningSolutions.Data.Enums
-@using NHSUKViewComponents.Web.ViewComponents
+@using NHSETELViewComponents.ViewComponents
 @using DigitalLearningSolutions.Web.ViewModels.Login
 @model ChooseACentreViewModel
 @{
diff --git a/DigitalLearningSolutions.Web/Views/MyAccount/EditDetails.cshtml b/DigitalLearningSolutions.Web/Views/MyAccount/EditDetails.cshtml
index 53a279dc6f..dbde5a8411 100644
--- a/DigitalLearningSolutions.Web/Views/MyAccount/EditDetails.cshtml
+++ b/DigitalLearningSolutions.Web/Views/MyAccount/EditDetails.cshtml
@@ -1,4 +1,4 @@
-@using NHSUKViewComponents.Web.ViewComponents
+@using NHSETELViewComponents.ViewComponents
 @using DigitalLearningSolutions.Web.ViewModels.MyAccount
 @using Microsoft.AspNetCore.Mvc.TagHelpers
 @model MyAccountEditDetailsViewModel
diff --git a/DigitalLearningSolutions.Web/Views/RegisterAdmin/Confirmation.cshtml b/DigitalLearningSolutions.Web/Views/RegisterAdmin/Confirmation.cshtml
index 3cb9daa124..ae52638704 100644
--- a/DigitalLearningSolutions.Web/Views/RegisterAdmin/Confirmation.cshtml
+++ b/DigitalLearningSolutions.Web/Views/RegisterAdmin/Confirmation.cshtml
@@ -1,4 +1,4 @@
-@using NHSUKViewComponents.Web.ViewComponents
+@using NHSETELViewComponents.ViewComponents
 @using DigitalLearningSolutions.Web.ViewModels.Register
 @model AdminConfirmationViewModel
 
diff --git a/DigitalLearningSolutions.Web/Views/Shared/Components/ActionLink/Default.cshtml b/DigitalLearningSolutions.Web/Views/Shared/Components/ActionLink/Default.cshtml
index 9b824da679..e2da6ae245 100644
--- a/DigitalLearningSolutions.Web/Views/Shared/Components/ActionLink/Default.cshtml
+++ b/DigitalLearningSolutions.Web/Views/Shared/Components/ActionLink/Default.cshtml
@@ -1,4 +1,4 @@
-@using NHSUKViewComponents.Web.ViewModels
+@using NHSETELViewComponents.ViewModels
 @model LinkViewModel
 
 <div class="nhsuk-action-link">
diff --git a/DigitalLearningSolutions.Web/Views/Shared/Components/BackLink/Default.cshtml b/DigitalLearningSolutions.Web/Views/Shared/Components/BackLink/Default.cshtml
index a95832bae8..388cf73d18 100644
--- a/DigitalLearningSolutions.Web/Views/Shared/Components/BackLink/Default.cshtml
+++ b/DigitalLearningSolutions.Web/Views/Shared/Components/BackLink/Default.cshtml
@@ -1,4 +1,4 @@
-@using NHSUKViewComponents.Web.ViewModels
+@using NHSETELViewComponents.ViewModels
 @model LinkViewModel
 
 <div class="nhsuk-back-link">
diff --git a/DigitalLearningSolutions.Web/Views/Shared/Components/CancelLink/Default.cshtml b/DigitalLearningSolutions.Web/Views/Shared/Components/CancelLink/Default.cshtml
index 72faf1b196..a16d967a73 100644
--- a/DigitalLearningSolutions.Web/Views/Shared/Components/CancelLink/Default.cshtml
+++ b/DigitalLearningSolutions.Web/Views/Shared/Components/CancelLink/Default.cshtml
@@ -1,4 +1,4 @@
-@using NHSUKViewComponents.Web.ViewModels
+@using NHSETELViewComponents.ViewModels
 @model LinkViewModel
 
 <link rel="stylesheet" href="@Url.Content("~/css/shared/components/cancelLink.css")" asp-append-version="true">
diff --git a/DigitalLearningSolutions.Web/Views/Shared/Components/Checkboxes/Default.cshtml b/DigitalLearningSolutions.Web/Views/Shared/Components/Checkboxes/Default.cshtml
index 5c445d7805..cec53bae24 100644
--- a/DigitalLearningSolutions.Web/Views/Shared/Components/Checkboxes/Default.cshtml
+++ b/DigitalLearningSolutions.Web/Views/Shared/Components/Checkboxes/Default.cshtml
@@ -1,5 +1,5 @@
-@using NHSUKViewComponents.Web.Extensions
-@using NHSUKViewComponents.Web.ViewModels
+@using NHSETELViewComponents.Extensions
+@using NHSETELViewComponents.ViewModels
 @model CheckboxesViewModel
 
 <div class="nhsuk-form-group">
diff --git a/DigitalLearningSolutions.Web/Views/Shared/Components/DateInput/Default.cshtml b/DigitalLearningSolutions.Web/Views/Shared/Components/DateInput/Default.cshtml
index 0497063261..6645d22b81 100644
--- a/DigitalLearningSolutions.Web/Views/Shared/Components/DateInput/Default.cshtml
+++ b/DigitalLearningSolutions.Web/Views/Shared/Components/DateInput/Default.cshtml
@@ -1,4 +1,4 @@
-@using NHSUKViewComponents.Web.ViewModels
+@using NHSETELViewComponents.ViewModels
 @model DateInputViewModel
 
 @{
diff --git a/DigitalLearningSolutions.Web/Views/Shared/Components/DateRangeInput/Default.cshtml b/DigitalLearningSolutions.Web/Views/Shared/Components/DateRangeInput/Default.cshtml
index e4c17d4b3e..878650b7c2 100644
--- a/DigitalLearningSolutions.Web/Views/Shared/Components/DateRangeInput/Default.cshtml
+++ b/DigitalLearningSolutions.Web/Views/Shared/Components/DateRangeInput/Default.cshtml
@@ -1,4 +1,4 @@
-@using NHSUKViewComponents.Web.ViewModels
+@using NHSETELViewComponents.ViewModels
 @model DateRangeInputViewModel
 @{
     var hintText = string.Empty;
diff --git a/DigitalLearningSolutions.Web/Views/Shared/Components/DictionaryTextInput/Default.cshtml b/DigitalLearningSolutions.Web/Views/Shared/Components/DictionaryTextInput/Default.cshtml
index c84c470feb..8f698c36f0 100644
--- a/DigitalLearningSolutions.Web/Views/Shared/Components/DictionaryTextInput/Default.cshtml
+++ b/DigitalLearningSolutions.Web/Views/Shared/Components/DictionaryTextInput/Default.cshtml
@@ -1,5 +1,5 @@
 @using DigitalLearningSolutions.Web.ViewModels.Common.ViewComponents
-@using NHSUKViewComponents.Web.ViewModels
+@using NHSETELViewComponents.ViewModels
 @model DictionaryTextInputViewModel
 
 @if (Model.HintText != null)
diff --git a/DigitalLearningSolutions.Web/Views/Shared/Components/ErrorSummary/Default.cshtml b/DigitalLearningSolutions.Web/Views/Shared/Components/ErrorSummary/Default.cshtml
index 7f438d581e..f30542eef7 100644
--- a/DigitalLearningSolutions.Web/Views/Shared/Components/ErrorSummary/Default.cshtml
+++ b/DigitalLearningSolutions.Web/Views/Shared/Components/ErrorSummary/Default.cshtml
@@ -1,4 +1,4 @@
-@using NHSUKViewComponents.Web.ViewModels
+@using NHSETELViewComponents.ViewModels
 @model ErrorSummaryViewModel
 
 @if (Model.Errors.Any())
diff --git a/DigitalLearningSolutions.Web/Views/Shared/Components/FileInput/Default.cshtml b/DigitalLearningSolutions.Web/Views/Shared/Components/FileInput/Default.cshtml
index 79b129d069..d7729c78dd 100644
--- a/DigitalLearningSolutions.Web/Views/Shared/Components/FileInput/Default.cshtml
+++ b/DigitalLearningSolutions.Web/Views/Shared/Components/FileInput/Default.cshtml
@@ -1,5 +1,5 @@
-@using NHSUKViewComponents.Web.ViewModels
-@using NHSUKViewComponents.Web.Helpers
+@using NHSETELViewComponents.ViewModels
+@using NHSETELViewComponents.Helpers
 @model FileInputViewModel
 <div class="nhsuk-form-group @(Model.HasError ? "nhsuk-form-group--error" : "")">
   <label class="nhsuk-label" for="@Model.Name">
diff --git a/DigitalLearningSolutions.Web/Views/Shared/Components/NumericInput/Default.cshtml b/DigitalLearningSolutions.Web/Views/Shared/Components/NumericInput/Default.cshtml
index a331d6aacf..c8ce666d1c 100644
--- a/DigitalLearningSolutions.Web/Views/Shared/Components/NumericInput/Default.cshtml
+++ b/DigitalLearningSolutions.Web/Views/Shared/Components/NumericInput/Default.cshtml
@@ -1,5 +1,5 @@
-@using NHSUKViewComponents.Web.ViewModels
-@using NHSUKViewComponents.Web.Helpers
+@using NHSETELViewComponents.ViewModels
+@using NHSETELViewComponents.Helpers
 @model NumericInputViewModel
 <div class="nhsuk-form-group @(Model.HasError ? "nhsuk-form-group--error" : "")">
     <label class="nhsuk-label" for="@Model.Id">
diff --git a/DigitalLearningSolutions.Web/Views/Shared/Components/RadioList/Default.cshtml b/DigitalLearningSolutions.Web/Views/Shared/Components/RadioList/Default.cshtml
index 6306a40ddc..0bce97b3bf 100644
--- a/DigitalLearningSolutions.Web/Views/Shared/Components/RadioList/Default.cshtml
+++ b/DigitalLearningSolutions.Web/Views/Shared/Components/RadioList/Default.cshtml
@@ -1,5 +1,5 @@
-@using NHSUKViewComponents.Web.Extensions
-@using NHSUKViewComponents.Web.ViewModels
+@using NHSETELViewComponents.Extensions
+@using NHSETELViewComponents.ViewModels
 
 @model RadiosViewModel
 @{
@@ -133,4 +133,4 @@
 
         </div>
     </fieldset>
-</div>
\ No newline at end of file
+</div>
diff --git a/DigitalLearningSolutions.Web/Views/Shared/Components/SelectList/Default.cshtml b/DigitalLearningSolutions.Web/Views/Shared/Components/SelectList/Default.cshtml
index ebac476ebc..1828e0ea13 100644
--- a/DigitalLearningSolutions.Web/Views/Shared/Components/SelectList/Default.cshtml
+++ b/DigitalLearningSolutions.Web/Views/Shared/Components/SelectList/Default.cshtml
@@ -1,5 +1,5 @@
-@using NHSUKViewComponents.Web.ViewModels
-@using NHSUKViewComponents.Web.Helpers
+@using NHSETELViewComponents.ViewModels
+@using NHSETELViewComponents.Helpers
 @model SelectListViewModel
 
 <div class="nhsuk-form-group @(Model.HasError ? "nhsuk-form-group--error" : "")">
diff --git a/DigitalLearningSolutions.Web/Views/Shared/Components/SingleCheckbox/Default.cshtml b/DigitalLearningSolutions.Web/Views/Shared/Components/SingleCheckbox/Default.cshtml
index 32abe658a3..08fde967cc 100644
--- a/DigitalLearningSolutions.Web/Views/Shared/Components/SingleCheckbox/Default.cshtml
+++ b/DigitalLearningSolutions.Web/Views/Shared/Components/SingleCheckbox/Default.cshtml
@@ -1,4 +1,4 @@
-@using NHSUKViewComponents.Web.ViewModels
+@using NHSETELViewComponents.ViewModels
 @model CheckboxItemViewModel
 
 <div class="nhsuk-form-group @(Model.HasError ? "nhsuk-form-group--error" : "")">
diff --git a/DigitalLearningSolutions.Web/Views/Shared/Components/TextArea/Default.cshtml b/DigitalLearningSolutions.Web/Views/Shared/Components/TextArea/Default.cshtml
index 5de6dcecc1..71df8b9e2e 100644
--- a/DigitalLearningSolutions.Web/Views/Shared/Components/TextArea/Default.cshtml
+++ b/DigitalLearningSolutions.Web/Views/Shared/Components/TextArea/Default.cshtml
@@ -1,5 +1,5 @@
-@using NHSUKViewComponents.Web.ViewModels
-@using NHSUKViewComponents.Web.Helpers
+@using NHSETELViewComponents.ViewModels
+@using NHSETELViewComponents.Helpers
 @model TextAreaViewModel
 @{
     string? describedBy = ViewComponentDynamicAttributeHelper.GetAriaDescribedByAttribute(Model.Name, Model.HasError, Model.HintText);
diff --git a/DigitalLearningSolutions.Web/Views/Shared/Components/TextInput/Default.cshtml b/DigitalLearningSolutions.Web/Views/Shared/Components/TextInput/Default.cshtml
index 4cbdda05d0..78529a4100 100644
--- a/DigitalLearningSolutions.Web/Views/Shared/Components/TextInput/Default.cshtml
+++ b/DigitalLearningSolutions.Web/Views/Shared/Components/TextInput/Default.cshtml
@@ -1,5 +1,5 @@
-@using NHSUKViewComponents.Web.ViewModels
-@using NHSUKViewComponents.Web.Helpers
+@using NHSETELViewComponents.ViewModels
+@using NHSETELViewComponents.Helpers
 @model TextInputViewModel
 <div class="nhsuk-form-group @(Model.HasError ? "nhsuk-form-group--error" : "")">
     <label class="nhsuk-label @(string.IsNullOrWhiteSpace(Model.Label) ? "nhsuk-u-visually-hidden" : "")" for="@Model.Name">
diff --git a/DigitalLearningSolutions.Web/Views/Shared/_CheckboxItem.cshtml b/DigitalLearningSolutions.Web/Views/Shared/_CheckboxItem.cshtml
index 07b0d6f846..02148be94b 100644
--- a/DigitalLearningSolutions.Web/Views/Shared/_CheckboxItem.cshtml
+++ b/DigitalLearningSolutions.Web/Views/Shared/_CheckboxItem.cshtml
@@ -1,4 +1,4 @@
-@using NHSUKViewComponents.Web.ViewModels
+@using NHSETELViewComponents.ViewModels
 @model CheckboxItemViewModel
 @{
   var describedBy = "";
diff --git a/DigitalLearningSolutions.Web/Views/Shared/_TextInputItem.cshtml b/DigitalLearningSolutions.Web/Views/Shared/_TextInputItem.cshtml
index 7537bf1fc2..e4efbcd160 100644
--- a/DigitalLearningSolutions.Web/Views/Shared/_TextInputItem.cshtml
+++ b/DigitalLearningSolutions.Web/Views/Shared/_TextInputItem.cshtml
@@ -1,6 +1,6 @@
 @using DigitalLearningSolutions.Web.ViewModels.Common.ViewComponents
 @using DigitalLearningSolutions.Web.Helpers
-@using NHSUKViewComponents.Web.ViewModels
+@using NHSETELViewComponents.ViewModels
 @model TextInputViewModel
 <div class="nhsuk-form-group @(Model.HasError ? "nhsuk-form-group--error" : "")">
     <label class="nhsuk-label" for="@Model.Id">
diff --git a/DigitalLearningSolutions.Web/Views/SuperAdmin/Centres/CentreRoleLimits.cshtml b/DigitalLearningSolutions.Web/Views/SuperAdmin/Centres/CentreRoleLimits.cshtml
index d50a2534d6..29ab32d129 100644
--- a/DigitalLearningSolutions.Web/Views/SuperAdmin/Centres/CentreRoleLimits.cshtml
+++ b/DigitalLearningSolutions.Web/Views/SuperAdmin/Centres/CentreRoleLimits.cshtml
@@ -1,7 +1,7 @@
 @using DigitalLearningSolutions.Web.Extensions
 @using DigitalLearningSolutions.Web.ViewModels.SuperAdmin.Centres
 @using Microsoft.AspNetCore.Mvc.TagHelpers
-@using NHSUKViewComponents.Web.ViewComponents
+@using NHSETELViewComponents.ViewComponents
 @model CentreRoleLimitsViewModel;
 @{
     ViewData["Title"] = "Centre Role Limits";
diff --git a/DigitalLearningSolutions.Web/Views/SuperAdmin/Users/UserCentreAccounts.cshtml b/DigitalLearningSolutions.Web/Views/SuperAdmin/Users/UserCentreAccounts.cshtml
index e5991f80fe..4833d1801f 100644
--- a/DigitalLearningSolutions.Web/Views/SuperAdmin/Users/UserCentreAccounts.cshtml
+++ b/DigitalLearningSolutions.Web/Views/SuperAdmin/Users/UserCentreAccounts.cshtml
@@ -1,5 +1,5 @@
 @using DigitalLearningSolutions.Web.ViewModels.UserCentreAccounts
-@using NHSUKViewComponents.Web.ViewComponents
+@using NHSETELViewComponents.ViewComponents
 @model UserCentreAccountRoleViewModel
 @{
     ViewData["Title"] = "User Centre Accounts";
diff --git a/DigitalLearningSolutions.Web/Views/Support/RequestSupportTicket/RequestAttachment.cshtml b/DigitalLearningSolutions.Web/Views/Support/RequestSupportTicket/RequestAttachment.cshtml
index ea36caa814..a38d73db4c 100644
--- a/DigitalLearningSolutions.Web/Views/Support/RequestSupportTicket/RequestAttachment.cshtml
+++ b/DigitalLearningSolutions.Web/Views/Support/RequestSupportTicket/RequestAttachment.cshtml
@@ -2,7 +2,7 @@
 @using DigitalLearningSolutions.Web.Models.Enums
 @using DigitalLearningSolutions.Web.Extensions
 @using DigitalLearningSolutions.Web.ViewModels.Support.RequestSupportTicket
-@using NHSUKViewComponents.Web.ViewComponents
+@using NHSETELViewComponents.ViewComponents
 @using Microsoft.AspNetCore.Mvc.TagHelpers
 @model RequestAttachmentViewModel
 @{
diff --git a/DigitalLearningSolutions.Web/Views/TrackingSystem/CourseSetup/Shared/_EditCourseOptionsFormInputs.cshtml b/DigitalLearningSolutions.Web/Views/TrackingSystem/CourseSetup/Shared/_EditCourseOptionsFormInputs.cshtml
index 5fbcacecc0..a432aeae99 100644
--- a/DigitalLearningSolutions.Web/Views/TrackingSystem/CourseSetup/Shared/_EditCourseOptionsFormInputs.cshtml
+++ b/DigitalLearningSolutions.Web/Views/TrackingSystem/CourseSetup/Shared/_EditCourseOptionsFormInputs.cshtml
@@ -1,4 +1,4 @@
-@using NHSUKViewComponents.Web.ViewModels
+@using NHSETELViewComponents.ViewModels
 @model List<CheckboxListItemViewModel>
 
 <vc:checkboxes label=""
diff --git a/DigitalLearningSolutions.Web/Views/TrackingSystem/Delegates/Enrol/EnrolCompleteBy.cshtml b/DigitalLearningSolutions.Web/Views/TrackingSystem/Delegates/Enrol/EnrolCompleteBy.cshtml
index f54799e91f..9410f73af9 100644
--- a/DigitalLearningSolutions.Web/Views/TrackingSystem/Delegates/Enrol/EnrolCompleteBy.cshtml
+++ b/DigitalLearningSolutions.Web/Views/TrackingSystem/Delegates/Enrol/EnrolCompleteBy.cshtml
@@ -1,5 +1,5 @@
 @using DigitalLearningSolutions.Data.Utilities
-@using NHSUKViewComponents.Web.ViewComponents
+@using NHSETELViewComponents.ViewComponents
 @using DigitalLearningSolutions.Web.ViewModels.TrackingSystem.Delegates.Enrol
 @using Microsoft.AspNetCore.Mvc.TagHelpers
 @model CompletedByDateViewModel
diff --git a/DigitalLearningSolutions.Web/Views/_ViewImports.cshtml b/DigitalLearningSolutions.Web/Views/_ViewImports.cshtml
index e2c7616427..c29e899816 100644
--- a/DigitalLearningSolutions.Web/Views/_ViewImports.cshtml
+++ b/DigitalLearningSolutions.Web/Views/_ViewImports.cshtml
@@ -1,4 +1,4 @@
 @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
 @addTagHelper *, DigitalLearningSolutions.Web
 @addTagHelper *, Microsoft.FeatureManagement.AspNetCore
-@addTagHelper *, NHSUKViewComponents.Web
+@addTagHelper *, NHSETELViewComponents