diff --git a/README.md b/README.md
index 91de2697c3da8cf7245dff5d282440611f5302aa..ec3ff4cf3be267c8f9bc021ec0dbdf5f080668ff 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@ Here we setup to use our local build of the `juggler` library.
 First set some environment variables.
 ```
 export JUGGLER_INSTALL_PREFIX=/usr/local
-export JUGGLER_DETECTOR=athena   # athena is the default
+export DETECTOR=epic             # epic is the default
 export BEAMLINE_CONFIG=ip6       # ip6 is the default
 ```
 
diff --git a/benchmarks/clustering/full_cal_clusters.sh b/benchmarks/clustering/full_cal_clusters.sh
index 07b0efd2a13da4086ec6f3b526b12973387f7d25..2feb65ae30e8907a2e7b72eefe20c94f8d05ab99 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_CONFIG}.xml
+compact_path=${DETECTOR_PATH}/${DETECTOR_CONFIG}.xml
 export JUGGLER_FILE_NAME_TAG="${nametag}"
 export JUGGLER_GEN_FILE="gen_${JUGGLER_FILE_NAME_TAG}.hepmc"
 
@@ -85,7 +85,7 @@ export JUGGLER_REC_FILE="rec_${JUGGLER_FILE_NAME_TAG}.root"
 
 echo "JUGGLER_N_EVENTS = ${JUGGLER_N_EVENTS}"
 echo "DETECTOR_PATH = ${DETECTOR_PATH}"
-echo "JUGGLER_DETECTOR = ${JUGGLER_DETECTOR}"
+echo "DETECTOR = ${DETECTOR}"
 
 # Generate the input events
 python benchmarks/imaging_ecal/scripts/gen_particles.py ${JUGGLER_GEN_FILE} -n ${JUGGLER_N_EVENTS}\
diff --git a/benchmarks/clustering/options/full_cal_reco.py b/benchmarks/clustering/options/full_cal_reco.py
index e2d29aedcf943b8d2b724a63cf9c0b3696265974..f933359c7d5659e7e6bf100651373e86d3bf905b 100644
--- a/benchmarks/clustering/options/full_cal_reco.py
+++ b/benchmarks/clustering/options/full_cal_reco.py
@@ -9,9 +9,9 @@ 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_config = str(os.environ.get("JUGGLER_DETECTOR_CONFIG", detector_name))
-detector_version = str(os.environ.get("JUGGLER_DETECTOR_VERSION", "master"))
+detector_name = str(os.environ.get("DETECTOR", "athena"))
+detector_config = str(os.environ.get("DETECTOR_CONFIG", detector_name))
+detector_version = str(os.environ.get("DETECTOR_VERSION", "master"))
 
 detector_path = str(os.environ.get("DETECTOR_PATH", "."))
 compact_path = os.path.join(detector_path, detector_config)
diff --git a/benchmarks/ecal/options/barrel.py b/benchmarks/ecal/options/barrel.py
index 149dfb6d64ef568d3db5c2f9acf1bfebd82cb2fa..1ed18456b6f206c574adb2c3113def77f61a5668 100644
--- a/benchmarks/ecal/options/barrel.py
+++ b/benchmarks/ecal/options/barrel.py
@@ -9,9 +9,9 @@ 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_config = str(os.environ.get("JUGGLER_DETECTOR_CONFIG", detector_name))
-detector_version = str(os.environ.get("JUGGLER_DETECTOR_VERSION", "master"))
+detector_name = str(os.environ.get("DETECTOR", "athena"))
+detector_config = str(os.environ.get("DETECTOR_CONFIG", detector_name))
+detector_version = str(os.environ.get("DETECTOR_VERSION", "master"))
 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 28df778f182e4f13bbcd2dd7d613b16c736bb5c6..1aab4beb31148fd38aad8c137521ca19d9910199 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_CONFIG", "athena"))
+detector_name = str(os.environ.get("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 d7730acf35faf23d1d94672e033d2456a426cc95..63469090af29fabdb9e0eaa5b94e33e55f854e8d 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_CONFIG", "athena"))
+detector_name = str(os.environ.get("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 f22ff9e77931e3343154ce71fbcc513e2ce17b34..24a277f5d701caf6f5cf93ec239387a27b5eb533 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_CONFIG', '')))
+        '{}.xml'.format(os.environ.get('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 d589f990469d5d3ffd0684497cef0d00c2441801..acd693d6f5c185be21e3325526fc0f5f45a04599 100644
--- a/benchmarks/far_forward/far_forward_protons.sh
+++ b/benchmarks/far_forward/far_forward_protons.sh
@@ -43,8 +43,8 @@ print_env.sh
 
 ## To run the reconstruction, we need the following global variables:
 ## - JUGGLER_INSTALL_PREFIX:   Install prefix for Juggler (simu/recon)
-## - JUGGLER_DETECTOR:         the detector package we want to use for this benchmark
-## - JUGGLER_DETECTOR_VERSION: the detector package we want to use for this benchmark
+## - DETECTOR:         the detector package we want to use for this benchmark
+## - DETECTOR_VERSION: the detector package we want to use for this benchmark
 ## - DETECTOR_PATH:            full path to the detector definitions
 ##
 ## You can ready options/env.sh for more in-depth explanations of the variables
@@ -63,7 +63,7 @@ export JUGGLER_SIM_FILE="sim_${JUGGLER_FILE_NAME_TAG}.edm4hep.root"
 export JUGGLER_REC_FILE="rec_${JUGGLER_FILE_NAME_TAG}.root"
 
 echo "JUGGLER_N_EVENTS = ${JUGGLER_N_EVENTS}"
-echo "JUGGLER_DETECTOR = ${JUGGLER_DETECTOR}"
+echo "DETECTOR = ${DETECTOR}"
 
 
 if [[ -z "${REC_ONLY}" && -z "${ANALYSIS_ONLY}" ]] ;
@@ -83,7 +83,7 @@ then
     --filter.tracker edep0 \
     -v WARNING \
     --numberOfEvents ${JUGGLER_N_EVENTS} \
-    --compactFile ${DETECTOR_PATH}/${JUGGLER_DETECTOR_CONFIG}.xml \
+    --compactFile ${DETECTOR_PATH}/${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 363f61d8ff950ae8a612e5ce2418c954541b0b93..9b52a4fd978c25a1866a09af2d22b228748c26a9 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_CONFIG", "athena"))
+detector_name = str(os.environ.get("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.sh b/benchmarks/far_forward/run_zdc.sh
index 816319e37ce033b991e7d138d9647e64a93f3dce..e9dc1666800a0b8d9d49dcc0e8aabac8b14151ca 100644
--- a/benchmarks/far_forward/run_zdc.sh
+++ b/benchmarks/far_forward/run_zdc.sh
@@ -50,8 +50,8 @@ print_env.sh
 
 ## To run the reconstruction, we need the following global variables:
 ## - JUGGLER_INSTALL_PREFIX:   Install prefix for Juggler (simu/recon)
-## - JUGGLER_DETECTOR:         the detector package we want to use for this benchmark
-## - JUGGLER_DETECTOR_VERSION: the detector package we want to use for this benchmark
+## - DETECTOR:         the detector package we want to use for this benchmark
+## - DETECTOR_VERSION: the detector package we want to use for this benchmark
 ## - DETECTOR_PATH:            full path to the detector definitions
 ##
 ## You can ready options/env.sh for more in-depth explanations of the variables
@@ -74,7 +74,7 @@ if [[ ! -n "${ZDC_SCI_SAMP_FRAC}" ]] ; then
   export ZDC_PbSCI_SAMP_FRAC=1.0
 fi
 
-export DETECTOR_COMPACT_PATH=${DETECTOR_PATH}/${JUGGLER_DETECTOR_CONFIG}.xml
+export DETECTOR_COMPACT_PATH=${DETECTOR_PATH}/${DETECTOR_CONFIG}.xml
 
 export JUGGLER_FILE_NAME_TAG="zdc_${PARTICLE}"
 export JUGGLER_GEN_FILE="${JUGGLER_FILE_NAME_TAG}.hepmc"
@@ -86,7 +86,7 @@ export RESULTS_PATH="results/far_forward/zdc/${PARTICLE}"
 mkdir -p ${RESULTS_PATH}
 
 echo "JUGGLER_N_EVENTS = ${JUGGLER_N_EVENTS}"
-echo "JUGGLER_DETECTOR = ${JUGGLER_DETECTOR}"
+echo "DETECTOR = ${DETECTOR}"
 
 if [[ -z "${REC_ONLY}" && -z "${ANALYSIS_ONLY}" ]] ;
 then
@@ -103,7 +103,7 @@ then
     --filter.tracker edep0 \
     -v WARNING \
     --numberOfEvents ${JUGGLER_N_EVENTS} \
-    --compactFile ${DETECTOR_PATH}/${JUGGLER_DETECTOR_CONFIG}.xml \
+    --compactFile ${DETECTOR_PATH}/${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 af988b9bd5982690c2a40a3f55fe3e6d3bfcccbc..584cb99d1634d84578f1e2e62fb2583704a5c0a1 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_CONFIG")) {
-    detector_name = std::getenv("JUGGLER_DETECTOR_CONFIG");
+  if(std::getenv("DETECTOR_CONFIG")) {
+    detector_name = std::getenv("DETECTOR_CONFIG");
   }
 
   // MCParticles Functions/////////////////////////////////////////////////////////////////////////////////////
diff --git a/benchmarks/imaging_ecal/config.yml b/benchmarks/imaging_ecal/config.yml
index 1688f2e6ff748f9d25be1b4a45aa79b633837824..02930ac5ec71a83e36592e4c26d9111a7e86d4f3 100644
--- a/benchmarks/imaging_ecal/config.yml
+++ b/benchmarks/imaging_ecal/config.yml
@@ -45,7 +45,7 @@ imaging_ecal_pion_rejection:bench:
     - ls -lhtR
     - compile_analyses.py imaging_ecal
     - |
-      if [[ ${JUGGLER_DETECTOR} =~ athena
-         || ${JUGGLER_DETECTOR} =~ ecce && ${JUGGLER_DETECTOR_CONFIG} =~ imaging ]] ; then
+      if [[ ${DETECTOR} =~ athena
+         || ${DETECTOR} =~ ecce && ${DETECTOR_CONFIG} =~ imaging ]] ; then
         root -b -q benchmarks/imaging_ecal/analysis/emcal_barrel_pion_rejection_analysis.cxx+
       fi
diff --git a/benchmarks/imaging_ecal/options/hybrid_cluster.py b/benchmarks/imaging_ecal/options/hybrid_cluster.py
index 731c33d387ae3cc7f85866b8d152e9272b6ee561..9125f41870d5a4ffb73a5bf6aff84015503226f7 100644
--- a/benchmarks/imaging_ecal/options/hybrid_cluster.py
+++ b/benchmarks/imaging_ecal/options/hybrid_cluster.py
@@ -15,9 +15,9 @@ from Configurables import Jug__Reco__ImagingPixelReco as ImagingPixelReco
 from Configurables import Jug__Reco__ImagingTopoCluster as ImagingTopoCluster
 from Configurables import Jug__Reco__ImagingClusterReco as ImagingClusterReco
 
-detector_name = str(os.environ.get("JUGGLER_DETECTOR", "athena"))
-detector_config = str(os.environ.get("JUGGLER_DETECTOR_CONFIG", detector_name))
-detector_version = str(os.environ.get("JUGGLER_DETECTOR_VERSION", "master"))
+detector_name = str(os.environ.get("DETECTOR", "athena"))
+detector_config = str(os.environ.get("DETECTOR_CONFIG", detector_name))
+detector_version = str(os.environ.get("DETECTOR_VERSION", "master"))
 
 detector_path = str(os.environ.get("DETECTOR_PATH", "."))
 
diff --git a/benchmarks/imaging_ecal/options/scfi_cluster.py b/benchmarks/imaging_ecal/options/scfi_cluster.py
index 802cf6b43043df8e405c48e63ec3cb2f365b58ce..8cd2259f7525f7dda42f84356b170b73f88d948a 100644
--- a/benchmarks/imaging_ecal/options/scfi_cluster.py
+++ b/benchmarks/imaging_ecal/options/scfi_cluster.py
@@ -12,9 +12,9 @@ from Configurables import Jug__Reco__CalorimeterHitsMerger as CalHitsMerger
 from Configurables import Jug__Reco__CalorimeterIslandCluster as IslandCluster
 from Configurables import Jug__Reco__ClusterRecoCoG as RecoCoG
 
-detector_name = str(os.environ.get("JUGGLER_DETECTOR", "athena"))
-detector_config = str(os.environ.get("JUGGLER_DETECTOR_CONFIG", detector_name))
-detector_version = str(os.environ.get("JUGGLER_DETECTOR_VERSION", "master"))
+detector_name = str(os.environ.get("DETECTOR", "athena"))
+detector_config = str(os.environ.get("DETECTOR_CONFIG", detector_name))
+detector_version = str(os.environ.get("DETECTOR_VERSION", "master"))
 
 detector_path = str(os.environ.get("DETECTOR_PATH", "."))
 
diff --git a/benchmarks/imaging_ecal/run_emcal_barrel.sh b/benchmarks/imaging_ecal/run_emcal_barrel.sh
index c89bc7f4c7e880ba1a271de2fbca8a658855adf2..113184404ec9aa2415b3d5622216fb4fa9ebd651 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_CONFIG}.xml
+export CB_EMCAL_COMPACT_PATH=${DETECTOR_PATH}/${DETECTOR_CONFIG}.xml
 
 if [[ ! -n  "${CB_EMCAL_NUMEV}" ]] ; then
   export CB_EMCAL_NUMEV=1000
@@ -127,8 +127,8 @@ for iev in "${ADDR[@]}"; do
         continue
     fi
 
-    if [[ ${JUGGLER_DETECTOR} =~ athena
-       || ${JUGGLER_DETECTOR} =~ ecce && ${JUGGLER_DETECTOR_CONFIG} =~ imaging ]] ; then
+    if [[ ${DETECTOR} =~ athena
+       || ${DETECTOR} =~ ecce && ${DETECTOR_CONFIG} =~ imaging ]] ; then
       python ${CB_EMCAL_SCRIPT_DIR}/draw_cluster_layers.py \
           ${CB_EMCAL_REC_FILE} -e ${iev} --topo-size=1.0 --compact=${CB_EMCAL_COMPACT_PATH} -o results/${particle}
       if [[ "$?" -ne "0" ]] ; then
diff --git a/benchmarks/imaging_ecal/run_emcal_barrel_pion_rej.sh b/benchmarks/imaging_ecal/run_emcal_barrel_pion_rej.sh
index a4a9c7dc646a5f0ee0d12f21d880b2b90e7777a8..96a7752ae7d0a55db4c7f488a5a5f83b6fe3c84d 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_CONFIG}.xml
+export CB_EMCAL_COMPACT_PATH=${DETECTOR_PATH}/${DETECTOR_CONFIG}.xml
 
 if [[ ! -n  "${CB_EMCAL_NUMEV}" ]] ; then
   export CB_EMCAL_NUMEV=1000
@@ -128,8 +128,8 @@ for iev in "${ADDR[@]}"; do
         continue
     fi
 
-    if [[ ${JUGGLER_DETECTOR} =~ athena
-       || ${JUGGLER_DETECTOR} =~ ecce && ${JUGGLER_DETECTOR_CONFIG} =~ imaging ]] ; then
+    if [[ ${DETECTOR} =~ athena
+       || ${DETECTOR} =~ ecce && ${DETECTOR_CONFIG} =~ imaging ]] ; then
       python ${CB_EMCAL_SCRIPT_DIR}/draw_cluster_layers.py \
           ${CB_EMCAL_REC_FILE} -e ${iev} --topo-size=1.0 --compact=${CB_EMCAL_COMPACT_PATH} -o results/${particle}
       if [[ "$?" -ne "0" ]] ; then
diff --git a/benchmarks/imaging_ecal/run_imcal_pion0.sh b/benchmarks/imaging_ecal/run_imcal_pion0.sh
index d4396e007b0d5ee2d2b4fd11eeb7aebbee9badf2..2c9ff8dd01e66d76f39f150e7145c64ab298c0b1 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_CONFIG}.xml
+export CB_EMCAL_COMPACT_PATH=${DETECTOR_PATH}/${DETECTOR_CONFIG}.xml
 
 if [[ ! -n  "${CB_EMCAL_NUMEV}" ]] ; then
   export CB_EMCAL_NUMEV=1000
diff --git a/benchmarks/imaging_shower_ML/config.yml b/benchmarks/imaging_shower_ML/config.yml
index 458a6842b913f9e0c344e9da65a63877d89059a0..15730f2cf08ac161074756ebc420685176502bb2 100644
--- a/benchmarks/imaging_shower_ML/config.yml
+++ b/benchmarks/imaging_shower_ML/config.yml
@@ -5,8 +5,8 @@ ml_shower:tagging_epimuphka_100:
     - pwd
     - ls -l
     - |
-      if [[ ${JUGGLER_DETECTOR} =~ athena
-         || ${JUGGLER_DETECTOR} =~ ecce && ${JUGGLER_DETECTOR_CONFIG} =~ imaging ]] ; then
+      if [[ ${DETECTOR} =~ athena
+         || ${DETECTOR} =~ ecce && ${DETECTOR_CONFIG} =~ imaging ]] ; then
         python3 benchmarks/imaging_shower_ML/sim_rec_tag.py -t imcal_epimuphka_100 -n 100 --particles "electron,pion-,muon,photon,kaon-" --pmin 0.5 --pmax 10
       fi
 
@@ -17,8 +17,8 @@ ml_shower:tagging_epimuphka:
   script:
     - ls -hal
     - |
-      if [[ ${JUGGLER_DETECTOR} =~ athena
-         || ${JUGGLER_DETECTOR} =~ ecce && ${JUGGLER_DETECTOR_CONFIG} =~ imaging ]] ; then
+      if [[ ${DETECTOR} =~ athena
+         || ${DETECTOR} =~ ecce && ${DETECTOR_CONFIG} =~ imaging ]] ; then
         python3 benchmarks/imaging_shower_ML/sim_rec_tag.py -t imcal_epimuphka -n 10000 --particles "electron,pion-,muon,photon,kaon-" --pmin 0.5 --pmax 10
       fi
 
@@ -28,8 +28,8 @@ ml_shower:tagging_e:
   stage: benchmarks1
   script:
     - |
-      if [[ ${JUGGLER_DETECTOR} =~ athena
-         || ${JUGGLER_DETECTOR} =~ ecce && ${JUGGLER_DETECTOR_CONFIG} =~ imaging ]] ; then
+      if [[ ${DETECTOR} =~ athena
+         || ${DETECTOR} =~ ecce && ${DETECTOR_CONFIG} =~ imaging ]] ; then
         python3 benchmarks/imaging_shower_ML/sim_rec_tag.py -t imcal_e -n 100 --particles "electron" --pmin 0.5 --pmax 10
       fi
 
@@ -39,8 +39,8 @@ ml_shower:tagging_pi:
   stage: benchmarks1
   script:
     - |
-      if [[ ${JUGGLER_DETECTOR} =~ athena
-         || ${JUGGLER_DETECTOR} =~ ecce && ${JUGGLER_DETECTOR_CONFIG} =~ imaging ]] ; then
+      if [[ ${DETECTOR} =~ athena
+         || ${DETECTOR} =~ ecce && ${DETECTOR_CONFIG} =~ imaging ]] ; then
         python3 benchmarks/imaging_shower_ML/sim_rec_tag.py -t imcal_pi -n 100  --particles "pion-" --pmin 0.5 --pmax 10
       fi
 
@@ -51,8 +51,8 @@ ml_shower:training_100:
   script:
     - python3 -m pip install tensorflow particle
     - |
-      if [[ ${JUGGLER_DETECTOR} =~ athena
-         || ${JUGGLER_DETECTOR} =~ ecce && ${JUGGLER_DETECTOR_CONFIG} =~ imaging ]] ; then
+      if [[ ${DETECTOR} =~ athena
+         || ${DETECTOR} =~ ecce && ${DETECTOR_CONFIG} =~ imaging ]] ; then
         python3 benchmarks/imaging_shower_ML/scripts/ml_training.py -t imcal_epimuphka_100 --pmin 0.5 --pmax 10
       fi
 
@@ -64,8 +64,8 @@ ml_shower:training:
   script:
     - python3 -m pip install tensorflow particle
     - |
-      if [[ ${JUGGLER_DETECTOR} =~ athena
-         || ${JUGGLER_DETECTOR} =~ ecce && ${JUGGLER_DETECTOR_CONFIG} =~ imaging ]] ; then
+      if [[ ${DETECTOR} =~ athena
+         || ${DETECTOR} =~ ecce && ${DETECTOR_CONFIG} =~ imaging ]] ; then
         python3 benchmarks/imaging_shower_ML/scripts/ml_training.py -t imcal_epimuphka --pmin 0.5 --pmax 10
       fi
 
diff --git a/benchmarks/imaging_shower_ML/sim_rec_tag.py b/benchmarks/imaging_shower_ML/sim_rec_tag.py
index bc767fdafe40f84ef78d149fbb395d5376d4aa04..8023479334ff121deefa63ed5490cb56e3f06c41 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_CONFIG', '')))
+        '{}.xml'.format(os.environ.get('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 f91d985cb24705ab72f87e24d1706dabf44f2b3d..edbda5e9ec3f6e80255b7dbcdb9732e0a024d0c0 100644
--- a/benchmarks/rich/forward_hadrons.sh
+++ b/benchmarks/rich/forward_hadrons.sh
@@ -4,8 +4,8 @@
 
 ## To run the reconstruction, we need the following global variables:
 ## - JUGGLER_INSTALL_PREFIX:   Install prefix for Juggler (simu/recon)
-## - JUGGLER_DETECTOR:         the detector package we want to use for this benchmark
-## - JUGGLER_DETECTOR_VERSION: the detector package we want to use for this benchmark
+## - DETECTOR:         the detector package we want to use for this benchmark
+## - DETECTOR_VERSION: the detector package we want to use for this benchmark
 ## - DETECTOR_PATH:            full path to the detector definitions
 ##
 ## You can ready options/env.sh for more in-depth explanations of the variables
@@ -24,7 +24,7 @@ export JUGGLER_SIM_FILE="sim_${JUGGLER_FILE_NAME_TAG}.edm4hep.root"
 export JUGGLER_REC_FILE="rec_${JUGGLER_FILE_NAME_TAG}.root"
 
 echo "JUGGLER_N_EVENTS = ${JUGGLER_N_EVENTS}"
-echo "JUGGLER_DETECTOR = ${JUGGLER_DETECTOR}"
+echo "DETECTOR = ${DETECTOR}"
 
 
 # generate the input events
@@ -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_CONFIG}.xml \
+#       --compact=${DETECTOR_PATH}/${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_CONFIG}.xml \
+      --compactFile ${DETECTOR_PATH}/${DETECTOR_CONFIG}.xml \
       --inputFiles  ${JUGGLER_FILE_NAME_TAG}.hepmc \
       --outputFile  ${JUGGLER_SIM_FILE}
 if [[ "$?" -ne "0" ]] ; then
@@ -79,11 +79,11 @@ if [[ "$?" -ne "0" ]] ; then
 fi
 
 # @TODO add analysis scripts
-#root_filesize=$(stat --format=%s "${JUGGLER_DETECTOR}/${JUGGLER_REC_FILE}")
+#root_filesize=$(stat --format=%s "${DETECTOR}/${JUGGLER_REC_FILE}")
 #if [[ "${JUGGLER_N_EVENTS}" -lt "500" ]] ; then 
 #  # file must be less than 10 MB to upload
 #  if [[ "${root_filesize}" -lt "10000000" ]] ; then 
-#    cp ${JUGGLER_DETECTOR}/${JUGGLER_REC_FILE} results/.
+#    cp ${DETECTOR}/${JUGGLER_REC_FILE} results/.
 #  fi
 #fi
 
diff --git a/benchmarks/rich/options/rich_reco.py b/benchmarks/rich/options/rich_reco.py
index 39a989e304785ff2f17ecd637cbf823d632ba81b..f3cbb49539b36860e29f0b88c3b9301adb6aacde 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_CONFIG" in os.environ :
-  detector_name = str(os.environ["JUGGLER_DETECTOR_CONFIG"])
+if "DETECTOR_CONFIG" in os.environ :
+  detector_name = str(os.environ["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 e1ac8756218bcd810f62fecb4120a1c2ba26e09e..fc1c19c1e3cacd5dbb677be5a1d808a38efdf759 100644
--- a/benchmarks/track_finding/multiple_tracks.sh
+++ b/benchmarks/track_finding/multiple_tracks.sh
@@ -35,8 +35,8 @@ print_env.sh
 
 ## To run the reconstruction, we need the following global variables:
 ## - JUGGLER_INSTALL_PREFIX:   Install prefix for Juggler (simu/recon)
-## - JUGGLER_DETECTOR:         the detector package we want to use for this benchmark
-## - JUGGLER_DETECTOR_VERSION: the detector package we want to use for this benchmark
+## - DETECTOR:         the detector package we want to use for this benchmark
+## - DETECTOR_VERSION: the detector package we want to use for this benchmark
 ## - DETECTOR_PATH:            full path to the detector definitions
 
 if [[ ! -n  "${JUGGLER_N_EVENTS}" ]] ; then 
@@ -52,7 +52,7 @@ export JUGGLER_SIM_FILE="sim_${JUGGLER_FILE_NAME_TAG}.edm4hep.root"
 export JUGGLER_REC_FILE="rec_${JUGGLER_FILE_NAME_TAG}.root"
 
 echo "JUGGLER_N_EVENTS = ${JUGGLER_N_EVENTS}"
-echo "JUGGLER_DETECTOR = ${JUGGLER_DETECTOR}"
+echo "DETECTOR = ${DETECTOR}"
 
 ## generate the input events
 root -b -q "benchmarks/track_finding/scripts/gen_multiple_tracks.cxx+(${JUGGLER_N_EVENTS}, \"${JUGGLER_FILE_NAME_TAG}.hepmc\")"
@@ -68,7 +68,7 @@ ddsim --runType batch \
   --filter.tracker edep0 \
   -v WARNING \
   --numberOfEvents ${JUGGLER_N_EVENTS} \
-  --compactFile ${DETECTOR_PATH}/${JUGGLER_DETECTOR_CONFIG}.xml \
+  --compactFile ${DETECTOR_PATH}/${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 40091d0e866ba9dd5e9beef0e54f949663ff1f11..5fa41b5baee98583d87464ebbd57d4ed8566ecf2 100644
--- a/benchmarks/track_finding/options/track_reconstruction.py
+++ b/benchmarks/track_finding/options/track_reconstruction.py
@@ -4,16 +4,16 @@ from Configurables import ApplicationMgr, EICDataSvc, PodioOutput, GeoSvc
 from GaudiKernel import SystemOfUnits as units
 
 detector_name = "topside"
-if "JUGGLER_DETECTOR_CONFIG" in os.environ :
-    detector_name = str(os.environ["JUGGLER_DETECTOR_CONFIG"])
+if "DETECTOR_CONFIG" in os.environ :
+    detector_name = str(os.environ["DETECTOR_CONFIG"])
 
 detector_path = ""
 if "DETECTOR_PATH" in os.environ :
     detector_path = str(os.environ["DETECTOR_PATH"])
 
 detector_version = 'default'
-if "JUGGLER_DETECTOR_VERSION" in os.environ:
-    env_version = str(os.environ["JUGGLER_DETECTOR_VERSION"])
+if "DETECTOR_VERSION" in os.environ:
+    env_version = str(os.environ["DETECTOR_VERSION"])
     if 'acadia' in env_version:
         detector_version = 'acadia'
 
diff --git a/benchmarks/track_fitting/options/track_reconstruction.py b/benchmarks/track_fitting/options/track_reconstruction.py
index a0716fc49c79b5a6b924e7c661f3bcd4be72a299..c1f949ebb341191d59c2f6da15e78e5155a07684 100644
--- a/benchmarks/track_fitting/options/track_reconstruction.py
+++ b/benchmarks/track_fitting/options/track_reconstruction.py
@@ -4,16 +4,16 @@ from Configurables import ApplicationMgr, EICDataSvc, PodioOutput, GeoSvc
 from GaudiKernel import SystemOfUnits as units
 
 detector_name = "athena"
-if "JUGGLER_DETECTOR_CONFIG" in os.environ :
-    detector_name = str(os.environ["JUGGLER_DETECTOR_CONFIG"])
+if "DETECTOR_CONFIG" in os.environ :
+    detector_name = str(os.environ["DETECTOR_CONFIG"])
 
 detector_path = ""
 if "DETECTOR_PATH" in os.environ :
     detector_path = str(os.environ["DETECTOR_PATH"])
 
 detector_version = 'default'
-if "JUGGLER_DETECTOR_VERSION" in os.environ:
-    env_version = str(os.environ["JUGGLER_DETECTOR_VERSION"])
+if "DETECTOR_VERSION" in os.environ:
+    env_version = str(os.environ["DETECTOR_VERSION"])
     if 'acadia' in env_version:
         detector_version = 'acadia'
 
diff --git a/benchmarks/track_fitting/single_tracks.sh b/benchmarks/track_fitting/single_tracks.sh
index 7d00f7393c860e0dc7504cd092bcf909cda16413..89b8f2ccb1ec60abd4a51ea475435218f9eb014a 100644
--- a/benchmarks/track_fitting/single_tracks.sh
+++ b/benchmarks/track_fitting/single_tracks.sh
@@ -38,8 +38,8 @@ print_env.sh
 
 ## To run the reconstruction, we need the following global variables:
 ## - JUGGLER_INSTALL_PREFIX:   Install prefix for Juggler (simu/recon)
-## - JUGGLER_DETECTOR:         the detector package we want to use for this benchmark
-## - JUGGLER_DETECTOR_VERSION: the detector package we want to use for this benchmark
+## - DETECTOR:         the detector package we want to use for this benchmark
+## - DETECTOR_VERSION: the detector package we want to use for this benchmark
 ## - DETECTOR_PATH:            full path to the detector definitions
 
 if [[ ! -n  "${JUGGLER_N_EVENTS}" ]] ; then 
@@ -55,7 +55,7 @@ export JUGGLER_SIM_FILE="sim_${JUGGLER_FILE_NAME_TAG}.edm4hep.root"
 export JUGGLER_REC_FILE="rec_${JUGGLER_FILE_NAME_TAG}.root"
 
 echo "JUGGLER_N_EVENTS = ${JUGGLER_N_EVENTS}"
-echo "JUGGLER_DETECTOR = ${JUGGLER_DETECTOR}"
+echo "DETECTOR = ${DETECTOR}"
 
 ## generate the input events
 root -b -q "benchmarks/track_fitting/scripts/gen_single_tracks.cxx+(${JUGGLER_N_EVENTS}, \"${JUGGLER_FILE_NAME_TAG}.hepmc\")"
@@ -71,7 +71,7 @@ ddsim --runType batch \
   --filter.tracker edep0 \
   -v WARNING \
   --numberOfEvents ${JUGGLER_N_EVENTS} \
-  --compactFile ${DETECTOR_PATH}/${JUGGLER_DETECTOR_CONFIG}.xml \
+  --compactFile ${DETECTOR_PATH}/${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 ecb92768a42cc89c0948789101c808f8c12249e3..d3c3cace5be61bd9cfb6c682579357029992fb64 100644
--- a/benchmarks/tracking/central_electrons.sh
+++ b/benchmarks/tracking/central_electrons.sh
@@ -43,8 +43,8 @@ print_env.sh
 
 ## To run the reconstruction, we need the following global variables:
 ## - JUGGLER_INSTALL_PREFIX:   Install prefix for Juggler (simu/recon)
-## - JUGGLER_DETECTOR:         the detector package we want to use for this benchmark
-## - JUGGLER_DETECTOR_VERSION: the detector package we want to use for this benchmark
+## - DETECTOR:         the detector package we want to use for this benchmark
+## - DETECTOR_VERSION: the detector package we want to use for this benchmark
 ## - DETECTOR_PATH:            full path to the detector definitions
 ##
 ## You can ready options/env.sh for more in-depth explanations of the variables
@@ -64,7 +64,7 @@ export JUGGLER_SIM_FILE="sim_${JUGGLER_FILE_NAME_TAG}.edm4hep.root"
 export JUGGLER_REC_FILE="rec_${JUGGLER_FILE_NAME_TAG}.root"
 
 echo "JUGGLER_N_EVENTS = ${JUGGLER_N_EVENTS}"
-echo "JUGGLER_DETECTOR = ${JUGGLER_DETECTOR}"
+echo "DETECTOR = ${DETECTOR}"
 
 
 if [[ -z "${REC_ONLY}" && -z "${ANALYSIS_ONLY}" ]] ;
@@ -84,7 +84,7 @@ then
     --filter.tracker edep0 \
     -v WARNING \
     --numberOfEvents ${JUGGLER_N_EVENTS} \
-    --compactFile ${DETECTOR_PATH}/${JUGGLER_DETECTOR_CONFIG}.xml \
+    --compactFile ${DETECTOR_PATH}/${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 f0d21710e4ea14bada8338285c44838d55723c2e..587ec115a944ab41239b1c533656bbe57faf5573 100644
--- a/benchmarks/tracking/central_pions.sh
+++ b/benchmarks/tracking/central_pions.sh
@@ -43,8 +43,8 @@ print_env.sh
 
 ## To run the reconstruction, we need the following global variables:
 ## - JUGGLER_INSTALL_PREFIX:   Install prefix for Juggler (simu/recon)
-## - JUGGLER_DETECTOR:         the detector package we want to use for this benchmark
-## - JUGGLER_DETECTOR_VERSION: the detector package we want to use for this benchmark
+## - DETECTOR:         the detector package we want to use for this benchmark
+## - DETECTOR_VERSION: the detector package we want to use for this benchmark
 ## - DETECTOR_PATH:            full path to the detector definitions
 ##
 ## You can ready options/env.sh for more in-depth explanations of the variables
@@ -63,7 +63,7 @@ export JUGGLER_SIM_FILE="sim_${JUGGLER_FILE_NAME_TAG}.edm4hep.root"
 export JUGGLER_REC_FILE="rec_${JUGGLER_FILE_NAME_TAG}.root"
 
 echo "JUGGLER_N_EVENTS = ${JUGGLER_N_EVENTS}"
-echo "JUGGLER_DETECTOR = ${JUGGLER_DETECTOR}"
+echo "DETECTOR = ${DETECTOR}"
 
 
 if [[ -z "${REC_ONLY}" && -z "${ANALYSIS_ONLY}" ]] ;
@@ -83,7 +83,7 @@ then
     --filter.tracker edep0 \
     -v WARNING \
     --numberOfEvents ${JUGGLER_N_EVENTS} \
-    --compactFile ${DETECTOR_PATH}/${JUGGLER_DETECTOR_CONFIG}.xml \
+    --compactFile ${DETECTOR_PATH}/${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 7173546371121b23eba102e21d08e72ae79e958b..11500869632c73aa76809b8fb4943b4f720989cb 100644
--- a/benchmarks/tracking/multiple_tracks.sh
+++ b/benchmarks/tracking/multiple_tracks.sh
@@ -43,8 +43,8 @@ print_env.sh
 
 ## To run the reconstruction, we need the following global variables:
 ## - JUGGLER_INSTALL_PREFIX:   Install prefix for Juggler (simu/recon)
-## - JUGGLER_DETECTOR:         the detector package we want to use for this benchmark
-## - JUGGLER_DETECTOR_VERSION: the detector package we want to use for this benchmark
+## - DETECTOR:         the detector package we want to use for this benchmark
+## - DETECTOR_VERSION: the detector package we want to use for this benchmark
 ## - DETECTOR_PATH:            full path to the detector definitions
 ##
 ## You can ready options/env.sh for more in-depth explanations of the variables
@@ -64,7 +64,7 @@ export JUGGLER_SIM_FILE="sim_${JUGGLER_FILE_NAME_TAG}.edm4hep.root"
 export JUGGLER_REC_FILE="rec_${JUGGLER_FILE_NAME_TAG}.root"
 
 echo "JUGGLER_N_EVENTS = ${JUGGLER_N_EVENTS}"
-echo "JUGGLER_DETECTOR = ${JUGGLER_DETECTOR}"
+echo "DETECTOR = ${DETECTOR}"
 
 
 if [[ -z "${REC_ONLY}" && -z "${ANALYSIS_ONLY}" ]] ;
@@ -84,7 +84,7 @@ then
     --filter.tracker edep0 \
     -v WARNING \
     --numberOfEvents ${JUGGLER_N_EVENTS} \
-    --compactFile ${DETECTOR_PATH}/${JUGGLER_DETECTOR_CONFIG}.xml \
+    --compactFile ${DETECTOR_PATH}/${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 63be8445dfc7eac5f1b9a77ebc44824508055c1a..dbd721790c17a34c728eecba53de035e88895a51 100644
--- a/benchmarks/tracking/options/track_reconstruction.py
+++ b/benchmarks/tracking/options/track_reconstruction.py
@@ -4,16 +4,16 @@ from Configurables import ApplicationMgr, EICDataSvc, PodioOutput, GeoSvc
 from GaudiKernel import SystemOfUnits as units
 
 detector_name = "topside"
-if "JUGGLER_DETECTOR_CONFIG" in os.environ :
-    detector_name = str(os.environ["JUGGLER_DETECTOR_CONFIG"])
+if "DETECTOR_CONFIG" in os.environ :
+    detector_name = str(os.environ["DETECTOR_CONFIG"])
 
 detector_path = ""
 if "DETECTOR_PATH" in os.environ :
     detector_path = str(os.environ["DETECTOR_PATH"])
 
 detector_version = 'default'
-if "JUGGLER_DETECTOR_VERSION" in os.environ:
-    env_version = str(os.environ["JUGGLER_DETECTOR_VERSION"])
+if "DETECTOR_VERSION" in os.environ:
+    env_version = str(os.environ["DETECTOR_VERSION"])
     if 'acadia' in env_version:
         detector_version = 'acadia'
 
diff --git a/benchmarks/tracking/run_tracking_benchmarks.py b/benchmarks/tracking/run_tracking_benchmarks.py
index 9deaec953b76b8f2cd4dfef6dafa71d70721b3f2..754338bb4c76602709f484914f4d0f03ed3cb673 100755
--- a/benchmarks/tracking/run_tracking_benchmarks.py
+++ b/benchmarks/tracking/run_tracking_benchmarks.py
@@ -12,8 +12,8 @@ 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_CONFIG', '')))
+        os.environ.get('DETECTOR_PATH',  os.environ.get('DETECTOR_PATH', '')),
+        '{}.xml'.format(os.environ.get('DETECTOR_CONFIG', '')))
 
 parser = argparse.ArgumentParser()
 parser.add_argument('-n', '--numberOfEvents', dest='nev', type=int, default=100, help='Number of events to process.')
diff --git a/benchmarks/tracking/scripts/gen_central_electrons.cxx b/benchmarks/tracking/scripts/gen_central_electrons.cxx
index 455c799dd598cc50ab70ba4be2d3ec5a54ae47a5..b338f13baff5239c9193ff15e0bf9a3d444cc4f6 100644
--- a/benchmarks/tracking/scripts/gen_central_electrons.cxx
+++ b/benchmarks/tracking/scripts/gen_central_electrons.cxx
@@ -19,8 +19,8 @@ using namespace HepMC3;
 void gen_central_electrons(int n_events = 100, 
                      const char* out_fname = "central_electrons.hepmc")
 {
-  double cos_theta_min = std::cos( 140.0*(M_PI/180.0));
-  double cos_theta_max = std::cos(170.0*(M_PI/180.0));
+  double cos_theta_min = std::cos( 45.0*(M_PI/180.0));
+  double cos_theta_max = std::cos(135.0*(M_PI/180.0));
 
   WriterAscii hepmc_output(out_fname);
   int events_parsed = 0;