diff --git a/src/main/java/io/bitsquare/AbstractBitsquareModule.java b/src/main/java/io/bitsquare/BitsquareModule.java
similarity index 84%
rename from src/main/java/io/bitsquare/AbstractBitsquareModule.java
rename to src/main/java/io/bitsquare/BitsquareModule.java
index 46a6f88c98..9293650999 100644
--- a/src/main/java/io/bitsquare/AbstractBitsquareModule.java
+++ b/src/main/java/io/bitsquare/BitsquareModule.java
@@ -25,24 +25,24 @@ import com.google.inject.Injector;
 import java.util.Properties;
 import java.util.Set;
 
-public abstract class AbstractBitsquareModule extends AbstractModule {
+public abstract class BitsquareModule extends AbstractModule {
 
     protected final Properties properties;
 
-    private final Set<AbstractBitsquareModule> modules = Sets.newHashSet();
+    private final Set<BitsquareModule> modules = Sets.newHashSet();
 
-    protected AbstractBitsquareModule(Properties properties) {
+    protected BitsquareModule(Properties properties) {
         this.properties = properties;
     }
 
-    protected void install(AbstractBitsquareModule module) {
+    protected void install(BitsquareModule module) {
         super.install(module);
         modules.add(module);
     }
 
     /**
      * Close any instances this module is responsible for and recursively close any
-     * sub-modules installed via {@link #install(AbstractBitsquareModule)}. This method
+     * sub-modules installed via {@link #install(BitsquareModule)}. This method
      * must be called manually, e.g. at the end of a main() method or in the stop() method
      * of a JavaFX Application; alternatively it may be registered as a JVM shutdown hook.
      *
diff --git a/src/main/java/io/bitsquare/app/AppModule.java b/src/main/java/io/bitsquare/app/AppModule.java
index fe281c942e..904d3fb1ae 100644
--- a/src/main/java/io/bitsquare/app/AppModule.java
+++ b/src/main/java/io/bitsquare/app/AppModule.java
@@ -17,7 +17,7 @@
 
 package io.bitsquare.app;
 
-import io.bitsquare.AbstractBitsquareModule;
+import io.bitsquare.BitsquareModule;
 import io.bitsquare.btc.BitcoinModule;
 import io.bitsquare.crypto.CryptoModule;
 import io.bitsquare.msg.MessageModule;
@@ -45,7 +45,7 @@ import scala.concurrent.duration.Duration;
 /**
  * Configures all non-UI modules necessary to run a Bitsquare application.
  */
-public class AppModule extends AbstractBitsquareModule {
+public class AppModule extends BitsquareModule {
     private static final Logger log = LoggerFactory.getLogger(AppModule.class);
 
     private final String appName;
diff --git a/src/main/java/io/bitsquare/app/gui/MainModule.java b/src/main/java/io/bitsquare/app/gui/MainModule.java
index 07cd1a1189..db57b7779d 100644
--- a/src/main/java/io/bitsquare/app/gui/MainModule.java
+++ b/src/main/java/io/bitsquare/app/gui/MainModule.java
@@ -17,14 +17,14 @@
 
 package io.bitsquare.app.gui;
 
-import io.bitsquare.AbstractBitsquareModule;
+import io.bitsquare.BitsquareModule;
 import io.bitsquare.app.AppModule;
 import io.bitsquare.gui.GuiModule;
 import io.bitsquare.util.ConfigLoader;
 
 import javafx.stage.Stage;
 
-class MainModule extends AbstractBitsquareModule {
+class MainModule extends BitsquareModule {
 
     private final String appName;
     private final Stage primaryStage;
diff --git a/src/main/java/io/bitsquare/btc/BitcoinModule.java b/src/main/java/io/bitsquare/btc/BitcoinModule.java
index c08f2eb562..c6346f3a49 100644
--- a/src/main/java/io/bitsquare/btc/BitcoinModule.java
+++ b/src/main/java/io/bitsquare/btc/BitcoinModule.java
@@ -17,7 +17,7 @@
 
 package io.bitsquare.btc;
 
-import io.bitsquare.AbstractBitsquareModule;
+import io.bitsquare.BitsquareModule;
 
 import org.bitcoinj.core.NetworkParameters;
 import org.bitcoinj.params.MainNetParams;
@@ -28,7 +28,7 @@ import com.google.inject.Injector;
 
 import java.util.Properties;
 
-public class BitcoinModule extends AbstractBitsquareModule {
+public class BitcoinModule extends BitsquareModule {
 
     private static final BitcoinNetwork DEFAULT_NETWORK = BitcoinNetwork.REGTEST;
 
diff --git a/src/main/java/io/bitsquare/crypto/CryptoModule.java b/src/main/java/io/bitsquare/crypto/CryptoModule.java
index 4f114b65d1..fc3472c98b 100644
--- a/src/main/java/io/bitsquare/crypto/CryptoModule.java
+++ b/src/main/java/io/bitsquare/crypto/CryptoModule.java
@@ -17,11 +17,11 @@
 
 package io.bitsquare.crypto;
 
-import io.bitsquare.AbstractBitsquareModule;
+import io.bitsquare.BitsquareModule;
 
 import java.util.Properties;
 
-public class CryptoModule extends AbstractBitsquareModule {
+public class CryptoModule extends BitsquareModule {
 
     public CryptoModule(Properties properties) {
         super(properties);
diff --git a/src/main/java/io/bitsquare/gui/GuiModule.java b/src/main/java/io/bitsquare/gui/GuiModule.java
index dd39924be1..8491ce60bb 100644
--- a/src/main/java/io/bitsquare/gui/GuiModule.java
+++ b/src/main/java/io/bitsquare/gui/GuiModule.java
@@ -17,7 +17,7 @@
 
 package io.bitsquare.gui;
 
-import io.bitsquare.AbstractBitsquareModule;
+import io.bitsquare.BitsquareModule;
 import io.bitsquare.gui.components.Popups;
 import io.bitsquare.gui.main.help.Help;
 import io.bitsquare.gui.main.trade.offerbook.OfferBook;
@@ -32,7 +32,7 @@ import java.util.Properties;
 
 import javafx.stage.Stage;
 
-public class GuiModule extends AbstractBitsquareModule {
+public class GuiModule extends BitsquareModule {
 
     private final Stage primaryStage;
 
diff --git a/src/main/java/io/bitsquare/msg/MessageModule.java b/src/main/java/io/bitsquare/msg/MessageModule.java
index 31de0addba..351fd3a923 100644
--- a/src/main/java/io/bitsquare/msg/MessageModule.java
+++ b/src/main/java/io/bitsquare/msg/MessageModule.java
@@ -17,7 +17,7 @@
 
 package io.bitsquare.msg;
 
-import io.bitsquare.AbstractBitsquareModule;
+import io.bitsquare.BitsquareModule;
 import io.bitsquare.network.BootstrapNodes;
 import io.bitsquare.network.Node;
 
@@ -26,7 +26,7 @@ import com.google.inject.name.Names;
 
 import java.util.Properties;
 
-public abstract class MessageModule extends AbstractBitsquareModule {
+public abstract class MessageModule extends BitsquareModule {
 
     protected MessageModule(Properties properties) {
         super(properties);
diff --git a/src/main/java/io/bitsquare/offer/OfferModule.java b/src/main/java/io/bitsquare/offer/OfferModule.java
index 47f500b5a3..a83627f92e 100644
--- a/src/main/java/io/bitsquare/offer/OfferModule.java
+++ b/src/main/java/io/bitsquare/offer/OfferModule.java
@@ -17,11 +17,11 @@
 
 package io.bitsquare.offer;
 
-import io.bitsquare.AbstractBitsquareModule;
+import io.bitsquare.BitsquareModule;
 
 import java.util.Properties;
 
-public abstract class OfferModule extends AbstractBitsquareModule {
+public abstract class OfferModule extends BitsquareModule {
 
     protected OfferModule(Properties properties) {
         super(properties);
diff --git a/src/main/java/io/bitsquare/trade/TradeModule.java b/src/main/java/io/bitsquare/trade/TradeModule.java
index 3ccd4fc18c..626e01e6ce 100644
--- a/src/main/java/io/bitsquare/trade/TradeModule.java
+++ b/src/main/java/io/bitsquare/trade/TradeModule.java
@@ -17,11 +17,11 @@
 
 package io.bitsquare.trade;
 
-import io.bitsquare.AbstractBitsquareModule;
+import io.bitsquare.BitsquareModule;
 
 import java.util.Properties;
 
-public class TradeModule extends AbstractBitsquareModule {
+public class TradeModule extends BitsquareModule {
 
     public TradeModule(Properties properties) {
         super(properties);