diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 429384c8440663c17fcc0eab2d97442def259812..f6329bc110f6e08335bd6d0878b7595f7be41942 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -48,31 +48,31 @@ common:setup:
   script:
     - |
       if [[ "x${CI_PIPELINE_SOURCE}" == "xmerge_request_event"  || "$CI_COMMIT_BRANCH" == "master" ]]; then
-        echo "JUGGLER_DETECTOR         = ${JUGGLER_DETECTOR}"
-        echo "JUGGLER_DETECTOR_CONFIG  = ${JUGGLER_DETECTOR_CONFIG}"
-        echo "JUGGLER_DETECTOR_VERSION = ${JUGGLER_DETECTOR_VERSION}"
-        echo "JUGGLER_DETECTOR=$JUGGLER_DETECTOR" >> juggler.env
-        echo "JUGGLER_DETECTOR_CONFIG=$JUGGLER_DETECTOR_CONFIG" >> juggler.env
-        echo "JUGGLER_DETECTOR_VERSION=$JUGGLER_DETECTOR_VERSION" >> juggler.env
-        echo "JUGGLER_DETECTOR_DEPLOY_TOKEN_USERNAME=${DEPLOY_TOKEN_USERNAME}" >> juggler.env
-        echo "JUGGLER_DETECTOR_DEPLOY_TOKEN_PASSWORD=${DEPLOY_TOKEN_PASSWORD}" >> juggler.env
+        echo "DETECTOR         = ${DETECTOR}"
+        echo "DETECTOR_CONFIG  = ${DETECTOR_CONFIG}"
+        echo "DETECTOR_VERSION = ${DETECTOR_VERSION}"
+        echo "DETECTOR=$DETECTOR" >> juggler.env
+        echo "DETECTOR_CONFIG=$DETECTOR_CONFIG" >> juggler.env
+        echo "DETECTOR_VERSION=$DETECTOR_VERSION" >> juggler.env
+        echo "DETECTOR_DEPLOY_TOKEN_USERNAME=${DEPLOY_TOKEN_USERNAME}" >> juggler.env
+        echo "DETECTOR_DEPLOY_TOKEN_PASSWORD=${DEPLOY_TOKEN_PASSWORD}" >> juggler.env
         echo "COMMON_BENCH_VERSION=$COMMON_BENCH_VERSION" >> juggler.env
       else 
-        if [[ "${JUGGLER_DETECTOR}" == "" ]] ; then
-          export JUGGLER_DETECTOR="ecce" 
+        if [[ "${DETECTOR}" == "" ]] ; then
+          export DETECTOR="ecce" 
         fi
-        if [[ "${JUGGLER_DETECTOR_CONFIG}" == "" ]] ; then
-          export JUGGLER_DETECTOR_CONFIG="ecce"
+        if [[ "${DETECTOR_CONFIG}" == "" ]] ; then
+          export DETECTOR_CONFIG="ecce"
         fi
-        if [[ "${JUGGLER_DETECTOR_VERSION}" == "" ]] ; then
-          export JUGGLER_DETECTOR_VERSION="main" 
+        if [[ "${DETECTOR_VERSION}" == "" ]] ; then
+          export DETECTOR_VERSION="main" 
         fi
-        echo "JUGGLER_DETECTOR         = ${JUGGLER_DETECTOR}"
-        echo "JUGGLER_DETECTOR_CONFIG  = ${JUGGLER_DETECTOR_CONFIG}"
-        echo "JUGGLER_DETECTOR_VERSION = ${JUGGLER_DETECTOR_VERSION}"
-        echo "JUGGLER_DETECTOR=$JUGGLER_DETECTOR" >> juggler.env
-        echo "JUGGLER_DETECTOR_CONFIG=$JUGGLER_DETECTOR_CONFIG" >> juggler.env
-        echo "JUGGLER_DETECTOR_VERSION=$JUGGLER_DETECTOR_VERSION" >> juggler.env
+        echo "DETECTOR         = ${DETECTOR}"
+        echo "DETECTOR_CONFIG  = ${DETECTOR_CONFIG}"
+        echo "DETECTOR_VERSION = ${DETECTOR_VERSION}"
+        echo "DETECTOR=$DETECTOR" >> juggler.env
+        echo "DETECTOR_CONFIG=$DETECTOR_CONFIG" >> juggler.env
+        echo "DETECTOR_VERSION=$DETECTOR_VERSION" >> juggler.env
         echo "COMMON_BENCH_VERSION=$COMMON_BENCH_VERSION" >> juggler.env
       fi
     - source setup/bin/env.sh && ./setup/bin/install_common.sh
@@ -135,11 +135,11 @@ deploy_results:
 benchmarks:reconstruction:
   stage: trigger
   variables:
-    JUGGLER_DETECTOR: "$JUGGLER_DETECTOR"
-    JUGGLER_DETECTOR_CONFIG: "$JUGGLER_DETECTOR_CONFIG"
-    JUGGLER_DETECTOR_VERSION: "$JUGGLER_DETECTOR_VERSION"
-    JUGGLER_DETECTOR_DEPLOY_TOKEN_USERNAME: "${JUGGLER_DETECTOR_DEPLOY_TOKEN_USERNAME}"
-    JUGGLER_DETECTOR_DEPLOY_TOKEN_PASSWORD: "${JUGGLER_DETECTOR_DEPLOY_TOKEN_PASSWORD}"
+    DETECTOR: "$DETECTOR"
+    DETECTOR_CONFIG: "$DETECTOR_CONFIG"
+    DETECTOR_VERSION: "$DETECTOR_VERSION"
+    DETECTOR_DEPLOY_TOKEN_USERNAME: "${DETECTOR_DEPLOY_TOKEN_USERNAME}"
+    DETECTOR_DEPLOY_TOKEN_PASSWORD: "${DETECTOR_DEPLOY_TOKEN_PASSWORD}"
     COMMON_BENCH_VERSION: "$COMMON_BENCH_VERSION"
   trigger:
     project: EIC/benchmarks/reconstruction_benchmarks
@@ -149,11 +149,11 @@ benchmarks:reconstruction:
 benchmarks:physics:
   stage: trigger
   variables:
-    JUGGLER_DETECTOR: "$JUGGLER_DETECTOR"
-    JUGGLER_DETECTOR_CONFIG: "$JUGGLER_DETECTOR_CONFIG"
-    JUGGLER_DETECTOR_VERSION: "$JUGGLER_DETECTOR_VERSION"
-    JUGGLER_DETECTOR_DEPLOY_TOKEN_USERNAME: "${JUGGLER_DETECTOR_DEPLOY_TOKEN_USERNAME}"
-    JUGGLER_DETECTOR_DEPLOY_TOKEN_PASSWORD: "${JUGGLER_DETECTOR_DEPLOY_TOKEN_PASSWORD}"
+    DETECTOR: "$DETECTOR"
+    DETECTOR_CONFIG: "$DETECTOR_CONFIG"
+    DETECTOR_VERSION: "$DETECTOR_VERSION"
+    DETECTOR_DEPLOY_TOKEN_USERNAME: "${DETECTOR_DEPLOY_TOKEN_USERNAME}"
+    DETECTOR_DEPLOY_TOKEN_PASSWORD: "${DETECTOR_DEPLOY_TOKEN_PASSWORD}"
     COMMON_BENCH_VERSION: "$COMMON_BENCH_VERSION"
   trigger:
     project: EIC/benchmarks/physics_benchmarks
diff --git a/README.md b/README.md
index 499adbab78fe25b3a4f3942a7d0da8c9faae054a..ca57aa5abb49ab80b1a6447c0c8bac464ba69ad9 100644
--- a/README.md
+++ b/README.md
@@ -29,7 +29,7 @@ Note juggler is not needed for `detector_benchmarks` because it is not used but
 First set some environment variables.
 ```
 # export JUGGLER_INSTALL_PREFIX=$HOME/stow/juggler # not needed for detector_benchmarks
-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/b0_tracker/forward_protons.sh b/benchmarks/b0_tracker/forward_protons.sh
index f92d9db568e3faca7b1268a3890bd25ea3b81aa5..30e4968e77d049b85d34971cdf93db9596ab020c 100755
--- a/benchmarks/b0_tracker/forward_protons.sh
+++ b/benchmarks/b0_tracker/forward_protons.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-if [[ ! -n  "${JUGGLER_DETECTOR}" ]] ; then 
-  export JUGGLER_DETECTOR="topside"
+if [[ ! -n  "${DETECTOR}" ]] ; then 
+  export DETECTOR="topside"
 fi
 
 if [[ ! -n  "${JUGGLER_N_EVENTS}" ]] ; then 
@@ -13,7 +13,7 @@ export JUGGLER_GEN_FILE="${LOCAL_DATA_PATH}/${FILE_NAME_TAG}.hepmc"
 export JUGGLER_SIM_FILE="${LOCAL_DATA_PATH}/sim_${FILE_NAME_TAG}.edm4hep.root"
 
 echo "JUGGLER_N_EVENTS = ${JUGGLER_N_EVENTS}"
-echo "JUGGLER_DETECTOR = ${JUGGLER_DETECTOR}"
+echo "DETECTOR = ${DETECTOR}"
 
 # Generate the input events
 root -b -q "benchmarks/b0_tracker/scripts/gen_${FILE_NAME_TAG}.cxx(${JUGGLER_N_EVENTS}, \"${FILE_NAME_TAG}.hepmc\")"
@@ -28,7 +28,7 @@ ddsim --runType batch \
       --part.minimalKineticEnergy 0.5*GeV  \
       --filter.tracker edep0 \
       --numberOfEvents ${JUGGLER_N_EVENTS} \
-      --compactFile ${DETECTOR_PATH}/${JUGGLER_DETECTOR_CONFIG}.xml \
+      --compactFile ${DETECTOR_PATH}/${DETECTOR_CONFIG}.xml \
       --inputFiles ${FILE_NAME_TAG}.hepmc \
       --outputFile ${JUGGLER_SIM_FILE}
 
diff --git a/benchmarks/barrel_ecal/run_emcal_barrel_electrons.sh b/benchmarks/barrel_ecal/run_emcal_barrel_electrons.sh
index 0ff0121dc4091a3616fee50eaf0fe70f33f1b3e4..3b73b2cddbc1ee70df1917a20dde9c3b245c3158 100755
--- a/benchmarks/barrel_ecal/run_emcal_barrel_electrons.sh
+++ b/benchmarks/barrel_ecal/run_emcal_barrel_electrons.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-if [[ ! -n  "${JUGGLER_DETECTOR}" ]] ; then 
-  export JUGGLER_DETECTOR="topside"
+if [[ ! -n  "${DETECTOR}" ]] ; then 
+  export DETECTOR="topside"
 fi
 
 if [[ ! -n  "${JUGGLER_N_EVENTS}" ]] ; then 
@@ -22,7 +22,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/barrel_ecal/scripts/emcal_barrel_electrons.cxx(${JUGGLER_N_EVENTS}, ${E_START}, ${E_END}, \"${JUGGLER_FILE_NAME_TAG}.hepmc\")"
@@ -43,7 +43,7 @@ ddsim --runType batch \
       --part.minimalKineticEnergy 0.5*GeV  \
       --filter.tracker edep0 \
       --numberOfEvents ${JUGGLER_N_EVENTS} \
-      --compactFile ${DETECTOR_PATH}/${JUGGLER_DETECTOR_CONFIG}.xml \
+      --compactFile ${DETECTOR_PATH}/${DETECTOR_CONFIG}.xml \
       --inputFiles ${JUGGLER_FILE_NAME_TAG}.hepmc \
       --outputFile sim_output/${JUGGLER_SIM_FILE}
 
diff --git a/benchmarks/barrel_ecal/run_emcal_barrel_particles.sh b/benchmarks/barrel_ecal/run_emcal_barrel_particles.sh
index 940379cba6b7b91cd4ee5a7c5d1f780e22991ba7..876e26741fea5233878dda29910812f6a3994774 100755
--- a/benchmarks/barrel_ecal/run_emcal_barrel_particles.sh
+++ b/benchmarks/barrel_ecal/run_emcal_barrel_particles.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-if [[ ! -n  "${JUGGLER_DETECTOR}" ]] ; then 
-  export JUGGLER_DETECTOR="athena"
+if [[ ! -n  "${DETECTOR}" ]] ; then 
+  export DETECTOR="athena"
 fi
 
 if [[ ! -n  "${JUGGLER_N_EVENTS}" ]] ; then 
@@ -28,7 +28,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/barrel_ecal/scripts/emcal_barrel_particles_gen.cxx+(${JUGGLER_N_EVENTS}, ${E_START}, ${E_END}, \"${PARTICLE}\")"
@@ -50,7 +50,7 @@ ddsim --runType batch \
       --part.minimalKineticEnergy 0.5*GeV  \
       --filter.tracker edep0 \
       --numberOfEvents ${JUGGLER_N_EVENTS} \
-      --compactFile ${DETECTOR_PATH}/${JUGGLER_DETECTOR_CONFIG}.xml \
+      --compactFile ${DETECTOR_PATH}/${DETECTOR_CONFIG}.xml \
       --inputFiles data/${JUGGLER_FILE_NAME_TAG}.hepmc \
       --outputFile sim_output/${JUGGLER_SIM_FILE}
 
diff --git a/benchmarks/barrel_ecal/run_emcal_barrel_pi0.sh b/benchmarks/barrel_ecal/run_emcal_barrel_pi0.sh
index b1c4d31d2423f34706285b059712147a1ef918d6..c354a0589eec5747e0412ba2bc96e5921a634db2 100755
--- a/benchmarks/barrel_ecal/run_emcal_barrel_pi0.sh
+++ b/benchmarks/barrel_ecal/run_emcal_barrel_pi0.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-if [[ ! -n  "${JUGGLER_DETECTOR}" ]] ; then 
-  export JUGGLER_DETECTOR="topside"
+if [[ ! -n  "${DETECTOR}" ]] ; then 
+  export DETECTOR="topside"
 fi
 
 if [[ ! -n  "${JUGGLER_N_EVENTS}" ]] ; then 
@@ -27,7 +27,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/barrel_ecal/scripts/emcal_barrel_pi0.cxx(${JUGGLER_N_EVENTS}, ${E_start}, ${E_end}, \"${JUGGLER_FILE_NAME_TAG}.hepmc\")"
@@ -48,7 +48,7 @@ ddsim --runType batch \
       --part.minimalKineticEnergy 0.5*GeV  \
       --filter.tracker edep0 \
       --numberOfEvents ${JUGGLER_N_EVENTS} \
-      --compactFile ${DETECTOR_PATH}/${JUGGLER_DETECTOR_CONFIG}.xml \
+      --compactFile ${DETECTOR_PATH}/${DETECTOR_CONFIG}.xml \
       --inputFiles ${JUGGLER_FILE_NAME_TAG}.hepmc \
       --outputFile sim_output/${JUGGLER_SIM_FILE}
 
diff --git a/benchmarks/barrel_ecal/run_emcal_barrel_pion_rejection.sh b/benchmarks/barrel_ecal/run_emcal_barrel_pion_rejection.sh
index 8aa933d0231365468720929ad79d2d4a31554160..018978b0b57bd4082c4396cccc86fb612a6c587a 100644
--- a/benchmarks/barrel_ecal/run_emcal_barrel_pion_rejection.sh
+++ b/benchmarks/barrel_ecal/run_emcal_barrel_pion_rejection.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-if [[ ! -n  "${JUGGLER_DETECTOR}" ]] ; then 
-  export JUGGLER_DETECTOR="athena"
+if [[ ! -n  "${DETECTOR}" ]] ; then 
+  export DETECTOR="athena"
 fi
 
 if [[ ! -n  "${JUGGLER_N_EVENTS}" ]] ; then 
@@ -28,7 +28,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/barrel_ecal/scripts/emcal_barrel_particles_gen.cxx+(${JUGGLER_N_EVENTS}, ${E_START}, ${E_END}, \"${PARTICLE}\")"
@@ -50,7 +50,7 @@ ddsim --runType batch \
       --part.minimalKineticEnergy 0.5*GeV  \
       --filter.tracker edep0 \
       --numberOfEvents ${JUGGLER_N_EVENTS} \
-      --compactFile ${DETECTOR_PATH}/${JUGGLER_DETECTOR_CONFIG}.xml \
+      --compactFile ${DETECTOR_PATH}/${DETECTOR_CONFIG}.xml \
       --inputFiles data/${JUGGLER_FILE_NAME_TAG}.hepmc \
       --outputFile sim_output/${JUGGLER_SIM_FILE}
 
diff --git a/benchmarks/barrel_ecal/run_emcal_barrel_pions.sh b/benchmarks/barrel_ecal/run_emcal_barrel_pions.sh
index a973d333a86a67814efde6d5b0e05915dba6276b..4e2895898613f84ba6f5431c0a6d506d1fc129b4 100755
--- a/benchmarks/barrel_ecal/run_emcal_barrel_pions.sh
+++ b/benchmarks/barrel_ecal/run_emcal_barrel_pions.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-if [[ ! -n  "${JUGGLER_DETECTOR}" ]] ; then 
-  export JUGGLER_DETECTOR="topside"
+if [[ ! -n  "${DETECTOR}" ]] ; then 
+  export DETECTOR="topside"
 fi
 
 if [[ ! -n  "${JUGGLER_N_EVENTS}" ]] ; then 
@@ -27,7 +27,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/barrel_ecal/scripts/emcal_barrel_pions.cxx(${JUGGLER_N_EVENTS}, ${E_start}, ${E_end}, \"${JUGGLER_FILE_NAME_TAG}.hepmc\")"
@@ -48,7 +48,7 @@ ddsim --runType batch \
       --part.minimalKineticEnergy 0.5*GeV  \
       --filter.tracker edep0 \
       --numberOfEvents ${JUGGLER_N_EVENTS} \
-      --compactFile ${DETECTOR_PATH}/${JUGGLER_DETECTOR_CONFIG}.xml \
+      --compactFile ${DETECTOR_PATH}/${DETECTOR_CONFIG}.xml \
       --inputFiles ${JUGGLER_FILE_NAME_TAG}.hepmc \
       --outputFile sim_output/${JUGGLER_SIM_FILE}
 
diff --git a/benchmarks/barrel_ecal/scripts/emcal_barrel_energy_scan_analysis.cxx b/benchmarks/barrel_ecal/scripts/emcal_barrel_energy_scan_analysis.cxx
index 3b83c1a361634e71c870c79dabfe6fe916a7be02..b417a3c664517a0a6c2f4b5e0cbaea7d8c0eb93a 100644
--- a/benchmarks/barrel_ecal/scripts/emcal_barrel_energy_scan_analysis.cxx
+++ b/benchmarks/barrel_ecal/scripts/emcal_barrel_energy_scan_analysis.cxx
@@ -272,8 +272,8 @@ void emcal_barrel_energy_scan_analysis(std::string particle_label = "electron")
   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");
   }
 
   dd4hep::Detector& detector = dd4hep::Detector::getInstance();
diff --git a/benchmarks/barrel_ecal/scripts/emcal_barrel_particles_analysis.cxx b/benchmarks/barrel_ecal/scripts/emcal_barrel_particles_analysis.cxx
index c1901eca943660db29292c3ca6b5cd528455a439..3bba738974358a363b6933f4bd88f388b304c06d 100644
--- a/benchmarks/barrel_ecal/scripts/emcal_barrel_particles_analysis.cxx
+++ b/benchmarks/barrel_ecal/scripts/emcal_barrel_particles_analysis.cxx
@@ -70,8 +70,8 @@ void emcal_barrel_particles_analysis(std::string particle_name = "electron", boo
   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");
   }
 
   // Thrown Energy [GeV]
diff --git a/benchmarks/barrel_ecal/scripts/emcal_barrel_pion_rejection_analysis.cxx b/benchmarks/barrel_ecal/scripts/emcal_barrel_pion_rejection_analysis.cxx
index 2a0d494e2004adab220b15d75bbd30afaad14d7d..ef19294b0c646f374c632ab5c116c5465bb16154 100644
--- a/benchmarks/barrel_ecal/scripts/emcal_barrel_pion_rejection_analysis.cxx
+++ b/benchmarks/barrel_ecal/scripts/emcal_barrel_pion_rejection_analysis.cxx
@@ -81,8 +81,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");
   }
 
   /*
diff --git a/benchmarks/barrel_hcal/run_hcal_barrel_particles.sh b/benchmarks/barrel_hcal/run_hcal_barrel_particles.sh
index f6fe3af736b8e978f3dfe02523b010fe28099231..ddae1318c5a8d898327549226755550f68f36f84 100755
--- a/benchmarks/barrel_hcal/run_hcal_barrel_particles.sh
+++ b/benchmarks/barrel_hcal/run_hcal_barrel_particles.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-if [[ ! -n  "${JUGGLER_DETECTOR}" ]] ; then 
-  export JUGGLER_DETECTOR="topside"
+if [[ ! -n  "${DETECTOR}" ]] ; then 
+  export DETECTOR="topside"
 fi
 
 if [[ ! -n  "${JUGGLER_N_EVENTS}" ]] ; then 
@@ -28,7 +28,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/barrel_hcal/scripts/hcal_barrel_particles_gen.cxx+(${JUGGLER_N_EVENTS}, ${E_START}, ${E_END}, \"${PARTICLE}\")"
@@ -50,7 +50,7 @@ ddsim --runType batch \
       --part.minimalKineticEnergy 0.5*GeV  \
       --filter.tracker edep0 \
       --numberOfEvents ${JUGGLER_N_EVENTS} \
-      --compactFile ${DETECTOR_PATH}/${JUGGLER_DETECTOR_CONFIG}.xml \
+      --compactFile ${DETECTOR_PATH}/${DETECTOR_CONFIG}.xml \
       --inputFiles data/${JUGGLER_FILE_NAME_TAG}.hepmc \
       --outputFile sim_output/${JUGGLER_SIM_FILE}
 
diff --git a/benchmarks/crystal_calorimeter/config.yml b/benchmarks/crystal_calorimeter/config.yml
index a4243d3cfa8a0a6a74d52409c75b94600227564e..6601613bb580cdd93ee95be68e9886223834e081 100644
--- a/benchmarks/crystal_calorimeter/config.yml
+++ b/benchmarks/crystal_calorimeter/config.yml
@@ -8,7 +8,7 @@ cal_sim:crystal_pion:
   extends: .det_benchmark
   stage: simulate
   script:
-    - ddsim --runType batch --numberOfEvents 100 --filter.tracker edep0 --compactFile ${DETECTOR_PATH}/${JUGGLER_DETECTOR_CONFIG}.xml --inputFiles  data/emcal_electrons.hepmc  --outputFile  sim_output/output_emcal_electrons.edm4hep.root
+    - ddsim --runType batch --numberOfEvents 100 --filter.tracker edep0 --compactFile ${DETECTOR_PATH}/${DETECTOR_CONFIG}.xml --inputFiles  data/emcal_electrons.hepmc  --outputFile  sim_output/output_emcal_electrons.edm4hep.root
 
 cal_bench:crystal_benchmark:
   extends: .det_benchmark
diff --git a/benchmarks/material_maps/config.yml b/benchmarks/material_maps/config.yml
index 35e9deadf45015c3500dc5fefe0df46856251406..616de41d403e48f063a4679de21cafd6148a0970 100644
--- a/benchmarks/material_maps/config.yml
+++ b/benchmarks/material_maps/config.yml
@@ -2,18 +2,18 @@ material_maps:
   extends: .det_benchmark
   stage: simulate
   script:
-    - ActsExampleGeometryDD4hep -j 1 -n 1 --dd4hep-input ${DETECTOR_PATH}/${JUGGLER_DETECTOR_CONFIG}.xml --output-json --output-root --mat-output-file geometry-map --mat-output-allmaterial true --mat-output-sensitives false
+    - ActsExampleGeometryDD4hep -j 1 -n 1 --dd4hep-input ${DETECTOR_PATH}/${DETECTOR_CONFIG}.xml --output-json --output-root --mat-output-file geometry-map --mat-output-allmaterial true --mat-output-sensitives false
     - test -f geometry-map.json
     - python3 benchmarks/material_maps/scripts/writeMapConfig.py geometry-map.json config-map.json
     - test -f config-map.json
     - python3 benchmarks/material_maps/scripts/configureMap.py geometry-map.json config-map.json
     - test -f config-map.json
-    - ActsExampleMaterialRecordingDD4hep -j 1 -n ${JUGGLER_N_EVENTS} --dd4hep-input ${DETECTOR_PATH}/${JUGGLER_DETECTOR_CONFIG}.xml --output-root 
+    - ActsExampleMaterialRecordingDD4hep -j 1 -n ${JUGGLER_N_EVENTS} --dd4hep-input ${DETECTOR_PATH}/${DETECTOR_CONFIG}.xml --output-root 
     - test -f geant4_material_tracks.root
     - root -l -b -q -e "TChain T(\"material-tracks\"); T.Add(\"geant4_material_tracks.root\"); cout << T.GetEntries() << \" entries\" << endl; gApplication->Terminate(T.GetEntries()-${JUGGLER_N_EVENTS});"
-    - ActsExampleMaterialMappingDD4hep -j 1 -n ${JUGGLER_N_EVENTS} --dd4hep-input ${DETECTOR_PATH}/${JUGGLER_DETECTOR_CONFIG}.xml --input-root true --input-files geant4_material_tracks.root --mat-input-type file --mat-input-file geometry-map.json --output-root --output-json --output-cbor --mat-output-file material-maps --mat-mapping-surfaces true --mat-mapping-volumes true --mat-mapping-volume-stepsize 1
+    - ActsExampleMaterialMappingDD4hep -j 1 -n ${JUGGLER_N_EVENTS} --dd4hep-input ${DETECTOR_PATH}/${DETECTOR_CONFIG}.xml --input-root true --input-files geant4_material_tracks.root --mat-input-type file --mat-input-file geometry-map.json --output-root --output-json --output-cbor --mat-output-file material-maps --mat-mapping-surfaces true --mat-mapping-volumes true --mat-mapping-volume-stepsize 1
     - test -f material-maps.json
-    - ActsExampleMaterialValidationDD4hep -j 1 -n ${JUGGLER_N_EVENTS} --dd4hep-input ${DETECTOR_PATH}/${JUGGLER_DETECTOR_CONFIG}.xml --mat-input-type file --mat-input-file material-maps.json --output-root --mat-output-file val-mat-map --prop-z0-sigma 0.0 --prop-d0-sigma 0.0
+    - ActsExampleMaterialValidationDD4hep -j 1 -n ${JUGGLER_N_EVENTS} --dd4hep-input ${DETECTOR_PATH}/${DETECTOR_CONFIG}.xml --mat-input-type file --mat-input-file material-maps.json --output-root --mat-output-file val-mat-map --prop-z0-sigma 0.0 --prop-d0-sigma 0.0
     - ls -al
     - mkdir -p results/material_maps
     - cp *.root *.json *.cbor results/material_maps/
diff --git a/benchmarks/others/config.yml b/benchmarks/others/config.yml
index 56b453f217993d312df0cacd396bac12f044182d..4a375285afb909e9f663844c24463abd47def32c 100644
--- a/benchmarks/others/config.yml
+++ b/benchmarks/others/config.yml
@@ -16,7 +16,7 @@ bench:materialScanEta:
   stage: benchmarks
   extends: .det_benchmark
   script:
-    - echo ".x benchmarks/others/materialScanEta.cxx($ETAMIN, $ETAMAX, $ETASTEP, $PHIMIN)" | materialScan ${DETECTOR_PATH}/${JUGGLER_DETECTOR_CONFIG}.xml -interactive
+    - echo ".x benchmarks/others/materialScanEta.cxx($ETAMIN, $ETAMAX, $ETASTEP, $PHIMIN)" | materialScan ${DETECTOR_PATH}/${DETECTOR_CONFIG}.xml -interactive
     - mkdir results/images/
     - mv materialScanEta.png results/images/materialScanEta.png
     - mv materialScanEta.pdf results/images/materialScanEta.pdf
@@ -25,7 +25,7 @@ bench:materialScanEta:tracking:
   stage: benchmarks
   extends: .det_benchmark
   script:
-    - echo ".x benchmarks/others/materialScanEta.cxx($ETAMIN, $ETAMAX, $ETASTEP, $PHIMIN, $TRACKING_RHOMAX, $TRACKING_ZNMAX, $TRACKING_ZPMAX)" | materialScan ${DETECTOR_PATH}/${JUGGLER_DETECTOR_CONFIG}.xml -interactive
+    - echo ".x benchmarks/others/materialScanEta.cxx($ETAMIN, $ETAMAX, $ETASTEP, $PHIMIN, $TRACKING_RHOMAX, $TRACKING_ZNMAX, $TRACKING_ZPMAX)" | materialScan ${DETECTOR_PATH}/${DETECTOR_CONFIG}.xml -interactive
     - mkdir results/images/
     - mv materialScanEta.png results/images/materialScanEtaTracking.png
     - mv materialScanEta.pdf results/images/materialScanEtaTracking.pdf
@@ -34,7 +34,7 @@ bench:materialScanEta:ecal:
   stage: benchmarks
   extends: .det_benchmark
   script:
-    - echo ".x benchmarks/others/materialScanEta.cxx($ETAMIN, $ETAMAX, $ETASTEP, $PHIMIN, $ECAL_RHOMAX, $ECAL_ZNMAX, $ECAL_ZPMAX)" | materialScan ${DETECTOR_PATH}/${JUGGLER_DETECTOR_CONFIG}.xml -interactive
+    - echo ".x benchmarks/others/materialScanEta.cxx($ETAMIN, $ETAMAX, $ETASTEP, $PHIMIN, $ECAL_RHOMAX, $ECAL_ZNMAX, $ECAL_ZPMAX)" | materialScan ${DETECTOR_PATH}/${DETECTOR_CONFIG}.xml -interactive
     - mkdir results/images/
     - mv materialScanEta.png results/images/materialScanEtaEcal.png
     - mv materialScanEta.pdf results/images/materialScanEtaEcal.pdf
@@ -43,7 +43,7 @@ bench:materialScanEtaPhi:
   stage: benchmarks
   extends: .det_benchmark
   script:
-    - echo ".x benchmarks/others/materialScanEtaPhi.cxx($ETAMIN, $ETAMAX, $ETASTEP, $PHIMIN, $PHIMAX, $PHISTEP)" | materialScan ${DETECTOR_PATH}/${JUGGLER_DETECTOR_CONFIG}.xml -interactive
+    - echo ".x benchmarks/others/materialScanEtaPhi.cxx($ETAMIN, $ETAMAX, $ETASTEP, $PHIMIN, $PHIMAX, $PHISTEP)" | materialScan ${DETECTOR_PATH}/${DETECTOR_CONFIG}.xml -interactive
     - mkdir results/images/
     - mv materialScanEtaPhi.png results/images/materialScanEtaPhi.png
     - mv materialScanEtaPhi.pdf results/images/materialScanEtaPhi.pdf
@@ -52,7 +52,7 @@ bench:materialScanEtaPhi:tracking:
   stage: benchmarks
   extends: .det_benchmark
   script:
-    - echo ".x benchmarks/others/materialScanEtaPhi.cxx($ETAMIN, $ETAMAX, $ETASTEP, $PHIMIN, $PHIMAX, $PHISTEP, $TRACKING_RHOMAX, $TRACKING_ZNMAX, $TRACKING_ZPMAX)" | materialScan ${DETECTOR_PATH}/${JUGGLER_DETECTOR_CONFIG}.xml -interactive
+    - echo ".x benchmarks/others/materialScanEtaPhi.cxx($ETAMIN, $ETAMAX, $ETASTEP, $PHIMIN, $PHIMAX, $PHISTEP, $TRACKING_RHOMAX, $TRACKING_ZNMAX, $TRACKING_ZPMAX)" | materialScan ${DETECTOR_PATH}/${DETECTOR_CONFIG}.xml -interactive
     - mkdir results/images/
     - mv materialScanEtaPhi.png results/images/materialScanEtaPhiTracking.png
     - mv materialScanEtaPhi.pdf results/images/materialScanEtaPhiTracking.pdf
@@ -61,7 +61,7 @@ bench:materialScanEtaPhi:ecal:
   stage: benchmarks
   extends: .det_benchmark
   script:
-    - echo ".x benchmarks/others/materialScanEtaPhi.cxx($ETAMIN, $ETAMAX, $ETASTEP, $PHIMIN, $PHIMAX, $PHISTEP, $ECAL_RHOMAX, $ECAL_ZNMAX, $ECAL_ZPMAX)" | materialScan ${DETECTOR_PATH}/${JUGGLER_DETECTOR_CONFIG}.xml -interactive
+    - echo ".x benchmarks/others/materialScanEtaPhi.cxx($ETAMIN, $ETAMAX, $ETASTEP, $PHIMIN, $PHIMAX, $PHISTEP, $ECAL_RHOMAX, $ECAL_ZNMAX, $ECAL_ZPMAX)" | materialScan ${DETECTOR_PATH}/${DETECTOR_CONFIG}.xml -interactive
     - mkdir results/images/
     - mv materialScanEtaPhi.png results/images/materialScanEtaPhiEcal.png
     - mv materialScanEtaPhi.pdf results/images/materialScanEtaPhiEcal.pdf
diff --git a/benchmarks/pid/config.yml b/benchmarks/pid/config.yml
index 8a0f0a4e8b739f343ef1cd0c504ee53de327a5b5..759bfbc91d4b808a07dca0e2a8b6afa81bab06fc 100644
--- a/benchmarks/pid/config.yml
+++ b/benchmarks/pid/config.yml
@@ -2,7 +2,7 @@ sim:backward:
   extends: .det_benchmark
   stage: simulate
   script:
-    - ddsim --runType batch --numberOfEvents 100 --filter.tracker edep0 --compactFile ${DETECTOR_PATH}/${JUGGLER_DETECTOR_CONFIG}.xml --enableGun --gun.energy "5*GeV" --gun.particle "${PARTICLE}" --gun.thetaMin 130*deg --gun.thetaMax 177*deg --gun.distribution "cos(theta)" --outputFile sim_output/sim_pid_backward_${PARTICLE}_5GeV.edm4hep.root
+    - ddsim --runType batch --numberOfEvents 100 --filter.tracker edep0 --compactFile ${DETECTOR_PATH}/${DETECTOR_CONFIG}.xml --enableGun --gun.energy "5*GeV" --gun.particle "${PARTICLE}" --gun.thetaMin 130*deg --gun.thetaMax 177*deg --gun.distribution "cos(theta)" --outputFile sim_output/sim_pid_backward_${PARTICLE}_5GeV.edm4hep.root
     - rootls -t sim_output/sim_pid_backward_${PARTICLE}_5GeV.edm4hep.root
   parallel:
     matrix:
@@ -12,7 +12,7 @@ sim:forward:
   extends: .det_benchmark
   stage: simulate
   script:
-    - ddsim --runType batch --numberOfEvents 100 --filter.tracker edep0 --compactFile ${DETECTOR_PATH}/${JUGGLER_DETECTOR_CONFIG}.xml --enableGun --gun.energy "5*GeV" --gun.particle "${PARTICLE}" --gun.thetaMin 3*deg --gun.thetaMax 50*deg --gun.distribution "cos(theta)" --outputFile sim_output/sim_pid_forward_${PARTICLE}_5GeV.edm4hep.root
+    - ddsim --runType batch --numberOfEvents 100 --filter.tracker edep0 --compactFile ${DETECTOR_PATH}/${DETECTOR_CONFIG}.xml --enableGun --gun.energy "5*GeV" --gun.particle "${PARTICLE}" --gun.thetaMin 3*deg --gun.thetaMax 50*deg --gun.distribution "cos(theta)" --outputFile sim_output/sim_pid_forward_${PARTICLE}_5GeV.edm4hep.root
     - rootls -t sim_output/sim_pid_forward_${PARTICLE}_5GeV.edm4hep.root
   parallel:
     matrix:
@@ -24,12 +24,12 @@ bench:mrich:
   needs: ["sim:backward"]
   script:
     - |
-      if [[ ${JUGGLER_DETECTOR_VERSION} =~ acadia ]]; then
+      if [[ ${DETECTOR_VERSION} =~ acadia ]]; then
         echo "Performing MRICH benchmarks for acadia"
         mkdir -p results/pid/backward/mrich/
         root -t -x -q -b "benchmarks/pid/scripts/mrich_analysis.cxx+(\"sim_output/sim_pid_backward_${PARTICLE}_5GeV.edm4hep.root\", \"${PARTICLE}\")"
       else
-        echo "Skipping MRICH Benchmarks for non-acadia detector version ${JUGGLER_DETECTOR_VERSION}"
+        echo "Skipping MRICH Benchmarks for non-acadia detector version ${DETECTOR_VERSION}"
       fi
   parallel:
     matrix:
@@ -53,10 +53,10 @@ bench:erich:
   needs: ["sim:backward"]
   script:
     - |
-      if [[ ${JUGGLER_DETECTOR_VERSION} =~ acadia ]]; then
+      if [[ ${DETECTOR_VERSION} =~ acadia ]]; then
         echo "Skipping ERICH benchmarks for acadia"
       else
-        echo "Doing MRICH Benchmarks for ${JUGGLER_DETECTOR_VERSION}"
+        echo "Doing MRICH Benchmarks for ${DETECTOR_VERSION}"
         echo "FIXME: needs implementing"
       fi
   parallel:
diff --git a/benchmarks/roman_pots/roman_pot_simu.sh b/benchmarks/roman_pots/roman_pot_simu.sh
index 810185f45806a93954c5bc929f5de6ca04675c9b..f75bce464d420f29933dbde62ad83edf1b0fa084 100755
--- a/benchmarks/roman_pots/roman_pot_simu.sh
+++ b/benchmarks/roman_pots/roman_pot_simu.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-if [[ ! -n  "${JUGGLER_DETECTOR}" ]] ; then 
-  export JUGGLER_DETECTOR="topside"
+if [[ ! -n  "${DETECTOR}" ]] ; then 
+  export DETECTOR="topside"
 fi
 
 if [[ ! -n  "${JUGGLER_N_EVENTS}" ]] ; then 
@@ -15,6 +15,6 @@ ddsim --runType batch \
       --part.minimalKineticEnergy 0.5*GeV  \
       --filter.tracker edep0 \
       --numberOfEvents ${JUGGLER_N_EVENTS} \
-      --compactFile ${DETECTOR_PATH}/${JUGGLER_DETECTOR_CONFIG}.xml \
+      --compactFile ${DETECTOR_PATH}/${DETECTOR_CONFIG}.xml \
 	--inputFiles ./data/forward_ions.hepmc \
       --outputFile sim_output/${JUGGLER_SIM_FILE}
diff --git a/benchmarks/timing/run_timing.sh b/benchmarks/timing/run_timing.sh
index 34476340a9118bed1e0e3e67dde9088d6eecadec..8542d3fe3d9296a1e6f05ec87a5a94b95bbe2abd 100755
--- a/benchmarks/timing/run_timing.sh
+++ b/benchmarks/timing/run_timing.sh
@@ -56,8 +56,8 @@ if [[ ! -n  "${energy}" ]] ; then
   energy="1*GeV"
 fi
 
-if [[ ! -n "${JUGGLER_DETECTOR}" ]] ; then
-  export JUGGLER_DETECTOR="athena"
+if [[ ! -n "${DETECTOR}" ]] ; then
+  export DETECTOR="athena"
 fi
 
 if [[ ! -n "${DETECTOR_PATH}" ]] ; then
@@ -68,10 +68,10 @@ if [[ ! -n "${JUGGLER_INSTALL_PREFIX}" ]] ; then
   export JUGGLER_INSTALL_PREFIX="/usr/local"
 fi
 
-compact_path=${DETECTOR_PATH}/${JUGGLER_DETECTOR_CONFIG}.xml
+compact_path=${DETECTOR_PATH}/${DETECTOR_CONFIG}.xml
 
 echo "DETECTOR_PATH = ${DETECTOR_PATH}"
-echo "JUGGLER_DETECTOR = ${JUGGLER_DETECTOR}"
+echo "DETECTOR = ${DETECTOR}"
 
 # Run geant4 simulations
 output_dir="data/timing/${particle}/${energy/\*/}"
diff --git a/benchmarks/tracking_detectors/analysis/sim_track_hits.cxx b/benchmarks/tracking_detectors/analysis/sim_track_hits.cxx
index 3523169d17f43ad0f972200d4f4d72f182cdbbb6..19592b2678d74836348963165f37e55339d292c0 100644
--- a/benchmarks/tracking_detectors/analysis/sim_track_hits.cxx
+++ b/benchmarks/tracking_detectors/analysis/sim_track_hits.cxx
@@ -102,7 +102,7 @@ int sim_track_hits(const char* fname = "sim_track_hits.edm4hep.root") {
 
   // detect detector setup
   std::string detector = "default";
-  if (const char* env_detector = std::getenv("JUGGLER_DETECTOR_VERSION")) {
+  if (const char* env_detector = std::getenv("DETECTOR_VERSION")) {
     if (detector.find("acadia") != std::string::npos) {
       detector = "acadia";
     } else if (detector.find("canyonlands") != std::string::npos) {
diff --git a/benchmarks/tracking_detectors/track_hits.sh b/benchmarks/tracking_detectors/track_hits.sh
index fc811e0fb2db67baab4049e5c5a3fe91f5981e2d..a302916f9d42cb9e49a90e79f88901152eb3cf28 100644
--- a/benchmarks/tracking_detectors/track_hits.sh
+++ b/benchmarks/tracking_detectors/track_hits.sh
@@ -46,8 +46,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_GEN_FILE="${LOCAL_DATA_PATH}/${JUGGLER_FILE_NAME_TAG}.hepmc"
 export JUGGLER_SIM_FILE="${LOCAL_DATA_PATH}/sim_${JUGGLER_FILE_NAME_TAG}.edm4hep.root"
 
 echo "JUGGLER_N_EVENTS = ${JUGGLER_N_EVENTS}"
-echo "JUGGLER_DETECTOR = ${JUGGLER_DETECTOR}"
+echo "DETECTOR = ${DETECTOR}"
 
 
 if [ -z "${ANALYSIS_ONLY}" ] ; then
@@ -83,7 +83,7 @@ if [ -z "${ANALYSIS_ONLY}" ] ; 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/zdc/run_zdc_particles.sh b/benchmarks/zdc/run_zdc_particles.sh
index 23dd1443c899b553e17ca806d7a89edec45380ad..1c3fab3faa84e330e3cc47ed98d7dfe6eab6cf85 100755
--- a/benchmarks/zdc/run_zdc_particles.sh
+++ b/benchmarks/zdc/run_zdc_particles.sh
@@ -33,8 +33,8 @@ do
 done
 set -- "${POSITIONAL[@]}" # restore positional parameters
 
-if [[ ! -n  "${JUGGLER_DETECTOR}" ]] ; then 
-  export JUGGLER_DETECTOR="topside"
+if [[ ! -n  "${DETECTOR}" ]] ; then 
+  export DETECTOR="topside"
 fi
 
 if [[ ! -n  "${JUGGLER_N_EVENTS}" ]] ; then 
@@ -62,7 +62,7 @@ export RESULTS_PATH="results/far_forward/zdc/"
 mkdir -p "${RESULTS_PATH}"
 
 echo "JUGGLER_N_EVENTS = ${JUGGLER_N_EVENTS}"
-echo "JUGGLER_DETECTOR = ${JUGGLER_DETECTOR}"
+echo "DETECTOR = ${DETECTOR}"
 
 # Generate the input events
 root -b -q "benchmarks/zdc/scripts/gen_zdc_particles.cxx+(${JUGGLER_N_EVENTS}, \"${PARTICLE}\", ${E_start}, ${E_end}, \"${JUGGLER_FILE_NAME_TAG}.hepmc\")"
@@ -77,7 +77,7 @@ ddsim --runType batch \
       --part.minimalKineticEnergy 0.5*GeV  \
       --filter.tracker edep0 \
       --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