diff --git a/app/templates/components/components/checkboxes/template.njk b/app/templates/components/components/checkboxes/template.njk
index 48a6b0b86..967e7e57e 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 govukFieldset %}
+{% from "../fieldset/macro.njk" import usaFieldset %}
 {% 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 govukFieldset({
+  {% call usaFieldset({
     describedBy: describedBy,
     classes: params.fieldset.classes,
     attributes: params.fieldset.attributes,
diff --git a/app/templates/components/components/fieldset/macro.njk b/app/templates/components/components/fieldset/macro.njk
index 688442182..a67b413fe 100644
--- a/app/templates/components/components/fieldset/macro.njk
+++ b/app/templates/components/components/fieldset/macro.njk
@@ -1,3 +1,3 @@
-{% macro govukFieldset(params) %}
+{% macro usaFieldset(params) %}
   {%- include "./template.njk" -%}
 {% endmacro %}
diff --git a/app/templates/components/components/radios/template.njk b/app/templates/components/components/radios/template.njk
index ef1054c5f..30fa8d8b3 100644
--- a/app/templates/components/components/radios/template.njk
+++ b/app/templates/components/components/radios/template.njk
@@ -1,5 +1,5 @@
 {% from "../error-message/macro.njk" import usaErrorMessage -%}
-{% from "../fieldset/macro.njk" import govukFieldset %}
+{% from "../fieldset/macro.njk" import usaFieldset %}
 {% from "../hint/macro.njk" import usaHint %}
 {% from "../label/macro.njk" import usaLabel %}
 
@@ -90,7 +90,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 govukFieldset({
+  {% call usaFieldset({
     describedBy: describedBy,
     classes: params.fieldset.classes,
     attributes: params.fieldset.attributes,
diff --git a/app/templates/components/list-entry.html b/app/templates/components/list-entry.html
index 1788c5210..87f77d2f0 100644
--- a/app/templates/components/list-entry.html
+++ b/app/templates/components/list-entry.html
@@ -1,4 +1,4 @@
-{% from "components/components/fieldset/macro.njk" import govukFieldset %}
+{% from "components/components/fieldset/macro.njk" import usaFieldset %}
 {% from "components/components/error-message/macro.njk" import usaErrorMessage %}
 
 {% macro list_entry(
@@ -14,7 +14,7 @@
     {% else %}
       {% set attributes = {} %}
     {% endif %}
-    {% call govukFieldset({
+    {% call usaFieldset({
         "legend": {
           "text": field.label.text,
           "isPageHeading": False
diff --git a/app/templates/forms/fields/checkboxes/template.njk b/app/templates/forms/fields/checkboxes/template.njk
index c1d006310..03b2f584b 100644
--- a/app/templates/forms/fields/checkboxes/template.njk
+++ b/app/templates/forms/fields/checkboxes/template.njk
@@ -1,5 +1,5 @@
 {% from "components/components/error-message/macro.njk" import usaErrorMessage -%}
-{% from "components/components/fieldset/macro.njk" import govukFieldset %}
+{% from "components/components/fieldset/macro.njk" import usaFieldset %}
 {% from "components/components/hint/macro.njk" import usaHint %}
 {% from "components/components/radio-label/macro.njk" import usaRadioLabel %}
 
@@ -129,7 +129,7 @@
 
 <div class="{% if formGroup %}usa-form-group{% endif %} {%- if params.errorMessage %} usa-form-group--error{% endif %} {%- if params.formGroup.classes %} {{ params.formGroup.classes }}{% endif %}">
 {% if params.fieldset %}
-  {% call govukFieldset({
+  {% call usaFieldset({
     describedBy: describedBy,
     classes: params.fieldset.classes,
     attributes: params.fieldset.attributes,