diff --git a/app/models/form/lettings/questions/nationality_all.rb b/app/models/form/lettings/questions/nationality_all.rb
index a9660c448..fe438af44 100644
--- a/app/models/form/lettings/questions/nationality_all.rb
+++ b/app/models/form/lettings/questions/nationality_all.rb
@@ -167,7 +167,7 @@ class Form::Lettings::Questions::NationalityAll < ::Form::Question
     "670" => { "name" => "Saint Vincent and the Grenadines", "synonyms" => "" },
     "882" => { "name" => "Samoa", "synonyms" => "WS" },
     "674" => { "name" => "San Marino", "synonyms" => "SM" },
-    "678" => { "name" => "Sao Tome and Principe", "synonyms" => "ST" },
+    "678" => { "name" => "São Tomé and Príncipe", "synonyms" => "ST,Sao Tome and Principe" },
     "682" => { "name" => "Saudi Arabia", "synonyms" => "SA" },
     "686" => { "name" => "Senegal", "synonyms" => "SN" },
     "688" => { "name" => "Serbia", "synonyms" => "RS" },
@@ -203,7 +203,7 @@ class Form::Lettings::Questions::NationalityAll < ::Form::Question
     "800" => { "name" => "Uganda", "synonyms" => "UG" },
     "804" => { "name" => "Ukraine", "synonyms" => "UA" },
     "784" => { "name" => "United Arab Emirates", "synonyms" => "AE" },
-    "826" => { "name" => "United Kingdom", "synonyms" => "GB,UK,England,Wales,Scotland,Northern Ireland" },
+    "826" => { "name" => "United Kingdom", "synonyms" => "GB,UK,England,Wales,Scotland,Northern Ireland,Great Britain" },
     "840" => { "name" => "United States of America", "synonyms" => "US,USA" },
     "858" => { "name" => "Uruguay", "synonyms" => "UY" },
     "860" => { "name" => "Uzbekistan", "synonyms" => "UZ" },
diff --git a/app/models/form/sales/pages/nationality1.rb b/app/models/form/sales/pages/buyer1_nationality.rb
similarity index 81%
rename from app/models/form/sales/pages/nationality1.rb
rename to app/models/form/sales/pages/buyer1_nationality.rb
index 8d30487c3..6bcf12952 100644
--- a/app/models/form/sales/pages/nationality1.rb
+++ b/app/models/form/sales/pages/buyer1_nationality.rb
@@ -1,4 +1,4 @@
-class Form::Sales::Pages::Nationality1 < ::Form::Page
+class Form::Sales::Pages::Buyer1Nationality < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "buyer_1_nationality"
@@ -19,7 +19,7 @@ class Form::Sales::Pages::Nationality1 < ::Form::Page
                        Form::Sales::Questions::NationalityAll.new("nationality_all", nil, self, 1),
                      ]
                    else
-                     [Form::Sales::Questions::Nationality1.new(nil, nil, self)]
+                     [Form::Sales::Questions::Buyer1Nationality.new(nil, nil, self)]
                    end
   end
 end
diff --git a/app/models/form/sales/questions/nationality1.rb b/app/models/form/sales/questions/buyer1_nationality.rb
similarity index 93%
rename from app/models/form/sales/questions/nationality1.rb
rename to app/models/form/sales/questions/buyer1_nationality.rb
index 68c2ce5ea..b30a94bc6 100644
--- a/app/models/form/sales/questions/nationality1.rb
+++ b/app/models/form/sales/questions/buyer1_nationality.rb
@@ -1,4 +1,4 @@
-class Form::Sales::Questions::Nationality1 < ::Form::Question
+class Form::Sales::Questions::Buyer1Nationality < ::Form::Question
   def initialize(id, hsh, page)
     super
     @id = "national"
diff --git a/app/models/form/sales/questions/nationality_all.rb b/app/models/form/sales/questions/nationality_all.rb
index b36fd39ac..eb0a36242 100644
--- a/app/models/form/sales/questions/nationality_all.rb
+++ b/app/models/form/sales/questions/nationality_all.rb
@@ -166,7 +166,7 @@ class Form::Sales::Questions::NationalityAll < ::Form::Question
     "670" => { "name" => "Saint Vincent and the Grenadines", "synonyms" => "" },
     "882" => { "name" => "Samoa", "synonyms" => "WS" },
     "674" => { "name" => "San Marino", "synonyms" => "SM" },
-    "678" => { "name" => "Sao Tome and Principe", "synonyms" => "ST" },
+    "678" => { "name" => "São Tomé and Príncipe", "synonyms" => "ST,Sao Tome and Principe" },
     "682" => { "name" => "Saudi Arabia", "synonyms" => "SA" },
     "686" => { "name" => "Senegal", "synonyms" => "SN" },
     "688" => { "name" => "Serbia", "synonyms" => "RS" },
@@ -202,7 +202,7 @@ class Form::Sales::Questions::NationalityAll < ::Form::Question
     "800" => { "name" => "Uganda", "synonyms" => "UG" },
     "804" => { "name" => "Ukraine", "synonyms" => "UA" },
     "784" => { "name" => "United Arab Emirates", "synonyms" => "AE" },
-    "826" => { "name" => "United Kingdom", "synonyms" => "GB,UK,England,Wales,Scotland,Northern Ireland" },
+    "826" => { "name" => "United Kingdom", "synonyms" => "GB,UK,England,Wales,Scotland,Northern Ireland,Great Britain" },
     "840" => { "name" => "United States of America", "synonyms" => "US,USA" },
     "858" => { "name" => "Uruguay", "synonyms" => "UY" },
     "860" => { "name" => "Uzbekistan", "synonyms" => "UZ" },
diff --git a/app/models/form/sales/subsections/household_characteristics.rb b/app/models/form/sales/subsections/household_characteristics.rb
index 34085c52a..187f7f34e 100644
--- a/app/models/form/sales/subsections/household_characteristics.rb
+++ b/app/models/form/sales/subsections/household_characteristics.rb
@@ -21,7 +21,7 @@ class Form::Sales::Subsections::HouseholdCharacteristics < ::Form::Subsection
       Form::Sales::Pages::Buyer1EthnicBackgroundArab.new(nil, nil, self),
       Form::Sales::Pages::Buyer1EthnicBackgroundMixed.new(nil, nil, self),
       Form::Sales::Pages::Buyer1EthnicBackgroundWhite.new(nil, nil, self),
-      Form::Sales::Pages::Nationality1.new(nil, nil, self),
+      Form::Sales::Pages::Buyer1Nationality.new(nil, nil, self),
       Form::Sales::Pages::Buyer1WorkingSituation.new(nil, nil, self),
       Form::Sales::Pages::RetirementValueCheck.new("working_situation_1_retirement_value_check", nil, self, person_index: 1),
       Form::Sales::Pages::Buyer1IncomeMinValueCheck.new("working_situation_buyer_1_income_min_value_check", nil, self),
diff --git a/spec/models/form/sales/pages/nationality1_spec.rb b/spec/models/form/sales/pages/buyer1_nationality_spec.rb
similarity index 94%
rename from spec/models/form/sales/pages/nationality1_spec.rb
rename to spec/models/form/sales/pages/buyer1_nationality_spec.rb
index 1dc482848..13b83f8f4 100644
--- a/spec/models/form/sales/pages/nationality1_spec.rb
+++ b/spec/models/form/sales/pages/buyer1_nationality_spec.rb
@@ -1,6 +1,6 @@
 require "rails_helper"
 
-RSpec.describe Form::Sales::Pages::Nationality1, type: :model do
+RSpec.describe Form::Sales::Pages::Buyer1Nationality, type: :model do
   subject(:page) { described_class.new(nil, nil, subsection) }
 
   let(:subsection) { instance_double(Form::Subsection) }
diff --git a/spec/models/form/sales/questions/nationality1_spec.rb b/spec/models/form/sales/questions/buyer1_nationality_spec.rb
similarity index 96%
rename from spec/models/form/sales/questions/nationality1_spec.rb
rename to spec/models/form/sales/questions/buyer1_nationality_spec.rb
index 4b8816dbf..2e52016da 100644
--- a/spec/models/form/sales/questions/nationality1_spec.rb
+++ b/spec/models/form/sales/questions/buyer1_nationality_spec.rb
@@ -1,6 +1,6 @@
 require "rails_helper"
 
-RSpec.describe Form::Sales::Questions::Nationality1, type: :model do
+RSpec.describe Form::Sales::Questions::Buyer1Nationality, type: :model do
   subject(:question) { described_class.new(nil, nil, page) }
 
   let(:page) { instance_double(Form::Page) }