diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index fb4f032c..a5f45292 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -10,7 +10,7 @@ Thanks for stopping by to let us know something could be better!
 
 Please run down the following list and make sure you've tried the usual "quick fixes":
 
-  - Search the issues already opened: https://github.com/googleapis/genai-toolbox-langchain-python/issues
+  - Search the issues already opened: https://github.com/googleapis/mcp-toolbox-sdk-python/issues
   - Search StackOverflow: https://stackoverflow.com/questions/tagged/google-cloud-platform+python
 
 If you are still having issues, please be sure to include as much information as possible:
diff --git a/.github/release-trigger.yml b/.github/release-trigger.yml
index 59e4d6e4..f2dbb8ed 100644
--- a/.github/release-trigger.yml
+++ b/.github/release-trigger.yml
@@ -13,4 +13,4 @@
 # limitations under the License.
 
 enabled: true
-multiScmName: genai-toolbox-langchain-python
+multiScmName: mcp-toolbox-sdk-python
diff --git a/.kokoro/build.sh b/.kokoro/build.sh
index d2cfe886..10b00021 100755
--- a/.kokoro/build.sh
+++ b/.kokoro/build.sh
@@ -16,7 +16,7 @@
 set -eo pipefail
 
 if [[ -z "${PROJECT_ROOT:-}" ]]; then
-    PROJECT_ROOT="github/genai-toolbox-langchain-python"
+    PROJECT_ROOT="github/mcp-toolbox-sdk-python"
 fi
 
 cd "${PROJECT_ROOT}"
diff --git a/packages/toolbox-core/DEVELOPER.md b/packages/toolbox-core/DEVELOPER.md
index d8d43a18..1695e02b 100644
--- a/packages/toolbox-core/DEVELOPER.md
+++ b/packages/toolbox-core/DEVELOPER.md
@@ -4,13 +4,12 @@ Below are the details to set up a development environment and run tests.
 
 ## Install
 1. Clone the repository:
-   TODO: Correct repo URL
     ```bash
-    git clone https://github.com/googleapis/genai-toolbox-langchain-python
+    git clone https://github.com/googleapis/mcp-toolbox-sdk-python
     ```
 1. Navigate to the package directory:
     ```bash
-    cd genai-toolbox-langchain-python/packages/toolbox-core
+    cd mcp-toolbox-sdk-python/packages/toolbox-core
     ```
 1. Install the package in editable mode, so changes are reflected without
    reinstall:
@@ -25,7 +24,7 @@ Below are the details to set up a development environment and run tests.
 ## Test
 1. Navigate to the package directory if needed:
     ```bash
-    cd genai-toolbox-langchain-python/packages/toolbox-core
+    cd mcp-toolbox-sdk-python/packages/toolbox-core
     ```
 1. Install the SDK and test dependencies:
     ```bash
diff --git a/packages/toolbox-core/pyproject.toml b/packages/toolbox-core/pyproject.toml
index e08f22a3..602b6d1e 100644
--- a/packages/toolbox-core/pyproject.toml
+++ b/packages/toolbox-core/pyproject.toml
@@ -33,10 +33,10 @@ package-dir = {"" = "src"}
 version = {attr = "toolbox_core.version.__version__"}
 
 [project.urls]
-Homepage = "https://github.com/googleapis/genai-toolbox-langchain-python/blob/main/packages/toolbox-core"
-Repository = "https://github.com/googleapis/genai-toolbox-langchain-python.git"
-"Bug Tracker" = "https://github.com/googleapis/genai-toolbox-langchain-python/issues"
-Changelog = "https://github.com/googleapis/genai-toolbox-langchain-python/blob/main/packages/toolbox-core/CHANGELOG.md"
+Homepage = "https://github.com/googleapis/mcp-toolbox-sdk-python/blob/main/packages/toolbox-core"
+Repository = "https://github.com/googleapis/mcp-toolbox-sdk-python.git"
+"Bug Tracker" = "https://github.com/googleapis/mcp-toolbox-sdk-python/issues"
+Changelog = "https://github.com/googleapis/mcp-toolbox-sdk-python/blob/main/packages/toolbox-core/CHANGELOG.md"
 
 [project.optional-dependencies]
 test = [
diff --git a/packages/toolbox-langchain/DEVELOPER.md b/packages/toolbox-langchain/DEVELOPER.md
index 5f50afb6..441f61d4 100644
--- a/packages/toolbox-langchain/DEVELOPER.md
+++ b/packages/toolbox-langchain/DEVELOPER.md
@@ -4,13 +4,12 @@ Below are the details to set up a development environment and run tests.
 
 ## Install
 1. Clone the repository:
-   TODO: Correct repo URL
     ```bash
-    git clone https://github.com/googleapis/genai-toolbox-langchain-python
+    git clone https://github.com/googleapis/mcp-toolbox-sdk-python
     ```
 1. Navigate to the package directory:
     ```bash
-    cd genai-toolbox-langchain-python/packages/toolbox-langchain
+    cd mcp-toolbox-sdk-python/packages/toolbox-langchain
     ```
 1. Install the package in editable mode, so changes are reflected without
    reinstall:
@@ -25,7 +24,7 @@ Below are the details to set up a development environment and run tests.
 ## Test
 1. Navigate to the package directory if needed:
     ```bash
-    cd genai-toolbox-langchain-python/packages/toolbox-langchain
+    cd mcp-toolbox-sdk-python/packages/toolbox-langchain
     ```
 1. Install the SDK and test dependencies:
     ```bash
diff --git a/packages/toolbox-langchain/pyproject.toml b/packages/toolbox-langchain/pyproject.toml
index 137d528b..c726ccc4 100644
--- a/packages/toolbox-langchain/pyproject.toml
+++ b/packages/toolbox-langchain/pyproject.toml
@@ -35,10 +35,10 @@ package-dir = {"" = "src"}
 version = {attr = "toolbox_langchain.version.__version__"}
 
 [project.urls]
-Homepage = "https://github.com/googleapis/genai-toolbox-langchain-python/blob/main/packages/toolbox-langchain"
-Repository = "https://github.com/googleapis/genai-toolbox-langchain-python.git"
-"Bug Tracker" = "https://github.com/googleapis/genai-toolbox-langchain-python/issues"
-Changelog = "https://github.com/googleapis/genai-toolbox-langchain-python/blob/main/packages/toolbox-langchain/CHANGELOG.md"
+Homepage = "https://github.com/googleapis/mcp-toolbox-sdk-python/blob/main/packages/toolbox-langchain"
+Repository = "https://github.com/googleapis/mcp-toolbox-sdk-python.git"
+"Bug Tracker" = "https://github.com/googleapis/mcp-toolbox-sdk-python/issues"
+Changelog = "https://github.com/googleapis/mcp-toolbox-sdk-python/blob/main/packages/toolbox-langchain/CHANGELOG.md"
 
 [project.optional-dependencies]
 test = [