diff --git a/app/controllers/locations_controller.rb b/app/controllers/locations_controller.rb
index 568a2fa60..d12968cc7 100644
--- a/app/controllers/locations_controller.rb
+++ b/app/controllers/locations_controller.rb
@@ -54,7 +54,7 @@ private
   end
 
   def authenticate_action!
-    if %w[new edit update create index].include?(action_name) && !((current_user.organisation == @scheme.organisation) || current_user.support?)
+    if %w[new edit update create index].include?(action_name) && !((current_user.organisation == @scheme.owning_organisation) || current_user.support?)
       render_not_found and return
     end
   end
diff --git a/spec/features/schemes_spec.rb b/spec/features/schemes_spec.rb
index 4ef8c9cb3..6408bbf68 100644
--- a/spec/features/schemes_spec.rb
+++ b/spec/features/schemes_spec.rb
@@ -652,9 +652,9 @@ RSpec.describe "Schemes scheme Features" do
                         expect(page).to have_content "Supported housing schemes"
                         expect(page).to have_content scheme.id_to_display
                         expect(page).to have_content scheme.service_name
-                        expect(page).to have_content scheme.organisation.name
-                        expect(page).to have_content scheme.stock_owning_organisation.name
-                        expect(page).to have_content "#{scheme.organisation.name} has been created."
+                        expect(page).to have_content scheme.owning_organisation.name
+                        expect(page).to have_content scheme.managing_organisation.name
+                        expect(page).to have_content "#{scheme.owning_organisation.name} has been created."
                       end
                     end
                   end
diff --git a/spec/requests/locations_controller_spec.rb b/spec/requests/locations_controller_spec.rb
index 36025a306..cba28a541 100644
--- a/spec/requests/locations_controller_spec.rb
+++ b/spec/requests/locations_controller_spec.rb
@@ -3,7 +3,7 @@ require "rails_helper"
 RSpec.describe LocationsController, type: :request do
   let(:page) { Capybara::Node::Simple.new(response.body) }
   let(:user) { FactoryBot.create(:user, :support) }
-  let!(:scheme) { FactoryBot.create(:scheme, organisation: user.organisation) }
+  let!(:scheme) { FactoryBot.create(:scheme, owning_organisation: user.organisation) }
 
   describe "#new" do
     context "when not signed in" do
@@ -29,7 +29,7 @@ RSpec.describe LocationsController, type: :request do
 
     context "when signed in as a data coordinator" do
       let(:user) { FactoryBot.create(:user, :data_coordinator) }
-      let!(:scheme) { FactoryBot.create(:scheme, organisation: user.organisation) }
+      let!(:scheme) { FactoryBot.create(:scheme, owning_organisation: user.organisation) }
 
       before do
         sign_in user
@@ -89,7 +89,7 @@ RSpec.describe LocationsController, type: :request do
 
     context "when signed in as a data coordinator" do
       let(:user) { FactoryBot.create(:user, :data_coordinator) }
-      let!(:scheme) { FactoryBot.create(:scheme, organisation: user.organisation) }
+      let!(:scheme) { FactoryBot.create(:scheme, owning_organisation: user.organisation) }
       let(:params) { { location: { name: "Test", total_units: "5", type_of_unit: "Bungalow", wheelchair_adaptation: "No", add_another_location: "No", postcode: "ZZ1 1ZZ" } } }
 
       before do
@@ -105,7 +105,7 @@ RSpec.describe LocationsController, type: :request do
       end
 
       it "creates a new location for scheme with valid params" do
-        expect(Location.last.scheme.organisation_id).to eq(user.organisation_id)
+        expect(Location.last.scheme.owning_organisation_id).to eq(user.organisation_id)
         expect(Location.last.name).to eq("Test")
         expect(Location.last.postcode).to eq("ZZ11ZZ")
         expect(Location.last.total_units).to eq(5)
@@ -151,7 +151,7 @@ RSpec.describe LocationsController, type: :request do
         end
 
         it "creates a new location for scheme with valid params" do
-          expect(Location.last.scheme.organisation_id).to eq(user.organisation_id)
+          expect(Location.last.scheme.owning_organisation_id).to eq(user.organisation_id)
           expect(Location.last.name).to eq("Test")
           expect(Location.last.total_units).to eq(5)
           expect(Location.last.type_of_unit).to eq("Bungalow")
@@ -170,7 +170,7 @@ RSpec.describe LocationsController, type: :request do
         end
 
         it "creates a new location for scheme with valid params" do
-          expect(Location.last.scheme.organisation_id).to eq(user.organisation_id)
+          expect(Location.last.scheme.owning_organisation_id).to eq(user.organisation_id)
           expect(Location.last.name).to eq("Test")
           expect(Location.last.total_units).to eq(5)
           expect(Location.last.type_of_unit).to eq("Bungalow")
@@ -189,7 +189,7 @@ RSpec.describe LocationsController, type: :request do
         end
 
         it "creates a new location for scheme with valid params" do
-          expect(Location.last.scheme.organisation_id).to eq(user.organisation_id)
+          expect(Location.last.scheme.owning_organisation_id).to eq(user.organisation_id)
           expect(Location.last.name).to eq("Test")
           expect(Location.last.total_units).to eq(5)
           expect(Location.last.type_of_unit).to eq("Bungalow")
@@ -322,7 +322,7 @@ RSpec.describe LocationsController, type: :request do
 
     context "when signed in as a data coordinator" do
       let(:user) { FactoryBot.create(:user, :data_coordinator) }
-      let!(:scheme) { FactoryBot.create(:scheme, organisation: user.organisation) }
+      let!(:scheme) { FactoryBot.create(:scheme, owning_organisation: user.organisation) }
       let!(:location) { FactoryBot.create(:location, scheme:) }
 
       before do
@@ -348,7 +348,7 @@ RSpec.describe LocationsController, type: :request do
 
     context "when signed in as a support user" do
       let(:user) { FactoryBot.create(:user, :support) }
-      let!(:scheme) { FactoryBot.create(:scheme, organisation: user.organisation) }
+      let!(:scheme) { FactoryBot.create(:scheme, owning_organisation: user.organisation) }
       let!(:location) { FactoryBot.create(:location, scheme:) }
 
       before do
@@ -388,7 +388,7 @@ RSpec.describe LocationsController, type: :request do
 
     context "when signed in as a data coordinator" do
       let(:user) { FactoryBot.create(:user, :data_coordinator) }
-      let!(:scheme) { FactoryBot.create(:scheme, organisation: user.organisation) }
+      let!(:scheme) { FactoryBot.create(:scheme, owning_organisation: user.organisation) }
       let!(:location)  { FactoryBot.create(:location, scheme:) }
       let(:params) { { location: { name: "Test", total_units: "5", type_of_unit: "Bungalow", wheelchair_adaptation: "No", add_another_location: "No", postcode: "ZZ1 1ZZ" } } }
 
@@ -404,7 +404,7 @@ RSpec.describe LocationsController, type: :request do
       end
 
       it "updates existing location for scheme with valid params" do
-        expect(Location.last.scheme.organisation_id).to eq(user.organisation_id)
+        expect(Location.last.scheme.owning_organisation_id).to eq(user.organisation_id)
         expect(Location.last.name).to eq("Test")
         expect(Location.last.postcode).to eq("ZZ11ZZ")
         expect(Location.last.total_units).to eq(5)
@@ -450,7 +450,7 @@ RSpec.describe LocationsController, type: :request do
         end
 
         it "updates existing location for scheme with valid params" do
-          expect(Location.last.scheme.organisation_id).to eq(user.organisation_id)
+          expect(Location.last.scheme.owning_organisation_id).to eq(user.organisation_id)
           expect(Location.last.name).to eq("Test")
           expect(Location.last.total_units).to eq(5)
           expect(Location.last.type_of_unit).to eq("Bungalow")
@@ -468,7 +468,7 @@ RSpec.describe LocationsController, type: :request do
         end
 
         it "updates existing location for scheme with valid params" do
-          expect(Location.last.scheme.organisation_id).to eq(user.organisation_id)
+          expect(Location.last.scheme.owning_organisation_id).to eq(user.organisation_id)
           expect(Location.last.name).to eq("Test")
           expect(Location.last.total_units).to eq(5)
           expect(Location.last.type_of_unit).to eq("Bungalow")
@@ -486,7 +486,7 @@ RSpec.describe LocationsController, type: :request do
         end
 
         it "updates existing location for scheme with valid params" do
-          expect(Location.last.scheme.organisation_id).to eq(user.organisation_id)
+          expect(Location.last.scheme.owning_organisation_id).to eq(user.organisation_id)
           expect(Location.last.name).to eq("Test")
           expect(Location.last.total_units).to eq(5)
           expect(Location.last.type_of_unit).to eq("Bungalow")
@@ -497,7 +497,7 @@ RSpec.describe LocationsController, type: :request do
 
     context "when signed in as a support user" do
       let(:user) { FactoryBot.create(:user, :data_coordinator) }
-      let!(:scheme) { FactoryBot.create(:scheme, organisation: user.organisation) }
+      let!(:scheme) { FactoryBot.create(:scheme, owning_organisation: user.organisation) }
       let!(:location)  { FactoryBot.create(:location, scheme:) }
       let(:params) { { location: { name: "Test", total_units: "5", type_of_unit: "Bungalow", wheelchair_adaptation: "No", add_another_location: "No", postcode: "ZZ1 1ZZ" } } }
 
@@ -615,7 +615,7 @@ RSpec.describe LocationsController, type: :request do
 
     context "when signed in as a data coordinator user" do
       let(:user) { FactoryBot.create(:user, :data_coordinator) }
-      let!(:scheme) { FactoryBot.create(:scheme, organisation: user.organisation) }
+      let!(:scheme) { FactoryBot.create(:scheme, owning_organisation: user.organisation) }
       let!(:locations) { FactoryBot.create_list(:location, 3, scheme:) }
 
       before do
diff --git a/spec/requests/schemes_controller_spec.rb b/spec/requests/schemes_controller_spec.rb
index a49749964..a9a99ce00 100644
--- a/spec/requests/schemes_controller_spec.rb
+++ b/spec/requests/schemes_controller_spec.rb
@@ -261,205 +261,6 @@ RSpec.describe SchemesController, type: :request do
     end
   end
 
-  describe "#locations" do
-    let(:specific_scheme) { schemes.first }
-
-    context "when not signed in" do
-      it "redirects to the sign in page" do
-        get "/schemes/#{specific_scheme.id}/locations"
-        expect(response).to redirect_to("/account/sign-in")
-      end
-    end
-
-    context "when signed in as a data provider user" do
-      let(:user) { FactoryBot.create(:user) }
-
-      before do
-        sign_in user
-        get "/schemes/#{specific_scheme.id}/locations"
-      end
-
-      it "returns 401 unauthorized" do
-        request
-        expect(response).to have_http_status(:unauthorized)
-      end
-    end
-
-    context "when signed in as a data coordinator user" do
-      let(:user) { FactoryBot.create(:user, :data_coordinator) }
-      let!(:scheme) { FactoryBot.create(:scheme, owning_organisation: user.organisation) }
-      let!(:locations) { FactoryBot.create_list(:location, 3, scheme:) }
-
-      before do
-        sign_in user
-        get "/schemes/#{scheme.id}/locations"
-      end
-
-      context "when coordinator attempts to see scheme belonging to a different organisation" do
-        let!(:specific_scheme) { FactoryBot.create(:scheme) }
-
-        before do
-          FactoryBot.create(:location, scheme: specific_scheme)
-        end
-
-        it "returns 404 not found" do
-          get "/schemes/#{specific_scheme.id}/locations"
-          expect(response).to have_http_status(:not_found)
-        end
-      end
-
-      it "shows scheme" do
-        locations.each do |location|
-          expect(page).to have_content(location.location_code)
-          expect(page).to have_content(location.postcode)
-          expect(page).to have_content(location.county)
-          expect(page).to have_content(location.type_of_unit)
-          expect(page).to have_content(location.type_of_building)
-          expect(page).to have_content(location.wheelchair_adaptation)
-          expect(page).to have_content(location.name)
-        end
-      end
-
-      it "has page heading" do
-        expect(page).to have_content(scheme.service_name)
-      end
-
-      it "has correct title" do
-        expected_title = CGI.escapeHTML("#{scheme.service_name} - Submit social housing lettings and sales data (CORE) - GOV.UK")
-        expect(page).to have_title(expected_title)
-      end
-
-      context "when paginating over 20 results" do
-        let!(:locations) { FactoryBot.create_list(:location, 25, scheme:) }
-
-        context "when on the first page" do
-          before do
-            get "/schemes/#{scheme.id}/locations"
-          end
-
-          it "shows which schemes are being shown on the current page" do
-            expect(CGI.unescape_html(response.body)).to match("Showing <b>1</b> to <b>20</b> of <b>#{locations.count}</b> locations")
-          end
-
-          it "has correct page 1 of 2 title" do
-            expected_title = CGI.escapeHTML("#{scheme.service_name} (page 1 of 2) - Submit social housing lettings and sales data (CORE) - GOV.UK")
-            expect(page).to have_title(expected_title)
-          end
-
-          it "has pagination links" do
-            expect(page).not_to have_content("Previous")
-            expect(page).not_to have_link("Previous")
-            expect(page).to have_content("Next")
-            expect(page).to have_link("Next")
-          end
-        end
-
-        context "when on the second page" do
-          before do
-            get "/schemes/#{scheme.id}/locations?page=2"
-          end
-
-          it "shows which schemes are being shown on the current page" do
-            expect(CGI.unescape_html(response.body)).to match("Showing <b>21</b> to <b>25</b> of <b>#{locations.count}</b> locations")
-          end
-
-          it "has correct page 2 of 2 title" do
-            expected_title = CGI.escapeHTML("#{scheme.service_name} (page 2 of 2) - Submit social housing lettings and sales data (CORE) - GOV.UK")
-            expect(page).to have_title(expected_title)
-          end
-
-          it "has pagination links" do
-            expect(page).to have_content("Previous")
-            expect(page).to have_link("Previous")
-            expect(page).not_to have_content("Next")
-            expect(page).not_to have_link("Next")
-          end
-        end
-      end
-    end
-
-    context "when signed in as a support user" do
-      let(:user) { FactoryBot.create(:user, :support) }
-      let!(:scheme) { FactoryBot.create(:scheme) }
-      let!(:locations) { FactoryBot.create_list(:location, 3, scheme:) }
-
-      before do
-        allow(user).to receive(:need_two_factor_authentication?).and_return(false)
-        sign_in user
-        get "/schemes/#{scheme.id}/locations"
-      end
-
-      it "shows scheme" do
-        locations.each do |location|
-          expect(page).to have_content(location.location_code)
-          expect(page).to have_content(location.postcode)
-          expect(page).to have_content(location.county)
-          expect(page).to have_content(location.type_of_unit)
-          expect(page).to have_content(location.type_of_building)
-          expect(page).to have_content(location.wheelchair_adaptation)
-          expect(page).to have_content(location.name)
-        end
-      end
-
-      it "has page heading" do
-        expect(page).to have_content(scheme.service_name)
-      end
-
-      it "has correct title" do
-        expected_title = CGI.escapeHTML("#{scheme.service_name} - Submit social housing lettings and sales data (CORE) - GOV.UK")
-        expect(page).to have_title(expected_title)
-      end
-
-      context "when paginating over 20 results" do
-        let!(:locations) { FactoryBot.create_list(:location, 25, scheme:) }
-
-        context "when on the first page" do
-          before do
-            get "/schemes/#{scheme.id}/locations"
-          end
-
-          it "shows which schemes are being shown on the current page" do
-            expect(CGI.unescape_html(response.body)).to match("Showing <b>1</b> to <b>20</b> of <b>#{locations.count}</b> locations")
-          end
-
-          it "has correct page 1 of 2 title" do
-            expected_title = CGI.escapeHTML("#{scheme.service_name} (page 1 of 2) - Submit social housing lettings and sales data (CORE) - GOV.UK")
-            expect(page).to have_title(expected_title)
-          end
-
-          it "has pagination links" do
-            expect(page).not_to have_content("Previous")
-            expect(page).not_to have_link("Previous")
-            expect(page).to have_content("Next")
-            expect(page).to have_link("Next")
-          end
-        end
-
-        context "when on the second page" do
-          before do
-            get "/schemes/#{scheme.id}/locations?page=2"
-          end
-
-          it "shows which schemes are being shown on the current page" do
-            expect(CGI.unescape_html(response.body)).to match("Showing <b>21</b> to <b>25</b> of <b>#{locations.count}</b> locations")
-          end
-
-          it "has correct page 1 of 2 title" do
-            expected_title = CGI.escapeHTML("#{scheme.service_name} (page 2 of 2) - Submit social housing lettings and sales data (CORE) - GOV.UK")
-            expect(page).to have_title(expected_title)
-          end
-
-          it "has pagination links" do
-            expect(page).to have_content("Previous")
-            expect(page).to have_link("Previous")
-            expect(page).not_to have_content("Next")
-            expect(page).not_to have_link("Next")
-          end
-        end
-      end
-    end
-  end
-
   describe "#new" do
     context "when not signed in" do
       it "redirects to the sign in page" do