diff --git a/enterprise/app/models/captain/assistant.rb b/enterprise/app/models/captain/assistant.rb
index 771360659..4f039d57a 100644
--- a/enterprise/app/models/captain/assistant.rb
+++ b/enterprise/app/models/captain/assistant.rb
@@ -88,7 +88,7 @@ class Captain::Assistant < ApplicationRecord
   private
 
   def agent_name
-    name
+    name.parameterize(separator: '_')
   end
 
   def agent_tools
diff --git a/enterprise/app/models/captain/scenario.rb b/enterprise/app/models/captain/scenario.rb
index d876a7127..c43468804 100644
--- a/enterprise/app/models/captain/scenario.rb
+++ b/enterprise/app/models/captain/scenario.rb
@@ -56,7 +56,7 @@ class Captain::Scenario < ApplicationRecord
   private
 
   def agent_name
-    "#{title} Agent".titleize
+    "#{title} Agent".parameterize(separator: '_')
   end
 
   def agent_tools