diff --git a/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountModel.java b/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountDataModel.java
similarity index 97%
rename from src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountModel.java
rename to src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountDataModel.java
index 8e72601cf1..75502ca3c2 100644
--- a/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountModel.java
+++ b/src/main/java/io/bitsquare/gui/main/account/content/fiat/FiatAccountDataModel.java
@@ -42,7 +42,7 @@ import javafx.beans.property.StringProperty;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 
-class FiatAccountModel implements Activatable, DataModel {
+class FiatAccountDataModel implements Activatable, DataModel {
 
     private final User user;
     private final AccountSettings accountSettings;
@@ -68,7 +68,7 @@ class FiatAccountModel implements Activatable, DataModel {
 
 
     @Inject
-    public FiatAccountModel(User user, Persistence persistence, AccountSettings accountSettings) {
+    public FiatAccountDataModel(User user, Persistence persistence, AccountSettings accountSettings) {
         this.persistence = persistence;
         this.user = user;
         this.accountSettings = accountSettings;
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 20d8f85e17..019be13fa6 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 FiatAccountViewModel extends ActivatableWithDelegate<FiatAccountModel> implements ViewModel {
+class FiatAccountViewModel extends ActivatableWithDelegate<FiatAccountDataModel> implements ViewModel {
 
     private final BankAccountNumberValidator bankAccountNumberValidator;
 
@@ -60,7 +60,7 @@ class FiatAccountViewModel extends ActivatableWithDelegate<FiatAccountModel> imp
 
 
     @Inject
-    public FiatAccountViewModel(FiatAccountModel model, BankAccountNumberValidator bankAccountNumberValidator) {
+    public FiatAccountViewModel(FiatAccountDataModel model, BankAccountNumberValidator bankAccountNumberValidator) {
         super(model);
         this.bankAccountNumberValidator = bankAccountNumberValidator;
 
diff --git a/src/main/java/io/bitsquare/gui/main/account/content/irc/IrcAccountModel.java b/src/main/java/io/bitsquare/gui/main/account/content/irc/IrcAccountDataModel.java
similarity index 96%
rename from src/main/java/io/bitsquare/gui/main/account/content/irc/IrcAccountModel.java
rename to src/main/java/io/bitsquare/gui/main/account/content/irc/IrcAccountDataModel.java
index 481d1b5b7c..28896117b9 100644
--- a/src/main/java/io/bitsquare/gui/main/account/content/irc/IrcAccountModel.java
+++ b/src/main/java/io/bitsquare/gui/main/account/content/irc/IrcAccountDataModel.java
@@ -52,7 +52,7 @@ import javafx.beans.property.StringProperty;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 
-class IrcAccountModel implements Activatable, DataModel {
+class IrcAccountDataModel implements Activatable, DataModel {
 
     private final User user;
     private final AccountSettings accountSettings;
@@ -70,8 +70,8 @@ class IrcAccountModel implements Activatable, DataModel {
 
 
     @Inject
-    public IrcAccountModel(User user, Persistence persistence, AccountSettings accountSettings,
-                           MessageService messageService) {
+    public IrcAccountDataModel(User user, Persistence persistence, AccountSettings accountSettings,
+                               MessageService messageService) {
         this.persistence = persistence;
         this.user = user;
         this.accountSettings = accountSettings;
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 76106991e4..bc89d0544e 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 IrcAccountViewModel extends ActivatableWithDelegate<IrcAccountModel> implements ViewModel {
+class IrcAccountViewModel extends ActivatableWithDelegate<IrcAccountDataModel> implements ViewModel {
 
     private final InputValidator nickNameValidator;
 
@@ -49,7 +49,7 @@ class IrcAccountViewModel extends ActivatableWithDelegate<IrcAccountModel> imple
 
 
     @Inject
-    public IrcAccountViewModel(IrcAccountModel model, BankAccountNumberValidator nickNameValidator) {
+    public IrcAccountViewModel(IrcAccountDataModel model, BankAccountNumberValidator nickNameValidator) {
         super(model);
         this.nickNameValidator = nickNameValidator;
 
diff --git a/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationModel.java b/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationDataModel.java
similarity index 96%
rename from src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationModel.java
rename to src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationDataModel.java
index fcf78cd79b..6a363b70b7 100644
--- a/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationModel.java
+++ b/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationDataModel.java
@@ -45,8 +45,8 @@ import org.jetbrains.annotations.NotNull;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-class RegistrationModel implements DataModel {
-    private static final Logger log = LoggerFactory.getLogger(RegistrationModel.class);
+class RegistrationDataModel implements DataModel {
+    private static final Logger log = LoggerFactory.getLogger(RegistrationDataModel.class);
 
     private final WalletService walletService;
     private final User user;
@@ -61,7 +61,7 @@ class RegistrationModel implements DataModel {
 
 
     @Inject
-    public RegistrationModel(WalletService walletService, User user, Persistence persistence) {
+    public RegistrationDataModel(WalletService walletService, User user, Persistence persistence) {
 
         this.walletService = walletService;
         this.user = user;
diff --git a/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationViewModel.java b/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationViewModel.java
index bb5bcb8bbf..bd812a9f21 100644
--- a/src/main/java/io/bitsquare/gui/main/account/content/registration/RegistrationViewModel.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 RegistrationViewModel extends WithDelegate<RegistrationModel> implements ViewModel {
+class RegistrationViewModel extends WithDelegate<RegistrationDataModel> implements ViewModel {
 
     final BooleanProperty isPayButtonDisabled = new SimpleBooleanProperty(true);
     final StringProperty requestPlaceOfferErrorMessage = new SimpleStringProperty();
@@ -49,7 +49,7 @@ class RegistrationViewModel extends WithDelegate<RegistrationModel> implements V
 
 
     @Inject
-    public RegistrationViewModel(RegistrationModel delegate, BSFormatter formatter) {
+    public RegistrationViewModel(RegistrationDataModel delegate, BSFormatter formatter) {
         super(delegate);
         this.formatter = formatter;
 
diff --git a/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsModel.java b/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsDataModel.java
similarity index 96%
rename from src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsModel.java
rename to src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsDataModel.java
index 909bc7381f..3d6cabd4ca 100644
--- a/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsModel.java
+++ b/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsDataModel.java
@@ -44,7 +44,7 @@ import java.util.Locale;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 
-class RestrictionsModel implements Activatable, DataModel {
+class RestrictionsDataModel implements Activatable, DataModel {
 
     private final User user;
     private final AccountSettings accountSettings;
@@ -60,8 +60,8 @@ class RestrictionsModel implements Activatable, DataModel {
 
 
     @Inject
-    public RestrictionsModel(User user, AccountSettings accountSettings, Persistence persistence,
-                             MessageService messageService) {
+    public RestrictionsDataModel(User user, AccountSettings accountSettings, Persistence persistence,
+                                 MessageService messageService) {
         this.user = user;
         this.accountSettings = accountSettings;
         this.persistence = persistence;
diff --git a/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsViewModel.java b/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsViewModel.java
index bacc5ac75f..e7a6e6ac91 100644
--- a/src/main/java/io/bitsquare/gui/main/account/content/restrictions/RestrictionsViewModel.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 RestrictionsViewModel extends ActivatableWithDelegate<RestrictionsModel> implements ViewModel {
+class RestrictionsViewModel extends ActivatableWithDelegate<RestrictionsDataModel> implements ViewModel {
 
     final BooleanProperty doneButtonDisable = new SimpleBooleanProperty(true);
 
 
     @Inject
-    public RestrictionsViewModel(RestrictionsModel model) {
+    public RestrictionsViewModel(RestrictionsDataModel model) {
         super(model);
     }
 
diff --git a/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesModel.java b/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesDataModel.java
similarity index 95%
rename from src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesModel.java
rename to src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesDataModel.java
index f7e2d484e0..6d53b672b7 100644
--- a/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesModel.java
+++ b/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesDataModel.java
@@ -31,7 +31,7 @@ import javafx.collections.FXCollections;
 import javafx.collections.MapChangeListener;
 import javafx.collections.ObservableList;
 
-class ClosedTradesModel implements Activatable, DataModel {
+class ClosedTradesDataModel implements Activatable, DataModel {
 
     private final TradeManager tradeManager;
     private final User user;
@@ -41,7 +41,7 @@ class ClosedTradesModel implements Activatable, DataModel {
 
 
     @Inject
-    public ClosedTradesModel(TradeManager tradeManager, User user) {
+    public ClosedTradesDataModel(TradeManager tradeManager, User user) {
         this.tradeManager = tradeManager;
         this.user = user;
 
diff --git a/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesViewModel.java b/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesViewModel.java
index c71d8c0d68..64cac5afe3 100644
--- a/src/main/java/io/bitsquare/gui/main/portfolio/closed/ClosedTradesViewModel.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 ClosedTradesViewModel extends ActivatableWithDelegate<ClosedTradesModel> implements ViewModel {
+class ClosedTradesViewModel extends ActivatableWithDelegate<ClosedTradesDataModel> implements ViewModel {
 
     private final BSFormatter formatter;
 
 
     @Inject
-    public ClosedTradesViewModel(ClosedTradesModel model, BSFormatter formatter) {
+    public ClosedTradesViewModel(ClosedTradesDataModel model, BSFormatter formatter) {
         super(model);
 
         this.formatter = formatter;
diff --git a/src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersModel.java b/src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersDataModel.java
similarity index 95%
rename from src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersModel.java
rename to src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersDataModel.java
index 89c2ca15db..d85907797d 100644
--- a/src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersModel.java
+++ b/src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersDataModel.java
@@ -32,7 +32,7 @@ import javafx.collections.FXCollections;
 import javafx.collections.MapChangeListener;
 import javafx.collections.ObservableList;
 
-class OffersModel implements Activatable, DataModel {
+class OffersDataModel implements Activatable, DataModel {
 
     private final TradeManager tradeManager;
     private final User user;
@@ -42,7 +42,7 @@ class OffersModel implements Activatable, DataModel {
 
 
     @Inject
-    public OffersModel(TradeManager tradeManager, User user) {
+    public OffersDataModel(TradeManager tradeManager, User user) {
         this.tradeManager = tradeManager;
         this.user = user;
 
diff --git a/src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersViewModel.java b/src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersViewModel.java
index da280e1213..3e31e36189 100644
--- a/src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersViewModel.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 OffersViewModel extends ActivatableWithDelegate<OffersModel> implements ViewModel {
+class OffersViewModel extends ActivatableWithDelegate<OffersDataModel> implements ViewModel {
 
     private final BSFormatter formatter;
 
 
     @Inject
-    public OffersViewModel(OffersModel model, BSFormatter formatter) {
+    public OffersViewModel(OffersDataModel model, BSFormatter formatter) {
         super(model);
 
         this.formatter = formatter;
diff --git a/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesModel.java b/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesDataModel.java
similarity index 98%
rename from src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesModel.java
rename to src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesDataModel.java
index 5969afc24f..3f9a3ba721 100644
--- a/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesModel.java
+++ b/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesDataModel.java
@@ -55,8 +55,8 @@ import org.jetbrains.annotations.NotNull;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-class PendingTradesModel implements Activatable, DataModel {
-    private static final Logger log = LoggerFactory.getLogger(PendingTradesModel.class);
+class PendingTradesDataModel implements Activatable, DataModel {
+    private static final Logger log = LoggerFactory.getLogger(PendingTradesDataModel.class);
 
     private final TradeManager tradeManager;
     private final WalletService walletService;
@@ -79,7 +79,7 @@ class PendingTradesModel implements Activatable, DataModel {
 
 
     @Inject
-    public PendingTradesModel(TradeManager tradeManager, WalletService walletService, User user) {
+    public PendingTradesDataModel(TradeManager tradeManager, WalletService walletService, User user) {
         this.tradeManager = tradeManager;
         this.walletService = walletService;
         this.user = user;
diff --git a/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesViewModel.java b/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesViewModel.java
index 8156df69b7..97983b3fe5 100644
--- a/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesViewModel.java
+++ b/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesViewModel.java
@@ -44,7 +44,7 @@ import javafx.collections.ObservableList;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-class PendingTradesViewModel extends ActivatableWithDelegate<PendingTradesModel> implements ViewModel {
+class PendingTradesViewModel extends ActivatableWithDelegate<PendingTradesDataModel> implements ViewModel {
     private static final Logger log = LoggerFactory.getLogger(PendingTradesViewModel.class);
 
     enum State {
@@ -70,7 +70,7 @@ class PendingTradesViewModel extends ActivatableWithDelegate<PendingTradesModel>
 
 
     @Inject
-    public PendingTradesViewModel(PendingTradesModel delegate, BSFormatter formatter,
+    public PendingTradesViewModel(PendingTradesDataModel delegate, BSFormatter formatter,
                                   BtcAddressValidator btcAddressValidator) {
         super(delegate);
 
diff --git a/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesModel.java b/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesDataModel.java
similarity index 95%
rename from src/main/java/io/bitsquare/gui/main/settings/application/PreferencesModel.java
rename to src/main/java/io/bitsquare/gui/main/settings/application/PreferencesDataModel.java
index 050b42f028..faed7bbd74 100644
--- a/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesModel.java
+++ b/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesDataModel.java
@@ -31,7 +31,7 @@ import javafx.beans.value.ChangeListener;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 
-class PreferencesModel implements Activatable, DataModel {
+class PreferencesDataModel implements Activatable, DataModel {
 
     private final Preferences preferences;
 
@@ -47,7 +47,7 @@ class PreferencesModel implements Activatable, DataModel {
 
 
     @Inject
-    public PreferencesModel(Preferences preferences) {
+    public PreferencesDataModel(Preferences preferences) {
         this.preferences = preferences;
 
         btcDenominations = FXCollections.observableArrayList(preferences.getBtcDenominations());
diff --git a/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesViewModel.java b/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesViewModel.java
index 977d3e02d1..0a55fa34cd 100644
--- a/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesViewModel.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 PreferencesViewModel extends ActivatableWithDelegate<PreferencesModel> implements ViewModel {
+class PreferencesViewModel extends ActivatableWithDelegate<PreferencesDataModel> implements ViewModel {
 
     @Inject
-    public PreferencesViewModel(PreferencesModel model) {
+    public PreferencesViewModel(PreferencesDataModel model) {
         super(model);
     }
 
diff --git a/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferModel.java b/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferDataModel.java
similarity index 96%
rename from src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferModel.java
rename to src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferDataModel.java
index cc7a14586c..6581f82cc5 100644
--- a/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferModel.java
+++ b/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferDataModel.java
@@ -65,8 +65,8 @@ import static com.google.common.base.Preconditions.checkArgument;
  * Note that the create offer domain has a deeper scope in the application domain (TradeManager).
  * That model is just responsible for the domain specific parts displayed needed in that UI element.
  */
-class CreateOfferModel implements Activatable, DataModel {
-    private static final Logger log = LoggerFactory.getLogger(CreateOfferModel.class);
+class CreateOfferDataModel implements Activatable, DataModel {
+    private static final Logger log = LoggerFactory.getLogger(CreateOfferDataModel.class);
 
     private final TradeManager tradeManager;
     private final WalletService walletService;
@@ -109,9 +109,9 @@ class CreateOfferModel implements Activatable, DataModel {
 
     // non private for testing
     @Inject
-    public CreateOfferModel(TradeManager tradeManager, WalletService walletService, AccountSettings accountSettings,
-                            Preferences preferences, User user, Persistence persistence,
-                            BSFormatter formatter) {
+    public CreateOfferDataModel(TradeManager tradeManager, WalletService walletService, AccountSettings accountSettings,
+                                Preferences preferences, User user, Persistence persistence,
+                                BSFormatter formatter) {
         this.tradeManager = tradeManager;
         this.walletService = walletService;
         this.accountSettings = accountSettings;
diff --git a/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferViewModel.java b/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferViewModel.java
index 40da66ba63..76a1082dff 100644
--- a/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferViewModel.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 CreateOfferViewModel extends ActivatableWithDelegate<CreateOfferModel> implements ViewModel {
+class CreateOfferViewModel extends ActivatableWithDelegate<CreateOfferDataModel> implements ViewModel {
 
     private final BtcValidator btcValidator;
     private final BSFormatter formatter;
@@ -93,7 +93,7 @@ class CreateOfferViewModel extends ActivatableWithDelegate<CreateOfferModel> imp
 
 
     @Inject
-    public CreateOfferViewModel(CreateOfferModel model, FiatValidator fiatValidator, BtcValidator btcValidator,
+    public CreateOfferViewModel(CreateOfferDataModel model, FiatValidator fiatValidator, BtcValidator btcValidator,
                                 BSFormatter formatter) {
         super(model);
 
diff --git a/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBook.java b/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBook.java
index 086881ec6f..d0753a084a 100644
--- a/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBook.java
+++ b/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBook.java
@@ -41,7 +41,7 @@ import static com.google.common.base.Preconditions.checkArgument;
 
 /**
  * Holds and manages the unsorted and unfiltered offerbook list of both buy and sell offers.
- * It is handled as singleton by Guice and is used by 2 instances of OfferBookModel (one for Buy one for Sell).
+ * It is handled as singleton by Guice and is used by 2 instances of OfferBookDataModel (one for Buy one for Sell).
  * As it is used only by the Buy and Sell UIs we treat it as local UI model.
  * It also use OfferRepository.Listener as the lists items class and we don't want to get any dependency out of the
  * package for that.
diff --git a/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookModel.java b/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookDataModel.java
similarity index 97%
rename from src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookModel.java
rename to src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookDataModel.java
index 2f9d21f71c..e1cd7ca0be 100644
--- a/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookModel.java
+++ b/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookDataModel.java
@@ -52,8 +52,8 @@ import org.slf4j.LoggerFactory;
 /**
  * It holds the scope specific domain data for either a buy or sell UI screen.
  */
-class OfferBookModel implements Activatable, DataModel {
-    private static final Logger log = LoggerFactory.getLogger(OfferBookModel.class);
+class OfferBookDataModel implements Activatable, DataModel {
+    private static final Logger log = LoggerFactory.getLogger(OfferBookDataModel.class);
 
     private final User user;
     private final OfferBook offerBook;
@@ -79,8 +79,8 @@ class OfferBookModel implements Activatable, DataModel {
 
 
     @Inject
-    public OfferBookModel(User user, TradeManager tradeManager, OfferBook offerBook, Preferences preferences,
-                          BSFormatter formatter) {
+    public OfferBookDataModel(User user, TradeManager tradeManager, OfferBook offerBook, Preferences preferences,
+                              BSFormatter formatter) {
         this.tradeManager = tradeManager;
         this.user = user;
         this.offerBook = offerBook;
diff --git a/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookViewModel.java b/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookViewModel.java
index 26c96b7cb9..5699bb3abb 100644
--- a/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookViewModel.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 OfferBookViewModel extends ActivatableWithDelegate<OfferBookModel> implements ViewModel {
+class OfferBookViewModel extends ActivatableWithDelegate<OfferBookDataModel> implements ViewModel {
 
     private final OptionalBtcValidator optionalBtcValidator;
     private final BSFormatter formatter;
@@ -51,7 +51,7 @@ class OfferBookViewModel extends ActivatableWithDelegate<OfferBookModel> impleme
 
 
     @Inject
-    public OfferBookViewModel(OfferBookModel delegate, OptionalFiatValidator optionalFiatValidator,
+    public OfferBookViewModel(OfferBookDataModel delegate, OptionalFiatValidator optionalFiatValidator,
                               OptionalBtcValidator optionalBtcValidator, BSFormatter formatter) {
         super(delegate);
 
diff --git a/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferModel.java b/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferDataModel.java
similarity index 96%
rename from src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferModel.java
rename to src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferDataModel.java
index f8c2db93b5..44868fcb5a 100644
--- a/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferModel.java
+++ b/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferDataModel.java
@@ -52,8 +52,8 @@ import org.slf4j.LoggerFactory;
  * Note that the create offer domain has a deeper scope in the application domain (TradeManager).
  * That model is just responsible for the domain specific parts displayed needed in that UI element.
  */
-class TakeOfferModel implements Activatable, DataModel {
-    private static final Logger log = LoggerFactory.getLogger(TakeOfferModel.class);
+class TakeOfferDataModel implements Activatable, DataModel {
+    private static final Logger log = LoggerFactory.getLogger(TakeOfferDataModel.class);
 
     private final TradeManager tradeManager;
     private final WalletService walletService;
@@ -80,8 +80,8 @@ class TakeOfferModel implements Activatable, DataModel {
 
 
     @Inject
-    public TakeOfferModel(TradeManager tradeManager, WalletService walletService, Preferences preferences,
-                          Persistence persistence) {
+    public TakeOfferDataModel(TradeManager tradeManager, WalletService walletService, Preferences preferences,
+                              Persistence persistence) {
         this.tradeManager = tradeManager;
         this.walletService = walletService;
         this.preferences = preferences;
diff --git a/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferViewModel.java b/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferViewModel.java
index 4e769b8ebd..d133f48c5b 100644
--- a/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferViewModel.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 TakeOfferViewModel extends ActivatableWithDelegate<TakeOfferModel> implements ViewModel {
+class TakeOfferViewModel extends ActivatableWithDelegate<TakeOfferDataModel> implements ViewModel {
 
     private String fiatCode;
     private String amountRange;
@@ -87,7 +87,7 @@ class TakeOfferViewModel extends ActivatableWithDelegate<TakeOfferModel> impleme
 
 
     @Inject
-    public TakeOfferViewModel(TakeOfferModel model, BtcValidator btcValidator, BSFormatter formatter) {
+    public TakeOfferViewModel(TakeOfferDataModel model, BtcValidator btcValidator, BSFormatter formatter) {
         super(model);
 
         this.btcValidator = btcValidator;
diff --git a/src/test/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferViewModelTest.java b/src/test/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferViewModelTest.java
index 70dea76b50..cc9e0fed4e 100644
--- a/src/test/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferViewModelTest.java
+++ b/src/test/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferViewModelTest.java
@@ -40,7 +40,7 @@ import static org.junit.Assert.*;
 public class CreateOfferViewModelTest {
     private static final Logger log = LoggerFactory.getLogger(CreateOfferViewModelTest.class);
 
-    private CreateOfferModel model;
+    private CreateOfferDataModel model;
     private CreateOfferViewModel presenter;
 
     @Before
@@ -48,7 +48,7 @@ public class CreateOfferViewModelTest {
         BSFormatter formatter = new BSFormatter(new User());
         formatter.setLocale(Locale.US);
         formatter.setFiatCurrencyCode("USD");
-        model = new CreateOfferModel(null, null, null, null, null, null, formatter);
+        model = new CreateOfferDataModel(null, null, null, null, null, null, formatter);
 
         presenter = new CreateOfferViewModel(model, new FiatValidator(null), new BtcValidator(), formatter);
     }