diff --git a/crates/assistant_tools/src/batch_tool.rs b/crates/assistant_tools/src/batch_tool.rs
index 919389b3a1d2b6ae7d0398dab0fd774b1c5b18f3..d59e570cf408c5b1214f036d19ef59d8324cf9f7 100644
--- a/crates/assistant_tools/src/batch_tool.rs
+++ b/crates/assistant_tools/src/batch_tool.rs
@@ -148,7 +148,7 @@ pub struct BatchTool;
 
 impl Tool for BatchTool {
     fn name(&self) -> String {
-        "batch-tool".into()
+        "batch_tool".into()
     }
 
     fn needs_confirmation(&self) -> bool {
diff --git a/crates/assistant_tools/src/code_symbols_tool.rs b/crates/assistant_tools/src/code_symbols_tool.rs
index d4ba5e9beb5b95c1df91458efd51161cf29792ea..10965eabd028dcb6249d1d45722c1283400fdc7e 100644
--- a/crates/assistant_tools/src/code_symbols_tool.rs
+++ b/crates/assistant_tools/src/code_symbols_tool.rs
@@ -79,7 +79,7 @@ pub struct CodeSymbolsTool;
 
 impl Tool for CodeSymbolsTool {
     fn name(&self) -> String {
-        "code-symbols".into()
+        "code_symbols".into()
     }
 
     fn needs_confirmation(&self) -> bool {
diff --git a/crates/assistant_tools/src/copy_path_tool.rs b/crates/assistant_tools/src/copy_path_tool.rs
index 540da5ff7a3032182af98065200ce8a1a27f7071..7a77b3257b4cebe67f5ff71fc64baaa58b015a19 100644
--- a/crates/assistant_tools/src/copy_path_tool.rs
+++ b/crates/assistant_tools/src/copy_path_tool.rs
@@ -40,7 +40,7 @@ pub struct CopyPathTool;
 
 impl Tool for CopyPathTool {
     fn name(&self) -> String {
-        "copy-path".into()
+        "copy_path".into()
     }
 
     fn needs_confirmation(&self) -> bool {
diff --git a/crates/assistant_tools/src/create_directory_tool.rs b/crates/assistant_tools/src/create_directory_tool.rs
index d5b948a2d9eafd5ccd3f2f21f3987c0cb77f0023..d7d80e1f2db94cdfbf6d9be4991f6ca2a7291a8d 100644
--- a/crates/assistant_tools/src/create_directory_tool.rs
+++ b/crates/assistant_tools/src/create_directory_tool.rs
@@ -30,7 +30,7 @@ pub struct CreateDirectoryTool;
 
 impl Tool for CreateDirectoryTool {
     fn name(&self) -> String {
-        "create-directory".into()
+        "create_directory".into()
     }
 
     fn needs_confirmation(&self) -> bool {
diff --git a/crates/assistant_tools/src/create_file_tool.rs b/crates/assistant_tools/src/create_file_tool.rs
index 64dfbdbfbda73b6a1108fee0ce76659c317e0854..57bff7594c2d954d55bf2cdc14f55253ac0c37ca 100644
--- a/crates/assistant_tools/src/create_file_tool.rs
+++ b/crates/assistant_tools/src/create_file_tool.rs
@@ -37,7 +37,7 @@ pub struct CreateFileTool;
 
 impl Tool for CreateFileTool {
     fn name(&self) -> String {
-        "create-file".into()
+        "create_file".into()
     }
 
     fn needs_confirmation(&self) -> bool {
diff --git a/crates/assistant_tools/src/delete_path_tool.rs b/crates/assistant_tools/src/delete_path_tool.rs
index 3eae3e1790d75aa8fcf04698de5d845411e589be..22b1b45e50c958d98d0c95377d3842acead1213c 100644
--- a/crates/assistant_tools/src/delete_path_tool.rs
+++ b/crates/assistant_tools/src/delete_path_tool.rs
@@ -30,7 +30,7 @@ pub struct DeletePathTool;
 
 impl Tool for DeletePathTool {
     fn name(&self) -> String {
-        "delete-path".into()
+        "delete_path".into()
     }
 
     fn needs_confirmation(&self) -> bool {
diff --git a/crates/assistant_tools/src/edit_files_tool.rs b/crates/assistant_tools/src/edit_files_tool.rs
index 5470045918f82890b83194ed2675f260c77662a7..67a2ac901d8ceb96376889242c25f844d3c661ba 100644
--- a/crates/assistant_tools/src/edit_files_tool.rs
+++ b/crates/assistant_tools/src/edit_files_tool.rs
@@ -78,7 +78,7 @@ pub struct EditFilesTool;
 
 impl Tool for EditFilesTool {
     fn name(&self) -> String {
-        "edit-files".into()
+        "edit_files".into()
     }
 
     fn needs_confirmation(&self) -> bool {
diff --git a/crates/assistant_tools/src/find_replace_file_tool.rs b/crates/assistant_tools/src/find_replace_file_tool.rs
index 5cd3faa1502e9c1b5bb03aecc1ad69151941a26c..93b6d2fef76f5ad436d1eea1ad092c4cc06bdca9 100644
--- a/crates/assistant_tools/src/find_replace_file_tool.rs
+++ b/crates/assistant_tools/src/find_replace_file_tool.rs
@@ -126,7 +126,7 @@ pub struct FindReplaceFileTool;
 
 impl Tool for FindReplaceFileTool {
     fn name(&self) -> String {
-        "find-replace-file".into()
+        "find_replace_file".into()
     }
 
     fn needs_confirmation(&self) -> bool {
diff --git a/crates/assistant_tools/src/list_directory_tool.rs b/crates/assistant_tools/src/list_directory_tool.rs
index 81ad0dd8017f278cce822841129e6d7682da83f0..4d76653dfd9bfa2361036de39f0e94d0f4fd17c6 100644
--- a/crates/assistant_tools/src/list_directory_tool.rs
+++ b/crates/assistant_tools/src/list_directory_tool.rs
@@ -41,7 +41,7 @@ pub struct ListDirectoryTool;
 
 impl Tool for ListDirectoryTool {
     fn name(&self) -> String {
-        "list-directory".into()
+        "list_directory".into()
     }
 
     fn needs_confirmation(&self) -> bool {
diff --git a/crates/assistant_tools/src/move_path_tool.rs b/crates/assistant_tools/src/move_path_tool.rs
index 9f8e27c60ea6c77150df44caf46f6165d420c0c4..5dbbc2373eb734cbd0b4612350c6fdb4f8ffecc1 100644
--- a/crates/assistant_tools/src/move_path_tool.rs
+++ b/crates/assistant_tools/src/move_path_tool.rs
@@ -39,7 +39,7 @@ pub struct MovePathTool;
 
 impl Tool for MovePathTool {
     fn name(&self) -> String {
-        "move-path".into()
+        "move_path".into()
     }
 
     fn needs_confirmation(&self) -> bool {
diff --git a/crates/assistant_tools/src/path_search_tool.rs b/crates/assistant_tools/src/path_search_tool.rs
index f7bdb0b8e584517e93c8299e4b733fff8a23cb2f..78662a604f4ca3c4e948b716731370f8208d0005 100644
--- a/crates/assistant_tools/src/path_search_tool.rs
+++ b/crates/assistant_tools/src/path_search_tool.rs
@@ -38,7 +38,7 @@ pub struct PathSearchTool;
 
 impl Tool for PathSearchTool {
     fn name(&self) -> String {
-        "path-search".into()
+        "path_search".into()
     }
 
     fn needs_confirmation(&self) -> bool {
diff --git a/crates/assistant_tools/src/read_file_tool.rs b/crates/assistant_tools/src/read_file_tool.rs
index b79c3ffb2909d41297e71a589a6cf102316fd659..17d7803d79f7f64a783e96992c5a4290242efbe7 100644
--- a/crates/assistant_tools/src/read_file_tool.rs
+++ b/crates/assistant_tools/src/read_file_tool.rs
@@ -44,7 +44,7 @@ pub struct ReadFileTool;
 
 impl Tool for ReadFileTool {
     fn name(&self) -> String {
-        "read-file".into()
+        "read_file".into()
     }
 
     fn needs_confirmation(&self) -> bool {
diff --git a/crates/assistant_tools/src/regex_search_tool.rs b/crates/assistant_tools/src/regex_search_tool.rs
index d300f0ddc1fed78b5ad52732709fab2ebf64f1cb..948afcf1fd83f11f83df48810ce89e149025c0f4 100644
--- a/crates/assistant_tools/src/regex_search_tool.rs
+++ b/crates/assistant_tools/src/regex_search_tool.rs
@@ -41,7 +41,7 @@ pub struct RegexSearchTool;
 
 impl Tool for RegexSearchTool {
     fn name(&self) -> String {
-        "regex-search".into()
+        "regex_search".into()
     }
 
     fn needs_confirmation(&self) -> bool {
diff --git a/crates/assistant_tools/src/symbol_info_tool.rs b/crates/assistant_tools/src/symbol_info_tool.rs
index 6a355d7bee7a4e490a96875ff82e93db337625e6..d04cce22ed8bdc2d2439ad9c445346ab40c99fa9 100644
--- a/crates/assistant_tools/src/symbol_info_tool.rs
+++ b/crates/assistant_tools/src/symbol_info_tool.rs
@@ -69,7 +69,7 @@ pub struct SymbolInfoTool;
 
 impl Tool for SymbolInfoTool {
     fn name(&self) -> String {
-        "symbol-info".into()
+        "symbol_info".into()
     }
 
     fn needs_confirmation(&self) -> bool {