diff --git a/app/templates/content_template.html b/app/templates/content_template.html
index 57189315d..286bce5f4 100644
--- a/app/templates/content_template.html
+++ b/app/templates/content_template.html
@@ -11,7 +11,7 @@
   <div class="govuk-grid-row">
 
     {% if navigation_links %}
-      <div class="column-one-quarter">
+      <div class="govuk-grid-column-one-quarter">
         {{ sub_navigation(navigation_links) }}
       </div>
       <div class="column-five-eighths">
diff --git a/app/templates/org_template.html b/app/templates/org_template.html
index 979c82c0e..69cd70a5c 100644
--- a/app/templates/org_template.html
+++ b/app/templates/org_template.html
@@ -16,7 +16,7 @@
       <a href="{{ url_for('main.choose_account') }}" class="govuk-link govuk-link--no-visited-state navigation-service-switch">Switch service</a>
     </div>
     <div class="govuk-grid-row govuk-!-padding-bottom-12">
-      <div class="column-one-quarter">
+      <div class="govuk-grid-column-one-quarter">
         {% include "org_nav.html" %}
       </div>
       <div class="column-three-quarters">
diff --git a/app/templates/partials/count.html b/app/templates/partials/count.html
index 63b59d16f..21834648b 100644
--- a/app/templates/partials/count.html
+++ b/app/templates/partials/count.html
@@ -5,7 +5,7 @@
   {% if notifications_deleted %}
     <div class="govuk-grid-row bottom-gutter-1-2">
       {% for label, query_param, url, count in counts %}
-        <div class="column-one-quarter">
+        <div class="govuk-grid-column-one-quarter">
           {{ big_number(count, label, smaller=True) }}
         </div>
       {% endfor %}
diff --git a/app/templates/views/choose-account.html b/app/templates/views/choose-account.html
index af740e582..74d3b8293 100644
--- a/app/templates/views/choose-account.html
+++ b/app/templates/views/choose-account.html
@@ -9,7 +9,7 @@
 ) %}
   {% if show_heading %}
     <div class="govuk-grid-row">
-      <div class="column-one-quarter">
+      <div class="govuk-grid-column-one-quarter">
         <h2>
           {{ heading }}
         </h2>
@@ -57,7 +57,7 @@
 
     {% if current_user.platform_admin %}
       <div class="govuk-grid-row">
-        <div class="column-one-quarter">
+        <div class="govuk-grid-column-one-quarter">
           <h2>
             Platform admin
           </h2>
@@ -103,7 +103,7 @@
     <div class="js-stick-at-bottom-when-scrolling">
       {% if current_user.has_access_to_live_and_trial_mode_services %}
         <div class="govuk-grid-row">
-          <div class="column-one-quarter">
+          <div class="govuk-grid-column-one-quarter">
             &nbsp;
           </div>
           <div class="column-three-quarters">
diff --git a/app/templates/views/find-services/find-services-by-name.html b/app/templates/views/find-services/find-services-by-name.html
index 1951aa68a..c16952bd8 100644
--- a/app/templates/views/find-services/find-services-by-name.html
+++ b/app/templates/views/find-services/find-services-by-name.html
@@ -25,7 +25,7 @@
         label='Find services by name, or by partial name'
       ) }}
     </div>
-    <div class="column-one-quarter">
+    <div class="govuk-grid-column-one-quarter">
       <input type="hidden" name="csrf_token" value="{{ csrf_token() }}">
       {{ govukButton({
         "text": "Search",
diff --git a/app/templates/views/find-users/find-users-by-email.html b/app/templates/views/find-users/find-users-by-email.html
index f07673dd7..00150d0e8 100644
--- a/app/templates/views/find-users/find-users-by-email.html
+++ b/app/templates/views/find-users/find-users-by-email.html
@@ -25,7 +25,7 @@
         label='Find users by email, or by partial email'
       ) }}
     </div>
-    <div class="column-one-quarter">
+    <div class="govuk-grid-column-one-quarter">
       <input type="hidden" name="csrf_token" value="{{ csrf_token() }}">
       {{ govukButton({
         "text": "Search",
diff --git a/app/templates/views/notifications.html b/app/templates/views/notifications.html
index ed8b7b5d4..23a2183f6 100644
--- a/app/templates/views/notifications.html
+++ b/app/templates/views/notifications.html
@@ -51,7 +51,7 @@
           )
         ) }}
       </div>
-      <div class="column-one-quarter">
+      <div class="govuk-grid-column-one-quarter">
         <input type="hidden" name="csrf_token" value="{{ csrf_token() }}">
         {{ govukButton({
           "text": "Search",
diff --git a/app/templates/views/organisations/add-organisation.html b/app/templates/views/organisations/add-organisation.html
index a1ac43d6e..b9c6671a9 100644
--- a/app/templates/views/organisations/add-organisation.html
+++ b/app/templates/views/organisations/add-organisation.html
@@ -17,7 +17,7 @@
     </div>
 
     <div class="govuk-grid-row">
-      <div class="column-one-quarter">
+      <div class="govuk-grid-column-one-quarter">
         &nbsp;
       </div>
       <div class="column-three-quarters">
diff --git a/app/templates/views/organisations/index.html b/app/templates/views/organisations/index.html
index c692856d9..04bc1b42d 100644
--- a/app/templates/views/organisations/index.html
+++ b/app/templates/views/organisations/index.html
@@ -18,7 +18,7 @@
     </div>
 
     <div class="govuk-grid-row top-gutter-2-3">
-      <div class="column-one-quarter">
+      <div class="govuk-grid-column-one-quarter">
         <h1>
           All organisations
         </h1>
@@ -48,7 +48,7 @@
     </div>
     <div class="js-stick-at-bottom-when-scrolling">
       <div class="govuk-grid-row">
-        <div class="column-one-quarter">
+        <div class="govuk-grid-column-one-quarter">
           &nbsp;
         </div>
         <div class="column-three-quarters">
diff --git a/app/templates/views/platform-admin/_base_template.html b/app/templates/views/platform-admin/_base_template.html
index d84ba9503..264309745 100644
--- a/app/templates/views/platform-admin/_base_template.html
+++ b/app/templates/views/platform-admin/_base_template.html
@@ -6,7 +6,7 @@
 {% block maincolumn_content %}
 
   <div class="govuk-grid-row">
-    <div class="column-one-quarter">
+    <div class="govuk-grid-column-one-quarter">
       <p class="heading-medium">
         Platform admin
       </p>
diff --git a/app/templates/withnav_template.html b/app/templates/withnav_template.html
index ea4f220b6..30252b3a6 100644
--- a/app/templates/withnav_template.html
+++ b/app/templates/withnav_template.html
@@ -24,7 +24,7 @@
       {% if help %}
         <div class="govuk-grid-column-one-third">
       {% else %}
-        <div class="column-one-quarter">
+        <div class="govuk-grid-column-one-quarter">
       {% endif %}
           {% include "main_nav.html" %}
         </div>