diff --git a/src/main/java/com/github/jtendermint/jabci/StartupExampleDummyAsyncServer.java b/src/main/java/com/github/jtendermint/jabci/StartupExampleDummyAsyncServer.java
index e89546e..7586f5a 100644
--- a/src/main/java/com/github/jtendermint/jabci/StartupExampleDummyAsyncServer.java
+++ b/src/main/java/com/github/jtendermint/jabci/StartupExampleDummyAsyncServer.java
@@ -42,8 +42,8 @@ public class StartupExampleDummyAsyncServer {
 
         final AsyncServer sock = new AsyncServer();
 
-        //// register TMSP-API listeners here:
-        //// listeners can be TMSPAPI for accepting all messages or
+        //// register ABCI-API listeners here:
+        //// listeners can be ABCIAPI for accepting all messages or
         //// single interfaces like IInfo, IDeliverTX, etc... to only target specific cases
         // sock.registerListener(some_listeners);
         
diff --git a/src/main/java/com/github/jtendermint/jabci/api/ABCIAPI.java b/src/main/java/com/github/jtendermint/jabci/api/ABCIAPI.java
index ca03f3e..a532f72 100644
--- a/src/main/java/com/github/jtendermint/jabci/api/ABCIAPI.java
+++ b/src/main/java/com/github/jtendermint/jabci/api/ABCIAPI.java
@@ -24,13 +24,11 @@
 package com.github.jtendermint.jabci.api;
 
 /**
- * TMSP-Protocol<br>
+ * ABCI-Protocol<br>
  * Bundled Interface of Sub-Interfaces
  * 
  * <br>
- * See <a
- * href="https://github.com/tendermint/tmsp">https://github.com/tendermint
- * /tmsp</a> for more info
+ * See <a href="https://github.com/tendermint/abci">https://github.com/tendermint /abci</a> for more info
  * 
  * @version 26.05.2016
  *
diff --git a/src/main/java/com/github/jtendermint/jabci/socket/ASocket.java b/src/main/java/com/github/jtendermint/jabci/socket/ASocket.java
index 8e2e8a7..0d42e7f 100644
--- a/src/main/java/com/github/jtendermint/jabci/socket/ASocket.java
+++ b/src/main/java/com/github/jtendermint/jabci/socket/ASocket.java
@@ -174,7 +174,7 @@ public abstract class ASocket {
     }
 
     /**
-     * Register a new listener of type TMSPAPI or supertype
+     * Register a new listener of type ABCIAPI or supertype
      * 
      * @param listener
      */
@@ -183,7 +183,7 @@ public abstract class ASocket {
     }
 
     /**
-     * Register a new listener of type TMSPAPI or supertype
+     * Register a new listener of type ABCIAPI or supertype
      * 
      * @param listener
      */
diff --git a/src/main/java/com/github/jtendermint/jabci/socket/DefaultFallbackListener.java b/src/main/java/com/github/jtendermint/jabci/socket/DefaultFallbackListener.java
index ed7cc2f..9eff138 100644
--- a/src/main/java/com/github/jtendermint/jabci/socket/DefaultFallbackListener.java
+++ b/src/main/java/com/github/jtendermint/jabci/socket/DefaultFallbackListener.java
@@ -52,7 +52,7 @@ import com.github.jtendermint.jabci.types.Types.ResponseQuery;
 import com.github.jtendermint.jabci.types.Types.ResponseSetOption;
 
 /**
- * The DefaultFallbackListener answers every incoming TMSP-request with a CodeType.OK
+ * The DefaultFallbackListener answers every incoming ABCI-request with a CodeType.OK
  *
  * @author wolfposd
  */
diff --git a/src/main/java/com/github/jtendermint/jabci/socket/TSocket.java b/src/main/java/com/github/jtendermint/jabci/socket/TSocket.java
index a3094cb..7100ed6 100644
--- a/src/main/java/com/github/jtendermint/jabci/socket/TSocket.java
+++ b/src/main/java/com/github/jtendermint/jabci/socket/TSocket.java
@@ -60,7 +60,7 @@ public class TSocket extends ASocket {
     private boolean continueRunning = true;
 
     /**
-     * Start listening on the default tmsp port 46658
+     * Start listening on the default ABCI port 46658
      */
     public void start() {
         this.start(DEFAULT_LISTEN_SOCKET_PORT);
@@ -87,9 +87,7 @@ public class TSocket extends ASocket {
             }
             TSOCKET_LOG.debug("TSocket Stopped Running");
         } catch (IOException e) {
-            TSOCKET_LOG.debug("Exception caught when trying to listen on port " + portNumber + " or listening for a connection");
-            TSOCKET_LOG.debug(e.getMessage());
-            e.printStackTrace();
+            TSOCKET_LOG.error("Exception caught when trying to listen on port " + portNumber + " or listening for a connection", e);
         }
     }