diff --git a/app/controllers/planning_applications/review/base_controller.rb b/app/controllers/planning_applications/review/base_controller.rb
index 92e3b17b2a..c577c5ab62 100644
--- a/app/controllers/planning_applications/review/base_controller.rb
+++ b/app/controllers/planning_applications/review/base_controller.rb
@@ -39,6 +39,10 @@ def redirect_failed_create_error(error)
         redirect_to planning_application_review_tasks_path(@planning_application), alert: Array.wrap(error).to_sentence
       end
 
+      def redirect_to_review_tasks
+        redirect_to planning_application_review_tasks_path(@planning_application)
+      end
+
       def render_review_tasks
         set_planning_application_constraints
         set_neighbour_review
diff --git a/app/controllers/planning_applications/review/cil_liability_controller.rb b/app/controllers/planning_applications/review/cil_liability_controller.rb
index a2eb2ef9de..e006a7bd56 100644
--- a/app/controllers/planning_applications/review/cil_liability_controller.rb
+++ b/app/controllers/planning_applications/review/cil_liability_controller.rb
@@ -9,7 +9,7 @@ def update
         @previous_decision = @planning_application.cil_liable
         if @planning_application.update(cil_liability_params)
           record_audit_for_cil_liability!
-          redirect_to planning_application_review_tasks_path(@planning_application), notice: t(".success")
+          redirect_to planning_application_review_tasks_path(@planning_application, anchor: "review-cil-liability"), notice: t(".success")
         else
           render :edit
         end
@@ -47,10 +47,6 @@ def activity_information
         end
       end
 
-      def redirect_to_review_tasks
-        redirect_to planning_application_review_tasks_path(@planning_application)
-      end
-
       def cil_feature?
         @planning_application.application_type.cil?
       end
diff --git a/app/controllers/planning_applications/review/committee_decisions_controller.rb b/app/controllers/planning_applications/review/committee_decisions_controller.rb
index 07f32fc97c..c6dfff9337 100644
--- a/app/controllers/planning_applications/review/committee_decisions_controller.rb
+++ b/app/controllers/planning_applications/review/committee_decisions_controller.rb
@@ -15,7 +15,7 @@ def update
         respond_to do |format|
           format.html do
             if @committee_decision.update(committee_decision_params)
-              redirect_to planning_application_review_tasks_path(@planning_application), notice: t(".success")
+              redirect_to planning_application_review_tasks_path(@planning_application, anchor: "recommendation_to_committee_section"), notice: t(".success")
             else
               flash.now[:alert] = @committee_decision.errors.messages.values.flatten.join(", ")
               render_review_tasks
diff --git a/app/controllers/planning_applications/review/conditions_controller.rb b/app/controllers/planning_applications/review/conditions_controller.rb
index 366f521fc0..c46a9dccbe 100644
--- a/app/controllers/planning_applications/review/conditions_controller.rb
+++ b/app/controllers/planning_applications/review/conditions_controller.rb
@@ -9,7 +9,7 @@ def update
         respond_to do |format|
           format.html do
             if @condition_set.update(condition_set_review_params)
-              redirect_to planning_application_review_tasks_path(@planning_application),
+              redirect_to planning_application_review_tasks_path(@planning_application, anchor: "review-conditions"),
                 notice: I18n.t("review.conditions.update.success")
             else
               flash.now[:alert] = @condition_set.errors.messages.values.flatten.join(", ")
diff --git a/app/controllers/planning_applications/review/considerations/items_controller.rb b/app/controllers/planning_applications/review/considerations/items_controller.rb
index b293d8eb78..4b135bfa67 100644
--- a/app/controllers/planning_applications/review/considerations/items_controller.rb
+++ b/app/controllers/planning_applications/review/considerations/items_controller.rb
@@ -17,7 +17,7 @@ def update
           respond_to do |format|
             format.html do
               if @consideration.update(consideration_params)
-                redirect_to planning_application_review_tasks_path(@planning_application), notice: t(".success")
+                redirect_to planning_application_review_tasks_path(@planning_application, anchor: "considerations_section"), notice: t(".success")
               else
                 render :edit
               end
diff --git a/app/controllers/planning_applications/review/considerations_controller.rb b/app/controllers/planning_applications/review/considerations_controller.rb
index 2f393f51f0..1f2982e29c 100644
--- a/app/controllers/planning_applications/review/considerations_controller.rb
+++ b/app/controllers/planning_applications/review/considerations_controller.rb
@@ -17,7 +17,7 @@ def update
         respond_to do |format|
           format.html do
             if @review.update(review_params)
-              redirect_to planning_application_review_tasks_path(@planning_application), notice: t(".success")
+              redirect_to planning_application_review_tasks_path(@planning_application, anchor: "review-considerations"), notice: t(".success")
             else
               flash.now[:alert] = @review.errors.messages.values.flatten.join(", ")
               render_review_tasks
@@ -45,10 +45,6 @@ def review_params
           .permit(:action, :comment, :review_status)
           .merge(reviewer: current_user, reviewed_at: Time.current)
       end
-
-      def redirect_to_review_tasks
-        redirect_to planning_application_review_tasks_path(@planning_application)
-      end
     end
   end
 end
diff --git a/app/controllers/planning_applications/review/heads_of_terms_controller.rb b/app/controllers/planning_applications/review/heads_of_terms_controller.rb
index 990d3b820a..ff095514d0 100644
--- a/app/controllers/planning_applications/review/heads_of_terms_controller.rb
+++ b/app/controllers/planning_applications/review/heads_of_terms_controller.rb
@@ -7,7 +7,7 @@ def update
         respond_to do |format|
           format.html do
             if heads_of_term.update(review_params)
-              redirect_to planning_application_review_tasks_path(@planning_application),
+              redirect_to planning_application_review_tasks_path(@planning_application, anchor: "review-heads-of-terms"),
                 notice: I18n.t("review.heads_of_terms.update.success")
             else
               flash.now[:alert] = heads_of_term.errors.messages.values.flatten.join(", ")
diff --git a/app/controllers/planning_applications/review/immunity_details_controller.rb b/app/controllers/planning_applications/review/immunity_details_controller.rb
index 343db014db..71ad9fc440 100644
--- a/app/controllers/planning_applications/review/immunity_details_controller.rb
+++ b/app/controllers/planning_applications/review/immunity_details_controller.rb
@@ -16,7 +16,7 @@ def update
         respond_to do |format|
           format.html do
             if @review_immunity_detail.update(review_immunity_detail_params)
-              redirect_to planning_application_review_tasks_path(@planning_application),
+              redirect_to planning_application_review_tasks_path(@planning_application, anchor: "review-immunity-details"),
                 notice: I18n.t("planning_applications.review..immunity_details.successfully_updated")
             else
               flash.now[:alert] = @review_immunity_detail.errors.messages.values.flatten.join(", ")
diff --git a/app/controllers/planning_applications/review/immunity_enforcements_controller.rb b/app/controllers/planning_applications/review/immunity_enforcements_controller.rb
index c59eacce68..aa57356a41 100644
--- a/app/controllers/planning_applications/review/immunity_enforcements_controller.rb
+++ b/app/controllers/planning_applications/review/immunity_enforcements_controller.rb
@@ -13,7 +13,7 @@ def update
         respond_to do |format|
           format.html do
             if @review_immunity_detail.update(review_immunity_detail_params)
-              redirect_to planning_application_review_tasks_path(@planning_application),
+              redirect_to planning_application_review_tasks_path(@planning_application, anchor: "review-immunity-enforcements"),
                 notice: I18n.t("review_immunity_enforcements.successfully_updated")
             else
               flash.now[:alert] = @review_immunity_detail.errors.messages.values.flatten.join(", ")
diff --git a/app/controllers/planning_applications/review/informatives/items_controller.rb b/app/controllers/planning_applications/review/informatives/items_controller.rb
index 23103358c6..96ddb59e0b 100644
--- a/app/controllers/planning_applications/review/informatives/items_controller.rb
+++ b/app/controllers/planning_applications/review/informatives/items_controller.rb
@@ -17,7 +17,7 @@ def update
           respond_to do |format|
             format.html do
               if @informative.update(informative_params)
-                redirect_to planning_application_review_tasks_path(@planning_application), notice: t(".success")
+                redirect_to planning_application_review_tasks_path(@planning_application, anchor: "review-informatives"), notice: t(".success")
               else
                 render :edit
               end
diff --git a/app/controllers/planning_applications/review/informatives_controller.rb b/app/controllers/planning_applications/review/informatives_controller.rb
index a68cdb8c7e..9f72afbc88 100644
--- a/app/controllers/planning_applications/review/informatives_controller.rb
+++ b/app/controllers/planning_applications/review/informatives_controller.rb
@@ -19,7 +19,7 @@ def update
         respond_to do |format|
           format.html do
             if @review.update(review_params)
-              redirect_to planning_application_review_tasks_path(@planning_application), notice: t(".success")
+              redirect_to planning_application_review_tasks_path(@planning_application, anchor: "review-informatives"), notice: t(".success")
             else
               flash.now[:alert] = @review.errors.messages.values.flatten.join(", ")
               render_review_tasks
@@ -48,10 +48,6 @@ def review_params
           .merge(reviewer: current_user, reviewed_at: Time.current)
       end
 
-      def redirect_to_review_tasks
-        redirect_to planning_application_review_tasks_path(@planning_application)
-      end
-
       def informatives_not_started?
         @review.not_started?
       end
diff --git a/app/controllers/planning_applications/review/neighbour_responses_controller.rb b/app/controllers/planning_applications/review/neighbour_responses_controller.rb
index 8db1ecf6c4..67f8f761c2 100644
--- a/app/controllers/planning_applications/review/neighbour_responses_controller.rb
+++ b/app/controllers/planning_applications/review/neighbour_responses_controller.rb
@@ -12,7 +12,7 @@ def update
         respond_to do |format|
           format.html do
             if @neighbour_review.update(review_params) && @consultation.update(status: consultation_status)
-              redirect_to planning_application_review_tasks_path(@planning_application), notice: t(".success")
+              redirect_to planning_application_review_tasks_path(@planning_application, anchor: "review-neighbour-responses"), notice: t(".success")
             else
               error = @neighbour_review.errors.group_by_attribute.transform_values { |errors| errors.map(&:full_message) }.values.flatten
               redirect_failed_create_error(error)
@@ -27,7 +27,7 @@ def create
         respond_to do |format|
           format.html do
             if @neighbour_review.save && @consultation.update(status: consultation_status)
-              redirect_to planning_application_review_tasks_path(@planning_application), notice: t(".success")
+              redirect_to planning_application_review_tasks_path(@planning_application, anchor: "review-neighbour-responses"), notice: t(".success")
             else
               error = @neighbour_review.errors.group_by_attribute.transform_values { |errors| errors.map(&:full_message) }.values.flatten
               redirect_failed_create_error(error)
diff --git a/app/controllers/planning_applications/review/permitted_development_rights_controller.rb b/app/controllers/planning_applications/review/permitted_development_rights_controller.rb
index 18442d1da0..72543f9823 100644
--- a/app/controllers/planning_applications/review/permitted_development_rights_controller.rb
+++ b/app/controllers/planning_applications/review/permitted_development_rights_controller.rb
@@ -14,7 +14,7 @@ def update
         respond_to do |format|
           format.html do
             if @permitted_development_right.update(permitted_development_right_params)
-              redirect_to planning_application_review_tasks_path(@planning_application),
+              redirect_to planning_application_review_tasks_path(@planning_application, anchor: "review-permitted-development-rights"),
                 notice: I18n.t("permitted_development_rights.successfully_updated")
             else
               flash.now[:alert] = @permitted_development_right.errors.messages.values.flatten.join(", ")
diff --git a/app/controllers/planning_applications/review/policy_areas/policy_classes_controller.rb b/app/controllers/planning_applications/review/policy_areas/policy_classes_controller.rb
index c5c5b4156b..2469a78e2d 100644
--- a/app/controllers/planning_applications/review/policy_areas/policy_classes_controller.rb
+++ b/app/controllers/planning_applications/review/policy_areas/policy_classes_controller.rb
@@ -30,7 +30,7 @@ def update
           @form.update(policy_section_status_params)
 
           if @planning_application_policy_class.update_review(review_params)
-            redirect_to planning_application_review_policy_areas_policy_classes_path(@planning_application), notice: t(".success")
+            redirect_to planning_application_review_policy_areas_policy_classes_path(@planning_application, anchor: "review-policy-classes"), notice: t(".success")
           else
             render :edit
           end
diff --git a/app/controllers/planning_applications/review/pre_commencement_conditions_controller.rb b/app/controllers/planning_applications/review/pre_commencement_conditions_controller.rb
index f0d1c5869b..5a05c1d778 100644
--- a/app/controllers/planning_applications/review/pre_commencement_conditions_controller.rb
+++ b/app/controllers/planning_applications/review/pre_commencement_conditions_controller.rb
@@ -14,7 +14,7 @@ def update
       respond_to do |format|
         format.html do
           if @pre_commencement_condition_set.update(review_params)
-            redirect_to planning_application_review_tasks_path(@planning_application),
+            redirect_to planning_application_review_tasks_path(@planning_application, anchor: "review-pre-commencement-conditions"),
               notice: I18n.t("review.conditions.update.success")
           else
             flash.now[:alert] = @pre_commencement_condition_set.errors.messages.values.flatten.join(", ")
diff --git a/app/controllers/planning_applications/review/publicities_controller.rb b/app/controllers/planning_applications/review/publicities_controller.rb
index fd4b6261e4..0c4e2fe90c 100644
--- a/app/controllers/planning_applications/review/publicities_controller.rb
+++ b/app/controllers/planning_applications/review/publicities_controller.rb
@@ -12,7 +12,7 @@ def update
         respond_to do |format|
           format.html do
             if @assessment_detail.update(assessment_detail_params)
-              redirect_to planning_application_review_tasks_path(@planning_application), notice: t(".success")
+              redirect_to planning_application_review_tasks_path(@planning_application, anchor: "review-publicities"), notice: t(".success")
             else
               flash.now[:alert] = @assessment_detail.errors.messages.values.flatten.join(", ")
               render_review_tasks
@@ -27,7 +27,7 @@ def create
         respond_to do |format|
           format.html do
             if @assessment_detail.save
-              redirect_to planning_application_review_tasks_path(@planning_application), notice: t(".success")
+              redirect_to planning_application_review_tasks_path(@planning_application, anchor: "review-publicities"), notice: t(".success")
             else
               flash.now[:alert] = @assessment_detail.errors.messages.values.flatten.join(", ")
               render_review_tasks
diff --git a/app/controllers/planning_applications/review/recommendations_controller.rb b/app/controllers/planning_applications/review/recommendations_controller.rb
index 51dcd73906..cbee421330 100644
--- a/app/controllers/planning_applications/review/recommendations_controller.rb
+++ b/app/controllers/planning_applications/review/recommendations_controller.rb
@@ -28,7 +28,7 @@ def create
         )
 
         if @recommendation.save_and_submit(recommendation_form_params)
-          redirect_to planning_application_review_tasks_path(@planning_application), notice: t(".success")
+          redirect_to planning_application_review_tasks_path(@planning_application, anchor: "recommendation_to_committee_section"), notice: t(".success")
         else
           render :new
         end
diff --git a/app/views/planning_applications/review/policy_areas/policy_classes/index.html.erb b/app/views/planning_applications/review/policy_areas/policy_classes/index.html.erb
index 472b253066..0a5f0ed3f2 100644
--- a/app/views/planning_applications/review/policy_areas/policy_classes/index.html.erb
+++ b/app/views/planning_applications/review/policy_areas/policy_classes/index.html.erb
@@ -14,7 +14,7 @@
 
 <%= render "shared/dates_and_assignment_header" %>
 
-<ul class="app-task-list__items" id="review-legislation">
+<ul class="app-task-list__items" id="review-policy-classes">
   <% @planning_application.planning_application_policy_classes.order(:policy_class_id).each do |policy_class| %>
     <% next if policy_class.current_review.not_started? || policy_class.current_review.in_progress? %>
 
diff --git a/app/views/planning_applications/review/tasks/_review_assessment.html.erb b/app/views/planning_applications/review/tasks/_review_assessment.html.erb
index 74339817f0..72a940c28b 100644
--- a/app/views/planning_applications/review/tasks/_review_assessment.html.erb
+++ b/app/views/planning_applications/review/tasks/_review_assessment.html.erb
@@ -2,7 +2,7 @@
   <% accordion.with_heading(text: "Review assessment") %>
 
   <% if @planning_application.application_type.cil? %>
-    <% accordion.with_section(id: "check-cil", expanded: false) do |section| %>
+    <% accordion.with_section(id: "review-cil-liability", expanded: false) do |section| %>
       <%= section.with_heading(text: "Check Community Infrastructure Levy (CIL)") %>
       <%= section.with_status do %>
         <%= render(
diff --git a/app/views/planning_applications/review/tasks/_review_conditions.html.erb b/app/views/planning_applications/review/tasks/_review_conditions.html.erb
index 864248869b..0bcf07bd1e 100644
--- a/app/views/planning_applications/review/tasks/_review_conditions.html.erb
+++ b/app/views/planning_applications/review/tasks/_review_conditions.html.erb
@@ -30,7 +30,7 @@
   <% end %>
 
   <% if @planning_application.possibly_immune? && @planning_application.immunity_detail.reviews.evidence.any? %>
-    <%= accordion.with_section(id: "review-evidence", expanded: @planning_application.immunity_detail.current_evidence_review_immunity_detail.errors.any?) do |section| %>
+    <%= accordion.with_section(id: "review-immunity-details", expanded: @planning_application.immunity_detail.current_evidence_review_immunity_detail.errors.any?) do |section| %>
       <% section.with_heading(text: "Review evidence of immunity") %>
 
       <% section.with_status do %>
@@ -47,14 +47,14 @@
         <%= govuk_link_to "Show evidence", planning_application_review_immunity_detail_path(@planning_application, @planning_application.immunity_detail.current_evidence_review_immunity_detail) %>
       <% end %>
 
-      <% section.with_footer(id: "review-evidence-form") do %>
+      <% section.with_footer(id: "review-immunity-details-form") do %>
         <%= render(partial: "planning_applications/review/immunity_details/form") %>
       <% end %>
     <% end %>
   <% end %>
 
   <% if @planning_application.possibly_immune? && @planning_application.immunity_detail.reviews.enforcement.any? %>
-    <%= accordion.with_section(id: "review-enforcement", expanded: @planning_application.immunity_detail.current_enforcement_review_immunity_detail.errors.any?) do |section| %>
+    <%= accordion.with_section(id: "review-immunity-enforcements", expanded: @planning_application.immunity_detail.current_enforcement_review_immunity_detail.errors.any?) do |section| %>
       <% section.with_heading(text: "Review assessment of immunity") %>
 
       <% section.with_status do %>
@@ -69,7 +69,7 @@
         <%= render(partial: "planning_applications/review/immunity_enforcements/details") %>
       <% end %>
 
-      <% section.with_footer(id: "review-enforcement-form") do %>
+      <% section.with_footer(id: "review-immunity-enforcements-form") do %>
         <%= render(partial: "planning_applications/review/immunity_enforcements/form") %>
       <% end %>
     <% end %>
@@ -167,7 +167,7 @@
 
 <ul class="app-task-list__items">
   <% if @planning_application.application_type.assess_against_policies? %>
-    <li class="app-task-list__item" id="review-legislation">
+    <li class="app-task-list__item" id="review-policy-classes">
       <span class="app-task-list__task-name">
         <%= govuk_link_to "Review assessment against legislation", planning_application_review_policy_areas_policy_classes_path(@planning_application) %>
       </span>
diff --git a/app/views/planning_applications/review/tasks/_review_consultation.html.erb b/app/views/planning_applications/review/tasks/_review_consultation.html.erb
index 67fa49cbf5..0887937435 100644
--- a/app/views/planning_applications/review/tasks/_review_consultation.html.erb
+++ b/app/views/planning_applications/review/tasks/_review_consultation.html.erb
@@ -1,6 +1,6 @@
 <%= bops_task_accordion(id: "review-consultation") do |accordion| %>
   <% accordion.with_heading(text: "Review consultation") %>
-  <%= accordion.with_section(id: "check-neighbour-notifications", expanded: @neighbour_review.errors.any?) do |section| %>
+  <%= accordion.with_section(id: "review-neighbour-responses", expanded: @neighbour_review.errors.any?) do |section| %>
     <% section.with_heading(text: "Check neighbour notifications") %>
 
     <% section.with_status do %>
@@ -19,7 +19,7 @@
     <% end %>
   <% end %>
 
-  <%= accordion.with_section(id: "check-publicity", expanded: @planning_application.existing_or_new_check_publicity.errors.any?) do |section| %>
+  <%= accordion.with_section(id: "review-publicities", expanded: @planning_application.existing_or_new_check_publicity.errors.any?) do |section| %>
     <% section.with_heading(text: "Check publicity") %>
     <% section.with_status do %>
       <%= render(
@@ -37,7 +37,7 @@
       <%= render(partial: "planning_applications/review/publicities/press_notice") %>
     <% end %>
 
-    <% section.with_footer(id: "check-publicity-form") do %>
+    <% section.with_footer(id: "review-publicities-form") do %>
       <%= render(partial: "planning_applications/review/publicities/form") %>
     <% end %>
   <% end %>
diff --git a/spec/system/planning_applications/assessing/immunity_spec.rb b/spec/system/planning_applications/assessing/immunity_spec.rb
index a9f3a6e634..f7b21d7e38 100644
--- a/spec/system/planning_applications/assessing/immunity_spec.rb
+++ b/spec/system/planning_applications/assessing/immunity_spec.rb
@@ -110,7 +110,7 @@
 
       click_button "Review evidence of immunity"
 
-      within("#review-evidence") do
+      within("#review-immunity-details") do
         choose "Return with comments"
         fill_in "Add a comment", with: "Please re-assess the evidence of immunity"
         click_button "Save and mark as complete"
@@ -120,13 +120,13 @@
 
       click_button "Review assessment of immunity"
 
-      within("#review-enforcement") do
+      within("#review-immunity-enforcements") do
         expect(page).to have_content("Assessor decision: Yes")
         expect(page).to have_content("Reason: no action is taken within 4 years for an unauthorised change of use to a single dwellinghouse")
         expect(page).to have_content("Summary: A summary")
       end
 
-      within("#review-enforcement-form") do
+      within("#review-immunity-enforcements-form") do
         choose "Return with comments"
         fill_in "Add a comment", with: "Please re-assess immunity enforcement response"
         click_button "Save and mark as complete"
@@ -188,7 +188,7 @@
 
       click_button "Review evidence of immunity"
 
-      within("#review-evidence") do
+      within("#review-immunity-details") do
         choose "Agree"
         click_button "Save and mark as complete"
       end
@@ -196,7 +196,7 @@
 
       click_button "Review assessment of immunity"
 
-      within("#review-enforcement") do
+      within("#review-immunity-enforcements") do
         expect(page).to have_content("Assessor decision: No")
         expect(page).to have_content("Reason: Application is not immune")
 
diff --git a/spec/system/planning_applications/review/check_cil_liability_spec.rb b/spec/system/planning_applications/review/check_cil_liability_spec.rb
index 79c66f13ba..f6f03dcece 100644
--- a/spec/system/planning_applications/review/check_cil_liability_spec.rb
+++ b/spec/system/planning_applications/review/check_cil_liability_spec.rb
@@ -31,7 +31,7 @@
     it "the reviewer can mark it as not needing confirmation" do
       visit "planning_applications/#{planning_application.id}/review/tasks"
 
-      within "#check-cil" do
+      within "#review-cil-liability" do
         expect(page).to have_content "Not started"
       end
 
@@ -39,13 +39,13 @@
 
       expect(page).to have_content "The validation officer did not confirm whether the application is liable for CIL."
 
-      within "#check-cil" do
+      within "#review-cil-liability" do
         click_button "Save and mark as complete"
       end
 
       expect(page).to have_content "Review of CIL liability successfully updated"
 
-      within "#check-cil" do
+      within "#review-cil-liability" do
         expect(page).to have_content "Completed"
       end
 
@@ -58,7 +58,7 @@
     it "the reviewer can update it" do
       visit "planning_applications/#{planning_application.id}/review/tasks"
 
-      within "#check-cil" do
+      within "#review-cil-liability" do
         expect(page).to have_content "Not started"
       end
 
@@ -68,13 +68,13 @@
 
       choose "Yes"
 
-      within "#check-cil" do
+      within "#review-cil-liability" do
         click_button "Save and mark as complete"
       end
 
       expect(page).to have_content "Review of CIL liability successfully updated"
 
-      within "#check-cil" do
+      within "#review-cil-liability" do
         expect(page).to have_content "Completed"
       end
 
@@ -93,7 +93,7 @@
     it "the reviewer can mark it as correct" do
       visit "planning_applications/#{planning_application.id}/review/tasks"
 
-      within "#check-cil" do
+      within "#review-cil-liability" do
         expect(page).to have_content "Not started"
       end
 
@@ -101,13 +101,13 @@
 
       expect(page).to have_content "The validation officer marked this application as liable for CIL"
 
-      within "#check-cil" do
+      within "#review-cil-liability" do
         click_button "Save and mark as complete"
       end
 
       expect(page).to have_content "Review of CIL liability successfully updated"
 
-      within "#check-cil" do
+      within "#review-cil-liability" do
         expect(page).to have_content "Completed"
       end
 
@@ -120,7 +120,7 @@
     it "the reviewer can change it" do
       visit "planning_applications/#{planning_application.id}/review/tasks"
 
-      within "#check-cil" do
+      within "#review-cil-liability" do
         expect(page).to have_content "Not started"
       end
 
@@ -130,13 +130,13 @@
 
       choose "No"
 
-      within "#check-cil" do
+      within "#review-cil-liability" do
         click_button "Save and mark as complete"
       end
 
       expect(page).to have_content "Review of CIL liability successfully updated"
 
-      within "#check-cil" do
+      within "#review-cil-liability" do
         expect(page).to have_content "Completed"
       end
 
@@ -155,7 +155,7 @@
     it "does not have a section to review CIL" do
       visit "planning_applications/#{planning_application.reference}/review/tasks"
 
-      expect(page).not_to have_css("#check-cil")
+      expect(page).not_to have_css("#review-cil-liability")
       expect(page).not_to have_content("Check Community Infrastructure Levy (CIL)")
     end
   end
diff --git a/spec/system/planning_applications/review/check_neighbour_notifications_spec.rb b/spec/system/planning_applications/review/check_neighbour_notifications_spec.rb
index 7576e4db4f..db338f093d 100644
--- a/spec/system/planning_applications/review/check_neighbour_notifications_spec.rb
+++ b/spec/system/planning_applications/review/check_neighbour_notifications_spec.rb
@@ -44,14 +44,14 @@
       it "you can accept that the assessor has notified the correct people" do
         visit "/planning_applications/#{planning_application.reference}/review/tasks"
 
-        within("#check-neighbour-notifications") do
+        within("#review-neighbour-responses") do
           expect(page).to have_content("Check neighbour notifications")
           expect(page).to have_content("Not started")
         end
 
         click_button "Check neighbour notifications"
 
-        within "#check-neighbour-notifications" do
+        within "#review-neighbour-responses" do
           choose "Agree"
 
           click_button "Save and mark as complete"
@@ -59,7 +59,7 @@
 
         expect(page).to have_content("Review of neighbour responses successfully added")
 
-        within("#check-neighbour-notifications") do
+        within("#review-neighbour-responses") do
           expect(page).to have_content("Completed")
         end
       end
@@ -67,14 +67,14 @@
       it "you can send it back for assessment", :capybara do
         visit "/planning_applications/#{planning_application.reference}/review/tasks"
 
-        within("#check-neighbour-notifications") do
+        within("#review-neighbour-responses") do
           expect(page).to have_content("Check neighbour notifications")
           expect(page).to have_content("Not started")
         end
 
         click_button "Check neighbour notifications"
 
-        within "#check-neighbour-notifications" do
+        within "#review-neighbour-responses" do
           choose "Return with comments"
           fill_in "Add a comment", with: "Notify more people"
 
@@ -83,7 +83,7 @@
 
         expect(page).to have_content("Review of neighbour responses successfully added")
 
-        within("#check-neighbour-notifications") do
+        within("#review-neighbour-responses") do
           expect(page).to have_content("Check neighbour notifications")
           expect(page).to have_content("Awaiting changes")
         end
@@ -131,14 +131,14 @@
       it "shows errors" do
         visit "/planning_applications/#{planning_application.reference}/review/tasks"
 
-        within("#check-neighbour-notifications") do
+        within("#review-neighbour-responses") do
           expect(page).to have_content("Check neighbour notifications")
           expect(page).to have_content("Not started")
         end
 
         click_button "Check neighbour notifications"
 
-        within "#check-neighbour-notifications" do
+        within "#review-neighbour-responses" do
           click_button "Save and mark as complete"
         end
 
@@ -147,14 +147,14 @@
           expect(page).to have_content("Select an option")
         end
 
-        within("#check-neighbour-notifications") do
+        within("#review-neighbour-responses") do
           expect(page).to have_content("Check neighbour notifications")
           expect(page).to have_content("Not started")
         end
 
         click_button "Check neighbour notifications"
 
-        within("#check-neighbour-notifications") do
+        within("#review-neighbour-responses") do
           choose "Return with comments"
           click_button "Save and mark as complete"
         end
@@ -170,14 +170,14 @@
       it "you can accept that the assessor has notified the correct people" do
         visit "/planning_applications/#{planning_application.reference}/review/tasks"
 
-        within("#check-neighbour-notifications") do
+        within("#review-neighbour-responses") do
           expect(page).to have_content("Check neighbour notifications")
           expect(page).to have_content("Not started")
         end
 
         click_button "Check neighbour notifications"
 
-        within "#check-neighbour-notifications" do
+        within "#review-neighbour-responses" do
           choose "Return with comments"
           fill_in "Add a comment", with: "People need to be consulted"
 
@@ -186,7 +186,7 @@
 
         expect(page).to have_content("Review of neighbour responses successfully added")
 
-        within("#check-neighbour-notifications") do
+        within("#review-neighbour-responses") do
           expect(page).to have_content("Check neighbour notifications")
           expect(page).to have_content("Awaiting changes")
         end
@@ -204,14 +204,14 @@
       it "you can't accept or reject the officer's work" do
         visit "/planning_applications/#{planning_application.reference}/review/tasks"
 
-        within("#check-neighbour-notifications") do
+        within("#review-neighbour-responses") do
           expect(page).to have_content("Check neighbour notifications")
           expect(page).to have_content("Not started")
         end
 
         click_button "Check neighbour notifications"
 
-        within "#check-neighbour-notifications" do
+        within "#review-neighbour-responses" do
           choose "Agree"
           click_button "Save and mark as complete"
         end
diff --git a/spec/system/planning_applications/review/check_publicity_spec.rb b/spec/system/planning_applications/review/check_publicity_spec.rb
index eac59d3302..e30e3573e2 100644
--- a/spec/system/planning_applications/review/check_publicity_spec.rb
+++ b/spec/system/planning_applications/review/check_publicity_spec.rb
@@ -76,7 +76,7 @@
       it "allows a reviewer to mark the publicity check as complete" do
         visit "/planning_applications/#{planning_application.reference}/review/tasks"
 
-        within("#check-publicity") do
+        within("#review-publicities") do
           expect(page).to have_content("Check publicity")
           expect(page).to have_content("Not started")
         end
@@ -114,14 +114,14 @@
           expect(page).to have_content("File name: press-notice.jpg")
         end
 
-        within("#check-publicity") do
+        within("#review-publicities") do
           choose "Agree"
           click_button "Save and mark as complete"
         end
 
         expect(page).to have_selector("[role=alert] p", text: "Review of publicity successfully added.")
 
-        within("#check-publicity") do
+        within("#review-publicities") do
           expect(page).to have_content("Check publicity")
           expect(page).to have_content("Completed")
         end
@@ -130,14 +130,14 @@
       it "allows a reviewer to return the application to the assessor" do
         visit "/planning_applications/#{planning_application.reference}/review/tasks"
 
-        within("#check-publicity") do
+        within("#review-publicities") do
           expect(page).to have_content("Check publicity")
           expect(page).to have_content("Not started")
         end
 
         click_button "Check publicity"
 
-        within("#check-publicity") do
+        within("#review-publicities") do
           choose "Return with comments"
           fill_in "Add a comment", with: "Check this"
           click_button "Save and mark as complete"
@@ -145,7 +145,7 @@
 
         expect(page).to have_selector("[role=alert] p", text: "Review of publicity successfully added.")
 
-        within("#check-publicity") do
+        within("#review-publicities") do
           expect(page).to have_content("Check publicity")
           expect(page).to have_content("Awaiting changes")
         end
@@ -193,7 +193,7 @@
 
         click_link "Review and sign-off"
 
-        within("#check-publicity") do
+        within("#review-publicities") do
           expect(page).to have_content("Check publicity")
           expect(page).to have_content("Not started")
         end
@@ -202,21 +202,21 @@
       it "shows errors" do
         visit "/planning_applications/#{planning_application.reference}/review/tasks"
 
-        within("#check-publicity") do
+        within("#review-publicities") do
           expect(page).to have_content("Check publicity")
           expect(page).to have_content("Not started")
         end
 
         click_button "Check publicity"
 
-        within("#check-publicity") do
+        within("#review-publicities") do
           click_button "Save and mark as complete"
         end
 
         expect(page).to have_content "Determine whether this is correct"
         expect(page).not_to have_content "You must add a comment"
 
-        within("#check-publicity") do
+        within("#review-publicities") do
           choose "Return with comments"
           click_button "Save and mark as complete"
         end
@@ -275,7 +275,7 @@
     it "the reviewer can accept" do
       visit "/planning_applications/#{planning_application.reference}/review/tasks"
 
-      within("#check-publicity") do
+      within("#review-publicities") do
         expect(page).to have_content("Check publicity")
         expect(page).to have_content("Not started")
       end
@@ -313,13 +313,13 @@
         expect(page).to have_content("File name: press-notice.jpg")
       end
 
-      within("#check-publicity") do
+      within("#review-publicities") do
         choose "Agree"
         click_button "Save and mark as complete"
       end
       expect(page).to have_selector("[role=alert] p", text: "Review of publicity successfully added.")
 
-      within("#check-publicity") do
+      within("#review-publicities") do
         expect(page).to have_content("Check publicity")
         expect(page).to have_content("Completed")
       end
@@ -328,14 +328,14 @@
     it "allows a reviewer to return the application to the assessor" do
       visit "/planning_applications/#{planning_application.reference}/review/tasks"
 
-      within("#check-publicity") do
+      within("#review-publicities") do
         expect(page).to have_content("Check publicity")
         expect(page).to have_content("Not started")
       end
 
       click_button "Check publicity"
 
-      within("#check-publicity") do
+      within("#review-publicities") do
         choose "Return with comments"
         fill_in "Add a comment", with: "Check this"
         click_button "Save and mark as complete"
@@ -343,7 +343,7 @@
 
       expect(page).to have_selector("[role=alert] p", text: "Review of publicity successfully added.")
 
-      within("#check-publicity") do
+      within("#review-publicities") do
         expect(page).to have_content("Check publicity")
         expect(page).to have_content("Awaiting changes")
       end
@@ -392,7 +392,7 @@
 
       click_link "Review and sign-off"
 
-      within("#check-publicity") do
+      within("#review-publicities") do
         expect(page).to have_content("Check publicity")
         expect(page).to have_content("Not started")
       end
@@ -401,21 +401,21 @@
     it "shows errors" do
       visit "/planning_applications/#{planning_application.reference}/review/tasks"
 
-      within("#check-publicity") do
+      within("#review-publicities") do
         expect(page).to have_content("Check publicity")
         expect(page).to have_content("Not started")
       end
 
       click_button "Check publicity"
 
-      within("#check-publicity") do
+      within("#review-publicities") do
         click_button "Save and mark as complete"
       end
 
       expect(page).to have_content "Determine whether this is correct"
       expect(page).not_to have_content "You must add a comment"
 
-      within("#check-publicity") do
+      within("#review-publicities") do
         choose "Return with comments"
         click_button "Save and mark as complete"
       end
diff --git a/spec/system/planning_applications/review/evidence_of_immunity_spec.rb b/spec/system/planning_applications/review/evidence_of_immunity_spec.rb
index 2d90474e74..0c8cd85472 100644
--- a/spec/system/planning_applications/review/evidence_of_immunity_spec.rb
+++ b/spec/system/planning_applications/review/evidence_of_immunity_spec.rb
@@ -50,14 +50,14 @@
 
     context "when planning application is awaiting determination", :capybara do
       it "I can save and mark as complete when adding my review to accept the review evidence of immunity response" do
-        within("#review-evidence") do
+        within("#review-immunity-details") do
           expect(page).to have_content("Review evidence of immunity")
           expect(page).to have_content("Not started")
         end
 
         click_button "Review evidence of immunity"
 
-        within("#review-evidence") do
+        within("#review-immunity-details") do
           expect(page).to have_content("Were the works carried out more than 4 years ago? Yes")
           expect(page).to have_content("Have the works been completed? Yes")
           expect(page).to have_content("When were the works completed? 01/02/2015")
@@ -70,21 +70,21 @@
 
         expect(page).to have_content("Review immunity details was successfully updated")
 
-        within("#review-evidence") do
+        within("#review-immunity-details") do
           expect(page).to have_content("Review evidence of immunity")
           expect(page).to have_content("Completed")
         end
       end
 
       it "when I return it with comments, they can see my comments" do
-        within("#review-evidence") do
+        within("#review-immunity-details") do
           expect(page).to have_content("Review evidence of immunity")
           expect(page).to have_content("Not started")
         end
 
         click_button "Review evidence of immunity"
 
-        within("#review-evidence") do
+        within("#review-immunity-details") do
           expect(page).to have_content("Were the works carried out more than 4 years ago? Yes")
           expect(page).to have_content("Have the works been completed? Yes")
           expect(page).to have_content("When were the works completed? 01/02/2015")
diff --git a/spec/system/planning_applications/review/immunity_enforcement_spec.rb b/spec/system/planning_applications/review/immunity_enforcement_spec.rb
index e4abcc6124..0acd6a6510 100644
--- a/spec/system/planning_applications/review/immunity_enforcement_spec.rb
+++ b/spec/system/planning_applications/review/immunity_enforcement_spec.rb
@@ -48,27 +48,27 @@
 
     context "when planning application is awaiting determination" do
       it "I can save and mark as complete when adding my review to accept the review evidence of immunity response" do
-        within("#review-enforcement") do
+        within("#review-immunity-enforcements") do
           expect(page).to have_content("Review assessment of immunity")
           expect(page).to have_content("Not started")
         end
 
         click_button "Review assessment of immunity"
 
-        within("#review-enforcement") do
+        within("#review-immunity-enforcements") do
           expect(page).not_to have_content("Immunity from enforcement summary")
           expect(page).to have_content("Assessor decision: Yes")
           expect(page).to have_content("Reason: it looks immune to me")
           expect(page).to have_content("Summary: they have enough bills to show it's immune")
         end
 
-        within("#review-enforcement-form") do
+        within("#review-immunity-enforcements-form") do
           choose "Agree"
 
           click_button "Save and mark as complete"
         end
 
-        within("#review-enforcement") do
+        within("#review-immunity-enforcements") do
           expect(page).to have_content("Review assessment of immunity")
           expect(page).to have_content("Completed")
         end
@@ -77,7 +77,7 @@
       it "when I return it with comments, they can see my comments" do
         click_button "Review assessment of immunity"
 
-        within("#review-enforcement-form") do
+        within("#review-immunity-enforcements-form") do
           choose "Return with comments"
 
           fill_in "Add a comment", with: "Please re-assess"
@@ -85,7 +85,7 @@
           click_button "Save and mark as complete"
         end
 
-        within("#review-enforcement") do
+        within("#review-immunity-enforcements") do
           expect(page).to have_content("Review assessment of immunity")
           expect(page).to have_content("Awaiting changes")
         end