diff --git a/lib/src/main/java/de/kuschku/libquassel/session/CoreConnection.kt b/lib/src/main/java/de/kuschku/libquassel/session/CoreConnection.kt
index 398a9f30f63994e129b1cdf502d43728e8f088b7..652f3dadb47f12b05aafa520cdd53855a5f32020 100644
--- a/lib/src/main/java/de/kuschku/libquassel/session/CoreConnection.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/session/CoreConnection.kt
@@ -60,7 +60,7 @@ class CoreConnection(
   }
 
   fun setState(value: ConnectionState) {
-    log(INFO, "CoreConnection", value.name)
+    log(INFO, TAG, value.name)
     internalState.onNext(value)
   }
 
@@ -84,7 +84,7 @@ class CoreConnection(
     sizeBuffer.flip()
     val protocol = ProtocolInfoSerializer.deserialize(sizeBuffer, session.coreFeatures)
 
-    log(DEBUG, "Protocol negotiated $protocol")
+    log(DEBUG, TAG, "Protocol negotiated $protocol")
 
     // Wrap socket in SSL context if ssl is enabled
     if (protocol.flags.hasFlag(ProtocolFeature.TLS)) {
diff --git a/lib/src/main/java/de/kuschku/libquassel/session/ProtocolHandler.kt b/lib/src/main/java/de/kuschku/libquassel/session/ProtocolHandler.kt
index c8fefde5cd82a99b08c63b4bd047beb9adbf4321..d86c73a3b475d840a2c71bdaa5a73ad756d72d0b 100644
--- a/lib/src/main/java/de/kuschku/libquassel/session/ProtocolHandler.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/session/ProtocolHandler.kt
@@ -31,11 +31,10 @@ abstract class ProtocolHandler : SignalProxy, AuthHandler, Closeable {
   override fun handle(f: SignalProxyMessage): Boolean {
     try {
       if (!super<SignalProxy>.handle(f)) {
-        log(DEBUG, "No receiver registered for $f")
+        log(DEBUG, "ProtocolHandler", "No receiver registered for $f")
       }
     } catch (e: Throwable) {
-      log(WARN, "ProtocolHandler",
-          "Error Handling SignalProxyMessage", e)
+      log(WARN, "ProtocolHandler", "Error Handling SignalProxyMessage", e)
     }
     return true
   }
@@ -43,11 +42,10 @@ abstract class ProtocolHandler : SignalProxy, AuthHandler, Closeable {
   override fun handle(f: HandshakeMessage): Boolean {
     try {
       if (!super<AuthHandler>.handle(f)) {
-        log(DEBUG, "No receiver registered for $f")
+        log(DEBUG, "ProtocolHandler", "No receiver registered for $f")
       }
     } catch (e: Throwable) {
-      log(WARN, "ProtocolHandler",
-          "Error Handling HandshakeMessage", e)
+      log(WARN, "ProtocolHandler", "Error Handling HandshakeMessage", e)
     }
     return true
   }