diff --git a/benchmarks/dis/analysis-only.sh b/benchmarks/dis/analysis-only.sh
index 15ffe96ca5dc0546c500467035a1d752cea2fbe7..1cff20449a6522acc00f27b8e338d97643de2790 100755
--- a/benchmarks/dis/analysis-only.sh
+++ b/benchmarks/dis/analysis-only.sh
@@ -62,7 +62,7 @@ echo "Running Geant4 simulation"
 #      --filter.tracker edep0 \
 #      -v WARNING \
 #      --numberOfEvents ${JUGGLER_N_EVENTS} \
-#      --compactFile ${DETECTOR_PATH}/${JUGGLER_DETECTOR}.xml \
+#      --compactFile ${DETECTOR_PATH}/${JUGGLER_DETECTOR_CONFIG}.xml \
 #      --inputFiles ${GEN_FILE} \
 #      --outputFile ${SIM_FILE}
 #if [ "$?" -ne "0" ] ; then
diff --git a/benchmarks/dis/dis.sh b/benchmarks/dis/dis.sh
index 2a2ae0a8fc455122b89238d04b6b5a22f624ec7b..43897bed588ffc081dd519b20ac356eb9efdfa64 100755
--- a/benchmarks/dis/dis.sh
+++ b/benchmarks/dis/dis.sh
@@ -67,7 +67,7 @@ ddsim --runType batch \
       --filter.tracker edep0 \
       -v INFO \
       --numberOfEvents ${JUGGLER_N_EVENTS} \
-      --compactFile ${DETECTOR_PATH}/${JUGGLER_DETECTOR}.xml \
+      --compactFile ${DETECTOR_PATH}/${JUGGLER_DETECTOR_CONFIG}.xml \
       --inputFiles ${GEN_FILE} \
       --outputFile ${SIM_FILE}
 if [ "$?" -ne "0" ] ; then
diff --git a/benchmarks/dvcs/dvcs.sh b/benchmarks/dvcs/dvcs.sh
index 4b26aef0a3835429b475e7fb8ffc5e92be4e510e..73c6c89fba5913f7541643cc17d282fe058feb33 100644
--- a/benchmarks/dvcs/dvcs.sh
+++ b/benchmarks/dvcs/dvcs.sh
@@ -105,7 +105,7 @@ if [[ -n "${DO_SIM}" || -n "${DO_ALL}" ]] ; then
     --filter.tracker edep0 \
     -v ERROR \
     --numberOfEvents ${JUGGLER_N_EVENTS} \
-    --compactFile ${DETECTOR_PATH}/${JUGGLER_DETECTOR}.xml \
+    --compactFile ${DETECTOR_PATH}/${JUGGLER_DETECTOR_CONFIG}.xml \
     --inputFiles "${JUGGLER_MC_FILE}" \
     --outputFile  ${JUGGLER_SIM_FILE}
   if [[ "$?" -ne "0" ]] ; then
diff --git a/benchmarks/dvmp/dvmp.sh b/benchmarks/dvmp/dvmp.sh
index 304e792c670d1413c7f5f19e261ba10b8c2791ca..ce165df359be723fe7c1187963ffd08d1b011ca4 100755
--- a/benchmarks/dvmp/dvmp.sh
+++ b/benchmarks/dvmp/dvmp.sh
@@ -65,7 +65,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 ${GEN_FILE} \
       --outputFile ${SIM_FILE}
 if [ "$?" -ne "0" ] ; then
@@ -106,7 +106,7 @@ cat << EOF > ${CONFIG}
   "rec_file": "${REC_FILE}",
   "vm_name": "${LEADING}",
   "decay": "${DECAY}",
-  "detector": "${JUGGLER_DETECTOR}",
+  "detector": "${JUGGLER_DETECTOR_CONFIG}",
   "output_prefix": "${RESULTS_PATH}/${PLOT_TAG}",
   "test_tag": "${LEADING}_${DECAY}_${BEAM_TAG}"
 }
diff --git a/benchmarks/single/simulate.sh b/benchmarks/single/simulate.sh
index 5b06b0c082e5045c953cfd9167ca0d30c1f989e4..6466beca35277523df577d7829470c47d14d2633 100644
--- a/benchmarks/single/simulate.sh
+++ b/benchmarks/single/simulate.sh
@@ -11,7 +11,7 @@ ddsim --runType run \
       --numberOfEvents ${JUGGLER_N_EVENTS} \
       --part.minimalKineticEnergy 1*TeV  \
       --filter.tracker edep0 \
-      --compactFile ${DETECTOR_PATH}/${JUGGLER_DETECTOR}.xml \
+      --compactFile ${DETECTOR_PATH}/${JUGGLER_DETECTOR_CONFIG}.xml \
       --outputFile  ${JUGGLER_SIM_FILE}
 if [[ "$?" -ne "0" ]] ; then
   echo "ERROR running ddsim"
diff --git a/benchmarks/synchrotron/synchrotron.sh b/benchmarks/synchrotron/synchrotron.sh
index 9de437b839a313fa21dd5561cc52424f17763fe0..45ff4edd0f44052023d55a1ccbf0a11e36c8187b 100644
--- a/benchmarks/synchrotron/synchrotron.sh
+++ b/benchmarks/synchrotron/synchrotron.sh
@@ -105,7 +105,7 @@ if [[ -n "${DO_SIM}" || -n "${DO_ALL}" ]] ; then
     --filter.tracker edep0 \
     -v ERROR \
     --numberOfEvents ${JUGGLER_N_EVENTS} \
-    --compactFile ${DETECTOR_PATH}/${JUGGLER_DETECTOR}.xml \
+    --compactFile ${DETECTOR_PATH}/${JUGGLER_DETECTOR_CONFIG}.xml \
     --inputFiles ${JUGGLER_MC_FILE} \
     --outputFile ${JUGGLER_SIM_FILE}
   if [[ "$?" -ne "0" ]] ; then
diff --git a/benchmarks/tcs/tcs.sh b/benchmarks/tcs/tcs.sh
index c9e66ecc0508feb99fb18d7cb242ad0f268641c5..63b384c78755e99d30c34ccffd28a0cc8f48ede7 100644
--- a/benchmarks/tcs/tcs.sh
+++ b/benchmarks/tcs/tcs.sh
@@ -126,7 +126,7 @@ if [[ -n "${DO_SIM}" || -n "${DO_ALL}" ]] ; then
     --filter.tracker edep0 \
     -v ERROR \
     --numberOfEvents ${JUGGLER_N_EVENTS} \
-    --compactFile ${DETECTOR_PATH}/${JUGGLER_DETECTOR}.xml \
+    --compactFile ${DETECTOR_PATH}/${JUGGLER_DETECTOR_CONFIG}.xml \
     --inputFiles "${JUGGLER_MC_FILE}" \
     --outputFile  ${JUGGLER_SIM_FILE}
   if [ "$?" -ne "0" ] ; then
diff --git a/benchmarks/u_omega/u_omega.sh b/benchmarks/u_omega/u_omega.sh
index 8382606f07a324ca51232f66ab6316adc0fd72f5..1052c787f6b681f420beb190921139e9426575d8 100644
--- a/benchmarks/u_omega/u_omega.sh
+++ b/benchmarks/u_omega/u_omega.sh
@@ -104,7 +104,7 @@ if [[ -n "${DO_SIM}" || -n "${DO_ALL}" ]] ; then
     --filter.tracker edep0 \
     -v ERROR \
     --numberOfEvents ${JUGGLER_N_EVENTS} \
-    --compactFile ${DETECTOR_PATH}/${JUGGLER_DETECTOR}.xml \
+    --compactFile ${DETECTOR_PATH}/${JUGGLER_DETECTOR_CONFIG}.xml \
     --inputFiles "${JUGGLER_MC_FILE}" \
     --outputFile  ${JUGGLER_SIM_FILE}
   if [[ "$?" -ne "0" ]] ; then
diff --git a/options/reconstruction.ecal.py b/options/reconstruction.ecal.py
index fc0aef8c881d5ce3a2e76245e93b9b7cb5dac260..120f4c836465d43d6a3091129a77b4af3a3ef64c 100644
--- a/options/reconstruction.ecal.py
+++ b/options/reconstruction.ecal.py
@@ -7,8 +7,8 @@ from GaudiKernel.SystemOfUnits import MeV, GeV, mm, cm, mrad
 import json
 
 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/options/reconstruction.hcal.py b/options/reconstruction.hcal.py
index b72fec2b9550beaefdb61a0512c94b6dbfffc4af..423f76846e1b9b74abc79c05859fd309c5fd9a49 100644
--- a/options/reconstruction.hcal.py
+++ b/options/reconstruction.hcal.py
@@ -7,8 +7,8 @@ from GaudiKernel.SystemOfUnits import MeV, GeV, mm, cm, mrad
 import json
 
 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/options/reconstruction.py b/options/reconstruction.py
index 6d75f0d9619ef3517b53450608f2a8f43f81c0b5..3afd793fe41dce28eaf81a2c90ce46fce7e2a5af 100644
--- a/options/reconstruction.py
+++ b/options/reconstruction.py
@@ -8,8 +8,8 @@ import json
 from math import sqrt
 
 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/options/reconstruction.raw.py b/options/reconstruction.raw.py
index 6e4ba88d09343ee5c12a44770530336556a7f955..47322563cefc4a52eaa504edbf4f53e92e1a2cde 100644
--- a/options/reconstruction.raw.py
+++ b/options/reconstruction.raw.py
@@ -7,8 +7,8 @@ from GaudiKernel.SystemOfUnits import MeV, GeV, mm, cm, mrad
 import json
 
 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 :