diff --git a/CLOUD-SQL-SQLSERVER.md b/CLOUD-SQL-SQLSERVER.md
index 6e660d3..0fe51bf 100644
--- a/CLOUD-SQL-SQLSERVER.md
+++ b/CLOUD-SQL-SQLSERVER.md
@@ -39,7 +39,7 @@ This section covers administrative operations like managing clusters, instances,
     * For read-only operations (get/list), the **Cloud SQL Viewer** (`roles/cloudsql.viewer`) role is sufficient.
     * If an operation fails due to permissions, identify the type of operation and recommend the appropriate role. You can provide these links for assistance:
         * Granting Roles: https://cloud.google.com/iam/docs/grant-role-console
-        * Cloud SQL Permissions: https://cloud.google.com/sql/docs/postgres/iam-permissions
+        * Cloud SQL Permissions: https://cloud.google.com/sql/docs/sqlserver/iam-permissions
 
 ---
 
@@ -82,4 +82,4 @@ Users may have set project environment variables:
 *   `CLOUD_SQL_MSSQL_DATABASE`: The name of the database.
 
 Instead of prompting the user for these values for specific tool calls, prompt the user to verify reuse a specific value.
-Make sure to not use the environment variable name like `CLOUD_SQL_MSSQL_PROJECT`, `${CLOUD_SQL_MSSQL_PROJECT}`, or `$CLOUD_SQL_MSSQL_PROJECT`. The value can be found by using command: `echo $CLOUD_SQL_MSSQL_PROJECT`.
\ No newline at end of file
+Make sure to not use the environment variable name like `CLOUD_SQL_MSSQL_PROJECT`, `${CLOUD_SQL_MSSQL_PROJECT}`, or `$CLOUD_SQL_MSSQL_PROJECT`. The value can be found by using command: `echo $CLOUD_SQL_MSSQL_PROJECT`.
diff --git a/gemini-extension.json b/gemini-extension.json
index dd45855..894777a 100644
--- a/gemini-extension.json
+++ b/gemini-extension.json
@@ -3,7 +3,7 @@
   "version": "0.1.0",
   "description": "Connect to Cloud SQL for SQL Server",
   "mcpServers": {
-    "Cloud SQL for SQL Server Admin": {
+    "cloud_sql_sqlserver_admin": {
       "command": "${extensionPath}${/}toolbox",
       "args": [
         "--prebuilt",
@@ -11,7 +11,7 @@
         "--stdio"
       ]
     },
-    "Cloud SQL for SQL Server": {
+    "cloud_sql_sqlserver": {
       "command": "${extensionPath}${/}toolbox",
       "args": [
         "--prebuilt",
@@ -19,12 +19,12 @@
         "--stdio"
       ],
       "env": {
-        "CLOUD_SQL_SQLSERVER_PROJECT": "${CLOUD_SQL_SQLSERVER_PROJECT}",
-        "CLOUD_SQL_SQLSERVER_REGION": "${CLOUD_SQL_SQLSERVER_REGION}",
-        "CLOUD_SQL_SQLSERVER_INSTANCE": "${CLOUD_SQL_SQLSERVER_INSTANCE}",
-        "CLOUD_SQL_SQLSERVER_DATABASE": "${CLOUD_SQL_SQLSERVER_DATABASE}",
-        "CLOUD_SQL_SQLSERVER_USER": "${CLOUD_SQL_SQLSERVER_USER}",
-        "CLOUD_SQL_SQLSERVER_PASSWORD": "${CLOUD_SQL_SQLSERVER_PASSWORD}"
+        "CLOUD_SQL_MSSQL_PROJECT": "${CLOUD_SQL_MSSQL_PROJECT}",
+        "CLOUD_SQL_MSSQL_REGION": "${CLOUD_SQL_MSSQL_REGION}",
+        "CLOUD_SQL_MSSQL_INSTANCE": "${CLOUD_SQL_MSSQL_INSTANCE}",
+        "CLOUD_SQL_MSSQL_DATABASE": "${CLOUD_SQL_MSSQL_DATABASE}",
+        "CLOUD_SQL_MSSQL_USER": "${CLOUD_SQL_MSSQL_USER}",
+        "CLOUD_SQL_MSSQL_PASSWORD": "${CLOUD_SQL_MSSQL_PASSWORD}"
       }
     }
   },