diff --git a/db/schema.rb b/db/schema.rb
index 77ad1f3ea..53dbf448b 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -519,6 +519,7 @@ ActiveRecord::Schema[7.0].define(version: 2023_04_12_143245) do
     t.integer "prevten"
     t.integer "mortgageused"
     t.integer "wchair"
+    t.integer "income2_value_check"
     t.integer "armedforcesspouse"
     t.datetime "hodate", precision: nil
     t.integer "hoday"
@@ -543,14 +544,13 @@ ActiveRecord::Schema[7.0].define(version: 2023_04_12_143245) do
     t.integer "retirement_value_check"
     t.integer "hodate_check"
     t.integer "extrabor_value_check"
-    t.integer "grant_value_check"
-    t.integer "staircase_bought_value_check"
     t.integer "deposit_and_mortgage_value_check"
     t.integer "shared_ownership_deposit_value_check"
+    t.integer "grant_value_check"
+    t.integer "value_value_check"
     t.integer "old_persons_shared_ownership_value_check"
-    t.integer "income2_value_check"
+    t.integer "staircase_bought_value_check"
     t.integer "monthly_charges_value_check"
-    t.integer "value_value_check"
     t.integer "details_known_5"
     t.integer "details_known_6"
     t.integer "saledate_check"
@@ -560,10 +560,9 @@ ActiveRecord::Schema[7.0].define(version: 2023_04_12_143245) do
     t.integer "ethnicbuy2"
     t.integer "proplen_asked"
     t.string "old_id"
-    t.integer "pregblank"
     t.integer "buy2living"
     t.integer "prevtenbuy2"
-    t.integer "nationalbuy2"
+    t.integer "pregblank"
     t.string "uprn"
     t.integer "uprn_known"
     t.integer "uprn_confirmed"
@@ -571,6 +570,7 @@ ActiveRecord::Schema[7.0].define(version: 2023_04_12_143245) do
     t.string "address_line2"
     t.string "town_or_city"
     t.string "county"
+    t.integer "nationalbuy2"
     t.integer "discounted_sale_value_check"
     t.integer "student_not_child_value_check"
     t.index ["bulk_upload_id"], name: "index_sales_logs_on_bulk_upload_id"
diff --git a/spec/models/form/lettings/subsections/income_and_benefits_spec.rb b/spec/models/form/lettings/subsections/income_and_benefits_spec.rb
index 8dd4f88a3..e914ccc6a 100644
--- a/spec/models/form/lettings/subsections/income_and_benefits_spec.rb
+++ b/spec/models/form/lettings/subsections/income_and_benefits_spec.rb
@@ -30,8 +30,8 @@ RSpec.describe Form::Lettings::Subsections::IncomeAndBenefits, type: :model do
         rent_bi_weekly
         rent_4_weekly
         rent_monthly
-        min_rent_value_check
-        max_rent_value_check
+        brent_min_rent_value_check
+        brent_max_rent_value_check
         outstanding
         outstanding_amount
       ],
diff --git a/spec/models/form/lettings/subsections/property_information_spec.rb b/spec/models/form/lettings/subsections/property_information_spec.rb
index 833522ecd..48178e797 100644
--- a/spec/models/form/lettings/subsections/property_information_spec.rb
+++ b/spec/models/form/lettings/subsections/property_information_spec.rb
@@ -54,8 +54,8 @@ RSpec.describe Form::Lettings::Subsections::PropertyInformation, type: :model do
             uprn_confirmation
             address
             property_local_authority
-            min_rent_value_check
-            max_rent_value_check
+            local_authority_min_rent_value_check
+            local_authority_max_rent_value_check
             first_time_property_let_as_social_housing
             property_let_type
             property_vacancy_reason_not_first_let
@@ -66,8 +66,8 @@ RSpec.describe Form::Lettings::Subsections::PropertyInformation, type: :model do
             property_building_type
             property_wheelchair_accessible
             property_number_of_bedrooms
-            min_rent_value_check
-            max_rent_value_check
+            beds_min_rent_value_check
+            beds_max_rent_value_check
             void_date
             void_date_value_check
             property_major_repairs
diff --git a/spec/models/form/lettings/subsections/setup_spec.rb b/spec/models/form/lettings/subsections/setup_spec.rb
index 9276a463b..00f9b5904 100644
--- a/spec/models/form/lettings/subsections/setup_spec.rb
+++ b/spec/models/form/lettings/subsections/setup_spec.rb
@@ -15,22 +15,22 @@ RSpec.describe Form::Lettings::Subsections::Setup, type: :model do
     expect(setup.pages.map(&:id)).to eq(
       %w[
         stock_owner
-        min_rent_value_check
-        max_rent_value_check
+        stock_owner_min_rent_value_check
+        stock_owner_max_rent_value_check
         managing_organisation
         created_by
         needs_type
         scheme
         location
-        min_rent_value_check
-        max_rent_value_check
+        needs_type_min_rent_value_check
+        needs_type_max_rent_value_check
         renewal
         tenancy_start_date
-        min_rent_value_check
-        max_rent_value_check
+        start_date_min_rent_value_check
+        start_date_max_rent_value_check
         rent_type
-        min_rent_value_check
-        max_rent_value_check
+        rent_type_min_rent_value_check
+        rent_type_max_rent_value_check
         tenant_code
         property_reference
       ],
@@ -50,22 +50,22 @@ RSpec.describe Form::Lettings::Subsections::Setup, type: :model do
       expect(setup.pages.map(&:id)).to eq(
         %w[
           stock_owner
-          min_rent_value_check
-          max_rent_value_check
+          stock_owner_min_rent_value_check
+          stock_owner_max_rent_value_check
           managing_organisation
           created_by
           needs_type
           scheme
           location
-          min_rent_value_check
-          max_rent_value_check
+          needs_type_min_rent_value_check
+          needs_type_max_rent_value_check
           renewal
           tenancy_start_date
-          min_rent_value_check
-          max_rent_value_check
+          start_date_min_rent_value_check
+          start_date_max_rent_value_check
           rent_type
-          min_rent_value_check
-          max_rent_value_check
+          rent_type_min_rent_value_check
+          rent_type_max_rent_value_check
           tenant_code
           property_reference
         ],