diff --git a/orcasong/from_toml.py b/orcasong/from_toml.py
index 563aab5440ef7e9fa8cdd8303d32dd15317742da..8f795a93a8d42ea961cd1d8e53948094c611a1dc 100644
--- a/orcasong/from_toml.py
+++ b/orcasong/from_toml.py
@@ -5,8 +5,12 @@ import orcasong.extractors as extractors
 # built-in extractors. First argument has to be the input filename,
 # other parameters can be set via 'extractor_config' dict in the toml
 EXTRACTORS = {
-    "neutrino_mc": extractors.get_neutrino_mc_info_extr,
-    "neutrino_data": extractors.get_real_data_info_extr,
+    "nu_chain_neutrino": extractors.get_neutrino_mc_info_extr,
+    "nu_chain_muon": extractors.get_muon_mc_info_extr,
+    "nu_chain_noise": extractors.get_random_noise_mc_info_extr,
+    "nu_chain_data": extractors.get_real_data_info_extr,
+    # TODO "bundle_mc": ???,
+    # TODO "bundle_data": ???,
 }
 
 MODES = {
diff --git a/tests/test_from_toml.py b/tests/test_from_toml.py
index f3985c05a968cca21b33e0de973b9c2a9760e6da..bd3d3d6799e88a4b627fc61104068f117dfcce02 100644
--- a/tests/test_from_toml.py
+++ b/tests/test_from_toml.py
@@ -12,7 +12,7 @@ def _test_extr(infile):
     return infile + "_extr"
 
 
-orcasong.from_toml.EXTRACTORS["neutrino_mc"] = _test_extr
+orcasong.from_toml.EXTRACTORS["nu_chain_neutrino"] = _test_extr
 
 
 class TestSetupProcessorExampleConfig(TestCase):