diff --git a/contrib/csv-to-pgsql.py b/contrib/csv-to-pgsql.py
index 71a5b664..dad408d7 100755
--- a/contrib/csv-to-pgsql.py
+++ b/contrib/csv-to-pgsql.py
@@ -12,7 +12,7 @@ from pathlib import Path
 from pySim.log import PySimLogger
 from packaging import version
 
-log = PySimLogger.get("CSV2PGQSL")
+log = PySimLogger.get(Path(__file__).stem)
 
 class CardKeyDatabase:
     def __init__(self, config_filename: str, table_name: str, create_table: bool = False, admin: bool = False):
@@ -35,7 +35,6 @@ class CardKeyDatabase:
                 raise ValueError("user for role '%s' not set up in config file." % role)
             return user.get('name'), user.get('pass')
 
-        log = PySimLogger.get("PGSQL")
         self.table = table_name.lower()
         self.cols = None
 
diff --git a/contrib/es2p_server.py b/contrib/es2p_server.py
index 6d71689a..3feadc00 100755
--- a/contrib/es2p_server.py
+++ b/contrib/es2p_server.py
@@ -31,8 +31,9 @@ from pySim.esim.es2p import param, Es2pApiServerMno, Es2pApiServerHandlerMno
 from osmocom.utils import b2h
 from datetime import datetime
 from analyze_simaResponse import split_sima_response
+from pathlib import Path
 
-logger = logging.getLogger(__name__)
+logger = logging.getLogger(Path(__file__).stem)
 
 parser = argparse.ArgumentParser(description="""
 Utility to receive and log requests against the ES2+ API of an SM-DP+ according to GSMA SGP.22.""")
diff --git a/pySim-shell.py b/pySim-shell.py
index be6249df..50deea2a 100755
--- a/pySim-shell.py
+++ b/pySim-shell.py
@@ -74,7 +74,7 @@ from pySim.card_key_provider import card_key_provider_register, card_key_provide
 
 from pySim.app import init_card
 
-log = PySimLogger.get("main")
+log = PySimLogger.get(Path(__file__).stem)
 
 class Cmd2Compat(cmd2.Cmd):
     """Backwards-compatibility wrapper around cmd2.Cmd to support older and newer
diff --git a/pySim/card_key_provider.py b/pySim/card_key_provider.py
index 07a55b5d..a6cd7eaa 100644
--- a/pySim/card_key_provider.py
+++ b/pySim/card_key_provider.py
@@ -38,7 +38,7 @@ import csv
 import logging
 import yaml
 
-log = PySimLogger.get("CARDKEY")
+log = PySimLogger.get(__name__)
 
 card_key_providers = []  # type: List['CardKeyProvider']
 
diff --git a/pySim/log.py b/pySim/log.py
index c7e52395..85397b6d 100644
--- a/pySim/log.py
+++ b/pySim/log.py
@@ -44,7 +44,7 @@ class PySimLogger:
     """
 
     LOG_FMTSTR = "%(levelname)s: %(message)s"
-    LOG_FMTSTR_VERBOSE = "%(module)s.%(lineno)d -- %(name)s - " + LOG_FMTSTR
+    LOG_FMTSTR_VERBOSE = "%(module)s.%(lineno)d -- " + LOG_FMTSTR
     __formatter = logging.Formatter(LOG_FMTSTR)
     __formatter_verbose = logging.Formatter(LOG_FMTSTR_VERBOSE)
 
diff --git a/pySim/runtime.py b/pySim/runtime.py
index 54f431b2..6a5a9e01 100644
--- a/pySim/runtime.py
+++ b/pySim/runtime.py
@@ -26,7 +26,7 @@ from pySim.exceptions import *
 from pySim.filesystem import *
 from pySim.log import PySimLogger
 
-log = PySimLogger.get("RUNTIME")
+log = PySimLogger.get(__name__)
 
 def lchan_nr_from_cla(cla: int) -> int:
     """Resolve the logical channel number from the CLA byte."""
diff --git a/tests/unittests/test_log.py b/tests/unittests/test_log.py
index 6a0f7ffe..a8e38dd0 100755
--- a/tests/unittests/test_log.py
+++ b/tests/unittests/test_log.py
@@ -25,7 +25,7 @@ import io
 import sys
 from inspect import currentframe, getframeinfo
 
-log = PySimLogger.get("TEST")
+log = PySimLogger.get(__name__)
 
 TEST_MSG_DEBUG = "this is a debug message"
 TEST_MSG_INFO = "this is an info message"
@@ -82,15 +82,15 @@ class PySimLogger_Test(unittest.TestCase):
         PySimLogger.setup(self._test_print_callback)
         PySimLogger.set_verbose(True)
         frame = currentframe()
-        expected_message = __name__ + "." + str(getframeinfo(frame).lineno + 1) + " -- TEST - DEBUG: " + TEST_MSG_DEBUG
+        expected_message = __name__ + "." + str(getframeinfo(frame).lineno + 1) + " -- DEBUG: " + TEST_MSG_DEBUG
         log.debug(TEST_MSG_DEBUG)
-        expected_message = __name__ + "." + str(getframeinfo(frame).lineno + 1) + " -- TEST - INFO: " + TEST_MSG_INFO
+        expected_message = __name__ + "." + str(getframeinfo(frame).lineno + 1) + " -- INFO: " + TEST_MSG_INFO
         log.info(TEST_MSG_INFO)
-        expected_message = __name__ + "." + str(getframeinfo(frame).lineno + 1) + " -- TEST - WARNING: " + TEST_MSG_WARNING
+        expected_message = __name__ + "." + str(getframeinfo(frame).lineno + 1) + " -- WARNING: " + TEST_MSG_WARNING
         log.warning(TEST_MSG_WARNING)
-        expected_message = __name__ + "." + str(getframeinfo(frame).lineno + 1) + " -- TEST - ERROR: " + TEST_MSG_ERROR
+        expected_message = __name__ + "." + str(getframeinfo(frame).lineno + 1) + " -- ERROR: " + TEST_MSG_ERROR
         log.error(TEST_MSG_ERROR)
-        expected_message = __name__ + "." + str(getframeinfo(frame).lineno + 1) + " -- TEST - CRITICAL: " + TEST_MSG_CRITICAL
+        expected_message = __name__ + "." + str(getframeinfo(frame).lineno + 1) + " -- CRITICAL: " + TEST_MSG_CRITICAL
         log.critical(TEST_MSG_CRITICAL)
 
     def test_04_level(self):