diff --git a/app/models/form/sales/pages/student_not_child_value_check.rb b/app/models/form/sales/pages/person_student_not_child_value_check.rb
similarity index 65%
rename from app/models/form/sales/pages/student_not_child_value_check.rb
rename to app/models/form/sales/pages/person_student_not_child_value_check.rb
index 3230b09cc..e3513e169 100644
--- a/app/models/form/sales/pages/student_not_child_value_check.rb
+++ b/app/models/form/sales/pages/person_student_not_child_value_check.rb
@@ -1,4 +1,4 @@
-class Form::Sales::Pages::StudentNotChildValueCheck < Form::Sales::Pages::Person
+class Form::Sales::Pages::PersonStudentNotChildValueCheck < Form::Sales::Pages::Person
   def initialize(id, hsh, subsection, person_index:)
     super
     @depends_on = [
@@ -15,7 +15,7 @@ class Form::Sales::Pages::StudentNotChildValueCheck < Form::Sales::Pages::Person
 
   def questions
     @questions ||= [
-      Form::Sales::Questions::StudentNotChildValueCheck.new(nil, nil, self, person_index: @person_index),
+      Form::Sales::Questions::PersonStudentNotChildValueCheck.new(nil, nil, self, person_index: @person_index),
     ]
   end
 end
diff --git a/app/models/form/sales/questions/student_not_child_value_check.rb b/app/models/form/sales/questions/person_student_not_child_value_check.rb
similarity index 80%
rename from app/models/form/sales/questions/student_not_child_value_check.rb
rename to app/models/form/sales/questions/person_student_not_child_value_check.rb
index b64b64a7f..e5983711e 100644
--- a/app/models/form/sales/questions/student_not_child_value_check.rb
+++ b/app/models/form/sales/questions/person_student_not_child_value_check.rb
@@ -1,4 +1,4 @@
-class Form::Sales::Questions::StudentNotChildValueCheck < ::Form::Question
+class Form::Sales::Questions::PersonStudentNotChildValueCheck < ::Form::Question
   def initialize(id, hsh, page, person_index:)
     super(id, hsh, page)
     @id = "student_not_child_value_check"
@@ -19,6 +19,6 @@ class Form::Sales::Questions::StudentNotChildValueCheck < ::Form::Question
       ],
     }
     @check_answers_card_number = person_index
-    @header = "Are you sure this person is not child?"
+    @header = "Are you sure this person is not a child?"
   end
 end
diff --git a/app/models/form/sales/subsections/household_characteristics.rb b/app/models/form/sales/subsections/household_characteristics.rb
index 72424ac8a..922d95edd 100644
--- a/app/models/form/sales/subsections/household_characteristics.rb
+++ b/app/models/form/sales/subsections/household_characteristics.rb
@@ -27,76 +27,76 @@ class Form::Sales::Subsections::HouseholdCharacteristics < ::Form::Subsection
       Form::Sales::Pages::Buyer1IncomeValueCheck.new("working_situation_buyer_1_income_value_check", nil, self),
       Form::Sales::Pages::Buyer1LiveInProperty.new(nil, nil, self),
       Form::Sales::Pages::Buyer2RelationshipToBuyer1.new(nil, nil, self),
-      Form::Sales::Pages::StudentNotChildValueCheck.new("buyer_2_relationship_student_not_child_value_check", nil, self, person_index: 2),
+      Form::Sales::Pages::PersonStudentNotChildValueCheck.new("buyer_2_relationship_student_not_child_value_check", nil, self, person_index: 2),
       Form::Sales::Pages::Age2.new(nil, nil, self),
       Form::Sales::Pages::OldPersonsSharedOwnershipValueCheck.new("age_2_old_persons_shared_ownership_value_check", nil, self),
       Form::Sales::Pages::RetirementValueCheck.new("age_2_buyer_retirement_value_check", nil, self, person_index: 2),
-      Form::Sales::Pages::StudentNotChildValueCheck.new("buyer_2_age_student_not_child_value_check", nil, self, person_index: 2),
+      Form::Sales::Pages::PersonStudentNotChildValueCheck.new("buyer_2_age_student_not_child_value_check", nil, self, person_index: 2),
       Form::Sales::Pages::GenderIdentity2.new(nil, nil, self),
       Form::Sales::Pages::RetirementValueCheck.new("gender_2_buyer_retirement_value_check", nil, self, person_index: 2),
       buyer_2_ethnicity_nationality_pages,
       Form::Sales::Pages::Buyer2WorkingSituation.new(nil, nil, self),
       Form::Sales::Pages::RetirementValueCheck.new("working_situation_2_retirement_value_check_joint_purchase", nil, self, person_index: 2),
       Form::Sales::Pages::Buyer2IncomeValueCheck.new("working_situation_buyer_2_income_value_check", nil, self),
-      Form::Sales::Pages::StudentNotChildValueCheck.new("buyer_2_working_situation_student_not_child_value_check", nil, self, person_index: 2),
+      Form::Sales::Pages::PersonStudentNotChildValueCheck.new("buyer_2_working_situation_student_not_child_value_check", nil, self, person_index: 2),
       Form::Sales::Pages::Buyer2LiveInProperty.new(nil, nil, self),
       Form::Sales::Pages::NumberOfOthersInProperty.new("number_of_others_in_property", nil, self, joint_purchase: false),
       Form::Sales::Pages::NumberOfOthersInProperty.new("number_of_others_in_property_joint_purchase", nil, self, joint_purchase: true),
       Form::Sales::Pages::PersonKnown.new("person_2_known", nil, self, person_index: 2),
       Form::Sales::Pages::PersonRelationshipToBuyer1.new("person_2_relationship_to_buyer_1", nil, self, person_index: 2),
-      Form::Sales::Pages::StudentNotChildValueCheck.new("relationship_2_student_not_child_value_check", nil, self, person_index: 2),
+      Form::Sales::Pages::PersonStudentNotChildValueCheck.new("relationship_2_student_not_child_value_check", nil, self, person_index: 2),
       Form::Sales::Pages::PersonAge.new("person_2_age", nil, self, person_index: 2),
       Form::Sales::Pages::RetirementValueCheck.new("age_2_retirement_value_check", nil, self, person_index: 2),
-      Form::Sales::Pages::StudentNotChildValueCheck.new("age_2_student_not_child_value_check", nil, self, person_index: 2),
+      Form::Sales::Pages::PersonStudentNotChildValueCheck.new("age_2_student_not_child_value_check", nil, self, person_index: 2),
       Form::Sales::Pages::PersonGenderIdentity.new("person_2_gender_identity", nil, self, person_index: 2),
       Form::Sales::Pages::RetirementValueCheck.new("gender_2_retirement_value_check", nil, self, person_index: 2),
       Form::Sales::Pages::PersonWorkingSituation.new("person_2_working_situation", nil, self, person_index: 2),
       Form::Sales::Pages::RetirementValueCheck.new("working_situation_2_retirement_value_check", nil, self, person_index: 2),
-      Form::Sales::Pages::StudentNotChildValueCheck.new("working_situation_2_student_not_child_value_check", nil, self, person_index: 2),
+      Form::Sales::Pages::PersonStudentNotChildValueCheck.new("working_situation_2_student_not_child_value_check", nil, self, person_index: 2),
       Form::Sales::Pages::PersonKnown.new("person_3_known", nil, self, person_index: 3),
       Form::Sales::Pages::PersonRelationshipToBuyer1.new("person_3_relationship_to_buyer_1", nil, self, person_index: 3),
-      Form::Sales::Pages::StudentNotChildValueCheck.new("relationship_3_student_not_child_value_check", nil, self, person_index: 3),
+      Form::Sales::Pages::PersonStudentNotChildValueCheck.new("relationship_3_student_not_child_value_check", nil, self, person_index: 3),
       Form::Sales::Pages::PersonAge.new("person_3_age", nil, self, person_index: 3),
       Form::Sales::Pages::RetirementValueCheck.new("age_3_retirement_value_check", nil, self, person_index: 3),
-      Form::Sales::Pages::StudentNotChildValueCheck.new("age_3_student_not_child_value_check", nil, self, person_index: 3),
+      Form::Sales::Pages::PersonStudentNotChildValueCheck.new("age_3_student_not_child_value_check", nil, self, person_index: 3),
       Form::Sales::Pages::PersonGenderIdentity.new("person_3_gender_identity", nil, self, person_index: 3),
       Form::Sales::Pages::RetirementValueCheck.new("gender_3_retirement_value_check", nil, self, person_index: 3),
       Form::Sales::Pages::PersonWorkingSituation.new("person_3_working_situation", nil, self, person_index: 3),
       Form::Sales::Pages::RetirementValueCheck.new("working_situation_3_retirement_value_check", nil, self, person_index: 3),
-      Form::Sales::Pages::StudentNotChildValueCheck.new("working_situation_3_student_not_child_value_check", nil, self, person_index: 3),
+      Form::Sales::Pages::PersonStudentNotChildValueCheck.new("working_situation_3_student_not_child_value_check", nil, self, person_index: 3),
       Form::Sales::Pages::PersonKnown.new("person_4_known", nil, self, person_index: 4),
       Form::Sales::Pages::PersonRelationshipToBuyer1.new("person_4_relationship_to_buyer_1", nil, self, person_index: 4),
-      Form::Sales::Pages::StudentNotChildValueCheck.new("relationship_4_student_not_child_value_check", nil, self, person_index: 4),
+      Form::Sales::Pages::PersonStudentNotChildValueCheck.new("relationship_4_student_not_child_value_check", nil, self, person_index: 4),
       Form::Sales::Pages::PersonAge.new("person_4_age", nil, self, person_index: 4),
       Form::Sales::Pages::RetirementValueCheck.new("age_4_retirement_value_check", nil, self, person_index: 4),
-      Form::Sales::Pages::StudentNotChildValueCheck.new("age_4_student_not_child_value_check", nil, self, person_index: 4),
+      Form::Sales::Pages::PersonStudentNotChildValueCheck.new("age_4_student_not_child_value_check", nil, self, person_index: 4),
       Form::Sales::Pages::PersonGenderIdentity.new("person_4_gender_identity", nil, self, person_index: 4),
       Form::Sales::Pages::RetirementValueCheck.new("gender_4_retirement_value_check", nil, self, person_index: 4),
       Form::Sales::Pages::PersonWorkingSituation.new("person_4_working_situation", nil, self, person_index: 4),
       Form::Sales::Pages::RetirementValueCheck.new("working_situation_4_retirement_value_check", nil, self, person_index: 4),
-      Form::Sales::Pages::StudentNotChildValueCheck.new("working_situation_4_student_not_child_value_check", nil, self, person_index: 4),
+      Form::Sales::Pages::PersonStudentNotChildValueCheck.new("working_situation_4_student_not_child_value_check", nil, self, person_index: 4),
       Form::Sales::Pages::PersonKnown.new("person_5_known", nil, self, person_index: 5),
       Form::Sales::Pages::PersonRelationshipToBuyer1.new("person_5_relationship_to_buyer_1", nil, self, person_index: 5),
-      Form::Sales::Pages::StudentNotChildValueCheck.new("relationship_5_student_not_child_value_check", nil, self, person_index: 5),
+      Form::Sales::Pages::PersonStudentNotChildValueCheck.new("relationship_5_student_not_child_value_check", nil, self, person_index: 5),
       Form::Sales::Pages::PersonAge.new("person_5_age", nil, self, person_index: 5),
       Form::Sales::Pages::RetirementValueCheck.new("age_5_retirement_value_check", nil, self, person_index: 5),
-      Form::Sales::Pages::StudentNotChildValueCheck.new("age_5_student_not_child_value_check", nil, self, person_index: 5),
+      Form::Sales::Pages::PersonStudentNotChildValueCheck.new("age_5_student_not_child_value_check", nil, self, person_index: 5),
       Form::Sales::Pages::PersonGenderIdentity.new("person_5_gender_identity", nil, self, person_index: 5),
       Form::Sales::Pages::RetirementValueCheck.new("gender_5_retirement_value_check", nil, self, person_index: 5),
       Form::Sales::Pages::PersonWorkingSituation.new("person_5_working_situation", nil, self, person_index: 5),
       Form::Sales::Pages::RetirementValueCheck.new("working_situation_5_retirement_value_check", nil, self, person_index: 5),
-      Form::Sales::Pages::StudentNotChildValueCheck.new("working_situation_5_student_not_child_value_check", nil, self, person_index: 5),
+      Form::Sales::Pages::PersonStudentNotChildValueCheck.new("working_situation_5_student_not_child_value_check", nil, self, person_index: 5),
       Form::Sales::Pages::PersonKnown.new("person_6_known", nil, self, person_index: 6),
       Form::Sales::Pages::PersonRelationshipToBuyer1.new("person_6_relationship_to_buyer_1", nil, self, person_index: 6),
-      Form::Sales::Pages::StudentNotChildValueCheck.new("relationship_6_student_not_child_value_check", nil, self, person_index: 6),
+      Form::Sales::Pages::PersonStudentNotChildValueCheck.new("relationship_6_student_not_child_value_check", nil, self, person_index: 6),
       Form::Sales::Pages::PersonAge.new("person_6_age", nil, self, person_index: 6),
       Form::Sales::Pages::RetirementValueCheck.new("age_6_retirement_value_check", nil, self, person_index: 6),
-      Form::Sales::Pages::StudentNotChildValueCheck.new("age_6_student_not_child_value_check", nil, self, person_index: 6),
+      Form::Sales::Pages::PersonStudentNotChildValueCheck.new("age_6_student_not_child_value_check", nil, self, person_index: 6),
       Form::Sales::Pages::PersonGenderIdentity.new("person_6_gender_identity", nil, self, person_index: 6),
       Form::Sales::Pages::RetirementValueCheck.new("gender_6_retirement_value_check", nil, self, person_index: 6),
       Form::Sales::Pages::PersonWorkingSituation.new("person_6_working_situation", nil, self, person_index: 6),
       Form::Sales::Pages::RetirementValueCheck.new("working_situation_6_retirement_value_check", nil, self, person_index: 6),
-      Form::Sales::Pages::StudentNotChildValueCheck.new("working_situation_6_student_not_child_value_check", nil, self, person_index: 6),
+      Form::Sales::Pages::PersonStudentNotChildValueCheck.new("working_situation_6_student_not_child_value_check", nil, self, person_index: 6),
     ].flatten.compact
   end
 
diff --git a/spec/models/form/sales/pages/student_not_child_value_check_spec.rb b/spec/models/form/sales/pages/person_student_not_child_value_check_spec.rb
similarity index 96%
rename from spec/models/form/sales/pages/student_not_child_value_check_spec.rb
rename to spec/models/form/sales/pages/person_student_not_child_value_check_spec.rb
index f04b0195a..3499cda9f 100644
--- a/spec/models/form/sales/pages/student_not_child_value_check_spec.rb
+++ b/spec/models/form/sales/pages/person_student_not_child_value_check_spec.rb
@@ -1,6 +1,6 @@
 require "rails_helper"
 
-RSpec.describe Form::Sales::Pages::StudentNotChildValueCheck, type: :model do
+RSpec.describe Form::Sales::Pages::PersonStudentNotChildValueCheck, type: :model do
   subject(:page) { described_class.new(page_id, page_definition, subsection, person_index:) }
 
   let(:page_definition) { nil }
diff --git a/spec/models/form/sales/questions/student_not_child_value_check_spec.rb b/spec/models/form/sales/questions/person_student_not_child_value_check_spec.rb
similarity index 94%
rename from spec/models/form/sales/questions/student_not_child_value_check_spec.rb
rename to spec/models/form/sales/questions/person_student_not_child_value_check_spec.rb
index 72b98285f..2b33a91ed 100644
--- a/spec/models/form/sales/questions/student_not_child_value_check_spec.rb
+++ b/spec/models/form/sales/questions/person_student_not_child_value_check_spec.rb
@@ -1,6 +1,6 @@
 require "rails_helper"
 
-RSpec.describe Form::Sales::Questions::StudentNotChildValueCheck, type: :model do
+RSpec.describe Form::Sales::Questions::PersonStudentNotChildValueCheck, type: :model do
   subject(:question) { described_class.new(question_id, question_definition, page, person_index: 1) }
 
   let(:question_id) { nil }