diff --git a/internal/server/config.go b/internal/server/config.go
index 16caa940b..0a1e44bdd 100644
--- a/internal/server/config.go
+++ b/internal/server/config.go
@@ -29,7 +29,7 @@ import (
 	postgressrc "github.com/googleapis/genai-toolbox/internal/sources/postgres"
 	spannersrc "github.com/googleapis/genai-toolbox/internal/sources/spanner"
 	"github.com/googleapis/genai-toolbox/internal/tools"
-	"github.com/googleapis/genai-toolbox/internal/tools/mssql"
+	"github.com/googleapis/genai-toolbox/internal/tools/mssqlsql"
 	"github.com/googleapis/genai-toolbox/internal/tools/mysql"
 	neo4jtool "github.com/googleapis/genai-toolbox/internal/tools/neo4j"
 	"github.com/googleapis/genai-toolbox/internal/tools/postgressql"
@@ -272,8 +272,8 @@ func (c *ToolConfigs) UnmarshalYAML(unmarshal func(interface{}) error) error {
 				return fmt.Errorf("unable to parse as %q: %w", k.Kind, err)
 			}
 			(*c)[name] = actual
-		case mssql.ToolKind:
-			actual := mssql.Config{Name: name}
+		case mssqlsql.ToolKind:
+			actual := mssqlsql.Config{Name: name}
 			if err := u.Unmarshal(&actual); err != nil {
 				return fmt.Errorf("unable to parse as %q: %w", k.Kind, err)
 			}
diff --git a/internal/tools/mssql/mssql.go b/internal/tools/mssqlsql/mssqlsql.go
similarity index 98%
rename from internal/tools/mssql/mssql.go
rename to internal/tools/mssqlsql/mssqlsql.go
index 2997b361e..0944a41b0 100644
--- a/internal/tools/mssql/mssql.go
+++ b/internal/tools/mssqlsql/mssqlsql.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package mssql
+package mssqlsql
 
 import (
 	"database/sql"
@@ -24,7 +24,7 @@ import (
 	"github.com/googleapis/genai-toolbox/internal/tools"
 )
 
-const ToolKind string = "mssql"
+const ToolKind string = "mssql-sql"
 
 type compatibleSource interface {
 	MSSQLDB() *sql.DB
diff --git a/internal/tools/mssql/mssql_test.go b/internal/tools/mssqlsql/mssqlsql_test.go
similarity index 92%
rename from internal/tools/mssql/mssql_test.go
rename to internal/tools/mssqlsql/mssqlsql_test.go
index d4230b394..e101d5890 100644
--- a/internal/tools/mssql/mssql_test.go
+++ b/internal/tools/mssqlsql/mssqlsql_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package mssql_test
+package mssqlsql_test
 
 import (
 	"testing"
@@ -21,7 +21,7 @@ import (
 	"github.com/googleapis/genai-toolbox/internal/server"
 	"github.com/googleapis/genai-toolbox/internal/testutils"
 	"github.com/googleapis/genai-toolbox/internal/tools"
-	"github.com/googleapis/genai-toolbox/internal/tools/mssql"
+	"github.com/googleapis/genai-toolbox/internal/tools/mssqlsql"
 	"gopkg.in/yaml.v3"
 )
 
@@ -36,7 +36,7 @@ func TestParseFromYamlMssql(t *testing.T) {
 			in: `
 			tools:
 				example_tool:
-					kind: mssql
+					kind: mssql-sql
 					source: my-instance
 					description: some description
 					statement: |
@@ -55,9 +55,9 @@ func TestParseFromYamlMssql(t *testing.T) {
 							  field: user_id
 			`,
 			want: server.ToolConfigs{
-				"example_tool": mssql.Config{
+				"example_tool": mssqlsql.Config{
 					Name:         "example_tool",
-					Kind:         mssql.ToolKind,
+					Kind:         mssqlsql.ToolKind,
 					Source:       "my-instance",
 					Description:  "some description",
 					Statement:    "SELECT * FROM SQL_STATEMENT;\n",