diff --git a/pkg/tests/testdata/TestCase2/call1.golden b/pkg/tests/testdata/TestCase2/call1.golden
index 581e03f5..d9b446d0 100644
--- a/pkg/tests/testdata/TestCase2/call1.golden
+++ b/pkg/tests/testdata/TestCase2/call1.golden
@@ -4,7 +4,7 @@
     {
       "function": {
         "toolID": "testdata/TestCase2/test.gpt:bob",
-        "name": "Bob",
+        "name": "bob",
         "description": "I'm Bob, a friendly guy.",
         "parameters": {
           "properties": {
diff --git a/pkg/types/tool.go b/pkg/types/tool.go
index f10788b4..0bd7bc02 100644
--- a/pkg/types/tool.go
+++ b/pkg/types/tool.go
@@ -698,7 +698,10 @@ func toolRefsToCompletionTools(completionTools []ToolReference, prg Program) (re
 	for _, subToolRef := range completionTools {
 		subTool := prg.ToolSet[subToolRef.ToolID]
 
-		subToolName := subToolRef.Reference
+		subToolName := subTool.Name
+		if subToolName == "" {
+			subToolName = subToolRef.Reference
+		}
 		if subToolRef.Named != "" {
 			subToolName = subToolRef.Named
 		}