diff --git a/DigitalLearningSolutions.Web/Models/Enums/CompetencyAssessmentsTab.cs b/DigitalLearningSolutions.Web/Models/Enums/CompetencyAssessmentsTab.cs
index c77a640c7e..ed435294f7 100644
--- a/DigitalLearningSolutions.Web/Models/Enums/CompetencyAssessmentsTab.cs
+++ b/DigitalLearningSolutions.Web/Models/Enums/CompetencyAssessmentsTab.cs
@@ -9,7 +9,7 @@ public class CompetencyAssessmentsTab : BaseTabEnumeration
             nameof(MyCompetencyAssessments),
             "CompetencyAssessments",
             "ViewCompetencyAssessments",
-            "My Competency Assessments",
+            "My Self-assessments",
             new Dictionary<string, string> { { "tabName", "Mine" } }
         );
 
@@ -18,7 +18,7 @@ public class CompetencyAssessmentsTab : BaseTabEnumeration
             nameof(AllCompetencyAssessments),
             "CompetencyAssessments",
             "ViewCompetencyAssessments",
-            "All Competency Assessments",
+            "All Self-assessments",
             new Dictionary<string, string> { { "tabName", "All" } }
         );
 
diff --git a/DigitalLearningSolutions.Web/ViewModels/CompetencyAssessments/BaseCompetencyAssessmentsPageViewModel.cs b/DigitalLearningSolutions.Web/ViewModels/CompetencyAssessments/BaseCompetencyAssessmentsPageViewModel.cs
index 01a65ba1ca..3bb675115d 100644
--- a/DigitalLearningSolutions.Web/ViewModels/CompetencyAssessments/BaseCompetencyAssessmentsPageViewModel.cs
+++ b/DigitalLearningSolutions.Web/ViewModels/CompetencyAssessments/BaseCompetencyAssessmentsPageViewModel.cs
@@ -60,7 +60,7 @@ private int OffsetFromPageNumber(int pageNumber) =>
     public static class CompetencyAssessmentSortByOptionTexts
     {
         public const string
-            CompetencyAssessmentName = "Competency Assessment",
+            CompetencyAssessmentName = "Self-assessment",
             CompetencyAssessmentOwner = "Owner",
             CompetencyAssessmentCreatedDate = "Created Date",
             CompetencyAssessmentPublishStatus = "Publish Status",
diff --git a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/AddCompetencies.cshtml b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/AddCompetencies.cshtml
index 119e3d17dd..727d842d9e 100644
--- a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/AddCompetencies.cshtml
+++ b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/AddCompetencies.cshtml
@@ -13,11 +13,11 @@
     <nav class="nhsuk-breadcrumb" aria-label="Breadcrumb">
         <div class="nhsuk-width-container">
             <ol class="nhsuk-breadcrumb__list">
-                <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ViewCompetencyAssessments" asp-route-tabname="Mine">Competency Assessments</a></li>
-                <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ManageCompetencyAssessment" asp-route-competencyAssessmentId="@Model.ID">Manage Competency Assessment</a></li>
+                <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ViewCompetencyAssessments" asp-route-tabname="Mine">Self-assessments</a></li>
+                <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ManageCompetencyAssessment" asp-route-competencyAssessmentId="@Model.ID">Manage self-assessment</a></li>
                 <li class="nhsuk-breadcrumb__item">Select Framework Sources</li>
             </ol>
-            <p class="nhsuk-breadcrumb__back"><a class="nhsuk-breadcrumb__backlink" asp-action="ManageCompetencyAssessment" asp-route-competencyAssessmentId="@Model.ID">Back to manage competency assessment</a></p>
+            <p class="nhsuk-breadcrumb__back"><a class="nhsuk-breadcrumb__backlink" asp-action="ManageCompetencyAssessment" asp-route-competencyAssessmentId="@Model.ID">Back to manage self-assessment</a></p>
         </div>
     </nav>
 }
diff --git a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/AddCompetenciesSelectFramework.cshtml b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/AddCompetenciesSelectFramework.cshtml
index d65981ca12..cda1e97ec5 100644
--- a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/AddCompetenciesSelectFramework.cshtml
+++ b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/AddCompetenciesSelectFramework.cshtml
@@ -13,11 +13,11 @@
     <nav class="nhsuk-breadcrumb" aria-label="Breadcrumb">
         <div class="nhsuk-width-container">
             <ol class="nhsuk-breadcrumb__list">
-                <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ViewCompetencyAssessments" asp-route-tabname="Mine">Competency Assessments</a></li>
-                <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ManageCompetencyAssessment" asp-route-competencyAssessmentId="@Model.ID">Manage Competency Assessment</a></li>
+                <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ViewCompetencyAssessments" asp-route-tabname="Mine">Self-assessments</a></li>
+                <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ManageCompetencyAssessment" asp-route-competencyAssessmentId="@Model.ID">Manage self-assessment</a></li>
                 <li class="nhsuk-breadcrumb__item">Select @Model.VocabularyPlural.ToLower() to assess</li>
             </ol>
-            <p class="nhsuk-breadcrumb__back"><a class="nhsuk-breadcrumb__backlink" asp-action="ManageCompetencyAssessment" asp-route-competencyAssessmentId="@Model.ID">Back to manage competency assessment</a></p>
+            <p class="nhsuk-breadcrumb__back"><a class="nhsuk-breadcrumb__backlink" asp-action="ManageCompetencyAssessment" asp-route-competencyAssessmentId="@Model.ID">Back to manage self-assessment</a></p>
         </div>
     </nav>
 }
@@ -32,7 +32,7 @@
         <fieldset class="nhsuk-fieldset">
             <legend class="nhsuk-fieldset__legend nhsuk-fieldset__legend--l">
                 <h2 class="nhsuk-fieldset__heading">
-                    Select the framework source you would like to use to add @Model.VocabularyPlural.ToLower() to this competency assessment.
+                    Select the framework source you would like to use to add @Model.VocabularyPlural.ToLower() to this self-assessment.
                 </h2>
             </legend>
             <div class="nhsuk-radios">
diff --git a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/CompetencyAssessmentFeatures.cshtml b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/CompetencyAssessmentFeatures.cshtml
index 1e5ef6a629..470c4695a7 100644
--- a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/CompetencyAssessmentFeatures.cshtml
+++ b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/CompetencyAssessmentFeatures.cshtml
@@ -1,7 +1,7 @@
 @using DigitalLearningSolutions.Web.ViewModels.CompetencyAssessments
 @model CompetencyAssessmentFeaturesViewModel
 @{
-    ViewData["Title"] = "Competency assessment features ";
+    ViewData["Title"] = "Self-assessment features ";
     ViewData["Application"] = "Framework Service";
     ViewData["HeaderPathName"] = "Framework Service";
 }
@@ -9,30 +9,30 @@
 @section NavMenuItems {
     <partial name="Shared/_NavMenuItems" />
 }
- @section NavBreadcrumbs {
+@section NavBreadcrumbs {
     <nav class="nhsuk-breadcrumb" aria-label="Breadcrumb">
         <div class="nhsuk-width-container">
             <ol class="nhsuk-breadcrumb__list">
-                <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ViewCompetencyAssessments" asp-route-tabname="Mine">Competency Assessments</a></li>
-                <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="CompetencyAssessmentName" asp-route-competencyAssessmentId="@Model.ID">Manage Competency Assessment</a></li>
-                <li class="nhsuk-breadcrumb__item">Competency assessment features</li>
+                <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ViewCompetencyAssessments" asp-route-tabname="Mine">self-assessments</a></li>
+                <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="CompetencyAssessmentName" asp-route-competencyAssessmentId="@Model.ID">Manage self-assessment</a></li>
+                <li class="nhsuk-breadcrumb__item">Self-assessment features</li>
             </ol>
         </div>
     </nav>
-} 
+}
 
-<h1>Create a new competency assessment</h1>
-<h2> Which features of the framework do you want to copy into the competency assessment?</h2>
+<h1>Create a new self-assessment</h1>
+<h2> Which features of the framework do you want to copy into the self-assessment?</h2>
 <p class="nhsuk-body-m">The framework itself will be used as the source for this self-assessment. </p>
-<p class="nhsuk-body-m">Select any additional features you want to copy into the competency assessment. You can edit all features later if needed.</p>
- <form method="post">
+<p class="nhsuk-body-m">Select any additional features you want to copy into the self-assessment. You can edit all features later if needed.</p>
+<form method="post">
     @if (!ViewData.ModelState.IsValid)
     {
         <partial name="_ErrorSummary" />
     }
-   
+
     <nhs-form-group>
-        <vc:single-checkbox asp-for="@nameof(Model.DescriptionStatus)" label="Description" hint-text="The framework description will be copied into the competency assessment description."></vc:single-checkbox>
+        <vc:single-checkbox asp-for="@nameof(Model.DescriptionStatus)" label="Description" hint-text="The framework description will be copied into the self-assessment description."></vc:single-checkbox>
     </nhs-form-group>
     <nhs-form-group>
         <vc:single-checkbox asp-for="@nameof(Model.ProviderandCategoryStatus)" label="Provider and category" hint-text="The framework branding (provider and category) will be copied."></vc:single-checkbox>
@@ -61,4 +61,4 @@
             Cancel
         </a>
     </div>
-</form> 
+</form>
diff --git a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/CompetencyAssessmentOptions.cshtml b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/CompetencyAssessmentOptions.cshtml
index c168d1f2ca..3c8f2c9a83 100644
--- a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/CompetencyAssessmentOptions.cshtml
+++ b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/CompetencyAssessmentOptions.cshtml
@@ -1,8 +1,8 @@
 @using DigitalLearningSolutions.Web.ViewModels.CompetencyAssessments
 @model OptionsLabelsViewModel
 @{
-    ViewData["Title"] = "Competency Assessment options and labels";
-    ViewData["Application"] = "Competency Assessment Service";
+    ViewData["Title"] = "Self-assessment options and labels";
+    ViewData["Application"] = "Self-assessment Service";
 
     var steps = new[]
     {
@@ -39,8 +39,8 @@
     <nav class="nhsuk-breadcrumb" aria-label="Breadcrumb">
         <div class="nhsuk-width-container">
             <ol class="nhsuk-breadcrumb__list">
-                <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ViewCompetencyAssessments" asp-route-tabname="Mine">Competency Assessments</a></li>
-                <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ManageCompetencyAssessment" asp-route-competencyAssessmentId="@Model.CompetencyAssessmentID">Manage Competency Assessment</a></li>
+                <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ViewCompetencyAssessments" asp-route-tabname="Mine">Self-assessments</a></li>
+                <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ManageCompetencyAssessment" asp-route-competencyAssessmentId="@Model.CompetencyAssessmentID">Manage self-assessment</a></li>
                 @foreach (var item in steps)
                 {
                     @if (Model.UserRole < 2)
@@ -69,7 +69,7 @@
                     </li>
                 }
             </ol>
-            <p class="nhsuk-breadcrumb__back"><a class="nhsuk-breadcrumb__backlink" asp-action="ManageCompetencyAssessment" asp-route-competencyAssessmentId="@Model.CompetencyAssessmentID">Back to manage competency assessment</a></p>
+            <p class="nhsuk-breadcrumb__back"><a class="nhsuk-breadcrumb__backlink" asp-action="ManageCompetencyAssessment" asp-route-competencyAssessmentId="@Model.CompetencyAssessmentID">Back to manage self-assessment</a></p>
         </div>
     </nav>
 }
diff --git a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/CompetencyAssessmentPreviewConfirm.cshtml b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/CompetencyAssessmentPreviewConfirm.cshtml
index ad81c18921..bc2ea4e2e4 100644
--- a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/CompetencyAssessmentPreviewConfirm.cshtml
+++ b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/CompetencyAssessmentPreviewConfirm.cshtml
@@ -4,9 +4,9 @@
 @inject IConfiguration Configuration
 
 @{
-    ViewData["Title"] = "Competency Assessment - Preview";
-    ViewData["Application"] = "Competency Assessment Service";
-    ViewData["HeaderPathName"] = "Competency Assessment Service";
+    ViewData["Title"] = "Self-assessment - Preview";
+    ViewData["Application"] = "Self-assessment Service";
+    ViewData["HeaderPathName"] = "Self-assessment Service";
 }
 
 @section NavMenuItems {
@@ -16,11 +16,11 @@
     <nav class="nhsuk-breadcrumb" aria-label="Breadcrumb">
         <div class="nhsuk-width-container">
             <ol class="nhsuk-breadcrumb__list">
-                <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ViewCompetencyAssessments" asp-route-tabname="Mine">Competency Assessments</a></li>
-                <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ManageCompetencyAssessment" asp-route-competencyAssessmentId="@Model.CompetencyAssessmentId">Manage Competency Assessment</a></li>
+                <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ViewCompetencyAssessments" asp-route-tabname="Mine">Self-assessments</a></li>
+                <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ManageCompetencyAssessment" asp-route-competencyAssessmentId="@Model.CompetencyAssessmentId">Manage self-assessment</a></li>
                 <li class="nhsuk-breadcrumb__item">Confirm Preview</li>
             </ol>
-            <p class="nhsuk-breadcrumb__back"><a class="nhsuk-breadcrumb__backlink" asp-action="ManageCompetencyAssessment" asp-route-competencyAssessmentId="@Model.CompetencyAssessmentId">Back to manage competency assessment</a></p>
+            <p class="nhsuk-breadcrumb__back"><a class="nhsuk-breadcrumb__backlink" asp-action="ManageCompetencyAssessment" asp-route-competencyAssessmentId="@Model.CompetencyAssessmentId">Back to manage self-assessment</a></p>
         </div>
     </nav>
 }
diff --git a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/CompetencyAssessmentSummary.cshtml b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/CompetencyAssessmentSummary.cshtml
index be9f1d0e0d..237e279722 100644
--- a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/CompetencyAssessmentSummary.cshtml
+++ b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/CompetencyAssessmentSummary.cshtml
@@ -1,7 +1,7 @@
 @using DigitalLearningSolutions.Web.ViewModels.CompetencyAssessments
 @model CompetencyAssessmentFeaturesViewModel
 @{
-    ViewData["Title"] = "Competency assessment features summary";
+    ViewData["Title"] = "Self-assessment features summary";
     ViewData["Application"] = "Framework Service";
     ViewData["HeaderPathName"] = "Framework Service";
 }
@@ -13,69 +13,69 @@
     <nav class="nhsuk-breadcrumb" aria-label="Breadcrumb">
         <div class="nhsuk-width-container">
             <ol class="nhsuk-breadcrumb__list">
-                <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ViewCompetencyAssessments" asp-route-tabname="Mine">Competency Assessments</a></li>
-                <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="CompetencyAssessmentFeatures" asp-route-competencyAssessmentId="@Model.ID" asp-route-frameworkId="@Model.FrameworkId">Competency Assessment Features</a></li>
-                <li class="nhsuk-breadcrumb__item">Competency assessment features summary</li>
+                <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ViewCompetencyAssessments" asp-route-tabname="Mine">Self-assessments</a></li>
+                <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="CompetencyAssessmentFeatures" asp-route-competencyAssessmentId="@Model.ID" asp-route-frameworkId="@Model.FrameworkId">Self-assessment features</a></li>
+                <li class="nhsuk-breadcrumb__item">Self-assessment features summary</li>
             </ol>
         </div>
     </nav>
 }
 
 
-<h1> Check your answer before creating competency assessment</h1>
- <form method="post">
+<h1> Check your answer before creating self-assessment</h1>
+<form method="post">
     @if (!ViewData.ModelState.IsValid)
     {
         <partial name="_ErrorSummary" />
     }
-<div class="nhsuk-u-reading-width">
-    <dl class="nhsuk-summary-list nhsuk-summary-list--no-border">
+    <div class="nhsuk-u-reading-width">
+        <dl class="nhsuk-summary-list nhsuk-summary-list--no-border">
 
-        <div class="nhsuk-summary-list__row">
-            <dt class="nhsuk-summary-list__key">
-                Assessment name
-            </dt>
-            <dd class="nhsuk-summary-list__value">
-                @Model.CompetencyAssessmentName
-            </dd>
-            <dd class="nhsuk-summary-list__actions">
+            <div class="nhsuk-summary-list__row">
+                <dt class="nhsuk-summary-list__key">
+                    Assessment name
+                </dt>
+                <dd class="nhsuk-summary-list__value">
+                    @Model.CompetencyAssessmentName
+                </dd>
+                <dd class="nhsuk-summary-list__actions">
                     <a asp-action="CompetencyAssessmentName" asp-route-actionName="Edit" asp-route-competencyAssessmentId="@ViewContext.RouteData.Values["competencyAssessmentId"]"
-                   asp-route-frameworkId="@ViewContext.RouteData.Values["frameworkId"]">
-                    Change<span class="nhsuk-u-visually-hidden"> assessment name</span>
-                </a>
-            </dd>
-        </div>
-        <div class="nhsuk-summary-list__row">
-            <dt class="nhsuk-summary-list__key">
-              Features to copy from framework
-            </dt>
-            <dd class="nhsuk-summary-list__value">
-                @if (Model.SelectedFeatures.Any())
-                {
-                    <ul class="nhsuk-list nhsuk-list--bullet">
-                        @foreach (var feature in Model.SelectedFeatures)
-                        {
-                            <li>@feature</li>
-                        }
-                    </ul>
-                }
-                else
-                {
-                    <span>No features selected</span>
-                }
-            </dd>
-            <dd class="nhsuk-summary-list__actions">
-                <a asp-action="CompetencyAssessmentFeatures"  asp-route-competencyAssessmentId="@ViewContext.RouteData.Values["competencyAssessmentId"]"
-                   asp-route-frameworkId="@ViewContext.RouteData.Values["frameworkId"]">
-                    Change<span class="nhsuk-u-visually-hidden"> features</span>
-                </a>
-            </dd>
-        </div>
-    </dl>
+                       asp-route-frameworkId="@ViewContext.RouteData.Values["frameworkId"]">
+                        Change<span class="nhsuk-u-visually-hidden"> assessment name</span>
+                    </a>
+                </dd>
+            </div>
+            <div class="nhsuk-summary-list__row">
+                <dt class="nhsuk-summary-list__key">
+                    Features to copy from framework
+                </dt>
+                <dd class="nhsuk-summary-list__value">
+                    @if (Model.SelectedFeatures.Any())
+                    {
+                        <ul class="nhsuk-list nhsuk-list--bullet">
+                            @foreach (var feature in Model.SelectedFeatures)
+                            {
+                                <li>@feature</li>
+                            }
+                        </ul>
+                    }
+                    else
+                    {
+                        <span>No features selected</span>
+                    }
+                </dd>
+                <dd class="nhsuk-summary-list__actions">
+                    <a asp-action="CompetencyAssessmentFeatures" asp-route-competencyAssessmentId="@ViewContext.RouteData.Values["competencyAssessmentId"]"
+                       asp-route-frameworkId="@ViewContext.RouteData.Values["frameworkId"]">
+                        Change<span class="nhsuk-u-visually-hidden"> features</span>
+                    </a>
+                </dd>
+            </div>
+        </dl>
         <input name="ID" type="hidden" asp-for="ID" />
         <input name="CompetencyAssessmentName" type="hidden" asp-for="CompetencyAssessmentName" />
         <input name="userRole" type="hidden" asp-for="UserRole" />
         <input name="FrameID" type="hidden" asp-for="FrameworkId" />
-</div>
-<button type="submit" class="nhsuk-button">Confirm and create assessment</button>
-</form> 
+    </div>
+    <button type="submit" class="nhsuk-button">Confirm and create assessment</button>
+</form>
diff --git a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/CompetencyAssessmentWorkingGroup.cshtml b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/CompetencyAssessmentWorkingGroup.cshtml
index feea611ff8..e78d280ba7 100644
--- a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/CompetencyAssessmentWorkingGroup.cshtml
+++ b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/CompetencyAssessmentWorkingGroup.cshtml
@@ -2,8 +2,8 @@
 @model WorkingGroupCollaboratorsViewModel
 @{
     ViewData["Title"] = "Assign working group";
-    ViewData["Application"] = "Competency Assessment Service";
-    ViewData["HeaderPathName"] = "Competency Assessment Service";
+    ViewData["Application"] = "Self-assessment Service";
+    ViewData["HeaderPathName"] = "Self-assessment Service";
     string errMsg = TempData["CompetencyAssessmentError"]?.ToString();
     if (!string.IsNullOrWhiteSpace(errMsg)) { Model.Error = true; }
 }
@@ -19,11 +19,11 @@
     <nav class="nhsuk-breadcrumb" aria-label="Breadcrumb">
         <div class="nhsuk-width-container">
             <ol class="nhsuk-breadcrumb__list">
-                <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ViewCompetencyAssessments" asp-route-tabname="Mine">Competency Assessments</a></li>
-                <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ManageCompetencyAssessment" asp-route-competencyAssessmentId="@Model.CompetencyAssessmentID">Manage Competency Assessment</a></li>
+                <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ViewCompetencyAssessments" asp-route-tabname="Mine">Self-assessments</a></li>
+                <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ManageCompetencyAssessment" asp-route-competencyAssessmentId="@Model.CompetencyAssessmentID">Manage self-assessment</a></li>
                 <li class="nhsuk-breadcrumb__item">Assign working group (contributors and reviewers)</li>
             </ol>
-            <p class="nhsuk-breadcrumb__back"><a class="nhsuk-breadcrumb__backlink" asp-action="ManageCompetencyAssessment" asp-route-competencyAssessmentId="@Model.CompetencyAssessmentID">Back to manage competency assessment</a></p>
+            <p class="nhsuk-breadcrumb__back"><a class="nhsuk-breadcrumb__backlink" asp-action="ManageCompetencyAssessment" asp-route-competencyAssessmentId="@Model.CompetencyAssessmentID">Back to manage self-assessment</a></p>
         </div>
     </nav>
 }
@@ -95,7 +95,7 @@
                 </label>
 
                 <div class="nhsuk-hint" id="add-user-hint">
-                    Provide the email address of a user with a registered DLS admin account to add as a Contributor (to help create your competency assessment) or Reviewer (to review your competency assessment and mark it as ready for publication).
+                    Provide the email address of a user with a registered DLS admin account to add as a Contributor (to help create your self-assessment) or Reviewer (to review your self-assessment and mark it as ready for publication).
                 </div>
                 @if (Model.Error)
                 {
diff --git a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/ConfirmChangePrimaryFramework.cshtml b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/ConfirmChangePrimaryFramework.cshtml
index 3ef1327b76..231b733c35 100644
--- a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/ConfirmChangePrimaryFramework.cshtml
+++ b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/ConfirmChangePrimaryFramework.cshtml
@@ -3,7 +3,7 @@
 @model ConfirmChangePrimaryFrameworkViewModel;
 @{
     var errorHasOccurred = !ViewData.ModelState.IsValid;
-    ViewData["Title"] = "Competency Assessments - Change primary framework";
+    ViewData["Title"] = "Self-assessments - change primary framework";
 }
 <div class="nhsuk-grid-row">
     <div class="nhsuk-grid-column-full">
@@ -24,7 +24,7 @@
             <input type="hidden" asp-for="AssessmentName" />
             <input type="hidden" asp-for="UserRole" />
             <input type="hidden" asp-for="Vocabulary" />
-      
+
             <vc:single-checkbox asp-for="@nameof(Model.Confirm)"
                                 label="I am sure that I wish to change the primary framework to @Model.FrameworkName "
                                 hint-text="" />
diff --git a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/ConfirmMakePrimaryFramework.cshtml b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/ConfirmMakePrimaryFramework.cshtml
index 1d70a73cf7..553a228baf 100644
--- a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/ConfirmMakePrimaryFramework.cshtml
+++ b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/ConfirmMakePrimaryFramework.cshtml
@@ -4,7 +4,7 @@
 
 @{
     var errorHasOccurred = !ViewData.ModelState.IsValid && ViewData.ModelState.ContainsKey(nameof(Model.Confirm));
-    ViewData["Title"] = "Competency Assessments - make primary framework";
+    ViewData["Title"] = "Self-assessments - make primary framework";
 }
 
 <div class="nhsuk-grid-row">
@@ -32,7 +32,7 @@
                             Description
                         </label>
                         <div class="nhsuk-hint nhsuk-checkboxes__hint" id="DescriptionStatus-item-hint">
-                            The framework description will be copied into the competency assessment description.
+                            The framework description will be copied into the self-assessment description.
                         </div>
                     </div>
                 </div>
diff --git a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/ConfirmRemoveFrameworkSource.cshtml b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/ConfirmRemoveFrameworkSource.cshtml
index a20a786820..579dde6b8f 100644
--- a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/ConfirmRemoveFrameworkSource.cshtml
+++ b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/ConfirmRemoveFrameworkSource.cshtml
@@ -3,7 +3,7 @@
 @model ConfirmRemoveFrameworkSourceViewModel;
 @{
     var errorHasOccurred = !ViewData.ModelState.IsValid;
-    ViewData["Title"] = "Competency Assessments - Remove source framework";
+    ViewData["Title"] = "Self-assessments - remove source framework";
 }
 <div class="nhsuk-grid-row">
     <div class="nhsuk-grid-column-full">
@@ -28,7 +28,7 @@
             <input type="hidden" asp-for="CompetencyCount" />
             <input type="hidden" asp-for="Vocabulary" />
             <p>
-                This competency assessment has @Model.CompetencyCount @DisplayStringHelper.PluraliseStringIfRequired(@Model.Vocabulary.ToLower(), Model.CompetencyCount)
+                This self-assessment has @Model.CompetencyCount @DisplayStringHelper.PluraliseStringIfRequired(@Model.Vocabulary.ToLower(), Model.CompetencyCount)
                 associated with it from the framework @Model.FrameworkName. Removing this
                 framework source will remove the @DisplayStringHelper.PluraliseStringIfRequired(@Model.Vocabulary.ToLower(), Model.CompetencyCount) from the assessment.
             </p>
diff --git a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/EditBranding.cshtml b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/EditBranding.cshtml
index 2ea90d43d3..1d8d0a8158 100644
--- a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/EditBranding.cshtml
+++ b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/EditBranding.cshtml
@@ -13,11 +13,11 @@
     <nav class="nhsuk-breadcrumb" aria-label="Breadcrumb">
         <div class="nhsuk-width-container">
             <ol class="nhsuk-breadcrumb__list">
-                <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ViewCompetencyAssessments" asp-route-tabname="Mine">Competency Assessments</a></li>
-                <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ManageCompetencyAssessment" asp-route-competencyAssessmentId="@Model.ID">Manage Competency Assessment</a></li>
+                <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ViewCompetencyAssessments" asp-route-tabname="Mine">Self-assessments</a></li>
+                <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ManageCompetencyAssessment" asp-route-competencyAssessmentId="@Model.ID">Manage self-assessment</a></li>
                 <li class="nhsuk-breadcrumb__item">Brand and category</li>
             </ol>
-            <p class="nhsuk-breadcrumb__back"><a class="nhsuk-breadcrumb__backlink" asp-action="ManageCompetencyAssessment" asp-route-competencyAssessmentId="@Model.ID">Back to competency assessment detail</a></p>
+            <p class="nhsuk-breadcrumb__back"><a class="nhsuk-breadcrumb__backlink" asp-action="ManageCompetencyAssessment" asp-route-competencyAssessmentId="@Model.ID">Back to self-assessment detail</a></p>
         </div>
     </nav>
 }
diff --git a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/EditCompetencyRoleRequirements.cshtml b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/EditCompetencyRoleRequirements.cshtml
index 73e7c2f74c..09b5647a45 100644
--- a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/EditCompetencyRoleRequirements.cshtml
+++ b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/EditCompetencyRoleRequirements.cshtml
@@ -13,8 +13,8 @@
     <nav class="nhsuk-breadcrumb" aria-label="Breadcrumb">
         <div class="nhsuk-width-container">
             <ol class="nhsuk-breadcrumb__list">
-                <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ViewCompetencyAssessments" asp-route-tabname="Mine">Competency Assessments</a></li>
-                <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ManageCompetencyAssessment" asp-route-competencyAssessmentId="@Model.Id">Manage Competency Assessment</a></li>
+                <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ViewCompetencyAssessments" asp-route-tabname="Mine">Self-assessments</a></li>
+                <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ManageCompetencyAssessment" asp-route-competencyAssessmentId="@Model.Id">Manage self-assessment</a></li>
                 <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ManageCompetencyRoleRequirements" asp-route-competencyAssessmentId="@Model.Id">Role Requirements</a></li>
                 <li class="nhsuk-breadcrumb__item">Edit Role Requirements</li>
             </ol>
diff --git a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/EditDescription.cshtml b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/EditDescription.cshtml
index 39b21d1c2d..2bebab49e2 100644
--- a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/EditDescription.cshtml
+++ b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/EditDescription.cshtml
@@ -14,11 +14,11 @@
     <nav class="nhsuk-breadcrumb" aria-label="Breadcrumb">
         <div class="nhsuk-width-container">
             <ol class="nhsuk-breadcrumb__list">
-                <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ViewCompetencyAssessments" asp-route-tabname="Mine">Competency Assessments</a></li>
-                <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ManageCompetencyAssessment" asp-route-competencyAssessmentId="@Model.ID">Manage Competency Assessment</a></li>
+                <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ViewCompetencyAssessments" asp-route-tabname="Mine">Self-assessments</a></li>
+                <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ManageCompetencyAssessment" asp-route-competencyAssessmentId="@Model.ID">Manage self-assessment</a></li>
                 <li class="nhsuk-breadcrumb__item">Introductory text</li>
             </ol>
-            <p class="nhsuk-breadcrumb__back"><a class="nhsuk-breadcrumb__backlink" asp-action="ManageCompetencyAssessment" asp-route-competencyAssessmentId="@Model.ID">Back to competency assessment detail</a></p>
+            <p class="nhsuk-breadcrumb__back"><a class="nhsuk-breadcrumb__backlink" asp-action="ManageCompetencyAssessment" asp-route-competencyAssessmentId="@Model.ID">Back to self-assessment detail</a></p>
         </div>
     </nav>
 }
diff --git a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/EditIncludeRequirementsFilters.cshtml b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/EditIncludeRequirementsFilters.cshtml
index 453e9775b4..27fcc25321 100644
--- a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/EditIncludeRequirementsFilters.cshtml
+++ b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/EditIncludeRequirementsFilters.cshtml
@@ -13,8 +13,8 @@
     <nav class="nhsuk-breadcrumb" aria-label="Breadcrumb">
         <div class="nhsuk-width-container">
             <ol class="nhsuk-breadcrumb__list">
-                <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ViewCompetencyAssessments" asp-route-tabname="Mine">Competency Assessments</a></li>
-                <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ManageCompetencyAssessment" asp-route-competencyAssessmentId="@Model.Id">Manage Competency Assessment</a></li>
+                <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ViewCompetencyAssessments" asp-route-tabname="Mine">Self-assessments</a></li>
+                <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ManageCompetencyAssessment" asp-route-competencyAssessmentId="@Model.Id">Manage self-assessment</a></li>
                 <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ManageCompetencyRoleRequirements" asp-route-competencyAssessmentId="@Model.Id">Role Requirements</a></li>
                 <li class="nhsuk-breadcrumb__item">Edit Include Requirement Filters</li>
             </ol>
diff --git a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/EditQuestionResponseRoleRequirements.cshtml b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/EditQuestionResponseRoleRequirements.cshtml
index 3d0a0aa099..fe1b2ef84f 100644
--- a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/EditQuestionResponseRoleRequirements.cshtml
+++ b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/EditQuestionResponseRoleRequirements.cshtml
@@ -13,8 +13,8 @@
     <nav class="nhsuk-breadcrumb" aria-label="Breadcrumb">
         <div class="nhsuk-width-container">
             <ol class="nhsuk-breadcrumb__list">
-                <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ViewCompetencyAssessments" asp-route-tabname="Mine">Competency Assessments</a></li>
-                <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ManageCompetencyAssessment" asp-route-competencyAssessmentId="@Model.Id">Manage Competency Assessment</a></li>
+                <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ViewCompetencyAssessments" asp-route-tabname="Mine">Self-assessments</a></li>
+                <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ManageCompetencyAssessment" asp-route-competencyAssessmentId="@Model.Id">Manage self-assessment</a></li>
                 <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ManageCompetencyRoleRequirements" asp-route-competencyAssessmentId="@Model.Id">Role Requirements</a></li>
                 <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="EditCompetencyRoleRequirements" asp-route-competencyAssessmentId="@Model.Id">Edit Role Requirements</a></li>
                 <li class="nhsuk-breadcrumb__item">Set Role Requirements</li>
diff --git a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/EditRoleProfileLinks.cshtml b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/EditRoleProfileLinks.cshtml
index 81e02bd981..a882b8cd81 100644
--- a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/EditRoleProfileLinks.cshtml
+++ b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/EditRoleProfileLinks.cshtml
@@ -13,11 +13,11 @@
     <nav class="nhsuk-breadcrumb" aria-label="Breadcrumb">
         <div class="nhsuk-width-container">
             <ol class="nhsuk-breadcrumb__list">
-                <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ViewCompetencyAssessments" asp-route-tabname="Mine">Competency Assessments</a></li>
-                <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ManageCompetencyAssessment" asp-route-competencyAssessmentId="@Model.ID">Manage Competency Assessment</a></li>
+                <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ViewCompetencyAssessments" asp-route-tabname="Mine">Self-assessments</a></li>
+                <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ManageCompetencyAssessment" asp-route-competencyAssessmentId="@Model.ID">Manage self-assessment</a></li>
                 <li class="nhsuk-breadcrumb__item">Role Profile Links</li>
             </ol>
-            <p class="nhsuk-breadcrumb__back"><a class="nhsuk-breadcrumb__backlink" asp-action="ManageCompetencyAssessment" asp-route-competencyAssessmentId="@Model.ID">Back to competency assessment detail</a></p>
+            <p class="nhsuk-breadcrumb__back"><a class="nhsuk-breadcrumb__backlink" asp-action="ManageCompetencyAssessment" asp-route-competencyAssessmentId="@Model.ID">Back to self-assessment detail</a></p>
         </div>
     </nav>
 }
diff --git a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/EditVocabulary.cshtml b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/EditVocabulary.cshtml
index b38c313e17..c7a0f559b8 100644
--- a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/EditVocabulary.cshtml
+++ b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/EditVocabulary.cshtml
@@ -13,11 +13,11 @@
     <nav class="nhsuk-breadcrumb" aria-label="Breadcrumb">
         <div class="nhsuk-width-container">
             <ol class="nhsuk-breadcrumb__list">
-                <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ViewCompetencyAssessments" asp-route-tabname="Mine">Competency Assessments</a></li>
-                <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ManageCompetencyAssessment" asp-route-competencyAssessmentId="@Model.ID">Manage Competency Assessment</a></li>
+                <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ViewCompetencyAssessments" asp-route-tabname="Mine">Self-assessments</a></li>
+                <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ManageCompetencyAssessment" asp-route-competencyAssessmentId="@Model.ID">Manage self-assessment</a></li>
                 <li class="nhsuk-breadcrumb__item">Brand and category</li>
             </ol>
-            <p class="nhsuk-breadcrumb__back"><a class="nhsuk-breadcrumb__backlink" asp-action="ManageCompetencyAssessment" asp-route-competencyAssessmentId="@Model.ID">Back to competency assessment detail</a></p>
+            <p class="nhsuk-breadcrumb__back"><a class="nhsuk-breadcrumb__backlink" asp-action="ManageCompetencyAssessment" asp-route-competencyAssessmentId="@Model.ID">Back to self-assessment detail</a></p>
         </div>
     </nav>
 }
diff --git a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/EnforceRoleRequirementsForSignOff.cshtml b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/EnforceRoleRequirementsForSignOff.cshtml
index 081d6d7601..bb4a1e41e7 100644
--- a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/EnforceRoleRequirementsForSignOff.cshtml
+++ b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/EnforceRoleRequirementsForSignOff.cshtml
@@ -13,8 +13,8 @@
     <nav class="nhsuk-breadcrumb" aria-label="Breadcrumb">
         <div class="nhsuk-width-container">
             <ol class="nhsuk-breadcrumb__list">
-                <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ViewCompetencyAssessments" asp-route-tabname="Mine">Competency Assessments</a></li>
-                <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ManageCompetencyAssessment" asp-route-competencyAssessmentId="@Model.Id">Manage Competency Assessment</a></li>
+                <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ViewCompetencyAssessments" asp-route-tabname="Mine">Self-assessments</a></li>
+                <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ManageCompetencyAssessment" asp-route-competencyAssessmentId="@Model.Id">Manage self-assessment</a></li>
                 <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ManageCompetencyRoleRequirements" asp-route-competencyAssessmentId="@Model.Id">Role Requirements</a></li>
                 <li class="nhsuk-breadcrumb__item">Enforce Role Requirements</li>
             </ol>
diff --git a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/Index.cshtml b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/Index.cshtml
index 0c6f91d80a..d29f343fd7 100644
--- a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/Index.cshtml
+++ b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/Index.cshtml
@@ -2,35 +2,35 @@
 @model CompetencyAssessmentsViewModel
 
 @{
-  ViewData["Title"] = (string)ViewContext.RouteData.Values["tabname"] == "Mine" ? "My Competency Assessments" : "All Competency Assessments";
-  ViewData["Application"] = "Framework Service";
+    ViewData["Title"] = (string)ViewContext.RouteData.Values["tabname"] == "Mine" ? "My self-assessments" : "All self-assessments";
+    ViewData["Application"] = "Framework Service";
 }
 <link rel="stylesheet" href="@Url.Content("~/css/frameworks/frameworksShared.css")" asp-append-version="true">
 @section NavMenuItems {
-  <partial name="~/Views/Frameworks/Shared/_NavMenuItems.cshtml" />
+    <partial name="~/Views/Frameworks/Shared/_NavMenuItems.cshtml" />
 }
-  @section NavBreadcrumbs {
-  <nav class="nhsuk-breadcrumb" aria-label="Breadcrumb">
-    <div class="nhsuk-width-container">
-      <ol class="nhsuk-breadcrumb__list">
-        <li class="nhsuk-breadcrumb__item">Competency Assessments</li>
-      </ol>
-    </div>
-  </nav>
+@section NavBreadcrumbs {
+    <nav class="nhsuk-breadcrumb" aria-label="Breadcrumb">
+        <div class="nhsuk-width-container">
+            <ol class="nhsuk-breadcrumb__list">
+                <li class="nhsuk-breadcrumb__item">Self-assessments</li>
+            </ol>
+        </div>
+    </nav>
 }
-  @if (Model.IsWorkforceContributor | Model.IsWorkforceManager)
+@if (Model.IsWorkforceContributor | Model.IsWorkforceManager)
 {
-  <partial name="_SecondaryTabsNavMenu" model="Model.TabNavLinks" />
+    <partial name="_SecondaryTabsNavMenu" model="Model.TabNavLinks" />
 }
 <div class="nhsuk-grid-row">
-  <div class="nhsuk-grid-column-full">
-    @if ((string)ViewContext.RouteData.Values["tabname"] == "Mine")
-    {
+    <div class="nhsuk-grid-column-full">
+        @if ((string)ViewContext.RouteData.Values["tabname"] == "Mine")
+        {
             <partial name="_MyCompetencyAssessments.cshtml" model="Model.MyCompetencyAssessmentsViewModel" />
-    }
-    else if ((string)ViewContext.RouteData.Values["tabname"] == "All")
-    {
+        }
+        else if ((string)ViewContext.RouteData.Values["tabname"] == "All")
+        {
             <partial name="_AllCompetencyAssessments.cshtml" model="Model.AllCompetencyAssessmentsViewModel" />
-    }
-  </div>
+        }
+    </div>
 </div>
diff --git a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/LearnerSignoffDeclaration.cshtml b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/LearnerSignoffDeclaration.cshtml
index d1ea62cb3d..79ba557129 100644
--- a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/LearnerSignoffDeclaration.cshtml
+++ b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/LearnerSignoffDeclaration.cshtml
@@ -13,8 +13,8 @@
     <nav class="nhsuk-breadcrumb" aria-label="Breadcrumb">
         <div class="nhsuk-width-container">
             <ol class="nhsuk-breadcrumb__list">
-                <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ViewCompetencyAssessments" asp-route-tabname="Mine">Competency Assessments</a></li>
-                <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ManageCompetencyAssessment" asp-route-competencyAssessmentId="@Model.CompetencyAssessmentId">Manage Competency Assessment</a></li>
+                <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ViewCompetencyAssessments" asp-route-tabname="Mine">Self-assessments</a></li>
+                <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ManageCompetencyAssessment" asp-route-competencyAssessmentId="@Model.CompetencyAssessmentId">Manage self-assessment</a></li>
                 <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="SupervisedSelfAssessmentSignoff" asp-route-competencyAssessmentId="@Model.CompetencyAssessmentId" asp-route-actionName="Signoff">Supervisor roles</a></li>
                 <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="SupervisorSignoffDeclaration" asp-route-competencyAssessmentId="@Model.CompetencyAssessmentId" asp-route-actionName="Supervisor">Supervisor sign off declaration</a></li>
                 <li class="nhsuk-breadcrumb__item">Learner sign off declaration</li>
diff --git a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/ManageCompetencyAssessment.cshtml b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/ManageCompetencyAssessment.cshtml
index ce881fc82e..8f08b6399c 100644
--- a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/ManageCompetencyAssessment.cshtml
+++ b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/ManageCompetencyAssessment.cshtml
@@ -1,7 +1,7 @@
 @using DigitalLearningSolutions.Web.ViewModels.CompetencyAssessments
 @model ManageCompetencyAssessmentViewModel
 @{
-    ViewData["Title"] = Model.PublishStatusID == 3 ? "Manage" : "Create" + " competency assessment";
+    ViewData["Title"] = Model.PublishStatusID == 3 ? "Manage" : "Create" + " self-assessment";
     ViewData["Application"] = "Framework Service";
 }
 <link rel="stylesheet" href="@Url.Content("~/css/frameworks/frameworksShared.css")" asp-append-version="true">
@@ -12,12 +12,12 @@
     <nav class="nhsuk-breadcrumb" aria-label="Breadcrumb">
         <div class="nhsuk-width-container">
             <ol class="nhsuk-breadcrumb__list">
-                <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ViewCompetencyAssessments" asp-route-tabname="Mine">Competency Assessments</a></li>
+                <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ViewCompetencyAssessments" asp-route-tabname="Mine">Self-assessments</a></li>
                 <li class="nhsuk-breadcrumb__item">@Model.CompetencyAssessmentName</li>
             </ol>
             <p class="nhsuk-breadcrumb__back">
                 <a class="nhsuk-breadcrumb__backlink" asp-action="ViewCompetencyAssessments" asp-route-tabname="Mine">
-                    <span class="nhsuk-u-visually-hidden">Back to &nbsp;</span>Competency Assessments
+                    <span class="nhsuk-u-visually-hidden">Back to &nbsp;</span>Self-assessments
                 </a>
             </p>
         </div>
diff --git a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/ManageCompetencyRoleRequirements.cshtml b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/ManageCompetencyRoleRequirements.cshtml
index 2616d61d71..bc2f9b41a8 100644
--- a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/ManageCompetencyRoleRequirements.cshtml
+++ b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/ManageCompetencyRoleRequirements.cshtml
@@ -13,11 +13,11 @@
     <nav class="nhsuk-breadcrumb" aria-label="Breadcrumb">
         <div class="nhsuk-width-container">
             <ol class="nhsuk-breadcrumb__list">
-                <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ViewCompetencyAssessments" asp-route-tabname="Mine">Competency Assessments</a></li>
-                <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ManageCompetencyAssessment" asp-route-competencyAssessmentId="@Model.Id">Manage Competency Assessment</a></li>
+                <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ViewCompetencyAssessments" asp-route-tabname="Mine">Self-assessments</a></li>
+                <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ManageCompetencyAssessment" asp-route-competencyAssessmentId="@Model.Id">Manage self-assessment</a></li>
                 <li class="nhsuk-breadcrumb__item">Role Requirements</li>
             </ol>
-            <p class="nhsuk-breadcrumb__back"><a class="nhsuk-breadcrumb__backlink" asp-action="ManageCompetencyAssessment" asp-route-competencyAssessmentId="@Model.Id">Back to manage competency assessment</a></p>
+            <p class="nhsuk-breadcrumb__back"><a class="nhsuk-breadcrumb__backlink" asp-action="ManageCompetencyAssessment" asp-route-competencyAssessmentId="@Model.Id">Back to manage self-assessment</a></p>
         </div>
     </nav>
 }
diff --git a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/ManageOptionalCompetencies.cshtml b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/ManageOptionalCompetencies.cshtml
index bbe7a66eb9..e47c1b04d4 100644
--- a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/ManageOptionalCompetencies.cshtml
+++ b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/ManageOptionalCompetencies.cshtml
@@ -13,11 +13,11 @@
     <nav class="nhsuk-breadcrumb" aria-label="Breadcrumb">
         <div class="nhsuk-width-container">
             <ol class="nhsuk-breadcrumb__list">
-                <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ViewCompetencyAssessments" asp-route-tabname="Mine">Competency Assessments</a></li>
-                <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ManageCompetencyAssessment" asp-route-competencyAssessmentId="@Model.ID">Manage Competency Assessment</a></li>
+                <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ViewCompetencyAssessments" asp-route-tabname="Mine">Self-assessments</a></li>
+                <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ManageCompetencyAssessment" asp-route-competencyAssessmentId="@Model.ID">Manage self-assessment</a></li>
                 <li class="nhsuk-breadcrumb__item">Optional Competencies</li>
             </ol>
-            <p class="nhsuk-breadcrumb__back"><a class="nhsuk-breadcrumb__backlink" asp-action="ManageCompetencyAssessment" asp-route-competencyAssessmentId="@Model.ID">Back to manage competency assessment</a></p>
+            <p class="nhsuk-breadcrumb__back"><a class="nhsuk-breadcrumb__backlink" asp-action="ManageCompetencyAssessment" asp-route-competencyAssessmentId="@Model.ID">Back to manage self-assessment</a></p>
         </div>
     </nav>
 }
diff --git a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/ManageSupervisionSettings.cshtml b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/ManageSupervisionSettings.cshtml
index f51989053a..61da18adbc 100644
--- a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/ManageSupervisionSettings.cshtml
+++ b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/ManageSupervisionSettings.cshtml
@@ -11,8 +11,8 @@
     <nav class="nhsuk-breadcrumb" aria-label="Breadcrumb">
         <div class="nhsuk-width-container">
             <ol class="nhsuk-breadcrumb__list">
-                <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ViewCompetencyAssessments" asp-route-tabname="Mine">Competency Assessments</a></li>
-                <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ManageCompetencyAssessment" asp-route-competencyAssessmentId="@Model.CompetencyAssessmentId">Manage Competency Assessment</a></li>
+                <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ViewCompetencyAssessments" asp-route-tabname="Mine">Self-assessments</a></li>
+                <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ManageCompetencyAssessment" asp-route-competencyAssessmentId="@Model.CompetencyAssessmentId">Manage self-assessment</a></li>
                 @if (Model.UserRole > 1)
                 {
                     <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="SupervisedSelfAssessmentSignoff" asp-route-competencyAssessmentId="@Model.CompetencyAssessmentId" asp-route-actionName="Signoff">Supervisor roles</a></li>
diff --git a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/Name.cshtml b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/Name.cshtml
index 69feaf3825..8430a53f56 100644
--- a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/Name.cshtml
+++ b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/Name.cshtml
@@ -1,49 +1,49 @@
 @using DigitalLearningSolutions.Data.Models.CompetencyAssessments;
 @model CompetencyAssessmentBase;
 @{
-    ViewData["Title"] = "New Competency Assessments";
+    ViewData["Title"] = "New self-assessments";
     ViewData["Application"] = "Framework Service";
 }
 <link rel="stylesheet" href="@Url.Content("~/css/frameworks/frameworksShared.css")" asp-append-version="true">
 @section NavMenuItems {
     <partial name="~/Views/Frameworks/Shared/_NavMenuItems.cshtml" />
 }
-  @if ((string)ViewContext.RouteData.Values["actionname"] == "New")
+@if ((string)ViewContext.RouteData.Values["actionname"] == "New")
 {
     @section NavBreadcrumbs {
-    <nav class="nhsuk-breadcrumb" aria-label="Breadcrumb">
-        <div class="nhsuk-width-container">
-            <ol class="nhsuk-breadcrumb__list">
-                <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ViewCompetencyAssessments" asp-route-tabname="Mine">Competency Assessments</a></li>
-                <li class="nhsuk-breadcrumb__item">Create competency assessment</li>
-            </ol>
-            <p class="nhsuk-breadcrumb__back"><a class="nhsuk-breadcrumb__backlink" asp-action="ViewCompetencyAssessments" asp-route-tabname="Mine">Back to competency assessments</a></p>
-        </div>
-    </nav>
+        <nav class="nhsuk-breadcrumb" aria-label="Breadcrumb">
+            <div class="nhsuk-width-container">
+                <ol class="nhsuk-breadcrumb__list">
+                    <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ViewCompetencyAssessments" asp-route-tabname="Mine">Self-assessments</a></li>
+                    <li class="nhsuk-breadcrumb__item">Create self-assessment</li>
+                </ol>
+                <p class="nhsuk-breadcrumb__back"><a class="nhsuk-breadcrumb__backlink" asp-action="ViewCompetencyAssessments" asp-route-tabname="Mine">Back to self-assessments</a></p>
+            </div>
+        </nav>
     }
 }
 else
 {
     @section NavBreadcrumbs {
-    <nav class="nhsuk-breadcrumb" aria-label="Breadcrumb">
-        <div class="nhsuk-width-container">
-            <ol class="nhsuk-breadcrumb__list">
-                <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ViewCompetencyAssessments" asp-route-tabname="Mine">Competency Assessments</a></li>
-                <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ManageCompetencyAssessment" asp-route-competencyAssessmentId="@Model.ID">Manage Competency Assessment</a></li>
-                <li class="nhsuk-breadcrumb__item">Name</li>
-            </ol>
-            <p class="nhsuk-breadcrumb__back"><a class="nhsuk-breadcrumb__backlink" asp-action="ManageCompetencyAssessment" asp-route-competencyAssessmentId="@Model.ID">Back to competency assessment detail</a></p>
-        </div>
-    </nav>
+        <nav class="nhsuk-breadcrumb" aria-label="Breadcrumb">
+            <div class="nhsuk-width-container">
+                <ol class="nhsuk-breadcrumb__list">
+                    <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ViewCompetencyAssessments" asp-route-tabname="Mine">Self-assessments</a></li>
+                    <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ManageCompetencyAssessment" asp-route-competencyAssessmentId="@Model.ID">Manage self-assessment</a></li>
+                    <li class="nhsuk-breadcrumb__item">Name</li>
+                </ol>
+                <p class="nhsuk-breadcrumb__back"><a class="nhsuk-breadcrumb__backlink" asp-action="ManageCompetencyAssessment" asp-route-competencyAssessmentId="@Model.ID">Back to self-assessment detail</a></p>
+            </div>
+        </nav>
     }
 }
 @if ((string)ViewContext.RouteData.Values["actionName"] == "New")
 {
-    <h1>Create a new competency assessment</h1>
+    <h1>Create a new self-assessment</h1>
 }
 else
 {
-    <h1>Edit competency assessment name</h1>
+    <h1>Edit self-assessment name</h1>
 }
 <form method="post">
     @if (!ViewData.ModelState.IsValid)
@@ -52,7 +52,7 @@ else
     }
     <nhs-form-group nhs-validation-for="CompetencyAssessmentName">
         <label class="nhsuk-label" for="roleprofilename">
-            <h2>What is the name of your competency assessment?</h2>
+            <h2>What is the name of your self-assessment?</h2>
         </label>
         <div class="nhsuk-hint" id="assessment-name-hint">
             Choose a title that identifies scope of capabilities covered and/or the roles or levels the assessment targets.
diff --git a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/PublishReview.cshtml b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/PublishReview.cshtml
index 4c8edd4950..81687e9230 100644
--- a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/PublishReview.cshtml
+++ b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/PublishReview.cshtml
@@ -13,8 +13,8 @@
     <nav class="nhsuk-breadcrumb" aria-label="Breadcrumb">
         <div class="nhsuk-width-container">
             <ol class="nhsuk-breadcrumb__list">
-                <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ViewCompetencyAssessments" asp-route-tabname="Mine">Competency Assessments</a></li>
-                <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ManageCompetencyAssessment" asp-route-competencyAssessmentId="@Model.CompetencyAssessmentID">Manage Competency Assessment</a></li>
+                <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ViewCompetencyAssessments" asp-route-tabname="Mine">Self-assessments</a></li>
+                <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ManageCompetencyAssessment" asp-route-competencyAssessmentId="@Model.CompetencyAssessmentID">Manage self-assessment</a></li>
                 <li class="nhsuk-breadcrumb__item">Publish</li>
             </ol>
 
diff --git a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/PublishWithoutReview.cshtml b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/PublishWithoutReview.cshtml
index 3a0c1ec716..18619ace30 100644
--- a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/PublishWithoutReview.cshtml
+++ b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/PublishWithoutReview.cshtml
@@ -11,8 +11,8 @@
     <nav class="nhsuk-breadcrumb" aria-label="Breadcrumb">
         <div class="nhsuk-width-container">
             <ol class="nhsuk-breadcrumb__list">
-                <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ViewCompetencyAssessments" asp-route-tabname="Mine">Competency Assessments</a></li>
-                <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ManageCompetencyAssessment" asp-route-competencyAssessmentId="@Model.CompetencyAssessmentID">Manage Competency Assessment</a></li>
+                <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ViewCompetencyAssessments" asp-route-tabname="Mine">Self-assessments</a></li>
+                <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ManageCompetencyAssessment" asp-route-competencyAssessmentId="@Model.CompetencyAssessmentID">Manage self-assessment</a></li>
                 <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="SendForReview" asp-route-competencyAssessmentId="@Model.CompetencyAssessmentID">Send for Review</a></li>
                 <li class="nhsuk-breadcrumb__item">Publish without review</li>
 
diff --git a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/RemoveCompetencyGroupConfirm.cshtml b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/RemoveCompetencyGroupConfirm.cshtml
index 7a0375c1b8..70da8b4dda 100644
--- a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/RemoveCompetencyGroupConfirm.cshtml
+++ b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/RemoveCompetencyGroupConfirm.cshtml
@@ -5,8 +5,8 @@
 
 @{
     ViewData["Title"] = "Competency Group - Confirm remove";
-    ViewData["Application"] = "Competency Assessment Service";
-    ViewData["HeaderPathName"] = "Competency Assessment Service";
+    ViewData["Application"] = "Self-assessment Service";
+    ViewData["HeaderPathName"] = "Self-assessment Service";
 }
 
 @section NavMenuItems {
@@ -16,12 +16,12 @@
     <nav class="nhsuk-breadcrumb" aria-label="Breadcrumb">
         <div class="nhsuk-width-container">
             <ol class="nhsuk-breadcrumb__list">
-                <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ViewCompetencyAssessments" asp-route-tabname="Mine">Competency Assessments</a></li>
-                <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ManageCompetencyAssessment" asp-route-competencyAssessmentId="@Model.CompetencyAssessmentId">Manage Competency Assessment</a></li>
+                <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ViewCompetencyAssessments" asp-route-tabname="Mine">Self-assessments</a></li>
+                <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ManageCompetencyAssessment" asp-route-competencyAssessmentId="@Model.CompetencyAssessmentId">Manage self-assessment</a></li>
                 <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ViewSelectedCompetencies" asp-route-competencyAssessmentId="@Model.CompetencyAssessmentId">Select @Model.VocabularyPlural To Assess</a></li>
                 <li class="nhsuk-breadcrumb__item">Confirm Remove Group</li>
             </ol>
-            <p class="nhsuk-breadcrumb__back"><a class="nhsuk-breadcrumb__backlink" asp-action="ManageCompetencyAssessment" asp-route-competencyAssessmentId="@Model.CompetencyAssessmentId">Back to manage competency assessment</a></p>
+            <p class="nhsuk-breadcrumb__back"><a class="nhsuk-breadcrumb__backlink" asp-action="ManageCompetencyAssessment" asp-route-competencyAssessmentId="@Model.CompetencyAssessmentId">Back to manage self-assessment</a></p>
         </div>
     </nav>
 }
diff --git a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/SelectFrameworkSources.cshtml b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/SelectFrameworkSources.cshtml
index d811de3e96..c613ca924d 100644
--- a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/SelectFrameworkSources.cshtml
+++ b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/SelectFrameworkSources.cshtml
@@ -14,11 +14,11 @@
     <nav class="nhsuk-breadcrumb" aria-label="Breadcrumb">
         <div class="nhsuk-width-container">
             <ol class="nhsuk-breadcrumb__list">
-                <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ViewCompetencyAssessments" asp-route-tabname="Mine">Competency Assessments</a></li>
-                <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ManageCompetencyAssessment" asp-route-competencyAssessmentId="@Model.ID">Manage Competency Assessment</a></li>
+                <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ViewCompetencyAssessments" asp-route-tabname="Mine">Self-assessments</a></li>
+                <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ManageCompetencyAssessment" asp-route-competencyAssessmentId="@Model.ID">Manage self-assessment</a></li>
                 <li class="nhsuk-breadcrumb__item">Select framework sources</li>
             </ol>
-            <p class="nhsuk-breadcrumb__back"><a class="nhsuk-breadcrumb__backlink" asp-action="ManageCompetencyAssessment" asp-route-competencyAssessmentId="@Model.ID">Back to manage competency assessment</a></p>
+            <p class="nhsuk-breadcrumb__back"><a class="nhsuk-breadcrumb__backlink" asp-action="ManageCompetencyAssessment" asp-route-competencyAssessmentId="@Model.ID">Back to manage self-assessment</a></p>
         </div>
     </nav>
 }
diff --git a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/SelectOptionalCompetencies.cshtml b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/SelectOptionalCompetencies.cshtml
index b196b35676..c68454a094 100644
--- a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/SelectOptionalCompetencies.cshtml
+++ b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/SelectOptionalCompetencies.cshtml
@@ -13,11 +13,11 @@
     <nav class="nhsuk-breadcrumb" aria-label="Breadcrumb">
         <div class="nhsuk-width-container">
             <ol class="nhsuk-breadcrumb__list">
-                <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ViewCompetencyAssessments" asp-route-tabname="Mine">Competency Assessments</a></li>
-                <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ManageCompetencyAssessment" asp-route-competencyAssessmentId="@Model.ID">Manage Competency Assessment</a></li>
+                <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ViewCompetencyAssessments" asp-route-tabname="Mine">Self-assessments</a></li>
+                <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ManageCompetencyAssessment" asp-route-competencyAssessmentId="@Model.ID">Manage self-assessment</a></li>
                 <li class="nhsuk-breadcrumb__item">Optional Competencies</li>
             </ol>
-            <p class="nhsuk-breadcrumb__back"><a class="nhsuk-breadcrumb__backlink" asp-action="ManageCompetencyAssessment" asp-route-competencyAssessmentId="@Model.ID">Back to manage competency assessment</a></p>
+            <p class="nhsuk-breadcrumb__back"><a class="nhsuk-breadcrumb__backlink" asp-action="ManageCompetencyAssessment" asp-route-competencyAssessmentId="@Model.ID">Back to manage self-assessment</a></p>
         </div>
     </nav>
 }
@@ -33,44 +33,44 @@
                 Which @Model.VocabularySingular.ToLower() groups and/or @Model.VocabularyPlural.ToLower() should be optional?
             </h2>
         </legend>
-    @foreach (var competencyGroup in Model.CompetencyGroups)
-    {
-        @if (competencyGroup.Count() > 1)
+        @foreach (var competencyGroup in Model.CompetencyGroups)
         {
+            @if (competencyGroup.Count() > 1)
+            {
 
-            <div class="nhsuk-u-margin-bottom-6">
-                <h3>
-                    @competencyGroup.Key
-                </h3>
-                <div class="nhsuk-checkboxes">
-                    <div class="nhsuk-checkboxes__item">
-                        <input class="nhsuk-checkboxes__input" data-group="@competencyGroup.First().GroupId" id="competency-check-@competencyGroup.First().GroupId" name="GroupIds" checked="@competencyGroup.Any(x => x.GroupOptionalCompetencies)" type="checkbox" value="@competencyGroup.First().GroupId">
-                        <label class="nhsuk-label nhsuk-checkboxes__label" for="competency-check-@competencyGroup.First().GroupId">
-                            <strong>@competencyGroup.Key @Model.VocabularyPlural.ToLower() optional as a group</strong>
-                        </label>
-                    </div>
-                    @foreach (var competency in competencyGroup)
-                    {
+                <div class="nhsuk-u-margin-bottom-6">
+                    <h3>
+                        @competencyGroup.Key
+                    </h3>
+                    <div class="nhsuk-checkboxes">
                         <div class="nhsuk-checkboxes__item">
-                            <input class="nhsuk-checkboxes__input" data-group="@competencyGroup.Key" id="competency-check-@competency.StructureId" name="SelectedCompetencyIds" checked="@(Model.SelectedCompetencyIds != null ? Model.SelectedCompetencyIds.Contains((int)competency.CompetencyID) : false)" type="checkbox" value="@competency.StructureId">
-                            <label class="nhsuk-label nhsuk-checkboxes__label" for="competency-check-@competency.StructureId">
-                                @foreach (var flag in competency.CompetencyFlags)
-                                {
-                                    <span class="nhsuk-u-padding-right-2 @(ViewData["cssClass"]?.ToString())">
-                                        <strong class="nhsuk-tag @flag.FlagTagClass">
-                                            @flag.FlagName
-                                        </strong>
-                                    </span>
-                                }
-                                @competency.CompetencyName
+                            <input class="nhsuk-checkboxes__input" data-group="@competencyGroup.First().GroupId" id="competency-check-@competencyGroup.First().GroupId" name="GroupIds" checked="@competencyGroup.Any(x => x.GroupOptionalCompetencies)" type="checkbox" value="@competencyGroup.First().GroupId">
+                            <label class="nhsuk-label nhsuk-checkboxes__label" for="competency-check-@competencyGroup.First().GroupId">
+                                <strong>@competencyGroup.Key @Model.VocabularyPlural.ToLower() optional as a group</strong>
                             </label>
                         </div>
-                    }
+                        @foreach (var competency in competencyGroup)
+                        {
+                            <div class="nhsuk-checkboxes__item">
+                                <input class="nhsuk-checkboxes__input" data-group="@competencyGroup.Key" id="competency-check-@competency.StructureId" name="SelectedCompetencyIds" checked="@(Model.SelectedCompetencyIds != null ? Model.SelectedCompetencyIds.Contains((int)competency.CompetencyID) : false)" type="checkbox" value="@competency.StructureId">
+                                <label class="nhsuk-label nhsuk-checkboxes__label" for="competency-check-@competency.StructureId">
+                                    @foreach (var flag in competency.CompetencyFlags)
+                                    {
+                                        <span class="nhsuk-u-padding-right-2 @(ViewData["cssClass"]?.ToString())">
+                                            <strong class="nhsuk-tag @flag.FlagTagClass">
+                                                @flag.FlagName
+                                            </strong>
+                                        </span>
+                                    }
+                                    @competency.CompetencyName
+                                </label>
+                            </div>
+                        }
+                    </div>
                 </div>
-            </div>
-        }
+            }
 
-    }
+        }
     </fieldset>
     <input type="hidden" asp-for="ID" />
     <input type="hidden" asp-for="MinimumOptionalCompetencies" />
diff --git a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/SendForReview.cshtml b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/SendForReview.cshtml
index e9b37b124d..1b240b38bd 100644
--- a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/SendForReview.cshtml
+++ b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/SendForReview.cshtml
@@ -11,8 +11,8 @@
     <nav class="nhsuk-breadcrumb" aria-label="Breadcrumb">
         <div class="nhsuk-width-container">
             <ol class="nhsuk-breadcrumb__list">
-                <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ViewCompetencyAssessments" asp-route-tabname="Mine">Competency Assessments</a></li>
-                <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ManageCompetencyAssessment" asp-route-competencyAssessmentId="@Model.CompetencyAssessmentID">Manage Competency Assessment</a></li>
+                <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ViewCompetencyAssessments" asp-route-tabname="Mine">Self-assessments</a></li>
+                <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ManageCompetencyAssessment" asp-route-competencyAssessmentId="@Model.CompetencyAssessmentID">Manage self-assessment</a></li>
                 <li class="nhsuk-breadcrumb__item">Send for Review</li>
             </ol>
 
diff --git a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/SetMinimumOptionalCompetencies.cshtml b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/SetMinimumOptionalCompetencies.cshtml
index e0c652122a..de60317efe 100644
--- a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/SetMinimumOptionalCompetencies.cshtml
+++ b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/SetMinimumOptionalCompetencies.cshtml
@@ -13,11 +13,11 @@
     <nav class="nhsuk-breadcrumb" aria-label="Breadcrumb">
         <div class="nhsuk-width-container">
             <ol class="nhsuk-breadcrumb__list">
-                <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ViewCompetencyAssessments" asp-route-tabname="Mine">Competency Assessments</a></li>
-                <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ManageCompetencyAssessment" asp-route-competencyAssessmentId="@Model.ID">Manage Competency Assessment</a></li>
+                <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ViewCompetencyAssessments" asp-route-tabname="Mine">Self-assessments</a></li>
+                <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ManageCompetencyAssessment" asp-route-competencyAssessmentId="@Model.ID">Manage self-assessment</a></li>
                 <li class="nhsuk-breadcrumb__item">Optional Competencies</li>
             </ol>
-            <p class="nhsuk-breadcrumb__back"><a class="nhsuk-breadcrumb__backlink" asp-action="ManageCompetencyAssessment" asp-route-competencyAssessmentId="@Model.ID">Back to manage competency assessment</a></p>
+            <p class="nhsuk-breadcrumb__back"><a class="nhsuk-breadcrumb__backlink" asp-action="ManageCompetencyAssessment" asp-route-competencyAssessmentId="@Model.ID">Back to manage self-assessment</a></p>
         </div>
     </nav>
 }
diff --git a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/SetOptionalCompetencyLearnerPrompt.cshtml b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/SetOptionalCompetencyLearnerPrompt.cshtml
index 2933477dc8..ee6ecf79ba 100644
--- a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/SetOptionalCompetencyLearnerPrompt.cshtml
+++ b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/SetOptionalCompetencyLearnerPrompt.cshtml
@@ -14,11 +14,11 @@
     <nav class="nhsuk-breadcrumb" aria-label="Breadcrumb">
         <div class="nhsuk-width-container">
             <ol class="nhsuk-breadcrumb__list">
-                <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ViewCompetencyAssessments" asp-route-tabname="Mine">Competency Assessments</a></li>
-                <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ManageCompetencyAssessment" asp-route-competencyAssessmentId="@Model.ID">Manage Competency Assessment</a></li>
+                <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ViewCompetencyAssessments" asp-route-tabname="Mine">Self-assessments</a></li>
+                <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ManageCompetencyAssessment" asp-route-competencyAssessmentId="@Model.ID">Manage self-assessment</a></li>
                 <li class="nhsuk-breadcrumb__item">Optional Competencies</li>
             </ol>
-            <p class="nhsuk-breadcrumb__back"><a class="nhsuk-breadcrumb__backlink" asp-action="ManageCompetencyAssessment" asp-route-competencyAssessmentId="@Model.ID">Back to manage competency assessment</a></p>
+            <p class="nhsuk-breadcrumb__back"><a class="nhsuk-breadcrumb__backlink" asp-action="ManageCompetencyAssessment" asp-route-competencyAssessmentId="@Model.ID">Back to manage self-assessment</a></p>
         </div>
     </nav>
 }
diff --git a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/Shared/_AssessmentsGrid.cshtml b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/Shared/_AssessmentsGrid.cshtml
index c9c5deba92..07110dd0d7 100644
--- a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/Shared/_AssessmentsGrid.cshtml
+++ b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/Shared/_AssessmentsGrid.cshtml
@@ -7,7 +7,7 @@
     <thead role="rowgroup" class="nhsuk-table__head">
         <tr role="row">
             <th role="columnheader" class="" scope="col">
-                Competency Assessment
+                Self-assessment
             </th>
             <th role="columnheader" class="" scope="col">
                 Framework Links
@@ -31,7 +31,7 @@
         {
             <tr role="row" class="nhsuk-table__row framework-row">
                 <td role="cell" class="nhsuk-table__cell nhsuk-u-font-size-16">
-                    <span class="nhsuk-table-responsive__heading">Competency Assessment </span>
+                    <span class="nhsuk-table-responsive__heading">Self-assessment </span>
                     <span class="roleprofile-brand">
                         @competencyAssessment.Brand
                     </span>
diff --git a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/SubmitReview.cshtml b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/SubmitReview.cshtml
index 81dd94bae2..0e384a838b 100644
--- a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/SubmitReview.cshtml
+++ b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/SubmitReview.cshtml
@@ -11,8 +11,8 @@
     <nav class="nhsuk-breadcrumb" aria-label="Breadcrumb">
         <div class="nhsuk-width-container">
             <ol class="nhsuk-breadcrumb__list">
-                <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ViewCompetencyAssessments" asp-route-tabname="Mine">Competency Assessments</a></li>
-                <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ManageCompetencyAssessment" asp-route-competencyAssessmentId="@Model.CompetencyAssessmentID">Manage Competency Assessment</a></li>
+                <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ViewCompetencyAssessments" asp-route-tabname="Mine">Self-assessments</a></li>
+                <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ManageCompetencyAssessment" asp-route-competencyAssessmentId="@Model.CompetencyAssessmentID">Manage self-assessment</a></li>
                 <li class="nhsuk-breadcrumb__item">Review</li>
             </ol>
 
diff --git a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/SupervisedSelfAssessmentSignoff.cshtml b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/SupervisedSelfAssessmentSignoff.cshtml
index 8f10d4fb64..a40d6e0c1b 100644
--- a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/SupervisedSelfAssessmentSignoff.cshtml
+++ b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/SupervisedSelfAssessmentSignoff.cshtml
@@ -12,8 +12,8 @@
     <nav class="nhsuk-breadcrumb" aria-label="Breadcrumb">
         <div class="nhsuk-width-container">
             <ol class="nhsuk-breadcrumb__list">
-                <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ViewCompetencyAssessments" asp-route-tabname="Mine">Competency Assessments</a></li>
-                <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ManageCompetencyAssessment" asp-route-competencyAssessmentId="@Model.CompetencyAssessmentId">Manage Competency Assessment</a></li>
+                <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ViewCompetencyAssessments" asp-route-tabname="Mine">Self-assessments</a></li>
+                <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ManageCompetencyAssessment" asp-route-competencyAssessmentId="@Model.CompetencyAssessmentId">Manage self-assessment</a></li>
                 <li class="nhsuk-breadcrumb__item">Supervisor roles</li>
             </ol>
         </div>
diff --git a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/SupervisorSignoffDeclaration.cshtml b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/SupervisorSignoffDeclaration.cshtml
index 96758f957f..eb0990ba02 100644
--- a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/SupervisorSignoffDeclaration.cshtml
+++ b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/SupervisorSignoffDeclaration.cshtml
@@ -13,8 +13,8 @@
     <nav class="nhsuk-breadcrumb" aria-label="Breadcrumb">
         <div class="nhsuk-width-container">
             <ol class="nhsuk-breadcrumb__list">
-                <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ViewCompetencyAssessments" asp-route-tabname="Mine">Competency Assessments</a></li>
-                <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ManageCompetencyAssessment" asp-route-competencyAssessmentId="@Model.CompetencyAssessmentId">Manage Competency Assessment</a></li>
+                <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ViewCompetencyAssessments" asp-route-tabname="Mine">Self-assessments</a></li>
+                <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ManageCompetencyAssessment" asp-route-competencyAssessmentId="@Model.CompetencyAssessmentId">Manage self-assessment</a></li>
                 <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="SupervisedSelfAssessmentSignoff" asp-route-competencyAssessmentId="@Model.CompetencyAssessmentId" asp-route-actionName="Signoff">Supervisor roles</a></li>
                 <li class="nhsuk-breadcrumb__item">Supervisor sign off declaration</li>
             </ol>
diff --git a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/ViewSelectedCompetencies.cshtml b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/ViewSelectedCompetencies.cshtml
index cc16f298e5..2f5ca61a11 100644
--- a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/ViewSelectedCompetencies.cshtml
+++ b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/ViewSelectedCompetencies.cshtml
@@ -18,11 +18,11 @@
     <nav class="nhsuk-breadcrumb" aria-label="Breadcrumb">
         <div class="nhsuk-width-container">
             <ol class="nhsuk-breadcrumb__list">
-                <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ViewCompetencyAssessments" asp-route-tabname="Mine">Competency Assessments</a></li>
-                <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ManageCompetencyAssessment" asp-route-competencyAssessmentId="@Model.ID">Manage Competency Assessment</a></li>
+                <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ViewCompetencyAssessments" asp-route-tabname="Mine">Self-assessments</a></li>
+                <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ManageCompetencyAssessment" asp-route-competencyAssessmentId="@Model.ID">Manage self-assessment</a></li>
                 <li class="nhsuk-breadcrumb__item">Select @Model.VocabularyPlural To Assess</li>
             </ol>
-            <p class="nhsuk-breadcrumb__back"><a class="nhsuk-breadcrumb__backlink" asp-action="ManageCompetencyAssessment" asp-route-competencyAssessmentId="@Model.ID">Back to manage competency assessment</a></p>
+            <p class="nhsuk-breadcrumb__back"><a class="nhsuk-breadcrumb__backlink" asp-action="ManageCompetencyAssessment" asp-route-competencyAssessmentId="@Model.ID">Back to manage self-assessment</a></p>
         </div>
     </nav>
 }
@@ -208,7 +208,7 @@
 }
 else
 {
-    <p>There are no @Model.VocabularyPlural.ToLower() selected for this competency assessment.</p>
+    <p>There are no @Model.VocabularyPlural.ToLower() selected for this self-assessment.</p>
 }
 
 <form method="post">
diff --git a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/_AllCompetencyAssessments.cshtml b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/_AllCompetencyAssessments.cshtml
index 721819ba8b..a8bea2a5d0 100644
--- a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/_AllCompetencyAssessments.cshtml
+++ b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/_AllCompetencyAssessments.cshtml
@@ -1,11 +1,11 @@
 @using DigitalLearningSolutions.Web.ViewModels.CompetencyAssessments
 @model AllCompetencyAssessmentsViewModel
 
-<h1>All Competency Assessments</h1>
+<h1>All self-assessments</h1>
 @if (!Model.CompetencyAssessments.Any() && Model.SearchString == null)
 {
   <p class="nhsuk-u-margin-top-4" role="alert">
-    <b>There are no competency assessments in the system.</b>
+        <b>There are no self-assessments in the system.</b>
   </p>
 }
 else
diff --git a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/_MyCompetencyAssessments.cshtml b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/_MyCompetencyAssessments.cshtml
index c863e0e058..223e51890d 100644
--- a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/_MyCompetencyAssessments.cshtml
+++ b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/_MyCompetencyAssessments.cshtml
@@ -1,11 +1,11 @@
 @using DigitalLearningSolutions.Web.ViewModels.CompetencyAssessments
 @model MyCompetencyAssessmentsViewModel
 
-<h1>My Competency Assessments</h1>
+<h1>My Self-assessments</h1>
 @if (!Model.CompetencyAssessments.Any() && Model.SearchString == null)
 {
   <p class="nhsuk-u-margin-top-4" role="alert">
-    <b>You are not working on any competency assessments.</b>
+        <b>You are not working on any self-assessments.</b>
   </p>
 }
 else
@@ -24,6 +24,6 @@ else
 @if (Model.IsWorkforceManager)
 {
     <a class="nhsuk-button nhsuk-u-margin-top-4" asp-action="CompetencyAssessmentName" asp-route-actionName="New">
-    Create new competency assessment
+        Create new self-assessment
   </a>
 }
diff --git a/DigitalLearningSolutions.Web/Views/Frameworks/Developer/CompareSelfAssessmentResult.cshtml b/DigitalLearningSolutions.Web/Views/Frameworks/Developer/CompareSelfAssessmentResult.cshtml
index dcbb9699a8..21ff311630 100644
--- a/DigitalLearningSolutions.Web/Views/Frameworks/Developer/CompareSelfAssessmentResult.cshtml
+++ b/DigitalLearningSolutions.Web/Views/Frameworks/Developer/CompareSelfAssessmentResult.cshtml
@@ -2,105 +2,105 @@
 @using DigitalLearningSolutions.Web.Models.Enums;
 @model CompetencyLearningResourceSignpostingParametersViewModel
 @{
-  var addOrEdit = Model.AssessmentQuestionParameter.IsNew ? "Add" : "Edit";
-  ViewData["Title"] = $"{addOrEdit} Signposting Parameters";
-  ViewData["Application"] = "Framework Service";
-  ViewData["HeaderPathName"] = "Framework Service";
+    var addOrEdit = Model.AssessmentQuestionParameter.IsNew ? "Add" : "Edit";
+    ViewData["Title"] = $"{addOrEdit} Signposting Parameters";
+    ViewData["Application"] = "Framework Service";
+    ViewData["HeaderPathName"] = "Framework Service";
 }
 @section NavMenuItems {
-  <partial name="Shared/_NavMenuItems" />
+    <partial name="Shared/_NavMenuItems" />
 }
-  @section NavBreadcrumbs {
-  <nav class="nhsuk-breadcrumb" aria-label="Breadcrumb">
-    <div class="nhsuk-width-container">
-      <ol class="nhsuk-breadcrumb__list">
-        <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ViewFrameworks" asp-route-tabname="Mine">Frameworks</a></li>
-        <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ViewFramework" asp-fragment="fc-@Model.FrameworkCompetencyId" asp-route-frameworkId="@Model.FrameworkId" asp-route-tabname="Structure">Framework Structure</a></li>
-        <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="EditCompetencyLearningResources" asp-route-frameworkId="@Model.FrameworkId" asp-route-frameworkCompetencyId="@Model.FrameworkCompetencyId" asp-route-frameworkCompetencyGroupId="@Model.FrameworkCompetencyGroupId">Signposting</a></li>
-        <li class="nhsuk-breadcrumb__item">Parameters</li>
-      </ol>
-      <p class="nhsuk-breadcrumb__back"><a class="nhsuk-breadcrumb__backlink" asp-action="EditCompetencyLearningResources" asp-route-frameworkId="@Model.FrameworkId" asp-route-frameworkCompetencyId="@Model.FrameworkCompetencyId" asp-route-frameworkCompetencyGroupId="@Model.FrameworkCompetencyGroupId">Back to Signposting</a></p>
-    </div>
-  </nav>
+@section NavBreadcrumbs {
+    <nav class="nhsuk-breadcrumb" aria-label="Breadcrumb">
+        <div class="nhsuk-width-container">
+            <ol class="nhsuk-breadcrumb__list">
+                <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ViewFrameworks" asp-route-tabname="Mine">Frameworks</a></li>
+                <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ViewFramework" asp-fragment="fc-@Model.FrameworkCompetencyId" asp-route-frameworkId="@Model.FrameworkId" asp-route-tabname="Structure">Framework Structure</a></li>
+                <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="EditCompetencyLearningResources" asp-route-frameworkId="@Model.FrameworkId" asp-route-frameworkCompetencyId="@Model.FrameworkCompetencyId" asp-route-frameworkCompetencyGroupId="@Model.FrameworkCompetencyGroupId">Signposting</a></li>
+                <li class="nhsuk-breadcrumb__item">Parameters</li>
+            </ol>
+            <p class="nhsuk-breadcrumb__back"><a class="nhsuk-breadcrumb__backlink" asp-action="EditCompetencyLearningResources" asp-route-frameworkId="@Model.FrameworkId" asp-route-frameworkCompetencyId="@Model.FrameworkCompetencyId" asp-route-frameworkCompetencyGroupId="@Model.FrameworkCompetencyGroupId">Back to Signposting</a></p>
+        </div>
+    </nav>
 }
-  <link rel="stylesheet" href="@Url.Content("~/css/frameworks/frameworksShared.css")" asp-append-version="true">
-  <partial name="Developer/_SignpostingParametersHeader" model="Model" />
+<link rel="stylesheet" href="@Url.Content("~/css/frameworks/frameworksShared.css")" asp-append-version="true">
+<partial name="Developer/_SignpostingParametersHeader" model="Model" />
 
-  <h2>Compare self-assessment result to</h2>
-  <label class="nhsuk-label nhsuk-u-margin-bottom-4">
+<h2>Compare self-assessment result to</h2>
+<label class="nhsuk-label nhsuk-u-margin-bottom-4">
     Optionally, choose a mechanism to dermine whether the individual is meeting their role-requirements for this competency.
     If they are not, the prominence of this learning resource in their recommendations will increase.
-  </label>
-  <form method="post" asp-controller="Frameworks">
+</label>
+<form method="post" asp-controller="Frameworks">
     <fieldset class="nhsuk-fieldset nhsuk-u-margin-top-5">
-      <div class="nhsuk-radios nhsuk-radios--conditional">
-        <div class="nhsuk-radios__item">
-          <input name="compareQuestionType" type="radio" class="nhsuk-radios__input"
-               value="0"
-               @(Model.SelectedCompareQuestionType == CompareAssessmentQuestionType.DontCompare ? "checked" : String.Empty)>
-          <label class="nhsuk-label nhsuk-radios__label">
-            Don't compare result
-          </label>
-        </div>
-        @if (Model.SelectedQuestionRoleRequirements > 0)
-      {
-        <div class="nhsuk-radios__item">
-          <input type="radio" name="compareQuestionType" class="nhsuk-radios__input"
-               value="1"
-               @(Model.SelectedCompareQuestionType == CompareAssessmentQuestionType.CompareToRole ? "checked" : String.Empty)>
-          <label class="nhsuk-label nhsuk-radios__label">
-            Competency assessment question role requirements
-          </label>
-        </div>
-      }
-      @if (Model.Questions?.Count > 1)
-      {
-        <div class="nhsuk-radios__item">
-          <input id="compareToOther" type="radio" name="compareQuestionType" class="nhsuk-radios__input" aria-controls="conditional-compareToOther" aria-expanded="false"
-               value="2"
-               @(Model.SelectedCompareQuestionType == CompareAssessmentQuestionType.CompareToOtherQuestion ? "checked" : String.Empty)>
-          <label class="nhsuk-label nhsuk-radios__label" for="compareToOther">
-            Other competency assessment question response
-          </label>
-        </div>
+        <div class="nhsuk-radios nhsuk-radios--conditional">
+            <div class="nhsuk-radios__item">
+                <input name="compareQuestionType" type="radio" class="nhsuk-radios__input"
+                       value="0"
+                       @(Model.SelectedCompareQuestionType == CompareAssessmentQuestionType.DontCompare ? "checked" : String.Empty)>
+                <label class="nhsuk-label nhsuk-radios__label">
+                    Don't compare result
+                </label>
+            </div>
+            @if (Model.SelectedQuestionRoleRequirements > 0)
+            {
+                <div class="nhsuk-radios__item">
+                    <input type="radio" name="compareQuestionType" class="nhsuk-radios__input"
+                           value="1"
+                           @(Model.SelectedCompareQuestionType == CompareAssessmentQuestionType.CompareToRole ? "checked" : String.Empty)>
+                    <label class="nhsuk-label nhsuk-radios__label">
+                        Self-assessment question role requirements
+                    </label>
+                </div>
+            }
+            @if (Model.Questions?.Count > 1)
+            {
+                <div class="nhsuk-radios__item">
+                    <input id="compareToOther" type="radio" name="compareQuestionType" class="nhsuk-radios__input" aria-controls="conditional-compareToOther" aria-expanded="false"
+                           value="2"
+                           @(Model.SelectedCompareQuestionType == CompareAssessmentQuestionType.CompareToOtherQuestion ? "checked" : String.Empty)>
+                    <label class="nhsuk-label nhsuk-radios__label" for="compareToOther">
+                        Other self-assessment question response
+                    </label>
+                </div>
 
-        <div id="conditional-compareToOther" class="nhsuk-radios__conditional @(Model.SelectedCompareQuestionType != CompareAssessmentQuestionType.CompareToOtherQuestion ? "nhsuk-radios__conditional--hidden" : String.Empty)">
-          <label class="nhsuk-label" for="email">
-            <select name="compareToQuestionId" class="nhsuk-select nhsuk-u-width-two-thirds nhsuk-u-margin-top-3">
-              @foreach (var question in Model.Questions)
-              {
-                @if (question.ID != Model.SelectedQuestion?.ID)
-                {
-                  <!option value="@question.ID" @(Model.SelectedCompareToQuestion?.ID == question.ID ? "selected" : String.Empty)>@question.Question </!option>
-                }
-              }
-            </select>
-          </label>
+                <div id="conditional-compareToOther" class="nhsuk-radios__conditional @(Model.SelectedCompareQuestionType != CompareAssessmentQuestionType.CompareToOtherQuestion ? "nhsuk-radios__conditional--hidden" : String.Empty)">
+                    <label class="nhsuk-label" for="email">
+                        <select name="compareToQuestionId" class="nhsuk-select nhsuk-u-width-two-thirds nhsuk-u-margin-top-3">
+                            @foreach (var question in Model.Questions)
+                            {
+                                @if (question.ID != Model.SelectedQuestion?.ID)
+                                {
+                                    <!option value="@question.ID" @(Model.SelectedCompareToQuestion?.ID == question.ID ? "selected" : String.Empty)>@question.Question </!option>
+                                }
+                            }
+                        </select>
+                    </label>
+                </div>
+            }
         </div>
-      }
+    </fieldset>
+    <div class="nhsuk-u-margin-top-6">
+        <a asp-action="@(Model.SelectedQuestion != null ? "SignpostingParametersSetTriggerValues" : "EditSignpostingParameters")"
+           asp-route-frameworkId="@Model.FrameworkId"
+           asp-route-frameworkCompetencyId="@Model.FrameworkCompetencyId"
+           asp-route-frameworkCompetencyGroupId="@Model.FrameworkCompetencyGroupId"
+           asp-route-competencyLearningResourceId="@Model.AssessmentQuestionParameter?.CompetencyLearningResourceId" class="nhsuk-button nhsuk-button--secondary nhsuk-u-margin-right-2">
+            Back
+        </a>
+        <button asp-action="CompareSelfAssessmentResultNext" class="nhsuk-button nhsuk-u-margin-right-1" type="submit">
+            Next
+        </button>
     </div>
-  </fieldset>
-  <div class="nhsuk-u-margin-top-6">
-    <a asp-action="@(Model.SelectedQuestion != null ? "SignpostingParametersSetTriggerValues" : "EditSignpostingParameters")"
-       asp-route-frameworkId="@Model.FrameworkId"
-       asp-route-frameworkCompetencyId="@Model.FrameworkCompetencyId"
-       asp-route-frameworkCompetencyGroupId="@Model.FrameworkCompetencyGroupId"
-       asp-route-competencyLearningResourceId="@Model.AssessmentQuestionParameter?.CompetencyLearningResourceId" class="nhsuk-button nhsuk-button--secondary nhsuk-u-margin-right-2">
-      Back
-    </a>
-    <button asp-action="CompareSelfAssessmentResultNext" class="nhsuk-button nhsuk-u-margin-right-1" type="submit">
-      Next
-    </button>
-  </div>
-  @Html.HiddenFor(m => m.FrameworkId)
-  @Html.HiddenFor(m => m.FrameworkCompetencyGroupId)
-  @Html.HiddenFor(m => m.FrameworkCompetencyId)
+    @Html.HiddenFor(m => m.FrameworkId)
+    @Html.HiddenFor(m => m.FrameworkCompetencyGroupId)
+    @Html.HiddenFor(m => m.FrameworkCompetencyId)
 </form>
 <div class="nhsuk-back-link nhsuk-u-margin-left-1">
-  <a class="nhsuk-back-link__link" asp-action="EditCompetencyLearningResources" asp-route-frameworkId="@Model.FrameworkId" asp-route-frameworkCompetencyId="@Model.FrameworkCompetencyId" asp-route-frameworkCompetencyGroupId="@Model.FrameworkCompetencyGroupId">
-    <svg class="nhsuk-icon nhsuk-icon__chevron-left" focusable='false' xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" aria-hidden="true" focusable="false">
-      <path d="M13.41 12l5.3-5.29a1 1 0 1 0-1.42-1.42L12 10.59l-5.29-5.3a1 1 0 0 0-1.42 1.42l5.3 5.29-5.3 5.29a1 1 0 0 0 0 1.42 1 1 0 0 0 1.42 0l5.29-5.3 5.29 5.3a1 1 0 0 0 1.42 0 1 1 0 0 0 0-1.42z"></path>
-    </svg>
-    Cancel
-  </a>
+    <a class="nhsuk-back-link__link" asp-action="EditCompetencyLearningResources" asp-route-frameworkId="@Model.FrameworkId" asp-route-frameworkCompetencyId="@Model.FrameworkCompetencyId" asp-route-frameworkCompetencyGroupId="@Model.FrameworkCompetencyGroupId">
+        <svg class="nhsuk-icon nhsuk-icon__chevron-left" focusable='false' xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" aria-hidden="true" focusable="false">
+            <path d="M13.41 12l5.3-5.29a1 1 0 1 0-1.42-1.42L12 10.59l-5.29-5.3a1 1 0 0 0-1.42 1.42l5.3 5.29-5.3 5.29a1 1 0 0 0 0 1.42 1 1 0 0 0 1.42 0l5.29-5.3 5.29 5.3a1 1 0 0 0 1.42 0 1 1 0 0 0 0-1.42z"></path>
+        </svg>
+        Cancel
+    </a>
 </div>
diff --git a/DigitalLearningSolutions.Web/Views/Frameworks/Developer/CompetencyAssessmentQuestions.cshtml b/DigitalLearningSolutions.Web/Views/Frameworks/Developer/CompetencyAssessmentQuestions.cshtml
index 34479d7169..ebd03f73af 100644
--- a/DigitalLearningSolutions.Web/Views/Frameworks/Developer/CompetencyAssessmentQuestions.cshtml
+++ b/DigitalLearningSolutions.Web/Views/Frameworks/Developer/CompetencyAssessmentQuestions.cshtml
@@ -1,133 +1,133 @@
 @using DigitalLearningSolutions.Web.ViewModels.Frameworks
 @model CompetencyAssessmentQuestionsViewModel;
 @{
-  ViewData["Title"] = "Competency Assessment Questions";
-  ViewData["Application"] = "Framework Service";
-  ViewData["HeaderPathName"] = "Framework Service";
+    ViewData["Title"] = "Self-assessment questions";
+    ViewData["Application"] = "Framework Service";
+    ViewData["HeaderPathName"] = "Framework Service";
 }
 <link rel="stylesheet" href="@Url.Content("~/css/frameworks/frameworksShared.css")" asp-append-version="true">
 @section NavMenuItems {
-  <partial name="Shared/_NavMenuItems" />
+    <partial name="Shared/_NavMenuItems" />
 }
-  @section NavBreadcrumbs {
-  <nav class="nhsuk-breadcrumb" aria-label="Breadcrumb">
-    <div class="nhsuk-width-container">
-      <ol class="nhsuk-breadcrumb__list">
-        <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ViewFrameworks" asp-route-tabname="Mine">Frameworks</a></li>
-        <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ViewFramework" asp-fragment="fc-@Model.FrameworkCompetencyId" asp-route-frameworkId="@Model.DetailFramework.ID" asp-route-tabname="Structure">Framework Structure</a></li>
-        <li class="nhsuk-breadcrumb__item">Competency Assessment Questions</li>
-      </ol>
-      <p class="nhsuk-breadcrumb__back"><a class="nhsuk-breadcrumb__backlink" asp-action="ViewFramework" asp-fragment="fc-@Model.FrameworkCompetencyId" asp-route-frameworkId="@Model.DetailFramework.ID" asp-route-tabname="Structure">Back to Framework Structure</a></p>
-    </div>
-  </nav>
+@section NavBreadcrumbs {
+    <nav class="nhsuk-breadcrumb" aria-label="Breadcrumb">
+        <div class="nhsuk-width-container">
+            <ol class="nhsuk-breadcrumb__list">
+                <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ViewFrameworks" asp-route-tabname="Mine">Frameworks</a></li>
+                <li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ViewFramework" asp-fragment="fc-@Model.FrameworkCompetencyId" asp-route-frameworkId="@Model.DetailFramework.ID" asp-route-tabname="Structure">Framework Structure</a></li>
+                <li class="nhsuk-breadcrumb__item">Self-assessment questions</li>
+            </ol>
+            <p class="nhsuk-breadcrumb__back"><a class="nhsuk-breadcrumb__backlink" asp-action="ViewFramework" asp-fragment="fc-@Model.FrameworkCompetencyId" asp-route-frameworkId="@Model.DetailFramework.ID" asp-route-tabname="Structure">Back to Framework Structure</a></p>
+        </div>
+    </nav>
 }
-  <h1 class="truncate-overflow">@Model.CompetencyName</h1>
-  <h2>@Model.VocabSingular() assessment questions</h2>
-  <p class="nhsuk-body-l">Assessment questions listed here will be presented to users assessing themselves against this @Model.VocabSingular().ToLower().</p>
-  @if (Model.DetailFramework.PublishStatusID == 3)
+<h1 class="truncate-overflow">@Model.CompetencyName</h1>
+<h2>@Model.VocabSingular() assessment questions</h2>
+<p class="nhsuk-body-l">Assessment questions listed here will be presented to users assessing themselves against this @Model.VocabSingular().ToLower().</p>
+@if (Model.DetailFramework.PublishStatusID == 3)
 {
-  <partial name="Shared/_PublishedWarning" />
+    <partial name="Shared/_PublishedWarning" />
 }
 <div class="nhsuk-table__panel-with-heading-tab">
-  <h3 class="nhsuk-table__heading-tab">Assessment questions for @Model.VocabSingular().ToLower()</h3>
+    <h3 class="nhsuk-table__heading-tab">Assessment questions for @Model.VocabSingular().ToLower()</h3>
 
-  @if (Model.AssessmentQuestions.Any())
-  {
-    <table class="nhsuk-table-responsive">
-      <thead role="rowgroup" class="nhsuk-table__head">
-        <tr role="row">
-          <th role="columnheader" class="" scope="col">
-            Question
-          </th>
-          <th role="columnheader" class="" scope="col">
-            Input type/Range
-          </th>
-          <th role="columnheader" class="" scope="col">
-            Actions
-          </th>
-        </tr>
-      </thead>
+    @if (Model.AssessmentQuestions.Any())
+    {
+        <table class="nhsuk-table-responsive">
+            <thead role="rowgroup" class="nhsuk-table__head">
+                <tr role="row">
+                    <th role="columnheader" class="" scope="col">
+                        Question
+                    </th>
+                    <th role="columnheader" class="" scope="col">
+                        Input type/Range
+                    </th>
+                    <th role="columnheader" class="" scope="col">
+                        Actions
+                    </th>
+                </tr>
+            </thead>
 
-      <tbody class="nhsuk-table__body">
-        @foreach (var question in Model.AssessmentQuestions.Select((value, i) => new { i, value }))
-        {
-          <tr role="row" class="nhsuk-table__row collaborator-row">
-            <td role="cell" class="nhsuk-table__cell nhsuk-u-font-size-16">
-              <span class="nhsuk-table-responsive__heading">Question </span>
-              <span class="framework-collaborator-user">
-                @question.value.Question
-              </span>
-            </td>
-            <td role="cell" class="nhsuk-table__cell nhsuk-u-font-size-16">
-              <span class="nhsuk-table-responsive__heading">Input type/Range </span>
-              <span class="framework-collaborator-role">
-                @question.value.InputTypeName (@question.value.MinValue - @question.value.MaxValue)
-              </span>
-            </td>
-            <td role="cell" class="nhsuk-table__cell nhsuk-u-font-size-16">
-              <span class="nhsuk-table-responsive__heading">Actions </span>
+            <tbody class="nhsuk-table__body">
+                @foreach (var question in Model.AssessmentQuestions.Select((value, i) => new { i, value }))
+                {
+                    <tr role="row" class="nhsuk-table__row collaborator-row">
+                        <td role="cell" class="nhsuk-table__cell nhsuk-u-font-size-16">
+                            <span class="nhsuk-table-responsive__heading">Question </span>
+                            <span class="framework-collaborator-user">
+                                @question.value.Question
+                            </span>
+                        </td>
+                        <td role="cell" class="nhsuk-table__cell nhsuk-u-font-size-16">
+                            <span class="nhsuk-table-responsive__heading">Input type/Range </span>
+                            <span class="framework-collaborator-role">
+                                @question.value.InputTypeName (@question.value.MinValue - @question.value.MaxValue)
+                            </span>
+                        </td>
+                        <td role="cell" class="nhsuk-table__cell nhsuk-u-font-size-16">
+                            <span class="nhsuk-table-responsive__heading">Actions </span>
 
-              <a asp-action="RemoveCompetencyAssessmentQuestion" asp-route-frameworkId="@Model.DetailFramework.ID" asp-route-frameworkCompetencyId="@Model.FrameworkCompetencyId" asp-route-assessmentQuestionId="@question.value.ID">
-                Remove
-              </a>
+                            <a asp-action="RemoveCompetencyAssessmentQuestion" asp-route-frameworkId="@Model.DetailFramework.ID" asp-route-frameworkCompetencyId="@Model.FrameworkCompetencyId" asp-route-assessmentQuestionId="@question.value.ID">
+                                Remove
+                            </a>
 
-              @if (question.value.UserIsOwner)
-              {
-                <span>&nbsp;</span>
-                <a asp-action="StartAssessmentQuestionSession" asp-route-assessmentQuestionId="@question.value.ID" asp-route-frameworkCompetencyId="@Model.FrameworkCompetencyId" asp-route-frameworkId="@Model.DetailFramework.ID">
-                  Edit
-                </a>
+                            @if (question.value.UserIsOwner)
+                            {
+                                <span>&nbsp;</span>
+                                <a asp-action="StartAssessmentQuestionSession" asp-route-assessmentQuestionId="@question.value.ID" asp-route-frameworkCompetencyId="@Model.FrameworkCompetencyId" asp-route-frameworkId="@Model.DetailFramework.ID">
+                                    Edit
+                                </a>
 
-              }
-              @if (Model.AssessmentQuestions.Count() > 1)
-              {
-                <br />
-                <div class="status-tag">
-                  @if (question.i > 0)
-                  {
-                    <a asp-action="CompetencyAssessmentQuestionReorder" asp-route-direction="UP" asp-route-assessmentQuestionId="@question.value.ID" asp-route-frameworkCompetencyId="@Model.FrameworkCompetencyId" asp-route-competencyId="@Model.CompetencyId" asp-route-frameworkId="@Model.DetailFramework.ID">
-                      Move up
-                    </a>
-                    <span>&nbsp;</span>
-                  }
-                  @if (question.i < Model.AssessmentQuestions.Count() - 1)
-                  {
-                    <a asp-action="CompetencyAssessmentQuestionReorder" asp-route-direction="DOWN" asp-route-assessmentQuestionId="@question.value.ID" asp-route-frameworkCompetencyId="@Model.FrameworkCompetencyId" asp-route-competencyId="@Model.CompetencyId" asp-route-frameworkId="@Model.DetailFramework.ID">
-                      Move Down
-                    </a>
-                  }
-                </div>
-              }
-            </td>
-          </tr>
-        }
-      </tbody>
-    </table>
-  }
-  else
-  {
-    <p>No assessment questions have been added to this @Model.VocabSingular().ToLower().</p>
-  }
+                            }
+                            @if (Model.AssessmentQuestions.Count() > 1)
+                            {
+                                <br />
+                                <div class="status-tag">
+                                    @if (question.i > 0)
+                                    {
+                                        <a asp-action="CompetencyAssessmentQuestionReorder" asp-route-direction="UP" asp-route-assessmentQuestionId="@question.value.ID" asp-route-frameworkCompetencyId="@Model.FrameworkCompetencyId" asp-route-competencyId="@Model.CompetencyId" asp-route-frameworkId="@Model.DetailFramework.ID">
+                                            Move up
+                                        </a>
+                                        <span>&nbsp;</span>
+                                    }
+                                    @if (question.i < Model.AssessmentQuestions.Count() - 1)
+                                    {
+                                        <a asp-action="CompetencyAssessmentQuestionReorder" asp-route-direction="DOWN" asp-route-assessmentQuestionId="@question.value.ID" asp-route-frameworkCompetencyId="@Model.FrameworkCompetencyId" asp-route-competencyId="@Model.CompetencyId" asp-route-frameworkId="@Model.DetailFramework.ID">
+                                            Move Down
+                                        </a>
+                                    }
+                                </div>
+                            }
+                        </td>
+                    </tr>
+                }
+            </tbody>
+        </table>
+    }
+    else
+    {
+        <p>No assessment questions have been added to this @Model.VocabSingular().ToLower().</p>
+    }
 </div>
 <h3>Add a question</h3>
 <form method="post">
-  <div class="nhsuk-form-group">
-    <label class="nhsuk-label" for="select-question">
-      Add an existing assessment question to the @Model.VocabSingular().ToLower()
-    </label>
-    <select class="nhsuk-select nhsuk-u-width-three-quarters" id="select-question" asp-items="Model.QuestionSelectList" asp-for="assessmentQuestionId"></select>
-    <button class="nhsuk-button button-small" asp-route-addToExisting="False" asp-route-frameworkId="@Model.DetailFramework.ID">
-      Add
-    </button>
-  </div>
+    <div class="nhsuk-form-group">
+        <label class="nhsuk-label" for="select-question">
+            Add an existing assessment question to the @Model.VocabSingular().ToLower()
+        </label>
+        <select class="nhsuk-select nhsuk-u-width-three-quarters" id="select-question" asp-items="Model.QuestionSelectList" asp-for="assessmentQuestionId"></select>
+        <button class="nhsuk-button button-small" asp-route-addToExisting="False" asp-route-frameworkId="@Model.DetailFramework.ID">
+            Add
+        </button>
+    </div>
 </form>
 <div class="nhsuk-form-group">
-  <a class="nhsuk-button nhsuk-button--secondary" role="button" asp-action="StartAssessmentQuestionSession" asp-route-frameworkId="@Model.DetailFramework.ID" asp-route-frameworkCompetencyId="@Model.FrameworkCompetencyId">
-    Add a new question
-  </a>
+    <a class="nhsuk-button nhsuk-button--secondary" role="button" asp-action="StartAssessmentQuestionSession" asp-route-frameworkId="@Model.DetailFramework.ID" asp-route-frameworkCompetencyId="@Model.FrameworkCompetencyId">
+        Add a new question
+    </a>
 </div>
 <div class=" nhsuk-u-margin-top-6">
-  <a class="nhsuk-button" role="button" asp-action="ViewFramework" asp-fragment="fc-@Model.FrameworkCompetencyId" asp-route-frameworkId="@Model.DetailFramework.ID" asp-route-tabname="Structure">
-    Done
-  </a>
+    <a class="nhsuk-button" role="button" asp-action="ViewFramework" asp-fragment="fc-@Model.FrameworkCompetencyId" asp-route-frameworkId="@Model.DetailFramework.ID" asp-route-tabname="Structure">
+        Done
+    </a>
 </div>
diff --git a/DigitalLearningSolutions.Web/Views/Frameworks/Shared/_NavMenuItems.cshtml b/DigitalLearningSolutions.Web/Views/Frameworks/Shared/_NavMenuItems.cshtml
index feea60f175..1f7b3a96ed 100644
--- a/DigitalLearningSolutions.Web/Views/Frameworks/Shared/_NavMenuItems.cshtml
+++ b/DigitalLearningSolutions.Web/Views/Frameworks/Shared/_NavMenuItems.cshtml
@@ -3,29 +3,29 @@
 @using DigitalLearningSolutions.Web.Models.Enums
 @using DigitalLearningSolutions.Data.Enums
 <li class="nhsuk-header__navigation-item @Html.GetSelectedCssClassIfTabSelected(NavMenuTab.Dashboard)">
-  <a class="nhsuk-header__navigation-link" asp-controller="Frameworks" asp-action="Index">
-    Dashboard
-  </a>
+    <a class="nhsuk-header__navigation-link" asp-controller="Frameworks" asp-action="Index">
+        Dashboard
+    </a>
 </li>
 <li class="nhsuk-header__navigation-item @Html.GetSelectedCssClassIfTabSelected(NavMenuTab.Frameworks)">
-  <a class="nhsuk-header__navigation-link" asp-controller="Frameworks" asp-action="ViewFrameworks" asp-route-tabname="Mine">
-    Frameworks
-  </a>
+    <a class="nhsuk-header__navigation-link" asp-controller="Frameworks" asp-action="ViewFrameworks" asp-route-tabname="Mine">
+        Frameworks
+    </a>
 </li>
 <feature name="@(FeatureFlags.WorkforceManagerInterface)">
-  <li class="nhsuk-header__navigation-item @Html.GetSelectedCssClassIfTabSelected(NavMenuTab.CompetencyAssessments)">
-    <a class="nhsuk-header__navigation-link" asp-controller="CompetencyAssessments" asp-action="ViewCompetencyAssessments" asp-route-tabname="Mine">
-      Competency Assessments
-    </a>
-  </li>
+    <li class="nhsuk-header__navigation-item @Html.GetSelectedCssClassIfTabSelected(NavMenuTab.CompetencyAssessments)">
+        <a class="nhsuk-header__navigation-link" asp-controller="CompetencyAssessments" asp-action="ViewCompetencyAssessments" asp-route-tabname="Mine">
+            Self-assessments
+        </a>
+    </li>
 </feature>
 <li class="nhsuk-header__navigation-item @Html.GetSelectedCssClassIfTabSelected(NavMenuTab.Support)">
-  <a class="nhsuk-header__navigation-link" asp-controller="Support" asp-action="Index" asp-route-dlsSubApplication="@DlsSubApplication.Frameworks.UrlSegment">
-    Support
-  </a>
+    <a class="nhsuk-header__navigation-link" asp-controller="Support" asp-action="Index" asp-route-dlsSubApplication="@DlsSubApplication.Frameworks.UrlSegment">
+        Support
+    </a>
 </li>
 <li class="nhsuk-header__navigation-item @Html.GetSelectedCssClassIfTabSelected(NavMenuTab.MyAccount)">
-  <a class="nhsuk-header__navigation-link" asp-controller="MyAccount" asp-action="Index" asp-route-dlsSubApplication="@DlsSubApplication.Frameworks.UrlSegment">
-    My account
-  </a>
+    <a class="nhsuk-header__navigation-link" asp-controller="MyAccount" asp-action="Index" asp-route-dlsSubApplication="@DlsSubApplication.Frameworks.UrlSegment">
+        My account
+    </a>
 </li>
diff --git a/DigitalLearningSolutions.Web/Views/Frameworks/Shared/_PublishedWarning.cshtml b/DigitalLearningSolutions.Web/Views/Frameworks/Shared/_PublishedWarning.cshtml
index 8d3e40011e..ac0155e706 100644
--- a/DigitalLearningSolutions.Web/Views/Frameworks/Shared/_PublishedWarning.cshtml
+++ b/DigitalLearningSolutions.Web/Views/Frameworks/Shared/_PublishedWarning.cshtml
@@ -1,9 +1,9 @@
 <div class="nhsuk-warning-callout">
-  <h3 class="nhsuk-warning-callout__label">
-    <span role="text">
-      <span class="nhsuk-u-visually-hidden">Important: </span>
-      Framework published and in use
-    </span>
-  </h3>
-  <p>This framework has been published and its content may be in use in competency assessments.</p><p>You should make only minor changes to a published framework.</p><p>Any meaningful or significant changes should be made to a new major release version of the framework.</p>
+    <h3 class="nhsuk-warning-callout__label">
+        <span role="text">
+            <span class="nhsuk-u-visually-hidden">Important: </span>
+            Framework published and in use
+        </span>
+    </h3>
+    <p>This framework has been published and its content may be in use in self-assessments.</p><p>You should make only minor changes to a published framework.</p><p>Any meaningful or significant changes should be made to a new major release version of the framework.</p>
 </div>
diff --git a/DigitalLearningSolutions.Web/Views/LearningPortal/Shared/_TagRow.cshtml b/DigitalLearningSolutions.Web/Views/LearningPortal/Shared/_TagRow.cshtml
index 7a6201c2b9..d75df74228 100644
--- a/DigitalLearningSolutions.Web/Views/LearningPortal/Shared/_TagRow.cshtml
+++ b/DigitalLearningSolutions.Web/Views/LearningPortal/Shared/_TagRow.cshtml
@@ -5,82 +5,82 @@
 @model BaseLearningItemViewModel
 
 <div class="nhsuk-grid-column-three-quarters tags">
-  @if (Model is CompletedCourseViewModel)
-  {
-    <div class="card-filter-tag">
-      <strong class="nhsuk-tag nhsuk-tag--blue">Course</strong>
-    </div>
-  }
-  @if (Model is CurrentCourseViewModel currentCourseViewModel)
-  {
-    <div class="card-filter-tag">
-      <strong class="nhsuk-tag nhsuk-tag--blue">Course</strong>
-    </div>
-    @if (currentCourseViewModel.UserIsSupervisor)
+    @if (Model is CompletedCourseViewModel)
     {
-      <div class="card-filter-tag">
-        <strong class="nhsuk-tag nhsuk-tag--grey">Supervisor</strong>
-      </div>
+        <div class="card-filter-tag">
+            <strong class="nhsuk-tag nhsuk-tag--blue">Course</strong>
+        </div>
     }
-    @if (currentCourseViewModel.IsEnrolledWithGroup)
+    @if (Model is CurrentCourseViewModel currentCourseViewModel)
     {
-      <div class="card-filter-tag">
-        <strong class="nhsuk-tag nhsuk-tag--grey">In group</strong>
-      </div>
+        <div class="card-filter-tag">
+            <strong class="nhsuk-tag nhsuk-tag--blue">Course</strong>
+        </div>
+        @if (currentCourseViewModel.UserIsSupervisor)
+        {
+            <div class="card-filter-tag">
+                <strong class="nhsuk-tag nhsuk-tag--grey">Supervisor</strong>
+            </div>
+        }
+        @if (currentCourseViewModel.IsEnrolledWithGroup)
+        {
+            <div class="card-filter-tag">
+                <strong class="nhsuk-tag nhsuk-tag--grey">In group</strong>
+            </div>
+        }
     }
-  }
-  @if (Model is SelfAssessmentCardViewModel)
-  {
-    <div class="card-filter-tag">
-      <strong class="nhsuk-tag nhsuk-tag--blue">Self assessment</strong>
-    </div>
-  }
-  @if (Model is ILearningResourceCardViewModel resource)
-  {
-    <div class="card-filter-tag">
-      <strong class="nhsuk-tag nhsuk-tag--blue">Learning resource</strong>
-    </div>
-    @if (!string.IsNullOrWhiteSpace(resource.ResourceType))
+    @if (Model is SelfAssessmentCardViewModel)
     {
-      <div class="card-filter-tag">
-        <strong class="nhsuk-tag nhsuk-tag--grey">@resource.ResourceType</strong>
-      </div>
+        <div class="card-filter-tag">
+            <strong class="nhsuk-tag nhsuk-tag--blue">Self assessment</strong>
+        </div>
     }
-    @if (!string.IsNullOrWhiteSpace(resource.CatalogueName))
+    @if (Model is ILearningResourceCardViewModel resource)
     {
-      <div class="card-filter-tag">
-        <strong class="nhsuk-tag nhsuk-tag--grey">@resource.CatalogueName</strong>
-      </div>
+        <div class="card-filter-tag">
+            <strong class="nhsuk-tag nhsuk-tag--blue">Learning resource</strong>
+        </div>
+        @if (!string.IsNullOrWhiteSpace(resource.ResourceType))
+        {
+            <div class="card-filter-tag">
+                <strong class="nhsuk-tag nhsuk-tag--grey">@resource.ResourceType</strong>
+            </div>
+        }
+        @if (!string.IsNullOrWhiteSpace(resource.CatalogueName))
+        {
+            <div class="card-filter-tag">
+                <strong class="nhsuk-tag nhsuk-tag--grey">@resource.CatalogueName</strong>
+            </div>
+        }
+    }
+    @if (Model.HasDiagnosticAssessment)
+    {
+        <div class="card-filter-tag">
+            <strong class="nhsuk-tag nhsuk-tag--grey">Diagnostic assessment</strong>
+        </div>
+    }
+    @if (Model.HasLearningContent)
+    {
+        <div class="card-filter-tag">
+            <strong class="nhsuk-tag nhsuk-tag--grey">Learning content</strong>
+        </div>
+    }
+    @if (Model.HasLearningAssessmentAndCertification)
+    {
+        <div class="card-filter-tag">
+            <strong class="nhsuk-tag nhsuk-tag--grey">Learning assessment and certification</strong>
+        </div>
+    }
+    @if (Model.IsSelfAssessment)
+    {
+        <div class="card-filter-tag">
+            <strong class="nhsuk-tag nhsuk-tag--grey">Self-assessment</strong>
+        </div>
+    }
+    @if (Model.IncludesSignposting)
+    {
+        <div class="card-filter-tag">
+            <strong class="nhsuk-tag nhsuk-tag--grey">Signposts learning</strong>
+        </div>
     }
-  }
-  @if (Model.HasDiagnosticAssessment)
-  {
-    <div class="card-filter-tag">
-      <strong class="nhsuk-tag nhsuk-tag--grey">Diagnostic assessment</strong>
-    </div>
-  }
-  @if (Model.HasLearningContent)
-  {
-    <div class="card-filter-tag">
-      <strong class="nhsuk-tag nhsuk-tag--grey">Learning content</strong>
-    </div>
-  }
-  @if (Model.HasLearningAssessmentAndCertification)
-  {
-    <div class="card-filter-tag">
-      <strong class="nhsuk-tag nhsuk-tag--grey">Learning assessment and certification</strong>
-    </div>
-  }
-  @if (Model.IsSelfAssessment)
-  {
-    <div class="card-filter-tag">
-      <strong class="nhsuk-tag nhsuk-tag--grey">Competency assessment</strong>
-    </div>
-  }
-  @if (Model.IncludesSignposting)
-  {
-    <div class="card-filter-tag">
-      <strong class="nhsuk-tag nhsuk-tag--grey">Signposts learning</strong>
-    </div>
-  }
 </div>
diff --git a/DigitalLearningSolutions.Web/Views/Supervisor/EnrolDelegateSummary.cshtml b/DigitalLearningSolutions.Web/Views/Supervisor/EnrolDelegateSummary.cshtml
index 9b1a0ba769..23da294dc9 100644
--- a/DigitalLearningSolutions.Web/Views/Supervisor/EnrolDelegateSummary.cshtml
+++ b/DigitalLearningSolutions.Web/Views/Supervisor/EnrolDelegateSummary.cshtml
@@ -75,7 +75,7 @@
         <dd class="nhsuk-summary-list__actions">
 
             <a asp-action="EnrolDelegateOnProfileAssessment" asp-route-supervisorDelegateId="@Model.SupervisorDelegateDetail.ID">
-                Change<span class="nhsuk-u-visually-hidden"> competency assessment</span>
+                Change<span class="nhsuk-u-visually-hidden"> self-assessment</span>
             </a>
 
         </dd>