diff --git a/tnc/codec2.py b/tnc/codec2.py
index 78244dba..d8cd5a1d 100644
--- a/tnc/codec2.py
+++ b/tnc/codec2.py
@@ -16,7 +16,7 @@ from threading import Lock
 import numpy as np
 import structlog
 
-log = structlog.get_logger(__file__)
+log = structlog.get_logger("codec2")
 
 # Enum for codec2 modes
 class FREEDV_MODE(Enum):
diff --git a/tnc/helpers.py b/tnc/helpers.py
index c5d8ace2..2b6ffa45 100644
--- a/tnc/helpers.py
+++ b/tnc/helpers.py
@@ -10,7 +10,7 @@ import crcengine
 import static
 import structlog
 
-log = structlog.get_logger(__file__)
+log = structlog.get_logger("helpers")
 
 
 def wait(seconds: float) -> bool:
diff --git a/tnc/main.py b/tnc/main.py
index 6ca65012..06e2ca46 100755
--- a/tnc/main.py
+++ b/tnc/main.py
@@ -23,7 +23,7 @@ import modem
 import static
 import structlog
 
-log = structlog.get_logger(__file__)
+log = structlog.get_logger("main")
 
 
 def signal_handler(sig, frame):
diff --git a/tnc/rig.py b/tnc/rig.py
index fa30f32e..2b1b5517 100644
--- a/tnc/rig.py
+++ b/tnc/rig.py
@@ -6,7 +6,7 @@ import sys
 
 import structlog
 
-mainlog = structlog.get_logger(__file__)
+mainlog = structlog.get_logger("rig")
 
 # set global hamlib version
 hamlib_version = 0
diff --git a/tnc/rigctl.py b/tnc/rigctl.py
index 1a5eff2e..dd6e202b 100644
--- a/tnc/rigctl.py
+++ b/tnc/rigctl.py
@@ -22,7 +22,7 @@ hamlib_version = 0
 class radio:
     """ """
 
-    log = structlog.get_logger(__name__)
+    log = structlog.get_logger("radio (rigctl)")
 
     def __init__(self):
         self.devicename = ""
diff --git a/tnc/rigctld.py b/tnc/rigctld.py
index 0d55e01d..076f3a93 100644
--- a/tnc/rigctld.py
+++ b/tnc/rigctld.py
@@ -18,7 +18,7 @@ class radio:
 
     # Note: This is a massive hack.
 
-    log = structlog.get_logger(__name__)
+    log = structlog.get_logger("radio (rigctld)")
 
     def __init__(self, hostname="localhost", port=4532, poll_rate=5, timeout=5):
         """Open a connection to rigctld, and test it for validity"""
diff --git a/tnc/sock.py b/tnc/sock.py
index 3becae85..a71ffc49 100644
--- a/tnc/sock.py
+++ b/tnc/sock.py
@@ -50,7 +50,7 @@ class ThreadedTCPRequestHandler(socketserver.StreamRequestHandler):
     """ """
 
     connection_alive = False
-    log = structlog.get_logger(__name__)
+    log = structlog.get_logger("ThreadedTCPRequestHandler")
 
     def send_to_client(self):
         """
@@ -505,7 +505,7 @@ def process_daemon_commands(data):
     Returns:
 
     """
-    log = structlog.get_logger(__name__)
+    log = structlog.get_logger("process_daemon_commands")
 
     # convert data to json object
     received_json = json.loads(data)
@@ -675,7 +675,7 @@ def send_daemon_state():
     """
     send the daemon state to network
     """
-    log = structlog.get_logger(__name__)
+    log = structlog.get_logger("send_daemon_state")
 
     try:
         python_version = f"{str(sys.version_info[0])}.{str(sys.version_info[1])}"