diff --git a/benchmarks/clustering/full_cal_clusters.sh b/benchmarks/clustering/full_cal_clusters.sh
index 6818e9d1ebd4d043112bed3c3deccf07c4fb2e36..07b0efd2a13da4086ec6f3b526b12973387f7d25 100644
--- a/benchmarks/clustering/full_cal_clusters.sh
+++ b/benchmarks/clustering/full_cal_clusters.sh
@@ -75,7 +75,7 @@ if [[ ! -n "${DETECTOR_PATH}" ]] ; then
   export DETECTOR_PATH=${DETECTOR_PATH}
 fi
 
-compact_path=${DETECTOR_PATH}/${JUGGLER_DETECTOR}.xml
+compact_path=${DETECTOR_PATH}/${JUGGLER_DETECTOR_CONFIG}.xml
 export JUGGLER_FILE_NAME_TAG="${nametag}"
 export JUGGLER_GEN_FILE="gen_${JUGGLER_FILE_NAME_TAG}.hepmc"
 
diff --git a/benchmarks/clustering/options/full_cal_reco.py b/benchmarks/clustering/options/full_cal_reco.py
index 5565c40b4c8b384e5f22fbb92b64d4ff55750664..99370ba90a8d1d23878e152cc8a11dd8a0af400e 100644
--- a/benchmarks/clustering/options/full_cal_reco.py
+++ b/benchmarks/clustering/options/full_cal_reco.py
@@ -9,8 +9,8 @@ import ROOT
 from Configurables import ApplicationMgr, EICDataSvc, PodioInput, PodioOutput, GeoSvc
 from GaudiKernel.SystemOfUnits import MeV, GeV, mm, cm, mrad
 
-detector_name = str(os.environ.get("JUGGLER_DETECTOR", "athena"))
-detector_version = str(os.environ.get("JUGGLER_DETECTOR", "master"))
+detector_name = str(os.environ.get("JUGGLER_DETECTOR_CONFIG", "athena"))
+detector_version = str(os.environ.get("JUGGLER_DETECTOR_VERSION", "master"))
 
 detector_path = str(os.environ.get("DETECTOR_PATH", "."))
 compact_path = os.path.join(detector_path, detector_name)
diff --git a/benchmarks/ecal/options/barrel.py b/benchmarks/ecal/options/barrel.py
index 41977b818ab18fb61b07618e61f8d4b5af58e94e..18d34a5144aad815764376fa70374fd5bcf8b783 100644
--- a/benchmarks/ecal/options/barrel.py
+++ b/benchmarks/ecal/options/barrel.py
@@ -9,7 +9,7 @@ import ROOT
 from Configurables import ApplicationMgr, EICDataSvc, PodioInput, PodioOutput, GeoSvc
 from GaudiKernel.SystemOfUnits import MeV, GeV, mm, cm, mrad
 
-detector_name = str(os.environ.get("JUGGLER_DETECTOR", "athena"))
+detector_name = str(os.environ.get("JUGGLER_DETECTOR_CONFIG", "athena"))
 detector_path = str(os.environ.get("DETECTOR_PATH", "."))
 compact_path = str(os.environ.get("JUGGLER_COMPACT_PATH", "{}.xml".format(os.path.join(detector_path, detector_name))))
 
diff --git a/benchmarks/ecal/options/endcap_e.py b/benchmarks/ecal/options/endcap_e.py
index 5a6b997eca51166f5eb753673587079f09de655a..28df778f182e4f13bbcd2dd7d613b16c736bb5c6 100644
--- a/benchmarks/ecal/options/endcap_e.py
+++ b/benchmarks/ecal/options/endcap_e.py
@@ -8,7 +8,7 @@ import ROOT
 from Configurables import ApplicationMgr, EICDataSvc, PodioInput, PodioOutput, GeoSvc
 from GaudiKernel.SystemOfUnits import MeV, GeV, mm, cm, mrad
 
-detector_name = str(os.environ.get("JUGGLER_DETECTOR", "athena"))
+detector_name = str(os.environ.get("JUGGLER_DETECTOR_CONFIG", "athena"))
 detector_path = str(os.environ.get("DETECTOR_PATH", "."))
 compact_path = str(os.environ.get("JUGGLER_COMPACT_PATH", "{}.xml".format(os.path.join(detector_path, detector_name))))
 
diff --git a/benchmarks/ecal/options/endcap_i.py b/benchmarks/ecal/options/endcap_i.py
index b1baf62fadc4812f83536b8a76425c38c8472464..d7730acf35faf23d1d94672e033d2456a426cc95 100644
--- a/benchmarks/ecal/options/endcap_i.py
+++ b/benchmarks/ecal/options/endcap_i.py
@@ -9,7 +9,7 @@ import ROOT
 from Configurables import ApplicationMgr, EICDataSvc, PodioInput, PodioOutput, GeoSvc
 from GaudiKernel.SystemOfUnits import MeV, GeV, mm, cm, mrad
 
-detector_name = str(os.environ.get("JUGGLER_DETECTOR", "athena"))
+detector_name = str(os.environ.get("JUGGLER_DETECTOR_CONFIG", "athena"))
 detector_path = str(os.environ.get("DETECTOR_PATH", "."))
 compact_path = str(os.environ.get("JUGGLER_COMPACT_PATH", "{}.xml".format(os.path.join(detector_path, detector_name))))
 ci_ecal_sf = float(os.environ.get("CI_ECAL_SAMP_FRAC", 0.253))
diff --git a/benchmarks/ecal/run_emcal_benchmarks.py b/benchmarks/ecal/run_emcal_benchmarks.py
index e44c455d9627f23bef0e52e3b87760e1023295b5..f22ff9e77931e3343154ce71fbcc513e2ce17b34 100755
--- a/benchmarks/ecal/run_emcal_benchmarks.py
+++ b/benchmarks/ecal/run_emcal_benchmarks.py
@@ -32,7 +32,7 @@ default_type = {
 }
 
 default_compact = os.path.join(os.environ.get('DETECTOR_PATH',  os.environ.get('DETECTOR_PATH', '')),
-        '{}.xml'.format(os.environ.get('JUGGLER_DETECTOR', '')))
+        '{}.xml'.format(os.environ.get('JUGGLER_DETECTOR_CONFIG', '')))
 parser = argparse.ArgumentParser()
 parser.add_argument('run_type', help='Run type, support {}'.format(list(default_type.keys())))
 parser.add_argument('-n', '--numberOfEvents', dest='nev', type=int, default=100, help='Number of events to process.')
diff --git a/benchmarks/far_forward/far_forward_protons.sh b/benchmarks/far_forward/far_forward_protons.sh
index 8b6bf299f720646736c2fc1514a1251964b2922b..d589f990469d5d3ffd0684497cef0d00c2441801 100644
--- a/benchmarks/far_forward/far_forward_protons.sh
+++ b/benchmarks/far_forward/far_forward_protons.sh
@@ -83,7 +83,7 @@ then
     --filter.tracker edep0 \
     -v WARNING \
     --numberOfEvents ${JUGGLER_N_EVENTS} \
-    --compactFile ${DETECTOR_PATH}/${JUGGLER_DETECTOR}.xml \
+    --compactFile ${DETECTOR_PATH}/${JUGGLER_DETECTOR_CONFIG}.xml \
     --inputFiles  ${JUGGLER_FILE_NAME_TAG}.hepmc \
     --outputFile  ${JUGGLER_SIM_FILE}
   if [[ "$?" -ne "0" ]] ; then
diff --git a/benchmarks/far_forward/options/far_forward_reconstruction.py b/benchmarks/far_forward/options/far_forward_reconstruction.py
index 7aef3b7dccc184e5d8d9e429fa607b75e4bf56c8..363f61d8ff950ae8a612e5ce2418c954541b0b93 100644
--- a/benchmarks/far_forward/options/far_forward_reconstruction.py
+++ b/benchmarks/far_forward/options/far_forward_reconstruction.py
@@ -3,7 +3,7 @@ from Gaudi.Configuration import *
 from Configurables import ApplicationMgr, EICDataSvc, PodioOutput, GeoSvc
 from GaudiKernel.SystemOfUnits import MeV, GeV, mm, cm, mrad
 
-detector_name = str(os.environ.get("JUGGLER_DETECTOR", "athena"))
+detector_name = str(os.environ.get("JUGGLER_DETECTOR_CONFIG", "athena"))
 detector_path = str(os.environ.get("DETECTOR_PATH", "."))
 compact_path = str(os.environ.get("JUGGLER_COMPACT_PATH", "{}.xml".format(os.path.join(detector_path, detector_name))))
 
diff --git a/benchmarks/far_forward/run_zdc_neutrons.sh b/benchmarks/far_forward/run_zdc_neutrons.sh
index 9c54b656ae42d5bf6570071781338721f54086e8..13b3d6ad1fbe1e2993154154fd953cc2bd0e3ab1 100644
--- a/benchmarks/far_forward/run_zdc_neutrons.sh
+++ b/benchmarks/far_forward/run_zdc_neutrons.sh
@@ -67,7 +67,7 @@ if [[ ! -n "${ZDC_SCI_SAMP_FRAC}" ]] ; then
   export ZDC_PbSCI_SAMP_FRAC=1.0
 fi
 
-export DETECTOR_COMPACT_PATH=${DETECTOR_PATH}/${JUGGLER_DETECTOR}.xml
+export DETECTOR_COMPACT_PATH=${DETECTOR_PATH}/${JUGGLER_DETECTOR_CONFIG}.xml
 
 export JUGGLER_FILE_NAME_TAG="zdc_neutrons"
 export JUGGLER_GEN_FILE="${JUGGLER_FILE_NAME_TAG}.hepmc"
@@ -93,7 +93,7 @@ then
     --filter.tracker edep0 \
     -v WARNING \
     --numberOfEvents ${JUGGLER_N_EVENTS} \
-    --compactFile ${DETECTOR_PATH}/${JUGGLER_DETECTOR}.xml \
+    --compactFile ${DETECTOR_PATH}/${JUGGLER_DETECTOR_CONFIG}.xml \
     --inputFiles  ${JUGGLER_FILE_NAME_TAG}.hepmc \
     --outputFile  ${JUGGLER_SIM_FILE}
   if [[ "$?" -ne "0" ]] ; then
diff --git a/benchmarks/far_forward/run_zdc_photons.sh b/benchmarks/far_forward/run_zdc_photons.sh
index ef22e2ab5d1324de7aee4450c8506a23753e1cc1..9f2d2e20126848ba2eceb3fc6766db77d925839a 100644
--- a/benchmarks/far_forward/run_zdc_photons.sh
+++ b/benchmarks/far_forward/run_zdc_photons.sh
@@ -67,7 +67,7 @@ if [[ ! -n "${ZDC_SCI_SAMP_FRAC}" ]] ; then
   export ZDC_PbSCI_SAMP_FRAC=1.0
 fi
 
-export DETECTOR_COMPACT_PATH=${DETECTOR_PATH}/${JUGGLER_DETECTOR}.xml
+export DETECTOR_COMPACT_PATH=${DETECTOR_PATH}/${JUGGLER_DETECTOR_CONFIG}.xml
 
 export JUGGLER_FILE_NAME_TAG="zdc_photons"
 export JUGGLER_GEN_FILE="${JUGGLER_FILE_NAME_TAG}.hepmc"
@@ -93,7 +93,7 @@ then
     --filter.tracker edep0 \
     -v WARNING \
     --numberOfEvents ${JUGGLER_N_EVENTS} \
-    --compactFile ${DETECTOR_PATH}/${JUGGLER_DETECTOR}.xml \
+    --compactFile ${DETECTOR_PATH}/${JUGGLER_DETECTOR_CONFIG}.xml \
     --inputFiles  ${JUGGLER_FILE_NAME_TAG}.hepmc \
     --outputFile  ${JUGGLER_SIM_FILE}
   if [[ "$?" -ne "0" ]] ; then
diff --git a/benchmarks/imaging_ecal/analysis/emcal_barrel_pion_rejection_analysis.cxx b/benchmarks/imaging_ecal/analysis/emcal_barrel_pion_rejection_analysis.cxx
index 042655bc0ed677e29651c7c6e8407150e5a3c734..af988b9bd5982690c2a40a3f55fe3e6d3bfcccbc 100644
--- a/benchmarks/imaging_ecal/analysis/emcal_barrel_pion_rejection_analysis.cxx
+++ b/benchmarks/imaging_ecal/analysis/emcal_barrel_pion_rejection_analysis.cxx
@@ -95,8 +95,8 @@ void emcal_barrel_pion_rejection_analysis(
   if(std::getenv("DETECTOR_PATH")) {
     detector_path = std::getenv("DETECTOR_PATH");
   }
-  if(std::getenv("JUGGLER_DETECTOR")) {
-    detector_name = std::getenv("JUGGLER_DETECTOR");
+  if(std::getenv("JUGGLER_DETECTOR_CONFIG")) {
+    detector_name = std::getenv("JUGGLER_DETECTOR_CONFIG");
   }
 
   // MCParticles Functions/////////////////////////////////////////////////////////////////////////////////////
diff --git a/benchmarks/imaging_ecal/run_emcal_barrel.sh b/benchmarks/imaging_ecal/run_emcal_barrel.sh
index 96559e6b8312f04edd484653b2055094d2386772..b5126af002f2392e713e7051d6a3d8f29975835e 100644
--- a/benchmarks/imaging_ecal/run_emcal_barrel.sh
+++ b/benchmarks/imaging_ecal/run_emcal_barrel.sh
@@ -47,7 +47,7 @@ do
 done
 set -- "${POSITIONAL[@]}" # restore positional parameters
 
-export CB_EMCAL_COMPACT_PATH=${DETECTOR_PATH}/${JUGGLER_DETECTOR}.xml
+export CB_EMCAL_COMPACT_PATH=${DETECTOR_PATH}/${JUGGLER_DETECTOR_CONFIG}.xml
 
 if [[ ! -n  "${CB_EMCAL_NUMEV}" ]] ; then
   export CB_EMCAL_NUMEV=1000
diff --git a/benchmarks/imaging_ecal/run_emcal_barrel_pion_rej.sh b/benchmarks/imaging_ecal/run_emcal_barrel_pion_rej.sh
index 4db6fdf29f3e8cc6d30d801238c65898647a624c..d2c22c3f9c25de4378c00f35e2f2244c2431f2e0 100755
--- a/benchmarks/imaging_ecal/run_emcal_barrel_pion_rej.sh
+++ b/benchmarks/imaging_ecal/run_emcal_barrel_pion_rej.sh
@@ -47,7 +47,7 @@ do
 done
 set -- "${POSITIONAL[@]}" # restore positional parameters
 
-export CB_EMCAL_COMPACT_PATH=${DETECTOR_PATH}/${JUGGLER_DETECTOR}.xml
+export CB_EMCAL_COMPACT_PATH=${DETECTOR_PATH}/${JUGGLER_DETECTOR_CONFIG}.xml
 
 if [[ ! -n  "${CB_EMCAL_NUMEV}" ]] ; then
   export CB_EMCAL_NUMEV=1000
diff --git a/benchmarks/imaging_ecal/run_imcal_pion0.sh b/benchmarks/imaging_ecal/run_imcal_pion0.sh
index 2866daea64d7f9b19b3ccab52cdcda4ff48f229a..d4396e007b0d5ee2d2b4fd11eeb7aebbee9badf2 100644
--- a/benchmarks/imaging_ecal/run_imcal_pion0.sh
+++ b/benchmarks/imaging_ecal/run_imcal_pion0.sh
@@ -47,7 +47,7 @@ do
 done
 set -- "${POSITIONAL[@]}" # restore positional parameters
 
-export CB_EMCAL_COMPACT_PATH=${DETECTOR_PATH}/${JUGGLER_DETECTOR}.xml
+export CB_EMCAL_COMPACT_PATH=${DETECTOR_PATH}/${JUGGLER_DETECTOR_CONFIG}.xml
 
 if [[ ! -n  "${CB_EMCAL_NUMEV}" ]] ; then
   export CB_EMCAL_NUMEV=1000
diff --git a/benchmarks/imaging_shower_ML/sim_rec_tag.py b/benchmarks/imaging_shower_ML/sim_rec_tag.py
index debc82cc446dc043bd9e22906519ee058e0d1669..bc767fdafe40f84ef78d149fbb395d5376d4aa04 100755
--- a/benchmarks/imaging_shower_ML/sim_rec_tag.py
+++ b/benchmarks/imaging_shower_ML/sim_rec_tag.py
@@ -12,7 +12,7 @@ import argparse
 
 
 default_compact = os.path.join(os.environ.get('DETECTOR_PATH',  os.environ.get('DETECTOR_PATH', '')),
-        '{}.xml'.format(os.environ.get('JUGGLER_DETECTOR', '')))
+        '{}.xml'.format(os.environ.get('JUGGLER_DETECTOR_CONFIG', '')))
 parser = argparse.ArgumentParser()
 parser.add_argument('-n', '--numberOfEvents', dest='nev', type=int, default=100, help='Number of events to process.')
 parser.add_argument('-t', '--nametag', type=str, default='IMCAL_ML', help='Name tag for output files.')
diff --git a/benchmarks/rich/forward_hadrons.sh b/benchmarks/rich/forward_hadrons.sh
index 08de28e9b2fede48ade6196228c21c5f3a4d6338..f91d985cb24705ab72f87e24d1706dabf44f2b3d 100644
--- a/benchmarks/rich/forward_hadrons.sh
+++ b/benchmarks/rich/forward_hadrons.sh
@@ -45,7 +45,7 @@ fi
 # This script appears to be missing
 ## run geant4 simulations
 #python benchmakrs/options/ForwardRICH/simu.py \
-#       --compact=${DETECTOR_PATH}/${JUGGLER_DETECTOR}.xml \
+#       --compact=${DETECTOR_PATH}/${JUGGLER_DETECTOR_CONFIG}.xml \
 #       -i ${JUGGLER_FILE_NAME_TAG}.hepmc \
 #       -o ${JUGGLER_SIM_FILE}
 #       -n ${JUGGLER_N_EVENTS}
@@ -63,7 +63,7 @@ ddsim --runType batch \
       --filter.tracker edep0 \
       -v WARNING \
       --numberOfEvents ${JUGGLER_N_EVENTS} \
-      --compactFile ${DETECTOR_PATH}/${JUGGLER_DETECTOR}.xml \
+      --compactFile ${DETECTOR_PATH}/${JUGGLER_DETECTOR_CONFIG}.xml \
       --inputFiles  ${JUGGLER_FILE_NAME_TAG}.hepmc \
       --outputFile  ${JUGGLER_SIM_FILE}
 if [[ "$?" -ne "0" ]] ; then
diff --git a/benchmarks/rich/options/rich_reco.py b/benchmarks/rich/options/rich_reco.py
index d851004c79a071ce92ccbc25b441cff62d600eaf..39a989e304785ff2f17ecd637cbf823d632ba81b 100644
--- a/benchmarks/rich/options/rich_reco.py
+++ b/benchmarks/rich/options/rich_reco.py
@@ -4,8 +4,8 @@ from GaudiKernel import SystemOfUnits as units
 from Configurables import ApplicationMgr, EICDataSvc, PodioOutput, GeoSvc
 
 detector_name = "topside"
-if "JUGGLER_DETECTOR" in os.environ :
-  detector_name = str(os.environ["JUGGLER_DETECTOR"])
+if "JUGGLER_DETECTOR_CONFIG" in os.environ :
+  detector_name = str(os.environ["JUGGLER_DETECTOR_CONFIG"])
 if "DETECTOR_PATH" in os.environ :
   detector_name = str(os.environ["DETECTOR_PATH"])+"/"+detector_name
 
diff --git a/benchmarks/track_finding/multiple_tracks.sh b/benchmarks/track_finding/multiple_tracks.sh
index 914df3b10520be18edca90eed4de499409bd854f..e1ac8756218bcd810f62fecb4120a1c2ba26e09e 100644
--- a/benchmarks/track_finding/multiple_tracks.sh
+++ b/benchmarks/track_finding/multiple_tracks.sh
@@ -68,7 +68,7 @@ ddsim --runType batch \
   --filter.tracker edep0 \
   -v WARNING \
   --numberOfEvents ${JUGGLER_N_EVENTS} \
-  --compactFile ${DETECTOR_PATH}/${JUGGLER_DETECTOR}.xml \
+  --compactFile ${DETECTOR_PATH}/${JUGGLER_DETECTOR_CONFIG}.xml \
   --inputFiles  ${JUGGLER_FILE_NAME_TAG}.hepmc \
   --outputFile  ${JUGGLER_SIM_FILE}
 if [[ "$?" -ne "0" ]] ; then
diff --git a/benchmarks/track_finding/options/track_reconstruction.py b/benchmarks/track_finding/options/track_reconstruction.py
index 88a34c61b65b40584dac61d008c87a86c7dc6634..40091d0e866ba9dd5e9beef0e54f949663ff1f11 100644
--- a/benchmarks/track_finding/options/track_reconstruction.py
+++ b/benchmarks/track_finding/options/track_reconstruction.py
@@ -4,8 +4,8 @@ from Configurables import ApplicationMgr, EICDataSvc, PodioOutput, GeoSvc
 from GaudiKernel import SystemOfUnits as units
 
 detector_name = "topside"
-if "JUGGLER_DETECTOR" in os.environ :
-    detector_name = str(os.environ["JUGGLER_DETECTOR"])
+if "JUGGLER_DETECTOR_CONFIG" in os.environ :
+    detector_name = str(os.environ["JUGGLER_DETECTOR_CONFIG"])
 
 detector_path = ""
 if "DETECTOR_PATH" in os.environ :
diff --git a/benchmarks/track_fitting/options/track_reconstruction.py b/benchmarks/track_fitting/options/track_reconstruction.py
index 885aa2741a7781ad3bc79a1e574073226f005d38..a0716fc49c79b5a6b924e7c661f3bcd4be72a299 100644
--- a/benchmarks/track_fitting/options/track_reconstruction.py
+++ b/benchmarks/track_fitting/options/track_reconstruction.py
@@ -4,8 +4,8 @@ from Configurables import ApplicationMgr, EICDataSvc, PodioOutput, GeoSvc
 from GaudiKernel import SystemOfUnits as units
 
 detector_name = "athena"
-if "JUGGLER_DETECTOR" in os.environ :
-    detector_name = str(os.environ["JUGGLER_DETECTOR"])
+if "JUGGLER_DETECTOR_CONFIG" in os.environ :
+    detector_name = str(os.environ["JUGGLER_DETECTOR_CONFIG"])
 
 detector_path = ""
 if "DETECTOR_PATH" in os.environ :
diff --git a/benchmarks/track_fitting/single_tracks.sh b/benchmarks/track_fitting/single_tracks.sh
index 19d166fa1661b4fec48031036d1e8a98e9d19791..7d00f7393c860e0dc7504cd092bcf909cda16413 100644
--- a/benchmarks/track_fitting/single_tracks.sh
+++ b/benchmarks/track_fitting/single_tracks.sh
@@ -71,7 +71,7 @@ ddsim --runType batch \
   --filter.tracker edep0 \
   -v WARNING \
   --numberOfEvents ${JUGGLER_N_EVENTS} \
-  --compactFile ${DETECTOR_PATH}/${JUGGLER_DETECTOR}.xml \
+  --compactFile ${DETECTOR_PATH}/${JUGGLER_DETECTOR_CONFIG}.xml \
   --inputFiles  ${JUGGLER_FILE_NAME_TAG}.hepmc \
   --outputFile  ${JUGGLER_SIM_FILE}
 if [[ "$?" -ne "0" ]] ; then
diff --git a/benchmarks/tracking/central_electrons.sh b/benchmarks/tracking/central_electrons.sh
index 85065831e3fd30c4b549ccb05ac1fe2be2433ecf..ecb92768a42cc89c0948789101c808f8c12249e3 100644
--- a/benchmarks/tracking/central_electrons.sh
+++ b/benchmarks/tracking/central_electrons.sh
@@ -84,7 +84,7 @@ then
     --filter.tracker edep0 \
     -v WARNING \
     --numberOfEvents ${JUGGLER_N_EVENTS} \
-    --compactFile ${DETECTOR_PATH}/${JUGGLER_DETECTOR}.xml \
+    --compactFile ${DETECTOR_PATH}/${JUGGLER_DETECTOR_CONFIG}.xml \
     --inputFiles  ${JUGGLER_FILE_NAME_TAG}.hepmc \
     --outputFile  ${JUGGLER_SIM_FILE}
   if [[ "$?" -ne "0" ]] ; then
diff --git a/benchmarks/tracking/central_pions.sh b/benchmarks/tracking/central_pions.sh
index 1081f4fc9b87378eefb8c606755c90486dccca4f..f0d21710e4ea14bada8338285c44838d55723c2e 100644
--- a/benchmarks/tracking/central_pions.sh
+++ b/benchmarks/tracking/central_pions.sh
@@ -83,7 +83,7 @@ then
     --filter.tracker edep0 \
     -v WARNING \
     --numberOfEvents ${JUGGLER_N_EVENTS} \
-    --compactFile ${DETECTOR_PATH}/${JUGGLER_DETECTOR}.xml \
+    --compactFile ${DETECTOR_PATH}/${JUGGLER_DETECTOR_CONFIG}.xml \
     --inputFiles  ${JUGGLER_FILE_NAME_TAG}.hepmc \
     --outputFile  ${JUGGLER_SIM_FILE}
   if [[ "$?" -ne "0" ]] ; then
diff --git a/benchmarks/tracking/multiple_tracks.sh b/benchmarks/tracking/multiple_tracks.sh
index b9aea549ccbd1e855236a0ee7ea8606d64d0b7d0..7173546371121b23eba102e21d08e72ae79e958b 100644
--- a/benchmarks/tracking/multiple_tracks.sh
+++ b/benchmarks/tracking/multiple_tracks.sh
@@ -84,7 +84,7 @@ then
     --filter.tracker edep0 \
     -v WARNING \
     --numberOfEvents ${JUGGLER_N_EVENTS} \
-    --compactFile ${DETECTOR_PATH}/${JUGGLER_DETECTOR}.xml \
+    --compactFile ${DETECTOR_PATH}/${JUGGLER_DETECTOR_CONFIG}.xml \
     --inputFiles  ${JUGGLER_FILE_NAME_TAG}.hepmc \
     --outputFile  ${JUGGLER_SIM_FILE}
   if [[ "$?" -ne "0" ]] ; then
diff --git a/benchmarks/tracking/options/track_reconstruction.py b/benchmarks/tracking/options/track_reconstruction.py
index 729021d2bf8086042d980efd1ff1709a0f372d44..491d130a85d4c2c0c8d94df1aeeb6dcc7fe22e79 100644
--- a/benchmarks/tracking/options/track_reconstruction.py
+++ b/benchmarks/tracking/options/track_reconstruction.py
@@ -4,8 +4,8 @@ from Configurables import ApplicationMgr, EICDataSvc, PodioOutput, GeoSvc
 from GaudiKernel import SystemOfUnits as units
 
 detector_name = "topside"
-if "JUGGLER_DETECTOR" in os.environ :
-    detector_name = str(os.environ["JUGGLER_DETECTOR"])
+if "JUGGLER_DETECTOR_CONFIG" in os.environ :
+    detector_name = str(os.environ["JUGGLER_DETECTOR_CONFIG"])
 
 detector_path = ""
 if "DETECTOR_PATH" in os.environ :
diff --git a/benchmarks/tracking/run_tracking_benchmarks.py b/benchmarks/tracking/run_tracking_benchmarks.py
index d4660c5e205650280133b3a9818042e81e184e49..9deaec953b76b8f2cd4dfef6dafa71d70721b3f2 100755
--- a/benchmarks/tracking/run_tracking_benchmarks.py
+++ b/benchmarks/tracking/run_tracking_benchmarks.py
@@ -13,7 +13,7 @@ import argparse
 
 default_compact = os.path.join(
         os.environ.get('JUGGLER_DETECTOR_PATH',  os.environ.get('DETECTOR_PATH', '')),
-        '{}.xml'.format(os.environ.get('JUGGLER_DETECTOR', '')))
+        '{}.xml'.format(os.environ.get('JUGGLER_DETECTOR_CONFIG', '')))
 
 parser = argparse.ArgumentParser()
 parser.add_argument('-n', '--numberOfEvents', dest='nev', type=int, default=100, help='Number of events to process.')