diff --git a/pkg/chat/chat.go b/pkg/chat/chat.go
index 27436f1e..35e025f4 100644
--- a/pkg/chat/chat.go
+++ b/pkg/chat/chat.go
@@ -41,6 +41,8 @@ func Start(ctx context.Context, prevState runner.ChatState, chatter Chatter, prg
 	}
 	defer prompter.Close()
 
+	// We will want the tool name to be displayed in the prompt
+	var prevResp runner.ChatResponse
 	for {
 		var (
 			input string
@@ -53,7 +55,7 @@ func Start(ctx context.Context, prevState runner.ChatState, chatter Chatter, prg
 			return err
 		}
 
-		prompter.SetPrompt(getPrompt(prg, resp))
+		prompter.SetPrompt(getPrompt(prg, prevResp))
 
 		if startInput != "" {
 			input = startInput
@@ -79,5 +81,6 @@ func Start(ctx context.Context, prevState runner.ChatState, chatter Chatter, prg
 		}
 
 		prevState = resp.State
+		prevResp = resp
 	}
 }
diff --git a/pkg/parser/parser.go b/pkg/parser/parser.go
index 99bc9e16..07ccb626 100644
--- a/pkg/parser/parser.go
+++ b/pkg/parser/parser.go
@@ -101,15 +101,15 @@ func isParam(line string, tool *types.Tool) (_ bool, err error) {
 		}
 		tool.Parameters.Chat = v
 	case "export":
-		tool.Parameters.Export = append(tool.Parameters.Export, csv(strings.ToLower(value))...)
+		tool.Parameters.Export = append(tool.Parameters.Export, csv(value)...)
 	case "tool", "tools":
-		tool.Parameters.Tools = append(tool.Parameters.Tools, csv(strings.ToLower(value))...)
+		tool.Parameters.Tools = append(tool.Parameters.Tools, csv(value)...)
 	case "globaltool", "globaltools":
-		tool.Parameters.GlobalTools = append(tool.Parameters.GlobalTools, csv(strings.ToLower(value))...)
+		tool.Parameters.GlobalTools = append(tool.Parameters.GlobalTools, csv(value)...)
 	case "exportcontext":
-		tool.Parameters.ExportContext = append(tool.Parameters.ExportContext, csv(strings.ToLower(value))...)
+		tool.Parameters.ExportContext = append(tool.Parameters.ExportContext, csv(value)...)
 	case "context":
-		tool.Parameters.Context = append(tool.Parameters.Context, csv(strings.ToLower(value))...)
+		tool.Parameters.Context = append(tool.Parameters.Context, csv(value)...)
 	case "args", "arg", "param", "params", "parameters", "parameter":
 		if err := addArg(value, tool); err != nil {
 			return false, err
diff --git a/pkg/tests/testdata/TestCase/call1.golden b/pkg/tests/testdata/TestCase/call1.golden
index 8cb564c7..ab170df9 100644
--- a/pkg/tests/testdata/TestCase/call1.golden
+++ b/pkg/tests/testdata/TestCase/call1.golden
@@ -5,7 +5,7 @@
     {
       "function": {
         "toolID": "testdata/TestCase/test.gpt:6",
-        "name": "bob",
+        "name": "Bob",
         "description": "I'm Bob, a friendly guy.",
         "parameters": {
           "properties": {
diff --git a/pkg/tests/testdata/TestCase2/call1.golden b/pkg/tests/testdata/TestCase2/call1.golden
index fa71f5ec..07d94234 100644
--- a/pkg/tests/testdata/TestCase2/call1.golden
+++ b/pkg/tests/testdata/TestCase2/call1.golden
@@ -5,7 +5,7 @@
     {
       "function": {
         "toolID": "testdata/TestCase2/test.gpt:6",
-        "name": "bob",
+        "name": "Bob",
         "description": "I'm Bob, a friendly guy.",
         "parameters": {
           "properties": {