diff --git a/codex-rs/core/config.schema.json b/codex-rs/core/config.schema.json
index a3dc361a3c..2e29ad7b1a 100644
--- a/codex-rs/core/config.schema.json
+++ b/codex-rs/core/config.schema.json
@@ -363,6 +363,9 @@
             "enable_experimental_windows_sandbox": {
               "type": "boolean"
             },
+            "enable_fanout": {
+              "type": "boolean"
+            },
             "enable_request_compression": {
               "type": "boolean"
             },
@@ -459,9 +462,6 @@
             "skill_mcp_dependency_install": {
               "type": "boolean"
             },
-            "spawn_csv": {
-              "type": "boolean"
-            },
             "sqlite": {
               "type": "boolean"
             },
@@ -1871,6 +1871,9 @@
         "enable_experimental_windows_sandbox": {
           "type": "boolean"
         },
+        "enable_fanout": {
+          "type": "boolean"
+        },
         "enable_request_compression": {
           "type": "boolean"
         },
@@ -1967,9 +1970,6 @@
         "skill_mcp_dependency_install": {
           "type": "boolean"
         },
-        "spawn_csv": {
-          "type": "boolean"
-        },
         "sqlite": {
           "type": "boolean"
         },
diff --git a/codex-rs/core/src/config/config_tests.rs b/codex-rs/core/src/config/config_tests.rs
index c6d92e74b9..d203ab02c9 100644
--- a/codex-rs/core/src/config/config_tests.rs
+++ b/codex-rs/core/src/config/config_tests.rs
@@ -5350,7 +5350,7 @@ async fn feature_requirements_normalize_runtime_feature_mutations() -> std::io::
 }
 
 #[tokio::test]
-async fn feature_requirements_reject_legacy_aliases() {
+async fn feature_requirements_reject_collab_legacy_alias() {
     let codex_home = TempDir::new().expect("tempdir");
 
     let err = ConfigBuilder::default()
diff --git a/codex-rs/core/src/features.rs b/codex-rs/core/src/features.rs
index ea7a34c428..702365bdd2 100644
--- a/codex-rs/core/src/features.rs
+++ b/codex-rs/core/src/features.rs
@@ -709,7 +709,7 @@ pub const FEATURES: &[FeatureSpec] = &[
     },
     FeatureSpec {
         id: Feature::SpawnCsv,
-        key: "spawn_csv",
+        key: "enable_fanout",
         stage: Stage::UnderDevelopment,
         default_enabled: false,
     },
diff --git a/codex-rs/core/src/features_tests.rs b/codex-rs/core/src/features_tests.rs
index aa0d1a6dc8..620200c302 100644
--- a/codex-rs/core/src/features_tests.rs
+++ b/codex-rs/core/src/features_tests.rs
@@ -133,18 +133,18 @@ fn collab_is_legacy_alias_for_multi_agent() {
 }
 
 #[test]
-fn spawn_csv_is_under_development() {
+fn enable_fanout_is_under_development() {
     assert_eq!(Feature::SpawnCsv.stage(), Stage::UnderDevelopment);
     assert_eq!(Feature::SpawnCsv.default_enabled(), false);
 }
 
 #[test]
-fn spawn_csv_normalization_enables_multi_agent_one_way() {
-    let mut spawn_csv_features = Features::with_defaults();
-    spawn_csv_features.enable(Feature::SpawnCsv);
-    spawn_csv_features.normalize_dependencies();
-    assert_eq!(spawn_csv_features.enabled(Feature::SpawnCsv), true);
-    assert_eq!(spawn_csv_features.enabled(Feature::Collab), true);
+fn enable_fanout_normalization_enables_multi_agent_one_way() {
+    let mut enable_fanout_features = Features::with_defaults();
+    enable_fanout_features.enable(Feature::SpawnCsv);
+    enable_fanout_features.normalize_dependencies();
+    assert_eq!(enable_fanout_features.enabled(Feature::SpawnCsv), true);
+    assert_eq!(enable_fanout_features.enabled(Feature::Collab), true);
 
     let mut collab_features = Features::with_defaults();
     collab_features.enable(Feature::Collab);
diff --git a/codex-rs/core/src/tools/spec_tests.rs b/codex-rs/core/src/tools/spec_tests.rs
index a1b7857962..cb8a0777c8 100644
--- a/codex-rs/core/src/tools/spec_tests.rs
+++ b/codex-rs/core/src/tools/spec_tests.rs
@@ -446,7 +446,7 @@ fn test_build_specs_collab_tools_enabled() {
 }
 
 #[test]
-fn test_build_specs_spawn_csv_enables_agent_jobs_and_collab_tools() {
+fn test_build_specs_enable_fanout_enables_agent_jobs_and_collab_tools() {
     let config = test_config();
     let model_info = ModelsManager::construct_model_info_offline_for_tests("gpt-5-codex", &config);
     let mut features = Features::with_defaults();