From 283bce8465d98be02b56a8d266dac0df587c467b Mon Sep 17 00:00:00 2001
From: Kat <katrina@kosiak.co.uk>
Date: Fri, 24 Feb 2023 16:34:01 +0000
Subject: [PATCH] Add obvious question numberings to sales

---
 app/models/form/sales/pages/privacy_notice.rb        |  2 +-
 app/models/form/sales/questions/armed_forces.rb      |  2 +-
 .../form/sales/questions/armed_forces_spouse.rb      |  2 +-
 app/models/form/sales/questions/buyer1_age_known.rb  |  2 +-
 .../sales/questions/buyer1_ethnic_background_arab.rb |  2 +-
 .../questions/buyer1_ethnic_background_asian.rb      |  2 +-
 .../questions/buyer1_ethnic_background_black.rb      |  2 +-
 .../questions/buyer1_ethnic_background_mixed.rb      |  2 +-
 .../questions/buyer1_ethnic_background_white.rb      |  2 +-
 .../form/sales/questions/buyer1_ethnic_group.rb      |  2 +-
 .../form/sales/questions/buyer1_income_known.rb      |  2 +-
 .../form/sales/questions/buyer1_live_in_property.rb  |  2 +-
 app/models/form/sales/questions/buyer1_mortgage.rb   |  2 +-
 .../form/sales/questions/buyer1_previous_tenure.rb   |  2 +-
 .../form/sales/questions/buyer1_working_situation.rb |  2 +-
 app/models/form/sales/questions/buyer2_age_known.rb  |  2 +-
 .../sales/questions/buyer2_ethnic_background_arab.rb |  2 +-
 .../questions/buyer2_ethnic_background_asian.rb      |  2 +-
 .../questions/buyer2_ethnic_background_black.rb      |  2 +-
 .../questions/buyer2_ethnic_background_mixed.rb      |  2 +-
 .../questions/buyer2_ethnic_background_white.rb      |  2 +-
 .../form/sales/questions/buyer2_ethnic_group.rb      |  2 +-
 .../form/sales/questions/buyer2_income_known.rb      |  2 +-
 .../form/sales/questions/buyer2_live_in_property.rb  |  2 +-
 app/models/form/sales/questions/buyer2_mortgage.rb   |  2 +-
 .../sales/questions/buyer2_relationship_to_buyer1.rb |  2 +-
 .../form/sales/questions/buyer2_working_situation.rb |  2 +-
 app/models/form/sales/questions/buyer_company.rb     |  2 +-
 app/models/form/sales/questions/buyer_interview.rb   |  2 +-
 app/models/form/sales/questions/buyer_live.rb        |  2 +-
 app/models/form/sales/questions/buyer_previous.rb    |  2 +-
 .../form/sales/questions/buyer_still_serving.rb      |  2 +-
 .../form/sales/questions/buyers_organisations.rb     |  2 +-
 app/models/form/sales/questions/deposit_discount.rb  |  2 +-
 app/models/form/sales/questions/discount.rb          |  2 +-
 .../sales/questions/discounted_ownership_type.rb     |  2 +-
 app/models/form/sales/questions/equity.rb            |  2 +-
 app/models/form/sales/questions/exchange_date.rb     |  2 +-
 app/models/form/sales/questions/fromprop.rb          |  2 +-
 app/models/form/sales/questions/gender_identity1.rb  |  2 +-
 app/models/form/sales/questions/gender_identity2.rb  |  2 +-
 app/models/form/sales/questions/grant.rb             |  2 +-
 app/models/form/sales/questions/handover_date.rb     |  2 +-
 .../form/sales/questions/household_disability.rb     |  2 +-
 .../form/sales/questions/household_wheelchair.rb     |  2 +-
 app/models/form/sales/questions/housing_benefits.rb  |  2 +-
 app/models/form/sales/questions/joint_purchase.rb    |  2 +-
 app/models/form/sales/questions/la_nominations.rb    |  2 +-
 app/models/form/sales/questions/monthly_rent.rb      |  2 +-
 app/models/form/sales/questions/nationality1.rb      |  2 +-
 .../form/sales/questions/number_joint_buyers.rb      |  2 +-
 .../sales/questions/number_of_others_in_property.rb  |  2 +-
 .../form/sales/questions/outright_ownership_type.rb  |  2 +-
 app/models/form/sales/questions/ownership_scheme.rb  |  2 +-
 app/models/form/sales/questions/postcode.rb          |  2 +-
 app/models/form/sales/questions/previous_bedrooms.rb |  2 +-
 .../form/sales/questions/previous_postcode_known.rb  |  2 +-
 app/models/form/sales/questions/previous_tenure.rb   |  2 +-
 app/models/form/sales/questions/prevloc.rb           |  2 +-
 app/models/form/sales/questions/prevown.rb           |  2 +-
 app/models/form/sales/questions/prevshared.rb        |  2 +-
 .../form/sales/questions/property_building_type.rb   |  2 +-
 .../form/sales/questions/property_local_authority.rb |  2 +-
 .../sales/questions/property_number_of_bedrooms.rb   |  2 +-
 .../form/sales/questions/property_unit_type.rb       |  2 +-
 .../questions/property_wheelchair_accessible.rb      |  2 +-
 app/models/form/sales/questions/purchaser_code.rb    |  2 +-
 app/models/form/sales/questions/resale.rb            |  2 +-
 app/models/form/sales/questions/sale_date.rb         |  2 +-
 app/models/form/sales/questions/savings_nk.rb        |  2 +-
 .../form/sales/questions/shared_ownership_type.rb    |  2 +-
 app/models/form/sales/questions/staircase.rb         |  2 +-
 app/models/form/sales/questions/staircase_bought.rb  |  2 +-
 app/models/form/sales/questions/staircase_owned.rb   |  2 +-
 app/models/form/sales/questions/staircase_sale.rb    |  2 +-
 db/schema.rb                                         | 12 +++++++-----
 .../models/form/sales/questions/armed_forces_spec.rb |  2 +-
 .../form/sales/questions/armed_forces_spouse_spec.rb |  2 +-
 .../form/sales/questions/buyer1_age_known_spec.rb    |  2 +-
 .../questions/buyer1_ethnic_background_arab_spec.rb  |  2 +-
 .../questions/buyer1_ethnic_background_asian_spec.rb |  2 +-
 .../questions/buyer1_ethnic_background_black_spec.rb |  2 +-
 .../questions/buyer1_ethnic_background_mixed_spec.rb |  2 +-
 .../questions/buyer1_ethnic_background_white_spec.rb |  2 +-
 .../form/sales/questions/buyer1_ethnic_group_spec.rb |  2 +-
 .../form/sales/questions/buyer1_income_known_spec.rb |  2 +-
 .../sales/questions/buyer1_live_in_property_spec.rb  |  2 +-
 .../form/sales/questions/buyer1_mortgage_spec.rb     |  2 +-
 .../sales/questions/buyer1_previous_tenure_spec.rb   |  2 +-
 .../sales/questions/buyer1_working_situation_spec.rb |  2 +-
 .../form/sales/questions/buyer2_age_known_spec.rb    |  2 +-
 .../questions/buyer2_ethnic_background_arab_spec.rb  |  2 +-
 .../questions/buyer2_ethnic_background_asian_spec.rb |  2 +-
 .../questions/buyer2_ethnic_background_black_spec.rb |  2 +-
 .../questions/buyer2_ethnic_background_mixed_spec.rb |  2 +-
 .../questions/buyer2_ethnic_background_white_spec.rb |  2 +-
 .../form/sales/questions/buyer2_ethnic_group_spec.rb |  2 +-
 .../form/sales/questions/buyer2_income_known_spec.rb |  2 +-
 .../sales/questions/buyer2_live_in_property_spec.rb  |  2 +-
 .../form/sales/questions/buyer2_mortgage_spec.rb     |  2 +-
 .../questions/buyer2_relationship_to_buyer1_spec.rb  |  2 +-
 .../sales/questions/buyer2_working_situation_spec.rb |  2 +-
 .../form/sales/questions/buyer_company_spec.rb       |  2 +-
 .../form/sales/questions/buyer_interview_spec.rb     |  2 +-
 spec/models/form/sales/questions/buyer_live_spec.rb  |  2 +-
 .../form/sales/questions/buyer_previous_spec.rb      |  2 +-
 .../form/sales/questions/buyer_still_serving_spec.rb |  2 +-
 .../sales/questions/buyers_organisations_spec.rb     |  2 +-
 .../form/sales/questions/deposit_discount_spec.rb    |  2 +-
 spec/models/form/sales/questions/discount_spec.rb    |  2 +-
 .../questions/discounted_ownership_type_spec.rb      |  2 +-
 spec/models/form/sales/questions/equity_spec.rb      |  2 +-
 .../form/sales/questions/exchange_date_spec.rb       |  2 +-
 spec/models/form/sales/questions/fromprop_spec.rb    |  2 +-
 .../form/sales/questions/gender_identity1_spec.rb    |  2 +-
 spec/models/form/sales/questions/grant_spec.rb       |  2 +-
 .../form/sales/questions/handover_date_spec.rb       |  2 +-
 .../sales/questions/household_disability_spec.rb     |  2 +-
 .../sales/questions/household_wheelchair_spec.rb     |  2 +-
 .../form/sales/questions/housing_benefits_spec.rb    |  2 +-
 .../form/sales/questions/joint_purchase_spec.rb      |  2 +-
 .../form/sales/questions/la_nominations_spec.rb      |  2 +-
 .../models/form/sales/questions/monthly_rent_spec.rb |  2 +-
 .../models/form/sales/questions/nationality1_spec.rb |  2 +-
 .../form/sales/questions/number_joint_buyers_spec.rb |  2 +-
 .../questions/number_of_others_in_property_spec.rb   |  2 +-
 .../sales/questions/outright_ownership_type_spec.rb  |  2 +-
 .../form/sales/questions/ownership_scheme_spec.rb    |  2 +-
 .../sales/questions/person_gender_identity_spec.rb   |  2 +-
 spec/models/form/sales/questions/postcode_spec.rb    |  2 +-
 .../form/sales/questions/previous_bedrooms_spec.rb   |  2 +-
 .../sales/questions/previous_postcode_known_spec.rb  |  2 +-
 .../form/sales/questions/previous_tenure_spec.rb     |  2 +-
 spec/models/form/sales/questions/prevloc_spec.rb     |  2 +-
 spec/models/form/sales/questions/prevown_spec.rb     |  2 +-
 spec/models/form/sales/questions/prevshared_spec.rb  |  2 +-
 .../sales/questions/property_building_type_spec.rb   |  2 +-
 .../sales/questions/property_local_authority_spec.rb |  2 +-
 .../questions/property_number_of_bedrooms_spec.rb    |  2 +-
 .../form/sales/questions/property_unit_type_spec.rb  |  2 +-
 .../questions/property_wheelchair_accessible_spec.rb |  2 +-
 .../form/sales/questions/purchaser_code_spec.rb      |  2 +-
 spec/models/form/sales/questions/resale_spec.rb      |  2 +-
 spec/models/form/sales/questions/sale_date_spec.rb   |  2 +-
 spec/models/form/sales/questions/savings_nk_spec.rb  |  2 +-
 .../sales/questions/shared_ownership_type_spec.rb    |  2 +-
 .../form/sales/questions/staircase_bought_spec.rb    |  2 +-
 .../form/sales/questions/staircase_owned_spec.rb     |  2 +-
 .../form/sales/questions/staircase_sale_spec.rb      |  2 +-
 spec/models/form/sales/questions/staircase_spec.rb   |  2 +-
 150 files changed, 156 insertions(+), 154 deletions(-)

diff --git a/app/models/form/sales/pages/privacy_notice.rb b/app/models/form/sales/pages/privacy_notice.rb
index a41800194..1d58c8737 100644
--- a/app/models/form/sales/pages/privacy_notice.rb
+++ b/app/models/form/sales/pages/privacy_notice.rb
@@ -2,7 +2,7 @@ class Form::Sales::Pages::PrivacyNotice < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "privacy_notice"
-    @header = "Department for Levelling Up, Housing and Communities privacy notice"
+    @header = "Q19 - Department for Levelling Up, Housing and Communities privacy notice"
     @depends_on = [{
       "noint" => 2,
     }]
diff --git a/app/models/form/sales/questions/armed_forces.rb b/app/models/form/sales/questions/armed_forces.rb
index af003c5b2..58bd0b2e2 100644
--- a/app/models/form/sales/questions/armed_forces.rb
+++ b/app/models/form/sales/questions/armed_forces.rb
@@ -3,7 +3,7 @@ class Form::Sales::Questions::ArmedForces < ::Form::Question
     super
     @id = "hhregres"
     @check_answer_label = "Have any of the buyers ever served as a regular in the UK armed forces?"
-    @header = "Have any of the buyers ever served as a regular in the UK armed forces?"
+    @header = "Q62 - Have any of the buyers ever served as a regular in the UK armed forces?"
     @type = "radio"
     @hint_text = "A regular is somebody who has served in the Royal Navy, the Royal Marines, the Royal Airforce or Army full time and does not include reserve forces"
     @answer_options = ANSWER_OPTIONS
diff --git a/app/models/form/sales/questions/armed_forces_spouse.rb b/app/models/form/sales/questions/armed_forces_spouse.rb
index cf38bd434..758b663b7 100644
--- a/app/models/form/sales/questions/armed_forces_spouse.rb
+++ b/app/models/form/sales/questions/armed_forces_spouse.rb
@@ -3,7 +3,7 @@ class Form::Sales::Questions::ArmedForcesSpouse < ::Form::Question
     super
     @id = "armedforcesspouse"
     @check_answer_label = "Are any of the buyers a spouse or civil partner of a UK armed forces regular who died in service within the last 2 years?"
-    @header = "Are any of the buyers a spouse or civil partner of a UK armed forces regular who died in service within the last 2 years?"
+    @header = "Q64 - Are any of the buyers a spouse or civil partner of a UK armed forces regular who died in service within the last 2 years?"
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
   end
diff --git a/app/models/form/sales/questions/buyer1_age_known.rb b/app/models/form/sales/questions/buyer1_age_known.rb
index 761bacddb..26213bcde 100644
--- a/app/models/form/sales/questions/buyer1_age_known.rb
+++ b/app/models/form/sales/questions/buyer1_age_known.rb
@@ -3,7 +3,7 @@ class Form::Sales::Questions::Buyer1AgeKnown < ::Form::Question
     super
     @id = "age1_known"
     @check_answer_label = "Lead buyer’s age"
-    @header = "Do you know buyer 1’s age?"
+    @header = "Q20 - Do you know buyer 1’s age?"
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
     @hint_text = "Buyer 1 is the person in the household who does the most paid work. If it’s a joint purchase and the buyers do the same amount of paid work, buyer 1 is whoever is the oldest."
diff --git a/app/models/form/sales/questions/buyer1_ethnic_background_arab.rb b/app/models/form/sales/questions/buyer1_ethnic_background_arab.rb
index 19526f5b7..c8f0ea85d 100644
--- a/app/models/form/sales/questions/buyer1_ethnic_background_arab.rb
+++ b/app/models/form/sales/questions/buyer1_ethnic_background_arab.rb
@@ -3,7 +3,7 @@ class Form::Sales::Questions::Buyer1EthnicBackgroundArab < ::Form::Question
     super
     @id = "ethnic"
     @check_answer_label = "Buyer 1’s ethnic background"
-    @header = "Which of the following best describes the buyer 1’s Arab background?"
+    @header = "Q23 - Which of the following best describes the buyer 1’s Arab background?"
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
     @hint_text = "Buyer 1 is the person in the household who does the most paid work. If it’s a joint purchase and the buyers do the same amount of paid work, buyer 1 is whoever is the oldest."
diff --git a/app/models/form/sales/questions/buyer1_ethnic_background_asian.rb b/app/models/form/sales/questions/buyer1_ethnic_background_asian.rb
index ee910c054..4ab9f0a05 100644
--- a/app/models/form/sales/questions/buyer1_ethnic_background_asian.rb
+++ b/app/models/form/sales/questions/buyer1_ethnic_background_asian.rb
@@ -3,7 +3,7 @@ class Form::Sales::Questions::Buyer1EthnicBackgroundAsian < ::Form::Question
     super
     @id = "ethnic"
     @check_answer_label = "Buyer 1’s ethnic background"
-    @header = "Which of the following best describes the buyer 1’s Asian or Asian British background?"
+    @header = "Q23 - Which of the following best describes the buyer 1’s Asian or Asian British background?"
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
     @hint_text = "Buyer 1 is the person in the household who does the most paid work. If it’s a joint purchase and the buyers do the same amount of paid work, buyer 1 is whoever is the oldest."
diff --git a/app/models/form/sales/questions/buyer1_ethnic_background_black.rb b/app/models/form/sales/questions/buyer1_ethnic_background_black.rb
index 4c24f1433..a8775e10c 100644
--- a/app/models/form/sales/questions/buyer1_ethnic_background_black.rb
+++ b/app/models/form/sales/questions/buyer1_ethnic_background_black.rb
@@ -3,7 +3,7 @@ class Form::Sales::Questions::Buyer1EthnicBackgroundBlack < ::Form::Question
     super
     @id = "ethnic"
     @check_answer_label = "Buyer 1’s ethnic background"
-    @header = "Which of the following best describes the buyer 1’s Black, African, Caribbean or Black British background?"
+    @header = "Q23 - Which of the following best describes the buyer 1’s Black, African, Caribbean or Black British background?"
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
     @hint_text = "Buyer 1 is the person in the household who does the most paid work. If it’s a joint purchase and the buyers do the same amount of paid work, buyer 1 is whoever is the oldest."
diff --git a/app/models/form/sales/questions/buyer1_ethnic_background_mixed.rb b/app/models/form/sales/questions/buyer1_ethnic_background_mixed.rb
index 8fa879949..8fee9714d 100644
--- a/app/models/form/sales/questions/buyer1_ethnic_background_mixed.rb
+++ b/app/models/form/sales/questions/buyer1_ethnic_background_mixed.rb
@@ -3,7 +3,7 @@ class Form::Sales::Questions::Buyer1EthnicBackgroundMixed < ::Form::Question
     super
     @id = "ethnic"
     @check_answer_label = "Buyer 1’s ethnic background"
-    @header = "Which of the following best describes the buyer 1’s Mixed or Multiple ethnic groups background?"
+    @header = "Q23 - Which of the following best describes the buyer 1’s Mixed or Multiple ethnic groups background?"
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
     @hint_text = "Buyer 1 is the person in the household who does the most paid work. If it’s a joint purchase and the buyers do the same amount of paid work, buyer 1 is whoever is the oldest."
diff --git a/app/models/form/sales/questions/buyer1_ethnic_background_white.rb b/app/models/form/sales/questions/buyer1_ethnic_background_white.rb
index 4b7ec9182..1ad16780d 100644
--- a/app/models/form/sales/questions/buyer1_ethnic_background_white.rb
+++ b/app/models/form/sales/questions/buyer1_ethnic_background_white.rb
@@ -3,7 +3,7 @@ class Form::Sales::Questions::Buyer1EthnicBackgroundWhite < ::Form::Question
     super
     @id = "ethnic"
     @check_answer_label = "Buyer 1’s ethnic background"
-    @header = "Which of the following best describes the buyer 1’s White background?"
+    @header = "Q23 - Which of the following best describes the buyer 1’s White background?"
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
     @hint_text = "Buyer 1 is the person in the household who does the most paid work. If it’s a joint purchase and the buyers do the same amount of paid work, buyer 1 is whoever is the oldest."
diff --git a/app/models/form/sales/questions/buyer1_ethnic_group.rb b/app/models/form/sales/questions/buyer1_ethnic_group.rb
index ab151d84d..01b772af8 100644
--- a/app/models/form/sales/questions/buyer1_ethnic_group.rb
+++ b/app/models/form/sales/questions/buyer1_ethnic_group.rb
@@ -3,7 +3,7 @@ class Form::Sales::Questions::Buyer1EthnicGroup < ::Form::Question
     super
     @id = "ethnic_group"
     @check_answer_label = "Buyer 1’s ethnic group"
-    @header = "What is buyer 1’s ethnic group?"
+    @header = "Q22 - What is buyer 1’s ethnic group?"
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
     @hint_text = "Buyer 1 is the person in the household who does the most paid work. If it’s a joint purchase and the buyers do the same amount of paid work, buyer 1 is whoever is the oldest."
diff --git a/app/models/form/sales/questions/buyer1_income_known.rb b/app/models/form/sales/questions/buyer1_income_known.rb
index 64462fa59..6e9a74fa9 100644
--- a/app/models/form/sales/questions/buyer1_income_known.rb
+++ b/app/models/form/sales/questions/buyer1_income_known.rb
@@ -3,7 +3,7 @@ class Form::Sales::Questions::Buyer1IncomeKnown < ::Form::Question
     super
     @id = "income1nk"
     @check_answer_label = "Buyer 1’s gross annual income"
-    @header = "Do you know buyer 1’s annual income?"
+    @header = "Q67 - Do you know buyer 1’s annual income?"
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
     @conditional_for = {
diff --git a/app/models/form/sales/questions/buyer1_live_in_property.rb b/app/models/form/sales/questions/buyer1_live_in_property.rb
index 4f18f60df..91caf905b 100644
--- a/app/models/form/sales/questions/buyer1_live_in_property.rb
+++ b/app/models/form/sales/questions/buyer1_live_in_property.rb
@@ -3,7 +3,7 @@ class Form::Sales::Questions::Buyer1LiveInProperty < ::Form::Question
     super
     @id = "buy1livein"
     @check_answer_label = "Will buyer 1 live in the property?"
-    @header = "Will buyer 1 live in the property?"
+    @header = "Q26 - Will buyer 1 live in the property?"
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
     @hint_text = "Buyer 1 is the person in the household who does the most paid work. If it’s a joint purchase and the buyers do the same amount of paid work, buyer 1 is whoever is the oldest."
diff --git a/app/models/form/sales/questions/buyer1_mortgage.rb b/app/models/form/sales/questions/buyer1_mortgage.rb
index f226f956c..7509f1bea 100644
--- a/app/models/form/sales/questions/buyer1_mortgage.rb
+++ b/app/models/form/sales/questions/buyer1_mortgage.rb
@@ -3,7 +3,7 @@ class Form::Sales::Questions::Buyer1Mortgage < ::Form::Question
     super
     @id = "inc1mort"
     @check_answer_label = "Buyer 1's income used for mortgage application"
-    @header = "Was buyer 1's income used for a mortgage application?"
+    @header = "Q68 - Was buyer 1's income used for a mortgage application?"
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
     @check_answers_card_number = 1
diff --git a/app/models/form/sales/questions/buyer1_previous_tenure.rb b/app/models/form/sales/questions/buyer1_previous_tenure.rb
index f075e615c..13427da81 100644
--- a/app/models/form/sales/questions/buyer1_previous_tenure.rb
+++ b/app/models/form/sales/questions/buyer1_previous_tenure.rb
@@ -3,7 +3,7 @@ class Form::Sales::Questions::Buyer1PreviousTenure < ::Form::Question
     super
     @id = "prevten"
     @check_answer_label = "Buyer 1's previous tenure"
-    @header = "What was buyer 1's previous tenure?"
+    @header = "Q56 - What was buyer 1's previous tenure?"
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
   end
diff --git a/app/models/form/sales/questions/buyer1_working_situation.rb b/app/models/form/sales/questions/buyer1_working_situation.rb
index 79db1790b..75f1d9e79 100644
--- a/app/models/form/sales/questions/buyer1_working_situation.rb
+++ b/app/models/form/sales/questions/buyer1_working_situation.rb
@@ -3,7 +3,7 @@ class Form::Sales::Questions::Buyer1WorkingSituation < ::Form::Question
     super
     @id = "ecstat1"
     @check_answer_label = "Buyer 1's working situation"
-    @header = "Which of these best describes buyer 1's working situation?"
+    @header = "Q25 - Which of these best describes buyer 1's working situation?"
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
     @hint_text = "Buyer 1 is the person in the household who does the most paid work. If it's a joint purchase and the buyers do the same amount of paid work, buyer 1 is whoever is the oldest."
diff --git a/app/models/form/sales/questions/buyer2_age_known.rb b/app/models/form/sales/questions/buyer2_age_known.rb
index c100d0b67..d8265554e 100644
--- a/app/models/form/sales/questions/buyer2_age_known.rb
+++ b/app/models/form/sales/questions/buyer2_age_known.rb
@@ -3,7 +3,7 @@ class Form::Sales::Questions::Buyer2AgeKnown < ::Form::Question
     super
     @id = "age2_known"
     @check_answer_label = "Buyer 2’s age"
-    @header = "Do you know buyer 2’s age?"
+    @header = "Q28 - Do you know buyer 2’s age?"
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
     @conditional_for = {
diff --git a/app/models/form/sales/questions/buyer2_ethnic_background_arab.rb b/app/models/form/sales/questions/buyer2_ethnic_background_arab.rb
index 1766780b7..ba1cb5147 100644
--- a/app/models/form/sales/questions/buyer2_ethnic_background_arab.rb
+++ b/app/models/form/sales/questions/buyer2_ethnic_background_arab.rb
@@ -3,7 +3,7 @@ class Form::Sales::Questions::Buyer2EthnicBackgroundArab < ::Form::Question
     super
     @id = "ethnicbuy2"
     @check_answer_label = "Buyer 2’s ethnic background"
-    @header = "Which of the following best describes the buyer 2’s Arab background?"
+    @header = "Q31 - Which of the following best describes the buyer 2’s Arab background?"
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
     @check_answers_card_number = 2
diff --git a/app/models/form/sales/questions/buyer2_ethnic_background_asian.rb b/app/models/form/sales/questions/buyer2_ethnic_background_asian.rb
index 2578d220a..34821797d 100644
--- a/app/models/form/sales/questions/buyer2_ethnic_background_asian.rb
+++ b/app/models/form/sales/questions/buyer2_ethnic_background_asian.rb
@@ -3,7 +3,7 @@ class Form::Sales::Questions::Buyer2EthnicBackgroundAsian < ::Form::Question
     super
     @id = "ethnicbuy2"
     @check_answer_label = "Buyer 2’s ethnic background"
-    @header = "Which of the following best describes the buyer 2’s Asian or Asian British background?"
+    @header = "Q31 - Which of the following best describes the buyer 2’s Asian or Asian British background?"
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
     @check_answers_card_number = 2
diff --git a/app/models/form/sales/questions/buyer2_ethnic_background_black.rb b/app/models/form/sales/questions/buyer2_ethnic_background_black.rb
index 11d47790c..b60ce2f30 100644
--- a/app/models/form/sales/questions/buyer2_ethnic_background_black.rb
+++ b/app/models/form/sales/questions/buyer2_ethnic_background_black.rb
@@ -3,7 +3,7 @@ class Form::Sales::Questions::Buyer2EthnicBackgroundBlack < ::Form::Question
     super
     @id = "ethnicbuy2"
     @check_answer_label = "Buyer 2’s ethnic background"
-    @header = "Which of the following best describes the buyer 2’s Black, African, Caribbean or Black British background?"
+    @header = "Q31 - Which of the following best describes the buyer 2’s Black, African, Caribbean or Black British background?"
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
     @check_answers_card_number = 2
diff --git a/app/models/form/sales/questions/buyer2_ethnic_background_mixed.rb b/app/models/form/sales/questions/buyer2_ethnic_background_mixed.rb
index 78600af34..c21147c47 100644
--- a/app/models/form/sales/questions/buyer2_ethnic_background_mixed.rb
+++ b/app/models/form/sales/questions/buyer2_ethnic_background_mixed.rb
@@ -3,7 +3,7 @@ class Form::Sales::Questions::Buyer2EthnicBackgroundMixed < ::Form::Question
     super
     @id = "ethnicbuy2"
     @check_answer_label = "Buyer 2’s ethnic background"
-    @header = "Which of the following best describes the buyer 2’s Mixed or Multiple ethnic groups background?"
+    @header = "Q31 - Which of the following best describes the buyer 2’s Mixed or Multiple ethnic groups background?"
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
     @check_answers_card_number = 2
diff --git a/app/models/form/sales/questions/buyer2_ethnic_background_white.rb b/app/models/form/sales/questions/buyer2_ethnic_background_white.rb
index 5b5fc8e2c..068351081 100644
--- a/app/models/form/sales/questions/buyer2_ethnic_background_white.rb
+++ b/app/models/form/sales/questions/buyer2_ethnic_background_white.rb
@@ -3,7 +3,7 @@ class Form::Sales::Questions::Buyer2EthnicBackgroundWhite < ::Form::Question
     super
     @id = "ethnicbuy2"
     @check_answer_label = "Buyer 2’s ethnic background"
-    @header = "Which of the following best describes the buyer 2’s White background?"
+    @header = "Q31 - Which of the following best describes the buyer 2’s White background?"
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
     @check_answers_card_number = 2
diff --git a/app/models/form/sales/questions/buyer2_ethnic_group.rb b/app/models/form/sales/questions/buyer2_ethnic_group.rb
index 5366910fe..912588856 100644
--- a/app/models/form/sales/questions/buyer2_ethnic_group.rb
+++ b/app/models/form/sales/questions/buyer2_ethnic_group.rb
@@ -3,7 +3,7 @@ class Form::Sales::Questions::Buyer2EthnicGroup < ::Form::Question
     super
     @id = "ethnic_group2"
     @check_answer_label = "Buyer 2’s ethnic group"
-    @header = "What is buyer 2’s ethnic group?"
+    @header = "Q30 - What is buyer 2’s ethnic group?"
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
     @inferred_check_answers_value = [{
diff --git a/app/models/form/sales/questions/buyer2_income_known.rb b/app/models/form/sales/questions/buyer2_income_known.rb
index 0b4613809..e93610737 100644
--- a/app/models/form/sales/questions/buyer2_income_known.rb
+++ b/app/models/form/sales/questions/buyer2_income_known.rb
@@ -3,7 +3,7 @@ class Form::Sales::Questions::Buyer2IncomeKnown < ::Form::Question
     super
     @id = "income2nk"
     @check_answer_label = "Buyer 2’s gross annual income"
-    @header = "Do you know buyer 2’s annual income?"
+    @header = "Q69 - Do you know buyer 2’s annual income?"
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
     @conditional_for = {
diff --git a/app/models/form/sales/questions/buyer2_live_in_property.rb b/app/models/form/sales/questions/buyer2_live_in_property.rb
index 162627905..8e3f3b643 100644
--- a/app/models/form/sales/questions/buyer2_live_in_property.rb
+++ b/app/models/form/sales/questions/buyer2_live_in_property.rb
@@ -3,7 +3,7 @@ class Form::Sales::Questions::Buyer2LiveInProperty < ::Form::Question
     super
     @id = "buy2livein"
     @check_answer_label = "Will buyer 2 live in the property?"
-    @header = "Will buyer 2 live in the property?"
+    @header = "Q34 - Will buyer 2 live in the property?"
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
     @check_answers_card_number = 2
diff --git a/app/models/form/sales/questions/buyer2_mortgage.rb b/app/models/form/sales/questions/buyer2_mortgage.rb
index 5697aea15..cf5f51696 100644
--- a/app/models/form/sales/questions/buyer2_mortgage.rb
+++ b/app/models/form/sales/questions/buyer2_mortgage.rb
@@ -3,7 +3,7 @@ class Form::Sales::Questions::Buyer2Mortgage < ::Form::Question
     super
     @id = "inc2mort"
     @check_answer_label = "Buyer 2's income used for mortgage application"
-    @header = "Was buyer 2's income used for a mortgage application?"
+    @header = "Q70 - Was buyer 2's income used for a mortgage application?"
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
     @check_answers_card_number = 2
diff --git a/app/models/form/sales/questions/buyer2_relationship_to_buyer1.rb b/app/models/form/sales/questions/buyer2_relationship_to_buyer1.rb
index 678219be8..d0ae9b37f 100644
--- a/app/models/form/sales/questions/buyer2_relationship_to_buyer1.rb
+++ b/app/models/form/sales/questions/buyer2_relationship_to_buyer1.rb
@@ -3,7 +3,7 @@ class Form::Sales::Questions::Buyer2RelationshipToBuyer1 < ::Form::Question
     super
     @id = "relat2"
     @check_answer_label = "Buyer 2's relationship to buyer 1"
-    @header = "What is buyer 2's relationship to buyer 1?"
+    @header = "Q27 - What is buyer 2's relationship to buyer 1?"
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
     @check_answers_card_number = 2
diff --git a/app/models/form/sales/questions/buyer2_working_situation.rb b/app/models/form/sales/questions/buyer2_working_situation.rb
index 21c68b456..ad7ba5d4f 100644
--- a/app/models/form/sales/questions/buyer2_working_situation.rb
+++ b/app/models/form/sales/questions/buyer2_working_situation.rb
@@ -3,7 +3,7 @@ class Form::Sales::Questions::Buyer2WorkingSituation < ::Form::Question
     super
     @id = "ecstat2"
     @check_answer_label = "Buyer 2's working situation"
-    @header = "Which of these best describes buyer 2's working situation?"
+    @header = "Q33 - Which of these best describes buyer 2's working situation?"
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
     @check_answers_card_number = 2
diff --git a/app/models/form/sales/questions/buyer_company.rb b/app/models/form/sales/questions/buyer_company.rb
index 1dac995b0..13a00ddd0 100644
--- a/app/models/form/sales/questions/buyer_company.rb
+++ b/app/models/form/sales/questions/buyer_company.rb
@@ -3,7 +3,7 @@ class Form::Sales::Questions::BuyerCompany < ::Form::Question
     super
     @id = "companybuy"
     @check_answer_label = "Company buyer"
-    @header = "Is the buyer a company?"
+    @header = "Q7 - Is the buyer a company?"
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
   end
diff --git a/app/models/form/sales/questions/buyer_interview.rb b/app/models/form/sales/questions/buyer_interview.rb
index b157c05cc..918965e72 100644
--- a/app/models/form/sales/questions/buyer_interview.rb
+++ b/app/models/form/sales/questions/buyer_interview.rb
@@ -3,7 +3,7 @@ class Form::Sales::Questions::BuyerInterview < ::Form::Question
     super
     @id = "noint"
     @check_answer_label = "Buyer interviewed in person?"
-    @header = "Was the buyer interviewed for any of the answers you will provide on this log?"
+    @header = "Q18 -Was the buyer interviewed for any of the answers you will provide on this log?"
     @type = "radio"
     @hint_text = "You should still try to answer all questions even if the buyer wasn't interviewed in person"
     @answer_options = ANSWER_OPTIONS
diff --git a/app/models/form/sales/questions/buyer_live.rb b/app/models/form/sales/questions/buyer_live.rb
index a8aeb0401..9a9d20886 100644
--- a/app/models/form/sales/questions/buyer_live.rb
+++ b/app/models/form/sales/questions/buyer_live.rb
@@ -3,7 +3,7 @@ class Form::Sales::Questions::BuyerLive < ::Form::Question
     super
     @id = "buylivein"
     @check_answer_label = "Buyers living in property"
-    @header = "Will the buyers live in the property?"
+    @header = "Q8 - Will the buyers live in the property?"
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
   end
diff --git a/app/models/form/sales/questions/buyer_previous.rb b/app/models/form/sales/questions/buyer_previous.rb
index 18ac019cb..d674cb71e 100644
--- a/app/models/form/sales/questions/buyer_previous.rb
+++ b/app/models/form/sales/questions/buyer_previous.rb
@@ -3,7 +3,7 @@ class Form::Sales::Questions::BuyerPrevious < ::Form::Question
     super
     @id = "soctenant"
     @check_answer_label = "Buyer was a registered provider, housing association or local authority tenant immediately before this sale?"
-    @header = "Was the buyer a private registered provider, housing association or local authority tenant immediately before this sale?"
+    @header = "Q84 - Was the buyer a private registered provider, housing association or local authority tenant immediately before this sale?"
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
   end
diff --git a/app/models/form/sales/questions/buyer_still_serving.rb b/app/models/form/sales/questions/buyer_still_serving.rb
index 04929fb42..85b262d32 100644
--- a/app/models/form/sales/questions/buyer_still_serving.rb
+++ b/app/models/form/sales/questions/buyer_still_serving.rb
@@ -3,7 +3,7 @@ class Form::Sales::Questions::BuyerStillServing < ::Form::Question
     super
     @id = "hhregresstill"
     @check_answer_label = "Are they still serving in the UK armed forces?"
-    @header = "Is the buyer still serving in the UK armed forces?"
+    @header = "Q63 - Is the buyer still serving in the UK armed forces?"
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
   end
diff --git a/app/models/form/sales/questions/buyers_organisations.rb b/app/models/form/sales/questions/buyers_organisations.rb
index 735a1563d..52514e993 100644
--- a/app/models/form/sales/questions/buyers_organisations.rb
+++ b/app/models/form/sales/questions/buyers_organisations.rb
@@ -3,7 +3,7 @@ class Form::Sales::Questions::BuyersOrganisations < ::Form::Question
     super
     @id = "buyers_organisations"
     @check_answer_label = "Organisations buyers were registered with"
-    @header = "What organisations were the buyers registered with?"
+    @header = "Q59 - What organisations were the buyers registered with?"
     @type = "checkbox"
     @hint_text = "Select all that apply"
     @answer_options = ANSWER_OPTIONS
diff --git a/app/models/form/sales/questions/deposit_discount.rb b/app/models/form/sales/questions/deposit_discount.rb
index b23a3e1b4..364e30606 100644
--- a/app/models/form/sales/questions/deposit_discount.rb
+++ b/app/models/form/sales/questions/deposit_discount.rb
@@ -3,7 +3,7 @@ class Form::Sales::Questions::DepositDiscount < ::Form::Question
     super
     @id = "cashdis"
     @check_answer_label = "Cash discount through SocialHomeBuy"
-    @header = "How much cash discount was given through Social HomeBuy?"
+    @header = "Q96 - How much cash discount was given through Social HomeBuy?"
     @type = "numeric"
     @min = 0
     @max = 999_999
diff --git a/app/models/form/sales/questions/discount.rb b/app/models/form/sales/questions/discount.rb
index 01ae38fd5..007c3ee58 100644
--- a/app/models/form/sales/questions/discount.rb
+++ b/app/models/form/sales/questions/discount.rb
@@ -3,7 +3,7 @@ class Form::Sales::Questions::Discount < ::Form::Question
     super
     @id = "discount"
     @check_answer_label = "Percentage discount"
-    @header = "What was the percentage discount?"
+    @header = "Q102 - What was the percentage discount?"
     @type = "numeric"
     @min = 0
     @max = 100
diff --git a/app/models/form/sales/questions/discounted_ownership_type.rb b/app/models/form/sales/questions/discounted_ownership_type.rb
index f75d83c01..b116ec5b2 100644
--- a/app/models/form/sales/questions/discounted_ownership_type.rb
+++ b/app/models/form/sales/questions/discounted_ownership_type.rb
@@ -3,7 +3,7 @@ class Form::Sales::Questions::DiscountedOwnershipType < ::Form::Question
     super
     @id = "type"
     @check_answer_label = "Type of discounted ownership sale"
-    @header = "What is the type of discounted ownership sale?"
+    @header = "Q5 - What is the type of discounted ownership sale?"
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
   end
diff --git a/app/models/form/sales/questions/equity.rb b/app/models/form/sales/questions/equity.rb
index 7dec2ac37..64d20cc32 100644
--- a/app/models/form/sales/questions/equity.rb
+++ b/app/models/form/sales/questions/equity.rb
@@ -3,7 +3,7 @@ class Form::Sales::Questions::Equity < ::Form::Question
     super
     @id = "equity"
     @check_answer_label = "Initial percentage equity stake"
-    @header = "What was the initial percentage equity stake purchased?"
+    @header = "Q89 - What was the initial percentage equity stake purchased?"
     @type = "numeric"
     @min = 0
     @max = 100
diff --git a/app/models/form/sales/questions/exchange_date.rb b/app/models/form/sales/questions/exchange_date.rb
index 69b8ec39f..9e7163f62 100644
--- a/app/models/form/sales/questions/exchange_date.rb
+++ b/app/models/form/sales/questions/exchange_date.rb
@@ -3,7 +3,7 @@ class Form::Sales::Questions::ExchangeDate < ::Form::Question
     super
     @id = "exdate"
     @check_answer_label = "Exchange of contracts date"
-    @header = "What is the exchange of contracts date?"
+    @header = "Q81 - What is the exchange of contracts date?"
     @type = "date"
   end
 end
diff --git a/app/models/form/sales/questions/fromprop.rb b/app/models/form/sales/questions/fromprop.rb
index af33c67ea..8d19c016f 100644
--- a/app/models/form/sales/questions/fromprop.rb
+++ b/app/models/form/sales/questions/fromprop.rb
@@ -3,7 +3,7 @@ class Form::Sales::Questions::Fromprop < ::Form::Question
     super
     @id = "fromprop"
     @check_answer_label = "Previous property type"
-    @header = "What was the previous property type?"
+    @header = "Q86 - What was the previous property type?"
     @type = "radio"
     @hint_text = ""
     @page = page
diff --git a/app/models/form/sales/questions/gender_identity1.rb b/app/models/form/sales/questions/gender_identity1.rb
index c31a9cc0b..bd8ffdcbd 100644
--- a/app/models/form/sales/questions/gender_identity1.rb
+++ b/app/models/form/sales/questions/gender_identity1.rb
@@ -3,7 +3,7 @@ class Form::Sales::Questions::GenderIdentity1 < ::Form::Question
     super
     @id = "sex1"
     @check_answer_label = "Buyer 1’s gender identity"
-    @header = "Which of these best describes buyer 1’s gender identity?"
+    @header = "Q21 - Which of these best describes buyer 1’s gender identity?"
     @type = "radio"
     @hint_text = "Buyer 1 is the person in the household who does the most paid work. If it’s a joint purchase and the buyers do the same amount of paid work, buyer 1 is whoever is the oldest."
     @answer_options = ANSWER_OPTIONS
diff --git a/app/models/form/sales/questions/gender_identity2.rb b/app/models/form/sales/questions/gender_identity2.rb
index e394ae325..c3855d9f3 100644
--- a/app/models/form/sales/questions/gender_identity2.rb
+++ b/app/models/form/sales/questions/gender_identity2.rb
@@ -3,7 +3,7 @@ class Form::Sales::Questions::GenderIdentity2 < ::Form::Question
     super
     @id = "sex2"
     @check_answer_label = "Buyer 2’s gender identity"
-    @header = "Which of these best describes buyer 2’s gender identity?"
+    @header = "Q29 - Which of these best describes buyer 2’s gender identity?"
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
     @check_answers_card_number = 2
diff --git a/app/models/form/sales/questions/grant.rb b/app/models/form/sales/questions/grant.rb
index beef93c58..5235cbfb0 100644
--- a/app/models/form/sales/questions/grant.rb
+++ b/app/models/form/sales/questions/grant.rb
@@ -3,7 +3,7 @@ class Form::Sales::Questions::Grant < ::Form::Question
     super
     @id = "grant"
     @check_answer_label = "Amount of any loan, grant or subsidy"
-    @header = "What was the amount of any loan, grant, discount or subsidy given?"
+    @header = "Q101 - What was the amount of any loan, grant, discount or subsidy given?"
     @type = "numeric"
     @min = 0
     @max = 999_999
diff --git a/app/models/form/sales/questions/handover_date.rb b/app/models/form/sales/questions/handover_date.rb
index 06a89eb04..4b68501e8 100644
--- a/app/models/form/sales/questions/handover_date.rb
+++ b/app/models/form/sales/questions/handover_date.rb
@@ -3,7 +3,7 @@ class Form::Sales::Questions::HandoverDate < ::Form::Question
     super
     @id = "hodate"
     @check_answer_label = "Practical completion or handover date"
-    @header = "What is the practical completion or handover date?"
+    @header = "Q82 - What is the practical completion or handover date?"
     @type = "date"
     @hint_text = "This is the date on which the building contractor hands over responsibility for the completed property to the private registered provider (PRP)"
   end
diff --git a/app/models/form/sales/questions/household_disability.rb b/app/models/form/sales/questions/household_disability.rb
index c0edef69c..ce19290da 100644
--- a/app/models/form/sales/questions/household_disability.rb
+++ b/app/models/form/sales/questions/household_disability.rb
@@ -2,7 +2,7 @@ class Form::Sales::Questions::HouseholdDisability < ::Form::Question
   def initialize(id, hsh, page)
     super
     @id = "disabled"
-    @header = "Does anyone in the household consider themselves to have a disability?"
+    @header = "Q65 - Does anyone in the household consider themselves to have a disability?"
     @check_answer_label = "Does anyone in the household have a disability?"
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
diff --git a/app/models/form/sales/questions/household_wheelchair.rb b/app/models/form/sales/questions/household_wheelchair.rb
index 9266909dc..0135b274b 100644
--- a/app/models/form/sales/questions/household_wheelchair.rb
+++ b/app/models/form/sales/questions/household_wheelchair.rb
@@ -2,7 +2,7 @@ class Form::Sales::Questions::HouseholdWheelchair < ::Form::Question
   def initialize(id, hsh, page)
     super
     @id = "wheel"
-    @header = "Does anyone in the household use a wheelchair?"
+    @header = "Q66 - Does anyone in the household use a wheelchair?"
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
     @hint_text = "This can be inside or outside the home"
diff --git a/app/models/form/sales/questions/housing_benefits.rb b/app/models/form/sales/questions/housing_benefits.rb
index db3e14c88..baa3be3af 100644
--- a/app/models/form/sales/questions/housing_benefits.rb
+++ b/app/models/form/sales/questions/housing_benefits.rb
@@ -3,7 +3,7 @@ class Form::Sales::Questions::HousingBenefits < ::Form::Question
     super
     @id = "hb"
     @check_answer_label = "Housing-related benefits buyer received before buying this property"
-    @header = "Was the buyer receiving any of these housing-related benefits immediately before buying this property?"
+    @header = "Q71 - Was the buyer receiving any of these housing-related benefits immediately before buying this property?"
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
   end
diff --git a/app/models/form/sales/questions/joint_purchase.rb b/app/models/form/sales/questions/joint_purchase.rb
index e2bf0f754..688e6fb0e 100644
--- a/app/models/form/sales/questions/joint_purchase.rb
+++ b/app/models/form/sales/questions/joint_purchase.rb
@@ -3,7 +3,7 @@ class Form::Sales::Questions::JointPurchase < ::Form::Question
     super
     @id = "jointpur"
     @check_answer_label = "Joint purchase"
-    @header = "Is this a joint purchase?"
+    @header = "Q9 - Is this a joint purchase?"
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
   end
diff --git a/app/models/form/sales/questions/la_nominations.rb b/app/models/form/sales/questions/la_nominations.rb
index 806f7cfdd..84207d350 100644
--- a/app/models/form/sales/questions/la_nominations.rb
+++ b/app/models/form/sales/questions/la_nominations.rb
@@ -3,7 +3,7 @@ class Form::Sales::Questions::LaNominations < ::Form::Question
     super
     @id = "lanomagr"
     @check_answer_label = "Household rehoused under a local authority nominations agreement?"
-    @header = "Was the household rehoused under a 'local authority nominations agreement'?"
+    @header = "Q83 - Was the household rehoused under a 'local authority nominations agreement'?"
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
     @hint_text = "A local authority nominations agreement is a written agreement between a local authority and private registered provider (PRP) that some or all of its sales vacancies are offered to local authorities for rehousing"
diff --git a/app/models/form/sales/questions/monthly_rent.rb b/app/models/form/sales/questions/monthly_rent.rb
index 34ac1bed9..901a5c9fc 100644
--- a/app/models/form/sales/questions/monthly_rent.rb
+++ b/app/models/form/sales/questions/monthly_rent.rb
@@ -3,7 +3,7 @@ class Form::Sales::Questions::MonthlyRent < ::Form::Question
     super
     @id = "mrent"
     @check_answer_label = "Monthly rent"
-    @header = "What is the basic monthly rent?"
+    @header = "Q97 - What is the basic monthly rent?"
     @type = "numeric"
     @min = 0
     @width = 5
diff --git a/app/models/form/sales/questions/nationality1.rb b/app/models/form/sales/questions/nationality1.rb
index 53e9edc5f..9a3cf435a 100644
--- a/app/models/form/sales/questions/nationality1.rb
+++ b/app/models/form/sales/questions/nationality1.rb
@@ -3,7 +3,7 @@ class Form::Sales::Questions::Nationality1 < ::Form::Question
     super
     @id = "national"
     @check_answer_label = "Buyer 1’s nationality"
-    @header = "What is buyer 1’s nationality?"
+    @header = "Q24 - What is buyer 1’s nationality?"
     @type = "radio"
     @hint_text = "Buyer 1 is the person in the household who does the most paid work. If it’s a joint purchase and the buyers do the same amount of paid work, buyer 1 is whoever is the oldest."
     @answer_options = ANSWER_OPTIONS
diff --git a/app/models/form/sales/questions/number_joint_buyers.rb b/app/models/form/sales/questions/number_joint_buyers.rb
index b9c2fc2e2..e44c92948 100644
--- a/app/models/form/sales/questions/number_joint_buyers.rb
+++ b/app/models/form/sales/questions/number_joint_buyers.rb
@@ -3,7 +3,7 @@ class Form::Sales::Questions::NumberJointBuyers < ::Form::Question
     super
     @id = "jointmore"
     @check_answer_label = "More than 2 joint buyers"
-    @header = "Are there more than 2 joint buyers of this property?"
+    @header = "Q10 - Are there more than 2 joint buyers of this property?"
     @hint_text = "You should still try to answer all questions even if the buyer wasn't interviewed in person"
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
diff --git a/app/models/form/sales/questions/number_of_others_in_property.rb b/app/models/form/sales/questions/number_of_others_in_property.rb
index cf590291b..d10012587 100644
--- a/app/models/form/sales/questions/number_of_others_in_property.rb
+++ b/app/models/form/sales/questions/number_of_others_in_property.rb
@@ -3,7 +3,7 @@ class Form::Sales::Questions::NumberOfOthersInProperty < ::Form::Question
     super
     @id = "hholdcount"
     @check_answer_label = "Number of other people living in the property"
-    @header = "Besides the buyer(s), how many other people live or will live in the property?"
+    @header = "Q35 - Besides the buyer(s), how many other people live or will live in the property?"
     @type = "numeric"
     @hint_text = "You can provide details for a maximum of 4 other people."
     @width = 2
diff --git a/app/models/form/sales/questions/outright_ownership_type.rb b/app/models/form/sales/questions/outright_ownership_type.rb
index baead7f5a..e1c910edc 100644
--- a/app/models/form/sales/questions/outright_ownership_type.rb
+++ b/app/models/form/sales/questions/outright_ownership_type.rb
@@ -3,7 +3,7 @@ class Form::Sales::Questions::OutrightOwnershipType < ::Form::Question
     super
     @id = "type"
     @check_answer_label = "Type of outright sale"
-    @header = "What is the type of outright sale?"
+    @header = "Q6 - What is the type of outright sale?"
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
     @conditional_for = {
diff --git a/app/models/form/sales/questions/ownership_scheme.rb b/app/models/form/sales/questions/ownership_scheme.rb
index fc30ce3b4..0f66b1f8e 100644
--- a/app/models/form/sales/questions/ownership_scheme.rb
+++ b/app/models/form/sales/questions/ownership_scheme.rb
@@ -3,7 +3,7 @@ class Form::Sales::Questions::OwnershipScheme < ::Form::Question
     super
     @id = "ownershipsch"
     @check_answer_label = "Purchase made under ownership scheme"
-    @header = "Was this purchase made through an ownership scheme?"
+    @header = "Q3 - Was this purchase made through an ownership scheme?"
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
   end
diff --git a/app/models/form/sales/questions/postcode.rb b/app/models/form/sales/questions/postcode.rb
index 0f72a9585..6d013cd2e 100644
--- a/app/models/form/sales/questions/postcode.rb
+++ b/app/models/form/sales/questions/postcode.rb
@@ -3,7 +3,7 @@ class Form::Sales::Questions::Postcode < ::Form::Question
     super
     @id = "postcode_full"
     @check_answer_label = "Property’s postcode"
-    @header = "Postcode"
+    @header = "Q15 - Postcode"
     @type = "text"
     @width = 5
     @inferred_check_answers_value = [{
diff --git a/app/models/form/sales/questions/previous_bedrooms.rb b/app/models/form/sales/questions/previous_bedrooms.rb
index 1bea6538c..364ba0ad7 100644
--- a/app/models/form/sales/questions/previous_bedrooms.rb
+++ b/app/models/form/sales/questions/previous_bedrooms.rb
@@ -3,7 +3,7 @@ class Form::Sales::Questions::PreviousBedrooms < ::Form::Question
     super
     @id = "frombeds"
     @check_answer_label = "Number of bedrooms in previous property"
-    @header = "How many bedrooms did the property have?"
+    @header = "Q85 - How many bedrooms did the property have?"
     @type = "numeric"
     @width = 5
     @min = 1
diff --git a/app/models/form/sales/questions/previous_postcode_known.rb b/app/models/form/sales/questions/previous_postcode_known.rb
index 9806d12e4..e121796d3 100644
--- a/app/models/form/sales/questions/previous_postcode_known.rb
+++ b/app/models/form/sales/questions/previous_postcode_known.rb
@@ -3,7 +3,7 @@ class Form::Sales::Questions::PreviousPostcodeKnown < ::Form::Question
     super
     @id = "ppcodenk"
     @check_answer_label = "Buyer 1’s last settled accommodation"
-    @header = "Do you know the postcode of buyer 1’s last settled accommodation?"
+    @header = "Q57 - Do you know the postcode of buyer 1’s last settled accommodation?"
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
     @conditional_for = {
diff --git a/app/models/form/sales/questions/previous_tenure.rb b/app/models/form/sales/questions/previous_tenure.rb
index e570ec90c..0df14f3a0 100644
--- a/app/models/form/sales/questions/previous_tenure.rb
+++ b/app/models/form/sales/questions/previous_tenure.rb
@@ -3,7 +3,7 @@ class Form::Sales::Questions::PreviousTenure < ::Form::Question
     super
     @id = "socprevten"
     @check_answer_label = "Previous property tenure"
-    @header = "What was the previous tenure of the buyer?"
+    @header = "Q87 - What was the previous tenure of the buyer?"
     @type = "radio"
     @hint_text = ""
     @page = page
diff --git a/app/models/form/sales/questions/prevloc.rb b/app/models/form/sales/questions/prevloc.rb
index 49a69ad39..59af938ee 100644
--- a/app/models/form/sales/questions/prevloc.rb
+++ b/app/models/form/sales/questions/prevloc.rb
@@ -3,7 +3,7 @@ class Form::Sales::Questions::Prevloc < ::Form::Question
     super
     @id = "prevloc"
     @check_answer_label = "Local authority of buyer 1’s last settled accommodation"
-    @header = "Select a local authority"
+    @header = "Q58 - Select a local authority"
     @type = "select"
     @answer_options = ANSWER_OPTIONS
     @inferred_check_answers_value = [{
diff --git a/app/models/form/sales/questions/prevown.rb b/app/models/form/sales/questions/prevown.rb
index a9a3b086b..4ac334da1 100644
--- a/app/models/form/sales/questions/prevown.rb
+++ b/app/models/form/sales/questions/prevown.rb
@@ -3,7 +3,7 @@ class Form::Sales::Questions::Prevown < ::Form::Question
     super
     @id = "prevown"
     @check_answer_label = "Buyers previously owned a property"
-    @header = "Has the buyer previously owned a property?"
+    @header = "Q73 - Has the buyer previously owned a property?"
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
   end
diff --git a/app/models/form/sales/questions/prevshared.rb b/app/models/form/sales/questions/prevshared.rb
index 2c09cf485..9d420e40c 100644
--- a/app/models/form/sales/questions/prevshared.rb
+++ b/app/models/form/sales/questions/prevshared.rb
@@ -3,7 +3,7 @@ class Form::Sales::Questions::Prevshared < ::Form::Question
     super
     @id = "prevshared"
     @check_answer_label = "Previous property shared ownership?"
-    @header = "Was the previous property a shared ownership property?"
+    @header = "Q74 - Was the previous property a shared ownership property?"
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
     @hint = "For any buyer"
diff --git a/app/models/form/sales/questions/property_building_type.rb b/app/models/form/sales/questions/property_building_type.rb
index 80102cc7a..92bc1e858 100644
--- a/app/models/form/sales/questions/property_building_type.rb
+++ b/app/models/form/sales/questions/property_building_type.rb
@@ -3,7 +3,7 @@ class Form::Sales::Questions::PropertyBuildingType < ::Form::Question
     super
     @id = "builtype"
     @check_answer_label = "Type of building"
-    @header = "What type of building is the property?"
+    @header = "Q13 - What type of building is the property?"
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
   end
diff --git a/app/models/form/sales/questions/property_local_authority.rb b/app/models/form/sales/questions/property_local_authority.rb
index 8def2d9f3..b9a465961 100644
--- a/app/models/form/sales/questions/property_local_authority.rb
+++ b/app/models/form/sales/questions/property_local_authority.rb
@@ -3,7 +3,7 @@ class Form::Sales::Questions::PropertyLocalAuthority < ::Form::Question
     super
     @id = "la"
     @check_answer_label = "Local authority"
-    @header = "What is the local authority of the property?"
+    @header = "Q16 - What is the local authority of the property?"
     @type = "select"
     @answer_options = ANSWER_OPTIONS
   end
diff --git a/app/models/form/sales/questions/property_number_of_bedrooms.rb b/app/models/form/sales/questions/property_number_of_bedrooms.rb
index e8ea674ea..ab78b1148 100644
--- a/app/models/form/sales/questions/property_number_of_bedrooms.rb
+++ b/app/models/form/sales/questions/property_number_of_bedrooms.rb
@@ -3,7 +3,7 @@ class Form::Sales::Questions::PropertyNumberOfBedrooms < ::Form::Question
     super
     @id = "beds"
     @check_answer_label = "Number of bedrooms"
-    @header = "How many bedrooms does the property have?"
+    @header = "Q11 - How many bedrooms does the property have?"
     @hint_text = "A bedsit has 1 bedroom"
     @type = "numeric"
     @width = 10
diff --git a/app/models/form/sales/questions/property_unit_type.rb b/app/models/form/sales/questions/property_unit_type.rb
index afa4f0f38..b9b55240c 100644
--- a/app/models/form/sales/questions/property_unit_type.rb
+++ b/app/models/form/sales/questions/property_unit_type.rb
@@ -3,7 +3,7 @@ class Form::Sales::Questions::PropertyUnitType < ::Form::Question
     super
     @id = "proptype"
     @check_answer_label = "Type of unit"
-    @header = "What type of unit is the property?"
+    @header = "Q12 - What type of unit is the property?"
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
   end
diff --git a/app/models/form/sales/questions/property_wheelchair_accessible.rb b/app/models/form/sales/questions/property_wheelchair_accessible.rb
index bfdd133c2..76b0cb35f 100644
--- a/app/models/form/sales/questions/property_wheelchair_accessible.rb
+++ b/app/models/form/sales/questions/property_wheelchair_accessible.rb
@@ -3,7 +3,7 @@ class Form::Sales::Questions::PropertyWheelchairAccessible < ::Form::Question
     super
     @id = "wchair"
     @check_answer_label = "Property build or adapted to wheelchair-user standards"
-    @header = "Is the property build or adapted to wheelchair-user standards?"
+    @header = "Q17 -Is the property build or adapted to wheelchair-user standards?"
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
   end
diff --git a/app/models/form/sales/questions/purchaser_code.rb b/app/models/form/sales/questions/purchaser_code.rb
index 7a5cc4bf7..8aeeb30cf 100644
--- a/app/models/form/sales/questions/purchaser_code.rb
+++ b/app/models/form/sales/questions/purchaser_code.rb
@@ -3,7 +3,7 @@ class Form::Sales::Questions::PurchaserCode < ::Form::Question
     super
     @id = "purchid"
     @check_answer_label = "Purchaser code"
-    @header = "What is the purchaser code?"
+    @header = "Q2 - What is the purchaser code?"
     @hint_text = "This is how you usually refer to the purchaser on your own systems."
     @type = "text"
     @width = 10
diff --git a/app/models/form/sales/questions/resale.rb b/app/models/form/sales/questions/resale.rb
index e67491d65..035cf7f36 100644
--- a/app/models/form/sales/questions/resale.rb
+++ b/app/models/form/sales/questions/resale.rb
@@ -3,7 +3,7 @@ class Form::Sales::Questions::Resale < ::Form::Question
     super
     @id = "resale"
     @check_answer_label = "Is this a resale?"
-    @header = "Is this a resale?"
+    @header = "Q80 - Is this a resale?"
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
     @hint_text = "If the social landlord has previously sold the property to another buyer and is now reselling the property, select 'yes'. If this is the first time the property has been sold, select 'no'."
diff --git a/app/models/form/sales/questions/sale_date.rb b/app/models/form/sales/questions/sale_date.rb
index ce085b646..526b5c827 100644
--- a/app/models/form/sales/questions/sale_date.rb
+++ b/app/models/form/sales/questions/sale_date.rb
@@ -3,7 +3,7 @@ class Form::Sales::Questions::SaleDate < ::Form::Question
     super
     @id = "saledate"
     @check_answer_label = "Sale completion date"
-    @header = "What is the sale completion date?"
+    @header = "Q1 - What is the sale completion date?"
     @type = "date"
   end
 end
diff --git a/app/models/form/sales/questions/savings_nk.rb b/app/models/form/sales/questions/savings_nk.rb
index f68b45560..e6a519d42 100644
--- a/app/models/form/sales/questions/savings_nk.rb
+++ b/app/models/form/sales/questions/savings_nk.rb
@@ -3,7 +3,7 @@ class Form::Sales::Questions::SavingsNk < ::Form::Question
     super
     @id = "savingsnk"
     @check_answer_label = "Buyer’s total savings known?"
-    @header = "Do you know how much the buyer had in savings before they paid any deposit for the property?"
+    @header = "Q72 - Do you know how much the buyer had in savings before they paid any deposit for the property?"
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
     @conditional_for = {
diff --git a/app/models/form/sales/questions/shared_ownership_type.rb b/app/models/form/sales/questions/shared_ownership_type.rb
index 6351cc185..eebdeef3f 100644
--- a/app/models/form/sales/questions/shared_ownership_type.rb
+++ b/app/models/form/sales/questions/shared_ownership_type.rb
@@ -3,7 +3,7 @@ class Form::Sales::Questions::SharedOwnershipType < ::Form::Question
     super
     @id = "type"
     @check_answer_label = "Type of shared ownership sale"
-    @header = "What is the type of shared ownership sale?"
+    @header = "Q4 - What is the type of shared ownership sale?"
     @hint_text = "A shared ownership sale is when the purchaser buys up to 75% of the property value and pays rent to the Private Registered Provider (PRP) on the remaining portion"
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
diff --git a/app/models/form/sales/questions/staircase.rb b/app/models/form/sales/questions/staircase.rb
index c03c24089..f9eb6ef1c 100644
--- a/app/models/form/sales/questions/staircase.rb
+++ b/app/models/form/sales/questions/staircase.rb
@@ -3,7 +3,7 @@ class Form::Sales::Questions::Staircase < ::Form::Question
     super
     @id = "staircase"
     @check_answer_label = "Staircasing transaction"
-    @header = "Is this a staircasing transaction?"
+    @header = "Q76 - Is this a staircasing transaction?"
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
     @hint_text = "A staircasing transaction is when the household purchases more shares in their property, increasing the proportion they own and decreasing the proportion the housing association owns. Once the household purchases 100% of the shares, they own the property"
diff --git a/app/models/form/sales/questions/staircase_bought.rb b/app/models/form/sales/questions/staircase_bought.rb
index 385cfb782..208f97460 100644
--- a/app/models/form/sales/questions/staircase_bought.rb
+++ b/app/models/form/sales/questions/staircase_bought.rb
@@ -3,7 +3,7 @@ class Form::Sales::Questions::StaircaseBought < ::Form::Question
     super
     @id = "stairbought"
     @check_answer_label = "Percentage bought in this staircasing transaction"
-    @header = "What percentage of the property has been bought in this staircasing transaction?"
+    @header = "Q77 - What percentage of the property has been bought in this staircasing transaction?"
     @type = "numeric"
     @width = 5
     @min = 0
diff --git a/app/models/form/sales/questions/staircase_owned.rb b/app/models/form/sales/questions/staircase_owned.rb
index 7e6dab5d6..abfe717df 100644
--- a/app/models/form/sales/questions/staircase_owned.rb
+++ b/app/models/form/sales/questions/staircase_owned.rb
@@ -3,7 +3,7 @@ class Form::Sales::Questions::StaircaseOwned < ::Form::Question
     super
     @id = "stairowned"
     @check_answer_label = "Percentage the buyer now owns in total"
-    @header = "What percentage of the property does the buyer now own in total?"
+    @header = "Q78 - What percentage of the property does the buyer now own in total?"
     @type = "numeric"
     @width = 5
     @min = 0
diff --git a/app/models/form/sales/questions/staircase_sale.rb b/app/models/form/sales/questions/staircase_sale.rb
index fb56572cf..aa6851b1c 100644
--- a/app/models/form/sales/questions/staircase_sale.rb
+++ b/app/models/form/sales/questions/staircase_sale.rb
@@ -3,7 +3,7 @@ class Form::Sales::Questions::StaircaseSale < ::Form::Question
     super
     @id = "staircasesale"
     @check_answer_label = "Part of a back-to-back staircasing transaction"
-    @header = "Is this transaction part of a back-to-back staircasing transaction to facilitate sale of the home on the open market?"
+    @header = "Q79 - Is this transaction part of a back-to-back staircasing transaction to facilitate sale of the home on the open market?"
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
   end
diff --git a/db/schema.rb b/db/schema.rb
index 1747fa6c5..5a055e754 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[7.0].define(version: 2023_02_13_140932) do
+ActiveRecord::Schema[7.0].define(version: 2023_02_15_112932) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
@@ -490,7 +490,6 @@ ActiveRecord::Schema[7.0].define(version: 2023_02_13_140932) do
     t.integer "prevten"
     t.integer "mortgageused"
     t.integer "wchair"
-    t.integer "income2_value_check"
     t.integer "armedforcesspouse"
     t.datetime "hodate", precision: nil
     t.integer "hoday"
@@ -522,16 +521,19 @@ ActiveRecord::Schema[7.0].define(version: 2023_02_13_140932) do
     t.integer "old_persons_shared_ownership_value_check"
     t.integer "staircase_bought_value_check"
     t.integer "monthly_charges_value_check"
+    t.integer "saledate_check"
     t.integer "details_known_5"
     t.integer "details_known_6"
-    t.integer "saledate_check"
-    t.integer "prevshared"
-    t.integer "staircasesale"
     t.integer "ethnic_group2"
     t.integer "ethnicbuy2"
+    t.integer "prevshared"
+    t.integer "staircasesale"
+    t.string "old_id"
+    t.integer "income2_value_check"
     t.integer "proplen_asked"
     t.index ["bulk_upload_id"], name: "index_sales_logs_on_bulk_upload_id"
     t.index ["created_by_id"], name: "index_sales_logs_on_created_by_id"
+    t.index ["old_id"], name: "index_sales_logs_on_old_id", unique: true
     t.index ["owning_organisation_id"], name: "index_sales_logs_on_owning_organisation_id"
     t.index ["updated_by_id"], name: "index_sales_logs_on_updated_by_id"
   end
diff --git a/spec/models/form/sales/questions/armed_forces_spec.rb b/spec/models/form/sales/questions/armed_forces_spec.rb
index d84b9fbb5..ac4016c11 100644
--- a/spec/models/form/sales/questions/armed_forces_spec.rb
+++ b/spec/models/form/sales/questions/armed_forces_spec.rb
@@ -16,7 +16,7 @@ RSpec.describe Form::Sales::Questions::ArmedForces, type: :model do
   end
 
   it "has the correct header" do
-    expect(question.header).to eq("Have any of the buyers ever served as a regular in the UK armed forces?")
+    expect(question.header).to eq("Q62 - Have any of the buyers ever served as a regular in the UK armed forces?")
   end
 
   it "has the correct check_answer_label" do
diff --git a/spec/models/form/sales/questions/armed_forces_spouse_spec.rb b/spec/models/form/sales/questions/armed_forces_spouse_spec.rb
index d3cc9bccc..8b4b321d2 100644
--- a/spec/models/form/sales/questions/armed_forces_spouse_spec.rb
+++ b/spec/models/form/sales/questions/armed_forces_spouse_spec.rb
@@ -16,7 +16,7 @@ RSpec.describe Form::Sales::Questions::ArmedForcesSpouse, type: :model do
   end
 
   it "has the correct header" do
-    expect(question.header).to eq("Are any of the buyers a spouse or civil partner of a UK armed forces regular who died in service within the last 2 years?")
+    expect(question.header).to eq("Q64 - Are any of the buyers a spouse or civil partner of a UK armed forces regular who died in service within the last 2 years?")
   end
 
   it "has the correct check_answer_label" do
diff --git a/spec/models/form/sales/questions/buyer1_age_known_spec.rb b/spec/models/form/sales/questions/buyer1_age_known_spec.rb
index 4337d8cb1..6daba83a1 100644
--- a/spec/models/form/sales/questions/buyer1_age_known_spec.rb
+++ b/spec/models/form/sales/questions/buyer1_age_known_spec.rb
@@ -16,7 +16,7 @@ RSpec.describe Form::Sales::Questions::Buyer1AgeKnown, type: :model do
   end
 
   it "has the correct header" do
-    expect(question.header).to eq("Do you know buyer 1’s age?")
+    expect(question.header).to eq("Q20 - Do you know buyer 1’s age?")
   end
 
   it "has the correct check_answer_label" do
diff --git a/spec/models/form/sales/questions/buyer1_ethnic_background_arab_spec.rb b/spec/models/form/sales/questions/buyer1_ethnic_background_arab_spec.rb
index fd62707bd..54fcc662b 100644
--- a/spec/models/form/sales/questions/buyer1_ethnic_background_arab_spec.rb
+++ b/spec/models/form/sales/questions/buyer1_ethnic_background_arab_spec.rb
@@ -16,7 +16,7 @@ RSpec.describe Form::Sales::Questions::Buyer1EthnicBackgroundArab, type: :model
   end
 
   it "has the correct header" do
-    expect(question.header).to eq("Which of the following best describes the buyer 1’s Arab background?")
+    expect(question.header).to eq("Q23 - Which of the following best describes the buyer 1’s Arab background?")
   end
 
   it "has the correct check_answer_label" do
diff --git a/spec/models/form/sales/questions/buyer1_ethnic_background_asian_spec.rb b/spec/models/form/sales/questions/buyer1_ethnic_background_asian_spec.rb
index 1b7c99988..d3e4ad54b 100644
--- a/spec/models/form/sales/questions/buyer1_ethnic_background_asian_spec.rb
+++ b/spec/models/form/sales/questions/buyer1_ethnic_background_asian_spec.rb
@@ -16,7 +16,7 @@ RSpec.describe Form::Sales::Questions::Buyer1EthnicBackgroundAsian, type: :model
   end
 
   it "has the correct header" do
-    expect(question.header).to eq("Which of the following best describes the buyer 1’s Asian or Asian British background?")
+    expect(question.header).to eq("Q23 - Which of the following best describes the buyer 1’s Asian or Asian British background?")
   end
 
   it "has the correct check_answer_label" do
diff --git a/spec/models/form/sales/questions/buyer1_ethnic_background_black_spec.rb b/spec/models/form/sales/questions/buyer1_ethnic_background_black_spec.rb
index c324556f7..23ac7934e 100644
--- a/spec/models/form/sales/questions/buyer1_ethnic_background_black_spec.rb
+++ b/spec/models/form/sales/questions/buyer1_ethnic_background_black_spec.rb
@@ -16,7 +16,7 @@ RSpec.describe Form::Sales::Questions::Buyer1EthnicBackgroundBlack, type: :model
   end
 
   it "has the correct header" do
-    expect(question.header).to eq("Which of the following best describes the buyer 1’s Black, African, Caribbean or Black British background?")
+    expect(question.header).to eq("Q23 - Which of the following best describes the buyer 1’s Black, African, Caribbean or Black British background?")
   end
 
   it "has the correct check_answer_label" do
diff --git a/spec/models/form/sales/questions/buyer1_ethnic_background_mixed_spec.rb b/spec/models/form/sales/questions/buyer1_ethnic_background_mixed_spec.rb
index efbb928d4..2808a290d 100644
--- a/spec/models/form/sales/questions/buyer1_ethnic_background_mixed_spec.rb
+++ b/spec/models/form/sales/questions/buyer1_ethnic_background_mixed_spec.rb
@@ -16,7 +16,7 @@ RSpec.describe Form::Sales::Questions::Buyer1EthnicBackgroundMixed, type: :model
   end
 
   it "has the correct header" do
-    expect(question.header).to eq("Which of the following best describes the buyer 1’s Mixed or Multiple ethnic groups background?")
+    expect(question.header).to eq("Q23 - Which of the following best describes the buyer 1’s Mixed or Multiple ethnic groups background?")
   end
 
   it "has the correct check_answer_label" do
diff --git a/spec/models/form/sales/questions/buyer1_ethnic_background_white_spec.rb b/spec/models/form/sales/questions/buyer1_ethnic_background_white_spec.rb
index e155378a3..e1fd049a8 100644
--- a/spec/models/form/sales/questions/buyer1_ethnic_background_white_spec.rb
+++ b/spec/models/form/sales/questions/buyer1_ethnic_background_white_spec.rb
@@ -16,7 +16,7 @@ RSpec.describe Form::Sales::Questions::Buyer1EthnicBackgroundWhite, type: :model
   end
 
   it "has the correct header" do
-    expect(question.header).to eq("Which of the following best describes the buyer 1’s White background?")
+    expect(question.header).to eq("Q23 - Which of the following best describes the buyer 1’s White background?")
   end
 
   it "has the correct check_answer_label" do
diff --git a/spec/models/form/sales/questions/buyer1_ethnic_group_spec.rb b/spec/models/form/sales/questions/buyer1_ethnic_group_spec.rb
index 4e619bcf8..38c4c4c58 100644
--- a/spec/models/form/sales/questions/buyer1_ethnic_group_spec.rb
+++ b/spec/models/form/sales/questions/buyer1_ethnic_group_spec.rb
@@ -16,7 +16,7 @@ RSpec.describe Form::Sales::Questions::Buyer1EthnicGroup, type: :model do
   end
 
   it "has the correct header" do
-    expect(question.header).to eq("What is buyer 1’s ethnic group?")
+    expect(question.header).to eq("Q22 - What is buyer 1’s ethnic group?")
   end
 
   it "has the correct check_answer_label" do
diff --git a/spec/models/form/sales/questions/buyer1_income_known_spec.rb b/spec/models/form/sales/questions/buyer1_income_known_spec.rb
index aafe16c2d..297126d80 100644
--- a/spec/models/form/sales/questions/buyer1_income_known_spec.rb
+++ b/spec/models/form/sales/questions/buyer1_income_known_spec.rb
@@ -16,7 +16,7 @@ RSpec.describe Form::Sales::Questions::Buyer1IncomeKnown, type: :model do
   end
 
   it "has the correct header" do
-    expect(question.header).to eq("Do you know buyer 1’s annual income?")
+    expect(question.header).to eq("Q67 - Do you know buyer 1’s annual income?")
   end
 
   it "has the correct check_answer_label" do
diff --git a/spec/models/form/sales/questions/buyer1_live_in_property_spec.rb b/spec/models/form/sales/questions/buyer1_live_in_property_spec.rb
index 7b8979d76..3b971f30f 100644
--- a/spec/models/form/sales/questions/buyer1_live_in_property_spec.rb
+++ b/spec/models/form/sales/questions/buyer1_live_in_property_spec.rb
@@ -16,7 +16,7 @@ RSpec.describe Form::Sales::Questions::Buyer1LiveInProperty, type: :model do
   end
 
   it "has the correct header" do
-    expect(question.header).to eq("Will buyer 1 live in the property?")
+    expect(question.header).to eq("Q26 - Will buyer 1 live in the property?")
   end
 
   it "has the correct check_answer_label" do
diff --git a/spec/models/form/sales/questions/buyer1_mortgage_spec.rb b/spec/models/form/sales/questions/buyer1_mortgage_spec.rb
index 59ae45afc..9e8c53333 100644
--- a/spec/models/form/sales/questions/buyer1_mortgage_spec.rb
+++ b/spec/models/form/sales/questions/buyer1_mortgage_spec.rb
@@ -16,7 +16,7 @@ RSpec.describe Form::Sales::Questions::Buyer1Mortgage, type: :model do
   end
 
   it "has the correct header" do
-    expect(question.header).to eq("Was buyer 1's income used for a mortgage application?")
+    expect(question.header).to eq("Q68 - Was buyer 1's income used for a mortgage application?")
   end
 
   it "has the correct check_answer_label" do
diff --git a/spec/models/form/sales/questions/buyer1_previous_tenure_spec.rb b/spec/models/form/sales/questions/buyer1_previous_tenure_spec.rb
index ae1da940a..f831b045c 100644
--- a/spec/models/form/sales/questions/buyer1_previous_tenure_spec.rb
+++ b/spec/models/form/sales/questions/buyer1_previous_tenure_spec.rb
@@ -16,7 +16,7 @@ RSpec.describe Form::Sales::Questions::Buyer1PreviousTenure, type: :model do
   end
 
   it "has the correct header" do
-    expect(question.header).to eq("What was buyer 1's previous tenure?")
+    expect(question.header).to eq("Q56 - What was buyer 1's previous tenure?")
   end
 
   it "has the correct check_answer_label" do
diff --git a/spec/models/form/sales/questions/buyer1_working_situation_spec.rb b/spec/models/form/sales/questions/buyer1_working_situation_spec.rb
index fdcc6ce36..93ace329f 100644
--- a/spec/models/form/sales/questions/buyer1_working_situation_spec.rb
+++ b/spec/models/form/sales/questions/buyer1_working_situation_spec.rb
@@ -16,7 +16,7 @@ RSpec.describe Form::Sales::Questions::Buyer1WorkingSituation, type: :model do
   end
 
   it "has the correct header" do
-    expect(question.header).to eq("Which of these best describes buyer 1's working situation?")
+    expect(question.header).to eq("Q25 - Which of these best describes buyer 1's working situation?")
   end
 
   it "has the correct check_answer_label" do
diff --git a/spec/models/form/sales/questions/buyer2_age_known_spec.rb b/spec/models/form/sales/questions/buyer2_age_known_spec.rb
index 7a06e4705..eec6fd076 100644
--- a/spec/models/form/sales/questions/buyer2_age_known_spec.rb
+++ b/spec/models/form/sales/questions/buyer2_age_known_spec.rb
@@ -16,7 +16,7 @@ RSpec.describe Form::Sales::Questions::Buyer2AgeKnown, type: :model do
   end
 
   it "has the correct header" do
-    expect(question.header).to eq("Do you know buyer 2’s age?")
+    expect(question.header).to eq("Q28 - Do you know buyer 2’s age?")
   end
 
   it "has the correct check_answer_label" do
diff --git a/spec/models/form/sales/questions/buyer2_ethnic_background_arab_spec.rb b/spec/models/form/sales/questions/buyer2_ethnic_background_arab_spec.rb
index 9fd408db9..956ba91e5 100644
--- a/spec/models/form/sales/questions/buyer2_ethnic_background_arab_spec.rb
+++ b/spec/models/form/sales/questions/buyer2_ethnic_background_arab_spec.rb
@@ -16,7 +16,7 @@ RSpec.describe Form::Sales::Questions::Buyer2EthnicBackgroundArab, type: :model
   end
 
   it "has the correct header" do
-    expect(question.header).to eq("Which of the following best describes the buyer 2’s Arab background?")
+    expect(question.header).to eq("Q31 - Which of the following best describes the buyer 2’s Arab background?")
   end
 
   it "has the correct check_answer_label" do
diff --git a/spec/models/form/sales/questions/buyer2_ethnic_background_asian_spec.rb b/spec/models/form/sales/questions/buyer2_ethnic_background_asian_spec.rb
index 67ce60e43..613e52d4d 100644
--- a/spec/models/form/sales/questions/buyer2_ethnic_background_asian_spec.rb
+++ b/spec/models/form/sales/questions/buyer2_ethnic_background_asian_spec.rb
@@ -16,7 +16,7 @@ RSpec.describe Form::Sales::Questions::Buyer2EthnicBackgroundAsian, type: :model
   end
 
   it "has the correct header" do
-    expect(question.header).to eq("Which of the following best describes the buyer 2’s Asian or Asian British background?")
+    expect(question.header).to eq("Q31 - Which of the following best describes the buyer 2’s Asian or Asian British background?")
   end
 
   it "has the correct check_answer_label" do
diff --git a/spec/models/form/sales/questions/buyer2_ethnic_background_black_spec.rb b/spec/models/form/sales/questions/buyer2_ethnic_background_black_spec.rb
index 8e772f870..2cec1519f 100644
--- a/spec/models/form/sales/questions/buyer2_ethnic_background_black_spec.rb
+++ b/spec/models/form/sales/questions/buyer2_ethnic_background_black_spec.rb
@@ -16,7 +16,7 @@ RSpec.describe Form::Sales::Questions::Buyer2EthnicBackgroundBlack, type: :model
   end
 
   it "has the correct header" do
-    expect(question.header).to eq("Which of the following best describes the buyer 2’s Black, African, Caribbean or Black British background?")
+    expect(question.header).to eq("Q31 - Which of the following best describes the buyer 2’s Black, African, Caribbean or Black British background?")
   end
 
   it "has the correct check_answer_label" do
diff --git a/spec/models/form/sales/questions/buyer2_ethnic_background_mixed_spec.rb b/spec/models/form/sales/questions/buyer2_ethnic_background_mixed_spec.rb
index 6c1b12865..3b1497795 100644
--- a/spec/models/form/sales/questions/buyer2_ethnic_background_mixed_spec.rb
+++ b/spec/models/form/sales/questions/buyer2_ethnic_background_mixed_spec.rb
@@ -16,7 +16,7 @@ RSpec.describe Form::Sales::Questions::Buyer2EthnicBackgroundMixed, type: :model
   end
 
   it "has the correct header" do
-    expect(question.header).to eq("Which of the following best describes the buyer 2’s Mixed or Multiple ethnic groups background?")
+    expect(question.header).to eq("Q31 - Which of the following best describes the buyer 2’s Mixed or Multiple ethnic groups background?")
   end
 
   it "has the correct check_answer_label" do
diff --git a/spec/models/form/sales/questions/buyer2_ethnic_background_white_spec.rb b/spec/models/form/sales/questions/buyer2_ethnic_background_white_spec.rb
index d3f2da508..7f8f2cad6 100644
--- a/spec/models/form/sales/questions/buyer2_ethnic_background_white_spec.rb
+++ b/spec/models/form/sales/questions/buyer2_ethnic_background_white_spec.rb
@@ -16,7 +16,7 @@ RSpec.describe Form::Sales::Questions::Buyer2EthnicBackgroundWhite, type: :model
   end
 
   it "has the correct header" do
-    expect(question.header).to eq("Which of the following best describes the buyer 2’s White background?")
+    expect(question.header).to eq("Q31 - Which of the following best describes the buyer 2’s White background?")
   end
 
   it "has the correct check_answer_label" do
diff --git a/spec/models/form/sales/questions/buyer2_ethnic_group_spec.rb b/spec/models/form/sales/questions/buyer2_ethnic_group_spec.rb
index 2e9e0c28c..67ebbaa20 100644
--- a/spec/models/form/sales/questions/buyer2_ethnic_group_spec.rb
+++ b/spec/models/form/sales/questions/buyer2_ethnic_group_spec.rb
@@ -16,7 +16,7 @@ RSpec.describe Form::Sales::Questions::Buyer2EthnicGroup, type: :model do
   end
 
   it "has the correct header" do
-    expect(question.header).to eq("What is buyer 2’s ethnic group?")
+    expect(question.header).to eq("Q30 - What is buyer 2’s ethnic group?")
   end
 
   it "has the correct check_answer_label" do
diff --git a/spec/models/form/sales/questions/buyer2_income_known_spec.rb b/spec/models/form/sales/questions/buyer2_income_known_spec.rb
index a1be51ad4..4acfd29dc 100644
--- a/spec/models/form/sales/questions/buyer2_income_known_spec.rb
+++ b/spec/models/form/sales/questions/buyer2_income_known_spec.rb
@@ -16,7 +16,7 @@ RSpec.describe Form::Sales::Questions::Buyer2IncomeKnown, type: :model do
   end
 
   it "has the correct header" do
-    expect(question.header).to eq("Do you know buyer 2’s annual income?")
+    expect(question.header).to eq("Q69 - Do you know buyer 2’s annual income?")
   end
 
   it "has the correct check_answer_label" do
diff --git a/spec/models/form/sales/questions/buyer2_live_in_property_spec.rb b/spec/models/form/sales/questions/buyer2_live_in_property_spec.rb
index c2d276c44..892e2d081 100644
--- a/spec/models/form/sales/questions/buyer2_live_in_property_spec.rb
+++ b/spec/models/form/sales/questions/buyer2_live_in_property_spec.rb
@@ -16,7 +16,7 @@ RSpec.describe Form::Sales::Questions::Buyer2LiveInProperty, type: :model do
   end
 
   it "has the correct header" do
-    expect(question.header).to eq("Will buyer 2 live in the property?")
+    expect(question.header).to eq("Q34 - Will buyer 2 live in the property?")
   end
 
   it "has the correct check_answer_label" do
diff --git a/spec/models/form/sales/questions/buyer2_mortgage_spec.rb b/spec/models/form/sales/questions/buyer2_mortgage_spec.rb
index bb561af43..4b750dd6f 100644
--- a/spec/models/form/sales/questions/buyer2_mortgage_spec.rb
+++ b/spec/models/form/sales/questions/buyer2_mortgage_spec.rb
@@ -16,7 +16,7 @@ RSpec.describe Form::Sales::Questions::Buyer2Mortgage, type: :model do
   end
 
   it "has the correct header" do
-    expect(question.header).to eq("Was buyer 2's income used for a mortgage application?")
+    expect(question.header).to eq("Q70 - Was buyer 2's income used for a mortgage application?")
   end
 
   it "has the correct check_answer_label" do
diff --git a/spec/models/form/sales/questions/buyer2_relationship_to_buyer1_spec.rb b/spec/models/form/sales/questions/buyer2_relationship_to_buyer1_spec.rb
index 598d59f64..613cbcb2c 100644
--- a/spec/models/form/sales/questions/buyer2_relationship_to_buyer1_spec.rb
+++ b/spec/models/form/sales/questions/buyer2_relationship_to_buyer1_spec.rb
@@ -16,7 +16,7 @@ RSpec.describe Form::Sales::Questions::Buyer2RelationshipToBuyer1, type: :model
   end
 
   it "has the correct header" do
-    expect(question.header).to eq("What is buyer 2's relationship to buyer 1?")
+    expect(question.header).to eq("Q27 - What is buyer 2's relationship to buyer 1?")
   end
 
   it "has the correct check_answer_label" do
diff --git a/spec/models/form/sales/questions/buyer2_working_situation_spec.rb b/spec/models/form/sales/questions/buyer2_working_situation_spec.rb
index 7905f0df1..6afd74e08 100644
--- a/spec/models/form/sales/questions/buyer2_working_situation_spec.rb
+++ b/spec/models/form/sales/questions/buyer2_working_situation_spec.rb
@@ -16,7 +16,7 @@ RSpec.describe Form::Sales::Questions::Buyer2WorkingSituation, type: :model do
   end
 
   it "has the correct header" do
-    expect(question.header).to eq("Which of these best describes buyer 2's working situation?")
+    expect(question.header).to eq("Q33 - Which of these best describes buyer 2's working situation?")
   end
 
   it "has the correct check_answer_label" do
diff --git a/spec/models/form/sales/questions/buyer_company_spec.rb b/spec/models/form/sales/questions/buyer_company_spec.rb
index 714aa0986..911f4acbf 100644
--- a/spec/models/form/sales/questions/buyer_company_spec.rb
+++ b/spec/models/form/sales/questions/buyer_company_spec.rb
@@ -16,7 +16,7 @@ RSpec.describe Form::Sales::Questions::BuyerCompany, type: :model do
   end
 
   it "has the correct header" do
-    expect(question.header).to eq("Is the buyer a company?")
+    expect(question.header).to eq("Q7 - Is the buyer a company?")
   end
 
   it "has the correct type" do
diff --git a/spec/models/form/sales/questions/buyer_interview_spec.rb b/spec/models/form/sales/questions/buyer_interview_spec.rb
index 433d46f8b..cc9fb3244 100644
--- a/spec/models/form/sales/questions/buyer_interview_spec.rb
+++ b/spec/models/form/sales/questions/buyer_interview_spec.rb
@@ -16,7 +16,7 @@ RSpec.describe Form::Sales::Questions::BuyerInterview, type: :model do
   end
 
   it "has the correct header" do
-    expect(question.header).to eq("Was the buyer interviewed for any of the answers you will provide on this log?")
+    expect(question.header).to eq("Q18 -Was the buyer interviewed for any of the answers you will provide on this log?")
   end
 
   it "has the correct check_answer_label" do
diff --git a/spec/models/form/sales/questions/buyer_live_spec.rb b/spec/models/form/sales/questions/buyer_live_spec.rb
index a946a7905..15ae7e5e3 100644
--- a/spec/models/form/sales/questions/buyer_live_spec.rb
+++ b/spec/models/form/sales/questions/buyer_live_spec.rb
@@ -16,7 +16,7 @@ RSpec.describe Form::Sales::Questions::BuyerLive, type: :model do
   end
 
   it "has the correct header" do
-    expect(question.header).to eq("Will the buyers live in the property?")
+    expect(question.header).to eq("Q8 - Will the buyers live in the property?")
   end
 
   it "has the correct check_answer_label" do
diff --git a/spec/models/form/sales/questions/buyer_previous_spec.rb b/spec/models/form/sales/questions/buyer_previous_spec.rb
index 07d3685f8..96d6f0b9a 100644
--- a/spec/models/form/sales/questions/buyer_previous_spec.rb
+++ b/spec/models/form/sales/questions/buyer_previous_spec.rb
@@ -16,7 +16,7 @@ RSpec.describe Form::Sales::Questions::BuyerPrevious, type: :model do
   end
 
   it "has the correct header" do
-    expect(question.header).to eq("Was the buyer a private registered provider, housing association or local authority tenant immediately before this sale?")
+    expect(question.header).to eq("Q84 - Was the buyer a private registered provider, housing association or local authority tenant immediately before this sale?")
   end
 
   it "has the correct check_answer_label" do
diff --git a/spec/models/form/sales/questions/buyer_still_serving_spec.rb b/spec/models/form/sales/questions/buyer_still_serving_spec.rb
index 887944a89..c0ee89030 100644
--- a/spec/models/form/sales/questions/buyer_still_serving_spec.rb
+++ b/spec/models/form/sales/questions/buyer_still_serving_spec.rb
@@ -16,7 +16,7 @@ RSpec.describe Form::Sales::Questions::BuyerStillServing, type: :model do
   end
 
   it "has the correct header" do
-    expect(question.header).to eq("Is the buyer still serving in the UK armed forces?")
+    expect(question.header).to eq("Q63 - Is the buyer still serving in the UK armed forces?")
   end
 
   it "has the correct check_answer_label" do
diff --git a/spec/models/form/sales/questions/buyers_organisations_spec.rb b/spec/models/form/sales/questions/buyers_organisations_spec.rb
index d9f61df5f..0bf4ac86b 100644
--- a/spec/models/form/sales/questions/buyers_organisations_spec.rb
+++ b/spec/models/form/sales/questions/buyers_organisations_spec.rb
@@ -16,7 +16,7 @@ RSpec.describe Form::Sales::Questions::BuyersOrganisations, type: :model do
   end
 
   it "has the correct header" do
-    expect(question.header).to eq("What organisations were the buyers registered with?")
+    expect(question.header).to eq("Q59 - What organisations were the buyers registered with?")
   end
 
   it "has the correct check_answer_label" do
diff --git a/spec/models/form/sales/questions/deposit_discount_spec.rb b/spec/models/form/sales/questions/deposit_discount_spec.rb
index b0f8899bf..8ee635973 100644
--- a/spec/models/form/sales/questions/deposit_discount_spec.rb
+++ b/spec/models/form/sales/questions/deposit_discount_spec.rb
@@ -16,7 +16,7 @@ RSpec.describe Form::Sales::Questions::DepositDiscount, type: :model do
   end
 
   it "has the correct header" do
-    expect(question.header).to eq("How much cash discount was given through Social HomeBuy?")
+    expect(question.header).to eq("Q96 - How much cash discount was given through Social HomeBuy?")
   end
 
   it "has the correct check_answer_label" do
diff --git a/spec/models/form/sales/questions/discount_spec.rb b/spec/models/form/sales/questions/discount_spec.rb
index f40b2eded..5996cce35 100644
--- a/spec/models/form/sales/questions/discount_spec.rb
+++ b/spec/models/form/sales/questions/discount_spec.rb
@@ -16,7 +16,7 @@ RSpec.describe Form::Sales::Questions::Discount, type: :model do
   end
 
   it "has the correct header" do
-    expect(question.header).to eq("What was the percentage discount?")
+    expect(question.header).to eq("Q102 - What was the percentage discount?")
   end
 
   it "has the correct check_answer_label" do
diff --git a/spec/models/form/sales/questions/discounted_ownership_type_spec.rb b/spec/models/form/sales/questions/discounted_ownership_type_spec.rb
index d1c074023..09773cc56 100644
--- a/spec/models/form/sales/questions/discounted_ownership_type_spec.rb
+++ b/spec/models/form/sales/questions/discounted_ownership_type_spec.rb
@@ -16,7 +16,7 @@ RSpec.describe Form::Sales::Questions::DiscountedOwnershipType, type: :model do
   end
 
   it "has the correct header" do
-    expect(question.header).to eq("What is the type of discounted ownership sale?")
+    expect(question.header).to eq("Q5 - What is the type of discounted ownership sale?")
   end
 
   it "has the correct check_answer_label" do
diff --git a/spec/models/form/sales/questions/equity_spec.rb b/spec/models/form/sales/questions/equity_spec.rb
index 91308c745..47b6f7fbb 100644
--- a/spec/models/form/sales/questions/equity_spec.rb
+++ b/spec/models/form/sales/questions/equity_spec.rb
@@ -16,7 +16,7 @@ RSpec.describe Form::Sales::Questions::Equity, type: :model do
   end
 
   it "has the correct header" do
-    expect(question.header).to eq("What was the initial percentage equity stake purchased?")
+    expect(question.header).to eq("Q89 - What was the initial percentage equity stake purchased?")
   end
 
   it "has the correct check_answer_label" do
diff --git a/spec/models/form/sales/questions/exchange_date_spec.rb b/spec/models/form/sales/questions/exchange_date_spec.rb
index 53d5a8975..9453d4b6b 100644
--- a/spec/models/form/sales/questions/exchange_date_spec.rb
+++ b/spec/models/form/sales/questions/exchange_date_spec.rb
@@ -20,7 +20,7 @@ RSpec.describe Form::Sales::Questions::ExchangeDate, type: :model do
   end
 
   it "has the correct check_answer_label" do
-    expect(question.check_answer_label).to eq("Exchange of contracts date")
+    expect(question.check_answer_label).to eq("Q81 - Exchange of contracts date")
   end
 
   it "has the correct type" do
diff --git a/spec/models/form/sales/questions/fromprop_spec.rb b/spec/models/form/sales/questions/fromprop_spec.rb
index ebfa218c5..5d86ca7f6 100644
--- a/spec/models/form/sales/questions/fromprop_spec.rb
+++ b/spec/models/form/sales/questions/fromprop_spec.rb
@@ -16,7 +16,7 @@ RSpec.describe Form::Sales::Questions::Fromprop, type: :model do
   end
 
   it "has the correct header" do
-    expect(question.header).to eq("What was the previous property type?")
+    expect(question.header).to eq("Q86 - What was the previous property type?")
   end
 
   it "has the correct check_answer_label" do
diff --git a/spec/models/form/sales/questions/gender_identity1_spec.rb b/spec/models/form/sales/questions/gender_identity1_spec.rb
index 2abe952ed..7700b0877 100644
--- a/spec/models/form/sales/questions/gender_identity1_spec.rb
+++ b/spec/models/form/sales/questions/gender_identity1_spec.rb
@@ -16,7 +16,7 @@ RSpec.describe Form::Sales::Questions::GenderIdentity1, type: :model do
   end
 
   it "has the correct header" do
-    expect(question.header).to eq("Which of these best describes buyer 1’s gender identity?")
+    expect(question.header).to eq("Q21 - Which of these best describes buyer 1’s gender identity?")
   end
 
   it "has the correct check_answer_label" do
diff --git a/spec/models/form/sales/questions/grant_spec.rb b/spec/models/form/sales/questions/grant_spec.rb
index d4e92f703..2da8d01cf 100644
--- a/spec/models/form/sales/questions/grant_spec.rb
+++ b/spec/models/form/sales/questions/grant_spec.rb
@@ -16,7 +16,7 @@ RSpec.describe Form::Sales::Questions::Grant, type: :model do
   end
 
   it "has the correct header" do
-    expect(question.header).to eq("What was the amount of any loan, grant, discount or subsidy given?")
+    expect(question.header).to eq("Q101 - What was the amount of any loan, grant, discount or subsidy given?")
   end
 
   it "has the correct check_answer_label" do
diff --git a/spec/models/form/sales/questions/handover_date_spec.rb b/spec/models/form/sales/questions/handover_date_spec.rb
index 43fa7f665..90f227cad 100644
--- a/spec/models/form/sales/questions/handover_date_spec.rb
+++ b/spec/models/form/sales/questions/handover_date_spec.rb
@@ -16,7 +16,7 @@ RSpec.describe Form::Sales::Questions::HandoverDate, type: :model do
   end
 
   it "has the correct header" do
-    expect(question.header).to eq("What is the practical completion or handover date?")
+    expect(question.header).to eq("Q82 - What is the practical completion or handover date?")
   end
 
   it "has the correct check_answer_label" do
diff --git a/spec/models/form/sales/questions/household_disability_spec.rb b/spec/models/form/sales/questions/household_disability_spec.rb
index 38134344c..e07118a27 100644
--- a/spec/models/form/sales/questions/household_disability_spec.rb
+++ b/spec/models/form/sales/questions/household_disability_spec.rb
@@ -16,7 +16,7 @@ RSpec.describe Form::Sales::Questions::HouseholdDisability, type: :model do
   end
 
   it "has the correct header" do
-    expect(question.header).to eq("Does anyone in the household consider themselves to have a disability?")
+    expect(question.header).to eq("Q65 - Does anyone in the household consider themselves to have a disability?")
   end
 
   it "has the correct check_answer_label" do
diff --git a/spec/models/form/sales/questions/household_wheelchair_spec.rb b/spec/models/form/sales/questions/household_wheelchair_spec.rb
index 8d641aef7..328d93c15 100644
--- a/spec/models/form/sales/questions/household_wheelchair_spec.rb
+++ b/spec/models/form/sales/questions/household_wheelchair_spec.rb
@@ -16,7 +16,7 @@ RSpec.describe Form::Sales::Questions::HouseholdWheelchair, type: :model do
   end
 
   it "has the correct header" do
-    expect(question.header).to eq("Does anyone in the household use a wheelchair?")
+    expect(question.header).to eq("Q66 - Does anyone in the household use a wheelchair?")
   end
 
   it "has the correct check_answer_label" do
diff --git a/spec/models/form/sales/questions/housing_benefits_spec.rb b/spec/models/form/sales/questions/housing_benefits_spec.rb
index 8c3ae57d3..2e38a5313 100644
--- a/spec/models/form/sales/questions/housing_benefits_spec.rb
+++ b/spec/models/form/sales/questions/housing_benefits_spec.rb
@@ -16,7 +16,7 @@ RSpec.describe Form::Sales::Questions::HousingBenefits, type: :model do
   end
 
   it "has the correct header" do
-    expect(question.header).to eq("Was the buyer receiving any of these housing-related benefits immediately before buying this property?")
+    expect(question.header).to eq("Q71 - Was the buyer receiving any of these housing-related benefits immediately before buying this property?")
   end
 
   it "has the correct check_answer_label" do
diff --git a/spec/models/form/sales/questions/joint_purchase_spec.rb b/spec/models/form/sales/questions/joint_purchase_spec.rb
index 5d738531c..88e8063bb 100644
--- a/spec/models/form/sales/questions/joint_purchase_spec.rb
+++ b/spec/models/form/sales/questions/joint_purchase_spec.rb
@@ -16,7 +16,7 @@ RSpec.describe Form::Sales::Questions::JointPurchase, type: :model do
   end
 
   it "has the correct header" do
-    expect(question.header).to eq("Is this a joint purchase?")
+    expect(question.header).to eq("Q9 - Is this a joint purchase?")
   end
 
   it "has the correct check_answer_label" do
diff --git a/spec/models/form/sales/questions/la_nominations_spec.rb b/spec/models/form/sales/questions/la_nominations_spec.rb
index bb06ef014..e59d36816 100644
--- a/spec/models/form/sales/questions/la_nominations_spec.rb
+++ b/spec/models/form/sales/questions/la_nominations_spec.rb
@@ -16,7 +16,7 @@ RSpec.describe Form::Sales::Questions::LaNominations, type: :model do
   end
 
   it "has the correct header" do
-    expect(question.header).to eq("Was the household rehoused under a 'local authority nominations agreement'?")
+    expect(question.header).to eq("Q83 - Was the household rehoused under a 'local authority nominations agreement'?")
   end
 
   it "has the correct check_answer_label" do
diff --git a/spec/models/form/sales/questions/monthly_rent_spec.rb b/spec/models/form/sales/questions/monthly_rent_spec.rb
index e33603099..794a19f54 100644
--- a/spec/models/form/sales/questions/monthly_rent_spec.rb
+++ b/spec/models/form/sales/questions/monthly_rent_spec.rb
@@ -16,7 +16,7 @@ RSpec.describe Form::Sales::Questions::MonthlyRent, type: :model do
   end
 
   it "has the correct header" do
-    expect(question.header).to eq("What is the basic monthly rent?")
+    expect(question.header).to eq("Q97 - What is the basic monthly rent?")
   end
 
   it "has the correct check_answer_label" do
diff --git a/spec/models/form/sales/questions/nationality1_spec.rb b/spec/models/form/sales/questions/nationality1_spec.rb
index 18f659e86..044a0fdad 100644
--- a/spec/models/form/sales/questions/nationality1_spec.rb
+++ b/spec/models/form/sales/questions/nationality1_spec.rb
@@ -16,7 +16,7 @@ RSpec.describe Form::Sales::Questions::Nationality1, type: :model do
   end
 
   it "has the correct header" do
-    expect(question.header).to eq("What is buyer 1’s nationality?")
+    expect(question.header).to eq("Q24 - What is buyer 1’s nationality?")
   end
 
   it "has the correct check_answer_label" do
diff --git a/spec/models/form/sales/questions/number_joint_buyers_spec.rb b/spec/models/form/sales/questions/number_joint_buyers_spec.rb
index a16502f9f..af8ab2660 100644
--- a/spec/models/form/sales/questions/number_joint_buyers_spec.rb
+++ b/spec/models/form/sales/questions/number_joint_buyers_spec.rb
@@ -16,7 +16,7 @@ RSpec.describe Form::Sales::Questions::NumberJointBuyers, type: :model do
   end
 
   it "has the correct header" do
-    expect(question.header).to eq("Are there more than 2 joint buyers of this property?")
+    expect(question.header).to eq("Q10 - Are there more than 2 joint buyers of this property?")
   end
 
   it "has the correct check_answer_label" do
diff --git a/spec/models/form/sales/questions/number_of_others_in_property_spec.rb b/spec/models/form/sales/questions/number_of_others_in_property_spec.rb
index 81c49770a..7e6d14a76 100644
--- a/spec/models/form/sales/questions/number_of_others_in_property_spec.rb
+++ b/spec/models/form/sales/questions/number_of_others_in_property_spec.rb
@@ -16,7 +16,7 @@ RSpec.describe Form::Sales::Questions::NumberOfOthersInProperty, type: :model do
   end
 
   it "has the correct header" do
-    expect(question.header).to eq("Besides the buyer(s), how many other people live or will live in the property?")
+    expect(question.header).to eq("Q35 - Besides the buyer(s), how many other people live or will live in the property?")
   end
 
   it "has the correct check_answer_label" do
diff --git a/spec/models/form/sales/questions/outright_ownership_type_spec.rb b/spec/models/form/sales/questions/outright_ownership_type_spec.rb
index 69b499e52..24901d6d5 100644
--- a/spec/models/form/sales/questions/outright_ownership_type_spec.rb
+++ b/spec/models/form/sales/questions/outright_ownership_type_spec.rb
@@ -16,7 +16,7 @@ RSpec.describe Form::Sales::Questions::OutrightOwnershipType, type: :model do
   end
 
   it "has the correct header" do
-    expect(question.header).to eq("What is the type of outright sale?")
+    expect(question.header).to eq("Q6 - What is the type of outright sale?")
   end
 
   it "has the correct check_answer_label" do
diff --git a/spec/models/form/sales/questions/ownership_scheme_spec.rb b/spec/models/form/sales/questions/ownership_scheme_spec.rb
index f21baeab3..5f0d5f0b3 100644
--- a/spec/models/form/sales/questions/ownership_scheme_spec.rb
+++ b/spec/models/form/sales/questions/ownership_scheme_spec.rb
@@ -16,7 +16,7 @@ RSpec.describe Form::Sales::Questions::OwnershipScheme, type: :model do
   end
 
   it "has the correct header" do
-    expect(question.header).to eq("Was this purchase made through an ownership scheme?")
+    expect(question.header).to eq("Q3 - Was this purchase made through an ownership scheme?")
   end
 
   it "has the correct check_answer_label" do
diff --git a/spec/models/form/sales/questions/person_gender_identity_spec.rb b/spec/models/form/sales/questions/person_gender_identity_spec.rb
index 0ae959e82..dd37ad1d3 100644
--- a/spec/models/form/sales/questions/person_gender_identity_spec.rb
+++ b/spec/models/form/sales/questions/person_gender_identity_spec.rb
@@ -38,7 +38,7 @@ RSpec.describe Form::Sales::Questions::PersonGenderIdentity, type: :model do
     end
 
     it "has the correct header" do
-      expect(question.header).to eq("Which of these best describes Person 2’s gender identity?")
+      expect(question.header).to eq("Q29 - Which of these best describes Person 2’s gender identity?")
     end
 
     it "has the correct check_answer_label" do
diff --git a/spec/models/form/sales/questions/postcode_spec.rb b/spec/models/form/sales/questions/postcode_spec.rb
index b46ae6898..9d07627e4 100644
--- a/spec/models/form/sales/questions/postcode_spec.rb
+++ b/spec/models/form/sales/questions/postcode_spec.rb
@@ -16,7 +16,7 @@ RSpec.describe Form::Sales::Questions::Postcode, type: :model do
   end
 
   it "has the correct header" do
-    expect(question.header).to eq("Postcode")
+    expect(question.header).to eq("Q15 - Postcode")
   end
 
   it "has the correct check_answer_label" do
diff --git a/spec/models/form/sales/questions/previous_bedrooms_spec.rb b/spec/models/form/sales/questions/previous_bedrooms_spec.rb
index 1798e23fa..f8f420d8a 100644
--- a/spec/models/form/sales/questions/previous_bedrooms_spec.rb
+++ b/spec/models/form/sales/questions/previous_bedrooms_spec.rb
@@ -16,7 +16,7 @@ RSpec.describe Form::Sales::Questions::PreviousBedrooms, type: :model do
   end
 
   it "has the correct header" do
-    expect(question.header).to eq("How many bedrooms did the property have?")
+    expect(question.header).to eq("Q85 - How many bedrooms did the property have?")
   end
 
   it "has the correct check_answer_label" do
diff --git a/spec/models/form/sales/questions/previous_postcode_known_spec.rb b/spec/models/form/sales/questions/previous_postcode_known_spec.rb
index b1d244b1e..98c66d6e3 100644
--- a/spec/models/form/sales/questions/previous_postcode_known_spec.rb
+++ b/spec/models/form/sales/questions/previous_postcode_known_spec.rb
@@ -16,7 +16,7 @@ RSpec.describe Form::Sales::Questions::PreviousPostcodeKnown, type: :model do
   end
 
   it "has the correct header" do
-    expect(question.header).to eq("Do you know the postcode of buyer 1’s last settled accommodation?")
+    expect(question.header).to eq("Q57 - Do you know the postcode of buyer 1’s last settled accommodation?")
   end
 
   it "has the correct check_answer_label" do
diff --git a/spec/models/form/sales/questions/previous_tenure_spec.rb b/spec/models/form/sales/questions/previous_tenure_spec.rb
index fde61271f..72fd45465 100644
--- a/spec/models/form/sales/questions/previous_tenure_spec.rb
+++ b/spec/models/form/sales/questions/previous_tenure_spec.rb
@@ -16,7 +16,7 @@ RSpec.describe Form::Sales::Questions::PreviousTenure, type: :model do
   end
 
   it "has the correct header" do
-    expect(question.header).to eq("What was the previous tenure of the buyer?")
+    expect(question.header).to eq("Q87 - What was the previous tenure of the buyer?")
   end
 
   it "has the correct check_answer_label" do
diff --git a/spec/models/form/sales/questions/prevloc_spec.rb b/spec/models/form/sales/questions/prevloc_spec.rb
index 5d985ba64..f5c1b5f7b 100644
--- a/spec/models/form/sales/questions/prevloc_spec.rb
+++ b/spec/models/form/sales/questions/prevloc_spec.rb
@@ -16,7 +16,7 @@ RSpec.describe Form::Sales::Questions::Prevloc, type: :model do
   end
 
   it "has the correct header" do
-    expect(question.header).to eq("Select a local authority")
+    expect(question.header).to eq("Q58 - Select a local authority")
   end
 
   it "has the correct check_answer_label" do
diff --git a/spec/models/form/sales/questions/prevown_spec.rb b/spec/models/form/sales/questions/prevown_spec.rb
index dda2b7c70..7c910bddc 100644
--- a/spec/models/form/sales/questions/prevown_spec.rb
+++ b/spec/models/form/sales/questions/prevown_spec.rb
@@ -16,7 +16,7 @@ RSpec.describe Form::Sales::Questions::Prevown, type: :model do
   end
 
   it "has the correct header" do
-    expect(question.header).to eq("Has the buyer previously owned a property?")
+    expect(question.header).to eq("Q73 - Has the buyer previously owned a property?")
   end
 
   it "has the correct check_answer_label" do
diff --git a/spec/models/form/sales/questions/prevshared_spec.rb b/spec/models/form/sales/questions/prevshared_spec.rb
index 3806b9561..1212ecf17 100644
--- a/spec/models/form/sales/questions/prevshared_spec.rb
+++ b/spec/models/form/sales/questions/prevshared_spec.rb
@@ -16,7 +16,7 @@ RSpec.describe Form::Sales::Questions::Prevshared, type: :model do
   end
 
   it "has the correct header" do
-    expect(question.header).to eq("Was the previous property a shared ownership property?")
+    expect(question.header).to eq("Q74 - Was the previous property a shared ownership property?")
   end
 
   it "has the correct check_answer_label" do
diff --git a/spec/models/form/sales/questions/property_building_type_spec.rb b/spec/models/form/sales/questions/property_building_type_spec.rb
index 9b8f94b5f..94d7cd015 100644
--- a/spec/models/form/sales/questions/property_building_type_spec.rb
+++ b/spec/models/form/sales/questions/property_building_type_spec.rb
@@ -16,7 +16,7 @@ RSpec.describe Form::Sales::Questions::PropertyBuildingType, type: :model do
   end
 
   it "has the correct header" do
-    expect(question.header).to eq("What type of building is the property?")
+    expect(question.header).to eq("Q13 - What type of building is the property?")
   end
 
   it "has the correct check_answer_label" do
diff --git a/spec/models/form/sales/questions/property_local_authority_spec.rb b/spec/models/form/sales/questions/property_local_authority_spec.rb
index 060f69bfa..50996c148 100644
--- a/spec/models/form/sales/questions/property_local_authority_spec.rb
+++ b/spec/models/form/sales/questions/property_local_authority_spec.rb
@@ -16,7 +16,7 @@ RSpec.describe Form::Sales::Questions::PropertyLocalAuthority, type: :model do
   end
 
   it "has the correct header" do
-    expect(question.header).to eq("What is the local authority of the property?")
+    expect(question.header).to eq("Q16 - What is the local authority of the property?")
   end
 
   it "has the correct check_answer_label" do
diff --git a/spec/models/form/sales/questions/property_number_of_bedrooms_spec.rb b/spec/models/form/sales/questions/property_number_of_bedrooms_spec.rb
index cad7cb004..005de358b 100644
--- a/spec/models/form/sales/questions/property_number_of_bedrooms_spec.rb
+++ b/spec/models/form/sales/questions/property_number_of_bedrooms_spec.rb
@@ -16,7 +16,7 @@ RSpec.describe Form::Sales::Questions::PropertyNumberOfBedrooms, type: :model do
   end
 
   it "has the correct header" do
-    expect(question.header).to eq("How many bedrooms does the property have?")
+    expect(question.header).to eq("Q11 - How many bedrooms does the property have?")
   end
 
   it "has the correct check_answer_label" do
diff --git a/spec/models/form/sales/questions/property_unit_type_spec.rb b/spec/models/form/sales/questions/property_unit_type_spec.rb
index 967ffe32d..a3d2d6587 100644
--- a/spec/models/form/sales/questions/property_unit_type_spec.rb
+++ b/spec/models/form/sales/questions/property_unit_type_spec.rb
@@ -16,7 +16,7 @@ RSpec.describe Form::Sales::Questions::PropertyUnitType, type: :model do
   end
 
   it "has the correct header" do
-    expect(question.header).to eq("What type of unit is the property?")
+    expect(question.header).to eq("Q12 - What type of unit is the property?")
   end
 
   it "has the correct check_answer_label" do
diff --git a/spec/models/form/sales/questions/property_wheelchair_accessible_spec.rb b/spec/models/form/sales/questions/property_wheelchair_accessible_spec.rb
index c8d7eadaf..1b6f8466a 100644
--- a/spec/models/form/sales/questions/property_wheelchair_accessible_spec.rb
+++ b/spec/models/form/sales/questions/property_wheelchair_accessible_spec.rb
@@ -16,7 +16,7 @@ RSpec.describe Form::Sales::Questions::PropertyWheelchairAccessible, type: :mode
   end
 
   it "has the correct header" do
-    expect(question.header).to eq("Is the property build or adapted to wheelchair-user standards?")
+    expect(question.header).to eq("Q17 - Is the property build or adapted to wheelchair-user standards?")
   end
 
   it "has the correct check_answer_label" do
diff --git a/spec/models/form/sales/questions/purchaser_code_spec.rb b/spec/models/form/sales/questions/purchaser_code_spec.rb
index 8f75d676b..ec1a03dd1 100644
--- a/spec/models/form/sales/questions/purchaser_code_spec.rb
+++ b/spec/models/form/sales/questions/purchaser_code_spec.rb
@@ -16,7 +16,7 @@ RSpec.describe Form::Sales::Questions::PurchaserCode, type: :model do
   end
 
   it "has the correct header" do
-    expect(question.header).to eq("What is the purchaser code?")
+    expect(question.header).to eq("Q2 - What is the purchaser code?")
   end
 
   it "has the correct hint_text" do
diff --git a/spec/models/form/sales/questions/resale_spec.rb b/spec/models/form/sales/questions/resale_spec.rb
index a52999fbb..463cafbc8 100644
--- a/spec/models/form/sales/questions/resale_spec.rb
+++ b/spec/models/form/sales/questions/resale_spec.rb
@@ -16,7 +16,7 @@ RSpec.describe Form::Sales::Questions::Resale, type: :model do
   end
 
   it "has the correct header" do
-    expect(question.header).to eq("Is this a resale?")
+    expect(question.header).to eq("Q80 - Is this a resale?")
   end
 
   it "has the correct check_answer_label" do
diff --git a/spec/models/form/sales/questions/sale_date_spec.rb b/spec/models/form/sales/questions/sale_date_spec.rb
index 0f368abbb..69870b5de 100644
--- a/spec/models/form/sales/questions/sale_date_spec.rb
+++ b/spec/models/form/sales/questions/sale_date_spec.rb
@@ -16,7 +16,7 @@ RSpec.describe Form::Sales::Questions::SaleDate, type: :model do
   end
 
   it "has the correct header" do
-    expect(question.header).to eq("What is the sale completion date?")
+    expect(question.header).to eq("Q1 - What is the sale completion date?")
   end
 
   it "has the correct check_answer_label" do
diff --git a/spec/models/form/sales/questions/savings_nk_spec.rb b/spec/models/form/sales/questions/savings_nk_spec.rb
index 519bdd8d4..0437d8c36 100644
--- a/spec/models/form/sales/questions/savings_nk_spec.rb
+++ b/spec/models/form/sales/questions/savings_nk_spec.rb
@@ -16,7 +16,7 @@ RSpec.describe Form::Sales::Questions::SavingsNk, type: :model do
   end
 
   it "has the correct header" do
-    expect(question.header).to eq("Do you know how much the buyer had in savings before they paid any deposit for the property?")
+    expect(question.header).to eq("Q72 - Do you know how much the buyer had in savings before they paid any deposit for the property?")
   end
 
   it "has the correct check_answer_label" do
diff --git a/spec/models/form/sales/questions/shared_ownership_type_spec.rb b/spec/models/form/sales/questions/shared_ownership_type_spec.rb
index c164c5794..107e3c1a8 100644
--- a/spec/models/form/sales/questions/shared_ownership_type_spec.rb
+++ b/spec/models/form/sales/questions/shared_ownership_type_spec.rb
@@ -16,7 +16,7 @@ RSpec.describe Form::Sales::Questions::SharedOwnershipType, type: :model do
   end
 
   it "has the correct header" do
-    expect(question.header).to eq("What is the type of shared ownership sale?")
+    expect(question.header).to eq("Q4 - What is the type of shared ownership sale?")
   end
 
   it "has the correct check_answer_label" do
diff --git a/spec/models/form/sales/questions/staircase_bought_spec.rb b/spec/models/form/sales/questions/staircase_bought_spec.rb
index 7b877cc26..9bdce8bdf 100644
--- a/spec/models/form/sales/questions/staircase_bought_spec.rb
+++ b/spec/models/form/sales/questions/staircase_bought_spec.rb
@@ -16,7 +16,7 @@ RSpec.describe Form::Sales::Questions::StaircaseBought, type: :model do
   end
 
   it "has the correct header" do
-    expect(question.header).to eq("What percentage of the property has been bought in this staircasing transaction?")
+    expect(question.header).to eq("Q77 - What percentage of the property has been bought in this staircasing transaction?")
   end
 
   it "has the correct check_answer_label" do
diff --git a/spec/models/form/sales/questions/staircase_owned_spec.rb b/spec/models/form/sales/questions/staircase_owned_spec.rb
index cbd577784..a9218e1aa 100644
--- a/spec/models/form/sales/questions/staircase_owned_spec.rb
+++ b/spec/models/form/sales/questions/staircase_owned_spec.rb
@@ -16,7 +16,7 @@ RSpec.describe Form::Sales::Questions::StaircaseOwned, type: :model do
   end
 
   it "has the correct header" do
-    expect(question.header).to eq("What percentage of the property does the buyer now own in total?")
+    expect(question.header).to eq("Q78 - What percentage of the property does the buyer now own in total?")
   end
 
   it "has the correct check_answer_label" do
diff --git a/spec/models/form/sales/questions/staircase_sale_spec.rb b/spec/models/form/sales/questions/staircase_sale_spec.rb
index 39927c967..d6524ae4b 100644
--- a/spec/models/form/sales/questions/staircase_sale_spec.rb
+++ b/spec/models/form/sales/questions/staircase_sale_spec.rb
@@ -16,7 +16,7 @@ RSpec.describe Form::Sales::Questions::StaircaseSale, type: :model do
   end
 
   it "has the correct header" do
-    expect(question.header).to eq("Is this transaction part of a back-to-back staircasing transaction to facilitate sale of the home on the open market?")
+    expect(question.header).to eq("Q79 - Is this transaction part of a back-to-back staircasing transaction to facilitate sale of the home on the open market?")
   end
 
   it "has the correct check_answer_label" do
diff --git a/spec/models/form/sales/questions/staircase_spec.rb b/spec/models/form/sales/questions/staircase_spec.rb
index 845e5242e..bde8de637 100644
--- a/spec/models/form/sales/questions/staircase_spec.rb
+++ b/spec/models/form/sales/questions/staircase_spec.rb
@@ -16,7 +16,7 @@ RSpec.describe Form::Sales::Questions::Staircase, type: :model do
   end
 
   it "has the correct header" do
-    expect(question.header).to eq("Is this a staircasing transaction?")
+    expect(question.header).to eq("Q76 - Is this a staircasing transaction?")
   end
 
   it "has the correct check_answer_label" do