diff --git a/lib/solaar/async.py b/lib/solaar/tasks.py
similarity index 100%
rename from lib/solaar/async.py
rename to lib/solaar/tasks.py
diff --git a/lib/solaar/ui/__init__.py b/lib/solaar/ui/__init__.py
index 3f64e83f..84285950 100644
--- a/lib/solaar/ui/__init__.py
+++ b/lib/solaar/ui/__init__.py
@@ -75,7 +75,7 @@ def error_dialog(reason, object):
 #
 
 _task_runner = None
-def async(function, *args, **kwargs):
+def ui_async(function, *args, **kwargs):
 	if _task_runner:
 		_task_runner(function, *args, **kwargs)
 
@@ -90,7 +90,7 @@ def _startup(app, startup_hook):
 	if _log.isEnabledFor(_DEBUG):
 		_log.debug("startup registered=%s, remote=%s", app.get_is_registered(), app.get_is_remote())
 
-	from solaar.async import TaskRunner as _TaskRunner
+	from solaar.tasks import TaskRunner as _TaskRunner
 	global _task_runner
 	_task_runner = _TaskRunner('AsyncUI')
 	_task_runner.start()
diff --git a/lib/solaar/ui/config_panel.py b/lib/solaar/ui/config_panel.py
index 75f9a2c3..151b61c2 100644
--- a/lib/solaar/ui/config_panel.py
+++ b/lib/solaar/ui/config_panel.py
@@ -23,7 +23,7 @@ from gi.repository import Gtk, GLib
 from threading import Timer as _Timer
 
 from solaar.i18n import _
-from solaar.ui import async as _ui_async
+from solaar.ui import ui_async as _ui_async
 from logitech_receiver.settings import KIND as _SETTING_KIND
 
 #
diff --git a/lib/solaar/ui/window.py b/lib/solaar/ui/window.py
index 6e27e095..8697fc73 100644
--- a/lib/solaar/ui/window.py
+++ b/lib/solaar/ui/window.py
@@ -31,7 +31,7 @@ from solaar import NAME
 from solaar.i18n import _
 from gettext import ngettext
 # from solaar import __version__ as VERSION
-from solaar.ui import async as _ui_async
+from solaar.ui import ui_async as _ui_async
 from logitech_receiver import hidpp10 as _hidpp10
 from logitech_receiver.common import NamedInts as _NamedInts, NamedInt as _NamedInt
 from logitech_receiver.status import KEYS as _K