diff --git a/setup/setup_sis100_electron_FEB23.C b/setup/setup_sis100_electron.C
similarity index 98%
rename from setup/setup_sis100_electron_FEB23.C
rename to setup/setup_sis100_electron.C
index 2f28d56835332e9e5f7e3b87c3ec78e22ac13459..cee7d062c90cf510856c3f41ba8abd2142fb2f2e 100644
--- a/setup/setup_sis100_electron_FEB23.C
+++ b/setup/setup_sis100_electron.C
@@ -17,7 +17,7 @@
 // 2017-11-20 - DE - use TRD v17n as new default
 // 2017-05-22 - DE - use TRD v17c as new default
 
-void setup_sis100_electron_MAR23()
+void setup_sis100_electron()
 {
   // -----  Geometry Tags  --------------------------------------------------
   TString magnetGeoTag    = "v22a";
diff --git a/setup/setup_sis100_hadron_FEB23.C b/setup/setup_sis100_hadron.C
similarity index 98%
rename from setup/setup_sis100_hadron_FEB23.C
rename to setup/setup_sis100_hadron.C
index 0ebf0af8f862a750f454524caf35e308370f6e5b..ed7da0c8b8c429e4aae92cfeefc17ae477ea3c7b 100644
--- a/setup/setup_sis100_hadron_FEB23.C
+++ b/setup/setup_sis100_hadron.C
@@ -15,7 +15,7 @@
 // 2020-04-23 - FU - Use exported TOF geometry v16d (same as v16c but
 //                   different file format
 
-void setup_sis100_hadron_MAR23()
+void setup_sis100_hadron()
 {
 
   // -----  Geometry Tags  --------------------------------------------------
diff --git a/setup/setup_sis100_muon_jpsi_FEB23.C b/setup/setup_sis100_muon_jpsi.C
similarity index 98%
rename from setup/setup_sis100_muon_jpsi_FEB23.C
rename to setup/setup_sis100_muon_jpsi.C
index 0eabacd4a8fb914212f24f1f2f2918b3164de8df..7555caeb6de63ada6ddb1bc0c839b5a0f6944b64 100644
--- a/setup/setup_sis100_muon_jpsi_FEB23.C
+++ b/setup/setup_sis100_muon_jpsi.C
@@ -36,7 +36,7 @@
 // 2013-11-04 - VF - make STS v15b the new default
 
 
-void setup_sis100_muon_jpsi_MAR23()
+void setup_sis100_muon_jpsi()
 {
 
   // -----  Geometry Tags  --------------------------------------------------
diff --git a/setup/setup_sis100_muon_lmvm_FEB23.C b/setup/setup_sis100_muon_lmvm.C
similarity index 98%
rename from setup/setup_sis100_muon_lmvm_FEB23.C
rename to setup/setup_sis100_muon_lmvm.C
index c8ba3a9288a029e0605263480d63a956873865f1..1b48ab0ab597b44300ba3b5827ef90fe0c941c55 100644
--- a/setup/setup_sis100_muon_lmvm_FEB23.C
+++ b/setup/setup_sis100_muon_lmvm.C
@@ -32,7 +32,7 @@
 // 2014-06-25 - DE - define digi files through tags for STS, TRD and TOF
 
 
-void setup_sis100_muon_lmvm_MAR23()
+void setup_sis100_muon_lmvm()
 {
 
   // -----  Geometry Tags  --------------------------------------------------