diff --git a/db/migrate/20220429092052_create_order_cycles_distributor_shipping_methods.rb b/db/migrate/20220429092052_create_order_cycles_distributor_shipping_methods.rb
new file mode 100644
index 0000000000..e2d5224235
--- /dev/null
+++ b/db/migrate/20220429092052_create_order_cycles_distributor_shipping_methods.rb
@@ -0,0 +1,17 @@
+class CreateOrderCyclesDistributorShippingMethods < ActiveRecord::Migration[6.1]
+  def up
+    create_table :order_cycles_distributor_shipping_methods, id: false do |t|
+      t.belongs_to :order_cycle,
+        index: { name: "index_oc_id_on_order_cycles_distributor_shipping_methods" }
+      t.belongs_to :distributor_shipping_method,
+        index: { name: "index_dsm_id_on_order_cycles_distributor_shipping_methods" }
+      t.index [:order_cycle_id, :distributor_shipping_method_id],
+        name: "order_cycles_distributor_shipping_methods_join_index",
+        unique: true
+    end
+  end
+
+  def down
+    drop_table :order_cycles_distributor_shipping_methods
+  end
+end
diff --git a/db/migrate/20220429092052_create_order_cycles_shipping_methods.rb b/db/migrate/20220429092052_create_order_cycles_shipping_methods.rb
deleted file mode 100644
index 7f184a8571..0000000000
--- a/db/migrate/20220429092052_create_order_cycles_shipping_methods.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-class CreateOrderCyclesShippingMethods < ActiveRecord::Migration[6.1]
-  def up
-    create_table :order_cycles_shipping_methods, id: false do |t|
-      t.belongs_to :order_cycle
-      t.belongs_to :shipping_method, foreign_key: { to_table: :spree_shipping_methods }
-      t.index [:order_cycle_id, :shipping_method_id],
-        name: "order_cycles_shipping_methods_join_index",
-        unique: true
-    end
-  end
-
-  def down
-    drop_table :order_cycles_shipping_methods
-  end
-end
diff --git a/db/schema.rb b/db/schema.rb
index 1ae02469f3..1925baa7fa 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -330,12 +330,12 @@ ActiveRecord::Schema.define(version: 2022_09_07_055044) do
     t.boolean "mails_sent", default: false
   end
 
-  create_table "order_cycles_shipping_methods", id: false, force: :cascade do |t|
+  create_table "order_cycles_distributor_shipping_methods", id: false, force: :cascade do |t|
     t.bigint "order_cycle_id"
-    t.bigint "shipping_method_id"
-    t.index ["order_cycle_id", "shipping_method_id"], name: "order_cycles_shipping_methods_join_index", unique: true
-    t.index ["order_cycle_id"], name: "index_order_cycles_shipping_methods_on_order_cycle_id"
-    t.index ["shipping_method_id"], name: "index_order_cycles_shipping_methods_on_shipping_method_id"
+    t.bigint "distributor_shipping_method_id"
+    t.index ["distributor_shipping_method_id"], name: "index_dsm_id_on_order_cycles_distributor_shipping_methods"
+    t.index ["order_cycle_id", "distributor_shipping_method_id"], name: "order_cycles_distributor_shipping_methods_join_index", unique: true
+    t.index ["order_cycle_id"], name: "index_oc_id_on_order_cycles_distributor_shipping_methods"
   end
 
   create_table "producer_properties", id: :serial, force: :cascade do |t|
@@ -1262,7 +1262,6 @@ ActiveRecord::Schema.define(version: 2022_09_07_055044) do
   add_foreign_key "order_cycle_schedules", "order_cycles", name: "oc_schedules_order_cycle_id_fk"
   add_foreign_key "order_cycle_schedules", "schedules", name: "oc_schedules_schedule_id_fk"
   add_foreign_key "order_cycles", "enterprises", column: "coordinator_id", name: "order_cycles_coordinator_id_fk"
-  add_foreign_key "order_cycles_shipping_methods", "spree_shipping_methods", column: "shipping_method_id"
   add_foreign_key "producer_properties", "enterprises", column: "producer_id", name: "producer_properties_producer_id_fk"
   add_foreign_key "producer_properties", "spree_properties", column: "property_id", name: "producer_properties_property_id_fk"
   add_foreign_key "proxy_orders", "order_cycles", name: "proxy_orders_order_cycle_id_fk"