diff --git a/api/libs/agents/src/tools/categories/file_tools/create_dashboard_files.rs b/api/libs/agents/src/tools/categories/file_tools/create_dashboards.rs
similarity index 100%
rename from api/libs/agents/src/tools/categories/file_tools/create_dashboard_files.rs
rename to api/libs/agents/src/tools/categories/file_tools/create_dashboards.rs
diff --git a/api/libs/agents/src/tools/categories/file_tools/create_metric_files.rs b/api/libs/agents/src/tools/categories/file_tools/create_metrics.rs
similarity index 100%
rename from api/libs/agents/src/tools/categories/file_tools/create_metric_files.rs
rename to api/libs/agents/src/tools/categories/file_tools/create_metrics.rs
diff --git a/api/libs/agents/src/tools/categories/file_tools/mod.rs b/api/libs/agents/src/tools/categories/file_tools/mod.rs
index 4273cf9a8..64564b07e 100644
--- a/api/libs/agents/src/tools/categories/file_tools/mod.rs
+++ b/api/libs/agents/src/tools/categories/file_tools/mod.rs
@@ -1,17 +1,17 @@
 pub mod common;
-pub mod create_dashboard_files;
-pub mod create_metric_files;
+pub mod create_dashboards;
+pub mod create_metrics;
 pub mod file_types;
 // pub mod filter_dashboards;
-pub mod modify_dashboard_files;
-pub mod modify_metric_files;
+pub mod modify_dashboards;
+pub mod modify_metrics;
 pub mod search_data_catalog;
 
-pub use create_dashboard_files::CreateDashboardFilesTool;
-pub use create_metric_files::CreateMetricFilesTool;
+pub use create_dashboards::CreateDashboardFilesTool;
+pub use create_metrics::CreateMetricFilesTool;
 // pub use filter_dashboards::FilterDashboardsTool;
-pub use modify_dashboard_files::ModifyDashboardFilesTool;
-pub use modify_metric_files::ModifyMetricFilesTool;
+pub use modify_dashboards::ModifyDashboardFilesTool;
+pub use modify_metrics::ModifyMetricFilesTool;
 pub use search_data_catalog::SearchDataCatalogTool;
 
 use crate::tools::ToolExecutor;
diff --git a/api/libs/agents/src/tools/categories/file_tools/modify_dashboard_files.rs b/api/libs/agents/src/tools/categories/file_tools/modify_dashboards.rs
similarity index 100%
rename from api/libs/agents/src/tools/categories/file_tools/modify_dashboard_files.rs
rename to api/libs/agents/src/tools/categories/file_tools/modify_dashboards.rs
diff --git a/api/libs/agents/src/tools/categories/file_tools/modify_metric_files.rs b/api/libs/agents/src/tools/categories/file_tools/modify_metrics.rs
similarity index 100%
rename from api/libs/agents/src/tools/categories/file_tools/modify_metric_files.rs
rename to api/libs/agents/src/tools/categories/file_tools/modify_metrics.rs
diff --git a/api/libs/handlers/src/chats/post_chat_handler.rs b/api/libs/handlers/src/chats/post_chat_handler.rs
index 4e11314ad..3dbb85b76 100644
--- a/api/libs/handlers/src/chats/post_chat_handler.rs
+++ b/api/libs/handlers/src/chats/post_chat_handler.rs
@@ -4,8 +4,8 @@ use std::{collections::HashMap, sync::Mutex, time::Instant};
 
 use agents::{
     tools::{file_tools::{
-        common::ModifyFilesOutput, create_dashboard_files::CreateDashboardFilesOutput,
-        create_metric_files::CreateMetricFilesOutput, search_data_catalog::SearchDataCatalogOutput,
+        common::ModifyFilesOutput, create_dashboards::CreateDashboardFilesOutput,
+        create_metrics::CreateMetricFilesOutput, search_data_catalog::SearchDataCatalogOutput,
     }, planning_tools::CreatePlanOutput},
     AgentExt, AgentMessage, AgentThread, BusterSuperAgent,
 };