diff --git a/DigitalLearningSolutions.Web/Scripts/searchSortAndPaginate/sort.ts b/DigitalLearningSolutions.Web/Scripts/searchSortAndPaginate/sort.ts
index 130732dc50..b5f8aa7493 100644
--- a/DigitalLearningSolutions.Web/Scripts/searchSortAndPaginate/sort.ts
+++ b/DigitalLearningSolutions.Web/Scripts/searchSortAndPaginate/sort.ts
@@ -30,15 +30,15 @@ export function getSortValue(
   switch (sortBy) {
     case 'Name':
       return getElementText(searchableElement, 'name').toLocaleLowerCase();
-    case 'EnrolledDate':
+    case 'StartedDate':
       return parseDate(getElementText(searchableElement, 'started-date'));
-    case 'LastAccessedDate':
+    case 'LastAccessed':
       return parseDate(getElementText(searchableElement, 'accessed-date'));
     case 'CompleteByDate':
       return parseDate(getElementText(searchableElement, 'complete-by-date'));
     case 'Completed':
       return parseDate(getElementText(searchableElement, 'completed-date'));
-    case 'HasDiagnostic,DiagnosticsScore':
+    case 'HasDiagnostic,DiagnosticScore':
       return parseInt(getElementText(searchableElement, 'diagnostic-score').split('/')[0] || '-1', 10);
     case 'IsAssessed,Passes':
       return parseInt(getElementText(searchableElement, 'passed-sections').split('/')[0] || '-1', 10);
diff --git a/DigitalLearningSolutions.Web/Scripts/spec/sort.spec.ts b/DigitalLearningSolutions.Web/Scripts/spec/sort.spec.ts
index 1f2944688a..3c34c19b53 100644
--- a/DigitalLearningSolutions.Web/Scripts/spec/sort.spec.ts
+++ b/DigitalLearningSolutions.Web/Scripts/spec/sort.spec.ts
@@ -7,12 +7,12 @@ describe('getSortValue', () => {
   it.each`
   fieldName             | fieldValue        | sortBy                  | expectedSortValue
   ${'name'}             | ${'Example name'} | ${'Name'}        | ${'example name'}
-  ${'started-date'}     | ${'01/01/2020'}   | ${'EnrolledDate'}      | ${new Date('01/01/2020')}
-  ${'accessed-date'}    | ${'02/02/2020'}   | ${'LastAccessedDate'} | ${new Date('02/02/2020')}
+  ${'started-date'}     | ${'01/01/2020'}   | ${'StartedDate'}      | ${new Date('01/01/2020')}
+  ${'accessed-date'}    | ${'02/02/2020'}   | ${'LastAccessed'} | ${new Date('02/02/2020')}
   ${'complete-by-date'} | ${'03/03/2020'}   | ${'CompleteByDate'}   | ${new Date('03/03/2020')}
   ${'complete-by-date'} | ${'-'}            | ${'CompleteByDate'}   | ${new Date(0)}
-  ${'diagnostic-score'} | ${'6/10'}         | ${'HasDiagnostic,DiagnosticsScore'}   | ${6}
-  ${''}                 | ${''}             | ${'HasDiagnostic,DiagnosticsScore'}   | ${-1}
+  ${'diagnostic-score'} | ${'6/10'}         | ${'HasDiagnostic,DiagnosticScore'}   | ${6}
+  ${''}                 | ${''}             | ${'HasDiagnostic,DiagnosticScore'}   | ${-1}
   ${'passed-sections'}  | ${'8/10'}         | ${'IsAssessed,Passes'}    | ${8}
   ${''}                 | ${''}             | ${'IsAssessed,Passes'}    | ${-1}
   ${'brand'}            | ${'Brand 1'}      | ${'Brand'}              | ${'brand 1'}
@@ -89,14 +89,14 @@ describe('sortSearchableElements current', () => {
     sortBy                  | sortDirection   | firstId       | secondId      | thirdId
     ${'Name'}        | ${'Ascending'}  | ${'course-a'} | ${'course-b'} | ${'course-c'}
     ${'Name'}        | ${'Descending'} | ${'course-c'} | ${'course-b'} | ${'course-a'}
-    ${'HasDiagnostic,DiagnosticsScore'}   | ${'Ascending'}  | ${'course-a'} | ${'course-c'} | ${'course-b'}
-    ${'HasDiagnostic,DiagnosticsScore'}   | ${'Descending'} | ${'course-b'} | ${'course-c'} | ${'course-a'}
+    ${'HasDiagnostic,DiagnosticScore'}   | ${'Ascending'}  | ${'course-a'} | ${'course-c'} | ${'course-b'}
+    ${'HasDiagnostic,DiagnosticScore'}   | ${'Descending'} | ${'course-b'} | ${'course-c'} | ${'course-a'}
     ${'IsAssessed,Passes'}    | ${'Ascending'}  | ${'course-c'} | ${'course-a'} | ${'course-b'}
     ${'IsAssessed,Passes'}    | ${'Descending'} | ${'course-b'} | ${'course-a'} | ${'course-c'}
-    ${'EnrolledDate'}      | ${'Ascending'}  | ${'course-a'} | ${'course-b'} | ${'course-c'}
-    ${'EnrolledDate'}      | ${'Descending'} | ${'course-c'} | ${'course-b'} | ${'course-a'}
-    ${'LastAccessedDate'} | ${'Ascending'}  | ${'course-b'} | ${'course-c'} | ${'course-a'}
-    ${'LastAccessedDate'} | ${'Descending'} | ${'course-a'} | ${'course-c'} | ${'course-b'}
+    ${'StartedDate'}      | ${'Ascending'}  | ${'course-a'} | ${'course-b'} | ${'course-c'}
+    ${'StartedDate'}      | ${'Descending'} | ${'course-c'} | ${'course-b'} | ${'course-a'}
+    ${'LastAccessed'} | ${'Ascending'}  | ${'course-b'} | ${'course-c'} | ${'course-a'}
+    ${'LastAccessed'} | ${'Descending'} | ${'course-a'} | ${'course-c'} | ${'course-b'}
     ${'CompleteByDate'}   | ${'Ascending'}  | ${'course-a'} | ${'course-b'} | ${'course-c'}
     ${'CompleteByDate'}   | ${'Descending'} | ${'course-c'} | ${'course-b'} | ${'course-a'}
     `('should correctly sort the cards $sortDirection by $sortBy', ({