From d41e77cc796eb7632ef2a5518ed5aa99a1398085 Mon Sep 17 00:00:00 2001
From: Douglas Clowes <dcl@ansto.gov.au>
Date: Wed, 22 Oct 2014 16:03:22 +1100
Subject: [PATCH] Regenerate the affected drivers

---
 .../config/chopper/astrium_chopper_sct.tcl    | 16 ++--
 .../bilby/config/motors/shutters_sct.tcl      | 12 +--
 .../bilby/config/motors/tank_sct.tcl          | 20 ++--
 .../config/environment/hiden_xcs_sct.tcl      | 56 +++++------
 .../config/environment/huber_pilot_sct.tcl    | 28 +++---
 .../config/environment/isotech_ps_sct.tcl     | 12 +--
 .../environment/magneticField/tsi_smc_sct.tcl | 44 ++++-----
 .../config/environment/nhq_200_sct.tcl        | 96 +++++++++----------
 .../config/environment/omron_hldc_sct.tcl     |  8 +-
 .../temperature/julabo_lh45_gen_sct.tcl       | 36 +++----
 .../temperature/lakeshore_218_sct.tcl         | 36 +++----
 .../temperature/mercury_base_sct.tcl          | 48 +++++-----
 .../temperature/mercury_level_sct.tcl         |  8 +-
 .../temperature/mercury_pres_sct.tcl          | 12 +--
 .../temperature/mercury_scpi_sct.tcl          | 80 ++++++++--------
 .../temperature/mercury_temp_sct.tcl          | 16 ++--
 .../temperature/mercury_valve_sct.tcl         |  8 +-
 .../temperature/pfeiffer_hg_sct.tcl           |  8 +-
 .../environment/temperature/west_6100_sct.tcl | 44 ++++-----
 .../config/source/reactor_status_sct.tcl      |  4 +-
 20 files changed, 296 insertions(+), 296 deletions(-)

diff --git a/site_ansto/instrument/bilby/config/chopper/astrium_chopper_sct.tcl b/site_ansto/instrument/bilby/config/chopper/astrium_chopper_sct.tcl
index a32f1e98..b081bbea 100644
--- a/site_ansto/instrument/bilby/config/chopper/astrium_chopper_sct.tcl
+++ b/site_ansto/instrument/bilby/config/chopper/astrium_chopper_sct.tcl
@@ -342,10 +342,10 @@ proc ::scobj::astrium_chopper::mkDriver { sct_controller name device_class simul
 
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} poll ${scobj_hpath}/disk_1/state 1
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/disk_1/state simulated false
     } else {
       ::scobj::astrium_chopper::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for astrium_chopper"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/disk_1/state simulated true
     }
     hsetprop ${scobj_hpath}/disk_1 data "true"
     hsetprop ${scobj_hpath}/disk_1 klass "@none"
@@ -444,10 +444,10 @@ proc ::scobj::astrium_chopper::mkDriver { sct_controller name device_class simul
 
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} poll ${scobj_hpath}/disk_2/state 1
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/disk_2/state simulated false
     } else {
       ::scobj::astrium_chopper::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for astrium_chopper"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/disk_2/state simulated true
     }
     hsetprop ${scobj_hpath}/disk_2 data "true"
     hsetprop ${scobj_hpath}/disk_2 klass "@none"
@@ -546,10 +546,10 @@ proc ::scobj::astrium_chopper::mkDriver { sct_controller name device_class simul
 
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} poll ${scobj_hpath}/disk_3/state 1
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/disk_3/state simulated false
     } else {
       ::scobj::astrium_chopper::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for astrium_chopper"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/disk_3/state simulated true
     }
     hsetprop ${scobj_hpath}/disk_3 data "true"
     hsetprop ${scobj_hpath}/disk_3 klass "@none"
@@ -648,10 +648,10 @@ proc ::scobj::astrium_chopper::mkDriver { sct_controller name device_class simul
 
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} poll ${scobj_hpath}/disk_4/state 1
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/disk_4/state simulated false
     } else {
       ::scobj::astrium_chopper::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for astrium_chopper"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/disk_4/state simulated true
     }
     hsetprop ${scobj_hpath}/disk_4 data "true"
     hsetprop ${scobj_hpath}/disk_4 klass "@none"
diff --git a/site_ansto/instrument/bilby/config/motors/shutters_sct.tcl b/site_ansto/instrument/bilby/config/motors/shutters_sct.tcl
index 09806f35..7bbf5a24 100644
--- a/site_ansto/instrument/bilby/config/motors/shutters_sct.tcl
+++ b/site_ansto/instrument/bilby/config/motors/shutters_sct.tcl
@@ -222,10 +222,10 @@ proc ::scobj::shutters::mkDriver { sct_controller name device_class simulation_f
 
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} poll ${scobj_hpath}/fast_shutter 1
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/fast_shutter simulated false
     } else {
       ::scobj::shutters::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for shutters"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/fast_shutter simulated true
     }
 
     # Start of var: rough_100
@@ -249,10 +249,10 @@ proc ::scobj::shutters::mkDriver { sct_controller name device_class simulation_f
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} poll ${scobj_hpath}/rough_100 1
       ${sct_controller} write ${scobj_hpath}/rough_100
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/rough_100 simulated false
     } else {
       ::scobj::shutters::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for shutters"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/rough_100 simulated true
     }
 
     # Start of var: rough_40
@@ -276,10 +276,10 @@ proc ::scobj::shutters::mkDriver { sct_controller name device_class simulation_f
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} poll ${scobj_hpath}/rough_40 1
       ${sct_controller} write ${scobj_hpath}/rough_40
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/rough_40 simulated false
     } else {
       ::scobj::shutters::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for shutters"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/rough_40 simulated true
     }
 
     hsetprop ${scobj_hpath} data "true"
diff --git a/site_ansto/instrument/bilby/config/motors/tank_sct.tcl b/site_ansto/instrument/bilby/config/motors/tank_sct.tcl
index eada4418..3e0fd483 100644
--- a/site_ansto/instrument/bilby/config/motors/tank_sct.tcl
+++ b/site_ansto/instrument/bilby/config/motors/tank_sct.tcl
@@ -230,10 +230,10 @@ proc ::scobj::tank::mkDriver { sct_controller name device_class simulation_flag
 
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} poll ${scobj_hpath}/pos 1
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/pos simulated false
     } else {
       ::scobj::tank::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for tank"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/pos simulated true
     }
 
     hsetprop ${scobj_hpath} data "true"
@@ -260,10 +260,10 @@ proc ::scobj::tank::mkDriver { sct_controller name device_class simulation_flag
 
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} poll ${scobj_hpath}/limits/forward 1
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/limits/forward simulated false
     } else {
       ::scobj::tank::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for tank"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/limits/forward simulated true
     }
 
     # Start of var: reverse
@@ -282,10 +282,10 @@ proc ::scobj::tank::mkDriver { sct_controller name device_class simulation_flag
 
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} poll ${scobj_hpath}/limits/reverse 1
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/limits/reverse simulated false
     } else {
       ::scobj::tank::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for tank"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/limits/reverse simulated true
     }
     hsetprop ${scobj_hpath}/limits data "true"
     hsetprop ${scobj_hpath}/limits klass "@none"
@@ -311,10 +311,10 @@ proc ::scobj::tank::mkDriver { sct_controller name device_class simulation_flag
 
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} poll ${scobj_hpath}/switches/forward 1
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/switches/forward simulated false
     } else {
       ::scobj::tank::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for tank"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/switches/forward simulated true
     }
 
     # Start of var: reverse
@@ -333,10 +333,10 @@ proc ::scobj::tank::mkDriver { sct_controller name device_class simulation_flag
 
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} poll ${scobj_hpath}/switches/reverse 1
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/switches/reverse simulated false
     } else {
       ::scobj::tank::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for tank"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/switches/reverse simulated true
     }
     hsetprop ${scobj_hpath}/switches data "true"
     hsetprop ${scobj_hpath}/switches klass "@none"
diff --git a/site_ansto/instrument/config/environment/hiden_xcs_sct.tcl b/site_ansto/instrument/config/environment/hiden_xcs_sct.tcl
index d3ce66a7..6886500c 100644
--- a/site_ansto/instrument/config/environment/hiden_xcs_sct.tcl
+++ b/site_ansto/instrument/config/environment/hiden_xcs_sct.tcl
@@ -786,10 +786,10 @@ proc ::scobj::hiden_xcs::mkDriver { sct_controller name device_class simulation_
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} poll ${scobj_hpath}/enabled 10
       ${sct_controller} write ${scobj_hpath}/enabled
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/enabled simulated false
     } else {
       ::scobj::hiden_xcs::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for hiden_xcs"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/enabled simulated true
     }
 
     # Start of var: flow1
@@ -879,10 +879,10 @@ proc ::scobj::hiden_xcs::mkDriver { sct_controller name device_class simulation_
 
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} poll ${scobj_hpath}/analog/ansto_temp 5
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/analog/ansto_temp simulated false
     } else {
       ::scobj::hiden_xcs::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for hiden_xcs"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/analog/ansto_temp simulated true
     }
 
     # Start of var: pv1
@@ -902,10 +902,10 @@ proc ::scobj::hiden_xcs::mkDriver { sct_controller name device_class simulation_
 
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} poll ${scobj_hpath}/analog/pv1 5
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/analog/pv1 simulated false
     } else {
       ::scobj::hiden_xcs::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for hiden_xcs"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/analog/pv1 simulated true
     }
 
     # Start of var: pv2
@@ -925,10 +925,10 @@ proc ::scobj::hiden_xcs::mkDriver { sct_controller name device_class simulation_
 
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} poll ${scobj_hpath}/analog/pv2 5
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/analog/pv2 simulated false
     } else {
       ::scobj::hiden_xcs::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for hiden_xcs"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/analog/pv2 simulated true
     }
 
     # Start of var: pv3
@@ -948,10 +948,10 @@ proc ::scobj::hiden_xcs::mkDriver { sct_controller name device_class simulation_
 
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} poll ${scobj_hpath}/analog/pv3 5
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/analog/pv3 simulated false
     } else {
       ::scobj::hiden_xcs::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for hiden_xcs"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/analog/pv3 simulated true
     }
 
     # Start of var: rhsense
@@ -971,10 +971,10 @@ proc ::scobj::hiden_xcs::mkDriver { sct_controller name device_class simulation_
 
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} poll ${scobj_hpath}/analog/rhsense 5
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/analog/rhsense simulated false
     } else {
       ::scobj::hiden_xcs::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for hiden_xcs"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/analog/rhsense simulated true
     }
 
     # Start of var: rhtemp
@@ -994,10 +994,10 @@ proc ::scobj::hiden_xcs::mkDriver { sct_controller name device_class simulation_
 
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} poll ${scobj_hpath}/analog/rhtemp 5
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/analog/rhtemp simulated false
     } else {
       ::scobj::hiden_xcs::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for hiden_xcs"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/analog/rhtemp simulated true
     }
 
     # Start of var: sp1
@@ -1021,10 +1021,10 @@ proc ::scobj::hiden_xcs::mkDriver { sct_controller name device_class simulation_
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} poll ${scobj_hpath}/analog/sp1 5
       ${sct_controller} write ${scobj_hpath}/analog/sp1
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/analog/sp1 simulated false
     } else {
       ::scobj::hiden_xcs::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for hiden_xcs"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/analog/sp1 simulated true
     }
 
     # Start of var: sp2
@@ -1048,10 +1048,10 @@ proc ::scobj::hiden_xcs::mkDriver { sct_controller name device_class simulation_
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} poll ${scobj_hpath}/analog/sp2 5
       ${sct_controller} write ${scobj_hpath}/analog/sp2
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/analog/sp2 simulated false
     } else {
       ::scobj::hiden_xcs::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for hiden_xcs"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/analog/sp2 simulated true
     }
 
     # Start of var: sp3
@@ -1075,10 +1075,10 @@ proc ::scobj::hiden_xcs::mkDriver { sct_controller name device_class simulation_
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} poll ${scobj_hpath}/analog/sp3 5
       ${sct_controller} write ${scobj_hpath}/analog/sp3
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/analog/sp3 simulated false
     } else {
       ::scobj::hiden_xcs::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for hiden_xcs"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/analog/sp3 simulated true
     }
     hsetprop ${scobj_hpath}/analog data "false"
     hsetprop ${scobj_hpath}/analog klass "@none"
@@ -1113,10 +1113,10 @@ proc ::scobj::hiden_xcs::mkDriver { sct_controller name device_class simulation_
 
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} poll ${scobj_hpath}/flow/sensor 1
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/flow/sensor simulated false
     } else {
       ::scobj::hiden_xcs::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for hiden_xcs"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/flow/sensor simulated true
     }
 
     # Start of var: setpoint
@@ -1147,10 +1147,10 @@ proc ::scobj::hiden_xcs::mkDriver { sct_controller name device_class simulation_
 
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} write ${scobj_hpath}/flow/setpoint
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/flow/setpoint simulated false
     } else {
       ::scobj::hiden_xcs::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for hiden_xcs"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/flow/setpoint simulated true
     }
     hsetprop ${scobj_hpath}/flow data "true"
     hsetprop ${scobj_hpath}/flow klass "@none"
@@ -1187,10 +1187,10 @@ proc ::scobj::hiden_xcs::mkDriver { sct_controller name device_class simulation_
 
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} poll ${scobj_hpath}/humidity/sensor 1
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/humidity/sensor simulated false
     } else {
       ::scobj::hiden_xcs::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for hiden_xcs"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/humidity/sensor simulated true
     }
 
     # Start of var: setpoint
@@ -1221,10 +1221,10 @@ proc ::scobj::hiden_xcs::mkDriver { sct_controller name device_class simulation_
 
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} write ${scobj_hpath}/humidity/setpoint
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/humidity/setpoint simulated false
     } else {
       ::scobj::hiden_xcs::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for hiden_xcs"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/humidity/setpoint simulated true
     }
     hsetprop ${scobj_hpath}/humidity data "true"
     hsetprop ${scobj_hpath}/humidity klass "@none"
diff --git a/site_ansto/instrument/config/environment/huber_pilot_sct.tcl b/site_ansto/instrument/config/environment/huber_pilot_sct.tcl
index e6be7f1a..5c7239e8 100644
--- a/site_ansto/instrument/config/environment/huber_pilot_sct.tcl
+++ b/site_ansto/instrument/config/environment/huber_pilot_sct.tcl
@@ -327,10 +327,10 @@ proc ::scobj::huber_pilot::mkDriver { sct_controller name device_class simulatio
 
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} poll ${scobj_hpath}/Loop1/sensor_int 1
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/Loop1/sensor_int simulated false
     } else {
       ::scobj::huber_pilot::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for huber_pilot"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/Loop1/sensor_int simulated true
     }
 
     # Start of var: setpoint
@@ -364,10 +364,10 @@ proc ::scobj::huber_pilot::mkDriver { sct_controller name device_class simulatio
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} poll ${scobj_hpath}/Loop1/setpoint 1
       ${sct_controller} write ${scobj_hpath}/Loop1/setpoint
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/Loop1/setpoint simulated false
     } else {
       ::scobj::huber_pilot::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for huber_pilot"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/Loop1/setpoint simulated true
     }
 
     # Start of var: vMaxSP
@@ -386,10 +386,10 @@ proc ::scobj::huber_pilot::mkDriver { sct_controller name device_class simulatio
 
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} poll ${scobj_hpath}/Loop1/vMaxSP 1
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/Loop1/vMaxSP simulated false
     } else {
       ::scobj::huber_pilot::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for huber_pilot"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/Loop1/vMaxSP simulated true
     }
 
     # Start of var: vMinSP
@@ -408,10 +408,10 @@ proc ::scobj::huber_pilot::mkDriver { sct_controller name device_class simulatio
 
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} poll ${scobj_hpath}/Loop1/vMinSP 1
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/Loop1/vMinSP simulated false
     } else {
       ::scobj::huber_pilot::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for huber_pilot"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/Loop1/vMinSP simulated true
     }
 
     # Start of var: vTE
@@ -432,10 +432,10 @@ proc ::scobj::huber_pilot::mkDriver { sct_controller name device_class simulatio
 
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} poll ${scobj_hpath}/Loop1/vTE 1
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/Loop1/vTE simulated false
     } else {
       ::scobj::huber_pilot::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for huber_pilot"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/Loop1/vTE simulated true
     }
 
     # Start of var: vTmpActive
@@ -454,10 +454,10 @@ proc ::scobj::huber_pilot::mkDriver { sct_controller name device_class simulatio
 
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} poll ${scobj_hpath}/Loop1/vTmpActive 1
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/Loop1/vTmpActive simulated false
     } else {
       ::scobj::huber_pilot::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for huber_pilot"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/Loop1/vTmpActive simulated true
     }
 
     # Start of var: vTmpMode
@@ -476,10 +476,10 @@ proc ::scobj::huber_pilot::mkDriver { sct_controller name device_class simulatio
 
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} poll ${scobj_hpath}/Loop1/vTmpMode 1
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/Loop1/vTmpMode simulated false
     } else {
       ::scobj::huber_pilot::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for huber_pilot"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/Loop1/vTmpMode simulated true
     }
     hsetprop ${scobj_hpath}/Loop1 data "true"
     hsetprop ${scobj_hpath}/Loop1 klass "@none"
diff --git a/site_ansto/instrument/config/environment/isotech_ps_sct.tcl b/site_ansto/instrument/config/environment/isotech_ps_sct.tcl
index a3a2c12e..7026be6d 100644
--- a/site_ansto/instrument/config/environment/isotech_ps_sct.tcl
+++ b/site_ansto/instrument/config/environment/isotech_ps_sct.tcl
@@ -270,10 +270,10 @@ proc ::scobj::isotech_ps::mkDriver { sct_controller name device_class simulation
 
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} poll ${scobj_hpath}/amps 5
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/amps simulated false
     } else {
       ::scobj::isotech_ps::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for isotech_ps"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/amps simulated true
     }
 
     # Start of var: relay
@@ -296,10 +296,10 @@ proc ::scobj::isotech_ps::mkDriver { sct_controller name device_class simulation
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} poll ${scobj_hpath}/relay 5
       ${sct_controller} write ${scobj_hpath}/relay
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/relay simulated false
     } else {
       ::scobj::isotech_ps::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for isotech_ps"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/relay simulated true
     }
 
     # Start of var: volts
@@ -323,10 +323,10 @@ proc ::scobj::isotech_ps::mkDriver { sct_controller name device_class simulation
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} poll ${scobj_hpath}/volts 5
       ${sct_controller} write ${scobj_hpath}/volts
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/volts simulated false
     } else {
       ::scobj::isotech_ps::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for isotech_ps"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/volts simulated true
     }
 
     hsetprop ${scobj_hpath} data "true"
diff --git a/site_ansto/instrument/config/environment/magneticField/tsi_smc_sct.tcl b/site_ansto/instrument/config/environment/magneticField/tsi_smc_sct.tcl
index 60909683..0f0b4b2b 100644
--- a/site_ansto/instrument/config/environment/magneticField/tsi_smc_sct.tcl
+++ b/site_ansto/instrument/config/environment/magneticField/tsi_smc_sct.tcl
@@ -310,10 +310,10 @@ proc ::scobj::tsi_smc::mkDriver { sct_controller name device_class simulation_fl
 
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} write ${scobj_hpath}/setpoint
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/setpoint simulated false
     } else {
       ::scobj::tsi_smc::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for tsi_smc"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/setpoint simulated true
     }
 
     # Start of var: value
@@ -357,10 +357,10 @@ proc ::scobj::tsi_smc::mkDriver { sct_controller name device_class simulation_fl
 
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} poll ${scobj_hpath}/a/G 1
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/a/G simulated false
     } else {
       ::scobj::tsi_smc::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for tsi_smc"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/a/G simulated true
     }
 
     # Start of var: J
@@ -378,10 +378,10 @@ proc ::scobj::tsi_smc::mkDriver { sct_controller name device_class simulation_fl
 
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} poll ${scobj_hpath}/a/J 1
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/a/J simulated false
     } else {
       ::scobj::tsi_smc::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for tsi_smc"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/a/J simulated true
     }
 
     # Start of var: K
@@ -399,10 +399,10 @@ proc ::scobj::tsi_smc::mkDriver { sct_controller name device_class simulation_fl
 
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} poll ${scobj_hpath}/a/K 1
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/a/K simulated false
     } else {
       ::scobj::tsi_smc::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for tsi_smc"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/a/K simulated true
     }
 
     # Start of var: N
@@ -420,10 +420,10 @@ proc ::scobj::tsi_smc::mkDriver { sct_controller name device_class simulation_fl
 
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} poll ${scobj_hpath}/a/N 1
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/a/N simulated false
     } else {
       ::scobj::tsi_smc::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for tsi_smc"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/a/N simulated true
     }
 
     # Start of var: O
@@ -441,10 +441,10 @@ proc ::scobj::tsi_smc::mkDriver { sct_controller name device_class simulation_fl
 
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} poll ${scobj_hpath}/a/O 1
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/a/O simulated false
     } else {
       ::scobj::tsi_smc::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for tsi_smc"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/a/O simulated true
     }
 
     # Start of var: S
@@ -462,10 +462,10 @@ proc ::scobj::tsi_smc::mkDriver { sct_controller name device_class simulation_fl
 
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} poll ${scobj_hpath}/a/S 1
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/a/S simulated false
     } else {
       ::scobj::tsi_smc::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for tsi_smc"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/a/S simulated true
     }
     hsetprop ${scobj_hpath}/a data "false"
     hsetprop ${scobj_hpath}/a klass "@none"
@@ -495,10 +495,10 @@ proc ::scobj::tsi_smc::mkDriver { sct_controller name device_class simulation_fl
 
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} write ${scobj_hpath}/b/Lower
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/b/Lower simulated false
     } else {
       ::scobj::tsi_smc::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for tsi_smc"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/b/Lower simulated true
     }
 
     # Start of var: Pause
@@ -521,10 +521,10 @@ proc ::scobj::tsi_smc::mkDriver { sct_controller name device_class simulation_fl
 
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} write ${scobj_hpath}/b/Pause
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/b/Pause simulated false
     } else {
       ::scobj::tsi_smc::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for tsi_smc"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/b/Pause simulated true
     }
 
     # Start of var: Ramp
@@ -547,10 +547,10 @@ proc ::scobj::tsi_smc::mkDriver { sct_controller name device_class simulation_fl
 
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} write ${scobj_hpath}/b/Ramp
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/b/Ramp simulated false
     } else {
       ::scobj::tsi_smc::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for tsi_smc"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/b/Ramp simulated true
     }
 
     # Start of var: Rate
@@ -570,10 +570,10 @@ proc ::scobj::tsi_smc::mkDriver { sct_controller name device_class simulation_fl
 
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} write ${scobj_hpath}/b/Rate
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/b/Rate simulated false
     } else {
       ::scobj::tsi_smc::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for tsi_smc"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/b/Rate simulated true
     }
     hsetprop ${scobj_hpath}/b data "true"
     hsetprop ${scobj_hpath}/b klass "@none"
diff --git a/site_ansto/instrument/config/environment/nhq_200_sct.tcl b/site_ansto/instrument/config/environment/nhq_200_sct.tcl
index f9de7e1c..0f191b3f 100644
--- a/site_ansto/instrument/config/environment/nhq_200_sct.tcl
+++ b/site_ansto/instrument/config/environment/nhq_200_sct.tcl
@@ -303,10 +303,10 @@ proc ::scobj::nhq_200::mkDriver { sct_controller name device_class simulation_fl
 
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} poll ${scobj_hpath}/break 10
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/break simulated false
     } else {
       ::scobj::nhq_200::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for nhq_200"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/break simulated true
     }
 
     # Start of var: id
@@ -325,10 +325,10 @@ proc ::scobj::nhq_200::mkDriver { sct_controller name device_class simulation_fl
 
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} poll ${scobj_hpath}/id 10
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/id simulated false
     } else {
       ::scobj::nhq_200::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for nhq_200"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/id simulated true
     }
 
     hsetprop ${scobj_hpath} data "true"
@@ -359,10 +359,10 @@ proc ::scobj::nhq_200::mkDriver { sct_controller name device_class simulation_fl
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} poll ${scobj_hpath}/ch1/auto_start 5
       ${sct_controller} write ${scobj_hpath}/ch1/auto_start
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/ch1/auto_start simulated false
     } else {
       ::scobj::nhq_200::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for nhq_200"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/ch1/auto_start simulated true
     }
 
     # Start of var: current
@@ -381,10 +381,10 @@ proc ::scobj::nhq_200::mkDriver { sct_controller name device_class simulation_fl
 
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} poll ${scobj_hpath}/ch1/current 5
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/ch1/current simulated false
     } else {
       ::scobj::nhq_200::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for nhq_200"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/ch1/current simulated true
     }
 
     # Start of var: go
@@ -404,10 +404,10 @@ proc ::scobj::nhq_200::mkDriver { sct_controller name device_class simulation_fl
 
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} write ${scobj_hpath}/ch1/go
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/ch1/go simulated false
     } else {
       ::scobj::nhq_200::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for nhq_200"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/ch1/go simulated true
     }
 
     # Start of var: i_lim
@@ -426,10 +426,10 @@ proc ::scobj::nhq_200::mkDriver { sct_controller name device_class simulation_fl
 
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} poll ${scobj_hpath}/ch1/i_lim 5
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/ch1/i_lim simulated false
     } else {
       ::scobj::nhq_200::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for nhq_200"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/ch1/i_lim simulated true
     }
 
     # Start of var: i_trip
@@ -452,10 +452,10 @@ proc ::scobj::nhq_200::mkDriver { sct_controller name device_class simulation_fl
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} poll ${scobj_hpath}/ch1/i_trip 5
       ${sct_controller} write ${scobj_hpath}/ch1/i_trip
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/ch1/i_trip simulated false
     } else {
       ::scobj::nhq_200::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for nhq_200"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/ch1/i_trip simulated true
     }
 
     # Start of var: module
@@ -474,10 +474,10 @@ proc ::scobj::nhq_200::mkDriver { sct_controller name device_class simulation_fl
 
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} poll ${scobj_hpath}/ch1/module 5
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/ch1/module simulated false
     } else {
       ::scobj::nhq_200::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for nhq_200"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/ch1/module simulated true
     }
 
     # Start of var: status
@@ -496,10 +496,10 @@ proc ::scobj::nhq_200::mkDriver { sct_controller name device_class simulation_fl
 
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} poll ${scobj_hpath}/ch1/status 5
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/ch1/status simulated false
     } else {
       ::scobj::nhq_200::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for nhq_200"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/ch1/status simulated true
     }
 
     # Start of var: v_lim
@@ -518,10 +518,10 @@ proc ::scobj::nhq_200::mkDriver { sct_controller name device_class simulation_fl
 
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} poll ${scobj_hpath}/ch1/v_lim 5
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/ch1/v_lim simulated false
     } else {
       ::scobj::nhq_200::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for nhq_200"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/ch1/v_lim simulated true
     }
 
     # Start of var: v_ramp
@@ -544,10 +544,10 @@ proc ::scobj::nhq_200::mkDriver { sct_controller name device_class simulation_fl
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} poll ${scobj_hpath}/ch1/v_ramp 5
       ${sct_controller} write ${scobj_hpath}/ch1/v_ramp
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/ch1/v_ramp simulated false
     } else {
       ::scobj::nhq_200::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for nhq_200"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/ch1/v_ramp simulated true
     }
 
     # Start of var: v_sp
@@ -579,10 +579,10 @@ proc ::scobj::nhq_200::mkDriver { sct_controller name device_class simulation_fl
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} poll ${scobj_hpath}/ch1/v_sp 5
       ${sct_controller} write ${scobj_hpath}/ch1/v_sp
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/ch1/v_sp simulated false
     } else {
       ::scobj::nhq_200::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for nhq_200"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/ch1/v_sp simulated true
     }
 
     # Start of var: voltage
@@ -601,10 +601,10 @@ proc ::scobj::nhq_200::mkDriver { sct_controller name device_class simulation_fl
 
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} poll ${scobj_hpath}/ch1/voltage 5
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/ch1/voltage simulated false
     } else {
       ::scobj::nhq_200::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for nhq_200"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/ch1/voltage simulated true
     }
     hsetprop ${scobj_hpath}/ch1 data "true"
     hsetprop ${scobj_hpath}/ch1 klass "@none"
@@ -635,10 +635,10 @@ proc ::scobj::nhq_200::mkDriver { sct_controller name device_class simulation_fl
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} poll ${scobj_hpath}/ch2/auto_start 5
       ${sct_controller} write ${scobj_hpath}/ch2/auto_start
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/ch2/auto_start simulated false
     } else {
       ::scobj::nhq_200::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for nhq_200"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/ch2/auto_start simulated true
     }
 
     # Start of var: current
@@ -657,10 +657,10 @@ proc ::scobj::nhq_200::mkDriver { sct_controller name device_class simulation_fl
 
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} poll ${scobj_hpath}/ch2/current 5
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/ch2/current simulated false
     } else {
       ::scobj::nhq_200::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for nhq_200"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/ch2/current simulated true
     }
 
     # Start of var: go
@@ -680,10 +680,10 @@ proc ::scobj::nhq_200::mkDriver { sct_controller name device_class simulation_fl
 
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} write ${scobj_hpath}/ch2/go
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/ch2/go simulated false
     } else {
       ::scobj::nhq_200::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for nhq_200"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/ch2/go simulated true
     }
 
     # Start of var: i_lim
@@ -702,10 +702,10 @@ proc ::scobj::nhq_200::mkDriver { sct_controller name device_class simulation_fl
 
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} poll ${scobj_hpath}/ch2/i_lim 5
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/ch2/i_lim simulated false
     } else {
       ::scobj::nhq_200::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for nhq_200"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/ch2/i_lim simulated true
     }
 
     # Start of var: i_trip
@@ -728,10 +728,10 @@ proc ::scobj::nhq_200::mkDriver { sct_controller name device_class simulation_fl
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} poll ${scobj_hpath}/ch2/i_trip 5
       ${sct_controller} write ${scobj_hpath}/ch2/i_trip
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/ch2/i_trip simulated false
     } else {
       ::scobj::nhq_200::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for nhq_200"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/ch2/i_trip simulated true
     }
 
     # Start of var: module
@@ -750,10 +750,10 @@ proc ::scobj::nhq_200::mkDriver { sct_controller name device_class simulation_fl
 
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} poll ${scobj_hpath}/ch2/module 5
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/ch2/module simulated false
     } else {
       ::scobj::nhq_200::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for nhq_200"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/ch2/module simulated true
     }
 
     # Start of var: status
@@ -772,10 +772,10 @@ proc ::scobj::nhq_200::mkDriver { sct_controller name device_class simulation_fl
 
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} poll ${scobj_hpath}/ch2/status 5
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/ch2/status simulated false
     } else {
       ::scobj::nhq_200::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for nhq_200"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/ch2/status simulated true
     }
 
     # Start of var: v_lim
@@ -794,10 +794,10 @@ proc ::scobj::nhq_200::mkDriver { sct_controller name device_class simulation_fl
 
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} poll ${scobj_hpath}/ch2/v_lim 5
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/ch2/v_lim simulated false
     } else {
       ::scobj::nhq_200::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for nhq_200"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/ch2/v_lim simulated true
     }
 
     # Start of var: v_ramp
@@ -820,10 +820,10 @@ proc ::scobj::nhq_200::mkDriver { sct_controller name device_class simulation_fl
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} poll ${scobj_hpath}/ch2/v_ramp 5
       ${sct_controller} write ${scobj_hpath}/ch2/v_ramp
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/ch2/v_ramp simulated false
     } else {
       ::scobj::nhq_200::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for nhq_200"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/ch2/v_ramp simulated true
     }
 
     # Start of var: v_sp
@@ -855,10 +855,10 @@ proc ::scobj::nhq_200::mkDriver { sct_controller name device_class simulation_fl
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} poll ${scobj_hpath}/ch2/v_sp 5
       ${sct_controller} write ${scobj_hpath}/ch2/v_sp
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/ch2/v_sp simulated false
     } else {
       ::scobj::nhq_200::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for nhq_200"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/ch2/v_sp simulated true
     }
 
     # Start of var: voltage
@@ -877,10 +877,10 @@ proc ::scobj::nhq_200::mkDriver { sct_controller name device_class simulation_fl
 
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} poll ${scobj_hpath}/ch2/voltage 5
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/ch2/voltage simulated false
     } else {
       ::scobj::nhq_200::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for nhq_200"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/ch2/voltage simulated true
     }
     hsetprop ${scobj_hpath}/ch2 data "true"
     hsetprop ${scobj_hpath}/ch2 klass "@none"
diff --git a/site_ansto/instrument/config/environment/omron_hldc_sct.tcl b/site_ansto/instrument/config/environment/omron_hldc_sct.tcl
index b7918b58..15c979f5 100644
--- a/site_ansto/instrument/config/environment/omron_hldc_sct.tcl
+++ b/site_ansto/instrument/config/environment/omron_hldc_sct.tcl
@@ -219,10 +219,10 @@ proc ::scobj::omron_hldc::mkDriver { sct_controller name device_class simulation
 
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} poll ${scobj_hpath}/distance 1
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/distance simulated false
     } else {
       ::scobj::omron_hldc::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for omron_hldc"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/distance simulated true
     }
 
     # Start of var: id
@@ -241,10 +241,10 @@ proc ::scobj::omron_hldc::mkDriver { sct_controller name device_class simulation
 
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} poll ${scobj_hpath}/id 10
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/id simulated false
     } else {
       ::scobj::omron_hldc::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for omron_hldc"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/id simulated true
     }
 
     hsetprop ${scobj_hpath} data "true"
diff --git a/site_ansto/instrument/config/environment/temperature/julabo_lh45_gen_sct.tcl b/site_ansto/instrument/config/environment/temperature/julabo_lh45_gen_sct.tcl
index 4f58ce86..97c496b6 100644
--- a/site_ansto/instrument/config/environment/temperature/julabo_lh45_gen_sct.tcl
+++ b/site_ansto/instrument/config/environment/temperature/julabo_lh45_gen_sct.tcl
@@ -398,10 +398,10 @@ proc ::scobj::julabo_lh45_gen::mkDriver { sct_controller name device_class simul
 
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} poll ${scobj_hpath}/heating_power_percent 1
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/heating_power_percent simulated false
     } else {
       ::scobj::julabo_lh45_gen::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for julabo_lh45_gen"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/heating_power_percent simulated true
     }
 
     # Start of var: lh45_lasterror
@@ -432,10 +432,10 @@ proc ::scobj::julabo_lh45_gen::mkDriver { sct_controller name device_class simul
 
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} poll ${scobj_hpath}/lh45_state 1
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/lh45_state simulated false
     } else {
       ::scobj::julabo_lh45_gen::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for julabo_lh45_gen"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/lh45_state simulated true
     }
 
     # Start of var: overtemp_warnlimit
@@ -454,10 +454,10 @@ proc ::scobj::julabo_lh45_gen::mkDriver { sct_controller name device_class simul
 
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} poll ${scobj_hpath}/overtemp_warnlimit 1
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/overtemp_warnlimit simulated false
     } else {
       ::scobj::julabo_lh45_gen::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for julabo_lh45_gen"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/overtemp_warnlimit simulated true
     }
 
     # Start of var: remote_ctrl
@@ -503,10 +503,10 @@ proc ::scobj::julabo_lh45_gen::mkDriver { sct_controller name device_class simul
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} poll ${scobj_hpath}/setpoint 1
       ${sct_controller} write ${scobj_hpath}/setpoint
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/setpoint simulated false
     } else {
       ::scobj::julabo_lh45_gen::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for julabo_lh45_gen"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/setpoint simulated true
     }
 
     # Start of var: subtemp_warnlimit
@@ -525,10 +525,10 @@ proc ::scobj::julabo_lh45_gen::mkDriver { sct_controller name device_class simul
 
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} poll ${scobj_hpath}/subtemp_warnlimit 1
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/subtemp_warnlimit simulated false
     } else {
       ::scobj::julabo_lh45_gen::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for julabo_lh45_gen"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/subtemp_warnlimit simulated true
     }
 
     hsetprop ${scobj_hpath} data "true"
@@ -560,10 +560,10 @@ proc ::scobj::julabo_lh45_gen::mkDriver { sct_controller name device_class simul
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} poll ${scobj_hpath}/mode/ext_else_bath 1
       ${sct_controller} write ${scobj_hpath}/mode/ext_else_bath
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/mode/ext_else_bath simulated false
     } else {
       ::scobj::julabo_lh45_gen::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for julabo_lh45_gen"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/mode/ext_else_bath simulated true
     }
 
     # Start of var: on_else_off
@@ -586,10 +586,10 @@ proc ::scobj::julabo_lh45_gen::mkDriver { sct_controller name device_class simul
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} poll ${scobj_hpath}/mode/on_else_off 1
       ${sct_controller} write ${scobj_hpath}/mode/on_else_off
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/mode/on_else_off simulated false
     } else {
       ::scobj::julabo_lh45_gen::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for julabo_lh45_gen"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/mode/on_else_off simulated true
     }
     hsetprop ${scobj_hpath}/mode data "true"
     hsetprop ${scobj_hpath}/mode klass "@none"
@@ -617,10 +617,10 @@ proc ::scobj::julabo_lh45_gen::mkDriver { sct_controller name device_class simul
 
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} poll ${scobj_hpath}/sensor/bathtemp 1
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/sensor/bathtemp simulated false
     } else {
       ::scobj::julabo_lh45_gen::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for julabo_lh45_gen"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/sensor/bathtemp simulated true
     }
 
     # Start of var: end_temperature
@@ -654,10 +654,10 @@ proc ::scobj::julabo_lh45_gen::mkDriver { sct_controller name device_class simul
 
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} poll ${scobj_hpath}/sensor/external 1
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/sensor/external simulated false
     } else {
       ::scobj::julabo_lh45_gen::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for julabo_lh45_gen"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/sensor/external simulated true
     }
 
     # Start of var: start_temperature
diff --git a/site_ansto/instrument/config/environment/temperature/lakeshore_218_sct.tcl b/site_ansto/instrument/config/environment/temperature/lakeshore_218_sct.tcl
index 1ac7cf52..06a5bcde 100644
--- a/site_ansto/instrument/config/environment/temperature/lakeshore_218_sct.tcl
+++ b/site_ansto/instrument/config/environment/temperature/lakeshore_218_sct.tcl
@@ -186,10 +186,10 @@ proc ::scobj::lakeshore_218::mkDriver { sct_controller name device_class simulat
 
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} poll ${scobj_hpath}/krdg 1
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/krdg simulated false
     } else {
       ::scobj::lakeshore_218::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for lakeshore_218"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/krdg simulated true
     }
 
     hsetprop ${scobj_hpath} data "false"
@@ -216,10 +216,10 @@ proc ::scobj::lakeshore_218::mkDriver { sct_controller name device_class simulat
 
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} poll ${scobj_hpath}/sensor/ch1 1
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/sensor/ch1 simulated false
     } else {
       ::scobj::lakeshore_218::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for lakeshore_218"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/sensor/ch1 simulated true
     }
 
     # Start of var: ch2
@@ -238,10 +238,10 @@ proc ::scobj::lakeshore_218::mkDriver { sct_controller name device_class simulat
 
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} poll ${scobj_hpath}/sensor/ch2 1
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/sensor/ch2 simulated false
     } else {
       ::scobj::lakeshore_218::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for lakeshore_218"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/sensor/ch2 simulated true
     }
 
     # Start of var: ch3
@@ -260,10 +260,10 @@ proc ::scobj::lakeshore_218::mkDriver { sct_controller name device_class simulat
 
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} poll ${scobj_hpath}/sensor/ch3 1
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/sensor/ch3 simulated false
     } else {
       ::scobj::lakeshore_218::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for lakeshore_218"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/sensor/ch3 simulated true
     }
 
     # Start of var: ch4
@@ -282,10 +282,10 @@ proc ::scobj::lakeshore_218::mkDriver { sct_controller name device_class simulat
 
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} poll ${scobj_hpath}/sensor/ch4 1
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/sensor/ch4 simulated false
     } else {
       ::scobj::lakeshore_218::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for lakeshore_218"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/sensor/ch4 simulated true
     }
 
     # Start of var: ch5
@@ -304,10 +304,10 @@ proc ::scobj::lakeshore_218::mkDriver { sct_controller name device_class simulat
 
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} poll ${scobj_hpath}/sensor/ch5 1
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/sensor/ch5 simulated false
     } else {
       ::scobj::lakeshore_218::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for lakeshore_218"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/sensor/ch5 simulated true
     }
 
     # Start of var: ch6
@@ -326,10 +326,10 @@ proc ::scobj::lakeshore_218::mkDriver { sct_controller name device_class simulat
 
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} poll ${scobj_hpath}/sensor/ch6 1
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/sensor/ch6 simulated false
     } else {
       ::scobj::lakeshore_218::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for lakeshore_218"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/sensor/ch6 simulated true
     }
 
     # Start of var: ch7
@@ -348,10 +348,10 @@ proc ::scobj::lakeshore_218::mkDriver { sct_controller name device_class simulat
 
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} poll ${scobj_hpath}/sensor/ch7 1
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/sensor/ch7 simulated false
     } else {
       ::scobj::lakeshore_218::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for lakeshore_218"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/sensor/ch7 simulated true
     }
 
     # Start of var: ch8
@@ -370,10 +370,10 @@ proc ::scobj::lakeshore_218::mkDriver { sct_controller name device_class simulat
 
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} poll ${scobj_hpath}/sensor/ch8 1
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/sensor/ch8 simulated false
     } else {
       ::scobj::lakeshore_218::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for lakeshore_218"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/sensor/ch8 simulated true
     }
     hsetprop ${scobj_hpath}/sensor data "true"
     hsetprop ${scobj_hpath}/sensor klass "@none"
diff --git a/site_ansto/instrument/config/environment/temperature/mercury_base_sct.tcl b/site_ansto/instrument/config/environment/temperature/mercury_base_sct.tcl
index 7861b741..91a8e4e9 100644
--- a/site_ansto/instrument/config/environment/temperature/mercury_base_sct.tcl
+++ b/site_ansto/instrument/config/environment/temperature/mercury_base_sct.tcl
@@ -302,10 +302,10 @@ proc ::scobj::mercury_base::mkDriver { sct_controller name device_class simulati
 
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} poll ${scobj_hpath}/Loop1/nick 15
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/Loop1/nick simulated false
     } else {
       ::scobj::mercury_base::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for mercury_base"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/Loop1/nick simulated true
     }
 
     # Start of var: power
@@ -324,10 +324,10 @@ proc ::scobj::mercury_base::mkDriver { sct_controller name device_class simulati
 
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} poll ${scobj_hpath}/Loop1/power 5
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/Loop1/power simulated false
     } else {
       ::scobj::mercury_base::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for mercury_base"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/Loop1/power simulated true
     }
 
     # Start of var: sensor
@@ -348,10 +348,10 @@ proc ::scobj::mercury_base::mkDriver { sct_controller name device_class simulati
 
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} poll ${scobj_hpath}/Loop1/sensor 1
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/Loop1/sensor simulated false
     } else {
       ::scobj::mercury_base::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for mercury_base"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/Loop1/sensor simulated true
     }
 
     # Start of var: setpoint
@@ -385,10 +385,10 @@ proc ::scobj::mercury_base::mkDriver { sct_controller name device_class simulati
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} poll ${scobj_hpath}/Loop1/setpoint 5
       ${sct_controller} write ${scobj_hpath}/Loop1/setpoint
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/Loop1/setpoint simulated false
     } else {
       ::scobj::mercury_base::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for mercury_base"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/Loop1/setpoint simulated true
     }
     hsetprop ${scobj_hpath}/Loop1 data "true"
     hsetprop ${scobj_hpath}/Loop1 klass "@none"
@@ -415,10 +415,10 @@ proc ::scobj::mercury_base::mkDriver { sct_controller name device_class simulati
 
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} poll ${scobj_hpath}/Loop2/nick 15
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/Loop2/nick simulated false
     } else {
       ::scobj::mercury_base::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for mercury_base"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/Loop2/nick simulated true
     }
 
     # Start of var: power
@@ -437,10 +437,10 @@ proc ::scobj::mercury_base::mkDriver { sct_controller name device_class simulati
 
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} poll ${scobj_hpath}/Loop2/power 5
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/Loop2/power simulated false
     } else {
       ::scobj::mercury_base::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for mercury_base"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/Loop2/power simulated true
     }
 
     # Start of var: sensor
@@ -461,10 +461,10 @@ proc ::scobj::mercury_base::mkDriver { sct_controller name device_class simulati
 
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} poll ${scobj_hpath}/Loop2/sensor 1
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/Loop2/sensor simulated false
     } else {
       ::scobj::mercury_base::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for mercury_base"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/Loop2/sensor simulated true
     }
 
     # Start of var: setpoint
@@ -498,10 +498,10 @@ proc ::scobj::mercury_base::mkDriver { sct_controller name device_class simulati
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} poll ${scobj_hpath}/Loop2/setpoint 5
       ${sct_controller} write ${scobj_hpath}/Loop2/setpoint
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/Loop2/setpoint simulated false
     } else {
       ::scobj::mercury_base::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for mercury_base"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/Loop2/setpoint simulated true
     }
     hsetprop ${scobj_hpath}/Loop2 data "true"
     hsetprop ${scobj_hpath}/Loop2 klass "@none"
@@ -528,10 +528,10 @@ proc ::scobj::mercury_base::mkDriver { sct_controller name device_class simulati
 
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} poll ${scobj_hpath}/Loop3/nick 15
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/Loop3/nick simulated false
     } else {
       ::scobj::mercury_base::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for mercury_base"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/Loop3/nick simulated true
     }
 
     # Start of var: power
@@ -550,10 +550,10 @@ proc ::scobj::mercury_base::mkDriver { sct_controller name device_class simulati
 
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} poll ${scobj_hpath}/Loop3/power 5
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/Loop3/power simulated false
     } else {
       ::scobj::mercury_base::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for mercury_base"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/Loop3/power simulated true
     }
 
     # Start of var: sensor
@@ -574,10 +574,10 @@ proc ::scobj::mercury_base::mkDriver { sct_controller name device_class simulati
 
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} poll ${scobj_hpath}/Loop3/sensor 1
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/Loop3/sensor simulated false
     } else {
       ::scobj::mercury_base::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for mercury_base"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/Loop3/sensor simulated true
     }
 
     # Start of var: setpoint
@@ -611,10 +611,10 @@ proc ::scobj::mercury_base::mkDriver { sct_controller name device_class simulati
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} poll ${scobj_hpath}/Loop3/setpoint 5
       ${sct_controller} write ${scobj_hpath}/Loop3/setpoint
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/Loop3/setpoint simulated false
     } else {
       ::scobj::mercury_base::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for mercury_base"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/Loop3/setpoint simulated true
     }
     hsetprop ${scobj_hpath}/Loop3 data "true"
     hsetprop ${scobj_hpath}/Loop3 klass "@none"
diff --git a/site_ansto/instrument/config/environment/temperature/mercury_level_sct.tcl b/site_ansto/instrument/config/environment/temperature/mercury_level_sct.tcl
index ad4c127c..05782d1b 100644
--- a/site_ansto/instrument/config/environment/temperature/mercury_level_sct.tcl
+++ b/site_ansto/instrument/config/environment/temperature/mercury_level_sct.tcl
@@ -170,10 +170,10 @@ proc ::scobj::mercury_level::mkDriver { sct_controller name device_class simulat
 
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} poll ${scobj_hpath}/Level/Helium 15
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/Level/Helium simulated false
     } else {
       ::scobj::mercury_level::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for mercury_level"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/Level/Helium simulated true
     }
 
     # Start of var: Nitrogen
@@ -194,10 +194,10 @@ proc ::scobj::mercury_level::mkDriver { sct_controller name device_class simulat
 
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} poll ${scobj_hpath}/Level/Nitrogen 15
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/Level/Nitrogen simulated false
     } else {
       ::scobj::mercury_level::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for mercury_level"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/Level/Nitrogen simulated true
     }
     hsetprop ${scobj_hpath}/Level data "true"
     hsetprop ${scobj_hpath}/Level klass "@none"
diff --git a/site_ansto/instrument/config/environment/temperature/mercury_pres_sct.tcl b/site_ansto/instrument/config/environment/temperature/mercury_pres_sct.tcl
index 661f9ece..c7a8e102 100644
--- a/site_ansto/instrument/config/environment/temperature/mercury_pres_sct.tcl
+++ b/site_ansto/instrument/config/environment/temperature/mercury_pres_sct.tcl
@@ -308,10 +308,10 @@ proc ::scobj::mercury_pres::mkDriver { sct_controller name device_class simulati
 
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} poll ${scobj_hpath}/Loop8/nick 15
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/Loop8/nick simulated false
     } else {
       ::scobj::mercury_pres::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for mercury_pres"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/Loop8/nick simulated true
     }
 
     # Start of var: sensor
@@ -333,10 +333,10 @@ proc ::scobj::mercury_pres::mkDriver { sct_controller name device_class simulati
 
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} poll ${scobj_hpath}/Loop8/sensor 1
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/Loop8/sensor simulated false
     } else {
       ::scobj::mercury_pres::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for mercury_pres"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/Loop8/sensor simulated true
     }
 
     # Start of var: setpoint
@@ -371,10 +371,10 @@ proc ::scobj::mercury_pres::mkDriver { sct_controller name device_class simulati
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} poll ${scobj_hpath}/Loop8/setpoint 5
       ${sct_controller} write ${scobj_hpath}/Loop8/setpoint
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/Loop8/setpoint simulated false
     } else {
       ::scobj::mercury_pres::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for mercury_pres"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/Loop8/setpoint simulated true
     }
     hsetprop ${scobj_hpath}/Loop8 data "true"
     hsetprop ${scobj_hpath}/Loop8 klass "@none"
diff --git a/site_ansto/instrument/config/environment/temperature/mercury_scpi_sct.tcl b/site_ansto/instrument/config/environment/temperature/mercury_scpi_sct.tcl
index 18a34aec..ceeaaad3 100644
--- a/site_ansto/instrument/config/environment/temperature/mercury_scpi_sct.tcl
+++ b/site_ansto/instrument/config/environment/temperature/mercury_scpi_sct.tcl
@@ -338,10 +338,10 @@ proc ::scobj::mercury_scpi::mkDriver { sct_controller name device_class simulati
 
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} poll ${scobj_hpath}/Level/Helium 15
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/Level/Helium simulated false
     } else {
       ::scobj::mercury_scpi::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for mercury_scpi"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/Level/Helium simulated true
     }
 
     # Start of var: Nitrogen
@@ -362,10 +362,10 @@ proc ::scobj::mercury_scpi::mkDriver { sct_controller name device_class simulati
 
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} poll ${scobj_hpath}/Level/Nitrogen 15
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/Level/Nitrogen simulated false
     } else {
       ::scobj::mercury_scpi::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for mercury_scpi"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/Level/Nitrogen simulated true
     }
     hsetprop ${scobj_hpath}/Level data "true"
     hsetprop ${scobj_hpath}/Level klass "@none"
@@ -391,10 +391,10 @@ proc ::scobj::mercury_scpi::mkDriver { sct_controller name device_class simulati
 
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} poll ${scobj_hpath}/Loop1/nick 15
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/Loop1/nick simulated false
     } else {
       ::scobj::mercury_scpi::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for mercury_scpi"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/Loop1/nick simulated true
     }
 
     # Start of var: power
@@ -413,10 +413,10 @@ proc ::scobj::mercury_scpi::mkDriver { sct_controller name device_class simulati
 
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} poll ${scobj_hpath}/Loop1/power 5
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/Loop1/power simulated false
     } else {
       ::scobj::mercury_scpi::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for mercury_scpi"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/Loop1/power simulated true
     }
 
     # Start of var: sensor
@@ -437,10 +437,10 @@ proc ::scobj::mercury_scpi::mkDriver { sct_controller name device_class simulati
 
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} poll ${scobj_hpath}/Loop1/sensor 1
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/Loop1/sensor simulated false
     } else {
       ::scobj::mercury_scpi::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for mercury_scpi"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/Loop1/sensor simulated true
     }
 
     # Start of var: setpoint
@@ -474,10 +474,10 @@ proc ::scobj::mercury_scpi::mkDriver { sct_controller name device_class simulati
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} poll ${scobj_hpath}/Loop1/setpoint 5
       ${sct_controller} write ${scobj_hpath}/Loop1/setpoint
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/Loop1/setpoint simulated false
     } else {
       ::scobj::mercury_scpi::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for mercury_scpi"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/Loop1/setpoint simulated true
     }
     hsetprop ${scobj_hpath}/Loop1 data "true"
     hsetprop ${scobj_hpath}/Loop1 klass "@none"
@@ -504,10 +504,10 @@ proc ::scobj::mercury_scpi::mkDriver { sct_controller name device_class simulati
 
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} poll ${scobj_hpath}/Loop2/nick 15
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/Loop2/nick simulated false
     } else {
       ::scobj::mercury_scpi::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for mercury_scpi"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/Loop2/nick simulated true
     }
 
     # Start of var: power
@@ -526,10 +526,10 @@ proc ::scobj::mercury_scpi::mkDriver { sct_controller name device_class simulati
 
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} poll ${scobj_hpath}/Loop2/power 5
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/Loop2/power simulated false
     } else {
       ::scobj::mercury_scpi::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for mercury_scpi"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/Loop2/power simulated true
     }
 
     # Start of var: sensor
@@ -550,10 +550,10 @@ proc ::scobj::mercury_scpi::mkDriver { sct_controller name device_class simulati
 
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} poll ${scobj_hpath}/Loop2/sensor 1
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/Loop2/sensor simulated false
     } else {
       ::scobj::mercury_scpi::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for mercury_scpi"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/Loop2/sensor simulated true
     }
 
     # Start of var: setpoint
@@ -587,10 +587,10 @@ proc ::scobj::mercury_scpi::mkDriver { sct_controller name device_class simulati
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} poll ${scobj_hpath}/Loop2/setpoint 5
       ${sct_controller} write ${scobj_hpath}/Loop2/setpoint
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/Loop2/setpoint simulated false
     } else {
       ::scobj::mercury_scpi::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for mercury_scpi"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/Loop2/setpoint simulated true
     }
     hsetprop ${scobj_hpath}/Loop2 data "true"
     hsetprop ${scobj_hpath}/Loop2 klass "@none"
@@ -617,10 +617,10 @@ proc ::scobj::mercury_scpi::mkDriver { sct_controller name device_class simulati
 
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} poll ${scobj_hpath}/Loop3/nick 15
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/Loop3/nick simulated false
     } else {
       ::scobj::mercury_scpi::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for mercury_scpi"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/Loop3/nick simulated true
     }
 
     # Start of var: power
@@ -639,10 +639,10 @@ proc ::scobj::mercury_scpi::mkDriver { sct_controller name device_class simulati
 
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} poll ${scobj_hpath}/Loop3/power 5
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/Loop3/power simulated false
     } else {
       ::scobj::mercury_scpi::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for mercury_scpi"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/Loop3/power simulated true
     }
 
     # Start of var: sensor
@@ -663,10 +663,10 @@ proc ::scobj::mercury_scpi::mkDriver { sct_controller name device_class simulati
 
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} poll ${scobj_hpath}/Loop3/sensor 1
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/Loop3/sensor simulated false
     } else {
       ::scobj::mercury_scpi::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for mercury_scpi"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/Loop3/sensor simulated true
     }
 
     # Start of var: setpoint
@@ -700,10 +700,10 @@ proc ::scobj::mercury_scpi::mkDriver { sct_controller name device_class simulati
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} poll ${scobj_hpath}/Loop3/setpoint 5
       ${sct_controller} write ${scobj_hpath}/Loop3/setpoint
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/Loop3/setpoint simulated false
     } else {
       ::scobj::mercury_scpi::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for mercury_scpi"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/Loop3/setpoint simulated true
     }
     hsetprop ${scobj_hpath}/Loop3 data "true"
     hsetprop ${scobj_hpath}/Loop3 klass "@none"
@@ -730,10 +730,10 @@ proc ::scobj::mercury_scpi::mkDriver { sct_controller name device_class simulati
 
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} poll ${scobj_hpath}/Loop4/nick 15
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/Loop4/nick simulated false
     } else {
       ::scobj::mercury_scpi::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for mercury_scpi"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/Loop4/nick simulated true
     }
 
     # Start of var: power
@@ -752,10 +752,10 @@ proc ::scobj::mercury_scpi::mkDriver { sct_controller name device_class simulati
 
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} poll ${scobj_hpath}/Loop4/power 5
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/Loop4/power simulated false
     } else {
       ::scobj::mercury_scpi::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for mercury_scpi"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/Loop4/power simulated true
     }
 
     # Start of var: sensor
@@ -776,10 +776,10 @@ proc ::scobj::mercury_scpi::mkDriver { sct_controller name device_class simulati
 
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} poll ${scobj_hpath}/Loop4/sensor 1
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/Loop4/sensor simulated false
     } else {
       ::scobj::mercury_scpi::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for mercury_scpi"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/Loop4/sensor simulated true
     }
 
     # Start of var: setpoint
@@ -813,10 +813,10 @@ proc ::scobj::mercury_scpi::mkDriver { sct_controller name device_class simulati
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} poll ${scobj_hpath}/Loop4/setpoint 5
       ${sct_controller} write ${scobj_hpath}/Loop4/setpoint
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/Loop4/setpoint simulated false
     } else {
       ::scobj::mercury_scpi::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for mercury_scpi"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/Loop4/setpoint simulated true
     }
     hsetprop ${scobj_hpath}/Loop4 data "true"
     hsetprop ${scobj_hpath}/Loop4 klass "@none"
@@ -845,10 +845,10 @@ proc ::scobj::mercury_scpi::mkDriver { sct_controller name device_class simulati
 
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} poll ${scobj_hpath}/Valve/sensor 5
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/Valve/sensor simulated false
     } else {
       ::scobj::mercury_scpi::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for mercury_scpi"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/Valve/sensor simulated true
     }
 
     # Start of var: setpoint
@@ -879,10 +879,10 @@ proc ::scobj::mercury_scpi::mkDriver { sct_controller name device_class simulati
 
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} write ${scobj_hpath}/Valve/setpoint
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/Valve/setpoint simulated false
     } else {
       ::scobj::mercury_scpi::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for mercury_scpi"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/Valve/setpoint simulated true
     }
     hsetprop ${scobj_hpath}/Valve data "true"
     hsetprop ${scobj_hpath}/Valve klass "@none"
diff --git a/site_ansto/instrument/config/environment/temperature/mercury_temp_sct.tcl b/site_ansto/instrument/config/environment/temperature/mercury_temp_sct.tcl
index 9a69b345..7a3ca99b 100644
--- a/site_ansto/instrument/config/environment/temperature/mercury_temp_sct.tcl
+++ b/site_ansto/instrument/config/environment/temperature/mercury_temp_sct.tcl
@@ -302,10 +302,10 @@ proc ::scobj::mercury_temp::mkDriver { sct_controller name device_class simulati
 
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} poll ${scobj_hpath}/Loop4/nick 15
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/Loop4/nick simulated false
     } else {
       ::scobj::mercury_temp::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for mercury_temp"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/Loop4/nick simulated true
     }
 
     # Start of var: power
@@ -324,10 +324,10 @@ proc ::scobj::mercury_temp::mkDriver { sct_controller name device_class simulati
 
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} poll ${scobj_hpath}/Loop4/power 5
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/Loop4/power simulated false
     } else {
       ::scobj::mercury_temp::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for mercury_temp"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/Loop4/power simulated true
     }
 
     # Start of var: sensor
@@ -348,10 +348,10 @@ proc ::scobj::mercury_temp::mkDriver { sct_controller name device_class simulati
 
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} poll ${scobj_hpath}/Loop4/sensor 1
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/Loop4/sensor simulated false
     } else {
       ::scobj::mercury_temp::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for mercury_temp"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/Loop4/sensor simulated true
     }
 
     # Start of var: setpoint
@@ -385,10 +385,10 @@ proc ::scobj::mercury_temp::mkDriver { sct_controller name device_class simulati
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} poll ${scobj_hpath}/Loop4/setpoint 5
       ${sct_controller} write ${scobj_hpath}/Loop4/setpoint
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/Loop4/setpoint simulated false
     } else {
       ::scobj::mercury_temp::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for mercury_temp"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/Loop4/setpoint simulated true
     }
     hsetprop ${scobj_hpath}/Loop4 data "true"
     hsetprop ${scobj_hpath}/Loop4 klass "@none"
diff --git a/site_ansto/instrument/config/environment/temperature/mercury_valve_sct.tcl b/site_ansto/instrument/config/environment/temperature/mercury_valve_sct.tcl
index e4cbb513..b792e5e8 100644
--- a/site_ansto/instrument/config/environment/temperature/mercury_valve_sct.tcl
+++ b/site_ansto/instrument/config/environment/temperature/mercury_valve_sct.tcl
@@ -282,10 +282,10 @@ proc ::scobj::mercury_valve::mkDriver { sct_controller name device_class simulat
 
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} poll ${scobj_hpath}/Valve/sensor 5
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/Valve/sensor simulated false
     } else {
       ::scobj::mercury_valve::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for mercury_valve"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/Valve/sensor simulated true
     }
 
     # Start of var: setpoint
@@ -316,10 +316,10 @@ proc ::scobj::mercury_valve::mkDriver { sct_controller name device_class simulat
 
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} write ${scobj_hpath}/Valve/setpoint
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/Valve/setpoint simulated false
     } else {
       ::scobj::mercury_valve::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for mercury_valve"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/Valve/setpoint simulated true
     }
     hsetprop ${scobj_hpath}/Valve data "true"
     hsetprop ${scobj_hpath}/Valve klass "@none"
diff --git a/site_ansto/instrument/config/environment/temperature/pfeiffer_hg_sct.tcl b/site_ansto/instrument/config/environment/temperature/pfeiffer_hg_sct.tcl
index bc12772c..5059f906 100644
--- a/site_ansto/instrument/config/environment/temperature/pfeiffer_hg_sct.tcl
+++ b/site_ansto/instrument/config/environment/temperature/pfeiffer_hg_sct.tcl
@@ -437,10 +437,10 @@ proc ::scobj::pfeiffer_hg::mkDriver { sct_controller name device_class simulatio
 
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} poll ${scobj_hpath}/pressure/sensor 1
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/pressure/sensor simulated false
     } else {
       ::scobj::pfeiffer_hg::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for pfeiffer_hg"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/pressure/sensor simulated true
     }
 
     # Start of var: setpoint
@@ -471,10 +471,10 @@ proc ::scobj::pfeiffer_hg::mkDriver { sct_controller name device_class simulatio
 
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} write ${scobj_hpath}/pressure/setpoint
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/pressure/setpoint simulated false
     } else {
       ::scobj::pfeiffer_hg::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for pfeiffer_hg"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/pressure/setpoint simulated true
     }
     hsetprop ${scobj_hpath}/pressure data "true"
     hsetprop ${scobj_hpath}/pressure klass "@none"
diff --git a/site_ansto/instrument/config/environment/temperature/west_6100_sct.tcl b/site_ansto/instrument/config/environment/temperature/west_6100_sct.tcl
index 70522473..df5a3576 100644
--- a/site_ansto/instrument/config/environment/temperature/west_6100_sct.tcl
+++ b/site_ansto/instrument/config/environment/temperature/west_6100_sct.tcl
@@ -295,10 +295,10 @@ proc ::scobj::west_6100::mkDriver { sct_controller name device_class simulation_
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} poll ${scobj_hpath}/alarm1 1
       ${sct_controller} write ${scobj_hpath}/alarm1
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/alarm1 simulated false
     } else {
       ::scobj::west_6100::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for west_6100"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/alarm1 simulated true
     }
 
     # Start of var: alarm2
@@ -321,10 +321,10 @@ proc ::scobj::west_6100::mkDriver { sct_controller name device_class simulation_
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} poll ${scobj_hpath}/alarm2 1
       ${sct_controller} write ${scobj_hpath}/alarm2
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/alarm2 simulated false
     } else {
       ::scobj::west_6100::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for west_6100"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/alarm2 simulated true
     }
 
     # Start of var: power
@@ -343,10 +343,10 @@ proc ::scobj::west_6100::mkDriver { sct_controller name device_class simulation_
 
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} poll ${scobj_hpath}/power 1
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/power simulated false
     } else {
       ::scobj::west_6100::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for west_6100"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/power simulated true
     }
 
     # Start of var: powermax
@@ -369,10 +369,10 @@ proc ::scobj::west_6100::mkDriver { sct_controller name device_class simulation_
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} poll ${scobj_hpath}/powermax 1
       ${sct_controller} write ${scobj_hpath}/powermax
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/powermax simulated false
     } else {
       ::scobj::west_6100::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for west_6100"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/powermax simulated true
     }
 
     # Start of var: ramprate
@@ -395,10 +395,10 @@ proc ::scobj::west_6100::mkDriver { sct_controller name device_class simulation_
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} poll ${scobj_hpath}/ramprate 1
       ${sct_controller} write ${scobj_hpath}/ramprate
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/ramprate simulated false
     } else {
       ::scobj::west_6100::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for west_6100"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/ramprate simulated true
     }
 
     # Start of var: sensor
@@ -417,10 +417,10 @@ proc ::scobj::west_6100::mkDriver { sct_controller name device_class simulation_
 
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} poll ${scobj_hpath}/sensor 1
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/sensor simulated false
     } else {
       ::scobj::west_6100::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for west_6100"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/sensor simulated true
     }
 
     # Start of var: setpoint
@@ -443,10 +443,10 @@ proc ::scobj::west_6100::mkDriver { sct_controller name device_class simulation_
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} poll ${scobj_hpath}/setpoint 1
       ${sct_controller} write ${scobj_hpath}/setpoint
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/setpoint simulated false
     } else {
       ::scobj::west_6100::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for west_6100"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/setpoint simulated true
     }
 
     # Start of var: w_sp
@@ -469,10 +469,10 @@ proc ::scobj::west_6100::mkDriver { sct_controller name device_class simulation_
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} poll ${scobj_hpath}/w_sp 1
       ${sct_controller} write ${scobj_hpath}/w_sp
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/w_sp simulated false
     } else {
       ::scobj::west_6100::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for west_6100"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/w_sp simulated true
     }
 
     hsetprop ${scobj_hpath} data "true"
@@ -499,10 +499,10 @@ proc ::scobj::west_6100::mkDriver { sct_controller name device_class simulation_
 
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} poll ${scobj_hpath}/aux/decimal 2
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/aux/decimal simulated false
     } else {
       ::scobj::west_6100::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for west_6100"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/aux/decimal simulated true
     }
 
     # Start of var: instatus
@@ -520,10 +520,10 @@ proc ::scobj::west_6100::mkDriver { sct_controller name device_class simulation_
 
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} poll ${scobj_hpath}/aux/instatus 2
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/aux/instatus simulated false
     } else {
       ::scobj::west_6100::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for west_6100"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/aux/instatus simulated true
     }
 
     # Start of var: model
@@ -541,10 +541,10 @@ proc ::scobj::west_6100::mkDriver { sct_controller name device_class simulation_
 
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} poll ${scobj_hpath}/aux/model 2
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/aux/model simulated false
     } else {
       ::scobj::west_6100::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for west_6100"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/aux/model simulated true
     }
     hsetprop ${scobj_hpath}/aux data "false"
     hsetprop ${scobj_hpath}/aux klass "@none"
diff --git a/site_ansto/instrument/config/source/reactor_status_sct.tcl b/site_ansto/instrument/config/source/reactor_status_sct.tcl
index 23c7c5e7..14db0125 100644
--- a/site_ansto/instrument/config/source/reactor_status_sct.tcl
+++ b/site_ansto/instrument/config/source/reactor_status_sct.tcl
@@ -280,10 +280,10 @@ proc ::scobj::reactor_status::mkDriver { sct_controller name device_class simula
 
     if {[string equal -nocase "${simulation_flag}" "false"]} {
       ${sct_controller} poll ${scobj_hpath}/status 30
-      hsetprop ${scobj_hpath}/%s simulated false
+      hsetprop ${scobj_hpath}/status simulated false
     } else {
       ::scobj::reactor_status::sics_log 9 "simulation_flag=${simulation_flag} => No poll/write for reactor_status"
-      hsetprop ${scobj_hpath}/%s simulated true
+      hsetprop ${scobj_hpath}/status simulated true
     }
 
     # Start of var: tg123