diff --git a/.design-system-version b/.design-system-version
index 0ee7d5d29..4996915d8 100644
--- a/.design-system-version
+++ b/.design-system-version
@@ -1 +1 @@
-62.2.4
+63.0.0
diff --git a/Makefile b/Makefile
index e86456143..87ee238c7 100644
--- a/Makefile
+++ b/Makefile
@@ -13,14 +13,14 @@ load-design-system-templates:
 	pipenv run ./scripts/load_templates.sh $(DESIGN_SYSTEM_VERSION)
 
 lint:
-	pipenv check ./response_operations_ui ./tests -i 51499
+	pipenv check ./response_operations_ui ./tests -i 51499 -i 59062 -i 58755
 	pipenv run isort .
 	pipenv run black --line-length 120 .
 	pipenv run djlint .
 	pipenv run flake8 --exclude ./node_modules
 
 lint-check: load-design-system-templates
-	pipenv check ./response_operations_ui ./tests -i 51499
+	pipenv check ./response_operations_ui ./tests -i 51499 -i 59062 -i 58755
 	pipenv run isort . --check-only
 	pipenv run black --line-length 120 --check .
 	pipenv run djlint . 
diff --git a/_infra/helm/response-operations-ui/Chart.yaml b/_infra/helm/response-operations-ui/Chart.yaml
index 894b968e0..dc3b65c85 100644
--- a/_infra/helm/response-operations-ui/Chart.yaml
+++ b/_infra/helm/response-operations-ui/Chart.yaml
@@ -14,8 +14,8 @@ type: application
 
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
-version: 3.1.27
+version: 3.1.28
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application.
-appVersion: 3.1.27
+appVersion: 3.1.28
diff --git a/response_operations_ui/templates/account/activate-account.html b/response_operations_ui/templates/account/activate-account.html
index 9621c6348..33f0433cf 100644
--- a/response_operations_ui/templates/account/activate-account.html
+++ b/response_operations_ui/templates/account/activate-account.html
@@ -1,7 +1,7 @@
 
 {% extends "layouts/base.html" %}
 {% from "components/button/_macro.njk" import onsButton %}
-{% from "components/lists/_macro.njk" import onsList %}
+{% from "components/list/_macro.njk" import onsList %}
 {% from "components/password/_macro.njk" import onsPassword %}
 {% from "components/input/_macro.njk" import onsInput %}
 {% from "components/fieldset/_macro.njk" import onsFieldset %}
diff --git a/response_operations_ui/templates/account/change-account-name.html b/response_operations_ui/templates/account/change-account-name.html
index 7e12b4786..75047e6a3 100644
--- a/response_operations_ui/templates/account/change-account-name.html
+++ b/response_operations_ui/templates/account/change-account-name.html
@@ -2,7 +2,7 @@
 {% from "components/metadata/_macro.njk" import onsMetadata %}
 {% from "components/input/_macro.njk" import onsInput %}
 {% from "components/button/_macro.njk" import onsButton %}
-{% from "components/lists/_macro.njk" import onsList %}
+{% from "components/list/_macro.njk" import onsList %}
 {% set page_title =  "Change Name" %}
 
 {% block main %}
diff --git a/response_operations_ui/templates/account/change-email.html b/response_operations_ui/templates/account/change-email.html
index cf0d76113..85a02cc4a 100644
--- a/response_operations_ui/templates/account/change-email.html
+++ b/response_operations_ui/templates/account/change-email.html
@@ -2,7 +2,7 @@
 {% from "components/metadata/_macro.njk" import onsMetadata %}
 {% from "components/input/_macro.njk" import onsInput %}
 {% from "components/button/_macro.njk" import onsButton %}
-{% from "components/lists/_macro.njk" import onsList %}
+{% from "components/list/_macro.njk" import onsList %}
 {% set page_title =  "Change email address" %}
 
 {% set ns = namespace() %}
diff --git a/response_operations_ui/templates/account/change-password.html b/response_operations_ui/templates/account/change-password.html
index 0748c3917..fe52127c5 100644
--- a/response_operations_ui/templates/account/change-password.html
+++ b/response_operations_ui/templates/account/change-password.html
@@ -1,7 +1,7 @@
 {% from "components/fieldset/_macro.njk" import onsFieldset %}
 {% from "components/input/_macro.njk" import onsInput %}
 {% from "components/button/_macro.njk" import onsButton %}
-{% from "components/lists/_macro.njk" import onsList %}
+{% from "components/list/_macro.njk" import onsList %}
 {% extends "layouts/base.html" %}
 {% from "components/metadata/_macro.njk" import onsMetadata %}
 {% from "components/password/_macro.njk" import onsPassword %}
diff --git a/response_operations_ui/templates/account/change-username.html b/response_operations_ui/templates/account/change-username.html
index 5fcd31d0b..086d65f4a 100644
--- a/response_operations_ui/templates/account/change-username.html
+++ b/response_operations_ui/templates/account/change-username.html
@@ -2,7 +2,7 @@
 {% from "components/fieldset/_macro.njk" import onsFieldset %}
 {% from "components/input/_macro.njk" import onsInput %}
 {% from "components/button/_macro.njk" import onsButton %}
-{% from "components/lists/_macro.njk" import onsList %}
+{% from "components/list/_macro.njk" import onsList %}
 {% from "components/metadata/_macro.njk" import onsMetadata %}
 
 {% set ns = namespace() %}
diff --git a/response_operations_ui/templates/admin/banner-manage.html b/response_operations_ui/templates/admin/banner-manage.html
index 88f30a7df..2e20647f2 100644
--- a/response_operations_ui/templates/admin/banner-manage.html
+++ b/response_operations_ui/templates/admin/banner-manage.html
@@ -2,7 +2,7 @@
 {% from "components/button/_macro.njk" import onsButton %}
 {% from "components/fieldset/_macro.njk" import onsFieldset %}
 {% from "components/input/_macro.njk" import onsInput %}
-{% from "components/lists/_macro.njk" import onsList %}
+{% from "components/list/_macro.njk" import onsList %}
 {% from "components/textarea/_macro.njk" import onsTextarea %}
 {% from "components/radios/_macro.njk" import onsRadios %}
 {% set page_title = 'Alert Admin' %}
diff --git a/response_operations_ui/templates/admin/banner-view-message-template.html b/response_operations_ui/templates/admin/banner-view-message-template.html
index 5e45fbdd7..3171983ab 100644
--- a/response_operations_ui/templates/admin/banner-view-message-template.html
+++ b/response_operations_ui/templates/admin/banner-view-message-template.html
@@ -2,7 +2,7 @@
 {% from "components/button/_macro.njk" import onsButton %}
 {% from "components/fieldset/_macro.njk" import onsFieldset %}
 {% from "components/input/_macro.njk" import onsInput %}
-{% from "components/lists/_macro.njk" import onsList %}
+{% from "components/list/_macro.njk" import onsList %}
 {% from "components/textarea/_macro.njk" import onsTextarea %}
 {% from "components/radios/_macro.njk" import onsRadios %}
 {% set page_title = 'Alert Admin' %}
diff --git a/response_operations_ui/templates/admin/template-create.html b/response_operations_ui/templates/admin/template-create.html
index befe73014..a0f6ed4d9 100644
--- a/response_operations_ui/templates/admin/template-create.html
+++ b/response_operations_ui/templates/admin/template-create.html
@@ -2,7 +2,7 @@
 {% from "components/button/_macro.njk" import onsButton %}
 {% from "components/fieldset/_macro.njk" import onsFieldset %}
 {% from "components/input/_macro.njk" import onsInput %}
-{% from "components/lists/_macro.njk" import onsList %}
+{% from "components/list/_macro.njk" import onsList %}
 {% from "components/textarea/_macro.njk" import onsTextarea %}
 
 {% set page_title = 'Template Create' %}
diff --git a/response_operations_ui/templates/admin/template-edit.html b/response_operations_ui/templates/admin/template-edit.html
index e34c81592..22df0269d 100644
--- a/response_operations_ui/templates/admin/template-edit.html
+++ b/response_operations_ui/templates/admin/template-edit.html
@@ -3,7 +3,7 @@
 {% from "components/button/_macro.njk" import onsButton %}
 {% from "components/fieldset/_macro.njk" import onsFieldset %}
 {% from "components/input/_macro.njk" import onsInput %}
-{% from "components/lists/_macro.njk" import onsList %}
+{% from "components/list/_macro.njk" import onsList %}
 {% from "components/textarea/_macro.njk" import onsTextarea %}
 {% set page_title = 'Template Edit' %}
 {% block main %}
diff --git a/response_operations_ui/templates/admin/template-manage.html b/response_operations_ui/templates/admin/template-manage.html
index e983824d7..96ee3c29e 100644
--- a/response_operations_ui/templates/admin/template-manage.html
+++ b/response_operations_ui/templates/admin/template-manage.html
@@ -2,7 +2,7 @@
 {% from "components/button/_macro.njk" import onsButton %}
 {% from "components/radios/_macro.njk" import onsRadios %}
 {% from "components/fieldset/_macro.njk" import onsFieldset %}
-{% from "components/lists/_macro.njk" import onsList %}
+{% from "components/list/_macro.njk" import onsList %}
 
 {% set page_title = 'Template Admin' %}
 {% block main %}
diff --git a/response_operations_ui/templates/admin/user-create.html b/response_operations_ui/templates/admin/user-create.html
index 9e2ae62ae..730c0f29e 100644
--- a/response_operations_ui/templates/admin/user-create.html
+++ b/response_operations_ui/templates/admin/user-create.html
@@ -1,7 +1,7 @@
 
 {% extends "layouts/base.html" %}
 {% from "components/button/_macro.njk" import onsButton %}
-{% from "components/lists/_macro.njk" import onsList %}
+{% from "components/list/_macro.njk" import onsList %}
 {% from "components/password/_macro.njk" import onsPassword %}
 {% from "components/input/_macro.njk" import onsInput %}
 {% from "components/fieldset/_macro.njk" import onsFieldset %}
diff --git a/response_operations_ui/templates/collection_exercise/ce-info-section.html b/response_operations_ui/templates/collection_exercise/ce-info-section.html
index c935b3000..afe84ab08 100644
--- a/response_operations_ui/templates/collection_exercise/ce-info-section.html
+++ b/response_operations_ui/templates/collection_exercise/ce-info-section.html
@@ -92,8 +92,7 @@ <h2 class="ons-u-fs-r--b ons-u-pt-m">Collection exercise information</h2>
                     "value": label, 
                 }, 
                 {
-                    "value": event if event,
-                    "name": id,
+                    "value": event if event
                 },
             ]
         %}  
diff --git a/response_operations_ui/templates/collection_exercise/ce-sample-section.html b/response_operations_ui/templates/collection_exercise/ce-sample-section.html
index 00ee5c9fc..3312e93df 100644
--- a/response_operations_ui/templates/collection_exercise/ce-sample-section.html
+++ b/response_operations_ui/templates/collection_exercise/ce-sample-section.html
@@ -43,7 +43,6 @@
                         },
                         {
                             "value": sample.totalSampleUnits,
-                            "name": "total-businesses",
                             "numeric": "true"
                         }
                     ]
@@ -55,7 +54,6 @@
                         },
                         {
                             "value": sample.expectedCollectionInstruments,
-                            "name": "total-ci",
                             "numeric": "true"
                         }
                     ]
diff --git a/response_operations_ui/templates/collection_exercise/ce-upload-sample-file.html b/response_operations_ui/templates/collection_exercise/ce-upload-sample-file.html
index 373db5d86..5c193e296 100644
--- a/response_operations_ui/templates/collection_exercise/ce-upload-sample-file.html
+++ b/response_operations_ui/templates/collection_exercise/ce-upload-sample-file.html
@@ -38,8 +38,7 @@ <h1 name="page-ce-title">Upload sample file</h1>
                                     "value": "Total businesses"
                                 },
                                 {
-                                    "value": sample.totalSampleUnits,
-                                    "name": "total-businesses"
+                                    "value": sample.totalSampleUnits
                                 }
                             ]
                         },
@@ -49,8 +48,7 @@ <h1 name="page-ce-title">Upload sample file</h1>
                                     "value": "Collection instruments"
                                 },
                                 {
-                                    "value": sample.expectedCollectionInstruments,
-                                    "name": "total-ci"
+                                    "value": sample.expectedCollectionInstruments
                                 }
                             ]
                         }
diff --git a/response_operations_ui/templates/conversation-view/cv-handle-errors.html b/response_operations_ui/templates/conversation-view/cv-handle-errors.html
index 7a01540f3..d57a5ee1a 100644
--- a/response_operations_ui/templates/conversation-view/cv-handle-errors.html
+++ b/response_operations_ui/templates/conversation-view/cv-handle-errors.html
@@ -1,4 +1,4 @@
-{% from "components/lists/_macro.njk" import onsList %}
+{% from "components/list/_macro.njk" import onsList %}
 {% if form.errors %}
     {% set error_count = form.errors | length %}
     {% set plural_suffix = 's' if error_count > 1 else '' %}
diff --git a/response_operations_ui/templates/conversation-view/cv-message-block.html b/response_operations_ui/templates/conversation-view/cv-message-block.html
index a4ea48679..2a26b59b6 100644
--- a/response_operations_ui/templates/conversation-view/cv-message-block.html
+++ b/response_operations_ui/templates/conversation-view/cv-message-block.html
@@ -23,7 +23,6 @@
     {% call onsMessage({
         "type": msgType,
         "id": msgId + loop.index|string,
-        "name": msgName,
         "fromLabel": 'From',
         "fromName": 'sm-from-user',
         "fromId": 'sm-from-user-' + loop.index|string,
@@ -35,8 +34,7 @@
         "unreadLink": unreadLink,
         "unreadLinkId": unreadLinkId,
         "unreadLinkText": unreadLinkText,
-        "messageID": 'conversation-message-body-' + loop.index|string,
-        "messageName": 'conversation-message-body'
+        "messageID": 'conversation-message-body-' + loop.index|string
     }) %}
         <span style="white-space:pre-line">{{ message.get('body') }}</span>
     {% endcall %}
diff --git a/response_operations_ui/templates/create-ce-event.html b/response_operations_ui/templates/create-ce-event.html
index a63aa5b4a..a5132ba4c 100644
--- a/response_operations_ui/templates/create-ce-event.html
+++ b/response_operations_ui/templates/create-ce-event.html
@@ -3,7 +3,7 @@
 {% from "components/metadata/_macro.njk" import onsMetadata %}
 {% from "components/fieldset/_macro.njk" import onsFieldset %}
 {% from "components/input/_macro.njk" import onsInput %}
-{% from "components/lists/_macro.njk" import onsList %}
+{% from "components/list/_macro.njk" import onsList %}
 
 {% set page_title = 'Create event date' %}
 {% block main %}
diff --git a/response_operations_ui/templates/create-message.html b/response_operations_ui/templates/create-message.html
index 7710979f7..9023657be 100644
--- a/response_operations_ui/templates/create-message.html
+++ b/response_operations_ui/templates/create-message.html
@@ -4,7 +4,7 @@
 {% from "components/fieldset/_macro.njk" import onsFieldset %}
 {% from "components/input/_macro.njk" import onsInput %}
 {% from "components/textarea/_macro.njk" import onsTextarea %}
-{% from "components/lists/_macro.njk" import onsList %}
+{% from "components/list/_macro.njk" import onsList %}
 
 {% set page_title = "Create Message" %}
 {% block main %}
diff --git a/response_operations_ui/templates/create-new-account.html b/response_operations_ui/templates/create-new-account.html
index bbb8bad0a..ea5d02ea6 100644
--- a/response_operations_ui/templates/create-new-account.html
+++ b/response_operations_ui/templates/create-new-account.html
@@ -1,6 +1,6 @@
 {% extends "layouts/base.html" %}
 {% from "components/button/_macro.njk" import onsButton %}
-{% from "components/lists/_macro.njk" import onsList %}
+{% from "components/list/_macro.njk" import onsList %}
 {% from "components/password/_macro.njk" import onsPassword %}
 {% from "components/input/_macro.njk" import onsInput %}
 {% from "components/fieldset/_macro.njk" import onsFieldset %}
diff --git a/response_operations_ui/templates/create-survey.html b/response_operations_ui/templates/create-survey.html
index d874498eb..4cea9f510 100644
--- a/response_operations_ui/templates/create-survey.html
+++ b/response_operations_ui/templates/create-survey.html
@@ -3,7 +3,7 @@
 {% from "components/radios/_macro.njk" import onsRadios %}
 {% from "components/fieldset/_macro.njk" import onsFieldset %}
 {% from "components/input/_macro.njk" import onsInput %}
-{% from "components/lists/_macro.njk" import onsList %}
+{% from "components/list/_macro.njk" import onsList %}
 
 {% set page_title = 'Create survey' %}
 
diff --git a/response_operations_ui/templates/home.html b/response_operations_ui/templates/home.html
index 3c5f54418..4f27c0ce6 100644
--- a/response_operations_ui/templates/home.html
+++ b/response_operations_ui/templates/home.html
@@ -1,5 +1,5 @@
 {% extends "layouts/base.html" %}
-{% from "components/lists/_macro.njk" import onsList %}
+{% from "components/list/_macro.njk" import onsList %}
 
 {% set page_title = "Home" %}
 
diff --git a/response_operations_ui/templates/messages.html b/response_operations_ui/templates/messages.html
index 27b3a1c03..8a279c872 100644
--- a/response_operations_ui/templates/messages.html
+++ b/response_operations_ui/templates/messages.html
@@ -185,36 +185,30 @@ <h1 class="ons-u-fs-l ons-u-mt-l">Oops! Something went wrong</h1>
                                     {
                                         "value": ruRef,
                                         "data": "RU Ref",
-                                        "name": "tbl-messages-RU_Ref",
                                         "id": 'ru-ref-' + loop.index|string
                                     },
                                     {
                                         "value": businessName,
                                         "data": "Business name",
-                                        "name": "tbl-messages-business",
                                         "id": 'business-name-' + loop.index|string
                                     },
                                     {
                                         "value": '<span class="ons-u-fw-b"><a href="' + url_for('messages_bp.view_conversation', thread_id=message.thread_id, page=page, conversation_tab=conversation_tab, ru_ref_filter=ru_ref_filter, business_id_filter=business_id_filter) +'#latest-message" id="message-link-' + loop.index|string + '">' + message.subject + '</a></span>' if message.unread else '<a href="' + url_for('messages_bp.view_conversation', thread_id=message.thread_id, page=page, conversation_tab=conversation_tab, ru_ref_filter=ru_ref_filter, business_id_filter=business_id_filter) +'#latest-message" id="message-link-' + loop.index|string + '">' + message.subject + '</a>',
-                                        "data": "Subject",
-                                        "name": "tbl-messages-subject"
+                                        "data": "Subject"
                                     },
                                     {
                                         "value": fromValue if message.from else 'Unavailable',
                                         "data": "From",
-                                        "name": "tbl-messages-from",
                                         "id": 'messages-from-' + loop.index|string
                                     },
                                     {
                                         "value": toValue if message.to else 'Unavailable',
                                         "data": "To",
-                                        "name": "tbl-messages-to",
                                         "id": 'messages-to-' + loop.index|string
                                     },
                                     {
                                         "value": sentDate if message.sent_date else 'Unavailable',
                                         "data": "Date and time",
-                                        "name": "tbl-messages-received",
                                         "id": 'messages-time-' + loop.index|string
                                     }
                                 ]
diff --git a/response_operations_ui/templates/overview/overview-dates-section.html b/response_operations_ui/templates/overview/overview-dates-section.html
index dd18558dc..f6d222b04 100644
--- a/response_operations_ui/templates/overview/overview-dates-section.html
+++ b/response_operations_ui/templates/overview/overview-dates-section.html
@@ -50,8 +50,7 @@ <h2 class="ons-u-fs-r--b ons-u-pt-m">Dates</h2>
                         },
                         {
                             "value": event,
-                            "tdClasses": "ons-u-ta-right",
-                            "name": name
+                            "tdClasses": "ons-u-ta-right"
                         }
                     ]
                 }
diff --git a/response_operations_ui/templates/overview/overview-reference-information.html b/response_operations_ui/templates/overview/overview-reference-information.html
index c6117df83..729447204 100644
--- a/response_operations_ui/templates/overview/overview-reference-information.html
+++ b/response_operations_ui/templates/overview/overview-reference-information.html
@@ -49,8 +49,7 @@ <h2 class="ons-u-fs-r--b ons-u-pt-m">Reference information for this collection e
                         "value": label
                     },
                     {
-                        "value": event if event,
-                        "name": id
+                        "value": event if event
                     }
                 ]
             }
diff --git a/response_operations_ui/templates/partials/ce-collection-instrument-eq-section-error-messages.html b/response_operations_ui/templates/partials/ce-collection-instrument-eq-section-error-messages.html
index a564e62d2..8e5186f6f 100644
--- a/response_operations_ui/templates/partials/ce-collection-instrument-eq-section-error-messages.html
+++ b/response_operations_ui/templates/partials/ce-collection-instrument-eq-section-error-messages.html
@@ -1,4 +1,4 @@
-{% from "components/lists/_macro.njk" import onsList %}
+{% from "components/list/_macro.njk" import onsList %}
 {% with messages = get_flashed_messages(category_filter=["error"]) %}
     {% if messages %}
         {% call
diff --git a/response_operations_ui/templates/radio-option-select-error-panel.html b/response_operations_ui/templates/radio-option-select-error-panel.html
index abc831408..0038c7ab6 100644
--- a/response_operations_ui/templates/radio-option-select-error-panel.html
+++ b/response_operations_ui/templates/radio-option-select-error-panel.html
@@ -1,4 +1,4 @@
-{% from "components/lists/_macro.njk" import onsList %}
+{% from "components/list/_macro.njk" import onsList %}
 {% from "components/panel/_macro.njk" import onsPanel %}
 {% set ns.optionError = false %}
 {% with messages = get_flashed_messages(with_categories=true) %}
diff --git a/response_operations_ui/templates/reporting-unit-respondents.html b/response_operations_ui/templates/reporting-unit-respondents.html
index 243d20b12..3f53ed0fd 100644
--- a/response_operations_ui/templates/reporting-unit-respondents.html
+++ b/response_operations_ui/templates/reporting-unit-respondents.html
@@ -67,18 +67,15 @@ <h1 id="RU_NAME" class="ons-u-fs-xl">{{ ru.name }}</h1>
                         "tds": [
                             {
                                 "value": res,
-                                "data": "Respondent",
-                                "name": "tbl-respondents-respondent"
+                                "data": "Respondent"
                             },
                             {
                                 "value": respondent.status,
-                                "data": "Account status",
-                                "name": "tbl-respondents-status"
+                                "data": "Account status"
                             },
                             {
                                 "value": survey_string|join(''),
-                                "data": "Surveys",
-                                "name": "tbl-respondents-surveys"
+                                "data": "Surveys"
                             }
                         ]
                     }
diff --git a/response_operations_ui/templates/reporting-unit-survey.html b/response_operations_ui/templates/reporting-unit-survey.html
index bd1e5066b..c792cea7e 100644
--- a/response_operations_ui/templates/reporting-unit-survey.html
+++ b/response_operations_ui/templates/reporting-unit-survey.html
@@ -79,28 +79,23 @@ <h3 id="COLLECTION_EXERCISES" class="ons-u-fs-m">Collection exercises</h3>
                             "tds": [
                                 {
                                     "value": ce.exerciseRef,
-                                    "data": "Period",
-                                    "name": "tbl-collection-exercises-period"
+                                    "data": "Period"
                                 },
                                 {
                                     "value": ce.companyName,
-                                    "data": "Reporting unit name",
-                                    "name": "tbl-collection-exercises-ru-name"
+                                    "data": "Reporting unit name"
                                 },
                                 {
                                     "value": ce.tradingAs,
-                                    "data": "Trading as",
-                                    "name": "tbl-collection-exercises-trading-as"
+                                    "data": "Trading as"
                                 },
                                 {
                                     "value": ce.companyRegion,
-                                    "data": "Region",
-                                    "name": "tbl-collection-exercises-region"
+                                    "data": "Region"
                                 },
                                 {
                                     "value": '<span class="ons-status ' + status_class + '">' + ce.responseStatus + '</span>' + survey_link,
-                                    "data": "Status",
-                                    "name": "tbl-collection-exercises-status"
+                                    "data": "Status"
                                 },
                             ]
                         }
diff --git a/response_operations_ui/templates/reporting-unit.html b/response_operations_ui/templates/reporting-unit.html
index ed1e355b8..597daad61 100644
--- a/response_operations_ui/templates/reporting-unit.html
+++ b/response_operations_ui/templates/reporting-unit.html
@@ -64,18 +64,15 @@ <h1 id="RU_NAME" class="ons-u-fs-xl">{{ ru.name }}</h1>
                     "tds": [
                         {
                             "value": '<a href="' + url_for("reporting_unit_bp.view_reporting_unit_survey", ru_ref=ru.sampleUnitRef, survey_id=survey[1].surveyId) + '" id="survey-' + survey[1].shortName + '" >' + survey[1].surveyName + '</a>',
-                            "data": "Survey",
-                            "name": "tbl-surveys-survey"
+                            "data": "Survey"
                         },
                         {
                             "value": survey[1].period,
-                            "data": "Current period",
-                            "name": "tbl-surveys-period"
+                            "data": "Current period"
                         },
                         {
                             "value": '<span class="ons-status ' + status_class + '">' + survey[1].caseStatus + '</span>',
-                            "data": "Status",
-                            "name": "tbl-surveys-status"
+                            "data": "Status"
                         }
                     ]
                 }
diff --git a/response_operations_ui/templates/reset-password.html b/response_operations_ui/templates/reset-password.html
index 9d1ee4ae4..d1060cab5 100644
--- a/response_operations_ui/templates/reset-password.html
+++ b/response_operations_ui/templates/reset-password.html
@@ -1,6 +1,6 @@
 {% extends "layouts/base.html" %}
 {% from "components/button/_macro.njk" import onsButton %}
-{% from "components/lists/_macro.njk" import onsList %}
+{% from "components/list/_macro.njk" import onsList %}
 {% from "components/password/_macro.njk" import onsPassword %}
 {% from "components/input/_macro.njk" import onsInput %}
 {% from "components/fieldset/_macro.njk" import onsFieldset %}
diff --git a/response_operations_ui/templates/respondent-search/respondent-search.html b/response_operations_ui/templates/respondent-search/respondent-search.html
index f229cd74d..db6027e8e 100644
--- a/response_operations_ui/templates/respondent-search/respondent-search.html
+++ b/response_operations_ui/templates/respondent-search/respondent-search.html
@@ -1,6 +1,6 @@
 {% extends "layouts/base.html" %}
 {% from "components/button/_macro.njk" import onsButton %}
-{% from "components/lists/_macro.njk" import onsList %}
+{% from "components/list/_macro.njk" import onsList %}
 {% from "components/fieldset/_macro.njk" import onsFieldset %}
 {% from "components/input/_macro.njk" import onsInput %}
 {% from "components/panel/_macro.njk" import onsPanel %}
diff --git a/response_operations_ui/templates/secure-message/change-reporting-unit.html b/response_operations_ui/templates/secure-message/change-reporting-unit.html
index e224e7318..b59cbc208 100644
--- a/response_operations_ui/templates/secure-message/change-reporting-unit.html
+++ b/response_operations_ui/templates/secure-message/change-reporting-unit.html
@@ -1,7 +1,7 @@
 {% extends "layouts/base.html" %}
 {% from "components/button/_macro.njk" import onsButton %}
 {% from "components/radios/_macro.njk" import onsRadios %}
-{% from "components/lists/_macro.njk" import onsList %}
+{% from "components/list/_macro.njk" import onsList %}
 
 {% set page_title = "Messages" %}
 {% set hide_breadcrumbs = true %}
diff --git a/response_operations_ui/templates/secure-message/change-thread-category-errors.html b/response_operations_ui/templates/secure-message/change-thread-category-errors.html
index 83e8170f1..7313247af 100644
--- a/response_operations_ui/templates/secure-message/change-thread-category-errors.html
+++ b/response_operations_ui/templates/secure-message/change-thread-category-errors.html
@@ -1,4 +1,4 @@
-{% from "components/lists/_macro.njk" import onsList %}
+{% from "components/list/_macro.njk" import onsList %}
 {%- with errors = get_flashed_messages(category_filter=["error"]) -%}
     {%- if errors -%}
         {% call
diff --git a/response_operations_ui/templates/secure-message/misc-inbox.html b/response_operations_ui/templates/secure-message/misc-inbox.html
index 2a57c55ff..b211877f9 100644
--- a/response_operations_ui/templates/secure-message/misc-inbox.html
+++ b/response_operations_ui/templates/secure-message/misc-inbox.html
@@ -155,30 +155,25 @@ <h1 class="ons-u-fs-l ons-u-mt-l">Oops! Something went wrong</h1>
                                     {
                                         "value": fromValue if message.from else 'Unavailable',
                                         "data": "From",
-                                        "name": "tbl-messages-from",
                                         "id": 'messages-from-' + loop.index|string
                                     },
                                     {
                                         "value": emailAddress,
                                         "data": "Email address",
-                                        "name": "tbl-email-address",
                                         "id": 'email-address-' + loop.index|string
                                     },
                                     {
                                         "value": '<span class="ons-u-fw-b"><a href="' + url_for('messages_bp.view_conversation', thread_id=message.thread_id, page=page, conversation_tab=conversation_tab, ru_ref_filter=ru_ref_filter, business_id_filter=business_id_filter) +'#latest-message" id="message-link-' + loop.index|string + '">' + message.subject + '</a></span>' if message.unread else '<a href="' + url_for('messages_bp.view_conversation', thread_id=message.thread_id, page=page, conversation_tab=conversation_tab, ru_ref_filter=ru_ref_filter, business_id_filter=business_id_filter) +'#latest-message" id="message-link-' + loop.index|string + '">' + message.subject + '</a>',
-                                        "data": "Subject",
-                                        "name": "tbl-messages-subject"
+                                        "data": "Subject"
                                     },
                                     {
                                         "value": toValue if message.to else 'Unavailable',
                                         "data": "To",
-                                        "name": "tbl-messages-to",
                                         "id": 'messages-to-' + loop.index|string
                                     },
                                     {
                                         "value": sentDate if message.sent_date else 'Unavailable',
                                         "data": "Date and time",
-                                        "name": "tbl-messages-received",
                                         "id": 'messages-time-' + loop.index|string
                                     }
                                 ]
diff --git a/response_operations_ui/templates/secure-message/technical-inbox.html b/response_operations_ui/templates/secure-message/technical-inbox.html
index 0471581e9..e3e612a08 100644
--- a/response_operations_ui/templates/secure-message/technical-inbox.html
+++ b/response_operations_ui/templates/secure-message/technical-inbox.html
@@ -155,30 +155,25 @@ <h1 class="ons-u-fs-l ons-u-mt-l">Oops! Something went wrong</h1>
                                 {
                                     "value": fromValue if message.from else 'Unavailable',
                                     "data": "From",
-                                    "name": "tbl-messages-from",
                                     "id": 'messages-from-' + loop.index|string
                                 },
                                 {
                                     "value": emailAddress,
                                     "data": "Email address",
-                                    "name": "tbl-email-address",
                                     "id": 'email-address-' + loop.index|string
                                 },
                                 {
                                     "value": '<span class="ons-u-fw-b"><a href="' + url_for('messages_bp.view_conversation', thread_id=message.thread_id, page=page, conversation_tab=conversation_tab, ru_ref_filter=ru_ref_filter, business_id_filter=business_id_filter) +'#latest-message" id="message-link-' + loop.index|string + '">' + message.subject + '</a></span>' if message.unread else '<a href="' + url_for('messages_bp.view_conversation', thread_id=message.thread_id, page=page, conversation_tab=conversation_tab, ru_ref_filter=ru_ref_filter, business_id_filter=business_id_filter) +'#latest-message" id="message-link-' + loop.index|string + '">' + message.subject + '</a>',
-                                    "data": "Subject",
-                                    "name": "tbl-messages-subject"
+                                    "data": "Subject"
                                 },
                                 {
                                     "value": toValue if message.to else 'Unavailable',
                                     "data": "To",
-                                    "name": "tbl-messages-to",
                                     "id": 'messages-to-' + loop.index|string
                                 },
                                 {
                                     "value": sentDate if message.sent_date else 'Unavailable',
                                     "data": "Date and time",
-                                    "name": "tbl-messages-received",
                                     "id": 'messages-time-' + loop.index|string
                                 }
                             ]
diff --git a/response_operations_ui/templates/sign_in.html b/response_operations_ui/templates/sign_in.html
index ac52141b1..ba91dbc80 100644
--- a/response_operations_ui/templates/sign_in.html
+++ b/response_operations_ui/templates/sign_in.html
@@ -2,7 +2,7 @@
 {% from "components/fieldset/_macro.njk" import onsFieldset %}
 {% from "components/input/_macro.njk" import onsInput %}
 {% from "components/error/_macro.njk" import onsError %}
-{% from "components/lists/_macro.njk" import onsList %}
+{% from "components/list/_macro.njk" import onsList %}
 {% from "components/button/_macro.njk" import onsButton %}
 {% from "components/password/_macro.njk" import onsPassword %}
 
diff --git a/response_operations_ui/templates/survey.html b/response_operations_ui/templates/survey.html
index 701d23497..185f0bc90 100644
--- a/response_operations_ui/templates/survey.html
+++ b/response_operations_ui/templates/survey.html
@@ -101,43 +101,35 @@ <h2 class="ons-u-fs-l u-mb-xs" name="page-survey-subtitle">Collection exercises
                         {
                             "value": '<a href="/surveys/' + survey.shortName.replace(' ', '') + "/" + exercise.exerciseRef + '"
                                 name="ce-link-' + exercise.exerciseRef + '">' + exercise.exerciseRef + '</a>',
-                            "data": "Period",
-                            "name" : "tbl-ce-period"
+                            "data": "Period"
                         },
                         {
                             "value": exercise.userDescription,
-                            "data": "Respondent sees",
-                            "name" : "tbl-ce-shown-as"
+                            "data": "Respondent sees"
                         },
                         {
                             "value": '<span class="ons-status ' + state_html_class + '">' + exercise.state + status_event + '</span>',
-                            "data": "Status",
-                            "name" : "tbl-ce-status"
+                            "data": "Status"
                         },
                         {
                             "value": exercise.sample_summary.totalSampleUnits,
-                            "data": "Sample",
-                            "name" : "tbl-ce-status"
+                            "data": "Sample"
                         },
                         {
                             "value": exercise.events.mps.date,
-                            "data": "MPS",
-                            "name" : "tbl-ce-status"
+                            "data": "MPS"
                         },
                         {
                             "value": exercise.events.go_live.date,
-                            "data": "Go live",
-                            "name" : "tbl-ce-status"
+                            "data": "Go live"
                         },
                         {
                             "value": exercise.events.return_by.date,
-                            "data": "Return by",
-                            "name" : "tbl-ce-status"
+                            "data": "Return by"
                         },
                         {
                             "value": exercise.events.reminder.date,
-                            "data": "First Reminder",
-                            "name" : "tbl-ce-report"
+                            "data": "First Reminder"
                         },
                     ]
                 }
diff --git a/response_operations_ui/templates/surveys.html b/response_operations_ui/templates/surveys.html
index df9996ecb..0e42248a1 100644
--- a/response_operations_ui/templates/surveys.html
+++ b/response_operations_ui/templates/surveys.html
@@ -84,23 +84,19 @@ <h1 class="ons-u-fs-xl u-mb-xs" name="page-surveys-title">Online Business Survey
                 "tds": [
                     {
                         "value": '<a href="/surveys/' + survey.shortName.replace(' ', '') + '" name="survey-link-' + survey.shortName + '">' + survey.longName + '</a><a style="text-decoration: none">' + ' | ' + survey.shortName + '</a>',
-                        "data": "Survey Title",
-                        "name": "tbl-surveys-title"
+                        "data": "Survey Title"
                     },
                     {
                         "value": survey.surveyRef,
-                        "data": "Survey ID",
-                        "name": "tbl-surveys-ref"
+                        "data": "Survey ID"
                     },
                     {
                         "value": survey.surveyMode.replace('_AND_', ' and '),
-                        "data": "Survey mode",
-                        "name": "tbl-surveys-mode"
+                        "data": "Survey mode"
                     },
                     {
                         "value": survey.legalBasis,
-                        "data": "Legal basis",
-                        "name": "tbl-surveys-legal-basis"
+                        "data": "Legal basis"
                     },
                     {
                         "value": '<a href="' + url_for("surveys_bp.view_survey_details", short_name=survey.shortName) + '">Edit survey</a>',
@@ -110,23 +106,19 @@ <h1 class="ons-u-fs-xl u-mb-xs" name="page-surveys-title">Online Business Survey
                         [
                             {
                                 "value": '<a href="/surveys/' + survey.shortName.replace(' ', '') + '" name="survey-link-' + survey.shortName + '">' + survey.longName + '</a>' + ' | ' + survey.shortName,
-                                "data": "Survey Title",
-                                "name": "tbl-surveys-title"
+                                "data": "Survey Title"
                             },
                             {
                                 "value": survey.surveyRef,
-                                "data": "Survey ID",
-                                "name": "tbl-surveys-ref"
+                                "data": "Survey ID"
                             },
                             {
                                 "value": survey.surveyMode.replace('_AND_', ' and '),
-                                "data": "Survey mode",
-                                "name": "tbl-surveys-mode"
+                                "data": "Survey mode"
                             },
                             {
                                 "value": survey.legalBasis,
-                                "data": "Legal basis",
-                                "name": "tbl-surveys-legal-basis"
+                                "data": "Legal basis"
                             }
                         ]
                 ]
diff --git a/response_operations_ui/templates/update-event-date.html b/response_operations_ui/templates/update-event-date.html
index 6efa09dd0..5439edb43 100644
--- a/response_operations_ui/templates/update-event-date.html
+++ b/response_operations_ui/templates/update-event-date.html
@@ -3,7 +3,7 @@
 {% from "components/metadata/_macro.njk" import onsMetadata %}
 {% from "components/fieldset/_macro.njk" import onsFieldset %}
 {% from "components/input/_macro.njk" import onsInput %}
-{% from "components/lists/_macro.njk" import onsList %}
+{% from "components/list/_macro.njk" import onsList %}
 {% from "components/checkboxes/_macro.njk" import onsCheckboxes %}
 {% from "components/field/_macro.njk" import onsField %}
 
diff --git a/tests/views/test_message.py b/tests/views/test_message.py
index bad61bad7..c80077da6 100644
--- a/tests/views/test_message.py
+++ b/tests/views/test_message.py
@@ -380,7 +380,6 @@ def test_unread_messages_are_displayed_correctly(self, mock_request, mock_get_jw
         mock_request.get(shortname_url + "/ASHE", json=ashe_info["survey"])
         response = self.client.get("/messages/ASHE")
 
-        self.assertIn('name="message-unread"'.encode(), response.data)
         self.assertIn("status".encode(), response.data)
 
     def test_get_message_unread_status(self):