diff --git a/app/models/form/lettings/pages/first_time_property_let_as_social_housing.rb b/app/models/form/lettings/pages/first_time_property_let_as_social_housing.rb
index a859f9ce1..eafb145b5 100644
--- a/app/models/form/lettings/pages/first_time_property_let_as_social_housing.rb
+++ b/app/models/form/lettings/pages/first_time_property_let_as_social_housing.rb
@@ -2,7 +2,7 @@ class Form::Lettings::Pages::FirstTimePropertyLetAsSocialHousing < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "first_time_property_let_as_social_housing"
-    @depends_on = [{ "not_renewal?" => true }]
+    @depends_on = [{ "is_renewal?" => false }]
   end
 
   def questions
diff --git a/app/models/form/lettings/pages/new_build_handover_date.rb b/app/models/form/lettings/pages/new_build_handover_date.rb
index cbbafb61a..e7cb2e5d9 100644
--- a/app/models/form/lettings/pages/new_build_handover_date.rb
+++ b/app/models/form/lettings/pages/new_build_handover_date.rb
@@ -2,7 +2,7 @@ class Form::Lettings::Pages::NewBuildHandoverDate < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "new_build_handover_date"
-    @depends_on = [{ "not_renewal?" => true, "has_first_let_vacancy_reason?" => true }]
+    @depends_on = [{ "is_renewal?" => false, "has_first_let_vacancy_reason?" => true }]
   end
 
   def questions
diff --git a/app/models/form/lettings/pages/property_let_type.rb b/app/models/form/lettings/pages/property_let_type.rb
index 3f9011c99..6bdb94803 100644
--- a/app/models/form/lettings/pages/property_let_type.rb
+++ b/app/models/form/lettings/pages/property_let_type.rb
@@ -2,7 +2,7 @@ class Form::Lettings::Pages::PropertyLetType < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "property_let_type"
-    @depends_on = [{ "first_time_property_let_as_social_housing" => 0, "renewal" => 0 }]
+    @depends_on = [{ "first_time_property_let_as_social_housing" => 0, "is_renewal?" => false }]
   end
 
   def questions
diff --git a/app/models/form/lettings/pages/property_major_repairs.rb b/app/models/form/lettings/pages/property_major_repairs.rb
index a1f415b4e..985b5dce1 100644
--- a/app/models/form/lettings/pages/property_major_repairs.rb
+++ b/app/models/form/lettings/pages/property_major_repairs.rb
@@ -2,7 +2,7 @@ class Form::Lettings::Pages::PropertyMajorRepairs < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "property_major_repairs"
-    @depends_on = [{ "not_renewal?" => true, "vacancy_reason_not_renewal_or_first_let?" => true }]
+    @depends_on = [{ "is_renewal?" => false, "vacancy_reason_not_renewal_or_first_let?" => true }]
   end
 
   def questions
diff --git a/app/models/form/lettings/pages/property_number_of_times_relet_not_social_let.rb b/app/models/form/lettings/pages/property_number_of_times_relet_not_social_let.rb
index d553c919c..b82a4757e 100644
--- a/app/models/form/lettings/pages/property_number_of_times_relet_not_social_let.rb
+++ b/app/models/form/lettings/pages/property_number_of_times_relet_not_social_let.rb
@@ -2,7 +2,7 @@ class Form::Lettings::Pages::PropertyNumberOfTimesReletNotSocialLet < ::Form::Pa
   def initialize(id, hsh, subsection)
     super
     @id = "property_number_of_times_relet_not_social_let"
-    @depends_on = [{ "first_time_property_let_as_social_housing" => 0, "not_renewal?" => true }]
+    @depends_on = [{ "first_time_property_let_as_social_housing" => 0, "is_renewal?" => false }]
   end
 
   def questions
diff --git a/app/models/form/lettings/pages/property_number_of_times_relet_social_let.rb b/app/models/form/lettings/pages/property_number_of_times_relet_social_let.rb
index e2c2365b8..5785a2961 100644
--- a/app/models/form/lettings/pages/property_number_of_times_relet_social_let.rb
+++ b/app/models/form/lettings/pages/property_number_of_times_relet_social_let.rb
@@ -2,7 +2,7 @@ class Form::Lettings::Pages::PropertyNumberOfTimesReletSocialLet < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "property_number_of_times_relet_social_let"
-    @depends_on = [{ "first_time_property_let_as_social_housing" => 1, "not_renewal?" => true }]
+    @depends_on = [{ "first_time_property_let_as_social_housing" => 1, "is_renewal?" => false }]
   end
 
   def questions
diff --git a/app/models/form/lettings/pages/property_vacancy_reason_first_let.rb b/app/models/form/lettings/pages/property_vacancy_reason_first_let.rb
index 79679dfd9..85dd5d690 100644
--- a/app/models/form/lettings/pages/property_vacancy_reason_first_let.rb
+++ b/app/models/form/lettings/pages/property_vacancy_reason_first_let.rb
@@ -2,7 +2,7 @@ class Form::Lettings::Pages::PropertyVacancyReasonFirstLet < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "property_vacancy_reason_first_let"
-    @depends_on = [{ "first_time_property_let_as_social_housing" => 1, "not_renewal?" => true }]
+    @depends_on = [{ "first_time_property_let_as_social_housing" => 1, "is_renewal?" => false }]
   end
 
   def questions
diff --git a/app/models/form/lettings/pages/property_vacancy_reason_not_first_let.rb b/app/models/form/lettings/pages/property_vacancy_reason_not_first_let.rb
index c76067626..4fdf7fef5 100644
--- a/app/models/form/lettings/pages/property_vacancy_reason_not_first_let.rb
+++ b/app/models/form/lettings/pages/property_vacancy_reason_not_first_let.rb
@@ -2,7 +2,7 @@ class Form::Lettings::Pages::PropertyVacancyReasonNotFirstLet < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "property_vacancy_reason_not_first_let"
-    @depends_on = [{ "first_time_property_let_as_social_housing" => 0, "not_renewal?" => true }]
+    @depends_on = [{ "first_time_property_let_as_social_housing" => 0, "is_renewal?" => false }]
   end
 
   def questions
diff --git a/app/models/form/lettings/pages/void_or_renewal_date.rb b/app/models/form/lettings/pages/void_or_renewal_date.rb
index 9b42e15b2..0905f1058 100644
--- a/app/models/form/lettings/pages/void_or_renewal_date.rb
+++ b/app/models/form/lettings/pages/void_or_renewal_date.rb
@@ -2,7 +2,7 @@ class Form::Lettings::Pages::VoidOrRenewalDate < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "void_or_renewal_date"
-    @depends_on = [{ "not_renewal?" => true, "vacancy_reason_not_renewal_or_first_let?" => true }]
+    @depends_on = [{ "is_renewal?" => false, "vacancy_reason_not_renewal_or_first_let?" => true }]
   end
 
   def questions