diff --git a/jrnl/jrnl.py b/jrnl/controller.py
similarity index 99%
rename from jrnl/jrnl.py
rename to jrnl/controller.py
index cda124cd..e3a8f283 100644
--- a/jrnl/jrnl.py
+++ b/jrnl/controller.py
@@ -31,7 +31,7 @@ if TYPE_CHECKING:
     from jrnl.Entry import Entry
 
 
-def run(args: "Namespace"):
+def start(args: "Namespace"):
     """
     Flow:
     1. Run standalone command if it doesn't require config (help, version, etc), then exit
diff --git a/jrnl/main.py b/jrnl/main.py
index a6510f68..714e3843 100644
--- a/jrnl/main.py
+++ b/jrnl/main.py
@@ -7,7 +7,7 @@ import traceback
 
 from rich.logging import RichHandler
 
-from jrnl import jrnl
+from jrnl import controller
 from jrnl.args import parse_args
 from jrnl.exception import JrnlException
 from jrnl.messages import Message
@@ -41,7 +41,7 @@ def run(manual_args: list[str] | None = None) -> int:
         configure_logger(args.debug)
         logging.debug("Parsed args:\n%s", args)
 
-        status_code = jrnl.run(args)
+        status_code = controller.start(args)
 
     except JrnlException as e:
         status_code = 1
diff --git a/tests/lib/fixtures.py b/tests/lib/fixtures.py
index 1dc09378..3f012e96 100644
--- a/tests/lib/fixtures.py
+++ b/tests/lib/fixtures.py
@@ -144,7 +144,7 @@ def mock_overrides(config_in_memory):
 
     return {
         "overrides": lambda: patch(
-            "jrnl.jrnl.apply_overrides", side_effect=my_overrides
+            "jrnl.controller.apply_overrides", side_effect=my_overrides
         )
     }
 
diff --git a/tests/unit/test_jrnl.py b/tests/unit/test_controller.py
similarity index 96%
rename from tests/unit/test_jrnl.py
rename to tests/unit/test_controller.py
index 9e6d9b25..4862dc8e 100644
--- a/tests/unit/test_jrnl.py
+++ b/tests/unit/test_controller.py
@@ -9,7 +9,7 @@ import pytest
 
 import jrnl
 from jrnl.args import parse_args
-from jrnl.jrnl import _display_search_results
+from jrnl.controller import _display_search_results
 
 
 @pytest.fixture