diff --git a/app/controllers/admin/enterprises_controller.rb b/app/controllers/admin/enterprises_controller.rb
index b62bb9ddf5..99ae12761f 100644
--- a/app/controllers/admin/enterprises_controller.rb
+++ b/app/controllers/admin/enterprises_controller.rb
@@ -235,7 +235,7 @@ module Admin
 
     def check_can_change_bulk_sells
       unless spree_current_user.admin?
-        params[:enterprise_set][:collection_attributes].each do |_i, enterprise_params|
+        params[:sets_enterprise_set][:collection_attributes].each do |_i, enterprise_params|
           unless spree_current_user == Enterprise.find_by(id: enterprise_params[:id]).owner
             enterprise_params.delete :sells
           end
@@ -269,7 +269,7 @@ module Admin
 
     def check_can_change_bulk_owner
       unless spree_current_user.admin?
-        params[:enterprise_set][:collection_attributes].each do |_i, enterprise_params|
+        params[:sets_enterprise_set][:collection_attributes].each do |_i, enterprise_params|
           enterprise_params.delete :owner_id
         end
       end
@@ -321,7 +321,7 @@ module Admin
     end
 
     def bulk_params
-      params.require(:enterprise_set).permit(
+      params.require(:sets_enterprise_set).permit(
         collection_attributes: PermittedAttributes::Enterprise.attributes
       )
     end
diff --git a/spec/controllers/admin/enterprises_controller_spec.rb b/spec/controllers/admin/enterprises_controller_spec.rb
index 8343ca0d9e..a19cada4d4 100644
--- a/spec/controllers/admin/enterprises_controller_spec.rb
+++ b/spec/controllers/admin/enterprises_controller_spec.rb
@@ -385,7 +385,7 @@ describe Admin::EnterprisesController, type: :controller do
         profile_enterprise1.enterprise_roles.build(user: new_owner).save
         profile_enterprise2.enterprise_roles.build(user: new_owner).save
         allow(controller).to receive_messages spree_current_user: new_owner
-        bulk_enterprise_params = { enterprise_set: { collection_attributes: { '0' => { id: profile_enterprise1.id, sells: 'any', owner_id: new_owner.id }, '1' => { id: profile_enterprise2.id, sells: 'any', owner_id: new_owner.id } } } }
+        bulk_enterprise_params = { sets_enterprise_set: { collection_attributes: { '0' => { id: profile_enterprise1.id, sells: 'any', owner_id: new_owner.id }, '1' => { id: profile_enterprise2.id, sells: 'any', owner_id: new_owner.id } } } }
 
         spree_put :bulk_update, bulk_enterprise_params
         profile_enterprise1.reload
@@ -400,7 +400,7 @@ describe Admin::EnterprisesController, type: :controller do
         allow_any_instance_of(Sets::EnterpriseSet).to receive(:save) { false }
         profile_enterprise1.enterprise_roles.build(user: new_owner).save
         allow(controller).to receive_messages spree_current_user: new_owner
-        bulk_enterprise_params = { enterprise_set: { collection_attributes: { '0' => { id: profile_enterprise1.id, visible: 'false' } } } }
+        bulk_enterprise_params = { sets_enterprise_set: { collection_attributes: { '0' => { id: profile_enterprise1.id, visible: 'false' } } } }
         spree_put :bulk_update, bulk_enterprise_params
         expect(assigns(:enterprise_set).collection).to eq [profile_enterprise1]
       end
@@ -409,7 +409,7 @@ describe Admin::EnterprisesController, type: :controller do
     context "as the owner of an enterprise" do
       it "allows 'sells' and 'owner' to be changed" do
         allow(controller).to receive_messages spree_current_user: original_owner
-        bulk_enterprise_params = { enterprise_set: { collection_attributes: { '0' => { id: profile_enterprise1.id, sells: 'any', owner_id: new_owner.id }, '1' => { id: profile_enterprise2.id, sells: 'any', owner_id: new_owner.id } } } }
+        bulk_enterprise_params = { sets_enterprise_set: { collection_attributes: { '0' => { id: profile_enterprise1.id, sells: 'any', owner_id: new_owner.id }, '1' => { id: profile_enterprise2.id, sells: 'any', owner_id: new_owner.id } } } }
 
         spree_put :bulk_update, bulk_enterprise_params
         profile_enterprise1.reload
@@ -426,7 +426,7 @@ describe Admin::EnterprisesController, type: :controller do
         profile_enterprise1.enterprise_roles.build(user: new_owner).save
         profile_enterprise2.enterprise_roles.build(user: new_owner).save
         allow(controller).to receive_messages spree_current_user: admin_user
-        bulk_enterprise_params = { enterprise_set: { collection_attributes: { '0' => { id: profile_enterprise1.id, sells: 'any', owner_id: new_owner.id }, '1' => { id: profile_enterprise2.id, sells: 'any', owner_id: new_owner.id } } } }
+        bulk_enterprise_params = { sets_enterprise_set: { collection_attributes: { '0' => { id: profile_enterprise1.id, sells: 'any', owner_id: new_owner.id }, '1' => { id: profile_enterprise2.id, sells: 'any', owner_id: new_owner.id } } } }
 
         spree_put :bulk_update, bulk_enterprise_params
         profile_enterprise1.reload
diff --git a/spec/features/admin/enterprises/index_spec.rb b/spec/features/admin/enterprises/index_spec.rb
index a79fbaab3c..2709dd2201 100644
--- a/spec/features/admin/enterprises/index_spec.rb
+++ b/spec/features/admin/enterprises/index_spec.rb
@@ -15,7 +15,7 @@ feature 'Enterprises Index' do
 
       within("tr.enterprise-#{s.id}") do
         expect(page).to have_content s.name
-        expect(page).to have_select "enterprise_set_collection_attributes_1_sells"
+        expect(page).to have_select "sets_enterprise_set_collection_attributes_1_sells"
         expect(page).to have_content "Settings"
         expect(page).to have_content "Delete"
         expect(page).to have_no_content "Payment Methods"
@@ -25,7 +25,7 @@ feature 'Enterprises Index' do
 
       within("tr.enterprise-#{d.id}") do
         expect(page).to have_content d.name
-        expect(page).to have_select "enterprise_set_collection_attributes_0_sells"
+        expect(page).to have_select "sets_enterprise_set_collection_attributes_0_sells"
         expect(page).to have_content "Settings"
         expect(page).to have_content "Delete"
         expect(page).to have_content "Payment Methods"
@@ -51,10 +51,10 @@ feature 'Enterprises Index' do
 
         it "updates the enterprises" do
           within("tr.enterprise-#{d.id}") do
-            expect(page).to have_checked_field "enterprise_set_collection_attributes_0_visible"
-            uncheck "enterprise_set_collection_attributes_0_visible"
-            select 'any', from: "enterprise_set_collection_attributes_0_sells"
-            select d_manager.email, from: 'enterprise_set_collection_attributes_0_owner_id'
+            expect(page).to have_checked_field "sets_enterprise_set_collection_attributes_0_visible"
+            uncheck "sets_enterprise_set_collection_attributes_0_visible"
+            select 'any', from: "sets_enterprise_set_collection_attributes_0_sells"
+            select d_manager.email, from: 'sets_enterprise_set_collection_attributes_0_owner_id'
           end
           click_button "Update"
           expect(flash_message).to eq('Enterprises updated successfully')
@@ -83,12 +83,12 @@ feature 'Enterprises Index' do
         it "does not update the enterprises and displays errors" do
           d_row_index = enterprise_row_index(d.name)
           within("tr.enterprise-#{d.id}") do
-            select d_manager.email, from: "enterprise_set_collection_attributes_#{d_row_index}_owner_id"
+            select d_manager.email, from: "sets_enterprise_set_collection_attributes_#{d_row_index}_owner_id"
           end
 
           second_distributor_row_index = enterprise_row_index(second_distributor.name)
           within("tr.enterprise-#{second_distributor.id}") do
-            select d_manager.email, from: "enterprise_set_collection_attributes_#{second_distributor_row_index}_owner_id"
+            select d_manager.email, from: "sets_enterprise_set_collection_attributes_#{second_distributor_row_index}_owner_id"
           end
           click_button "Update"
           expect(flash_message).to eq('Update failed')