diff --git a/app/assets/stylesheets/components/_header-notice.scss b/app/assets/stylesheets/components/_brexit-notice.scss
similarity index 66%
rename from app/assets/stylesheets/components/_header-notice.scss
rename to app/assets/stylesheets/components/_brexit-notice.scss
index cb71bb3ab..1b70a6ad3 100644
--- a/app/assets/stylesheets/components/_header-notice.scss
+++ b/app/assets/stylesheets/components/_brexit-notice.scss
@@ -1,47 +1,47 @@
-.app-c-header-notice {
+.app-c-brexit-notice {
   margin-bottom: govuk-spacing(8);
 }
 
-.app-c-header-notice__header {
+.app-c-brexit-notice__header {
   background-color: govuk-colour("black");
   padding: govuk-spacing(4);
 }
 
-.app-c-header-notice__title {
+.app-c-brexit-notice__title {
   @extend %govuk-heading-m;
   color: govuk-colour("white");
   margin: 0;
 }
 
-.app-c-header-notice__content {
+.app-c-brexit-notice__content {
   border-left: $govuk-border-width solid govuk-colour("black");
   border-right: $govuk-border-width solid govuk-colour("black");
   border-bottom: $govuk-border-width solid govuk-colour("black");
   padding: govuk-spacing(4);
 }
 
-.app-c-header-notice__text {
+.app-c-brexit-notice__text {
   margin-bottom: govuk-spacing(2);
 }
 
-.app-c-header-notice__links {
+.app-c-brexit-notice__links {
   margin-bottom: govuk-spacing(2);
 }
 
-.app-c-header-notice__list {
+.app-c-brexit-notice__list {
   margin-top: -5px;
   margin-bottom: 0;
 }
 
-.app-c-header-notice__link-intro {
+.app-c-brexit-notice__link-intro {
   margin-bottom: govuk-spacing(2);
 }
 
-.app-c-header-notice__link {
+.app-c-brexit-notice__link {
   @extend %govuk-link;
   font-weight: bold;
 }
 
-.app-c-header-notice__content .app-c-header-notice__text:last-child {
+.app-c-brexit-notice__content .app-c-brexit-notice__text:last-child {
   margin-bottom: 0;
 }
diff --git a/app/presenters/content_item/no_deal_notice.rb b/app/presenters/content_item/brexit_notice.rb
similarity index 70%
rename from app/presenters/content_item/no_deal_notice.rb
rename to app/presenters/content_item/brexit_notice.rb
index 33cdf5e13..851acf2a8 100644
--- a/app/presenters/content_item/no_deal_notice.rb
+++ b/app/presenters/content_item/brexit_notice.rb
@@ -1,40 +1,40 @@
 module ContentItem
-  module NoDealNotice
-    def has_no_deal_notice?
+  module BrexitNotice
+    def has_brexit_notice?
       content_item.dig("details").key?("brexit_no_deal_notice")
     end
 
-    def no_deal_notice_component
-      if has_no_deal_notice?
+    def brexit_notice_component
+      if has_brexit_notice?
         {
-          title: no_deal_notice_title,
-          description: no_deal_notice_description,
-          link_intro: no_deal_notice_link_intro,
-          links: no_deal_links,
-          featured_link: no_deal_landing_page_cta,
+          title: brexit_notice_title,
+          description: brexit_notice_description,
+          link_intro: brexit_notice_link_intro,
+          links: brexit_links,
+          featured_link: brexit_landing_page_cta,
         }
       end
     end
 
   private
 
-    def no_deal_notice_links
+    def brexit_notice_links
       content_item.dig("details", "brexit_no_deal_notice")
     end
 
-    def no_deal_notice_title
+    def brexit_notice_title
       "Brexit transition: new rules for 2021"
     end
 
-    def no_deal_notice_description
+    def brexit_notice_description
       "The UK has agreed a deal with the EU. This page tells you the new rules from 1 January 2021."
     end
 
-    def no_deal_notice_link_intro
+    def brexit_notice_link_intro
       "For current information, read: "
     end
 
-    def no_deal_landing_page_cta
+    def brexit_landing_page_cta
       data_attributes = {
         "module": "track-click",
         "track-category": "no_deal_notice",
@@ -50,8 +50,8 @@ def no_deal_landing_page_cta
       ("Use the Brexit checker to " + featured_link + " and sign up for email updates.").html_safe
     end
 
-    def no_deal_links
-      no_deal_notice_links.map do |link|
+    def brexit_links
+      brexit_notice_links.map do |link|
         {
           title: link["title"],
           href: link["href"],
diff --git a/app/presenters/content_item_presenter.rb b/app/presenters/content_item_presenter.rb
index f51ef5384..78de9bf62 100644
--- a/app/presenters/content_item_presenter.rb
+++ b/app/presenters/content_item_presenter.rb
@@ -1,6 +1,6 @@
 class ContentItemPresenter
   include ContentItem::Withdrawable
-  include ContentItem::NoDealNotice
+  include ContentItem::BrexitNotice
 
   attr_reader :content_item,
               :requested_path,
diff --git a/app/views/components/_header-notice.html.erb b/app/views/components/_brexit-notice.html.erb
similarity index 54%
rename from app/views/components/_header-notice.html.erb
rename to app/views/components/_brexit-notice.html.erb
index 8b35a0893..c9d6ae536 100644
--- a/app/views/components/_header-notice.html.erb
+++ b/app/views/components/_brexit-notice.html.erb
@@ -6,34 +6,34 @@
   featured_link ||= false
 %>
 <% if title && description %>
-  <section class="app-c-header-notice" aria-label="notice" role="region" lang="en">
-    <div class="app-c-header-notice__header">
-      <h2 class="app-c-header-notice__title"><%= title %></h2>
+  <section class="app-c-brexit-notice" aria-label="notice" role="region" lang="en">
+    <div class="app-c-brexit-notice__header">
+      <h2 class="app-c-brexit-notice__title"><%= title %></h2>
     </div>
 
-    <div class="app-c-header-notice__content">
+    <div class="app-c-brexit-notice__content">
       <% if description.is_a? Array %>
         <% description.map do |line| %>
-          <p class="app-c-header-notice__text govuk-body"><%= line %></p>
+          <p class="app-c-brexit-notice__text govuk-body"><%= line %></p>
         <% end %>
       <% else %>
-        <p class="app-c-header-notice__text govuk-body"><%= description %></p>
+        <p class="app-c-brexit-notice__text govuk-body"><%= description %></p>
       <% end %>
       <% if featured_link %>
-        <p class="app-c-header-notice__text govuk-body"><%= featured_link %></p>
+        <p class="app-c-brexit-notice__text govuk-body"><%= featured_link %></p>
       <% end %>
       <% if links.any? %>
-        <div class="app-c-header-notice__links">
+        <div class="app-c-brexit-notice__links">
           <% if links.count == 1 %>
-            <p class="govuk-body app-c-header-notice__link-intro">
+            <p class="govuk-body app-c-brexit-notice__link-intro">
               <% if link_intro %><%= link_intro %><% end %>
-              <%= link_to(links[0][:title], links[0][:href], data: links[0][:data_attributes], class: "app-c-header-notice__link") %>
+              <%= link_to(links[0][:title], links[0][:href], data: links[0][:data_attributes], class: "app-c-brexit-notice__link") %>
             </p>
           <% else %>
-            <% if link_intro %><p class="govuk-body app-c-header-notice__link-intro"><%= link_intro %></p><% end %>
-            <ul class="app-c-header-notice__list govuk-list">
+            <% if link_intro %><p class="govuk-body app-c-brexit-notice__link-intro"><%= link_intro %></p><% end %>
+            <ul class="app-c-brexit-notice__list govuk-list">
               <% links.each do |link| %>
-                <li><%= link_to(link[:title], link[:href], data: link[:data_attributes], class: "app-c-header-notice__link") %></li>
+                <li><%= link_to(link[:title], link[:href], data: link[:data_attributes], class: "app-c-brexit-notice__link") %></li>
               <% end %>
             </ul>
           <% end %>
diff --git a/app/views/components/docs/header-notice.yml b/app/views/components/docs/brexit-notice.yml
similarity index 98%
rename from app/views/components/docs/header-notice.yml
rename to app/views/components/docs/brexit-notice.yml
index 853b999e1..cb9f8684d 100644
--- a/app/views/components/docs/header-notice.yml
+++ b/app/views/components/docs/brexit-notice.yml
@@ -1,4 +1,4 @@
-name: Header Notice
+name: Brexit Notice
 description: A bolder style of notice
 shared_accessibility_criteria:
   - link
diff --git a/app/views/content_items/case_study.html.erb b/app/views/content_items/case_study.html.erb
index ca3d898dd..166ad4865 100644
--- a/app/views/content_items/case_study.html.erb
+++ b/app/views/content_items/case_study.html.erb
@@ -16,7 +16,7 @@
 
 <%= render 'shared/publisher_metadata_with_logo' %>
 <%= render 'govuk_publishing_components/components/notice', @content_item.withdrawal_notice_component  %>
-<%= render 'components/header-notice', @content_item.no_deal_notice_component unless @content_item.withdrawal_notice_component %>
+<%= render 'components/brexit-notice', @content_item.brexit_notice_component unless @content_item.withdrawal_notice_component %>
 
 <div class="govuk-grid-row">
   <div class="govuk-grid-column-two-thirds content-bottom-margin">
diff --git a/app/views/content_items/detailed_guide.html.erb b/app/views/content_items/detailed_guide.html.erb
index d0f81bd60..8bb5e94c9 100644
--- a/app/views/content_items/detailed_guide.html.erb
+++ b/app/views/content_items/detailed_guide.html.erb
@@ -17,7 +17,7 @@
 <%= render 'shared/publisher_metadata_with_logo' %>
 <%= render 'shared/history_notice', content_item: @content_item %>
 <%= render 'govuk_publishing_components/components/notice', @content_item.withdrawal_notice_component  %>
-<%= render 'components/header-notice', @content_item.no_deal_notice_component unless @content_item.withdrawal_notice_component %>
+<%= render 'components/brexit-notice', @content_item.brexit_notice_component unless @content_item.withdrawal_notice_component %>
 
 <div class="govuk-grid-row">
   <div class="govuk-grid-column-two-thirds">
diff --git a/app/views/content_items/document_collection.html.erb b/app/views/content_items/document_collection.html.erb
index 8874c4d54..85dcf6be8 100644
--- a/app/views/content_items/document_collection.html.erb
+++ b/app/views/content_items/document_collection.html.erb
@@ -15,7 +15,7 @@
   <div class="govuk-grid-column-two-thirds">
     <%= render 'govuk_publishing_components/components/lead_paragraph', text: @content_item.description %>
     <%= render 'govuk_publishing_components/components/notice', @content_item.withdrawal_notice_component  %>
-    <%= render 'components/header-notice', @content_item.no_deal_notice_component unless @content_item.withdrawal_notice_component %>
+    <%= render 'components/brexit-notice', @content_item.brexit_notice_component unless @content_item.withdrawal_notice_component %>
     <%= render 'shared/history_notice', content_item: @content_item %>
   </div>
 </div>
diff --git a/app/views/content_items/html_publication.html.erb b/app/views/content_items/html_publication.html.erb
index 96bf0a86e..324f58a8c 100644
--- a/app/views/content_items/html_publication.html.erb
+++ b/app/views/content_items/html_publication.html.erb
@@ -33,7 +33,7 @@
 <% end %>
 
 <%= render 'govuk_publishing_components/components/notice', @content_item.withdrawal_notice_component  %>
-<%= render 'components/header-notice', @content_item.no_deal_notice_component unless @content_item.withdrawal_notice_component %>
+<%= render 'components/brexit-notice', @content_item.brexit_notice_component unless @content_item.withdrawal_notice_component %>
 
 <div
   class="govuk-grid-row sidebar-with-body"
diff --git a/app/views/content_items/publication.html.erb b/app/views/content_items/publication.html.erb
index f79bbff3c..1fca7b9ea 100644
--- a/app/views/content_items/publication.html.erb
+++ b/app/views/content_items/publication.html.erb
@@ -23,7 +23,7 @@
 <%= render 'shared/history_notice', content_item: @content_item %>
 
 <%= render 'govuk_publishing_components/components/notice', @content_item.withdrawal_notice_component  %>
-<%= render 'components/header-notice', @content_item.no_deal_notice_component unless @content_item.withdrawal_notice_component %>
+<%= render 'components/brexit-notice', @content_item.brexit_notice_component unless @content_item.withdrawal_notice_component %>
 
 <div class="govuk-grid-row">
   <div class="govuk-grid-column-two-thirds responsive-bottom-margin">
diff --git a/test/components/header_notice_test.rb b/test/components/brexit_notice_test.rb
similarity index 53%
rename from test/components/header_notice_test.rb
rename to test/components/brexit_notice_test.rb
index f59b245aa..c08e129e1 100644
--- a/test/components/header_notice_test.rb
+++ b/test/components/brexit_notice_test.rb
@@ -1,65 +1,65 @@
 require "component_test_helper"
 
-class HeaderNoticeTest < ComponentTestCase
+class BrexitNoticeTest < ComponentTestCase
   def component_name
-    "header-notice"
+    "brexit-notice"
   end
 
-  test "doesn't render a header notice when no params are given" do
+  test "doesn't render a brexit notice when no params are given" do
     assert_empty render_component({})
   end
 
-  test "doesn't render a header notice when no title is given" do
+  test "doesn't render a brexit notice when no title is given" do
     assert_empty render_component(links: [{ title: "test", href: "/test" }], description: "description")
   end
 
-  test "doesn't render a header notice when no description is given" do
+  test "doesn't render a brexit notice when no description is given" do
     assert_empty render_component(links: [{ title: "test", href: "/test" }], title: "title")
   end
 
-  test "renders a header notice with text correctly" do
+  test "renders a brexit notice with text correctly" do
     render_component(title: "This is an important notice", description: "This is some important information about the content.")
 
-    assert_select ".app-c-header-notice__title", text: "This is an important notice"
-    assert_select ".app-c-header-notice__content p", text: "This is some important information about the content."
+    assert_select ".app-c-brexit-notice__title", text: "This is an important notice"
+    assert_select ".app-c-brexit-notice__content p", text: "This is some important information about the content."
   end
 
-  test "renders a header notice with text correctly with a multi-line description" do
+  test "renders a brexit notice with text correctly with a multi-line description" do
     render_component(title: "This is an important notice", description: ["This is some important information about the content.", "It runs on to two lines."])
 
-    assert_select ".app-c-header-notice__title", text: "This is an important notice"
-    assert_select ".app-c-header-notice__content p", text: "This is some important information about the content."
-    assert_select ".app-c-header-notice__content p", text: "It runs on to two lines."
+    assert_select ".app-c-brexit-notice__title", text: "This is an important notice"
+    assert_select ".app-c-brexit-notice__content p", text: "This is some important information about the content."
+    assert_select ".app-c-brexit-notice__content p", text: "It runs on to two lines."
   end
 
-  test "renders a header notice with an aria label" do
+  test "renders a brexit notice with an aria label" do
     render_component(title: "This is an important notice", description: "This is some important information about the content.")
     assert_select "section[aria-label=notice]"
   end
 
-  test "renders a header notice with no link" do
+  test "renders a brexit notice with no link" do
     render_component(title: "This is an important notice", description: "This is a description", link_intro: "This should not be shown", links: [])
 
-    assert_select ".app-c-header-notice__title", text: "This is an important notice"
-    assert_select ".app-c-header-notice__content p", text: "This is a description"
-    assert_select ".app-c-header-notice__link-intro", false, "A link intro shouldn't be shown when no links are provided"
+    assert_select ".app-c-brexit-notice__title", text: "This is an important notice"
+    assert_select ".app-c-brexit-notice__content p", text: "This is a description"
+    assert_select ".app-c-brexit-notice__link-intro", false, "A link intro shouldn't be shown when no links are provided"
   end
 
-  test "renders a header notice with one link" do
+  test "renders a brexit notice with one link" do
     render_component(title: "This is an important notice", description: "This is a description", links: [{ title: "test", href: "/test" }])
 
-    assert_select ".app-c-header-notice__title", text: "This is an important notice"
-    assert_select ".app-c-header-notice__content p", text: "This is a description"
-    assert_select ".app-c-header-notice__link[href='/test']", text: "test"
+    assert_select ".app-c-brexit-notice__title", text: "This is an important notice"
+    assert_select ".app-c-brexit-notice__content p", text: "This is a description"
+    assert_select ".app-c-brexit-notice__link[href='/test']", text: "test"
   end
 
-  test "renders a header notice with multiple links" do
+  test "renders a brexit notice with multiple links" do
     render_component(title: "This is an important notice", description: "This is a description", link_intro: "Look at these links: ", links: [{ title: "test", href: "/test" }, { title: "test2", href: "/test2" }])
 
-    assert_select ".app-c-header-notice__title", text: "This is an important notice"
-    assert_select ".app-c-header-notice__content p", text: "This is a description"
-    assert_select ".app-c-header-notice__link-intro", text: "Look at these links:"
-    assert_select ".app-c-header-notice__list .app-c-header-notice__link[href='/test']", text: "test"
-    assert_select ".app-c-header-notice__list .app-c-header-notice__link[href='/test2']", text: "test2"
+    assert_select ".app-c-brexit-notice__title", text: "This is an important notice"
+    assert_select ".app-c-brexit-notice__content p", text: "This is a description"
+    assert_select ".app-c-brexit-notice__link-intro", text: "Look at these links:"
+    assert_select ".app-c-brexit-notice__list .app-c-brexit-notice__link[href='/test']", text: "test"
+    assert_select ".app-c-brexit-notice__list .app-c-brexit-notice__link[href='/test2']", text: "test2"
   end
 end