Remove Prefixes for tasks

core/src/main/java/io/bitsquare/gui/main/debug/DebugView.java

@@ -30,25 +30,25 @@ import io.bitsquare.trade.protocol.placeoffer.tasks.CreateOfferFeeTx;
 import io.bitsquare.trade.protocol.placeoffer.tasks.ValidateOffer;
 import io.bitsquare.trade.protocol.trade.BuyerAsOffererProtocol;
 import io.bitsquare.trade.protocol.trade.SellerAsTakerProtocol;
-import io.bitsquare.trade.protocol.trade.tasks.buyer.BuyerCreatesAndSignPayoutTx;
-import io.bitsquare.trade.protocol.trade.tasks.buyer.BuyerCreatesDepositTxInputs;
-import io.bitsquare.trade.protocol.trade.tasks.buyer.BuyerProcessPayoutTxPublishedMessage;
-import io.bitsquare.trade.protocol.trade.tasks.buyer.BuyerProcessRequestPublishDepositTxMessage;
-import io.bitsquare.trade.protocol.trade.tasks.buyer.BuyerSendsDepositTxPublishedMessage;
-import io.bitsquare.trade.protocol.trade.tasks.buyer.BuyerSendsFiatTransferStartedMessage;
-import io.bitsquare.trade.protocol.trade.tasks.buyer.BuyerSendsRequestPayDepositMessage;
-import io.bitsquare.trade.protocol.trade.tasks.buyer.BuyerSignsAndPublishDepositTx;
+import io.bitsquare.trade.protocol.trade.tasks.buyer.CreateAndSignPayoutTx;
+import io.bitsquare.trade.protocol.trade.tasks.buyer.CreateDepositTxInputs;
+import io.bitsquare.trade.protocol.trade.tasks.buyer.ProcessPayoutTxPublishedMessage;
 import io.bitsquare.trade.protocol.trade.tasks.buyer.ProcessRequestDepositTxInputsMessage;
+import io.bitsquare.trade.protocol.trade.tasks.buyer.ProcessRequestPublishDepositTxMessage;
+import io.bitsquare.trade.protocol.trade.tasks.buyer.SendDepositTxPublishedMessage;
+import io.bitsquare.trade.protocol.trade.tasks.buyer.SendFiatTransferStartedMessage;
+import io.bitsquare.trade.protocol.trade.tasks.buyer.SendRequestPayDepositMessage;
+import io.bitsquare.trade.protocol.trade.tasks.buyer.SignAndPublishDepositTx;
 import io.bitsquare.trade.protocol.trade.tasks.offerer.VerifyTakeOfferFeePayment;
 import io.bitsquare.trade.protocol.trade.tasks.offerer.VerifyTakerAccount;
-import io.bitsquare.trade.protocol.trade.tasks.seller.SellerCommitDepositTx;
-import io.bitsquare.trade.protocol.trade.tasks.seller.SellerCreatesAndSignsDepositTx;
-import io.bitsquare.trade.protocol.trade.tasks.seller.SellerProcessDepositTxPublishedMessage;
-import io.bitsquare.trade.protocol.trade.tasks.seller.SellerProcessFiatTransferStartedMessage;
-import io.bitsquare.trade.protocol.trade.tasks.seller.SellerProcessRequestPayDepositMessage;
-import io.bitsquare.trade.protocol.trade.tasks.seller.SellerSendsPayoutTxPublishedMessage;
-import io.bitsquare.trade.protocol.trade.tasks.seller.SellerSignsAndPublishPayoutTx;
+import io.bitsquare.trade.protocol.trade.tasks.seller.CommitDepositTx;
+import io.bitsquare.trade.protocol.trade.tasks.seller.CreateAndSignDepositTx;
+import io.bitsquare.trade.protocol.trade.tasks.seller.ProcessDepositTxPublishedMessage;
+import io.bitsquare.trade.protocol.trade.tasks.seller.ProcessFiatTransferStartedMessage;
+import io.bitsquare.trade.protocol.trade.tasks.seller.ProcessRequestPayDepositMessage;
+import io.bitsquare.trade.protocol.trade.tasks.seller.SendPayoutTxPublishedMessage;
 import io.bitsquare.trade.protocol.trade.tasks.seller.SendRequestDepositTxInputsMessage;
+import io.bitsquare.trade.protocol.trade.tasks.seller.SignAndPublishPayoutTx;
 import io.bitsquare.trade.protocol.trade.tasks.taker.CreateTakeOfferFeeTx;
 import io.bitsquare.trade.protocol.trade.tasks.taker.VerifyOfferFeePayment;
 import io.bitsquare.trade.protocol.trade.tasks.taker.VerifyOffererAccount;
@@ -99,19 +99,19 @@ public class DebugView extends InitializableView {
                         /*---- Protocol ----*/
                         BuyerAsOffererProtocol.class,
                         ProcessRequestDepositTxInputsMessage.class,
-                        BuyerCreatesDepositTxInputs.class,
-                        BuyerSendsRequestPayDepositMessage.class,
+                        CreateDepositTxInputs.class,
+                        SendRequestPayDepositMessage.class,
 
-                        BuyerProcessRequestPublishDepositTxMessage.class,
+                        ProcessRequestPublishDepositTxMessage.class,
                         VerifyTakerAccount.class,
-                        BuyerSignsAndPublishDepositTx.class,
-                        BuyerSendsDepositTxPublishedMessage.class,
+                        SignAndPublishDepositTx.class,
+                        SendDepositTxPublishedMessage.class,
 
-                        BuyerCreatesAndSignPayoutTx.class,
+                        CreateAndSignPayoutTx.class,
                         VerifyTakeOfferFeePayment.class,
-                        BuyerSendsFiatTransferStartedMessage.class,
+                        SendFiatTransferStartedMessage.class,
 
-                        BuyerProcessPayoutTxPublishedMessage.class,
+                        ProcessPayoutTxPublishedMessage.class,
                         Boolean.class, /* used as seperator*/
                         
 
@@ -120,18 +120,18 @@ public class DebugView extends InitializableView {
                         CreateTakeOfferFeeTx.class,
                         SendRequestDepositTxInputsMessage.class,
 
-                        SellerProcessRequestPayDepositMessage.class,
+                        ProcessRequestPayDepositMessage.class,
                         VerifyOffererAccount.class,
-                        SellerCreatesAndSignsDepositTx.class,
+                        CreateAndSignDepositTx.class,
 
-                        SellerProcessDepositTxPublishedMessage.class,
-                        SellerCommitDepositTx.class,
+                        ProcessDepositTxPublishedMessage.class,
+                        CommitDepositTx.class,
 
-                        SellerProcessFiatTransferStartedMessage.class,
+                        ProcessFiatTransferStartedMessage.class,
 
-                        SellerSignsAndPublishPayoutTx.class,
+                        SignAndPublishPayoutTx.class,
                         VerifyOfferFeePayment.class,
-                        SellerSendsPayoutTxPublishedMessage.class
+                        SendPayoutTxPublishedMessage.class
                 )
         );
 

core/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesViewModel.java

@@ -241,7 +241,7 @@ public class PendingTradesViewModel extends ActivatableWithDataModel<PendingTrad
 
     // summary
     public String getTradeVolume() {
-        return formatter.formatCoinWithCode(dataModel.getTrade().getTradeAmount());
+        return dataModel.getTrade() != null ? formatter.formatCoinWithCode(dataModel.getTrade().getTradeAmount()) : "";
     }
 
     public String getFiatVolume() {

core/src/main/java/io/bitsquare/trade/protocol/trade/BuyerAsOffererProtocol.java

@@ -31,17 +31,17 @@ import io.bitsquare.trade.protocol.trade.messages.PayoutTxPublishedMessage;
 import io.bitsquare.trade.protocol.trade.messages.RequestDepositTxInputsMessage;
 import io.bitsquare.trade.protocol.trade.messages.RequestPublishDepositTxMessage;
 import io.bitsquare.trade.protocol.trade.messages.TradeMessage;
-import io.bitsquare.trade.protocol.trade.tasks.buyer.BuyerCommitsPayoutTx;
-import io.bitsquare.trade.protocol.trade.tasks.buyer.BuyerCreatesAndSignPayoutTx;
-import io.bitsquare.trade.protocol.trade.tasks.buyer.BuyerCreatesDepositTxInputs;
-import io.bitsquare.trade.protocol.trade.tasks.buyer.BuyerProcessPayoutTxPublishedMessage;
-import io.bitsquare.trade.protocol.trade.tasks.buyer.BuyerProcessRequestPublishDepositTxMessage;
-import io.bitsquare.trade.protocol.trade.tasks.buyer.BuyerSendsDepositTxPublishedMessage;
-import io.bitsquare.trade.protocol.trade.tasks.buyer.BuyerSendsFiatTransferStartedMessage;
-import io.bitsquare.trade.protocol.trade.tasks.buyer.BuyerSendsRequestPayDepositMessage;
-import io.bitsquare.trade.protocol.trade.tasks.buyer.BuyerSignsAndPublishDepositTx;
-import io.bitsquare.trade.protocol.trade.tasks.buyer.BuyerVerifiesAndSignsContract;
+import io.bitsquare.trade.protocol.trade.tasks.buyer.CommitPayoutTx;
+import io.bitsquare.trade.protocol.trade.tasks.buyer.CreateAndSignPayoutTx;
+import io.bitsquare.trade.protocol.trade.tasks.buyer.CreateDepositTxInputs;
+import io.bitsquare.trade.protocol.trade.tasks.buyer.ProcessPayoutTxPublishedMessage;
 import io.bitsquare.trade.protocol.trade.tasks.buyer.ProcessRequestDepositTxInputsMessage;
+import io.bitsquare.trade.protocol.trade.tasks.buyer.ProcessRequestPublishDepositTxMessage;
+import io.bitsquare.trade.protocol.trade.tasks.buyer.SendDepositTxPublishedMessage;
+import io.bitsquare.trade.protocol.trade.tasks.buyer.SendFiatTransferStartedMessage;
+import io.bitsquare.trade.protocol.trade.tasks.buyer.SendRequestPayDepositMessage;
+import io.bitsquare.trade.protocol.trade.tasks.buyer.SignAndPublishDepositTx;
+import io.bitsquare.trade.protocol.trade.tasks.buyer.VerifyAndSignContract;
 import io.bitsquare.trade.protocol.trade.tasks.offerer.VerifyTakeOfferFeePayment;
 import io.bitsquare.trade.protocol.trade.tasks.offerer.VerifyTakerAccount;
 import io.bitsquare.trade.states.OffererTradeState;
@@ -143,8 +143,8 @@ public class BuyerAsOffererProtocol implements TradeProtocol {
                 this::handleTaskRunnerFault);
         taskRunner.addTasks(
                 ProcessRequestDepositTxInputsMessage.class,
-                BuyerCreatesDepositTxInputs.class,
-                BuyerSendsRequestPayDepositMessage.class
+                CreateDepositTxInputs.class,
+                SendRequestPayDepositMessage.class
         );
         taskRunner.run();
     }
@@ -156,11 +156,11 @@ public class BuyerAsOffererProtocol implements TradeProtocol {
                 () -> log.debug("taskRunner at handleRequestPublishDepositTxMessage completed"),
                 this::handleTaskRunnerFault);
         taskRunner.addTasks(
-                BuyerProcessRequestPublishDepositTxMessage.class,
+                ProcessRequestPublishDepositTxMessage.class,
                 VerifyTakerAccount.class,
-                BuyerVerifiesAndSignsContract.class,
-                BuyerSignsAndPublishDepositTx.class,
-                BuyerSendsDepositTxPublishedMessage.class
+                VerifyAndSignContract.class,
+                SignAndPublishDepositTx.class,
+                SendDepositTxPublishedMessage.class
         );
         taskRunner.run();
     }
@@ -177,8 +177,8 @@ public class BuyerAsOffererProtocol implements TradeProtocol {
                 this::handleTaskRunnerFault);
         taskRunner.addTasks(
                 VerifyTakeOfferFeePayment.class,
-                BuyerCreatesAndSignPayoutTx.class,
-                BuyerSendsFiatTransferStartedMessage.class
+                CreateAndSignPayoutTx.class,
+                SendFiatTransferStartedMessage.class
         );
         taskRunner.run();
     }
@@ -199,8 +199,8 @@ public class BuyerAsOffererProtocol implements TradeProtocol {
                 },
                 this::handleTaskRunnerFault);
 
-        taskRunner.addTasks(BuyerProcessPayoutTxPublishedMessage.class);
-        taskRunner.addTasks(BuyerCommitsPayoutTx.class);
+        taskRunner.addTasks(ProcessPayoutTxPublishedMessage.class);
+        taskRunner.addTasks(CommitPayoutTx.class);
         taskRunner.run();
     }
 

core/src/main/java/io/bitsquare/trade/protocol/trade/BuyerAsTakerProtocol.java

@@ -27,16 +27,16 @@ import io.bitsquare.trade.Trade;
 import io.bitsquare.trade.protocol.trade.messages.PayoutTxPublishedMessage;
 import io.bitsquare.trade.protocol.trade.messages.RequestPublishDepositTxMessage;
 import io.bitsquare.trade.protocol.trade.messages.TradeMessage;
-import io.bitsquare.trade.protocol.trade.tasks.buyer.BuyerCommitsPayoutTx;
-import io.bitsquare.trade.protocol.trade.tasks.buyer.BuyerCreatesAndSignPayoutTx;
-import io.bitsquare.trade.protocol.trade.tasks.buyer.BuyerCreatesDepositTxInputs;
-import io.bitsquare.trade.protocol.trade.tasks.buyer.BuyerProcessPayoutTxPublishedMessage;
-import io.bitsquare.trade.protocol.trade.tasks.buyer.BuyerProcessRequestPublishDepositTxMessage;
-import io.bitsquare.trade.protocol.trade.tasks.buyer.BuyerSendsDepositTxPublishedMessage;
-import io.bitsquare.trade.protocol.trade.tasks.buyer.BuyerSendsFiatTransferStartedMessage;
-import io.bitsquare.trade.protocol.trade.tasks.buyer.BuyerSendsRequestPayDepositMessage;
-import io.bitsquare.trade.protocol.trade.tasks.buyer.BuyerSignsAndPublishDepositTx;
-import io.bitsquare.trade.protocol.trade.tasks.buyer.BuyerVerifiesAndSignsContract;
+import io.bitsquare.trade.protocol.trade.tasks.buyer.CommitPayoutTx;
+import io.bitsquare.trade.protocol.trade.tasks.buyer.CreateAndSignPayoutTx;
+import io.bitsquare.trade.protocol.trade.tasks.buyer.CreateDepositTxInputs;
+import io.bitsquare.trade.protocol.trade.tasks.buyer.ProcessPayoutTxPublishedMessage;
+import io.bitsquare.trade.protocol.trade.tasks.buyer.ProcessRequestPublishDepositTxMessage;
+import io.bitsquare.trade.protocol.trade.tasks.buyer.SendDepositTxPublishedMessage;
+import io.bitsquare.trade.protocol.trade.tasks.buyer.SendFiatTransferStartedMessage;
+import io.bitsquare.trade.protocol.trade.tasks.buyer.SendRequestPayDepositMessage;
+import io.bitsquare.trade.protocol.trade.tasks.buyer.SignAndPublishDepositTx;
+import io.bitsquare.trade.protocol.trade.tasks.buyer.VerifyAndSignContract;
 import io.bitsquare.trade.protocol.trade.tasks.taker.BroadcastTakeOfferFeeTx;
 import io.bitsquare.trade.protocol.trade.tasks.taker.CreateTakeOfferFeeTx;
 import io.bitsquare.trade.protocol.trade.tasks.taker.VerifyOfferFeePayment;
@@ -100,8 +100,8 @@ public class BuyerAsTakerProtocol implements TradeProtocol {
         taskRunner.addTasks(
                 CreateTakeOfferFeeTx.class,
                 BroadcastTakeOfferFeeTx.class,
-                BuyerCreatesDepositTxInputs.class,
-                BuyerSendsRequestPayDepositMessage.class
+                CreateDepositTxInputs.class,
+                SendRequestPayDepositMessage.class
         );
         taskRunner.run();
     }
@@ -118,11 +118,11 @@ public class BuyerAsTakerProtocol implements TradeProtocol {
                 () -> log.debug("taskRunner at handleRequestPublishDepositTxMessage completed"),
                 this::handleTaskRunnerFault);
         taskRunner.addTasks(
-                BuyerProcessRequestPublishDepositTxMessage.class,
+                ProcessRequestPublishDepositTxMessage.class,
                 VerifyOffererAccount.class,
-                BuyerVerifiesAndSignsContract.class,
-                BuyerSignsAndPublishDepositTx.class,
-                BuyerSendsDepositTxPublishedMessage.class
+                VerifyAndSignContract.class,
+                SignAndPublishDepositTx.class,
+                SendDepositTxPublishedMessage.class
         );
         taskRunner.run();
     }
@@ -139,8 +139,8 @@ public class BuyerAsTakerProtocol implements TradeProtocol {
                 this::handleTaskRunnerFault);
         taskRunner.addTasks(
                 VerifyOfferFeePayment.class,
-                BuyerCreatesAndSignPayoutTx.class,
-                BuyerSendsFiatTransferStartedMessage.class
+                CreateAndSignPayoutTx.class,
+                SendFiatTransferStartedMessage.class
         );
         taskRunner.run();
     }
@@ -162,8 +162,8 @@ public class BuyerAsTakerProtocol implements TradeProtocol {
                 this::handleTaskRunnerFault);
 
         taskRunner.addTasks(
-                BuyerProcessPayoutTxPublishedMessage.class,
-                BuyerCommitsPayoutTx.class);
+                ProcessPayoutTxPublishedMessage.class,
+                CommitPayoutTx.class);
         taskRunner.run();
     }
 

core/src/main/java/io/bitsquare/trade/protocol/trade/SellerAsOffererProtocol.java

@@ -33,15 +33,15 @@ import io.bitsquare.trade.protocol.trade.messages.RequestPayDepositMessage;
 import io.bitsquare.trade.protocol.trade.messages.TradeMessage;
 import io.bitsquare.trade.protocol.trade.tasks.offerer.VerifyTakeOfferFeePayment;
 import io.bitsquare.trade.protocol.trade.tasks.offerer.VerifyTakerAccount;
-import io.bitsquare.trade.protocol.trade.tasks.seller.SellerCommitDepositTx;
-import io.bitsquare.trade.protocol.trade.tasks.seller.SellerCreatesAndSignsContract;
-import io.bitsquare.trade.protocol.trade.tasks.seller.SellerCreatesAndSignsDepositTx;
-import io.bitsquare.trade.protocol.trade.tasks.seller.SellerProcessDepositTxPublishedMessage;
-import io.bitsquare.trade.protocol.trade.tasks.seller.SellerProcessFiatTransferStartedMessage;
-import io.bitsquare.trade.protocol.trade.tasks.seller.SellerProcessRequestPayDepositMessage;
-import io.bitsquare.trade.protocol.trade.tasks.seller.SellerSendsPayoutTxPublishedMessage;
-import io.bitsquare.trade.protocol.trade.tasks.seller.SellerSendsRequestPublishDepositTxMessage;
-import io.bitsquare.trade.protocol.trade.tasks.seller.SellerSignsAndPublishPayoutTx;
+import io.bitsquare.trade.protocol.trade.tasks.seller.CommitDepositTx;
+import io.bitsquare.trade.protocol.trade.tasks.seller.CreateAndSignContract;
+import io.bitsquare.trade.protocol.trade.tasks.seller.CreateAndSignDepositTx;
+import io.bitsquare.trade.protocol.trade.tasks.seller.ProcessDepositTxPublishedMessage;
+import io.bitsquare.trade.protocol.trade.tasks.seller.ProcessFiatTransferStartedMessage;
+import io.bitsquare.trade.protocol.trade.tasks.seller.ProcessRequestPayDepositMessage;
+import io.bitsquare.trade.protocol.trade.tasks.seller.SendPayoutTxPublishedMessage;
+import io.bitsquare.trade.protocol.trade.tasks.seller.SendRequestPublishDepositTxMessage;
+import io.bitsquare.trade.protocol.trade.tasks.seller.SignAndPublishPayoutTx;
 import io.bitsquare.trade.states.OffererTradeState;
 
 import org.slf4j.Logger;
@@ -144,11 +144,11 @@ public class SellerAsOffererProtocol implements TradeProtocol {
                 this::handleTaskRunnerFault);
 
         taskRunner.addTasks(
-                SellerProcessRequestPayDepositMessage.class,
+                ProcessRequestPayDepositMessage.class,
                 VerifyTakerAccount.class,
-                SellerCreatesAndSignsContract.class,
-                SellerCreatesAndSignsDepositTx.class,
-                SellerSendsRequestPublishDepositTxMessage.class
+                CreateAndSignContract.class,
+                CreateAndSignDepositTx.class,
+                SendRequestPublishDepositTxMessage.class
         );
         taskRunner.run();
     }
@@ -161,8 +161,8 @@ public class SellerAsOffererProtocol implements TradeProtocol {
                 this::handleTaskRunnerFault);
 
         taskRunner.addTasks(
-                SellerProcessDepositTxPublishedMessage.class,
-                SellerCommitDepositTx.class
+                ProcessDepositTxPublishedMessage.class,
+                CommitDepositTx.class
         );
         taskRunner.run();
     }
@@ -174,7 +174,7 @@ public class SellerAsOffererProtocol implements TradeProtocol {
                 () -> log.debug("taskRunner at handleFiatTransferStartedMessage completed"),
                 this::handleTaskRunnerFault);
 
-        taskRunner.addTasks(SellerProcessFiatTransferStartedMessage.class);
+        taskRunner.addTasks(ProcessFiatTransferStartedMessage.class);
         taskRunner.run();
     }
 
@@ -198,8 +198,8 @@ public class SellerAsOffererProtocol implements TradeProtocol {
 
         taskRunner.addTasks(
                 VerifyTakeOfferFeePayment.class,
-                SellerSignsAndPublishPayoutTx.class,
-                SellerSendsPayoutTxPublishedMessage.class
+                SignAndPublishPayoutTx.class,
+                SendPayoutTxPublishedMessage.class
         );
         taskRunner.run();
     }

core/src/main/java/io/bitsquare/trade/protocol/trade/SellerAsTakerProtocol.java

@@ -28,16 +28,16 @@ import io.bitsquare.trade.protocol.trade.messages.DepositTxPublishedMessage;
 import io.bitsquare.trade.protocol.trade.messages.FiatTransferStartedMessage;
 import io.bitsquare.trade.protocol.trade.messages.RequestPayDepositMessage;
 import io.bitsquare.trade.protocol.trade.messages.TradeMessage;
-import io.bitsquare.trade.protocol.trade.tasks.seller.SellerCommitDepositTx;
-import io.bitsquare.trade.protocol.trade.tasks.seller.SellerCreatesAndSignsContract;
-import io.bitsquare.trade.protocol.trade.tasks.seller.SellerCreatesAndSignsDepositTx;
-import io.bitsquare.trade.protocol.trade.tasks.seller.SellerProcessDepositTxPublishedMessage;
-import io.bitsquare.trade.protocol.trade.tasks.seller.SellerProcessFiatTransferStartedMessage;
-import io.bitsquare.trade.protocol.trade.tasks.seller.SellerProcessRequestPayDepositMessage;
-import io.bitsquare.trade.protocol.trade.tasks.seller.SellerSendsPayoutTxPublishedMessage;
-import io.bitsquare.trade.protocol.trade.tasks.seller.SellerSendsRequestPublishDepositTxMessage;
-import io.bitsquare.trade.protocol.trade.tasks.seller.SellerSignsAndPublishPayoutTx;
+import io.bitsquare.trade.protocol.trade.tasks.seller.CommitDepositTx;
+import io.bitsquare.trade.protocol.trade.tasks.seller.CreateAndSignContract;
+import io.bitsquare.trade.protocol.trade.tasks.seller.CreateAndSignDepositTx;
+import io.bitsquare.trade.protocol.trade.tasks.seller.ProcessDepositTxPublishedMessage;
+import io.bitsquare.trade.protocol.trade.tasks.seller.ProcessFiatTransferStartedMessage;
+import io.bitsquare.trade.protocol.trade.tasks.seller.ProcessRequestPayDepositMessage;
+import io.bitsquare.trade.protocol.trade.tasks.seller.SendPayoutTxPublishedMessage;
 import io.bitsquare.trade.protocol.trade.tasks.seller.SendRequestDepositTxInputsMessage;
+import io.bitsquare.trade.protocol.trade.tasks.seller.SendRequestPublishDepositTxMessage;
+import io.bitsquare.trade.protocol.trade.tasks.seller.SignAndPublishPayoutTx;
 import io.bitsquare.trade.protocol.trade.tasks.taker.BroadcastTakeOfferFeeTx;
 import io.bitsquare.trade.protocol.trade.tasks.taker.CreateTakeOfferFeeTx;
 import io.bitsquare.trade.protocol.trade.tasks.taker.VerifyOfferFeePayment;
@@ -120,11 +120,11 @@ public class SellerAsTakerProtocol implements TradeProtocol {
                 this::handleTaskRunnerFault);
 
         taskRunner.addTasks(
-                SellerProcessRequestPayDepositMessage.class,
+                ProcessRequestPayDepositMessage.class,
                 VerifyOffererAccount.class,
-                SellerCreatesAndSignsContract.class,
-                SellerCreatesAndSignsDepositTx.class,
-                SellerSendsRequestPublishDepositTxMessage.class
+                CreateAndSignContract.class,
+                CreateAndSignDepositTx.class,
+                SendRequestPublishDepositTxMessage.class
         );
         taskRunner.run();
     }
@@ -137,8 +137,8 @@ public class SellerAsTakerProtocol implements TradeProtocol {
                 this::handleTaskRunnerFault);
 
         taskRunner.addTasks(
-                SellerProcessDepositTxPublishedMessage.class,
-                SellerCommitDepositTx.class
+                ProcessDepositTxPublishedMessage.class,
+                CommitDepositTx.class
         );
         taskRunner.run();
     }
@@ -150,7 +150,7 @@ public class SellerAsTakerProtocol implements TradeProtocol {
                 () -> log.debug("taskRunner at handleFiatTransferStartedMessage completed"),
                 this::handleTaskRunnerFault);
 
-        taskRunner.addTasks(SellerProcessFiatTransferStartedMessage.class);
+        taskRunner.addTasks(ProcessFiatTransferStartedMessage.class);
         taskRunner.run();
     }
 
@@ -174,8 +174,8 @@ public class SellerAsTakerProtocol implements TradeProtocol {
 
         taskRunner.addTasks(
                 VerifyOfferFeePayment.class,
-                SellerSignsAndPublishPayoutTx.class,
-                SellerSendsPayoutTxPublishedMessage.class
+                SignAndPublishPayoutTx.class,
+                SendPayoutTxPublishedMessage.class
         );
         taskRunner.run();
     }

core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/CommitPayoutTx.java

@@ -26,10 +26,10 @@ import org.bitcoinj.core.Transaction;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class BuyerCommitsPayoutTx extends TradeTask {
-    private static final Logger log = LoggerFactory.getLogger(BuyerCommitsPayoutTx.class);
+public class CommitPayoutTx extends TradeTask {
+    private static final Logger log = LoggerFactory.getLogger(CommitPayoutTx.class);
 
-    public BuyerCommitsPayoutTx(TaskRunner taskHandler, Trade trade) {
+    public CommitPayoutTx(TaskRunner taskHandler, Trade trade) {
         super(taskHandler, trade);
     }
 

core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/CreateAndSignPayoutTx.java

@@ -26,10 +26,10 @@ import org.bitcoinj.core.Coin;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class BuyerCreatesAndSignPayoutTx extends TradeTask {
-    private static final Logger log = LoggerFactory.getLogger(BuyerCreatesAndSignPayoutTx.class);
+public class CreateAndSignPayoutTx extends TradeTask {
+    private static final Logger log = LoggerFactory.getLogger(CreateAndSignPayoutTx.class);
 
-    public BuyerCreatesAndSignPayoutTx(TaskRunner taskHandler, Trade trade) {
+    public CreateAndSignPayoutTx(TaskRunner taskHandler, Trade trade) {
         super(taskHandler, trade);
     }
 

core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/CreateDepositTxInputs.java

@@ -29,10 +29,10 @@ import org.bitcoinj.core.Coin;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class BuyerCreatesDepositTxInputs extends TradeTask {
-    private static final Logger log = LoggerFactory.getLogger(BuyerCreatesDepositTxInputs.class);
+public class CreateDepositTxInputs extends TradeTask {
+    private static final Logger log = LoggerFactory.getLogger(CreateDepositTxInputs.class);
 
-    public BuyerCreatesDepositTxInputs(TaskRunner taskHandler, Trade trade) {
+    public CreateDepositTxInputs(TaskRunner taskHandler, Trade trade) {
         super(taskHandler, trade);
     }
 

core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/ProcessPayoutTxPublishedMessage.java

@@ -32,10 +32,10 @@ import org.slf4j.LoggerFactory;
 import static com.google.common.base.Preconditions.checkNotNull;
 import static io.bitsquare.util.Validator.checkTradeId;
 
-public class BuyerProcessPayoutTxPublishedMessage extends TradeTask {
-    private static final Logger log = LoggerFactory.getLogger(BuyerProcessPayoutTxPublishedMessage.class);
+public class ProcessPayoutTxPublishedMessage extends TradeTask {
+    private static final Logger log = LoggerFactory.getLogger(ProcessPayoutTxPublishedMessage.class);
 
-    public BuyerProcessPayoutTxPublishedMessage(TaskRunner taskHandler, Trade trade) {
+    public ProcessPayoutTxPublishedMessage(TaskRunner taskHandler, Trade trade) {
         super(taskHandler, trade);
     }
 

core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/ProcessRequestPublishDepositTxMessage.java

@@ -29,10 +29,10 @@ import org.slf4j.LoggerFactory;
 import static com.google.common.base.Preconditions.*;
 import static io.bitsquare.util.Validator.*;
 
-public class BuyerProcessRequestPublishDepositTxMessage extends TradeTask {
-    private static final Logger log = LoggerFactory.getLogger(BuyerProcessRequestPublishDepositTxMessage.class);
+public class ProcessRequestPublishDepositTxMessage extends TradeTask {
+    private static final Logger log = LoggerFactory.getLogger(ProcessRequestPublishDepositTxMessage.class);
 
-    public BuyerProcessRequestPublishDepositTxMessage(TaskRunner taskHandler, Trade trade) {
+    public ProcessRequestPublishDepositTxMessage(TaskRunner taskHandler, Trade trade) {
         super(taskHandler, trade);
     }
 

core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/SendDepositTxPublishedMessage.java

@@ -27,10 +27,10 @@ import io.bitsquare.trade.states.StateUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class BuyerSendsDepositTxPublishedMessage extends TradeTask {
-    private static final Logger log = LoggerFactory.getLogger(BuyerSendsDepositTxPublishedMessage.class);
+public class SendDepositTxPublishedMessage extends TradeTask {
+    private static final Logger log = LoggerFactory.getLogger(SendDepositTxPublishedMessage.class);
 
-    public BuyerSendsDepositTxPublishedMessage(TaskRunner taskHandler, Trade trade) {
+    public SendDepositTxPublishedMessage(TaskRunner taskHandler, Trade trade) {
         super(taskHandler, trade);
     }
 

core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/SendFiatTransferStartedMessage.java

@@ -31,10 +31,10 @@ import io.bitsquare.trade.states.TakerTradeState;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class BuyerSendsFiatTransferStartedMessage extends TradeTask {
-    private static final Logger log = LoggerFactory.getLogger(BuyerSendsFiatTransferStartedMessage.class);
+public class SendFiatTransferStartedMessage extends TradeTask {
+    private static final Logger log = LoggerFactory.getLogger(SendFiatTransferStartedMessage.class);
 
-    public BuyerSendsFiatTransferStartedMessage(TaskRunner taskHandler, Trade trade) {
+    public SendFiatTransferStartedMessage(TaskRunner taskHandler, Trade trade) {
         super(taskHandler, trade);
     }
 

core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/SendRequestPayDepositMessage.java

@@ -27,10 +27,10 @@ import io.bitsquare.trade.states.StateUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class BuyerSendsRequestPayDepositMessage extends TradeTask {
-    private static final Logger log = LoggerFactory.getLogger(BuyerSendsRequestPayDepositMessage.class);
+public class SendRequestPayDepositMessage extends TradeTask {
+    private static final Logger log = LoggerFactory.getLogger(SendRequestPayDepositMessage.class);
 
-    public BuyerSendsRequestPayDepositMessage(TaskRunner taskHandler, Trade trade) {
+    public SendRequestPayDepositMessage(TaskRunner taskHandler, Trade trade) {
         super(taskHandler, trade);
     }
 

core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/SignAndPublishDepositTx.java

@@ -36,10 +36,10 @@ import org.jetbrains.annotations.NotNull;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class BuyerSignsAndPublishDepositTx extends TradeTask {
-    private static final Logger log = LoggerFactory.getLogger(BuyerSignsAndPublishDepositTx.class);
+public class SignAndPublishDepositTx extends TradeTask {
+    private static final Logger log = LoggerFactory.getLogger(SignAndPublishDepositTx.class);
 
-    public BuyerSignsAndPublishDepositTx(TaskRunner taskHandler, Trade trade) {
+    public SignAndPublishDepositTx(TaskRunner taskHandler, Trade trade) {
         super(taskHandler, trade);
     }
 

core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/VerifyAndSignContract.java

@@ -27,10 +27,10 @@ import io.bitsquare.util.Utilities;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class BuyerVerifiesAndSignsContract extends TradeTask {
-    private static final Logger log = LoggerFactory.getLogger(BuyerVerifiesAndSignsContract.class);
+public class VerifyAndSignContract extends TradeTask {
+    private static final Logger log = LoggerFactory.getLogger(VerifyAndSignContract.class);
 
-    public BuyerVerifiesAndSignsContract(TaskRunner taskHandler, Trade trade) {
+    public VerifyAndSignContract(TaskRunner taskHandler, Trade trade) {
         super(taskHandler, trade);
     }
 

core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/CommitDepositTx.java

@@ -26,10 +26,10 @@ import org.bitcoinj.core.Transaction;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class SellerCommitDepositTx extends TradeTask {
-    private static final Logger log = LoggerFactory.getLogger(SellerCommitDepositTx.class);
+public class CommitDepositTx extends TradeTask {
+    private static final Logger log = LoggerFactory.getLogger(CommitDepositTx.class);
 
-    public SellerCommitDepositTx(TaskRunner taskHandler, Trade trade) {
+    public CommitDepositTx(TaskRunner taskHandler, Trade trade) {
         super(taskHandler, trade);
     }
 

core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/CreateAndSignContract.java

@@ -26,10 +26,10 @@ import io.bitsquare.util.Utilities;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class SellerCreatesAndSignsContract extends TradeTask {
-    private static final Logger log = LoggerFactory.getLogger(SellerCreatesAndSignsContract.class);
+public class CreateAndSignContract extends TradeTask {
+    private static final Logger log = LoggerFactory.getLogger(CreateAndSignContract.class);
 
-    public SellerCreatesAndSignsContract(TaskRunner taskHandler, Trade trade) {
+    public CreateAndSignContract(TaskRunner taskHandler, Trade trade) {
         super(taskHandler, trade);
     }
 

core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/CreateAndSignDepositTx.java

@@ -28,10 +28,10 @@ import org.bitcoinj.core.Coin;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class SellerCreatesAndSignsDepositTx extends TradeTask {
-    private static final Logger log = LoggerFactory.getLogger(SellerCreatesAndSignsDepositTx.class);
+public class CreateAndSignDepositTx extends TradeTask {
+    private static final Logger log = LoggerFactory.getLogger(CreateAndSignDepositTx.class);
 
-    public SellerCreatesAndSignsDepositTx(TaskRunner taskHandler, Trade trade) {
+    public CreateAndSignDepositTx(TaskRunner taskHandler, Trade trade) {
         super(taskHandler, trade);
     }
 

core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/ProcessDepositTxPublishedMessage.java

@@ -32,10 +32,10 @@ import org.slf4j.LoggerFactory;
 import static com.google.common.base.Preconditions.checkNotNull;
 import static io.bitsquare.util.Validator.checkTradeId;
 
-public class SellerProcessDepositTxPublishedMessage extends TradeTask {
-    private static final Logger log = LoggerFactory.getLogger(SellerProcessDepositTxPublishedMessage.class);
+public class ProcessDepositTxPublishedMessage extends TradeTask {
+    private static final Logger log = LoggerFactory.getLogger(ProcessDepositTxPublishedMessage.class);
 
-    public SellerProcessDepositTxPublishedMessage(TaskRunner taskHandler, Trade trade) {
+    public ProcessDepositTxPublishedMessage(TaskRunner taskHandler, Trade trade) {
         super(taskHandler, trade);
     }
 

core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/ProcessFiatTransferStartedMessage.java

@@ -32,10 +32,10 @@ import org.slf4j.LoggerFactory;
 import static com.google.common.base.Preconditions.checkNotNull;
 import static io.bitsquare.util.Validator.*;
 
-public class SellerProcessFiatTransferStartedMessage extends TradeTask {
-    private static final Logger log = LoggerFactory.getLogger(SellerProcessFiatTransferStartedMessage.class);
+public class ProcessFiatTransferStartedMessage extends TradeTask {
+    private static final Logger log = LoggerFactory.getLogger(ProcessFiatTransferStartedMessage.class);
 
-    public SellerProcessFiatTransferStartedMessage(TaskRunner taskHandler, Trade trade) {
+    public ProcessFiatTransferStartedMessage(TaskRunner taskHandler, Trade trade) {
         super(taskHandler, trade);
     }
 

core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/ProcessRequestPayDepositMessage.java

@@ -28,10 +28,10 @@ import org.slf4j.LoggerFactory;
 import static com.google.common.base.Preconditions.*;
 import static io.bitsquare.util.Validator.*;
 
-public class SellerProcessRequestPayDepositMessage extends TradeTask {
-    private static final Logger log = LoggerFactory.getLogger(SellerProcessRequestPayDepositMessage.class);
+public class ProcessRequestPayDepositMessage extends TradeTask {
+    private static final Logger log = LoggerFactory.getLogger(ProcessRequestPayDepositMessage.class);
 
-    public SellerProcessRequestPayDepositMessage(TaskRunner taskHandler, Trade trade) {
+    public ProcessRequestPayDepositMessage(TaskRunner taskHandler, Trade trade) {
         super(taskHandler, trade);
     }
 

core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/SendPayoutTxPublishedMessage.java

@@ -27,10 +27,10 @@ import io.bitsquare.trade.states.StateUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class SellerSendsPayoutTxPublishedMessage extends TradeTask {
-    private static final Logger log = LoggerFactory.getLogger(SellerSendsPayoutTxPublishedMessage.class);
+public class SendPayoutTxPublishedMessage extends TradeTask {
+    private static final Logger log = LoggerFactory.getLogger(SendPayoutTxPublishedMessage.class);
 
-    public SellerSendsPayoutTxPublishedMessage(TaskRunner taskHandler, Trade trade) {
+    public SendPayoutTxPublishedMessage(TaskRunner taskHandler, Trade trade) {
         super(taskHandler, trade);
     }
 

core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/SendRequestPublishDepositTxMessage.java

@@ -27,10 +27,10 @@ import io.bitsquare.trade.states.StateUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class SellerSendsRequestPublishDepositTxMessage extends TradeTask {
-    private static final Logger log = LoggerFactory.getLogger(SellerSendsRequestPublishDepositTxMessage.class);
+public class SendRequestPublishDepositTxMessage extends TradeTask {
+    private static final Logger log = LoggerFactory.getLogger(SendRequestPublishDepositTxMessage.class);
 
-    public SellerSendsRequestPublishDepositTxMessage(TaskRunner taskHandler, Trade trade) {
+    public SendRequestPublishDepositTxMessage(TaskRunner taskHandler, Trade trade) {
         super(taskHandler, trade);
     }
 

core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/SignAndPublishPayoutTx.java

@@ -34,10 +34,10 @@ import org.jetbrains.annotations.NotNull;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class SellerSignsAndPublishPayoutTx extends TradeTask {
-    private static final Logger log = LoggerFactory.getLogger(SellerSignsAndPublishPayoutTx.class);
+public class SignAndPublishPayoutTx extends TradeTask {
+    private static final Logger log = LoggerFactory.getLogger(SignAndPublishPayoutTx.class);
 
-    public SellerSignsAndPublishPayoutTx(TaskRunner taskHandler, Trade trade) {
+    public SignAndPublishPayoutTx(TaskRunner taskHandler, Trade trade) {
         super(taskHandler, trade);
     }