diff --git a/src/git/pyproject.toml b/src/git/pyproject.toml
index 86dad110..4abc81af 100644
--- a/src/git/pyproject.toml
+++ b/src/git/pyproject.toml
@@ -23,7 +23,7 @@ dependencies = [
 ]
 
 [project.scripts]
-mcp-git = "mcp_git:main"
+mcp-server-git = "mcp_server_git:main"
 
 [build-system]
 requires = ["hatchling"]
diff --git a/src/git/src/mcp_git/__main__.py b/src/git/src/mcp_git/__main__.py
deleted file mode 100644
index 7182e6f7..00000000
--- a/src/git/src/mcp_git/__main__.py
+++ /dev/null
@@ -1,5 +0,0 @@
-# __main__.py
-
-from mcp_git import main
-
-main()
diff --git a/src/git/src/mcp_git/__init__.py b/src/git/src/mcp_server_git/__init__.py
similarity index 100%
rename from src/git/src/mcp_git/__init__.py
rename to src/git/src/mcp_server_git/__init__.py
diff --git a/src/git/src/mcp_server_git/__main__.py b/src/git/src/mcp_server_git/__main__.py
new file mode 100644
index 00000000..beda6b0e
--- /dev/null
+++ b/src/git/src/mcp_server_git/__main__.py
@@ -0,0 +1,5 @@
+# __main__.py
+
+from mcp_server_git import main
+
+main()
diff --git a/src/git/uv.lock b/src/git/uv.lock
index f994f688..191ed15f 100644
--- a/src/git/uv.lock
+++ b/src/git/uv.lock
@@ -166,7 +166,7 @@ wheels = [
 ]
 
 [[package]]
-name = "mcp-git"
+name = "mcp-server-git"
 version = "0.2.0"
 source = { editable = "." }
 dependencies = [
diff --git a/src/sqlite/pyproject.toml b/src/sqlite/pyproject.toml
index 8cba887c..1730db4b 100644
--- a/src/sqlite/pyproject.toml
+++ b/src/sqlite/pyproject.toml
@@ -11,4 +11,4 @@ requires = ["hatchling"]
 build-backend = "hatchling.build"
 
 [project.scripts]
-sqlite = "sqlite:main"
+mcp-server-sqlite = "mcp_server_sqlite:main"
diff --git a/src/sqlite/src/sqlite/__init__.py b/src/sqlite/src/mcp_server_sqlite/__init__.py
similarity index 100%
rename from src/sqlite/src/sqlite/__init__.py
rename to src/sqlite/src/mcp_server_sqlite/__init__.py
diff --git a/src/sqlite/src/sqlite/server.py b/src/sqlite/src/mcp_server_sqlite/server.py
similarity index 100%
rename from src/sqlite/src/sqlite/server.py
rename to src/sqlite/src/mcp_server_sqlite/server.py
diff --git a/src/sqlite/uv.lock b/src/sqlite/uv.lock
index fc36f073..d9c68db8 100644
--- a/src/sqlite/uv.lock
+++ b/src/sqlite/uv.lock
@@ -126,6 +126,17 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/b3/a0/2ee813d456b57a726d583868417d1ad900fbe12ee3c8cd866e3e804ca486/mcp-0.9.1-py3-none-any.whl", hash = "sha256:7f640fcfb0be486aa510594df309920ae1d375cdca1f8aff21db3a96d837f303", size = 31562 },
 ]
 
+[[package]]
+name = "mcp-server-sqlite"
+version = "0.1.0"
+source = { editable = "." }
+dependencies = [
+    { name = "mcp" },
+]
+
+[package.metadata]
+requires-dist = [{ name = "mcp", specifier = ">=0.9.1" }]
+
 [[package]]
 name = "pydantic"
 version = "2.10.0"
@@ -202,17 +213,6 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/e9/44/75a9c9421471a6c4805dbf2356f7c181a29c1879239abab1ea2cc8f38b40/sniffio-1.3.1-py3-none-any.whl", hash = "sha256:2f6da418d1f1e0fddd844478f41680e794e6051915791a034ff65e5f100525a2", size = 10235 },
 ]
 
-[[package]]
-name = "sqlite"
-version = "0.1.0"
-source = { editable = "." }
-dependencies = [
-    { name = "mcp" },
-]
-
-[package.metadata]
-requires-dist = [{ name = "mcp", specifier = ">=0.9.1" }]
-
 [[package]]
 name = "sse-starlette"
 version = "2.1.3"