diff --git a/app/models/form/lettings/pages/person_age.rb b/app/models/form/lettings/pages/person_age.rb
index 525341266..bbb5da01e 100644
--- a/app/models/form/lettings/pages/person_age.rb
+++ b/app/models/form/lettings/pages/person_age.rb
@@ -1,13 +1,13 @@
 class Form::Lettings::Pages::PersonAge < ::Form::Page
-  def initialize(id, hsh, subsection, person_index:, is_child:)
+  def initialize(id, hsh, subsection, person_index:, person_type: "non_child")
     super(id, hsh, subsection)
-    @id = is_child ? "person_#{person_index}_age_child" : "person_#{person_index}_age_non_child"
+    @id = "person_#{person_index}_age_#{person_type}"
     @person_index = person_index
-    @is_child = is_child
+    @person_type = person_type
     @depends_on = [
       {
         "details_known_#{person_index}" => 0,
-        "person_#{person_index}_child_relation?" => is_child,
+        "person_#{person_index}_child_relation?" => (person_type == "child"),
       },
     ]
   end
@@ -15,7 +15,7 @@ class Form::Lettings::Pages::PersonAge < ::Form::Page
   def questions
     @questions ||= [
       Form::Lettings::Questions::AgeKnown.new(nil, nil, self, person_index: @person_index),
-      Form::Lettings::Questions::Age.new(nil, nil, self, person_index: @person_index, is_child: @is_child),
+      Form::Lettings::Questions::Age.new(nil, nil, self, person_index: @person_index, person_type: @person_type),
     ]
   end
 end
diff --git a/app/models/form/lettings/questions/age.rb b/app/models/form/lettings/questions/age.rb
index 95fad10fa..82975ebb7 100644
--- a/app/models/form/lettings/questions/age.rb
+++ b/app/models/form/lettings/questions/age.rb
@@ -1,5 +1,5 @@
 class Form::Lettings::Questions::Age < ::Form::Question
-  def initialize(id, hsh, page, person_index:, is_child:)
+  def initialize(id, hsh, page, person_index:, person_type:)
     super(id, hsh, page)
     @id = "age#{person_index}"
     @check_answer_label = "Person #{person_index}’s age"
@@ -11,6 +11,6 @@ class Form::Lettings::Questions::Age < ::Form::Question
     @max = 120
     @min = 1
     @step = 1
-    @hint_text = "For a child under 1, enter 1" if is_child
+    @hint_text = "For a child under 1, enter 1" if person_type == "child"
   end
 end
diff --git a/app/models/form/lettings/subsections/household_characteristics.rb b/app/models/form/lettings/subsections/household_characteristics.rb
index 0d9201f67..9fc6948bd 100644
--- a/app/models/form/lettings/subsections/household_characteristics.rb
+++ b/app/models/form/lettings/subsections/household_characteristics.rb
@@ -30,8 +30,8 @@ class Form::Lettings::Subsections::HouseholdCharacteristics < ::Form::Subsection
       Form::Lettings::Pages::LeadTenantOverRetirementValueCheck.new(nil, nil, self),
       Form::Lettings::Pages::PersonKnown.new(nil, nil, self, person_index: 2),
       Form::Lettings::Pages::PersonRelationshipToLead.new(nil, nil, self, person_index: 2),
-      Form::Lettings::Pages::PersonAge.new(nil, nil, self, person_index: 2, is_child: true),
-      Form::Lettings::Pages::PersonAge.new(nil, nil, self, person_index: 2, is_child: false),
+      Form::Lettings::Pages::PersonAge.new(nil, nil, self, person_index: 2, person_type: "child"),
+      Form::Lettings::Pages::PersonAge.new(nil, nil, self, person_index: 2),
       Form::Lettings::Pages::NoFemalesPregnantHouseholdPersonAgeValueCheck.new(nil, nil, self,
                                                                                person_index: 2),
       Form::Lettings::Pages::FemalesInSoftAgeRangeInPregnantHouseholdPersonAgeValueCheck.new(nil, nil, self,
@@ -45,8 +45,8 @@ class Form::Lettings::Subsections::HouseholdCharacteristics < ::Form::Subsection
       Form::Lettings::Pages::PersonOverRetirementValueCheck.new(nil, nil, self, person_index: 2),
       Form::Lettings::Pages::PersonKnown.new(nil, nil, self, person_index: 3),
       Form::Lettings::Pages::PersonRelationshipToLead.new(nil, nil, self, person_index: 3),
-      Form::Lettings::Pages::PersonAge.new(nil, nil, self, person_index: 3, is_child: true),
-      Form::Lettings::Pages::PersonAge.new(nil, nil, self, person_index: 3, is_child: false),
+      Form::Lettings::Pages::PersonAge.new(nil, nil, self, person_index: 3, person_type: "child"),
+      Form::Lettings::Pages::PersonAge.new(nil, nil, self, person_index: 3),
       Form::Lettings::Pages::NoFemalesPregnantHouseholdPersonAgeValueCheck.new(nil, nil, self,
                                                                                person_index: 3),
       Form::Lettings::Pages::FemalesInSoftAgeRangeInPregnantHouseholdPersonAgeValueCheck.new(nil, nil, self,
@@ -60,8 +60,8 @@ class Form::Lettings::Subsections::HouseholdCharacteristics < ::Form::Subsection
       Form::Lettings::Pages::PersonOverRetirementValueCheck.new(nil, nil, self, person_index: 3),
       Form::Lettings::Pages::PersonKnown.new(nil, nil, self, person_index: 4),
       Form::Lettings::Pages::PersonRelationshipToLead.new(nil, nil, self, person_index: 4),
-      Form::Lettings::Pages::PersonAge.new(nil, nil, self, person_index: 4, is_child: true),
-      Form::Lettings::Pages::PersonAge.new(nil, nil, self, person_index: 4, is_child: false),
+      Form::Lettings::Pages::PersonAge.new(nil, nil, self, person_index: 4, person_type: "child"),
+      Form::Lettings::Pages::PersonAge.new(nil, nil, self, person_index: 4),
       Form::Lettings::Pages::NoFemalesPregnantHouseholdPersonAgeValueCheck.new(nil, nil, self,
                                                                                person_index: 4),
       Form::Lettings::Pages::FemalesInSoftAgeRangeInPregnantHouseholdPersonAgeValueCheck.new(nil, nil, self,
@@ -75,8 +75,8 @@ class Form::Lettings::Subsections::HouseholdCharacteristics < ::Form::Subsection
       Form::Lettings::Pages::PersonOverRetirementValueCheck.new(nil, nil, self, person_index: 4),
       Form::Lettings::Pages::PersonKnown.new(nil, nil, self, person_index: 5),
       Form::Lettings::Pages::PersonRelationshipToLead.new(nil, nil, self, person_index: 5),
-      Form::Lettings::Pages::PersonAge.new(nil, nil, self, person_index: 5, is_child: true),
-      Form::Lettings::Pages::PersonAge.new(nil, nil, self, person_index: 5, is_child: false),
+      Form::Lettings::Pages::PersonAge.new(nil, nil, self, person_index: 5, person_type: "child"),
+      Form::Lettings::Pages::PersonAge.new(nil, nil, self, person_index: 5),
       Form::Lettings::Pages::NoFemalesPregnantHouseholdPersonAgeValueCheck.new(nil, nil, self,
                                                                                person_index: 5),
       Form::Lettings::Pages::FemalesInSoftAgeRangeInPregnantHouseholdPersonAgeValueCheck.new(nil, nil, self,
@@ -90,8 +90,8 @@ class Form::Lettings::Subsections::HouseholdCharacteristics < ::Form::Subsection
       Form::Lettings::Pages::PersonOverRetirementValueCheck.new(nil, nil, self, person_index: 5),
       Form::Lettings::Pages::PersonKnown.new(nil, nil, self, person_index: 6),
       Form::Lettings::Pages::PersonRelationshipToLead.new(nil, nil, self, person_index: 6),
-      Form::Lettings::Pages::PersonAge.new(nil, nil, self, person_index: 6, is_child: true),
-      Form::Lettings::Pages::PersonAge.new(nil, nil, self, person_index: 6, is_child: false),
+      Form::Lettings::Pages::PersonAge.new(nil, nil, self, person_index: 6, person_type: "child"),
+      Form::Lettings::Pages::PersonAge.new(nil, nil, self, person_index: 6),
       Form::Lettings::Pages::NoFemalesPregnantHouseholdPersonAgeValueCheck.new(nil, nil, self,
                                                                                person_index: 6),
       Form::Lettings::Pages::FemalesInSoftAgeRangeInPregnantHouseholdPersonAgeValueCheck.new(nil, nil, self,
@@ -105,8 +105,8 @@ class Form::Lettings::Subsections::HouseholdCharacteristics < ::Form::Subsection
       Form::Lettings::Pages::PersonOverRetirementValueCheck.new(nil, nil, self, person_index: 6),
       Form::Lettings::Pages::PersonKnown.new(nil, nil, self, person_index: 7),
       Form::Lettings::Pages::PersonRelationshipToLead.new(nil, nil, self, person_index: 7),
-      Form::Lettings::Pages::PersonAge.new(nil, nil, self, person_index: 7, is_child: true),
-      Form::Lettings::Pages::PersonAge.new(nil, nil, self, person_index: 7, is_child: false),
+      Form::Lettings::Pages::PersonAge.new(nil, nil, self, person_index: 7, person_type: "child"),
+      Form::Lettings::Pages::PersonAge.new(nil, nil, self, person_index: 7),
       Form::Lettings::Pages::NoFemalesPregnantHouseholdPersonAgeValueCheck.new(nil, nil, self,
                                                                                person_index: 7),
       Form::Lettings::Pages::FemalesInSoftAgeRangeInPregnantHouseholdPersonAgeValueCheck.new(nil, nil, self,
@@ -120,8 +120,8 @@ class Form::Lettings::Subsections::HouseholdCharacteristics < ::Form::Subsection
       Form::Lettings::Pages::PersonOverRetirementValueCheck.new(nil, nil, self, person_index: 7),
       Form::Lettings::Pages::PersonKnown.new(nil, nil, self, person_index: 8),
       Form::Lettings::Pages::PersonRelationshipToLead.new(nil, nil, self, person_index: 8),
-      Form::Lettings::Pages::PersonAge.new(nil, nil, self, person_index: 8, is_child: true),
-      Form::Lettings::Pages::PersonAge.new(nil, nil, self, person_index: 8, is_child: false),
+      Form::Lettings::Pages::PersonAge.new(nil, nil, self, person_index: 8, person_type: "child"),
+      Form::Lettings::Pages::PersonAge.new(nil, nil, self, person_index: 8),
       Form::Lettings::Pages::NoFemalesPregnantHouseholdPersonAgeValueCheck.new(nil, nil, self,
                                                                                person_index: 8),
       Form::Lettings::Pages::FemalesInSoftAgeRangeInPregnantHouseholdPersonAgeValueCheck.new(nil, nil, self,