diff --git a/src/main/java/io/bitsquare/gui/View.java b/src/main/java/io/bitsquare/gui/View.java
index 911e1b40c0..2590b2b2fa 100644
--- a/src/main/java/io/bitsquare/gui/View.java
+++ b/src/main/java/io/bitsquare/gui/View.java
@@ -29,7 +29,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- * Non caching version for code behind classes using the PM pattern
+ * Non caching version for code behind classes using the ViewModel pattern
  */
 public abstract class View<M> implements Initializable {
 
diff --git a/src/main/java/io/bitsquare/gui/main/account/AccountView.java b/src/main/java/io/bitsquare/gui/main/account/AccountView.java
index cdc9c46649..7696c22a5b 100644
--- a/src/main/java/io/bitsquare/gui/main/account/AccountView.java
+++ b/src/main/java/io/bitsquare/gui/main/account/AccountView.java
@@ -45,7 +45,7 @@ public class AccountView extends ActivatableView {
 
     @FXML Tab accountSettingsTab, arbitratorSettingsTab;
 
-    private final AccountPM model;
+    private final AccountViewModel model;
     private final ViewLoader viewLoader;
     private final Navigation navigation;
 
@@ -55,7 +55,7 @@ public class AccountView extends ActivatableView {
     ///////////////////////////////////////////////////////////////////////////////////////////
 
     @Inject
-    private AccountView(AccountPM model, ViewLoader viewLoader, Navigation navigation) {
+    private AccountView(AccountViewModel model, ViewLoader viewLoader, Navigation navigation) {
         this.model = model;
         this.viewLoader = viewLoader;
         this.navigation = navigation;
diff --git a/src/main/java/io/bitsquare/gui/main/account/AccountPM.java b/src/main/java/io/bitsquare/gui/main/account/AccountViewModel.java
similarity index 92%
rename from src/main/java/io/bitsquare/gui/main/account/AccountPM.java
rename to src/main/java/io/bitsquare/gui/main/account/AccountViewModel.java
index 8edc590f09..bd0594edef 100644
--- a/src/main/java/io/bitsquare/gui/main/account/AccountPM.java
+++ b/src/main/java/io/bitsquare/gui/main/account/AccountViewModel.java
@@ -22,12 +22,12 @@ import io.bitsquare.user.User;
 
 import com.google.inject.Inject;
 
-class AccountPM implements ViewModel {
+class AccountViewModel implements ViewModel {
 
     private final User user;
 
     @Inject
-    public AccountPM(User user) {
+    public AccountViewModel(User user) {
         this.user = user;
     }
 
diff --git a/src/main/java/io/bitsquare/gui/main/account/content/changepassword/ChangePasswordView.java b/src/main/java/io/bitsquare/gui/main/account/content/changepassword/ChangePasswordView.java
index 4465669175..c827e4d4fa 100644
--- a/src/main/java/io/bitsquare/gui/main/account/content/changepassword/ChangePasswordView.java
+++ b/src/main/java/io/bitsquare/gui/main/account/content/changepassword/ChangePasswordView.java
@@ -36,7 +36,7 @@ import javafx.scene.layout.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class ChangePasswordView extends View<ChangePasswordPM> implements ContextAware {
+public class ChangePasswordView extends View<ChangePasswordViewModel> implements ContextAware {
 
     private static final Logger log = LoggerFactory.getLogger(ChangePasswordView.class);
 
@@ -50,7 +50,7 @@ public class ChangePasswordView extends View<ChangePasswordPM> implements Contex
     ///////////////////////////////////////////////////////////////////////////////////////////
 
     @Inject
-    private ChangePasswordView(ChangePasswordPM model) {
+    private ChangePasswordView(ChangePasswordViewModel model) {
         super(model);
     }
 
diff --git a/src/main/java/io/bitsquare/gui/main/account/content/changepassword/ChangePasswordPM.java b/src/main/java/io/bitsquare/gui/main/account/content/changepassword/ChangePasswordViewModel.java
similarity index 95%
rename from src/main/java/io/bitsquare/gui/main/account/content/changepassword/ChangePasswordPM.java
rename to src/main/java/io/bitsquare/gui/main/account/content/changepassword/ChangePasswordViewModel.java
index ec9701e822..ab585bf048 100644
--- a/src/main/java/io/bitsquare/gui/main/account/content/changepassword/ChangePasswordPM.java
+++ b/src/main/java/io/bitsquare/gui/main/account/content/changepassword/ChangePasswordViewModel.java
@@ -28,7 +28,7 @@ import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
 
-class ChangePasswordPM implements ViewModel {
+class ChangePasswordViewModel implements ViewModel {
 
     private final PasswordValidator passwordValidator;
 
@@ -40,7 +40,7 @@ class ChangePasswordPM implements ViewModel {
 
 
     @Inject
-    public ChangePasswordPM(PasswordValidator passwordValidator) {
+    public ChangePasswordViewModel(PasswordValidator passwordValidator) {
         this.passwordValidator = passwordValidator;
 
         passwordField.addListener((ov) -> saveButtonDisabled.set(!validate()));
diff --git a/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountPm.java b/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountPm.java
index 5016c567a5..20d8f85e17 100644
--- a/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountPm.java
+++ b/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountPm.java
@@ -41,7 +41,7 @@ import javafx.collections.ListChangeListener;
 import javafx.collections.ObservableList;
 import javafx.util.StringConverter;
 
-class FiatAccountPM extends ActivatableWithDelegate<FiatAccountModel> implements ViewModel {
+class FiatAccountViewModel extends ActivatableWithDelegate<FiatAccountModel> implements ViewModel {
 
     private final BankAccountNumberValidator bankAccountNumberValidator;
 
@@ -60,7 +60,7 @@ class FiatAccountPM extends ActivatableWithDelegate<FiatAccountModel> implements
 
 
     @Inject
-    public FiatAccountPM(FiatAccountModel model, BankAccountNumberValidator bankAccountNumberValidator) {
+    public FiatAccountViewModel(FiatAccountModel model, BankAccountNumberValidator bankAccountNumberValidator) {
         super(model);
         this.bankAccountNumberValidator = bankAccountNumberValidator;
 
diff --git a/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountView.java b/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountView.java
index 5f8cdca246..e099cab3fe 100644
--- a/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountView.java
+++ b/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountView.java
@@ -56,7 +56,7 @@ import org.slf4j.LoggerFactory;
 
 import static javafx.beans.binding.Bindings.createBooleanBinding;
 
-public class FiatAccountView extends ActivatableView<FiatAccountPM> implements ContextAware {
+public class FiatAccountView extends ActivatableView<FiatAccountViewModel> implements ContextAware {
 
     private static final Logger log = LoggerFactory.getLogger(FiatAccountView.class);
 
@@ -76,7 +76,7 @@ public class FiatAccountView extends ActivatableView<FiatAccountPM> implements C
     ///////////////////////////////////////////////////////////////////////////////////////////
 
     @Inject
-    FiatAccountView(FiatAccountPM model, OverlayManager overlayManager) {
+    FiatAccountView(FiatAccountViewModel model, OverlayManager overlayManager) {
         super(model);
 
         this.overlayManager = overlayManager;
diff --git a/src/main/java/io/bitsquare/gui/main/account/content/irc/IrcAccountPm.java b/src/main/java/io/bitsquare/gui/main/account/content/irc/IrcAccountPm.java
index 88b839c865..76106991e4 100644
--- a/src/main/java/io/bitsquare/gui/main/account/content/irc/IrcAccountPm.java
+++ b/src/main/java/io/bitsquare/gui/main/account/content/irc/IrcAccountPm.java
@@ -38,7 +38,7 @@ import javafx.beans.property.StringProperty;
 import javafx.collections.ObservableList;
 import javafx.util.StringConverter;
 
-class IrcAccountPM extends ActivatableWithDelegate<IrcAccountModel> implements ViewModel {
+class IrcAccountViewModel extends ActivatableWithDelegate<IrcAccountModel> implements ViewModel {
 
     private final InputValidator nickNameValidator;
 
@@ -49,7 +49,7 @@ class IrcAccountPM extends ActivatableWithDelegate<IrcAccountModel> implements V
 
 
     @Inject
-    public IrcAccountPM(IrcAccountModel model, BankAccountNumberValidator nickNameValidator) {
+    public IrcAccountViewModel(IrcAccountModel model, BankAccountNumberValidator nickNameValidator) {
         super(model);
         this.nickNameValidator = nickNameValidator;
 
diff --git a/src/main/java/io/bitsquare/gui/main/account/content/irc/IrcAccountView.java b/src/main/java/io/bitsquare/gui/main/account/content/irc/IrcAccountView.java
index 0b8f9b3aec..8e9ddfaf14 100644
--- a/src/main/java/io/bitsquare/gui/main/account/content/irc/IrcAccountView.java
+++ b/src/main/java/io/bitsquare/gui/main/account/content/irc/IrcAccountView.java
@@ -47,7 +47,7 @@ import org.slf4j.LoggerFactory;
 /*
 Just temporary for giving the user a possibility to test the app via simulating the bank transfer in a IRC chat.
  */
-public class IrcAccountView extends ActivatableView<IrcAccountPM> implements ContextAware {
+public class IrcAccountView extends ActivatableView<IrcAccountViewModel> implements ContextAware {
 
     private static final Logger log = LoggerFactory.getLogger(IrcAccountView.class);
 
@@ -63,7 +63,7 @@ public class IrcAccountView extends ActivatableView<IrcAccountPM> implements Con
     ///////////////////////////////////////////////////////////////////////////////////////////
 
     @Inject
-    IrcAccountView(IrcAccountPM model) {
+    IrcAccountView(IrcAccountViewModel model) {
         super(model);
     }
 
diff --git a/src/main/java/io/bitsquare/gui/main/account/content/password/PasswordView.java b/src/main/java/io/bitsquare/gui/main/account/content/password/PasswordView.java
index 47cc82fb1b..bd7c2e3215 100644
--- a/src/main/java/io/bitsquare/gui/main/account/content/password/PasswordView.java
+++ b/src/main/java/io/bitsquare/gui/main/account/content/password/PasswordView.java
@@ -36,7 +36,7 @@ import javafx.scene.layout.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class PasswordView extends View<PasswordPM> implements ContextAware {
+public class PasswordView extends View<PasswordViewModel> implements ContextAware {
 
     private static final Logger log = LoggerFactory.getLogger(PasswordView.class);
 
@@ -50,7 +50,7 @@ public class PasswordView extends View<PasswordPM> implements ContextAware {
     ///////////////////////////////////////////////////////////////////////////////////////////
 
     @Inject
-    private PasswordView(PasswordPM model) {
+    private PasswordView(PasswordViewModel model) {
         super(model);
     }
 
diff --git a/src/main/java/io/bitsquare/gui/main/account/content/password/PasswordPM.java b/src/main/java/io/bitsquare/gui/main/account/content/password/PasswordViewModel.java
similarity index 95%
rename from src/main/java/io/bitsquare/gui/main/account/content/password/PasswordPM.java
rename to src/main/java/io/bitsquare/gui/main/account/content/password/PasswordViewModel.java
index 715eab7a1c..488ad8ee84 100644
--- a/src/main/java/io/bitsquare/gui/main/account/content/password/PasswordPM.java
+++ b/src/main/java/io/bitsquare/gui/main/account/content/password/PasswordViewModel.java
@@ -28,7 +28,7 @@ import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
 
-class PasswordPM implements ViewModel {
+class PasswordViewModel implements ViewModel {
 
     private final PasswordValidator passwordValidator;
 
@@ -40,7 +40,7 @@ class PasswordPM implements ViewModel {
 
 
     @Inject
-    public PasswordPM(PasswordValidator passwordValidator) {
+    public PasswordViewModel(PasswordValidator passwordValidator) {
         this.passwordValidator = passwordValidator;
 
         passwordField.addListener((ov) -> saveButtonDisabled.set(!validate()));
diff --git a/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationView.java b/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationView.java
index bc0d9bdfd4..a8f308084e 100644
--- a/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationView.java
+++ b/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationView.java
@@ -48,7 +48,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 
-public class RegistrationView extends View<RegistrationPM> implements ContextAware {
+public class RegistrationView extends View<RegistrationViewModel> implements ContextAware {
 
     private static final Logger log = LoggerFactory.getLogger(RegistrationView.class);
 
@@ -67,7 +67,7 @@ public class RegistrationView extends View<RegistrationPM> implements ContextAwa
     ///////////////////////////////////////////////////////////////////////////////////////////
 
     @Inject
-    private RegistrationView(RegistrationPM model, OverlayManager overlayManager) {
+    private RegistrationView(RegistrationViewModel model, OverlayManager overlayManager) {
         super(model);
         this.overlayManager = overlayManager;
     }
diff --git a/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationPM.java b/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationViewModel.java
similarity index 95%
rename from src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationPM.java
rename to src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationViewModel.java
index d1cf4ca901..bb5bcb8bbf 100644
--- a/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationPM.java
+++ b/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationViewModel.java
@@ -36,7 +36,7 @@ import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
 
 
-class RegistrationPM extends WithDelegate<RegistrationModel> implements ViewModel {
+class RegistrationViewModel extends WithDelegate<RegistrationModel> implements ViewModel {
 
     final BooleanProperty isPayButtonDisabled = new SimpleBooleanProperty(true);
     final StringProperty requestPlaceOfferErrorMessage = new SimpleStringProperty();
@@ -49,7 +49,7 @@ class RegistrationPM extends WithDelegate<RegistrationModel> implements ViewMode
 
 
     @Inject
-    public RegistrationPM(RegistrationModel delegate, BSFormatter formatter) {
+    public RegistrationViewModel(RegistrationModel delegate, BSFormatter formatter) {
         super(delegate);
         this.formatter = formatter;
 
diff --git a/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsView.java b/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsView.java
index 86bcf1fb47..a608f66933 100644
--- a/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsView.java
+++ b/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsView.java
@@ -50,7 +50,7 @@ import javafx.util.StringConverter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class RestrictionsView extends ActivatableView<RestrictionsPM> implements ContextAware {
+public class RestrictionsView extends ActivatableView<RestrictionsViewModel> implements ContextAware {
 
     private static final Logger log = LoggerFactory.getLogger(RestrictionsView.class);
 
@@ -71,7 +71,7 @@ public class RestrictionsView extends ActivatableView<RestrictionsPM> implements
     ///////////////////////////////////////////////////////////////////////////////////////////
 
     @Inject
-    private RestrictionsView(RestrictionsPM model, ViewLoader viewLoader, Stage primaryStage) {
+    private RestrictionsView(RestrictionsViewModel model, ViewLoader viewLoader, Stage primaryStage) {
         super(model);
         this.viewLoader = viewLoader;
         this.primaryStage = primaryStage;
diff --git a/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsPM.java b/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsViewModel.java
similarity index 95%
rename from src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsPM.java
rename to src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsViewModel.java
index adef4b662a..bacc5ac75f 100644
--- a/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsPM.java
+++ b/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsViewModel.java
@@ -31,13 +31,13 @@ import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.collections.ObservableList;
 
-class RestrictionsPM extends ActivatableWithDelegate<RestrictionsModel> implements ViewModel {
+class RestrictionsViewModel extends ActivatableWithDelegate<RestrictionsModel> implements ViewModel {
 
     final BooleanProperty doneButtonDisable = new SimpleBooleanProperty(true);
 
 
     @Inject
-    public RestrictionsPM(RestrictionsModel model) {
+    public RestrictionsViewModel(RestrictionsModel model) {
         super(model);
     }
 
diff --git a/src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsView.java b/src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsView.java
index c0c02222a4..386e51c1fb 100644
--- a/src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsView.java
+++ b/src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsView.java
@@ -36,7 +36,7 @@ import javafx.scene.layout.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class SeedWordsView extends View<SeedWordsPM> implements ContextAware {
+public class SeedWordsView extends View<SeedWordsViewModel> implements ContextAware {
 
     private static final Logger log = LoggerFactory.getLogger(SeedWordsView.class);
 
@@ -49,7 +49,7 @@ public class SeedWordsView extends View<SeedWordsPM> implements ContextAware {
     ///////////////////////////////////////////////////////////////////////////////////////////
 
     @Inject
-    private SeedWordsView(SeedWordsPM model) {
+    private SeedWordsView(SeedWordsViewModel model) {
         super(model);
     }
 
diff --git a/src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsPM.java b/src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsViewModel.java
similarity index 91%
rename from src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsPM.java
rename to src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsViewModel.java
index 993187749f..9212833292 100644
--- a/src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsPM.java
+++ b/src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsViewModel.java
@@ -28,12 +28,12 @@ import java.util.List;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
 
-class SeedWordsPM implements ViewModel {
+class SeedWordsViewModel implements ViewModel {
 
     final StringProperty seedWords = new SimpleStringProperty();
 
     @Inject
-    public SeedWordsPM(WalletService walletService, BSFormatter formatter) {
+    public SeedWordsViewModel(WalletService walletService, BSFormatter formatter) {
         if (walletService.getWallet() != null) {
             List<String> mnemonicCode = walletService.getWallet().getKeyChainSeed().getMnemonicCode();
             if (mnemonicCode != null) {
diff --git a/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesView.java b/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesView.java
index 5163d5d43d..1ac8f5f4fb 100644
--- a/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesView.java
+++ b/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesView.java
@@ -34,7 +34,7 @@ import javafx.util.Callback;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class ClosedTradesView extends ActivatableView<ClosedTradesPM> {
+public class ClosedTradesView extends ActivatableView<ClosedTradesViewModel> {
     private static final Logger log = LoggerFactory.getLogger(ClosedTradesView.class);
 
     @FXML TableColumn<ClosedTradesListItem, ClosedTradesListItem> priceColumn, amountColumn, volumeColumn,
@@ -47,7 +47,7 @@ public class ClosedTradesView extends ActivatableView<ClosedTradesPM> {
     ///////////////////////////////////////////////////////////////////////////////////////////
 
     @Inject
-    private ClosedTradesView(ClosedTradesPM model) {
+    private ClosedTradesView(ClosedTradesViewModel model) {
         super(model);
     }
 
diff --git a/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesPM.java b/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesViewModel.java
similarity index 91%
rename from src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesPM.java
rename to src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesViewModel.java
index 2388a6d4c7..c71d8c0d68 100644
--- a/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesPM.java
+++ b/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesViewModel.java
@@ -25,13 +25,13 @@ import com.google.inject.Inject;
 
 import javafx.collections.ObservableList;
 
-class ClosedTradesPM extends ActivatableWithDelegate<ClosedTradesModel> implements ViewModel {
+class ClosedTradesViewModel extends ActivatableWithDelegate<ClosedTradesModel> implements ViewModel {
 
     private final BSFormatter formatter;
 
 
     @Inject
-    public ClosedTradesPM(ClosedTradesModel model, BSFormatter formatter) {
+    public ClosedTradesViewModel(ClosedTradesModel model, BSFormatter formatter) {
         super(model);
 
         this.formatter = formatter;
diff --git a/src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersView.java b/src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersView.java
index 2016ef6ec5..3fa4386e22 100644
--- a/src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersView.java
+++ b/src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersView.java
@@ -36,7 +36,7 @@ import javafx.util.Callback;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class OffersView extends ActivatableView<OffersPM> {
+public class OffersView extends ActivatableView<OffersViewModel> {
     private static final Logger log = LoggerFactory.getLogger(OffersView.class);
 
     @FXML TableColumn<OfferListItem, OfferListItem> priceColumn, amountColumn, volumeColumn,
@@ -49,7 +49,7 @@ public class OffersView extends ActivatableView<OffersPM> {
     ///////////////////////////////////////////////////////////////////////////////////////////
 
     @Inject
-    private OffersView(OffersPM model) {
+    private OffersView(OffersViewModel model) {
         super(model);
     }
 
diff --git a/src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersPM.java b/src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersViewModel.java
similarity index 92%
rename from src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersPM.java
rename to src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersViewModel.java
index 69eef6e259..da280e1213 100644
--- a/src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersPM.java
+++ b/src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersViewModel.java
@@ -25,13 +25,13 @@ import com.google.inject.Inject;
 
 import javafx.collections.ObservableList;
 
-class OffersPM extends ActivatableWithDelegate<OffersModel> implements ViewModel {
+class OffersViewModel extends ActivatableWithDelegate<OffersModel> implements ViewModel {
 
     private final BSFormatter formatter;
 
 
     @Inject
-    public OffersPM(OffersModel model, BSFormatter formatter) {
+    public OffersViewModel(OffersModel model, BSFormatter formatter) {
         super(model);
 
         this.formatter = formatter;
diff --git a/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesView.java b/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesView.java
index 24f7cce05e..1b032bd24b 100644
--- a/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesView.java
+++ b/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesView.java
@@ -58,15 +58,15 @@ import javafx.util.StringConverter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class PendingTradesView extends ActivatableView<PendingTradesPM> {
+public class PendingTradesView extends ActivatableView<PendingTradesViewModel> {
     private static final Logger log = LoggerFactory.getLogger(PendingTradesView.class);
 
 
     private ChangeListener<PendingTradesListItem> selectedItemChangeListener;
     private ListChangeListener<PendingTradesListItem> listChangeListener;
     private ChangeListener<String> txIdChangeListener;
-    private ChangeListener<PendingTradesPM.State> offererStateChangeListener;
-    private ChangeListener<PendingTradesPM.State> takerStateChangeListener;
+    private ChangeListener<PendingTradesViewModel.State> offererStateChangeListener;
+    private ChangeListener<PendingTradesViewModel.State> takerStateChangeListener;
     private ChangeListener<Throwable> faultChangeListener;
     private final Navigation navigation;
 
@@ -99,7 +99,7 @@ public class PendingTradesView extends ActivatableView<PendingTradesPM> {
     ///////////////////////////////////////////////////////////////////////////////////////////
 
     @Inject
-    PendingTradesView(PendingTradesPM model, Navigation navigation) {
+    PendingTradesView(PendingTradesViewModel model, Navigation navigation) {
         super(model);
 
         this.navigation = navigation;
@@ -290,7 +290,7 @@ public class PendingTradesView extends ActivatableView<PendingTradesPM> {
         applyTakerState(model.state.get());
     }
 
-    private void applyOffererState(PendingTradesPM.State state) {
+    private void applyOffererState(PendingTradesViewModel.State state) {
         setPaymentsControlsVisible(false);
         setSummaryControlsVisible(false);
 
@@ -364,7 +364,7 @@ public class PendingTradesView extends ActivatableView<PendingTradesPM> {
     }
 
 
-    private void applyTakerState(PendingTradesPM.State state) {
+    private void applyTakerState(PendingTradesViewModel.State state) {
         confirmPaymentReceiptButton.setVisible(false);
         confirmPaymentReceiptButton.setManaged(false);
 
diff --git a/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesPM.java b/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesViewModel.java
similarity index 96%
rename from src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesPM.java
rename to src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesViewModel.java
index 7227225e6d..8156df69b7 100644
--- a/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesPM.java
+++ b/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesViewModel.java
@@ -44,8 +44,8 @@ import javafx.collections.ObservableList;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-class PendingTradesPM extends ActivatableWithDelegate<PendingTradesModel> implements ViewModel {
-    private static final Logger log = LoggerFactory.getLogger(PendingTradesPM.class);
+class PendingTradesViewModel extends ActivatableWithDelegate<PendingTradesModel> implements ViewModel {
+    private static final Logger log = LoggerFactory.getLogger(PendingTradesViewModel.class);
 
     enum State {
         TAKER_SELLER_WAIT_TX_CONF,
@@ -70,8 +70,8 @@ class PendingTradesPM extends ActivatableWithDelegate<PendingTradesModel> implem
 
 
     @Inject
-    public PendingTradesPM(PendingTradesModel delegate, BSFormatter formatter,
-                    BtcAddressValidator btcAddressValidator) {
+    public PendingTradesViewModel(PendingTradesModel delegate, BSFormatter formatter,
+                                  BtcAddressValidator btcAddressValidator) {
         super(delegate);
 
         this.formatter = formatter;
diff --git a/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesView.java b/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesView.java
index b52c2be09d..b6c94626c2 100644
--- a/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesView.java
+++ b/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesView.java
@@ -34,7 +34,7 @@ import org.slf4j.LoggerFactory;
 /**
  * This UI is not cached as it is normally only needed once.
  */
-public class PreferencesView extends ActivatableView<PreferencesPM> {
+public class PreferencesView extends ActivatableView<PreferencesViewModel> {
 
     private static final Logger log = LoggerFactory.getLogger(PreferencesView.class);
 
@@ -47,7 +47,7 @@ public class PreferencesView extends ActivatableView<PreferencesPM> {
     ///////////////////////////////////////////////////////////////////////////////////////////
 
     @Inject
-    private PreferencesView(PreferencesPM model) {
+    private PreferencesView(PreferencesViewModel model) {
         super(model);
     }
 
diff --git a/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesPM.java b/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesViewModel.java
similarity index 89%
rename from src/main/java/io/bitsquare/gui/main/settings/application/PreferencesPM.java
rename to src/main/java/io/bitsquare/gui/main/settings/application/PreferencesViewModel.java
index 0a112d0e39..977d3e02d1 100644
--- a/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesPM.java
+++ b/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesViewModel.java
@@ -26,10 +26,10 @@ import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.StringProperty;
 import javafx.collections.ObservableList;
 
-class PreferencesPM extends ActivatableWithDelegate<PreferencesModel> implements ViewModel {
+class PreferencesViewModel extends ActivatableWithDelegate<PreferencesModel> implements ViewModel {
 
     @Inject
-    public PreferencesPM(PreferencesModel model) {
+    public PreferencesViewModel(PreferencesModel model) {
         super(model);
     }
 
diff --git a/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferView.java b/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferView.java
index 3ae7c389c5..469be18d87 100644
--- a/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferView.java
+++ b/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferView.java
@@ -73,7 +73,7 @@ import static javafx.beans.binding.Bindings.createStringBinding;
 // TODO Implement other positioning method in InoutTextField to display it over the field instead of right side
 // priceAmountHBox is too large after redesign as to be used as layoutReference.
 
-public class CreateOfferView extends ActivatableView<CreateOfferPM> {
+public class CreateOfferView extends ActivatableView<CreateOfferViewModel> {
     private static final Logger log = LoggerFactory.getLogger(CreateOfferView.class);
 
 
@@ -117,7 +117,7 @@ public class CreateOfferView extends ActivatableView<CreateOfferPM> {
     ///////////////////////////////////////////////////////////////////////////////////////////
 
     @Inject
-    private CreateOfferView(CreateOfferPM model, Navigation navigation,
+    private CreateOfferView(CreateOfferViewModel model, Navigation navigation,
                             OverlayManager overlayManager) {
         super(model);
         this.navigation = navigation;
diff --git a/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferPM.java b/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferViewModel.java
similarity index 98%
rename from src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferPM.java
rename to src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferViewModel.java
index 3bc92cdae7..40da66ba63 100644
--- a/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferPM.java
+++ b/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferViewModel.java
@@ -44,7 +44,7 @@ import javafx.beans.property.StringProperty;
 
 import static javafx.beans.binding.Bindings.createStringBinding;
 
-class CreateOfferPM extends ActivatableWithDelegate<CreateOfferModel> implements ViewModel {
+class CreateOfferViewModel extends ActivatableWithDelegate<CreateOfferModel> implements ViewModel {
 
     private final BtcValidator btcValidator;
     private final BSFormatter formatter;
@@ -93,8 +93,8 @@ class CreateOfferPM extends ActivatableWithDelegate<CreateOfferModel> implements
 
 
     @Inject
-    public CreateOfferPM(CreateOfferModel model, FiatValidator fiatValidator, BtcValidator btcValidator,
-                  BSFormatter formatter) {
+    public CreateOfferViewModel(CreateOfferModel model, FiatValidator fiatValidator, BtcValidator btcValidator,
+                                BSFormatter formatter) {
         super(model);
 
         this.fiatValidator = fiatValidator;
diff --git a/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookView.java b/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookView.java
index 4579e4ee37..8d42b800c9 100644
--- a/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookView.java
+++ b/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookView.java
@@ -62,7 +62,7 @@ import static javafx.beans.binding.Bindings.createStringBinding;
  * TODO: The advanced filters are not impl. yet
  * The restrictions handling is open from the concept and is only implemented for countries yet.
  */
-public class OfferBookView extends ActivatableView<OfferBookPM> {
+public class OfferBookView extends ActivatableView<OfferBookViewModel> {
     private static final Logger log = LoggerFactory.getLogger(OfferBookView.class);
 
     private final Navigation navigation;
@@ -90,7 +90,7 @@ public class OfferBookView extends ActivatableView<OfferBookPM> {
     ///////////////////////////////////////////////////////////////////////////////////////////
 
     @Inject
-    OfferBookView(OfferBookPM model,
+    OfferBookView(OfferBookViewModel model,
                   Navigation navigation,
                   OverlayManager overlayManager,
                   OptionalBtcValidator optionalBtcValidator,
diff --git a/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookPM.java b/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookViewModel.java
similarity index 95%
rename from src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookPM.java
rename to src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookViewModel.java
index 1e617c0285..26c96b7cb9 100644
--- a/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookPM.java
+++ b/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookViewModel.java
@@ -36,7 +36,7 @@ import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
 import javafx.collections.transformation.SortedList;
 
-class OfferBookPM extends ActivatableWithDelegate<OfferBookModel> implements ViewModel {
+class OfferBookViewModel extends ActivatableWithDelegate<OfferBookModel> implements ViewModel {
 
     private final OptionalBtcValidator optionalBtcValidator;
     private final BSFormatter formatter;
@@ -51,8 +51,8 @@ class OfferBookPM extends ActivatableWithDelegate<OfferBookModel> implements Vie
 
 
     @Inject
-    public OfferBookPM(OfferBookModel delegate, OptionalFiatValidator optionalFiatValidator,
-                       OptionalBtcValidator optionalBtcValidator, BSFormatter formatter) {
+    public OfferBookViewModel(OfferBookModel delegate, OptionalFiatValidator optionalFiatValidator,
+                              OptionalBtcValidator optionalBtcValidator, BSFormatter formatter) {
         super(delegate);
 
         this.optionalFiatValidator = optionalFiatValidator;
diff --git a/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferView.java b/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferView.java
index 404e49fb5a..04ec1f5c52 100644
--- a/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferView.java
+++ b/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferView.java
@@ -69,7 +69,7 @@ import org.controlsfx.dialog.Dialog;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class TakeOfferView extends ActivatableView<TakeOfferPM> {
+public class TakeOfferView extends ActivatableView<TakeOfferViewModel> {
     private static final Logger log = LoggerFactory.getLogger(TakeOfferView.class);
 
     private final Navigation navigation;
@@ -112,7 +112,7 @@ public class TakeOfferView extends ActivatableView<TakeOfferPM> {
     ///////////////////////////////////////////////////////////////////////////////////////////
 
     @Inject
-    private TakeOfferView(TakeOfferPM model, Navigation navigation,
+    private TakeOfferView(TakeOfferViewModel model, Navigation navigation,
                           OverlayManager overlayManager) {
         super(model);
 
diff --git a/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferPM.java b/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferViewModel.java
similarity index 98%
rename from src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferPM.java
rename to src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferViewModel.java
index 1e4e1d1bde..4e769b8ebd 100644
--- a/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferPM.java
+++ b/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferViewModel.java
@@ -41,7 +41,7 @@ import javafx.beans.property.StringProperty;
 
 import static javafx.beans.binding.Bindings.createStringBinding;
 
-class TakeOfferPM extends ActivatableWithDelegate<TakeOfferModel> implements ViewModel {
+class TakeOfferViewModel extends ActivatableWithDelegate<TakeOfferModel> implements ViewModel {
 
     private String fiatCode;
     private String amountRange;
@@ -87,7 +87,7 @@ class TakeOfferPM extends ActivatableWithDelegate<TakeOfferModel> implements Vie
 
 
     @Inject
-    public TakeOfferPM(TakeOfferModel model, BtcValidator btcValidator, BSFormatter formatter) {
+    public TakeOfferViewModel(TakeOfferModel model, BtcValidator btcValidator, BSFormatter formatter) {
         super(model);
 
         this.btcValidator = btcValidator;
diff --git a/src/test/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferPMTest.java b/src/test/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferViewModelTest.java
similarity index 95%
rename from src/test/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferPMTest.java
rename to src/test/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferViewModelTest.java
index 9a225695d5..70dea76b50 100644
--- a/src/test/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferPMTest.java
+++ b/src/test/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferViewModelTest.java
@@ -37,11 +37,11 @@ import org.slf4j.LoggerFactory;
 
 import static org.junit.Assert.*;
 
-public class CreateOfferPMTest {
-    private static final Logger log = LoggerFactory.getLogger(CreateOfferPMTest.class);
+public class CreateOfferViewModelTest {
+    private static final Logger log = LoggerFactory.getLogger(CreateOfferViewModelTest.class);
 
     private CreateOfferModel model;
-    private CreateOfferPM presenter;
+    private CreateOfferViewModel presenter;
 
     @Before
     public void setup() {
@@ -50,7 +50,7 @@ public class CreateOfferPMTest {
         formatter.setFiatCurrencyCode("USD");
         model = new CreateOfferModel(null, null, null, null, null, null, formatter);
 
-        presenter = new CreateOfferPM(model, new FiatValidator(null), new BtcValidator(), formatter);
+        presenter = new CreateOfferViewModel(model, new FiatValidator(null), new BtcValidator(), formatter);
     }
 
     @Test