diff --git a/tool/agenttool/agenttool.go b/tool/agenttool/agenttool.go
index 44b558c5..655ccac0 100644
--- a/tool/agenttool/agenttool.go
+++ b/tool/agenttool/agenttool.go
@@ -48,7 +48,7 @@ func (t functool) Name() string {
 	if name == "" {
 		name = t.agent.ID()
 	}
-	return invalidNameChars.ReplaceAllString(name, "_")
+	return sanitizeAgentName(name)
 }
 
 func (t functool) Description() string {
@@ -58,6 +58,10 @@ func (t functool) Description() string {
 	return defaultDescription
 }
 
+func sanitizeAgentName(name string) string {
+	return invalidNameChars.ReplaceAllString(name, "_")
+}
+
 func (t functool) Schema() any {
 	return map[string]any{
 		"type": "object",