diff --git a/lib/solaar/configuration.py b/lib/solaar/configuration.py
index 87a69c5c..4ec9cce7 100644
--- a/lib/solaar/configuration.py
+++ b/lib/solaar/configuration.py
@@ -7,7 +7,7 @@ import os.path as _path
 from json import load as _json_load, dump as _json_save
 
 from logging import getLogger, DEBUG as _DEBUG
-_log = getLogger('solaar.configuration')
+_log = getLogger(__name__)
 del getLogger
 
 _XDG_CONFIG_HOME = _os.environ.get('XDG_CONFIG_HOME') or _path.join(_path.expanduser('~'), '.config')
diff --git a/lib/solaar/gtk.py b/lib/solaar/gtk.py
index ec86358c..46dc256f 100644
--- a/lib/solaar/gtk.py
+++ b/lib/solaar/gtk.py
@@ -40,8 +40,8 @@ def _parse_arguments():
 
 
 def _run(args):
-	from logging import getLogger
-	_log = getLogger('solaar.gtk')
+	from logging import getLogger, DEBUG as _DEBUG
+	_log = getLogger(__name__)
 	del getLogger
 
 	import solaar.ui as ui
diff --git a/lib/solaar/listener.py b/lib/solaar/listener.py
index b2e65448..2cc6c8a1 100644
--- a/lib/solaar/listener.py
+++ b/lib/solaar/listener.py
@@ -5,7 +5,7 @@
 from __future__ import absolute_import, division, print_function, unicode_literals
 
 from logging import getLogger, DEBUG as _DEBUG
-_log = getLogger('solaar.listener')
+_log = getLogger(__name__)
 del getLogger
 
 from . import configuration
diff --git a/lib/solaar/ui/icons.py b/lib/solaar/ui/icons.py
index a9b88fd7..908d2f3d 100644
--- a/lib/solaar/ui/icons.py
+++ b/lib/solaar/ui/icons.py
@@ -6,7 +6,7 @@ from __future__ import absolute_import, division, print_function, unicode_litera
 
 import logging
 _DEBUG = logging.DEBUG
-_log = logging.getLogger('solaar.ui.icons')
+_log = logging.getLogger(__name__)
 
 from gi.repository import Gtk
 
diff --git a/lib/solaar/ui/main_window.py b/lib/solaar/ui/main_window.py
index 9cc2503d..45e27ee9 100644
--- a/lib/solaar/ui/main_window.py
+++ b/lib/solaar/ui/main_window.py
@@ -5,7 +5,7 @@
 from __future__ import absolute_import, division, print_function, unicode_literals
 
 from logging import getLogger, DEBUG as _DEBUG
-_log = getLogger('solaar.ui.window')
+_log = getLogger(__name__)
 del getLogger
 
 from gi.repository import Gtk, Gdk, GLib
diff --git a/lib/solaar/ui/notify.py b/lib/solaar/ui/notify.py
index 20db0631..346b0534 100644
--- a/lib/solaar/ui/notify.py
+++ b/lib/solaar/ui/notify.py
@@ -10,7 +10,7 @@ try:
 	from gi.repository import Notify
 
 	from logging import getLogger, DEBUG as _DEBUG
-	_log = getLogger('solaar.ui.notify')
+	_log = getLogger(__name__)
 	del getLogger
 
 	from solaar import NAME
diff --git a/lib/solaar/ui/pair_window.py b/lib/solaar/ui/pair_window.py
index b63ac52d..e3464fba 100644
--- a/lib/solaar/ui/pair_window.py
+++ b/lib/solaar/ui/pair_window.py
@@ -7,7 +7,7 @@ from __future__ import absolute_import, division, print_function, unicode_litera
 from gi.repository import Gtk, GLib
 
 from logging import getLogger, DEBUG as _DEBUG
-_log = getLogger('pair-window')
+_log = getLogger(__name__)
 del getLogger
 
 from . import icons as _icons
diff --git a/lib/solaar/ui/status_icon.py b/lib/solaar/ui/status_icon.py
index f2126cd3..4d661d7a 100644
--- a/lib/solaar/ui/status_icon.py
+++ b/lib/solaar/ui/status_icon.py
@@ -5,7 +5,7 @@
 from __future__ import absolute_import, division, print_function, unicode_literals
 
 from logging import getLogger, DEBUG as _DEBUG
-_log = getLogger('solaar.ui.tray')
+_log = getLogger(__name__)
 del getLogger
 
 from time import time as _timestamp