diff --git a/core/src/main/java/bisq/core/trade/TradeManager.java b/core/src/main/java/bisq/core/trade/TradeManager.java
index b3eee7071b..09f2aae7c4 100644
--- a/core/src/main/java/bisq/core/trade/TradeManager.java
+++ b/core/src/main/java/bisq/core/trade/TradeManager.java
@@ -43,7 +43,7 @@ import bisq.core.trade.model.bisq_v1.SellerAsMakerTrade;
 import bisq.core.trade.model.bisq_v1.SellerAsTakerTrade;
 import bisq.core.trade.model.bisq_v1.Trade;
 import bisq.core.trade.protocol.ProcessModel;
-import bisq.core.trade.protocol.ProcessModelServiceProvider;
+import bisq.core.trade.protocol.Provider;
 import bisq.core.trade.protocol.TradeProtocol;
 import bisq.core.trade.protocol.TradeProtocolFactory;
 import bisq.core.trade.protocol.bisq_v1.MakerProtocol;
@@ -134,7 +134,7 @@ public class TradeManager implements PersistedDataHost, DecryptedDirectMessageLi
     @Getter
     private final ArbitratorManager arbitratorManager;
     private final MediatorManager mediatorManager;
-    private final ProcessModelServiceProvider processModelServiceProvider;
+    private final Provider provider;
     private final ClockWatcher clockWatcher;
 
     private final Map<String, TradeProtocol> tradeProtocolByTradeId = new HashMap<>();
@@ -171,7 +171,7 @@ public class TradeManager implements PersistedDataHost, DecryptedDirectMessageLi
                         TradeUtil tradeUtil,
                         ArbitratorManager arbitratorManager,
                         MediatorManager mediatorManager,
-                        ProcessModelServiceProvider processModelServiceProvider,
+                        Provider provider,
                         ClockWatcher clockWatcher,
                         PersistenceManager<TradableList<Trade>> persistenceManager,
                         ReferralIdService referralIdService,
@@ -190,7 +190,7 @@ public class TradeManager implements PersistedDataHost, DecryptedDirectMessageLi
         this.tradeUtil = tradeUtil;
         this.arbitratorManager = arbitratorManager;
         this.mediatorManager = mediatorManager;
-        this.processModelServiceProvider = processModelServiceProvider;
+        this.provider = provider;
         this.clockWatcher = clockWatcher;
         this.referralIdService = referralIdService;
         this.dumpDelayedPayoutTx = dumpDelayedPayoutTx;
@@ -367,8 +367,8 @@ public class TradeManager implements PersistedDataHost, DecryptedDirectMessageLi
     }
 
     private void initTradeAndProtocol(Trade trade, TradeProtocol tradeProtocol) {
-        tradeProtocol.initialize(processModelServiceProvider, this, trade.getOffer());
-        trade.initialize(processModelServiceProvider);
+        tradeProtocol.initialize(provider, this, trade.getOffer());
+        trade.initialize(provider);
         requestPersistence();
     }
 
@@ -471,8 +471,8 @@ public class TradeManager implements PersistedDataHost, DecryptedDirectMessageLi
 
     private ProcessModel getNewProcessModel(Offer offer) {
         return new ProcessModel(checkNotNull(offer).getId(),
-                processModelServiceProvider.getUser().getAccountId(),
-                processModelServiceProvider.getKeyRing().getPubKeyRing());
+                provider.getUser().getAccountId(),
+                provider.getKeyRing().getPubKeyRing());
     }
 
     private OfferAvailabilityModel getOfferAvailabilityModel(Offer offer, boolean isTakerApiUser) {
diff --git a/core/src/main/java/bisq/core/trade/model/bisq_v1/Trade.java b/core/src/main/java/bisq/core/trade/model/bisq_v1/Trade.java
index 6755a574c2..75cf84ed81 100644
--- a/core/src/main/java/bisq/core/trade/model/bisq_v1/Trade.java
+++ b/core/src/main/java/bisq/core/trade/model/bisq_v1/Trade.java
@@ -30,7 +30,7 @@ import bisq.core.support.dispute.refund.RefundResultState;
 import bisq.core.support.messages.ChatMessage;
 import bisq.core.trade.model.Tradable;
 import bisq.core.trade.protocol.ProcessModel;
-import bisq.core.trade.protocol.ProcessModelServiceProvider;
+import bisq.core.trade.protocol.Provider;
 import bisq.core.trade.txproof.AssetTxProofResult;
 import bisq.core.util.VolumeUtil;
 
@@ -628,7 +628,7 @@ public abstract class Trade implements Tradable, Model {
     // API
     ///////////////////////////////////////////////////////////////////////////////////////////
 
-    public void initialize(ProcessModelServiceProvider serviceProvider) {
+    public void initialize(Provider serviceProvider) {
         serviceProvider.getArbitratorManager().getDisputeAgentByNodeAddress(arbitratorNodeAddress).ifPresent(arbitrator -> {
             arbitratorBtcPubKey = arbitrator.getBtcPubKey();
             arbitratorPubKeyRing = arbitrator.getPubKeyRing();
diff --git a/core/src/main/java/bisq/core/trade/protocol/ProcessModel.java b/core/src/main/java/bisq/core/trade/protocol/ProcessModel.java
index 562d80f399..25eb374c79 100644
--- a/core/src/main/java/bisq/core/trade/protocol/ProcessModel.java
+++ b/core/src/main/java/bisq/core/trade/protocol/ProcessModel.java
@@ -77,7 +77,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
 
 /**
  * This is the base model for the trade protocol. It is persisted with the trade (non transient fields).
- * It uses the {@link ProcessModelServiceProvider} for access to domain services.
+ * It uses the {@link Provider} for access to domain services.
  */
 
 @Getter
@@ -89,7 +89,7 @@ public class ProcessModel implements Model, PersistablePayload {
     }
 
     // Transient/Immutable (net set in constructor so they are not final, but at init)
-    transient private ProcessModelServiceProvider provider;
+    transient private Provider provider;
     transient private TradeManager tradeManager;
     transient private Offer offer;
 
@@ -181,7 +181,7 @@ public class ProcessModel implements Model, PersistablePayload {
         this.tradingPeer = tradingPeer != null ? tradingPeer : new TradingPeer();
     }
 
-    public void applyTransient(ProcessModelServiceProvider provider,
+    public void applyTransient(Provider provider,
                                TradeManager tradeManager,
                                Offer offer) {
         this.offer = offer;
diff --git a/core/src/main/java/bisq/core/trade/protocol/ProcessModelServiceProvider.java b/core/src/main/java/bisq/core/trade/protocol/Provider.java
similarity index 72%
rename from core/src/main/java/bisq/core/trade/protocol/ProcessModelServiceProvider.java
rename to core/src/main/java/bisq/core/trade/protocol/Provider.java
index 37600eccaf..5516e491cf 100644
--- a/core/src/main/java/bisq/core/trade/protocol/ProcessModelServiceProvider.java
+++ b/core/src/main/java/bisq/core/trade/protocol/Provider.java
@@ -40,7 +40,7 @@ import javax.inject.Inject;
 import lombok.Getter;
 
 @Getter
-public class ProcessModelServiceProvider {
+public class Provider {
     private final OpenOfferManager openOfferManager;
     private final P2PService p2PService;
     private final BtcWalletService btcWalletService;
@@ -58,21 +58,21 @@ public class ProcessModelServiceProvider {
     private final KeyRing keyRing;
 
     @Inject
-    public ProcessModelServiceProvider(OpenOfferManager openOfferManager,
-                                       P2PService p2PService,
-                                       BtcWalletService btcWalletService,
-                                       BsqWalletService bsqWalletService,
-                                       TradeWalletService tradeWalletService,
-                                       DaoFacade daoFacade,
-                                       ReferralIdService referralIdService,
-                                       User user,
-                                       FilterManager filterManager,
-                                       AccountAgeWitnessService accountAgeWitnessService,
-                                       TradeStatisticsManager tradeStatisticsManager,
-                                       ArbitratorManager arbitratorManager,
-                                       MediatorManager mediatorManager,
-                                       RefundAgentManager refundAgentManager,
-                                       KeyRing keyRing) {
+    public Provider(OpenOfferManager openOfferManager,
+                    P2PService p2PService,
+                    BtcWalletService btcWalletService,
+                    BsqWalletService bsqWalletService,
+                    TradeWalletService tradeWalletService,
+                    DaoFacade daoFacade,
+                    ReferralIdService referralIdService,
+                    User user,
+                    FilterManager filterManager,
+                    AccountAgeWitnessService accountAgeWitnessService,
+                    TradeStatisticsManager tradeStatisticsManager,
+                    ArbitratorManager arbitratorManager,
+                    MediatorManager mediatorManager,
+                    RefundAgentManager refundAgentManager,
+                    KeyRing keyRing) {
 
         this.openOfferManager = openOfferManager;
         this.p2PService = p2PService;
diff --git a/core/src/main/java/bisq/core/trade/protocol/TradeProtocol.java b/core/src/main/java/bisq/core/trade/protocol/TradeProtocol.java
index 5b20b682e8..7d1d61513e 100644
--- a/core/src/main/java/bisq/core/trade/protocol/TradeProtocol.java
+++ b/core/src/main/java/bisq/core/trade/protocol/TradeProtocol.java
@@ -69,7 +69,7 @@ public abstract class TradeProtocol implements DecryptedDirectMessageListener, D
     // API
     ///////////////////////////////////////////////////////////////////////////////////////////
 
-    public void initialize(ProcessModelServiceProvider serviceProvider, TradeManager tradeManager, Offer offer) {
+    public void initialize(Provider serviceProvider, TradeManager tradeManager, Offer offer) {
         processModel.applyTransient(serviceProvider, tradeManager, offer);
         onInitialized();
     }