diff --git a/app/templates/partials/jobs/count-letters.html b/app/templates/partials/jobs/count-letters.html
index 3bfb13cd0..21e242d4e 100644
--- a/app/templates/partials/jobs/count-letters.html
+++ b/app/templates/partials/jobs/count-letters.html
@@ -2,7 +2,7 @@
 {% from 'components/message-count-label.html' import message_count_label %}
 
 <div class="govuk-grid-row bottom-gutter-2-3">
-  <div class="column-half">
+  <div class="govuk-grid-column-one-half">
     <div class="keyline-block">
       {{ big_number(
         job.notification_count,
@@ -11,7 +11,7 @@
       )}}
     </div>
   </div>
-  <div class="column-half">
+  <div class="govuk-grid-column-one-half">
     <div class="keyline-block">
       {{ big_number(
         job.letter_timings.earliest_delivery|string|format_date_short,
diff --git a/app/templates/views/api/index.html b/app/templates/views/api/index.html
index 5fbaaec96..c8cf54694 100644
--- a/app/templates/views/api/index.html
+++ b/app/templates/views/api/index.html
@@ -27,12 +27,12 @@
   </nav>
 
   <div class="govuk-grid-row">
-    <div class="column-half">
+    <div class="govuk-grid-column-one-half">
       <h2 class="heading-small">
         Message log
       </h2>
     </div>
-    <div class="column-half align-with-heading-copy-right">
+    <div class="govuk-grid-column-one-half align-with-heading-copy-right">
       <a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('.api_integration', service_id=current_service.id) }}">Refresh</a>
     </div>
   </div>
diff --git a/app/templates/views/service-settings/set-letter-contact-block.html b/app/templates/views/service-settings/set-letter-contact-block.html
index 7b3562112..cc5c39f88 100644
--- a/app/templates/views/service-settings/set-letter-contact-block.html
+++ b/app/templates/views/service-settings/set-letter-contact-block.html
@@ -15,7 +15,7 @@
     back_link=None if request.args.get('from_template') else url_for('.service_settings', service_id=current_service.id)
   ) }}
   <div class="govuk-grid-row">
-    {% call form_wrapper(class="column-half") %}
+    {% call form_wrapper(class="govuk-grid-column-one-half") %}
       {{ textbox(
         form.letter_contact_block,
         label='How should users contact your service?<br>This applies to all the letters you send.'|safe,
diff --git a/app/templates/views/signedout.html b/app/templates/views/signedout.html
index 1ae3acc1c..b28165b6b 100644
--- a/app/templates/views/signedout.html
+++ b/app/templates/views/signedout.html
@@ -48,7 +48,7 @@
 
   <div class="product-page-section">
     <div class="govuk-grid-row">
-      <div class="column-half">
+      <div class="govuk-grid-column-one-half">
         <h2>
           Control your content
         </h2>
@@ -57,14 +57,14 @@
           text&nbsp;message or letter templates.
         </p>
       </div>
-      <div class="column-half">
+      <div class="govuk-grid-column-one-half">
         <img src="{{ asset_url('images/product/01-templates.svg') }}" alt="">
       </div>
     </div>
   </div>
   <div class="product-page-section">
     <div class="govuk-grid-row">
-      <div class="column-half">
+      <div class="govuk-grid-column-one-half">
         <h2>
           See how your messages perform
         </h2>
@@ -73,7 +73,7 @@
           find out which ones are not being delivered.
         </p>
       </div>
-      <div class="column-half">
+      <div class="govuk-grid-column-one-half">
         <img
           src="{{ asset_url('images/product/02-reporting.svg') }}"
           alt="A screenshot of GOV.UK Notify showing counts of emails and text messages sent"
@@ -86,7 +86,7 @@
       Send messages manually or automatically
     </h2>
     <div class="govuk-grid-row">
-      <div class="column-half">
+      <div class="govuk-grid-column-one-half">
         <p>
           Upload a spreadsheet of email&nbsp;addresses or
           phone&nbsp;numbers and Notify sends the messages.
@@ -96,7 +96,7 @@
           alt="A screenshot of a spreadsheet with columns for email address, name and colour"
         >
       </div>
-      <div class="column-half">
+      <div class="govuk-grid-column-one-half">
         <p>
           Integrate the GOV.UK Notify API with your web&nbsp;application or
           back office system.
@@ -122,12 +122,12 @@
     <div class="with-keyline bottom-gutter-2" id="whos-using-notify">
       <h2>Who’s using GOV.UK Notify</h2>
       <div class="govuk-grid-row bottom-gutter">
-        <div class="column-half">
+        <div class="govuk-grid-column-one-half">
           <h3 class="govuk-visually-hidden">Services</h3>
           <div class="product-page-big-number">{{ counts.services|format_thousands }}</div>
           services
         </div>
-        <div class="column-half">
+        <div class="govuk-grid-column-one-half">
           <h3 class="govuk-visually-hidden">Organisations</h3>
           <div class="product-page-big-number">{{ counts.organisations|format_thousands }}</div>
           organisations
@@ -143,23 +143,23 @@
     <div class="with-keyline bottom-gutter-2">
       <h2>Pricing</h2>
       <div class="govuk-grid-row bottom-gutter">
-        <div class="column-half">
+        <div class="govuk-grid-column-one-half">
           <h3 class="govuk-visually-hidden">Emails</h3>
           <div class="product-page-big-number">Unlimited</div>
           free emails
         </div>
-        <div class="column-half">
+        <div class="govuk-grid-column-one-half">
           <h3 class="govuk-visually-hidden">Text messages</h3>
           <div class="product-page-big-number">Up to 250,000</div>
           free text messages a year,<br>
           then 1.58 pence per message
         </div>
-        <div class="column-half">
+        <div class="govuk-grid-column-one-half">
           <h3 class="govuk-visually-hidden">Letters</h3>
           <div class="product-page-big-number">35 pence</div>
           to print and post a one page letter
         </div>
-        <div class="column-half">
+        <div class="govuk-grid-column-one-half">
           <p class="align-with-big-number-hint">
             There’s no monthly charge, no setup fee and no&nbsp;procurement process.
           </p>
@@ -171,7 +171,7 @@
   </div>
   <div class="product-page-section">
     <div class="govuk-grid-row">
-      <div class="column-half">
+      <div class="govuk-grid-column-one-half">
         <h2 class="with-keyline">
           The team
         </h2>
@@ -184,7 +184,7 @@
           to give feedback.
         </p>
       </div>
-      <div class="column-half">
+      <div class="govuk-grid-column-one-half">
         <img
           src="{{ asset_url('images/product/team.jpg') }}"
           alt="A photo of the GOV.UK Notify team gathered around a big screen. One team member is pointing at a graph on the screen."
diff --git a/app/templates/views/templates/_template.html b/app/templates/views/templates/_template.html
index 899967ee4..43c221a9e 100644
--- a/app/templates/views/templates/_template.html
+++ b/app/templates/views/templates/_template.html
@@ -22,7 +22,7 @@
           {% endcall %}
         {% endif %}
           {% if current_user.has_permissions('send_messages', restrict_admin_usage=True) and not letter_too_long %}
-            <div class="column-half">
+            <div class="govuk-grid-column-one-half">
               <a href="{{ url_for(".set_sender", service_id=current_service.id, template_id=template.id) }}" class="govuk-link govuk-link--no-visited-state pill-separate-item">
                 Send
               </a>
@@ -30,14 +30,14 @@
           {% endif %}
         {% else %}
           {% if current_user.has_permissions('send_messages', restrict_admin_usage=True) %}
-            <div class="column-half">
+            <div class="govuk-grid-column-one-half">
               <a href="{{ url_for(".set_sender", service_id=current_service.id, template_id=template.id) }}" class="govuk-link govuk-link--no-visited-state pill-separate-item">
                 Send
               </a>
             </div>
           {% endif %}
           {% if current_user.has_permissions('manage_templates') %}
-            <div class="column-half">
+            <div class="govuk-grid-column-one-half">
               <a href="{{ url_for(".edit_service_template", service_id=current_service.id, template_id=template.id) }}" class="govuk-link govuk-link--no-visited-state pill-separate-item">
                 Edit
               </a>