diff --git a/cli/pyrightconfig.json b/cli/pyrightconfig.json
index 39b6dd1..aea88d0 100644
--- a/cli/pyrightconfig.json
+++ b/cli/pyrightconfig.json
@@ -1,6 +1,6 @@
 {
   "include": [
-    "tjwater_agent_cli",
+    "tjwater_cli",
     "tests"
   ],
   "executionEnvironments": [
diff --git a/cli/tests/unit/test_tjwater_cli.py b/cli/tests/unit/test_tjwater_cli.py
index c546396..7709a71 100644
--- a/cli/tests/unit/test_tjwater_cli.py
+++ b/cli/tests/unit/test_tjwater_cli.py
@@ -2,8 +2,8 @@ from pathlib import Path
 
 from typer.testing import CliRunner
 
-from tjwater_agent_cli import core
-from tjwater_agent_cli.main import app, main
+from tjwater_cli import core
+from tjwater_cli.main import app, main
 
 
 runner = CliRunner()
diff --git a/cli/tjwater_agent_cli/__init__.py b/cli/tjwater_cli/__init__.py
similarity index 100%
rename from cli/tjwater_agent_cli/__init__.py
rename to cli/tjwater_cli/__init__.py
diff --git a/cli/tjwater_agent_cli/__main__.py b/cli/tjwater_cli/__main__.py
similarity index 100%
rename from cli/tjwater_agent_cli/__main__.py
rename to cli/tjwater_cli/__main__.py
diff --git a/cli/tjwater_agent_cli/apps.py b/cli/tjwater_cli/apps.py
similarity index 100%
rename from cli/tjwater_agent_cli/apps.py
rename to cli/tjwater_cli/apps.py
diff --git a/cli/tjwater_agent_cli/commands_analysis.py b/cli/tjwater_cli/commands_analysis.py
similarity index 100%
rename from cli/tjwater_agent_cli/commands_analysis.py
rename to cli/tjwater_cli/commands_analysis.py
diff --git a/cli/tjwater_agent_cli/commands_data.py b/cli/tjwater_cli/commands_data.py
similarity index 100%
rename from cli/tjwater_agent_cli/commands_data.py
rename to cli/tjwater_cli/commands_data.py
diff --git a/cli/tjwater_agent_cli/commands_project.py b/cli/tjwater_cli/commands_project.py
similarity index 100%
rename from cli/tjwater_agent_cli/commands_project.py
rename to cli/tjwater_cli/commands_project.py
diff --git a/cli/tjwater_agent_cli/common.py b/cli/tjwater_cli/common.py
similarity index 100%
rename from cli/tjwater_agent_cli/common.py
rename to cli/tjwater_cli/common.py
diff --git a/cli/tjwater_agent_cli/core.py b/cli/tjwater_cli/core.py
similarity index 100%
rename from cli/tjwater_agent_cli/core.py
rename to cli/tjwater_cli/core.py
diff --git a/cli/tjwater_agent_cli/helping.py b/cli/tjwater_cli/helping.py
similarity index 100%
rename from cli/tjwater_agent_cli/helping.py
rename to cli/tjwater_cli/helping.py
diff --git a/cli/tjwater_agent_cli/main.py b/cli/tjwater_cli/main.py
similarity index 100%
rename from cli/tjwater_agent_cli/main.py
rename to cli/tjwater_cli/main.py
diff --git a/cli/tjwater_agent_cli/registry.py b/cli/tjwater_cli/registry.py
similarity index 100%
rename from cli/tjwater_agent_cli/registry.py
rename to cli/tjwater_cli/registry.py