diff --git a/src/main/java/io/bitsquare/app/gui/BitsquareApp.java b/src/main/java/io/bitsquare/app/gui/BitsquareApp.java
index 8b66a99c1c..7df2909cd3 100644
--- a/src/main/java/io/bitsquare/app/gui/BitsquareApp.java
+++ b/src/main/java/io/bitsquare/app/gui/BitsquareApp.java
@@ -41,7 +41,7 @@ import java.nio.file.Paths;
 import viewfx.view.View;
 import viewfx.view.ViewLoader;
 import viewfx.view.support.CachingViewLoader;
-import viewfx.view.support.guice.GuiceViewFactory;
+import viewfx.view.support.guice.InjectorViewFactory;
 
 import javafx.application.Application;
 import javafx.scene.*;
@@ -67,7 +67,7 @@ public class BitsquareApp extends Application {
     public void start(Stage primaryStage) throws IOException {
         bitsquareAppModule = new BitsquareAppModule(env, primaryStage);
         injector = Guice.createInjector(bitsquareAppModule);
-        injector.getInstance(GuiceViewFactory.class).setInjector(injector);
+        injector.getInstance(InjectorViewFactory.class).setInjector(injector);
 
 
         // route uncaught exceptions to a user-facing dialog
diff --git a/src/main/java/io/bitsquare/gui/GuiModule.java b/src/main/java/io/bitsquare/gui/GuiModule.java
index 033d81a3bd..c66258cc90 100644
--- a/src/main/java/io/bitsquare/gui/GuiModule.java
+++ b/src/main/java/io/bitsquare/gui/GuiModule.java
@@ -39,7 +39,7 @@ import viewfx.view.ViewFactory;
 import viewfx.view.ViewLoader;
 import viewfx.view.support.CachingViewLoader;
 import viewfx.view.support.fxml.FxmlViewLoader;
-import viewfx.view.support.guice.GuiceViewFactory;
+import viewfx.view.support.guice.InjectorViewFactory;
 
 import javafx.stage.Stage;
 
@@ -56,8 +56,8 @@ public class GuiModule extends BitsquareModule {
 
     @Override
     protected void configure() {
-        bind(GuiceViewFactory.class).in(Singleton.class);
-        bind(ViewFactory.class).to(GuiceViewFactory.class);
+        bind(InjectorViewFactory.class).in(Singleton.class);
+        bind(ViewFactory.class).to(InjectorViewFactory.class);
 
         bind(ResourceBundle.class).toInstance(BSResources.getResourceBundle());
         bind(ViewLoader.class).to(FxmlViewLoader.class).asEagerSingleton();
diff --git a/src/main/java/viewfx/view/support/guice/GuiceViewFactory.java b/src/main/java/viewfx/view/support/guice/InjectorViewFactory.java
similarity index 72%
rename from src/main/java/viewfx/view/support/guice/GuiceViewFactory.java
rename to src/main/java/viewfx/view/support/guice/InjectorViewFactory.java
index cf3d6b8b50..b7dd0343d5 100644
--- a/src/main/java/viewfx/view/support/guice/GuiceViewFactory.java
+++ b/src/main/java/viewfx/view/support/guice/InjectorViewFactory.java
@@ -23,15 +23,7 @@ import com.google.inject.Injector;
 
 import viewfx.view.ViewFactory;
 
-/**
- * A JavaFX controller factory for constructing viewfx Views using Guice. To
- * install this in the {@link javafx.fxml.FXMLLoader}, pass it as a parameter to
- * {@link javafx.fxml.FXMLLoader#setControllerFactory(javafx.util.Callback)}.
- * <p>
- * Once set, make sure you do <b>not</b> use the static methods on
- * {@link javafx.fxml.FXMLLoader} when creating your JavaFX node.
- */
-public class GuiceViewFactory implements ViewFactory {
+public class InjectorViewFactory implements ViewFactory {
 
     private Injector injector;