diff --git a/app/templates/components/components/checkboxes/template.njk b/app/templates/components/components/checkboxes/template.njk
index 967e7e57e..48a6b0b86 100644
--- a/app/templates/components/components/checkboxes/template.njk
+++ b/app/templates/components/components/checkboxes/template.njk
@@ -1,5 +1,5 @@
 {% from "../error-message/macro.njk" import usaErrorMessage -%}
-{% from "../fieldset/macro.njk" import usaFieldset %}
+{% from "../fieldset/macro.njk" import govukFieldset %}
 {% from "../hint/macro.njk" import usaHint %}
 {% from "../label/macro.njk" import usaLabel %}
 
@@ -95,7 +95,7 @@
 
 <div class="usa-form-group {%- if params.errorMessage %} usa-form-group--error{% endif %} {%- if params.formGroup.classes %} {{ params.formGroup.classes }}{% endif %}">
 {% if params.fieldset %}
-  {% call usaFieldset({
+  {% call govukFieldset({
     describedBy: describedBy,
     classes: params.fieldset.classes,
     attributes: params.fieldset.attributes,
diff --git a/app/templates/components/components/hint/_hint.scss b/app/templates/components/components/hint/_hint.scss
deleted file mode 100644
index a9370334a..000000000
--- a/app/templates/components/components/hint/_hint.scss
+++ /dev/null
@@ -1,50 +0,0 @@
-@import "../../settings/all";
-@import "../../tools/all";
-@import "../../helpers/all";
-
-@include govuk-exports("govuk/component/hint") {
-  .usa-hint {
-    @include govuk-font($size: 19);
-
-    display: block;
-
-    margin-bottom: govuk-spacing(3);
-
-    color: $govuk-secondary-text-colour;
-  }
-
-  // Reduces margin-bottom of hint when used after the default label (no class)
-  // or govuk-label--s for better vertical alignment.
-
-  // This adjustment will not work when the label is inside the <h1>, however it
-  // is unlikely that the default or govuk-label--s class would be used in this
-  // case.
-
-  // This adjustment will not work in browsers that do not support :not(). 
-  // Users with these browsers will see the default size margin (5px larger).
-
-  .govuk-label:not(.govuk-label--m):not(.govuk-label--l):not(.govuk-label--xl) + .usa-hint {
-    margin-bottom: govuk-spacing(2);
-  }
-
-  // Reduces margin-bottom of hint when used after the default legend (no class)
-  // or govuk-fieldset__legend--s for better vertical alignment.
-
-  // This adjustment will not work when the legend is outside the <h1>, however
-  // it is unlikely that the default or govuk-fieldset__legend--s class would be
-  // used in this case.
-
-  // This adjustment will not work in browsers that do not support :not(). 
-  // Users with these browsers will see the default size margin (5px larger).
-
-  .govuk-fieldset__legend:not(.govuk-fieldset__legend--m):not(.govuk-fieldset__legend--l):not(.govuk-fieldset__legend--xl) + .usa-hint {
-    margin-bottom: govuk-spacing(2);
-  }
-
-  // Reduces visual spacing of legend when there is a hint
-
-  .govuk-fieldset__legend + .usa-hint,
-  .govuk-fieldset__legend + .usa-hint {
-    margin-top: -(govuk-spacing(1));
-  }
-}
diff --git a/app/templates/views/cookies.html b/app/templates/views/cookies.html
index ffa032e38..1af35b4ec 100644
--- a/app/templates/views/cookies.html
+++ b/app/templates/views/cookies.html
@@ -122,8 +122,8 @@
     <div class="cookie-settings__form-wrapper">
       <form data-module="cookie-settings">
         <div class="usa-form-group">
-          <fieldset class="govuk-fieldset" aria-describedby="changed-name-hint">
-            <legend class="govuk-fieldset__legend govuk-fieldset__legend--s">
+          <fieldset class="usa-fieldset" aria-describedby="changed-name-hint">
+            <legend class="usa-fieldset__legend usa-fieldset__legend--s">
               Do you want to accept analytics cookies?
             </legend>
             <div class="usa-radios usa-radios--inline">
diff --git a/app/templates/views/service-settings/set-inbound-number.html b/app/templates/views/service-settings/set-inbound-number.html
index e01f21d88..2aa30ba75 100644
--- a/app/templates/views/service-settings/set-inbound-number.html
+++ b/app/templates/views/service-settings/set-inbound-number.html
@@ -28,7 +28,7 @@
         'fieldset': {
           'legend': {
             'isPageHeading': True,
-            'classes': 'govuk-fieldset__legend--l'
+            'classes': 'usa-legend usa-legend--large'
           }
         }
       }) }}
diff --git a/app/templates/views/service-settings/set-service-setting.html b/app/templates/views/service-settings/set-service-setting.html
index 1787267f8..c78ab0c4f 100644
--- a/app/templates/views/service-settings/set-service-setting.html
+++ b/app/templates/views/service-settings/set-service-setting.html
@@ -20,7 +20,7 @@
           "fieldset": {
             "legend": {
               "isPageHeading": True,
-              "classes": "govuk-fieldset__legend--l"
+              "classes": "usa-legend usa-legend--large"
             }
           }
         }) }}
diff --git a/app/templates/views/user-profile/disable-platform-admin-view.html b/app/templates/views/user-profile/disable-platform-admin-view.html
index 7671fc4d3..ff66589ea 100644
--- a/app/templates/views/user-profile/disable-platform-admin-view.html
+++ b/app/templates/views/user-profile/disable-platform-admin-view.html
@@ -23,7 +23,7 @@
           'fieldset': {
             'legend': {
               'isPageHeading': True,
-              'classes': 'govuk-fieldset__legend--l'
+              'classes': 'usa-legend usa-legend--large'
             }
           },
           'hint': {
diff --git a/tests/javascripts/collapsibleCheckboxes.test.js b/tests/javascripts/collapsibleCheckboxes.test.js
index 18c3ca953..9038ff37b 100644
--- a/tests/javascripts/collapsibleCheckboxes.test.js
+++ b/tests/javascripts/collapsibleCheckboxes.test.js
@@ -42,8 +42,8 @@ describe('Collapsible fieldset', () => {
     document.body.innerHTML =
       `<div class="selection-wrapper" data-module="collapsible-checkboxes" data-field-label="folder">
         <div class="usa-form-group">
-          <fieldset class="govuk-fieldset" id="folder_permissions" aria-describedby="users_with_permission-hint">
-            <legend class="govuk-fieldset__legend govuk-fieldset__legend--s">
+          <fieldset class="usa-fieldset" id="folder_permissions" aria-describedby="users_with_permission-hint">
+            <legend class="usa-fieldset__legend usa-fieldset__legend--s">
               Folders this team member can see
               <span class="usa-hint" id="users_with_permission-hint">
                 <div class="selection-summary" role="region" aria-live="polite"></div>
diff --git a/tests/javascripts/listEntry.test.js b/tests/javascripts/listEntry.test.js
index b63be2d71..99357a65c 100644
--- a/tests/javascripts/listEntry.test.js
+++ b/tests/javascripts/listEntry.test.js
@@ -63,7 +63,7 @@ describe("List entry", () => {
 
     document.body.innerHTML =
       `<fieldset class="usa-form-group" aria-describedby="domains-hint">
-        <legend class="govuk-fieldset__legend">
+        <legend class="usa-fieldset__legend">
           Domain names
           </span>
         </legend>
diff --git a/tests/javascripts/support/helpers/html.js b/tests/javascripts/support/helpers/html.js
index d557caba8..ddf0381eb 100644
--- a/tests/javascripts/support/helpers/html.js
+++ b/tests/javascripts/support/helpers/html.js
@@ -25,11 +25,11 @@ function getRadioGroup (data) {
     data.cssClasses.forEach(cssClass => radioGroup.classList.add(cssClass));
   }
   radioGroup.innerHTML = `
-    <fieldset class="govuk-fieldset" id="${data.name}">
-      <legend class="govuk-fieldset__legend${data.hideLegend ? " usa-sr-only" : ""}">
+    <fieldset class="usa-fieldset" id="${data.name}">
+      <legend class="usa-fieldset__legend${data.hideLegend ? " usa-sr-only" : ""}">
         ${data.label}
       </legend>
-      <div class="govuk-radios">
+      <div class="usa-radios">
         ${getRadios(data.fields, data.name)}
       </div>
     </fieldset>`;