diff --git a/pyproject.toml b/pyproject.toml
index d6937ae9dbe9f1c55fdb75c0b1366a5a3c0fb67f..821786adcade378367924fceeed4f79f20c4b08f 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -80,42 +80,42 @@ densenet_pre = "ptbench.configs.models.densenet_pretrained"
 
 # montgomery dataset (and cross-validation folds)
 montgomery = "ptbench.data.montgomery.default"
-montgomery_f0 = "ptbench.data.montgomery.fold_0"
-montgomery_f1 = "ptbench.data.montgomery.fold_1"
-montgomery_f2 = "ptbench.data.montgomery.fold_2"
-montgomery_f3 = "ptbench.data.montgomery.fold_3"
-montgomery_f4 = "ptbench.data.montgomery.fold_4"
-montgomery_f5 = "ptbench.data.montgomery.fold_5"
-montgomery_f6 = "ptbench.data.montgomery.fold_6"
-montgomery_f7 = "ptbench.data.montgomery.fold_7"
-montgomery_f8 = "ptbench.data.montgomery.fold_8"
-montgomery_f9 = "ptbench.data.montgomery.fold_9"
+montgomery-f0 = "ptbench.data.montgomery.fold_0"
+montgomery-f1 = "ptbench.data.montgomery.fold_1"
+montgomery-f2 = "ptbench.data.montgomery.fold_2"
+montgomery-f3 = "ptbench.data.montgomery.fold_3"
+montgomery-f4 = "ptbench.data.montgomery.fold_4"
+montgomery-f5 = "ptbench.data.montgomery.fold_5"
+montgomery-f6 = "ptbench.data.montgomery.fold_6"
+montgomery-f7 = "ptbench.data.montgomery.fold_7"
+montgomery-f8 = "ptbench.data.montgomery.fold_8"
+montgomery-f9 = "ptbench.data.montgomery.fold_9"
 
 # shenzhen dataset (and cross-validation folds)
 shenzhen = "ptbench.data.shenzhen.default"
-shenzhen_f0 = "ptbench.data.shenzhen.fold_0"
-shenzhen_f1 = "ptbench.data.shenzhen.fold_1"
-shenzhen_f2 = "ptbench.data.shenzhen.fold_2"
-shenzhen_f3 = "ptbench.data.shenzhen.fold_3"
-shenzhen_f4 = "ptbench.data.shenzhen.fold_4"
-shenzhen_f5 = "ptbench.data.shenzhen.fold_5"
-shenzhen_f6 = "ptbench.data.shenzhen.fold_6"
-shenzhen_f7 = "ptbench.data.shenzhen.fold_7"
-shenzhen_f8 = "ptbench.data.shenzhen.fold_8"
-shenzhen_f9 = "ptbench.data.shenzhen.fold_9"
+shenzhen-f0 = "ptbench.data.shenzhen.fold_0"
+shenzhen-f1 = "ptbench.data.shenzhen.fold_1"
+shenzhen-f2 = "ptbench.data.shenzhen.fold_2"
+shenzhen-f3 = "ptbench.data.shenzhen.fold_3"
+shenzhen-f4 = "ptbench.data.shenzhen.fold_4"
+shenzhen-f5 = "ptbench.data.shenzhen.fold_5"
+shenzhen-f6 = "ptbench.data.shenzhen.fold_6"
+shenzhen-f7 = "ptbench.data.shenzhen.fold_7"
+shenzhen-f8 = "ptbench.data.shenzhen.fold_8"
+shenzhen-f9 = "ptbench.data.shenzhen.fold_9"
 
 # indian dataset (and cross-validation folds)
 indian = "ptbench.data.indian.default"
-indian_f0 = "ptbench.data.indian.fold_0"
-indian_f1 = "ptbench.data.indian.fold_1"
-indian_f2 = "ptbench.data.indian.fold_2"
-indian_f3 = "ptbench.data.indian.fold_3"
-indian_f4 = "ptbench.data.indian.fold_4"
-indian_f5 = "ptbench.data.indian.fold_5"
-indian_f6 = "ptbench.data.indian.fold_6"
-indian_f7 = "ptbench.data.indian.fold_7"
-indian_f8 = "ptbench.data.indian.fold_8"
-indian_f9 = "ptbench.data.indian.fold_9"
+indian-f0 = "ptbench.data.indian.fold_0"
+indian-f1 = "ptbench.data.indian.fold_1"
+indian-f2 = "ptbench.data.indian.fold_2"
+indian-f3 = "ptbench.data.indian.fold_3"
+indian-f4 = "ptbench.data.indian.fold_4"
+indian-f5 = "ptbench.data.indian.fold_5"
+indian-f6 = "ptbench.data.indian.fold_6"
+indian-f7 = "ptbench.data.indian.fold_7"
+indian-f8 = "ptbench.data.indian.fold_8"
+indian-f9 = "ptbench.data.indian.fold_9"
 
 # TBX11K simplified dataset split 1 (and cross-validation folds)
 tbx11k_simplified = "ptbench.data.tbx11k_simplified.default"
@@ -144,17 +144,17 @@ tbx11k_simplified_v2_f8 = "ptbench.data.tbx11k_simplified_v2.fold_8"
 tbx11k_simplified_v2_f9 = "ptbench.data.tbx11k_simplified_v2.fold_9"
 
 # montgomery-shenzhen aggregated dataset
-mc_ch = "ptbench.data.mc_ch.default"
-mc_ch_f0 = "ptbench.data.mc_ch.fold_0"
-mc_ch_f1 = "ptbench.data.mc_ch.fold_1"
-mc_ch_f2 = "ptbench.data.mc_ch.fold_2"
-mc_ch_f3 = "ptbench.data.mc_ch.fold_3"
-mc_ch_f4 = "ptbench.data.mc_ch.fold_4"
-mc_ch_f5 = "ptbench.data.mc_ch.fold_5"
-mc_ch_f6 = "ptbench.data.mc_ch.fold_6"
-mc_ch_f7 = "ptbench.data.mc_ch.fold_7"
-mc_ch_f8 = "ptbench.data.mc_ch.fold_8"
-mc_ch_f9 = "ptbench.data.mc_ch.fold_9"
+montgomery-shenzhen = "ptbench.data.montgomery_shenzhen.default"
+montgomery-shenzhen_f0 = "ptbench.data.montgomery_shenzhen.fold_0"
+montgomery-shenzhen_f1 = "ptbench.data.montgomery_shenzhen.fold_1"
+montgomery-shenzhen_f2 = "ptbench.data.montgomery_shenzhen.fold_2"
+montgomery-shenzhen_f3 = "ptbench.data.montgomery_shenzhen.fold_3"
+montgomery-shenzhen_f4 = "ptbench.data.montgomery_shenzhen.fold_4"
+montgomery-shenzhen_f5 = "ptbench.data.montgomery_shenzhen.fold_5"
+montgomery-shenzhen_f6 = "ptbench.data.montgomery_shenzhen.fold_6"
+montgomery-shenzhen_f7 = "ptbench.data.montgomery_shenzhen.fold_7"
+montgomery-shenzhen_f8 = "ptbench.data.montgomery_shenzhen.fold_8"
+montgomery-shenzhen_f9 = "ptbench.data.montgomery_shenzhen.fold_9"
 
 # montgomery-shenzhen-indian aggregated dataset
 mc_ch_in = "ptbench.data.mc_ch_in.default"