From f2c0882dd71e41d12541ca569e0943ad1015be3c Mon Sep 17 00:00:00 2001
From: Kat <katrina@kosiak.co.uk>
Date: Thu, 27 Apr 2023 12:03:38 +0100
Subject: [PATCH] Rename attribute

---
 app/helpers/interruption_screen_helper.rb     |   2 +-
 .../pages/care_home_charges_value_check.rb    |   2 +-
 ...pregnant_household_lead_age_value_check.rb |   2 +-
 ...gnant_household_lead_hhmemb_value_check.rb |   2 +-
 ..._in_pregnant_household_lead_value_check.rb |   2 +-
 ...egnant_household_person_age_value_check.rb |   2 +-
 ...n_pregnant_household_person_value_check.rb |   2 +-
 ...range_in_pregnant_household_value_check.rb |   2 +-
 ...lead_tenant_over_retirement_value_check.rb |   2 +-
 ...ead_tenant_under_retirement_value_check.rb |   2 +-
 .../lettings/pages/max_rent_value_check.rb    |   2 +-
 .../lettings/pages/min_rent_value_check.rb    |   2 +-
 .../lettings/pages/net_income_value_check.rb  |   2 +-
 ...pregnant_household_lead_age_value_check.rb |   2 +-
 ...gnant_household_lead_hhmemb_value_check.rb |   2 +-
 ...les_pregnant_household_lead_value_check.rb |   2 +-
 ...egnant_household_person_age_value_check.rb |   2 +-
 ...s_pregnant_household_person_value_check.rb |   2 +-
 ..._females_pregnant_household_value_check.rb |   2 +-
 .../person_over_retirement_value_check.rb     |   2 +-
 .../person_under_retirement_value_check.rb    |   2 +-
 .../property_major_repairs_value_check.rb     |   2 +-
 .../lettings/pages/void_date_value_check.rb   |   2 +-
 app/models/form/page.rb                       |   4 +-
 .../sales/pages/about_price_value_check.rb    |   2 +-
 .../sales/pages/buyer1_income_value_check.rb  |   2 +-
 .../sales/pages/buyer2_income_value_check.rb  |   2 +-
 .../sales/pages/buyer_live_in_value_check.rb  |   2 +-
 .../pages/deposit_and_mortgage_value_check.rb |   2 +-
 .../form/sales/pages/deposit_value_check.rb   |   2 +-
 .../pages/discounted_sale_value_check.rb      |   2 +-
 .../pages/extra_borrowing_value_check.rb      |   2 +-
 .../form/sales/pages/grant_value_check.rb     |   2 +-
 .../form/sales/pages/handover_date_check.rb   |   2 +-
 .../sales/pages/household_wheelchair_check.rb |   2 +-
 .../pages/monthly_charges_value_check.rb      |   2 +-
 .../form/sales/pages/mortgage_value_check.rb  |   2 +-
 ...ld_persons_shared_ownership_value_check.rb |   2 +-
 .../pages/percentage_discount_value_check.rb  |   2 +-
 .../person_student_not_child_value_check.rb   |   2 +-
 .../sales/pages/retirement_value_check.rb     |   2 +-
 .../form/sales/pages/savings_value_check.rb   |   2 +-
 .../shared_ownership_deposit_value_check.rb   |   2 +-
 .../pages/staircase_bought_value_check.rb     |   2 +-
 config/forms/2022_2023.json                   | 116 +++++++++---------
 spec/fixtures/forms/2021_2022.json            |   4 +-
 .../care_home_charges_value_check_spec.rb     |   4 +-
 .../pages/max_rent_value_check_spec.rb        |   4 +-
 .../pages/min_rent_value_check_spec.rb        |   4 +-
 .../pages/about_price_value_check_spec.rb     |   4 +-
 .../pages/buyer1_income_value_check_spec.rb   |   4 +-
 .../pages/buyer_live_in_value_check_spec.rb   |   8 +-
 .../sales/pages/deposit_value_check_spec.rb   |   4 +-
 .../pages/discounted_sale_value_check_spec.rb |   4 +-
 .../sales/pages/handover_date_check_spec.rb   |   4 +-
 .../pages/household_wheelchair_check_spec.rb  |   4 +-
 .../pages/monthly_charges_value_check_spec.rb |   4 +-
 .../sales/pages/mortgage_value_check_spec.rb  |   4 +-
 ...rsons_shared_ownership_value_check_spec.rb |   4 +-
 .../percentage_discount_value_check_spec.rb   |   4 +-
 ...rson_student_not_child_value_check_spec.rb |  24 ++--
 .../pages/retirement_value_check_spec.rb      |  24 ++--
 .../sales/pages/savings_value_check_spec.rb   |   4 +-
 ...ared_ownership_deposit_value_check_spec.rb |   4 +-
 64 files changed, 163 insertions(+), 163 deletions(-)

diff --git a/app/helpers/interruption_screen_helper.rb b/app/helpers/interruption_screen_helper.rb
index e3ad5ed4b..fc75f6f59 100644
--- a/app/helpers/interruption_screen_helper.rb
+++ b/app/helpers/interruption_screen_helper.rb
@@ -30,7 +30,7 @@ module InterruptionScreenHelper
   end
 
   def soft_validation_affected_questions(question, log)
-    question.page.affected_question_ids.map { |question_id| log.form.get_question(question_id, log) }.compact
+    question.page.interruption_screen_question_ids.map { |question_id| log.form.get_question(question_id, log) }.compact
   end
 
 private
diff --git a/app/models/form/lettings/pages/care_home_charges_value_check.rb b/app/models/form/lettings/pages/care_home_charges_value_check.rb
index 080517781..2cf253bf6 100644
--- a/app/models/form/lettings/pages/care_home_charges_value_check.rb
+++ b/app/models/form/lettings/pages/care_home_charges_value_check.rb
@@ -13,7 +13,7 @@ class Form::Lettings::Pages::CareHomeChargesValueCheck < ::Form::Page
     @questions ||= [Form::Lettings::Questions::CareHomeChargesValueCheck.new(nil, nil, self)]
   end
 
-  def affected_question_ids
+  def interruption_screen_question_ids
     %w[chcharge is_carehome]
   end
 end
diff --git a/app/models/form/lettings/pages/females_in_soft_age_range_in_pregnant_household_lead_age_value_check.rb b/app/models/form/lettings/pages/females_in_soft_age_range_in_pregnant_household_lead_age_value_check.rb
index 03d8e328b..a7046e88b 100644
--- a/app/models/form/lettings/pages/females_in_soft_age_range_in_pregnant_household_lead_age_value_check.rb
+++ b/app/models/form/lettings/pages/females_in_soft_age_range_in_pregnant_household_lead_age_value_check.rb
@@ -17,7 +17,7 @@ class Form::Lettings::Pages::FemalesInSoftAgeRangeInPregnantHouseholdLeadAgeValu
     @questions ||= [Form::Lettings::Questions::PregnancyValueCheck.new(nil, nil, self)]
   end
 
-  def affected_question_ids
+  def interruption_screen_question_ids
     %w[preg_occ sex1 sex2 sex3 sex4 sex5 sex6 sex7 sex8 age1 age2 age3 age4 age5 age6 age7 age8]
   end
 end
diff --git a/app/models/form/lettings/pages/females_in_soft_age_range_in_pregnant_household_lead_hhmemb_value_check.rb b/app/models/form/lettings/pages/females_in_soft_age_range_in_pregnant_household_lead_hhmemb_value_check.rb
index 44405158e..b4915a92b 100644
--- a/app/models/form/lettings/pages/females_in_soft_age_range_in_pregnant_household_lead_hhmemb_value_check.rb
+++ b/app/models/form/lettings/pages/females_in_soft_age_range_in_pregnant_household_lead_hhmemb_value_check.rb
@@ -17,7 +17,7 @@ class Form::Lettings::Pages::FemalesInSoftAgeRangeInPregnantHouseholdLeadHhmembV
     @questions ||= [Form::Lettings::Questions::PregnancyValueCheck.new(nil, nil, self)]
   end
 
-  def affected_question_ids
+  def interruption_screen_question_ids
     %w[preg_occ sex1 sex2 sex3 sex4 sex5 sex6 sex7 sex8 age1 age2 age3 age4 age5 age6 age7 age8]
   end
 end
diff --git a/app/models/form/lettings/pages/females_in_soft_age_range_in_pregnant_household_lead_value_check.rb b/app/models/form/lettings/pages/females_in_soft_age_range_in_pregnant_household_lead_value_check.rb
index 326c40a97..291fb92b6 100644
--- a/app/models/form/lettings/pages/females_in_soft_age_range_in_pregnant_household_lead_value_check.rb
+++ b/app/models/form/lettings/pages/females_in_soft_age_range_in_pregnant_household_lead_value_check.rb
@@ -17,7 +17,7 @@ class Form::Lettings::Pages::FemalesInSoftAgeRangeInPregnantHouseholdLeadValueCh
     @questions ||= [Form::Lettings::Questions::PregnancyValueCheck.new(nil, nil, self)]
   end
 
-  def affected_question_ids
+  def interruption_screen_question_ids
     %w[preg_occ sex1 sex2 sex3 sex4 sex5 sex6 sex7 sex8 age1 age2 age3 age4 age5 age6 age7 age8]
   end
 end
diff --git a/app/models/form/lettings/pages/females_in_soft_age_range_in_pregnant_household_person_age_value_check.rb b/app/models/form/lettings/pages/females_in_soft_age_range_in_pregnant_household_person_age_value_check.rb
index 28b67d9ba..419bcc81b 100644
--- a/app/models/form/lettings/pages/females_in_soft_age_range_in_pregnant_household_person_age_value_check.rb
+++ b/app/models/form/lettings/pages/females_in_soft_age_range_in_pregnant_household_person_age_value_check.rb
@@ -34,7 +34,7 @@ class Form::Lettings::Pages::FemalesInSoftAgeRangeInPregnantHouseholdPersonAgeVa
     @questions ||= [Form::Lettings::Questions::PregnancyValueCheck.new(nil, nil, self)]
   end
 
-  def affected_question_ids
+  def interruption_screen_question_ids
     %w[preg_occ sex1 sex2 sex3 sex4 sex5 sex6 sex7 sex8 age1 age2 age3 age4 age5 age6 age7 age8]
   end
 end
diff --git a/app/models/form/lettings/pages/females_in_soft_age_range_in_pregnant_household_person_value_check.rb b/app/models/form/lettings/pages/females_in_soft_age_range_in_pregnant_household_person_value_check.rb
index 7779a7339..75b1b0d35 100644
--- a/app/models/form/lettings/pages/females_in_soft_age_range_in_pregnant_household_person_value_check.rb
+++ b/app/models/form/lettings/pages/females_in_soft_age_range_in_pregnant_household_person_value_check.rb
@@ -34,7 +34,7 @@ class Form::Lettings::Pages::FemalesInSoftAgeRangeInPregnantHouseholdPersonValue
     @questions ||= [Form::Lettings::Questions::PregnancyValueCheck.new(nil, nil, self)]
   end
 
-  def affected_question_ids
+  def interruption_screen_question_ids
     %w[preg_occ sex1 sex2 sex3 sex4 sex5 sex6 sex7 sex8 age1 age2 age3 age4 age5 age6 age7 age8]
   end
 end
diff --git a/app/models/form/lettings/pages/females_in_soft_age_range_in_pregnant_household_value_check.rb b/app/models/form/lettings/pages/females_in_soft_age_range_in_pregnant_household_value_check.rb
index 08df765a1..9355c24e7 100644
--- a/app/models/form/lettings/pages/females_in_soft_age_range_in_pregnant_household_value_check.rb
+++ b/app/models/form/lettings/pages/females_in_soft_age_range_in_pregnant_household_value_check.rb
@@ -17,7 +17,7 @@ class Form::Lettings::Pages::FemalesInSoftAgeRangeInPregnantHouseholdValueCheck
     @questions ||= [Form::Lettings::Questions::PregnancyValueCheck.new(nil, nil, self)]
   end
 
-  def affected_question_ids
+  def interruption_screen_question_ids
     %w[preg_occ sex1 sex2 sex3 sex4 sex5 sex6 sex7 sex8 age1 age2 age3 age4 age5 age6 age7 age8]
   end
 end
diff --git a/app/models/form/lettings/pages/lead_tenant_over_retirement_value_check.rb b/app/models/form/lettings/pages/lead_tenant_over_retirement_value_check.rb
index 8859b72d3..d2651d83d 100644
--- a/app/models/form/lettings/pages/lead_tenant_over_retirement_value_check.rb
+++ b/app/models/form/lettings/pages/lead_tenant_over_retirement_value_check.rb
@@ -30,7 +30,7 @@ class Form::Lettings::Pages::LeadTenantOverRetirementValueCheck < ::Form::Page
     @questions ||= [Form::Lettings::Questions::RetirementValueCheck.new(nil, nil, self)]
   end
 
-  def affected_question_ids
+  def interruption_screen_question_ids
     %w[ecstat1 sex1 age1]
   end
 end
diff --git a/app/models/form/lettings/pages/lead_tenant_under_retirement_value_check.rb b/app/models/form/lettings/pages/lead_tenant_under_retirement_value_check.rb
index 6641bb621..245eb3d48 100644
--- a/app/models/form/lettings/pages/lead_tenant_under_retirement_value_check.rb
+++ b/app/models/form/lettings/pages/lead_tenant_under_retirement_value_check.rb
@@ -30,7 +30,7 @@ class Form::Lettings::Pages::LeadTenantUnderRetirementValueCheck < ::Form::Page
     @questions ||= [Form::Lettings::Questions::NoRetirementValueCheck.new(nil, nil, self)]
   end
 
-  def affected_question_ids
+  def interruption_screen_question_ids
     %w[ecstat1 sex1 age1]
   end
 end
diff --git a/app/models/form/lettings/pages/max_rent_value_check.rb b/app/models/form/lettings/pages/max_rent_value_check.rb
index ab5f76c44..dcda23c43 100644
--- a/app/models/form/lettings/pages/max_rent_value_check.rb
+++ b/app/models/form/lettings/pages/max_rent_value_check.rb
@@ -29,7 +29,7 @@ class Form::Lettings::Pages::MaxRentValueCheck < ::Form::Page
     @questions ||= [Form::Lettings::Questions::RentValueCheck.new(nil, nil, self, check_answers_card_number: @check_answers_card_number)]
   end
 
-  def affected_question_ids
+  def interruption_screen_question_ids
     %w[brent startdate la beds rent_type needstype]
   end
 end
diff --git a/app/models/form/lettings/pages/min_rent_value_check.rb b/app/models/form/lettings/pages/min_rent_value_check.rb
index 0808b2149..245158a08 100644
--- a/app/models/form/lettings/pages/min_rent_value_check.rb
+++ b/app/models/form/lettings/pages/min_rent_value_check.rb
@@ -25,7 +25,7 @@ class Form::Lettings::Pages::MinRentValueCheck < ::Form::Page
     @questions ||= [Form::Lettings::Questions::RentValueCheck.new(nil, nil, self, check_answers_card_number: @check_answers_card_number)]
   end
 
-  def affected_question_ids
+  def interruption_screen_question_ids
     %w[brent startdate la beds rent_type needstype]
   end
 end
diff --git a/app/models/form/lettings/pages/net_income_value_check.rb b/app/models/form/lettings/pages/net_income_value_check.rb
index 50c0becae..7507026cc 100644
--- a/app/models/form/lettings/pages/net_income_value_check.rb
+++ b/app/models/form/lettings/pages/net_income_value_check.rb
@@ -25,7 +25,7 @@ class Form::Lettings::Pages::NetIncomeValueCheck < ::Form::Page
     @questions ||= [Form::Lettings::Questions::NetIncomeValueCheck.new(nil, nil, self)]
   end
 
-  def affected_question_ids
+  def interruption_screen_question_ids
     %w[incfreq earnings ecstat1]
   end
 end
diff --git a/app/models/form/lettings/pages/no_females_pregnant_household_lead_age_value_check.rb b/app/models/form/lettings/pages/no_females_pregnant_household_lead_age_value_check.rb
index 4f9fb982b..570a1bc5a 100644
--- a/app/models/form/lettings/pages/no_females_pregnant_household_lead_age_value_check.rb
+++ b/app/models/form/lettings/pages/no_females_pregnant_household_lead_age_value_check.rb
@@ -17,7 +17,7 @@ class Form::Lettings::Pages::NoFemalesPregnantHouseholdLeadAgeValueCheck < ::For
     @questions ||= [Form::Lettings::Questions::PregnancyValueCheck.new(nil, nil, self)]
   end
 
-  def affected_question_ids
+  def interruption_screen_question_ids
     %w[preg_occ sex1 sex2 sex3 sex4 sex5 sex6 sex7 sex8]
   end
 end
diff --git a/app/models/form/lettings/pages/no_females_pregnant_household_lead_hhmemb_value_check.rb b/app/models/form/lettings/pages/no_females_pregnant_household_lead_hhmemb_value_check.rb
index 3a1fe792b..ea90bd6ff 100644
--- a/app/models/form/lettings/pages/no_females_pregnant_household_lead_hhmemb_value_check.rb
+++ b/app/models/form/lettings/pages/no_females_pregnant_household_lead_hhmemb_value_check.rb
@@ -17,7 +17,7 @@ class Form::Lettings::Pages::NoFemalesPregnantHouseholdLeadHhmembValueCheck < ::
     @questions ||= [Form::Lettings::Questions::PregnancyValueCheck.new(nil, nil, self)]
   end
 
-  def affected_question_ids
+  def interruption_screen_question_ids
     %w[preg_occ sex1 sex2 sex3 sex4 sex5 sex6 sex7 sex8]
   end
 end
diff --git a/app/models/form/lettings/pages/no_females_pregnant_household_lead_value_check.rb b/app/models/form/lettings/pages/no_females_pregnant_household_lead_value_check.rb
index 54346d9ad..4d0fc0c2c 100644
--- a/app/models/form/lettings/pages/no_females_pregnant_household_lead_value_check.rb
+++ b/app/models/form/lettings/pages/no_females_pregnant_household_lead_value_check.rb
@@ -17,7 +17,7 @@ class Form::Lettings::Pages::NoFemalesPregnantHouseholdLeadValueCheck < ::Form::
     @questions ||= [Form::Lettings::Questions::PregnancyValueCheck.new(nil, nil, self)]
   end
 
-  def affected_question_ids
+  def interruption_screen_question_ids
     %w[preg_occ sex1 sex2 sex3 sex4 sex5 sex6 sex7 sex8]
   end
 end
diff --git a/app/models/form/lettings/pages/no_females_pregnant_household_person_age_value_check.rb b/app/models/form/lettings/pages/no_females_pregnant_household_person_age_value_check.rb
index 7e67ad7b0..a58c9bc60 100644
--- a/app/models/form/lettings/pages/no_females_pregnant_household_person_age_value_check.rb
+++ b/app/models/form/lettings/pages/no_females_pregnant_household_person_age_value_check.rb
@@ -17,7 +17,7 @@ class Form::Lettings::Pages::NoFemalesPregnantHouseholdPersonAgeValueCheck < ::F
     @questions ||= [Form::Lettings::Questions::PregnancyValueCheck.new(nil, nil, self)]
   end
 
-  def affected_question_ids
+  def interruption_screen_question_ids
     %w[preg_occ sex1 sex2 sex3 sex4 sex5 sex6 sex7 sex8]
   end
 end
diff --git a/app/models/form/lettings/pages/no_females_pregnant_household_person_value_check.rb b/app/models/form/lettings/pages/no_females_pregnant_household_person_value_check.rb
index 6765df416..ede6e61b4 100644
--- a/app/models/form/lettings/pages/no_females_pregnant_household_person_value_check.rb
+++ b/app/models/form/lettings/pages/no_females_pregnant_household_person_value_check.rb
@@ -17,7 +17,7 @@ class Form::Lettings::Pages::NoFemalesPregnantHouseholdPersonValueCheck < ::Form
     @questions ||= [Form::Lettings::Questions::PregnancyValueCheck.new(nil, nil, self)]
   end
 
-  def affected_question_ids
+  def interruption_screen_question_ids
     %w[preg_occ sex1 sex2 sex3 sex4 sex5 sex6 sex7 sex8]
   end
 end
diff --git a/app/models/form/lettings/pages/no_females_pregnant_household_value_check.rb b/app/models/form/lettings/pages/no_females_pregnant_household_value_check.rb
index 85abaf6ab..23aaec180 100644
--- a/app/models/form/lettings/pages/no_females_pregnant_household_value_check.rb
+++ b/app/models/form/lettings/pages/no_females_pregnant_household_value_check.rb
@@ -17,7 +17,7 @@ class Form::Lettings::Pages::NoFemalesPregnantHouseholdValueCheck < ::Form::Page
     @questions ||= [Form::Lettings::Questions::PregnancyValueCheck.new(nil, nil, self)]
   end
 
-  def affected_question_ids
+  def interruption_screen_question_ids
     %w[preg_occ sex1 sex2 sex3 sex4 sex5 sex6 sex7 sex8]
   end
 end
diff --git a/app/models/form/lettings/pages/person_over_retirement_value_check.rb b/app/models/form/lettings/pages/person_over_retirement_value_check.rb
index 8e64cf556..4153ff94e 100644
--- a/app/models/form/lettings/pages/person_over_retirement_value_check.rb
+++ b/app/models/form/lettings/pages/person_over_retirement_value_check.rb
@@ -35,7 +35,7 @@ class Form::Lettings::Pages::PersonOverRetirementValueCheck < ::Form::Page
     @questions ||= [Form::Lettings::Questions::RetirementValueCheck.new(nil, nil, self)]
   end
 
-  def affected_question_ids
+  def interruption_screen_question_ids
     ["ecstat#{@person_index}", "sex#{@person_index}", "age#{@person_index}"]
   end
 end
diff --git a/app/models/form/lettings/pages/person_under_retirement_value_check.rb b/app/models/form/lettings/pages/person_under_retirement_value_check.rb
index 841152f7e..616aefab0 100644
--- a/app/models/form/lettings/pages/person_under_retirement_value_check.rb
+++ b/app/models/form/lettings/pages/person_under_retirement_value_check.rb
@@ -35,7 +35,7 @@ class Form::Lettings::Pages::PersonUnderRetirementValueCheck < ::Form::Page
     @questions ||= [Form::Lettings::Questions::NoRetirementValueCheck.new(nil, nil, self)]
   end
 
-  def affected_question_ids
+  def interruption_screen_question_ids
     ["ecstat#{@person_index}", "sex#{@person_index}", "age#{@person_index}"]
   end
 end
diff --git a/app/models/form/lettings/pages/property_major_repairs_value_check.rb b/app/models/form/lettings/pages/property_major_repairs_value_check.rb
index e084ebee0..bd20bfe5a 100644
--- a/app/models/form/lettings/pages/property_major_repairs_value_check.rb
+++ b/app/models/form/lettings/pages/property_major_repairs_value_check.rb
@@ -11,7 +11,7 @@ class Form::Lettings::Pages::PropertyMajorRepairsValueCheck < ::Form::Page
     @questions ||= [Form::Lettings::Questions::MajorRepairsDateValueCheck.new(nil, nil, self)]
   end
 
-  def affected_question_ids
+  def interruption_screen_question_ids
     %w[mrcdate startdate]
   end
 end
diff --git a/app/models/form/lettings/pages/void_date_value_check.rb b/app/models/form/lettings/pages/void_date_value_check.rb
index d4a2548b1..77c3f7b04 100644
--- a/app/models/form/lettings/pages/void_date_value_check.rb
+++ b/app/models/form/lettings/pages/void_date_value_check.rb
@@ -11,7 +11,7 @@ class Form::Lettings::Pages::VoidDateValueCheck < ::Form::Page
     @questions ||= [Form::Lettings::Questions::VoidDateValueCheck.new(nil, nil, self)]
   end
 
-  def affected_question_ids
+  def interruption_screen_question_ids
     %w[voiddate startdate]
   end
 end
diff --git a/app/models/form/page.rb b/app/models/form/page.rb
index 3f91b920f..498c69d7b 100644
--- a/app/models/form/page.rb
+++ b/app/models/form/page.rb
@@ -1,7 +1,7 @@
 class Form::Page
   attr_accessor :id, :header, :header_partial, :description, :questions, :depends_on, :title_text,
                 :informative_text, :subsection, :hide_subsection_label, :next_unresolved_page_id,
-                :skip_text, :affected_question_ids
+                :skip_text, :interruption_screen_question_ids
 
   def initialize(id, hsh, subsection)
     @id = id
@@ -17,7 +17,7 @@ class Form::Page
       @hide_subsection_label = hsh["hide_subsection_label"]
       @next_unresolved_page_id = hsh["next_unresolved_page_id"]
       @skip_text = hsh["skip_text"]
-      @affected_question_ids = hsh["affected_question_ids"] || []
+      @interruption_screen_question_ids = hsh["interruption_screen_question_ids"] || []
     end
   end
 
diff --git a/app/models/form/sales/pages/about_price_value_check.rb b/app/models/form/sales/pages/about_price_value_check.rb
index b10160db1..c7150773d 100644
--- a/app/models/form/sales/pages/about_price_value_check.rb
+++ b/app/models/form/sales/pages/about_price_value_check.rb
@@ -38,7 +38,7 @@ class Form::Sales::Pages::AboutPriceValueCheck < ::Form::Page
     ]
   end
 
-  def affected_question_ids
+  def interruption_screen_question_ids
     %w[value beds la]
   end
 end
diff --git a/app/models/form/sales/pages/buyer1_income_value_check.rb b/app/models/form/sales/pages/buyer1_income_value_check.rb
index 3c6a84a01..776debc75 100644
--- a/app/models/form/sales/pages/buyer1_income_value_check.rb
+++ b/app/models/form/sales/pages/buyer1_income_value_check.rb
@@ -30,7 +30,7 @@ class Form::Sales::Pages::Buyer1IncomeValueCheck < ::Form::Page
     ]
   end
 
-  def affected_question_ids
+  def interruption_screen_question_ids
     %w[ecstat1 income1]
   end
 end
diff --git a/app/models/form/sales/pages/buyer2_income_value_check.rb b/app/models/form/sales/pages/buyer2_income_value_check.rb
index 17f0c48cc..2a3b389c7 100644
--- a/app/models/form/sales/pages/buyer2_income_value_check.rb
+++ b/app/models/form/sales/pages/buyer2_income_value_check.rb
@@ -33,7 +33,7 @@ class Form::Sales::Pages::Buyer2IncomeValueCheck < ::Form::Page
     ]
   end
 
-  def affected_question_ids
+  def interruption_screen_question_ids
     %w[ecstat2 income2]
   end
 end
diff --git a/app/models/form/sales/pages/buyer_live_in_value_check.rb b/app/models/form/sales/pages/buyer_live_in_value_check.rb
index a086852ce..dae6beb78 100644
--- a/app/models/form/sales/pages/buyer_live_in_value_check.rb
+++ b/app/models/form/sales/pages/buyer_live_in_value_check.rb
@@ -19,7 +19,7 @@ class Form::Sales::Pages::BuyerLiveInValueCheck < Form::Sales::Pages::Person
     ]
   end
 
-  def affected_question_ids
+  def interruption_screen_question_ids
     ["ownershipsch", "buy#{@person_index}livein"]
   end
 end
diff --git a/app/models/form/sales/pages/deposit_and_mortgage_value_check.rb b/app/models/form/sales/pages/deposit_and_mortgage_value_check.rb
index 15a03edd8..95e9c9dd7 100644
--- a/app/models/form/sales/pages/deposit_and_mortgage_value_check.rb
+++ b/app/models/form/sales/pages/deposit_and_mortgage_value_check.rb
@@ -15,7 +15,7 @@ class Form::Sales::Pages::DepositAndMortgageValueCheck < ::Form::Page
     ]
   end
 
-  def affected_question_ids
+  def interruption_screen_question_ids
     %w[mortgage deposit value discount]
   end
 end
diff --git a/app/models/form/sales/pages/deposit_value_check.rb b/app/models/form/sales/pages/deposit_value_check.rb
index a4d5e8412..e8c5eb948 100644
--- a/app/models/form/sales/pages/deposit_value_check.rb
+++ b/app/models/form/sales/pages/deposit_value_check.rb
@@ -18,7 +18,7 @@ class Form::Sales::Pages::DepositValueCheck < ::Form::Page
     ]
   end
 
-  def affected_question_ids
+  def interruption_screen_question_ids
     %w[savings deposit]
   end
 end
diff --git a/app/models/form/sales/pages/discounted_sale_value_check.rb b/app/models/form/sales/pages/discounted_sale_value_check.rb
index c0ea440bd..dcb820e49 100644
--- a/app/models/form/sales/pages/discounted_sale_value_check.rb
+++ b/app/models/form/sales/pages/discounted_sale_value_check.rb
@@ -36,7 +36,7 @@ class Form::Sales::Pages::DiscountedSaleValueCheck < ::Form::Page
     ]
   end
 
-  def affected_question_ids
+  def interruption_screen_question_ids
     %w[value deposit ownershipsch mortgage mortgageused discount grant type]
   end
 end
diff --git a/app/models/form/sales/pages/extra_borrowing_value_check.rb b/app/models/form/sales/pages/extra_borrowing_value_check.rb
index ce8daeda8..d0e1bf089 100644
--- a/app/models/form/sales/pages/extra_borrowing_value_check.rb
+++ b/app/models/form/sales/pages/extra_borrowing_value_check.rb
@@ -18,7 +18,7 @@ class Form::Sales::Pages::ExtraBorrowingValueCheck < Form::Page
     ]
   end
 
-  def affected_question_ids
+  def interruption_screen_question_ids
     %w[extrabor mortgage deposit value discount]
   end
 end
diff --git a/app/models/form/sales/pages/grant_value_check.rb b/app/models/form/sales/pages/grant_value_check.rb
index a996872be..c3633201a 100644
--- a/app/models/form/sales/pages/grant_value_check.rb
+++ b/app/models/form/sales/pages/grant_value_check.rb
@@ -17,7 +17,7 @@ class Form::Sales::Pages::GrantValueCheck < ::Form::Page
     ]
   end
 
-  def affected_question_ids
+  def interruption_screen_question_ids
     %w[grant]
   end
 end
diff --git a/app/models/form/sales/pages/handover_date_check.rb b/app/models/form/sales/pages/handover_date_check.rb
index ee2736ae0..2a3bfdbf3 100644
--- a/app/models/form/sales/pages/handover_date_check.rb
+++ b/app/models/form/sales/pages/handover_date_check.rb
@@ -17,7 +17,7 @@ class Form::Sales::Pages::HandoverDateCheck < ::Form::Page
     ]
   end
 
-  def affected_question_ids
+  def interruption_screen_question_ids
     %w[hodate saledate]
   end
 end
diff --git a/app/models/form/sales/pages/household_wheelchair_check.rb b/app/models/form/sales/pages/household_wheelchair_check.rb
index a4bb95f33..72b78cc2b 100644
--- a/app/models/form/sales/pages/household_wheelchair_check.rb
+++ b/app/models/form/sales/pages/household_wheelchair_check.rb
@@ -16,7 +16,7 @@ class Form::Sales::Pages::HouseholdWheelchairCheck < ::Form::Page
     ]
   end
 
-  def affected_question_ids
+  def interruption_screen_question_ids
     %w[disabled wheel]
   end
 end
diff --git a/app/models/form/sales/pages/monthly_charges_value_check.rb b/app/models/form/sales/pages/monthly_charges_value_check.rb
index 140eb99f4..76fb7e279 100644
--- a/app/models/form/sales/pages/monthly_charges_value_check.rb
+++ b/app/models/form/sales/pages/monthly_charges_value_check.rb
@@ -19,7 +19,7 @@ class Form::Sales::Pages::MonthlyChargesValueCheck < ::Form::Page
     ]
   end
 
-  def affected_question_ids
+  def interruption_screen_question_ids
     %w[type mscharge proptype]
   end
 end
diff --git a/app/models/form/sales/pages/mortgage_value_check.rb b/app/models/form/sales/pages/mortgage_value_check.rb
index cbb9d8ccc..96bb4a22b 100644
--- a/app/models/form/sales/pages/mortgage_value_check.rb
+++ b/app/models/form/sales/pages/mortgage_value_check.rb
@@ -30,7 +30,7 @@ class Form::Sales::Pages::MortgageValueCheck < ::Form::Page
     end
   end
 
-  def affected_question_ids
+  def interruption_screen_question_ids
     %w[mortgage inc1mort inc2mort jointpur income1 income2 inc1mort inc2mort]
   end
 end
diff --git a/app/models/form/sales/pages/old_persons_shared_ownership_value_check.rb b/app/models/form/sales/pages/old_persons_shared_ownership_value_check.rb
index 658cfdfa1..30e40f90a 100644
--- a/app/models/form/sales/pages/old_persons_shared_ownership_value_check.rb
+++ b/app/models/form/sales/pages/old_persons_shared_ownership_value_check.rb
@@ -19,7 +19,7 @@ class Form::Sales::Pages::OldPersonsSharedOwnershipValueCheck < ::Form::Page
     ]
   end
 
-  def affected_question_ids
+  def interruption_screen_question_ids
     %w[type jointpur age1 age2]
   end
 end
diff --git a/app/models/form/sales/pages/percentage_discount_value_check.rb b/app/models/form/sales/pages/percentage_discount_value_check.rb
index eefded5e7..ec288a71b 100644
--- a/app/models/form/sales/pages/percentage_discount_value_check.rb
+++ b/app/models/form/sales/pages/percentage_discount_value_check.rb
@@ -13,7 +13,7 @@ class Form::Sales::Pages::PercentageDiscountValueCheck < ::Form::Page
     @questions ||= [Form::Sales::Questions::PercentageDiscountValueCheck.new(nil, nil, self)]
   end
 
-  def affected_question_ids
+  def interruption_screen_question_ids
     %w[discount proptype]
   end
 end
diff --git a/app/models/form/sales/pages/person_student_not_child_value_check.rb b/app/models/form/sales/pages/person_student_not_child_value_check.rb
index be1afa809..02f6d8b73 100644
--- a/app/models/form/sales/pages/person_student_not_child_value_check.rb
+++ b/app/models/form/sales/pages/person_student_not_child_value_check.rb
@@ -19,7 +19,7 @@ class Form::Sales::Pages::PersonStudentNotChildValueCheck < Form::Sales::Pages::
     ]
   end
 
-  def affected_question_ids
+  def interruption_screen_question_ids
     ["relat#{@person_index}", "exstat#{@person_index}", "age#{@person_index}"]
   end
 end
diff --git a/app/models/form/sales/pages/retirement_value_check.rb b/app/models/form/sales/pages/retirement_value_check.rb
index e11e15be1..d464752b2 100644
--- a/app/models/form/sales/pages/retirement_value_check.rb
+++ b/app/models/form/sales/pages/retirement_value_check.rb
@@ -40,7 +40,7 @@ class Form::Sales::Pages::RetirementValueCheck < Form::Sales::Pages::Person
     ]
   end
 
-  def affected_question_ids
+  def interruption_screen_question_ids
     ["age#{@person_index}", "exstat#{@person_index}", "sex#{@person_index}"]
   end
 end
diff --git a/app/models/form/sales/pages/savings_value_check.rb b/app/models/form/sales/pages/savings_value_check.rb
index c31855eb5..c4e7620b3 100644
--- a/app/models/form/sales/pages/savings_value_check.rb
+++ b/app/models/form/sales/pages/savings_value_check.rb
@@ -18,7 +18,7 @@ class Form::Sales::Pages::SavingsValueCheck < ::Form::Page
     ]
   end
 
-  def affected_question_ids
+  def interruption_screen_question_ids
     %w[savings]
   end
 end
diff --git a/app/models/form/sales/pages/shared_ownership_deposit_value_check.rb b/app/models/form/sales/pages/shared_ownership_deposit_value_check.rb
index 45f57560a..4d720c1d8 100644
--- a/app/models/form/sales/pages/shared_ownership_deposit_value_check.rb
+++ b/app/models/form/sales/pages/shared_ownership_deposit_value_check.rb
@@ -25,7 +25,7 @@ class Form::Sales::Pages::SharedOwnershipDepositValueCheck < ::Form::Page
     ]
   end
 
-  def affected_question_ids
+  def interruption_screen_question_ids
     %w[mortgage mortgageused cashdis type deposit value equity]
   end
 end
diff --git a/app/models/form/sales/pages/staircase_bought_value_check.rb b/app/models/form/sales/pages/staircase_bought_value_check.rb
index 2043b7277..80d5a3af7 100644
--- a/app/models/form/sales/pages/staircase_bought_value_check.rb
+++ b/app/models/form/sales/pages/staircase_bought_value_check.rb
@@ -25,7 +25,7 @@ class Form::Sales::Pages::StaircaseBoughtValueCheck < ::Form::Page
     ]
   end
 
-  def affected_question_ids
+  def interruption_screen_question_ids
     %w[stairbought]
   end
 end
diff --git a/config/forms/2022_2023.json b/config/forms/2022_2023.json
index 5e598b32a..b979ff960 100644
--- a/config/forms/2022_2023.json
+++ b/config/forms/2022_2023.json
@@ -815,7 +815,7 @@
                   }
                 }
               },
-              "affected_question_ids": ["voiddate", "startdate"]
+              "interruption_screen_question_ids": ["voiddate", "startdate"]
             },
             "property_major_repairs": {
               "header": "",
@@ -925,7 +925,7 @@
                   }
                 }
               },
-              "affected_question_ids": ["mrcdate", "startdate"]
+              "interruption_screen_question_ids": ["mrcdate", "startdate"]
             }
           },
           "displayed_in_tasklist": [
@@ -1240,7 +1240,7 @@
                   }
                 }
               },
-              "affected_question_ids": ["preg_occ", "sex1", "sex2", "sex3", "sex4", "sex5", "sex6", "sex7", "sex8"]
+              "interruption_screen_question_ids": ["preg_occ", "sex1", "sex2", "sex3", "sex4", "sex5", "sex6", "sex7", "sex8"]
             },
             "females_in_soft_age_range_in_pregnant_household_lead_hhmemb_value_check": {
               "depends_on": [
@@ -1284,7 +1284,7 @@
                   }
                 }
               },
-              "affected_question_ids": ["preg_occ", "sex1", "sex2", "sex3", "sex4", "sex5", "sex6", "sex7", "sex8", "age1", "age2", "age3", "age4", "age5", "age6", "age7", "age8"]
+              "interruption_screen_question_ids": ["preg_occ", "sex1", "sex2", "sex3", "sex4", "sex5", "sex6", "sex7", "sex8", "age1", "age2", "age3", "age4", "age5", "age6", "age7", "age8"]
             },
             "lead_tenant_age": {
               "header": "",
@@ -1384,7 +1384,7 @@
                   }
                 }
               },
-              "affected_question_ids": ["preg_occ", "sex1", "sex2", "sex3", "sex4", "sex5", "sex6", "sex7", "sex8"]
+              "interruption_screen_question_ids": ["preg_occ", "sex1", "sex2", "sex3", "sex4", "sex5", "sex6", "sex7", "sex8"]
             },
             "females_in_soft_age_range_in_pregnant_household_lead_age_value_check": {
               "depends_on": [
@@ -1428,7 +1428,7 @@
                   }
                 }
               },
-              "affected_question_ids": ["preg_occ", "sex1", "sex2", "sex3", "sex4", "sex5", "sex6", "sex7", "sex8", "age1", "age2", "age3", "age4", "age5", "age6", "age7", "age8"]
+              "interruption_screen_question_ids": ["preg_occ", "sex1", "sex2", "sex3", "sex4", "sex5", "sex6", "sex7", "sex8", "age1", "age2", "age3", "age4", "age5", "age6", "age7", "age8"]
             },
             "lead_tenant_gender_identity": {
               "header": "",
@@ -1507,7 +1507,7 @@
                   }
                 }
               },
-              "affected_question_ids": ["preg_occ", "sex1", "sex2", "sex3", "sex4", "sex5", "sex6", "sex7", "sex8"]
+              "interruption_screen_question_ids": ["preg_occ", "sex1", "sex2", "sex3", "sex4", "sex5", "sex6", "sex7", "sex8"]
             },
             "females_in_soft_age_range_in_pregnant_household_lead_value_check": {
               "depends_on": [
@@ -1551,7 +1551,7 @@
                   }
                 }
               },
-              "affected_question_ids": ["preg_occ", "sex1", "sex2", "sex3", "sex4", "sex5", "sex6", "sex7", "sex8", "age1", "age2", "age3", "age4", "age5", "age6", "age7", "age8"]
+              "interruption_screen_question_ids": ["preg_occ", "sex1", "sex2", "sex3", "sex4", "sex5", "sex6", "sex7", "sex8", "age1", "age2", "age3", "age4", "age5", "age6", "age7", "age8"]
             },
             "lead_tenant_ethnic_group": {
               "header": "",
@@ -1894,7 +1894,7 @@
                   }
                 }
               },
-              "affected_question_ids": ["ecstat1", "sex1", "age1"]
+              "interruption_screen_question_ids": ["ecstat1", "sex1", "age1"]
             },
             "lead_tenant_over_retirement_value_check": {
               "depends_on": [
@@ -1953,7 +1953,7 @@
                   }
                 }
               },
-              "affected_question_ids": ["ecstat1", "sex1", "age1"]
+              "interruption_screen_question_ids": ["ecstat1", "sex1", "age1"]
             },
             "person_2_known": {
               "header": "You’ve given us the details for 1 person in the household",
@@ -2134,7 +2134,7 @@
                   }
                 }
               },
-              "affected_question_ids": ["preg_occ", "sex1", "sex2", "sex3", "sex4", "sex5", "sex6", "sex7", "sex8"]
+              "interruption_screen_question_ids": ["preg_occ", "sex1", "sex2", "sex3", "sex4", "sex5", "sex6", "sex7", "sex8"]
             },
             "females_in_soft_age_range_in_pregnant_household_person_2_age_value_check": {
               "depends_on": [
@@ -2179,7 +2179,7 @@
                   }
                 }
               },
-              "affected_question_ids": ["preg_occ", "sex1", "sex2", "sex3", "sex4", "sex5", "sex6", "sex7", "sex8", "age1", "age2", "age3", "age4", "age5", "age6", "age7", "age8"]
+              "interruption_screen_question_ids": ["preg_occ", "sex1", "sex2", "sex3", "sex4", "sex5", "sex6", "sex7", "sex8", "age1", "age2", "age3", "age4", "age5", "age6", "age7", "age8"]
             },
             "person_2_gender_identity": {
               "header": "",
@@ -2259,7 +2259,7 @@
                   }
                 }
               },
-              "affected_question_ids": ["preg_occ", "sex1", "sex2", "sex3", "sex4", "sex5", "sex6", "sex7", "sex8"]
+              "interruption_screen_question_ids": ["preg_occ", "sex1", "sex2", "sex3", "sex4", "sex5", "sex6", "sex7", "sex8"]
             },
             "females_in_soft_age_range_in_pregnant_household_person_2_value_check": {
               "depends_on": [
@@ -2304,7 +2304,7 @@
                   }
                 }
               },
-              "affected_question_ids": ["preg_occ", "sex1", "sex2", "sex3", "sex4", "sex5", "sex6", "sex7", "sex8", "age1", "age2", "age3", "age4", "age5", "age6", "age7", "age8"]
+              "interruption_screen_question_ids": ["preg_occ", "sex1", "sex2", "sex3", "sex4", "sex5", "sex6", "sex7", "sex8", "age1", "age2", "age3", "age4", "age5", "age6", "age7", "age8"]
             },
             "person_2_working_situation": {
               "header": "",
@@ -2438,7 +2438,7 @@
                   }
                 }
               },
-              "affected_question_ids": ["ecstat2", "sex2", "age2"]
+              "interruption_screen_question_ids": ["ecstat2", "sex2", "age2"]
             },
             "person_2_over_retirement_value_check": {
               "depends_on": [
@@ -2497,7 +2497,7 @@
                   }
                 }
               },
-              "affected_question_ids": ["ecstat2", "sex2", "age2"]
+              "interruption_screen_question_ids": ["ecstat2", "sex2", "age2"]
             },
             "person_3_known": {
               "header": "You’ve given us the details for 2 people in the household",
@@ -2675,7 +2675,7 @@
                   }
                 }
               },
-              "affected_question_ids": ["preg_occ", "sex1", "sex2", "sex3", "sex4", "sex5", "sex6", "sex7", "sex8"]
+              "interruption_screen_question_ids": ["preg_occ", "sex1", "sex2", "sex3", "sex4", "sex5", "sex6", "sex7", "sex8"]
             },
             "females_in_soft_age_range_in_pregnant_household_person_3_age_value_check": {
               "depends_on": [
@@ -2720,7 +2720,7 @@
                   }
                 }
               },
-              "affected_question_ids": ["preg_occ", "sex1", "sex2", "sex3", "sex4", "sex5", "sex6", "sex7", "sex8", "age1", "age2", "age3", "age4", "age5", "age6", "age7", "age8"]
+              "interruption_screen_question_ids": ["preg_occ", "sex1", "sex2", "sex3", "sex4", "sex5", "sex6", "sex7", "sex8", "age1", "age2", "age3", "age4", "age5", "age6", "age7", "age8"]
             },
             "person_3_gender_identity": {
               "header": "",
@@ -2800,7 +2800,7 @@
                   }
                 }
               },
-              "affected_question_ids": ["preg_occ", "sex1", "sex2", "sex3", "sex4", "sex5", "sex6", "sex7", "sex8"]
+              "interruption_screen_question_ids": ["preg_occ", "sex1", "sex2", "sex3", "sex4", "sex5", "sex6", "sex7", "sex8"]
             },
             "females_in_soft_age_range_in_pregnant_household_person_3_value_check": {
               "depends_on": [
@@ -2845,7 +2845,7 @@
                   }
                 }
               },
-              "affected_question_ids": ["preg_occ", "sex1", "sex2", "sex3", "sex4", "sex5", "sex6", "sex7", "sex8", "age1", "age2", "age3", "age4", "age5", "age6", "age7", "age8"]
+              "interruption_screen_question_ids": ["preg_occ", "sex1", "sex2", "sex3", "sex4", "sex5", "sex6", "sex7", "sex8", "age1", "age2", "age3", "age4", "age5", "age6", "age7", "age8"]
             },
             "person_3_working_situation": {
               "header": "",
@@ -2979,7 +2979,7 @@
                   }
                 }
               },
-              "affected_question_ids": ["ecstat3", "sex3", "age3"]
+              "interruption_screen_question_ids": ["ecstat3", "sex3", "age3"]
             },
             "person_3_over_retirement_value_check": {
               "depends_on": [
@@ -3038,7 +3038,7 @@
                   }
                 }
               },
-              "affected_question_ids": ["ecstat3", "sex3", "age3"]
+              "interruption_screen_question_ids": ["ecstat3", "sex3", "age3"]
             },
             "person_4_known": {
               "header": "You’ve given us the details for 3 people in the household",
@@ -3213,7 +3213,7 @@
                   }
                 }
               },
-              "affected_question_ids": ["preg_occ", "sex1", "sex2", "sex3", "sex4", "sex5", "sex6", "sex7", "sex8"]
+              "interruption_screen_question_ids": ["preg_occ", "sex1", "sex2", "sex3", "sex4", "sex5", "sex6", "sex7", "sex8"]
             },
             "females_in_soft_age_range_in_pregnant_household_person_4_age_value_check": {
               "depends_on": [
@@ -3258,7 +3258,7 @@
                   }
                 }
               },
-              "affected_question_ids": ["preg_occ", "sex1", "sex2", "sex3", "sex4", "sex5", "sex6", "sex7", "sex8", "age1", "age2", "age3", "age4", "age5", "age6", "age7", "age8"]
+              "interruption_screen_question_ids": ["preg_occ", "sex1", "sex2", "sex3", "sex4", "sex5", "sex6", "sex7", "sex8", "age1", "age2", "age3", "age4", "age5", "age6", "age7", "age8"]
             },
             "person_4_gender_identity": {
               "header": "",
@@ -3338,7 +3338,7 @@
                   }
                 }
               },
-              "affected_question_ids": ["preg_occ", "sex1", "sex2", "sex3", "sex4", "sex5", "sex6", "sex7", "sex8"]
+              "interruption_screen_question_ids": ["preg_occ", "sex1", "sex2", "sex3", "sex4", "sex5", "sex6", "sex7", "sex8"]
             },
             "females_in_soft_age_range_in_pregnant_household_person_4_value_check": {
               "depends_on": [
@@ -3383,7 +3383,7 @@
                   }
                 }
               },
-              "affected_question_ids": ["preg_occ", "sex1", "sex2", "sex3", "sex4", "sex5", "sex6", "sex7", "sex8", "age1", "age2", "age3", "age4", "age5", "age6", "age7", "age8"]
+              "interruption_screen_question_ids": ["preg_occ", "sex1", "sex2", "sex3", "sex4", "sex5", "sex6", "sex7", "sex8", "age1", "age2", "age3", "age4", "age5", "age6", "age7", "age8"]
             },
             "person_4_working_situation": {
               "header": "",
@@ -3517,7 +3517,7 @@
                   }
                 }
               },
-              "affected_question_ids": ["ecstat4", "sex4", "age4"]
+              "interruption_screen_question_ids": ["ecstat4", "sex4", "age4"]
             },
             "person_4_over_retirement_value_check": {
               "depends_on": [
@@ -3576,7 +3576,7 @@
                   }
                 }
               },
-              "affected_question_ids": ["ecstat4", "sex4", "age4"]
+              "interruption_screen_question_ids": ["ecstat4", "sex4", "age4"]
             },
             "person_5_known": {
               "header": "You’ve given us the details for 4 people in the household",
@@ -3748,7 +3748,7 @@
                   }
                 }
               },
-              "affected_question_ids": ["preg_occ", "sex1", "sex2", "sex3", "sex4", "sex5", "sex6", "sex7", "sex8"]
+              "interruption_screen_question_ids": ["preg_occ", "sex1", "sex2", "sex3", "sex4", "sex5", "sex6", "sex7", "sex8"]
             },
             "females_in_soft_age_range_in_pregnant_household_person_5_age_value_check": {
               "depends_on": [
@@ -3793,7 +3793,7 @@
                   }
                 }
               },
-              "affected_question_ids": ["preg_occ", "sex1", "sex2", "sex3", "sex4", "sex5", "sex6", "sex7", "sex8", "age1", "age2", "age3", "age4", "age5", "age6", "age7", "age8"]
+              "interruption_screen_question_ids": ["preg_occ", "sex1", "sex2", "sex3", "sex4", "sex5", "sex6", "sex7", "sex8", "age1", "age2", "age3", "age4", "age5", "age6", "age7", "age8"]
             },
             "person_5_gender_identity": {
               "header": "",
@@ -3873,7 +3873,7 @@
                   }
                 }
               },
-              "affected_question_ids": ["preg_occ", "sex1", "sex2", "sex3", "sex4", "sex5", "sex6", "sex7", "sex8"]
+              "interruption_screen_question_ids": ["preg_occ", "sex1", "sex2", "sex3", "sex4", "sex5", "sex6", "sex7", "sex8"]
             },
             "females_in_soft_age_range_in_pregnant_household_person_5_value_check": {
               "depends_on": [
@@ -3918,7 +3918,7 @@
                   }
                 }
               },
-              "affected_question_ids": ["preg_occ", "sex1", "sex2", "sex3", "sex4", "sex5", "sex6", "sex7", "sex8", "age1", "age2", "age3", "age4", "age5", "age6", "age7", "age8"]
+              "interruption_screen_question_ids": ["preg_occ", "sex1", "sex2", "sex3", "sex4", "sex5", "sex6", "sex7", "sex8", "age1", "age2", "age3", "age4", "age5", "age6", "age7", "age8"]
             },
             "person_5_working_situation": {
               "header": "",
@@ -4052,7 +4052,7 @@
                   }
                 }
               },
-              "affected_question_ids": ["ecstat5", "sex5", "age5"]
+              "interruption_screen_question_ids": ["ecstat5", "sex5", "age5"]
             },
             "person_5_over_retirement_value_check": {
               "depends_on": [
@@ -4111,7 +4111,7 @@
                   }
                 }
               },
-              "affected_question_ids": ["ecstat5", "sex5", "age5"]
+              "interruption_screen_question_ids": ["ecstat5", "sex5", "age5"]
             },
             "person_6_known": {
               "header": "You’ve given us the details for 5 people in the household",
@@ -4280,7 +4280,7 @@
                   }
                 }
               },
-              "affected_question_ids": ["preg_occ", "sex1", "sex2", "sex3", "sex4", "sex5", "sex6", "sex7", "sex8"]
+              "interruption_screen_question_ids": ["preg_occ", "sex1", "sex2", "sex3", "sex4", "sex5", "sex6", "sex7", "sex8"]
             },
             "females_in_soft_age_range_in_pregnant_household_person_6_age_value_check": {
               "depends_on": [
@@ -4325,7 +4325,7 @@
                   }
                 }
               },
-              "affected_question_ids": ["preg_occ", "sex1", "sex2", "sex3", "sex4", "sex5", "sex6", "sex7", "sex8", "age1", "age2", "age3", "age4", "age5", "age6", "age7", "age8"]
+              "interruption_screen_question_ids": ["preg_occ", "sex1", "sex2", "sex3", "sex4", "sex5", "sex6", "sex7", "sex8", "age1", "age2", "age3", "age4", "age5", "age6", "age7", "age8"]
             },
             "person_6_gender_identity": {
               "header": "",
@@ -4405,7 +4405,7 @@
                   }
                 }
               },
-              "affected_question_ids": ["preg_occ", "sex1", "sex2", "sex3", "sex4", "sex5", "sex6", "sex7", "sex8"]
+              "interruption_screen_question_ids": ["preg_occ", "sex1", "sex2", "sex3", "sex4", "sex5", "sex6", "sex7", "sex8"]
             },
             "females_in_soft_age_range_in_pregnant_household_person_6_value_check": {
               "depends_on": [
@@ -4450,7 +4450,7 @@
                   }
                 }
               },
-              "affected_question_ids": ["preg_occ", "sex1", "sex2", "sex3", "sex4", "sex5", "sex6", "sex7", "sex8", "age1", "age2", "age3", "age4", "age5", "age6", "age7", "age8"]
+              "interruption_screen_question_ids": ["preg_occ", "sex1", "sex2", "sex3", "sex4", "sex5", "sex6", "sex7", "sex8", "age1", "age2", "age3", "age4", "age5", "age6", "age7", "age8"]
             },
             "person_6_working_situation": {
               "header": "",
@@ -4584,7 +4584,7 @@
                   }
                 }
               },
-              "affected_question_ids": ["ecstat6", "sex6", "age6"]
+              "interruption_screen_question_ids": ["ecstat6", "sex6", "age6"]
             },
             "person_6_over_retirement_value_check": {
               "depends_on": [
@@ -4643,7 +4643,7 @@
                   }
                 }
               },
-              "affected_question_ids": ["ecstat6", "sex6", "age6"]
+              "interruption_screen_question_ids": ["ecstat6", "sex6", "age6"]
             },
             "person_7_known": {
               "header": "You’ve given us the details for 6 people in the household",
@@ -4809,7 +4809,7 @@
                   }
                 }
               },
-              "affected_question_ids": ["preg_occ", "sex1", "sex2", "sex3", "sex4", "sex5", "sex6", "sex7", "sex8"]
+              "interruption_screen_question_ids": ["preg_occ", "sex1", "sex2", "sex3", "sex4", "sex5", "sex6", "sex7", "sex8"]
             },
             "females_in_soft_age_range_in_pregnant_household_person_7_age_value_check": {
               "depends_on": [
@@ -4854,7 +4854,7 @@
                   }
                 }
               },
-              "affected_question_ids": ["preg_occ", "sex1", "sex2", "sex3", "sex4", "sex5", "sex6", "sex7", "sex8", "age1", "age2", "age3", "age4", "age5", "age6", "age7", "age8"]
+              "interruption_screen_question_ids": ["preg_occ", "sex1", "sex2", "sex3", "sex4", "sex5", "sex6", "sex7", "sex8", "age1", "age2", "age3", "age4", "age5", "age6", "age7", "age8"]
             },
             "person_7_gender_identity": {
               "header": "",
@@ -4934,7 +4934,7 @@
                   }
                 }
               },
-              "affected_question_ids": ["preg_occ", "sex1", "sex2", "sex3", "sex4", "sex5", "sex6", "sex7", "sex8"]
+              "interruption_screen_question_ids": ["preg_occ", "sex1", "sex2", "sex3", "sex4", "sex5", "sex6", "sex7", "sex8"]
             },
             "females_in_soft_age_range_in_pregnant_household_person_7_value_check": {
               "depends_on": [
@@ -4979,7 +4979,7 @@
                   }
                 }
               },
-              "affected_question_ids": ["preg_occ", "sex1", "sex2", "sex3", "sex4", "sex5", "sex6", "sex7", "sex8", "age1", "age2", "age3", "age4", "age5", "age6", "age7", "age8"]
+              "interruption_screen_question_ids": ["preg_occ", "sex1", "sex2", "sex3", "sex4", "sex5", "sex6", "sex7", "sex8", "age1", "age2", "age3", "age4", "age5", "age6", "age7", "age8"]
             },
             "person_7_working_situation": {
               "header": "",
@@ -5113,7 +5113,7 @@
                   }
                 }
               },
-              "affected_question_ids": ["ecstat7", "sex7", "age7"]
+              "interruption_screen_question_ids": ["ecstat7", "sex7", "age7"]
             },
             "person_7_over_retirement_value_check": {
               "depends_on": [
@@ -5172,7 +5172,7 @@
                   }
                 }
               },
-              "affected_question_ids": ["ecstat7", "sex7", "age7"]
+              "interruption_screen_question_ids": ["ecstat7", "sex7", "age7"]
             },
             "person_8_known": {
               "header": "You’ve given us the details for 7 people in the household",
@@ -5335,7 +5335,7 @@
                   }
                 }
               },
-              "affected_question_ids": ["preg_occ", "sex1", "sex2", "sex3", "sex4", "sex5", "sex6", "sex7", "sex8"]
+              "interruption_screen_question_ids": ["preg_occ", "sex1", "sex2", "sex3", "sex4", "sex5", "sex6", "sex7", "sex8"]
             },
             "females_in_soft_age_range_in_pregnant_household_person_8_age_value_check": {
               "depends_on": [
@@ -5380,7 +5380,7 @@
                   }
                 }
               },
-              "affected_question_ids": ["preg_occ", "sex1", "sex2", "sex3", "sex4", "sex5", "sex6", "sex7", "sex8", "age1", "age2", "age3", "age4", "age5", "age6", "age7", "age8"]
+              "interruption_screen_question_ids": ["preg_occ", "sex1", "sex2", "sex3", "sex4", "sex5", "sex6", "sex7", "sex8", "age1", "age2", "age3", "age4", "age5", "age6", "age7", "age8"]
             },
             "person_8_gender_identity": {
               "header": "",
@@ -5460,7 +5460,7 @@
                   }
                 }
               },
-              "affected_question_ids": ["preg_occ", "sex1", "sex2", "sex3", "sex4", "sex5", "sex6", "sex7", "sex8"]
+              "interruption_screen_question_ids": ["preg_occ", "sex1", "sex2", "sex3", "sex4", "sex5", "sex6", "sex7", "sex8"]
             },
             "females_in_soft_age_range_in_pregnant_household_person_8_value_check": {
               "depends_on": [
@@ -5505,7 +5505,7 @@
                   }
                 }
               },
-              "affected_question_ids": ["preg_occ", "sex1", "sex2", "sex3", "sex4", "sex5", "sex6", "sex7", "sex8", "age1", "age2", "age3", "age4", "age5", "age6", "age7", "age8"]
+              "interruption_screen_question_ids": ["preg_occ", "sex1", "sex2", "sex3", "sex4", "sex5", "sex6", "sex7", "sex8", "age1", "age2", "age3", "age4", "age5", "age6", "age7", "age8"]
             },
             "person_8_working_situation": {
               "header": "",
@@ -5639,7 +5639,7 @@
                   }
                 }
               },
-              "affected_question_ids": ["ecstat8", "sex8", "age8"]
+              "interruption_screen_question_ids": ["ecstat8", "sex8", "age8"]
             },
             "person_8_over_retirement_value_check": {
               "depends_on": [
@@ -5698,7 +5698,7 @@
                   }
                 }
               },
-              "affected_question_ids": ["ecstat8", "sex8", "age8"]
+              "interruption_screen_question_ids": ["ecstat8", "sex8", "age8"]
             }
           }
         },
@@ -5881,7 +5881,7 @@
                   }
                 }
               },
-              "affected_question_ids": ["preg_occ", "sex1", "sex2", "sex3", "sex4", "sex5", "sex6", "sex7", "sex8"]
+              "interruption_screen_question_ids": ["preg_occ", "sex1", "sex2", "sex3", "sex4", "sex5", "sex6", "sex7", "sex8"]
             },
             "females_in_soft_age_range_in_pregnant_household_value_check": {
               "depends_on": [
@@ -5934,7 +5934,7 @@
                   }
                 }
               },
-              "affected_question_ids": ["preg_occ", "sex1", "sex2", "sex3", "sex4", "sex5", "sex6", "sex7", "sex8", "age1", "age2", "age3", "age4", "age5", "age6", "age7", "age8"]
+              "interruption_screen_question_ids": ["preg_occ", "sex1", "sex2", "sex3", "sex4", "sex5", "sex6", "sex7", "sex8", "age1", "age2", "age3", "age4", "age5", "age6", "age7", "age8"]
             },
             "access_needs_exist": {
               "header": "",
@@ -7447,7 +7447,7 @@
                   }
                 }
               },
-              "affected_question_ids": ["incfreq", "earnings", "ecstat1"]
+              "interruption_screen_question_ids": ["incfreq", "earnings", "ecstat1"]
             },
             "housing_benefit": {
               "header": "",
@@ -7810,7 +7810,7 @@
                   }
                 }
               },
-              "affected_question_ids": ["chcharge", "is_carehome"]
+              "interruption_screen_question_ids": ["chcharge", "is_carehome"]
             },
             "rent_weekly": {
               "header": "Household rent and charges",
@@ -8337,7 +8337,7 @@
                   }
                 }
               },
-              "affected_question_ids": ["brent", "startdate", "la", "beds", "rent_type", "needstype"]
+              "interruption_screen_question_ids": ["brent", "startdate", "la", "beds", "rent_type", "needstype"]
             },
             "max_rent_value_check": {
               "depends_on": [
@@ -8382,7 +8382,7 @@
                   }
                 }
               },
-              "affected_question_ids": ["brent", "startdate", "la", "beds", "rent_type", "needstype"]
+              "interruption_screen_question_ids": ["brent", "startdate", "la", "beds", "rent_type", "needstype"]
             },
             "outstanding": {
               "header": "",
diff --git a/spec/fixtures/forms/2021_2022.json b/spec/fixtures/forms/2021_2022.json
index 3d4342dd5..b3ae2417e 100644
--- a/spec/fixtures/forms/2021_2022.json
+++ b/spec/fixtures/forms/2021_2022.json
@@ -227,7 +227,7 @@
                   }
                 }
               ],
-              "affected_question_ids": ["age1", "ecstat1"]
+              "interruption_screen_question_ids": ["age1", "ecstat1"]
             },
             "person_2_working_situation": {
               "header": "",
@@ -774,7 +774,7 @@
                   }
                 }
               },
-              "affected_question_ids": ["ecstat1", "incfreq", "earnings"]
+              "interruption_screen_question_ids": ["ecstat1", "incfreq", "earnings"]
             },
             "net_income_uc_proportion": {
               "questions": {
diff --git a/spec/models/form/lettings/pages/care_home_charges_value_check_spec.rb b/spec/models/form/lettings/pages/care_home_charges_value_check_spec.rb
index ba7ff1f84..6d2b8f7a8 100644
--- a/spec/models/form/lettings/pages/care_home_charges_value_check_spec.rb
+++ b/spec/models/form/lettings/pages/care_home_charges_value_check_spec.rb
@@ -42,7 +42,7 @@ RSpec.describe Form::Lettings::Pages::CareHomeChargesValueCheck, type: :model do
     expect(page.informative_text).to eq("")
   end
 
-  it "has the correct affected_question_ids" do
-    expect(page.affected_question_ids).to eq(%w[chcharge is_carehome])
+  it "has the correct interruption_screen_question_ids" do
+    expect(page.interruption_screen_question_ids).to eq(%w[chcharge is_carehome])
   end
 end
diff --git a/spec/models/form/lettings/pages/max_rent_value_check_spec.rb b/spec/models/form/lettings/pages/max_rent_value_check_spec.rb
index 6c2ed4091..5d803252b 100644
--- a/spec/models/form/lettings/pages/max_rent_value_check_spec.rb
+++ b/spec/models/form/lettings/pages/max_rent_value_check_spec.rb
@@ -35,7 +35,7 @@ RSpec.describe Form::Lettings::Pages::MaxRentValueCheck, type: :model do
     expect(page.informative_text).to eq({ "arguments" => [{ "arguments_for_key" => "soft_max_for_period", "i18n_template" => "soft_max_for_period", "key" => "field_formatted_as_currency" }], "translation" => "soft_validations.rent.max_hint_text" })
   end
 
-  it "has the correct affected_question_ids" do
-    expect(page.affected_question_ids).to eq(%w[brent startdate la beds rent_type needstype])
+  it "has the correct interruption_screen_question_ids" do
+    expect(page.interruption_screen_question_ids).to eq(%w[brent startdate la beds rent_type needstype])
   end
 end
diff --git a/spec/models/form/lettings/pages/min_rent_value_check_spec.rb b/spec/models/form/lettings/pages/min_rent_value_check_spec.rb
index e9c9cd990..e4b6b5478 100644
--- a/spec/models/form/lettings/pages/min_rent_value_check_spec.rb
+++ b/spec/models/form/lettings/pages/min_rent_value_check_spec.rb
@@ -53,7 +53,7 @@ RSpec.describe Form::Lettings::Pages::MinRentValueCheck, type: :model do
     })
   end
 
-  it "has the correct affected_question_ids" do
-    expect(page.affected_question_ids).to eq(%w[brent startdate la beds rent_type needstype])
+  it "has the correct interruption_screen_question_ids" do
+    expect(page.interruption_screen_question_ids).to eq(%w[brent startdate la beds rent_type needstype])
   end
 end
diff --git a/spec/models/form/sales/pages/about_price_value_check_spec.rb b/spec/models/form/sales/pages/about_price_value_check_spec.rb
index 9cab4ad81..a80c197e3 100644
--- a/spec/models/form/sales/pages/about_price_value_check_spec.rb
+++ b/spec/models/form/sales/pages/about_price_value_check_spec.rb
@@ -52,7 +52,7 @@ RSpec.describe Form::Sales::Pages::AboutPriceValueCheck, type: :model do
     })
   end
 
-  it "has the correct affected_question_ids" do
-    expect(page.affected_question_ids).to eq(%w[value beds la])
+  it "has the correct interruption_screen_question_ids" do
+    expect(page.interruption_screen_question_ids).to eq(%w[value beds la])
   end
 end
diff --git a/spec/models/form/sales/pages/buyer1_income_value_check_spec.rb b/spec/models/form/sales/pages/buyer1_income_value_check_spec.rb
index 33e05bad4..8aa6ef233 100644
--- a/spec/models/form/sales/pages/buyer1_income_value_check_spec.rb
+++ b/spec/models/form/sales/pages/buyer1_income_value_check_spec.rb
@@ -35,7 +35,7 @@ RSpec.describe Form::Sales::Pages::Buyer1IncomeValueCheck, type: :model do
     expect(page.interruption_screen?).to eq(true)
   end
 
-  it "is has correct affected_question_ids" do
-    expect(page.affected_question_ids).to eq(%w[ecstat1 income1])
+  it "is has correct interruption_screen_question_ids" do
+    expect(page.interruption_screen_question_ids).to eq(%w[ecstat1 income1])
   end
 end
diff --git a/spec/models/form/sales/pages/buyer_live_in_value_check_spec.rb b/spec/models/form/sales/pages/buyer_live_in_value_check_spec.rb
index ae0b9b79c..22d1433bc 100644
--- a/spec/models/form/sales/pages/buyer_live_in_value_check_spec.rb
+++ b/spec/models/form/sales/pages/buyer_live_in_value_check_spec.rb
@@ -43,8 +43,8 @@ RSpec.describe Form::Sales::Pages::BuyerLiveInValueCheck, type: :model do
     })
   end
 
-  it "has the correct affected_question_ids" do
-    expect(page.affected_question_ids).to eq(%w[ownershipsch buy1livein])
+  it "has the correct interruption_screen_question_ids" do
+    expect(page.interruption_screen_question_ids).to eq(%w[ownershipsch buy1livein])
   end
 
   context "with buyer 2" do
@@ -65,8 +65,8 @@ RSpec.describe Form::Sales::Pages::BuyerLiveInValueCheck, type: :model do
       })
     end
 
-    it "has the correct affected_question_ids" do
-      expect(page.affected_question_ids).to eq(%w[ownershipsch buy2livein])
+    it "has the correct interruption_screen_question_ids" do
+      expect(page.interruption_screen_question_ids).to eq(%w[ownershipsch buy2livein])
     end
   end
 end
diff --git a/spec/models/form/sales/pages/deposit_value_check_spec.rb b/spec/models/form/sales/pages/deposit_value_check_spec.rb
index 12b29c88e..9f8c99966 100644
--- a/spec/models/form/sales/pages/deposit_value_check_spec.rb
+++ b/spec/models/form/sales/pages/deposit_value_check_spec.rb
@@ -35,7 +35,7 @@ RSpec.describe Form::Sales::Pages::DepositValueCheck, type: :model do
     expect(page.interruption_screen?).to eq(true)
   end
 
-  it "is has correct affected_question_ids" do
-    expect(page.affected_question_ids).to eq(%w[savings deposit])
+  it "is has correct interruption_screen_question_ids" do
+    expect(page.interruption_screen_question_ids).to eq(%w[savings deposit])
   end
 end
diff --git a/spec/models/form/sales/pages/discounted_sale_value_check_spec.rb b/spec/models/form/sales/pages/discounted_sale_value_check_spec.rb
index 7ee802a3e..ce0d7be8e 100644
--- a/spec/models/form/sales/pages/discounted_sale_value_check_spec.rb
+++ b/spec/models/form/sales/pages/discounted_sale_value_check_spec.rb
@@ -50,7 +50,7 @@ RSpec.describe Form::Sales::Pages::DiscountedSaleValueCheck, type: :model do
     ])
   end
 
-  it "has correct affected_question_ids" do
-    expect(page.affected_question_ids).to eq(%w[value deposit ownershipsch mortgage mortgageused discount grant type])
+  it "has correct interruption_screen_question_ids" do
+    expect(page.interruption_screen_question_ids).to eq(%w[value deposit ownershipsch mortgage mortgageused discount grant type])
   end
 end
diff --git a/spec/models/form/sales/pages/handover_date_check_spec.rb b/spec/models/form/sales/pages/handover_date_check_spec.rb
index b5ab6d5a3..cd358a2b8 100644
--- a/spec/models/form/sales/pages/handover_date_check_spec.rb
+++ b/spec/models/form/sales/pages/handover_date_check_spec.rb
@@ -45,7 +45,7 @@ RSpec.describe Form::Sales::Pages::HandoverDateCheck, type: :model do
     expect(page.interruption_screen?).to eq(true)
   end
 
-  it "is has correct affected_question_ids" do
-    expect(page.affected_question_ids).to eq(%w[hodate saledate])
+  it "is has correct interruption_screen_question_ids" do
+    expect(page.interruption_screen_question_ids).to eq(%w[hodate saledate])
   end
 end
diff --git a/spec/models/form/sales/pages/household_wheelchair_check_spec.rb b/spec/models/form/sales/pages/household_wheelchair_check_spec.rb
index 67c0b997d..20d0a325f 100644
--- a/spec/models/form/sales/pages/household_wheelchair_check_spec.rb
+++ b/spec/models/form/sales/pages/household_wheelchair_check_spec.rb
@@ -35,7 +35,7 @@ RSpec.describe Form::Sales::Pages::HouseholdWheelchairCheck, type: :model do
     expect(page.interruption_screen?).to eq(true)
   end
 
-  it "is has correct affected_question_ids" do
-    expect(page.affected_question_ids).to eq(%w[disabled wheel])
+  it "is has correct interruption_screen_question_ids" do
+    expect(page.interruption_screen_question_ids).to eq(%w[disabled wheel])
   end
 end
diff --git a/spec/models/form/sales/pages/monthly_charges_value_check_spec.rb b/spec/models/form/sales/pages/monthly_charges_value_check_spec.rb
index 80b2f5d72..b8b245582 100644
--- a/spec/models/form/sales/pages/monthly_charges_value_check_spec.rb
+++ b/spec/models/form/sales/pages/monthly_charges_value_check_spec.rb
@@ -46,7 +46,7 @@ RSpec.describe Form::Sales::Pages::MonthlyChargesValueCheck, type: :model do
     expect(page.informative_text).to eq({})
   end
 
-  it "has correct affected_question_ids" do
-    expect(page.affected_question_ids).to eq(%w[type mscharge proptype])
+  it "has correct interruption_screen_question_ids" do
+    expect(page.interruption_screen_question_ids).to eq(%w[type mscharge proptype])
   end
 end
diff --git a/spec/models/form/sales/pages/mortgage_value_check_spec.rb b/spec/models/form/sales/pages/mortgage_value_check_spec.rb
index d2132d0e4..f33525652 100644
--- a/spec/models/form/sales/pages/mortgage_value_check_spec.rb
+++ b/spec/models/form/sales/pages/mortgage_value_check_spec.rb
@@ -36,8 +36,8 @@ RSpec.describe Form::Sales::Pages::MortgageValueCheck, type: :model do
     ])
   end
 
-  it "has correct affected_question_ids" do
-    expect(page.affected_question_ids).to eq(%w[mortgage inc1mort inc2mort jointpur income1 income2 inc1mort inc2mort])
+  it "has correct interruption_screen_question_ids" do
+    expect(page.interruption_screen_question_ids).to eq(%w[mortgage inc1mort inc2mort jointpur income1 income2 inc1mort inc2mort])
   end
 
   context "when checking buyer 2" do
diff --git a/spec/models/form/sales/pages/old_persons_shared_ownership_value_check_spec.rb b/spec/models/form/sales/pages/old_persons_shared_ownership_value_check_spec.rb
index b9d145828..2bb961264 100644
--- a/spec/models/form/sales/pages/old_persons_shared_ownership_value_check_spec.rb
+++ b/spec/models/form/sales/pages/old_persons_shared_ownership_value_check_spec.rb
@@ -42,7 +42,7 @@ RSpec.describe Form::Sales::Pages::OldPersonsSharedOwnershipValueCheck, type: :m
     expect(page.informative_text).to eq({})
   end
 
-  it "has the correct affected_question_ids" do
-    expect(page.affected_question_ids).to eq(%w[type jointpur age1 age2])
+  it "has the correct interruption_screen_question_ids" do
+    expect(page.interruption_screen_question_ids).to eq(%w[type jointpur age1 age2])
   end
 end
diff --git a/spec/models/form/sales/pages/percentage_discount_value_check_spec.rb b/spec/models/form/sales/pages/percentage_discount_value_check_spec.rb
index 97c890d76..36bd66418 100644
--- a/spec/models/form/sales/pages/percentage_discount_value_check_spec.rb
+++ b/spec/models/form/sales/pages/percentage_discount_value_check_spec.rb
@@ -46,7 +46,7 @@ RSpec.describe Form::Sales::Pages::PercentageDiscountValueCheck, type: :model do
     ])
   end
 
-  it "has correct affected_question_ids" do
-    expect(page.affected_question_ids).to eq(%w[discount proptype])
+  it "has correct interruption_screen_question_ids" do
+    expect(page.interruption_screen_question_ids).to eq(%w[discount proptype])
   end
 end
diff --git a/spec/models/form/sales/pages/person_student_not_child_value_check_spec.rb b/spec/models/form/sales/pages/person_student_not_child_value_check_spec.rb
index 5cbb42a95..41395ffd4 100644
--- a/spec/models/form/sales/pages/person_student_not_child_value_check_spec.rb
+++ b/spec/models/form/sales/pages/person_student_not_child_value_check_spec.rb
@@ -39,8 +39,8 @@ RSpec.describe Form::Sales::Pages::PersonStudentNotChildValueCheck, type: :model
     expect(page.questions.map(&:id)).to eq(%w[student_not_child_value_check])
   end
 
-  it "has correct affected_question_ids" do
-    expect(page.affected_question_ids).to eq(%w[relat2 exstat2 age2])
+  it "has correct interruption_screen_question_ids" do
+    expect(page.interruption_screen_question_ids).to eq(%w[relat2 exstat2 age2])
   end
 
   context "with person 2" do
@@ -55,8 +55,8 @@ RSpec.describe Form::Sales::Pages::PersonStudentNotChildValueCheck, type: :model
       expect(page.depends_on).to eq([{ "person_2_student_not_child?" => true }])
     end
 
-    it "has correct affected_question_ids" do
-      expect(page.affected_question_ids).to eq(%w[relat2 exstat2 age2])
+    it "has correct interruption_screen_question_ids" do
+      expect(page.interruption_screen_question_ids).to eq(%w[relat2 exstat2 age2])
     end
   end
 
@@ -72,8 +72,8 @@ RSpec.describe Form::Sales::Pages::PersonStudentNotChildValueCheck, type: :model
       expect(page.depends_on).to eq([{ "person_3_student_not_child?" => true }])
     end
 
-    it "has correct affected_question_ids" do
-      expect(page.affected_question_ids).to eq(%w[relat3 exstat3 age3])
+    it "has correct interruption_screen_question_ids" do
+      expect(page.interruption_screen_question_ids).to eq(%w[relat3 exstat3 age3])
     end
   end
 
@@ -89,8 +89,8 @@ RSpec.describe Form::Sales::Pages::PersonStudentNotChildValueCheck, type: :model
       expect(page.depends_on).to eq([{ "person_4_student_not_child?" => true }])
     end
 
-    it "has correct affected_question_ids" do
-      expect(page.affected_question_ids).to eq(%w[relat4 exstat4 age4])
+    it "has correct interruption_screen_question_ids" do
+      expect(page.interruption_screen_question_ids).to eq(%w[relat4 exstat4 age4])
     end
   end
 
@@ -106,8 +106,8 @@ RSpec.describe Form::Sales::Pages::PersonStudentNotChildValueCheck, type: :model
       expect(page.depends_on).to eq([{ "person_5_student_not_child?" => true }])
     end
 
-    it "has correct affected_question_ids" do
-      expect(page.affected_question_ids).to eq(%w[relat5 exstat5 age5])
+    it "has correct interruption_screen_question_ids" do
+      expect(page.interruption_screen_question_ids).to eq(%w[relat5 exstat5 age5])
     end
   end
 
@@ -123,8 +123,8 @@ RSpec.describe Form::Sales::Pages::PersonStudentNotChildValueCheck, type: :model
       expect(page.depends_on).to eq([{ "person_6_student_not_child?" => true }])
     end
 
-    it "has correct affected_question_ids" do
-      expect(page.affected_question_ids).to eq(%w[relat6 exstat6 age6])
+    it "has correct interruption_screen_question_ids" do
+      expect(page.interruption_screen_question_ids).to eq(%w[relat6 exstat6 age6])
     end
   end
 end
diff --git a/spec/models/form/sales/pages/retirement_value_check_spec.rb b/spec/models/form/sales/pages/retirement_value_check_spec.rb
index cba9ccc48..87c4c17fd 100644
--- a/spec/models/form/sales/pages/retirement_value_check_spec.rb
+++ b/spec/models/form/sales/pages/retirement_value_check_spec.rb
@@ -72,8 +72,8 @@ RSpec.describe Form::Sales::Pages::RetirementValueCheck, type: :model do
       })
     end
 
-    it "has correct affected_question_ids" do
-      expect(page.affected_question_ids).to eq(%w[age1 exstat1 sex1])
+    it "has correct interruption_screen_question_ids" do
+      expect(page.interruption_screen_question_ids).to eq(%w[age1 exstat1 sex1])
     end
   end
 
@@ -124,8 +124,8 @@ RSpec.describe Form::Sales::Pages::RetirementValueCheck, type: :model do
       })
     end
 
-    it "has correct affected_question_ids" do
-      expect(page.affected_question_ids).to eq(%w[age2 exstat2 sex2])
+    it "has correct interruption_screen_question_ids" do
+      expect(page.interruption_screen_question_ids).to eq(%w[age2 exstat2 sex2])
     end
   end
 
@@ -176,8 +176,8 @@ RSpec.describe Form::Sales::Pages::RetirementValueCheck, type: :model do
       })
     end
 
-    it "has correct affected_question_ids" do
-      expect(page.affected_question_ids).to eq(%w[age3 exstat3 sex3])
+    it "has correct interruption_screen_question_ids" do
+      expect(page.interruption_screen_question_ids).to eq(%w[age3 exstat3 sex3])
     end
   end
 
@@ -228,8 +228,8 @@ RSpec.describe Form::Sales::Pages::RetirementValueCheck, type: :model do
       })
     end
 
-    it "has correct affected_question_ids" do
-      expect(page.affected_question_ids).to eq(%w[age4 exstat4 sex4])
+    it "has correct interruption_screen_question_ids" do
+      expect(page.interruption_screen_question_ids).to eq(%w[age4 exstat4 sex4])
     end
   end
 
@@ -280,8 +280,8 @@ RSpec.describe Form::Sales::Pages::RetirementValueCheck, type: :model do
       })
     end
 
-    it "has correct affected_question_ids" do
-      expect(page.affected_question_ids).to eq(%w[age5 exstat5 sex5])
+    it "has correct interruption_screen_question_ids" do
+      expect(page.interruption_screen_question_ids).to eq(%w[age5 exstat5 sex5])
     end
   end
 
@@ -332,8 +332,8 @@ RSpec.describe Form::Sales::Pages::RetirementValueCheck, type: :model do
       })
     end
 
-    it "has correct affected_question_ids" do
-      expect(page.affected_question_ids).to eq(%w[age6 exstat6 sex6])
+    it "has correct interruption_screen_question_ids" do
+      expect(page.interruption_screen_question_ids).to eq(%w[age6 exstat6 sex6])
     end
   end
 end
diff --git a/spec/models/form/sales/pages/savings_value_check_spec.rb b/spec/models/form/sales/pages/savings_value_check_spec.rb
index baf249334..cfff9c74d 100644
--- a/spec/models/form/sales/pages/savings_value_check_spec.rb
+++ b/spec/models/form/sales/pages/savings_value_check_spec.rb
@@ -35,7 +35,7 @@ RSpec.describe Form::Sales::Pages::SavingsValueCheck, type: :model do
     expect(page.interruption_screen?).to eq(true)
   end
 
-  it "has the correct affected_question_ids" do
-    expect(page.affected_question_ids).to eq(%w[savings])
+  it "has the correct interruption_screen_question_ids" do
+    expect(page.interruption_screen_question_ids).to eq(%w[savings])
   end
 end
diff --git a/spec/models/form/sales/pages/shared_ownership_deposit_value_check_spec.rb b/spec/models/form/sales/pages/shared_ownership_deposit_value_check_spec.rb
index 0197c8b49..285449fe9 100644
--- a/spec/models/form/sales/pages/shared_ownership_deposit_value_check_spec.rb
+++ b/spec/models/form/sales/pages/shared_ownership_deposit_value_check_spec.rb
@@ -42,7 +42,7 @@ RSpec.describe Form::Sales::Pages::SharedOwnershipDepositValueCheck, type: :mode
     expect(page.informative_text).to eq({})
   end
 
-  it "has the correct affected_question_ids" do
-    expect(page.affected_question_ids).to eq(%w[mortgage mortgageused cashdis type deposit value equity])
+  it "has the correct interruption_screen_question_ids" do
+    expect(page.interruption_screen_question_ids).to eq(%w[mortgage mortgageused cashdis type deposit value equity])
   end
 end