diff --git a/app/models/spree/payment_method.rb b/app/models/spree/payment_method.rb
index 9c41fbefa2..ba1dc3e301 100644
--- a/app/models/spree/payment_method.rb
+++ b/app/models/spree/payment_method.rb
@@ -99,7 +99,7 @@ module Spree
         self.class.include Spree::Core::CalculatedAdjustments
       end
 
-      self.calculator ||= Calculator::FlatRate.new(preferred_amount: 0)
+      self.calculator ||= ::Calculator::FlatRate.new(preferred_amount: 0)
     end
 
     def has_distributor?(distributor)
diff --git a/spec/factories/calculator_factory.rb b/spec/factories/calculator_factory.rb
index 1268a8ccb7..2d8cc36a1a 100644
--- a/spec/factories/calculator_factory.rb
+++ b/spec/factories/calculator_factory.rb
@@ -1,9 +1,9 @@
 FactoryBot.define do
-  factory :calculator, class: Spree::Calculator::FlatRate do
+  factory :calculator, class: Calculator::FlatRate do
     after(:create) { |c| c.set_preference(:amount, 10.0) }
   end
 
-  factory :no_amount_calculator, class: Spree::Calculator::FlatRate do
+  factory :no_amount_calculator, class: Calculator::FlatRate do
     after(:create) { |c| c.set_preference(:amount, 0) }
   end
 
diff --git a/spec/factories/stock_factory.rb b/spec/factories/stock_factory.rb
index b501401507..c288121873 100644
--- a/spec/factories/stock_factory.rb
+++ b/spec/factories/stock_factory.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 FactoryBot.define do
-  factory :stock_package, class: Spree::Stock::Package do
+  factory :stock_package, class: OrderManagement::Stock::Package do
     ignore do
       stock_location { build(:stock_location) }
       order { create(:order_with_line_items, line_items_count: 2) }