diff --git a/app/controllers/manage/questionnaires_controller.rb b/app/controllers/manage/questionnaires_controller.rb
index 5a8cdeca1..ce2ed1218 100644
--- a/app/controllers/manage/questionnaires_controller.rb
+++ b/app/controllers/manage/questionnaires_controller.rb
@@ -97,9 +97,9 @@ def check_in
 
   def destroy
     if @questionnaire.is_bus_captain
-      admins = User.where(role: :admin)
-      admins.each do |user|
-        AdminMailer.bus_captain_left(@questionnaire.bus_list_id, @questionnaire.user_id, user.id).deliver_later
+      directors = User.where(role: :director)
+      directors.each do |user|
+        StaffMailer.bus_captain_left(@questionnaire.bus_list_id, @questionnaire.user_id, user.id).deliver_later
       end
     end
 
diff --git a/app/controllers/questionnaires_controller.rb b/app/controllers/questionnaires_controller.rb
index d1ffae79e..3cb3763b6 100644
--- a/app/controllers/questionnaires_controller.rb
+++ b/app/controllers/questionnaires_controller.rb
@@ -95,9 +95,9 @@ def update
   # DELETE /apply.json
   def destroy
     if @questionnaire.is_bus_captain
-      admins = User.where(role: :admin)
-      admins.each do |user|
-        AdminMailer.bus_captain_left(@questionnaire.bus_list_id, @questionnaire.user_id, user.id).deliver_later
+      directors = User.where(role: :director)
+      directors.each do |user|
+        StaffMailer.bus_captain_left(@questionnaire.bus_list_id, @questionnaire.user_id, user.id).deliver_later
       end
     end
 
diff --git a/app/controllers/rsvps_controller.rb b/app/controllers/rsvps_controller.rb
index 0fabed740..85a61defd 100644
--- a/app/controllers/rsvps_controller.rb
+++ b/app/controllers/rsvps_controller.rb
@@ -67,9 +67,9 @@ def update
 
     if bus != nil && (acc_status != acc_status_after_rsvp || bus != bus_after_rsvp) && @questionnaire.is_bus_captain == true
       @questionnaire.is_bus_captain = false
-      admins = User.where(role: :admin)
-      admins.each do |user|
-        AdminMailer.bus_captain_left(@questionnaire.bus_list_id, @questionnaire.user_id, user.id).deliver_later
+      directors = User.where(role: :director)
+      directors.each do |user|
+        StaffMailer.bus_captain_left(@questionnaire.bus_list_id, @questionnaire.user_id, user.id).deliver_later
       end
     end
 
diff --git a/test/controllers/manage/dashboard_controller_test.rb b/test/controllers/manage/dashboard_controller_test.rb
index 22bd05e22..f473968e6 100644
--- a/test/controllers/manage/dashboard_controller_test.rb
+++ b/test/controllers/manage/dashboard_controller_test.rb
@@ -69,7 +69,7 @@ class Manage::DashboardControllerTest < ActionController::TestCase
     should "not allow access to manage_dashboard#index" do
       get :index
       assert_response :redirect
-      assert_redirected_to manage_root_path
+      assert_redirected_to manage_checkins_path
     end
 
     should "not allow access to all data endpoints" do
@@ -101,11 +101,11 @@ class Manage::DashboardControllerTest < ActionController::TestCase
 
       paths.each do |path|
         get path
-        assert_redirected_to manage_root_path
+        assert_redirected_to manage_checkins_path
       end
 
       get :map_data, format: "tsv"
-      assert_redirected_to manage_root_path
+      assert_redirected_to manage_checkins_path
     end
   end
 
diff --git a/test/controllers/manage/messages_controller_test.rb b/test/controllers/manage/messages_controller_test.rb
index ec8177490..c63245752 100644
--- a/test/controllers/manage/messages_controller_test.rb
+++ b/test/controllers/manage/messages_controller_test.rb
@@ -210,13 +210,13 @@ class Manage::MessagesControllerTest < ActionController::TestCase
     should "not allow access to manage_messages#index" do
       get :index
       assert_response :redirect
-      assert_redirected_to manage_root_path
+      assert_redirected_to manage_checkins_path
     end
 
     should "not allow access to manage_messages datatables api" do
       post :datatable, format: :json, params: { "columns[0][data]" => "" }
       assert_response :redirect
-      assert_redirected_to manage_root_path
+      assert_redirected_to manage_checkins_path
     end
 
     should "not allow access to manage_messages#new" do
@@ -228,7 +228,7 @@ class Manage::MessagesControllerTest < ActionController::TestCase
     should "not allow access to manage_messages#show" do
       get :show, params: { id: @message }
       assert_response :redirect
-      assert_redirected_to manage_root_path
+      assert_redirected_to manage_checkins_path
     end
 
     should "not allow access to manage_messages#edit" do
@@ -266,7 +266,7 @@ class Manage::MessagesControllerTest < ActionController::TestCase
     should "not allow access to manage_messages#preview" do
       get :preview, params: { id: @message }
       assert_response :redirect
-      assert_redirected_to manage_root_path
+      assert_redirected_to manage_checkins_path
     end
 
     should "not allow access to manage_messages#live_preview" do
diff --git a/test/controllers/manage/questionnaires_controller_test.rb b/test/controllers/manage/questionnaires_controller_test.rb
index d2beef259..03a992781 100644
--- a/test/controllers/manage/questionnaires_controller_test.rb
+++ b/test/controllers/manage/questionnaires_controller_test.rb
@@ -346,10 +346,10 @@ class Manage::QuestionnairesControllerTest < ActionController::TestCase
     end
 
     context "destroy questionnaire" do
-      should "if bus captain, notify admins that bus captain has been removed" do
-        @user = create(:admin)
+      should "if bus captain, notify directors that bus captain has been removed" do
+        @user = create(:director)
         @questionnaire.update_attribute(:is_bus_captain, true)
-        assert_difference('enqueued_jobs.size', User.where(role: :admin).size) do
+        assert_difference('enqueued_jobs.size', User.where(role: :director).size) do
           delete :destroy, params: { id: @questionnaire }
         end
       end
diff --git a/test/controllers/manage/stats_controller_test.rb b/test/controllers/manage/stats_controller_test.rb
index cec0ad186..79aa2c9cb 100644
--- a/test/controllers/manage/stats_controller_test.rb
+++ b/test/controllers/manage/stats_controller_test.rb
@@ -49,14 +49,14 @@ class Manage::StatsControllerTest < ActionController::TestCase
     should "not allow access to stats#index" do
       get :index
       assert_response :redirect
-      assert_redirected_to manage_root_path
+      assert_redirected_to manage_checkins_path
     end
 
     should "not allow access to data endpoints" do
       paths.each do |path|
         patch path
         assert_response :redirect
-        assert_redirected_to manage_root_path
+        assert_redirected_to manage_checkins_path
       end
     end
   end
diff --git a/test/controllers/manage/users_controller_test.rb b/test/controllers/manage/users_controller_test.rb
index a29bf2b8d..2ea0cd3c9 100644
--- a/test/controllers/manage/users_controller_test.rb
+++ b/test/controllers/manage/users_controller_test.rb
@@ -105,22 +105,22 @@ class Manage::UsersControllerTest < ActionController::TestCase
 
     should "not allow access to manage_users#index" do
       get :index
-      assert_redirected_to manage_root_path
+      assert_redirected_to manage_checkins_path
     end
 
     should "not allow access to manage_users users datatables api" do
       post :user_datatable, format: :json, params: { "columns[0][data]" => "" }
-      assert_redirected_to manage_root_path
+      assert_redirected_to manage_checkins_path
     end
 
     should "not allow access to manage_users staff datatables api" do
       post :staff_datatable, format: :json, params: { "columns[0][data]" => "" }
-      assert_redirected_to manage_root_path
+      assert_redirected_to manage_checkins_path
     end
 
     should "allow access to manage_users#show" do
       get :show, params: { id: @user }
-      assert_redirected_to manage_root_path
+      assert_redirected_to manage_checkins_path
     end
 
     should "not allow access to manage_users#edit" do
diff --git a/test/controllers/questionnaires_controller_test.rb b/test/controllers/questionnaires_controller_test.rb
index 909a3e797..a3f14b404 100644
--- a/test/controllers/questionnaires_controller_test.rb
+++ b/test/controllers/questionnaires_controller_test.rb
@@ -166,10 +166,10 @@ class QuestionnairesControllerTest < ActionController::TestCase
     end
 
     context "destroy questionnaire" do
-      should "if bus captain, notify admins that bus captain has been removed" do
-        @admin = create(:admin)
+      should "if bus captain, notify directors that bus captain has been removed" do
+        @director = create(:director)
         @questionnaire.update_attribute(:is_bus_captain, true)
-        assert_difference('enqueued_jobs.size', User.where(role: :admin).size) do
+        assert_difference('enqueued_jobs.size', User.where(role: :director).size) do
           delete :destroy
         end
       end
diff --git a/test/controllers/rsvps_controller_test.rb b/test/controllers/rsvps_controller_test.rb
index f7a8b70b3..7a61408a5 100644
--- a/test/controllers/rsvps_controller_test.rb
+++ b/test/controllers/rsvps_controller_test.rb
@@ -244,8 +244,8 @@ class RsvpsControllerTest < ActionController::TestCase
       assert_redirected_to rsvp_path
     end
 
-    should "if bus captain leaves a bus, notify admins that bus captain has been removed" do
-      @admin = create(:admin)
+    should "if bus captain leaves a bus, notify directors that bus captain has been removed" do
+      @director = create(:director)
       @questionnaire.update_attribute(:is_bus_captain, true)
       @questionnaire.update_attribute(:acc_status, "rsvp_confirmed")
 
@@ -259,7 +259,7 @@ class RsvpsControllerTest < ActionController::TestCase
         }
       }
 
-      assert_difference('enqueued_jobs.size', User.where(role: :admin).size) do
+      assert_difference('enqueued_jobs.size', User.where(role: :director).size) do
         patch :update, params: {
           questionnaire: {
             acc_status: "rsvp_confirmed",