diff --git a/pyproject.toml b/pyproject.toml
index edcae1180..04b236190 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -11,7 +11,7 @@ target-version = "py312"
 line-length = 88
 
 [tool.ruff.lint]
-select = ["PL"]
+select = ["F", "PL"]
 
 [tool.ruff.lint.isort]
 known-first-party = ["dbus_client_gen", "dbus_python_client_gen"]
diff --git a/src/stratis_cli/__init__.py b/src/stratis_cli/__init__.py
index 1a8443f3e..4d447f820 100644
--- a/src/stratis_cli/__init__.py
+++ b/src/stratis_cli/__init__.py
@@ -15,6 +15,7 @@
 Top level of CLI.
 """
 
-from ._errors import StratisCliEnvironmentError
-from ._exit import StratisCliErrorCodes, exit_
-from ._main import run
+from ._errors import StratisCliEnvironmentError as StratisCliEnvironmentError
+from ._exit import StratisCliErrorCodes as StratisCliErrorCodes
+from ._exit import exit_ as exit_
+from ._main import run as run
diff --git a/src/stratis_cli/_actions/__init__.py b/src/stratis_cli/_actions/__init__.py
index 45e079911..ffc1a344c 100644
--- a/src/stratis_cli/_actions/__init__.py
+++ b/src/stratis_cli/_actions/__init__.py
@@ -15,24 +15,21 @@
 Package mediating dbus actions.
 """
 
-from ._bind import BindActions, RebindActions
-from ._constants import (
-    BLOCKDEV_INTERFACE,
-    FILESYSTEM_INTERFACE,
-    MANAGER_0_INTERFACE,
-    POOL_INTERFACE,
-)
-from ._crypt import CryptActions
-from ._debug import (
-    BlockdevDebugActions,
-    FilesystemDebugActions,
-    PoolDebugActions,
-    TopDebugActions,
-)
-from ._logical import LogicalActions
-from ._physical import PhysicalActions
-from ._pool import PoolActions
-from ._stratis import StratisActions
-from ._stratisd_version import check_stratisd_version
-from ._top import TopActions
-from ._utils import get_errors
+from ._bind import BindActions as BindActions
+from ._bind import RebindActions as RebindActions
+from ._constants import BLOCKDEV_INTERFACE as BLOCKDEV_INTERFACE
+from ._constants import FILESYSTEM_INTERFACE as FILESYSTEM_INTERFACE
+from ._constants import MANAGER_0_INTERFACE as MANAGER_0_INTERFACE
+from ._constants import POOL_INTERFACE as POOL_INTERFACE
+from ._crypt import CryptActions as CryptActions
+from ._debug import BlockdevDebugActions as BlockdevDebugActions
+from ._debug import FilesystemDebugActions as FilesystemDebugActions
+from ._debug import PoolDebugActions as PoolDebugActions
+from ._debug import TopDebugActions as TopDebugActions
+from ._logical import LogicalActions as LogicalActions
+from ._physical import PhysicalActions as PhysicalActions
+from ._pool import PoolActions as PoolActions
+from ._stratis import StratisActions as StratisActions
+from ._stratisd_version import check_stratisd_version as check_stratisd_version
+from ._top import TopActions as TopActions
+from ._utils import get_errors as get_errors
diff --git a/src/stratis_cli/_parser/__init__.py b/src/stratis_cli/_parser/__init__.py
index 08d632851..a1aa4649e 100644
--- a/src/stratis_cli/_parser/__init__.py
+++ b/src/stratis_cli/_parser/__init__.py
@@ -15,4 +15,4 @@
 Top level of CLI.
 """
 
-from ._parser import gen_parser
+from ._parser import gen_parser as gen_parser