diff --git a/pkg/tests/testdata/TestExport/call1.golden b/pkg/tests/testdata/TestExport/call1.golden
index b0619ee2..541fec05 100644
--- a/pkg/tests/testdata/TestExport/call1.golden
+++ b/pkg/tests/testdata/TestExport/call1.golden
@@ -23,7 +23,7 @@
     {
       "function": {
         "toolID": "testdata/TestExport/parent.gpt:11",
-        "name": "parent-local",
+        "name": "parent_local",
         "parameters": {
           "properties": {
             "defaultPromptParameter": {
diff --git a/pkg/tests/testdata/TestExport/call3.golden b/pkg/tests/testdata/TestExport/call3.golden
index b4874230..18acf446 100644
--- a/pkg/tests/testdata/TestExport/call3.golden
+++ b/pkg/tests/testdata/TestExport/call3.golden
@@ -23,7 +23,7 @@
     {
       "function": {
         "toolID": "testdata/TestExport/parent.gpt:11",
-        "name": "parent-local",
+        "name": "parent_local",
         "parameters": {
           "properties": {
             "defaultPromptParameter": {
diff --git a/pkg/types/toolname.go b/pkg/types/toolname.go
index e1e44a55..ce396cff 100644
--- a/pkg/types/toolname.go
+++ b/pkg/types/toolname.go
@@ -9,8 +9,8 @@ import (
 )
 
 var (
-	validToolName = regexp.MustCompile("^[a-zA-Z0-9_-]{1,64}$")
-	invalidChars  = regexp.MustCompile("[^a-zA-Z0-9_-]+")
+	validToolName = regexp.MustCompile("^[a-zA-Z0-9_]{1,64}$")
+	invalidChars  = regexp.MustCompile("[^a-zA-Z0-9_]+")
 )
 
 func ToolNormalizer(tool string) string {
diff --git a/pkg/types/toolname_test.go b/pkg/types/toolname_test.go
new file mode 100644
index 00000000..84621058
--- /dev/null
+++ b/pkg/types/toolname_test.go
@@ -0,0 +1,11 @@
+package types
+
+import (
+	"testing"
+
+	"github.com/hexops/autogold/v2"
+)
+
+func TestToolNormalizer(t *testing.T) {
+	autogold.Expect("bob_tool").Equal(t, ToolNormalizer("bob-tool"))
+}