diff --git a/src/main/java/io/bitsquare/gui/components/ValidatingTextField.java b/src/main/java/io/bitsquare/gui/components/InputTextField.java
similarity index 93%
rename from src/main/java/io/bitsquare/gui/components/ValidatingTextField.java
rename to src/main/java/io/bitsquare/gui/components/InputTextField.java
index 9255812dcf..88b7325d61 100644
--- a/src/main/java/io/bitsquare/gui/components/ValidatingTextField.java
+++ b/src/main/java/io/bitsquare/gui/components/InputTextField.java
@@ -43,8 +43,8 @@ import org.slf4j.LoggerFactory;
  * There can be only 1 errorMessageDisplays at a time we use static field for it.
  * The position is derived from the position of the textField itself or if set from the layoutReference node.
  */
-public class ValidatingTextField extends TextField {
-    private static final Logger log = LoggerFactory.getLogger(ValidatingTextField.class);
+public class InputTextField extends TextField {
+    private static final Logger log = LoggerFactory.getLogger(InputTextField.class);
 
     private Effect invalidEffect = new DropShadow(BlurType.GAUSSIAN, Color.RED, 4, 0.0, 0, 0);
 
@@ -67,7 +67,7 @@ public class ValidatingTextField extends TextField {
     // Constructor
     ///////////////////////////////////////////////////////////////////////////////////////////
 
-    public ValidatingTextField() {
+    public InputTextField() {
         super();
 
         amountValidationResult.addListener((ov, oldValue, newValue) -> {
@@ -153,9 +153,9 @@ public class ValidatingTextField extends TextField {
         errorLabel.setId("validation-error");
         errorLabel.setPadding(new Insets(0, 10, 0, 10));
 
-        ValidatingTextField.errorMessageDisplay = new PopOver(errorLabel);
-        ValidatingTextField.errorMessageDisplay.setDetachable(false);
-        ValidatingTextField.errorMessageDisplay.setArrowIndent(5);
+        InputTextField.errorMessageDisplay = new PopOver(errorLabel);
+        InputTextField.errorMessageDisplay.setDetachable(false);
+        InputTextField.errorMessageDisplay.setArrowIndent(5);
     }
 
 }
\ No newline at end of file
diff --git a/src/main/java/io/bitsquare/gui/trade/TradeController.java b/src/main/java/io/bitsquare/gui/trade/TradeController.java
index 3ea0705aff..e1eba34810 100644
--- a/src/main/java/io/bitsquare/gui/trade/TradeController.java
+++ b/src/main/java/io/bitsquare/gui/trade/TradeController.java
@@ -20,7 +20,7 @@ package io.bitsquare.gui.trade;
 import io.bitsquare.di.GuiceFXMLLoader;
 import io.bitsquare.gui.CachedViewController;
 import io.bitsquare.gui.NavigationItem;
-import io.bitsquare.gui.components.ValidatingTextField;
+import io.bitsquare.gui.components.InputTextField;
 import io.bitsquare.gui.trade.createoffer.CreateOfferCB;
 import io.bitsquare.gui.trade.orderbook.OrderBookController;
 import io.bitsquare.gui.trade.takeoffer.TakeOfferController;
@@ -78,7 +78,7 @@ public class TradeController extends CachedViewController {
 
         //TODO update to new verison
         ((TabPane) root).getSelectionModel().selectedIndexProperty().addListener((observableValue) ->
-                Platform.runLater(ValidatingTextField::hideErrorMessageDisplay));
+                Platform.runLater(InputTextField::hideErrorMessageDisplay));
     }
 
 
diff --git a/src/main/java/io/bitsquare/gui/trade/createoffer/CreateOfferCB.java b/src/main/java/io/bitsquare/gui/trade/createoffer/CreateOfferCB.java
index 9c00dba0b9..7f9b7671de 100644
--- a/src/main/java/io/bitsquare/gui/trade/createoffer/CreateOfferCB.java
+++ b/src/main/java/io/bitsquare/gui/trade/createoffer/CreateOfferCB.java
@@ -18,8 +18,8 @@
 package io.bitsquare.gui.trade.createoffer;
 
 import io.bitsquare.gui.CachedCodeBehind;
+import io.bitsquare.gui.components.InputTextField;
 import io.bitsquare.gui.components.Popups;
-import io.bitsquare.gui.components.ValidatingTextField;
 import io.bitsquare.gui.components.btc.AddressTextField;
 import io.bitsquare.gui.components.btc.BalanceTextField;
 import io.bitsquare.gui.components.confidence.ConfidenceProgressIndicator;
@@ -43,7 +43,7 @@ public class CreateOfferCB extends CachedCodeBehind<CreateOfferPM> {
     private static final Logger log = LoggerFactory.getLogger(CreateOfferCB.class);
 
     @FXML private Label buyLabel, confirmationLabel, txTitleLabel, collateralLabel;
-    @FXML private ValidatingTextField amountTextField, minAmountTextField, priceTextField, volumeTextField;
+    @FXML private InputTextField amountTextField, minAmountTextField, priceTextField, volumeTextField;
     @FXML private Button placeOfferButton, closeButton;
     @FXML private TextField totalToPayTextField, collateralTextField, bankAccountTypeTextField,
             bankAccountCurrencyTextField, bankAccountCountyTextField, acceptedCountriesTextField,
diff --git a/src/main/java/io/bitsquare/gui/trade/createoffer/CreateOfferView.fxml b/src/main/java/io/bitsquare/gui/trade/createoffer/CreateOfferView.fxml
index 9a41287f26..d89074575a 100644
--- a/src/main/java/io/bitsquare/gui/trade/createoffer/CreateOfferView.fxml
+++ b/src/main/java/io/bitsquare/gui/trade/createoffer/CreateOfferView.fxml
@@ -20,7 +20,7 @@
 <?import io.bitsquare.gui.components.btc.AddressTextField?>
 <?import io.bitsquare.gui.components.btc.BalanceTextField?>
 <?import io.bitsquare.gui.components.confidence.ConfidenceProgressIndicator?>
-<?import io.bitsquare.gui.components.ValidatingTextField?>
+<?import io.bitsquare.gui.components.InputTextField?>
 <?import io.bitsquare.gui.components.VSpacer?>
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.*?>
@@ -48,16 +48,16 @@
 
         <Label GridPane.rowIndex="1" fx:id="buyLabel"/>
         <HBox GridPane.rowIndex="1" GridPane.columnIndex="1" spacing="5" GridPane.hgrow="NEVER" alignment="CENTER_LEFT">
-            <ValidatingTextField fx:id="amountTextField" prefWidth="100.0" alignment="CENTER_RIGHT"/>
+            <InputTextField fx:id="amountTextField" prefWidth="100.0" alignment="CENTER_RIGHT"/>
             <Label text="BTC for price of "/>
-            <ValidatingTextField fx:id="priceTextField" prefWidth="100.0" alignment="CENTER_RIGHT"/>
+            <InputTextField fx:id="priceTextField" prefWidth="100.0" alignment="CENTER_RIGHT"/>
             <Label text="EUR/BTC ="/>
-            <ValidatingTextField fx:id="volumeTextField" prefWidth="100.0" alignment="CENTER_RIGHT"/>
+            <InputTextField fx:id="volumeTextField" prefWidth="100.0" alignment="CENTER_RIGHT"/>
             <Label text="EUR in total"/>
         </HBox>
 
         <Label GridPane.rowIndex="2" text="Min. Amount (BTC):"/>
-        <ValidatingTextField GridPane.rowIndex="2" GridPane.columnIndex="1" fx:id="minAmountTextField"/>
+        <InputTextField GridPane.rowIndex="2" GridPane.columnIndex="1" fx:id="minAmountTextField"/>
 
 
         <!-- group -->