diff --git a/app/controllers/legislation/processes_controller.rb b/app/controllers/legislation/processes_controller.rb
index 9da8afdaa..b9a6e65fa 100644
--- a/app/controllers/legislation/processes_controller.rb
+++ b/app/controllers/legislation/processes_controller.rb
@@ -8,9 +8,9 @@ class Legislation::ProcessesController < Legislation::BaseController
   end
 
   def show
-    if process.active_phase?(:allegations) && process.allegations_phase.started? && draft_version = process.draft_versions.published.last
+    if process.allegations_phase.enabled? && process.allegations_phase.started? && draft_version = process.draft_versions.published.last
       redirect_to legislation_process_draft_version_path(process, draft_version)
-    elsif process.active_phase?(:debate)
+    elsif process.debate_phase.enabled?
       redirect_to legislation_process_debate_path(process)
     else
       redirect_to legislation_process_allegations_path(process)
diff --git a/app/views/admin/legislation/processes/_form.html.erb b/app/views/admin/legislation/processes/_form.html.erb
index 88cb6560b..8233d5f14 100644
--- a/app/views/admin/legislation/processes/_form.html.erb
+++ b/app/views/admin/legislation/processes/_form.html.erb
@@ -70,7 +70,7 @@
                         id: "debate_end_date" %>
     </div>
     <div class="small-12 medium-2 column">
-      <%= check_box_tag :debate_phase_active, @process.active_phase?(:debate), @process.new_record? || @process.active_phase?(:debate), data: {disable_date: "debate"} %>
+      <%= check_box_tag :debate_phase_active, @process.debate_phase.enabled?, @process.new_record? || @process.debate_phase.enabled?, data: {disable_date: "debate"} %>
       <%= label_tag :debate_phase_active, t('admin.legislation.processes.form.active') %>
     </div>
 
@@ -104,7 +104,7 @@
                         id: "allegations_end_date" %>
     </div>
     <div class="small-12 medium-2 column">
-      <%= check_box_tag :allegations_phase_active, @process.active_phase?(:allegations), @process.new_record? || @process.active_phase?(:allegations), data: {disable_date: "allegations"} %>
+      <%= check_box_tag :allegations_phase_active, @process.allegations_phase.enabled?, @process.new_record? || @process.allegations_phase.enabled?, data: {disable_date: "allegations"} %>
       <%= label_tag :allegations_phase_active, t('admin.legislation.processes.form.active') %>
     </div>
 
@@ -125,7 +125,7 @@
                         id: "draft_publication_date" %>
     </div>
     <div class="small-12 medium-2 column">
-      <%= check_box_tag :draft_publication_phase_active, @process.active_phase?(:draft_publication), @process.new_record? || @process.active_phase?(:draft_publication), data: {disable_date: "draft_publication"} %>
+      <%= check_box_tag :draft_publication_phase_active, @process.draft_publication.enabled?, @process.new_record? || @process.draft_publication.enabled?, data: {disable_date: "draft_publication"} %>
       <%= label_tag :draft_publication_phase_active, t('admin.legislation.processes.form.active') %>
     </div>
     <div class="small-12 column">
@@ -145,7 +145,7 @@
                         id: "result_publication_date" %>
     </div>
     <div class="small-12 medium-2 column">
-      <%= check_box_tag :result_publication_phase_active, @process.active_phase?(:result_publication), @process.new_record? || @process.active_phase?(:result_publication), data: {disable_date: "final_publication"} %>
+      <%= check_box_tag :result_publication_phase_active, @process.result_publication.enabled?, @process.new_record? || @process.result_publication.enabled?, data: {disable_date: "final_publication"} %>
       <%= label_tag :result_publication_phase_active, t('admin.legislation.processes.form.active') %>
     </div>
     <div class="small-12 column">
diff --git a/app/views/legislation/processes/_key_dates.html.erb b/app/views/legislation/processes/_key_dates.html.erb
index 23471d217..5e4d37ccf 100644
--- a/app/views/legislation/processes/_key_dates.html.erb
+++ b/app/views/legislation/processes/_key_dates.html.erb
@@ -7,7 +7,7 @@
     </div>
 
     <ul>
-      <% if process.active_phase?(:debate) %>
+      <% if process.debate_phase.enabled? %>
         <li <%= "class=active" if phase == :debate %>>
           <%= link_to legislation_process_debate_path(process) do %>
             <h4><%= t('legislation.processes.shared.debate_dates') %></h4>
@@ -16,7 +16,7 @@
         </li>
       <% end %>
 
-      <% if process.active_phase?(:draft_publication) %>
+      <% if process.draft_publication.enabled? %>
         <li <%= "class=active" if phase == :draft_publication %>>
           <%= link_to legislation_process_draft_publication_path(process) do %>
             <h4><%= t('legislation.processes.shared.draft_publication_date') %></h4>
@@ -25,7 +25,7 @@
         </li>
       <% end %>
 
-      <% if process.active_phase?(:allegations) %>
+      <% if process.allegations_phase.enabled? %>
         <li <%= "class=active" if phase == :allegations %>>
           <%= link_to legislation_process_allegations_path(process) do %>
             <h4><%= t('legislation.processes.shared.allegations_dates') %></h4>
@@ -34,7 +34,7 @@
         </li>
       <% end %>
 
-      <% if process.active_phase?(:result_publication) %>
+      <% if process.result_publication.enabled? %>
         <li <%= "class=active" if phase == :result_publication %>>
           <%= link_to legislation_process_result_publication_path(process) do %>
             <h4><%= t('legislation.processes.shared.result_publication_date') %></h4>