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 8e76275e..1aeb5326 100644
--- a/site_ansto/instrument/bilby/config/chopper/astrium_chopper_sct.tcl
+++ b/site_ansto/instrument/bilby/config/chopper/astrium_chopper_sct.tcl
@@ -250,10 +250,8 @@ proc ::scobj::astrium_chopper::mkDriver { sct_controller name device_class simul
 
     set scobj_hpath /sics/${name}
 
-    # Start of named group: disk_1
     hfactory ${scobj_hpath}/disk_1 plain spy none
 
-    # Start of var: aphase
     hfactory ${scobj_hpath}/disk_1/aphase plain user float
     hsetprop ${scobj_hpath}/disk_1/aphase control true
     hsetprop ${scobj_hpath}/disk_1/aphase data true
@@ -265,7 +263,6 @@ proc ::scobj::astrium_chopper::mkDriver { sct_controller name device_class simul
     hsetprop ${scobj_hpath}/disk_1/aphase type "part"
     hsetprop ${scobj_hpath}/disk_1/aphase nxalias "${name}_disk_1_aphase"
 
-    # Start of var: aspeed
     hfactory ${scobj_hpath}/disk_1/aspeed plain user float
     hsetprop ${scobj_hpath}/disk_1/aspeed control true
     hsetprop ${scobj_hpath}/disk_1/aspeed data true
@@ -277,7 +274,6 @@ proc ::scobj::astrium_chopper::mkDriver { sct_controller name device_class simul
     hsetprop ${scobj_hpath}/disk_1/aspeed type "part"
     hsetprop ${scobj_hpath}/disk_1/aspeed nxalias "${name}_disk_1_aspeed"
 
-    # Start of var: frequency
     hfactory ${scobj_hpath}/disk_1/frequency plain user float
     hsetprop ${scobj_hpath}/disk_1/frequency control true
     hsetprop ${scobj_hpath}/disk_1/frequency data true
@@ -289,7 +285,6 @@ proc ::scobj::astrium_chopper::mkDriver { sct_controller name device_class simul
     hsetprop ${scobj_hpath}/disk_1/frequency type "part"
     hsetprop ${scobj_hpath}/disk_1/frequency nxalias "${name}_disk_1_frequency"
 
-    # Start of var: master
     hfactory ${scobj_hpath}/disk_1/master plain user text
     hsetprop ${scobj_hpath}/disk_1/master control true
     hsetprop ${scobj_hpath}/disk_1/master data true
@@ -301,7 +296,6 @@ proc ::scobj::astrium_chopper::mkDriver { sct_controller name device_class simul
     hsetprop ${scobj_hpath}/disk_1/master type "part"
     hsetprop ${scobj_hpath}/disk_1/master nxalias "${name}_disk_1_master"
 
-    # Start of var: rphase
     hfactory ${scobj_hpath}/disk_1/rphase plain user float
     hsetprop ${scobj_hpath}/disk_1/rphase control true
     hsetprop ${scobj_hpath}/disk_1/rphase data true
@@ -313,7 +307,6 @@ proc ::scobj::astrium_chopper::mkDriver { sct_controller name device_class simul
     hsetprop ${scobj_hpath}/disk_1/rphase type "part"
     hsetprop ${scobj_hpath}/disk_1/rphase nxalias "${name}_disk_1_rphase"
 
-    # Start of var: rspeed
     hfactory ${scobj_hpath}/disk_1/rspeed plain user float
     hsetprop ${scobj_hpath}/disk_1/rspeed control true
     hsetprop ${scobj_hpath}/disk_1/rspeed data true
@@ -325,7 +318,6 @@ proc ::scobj::astrium_chopper::mkDriver { sct_controller name device_class simul
     hsetprop ${scobj_hpath}/disk_1/rspeed type "part"
     hsetprop ${scobj_hpath}/disk_1/rspeed nxalias "${name}_disk_1_rspeed"
 
-    # Start of var: state
     hfactory ${scobj_hpath}/disk_1/state plain user text
     hsetprop ${scobj_hpath}/disk_1/state read ${ns}::fetchState ${scobj_hpath} readState {1}
     hsetprop ${scobj_hpath}/disk_1/state readState ${ns}::readState ${scobj_hpath}
@@ -350,12 +342,9 @@ proc ::scobj::astrium_chopper::mkDriver { sct_controller name device_class simul
     hsetprop ${scobj_hpath}/disk_1 data "true"
     hsetprop ${scobj_hpath}/disk_1 klass "@none"
     hsetprop ${scobj_hpath}/disk_1 type "part"
-    # End of named group: disk_1
 
-    # Start of named group: disk_2
     hfactory ${scobj_hpath}/disk_2 plain spy none
 
-    # Start of var: aphase
     hfactory ${scobj_hpath}/disk_2/aphase plain user float
     hsetprop ${scobj_hpath}/disk_2/aphase control true
     hsetprop ${scobj_hpath}/disk_2/aphase data true
@@ -367,7 +356,6 @@ proc ::scobj::astrium_chopper::mkDriver { sct_controller name device_class simul
     hsetprop ${scobj_hpath}/disk_2/aphase type "part"
     hsetprop ${scobj_hpath}/disk_2/aphase nxalias "${name}_disk_2_aphase"
 
-    # Start of var: aspeed
     hfactory ${scobj_hpath}/disk_2/aspeed plain user float
     hsetprop ${scobj_hpath}/disk_2/aspeed control true
     hsetprop ${scobj_hpath}/disk_2/aspeed data true
@@ -379,7 +367,6 @@ proc ::scobj::astrium_chopper::mkDriver { sct_controller name device_class simul
     hsetprop ${scobj_hpath}/disk_2/aspeed type "part"
     hsetprop ${scobj_hpath}/disk_2/aspeed nxalias "${name}_disk_2_aspeed"
 
-    # Start of var: frequency
     hfactory ${scobj_hpath}/disk_2/frequency plain user float
     hsetprop ${scobj_hpath}/disk_2/frequency control true
     hsetprop ${scobj_hpath}/disk_2/frequency data true
@@ -391,7 +378,6 @@ proc ::scobj::astrium_chopper::mkDriver { sct_controller name device_class simul
     hsetprop ${scobj_hpath}/disk_2/frequency type "part"
     hsetprop ${scobj_hpath}/disk_2/frequency nxalias "${name}_disk_2_frequency"
 
-    # Start of var: master
     hfactory ${scobj_hpath}/disk_2/master plain user text
     hsetprop ${scobj_hpath}/disk_2/master control true
     hsetprop ${scobj_hpath}/disk_2/master data true
@@ -403,7 +389,6 @@ proc ::scobj::astrium_chopper::mkDriver { sct_controller name device_class simul
     hsetprop ${scobj_hpath}/disk_2/master type "part"
     hsetprop ${scobj_hpath}/disk_2/master nxalias "${name}_disk_2_master"
 
-    # Start of var: rphase
     hfactory ${scobj_hpath}/disk_2/rphase plain user float
     hsetprop ${scobj_hpath}/disk_2/rphase control true
     hsetprop ${scobj_hpath}/disk_2/rphase data true
@@ -415,7 +400,6 @@ proc ::scobj::astrium_chopper::mkDriver { sct_controller name device_class simul
     hsetprop ${scobj_hpath}/disk_2/rphase type "part"
     hsetprop ${scobj_hpath}/disk_2/rphase nxalias "${name}_disk_2_rphase"
 
-    # Start of var: rspeed
     hfactory ${scobj_hpath}/disk_2/rspeed plain user float
     hsetprop ${scobj_hpath}/disk_2/rspeed control true
     hsetprop ${scobj_hpath}/disk_2/rspeed data true
@@ -427,7 +411,6 @@ proc ::scobj::astrium_chopper::mkDriver { sct_controller name device_class simul
     hsetprop ${scobj_hpath}/disk_2/rspeed type "part"
     hsetprop ${scobj_hpath}/disk_2/rspeed nxalias "${name}_disk_2_rspeed"
 
-    # Start of var: state
     hfactory ${scobj_hpath}/disk_2/state plain user text
     hsetprop ${scobj_hpath}/disk_2/state read ${ns}::fetchState ${scobj_hpath} readState {2}
     hsetprop ${scobj_hpath}/disk_2/state readState ${ns}::readState ${scobj_hpath}
@@ -452,12 +435,9 @@ proc ::scobj::astrium_chopper::mkDriver { sct_controller name device_class simul
     hsetprop ${scobj_hpath}/disk_2 data "true"
     hsetprop ${scobj_hpath}/disk_2 klass "@none"
     hsetprop ${scobj_hpath}/disk_2 type "part"
-    # End of named group: disk_2
 
-    # Start of named group: disk_3
     hfactory ${scobj_hpath}/disk_3 plain spy none
 
-    # Start of var: aphase
     hfactory ${scobj_hpath}/disk_3/aphase plain user float
     hsetprop ${scobj_hpath}/disk_3/aphase control true
     hsetprop ${scobj_hpath}/disk_3/aphase data true
@@ -469,7 +449,6 @@ proc ::scobj::astrium_chopper::mkDriver { sct_controller name device_class simul
     hsetprop ${scobj_hpath}/disk_3/aphase type "part"
     hsetprop ${scobj_hpath}/disk_3/aphase nxalias "${name}_disk_3_aphase"
 
-    # Start of var: aspeed
     hfactory ${scobj_hpath}/disk_3/aspeed plain user float
     hsetprop ${scobj_hpath}/disk_3/aspeed control true
     hsetprop ${scobj_hpath}/disk_3/aspeed data true
@@ -481,7 +460,6 @@ proc ::scobj::astrium_chopper::mkDriver { sct_controller name device_class simul
     hsetprop ${scobj_hpath}/disk_3/aspeed type "part"
     hsetprop ${scobj_hpath}/disk_3/aspeed nxalias "${name}_disk_3_aspeed"
 
-    # Start of var: frequency
     hfactory ${scobj_hpath}/disk_3/frequency plain user float
     hsetprop ${scobj_hpath}/disk_3/frequency control true
     hsetprop ${scobj_hpath}/disk_3/frequency data true
@@ -493,7 +471,6 @@ proc ::scobj::astrium_chopper::mkDriver { sct_controller name device_class simul
     hsetprop ${scobj_hpath}/disk_3/frequency type "part"
     hsetprop ${scobj_hpath}/disk_3/frequency nxalias "${name}_disk_3_frequency"
 
-    # Start of var: master
     hfactory ${scobj_hpath}/disk_3/master plain user text
     hsetprop ${scobj_hpath}/disk_3/master control true
     hsetprop ${scobj_hpath}/disk_3/master data true
@@ -505,7 +482,6 @@ proc ::scobj::astrium_chopper::mkDriver { sct_controller name device_class simul
     hsetprop ${scobj_hpath}/disk_3/master type "part"
     hsetprop ${scobj_hpath}/disk_3/master nxalias "${name}_disk_3_master"
 
-    # Start of var: rphase
     hfactory ${scobj_hpath}/disk_3/rphase plain user float
     hsetprop ${scobj_hpath}/disk_3/rphase control true
     hsetprop ${scobj_hpath}/disk_3/rphase data true
@@ -517,7 +493,6 @@ proc ::scobj::astrium_chopper::mkDriver { sct_controller name device_class simul
     hsetprop ${scobj_hpath}/disk_3/rphase type "part"
     hsetprop ${scobj_hpath}/disk_3/rphase nxalias "${name}_disk_3_rphase"
 
-    # Start of var: rspeed
     hfactory ${scobj_hpath}/disk_3/rspeed plain user float
     hsetprop ${scobj_hpath}/disk_3/rspeed control true
     hsetprop ${scobj_hpath}/disk_3/rspeed data true
@@ -529,7 +504,6 @@ proc ::scobj::astrium_chopper::mkDriver { sct_controller name device_class simul
     hsetprop ${scobj_hpath}/disk_3/rspeed type "part"
     hsetprop ${scobj_hpath}/disk_3/rspeed nxalias "${name}_disk_3_rspeed"
 
-    # Start of var: state
     hfactory ${scobj_hpath}/disk_3/state plain user text
     hsetprop ${scobj_hpath}/disk_3/state read ${ns}::fetchState ${scobj_hpath} readState {3}
     hsetprop ${scobj_hpath}/disk_3/state readState ${ns}::readState ${scobj_hpath}
@@ -554,12 +528,9 @@ proc ::scobj::astrium_chopper::mkDriver { sct_controller name device_class simul
     hsetprop ${scobj_hpath}/disk_3 data "true"
     hsetprop ${scobj_hpath}/disk_3 klass "@none"
     hsetprop ${scobj_hpath}/disk_3 type "part"
-    # End of named group: disk_3
 
-    # Start of named group: disk_4
     hfactory ${scobj_hpath}/disk_4 plain spy none
 
-    # Start of var: aphase
     hfactory ${scobj_hpath}/disk_4/aphase plain user float
     hsetprop ${scobj_hpath}/disk_4/aphase control true
     hsetprop ${scobj_hpath}/disk_4/aphase data true
@@ -571,7 +542,6 @@ proc ::scobj::astrium_chopper::mkDriver { sct_controller name device_class simul
     hsetprop ${scobj_hpath}/disk_4/aphase type "part"
     hsetprop ${scobj_hpath}/disk_4/aphase nxalias "${name}_disk_4_aphase"
 
-    # Start of var: aspeed
     hfactory ${scobj_hpath}/disk_4/aspeed plain user float
     hsetprop ${scobj_hpath}/disk_4/aspeed control true
     hsetprop ${scobj_hpath}/disk_4/aspeed data true
@@ -583,7 +553,6 @@ proc ::scobj::astrium_chopper::mkDriver { sct_controller name device_class simul
     hsetprop ${scobj_hpath}/disk_4/aspeed type "part"
     hsetprop ${scobj_hpath}/disk_4/aspeed nxalias "${name}_disk_4_aspeed"
 
-    # Start of var: frequency
     hfactory ${scobj_hpath}/disk_4/frequency plain user float
     hsetprop ${scobj_hpath}/disk_4/frequency control true
     hsetprop ${scobj_hpath}/disk_4/frequency data true
@@ -595,7 +564,6 @@ proc ::scobj::astrium_chopper::mkDriver { sct_controller name device_class simul
     hsetprop ${scobj_hpath}/disk_4/frequency type "part"
     hsetprop ${scobj_hpath}/disk_4/frequency nxalias "${name}_disk_4_frequency"
 
-    # Start of var: master
     hfactory ${scobj_hpath}/disk_4/master plain user text
     hsetprop ${scobj_hpath}/disk_4/master control true
     hsetprop ${scobj_hpath}/disk_4/master data true
@@ -607,7 +575,6 @@ proc ::scobj::astrium_chopper::mkDriver { sct_controller name device_class simul
     hsetprop ${scobj_hpath}/disk_4/master type "part"
     hsetprop ${scobj_hpath}/disk_4/master nxalias "${name}_disk_4_master"
 
-    # Start of var: rphase
     hfactory ${scobj_hpath}/disk_4/rphase plain user float
     hsetprop ${scobj_hpath}/disk_4/rphase control true
     hsetprop ${scobj_hpath}/disk_4/rphase data true
@@ -619,7 +586,6 @@ proc ::scobj::astrium_chopper::mkDriver { sct_controller name device_class simul
     hsetprop ${scobj_hpath}/disk_4/rphase type "part"
     hsetprop ${scobj_hpath}/disk_4/rphase nxalias "${name}_disk_4_rphase"
 
-    # Start of var: rspeed
     hfactory ${scobj_hpath}/disk_4/rspeed plain user float
     hsetprop ${scobj_hpath}/disk_4/rspeed control true
     hsetprop ${scobj_hpath}/disk_4/rspeed data true
@@ -631,7 +597,6 @@ proc ::scobj::astrium_chopper::mkDriver { sct_controller name device_class simul
     hsetprop ${scobj_hpath}/disk_4/rspeed type "part"
     hsetprop ${scobj_hpath}/disk_4/rspeed nxalias "${name}_disk_4_rspeed"
 
-    # Start of var: state
     hfactory ${scobj_hpath}/disk_4/state plain user text
     hsetprop ${scobj_hpath}/disk_4/state read ${ns}::fetchState ${scobj_hpath} readState {4}
     hsetprop ${scobj_hpath}/disk_4/state readState ${ns}::readState ${scobj_hpath}
@@ -656,7 +621,6 @@ proc ::scobj::astrium_chopper::mkDriver { sct_controller name device_class simul
     hsetprop ${scobj_hpath}/disk_4 data "true"
     hsetprop ${scobj_hpath}/disk_4 klass "@none"
     hsetprop ${scobj_hpath}/disk_4 type "part"
-    # End of named group: disk_4
     hsetprop ${scobj_hpath} klass ${device_class}
     hsetprop ${scobj_hpath} data true
     hsetprop ${scobj_hpath} debug_threshold 5
@@ -701,8 +665,8 @@ proc add_astrium_chopper {name ip_address tcp_port} {
   ::scobj::astrium_chopper::add_driver ${name} "NXdisk_chopper" ${simulation_flag} ${ip_address} ${tcp_port}
 }
 
-clientput "file evaluation of sct_astrium_chopper.tcl"
-::scobj::astrium_chopper::sics_log 9 "file evaluation of sct_astrium_chopper.tcl"
+clientput "file evaluation of astrium_chopper_sct.tcl"
+::scobj::astrium_chopper::sics_log 9 "file evaluation of astrium_chopper_sct.tcl"
 
 proc ::scobj::astrium_chopper::read_config {} {
   set catch_status [ catch {
@@ -774,7 +738,7 @@ proc ::scobj::astrium_chopper::read_config {} {
             }
             makesctcontroller sct_${name} aqadapter ${asyncqueue}
           }
-          ${ns}::mkDriver sct_${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port}
+          ${ns}::mkDriver sct_${name} ${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port}
         }
       }
     }
diff --git a/site_ansto/instrument/bilby/config/motors/shutters_sct.tcl b/site_ansto/instrument/bilby/config/motors/shutters_sct.tcl
index 64ebbcdb..88222c0e 100644
--- a/site_ansto/instrument/bilby/config/motors/shutters_sct.tcl
+++ b/site_ansto/instrument/bilby/config/motors/shutters_sct.tcl
@@ -204,9 +204,7 @@ proc ::scobj::shutters::mkDriver { sct_controller name device_class simulation_f
     sicslist setatt ${name} long_name ${name}
 
     set scobj_hpath /sics/${name}
-    # Start of unnamed group
 
-    # Start of var: fast_shutter
     hfactory ${scobj_hpath}/fast_shutter plain user text
     hsetprop ${scobj_hpath}/fast_shutter read ${ns}::getValue ${scobj_hpath} read_switch_pair {MG @IN[5], @IN[6]}
     hsetprop ${scobj_hpath}/fast_shutter read_switch_pair ${ns}::read_switch_pair ${scobj_hpath}
@@ -228,7 +226,6 @@ proc ::scobj::shutters::mkDriver { sct_controller name device_class simulation_f
       hsetprop ${scobj_hpath}/fast_shutter simulated true
     }
 
-    # Start of var: rough_100
     hfactory ${scobj_hpath}/rough_100 plain user text
     hsetprop ${scobj_hpath}/rough_100 read ${ns}::getValue ${scobj_hpath} read_switch_pair {MG @IN[15], @IN[16]}
     hsetprop ${scobj_hpath}/rough_100 read_switch_pair ${ns}::read_switch_pair ${scobj_hpath}
@@ -255,7 +252,6 @@ proc ::scobj::shutters::mkDriver { sct_controller name device_class simulation_f
       hsetprop ${scobj_hpath}/rough_100 simulated true
     }
 
-    # Start of var: rough_40
     hfactory ${scobj_hpath}/rough_40 plain user text
     hsetprop ${scobj_hpath}/rough_40 read ${ns}::getValue ${scobj_hpath} read_switch_pair {MG @IN[13], @IN[14]}
     hsetprop ${scobj_hpath}/rough_40 read_switch_pair ${ns}::read_switch_pair ${scobj_hpath}
@@ -286,7 +282,6 @@ proc ::scobj::shutters::mkDriver { sct_controller name device_class simulation_f
     hsetprop ${scobj_hpath} klass "@none"
     hsetprop ${scobj_hpath} nxsave "true"
     hsetprop ${scobj_hpath} type "part"
-    # End of unnamed group
     hsetprop ${scobj_hpath} klass ${device_class}
     hsetprop ${scobj_hpath} data true
     hsetprop ${scobj_hpath} debug_threshold 5
@@ -331,8 +326,8 @@ proc add_shutters {name ip_address tcp_port} {
   ::scobj::shutters::add_driver ${name} "instrument" ${simulation_flag} ${ip_address} ${tcp_port}
 }
 
-clientput "file evaluation of sct_shutters.tcl"
-::scobj::shutters::sics_log 9 "file evaluation of sct_shutters.tcl"
+clientput "file evaluation of shutters_sct.tcl"
+::scobj::shutters::sics_log 9 "file evaluation of shutters_sct.tcl"
 
 proc ::scobj::shutters::read_config {} {
   set catch_status [ catch {
@@ -404,7 +399,7 @@ proc ::scobj::shutters::read_config {} {
             }
             makesctcontroller sct_${name} aqadapter ${asyncqueue}
           }
-          ${ns}::mkDriver sct_${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port}
+          ${ns}::mkDriver sct_${name} ${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port}
         }
       }
     }
diff --git a/site_ansto/instrument/bilby/config/motors/tank_sct.tcl b/site_ansto/instrument/bilby/config/motors/tank_sct.tcl
index 201d5704..6cbc7ebb 100644
--- a/site_ansto/instrument/bilby/config/motors/tank_sct.tcl
+++ b/site_ansto/instrument/bilby/config/motors/tank_sct.tcl
@@ -212,9 +212,7 @@ proc ::scobj::tank::mkDriver { sct_controller name device_class simulation_flag
     sicslist setatt ${name} long_name ${name}
 
     set scobj_hpath /sics/${name}
-    # Start of unnamed group
 
-    # Start of var: pos
     hfactory ${scobj_hpath}/pos plain spy float
     hsetprop ${scobj_hpath}/pos read ${ns}::getValue ${scobj_hpath} read_pos {MG _TPH}
     hsetprop ${scobj_hpath}/pos read_pos ${ns}::read_pos ${scobj_hpath}
@@ -239,12 +237,9 @@ proc ::scobj::tank::mkDriver { sct_controller name device_class simulation_flag
     hsetprop ${scobj_hpath} data "true"
     hsetprop ${scobj_hpath} klass "@none"
     hsetprop ${scobj_hpath} type "part"
-    # End of unnamed group
 
-    # Start of named group: limits
     hfactory ${scobj_hpath}/limits plain spy none
 
-    # Start of var: forward
     hfactory ${scobj_hpath}/limits/forward plain user text
     hsetprop ${scobj_hpath}/limits/forward read ${ns}::getValue ${scobj_hpath} read_switch {MG _LFH}
     hsetprop ${scobj_hpath}/limits/forward read_switch ${ns}::read_switch ${scobj_hpath}
@@ -266,7 +261,6 @@ proc ::scobj::tank::mkDriver { sct_controller name device_class simulation_flag
       hsetprop ${scobj_hpath}/limits/forward simulated true
     }
 
-    # Start of var: reverse
     hfactory ${scobj_hpath}/limits/reverse plain user text
     hsetprop ${scobj_hpath}/limits/reverse read ${ns}::getValue ${scobj_hpath} read_switch {MG _LRH}
     hsetprop ${scobj_hpath}/limits/reverse read_switch ${ns}::read_switch ${scobj_hpath}
@@ -290,12 +284,9 @@ proc ::scobj::tank::mkDriver { sct_controller name device_class simulation_flag
     hsetprop ${scobj_hpath}/limits data "true"
     hsetprop ${scobj_hpath}/limits klass "@none"
     hsetprop ${scobj_hpath}/limits type "part"
-    # End of named group: limits
 
-    # Start of named group: switches
     hfactory ${scobj_hpath}/switches plain spy none
 
-    # Start of var: forward
     hfactory ${scobj_hpath}/switches/forward plain user text
     hsetprop ${scobj_hpath}/switches/forward read ${ns}::getValue ${scobj_hpath} read_switch {MG @IN[5]}
     hsetprop ${scobj_hpath}/switches/forward read_switch ${ns}::read_switch ${scobj_hpath}
@@ -317,7 +308,6 @@ proc ::scobj::tank::mkDriver { sct_controller name device_class simulation_flag
       hsetprop ${scobj_hpath}/switches/forward simulated true
     }
 
-    # Start of var: reverse
     hfactory ${scobj_hpath}/switches/reverse plain user text
     hsetprop ${scobj_hpath}/switches/reverse read ${ns}::getValue ${scobj_hpath} read_switch {MG @IN[6]}
     hsetprop ${scobj_hpath}/switches/reverse read_switch ${ns}::read_switch ${scobj_hpath}
@@ -341,7 +331,6 @@ proc ::scobj::tank::mkDriver { sct_controller name device_class simulation_flag
     hsetprop ${scobj_hpath}/switches data "true"
     hsetprop ${scobj_hpath}/switches klass "@none"
     hsetprop ${scobj_hpath}/switches type "part"
-    # End of named group: switches
     hsetprop ${scobj_hpath} klass ${device_class}
     hsetprop ${scobj_hpath} data true
     hsetprop ${scobj_hpath} debug_threshold 5
@@ -389,8 +378,8 @@ proc add_tank {name ip_address tcp_port} {
   ::scobj::tank::add_driver ${name} "instrument" ${simulation_flag} ${ip_address} ${tcp_port}
 }
 
-clientput "file evaluation of sct_tank.tcl"
-::scobj::tank::sics_log 9 "file evaluation of sct_tank.tcl"
+clientput "file evaluation of tank_sct.tcl"
+::scobj::tank::sics_log 9 "file evaluation of tank_sct.tcl"
 
 proc ::scobj::tank::read_config {} {
   set catch_status [ catch {
@@ -462,7 +451,7 @@ proc ::scobj::tank::read_config {} {
             }
             makesctcontroller sct_${name} aqadapter ${asyncqueue}
           }
-          ${ns}::mkDriver sct_${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port}
+          ${ns}::mkDriver sct_${name} ${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port}
         }
       }
     }
diff --git a/site_ansto/instrument/config/beamline/he3_polanal_sct.tcl b/site_ansto/instrument/config/beamline/he3_polanal_sct.tcl
index cfd66666..e41ac3c6 100644
--- a/site_ansto/instrument/config/beamline/he3_polanal_sct.tcl
+++ b/site_ansto/instrument/config/beamline/he3_polanal_sct.tcl
@@ -221,10 +221,8 @@ proc ::scobj::he3_polanal::mkDriver { sct_controller name device_class simulatio
 
     set scobj_hpath /sics/${name}
 
-    # Start of named group: analyser
     hfactory ${scobj_hpath}/analyser plain spy none
 
-    # Start of var: Amplitude
     hfactory ${scobj_hpath}/analyser/Amplitude plain user text
     hsetprop ${scobj_hpath}/analyser/Amplitude control true
     hsetprop ${scobj_hpath}/analyser/Amplitude data true
@@ -236,7 +234,6 @@ proc ::scobj::he3_polanal::mkDriver { sct_controller name device_class simulatio
     hsetprop ${scobj_hpath}/analyser/Amplitude type "part"
     hsetprop ${scobj_hpath}/analyser/Amplitude nxalias "${name}_analyser_Amplitude"
 
-    # Start of var: Field
     hfactory ${scobj_hpath}/analyser/Field plain user text
     hsetprop ${scobj_hpath}/analyser/Field control true
     hsetprop ${scobj_hpath}/analyser/Field data true
@@ -249,7 +246,6 @@ proc ::scobj::he3_polanal::mkDriver { sct_controller name device_class simulatio
     hsetprop ${scobj_hpath}/analyser/Field type "part"
     hsetprop ${scobj_hpath}/analyser/Field nxalias "${name}_analyser_Field"
 
-    # Start of var: Freq
     hfactory ${scobj_hpath}/analyser/Freq plain user text
     hsetprop ${scobj_hpath}/analyser/Freq control true
     hsetprop ${scobj_hpath}/analyser/Freq data true
@@ -262,7 +258,6 @@ proc ::scobj::he3_polanal::mkDriver { sct_controller name device_class simulatio
     hsetprop ${scobj_hpath}/analyser/Freq type "part"
     hsetprop ${scobj_hpath}/analyser/Freq nxalias "${name}_analyser_Freq"
 
-    # Start of var: Phase
     hfactory ${scobj_hpath}/analyser/Phase plain user text
     hsetprop ${scobj_hpath}/analyser/Phase control true
     hsetprop ${scobj_hpath}/analyser/Phase data true
@@ -275,7 +270,6 @@ proc ::scobj::he3_polanal::mkDriver { sct_controller name device_class simulatio
     hsetprop ${scobj_hpath}/analyser/Phase type "part"
     hsetprop ${scobj_hpath}/analyser/Phase nxalias "${name}_analyser_Phase"
 
-    # Start of var: Time2
     hfactory ${scobj_hpath}/analyser/Time2 plain user text
     hsetprop ${scobj_hpath}/analyser/Time2 control true
     hsetprop ${scobj_hpath}/analyser/Time2 data true
@@ -288,7 +282,6 @@ proc ::scobj::he3_polanal::mkDriver { sct_controller name device_class simulatio
     hsetprop ${scobj_hpath}/analyser/Time2 type "part"
     hsetprop ${scobj_hpath}/analyser/Time2 nxalias "${name}_analyser_Time2"
 
-    # Start of var: spin
     hfactory ${scobj_hpath}/analyser/spin plain user text
     hsetprop ${scobj_hpath}/analyser/spin read ${ns}::getValue ${scobj_hpath} rdValue {analyser}
     hsetprop ${scobj_hpath}/analyser/spin rdValue ${ns}::rdValue ${scobj_hpath}
@@ -317,12 +310,9 @@ proc ::scobj::he3_polanal::mkDriver { sct_controller name device_class simulatio
     hsetprop ${scobj_hpath}/analyser data "true"
     hsetprop ${scobj_hpath}/analyser klass "@none"
     hsetprop ${scobj_hpath}/analyser type "part"
-    # End of named group: analyser
 
-    # Start of named group: polariser
     hfactory ${scobj_hpath}/polariser plain spy none
 
-    # Start of var: Amplitude
     hfactory ${scobj_hpath}/polariser/Amplitude plain user text
     hsetprop ${scobj_hpath}/polariser/Amplitude control true
     hsetprop ${scobj_hpath}/polariser/Amplitude data true
@@ -334,7 +324,6 @@ proc ::scobj::he3_polanal::mkDriver { sct_controller name device_class simulatio
     hsetprop ${scobj_hpath}/polariser/Amplitude type "part"
     hsetprop ${scobj_hpath}/polariser/Amplitude nxalias "${name}_polariser_Amplitude"
 
-    # Start of var: Field
     hfactory ${scobj_hpath}/polariser/Field plain user text
     hsetprop ${scobj_hpath}/polariser/Field control true
     hsetprop ${scobj_hpath}/polariser/Field data true
@@ -347,7 +336,6 @@ proc ::scobj::he3_polanal::mkDriver { sct_controller name device_class simulatio
     hsetprop ${scobj_hpath}/polariser/Field type "part"
     hsetprop ${scobj_hpath}/polariser/Field nxalias "${name}_polariser_Field"
 
-    # Start of var: Freq
     hfactory ${scobj_hpath}/polariser/Freq plain user text
     hsetprop ${scobj_hpath}/polariser/Freq control true
     hsetprop ${scobj_hpath}/polariser/Freq data true
@@ -360,7 +348,6 @@ proc ::scobj::he3_polanal::mkDriver { sct_controller name device_class simulatio
     hsetprop ${scobj_hpath}/polariser/Freq type "part"
     hsetprop ${scobj_hpath}/polariser/Freq nxalias "${name}_polariser_Freq"
 
-    # Start of var: Phase
     hfactory ${scobj_hpath}/polariser/Phase plain user text
     hsetprop ${scobj_hpath}/polariser/Phase control true
     hsetprop ${scobj_hpath}/polariser/Phase data true
@@ -373,7 +360,6 @@ proc ::scobj::he3_polanal::mkDriver { sct_controller name device_class simulatio
     hsetprop ${scobj_hpath}/polariser/Phase type "part"
     hsetprop ${scobj_hpath}/polariser/Phase nxalias "${name}_polariser_Phase"
 
-    # Start of var: Time2
     hfactory ${scobj_hpath}/polariser/Time2 plain user text
     hsetprop ${scobj_hpath}/polariser/Time2 control true
     hsetprop ${scobj_hpath}/polariser/Time2 data true
@@ -386,7 +372,6 @@ proc ::scobj::he3_polanal::mkDriver { sct_controller name device_class simulatio
     hsetprop ${scobj_hpath}/polariser/Time2 type "part"
     hsetprop ${scobj_hpath}/polariser/Time2 nxalias "${name}_polariser_Time2"
 
-    # Start of var: spin
     hfactory ${scobj_hpath}/polariser/spin plain user text
     hsetprop ${scobj_hpath}/polariser/spin read ${ns}::getValue ${scobj_hpath} rdValue {polariser}
     hsetprop ${scobj_hpath}/polariser/spin rdValue ${ns}::rdValue ${scobj_hpath}
@@ -415,7 +400,6 @@ proc ::scobj::he3_polanal::mkDriver { sct_controller name device_class simulatio
     hsetprop ${scobj_hpath}/polariser data "true"
     hsetprop ${scobj_hpath}/polariser klass "@none"
     hsetprop ${scobj_hpath}/polariser type "part"
-    # End of named group: polariser
     hsetprop ${scobj_hpath} klass ${device_class}
     hsetprop ${scobj_hpath} data true
     hsetprop ${scobj_hpath} debug_threshold 0
@@ -459,8 +443,8 @@ proc add_he3_polanal {name ip_address tcp_port} {
   ::scobj::he3_polanal::add_driver ${name} "instrument" ${simulation_flag} ${ip_address} ${tcp_port}
 }
 
-clientput "file evaluation of sct_he3_polanal.tcl"
-::scobj::he3_polanal::sics_log 9 "file evaluation of sct_he3_polanal.tcl"
+clientput "file evaluation of he3_polanal_sct.tcl"
+::scobj::he3_polanal::sics_log 9 "file evaluation of he3_polanal_sct.tcl"
 
 proc ::scobj::he3_polanal::read_config {} {
   set catch_status [ catch {
@@ -532,7 +516,7 @@ proc ::scobj::he3_polanal::read_config {} {
             }
             makesctcontroller sct_${name} aqadapter ${asyncqueue}
           }
-          ${ns}::mkDriver sct_${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port}
+          ${ns}::mkDriver sct_${name} ${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port}
         }
       }
     }
diff --git a/site_ansto/instrument/config/environment/agilent_33220A_sct.tcl b/site_ansto/instrument/config/environment/agilent_33220A_sct.tcl
index 8cb0a7e8..264820f3 100644
--- a/site_ansto/instrument/config/environment/agilent_33220A_sct.tcl
+++ b/site_ansto/instrument/config/environment/agilent_33220A_sct.tcl
@@ -63,8 +63,8 @@ proc add_agilent_33220A {name ip_address tcp_port} {
   ::scobj::agilent_33220A::add_driver ${name} "environment" ${simulation_flag} ${ip_address} ${tcp_port}
 }
 
-clientput "file evaluation of sct_agilent_33220A.tcl"
-::scobj::agilent_33220A::sics_log 9 "file evaluation of sct_agilent_33220A.tcl"
+clientput "file evaluation of agilent_33220A_sct.tcl"
+::scobj::agilent_33220A::sics_log 9 "file evaluation of agilent_33220A_sct.tcl"
 
 proc ::scobj::agilent_33220A::read_config {} {
   set catch_status [ catch {
@@ -97,7 +97,7 @@ proc ::scobj::agilent_33220A::read_config {} {
         }
         if { [string equal -nocase [dict get $v "driver"] "agilent_33220A"] } {
           ::scobj::agilent_33220A::sics_log 9 "No sctcontroller for agilent_33220A"
-          ${ns}::mkDriver sct_${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port}
+          ${ns}::mkDriver sct_${name} ${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port}
         }
       }
     }
diff --git a/site_ansto/instrument/config/environment/hiden_xcs_sct.tcl b/site_ansto/instrument/config/environment/hiden_xcs_sct.tcl
index e8d15c08..b5670669 100644
--- a/site_ansto/instrument/config/environment/hiden_xcs_sct.tcl
+++ b/site_ansto/instrument/config/environment/hiden_xcs_sct.tcl
@@ -88,7 +88,7 @@ proc ::scobj::hiden_xcs::checkstatus {tc_root} {
       set sp "[sct target]"
       if {[hpropexists [sct] simulated] && [sct simulated] == "true"} {
         set pv "${sp}"
-        hset ${tc_root}/[sct driveable] ${sp}
+        hupdateif ${tc_root}/[sct driveable] ${sp}
       }
         set pv "[hval ${tc_root}/[sct driveable]]"
       }
@@ -798,9 +798,7 @@ proc ::scobj::hiden_xcs::mkDriver { sct_controller name device_class simulation_
     sicslist setatt ${name} long_name ${name}
 
     set scobj_hpath /sics/${name}
-    # Start of unnamed group
 
-    # Start of var: auto
     hfactory ${scobj_hpath}/auto plain user int
     hsetprop ${scobj_hpath}/auto control true
     hsetprop ${scobj_hpath}/auto data true
@@ -814,7 +812,6 @@ proc ::scobj::hiden_xcs::mkDriver { sct_controller name device_class simulation_
     hsetprop ${scobj_hpath}/auto type "part"
     hsetprop ${scobj_hpath}/auto nxalias "${name}_auto"
 
-    # Start of var: enabled
     hfactory ${scobj_hpath}/enabled plain user int
     hsetprop ${scobj_hpath}/enabled read ${ns}::getValue ${scobj_hpath} read_digital {?DOUT,2}
     hsetprop ${scobj_hpath}/enabled read_digital ${ns}::read_digital ${scobj_hpath}
@@ -843,7 +840,6 @@ proc ::scobj::hiden_xcs::mkDriver { sct_controller name device_class simulation_
       hsetprop ${scobj_hpath}/enabled simulated true
     }
 
-    # Start of var: flow1
     hfactory ${scobj_hpath}/flow1 plain user float
     hsetprop ${scobj_hpath}/flow1 control false
     hsetprop ${scobj_hpath}/flow1 data false
@@ -855,7 +851,6 @@ proc ::scobj::hiden_xcs::mkDriver { sct_controller name device_class simulation_
     hsetprop ${scobj_hpath}/flow1 type "part"
     hsetprop ${scobj_hpath}/flow1 nxalias "${name}_flow1"
 
-    # Start of var: flow2
     hfactory ${scobj_hpath}/flow2 plain user float
     hsetprop ${scobj_hpath}/flow2 control false
     hsetprop ${scobj_hpath}/flow2 data false
@@ -867,7 +862,6 @@ proc ::scobj::hiden_xcs::mkDriver { sct_controller name device_class simulation_
     hsetprop ${scobj_hpath}/flow2 type "part"
     hsetprop ${scobj_hpath}/flow2 nxalias "${name}_flow2"
 
-    # Start of var: flow3
     hfactory ${scobj_hpath}/flow3 plain user float
     hsetprop ${scobj_hpath}/flow3 control false
     hsetprop ${scobj_hpath}/flow3 data false
@@ -879,7 +873,6 @@ proc ::scobj::hiden_xcs::mkDriver { sct_controller name device_class simulation_
     hsetprop ${scobj_hpath}/flow3 type "part"
     hsetprop ${scobj_hpath}/flow3 nxalias "${name}_flow3"
 
-    # Start of var: gas_factor
     hfactory ${scobj_hpath}/gas_factor plain user float
     hsetprop ${scobj_hpath}/gas_factor control true
     hsetprop ${scobj_hpath}/gas_factor data true
@@ -892,7 +885,6 @@ proc ::scobj::hiden_xcs::mkDriver { sct_controller name device_class simulation_
     hsetprop ${scobj_hpath}/gas_factor type "part"
     hsetprop ${scobj_hpath}/gas_factor nxalias "${name}_gas_factor"
 
-    # Start of var: temperature
     hfactory ${scobj_hpath}/temperature plain user float
     hsetprop ${scobj_hpath}/temperature control false
     hsetprop ${scobj_hpath}/temperature data false
@@ -908,12 +900,9 @@ proc ::scobj::hiden_xcs::mkDriver { sct_controller name device_class simulation_
     hsetprop ${scobj_hpath} klass "@none"
     hsetprop ${scobj_hpath} nxsave "true"
     hsetprop ${scobj_hpath} type "part"
-    # End of unnamed group
 
-    # Start of named group: analog
     hfactory ${scobj_hpath}/analog plain spy none
 
-    # Start of var: ansto_temp
     hfactory ${scobj_hpath}/analog/ansto_temp plain user float
     hsetprop ${scobj_hpath}/analog/ansto_temp read ${ns}::getValue ${scobj_hpath} read_sixteen {?AIN,12}
     hsetprop ${scobj_hpath}/analog/ansto_temp read_sixteen ${ns}::read_sixteen ${scobj_hpath}
@@ -936,7 +925,6 @@ proc ::scobj::hiden_xcs::mkDriver { sct_controller name device_class simulation_
       hsetprop ${scobj_hpath}/analog/ansto_temp simulated true
     }
 
-    # Start of var: pv1
     hfactory ${scobj_hpath}/analog/pv1 plain user float
     hsetprop ${scobj_hpath}/analog/pv1 read ${ns}::getValue ${scobj_hpath} read_sixteen {?AIN,0}
     hsetprop ${scobj_hpath}/analog/pv1 read_sixteen ${ns}::read_sixteen ${scobj_hpath}
@@ -959,7 +947,6 @@ proc ::scobj::hiden_xcs::mkDriver { sct_controller name device_class simulation_
       hsetprop ${scobj_hpath}/analog/pv1 simulated true
     }
 
-    # Start of var: pv2
     hfactory ${scobj_hpath}/analog/pv2 plain user float
     hsetprop ${scobj_hpath}/analog/pv2 read ${ns}::getValue ${scobj_hpath} read_sixteen {?AIN,1}
     hsetprop ${scobj_hpath}/analog/pv2 read_sixteen ${ns}::read_sixteen ${scobj_hpath}
@@ -982,7 +969,6 @@ proc ::scobj::hiden_xcs::mkDriver { sct_controller name device_class simulation_
       hsetprop ${scobj_hpath}/analog/pv2 simulated true
     }
 
-    # Start of var: pv3
     hfactory ${scobj_hpath}/analog/pv3 plain user float
     hsetprop ${scobj_hpath}/analog/pv3 read ${ns}::getValue ${scobj_hpath} read_sixteen {?AIN,2}
     hsetprop ${scobj_hpath}/analog/pv3 read_sixteen ${ns}::read_sixteen ${scobj_hpath}
@@ -1005,7 +991,6 @@ proc ::scobj::hiden_xcs::mkDriver { sct_controller name device_class simulation_
       hsetprop ${scobj_hpath}/analog/pv3 simulated true
     }
 
-    # Start of var: rhsense
     hfactory ${scobj_hpath}/analog/rhsense plain user float
     hsetprop ${scobj_hpath}/analog/rhsense read ${ns}::getValue ${scobj_hpath} read_sixteen {?AIN,9}
     hsetprop ${scobj_hpath}/analog/rhsense read_sixteen ${ns}::read_sixteen ${scobj_hpath}
@@ -1028,7 +1013,6 @@ proc ::scobj::hiden_xcs::mkDriver { sct_controller name device_class simulation_
       hsetprop ${scobj_hpath}/analog/rhsense simulated true
     }
 
-    # Start of var: rhtemp
     hfactory ${scobj_hpath}/analog/rhtemp plain user float
     hsetprop ${scobj_hpath}/analog/rhtemp read ${ns}::getValue ${scobj_hpath} read_sixteen {?AIN,8}
     hsetprop ${scobj_hpath}/analog/rhtemp read_sixteen ${ns}::read_sixteen ${scobj_hpath}
@@ -1051,7 +1035,6 @@ proc ::scobj::hiden_xcs::mkDriver { sct_controller name device_class simulation_
       hsetprop ${scobj_hpath}/analog/rhtemp simulated true
     }
 
-    # Start of var: sp1
     hfactory ${scobj_hpath}/analog/sp1 plain user float
     hsetprop ${scobj_hpath}/analog/sp1 read ${ns}::getValue ${scobj_hpath} read_twelve {?AOUT,0}
     hsetprop ${scobj_hpath}/analog/sp1 read_twelve ${ns}::read_twelve ${scobj_hpath}
@@ -1078,7 +1061,6 @@ proc ::scobj::hiden_xcs::mkDriver { sct_controller name device_class simulation_
       hsetprop ${scobj_hpath}/analog/sp1 simulated true
     }
 
-    # Start of var: sp2
     hfactory ${scobj_hpath}/analog/sp2 plain user float
     hsetprop ${scobj_hpath}/analog/sp2 read ${ns}::getValue ${scobj_hpath} read_twelve {?AOUT,1}
     hsetprop ${scobj_hpath}/analog/sp2 read_twelve ${ns}::read_twelve ${scobj_hpath}
@@ -1105,7 +1087,6 @@ proc ::scobj::hiden_xcs::mkDriver { sct_controller name device_class simulation_
       hsetprop ${scobj_hpath}/analog/sp2 simulated true
     }
 
-    # Start of var: sp3
     hfactory ${scobj_hpath}/analog/sp3 plain user float
     hsetprop ${scobj_hpath}/analog/sp3 read ${ns}::getValue ${scobj_hpath} read_twelve {?AOUT,2}
     hsetprop ${scobj_hpath}/analog/sp3 read_twelve ${ns}::read_twelve ${scobj_hpath}
@@ -1134,12 +1115,9 @@ proc ::scobj::hiden_xcs::mkDriver { sct_controller name device_class simulation_
     hsetprop ${scobj_hpath}/analog data "false"
     hsetprop ${scobj_hpath}/analog klass "@none"
     hsetprop ${scobj_hpath}/analog type "part"
-    # End of named group: analog
 
-    # Start of named group: flow
     hfactory ${scobj_hpath}/flow plain spy none
 
-    # Start of var: sensor
     hfactory ${scobj_hpath}/flow/sensor plain user float
     hsetprop ${scobj_hpath}/flow/sensor read ${ns}::fetch_flow ${scobj_hpath} read_flow {None}
     hsetprop ${scobj_hpath}/flow/sensor read_flow ${ns}::read_flow ${scobj_hpath}
@@ -1170,7 +1148,6 @@ proc ::scobj::hiden_xcs::mkDriver { sct_controller name device_class simulation_
       hsetprop ${scobj_hpath}/flow/sensor simulated true
     }
 
-    # Start of var: setpoint
     hfactory ${scobj_hpath}/flow/setpoint plain user float
     hsetprop ${scobj_hpath}/flow/setpoint read ${ns}::getTarget ${scobj_hpath} rdValue {@}
     hsetprop ${scobj_hpath}/flow/setpoint rdValue ${ns}::rdValue ${scobj_hpath}
@@ -1210,13 +1187,10 @@ proc ::scobj::hiden_xcs::mkDriver { sct_controller name device_class simulation_
     hsetprop ${scobj_hpath}/flow klass "@none"
     hsetprop ${scobj_hpath}/flow nxsave "true"
     hsetprop ${scobj_hpath}/flow type "part"
-    # End of named group: flow
     ansto_makesctdrive ${name}_flow_setpoint ${scobj_hpath}/flow/setpoint ${scobj_hpath}/flow/sensor ${sct_controller}
 
-    # Start of named group: humidity
     hfactory ${scobj_hpath}/humidity plain spy none
 
-    # Start of var: sensor
     hfactory ${scobj_hpath}/humidity/sensor plain user float
     hsetprop ${scobj_hpath}/humidity/sensor read ${ns}::getValue ${scobj_hpath} read_all_data {?ALL DATA}
     hsetprop ${scobj_hpath}/humidity/sensor read_all_data ${ns}::read_all_data ${scobj_hpath}
@@ -1247,7 +1221,6 @@ proc ::scobj::hiden_xcs::mkDriver { sct_controller name device_class simulation_
       hsetprop ${scobj_hpath}/humidity/sensor simulated true
     }
 
-    # Start of var: setpoint
     hfactory ${scobj_hpath}/humidity/setpoint plain user float
     hsetprop ${scobj_hpath}/humidity/setpoint read ${ns}::getTarget ${scobj_hpath} rdValue {@}
     hsetprop ${scobj_hpath}/humidity/setpoint rdValue ${ns}::rdValue ${scobj_hpath}
@@ -1287,7 +1260,6 @@ proc ::scobj::hiden_xcs::mkDriver { sct_controller name device_class simulation_
     hsetprop ${scobj_hpath}/humidity klass "@none"
     hsetprop ${scobj_hpath}/humidity nxsave "true"
     hsetprop ${scobj_hpath}/humidity type "part"
-    # End of named group: humidity
     ansto_makesctdrive ${name}_humidity_setpoint ${scobj_hpath}/humidity/setpoint ${scobj_hpath}/humidity/sensor ${sct_controller}
     hsetprop ${scobj_hpath} klass ${device_class}
     hsetprop ${scobj_hpath} data true
@@ -1421,7 +1393,7 @@ proc ::scobj::hiden_xcs::read_config {} {
           if { [llength $missing_list] > 0 } {
               error "$name is missing configuration values $missing_list"
           }
-          ${ns}::mkDriver sct_${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port} {*}$arg_list
+          ${ns}::mkDriver sct_${name} ${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port} {*}$arg_list
         }
       }
     }
diff --git a/site_ansto/instrument/config/environment/huber_pilot_sct.tcl b/site_ansto/instrument/config/environment/huber_pilot_sct.tcl
index 9b355eb6..6dc0565d 100644
--- a/site_ansto/instrument/config/environment/huber_pilot_sct.tcl
+++ b/site_ansto/instrument/config/environment/huber_pilot_sct.tcl
@@ -91,7 +91,7 @@ proc ::scobj::huber_pilot::checkstatus {tc_root} {
       set sp "[sct target]"
       if {[hpropexists [sct] simulated] && [sct simulated] == "true"} {
         set pv "${sp}"
-        hset ${tc_root}/[sct driveable] ${sp}
+        hupdateif ${tc_root}/[sct driveable] ${sp}
       }
         set pv "[hval ${tc_root}/[sct driveable]]"
       }
@@ -306,10 +306,8 @@ proc ::scobj::huber_pilot::mkDriver { sct_controller name device_class simulatio
 
     set scobj_hpath /sics/${name}
 
-    # Start of named group: Loop1
     hfactory ${scobj_hpath}/Loop1 plain spy none
 
-    # Start of var: sensor_int
     hfactory ${scobj_hpath}/Loop1/sensor_int plain user float
     hsetprop ${scobj_hpath}/Loop1/sensor_int read ${ns}::getValue ${scobj_hpath} rdTemp {01}
     hsetprop ${scobj_hpath}/Loop1/sensor_int rdTemp ${ns}::rdTemp ${scobj_hpath}
@@ -333,7 +331,6 @@ proc ::scobj::huber_pilot::mkDriver { sct_controller name device_class simulatio
       hsetprop ${scobj_hpath}/Loop1/sensor_int simulated true
     }
 
-    # Start of var: setpoint
     hfactory ${scobj_hpath}/Loop1/setpoint plain user float
     hsetprop ${scobj_hpath}/Loop1/setpoint read ${ns}::getValue ${scobj_hpath} rdTemp {00}
     hsetprop ${scobj_hpath}/Loop1/setpoint rdTemp ${ns}::rdTemp ${scobj_hpath}
@@ -370,7 +367,6 @@ proc ::scobj::huber_pilot::mkDriver { sct_controller name device_class simulatio
       hsetprop ${scobj_hpath}/Loop1/setpoint simulated true
     }
 
-    # Start of var: vMaxSP
     hfactory ${scobj_hpath}/Loop1/vMaxSP plain user float
     hsetprop ${scobj_hpath}/Loop1/vMaxSP read ${ns}::getValue ${scobj_hpath} rdTemp {31}
     hsetprop ${scobj_hpath}/Loop1/vMaxSP rdTemp ${ns}::rdTemp ${scobj_hpath}
@@ -392,7 +388,6 @@ proc ::scobj::huber_pilot::mkDriver { sct_controller name device_class simulatio
       hsetprop ${scobj_hpath}/Loop1/vMaxSP simulated true
     }
 
-    # Start of var: vMinSP
     hfactory ${scobj_hpath}/Loop1/vMinSP plain user float
     hsetprop ${scobj_hpath}/Loop1/vMinSP read ${ns}::getValue ${scobj_hpath} rdTemp {30}
     hsetprop ${scobj_hpath}/Loop1/vMinSP rdTemp ${ns}::rdTemp ${scobj_hpath}
@@ -414,7 +409,6 @@ proc ::scobj::huber_pilot::mkDriver { sct_controller name device_class simulatio
       hsetprop ${scobj_hpath}/Loop1/vMinSP simulated true
     }
 
-    # Start of var: vTE
     hfactory ${scobj_hpath}/Loop1/vTE plain user float
     hsetprop ${scobj_hpath}/Loop1/vTE read ${ns}::getValue ${scobj_hpath} rdTemp {07}
     hsetprop ${scobj_hpath}/Loop1/vTE rdTemp ${ns}::rdTemp ${scobj_hpath}
@@ -438,7 +432,6 @@ proc ::scobj::huber_pilot::mkDriver { sct_controller name device_class simulatio
       hsetprop ${scobj_hpath}/Loop1/vTE simulated true
     }
 
-    # Start of var: vTmpActive
     hfactory ${scobj_hpath}/Loop1/vTmpActive plain user int
     hsetprop ${scobj_hpath}/Loop1/vTmpActive read ${ns}::getValue ${scobj_hpath} rdStatus {14}
     hsetprop ${scobj_hpath}/Loop1/vTmpActive rdStatus ${ns}::rdStatus ${scobj_hpath}
@@ -460,7 +453,6 @@ proc ::scobj::huber_pilot::mkDriver { sct_controller name device_class simulatio
       hsetprop ${scobj_hpath}/Loop1/vTmpActive simulated true
     }
 
-    # Start of var: vTmpMode
     hfactory ${scobj_hpath}/Loop1/vTmpMode plain user int
     hsetprop ${scobj_hpath}/Loop1/vTmpMode read ${ns}::getValue ${scobj_hpath} rdStatus {13}
     hsetprop ${scobj_hpath}/Loop1/vTmpMode rdStatus ${ns}::rdStatus ${scobj_hpath}
@@ -484,7 +476,6 @@ proc ::scobj::huber_pilot::mkDriver { sct_controller name device_class simulatio
     hsetprop ${scobj_hpath}/Loop1 data "true"
     hsetprop ${scobj_hpath}/Loop1 klass "@none"
     hsetprop ${scobj_hpath}/Loop1 type "part"
-    # End of named group: Loop1
     ansto_makesctdrive ${name}_Loop1_setpoint ${scobj_hpath}/Loop1/setpoint ${scobj_hpath}/Loop1/sensor_int ${sct_controller}
     hsetprop ${scobj_hpath} klass ${device_class}
     hsetprop ${scobj_hpath} data true
@@ -529,8 +520,8 @@ proc add_huber_pilot {name ip_address tcp_port} {
   ::scobj::huber_pilot::add_driver ${name} "environment" ${simulation_flag} ${ip_address} ${tcp_port}
 }
 
-clientput "file evaluation of sct_huber_pilot.tcl"
-::scobj::huber_pilot::sics_log 9 "file evaluation of sct_huber_pilot.tcl"
+clientput "file evaluation of huber_pilot_sct.tcl"
+::scobj::huber_pilot::sics_log 9 "file evaluation of huber_pilot_sct.tcl"
 
 proc ::scobj::huber_pilot::read_config {} {
   set catch_status [ catch {
@@ -602,7 +593,7 @@ proc ::scobj::huber_pilot::read_config {} {
             }
             makesctcontroller sct_${name} aqadapter ${asyncqueue}
           }
-          ${ns}::mkDriver sct_${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port}
+          ${ns}::mkDriver sct_${name} ${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port}
         }
       }
     }
diff --git a/site_ansto/instrument/config/environment/isotech_ps_sct.tcl b/site_ansto/instrument/config/environment/isotech_ps_sct.tcl
index a89a0246..10011c59 100644
--- a/site_ansto/instrument/config/environment/isotech_ps_sct.tcl
+++ b/site_ansto/instrument/config/environment/isotech_ps_sct.tcl
@@ -251,9 +251,7 @@ proc ::scobj::isotech_ps::mkDriver { sct_controller name device_class simulation
     sicslist setatt ${name} long_name ${name}
 
     set scobj_hpath /sics/${name}
-    # Start of unnamed group
 
-    # Start of var: amps
     hfactory ${scobj_hpath}/amps plain user float
     hsetprop ${scobj_hpath}/amps read ${ns}::getValue ${scobj_hpath} rdValue {A}
     hsetprop ${scobj_hpath}/amps rdValue ${ns}::rdValue ${scobj_hpath}
@@ -276,7 +274,6 @@ proc ::scobj::isotech_ps::mkDriver { sct_controller name device_class simulation
       hsetprop ${scobj_hpath}/amps simulated true
     }
 
-    # Start of var: relay
     hfactory ${scobj_hpath}/relay plain user int
     hsetprop ${scobj_hpath}/relay read ${ns}::getValue ${scobj_hpath} read_relay {F}
     hsetprop ${scobj_hpath}/relay read_relay ${ns}::read_relay ${scobj_hpath}
@@ -302,7 +299,6 @@ proc ::scobj::isotech_ps::mkDriver { sct_controller name device_class simulation
       hsetprop ${scobj_hpath}/relay simulated true
     }
 
-    # Start of var: volts
     hfactory ${scobj_hpath}/volts plain user float
     hsetprop ${scobj_hpath}/volts read ${ns}::getValue ${scobj_hpath} rdValue {V}
     hsetprop ${scobj_hpath}/volts rdValue ${ns}::rdValue ${scobj_hpath}
@@ -332,7 +328,6 @@ proc ::scobj::isotech_ps::mkDriver { sct_controller name device_class simulation
     hsetprop ${scobj_hpath} data "true"
     hsetprop ${scobj_hpath} klass "@none"
     hsetprop ${scobj_hpath} type "part"
-    # End of unnamed group
     hsetprop ${scobj_hpath} klass ${device_class}
     hsetprop ${scobj_hpath} data true
     hsetprop ${scobj_hpath} debug_threshold 5
@@ -376,8 +371,8 @@ proc add_isotech_ps {name ip_address tcp_port} {
   ::scobj::isotech_ps::add_driver ${name} "environment" ${simulation_flag} ${ip_address} ${tcp_port}
 }
 
-clientput "file evaluation of sct_isotech_ps.tcl"
-::scobj::isotech_ps::sics_log 9 "file evaluation of sct_isotech_ps.tcl"
+clientput "file evaluation of isotech_ps_sct.tcl"
+::scobj::isotech_ps::sics_log 9 "file evaluation of isotech_ps_sct.tcl"
 
 proc ::scobj::isotech_ps::read_config {} {
   set catch_status [ catch {
@@ -468,7 +463,7 @@ proc ::scobj::isotech_ps::read_config {} {
             }
             makesctcontroller sct_${name} aqadapter ${asyncqueue}
           }
-          ${ns}::mkDriver sct_${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port}
+          ${ns}::mkDriver sct_${name} ${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port}
         }
       }
     }
diff --git a/site_ansto/instrument/config/environment/keithley_m2700_sct.tcl b/site_ansto/instrument/config/environment/keithley_m2700_sct.tcl
index f5143cd9..647e43cc 100644
--- a/site_ansto/instrument/config/environment/keithley_m2700_sct.tcl
+++ b/site_ansto/instrument/config/environment/keithley_m2700_sct.tcl
@@ -83,8 +83,8 @@ proc add_keithley_m2700 {name ip_address tcp_port id datype tol} {
   ::scobj::keithley_m2700::add_driver ${name} "environment" ${simulation_flag} ${ip_address} ${tcp_port} ${id} ${datype} ${tol}
 }
 
-clientput "file evaluation of sct_keithley_m2700.tcl"
-::scobj::keithley_m2700::sics_log 9 "file evaluation of sct_keithley_m2700.tcl"
+clientput "file evaluation of keithley_m2700_sct.tcl"
+::scobj::keithley_m2700::sics_log 9 "file evaluation of keithley_m2700_sct.tcl"
 
 proc ::scobj::keithley_m2700::read_config {} {
   set catch_status [ catch {
@@ -171,7 +171,7 @@ proc ::scobj::keithley_m2700::read_config {} {
           if { [llength $missing_list] > 0 } {
               error "$name is missing configuration values $missing_list"
           }
-          ${ns}::mkDriver sct_${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port} {*}$arg_list
+          ${ns}::mkDriver sct_${name} ${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port} {*}$arg_list
         }
       }
     }
diff --git a/site_ansto/instrument/config/environment/knauer_pump_sct.tcl b/site_ansto/instrument/config/environment/knauer_pump_sct.tcl
index 928d47ec..45032fd3 100644
--- a/site_ansto/instrument/config/environment/knauer_pump_sct.tcl
+++ b/site_ansto/instrument/config/environment/knauer_pump_sct.tcl
@@ -585,7 +585,7 @@ proc ::scobj::knauer_pump::volume_checkstatus {tc_root} {
       set sp "[sct target]"
       if {[hpropexists [sct] simulated] && [sct simulated] == "true"} {
         set pv "${sp}"
-        hset ${tc_root}/[sct driveable] ${sp}
+        hupdateif ${tc_root}/[sct driveable] ${sp}
       }
         set pv "[hval ${tc_root}/[sct driveable]]"
       }
@@ -885,10 +885,8 @@ proc ::scobj::knauer_pump::mkDriver { sct_controller name device_class simulatio
 
     set scobj_hpath /sics/${name}
 
-    # Start of named group: dummy
     hfactory ${scobj_hpath}/dummy plain spy none
 
-    # Start of var: glp
     hfactory ${scobj_hpath}/dummy/glp plain user text
     hsetprop ${scobj_hpath}/dummy/glp read ${ns}::getValue ${scobj_hpath} read_glp {GLP?}
     hsetprop ${scobj_hpath}/dummy/glp read_glp ${ns}::read_glp ${scobj_hpath}
@@ -910,7 +908,6 @@ proc ::scobj::knauer_pump::mkDriver { sct_controller name device_class simulatio
       hsetprop ${scobj_hpath}/dummy/glp simulated true
     }
 
-    # Start of var: status
     hfactory ${scobj_hpath}/dummy/status plain user text
     hsetprop ${scobj_hpath}/dummy/status read ${ns}::getValue ${scobj_hpath} read_status {STATUS?}
     hsetprop ${scobj_hpath}/dummy/status read_status ${ns}::read_status ${scobj_hpath}
@@ -934,12 +931,9 @@ proc ::scobj::knauer_pump::mkDriver { sct_controller name device_class simulatio
     hsetprop ${scobj_hpath}/dummy data "false"
     hsetprop ${scobj_hpath}/dummy klass "@none"
     hsetprop ${scobj_hpath}/dummy type "part"
-    # End of named group: dummy
 
-    # Start of named group: pump
     hfactory ${scobj_hpath}/pump plain spy none
 
-    # Start of var: remote
     hfactory ${scobj_hpath}/pump/remote plain user int
     hsetprop ${scobj_hpath}/pump/remote read ${ns}::getValue ${scobj_hpath} remote_read {REMOTE?}
     hsetprop ${scobj_hpath}/pump/remote remote_read ${ns}::remote_read ${scobj_hpath}
@@ -966,7 +960,6 @@ proc ::scobj::knauer_pump::mkDriver { sct_controller name device_class simulatio
       hsetprop ${scobj_hpath}/pump/remote simulated true
     }
 
-    # Start of var: state
     hfactory ${scobj_hpath}/pump/state plain user text
     hsetprop ${scobj_hpath}/pump/state read ${ns}::state_fetch ${scobj_hpath} rdValue { }
     hsetprop ${scobj_hpath}/pump/state rdValue ${ns}::rdValue ${scobj_hpath}
@@ -988,7 +981,6 @@ proc ::scobj::knauer_pump::mkDriver { sct_controller name device_class simulatio
       hsetprop ${scobj_hpath}/pump/state simulated true
     }
 
-    # Start of var: status
     hfactory ${scobj_hpath}/pump/status plain user text
     hsetprop ${scobj_hpath}/pump/status read ${ns}::status_fetch ${scobj_hpath} rdValue { }
     hsetprop ${scobj_hpath}/pump/status rdValue ${ns}::rdValue ${scobj_hpath}
@@ -1012,12 +1004,9 @@ proc ::scobj::knauer_pump::mkDriver { sct_controller name device_class simulatio
     hsetprop ${scobj_hpath}/pump data "true"
     hsetprop ${scobj_hpath}/pump klass "@none"
     hsetprop ${scobj_hpath}/pump type "part"
-    # End of named group: pump
 
-    # Start of named group: pump/flow
     hfactory ${scobj_hpath}/pump/flow plain spy none
 
-    # Start of var: pval
     hfactory ${scobj_hpath}/pump/flow/pval plain user float
     hsetprop ${scobj_hpath}/pump/flow/pval read ${ns}::flow_fetch ${scobj_hpath} rdValue { }
     hsetprop ${scobj_hpath}/pump/flow/pval rdValue ${ns}::rdValue ${scobj_hpath}
@@ -1040,7 +1029,6 @@ proc ::scobj::knauer_pump::mkDriver { sct_controller name device_class simulatio
       hsetprop ${scobj_hpath}/pump/flow/pval simulated true
     }
 
-    # Start of var: setp
     hfactory ${scobj_hpath}/pump/flow/setp plain user float
     hsetprop ${scobj_hpath}/pump/flow/setp write ${ns}::flow_write ${scobj_hpath} noResponse { }
     hsetprop ${scobj_hpath}/pump/flow/setp noResponse ${ns}::noResponse ${scobj_hpath}
@@ -1069,12 +1057,9 @@ proc ::scobj::knauer_pump::mkDriver { sct_controller name device_class simulatio
     hsetprop ${scobj_hpath}/pump/flow data "true"
     hsetprop ${scobj_hpath}/pump/flow klass "@none"
     hsetprop ${scobj_hpath}/pump/flow type "part"
-    # End of named group: pump/flow
 
-    # Start of named group: pump/ratio
     hfactory ${scobj_hpath}/pump/ratio plain spy none
 
-    # Start of var: pval
     hfactory ${scobj_hpath}/pump/ratio/pval plain user text
     hsetprop ${scobj_hpath}/pump/ratio/pval read ${ns}::ratio_fetch ${scobj_hpath} rdValue { }
     hsetprop ${scobj_hpath}/pump/ratio/pval rdValue ${ns}::rdValue ${scobj_hpath}
@@ -1097,7 +1082,6 @@ proc ::scobj::knauer_pump::mkDriver { sct_controller name device_class simulatio
       hsetprop ${scobj_hpath}/pump/ratio/pval simulated true
     }
 
-    # Start of var: setp
     hfactory ${scobj_hpath}/pump/ratio/setp plain user text
     hsetprop ${scobj_hpath}/pump/ratio/setp write ${ns}::ratio_write ${scobj_hpath} noResponse { }
     hsetprop ${scobj_hpath}/pump/ratio/setp noResponse ${ns}::noResponse ${scobj_hpath}
@@ -1124,12 +1108,9 @@ proc ::scobj::knauer_pump::mkDriver { sct_controller name device_class simulatio
     hsetprop ${scobj_hpath}/pump/ratio data "true"
     hsetprop ${scobj_hpath}/pump/ratio klass "@none"
     hsetprop ${scobj_hpath}/pump/ratio type "part"
-    # End of named group: pump/ratio
 
-    # Start of named group: pump/volume
     hfactory ${scobj_hpath}/pump/volume plain spy none
 
-    # Start of var: pval
     hfactory ${scobj_hpath}/pump/volume/pval plain user float
     hsetprop ${scobj_hpath}/pump/volume/pval read ${ns}::volume_fetch ${scobj_hpath} volume_read { }
     hsetprop ${scobj_hpath}/pump/volume/pval volume_read ${ns}::volume_read ${scobj_hpath}
@@ -1152,7 +1133,6 @@ proc ::scobj::knauer_pump::mkDriver { sct_controller name device_class simulatio
       hsetprop ${scobj_hpath}/pump/volume/pval simulated true
     }
 
-    # Start of var: setp
     hfactory ${scobj_hpath}/pump/volume/setp plain user float
     hsetprop ${scobj_hpath}/pump/volume/setp read ${ns}::volume_fsm ${scobj_hpath} volume_store { }
     hsetprop ${scobj_hpath}/pump/volume/setp volume_store ${ns}::volume_store ${scobj_hpath}
@@ -1190,7 +1170,6 @@ proc ::scobj::knauer_pump::mkDriver { sct_controller name device_class simulatio
     hsetprop ${scobj_hpath}/pump/volume data "true"
     hsetprop ${scobj_hpath}/pump/volume klass "@none"
     hsetprop ${scobj_hpath}/pump/volume type "part"
-    # End of named group: pump/volume
     ansto_makesctdrive ${name}_pump_volume_setp ${scobj_hpath}/pump/volume/setp ${scobj_hpath}/pump/volume/pval ${sct_controller}
     hsetprop ${scobj_hpath} klass ${device_class}
     hsetprop ${scobj_hpath} data true
@@ -1237,8 +1216,8 @@ proc add_knauer_pump {name ip_address tcp_port} {
   ::scobj::knauer_pump::add_driver ${name} "environment" ${simulation_flag} ${ip_address} ${tcp_port}
 }
 
-clientput "file evaluation of sct_knauer_pump.tcl"
-::scobj::knauer_pump::sics_log 9 "file evaluation of sct_knauer_pump.tcl"
+clientput "file evaluation of knauer_pump_sct.tcl"
+::scobj::knauer_pump::sics_log 9 "file evaluation of knauer_pump_sct.tcl"
 
 proc ::scobj::knauer_pump::read_config {} {
   set catch_status [ catch {
@@ -1310,7 +1289,7 @@ proc ::scobj::knauer_pump::read_config {} {
             }
             makesctcontroller sct_${name} aqadapter ${asyncqueue}
           }
-          ${ns}::mkDriver sct_${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port}
+          ${ns}::mkDriver sct_${name} ${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port}
         }
       }
     }
diff --git a/site_ansto/instrument/config/environment/magneticField/bruker_sct.tcl b/site_ansto/instrument/config/environment/magneticField/bruker_sct.tcl
index 99f12479..dab74b22 100644
--- a/site_ansto/instrument/config/environment/magneticField/bruker_sct.tcl
+++ b/site_ansto/instrument/config/environment/magneticField/bruker_sct.tcl
@@ -74,8 +74,8 @@ proc add_bruker {name ip_address tcp_port id datype {tol 0.1}} {
   ::scobj::bruker::add_driver ${name} "environment" ${simulation_flag} ${ip_address} ${tcp_port} ${id} ${datype} ${tol}
 }
 
-clientput "file evaluation of sct_bruker.tcl"
-::scobj::bruker::sics_log 9 "file evaluation of sct_bruker.tcl"
+clientput "file evaluation of bruker_sct.tcl"
+::scobj::bruker::sics_log 9 "file evaluation of bruker_sct.tcl"
 
 proc ::scobj::bruker::read_config {} {
   set catch_status [ catch {
@@ -162,7 +162,7 @@ proc ::scobj::bruker::read_config {} {
           if { [llength $missing_list] > 0 } {
               error "$name is missing configuration values $missing_list"
           }
-          ${ns}::mkDriver sct_${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port} {*}$arg_list
+          ${ns}::mkDriver sct_${name} ${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port} {*}$arg_list
         }
       }
     }
diff --git a/site_ansto/instrument/config/environment/magneticField/green_magnet_labview_sct.tcl b/site_ansto/instrument/config/environment/magneticField/green_magnet_labview_sct.tcl
index 3b101371..e2c6d773 100644
--- a/site_ansto/instrument/config/environment/magneticField/green_magnet_labview_sct.tcl
+++ b/site_ansto/instrument/config/environment/magneticField/green_magnet_labview_sct.tcl
@@ -69,8 +69,8 @@ proc add_green_magnet_labview {name ip_address tcp_port} {
   ::scobj::green_magnet_labview::add_driver ${name} "environment" ${simulation_flag} ${ip_address} ${tcp_port}
 }
 
-clientput "file evaluation of sct_green_magnet_labview.tcl"
-::scobj::green_magnet_labview::sics_log 9 "file evaluation of sct_green_magnet_labview.tcl"
+clientput "file evaluation of green_magnet_labview_sct.tcl"
+::scobj::green_magnet_labview::sics_log 9 "file evaluation of green_magnet_labview_sct.tcl"
 
 proc ::scobj::green_magnet_labview::read_config {} {
   set catch_status [ catch {
@@ -103,7 +103,7 @@ proc ::scobj::green_magnet_labview::read_config {} {
         }
         if { [string equal -nocase [dict get $v "driver"] "green_magnet_labview"] } {
           ::scobj::green_magnet_labview::sics_log 9 "No sctcontroller for green_magnet_labview"
-          ${ns}::mkDriver sct_${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port}
+          ${ns}::mkDriver sct_${name} ${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port}
         }
       }
     }
diff --git a/site_ansto/instrument/config/environment/magneticField/oxford12tlv_sct.tcl b/site_ansto/instrument/config/environment/magneticField/oxford12tlv_sct.tcl
index ddafe965..6acac4d8 100644
--- a/site_ansto/instrument/config/environment/magneticField/oxford12tlv_sct.tcl
+++ b/site_ansto/instrument/config/environment/magneticField/oxford12tlv_sct.tcl
@@ -88,8 +88,8 @@ proc add_oxford12tlv {name ip_address tcp_port id datype interval} {
   ::scobj::oxford12tlv::add_driver ${name} "environment" ${simulation_flag} ${ip_address} ${tcp_port} ${id} ${datype} ${interval}
 }
 
-clientput "file evaluation of sct_oxford12tlv.tcl"
-::scobj::oxford12tlv::sics_log 9 "file evaluation of sct_oxford12tlv.tcl"
+clientput "file evaluation of oxford12tlv_sct.tcl"
+::scobj::oxford12tlv::sics_log 9 "file evaluation of oxford12tlv_sct.tcl"
 
 proc ::scobj::oxford12tlv::read_config {} {
   set catch_status [ catch {
@@ -176,7 +176,7 @@ proc ::scobj::oxford12tlv::read_config {} {
           if { [llength $missing_list] > 0 } {
               error "$name is missing configuration values $missing_list"
           }
-          ${ns}::mkDriver sct_${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port} {*}$arg_list
+          ${ns}::mkDriver sct_${name} ${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port} {*}$arg_list
         }
       }
     }
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 17a8f3f2..89230c71 100644
--- a/site_ansto/instrument/config/environment/magneticField/tsi_smc_sct.tcl
+++ b/site_ansto/instrument/config/environment/magneticField/tsi_smc_sct.tcl
@@ -88,7 +88,7 @@ proc ::scobj::tsi_smc::checkstatus {tc_root} {
       set sp "[sct target]"
       if {[hpropexists [sct] simulated] && [sct simulated] == "true"} {
         set pv "${sp}"
-        hset ${tc_root}/[sct driveable] ${sp}
+        hupdateif ${tc_root}/[sct driveable] ${sp}
       }
         set pv "[hval ${tc_root}/[sct driveable]]"
       }
@@ -279,9 +279,7 @@ proc ::scobj::tsi_smc::mkDriver { sct_controller name device_class simulation_fl
     sicslist setatt ${name} long_name ${name}
 
     set scobj_hpath /sics/${name}
-    # Start of unnamed group
 
-    # Start of var: setpoint
     hfactory ${scobj_hpath}/setpoint plain user float
     hsetprop ${scobj_hpath}/setpoint write ${ns}::setGauss ${scobj_hpath} noResponse {}
     hsetprop ${scobj_hpath}/setpoint noResponse ${ns}::noResponse ${scobj_hpath}
@@ -316,7 +314,6 @@ proc ::scobj::tsi_smc::mkDriver { sct_controller name device_class simulation_fl
       hsetprop ${scobj_hpath}/setpoint simulated true
     }
 
-    # Start of var: value
     hfactory ${scobj_hpath}/value plain user float
     hsetprop ${scobj_hpath}/value control true
     hsetprop ${scobj_hpath}/value data true
@@ -335,13 +332,10 @@ proc ::scobj::tsi_smc::mkDriver { sct_controller name device_class simulation_fl
     hsetprop ${scobj_hpath} data "true"
     hsetprop ${scobj_hpath} klass "@none"
     hsetprop ${scobj_hpath} type "part"
-    # End of unnamed group
     ansto_makesctdrive ${name}_setpoint ${scobj_hpath}/setpoint ${scobj_hpath}/value ${sct_controller}
 
-    # Start of named group: a
     hfactory ${scobj_hpath}/a plain spy none
 
-    # Start of var: G
     hfactory ${scobj_hpath}/a/G plain user text
     hsetprop ${scobj_hpath}/a/G read ${ns}::getValue ${scobj_hpath} rdValue {G}
     hsetprop ${scobj_hpath}/a/G rdValue ${ns}::rdValue ${scobj_hpath}
@@ -363,7 +357,6 @@ proc ::scobj::tsi_smc::mkDriver { sct_controller name device_class simulation_fl
       hsetprop ${scobj_hpath}/a/G simulated true
     }
 
-    # Start of var: J
     hfactory ${scobj_hpath}/a/J plain user text
     hsetprop ${scobj_hpath}/a/J read ${ns}::getValue ${scobj_hpath} rdValue {J}
     hsetprop ${scobj_hpath}/a/J rdValue ${ns}::rdValue ${scobj_hpath}
@@ -384,7 +377,6 @@ proc ::scobj::tsi_smc::mkDriver { sct_controller name device_class simulation_fl
       hsetprop ${scobj_hpath}/a/J simulated true
     }
 
-    # Start of var: K
     hfactory ${scobj_hpath}/a/K plain user text
     hsetprop ${scobj_hpath}/a/K read ${ns}::getValue ${scobj_hpath} rdValue {K}
     hsetprop ${scobj_hpath}/a/K rdValue ${ns}::rdValue ${scobj_hpath}
@@ -405,7 +397,6 @@ proc ::scobj::tsi_smc::mkDriver { sct_controller name device_class simulation_fl
       hsetprop ${scobj_hpath}/a/K simulated true
     }
 
-    # Start of var: N
     hfactory ${scobj_hpath}/a/N plain user text
     hsetprop ${scobj_hpath}/a/N read ${ns}::getValue ${scobj_hpath} rdValue {N}
     hsetprop ${scobj_hpath}/a/N rdValue ${ns}::rdValue ${scobj_hpath}
@@ -426,7 +417,6 @@ proc ::scobj::tsi_smc::mkDriver { sct_controller name device_class simulation_fl
       hsetprop ${scobj_hpath}/a/N simulated true
     }
 
-    # Start of var: O
     hfactory ${scobj_hpath}/a/O plain user text
     hsetprop ${scobj_hpath}/a/O read ${ns}::getValue ${scobj_hpath} rdValue {O}
     hsetprop ${scobj_hpath}/a/O rdValue ${ns}::rdValue ${scobj_hpath}
@@ -447,7 +437,6 @@ proc ::scobj::tsi_smc::mkDriver { sct_controller name device_class simulation_fl
       hsetprop ${scobj_hpath}/a/O simulated true
     }
 
-    # Start of var: S
     hfactory ${scobj_hpath}/a/S plain user text
     hsetprop ${scobj_hpath}/a/S read ${ns}::getValue ${scobj_hpath} rdValue {S}
     hsetprop ${scobj_hpath}/a/S rdValue ${ns}::rdValue ${scobj_hpath}
@@ -470,12 +459,9 @@ proc ::scobj::tsi_smc::mkDriver { sct_controller name device_class simulation_fl
     hsetprop ${scobj_hpath}/a data "false"
     hsetprop ${scobj_hpath}/a klass "@none"
     hsetprop ${scobj_hpath}/a type "part"
-    # End of named group: a
 
-    # Start of named group: b
     hfactory ${scobj_hpath}/b plain spy none
 
-    # Start of var: Lower
     hfactory ${scobj_hpath}/b/Lower plain user float
     hsetprop ${scobj_hpath}/b/Lower write ${ns}::setValue ${scobj_hpath} noResponse {L}
     hsetprop ${scobj_hpath}/b/Lower noResponse ${ns}::noResponse ${scobj_hpath}
@@ -501,7 +487,6 @@ proc ::scobj::tsi_smc::mkDriver { sct_controller name device_class simulation_fl
       hsetprop ${scobj_hpath}/b/Lower simulated true
     }
 
-    # Start of var: Pause
     hfactory ${scobj_hpath}/b/Pause plain user int
     hsetprop ${scobj_hpath}/b/Pause write ${ns}::setValue ${scobj_hpath} noResponse {P}
     hsetprop ${scobj_hpath}/b/Pause noResponse ${ns}::noResponse ${scobj_hpath}
@@ -527,7 +512,6 @@ proc ::scobj::tsi_smc::mkDriver { sct_controller name device_class simulation_fl
       hsetprop ${scobj_hpath}/b/Pause simulated true
     }
 
-    # Start of var: Ramp
     hfactory ${scobj_hpath}/b/Ramp plain user int
     hsetprop ${scobj_hpath}/b/Ramp write ${ns}::setValue ${scobj_hpath} noResponse {R}
     hsetprop ${scobj_hpath}/b/Ramp noResponse ${ns}::noResponse ${scobj_hpath}
@@ -553,7 +537,6 @@ proc ::scobj::tsi_smc::mkDriver { sct_controller name device_class simulation_fl
       hsetprop ${scobj_hpath}/b/Ramp simulated true
     }
 
-    # Start of var: Rate
     hfactory ${scobj_hpath}/b/Rate plain user float
     hsetprop ${scobj_hpath}/b/Rate write ${ns}::setValue ${scobj_hpath} noResponse {A}
     hsetprop ${scobj_hpath}/b/Rate noResponse ${ns}::noResponse ${scobj_hpath}
@@ -578,7 +561,6 @@ proc ::scobj::tsi_smc::mkDriver { sct_controller name device_class simulation_fl
     hsetprop ${scobj_hpath}/b data "true"
     hsetprop ${scobj_hpath}/b klass "@none"
     hsetprop ${scobj_hpath}/b type "part"
-    # End of named group: b
     hsetprop ${scobj_hpath} klass ${device_class}
     hsetprop ${scobj_hpath} data true
     hsetprop ${scobj_hpath} debug_threshold 5
@@ -622,8 +604,8 @@ proc add_tsi_smc {name ip_address tcp_port {id 1}} {
   ::scobj::tsi_smc::add_driver ${name} "environment" ${simulation_flag} ${ip_address} ${tcp_port} ${id}
 }
 
-clientput "file evaluation of sct_tsi_smc.tcl"
-::scobj::tsi_smc::sics_log 9 "file evaluation of sct_tsi_smc.tcl"
+clientput "file evaluation of tsi_smc_sct.tcl"
+::scobj::tsi_smc::sics_log 9 "file evaluation of tsi_smc_sct.tcl"
 
 proc ::scobj::tsi_smc::read_config {} {
   set catch_status [ catch {
@@ -710,7 +692,7 @@ proc ::scobj::tsi_smc::read_config {} {
           if { [llength $missing_list] > 0 } {
               error "$name is missing configuration values $missing_list"
           }
-          ${ns}::mkDriver sct_${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port} {*}$arg_list
+          ${ns}::mkDriver sct_${name} ${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port} {*}$arg_list
         }
       }
     }
diff --git a/site_ansto/instrument/config/environment/mvp_valve_sct.tcl b/site_ansto/instrument/config/environment/mvp_valve_sct.tcl
index 98a74ba0..3fc74657 100644
--- a/site_ansto/instrument/config/environment/mvp_valve_sct.tcl
+++ b/site_ansto/instrument/config/environment/mvp_valve_sct.tcl
@@ -62,8 +62,8 @@ proc add_mvp_valve {name ip_address tcp_port id datype} {
   ::scobj::mvp_valve::add_driver ${name} "environment" ${simulation_flag} ${ip_address} ${tcp_port} ${id} ${datype}
 }
 
-clientput "file evaluation of sct_mvp_valve.tcl"
-::scobj::mvp_valve::sics_log 9 "file evaluation of sct_mvp_valve.tcl"
+clientput "file evaluation of mvp_valve_sct.tcl"
+::scobj::mvp_valve::sics_log 9 "file evaluation of mvp_valve_sct.tcl"
 
 proc ::scobj::mvp_valve::read_config {} {
   set catch_status [ catch {
@@ -111,7 +111,7 @@ proc ::scobj::mvp_valve::read_config {} {
           if { [llength $missing_list] > 0 } {
               error "$name is missing configuration values $missing_list"
           }
-          ${ns}::mkDriver sct_${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port} {*}$arg_list
+          ${ns}::mkDriver sct_${name} ${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port} {*}$arg_list
         }
       }
     }
diff --git a/site_ansto/instrument/config/environment/nhq_200_sct.tcl b/site_ansto/instrument/config/environment/nhq_200_sct.tcl
index bd7be084..93c9481f 100644
--- a/site_ansto/instrument/config/environment/nhq_200_sct.tcl
+++ b/site_ansto/instrument/config/environment/nhq_200_sct.tcl
@@ -88,7 +88,7 @@ proc ::scobj::nhq_200::checkstatus {tc_root} {
       set sp "[sct target]"
       if {[hpropexists [sct] simulated] && [sct simulated] == "true"} {
         set pv "${sp}"
-        hset ${tc_root}/[sct driveable] ${sp}
+        hupdateif ${tc_root}/[sct driveable] ${sp}
       }
         set pv "[hval ${tc_root}/[sct driveable]]"
       }
@@ -285,9 +285,7 @@ proc ::scobj::nhq_200::mkDriver { sct_controller name device_class simulation_fl
     sicslist setatt ${name} long_name ${name}
 
     set scobj_hpath /sics/${name}
-    # Start of unnamed group
 
-    # Start of var: break
     hfactory ${scobj_hpath}/break plain user int
     hsetprop ${scobj_hpath}/break read ${ns}::getValue ${scobj_hpath} rdValue {W}
     hsetprop ${scobj_hpath}/break rdValue ${ns}::rdValue ${scobj_hpath}
@@ -309,7 +307,6 @@ proc ::scobj::nhq_200::mkDriver { sct_controller name device_class simulation_fl
       hsetprop ${scobj_hpath}/break simulated true
     }
 
-    # Start of var: id
     hfactory ${scobj_hpath}/id plain user text
     hsetprop ${scobj_hpath}/id read ${ns}::getValue ${scobj_hpath} rdValue {#}
     hsetprop ${scobj_hpath}/id rdValue ${ns}::rdValue ${scobj_hpath}
@@ -334,12 +331,9 @@ proc ::scobj::nhq_200::mkDriver { sct_controller name device_class simulation_fl
     hsetprop ${scobj_hpath} data "true"
     hsetprop ${scobj_hpath} klass "@none"
     hsetprop ${scobj_hpath} type "part"
-    # End of unnamed group
 
-    # Start of named group: ch1
     hfactory ${scobj_hpath}/ch1 plain spy none
 
-    # Start of var: auto_start
     hfactory ${scobj_hpath}/ch1/auto_start plain user int
     hsetprop ${scobj_hpath}/ch1/auto_start read ${ns}::getValue ${scobj_hpath} rdValue {A1}
     hsetprop ${scobj_hpath}/ch1/auto_start rdValue ${ns}::rdValue ${scobj_hpath}
@@ -365,7 +359,6 @@ proc ::scobj::nhq_200::mkDriver { sct_controller name device_class simulation_fl
       hsetprop ${scobj_hpath}/ch1/auto_start simulated true
     }
 
-    # Start of var: current
     hfactory ${scobj_hpath}/ch1/current plain user text
     hsetprop ${scobj_hpath}/ch1/current read ${ns}::getValue ${scobj_hpath} rdCurrent {I1}
     hsetprop ${scobj_hpath}/ch1/current rdCurrent ${ns}::rdCurrent ${scobj_hpath}
@@ -387,7 +380,6 @@ proc ::scobj::nhq_200::mkDriver { sct_controller name device_class simulation_fl
       hsetprop ${scobj_hpath}/ch1/current simulated true
     }
 
-    # Start of var: go
     hfactory ${scobj_hpath}/ch1/go plain user int
     hsetprop ${scobj_hpath}/ch1/go write ${ns}::setValue ${scobj_hpath} noResponse {G1}
     hsetprop ${scobj_hpath}/ch1/go noResponse ${ns}::noResponse ${scobj_hpath}
@@ -410,7 +402,6 @@ proc ::scobj::nhq_200::mkDriver { sct_controller name device_class simulation_fl
       hsetprop ${scobj_hpath}/ch1/go simulated true
     }
 
-    # Start of var: i_lim
     hfactory ${scobj_hpath}/ch1/i_lim plain user int
     hsetprop ${scobj_hpath}/ch1/i_lim read ${ns}::getValue ${scobj_hpath} rdValue {N1}
     hsetprop ${scobj_hpath}/ch1/i_lim rdValue ${ns}::rdValue ${scobj_hpath}
@@ -432,7 +423,6 @@ proc ::scobj::nhq_200::mkDriver { sct_controller name device_class simulation_fl
       hsetprop ${scobj_hpath}/ch1/i_lim simulated true
     }
 
-    # Start of var: i_trip
     hfactory ${scobj_hpath}/ch1/i_trip plain user int
     hsetprop ${scobj_hpath}/ch1/i_trip read ${ns}::getValue ${scobj_hpath} rdValue {L1}
     hsetprop ${scobj_hpath}/ch1/i_trip rdValue ${ns}::rdValue ${scobj_hpath}
@@ -458,7 +448,6 @@ proc ::scobj::nhq_200::mkDriver { sct_controller name device_class simulation_fl
       hsetprop ${scobj_hpath}/ch1/i_trip simulated true
     }
 
-    # Start of var: module
     hfactory ${scobj_hpath}/ch1/module plain user int
     hsetprop ${scobj_hpath}/ch1/module read ${ns}::getValue ${scobj_hpath} rdValue {T1}
     hsetprop ${scobj_hpath}/ch1/module rdValue ${ns}::rdValue ${scobj_hpath}
@@ -480,7 +469,6 @@ proc ::scobj::nhq_200::mkDriver { sct_controller name device_class simulation_fl
       hsetprop ${scobj_hpath}/ch1/module simulated true
     }
 
-    # Start of var: status
     hfactory ${scobj_hpath}/ch1/status plain user text
     hsetprop ${scobj_hpath}/ch1/status read ${ns}::getValue ${scobj_hpath} rdValue {S1}
     hsetprop ${scobj_hpath}/ch1/status rdValue ${ns}::rdValue ${scobj_hpath}
@@ -502,7 +490,6 @@ proc ::scobj::nhq_200::mkDriver { sct_controller name device_class simulation_fl
       hsetprop ${scobj_hpath}/ch1/status simulated true
     }
 
-    # Start of var: v_lim
     hfactory ${scobj_hpath}/ch1/v_lim plain user int
     hsetprop ${scobj_hpath}/ch1/v_lim read ${ns}::getValue ${scobj_hpath} rdValue {M1}
     hsetprop ${scobj_hpath}/ch1/v_lim rdValue ${ns}::rdValue ${scobj_hpath}
@@ -524,7 +511,6 @@ proc ::scobj::nhq_200::mkDriver { sct_controller name device_class simulation_fl
       hsetprop ${scobj_hpath}/ch1/v_lim simulated true
     }
 
-    # Start of var: v_ramp
     hfactory ${scobj_hpath}/ch1/v_ramp plain user int
     hsetprop ${scobj_hpath}/ch1/v_ramp read ${ns}::getValue ${scobj_hpath} rdValue {V1}
     hsetprop ${scobj_hpath}/ch1/v_ramp rdValue ${ns}::rdValue ${scobj_hpath}
@@ -550,7 +536,6 @@ proc ::scobj::nhq_200::mkDriver { sct_controller name device_class simulation_fl
       hsetprop ${scobj_hpath}/ch1/v_ramp simulated true
     }
 
-    # Start of var: v_sp
     hfactory ${scobj_hpath}/ch1/v_sp plain user int
     hsetprop ${scobj_hpath}/ch1/v_sp read ${ns}::getValue ${scobj_hpath} rdValue {D1}
     hsetprop ${scobj_hpath}/ch1/v_sp rdValue ${ns}::rdValue ${scobj_hpath}
@@ -585,7 +570,6 @@ proc ::scobj::nhq_200::mkDriver { sct_controller name device_class simulation_fl
       hsetprop ${scobj_hpath}/ch1/v_sp simulated true
     }
 
-    # Start of var: voltage
     hfactory ${scobj_hpath}/ch1/voltage plain user int
     hsetprop ${scobj_hpath}/ch1/voltage read ${ns}::getValue ${scobj_hpath} rdVoltage {U1}
     hsetprop ${scobj_hpath}/ch1/voltage rdVoltage ${ns}::rdVoltage ${scobj_hpath}
@@ -609,13 +593,10 @@ proc ::scobj::nhq_200::mkDriver { sct_controller name device_class simulation_fl
     hsetprop ${scobj_hpath}/ch1 data "true"
     hsetprop ${scobj_hpath}/ch1 klass "@none"
     hsetprop ${scobj_hpath}/ch1 type "part"
-    # End of named group: ch1
     ansto_makesctdrive ${name}_ch1_v_sp ${scobj_hpath}/ch1/v_sp ${scobj_hpath}/ch1/voltage ${sct_controller}
 
-    # Start of named group: ch2
     hfactory ${scobj_hpath}/ch2 plain spy none
 
-    # Start of var: auto_start
     hfactory ${scobj_hpath}/ch2/auto_start plain user int
     hsetprop ${scobj_hpath}/ch2/auto_start read ${ns}::getValue ${scobj_hpath} rdValue {A2}
     hsetprop ${scobj_hpath}/ch2/auto_start rdValue ${ns}::rdValue ${scobj_hpath}
@@ -641,7 +622,6 @@ proc ::scobj::nhq_200::mkDriver { sct_controller name device_class simulation_fl
       hsetprop ${scobj_hpath}/ch2/auto_start simulated true
     }
 
-    # Start of var: current
     hfactory ${scobj_hpath}/ch2/current plain user text
     hsetprop ${scobj_hpath}/ch2/current read ${ns}::getValue ${scobj_hpath} rdCurrent {I2}
     hsetprop ${scobj_hpath}/ch2/current rdCurrent ${ns}::rdCurrent ${scobj_hpath}
@@ -663,7 +643,6 @@ proc ::scobj::nhq_200::mkDriver { sct_controller name device_class simulation_fl
       hsetprop ${scobj_hpath}/ch2/current simulated true
     }
 
-    # Start of var: go
     hfactory ${scobj_hpath}/ch2/go plain user int
     hsetprop ${scobj_hpath}/ch2/go write ${ns}::setValue ${scobj_hpath} noResponse {G2}
     hsetprop ${scobj_hpath}/ch2/go noResponse ${ns}::noResponse ${scobj_hpath}
@@ -686,7 +665,6 @@ proc ::scobj::nhq_200::mkDriver { sct_controller name device_class simulation_fl
       hsetprop ${scobj_hpath}/ch2/go simulated true
     }
 
-    # Start of var: i_lim
     hfactory ${scobj_hpath}/ch2/i_lim plain user int
     hsetprop ${scobj_hpath}/ch2/i_lim read ${ns}::getValue ${scobj_hpath} rdValue {N2}
     hsetprop ${scobj_hpath}/ch2/i_lim rdValue ${ns}::rdValue ${scobj_hpath}
@@ -708,7 +686,6 @@ proc ::scobj::nhq_200::mkDriver { sct_controller name device_class simulation_fl
       hsetprop ${scobj_hpath}/ch2/i_lim simulated true
     }
 
-    # Start of var: i_trip
     hfactory ${scobj_hpath}/ch2/i_trip plain user int
     hsetprop ${scobj_hpath}/ch2/i_trip read ${ns}::getValue ${scobj_hpath} rdValue {L2}
     hsetprop ${scobj_hpath}/ch2/i_trip rdValue ${ns}::rdValue ${scobj_hpath}
@@ -734,7 +711,6 @@ proc ::scobj::nhq_200::mkDriver { sct_controller name device_class simulation_fl
       hsetprop ${scobj_hpath}/ch2/i_trip simulated true
     }
 
-    # Start of var: module
     hfactory ${scobj_hpath}/ch2/module plain user int
     hsetprop ${scobj_hpath}/ch2/module read ${ns}::getValue ${scobj_hpath} rdValue {T2}
     hsetprop ${scobj_hpath}/ch2/module rdValue ${ns}::rdValue ${scobj_hpath}
@@ -756,7 +732,6 @@ proc ::scobj::nhq_200::mkDriver { sct_controller name device_class simulation_fl
       hsetprop ${scobj_hpath}/ch2/module simulated true
     }
 
-    # Start of var: status
     hfactory ${scobj_hpath}/ch2/status plain user text
     hsetprop ${scobj_hpath}/ch2/status read ${ns}::getValue ${scobj_hpath} rdValue {S2}
     hsetprop ${scobj_hpath}/ch2/status rdValue ${ns}::rdValue ${scobj_hpath}
@@ -778,7 +753,6 @@ proc ::scobj::nhq_200::mkDriver { sct_controller name device_class simulation_fl
       hsetprop ${scobj_hpath}/ch2/status simulated true
     }
 
-    # Start of var: v_lim
     hfactory ${scobj_hpath}/ch2/v_lim plain user int
     hsetprop ${scobj_hpath}/ch2/v_lim read ${ns}::getValue ${scobj_hpath} rdValue {M2}
     hsetprop ${scobj_hpath}/ch2/v_lim rdValue ${ns}::rdValue ${scobj_hpath}
@@ -800,7 +774,6 @@ proc ::scobj::nhq_200::mkDriver { sct_controller name device_class simulation_fl
       hsetprop ${scobj_hpath}/ch2/v_lim simulated true
     }
 
-    # Start of var: v_ramp
     hfactory ${scobj_hpath}/ch2/v_ramp plain user int
     hsetprop ${scobj_hpath}/ch2/v_ramp read ${ns}::getValue ${scobj_hpath} rdValue {V2}
     hsetprop ${scobj_hpath}/ch2/v_ramp rdValue ${ns}::rdValue ${scobj_hpath}
@@ -826,7 +799,6 @@ proc ::scobj::nhq_200::mkDriver { sct_controller name device_class simulation_fl
       hsetprop ${scobj_hpath}/ch2/v_ramp simulated true
     }
 
-    # Start of var: v_sp
     hfactory ${scobj_hpath}/ch2/v_sp plain user int
     hsetprop ${scobj_hpath}/ch2/v_sp read ${ns}::getValue ${scobj_hpath} rdValue {D2}
     hsetprop ${scobj_hpath}/ch2/v_sp rdValue ${ns}::rdValue ${scobj_hpath}
@@ -861,7 +833,6 @@ proc ::scobj::nhq_200::mkDriver { sct_controller name device_class simulation_fl
       hsetprop ${scobj_hpath}/ch2/v_sp simulated true
     }
 
-    # Start of var: voltage
     hfactory ${scobj_hpath}/ch2/voltage plain user int
     hsetprop ${scobj_hpath}/ch2/voltage read ${ns}::getValue ${scobj_hpath} rdVoltage {U2}
     hsetprop ${scobj_hpath}/ch2/voltage rdVoltage ${ns}::rdVoltage ${scobj_hpath}
@@ -885,7 +856,6 @@ proc ::scobj::nhq_200::mkDriver { sct_controller name device_class simulation_fl
     hsetprop ${scobj_hpath}/ch2 data "true"
     hsetprop ${scobj_hpath}/ch2 klass "@none"
     hsetprop ${scobj_hpath}/ch2 type "part"
-    # End of named group: ch2
     ansto_makesctdrive ${name}_ch2_v_sp ${scobj_hpath}/ch2/v_sp ${scobj_hpath}/ch2/voltage ${sct_controller}
     hsetprop ${scobj_hpath} klass ${device_class}
     hsetprop ${scobj_hpath} data true
@@ -930,8 +900,8 @@ proc add_nhq_200 {name ip_address tcp_port} {
   ::scobj::nhq_200::add_driver ${name} "NXdetector" ${simulation_flag} ${ip_address} ${tcp_port}
 }
 
-clientput "file evaluation of sct_nhq_200.tcl"
-::scobj::nhq_200::sics_log 9 "file evaluation of sct_nhq_200.tcl"
+clientput "file evaluation of nhq_200_sct.tcl"
+::scobj::nhq_200::sics_log 9 "file evaluation of nhq_200_sct.tcl"
 
 proc ::scobj::nhq_200::read_config {} {
   set catch_status [ catch {
@@ -1003,7 +973,7 @@ proc ::scobj::nhq_200::read_config {} {
             }
             makesctcontroller sct_${name} aqadapter ${asyncqueue}
           }
-          ${ns}::mkDriver sct_${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port}
+          ${ns}::mkDriver sct_${name} ${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port}
         }
       }
     }
diff --git a/site_ansto/instrument/config/environment/omron_hldc_sct.tcl b/site_ansto/instrument/config/environment/omron_hldc_sct.tcl
index 71abde15..092681e9 100644
--- a/site_ansto/instrument/config/environment/omron_hldc_sct.tcl
+++ b/site_ansto/instrument/config/environment/omron_hldc_sct.tcl
@@ -201,9 +201,7 @@ proc ::scobj::omron_hldc::mkDriver { sct_controller name device_class simulation
     sicslist setatt ${name} long_name ${name}
 
     set scobj_hpath /sics/${name}
-    # Start of unnamed group
 
-    # Start of var: distance
     hfactory ${scobj_hpath}/distance plain user float
     hsetprop ${scobj_hpath}/distance read ${ns}::getValue ${scobj_hpath} read_mm {0201C02030008001}
     hsetprop ${scobj_hpath}/distance read_mm ${ns}::read_mm ${scobj_hpath}
@@ -225,7 +223,6 @@ proc ::scobj::omron_hldc::mkDriver { sct_controller name device_class simulation
       hsetprop ${scobj_hpath}/distance simulated true
     }
 
-    # Start of var: id
     hfactory ${scobj_hpath}/id plain user text
     hsetprop ${scobj_hpath}/id read ${ns}::getValue ${scobj_hpath} read_id {0501}
     hsetprop ${scobj_hpath}/id read_id ${ns}::read_id ${scobj_hpath}
@@ -250,7 +247,6 @@ proc ::scobj::omron_hldc::mkDriver { sct_controller name device_class simulation
     hsetprop ${scobj_hpath} data "true"
     hsetprop ${scobj_hpath} klass "@none"
     hsetprop ${scobj_hpath} type "part"
-    # End of unnamed group
     hsetprop ${scobj_hpath} klass ${device_class}
     hsetprop ${scobj_hpath} data true
     hsetprop ${scobj_hpath} debug_threshold 5
@@ -294,8 +290,8 @@ proc add_omron_hldc {name ip_address tcp_port} {
   ::scobj::omron_hldc::add_driver ${name} "environment" ${simulation_flag} ${ip_address} ${tcp_port}
 }
 
-clientput "file evaluation of sct_omron_hldc.tcl"
-::scobj::omron_hldc::sics_log 9 "file evaluation of sct_omron_hldc.tcl"
+clientput "file evaluation of omron_hldc_sct.tcl"
+::scobj::omron_hldc::sics_log 9 "file evaluation of omron_hldc_sct.tcl"
 
 proc ::scobj::omron_hldc::read_config {} {
   set catch_status [ catch {
@@ -367,7 +363,7 @@ proc ::scobj::omron_hldc::read_config {} {
             }
             makesctcontroller sct_${name} aqadapter ${asyncqueue}
           }
-          ${ns}::mkDriver sct_${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port}
+          ${ns}::mkDriver sct_${name} ${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port}
         }
       }
     }
diff --git a/site_ansto/instrument/config/environment/protekmm_sct.tcl b/site_ansto/instrument/config/environment/protekmm_sct.tcl
index e051dd3e..6928ec09 100644
--- a/site_ansto/instrument/config/environment/protekmm_sct.tcl
+++ b/site_ansto/instrument/config/environment/protekmm_sct.tcl
@@ -83,8 +83,8 @@ proc add_protekmm {name ip_address tcp_port id datype} {
   ::scobj::protekmm::add_driver ${name} "environment" ${simulation_flag} ${ip_address} ${tcp_port} ${id} ${datype}
 }
 
-clientput "file evaluation of sct_protekmm.tcl"
-::scobj::protekmm::sics_log 9 "file evaluation of sct_protekmm.tcl"
+clientput "file evaluation of protekmm_sct.tcl"
+::scobj::protekmm::sics_log 9 "file evaluation of protekmm_sct.tcl"
 
 proc ::scobj::protekmm::read_config {} {
   set catch_status [ catch {
@@ -171,7 +171,7 @@ proc ::scobj::protekmm::read_config {} {
           if { [llength $missing_list] > 0 } {
               error "$name is missing configuration values $missing_list"
           }
-          ${ns}::mkDriver sct_${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port} {*}$arg_list
+          ${ns}::mkDriver sct_${name} ${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port} {*}$arg_list
         }
       }
     }
diff --git a/site_ansto/instrument/config/environment/syringe_pump_sct.tcl b/site_ansto/instrument/config/environment/syringe_pump_sct.tcl
index ec1f5d0d..cae10bfb 100644
--- a/site_ansto/instrument/config/environment/syringe_pump_sct.tcl
+++ b/site_ansto/instrument/config/environment/syringe_pump_sct.tcl
@@ -74,8 +74,8 @@ proc add_syringe_pump {name ip_address tcp_port id datype} {
   ::scobj::syringe_pump::add_driver ${name} "environment" ${simulation_flag} ${ip_address} ${tcp_port} ${id} ${datype}
 }
 
-clientput "file evaluation of sct_syringe_pump.tcl"
-::scobj::syringe_pump::sics_log 9 "file evaluation of sct_syringe_pump.tcl"
+clientput "file evaluation of syringe_pump_sct.tcl"
+::scobj::syringe_pump::sics_log 9 "file evaluation of syringe_pump_sct.tcl"
 
 proc ::scobj::syringe_pump::read_config {} {
   set catch_status [ catch {
@@ -162,7 +162,7 @@ proc ::scobj::syringe_pump::read_config {} {
           if { [llength $missing_list] > 0 } {
               error "$name is missing configuration values $missing_list"
           }
-          ${ns}::mkDriver sct_${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port} {*}$arg_list
+          ${ns}::mkDriver sct_${name} ${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port} {*}$arg_list
         }
       }
     }
diff --git a/site_ansto/instrument/config/environment/temperature/eurotherm_3200_sct.tcl b/site_ansto/instrument/config/environment/temperature/eurotherm_3200_sct.tcl
index a4f86112..25e2ff94 100644
--- a/site_ansto/instrument/config/environment/temperature/eurotherm_3200_sct.tcl
+++ b/site_ansto/instrument/config/environment/temperature/eurotherm_3200_sct.tcl
@@ -88,7 +88,7 @@ proc ::scobj::eurotherm_3200::checkstatus {tc_root} {
       set sp "[sct target]"
       if {[hpropexists [sct] simulated] && [sct simulated] == "true"} {
         set pv "${sp}"
-        hset ${tc_root}/[sct driveable] ${sp}
+        hupdateif ${tc_root}/[sct driveable] ${sp}
       }
         set pv "[hval ${tc_root}/[sct driveable]]"
       }
@@ -241,10 +241,8 @@ proc ::scobj::eurotherm_3200::mkDriver { sct_controller name device_class simula
 
     set scobj_hpath /sics/${name}
 
-    # Start of named group: loop1
     hfactory ${scobj_hpath}/loop1 plain spy none
 
-    # Start of var: sensor
     hfactory ${scobj_hpath}/loop1/sensor plain user float
     hsetprop ${scobj_hpath}/loop1/sensor read ${ns}::getValue ${scobj_hpath} rdValue {1}
     hsetprop ${scobj_hpath}/loop1/sensor rdValue ${ns}::rdValue ${scobj_hpath}
@@ -268,7 +266,6 @@ proc ::scobj::eurotherm_3200::mkDriver { sct_controller name device_class simula
       hsetprop ${scobj_hpath}/loop1/sensor simulated true
     }
 
-    # Start of var: setpoint
     hfactory ${scobj_hpath}/loop1/setpoint plain user float
     hsetprop ${scobj_hpath}/loop1/setpoint read ${ns}::getValue ${scobj_hpath} rdValue {2}
     hsetprop ${scobj_hpath}/loop1/setpoint rdValue ${ns}::rdValue ${scobj_hpath}
@@ -306,13 +303,10 @@ proc ::scobj::eurotherm_3200::mkDriver { sct_controller name device_class simula
     hsetprop ${scobj_hpath}/loop1 data "true"
     hsetprop ${scobj_hpath}/loop1 klass "@none"
     hsetprop ${scobj_hpath}/loop1 type "part"
-    # End of named group: loop1
     ansto_makesctdrive ${name}_loop1_setpoint ${scobj_hpath}/loop1/setpoint ${scobj_hpath}/loop1/sensor ${sct_controller}
 
-    # Start of named group: loop1_extra
     hfactory ${scobj_hpath}/loop1_extra plain spy none
 
-    # Start of var: active_setpoint
     hfactory ${scobj_hpath}/loop1_extra/active_setpoint plain user float
     hsetprop ${scobj_hpath}/loop1_extra/active_setpoint read ${ns}::getValue ${scobj_hpath} rdValue {15}
     hsetprop ${scobj_hpath}/loop1_extra/active_setpoint rdValue ${ns}::rdValue ${scobj_hpath}
@@ -333,7 +327,6 @@ proc ::scobj::eurotherm_3200::mkDriver { sct_controller name device_class simula
       hsetprop ${scobj_hpath}/loop1_extra/active_setpoint simulated true
     }
 
-    # Start of var: alarm1_thresh
     hfactory ${scobj_hpath}/loop1_extra/alarm1_thresh plain user float
     hsetprop ${scobj_hpath}/loop1_extra/alarm1_thresh read ${ns}::getValue ${scobj_hpath} rdValue {13}
     hsetprop ${scobj_hpath}/loop1_extra/alarm1_thresh rdValue ${ns}::rdValue ${scobj_hpath}
@@ -358,7 +351,6 @@ proc ::scobj::eurotherm_3200::mkDriver { sct_controller name device_class simula
       hsetprop ${scobj_hpath}/loop1_extra/alarm1_thresh simulated true
     }
 
-    # Start of var: alarm2_thresh
     hfactory ${scobj_hpath}/loop1_extra/alarm2_thresh plain user float
     hsetprop ${scobj_hpath}/loop1_extra/alarm2_thresh read ${ns}::getValue ${scobj_hpath} rdValue {14}
     hsetprop ${scobj_hpath}/loop1_extra/alarm2_thresh rdValue ${ns}::rdValue ${scobj_hpath}
@@ -383,7 +375,6 @@ proc ::scobj::eurotherm_3200::mkDriver { sct_controller name device_class simula
       hsetprop ${scobj_hpath}/loop1_extra/alarm2_thresh simulated true
     }
 
-    # Start of var: manual_output
     hfactory ${scobj_hpath}/loop1_extra/manual_output plain user float
     hsetprop ${scobj_hpath}/loop1_extra/manual_output read ${ns}::getValue ${scobj_hpath} rdValue {3}
     hsetprop ${scobj_hpath}/loop1_extra/manual_output rdValue ${ns}::rdValue ${scobj_hpath}
@@ -404,7 +395,6 @@ proc ::scobj::eurotherm_3200::mkDriver { sct_controller name device_class simula
       hsetprop ${scobj_hpath}/loop1_extra/manual_output simulated true
     }
 
-    # Start of var: power_limit_high
     hfactory ${scobj_hpath}/loop1_extra/power_limit_high plain user float
     hsetprop ${scobj_hpath}/loop1_extra/power_limit_high read ${ns}::getValue ${scobj_hpath} rdValue {30}
     hsetprop ${scobj_hpath}/loop1_extra/power_limit_high rdValue ${ns}::rdValue ${scobj_hpath}
@@ -429,7 +419,6 @@ proc ::scobj::eurotherm_3200::mkDriver { sct_controller name device_class simula
       hsetprop ${scobj_hpath}/loop1_extra/power_limit_high simulated true
     }
 
-    # Start of var: power_limit_low
     hfactory ${scobj_hpath}/loop1_extra/power_limit_low plain user float
     hsetprop ${scobj_hpath}/loop1_extra/power_limit_low read ${ns}::getValue ${scobj_hpath} rdValue {31}
     hsetprop ${scobj_hpath}/loop1_extra/power_limit_low rdValue ${ns}::rdValue ${scobj_hpath}
@@ -454,7 +443,6 @@ proc ::scobj::eurotherm_3200::mkDriver { sct_controller name device_class simula
       hsetprop ${scobj_hpath}/loop1_extra/power_limit_low simulated true
     }
 
-    # Start of var: power_slew_rate
     hfactory ${scobj_hpath}/loop1_extra/power_slew_rate plain user float
     hsetprop ${scobj_hpath}/loop1_extra/power_slew_rate read ${ns}::getValue ${scobj_hpath} rdValue {37}
     hsetprop ${scobj_hpath}/loop1_extra/power_slew_rate rdValue ${ns}::rdValue ${scobj_hpath}
@@ -479,7 +467,6 @@ proc ::scobj::eurotherm_3200::mkDriver { sct_controller name device_class simula
       hsetprop ${scobj_hpath}/loop1_extra/power_slew_rate simulated true
     }
 
-    # Start of var: setpoint_slew_rate
     hfactory ${scobj_hpath}/loop1_extra/setpoint_slew_rate plain user float
     hsetprop ${scobj_hpath}/loop1_extra/setpoint_slew_rate read ${ns}::getValue ${scobj_hpath} rdValue {35}
     hsetprop ${scobj_hpath}/loop1_extra/setpoint_slew_rate rdValue ${ns}::rdValue ${scobj_hpath}
@@ -504,7 +491,6 @@ proc ::scobj::eurotherm_3200::mkDriver { sct_controller name device_class simula
       hsetprop ${scobj_hpath}/loop1_extra/setpoint_slew_rate simulated true
     }
 
-    # Start of var: working_output
     hfactory ${scobj_hpath}/loop1_extra/working_output plain user float
     hsetprop ${scobj_hpath}/loop1_extra/working_output read ${ns}::getValue ${scobj_hpath} rdValue {4}
     hsetprop ${scobj_hpath}/loop1_extra/working_output rdValue ${ns}::rdValue ${scobj_hpath}
@@ -525,7 +511,6 @@ proc ::scobj::eurotherm_3200::mkDriver { sct_controller name device_class simula
       hsetprop ${scobj_hpath}/loop1_extra/working_output simulated true
     }
 
-    # Start of var: working_setpoint
     hfactory ${scobj_hpath}/loop1_extra/working_setpoint plain user float
     hsetprop ${scobj_hpath}/loop1_extra/working_setpoint read ${ns}::getValue ${scobj_hpath} rdValue {5}
     hsetprop ${scobj_hpath}/loop1_extra/working_setpoint rdValue ${ns}::rdValue ${scobj_hpath}
@@ -548,12 +533,9 @@ proc ::scobj::eurotherm_3200::mkDriver { sct_controller name device_class simula
     hsetprop ${scobj_hpath}/loop1_extra data "false"
     hsetprop ${scobj_hpath}/loop1_extra klass "@none"
     hsetprop ${scobj_hpath}/loop1_extra type "part"
-    # End of named group: loop1_extra
 
-    # Start of named group: util
     hfactory ${scobj_hpath}/util plain spy none
 
-    # Start of var: mode
     hfactory ${scobj_hpath}/util/mode plain user text
     hsetprop ${scobj_hpath}/util/mode control false
     hsetprop ${scobj_hpath}/util/mode data false
@@ -566,7 +548,6 @@ proc ::scobj::eurotherm_3200::mkDriver { sct_controller name device_class simula
     hsetprop ${scobj_hpath}/util/mode type "part"
     hsetprop ${scobj_hpath}/util/mode nxalias "${name}_util_mode"
 
-    # Start of var: unit
     hfactory ${scobj_hpath}/util/unit plain user int
     hsetprop ${scobj_hpath}/util/unit control false
     hsetprop ${scobj_hpath}/util/unit data false
@@ -580,7 +561,6 @@ proc ::scobj::eurotherm_3200::mkDriver { sct_controller name device_class simula
     hsetprop ${scobj_hpath}/util data "false"
     hsetprop ${scobj_hpath}/util klass "@none"
     hsetprop ${scobj_hpath}/util type "part"
-    # End of named group: util
     hsetprop ${scobj_hpath} klass ${device_class}
     hsetprop ${scobj_hpath} data true
     hsetprop ${scobj_hpath} debug_threshold 5
@@ -624,8 +604,8 @@ proc add_eurotherm_3200 {name ip_address tcp_port id datype dev_id tol} {
   ::scobj::eurotherm_3200::add_driver ${name} "environment" ${simulation_flag} ${ip_address} ${tcp_port} ${id} ${datype} ${dev_id} ${tol}
 }
 
-clientput "file evaluation of sct_eurotherm_3200.tcl"
-::scobj::eurotherm_3200::sics_log 9 "file evaluation of sct_eurotherm_3200.tcl"
+clientput "file evaluation of eurotherm_3200_sct.tcl"
+::scobj::eurotherm_3200::sics_log 9 "file evaluation of eurotherm_3200_sct.tcl"
 
 proc ::scobj::eurotherm_3200::read_config {} {
   set catch_status [ catch {
@@ -712,7 +692,7 @@ proc ::scobj::eurotherm_3200::read_config {} {
           if { [llength $missing_list] > 0 } {
               error "$name is missing configuration values $missing_list"
           }
-          ${ns}::mkDriver sct_${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port} {*}$arg_list
+          ${ns}::mkDriver sct_${name} ${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port} {*}$arg_list
         }
       }
     }
diff --git a/site_ansto/instrument/config/environment/temperature/eurotherm_m2000_sct.tcl b/site_ansto/instrument/config/environment/temperature/eurotherm_m2000_sct.tcl
index 47120c24..dec4b92c 100644
--- a/site_ansto/instrument/config/environment/temperature/eurotherm_m2000_sct.tcl
+++ b/site_ansto/instrument/config/environment/temperature/eurotherm_m2000_sct.tcl
@@ -83,8 +83,8 @@ proc add_eurotherm_m2000 {name ip_address tcp_port id datype dev_id tol} {
   ::scobj::eurotherm_m2000::add_driver ${name} "environment" ${simulation_flag} ${ip_address} ${tcp_port} ${id} ${datype} ${dev_id} ${tol}
 }
 
-clientput "file evaluation of sct_eurotherm_m2000.tcl"
-::scobj::eurotherm_m2000::sics_log 9 "file evaluation of sct_eurotherm_m2000.tcl"
+clientput "file evaluation of eurotherm_m2000_sct.tcl"
+::scobj::eurotherm_m2000::sics_log 9 "file evaluation of eurotherm_m2000_sct.tcl"
 
 proc ::scobj::eurotherm_m2000::read_config {} {
   set catch_status [ catch {
@@ -171,7 +171,7 @@ proc ::scobj::eurotherm_m2000::read_config {} {
           if { [llength $missing_list] > 0 } {
               error "$name is missing configuration values $missing_list"
           }
-          ${ns}::mkDriver sct_${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port} {*}$arg_list
+          ${ns}::mkDriver sct_${name} ${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port} {*}$arg_list
         }
       }
     }
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 702f8967..90ef3331 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
@@ -88,7 +88,7 @@ proc ::scobj::julabo_lh45_gen::checkstatus {tc_root} {
       set sp "[sct target]"
       if {[hpropexists [sct] simulated] && [sct simulated] == "true"} {
         set pv "${sp}"
-        hset ${tc_root}/[sct driveable] ${sp}
+        hupdateif ${tc_root}/[sct driveable] ${sp}
       }
         set pv "[hval ${tc_root}/[sct driveable]]"
       }
@@ -380,9 +380,7 @@ proc ::scobj::julabo_lh45_gen::mkDriver { sct_controller name device_class simul
     sicslist setatt ${name} long_name ${name}
 
     set scobj_hpath /sics/${name}
-    # Start of unnamed group
 
-    # Start of var: heating_power_percent
     hfactory ${scobj_hpath}/heating_power_percent plain user float
     hsetprop ${scobj_hpath}/heating_power_percent read ${ns}::getValue ${scobj_hpath} rdValue {in_pv_01}
     hsetprop ${scobj_hpath}/heating_power_percent rdValue ${ns}::rdValue ${scobj_hpath}
@@ -404,7 +402,6 @@ proc ::scobj::julabo_lh45_gen::mkDriver { sct_controller name device_class simul
       hsetprop ${scobj_hpath}/heating_power_percent simulated true
     }
 
-    # Start of var: lh45_lasterror
     hfactory ${scobj_hpath}/lh45_lasterror plain user text
     hsetprop ${scobj_hpath}/lh45_lasterror control true
     hsetprop ${scobj_hpath}/lh45_lasterror data true
@@ -416,7 +413,6 @@ proc ::scobj::julabo_lh45_gen::mkDriver { sct_controller name device_class simul
     hsetprop ${scobj_hpath}/lh45_lasterror type "part"
     hsetprop ${scobj_hpath}/lh45_lasterror nxalias "${name}_lh45_lasterror"
 
-    # Start of var: lh45_state
     hfactory ${scobj_hpath}/lh45_state plain user text
     hsetprop ${scobj_hpath}/lh45_state read ${ns}::getState ${scobj_hpath} rdState {status}
     hsetprop ${scobj_hpath}/lh45_state rdState ${ns}::rdState ${scobj_hpath}
@@ -438,7 +434,6 @@ proc ::scobj::julabo_lh45_gen::mkDriver { sct_controller name device_class simul
       hsetprop ${scobj_hpath}/lh45_state simulated true
     }
 
-    # Start of var: overtemp_warnlimit
     hfactory ${scobj_hpath}/overtemp_warnlimit plain user float
     hsetprop ${scobj_hpath}/overtemp_warnlimit read ${ns}::getValue ${scobj_hpath} rdValue {in_sp_03}
     hsetprop ${scobj_hpath}/overtemp_warnlimit rdValue ${ns}::rdValue ${scobj_hpath}
@@ -460,7 +455,6 @@ proc ::scobj::julabo_lh45_gen::mkDriver { sct_controller name device_class simul
       hsetprop ${scobj_hpath}/overtemp_warnlimit simulated true
     }
 
-    # Start of var: remote_ctrl
     hfactory ${scobj_hpath}/remote_ctrl plain spy text
     hsetprop ${scobj_hpath}/remote_ctrl control true
     hsetprop ${scobj_hpath}/remote_ctrl data true
@@ -472,7 +466,6 @@ proc ::scobj::julabo_lh45_gen::mkDriver { sct_controller name device_class simul
     hsetprop ${scobj_hpath}/remote_ctrl type "part"
     hsetprop ${scobj_hpath}/remote_ctrl nxalias "${name}_remote_ctrl"
 
-    # Start of var: setpoint
     hfactory ${scobj_hpath}/setpoint plain user float
     hsetprop ${scobj_hpath}/setpoint read ${ns}::getValue ${scobj_hpath} rdValue {in_sp_00}
     hsetprop ${scobj_hpath}/setpoint rdValue ${ns}::rdValue ${scobj_hpath}
@@ -509,7 +502,6 @@ proc ::scobj::julabo_lh45_gen::mkDriver { sct_controller name device_class simul
       hsetprop ${scobj_hpath}/setpoint simulated true
     }
 
-    # Start of var: subtemp_warnlimit
     hfactory ${scobj_hpath}/subtemp_warnlimit plain user float
     hsetprop ${scobj_hpath}/subtemp_warnlimit read ${ns}::getValue ${scobj_hpath} rdValue {in_sp_04}
     hsetprop ${scobj_hpath}/subtemp_warnlimit rdValue ${ns}::rdValue ${scobj_hpath}
@@ -534,13 +526,10 @@ proc ::scobj::julabo_lh45_gen::mkDriver { sct_controller name device_class simul
     hsetprop ${scobj_hpath} data "true"
     hsetprop ${scobj_hpath} klass "@none"
     hsetprop ${scobj_hpath} type "part"
-    # End of unnamed group
     ansto_makesctdrive ${name}_setpoint ${scobj_hpath}/setpoint ${scobj_hpath}/sensor/value ${sct_controller}
 
-    # Start of named group: mode
     hfactory ${scobj_hpath}/mode plain spy none
 
-    # Start of var: ext_else_bath
     hfactory ${scobj_hpath}/mode/ext_else_bath plain user int
     hsetprop ${scobj_hpath}/mode/ext_else_bath read ${ns}::getValue ${scobj_hpath} rdValue {in_mode_04}
     hsetprop ${scobj_hpath}/mode/ext_else_bath rdValue ${ns}::rdValue ${scobj_hpath}
@@ -566,7 +555,6 @@ proc ::scobj::julabo_lh45_gen::mkDriver { sct_controller name device_class simul
       hsetprop ${scobj_hpath}/mode/ext_else_bath simulated true
     }
 
-    # Start of var: on_else_off
     hfactory ${scobj_hpath}/mode/on_else_off plain user int
     hsetprop ${scobj_hpath}/mode/on_else_off read ${ns}::getValue ${scobj_hpath} rdValue {in_mode_05}
     hsetprop ${scobj_hpath}/mode/on_else_off rdValue ${ns}::rdValue ${scobj_hpath}
@@ -594,12 +582,9 @@ proc ::scobj::julabo_lh45_gen::mkDriver { sct_controller name device_class simul
     hsetprop ${scobj_hpath}/mode data "true"
     hsetprop ${scobj_hpath}/mode klass "@none"
     hsetprop ${scobj_hpath}/mode type "part"
-    # End of named group: mode
 
-    # Start of named group: sensor
     hfactory ${scobj_hpath}/sensor plain spy none
 
-    # Start of var: bathtemp
     hfactory ${scobj_hpath}/sensor/bathtemp plain internal float
     hsetprop ${scobj_hpath}/sensor/bathtemp read ${ns}::getValue ${scobj_hpath} rdSensor {in_pv_00}
     hsetprop ${scobj_hpath}/sensor/bathtemp rdSensor ${ns}::rdSensor ${scobj_hpath}
@@ -623,7 +608,6 @@ proc ::scobj::julabo_lh45_gen::mkDriver { sct_controller name device_class simul
       hsetprop ${scobj_hpath}/sensor/bathtemp simulated true
     }
 
-    # Start of var: end_temperature
     hfactory ${scobj_hpath}/sensor/end_temperature plain internal float
     hsetprop ${scobj_hpath}/sensor/end_temperature control true
     hsetprop ${scobj_hpath}/sensor/end_temperature data true
@@ -636,7 +620,6 @@ proc ::scobj::julabo_lh45_gen::mkDriver { sct_controller name device_class simul
     hsetprop ${scobj_hpath}/sensor/end_temperature units "C"
     hsetprop ${scobj_hpath}/sensor/end_temperature nxalias "${name}_sensor_end_temperature"
 
-    # Start of var: external
     hfactory ${scobj_hpath}/sensor/external plain internal float
     hsetprop ${scobj_hpath}/sensor/external read ${ns}::getValue ${scobj_hpath} rdSensor {in_pv_02}
     hsetprop ${scobj_hpath}/sensor/external rdSensor ${ns}::rdSensor ${scobj_hpath}
@@ -660,7 +643,6 @@ proc ::scobj::julabo_lh45_gen::mkDriver { sct_controller name device_class simul
       hsetprop ${scobj_hpath}/sensor/external simulated true
     }
 
-    # Start of var: start_temperature
     hfactory ${scobj_hpath}/sensor/start_temperature plain internal float
     hsetprop ${scobj_hpath}/sensor/start_temperature control true
     hsetprop ${scobj_hpath}/sensor/start_temperature data true
@@ -673,7 +655,6 @@ proc ::scobj::julabo_lh45_gen::mkDriver { sct_controller name device_class simul
     hsetprop ${scobj_hpath}/sensor/start_temperature units "C"
     hsetprop ${scobj_hpath}/sensor/start_temperature nxalias "${name}_sensor_start_temperature"
 
-    # Start of var: value
     hfactory ${scobj_hpath}/sensor/value plain internal float
     hsetprop ${scobj_hpath}/sensor/value control true
     hsetprop ${scobj_hpath}/sensor/value data true
@@ -690,7 +671,6 @@ proc ::scobj::julabo_lh45_gen::mkDriver { sct_controller name device_class simul
     hsetprop ${scobj_hpath}/sensor data "true"
     hsetprop ${scobj_hpath}/sensor klass "@none"
     hsetprop ${scobj_hpath}/sensor type "part"
-    # End of named group: sensor
     hsetprop ${scobj_hpath} klass ${device_class}
     hsetprop ${scobj_hpath} data true
     hsetprop ${scobj_hpath} debug_threshold 5
@@ -741,8 +721,8 @@ proc add_julabo_lh45_gen {name ip_address tcp_port {id 1} {ctrl_sensor "bath"} {
   ::scobj::julabo_lh45_gen::add_driver ${name} "environment" ${simulation_flag} ${ip_address} ${tcp_port} ${id} ${ctrl_sensor} ${tol}
 }
 
-clientput "file evaluation of sct_julabo_lh45_gen.tcl"
-::scobj::julabo_lh45_gen::sics_log 9 "file evaluation of sct_julabo_lh45_gen.tcl"
+clientput "file evaluation of julabo_lh45_gen_sct.tcl"
+::scobj::julabo_lh45_gen::sics_log 9 "file evaluation of julabo_lh45_gen_sct.tcl"
 
 proc ::scobj::julabo_lh45_gen::read_config {} {
   set catch_status [ catch {
@@ -848,7 +828,7 @@ proc ::scobj::julabo_lh45_gen::read_config {} {
           if { [llength $missing_list] > 0 } {
               error "$name is missing configuration values $missing_list"
           }
-          ${ns}::mkDriver sct_${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port} {*}$arg_list
+          ${ns}::mkDriver sct_${name} ${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port} {*}$arg_list
         }
       }
     }
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 d0448846..fe12640a 100644
--- a/site_ansto/instrument/config/environment/temperature/lakeshore_218_sct.tcl
+++ b/site_ansto/instrument/config/environment/temperature/lakeshore_218_sct.tcl
@@ -168,9 +168,7 @@ proc ::scobj::lakeshore_218::mkDriver { sct_controller name device_class simulat
     sicslist setatt ${name} long_name ${name}
 
     set scobj_hpath /sics/${name}
-    # Start of unnamed group
 
-    # Start of var: krdg
     hfactory ${scobj_hpath}/krdg plain user text
     hsetprop ${scobj_hpath}/krdg read ${ns}::getValue ${scobj_hpath} rdValue {KRDG? 0}
     hsetprop ${scobj_hpath}/krdg rdValue ${ns}::rdValue ${scobj_hpath}
@@ -195,12 +193,9 @@ proc ::scobj::lakeshore_218::mkDriver { sct_controller name device_class simulat
     hsetprop ${scobj_hpath} data "false"
     hsetprop ${scobj_hpath} klass "@none"
     hsetprop ${scobj_hpath} type "part"
-    # End of unnamed group
 
-    # Start of named group: sensor
     hfactory ${scobj_hpath}/sensor plain spy none
 
-    # Start of var: ch1
     hfactory ${scobj_hpath}/sensor/ch1 plain user float
     hsetprop ${scobj_hpath}/sensor/ch1 read ${ns}::getTemp ${scobj_hpath} rdValue {0}
     hsetprop ${scobj_hpath}/sensor/ch1 rdValue ${ns}::rdValue ${scobj_hpath}
@@ -222,7 +217,6 @@ proc ::scobj::lakeshore_218::mkDriver { sct_controller name device_class simulat
       hsetprop ${scobj_hpath}/sensor/ch1 simulated true
     }
 
-    # Start of var: ch2
     hfactory ${scobj_hpath}/sensor/ch2 plain user float
     hsetprop ${scobj_hpath}/sensor/ch2 read ${ns}::getTemp ${scobj_hpath} rdValue {1}
     hsetprop ${scobj_hpath}/sensor/ch2 rdValue ${ns}::rdValue ${scobj_hpath}
@@ -244,7 +238,6 @@ proc ::scobj::lakeshore_218::mkDriver { sct_controller name device_class simulat
       hsetprop ${scobj_hpath}/sensor/ch2 simulated true
     }
 
-    # Start of var: ch3
     hfactory ${scobj_hpath}/sensor/ch3 plain user float
     hsetprop ${scobj_hpath}/sensor/ch3 read ${ns}::getTemp ${scobj_hpath} rdValue {2}
     hsetprop ${scobj_hpath}/sensor/ch3 rdValue ${ns}::rdValue ${scobj_hpath}
@@ -266,7 +259,6 @@ proc ::scobj::lakeshore_218::mkDriver { sct_controller name device_class simulat
       hsetprop ${scobj_hpath}/sensor/ch3 simulated true
     }
 
-    # Start of var: ch4
     hfactory ${scobj_hpath}/sensor/ch4 plain user float
     hsetprop ${scobj_hpath}/sensor/ch4 read ${ns}::getTemp ${scobj_hpath} rdValue {3}
     hsetprop ${scobj_hpath}/sensor/ch4 rdValue ${ns}::rdValue ${scobj_hpath}
@@ -288,7 +280,6 @@ proc ::scobj::lakeshore_218::mkDriver { sct_controller name device_class simulat
       hsetprop ${scobj_hpath}/sensor/ch4 simulated true
     }
 
-    # Start of var: ch5
     hfactory ${scobj_hpath}/sensor/ch5 plain user float
     hsetprop ${scobj_hpath}/sensor/ch5 read ${ns}::getTemp ${scobj_hpath} rdValue {4}
     hsetprop ${scobj_hpath}/sensor/ch5 rdValue ${ns}::rdValue ${scobj_hpath}
@@ -310,7 +301,6 @@ proc ::scobj::lakeshore_218::mkDriver { sct_controller name device_class simulat
       hsetprop ${scobj_hpath}/sensor/ch5 simulated true
     }
 
-    # Start of var: ch6
     hfactory ${scobj_hpath}/sensor/ch6 plain user float
     hsetprop ${scobj_hpath}/sensor/ch6 read ${ns}::getTemp ${scobj_hpath} rdValue {5}
     hsetprop ${scobj_hpath}/sensor/ch6 rdValue ${ns}::rdValue ${scobj_hpath}
@@ -332,7 +322,6 @@ proc ::scobj::lakeshore_218::mkDriver { sct_controller name device_class simulat
       hsetprop ${scobj_hpath}/sensor/ch6 simulated true
     }
 
-    # Start of var: ch7
     hfactory ${scobj_hpath}/sensor/ch7 plain user float
     hsetprop ${scobj_hpath}/sensor/ch7 read ${ns}::getTemp ${scobj_hpath} rdValue {6}
     hsetprop ${scobj_hpath}/sensor/ch7 rdValue ${ns}::rdValue ${scobj_hpath}
@@ -354,7 +343,6 @@ proc ::scobj::lakeshore_218::mkDriver { sct_controller name device_class simulat
       hsetprop ${scobj_hpath}/sensor/ch7 simulated true
     }
 
-    # Start of var: ch8
     hfactory ${scobj_hpath}/sensor/ch8 plain user float
     hsetprop ${scobj_hpath}/sensor/ch8 read ${ns}::getTemp ${scobj_hpath} rdValue {7}
     hsetprop ${scobj_hpath}/sensor/ch8 rdValue ${ns}::rdValue ${scobj_hpath}
@@ -378,7 +366,6 @@ proc ::scobj::lakeshore_218::mkDriver { sct_controller name device_class simulat
     hsetprop ${scobj_hpath}/sensor data "true"
     hsetprop ${scobj_hpath}/sensor klass "@none"
     hsetprop ${scobj_hpath}/sensor type "part"
-    # End of named group: sensor
     hsetprop ${scobj_hpath} klass ${device_class}
     hsetprop ${scobj_hpath} data true
     hsetprop ${scobj_hpath} debug_threshold 5
@@ -422,8 +409,8 @@ proc add_lakeshore_218 {name ip_address tcp_port} {
   ::scobj::lakeshore_218::add_driver ${name} "NXdetector" ${simulation_flag} ${ip_address} ${tcp_port}
 }
 
-clientput "file evaluation of sct_lakeshore_218.tcl"
-::scobj::lakeshore_218::sics_log 9 "file evaluation of sct_lakeshore_218.tcl"
+clientput "file evaluation of lakeshore_218_sct.tcl"
+::scobj::lakeshore_218::sics_log 9 "file evaluation of lakeshore_218_sct.tcl"
 
 proc ::scobj::lakeshore_218::read_config {} {
   set catch_status [ catch {
@@ -495,7 +482,7 @@ proc ::scobj::lakeshore_218::read_config {} {
             }
             makesctcontroller sct_${name} aqadapter ${asyncqueue}
           }
-          ${ns}::mkDriver sct_${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port}
+          ${ns}::mkDriver sct_${name} ${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port}
         }
       }
     }
diff --git a/site_ansto/instrument/config/environment/temperature/lakeshore_m370_sct.tcl b/site_ansto/instrument/config/environment/temperature/lakeshore_m370_sct.tcl
index 0199b9b1..38edd1dc 100644
--- a/site_ansto/instrument/config/environment/temperature/lakeshore_m370_sct.tcl
+++ b/site_ansto/instrument/config/environment/temperature/lakeshore_m370_sct.tcl
@@ -87,8 +87,8 @@ proc add_lakeshore_m370 {name ip_address tcp_port id tol} {
   ::scobj::lakeshore_m370::add_driver ${name} "environment" ${simulation_flag} ${ip_address} ${tcp_port} ${id} ${tol}
 }
 
-clientput "file evaluation of sct_lakeshore_m370.tcl"
-::scobj::lakeshore_m370::sics_log 9 "file evaluation of sct_lakeshore_m370.tcl"
+clientput "file evaluation of lakeshore_m370_sct.tcl"
+::scobj::lakeshore_m370::sics_log 9 "file evaluation of lakeshore_m370_sct.tcl"
 
 proc ::scobj::lakeshore_m370::read_config {} {
   set catch_status [ catch {
@@ -175,7 +175,7 @@ proc ::scobj::lakeshore_m370::read_config {} {
           if { [llength $missing_list] > 0 } {
               error "$name is missing configuration values $missing_list"
           }
-          ${ns}::mkDriver sct_${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port} {*}$arg_list
+          ${ns}::mkDriver sct_${name} ${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port} {*}$arg_list
         }
       }
     }
diff --git a/site_ansto/instrument/config/environment/temperature/ls336_sct.tcl b/site_ansto/instrument/config/environment/temperature/ls336_sct.tcl
index 380a46c3..e6d3d289 100644
--- a/site_ansto/instrument/config/environment/temperature/ls336_sct.tcl
+++ b/site_ansto/instrument/config/environment/temperature/ls336_sct.tcl
@@ -83,8 +83,8 @@ proc add_ls336 {name ip_address tcp_port id datype {tol1 1.0} {tol2 1.0}} {
   ::scobj::ls336::add_driver ${name} "environment" ${simulation_flag} ${ip_address} ${tcp_port} ${id} ${datype} ${tol1} ${tol2}
 }
 
-clientput "file evaluation of sct_ls336.tcl"
-::scobj::ls336::sics_log 9 "file evaluation of sct_ls336.tcl"
+clientput "file evaluation of ls336_sct.tcl"
+::scobj::ls336::sics_log 9 "file evaluation of ls336_sct.tcl"
 
 proc ::scobj::ls336::read_config {} {
   set catch_status [ catch {
@@ -171,7 +171,7 @@ proc ::scobj::ls336::read_config {} {
           if { [llength $missing_list] > 0 } {
               error "$name is missing configuration values $missing_list"
           }
-          ${ns}::mkDriver sct_${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port} {*}$arg_list
+          ${ns}::mkDriver sct_${name} ${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port} {*}$arg_list
         }
       }
     }
diff --git a/site_ansto/instrument/config/environment/temperature/ls340_sct.tcl b/site_ansto/instrument/config/environment/temperature/ls340_sct.tcl
index 40d3eb1e..2d55f7a6 100644
--- a/site_ansto/instrument/config/environment/temperature/ls340_sct.tcl
+++ b/site_ansto/instrument/config/environment/temperature/ls340_sct.tcl
@@ -83,8 +83,8 @@ proc add_ls340 {name ip_address tcp_port id datype {tol1 1.0} {tol2 1.0}} {
   ::scobj::ls340::add_driver ${name} "environment" ${simulation_flag} ${ip_address} ${tcp_port} ${id} ${datype} ${tol1} ${tol2}
 }
 
-clientput "file evaluation of sct_ls340.tcl"
-::scobj::ls340::sics_log 9 "file evaluation of sct_ls340.tcl"
+clientput "file evaluation of ls340_sct.tcl"
+::scobj::ls340::sics_log 9 "file evaluation of ls340_sct.tcl"
 
 proc ::scobj::ls340::read_config {} {
   set catch_status [ catch {
@@ -194,7 +194,7 @@ proc ::scobj::ls340::read_config {} {
           if { [llength $missing_list] > 0 } {
               error "$name is missing configuration values $missing_list"
           }
-          ${ns}::mkDriver sct_${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port} {*}$arg_list
+          ${ns}::mkDriver sct_${name} ${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port} {*}$arg_list
         }
       }
     }
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 65aae3fc..9808145d 100644
--- a/site_ansto/instrument/config/environment/temperature/mercury_base_sct.tcl
+++ b/site_ansto/instrument/config/environment/temperature/mercury_base_sct.tcl
@@ -88,7 +88,7 @@ proc ::scobj::mercury_base::checkstatus {tc_root} {
       set sp "[sct target]"
       if {[hpropexists [sct] simulated] && [sct simulated] == "true"} {
         set pv "${sp}"
-        hset ${tc_root}/[sct driveable] ${sp}
+        hupdateif ${tc_root}/[sct driveable] ${sp}
       }
         set pv "[hval ${tc_root}/[sct driveable]]"
       }
@@ -283,10 +283,8 @@ proc ::scobj::mercury_base::mkDriver { sct_controller name device_class simulati
 
     set scobj_hpath /sics/${name}
 
-    # Start of named group: Loop1
     hfactory ${scobj_hpath}/Loop1 plain spy none
 
-    # Start of var: nick
     hfactory ${scobj_hpath}/Loop1/nick plain user text
     hsetprop ${scobj_hpath}/Loop1/nick read ${ns}::getValue ${scobj_hpath} rdText {READ:DEV:MB1.T1:TEMP:NICK}
     hsetprop ${scobj_hpath}/Loop1/nick rdText ${ns}::rdText ${scobj_hpath}
@@ -308,7 +306,6 @@ proc ::scobj::mercury_base::mkDriver { sct_controller name device_class simulati
       hsetprop ${scobj_hpath}/Loop1/nick simulated true
     }
 
-    # Start of var: power
     hfactory ${scobj_hpath}/Loop1/power plain user float
     hsetprop ${scobj_hpath}/Loop1/power read ${ns}::getValue ${scobj_hpath} rdValue {READ:DEV:MB0.H1:HTR:SIG:POWR}
     hsetprop ${scobj_hpath}/Loop1/power rdValue ${ns}::rdValue ${scobj_hpath}
@@ -330,7 +327,6 @@ proc ::scobj::mercury_base::mkDriver { sct_controller name device_class simulati
       hsetprop ${scobj_hpath}/Loop1/power simulated true
     }
 
-    # Start of var: sensor
     hfactory ${scobj_hpath}/Loop1/sensor plain user float
     hsetprop ${scobj_hpath}/Loop1/sensor read ${ns}::getValue ${scobj_hpath} rdValue {READ:DEV:MB1.T1:TEMP:SIG:TEMP}
     hsetprop ${scobj_hpath}/Loop1/sensor rdValue ${ns}::rdValue ${scobj_hpath}
@@ -354,7 +350,6 @@ proc ::scobj::mercury_base::mkDriver { sct_controller name device_class simulati
       hsetprop ${scobj_hpath}/Loop1/sensor simulated true
     }
 
-    # Start of var: setpoint
     hfactory ${scobj_hpath}/Loop1/setpoint plain user float
     hsetprop ${scobj_hpath}/Loop1/setpoint read ${ns}::getValue ${scobj_hpath} rdValue {READ:DEV:MB1.T1:TEMP:LOOP:TSET}
     hsetprop ${scobj_hpath}/Loop1/setpoint rdValue ${ns}::rdValue ${scobj_hpath}
@@ -393,13 +388,10 @@ proc ::scobj::mercury_base::mkDriver { sct_controller name device_class simulati
     hsetprop ${scobj_hpath}/Loop1 data "true"
     hsetprop ${scobj_hpath}/Loop1 klass "@none"
     hsetprop ${scobj_hpath}/Loop1 type "part"
-    # End of named group: Loop1
     ansto_makesctdrive ${name}_Loop1_setpoint ${scobj_hpath}/Loop1/setpoint ${scobj_hpath}/Loop1/sensor ${sct_controller}
 
-    # Start of named group: Loop2
     hfactory ${scobj_hpath}/Loop2 plain spy none
 
-    # Start of var: nick
     hfactory ${scobj_hpath}/Loop2/nick plain user text
     hsetprop ${scobj_hpath}/Loop2/nick read ${ns}::getValue ${scobj_hpath} rdText {READ:DEV:DB6.T1:TEMP:NICK}
     hsetprop ${scobj_hpath}/Loop2/nick rdText ${ns}::rdText ${scobj_hpath}
@@ -421,7 +413,6 @@ proc ::scobj::mercury_base::mkDriver { sct_controller name device_class simulati
       hsetprop ${scobj_hpath}/Loop2/nick simulated true
     }
 
-    # Start of var: power
     hfactory ${scobj_hpath}/Loop2/power plain user float
     hsetprop ${scobj_hpath}/Loop2/power read ${ns}::getValue ${scobj_hpath} rdValue {READ:DEV:DB1.H1:HTR:SIG:POWR}
     hsetprop ${scobj_hpath}/Loop2/power rdValue ${ns}::rdValue ${scobj_hpath}
@@ -443,7 +434,6 @@ proc ::scobj::mercury_base::mkDriver { sct_controller name device_class simulati
       hsetprop ${scobj_hpath}/Loop2/power simulated true
     }
 
-    # Start of var: sensor
     hfactory ${scobj_hpath}/Loop2/sensor plain user float
     hsetprop ${scobj_hpath}/Loop2/sensor read ${ns}::getValue ${scobj_hpath} rdValue {READ:DEV:DB6.T1:TEMP:SIG:TEMP}
     hsetprop ${scobj_hpath}/Loop2/sensor rdValue ${ns}::rdValue ${scobj_hpath}
@@ -467,7 +457,6 @@ proc ::scobj::mercury_base::mkDriver { sct_controller name device_class simulati
       hsetprop ${scobj_hpath}/Loop2/sensor simulated true
     }
 
-    # Start of var: setpoint
     hfactory ${scobj_hpath}/Loop2/setpoint plain user float
     hsetprop ${scobj_hpath}/Loop2/setpoint read ${ns}::getValue ${scobj_hpath} rdValue {READ:DEV:DB6.T1:TEMP:LOOP:TSET}
     hsetprop ${scobj_hpath}/Loop2/setpoint rdValue ${ns}::rdValue ${scobj_hpath}
@@ -506,13 +495,10 @@ proc ::scobj::mercury_base::mkDriver { sct_controller name device_class simulati
     hsetprop ${scobj_hpath}/Loop2 data "true"
     hsetprop ${scobj_hpath}/Loop2 klass "@none"
     hsetprop ${scobj_hpath}/Loop2 type "part"
-    # End of named group: Loop2
     ansto_makesctdrive ${name}_Loop2_setpoint ${scobj_hpath}/Loop2/setpoint ${scobj_hpath}/Loop2/sensor ${sct_controller}
 
-    # Start of named group: Loop3
     hfactory ${scobj_hpath}/Loop3 plain spy none
 
-    # Start of var: nick
     hfactory ${scobj_hpath}/Loop3/nick plain user text
     hsetprop ${scobj_hpath}/Loop3/nick read ${ns}::getValue ${scobj_hpath} rdText {READ:DEV:DB7.T1:TEMP:NICK}
     hsetprop ${scobj_hpath}/Loop3/nick rdText ${ns}::rdText ${scobj_hpath}
@@ -534,7 +520,6 @@ proc ::scobj::mercury_base::mkDriver { sct_controller name device_class simulati
       hsetprop ${scobj_hpath}/Loop3/nick simulated true
     }
 
-    # Start of var: power
     hfactory ${scobj_hpath}/Loop3/power plain user float
     hsetprop ${scobj_hpath}/Loop3/power read ${ns}::getValue ${scobj_hpath} rdValue {READ:DEV:DB2.H1:HTR:SIG:POWR}
     hsetprop ${scobj_hpath}/Loop3/power rdValue ${ns}::rdValue ${scobj_hpath}
@@ -556,7 +541,6 @@ proc ::scobj::mercury_base::mkDriver { sct_controller name device_class simulati
       hsetprop ${scobj_hpath}/Loop3/power simulated true
     }
 
-    # Start of var: sensor
     hfactory ${scobj_hpath}/Loop3/sensor plain user float
     hsetprop ${scobj_hpath}/Loop3/sensor read ${ns}::getValue ${scobj_hpath} rdValue {READ:DEV:DB7.T1:TEMP:SIG:TEMP}
     hsetprop ${scobj_hpath}/Loop3/sensor rdValue ${ns}::rdValue ${scobj_hpath}
@@ -580,7 +564,6 @@ proc ::scobj::mercury_base::mkDriver { sct_controller name device_class simulati
       hsetprop ${scobj_hpath}/Loop3/sensor simulated true
     }
 
-    # Start of var: setpoint
     hfactory ${scobj_hpath}/Loop3/setpoint plain user float
     hsetprop ${scobj_hpath}/Loop3/setpoint read ${ns}::getValue ${scobj_hpath} rdValue {READ:DEV:DB7.T1:TEMP:LOOP:TSET}
     hsetprop ${scobj_hpath}/Loop3/setpoint rdValue ${ns}::rdValue ${scobj_hpath}
@@ -619,7 +602,6 @@ proc ::scobj::mercury_base::mkDriver { sct_controller name device_class simulati
     hsetprop ${scobj_hpath}/Loop3 data "true"
     hsetprop ${scobj_hpath}/Loop3 klass "@none"
     hsetprop ${scobj_hpath}/Loop3 type "part"
-    # End of named group: Loop3
     ansto_makesctdrive ${name}_Loop3_setpoint ${scobj_hpath}/Loop3/setpoint ${scobj_hpath}/Loop3/sensor ${sct_controller}
     hsetprop ${scobj_hpath} klass ${device_class}
     hsetprop ${scobj_hpath} data true
@@ -664,8 +646,8 @@ proc add_mercury_base {name ip_address tcp_port {id 99} {tol 1}} {
   ::scobj::mercury_base::add_driver ${name} "environment" ${simulation_flag} ${ip_address} ${tcp_port} ${id} ${tol}
 }
 
-clientput "file evaluation of sct_mercury_base.tcl"
-::scobj::mercury_base::sics_log 9 "file evaluation of sct_mercury_base.tcl"
+clientput "file evaluation of mercury_base_sct.tcl"
+::scobj::mercury_base::sics_log 9 "file evaluation of mercury_base_sct.tcl"
 
 proc ::scobj::mercury_base::read_config {} {
   set catch_status [ catch {
@@ -752,7 +734,7 @@ proc ::scobj::mercury_base::read_config {} {
           if { [llength $missing_list] > 0 } {
               error "$name is missing configuration values $missing_list"
           }
-          ${ns}::mkDriver sct_${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port} {*}$arg_list
+          ${ns}::mkDriver sct_${name} ${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port} {*}$arg_list
         }
       }
     }
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 8f59ed96..626bd2b5 100644
--- a/site_ansto/instrument/config/environment/temperature/mercury_level_sct.tcl
+++ b/site_ansto/instrument/config/environment/temperature/mercury_level_sct.tcl
@@ -149,10 +149,8 @@ proc ::scobj::mercury_level::mkDriver { sct_controller name device_class simulat
 
     set scobj_hpath /sics/${name}
 
-    # Start of named group: Level
     hfactory ${scobj_hpath}/Level plain spy none
 
-    # Start of var: Helium
     hfactory ${scobj_hpath}/Level/Helium plain user float
     hsetprop ${scobj_hpath}/Level/Helium read ${ns}::getValue ${scobj_hpath} rdValue {READ:DEV:DB5.L1:LVL:SIG:HEL:LEV}
     hsetprop ${scobj_hpath}/Level/Helium rdValue ${ns}::rdValue ${scobj_hpath}
@@ -176,7 +174,6 @@ proc ::scobj::mercury_level::mkDriver { sct_controller name device_class simulat
       hsetprop ${scobj_hpath}/Level/Helium simulated true
     }
 
-    # Start of var: Nitrogen
     hfactory ${scobj_hpath}/Level/Nitrogen plain user float
     hsetprop ${scobj_hpath}/Level/Nitrogen read ${ns}::getValue ${scobj_hpath} rdValue {READ:DEV:DB5.L1:LVL:SIG:NIT:LEV}
     hsetprop ${scobj_hpath}/Level/Nitrogen rdValue ${ns}::rdValue ${scobj_hpath}
@@ -202,7 +199,6 @@ proc ::scobj::mercury_level::mkDriver { sct_controller name device_class simulat
     hsetprop ${scobj_hpath}/Level data "true"
     hsetprop ${scobj_hpath}/Level klass "@none"
     hsetprop ${scobj_hpath}/Level type "part"
-    # End of named group: Level
     hsetprop ${scobj_hpath} klass ${device_class}
     hsetprop ${scobj_hpath} data true
     hsetprop ${scobj_hpath} debug_threshold 5
@@ -246,8 +242,8 @@ proc add_mercury_level {name ip_address tcp_port {id 99}} {
   ::scobj::mercury_level::add_driver ${name} "environment" ${simulation_flag} ${ip_address} ${tcp_port} ${id}
 }
 
-clientput "file evaluation of sct_mercury_level.tcl"
-::scobj::mercury_level::sics_log 9 "file evaluation of sct_mercury_level.tcl"
+clientput "file evaluation of mercury_level_sct.tcl"
+::scobj::mercury_level::sics_log 9 "file evaluation of mercury_level_sct.tcl"
 
 proc ::scobj::mercury_level::read_config {} {
   set catch_status [ catch {
@@ -334,7 +330,7 @@ proc ::scobj::mercury_level::read_config {} {
           if { [llength $missing_list] > 0 } {
               error "$name is missing configuration values $missing_list"
           }
-          ${ns}::mkDriver sct_${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port} {*}$arg_list
+          ${ns}::mkDriver sct_${name} ${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port} {*}$arg_list
         }
       }
     }
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 cedc0894..17ac35f9 100644
--- a/site_ansto/instrument/config/environment/temperature/mercury_pres_sct.tcl
+++ b/site_ansto/instrument/config/environment/temperature/mercury_pres_sct.tcl
@@ -88,7 +88,7 @@ proc ::scobj::mercury_pres::checkstatus {tc_root} {
       set sp "[sct target]"
       if {[hpropexists [sct] simulated] && [sct simulated] == "true"} {
         set pv "${sp}"
-        hset ${tc_root}/[sct driveable] ${sp}
+        hupdateif ${tc_root}/[sct driveable] ${sp}
       }
         set pv "[hval ${tc_root}/[sct driveable]]"
       }
@@ -289,10 +289,8 @@ proc ::scobj::mercury_pres::mkDriver { sct_controller name device_class simulati
 
     set scobj_hpath /sics/${name}
 
-    # Start of named group: Loop8
     hfactory ${scobj_hpath}/Loop8 plain spy none
 
-    # Start of var: nick
     hfactory ${scobj_hpath}/Loop8/nick plain user text
     hsetprop ${scobj_hpath}/Loop8/nick read ${ns}::getValue ${scobj_hpath} rdText {READ:DEV:DB8.P1:PRES:NICK}
     hsetprop ${scobj_hpath}/Loop8/nick rdText ${ns}::rdText ${scobj_hpath}
@@ -314,7 +312,6 @@ proc ::scobj::mercury_pres::mkDriver { sct_controller name device_class simulati
       hsetprop ${scobj_hpath}/Loop8/nick simulated true
     }
 
-    # Start of var: sensor
     hfactory ${scobj_hpath}/Loop8/sensor plain user float
     hsetprop ${scobj_hpath}/Loop8/sensor read ${ns}::getValue ${scobj_hpath} rdValue {READ:DEV:DB8.P1:PRES:SIG:PRES}
     hsetprop ${scobj_hpath}/Loop8/sensor rdValue ${ns}::rdValue ${scobj_hpath}
@@ -339,7 +336,6 @@ proc ::scobj::mercury_pres::mkDriver { sct_controller name device_class simulati
       hsetprop ${scobj_hpath}/Loop8/sensor simulated true
     }
 
-    # Start of var: setpoint
     hfactory ${scobj_hpath}/Loop8/setpoint plain user float
     hsetprop ${scobj_hpath}/Loop8/setpoint read ${ns}::getValue ${scobj_hpath} rdValue {READ:DEV:DB8.P1:PRES:LOOP:TSET}
     hsetprop ${scobj_hpath}/Loop8/setpoint rdValue ${ns}::rdValue ${scobj_hpath}
@@ -379,7 +375,6 @@ proc ::scobj::mercury_pres::mkDriver { sct_controller name device_class simulati
     hsetprop ${scobj_hpath}/Loop8 data "true"
     hsetprop ${scobj_hpath}/Loop8 klass "@none"
     hsetprop ${scobj_hpath}/Loop8 type "part"
-    # End of named group: Loop8
     ansto_makesctdrive ${name}_Loop8_setpoint ${scobj_hpath}/Loop8/setpoint ${scobj_hpath}/Loop8/sensor ${sct_controller}
     hsetprop ${scobj_hpath} klass ${device_class}
     hsetprop ${scobj_hpath} data true
@@ -424,8 +419,8 @@ proc add_mercury_pres {name ip_address tcp_port {id 99} {tol 1}} {
   ::scobj::mercury_pres::add_driver ${name} "environment" ${simulation_flag} ${ip_address} ${tcp_port} ${id} ${tol}
 }
 
-clientput "file evaluation of sct_mercury_pres.tcl"
-::scobj::mercury_pres::sics_log 9 "file evaluation of sct_mercury_pres.tcl"
+clientput "file evaluation of mercury_pres_sct.tcl"
+::scobj::mercury_pres::sics_log 9 "file evaluation of mercury_pres_sct.tcl"
 
 proc ::scobj::mercury_pres::read_config {} {
   set catch_status [ catch {
@@ -512,7 +507,7 @@ proc ::scobj::mercury_pres::read_config {} {
           if { [llength $missing_list] > 0 } {
               error "$name is missing configuration values $missing_list"
           }
-          ${ns}::mkDriver sct_${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port} {*}$arg_list
+          ${ns}::mkDriver sct_${name} ${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port} {*}$arg_list
         }
       }
     }
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 8def6080..bb794c35 100644
--- a/site_ansto/instrument/config/environment/temperature/mercury_scpi_sct.tcl
+++ b/site_ansto/instrument/config/environment/temperature/mercury_scpi_sct.tcl
@@ -88,7 +88,7 @@ proc ::scobj::mercury_scpi::checkstatus {tc_root} {
       set sp "[sct target]"
       if {[hpropexists [sct] simulated] && [sct simulated] == "true"} {
         set pv "${sp}"
-        hset ${tc_root}/[sct driveable] ${sp}
+        hupdateif ${tc_root}/[sct driveable] ${sp}
       }
         set pv "[hval ${tc_root}/[sct driveable]]"
       }
@@ -317,10 +317,8 @@ proc ::scobj::mercury_scpi::mkDriver { sct_controller name device_class simulati
 
     set scobj_hpath /sics/${name}
 
-    # Start of named group: Level
     hfactory ${scobj_hpath}/Level plain spy none
 
-    # Start of var: Helium
     hfactory ${scobj_hpath}/Level/Helium plain user float
     hsetprop ${scobj_hpath}/Level/Helium read ${ns}::getValue ${scobj_hpath} rdValue {READ:DEV:DB5.L1:LVL:SIG:HEL:LEV}
     hsetprop ${scobj_hpath}/Level/Helium rdValue ${ns}::rdValue ${scobj_hpath}
@@ -344,7 +342,6 @@ proc ::scobj::mercury_scpi::mkDriver { sct_controller name device_class simulati
       hsetprop ${scobj_hpath}/Level/Helium simulated true
     }
 
-    # Start of var: Nitrogen
     hfactory ${scobj_hpath}/Level/Nitrogen plain user float
     hsetprop ${scobj_hpath}/Level/Nitrogen read ${ns}::getValue ${scobj_hpath} rdValue {READ:DEV:DB5.L1:LVL:SIG:NIT:LEV}
     hsetprop ${scobj_hpath}/Level/Nitrogen rdValue ${ns}::rdValue ${scobj_hpath}
@@ -370,12 +367,9 @@ proc ::scobj::mercury_scpi::mkDriver { sct_controller name device_class simulati
     hsetprop ${scobj_hpath}/Level data "true"
     hsetprop ${scobj_hpath}/Level klass "@none"
     hsetprop ${scobj_hpath}/Level type "part"
-    # End of named group: Level
 
-    # Start of named group: Loop1
     hfactory ${scobj_hpath}/Loop1 plain spy none
 
-    # Start of var: nick
     hfactory ${scobj_hpath}/Loop1/nick plain user text
     hsetprop ${scobj_hpath}/Loop1/nick read ${ns}::getValue ${scobj_hpath} rdText {READ:DEV:MB1.T1:TEMP:NICK}
     hsetprop ${scobj_hpath}/Loop1/nick rdText ${ns}::rdText ${scobj_hpath}
@@ -397,7 +391,6 @@ proc ::scobj::mercury_scpi::mkDriver { sct_controller name device_class simulati
       hsetprop ${scobj_hpath}/Loop1/nick simulated true
     }
 
-    # Start of var: power
     hfactory ${scobj_hpath}/Loop1/power plain user float
     hsetprop ${scobj_hpath}/Loop1/power read ${ns}::getValue ${scobj_hpath} rdValue {READ:DEV:MB0.H1:HTR:SIG:POWR}
     hsetprop ${scobj_hpath}/Loop1/power rdValue ${ns}::rdValue ${scobj_hpath}
@@ -419,7 +412,6 @@ proc ::scobj::mercury_scpi::mkDriver { sct_controller name device_class simulati
       hsetprop ${scobj_hpath}/Loop1/power simulated true
     }
 
-    # Start of var: sensor
     hfactory ${scobj_hpath}/Loop1/sensor plain user float
     hsetprop ${scobj_hpath}/Loop1/sensor read ${ns}::getValue ${scobj_hpath} rdValue {READ:DEV:MB1.T1:TEMP:SIG:TEMP}
     hsetprop ${scobj_hpath}/Loop1/sensor rdValue ${ns}::rdValue ${scobj_hpath}
@@ -443,7 +435,6 @@ proc ::scobj::mercury_scpi::mkDriver { sct_controller name device_class simulati
       hsetprop ${scobj_hpath}/Loop1/sensor simulated true
     }
 
-    # Start of var: setpoint
     hfactory ${scobj_hpath}/Loop1/setpoint plain user float
     hsetprop ${scobj_hpath}/Loop1/setpoint read ${ns}::getValue ${scobj_hpath} rdValue {READ:DEV:MB1.T1:TEMP:LOOP:TSET}
     hsetprop ${scobj_hpath}/Loop1/setpoint rdValue ${ns}::rdValue ${scobj_hpath}
@@ -482,13 +473,10 @@ proc ::scobj::mercury_scpi::mkDriver { sct_controller name device_class simulati
     hsetprop ${scobj_hpath}/Loop1 data "true"
     hsetprop ${scobj_hpath}/Loop1 klass "@none"
     hsetprop ${scobj_hpath}/Loop1 type "part"
-    # End of named group: Loop1
     ansto_makesctdrive ${name}_Loop1_setpoint ${scobj_hpath}/Loop1/setpoint ${scobj_hpath}/Loop1/sensor ${sct_controller}
 
-    # Start of named group: Loop2
     hfactory ${scobj_hpath}/Loop2 plain spy none
 
-    # Start of var: nick
     hfactory ${scobj_hpath}/Loop2/nick plain user text
     hsetprop ${scobj_hpath}/Loop2/nick read ${ns}::getValue ${scobj_hpath} rdText {READ:DEV:DB6.T1:TEMP:NICK}
     hsetprop ${scobj_hpath}/Loop2/nick rdText ${ns}::rdText ${scobj_hpath}
@@ -510,7 +498,6 @@ proc ::scobj::mercury_scpi::mkDriver { sct_controller name device_class simulati
       hsetprop ${scobj_hpath}/Loop2/nick simulated true
     }
 
-    # Start of var: power
     hfactory ${scobj_hpath}/Loop2/power plain user float
     hsetprop ${scobj_hpath}/Loop2/power read ${ns}::getValue ${scobj_hpath} rdValue {READ:DEV:DB1.H1:HTR:SIG:POWR}
     hsetprop ${scobj_hpath}/Loop2/power rdValue ${ns}::rdValue ${scobj_hpath}
@@ -532,7 +519,6 @@ proc ::scobj::mercury_scpi::mkDriver { sct_controller name device_class simulati
       hsetprop ${scobj_hpath}/Loop2/power simulated true
     }
 
-    # Start of var: sensor
     hfactory ${scobj_hpath}/Loop2/sensor plain user float
     hsetprop ${scobj_hpath}/Loop2/sensor read ${ns}::getValue ${scobj_hpath} rdValue {READ:DEV:DB6.T1:TEMP:SIG:TEMP}
     hsetprop ${scobj_hpath}/Loop2/sensor rdValue ${ns}::rdValue ${scobj_hpath}
@@ -556,7 +542,6 @@ proc ::scobj::mercury_scpi::mkDriver { sct_controller name device_class simulati
       hsetprop ${scobj_hpath}/Loop2/sensor simulated true
     }
 
-    # Start of var: setpoint
     hfactory ${scobj_hpath}/Loop2/setpoint plain user float
     hsetprop ${scobj_hpath}/Loop2/setpoint read ${ns}::getValue ${scobj_hpath} rdValue {READ:DEV:DB6.T1:TEMP:LOOP:TSET}
     hsetprop ${scobj_hpath}/Loop2/setpoint rdValue ${ns}::rdValue ${scobj_hpath}
@@ -595,13 +580,10 @@ proc ::scobj::mercury_scpi::mkDriver { sct_controller name device_class simulati
     hsetprop ${scobj_hpath}/Loop2 data "true"
     hsetprop ${scobj_hpath}/Loop2 klass "@none"
     hsetprop ${scobj_hpath}/Loop2 type "part"
-    # End of named group: Loop2
     ansto_makesctdrive ${name}_Loop2_setpoint ${scobj_hpath}/Loop2/setpoint ${scobj_hpath}/Loop2/sensor ${sct_controller}
 
-    # Start of named group: Loop3
     hfactory ${scobj_hpath}/Loop3 plain spy none
 
-    # Start of var: nick
     hfactory ${scobj_hpath}/Loop3/nick plain user text
     hsetprop ${scobj_hpath}/Loop3/nick read ${ns}::getValue ${scobj_hpath} rdText {READ:DEV:DB7.T1:TEMP:NICK}
     hsetprop ${scobj_hpath}/Loop3/nick rdText ${ns}::rdText ${scobj_hpath}
@@ -623,7 +605,6 @@ proc ::scobj::mercury_scpi::mkDriver { sct_controller name device_class simulati
       hsetprop ${scobj_hpath}/Loop3/nick simulated true
     }
 
-    # Start of var: power
     hfactory ${scobj_hpath}/Loop3/power plain user float
     hsetprop ${scobj_hpath}/Loop3/power read ${ns}::getValue ${scobj_hpath} rdValue {READ:DEV:DB2.H1:HTR:SIG:POWR}
     hsetprop ${scobj_hpath}/Loop3/power rdValue ${ns}::rdValue ${scobj_hpath}
@@ -645,7 +626,6 @@ proc ::scobj::mercury_scpi::mkDriver { sct_controller name device_class simulati
       hsetprop ${scobj_hpath}/Loop3/power simulated true
     }
 
-    # Start of var: sensor
     hfactory ${scobj_hpath}/Loop3/sensor plain user float
     hsetprop ${scobj_hpath}/Loop3/sensor read ${ns}::getValue ${scobj_hpath} rdValue {READ:DEV:DB7.T1:TEMP:SIG:TEMP}
     hsetprop ${scobj_hpath}/Loop3/sensor rdValue ${ns}::rdValue ${scobj_hpath}
@@ -669,7 +649,6 @@ proc ::scobj::mercury_scpi::mkDriver { sct_controller name device_class simulati
       hsetprop ${scobj_hpath}/Loop3/sensor simulated true
     }
 
-    # Start of var: setpoint
     hfactory ${scobj_hpath}/Loop3/setpoint plain user float
     hsetprop ${scobj_hpath}/Loop3/setpoint read ${ns}::getValue ${scobj_hpath} rdValue {READ:DEV:DB7.T1:TEMP:LOOP:TSET}
     hsetprop ${scobj_hpath}/Loop3/setpoint rdValue ${ns}::rdValue ${scobj_hpath}
@@ -708,13 +687,10 @@ proc ::scobj::mercury_scpi::mkDriver { sct_controller name device_class simulati
     hsetprop ${scobj_hpath}/Loop3 data "true"
     hsetprop ${scobj_hpath}/Loop3 klass "@none"
     hsetprop ${scobj_hpath}/Loop3 type "part"
-    # End of named group: Loop3
     ansto_makesctdrive ${name}_Loop3_setpoint ${scobj_hpath}/Loop3/setpoint ${scobj_hpath}/Loop3/sensor ${sct_controller}
 
-    # Start of named group: Loop4
     hfactory ${scobj_hpath}/Loop4 plain spy none
 
-    # Start of var: nick
     hfactory ${scobj_hpath}/Loop4/nick plain user text
     hsetprop ${scobj_hpath}/Loop4/nick read ${ns}::getValue ${scobj_hpath} rdText {READ:DEV:DB8.T1:TEMP:NICK}
     hsetprop ${scobj_hpath}/Loop4/nick rdText ${ns}::rdText ${scobj_hpath}
@@ -736,7 +712,6 @@ proc ::scobj::mercury_scpi::mkDriver { sct_controller name device_class simulati
       hsetprop ${scobj_hpath}/Loop4/nick simulated true
     }
 
-    # Start of var: power
     hfactory ${scobj_hpath}/Loop4/power plain user float
     hsetprop ${scobj_hpath}/Loop4/power read ${ns}::getValue ${scobj_hpath} rdValue {READ:DEV:DB3.H1:HTR:SIG:POWR}
     hsetprop ${scobj_hpath}/Loop4/power rdValue ${ns}::rdValue ${scobj_hpath}
@@ -758,7 +733,6 @@ proc ::scobj::mercury_scpi::mkDriver { sct_controller name device_class simulati
       hsetprop ${scobj_hpath}/Loop4/power simulated true
     }
 
-    # Start of var: sensor
     hfactory ${scobj_hpath}/Loop4/sensor plain user float
     hsetprop ${scobj_hpath}/Loop4/sensor read ${ns}::getValue ${scobj_hpath} rdValue {READ:DEV:DB8.T1:TEMP:SIG:TEMP}
     hsetprop ${scobj_hpath}/Loop4/sensor rdValue ${ns}::rdValue ${scobj_hpath}
@@ -782,7 +756,6 @@ proc ::scobj::mercury_scpi::mkDriver { sct_controller name device_class simulati
       hsetprop ${scobj_hpath}/Loop4/sensor simulated true
     }
 
-    # Start of var: setpoint
     hfactory ${scobj_hpath}/Loop4/setpoint plain user float
     hsetprop ${scobj_hpath}/Loop4/setpoint read ${ns}::getValue ${scobj_hpath} rdValue {READ:DEV:DB8.T1:TEMP:LOOP:TSET}
     hsetprop ${scobj_hpath}/Loop4/setpoint rdValue ${ns}::rdValue ${scobj_hpath}
@@ -821,13 +794,10 @@ proc ::scobj::mercury_scpi::mkDriver { sct_controller name device_class simulati
     hsetprop ${scobj_hpath}/Loop4 data "true"
     hsetprop ${scobj_hpath}/Loop4 klass "@none"
     hsetprop ${scobj_hpath}/Loop4 type "part"
-    # End of named group: Loop4
     ansto_makesctdrive ${name}_Loop4_setpoint ${scobj_hpath}/Loop4/setpoint ${scobj_hpath}/Loop4/sensor ${sct_controller}
 
-    # Start of named group: Valve
     hfactory ${scobj_hpath}/Valve plain spy none
 
-    # Start of var: sensor
     hfactory ${scobj_hpath}/Valve/sensor plain user float
     hsetprop ${scobj_hpath}/Valve/sensor read ${ns}::getValue ${scobj_hpath} rdValue {READ:DEV:DB4.G1:AUX:SIG:OPEN}
     hsetprop ${scobj_hpath}/Valve/sensor rdValue ${ns}::rdValue ${scobj_hpath}
@@ -851,7 +821,6 @@ proc ::scobj::mercury_scpi::mkDriver { sct_controller name device_class simulati
       hsetprop ${scobj_hpath}/Valve/sensor simulated true
     }
 
-    # Start of var: setpoint
     hfactory ${scobj_hpath}/Valve/setpoint plain user float
     hsetprop ${scobj_hpath}/Valve/setpoint write ${ns}::setValve ${scobj_hpath} noResponse {SET:DEV:DB4.G1:AUX:SIG:OPEN:}
     hsetprop ${scobj_hpath}/Valve/setpoint noResponse ${ns}::noResponse ${scobj_hpath}
@@ -887,7 +856,6 @@ proc ::scobj::mercury_scpi::mkDriver { sct_controller name device_class simulati
     hsetprop ${scobj_hpath}/Valve data "true"
     hsetprop ${scobj_hpath}/Valve klass "@none"
     hsetprop ${scobj_hpath}/Valve type "part"
-    # End of named group: Valve
     ansto_makesctdrive ${name}_Valve_setpoint ${scobj_hpath}/Valve/setpoint ${scobj_hpath}/Valve/sensor ${sct_controller}
     hsetprop ${scobj_hpath} klass ${device_class}
     hsetprop ${scobj_hpath} data true
@@ -932,8 +900,8 @@ proc add_mercury_scpi {name ip_address tcp_port {id 99} {permlink LT} {tol 1} {v
   ::scobj::mercury_scpi::add_driver ${name} "environment" ${simulation_flag} ${ip_address} ${tcp_port} ${id} ${permlink} ${tol} ${valve_tol}
 }
 
-clientput "file evaluation of sct_mercury_scpi.tcl"
-::scobj::mercury_scpi::sics_log 9 "file evaluation of sct_mercury_scpi.tcl"
+clientput "file evaluation of mercury_scpi_sct.tcl"
+::scobj::mercury_scpi::sics_log 9 "file evaluation of mercury_scpi_sct.tcl"
 
 proc ::scobj::mercury_scpi::read_config {} {
   set catch_status [ catch {
@@ -1020,7 +988,7 @@ proc ::scobj::mercury_scpi::read_config {} {
           if { [llength $missing_list] > 0 } {
               error "$name is missing configuration values $missing_list"
           }
-          ${ns}::mkDriver sct_${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port} {*}$arg_list
+          ${ns}::mkDriver sct_${name} ${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port} {*}$arg_list
         }
       }
     }
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 731d88c1..08a510c7 100644
--- a/site_ansto/instrument/config/environment/temperature/mercury_temp_sct.tcl
+++ b/site_ansto/instrument/config/environment/temperature/mercury_temp_sct.tcl
@@ -88,7 +88,7 @@ proc ::scobj::mercury_temp::checkstatus {tc_root} {
       set sp "[sct target]"
       if {[hpropexists [sct] simulated] && [sct simulated] == "true"} {
         set pv "${sp}"
-        hset ${tc_root}/[sct driveable] ${sp}
+        hupdateif ${tc_root}/[sct driveable] ${sp}
       }
         set pv "[hval ${tc_root}/[sct driveable]]"
       }
@@ -283,10 +283,8 @@ proc ::scobj::mercury_temp::mkDriver { sct_controller name device_class simulati
 
     set scobj_hpath /sics/${name}
 
-    # Start of named group: Loop4
     hfactory ${scobj_hpath}/Loop4 plain spy none
 
-    # Start of var: nick
     hfactory ${scobj_hpath}/Loop4/nick plain user text
     hsetprop ${scobj_hpath}/Loop4/nick read ${ns}::getValue ${scobj_hpath} rdText {READ:DEV:DB8.T1:TEMP:NICK}
     hsetprop ${scobj_hpath}/Loop4/nick rdText ${ns}::rdText ${scobj_hpath}
@@ -308,7 +306,6 @@ proc ::scobj::mercury_temp::mkDriver { sct_controller name device_class simulati
       hsetprop ${scobj_hpath}/Loop4/nick simulated true
     }
 
-    # Start of var: power
     hfactory ${scobj_hpath}/Loop4/power plain user float
     hsetprop ${scobj_hpath}/Loop4/power read ${ns}::getValue ${scobj_hpath} rdValue {READ:DEV:DB3.H1:HTR:SIG:POWR}
     hsetprop ${scobj_hpath}/Loop4/power rdValue ${ns}::rdValue ${scobj_hpath}
@@ -330,7 +327,6 @@ proc ::scobj::mercury_temp::mkDriver { sct_controller name device_class simulati
       hsetprop ${scobj_hpath}/Loop4/power simulated true
     }
 
-    # Start of var: sensor
     hfactory ${scobj_hpath}/Loop4/sensor plain user float
     hsetprop ${scobj_hpath}/Loop4/sensor read ${ns}::getValue ${scobj_hpath} rdValue {READ:DEV:DB8.T1:TEMP:SIG:TEMP}
     hsetprop ${scobj_hpath}/Loop4/sensor rdValue ${ns}::rdValue ${scobj_hpath}
@@ -354,7 +350,6 @@ proc ::scobj::mercury_temp::mkDriver { sct_controller name device_class simulati
       hsetprop ${scobj_hpath}/Loop4/sensor simulated true
     }
 
-    # Start of var: setpoint
     hfactory ${scobj_hpath}/Loop4/setpoint plain user float
     hsetprop ${scobj_hpath}/Loop4/setpoint read ${ns}::getValue ${scobj_hpath} rdValue {READ:DEV:DB8.T1:TEMP:LOOP:TSET}
     hsetprop ${scobj_hpath}/Loop4/setpoint rdValue ${ns}::rdValue ${scobj_hpath}
@@ -393,7 +388,6 @@ proc ::scobj::mercury_temp::mkDriver { sct_controller name device_class simulati
     hsetprop ${scobj_hpath}/Loop4 data "true"
     hsetprop ${scobj_hpath}/Loop4 klass "@none"
     hsetprop ${scobj_hpath}/Loop4 type "part"
-    # End of named group: Loop4
     ansto_makesctdrive ${name}_Loop4_setpoint ${scobj_hpath}/Loop4/setpoint ${scobj_hpath}/Loop4/sensor ${sct_controller}
     hsetprop ${scobj_hpath} klass ${device_class}
     hsetprop ${scobj_hpath} data true
@@ -438,8 +432,8 @@ proc add_mercury_temp {name ip_address tcp_port {id 99} {tol 1}} {
   ::scobj::mercury_temp::add_driver ${name} "environment" ${simulation_flag} ${ip_address} ${tcp_port} ${id} ${tol}
 }
 
-clientput "file evaluation of sct_mercury_temp.tcl"
-::scobj::mercury_temp::sics_log 9 "file evaluation of sct_mercury_temp.tcl"
+clientput "file evaluation of mercury_temp_sct.tcl"
+::scobj::mercury_temp::sics_log 9 "file evaluation of mercury_temp_sct.tcl"
 
 proc ::scobj::mercury_temp::read_config {} {
   set catch_status [ catch {
@@ -526,7 +520,7 @@ proc ::scobj::mercury_temp::read_config {} {
           if { [llength $missing_list] > 0 } {
               error "$name is missing configuration values $missing_list"
           }
-          ${ns}::mkDriver sct_${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port} {*}$arg_list
+          ${ns}::mkDriver sct_${name} ${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port} {*}$arg_list
         }
       }
     }
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 690f3c37..cda7f832 100644
--- a/site_ansto/instrument/config/environment/temperature/mercury_valve_sct.tcl
+++ b/site_ansto/instrument/config/environment/temperature/mercury_valve_sct.tcl
@@ -88,7 +88,7 @@ proc ::scobj::mercury_valve::checkstatus {tc_root} {
       set sp "[sct target]"
       if {[hpropexists [sct] simulated] && [sct simulated] == "true"} {
         set pv "${sp}"
-        hset ${tc_root}/[sct driveable] ${sp}
+        hupdateif ${tc_root}/[sct driveable] ${sp}
       }
         set pv "[hval ${tc_root}/[sct driveable]]"
       }
@@ -261,10 +261,8 @@ proc ::scobj::mercury_valve::mkDriver { sct_controller name device_class simulat
 
     set scobj_hpath /sics/${name}
 
-    # Start of named group: Valve
     hfactory ${scobj_hpath}/Valve plain spy none
 
-    # Start of var: sensor
     hfactory ${scobj_hpath}/Valve/sensor plain user float
     hsetprop ${scobj_hpath}/Valve/sensor read ${ns}::getValue ${scobj_hpath} rdValue {READ:DEV:DB4.G1:AUX:SIG:OPEN}
     hsetprop ${scobj_hpath}/Valve/sensor rdValue ${ns}::rdValue ${scobj_hpath}
@@ -288,7 +286,6 @@ proc ::scobj::mercury_valve::mkDriver { sct_controller name device_class simulat
       hsetprop ${scobj_hpath}/Valve/sensor simulated true
     }
 
-    # Start of var: setpoint
     hfactory ${scobj_hpath}/Valve/setpoint plain user float
     hsetprop ${scobj_hpath}/Valve/setpoint write ${ns}::setValve ${scobj_hpath} noResponse {SET:DEV:DB4.G1:AUX:SIG:OPEN:}
     hsetprop ${scobj_hpath}/Valve/setpoint noResponse ${ns}::noResponse ${scobj_hpath}
@@ -324,7 +321,6 @@ proc ::scobj::mercury_valve::mkDriver { sct_controller name device_class simulat
     hsetprop ${scobj_hpath}/Valve data "true"
     hsetprop ${scobj_hpath}/Valve klass "@none"
     hsetprop ${scobj_hpath}/Valve type "part"
-    # End of named group: Valve
     ansto_makesctdrive ${name}_Valve_setpoint ${scobj_hpath}/Valve/setpoint ${scobj_hpath}/Valve/sensor ${sct_controller}
     hsetprop ${scobj_hpath} klass ${device_class}
     hsetprop ${scobj_hpath} data true
@@ -369,8 +365,8 @@ proc add_mercury_valve {name ip_address tcp_port {id 99} {valve_tol 2}} {
   ::scobj::mercury_valve::add_driver ${name} "environment" ${simulation_flag} ${ip_address} ${tcp_port} ${id} ${valve_tol}
 }
 
-clientput "file evaluation of sct_mercury_valve.tcl"
-::scobj::mercury_valve::sics_log 9 "file evaluation of sct_mercury_valve.tcl"
+clientput "file evaluation of mercury_valve_sct.tcl"
+::scobj::mercury_valve::sics_log 9 "file evaluation of mercury_valve_sct.tcl"
 
 proc ::scobj::mercury_valve::read_config {} {
   set catch_status [ catch {
@@ -457,7 +453,7 @@ proc ::scobj::mercury_valve::read_config {} {
           if { [llength $missing_list] > 0 } {
               error "$name is missing configuration values $missing_list"
           }
-          ${ns}::mkDriver sct_${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port} {*}$arg_list
+          ${ns}::mkDriver sct_${name} ${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port} {*}$arg_list
         }
       }
     }
diff --git a/site_ansto/instrument/config/environment/temperature/nprvasm2_sct.tcl b/site_ansto/instrument/config/environment/temperature/nprvasm2_sct.tcl
index 48ede97e..13caadc1 100644
--- a/site_ansto/instrument/config/environment/temperature/nprvasm2_sct.tcl
+++ b/site_ansto/instrument/config/environment/temperature/nprvasm2_sct.tcl
@@ -83,8 +83,8 @@ proc add_nprvasm2 {name ip_address tcp_port {tol 1.0}} {
   ::scobj::nprvasm2::add_driver ${name} "environment" ${simulation_flag} ${ip_address} ${tcp_port} ${tol}
 }
 
-clientput "file evaluation of sct_nprvasm2.tcl"
-::scobj::nprvasm2::sics_log 9 "file evaluation of sct_nprvasm2.tcl"
+clientput "file evaluation of nprvasm2_sct.tcl"
+::scobj::nprvasm2::sics_log 9 "file evaluation of nprvasm2_sct.tcl"
 
 proc ::scobj::nprvasm2::read_config {} {
   set catch_status [ catch {
@@ -171,7 +171,7 @@ proc ::scobj::nprvasm2::read_config {} {
           if { [llength $missing_list] > 0 } {
               error "$name is missing configuration values $missing_list"
           }
-          ${ns}::mkDriver sct_${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port} {*}$arg_list
+          ${ns}::mkDriver sct_${name} ${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port} {*}$arg_list
         }
       }
     }
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 f31ce684..498af95b 100644
--- a/site_ansto/instrument/config/environment/temperature/pfeiffer_hg_sct.tcl
+++ b/site_ansto/instrument/config/environment/temperature/pfeiffer_hg_sct.tcl
@@ -127,7 +127,7 @@ proc ::scobj::pfeiffer_hg::checkstatus {tc_root} {
       set sp "[sct target]"
       if {[hpropexists [sct] simulated] && [sct simulated] == "true"} {
         set pv "${sp}"
-        hset ${tc_root}/[sct driveable] ${sp}
+        hupdateif ${tc_root}/[sct driveable] ${sp}
       }
         set pv "[hval ${tc_root}/[sct driveable]]"
       }
@@ -206,14 +206,14 @@ proc ::scobj::pfeiffer_hg::pid_pressure {tc_root sp pv} {
     set p_value [expr {[sct pid_pvalue] * [sct pid_error]}]
     set d_value [expr {[sct pid_dvalue] * (${pv} - [sct oldval])}]
     sct pid_deriv [sct pid_error]
-    sct pid_integ [expr {[sct pid_integ] + [sct pid_error]}]
+    sct pid_integ [expr {[sct pid_integ] + [sct pid_error] * [sct pid_ivalue]}]
     if { [sct pid_integ] > [sct pid_imax] } {
       sct pid_integ [sct pid_imax]
     }
     if { [sct pid_integ] < -[sct pid_imax] } {
       sct pid_integ -[sct pid_imax]
     }
-    set i_value [expr {[sct pid_ivalue] * [sct pid_integ]}]
+    set i_value [sct pid_integ]
     set pid [expr {${p_value} + ${i_value} + ${d_value}}]
 # pid_pressure hook code starts
     if { [hpropexists [sct] pid_control] } {
@@ -388,9 +388,7 @@ proc ::scobj::pfeiffer_hg::mkDriver { sct_controller name device_class simulatio
     sicslist setatt ${name} long_name ${name}
 
     set scobj_hpath /sics/${name}
-    # Start of unnamed group
 
-    # Start of var: status
     hfactory ${scobj_hpath}/status plain user int
     hsetprop ${scobj_hpath}/status control true
     hsetprop ${scobj_hpath}/status data true
@@ -405,12 +403,9 @@ proc ::scobj::pfeiffer_hg::mkDriver { sct_controller name device_class simulatio
     hsetprop ${scobj_hpath} data "true"
     hsetprop ${scobj_hpath} klass "@none"
     hsetprop ${scobj_hpath} type "part"
-    # End of unnamed group
 
-    # Start of named group: pressure
     hfactory ${scobj_hpath}/pressure plain spy none
 
-    # Start of var: sensor
     hfactory ${scobj_hpath}/pressure/sensor plain user float
     hsetprop ${scobj_hpath}/pressure/sensor read ${ns}::sendPR1 ${scobj_hpath} readPR1 {PR1}
     hsetprop ${scobj_hpath}/pressure/sensor readPR1 ${ns}::readPR1 ${scobj_hpath}
@@ -443,7 +438,6 @@ proc ::scobj::pfeiffer_hg::mkDriver { sct_controller name device_class simulatio
       hsetprop ${scobj_hpath}/pressure/sensor simulated true
     }
 
-    # Start of var: setpoint
     hfactory ${scobj_hpath}/pressure/setpoint plain user float
     hsetprop ${scobj_hpath}/pressure/setpoint write ${ns}::setPoint ${scobj_hpath} noResponse {@}
     hsetprop ${scobj_hpath}/pressure/setpoint noResponse ${ns}::noResponse ${scobj_hpath}
@@ -479,7 +473,6 @@ proc ::scobj::pfeiffer_hg::mkDriver { sct_controller name device_class simulatio
     hsetprop ${scobj_hpath}/pressure data "true"
     hsetprop ${scobj_hpath}/pressure klass "@none"
     hsetprop ${scobj_hpath}/pressure type "part"
-    # End of named group: pressure
     ansto_makesctdrive ${name}_pressure_setpoint ${scobj_hpath}/pressure/setpoint ${scobj_hpath}/pressure/sensor ${sct_controller}
     hsetprop ${scobj_hpath} klass ${device_class}
     hsetprop ${scobj_hpath} data true
@@ -527,8 +520,8 @@ proc add_pfeiffer_hg {name ip_address tcp_port} {
   ::scobj::pfeiffer_hg::add_driver ${name} "environment" ${simulation_flag} ${ip_address} ${tcp_port}
 }
 
-clientput "file evaluation of sct_pfeiffer_hg.tcl"
-::scobj::pfeiffer_hg::sics_log 9 "file evaluation of sct_pfeiffer_hg.tcl"
+clientput "file evaluation of pfeiffer_hg_sct.tcl"
+::scobj::pfeiffer_hg::sics_log 9 "file evaluation of pfeiffer_hg_sct.tcl"
 
 proc ::scobj::pfeiffer_hg::read_config {} {
   set catch_status [ catch {
@@ -600,7 +593,7 @@ proc ::scobj::pfeiffer_hg::read_config {} {
             }
             makesctcontroller sct_${name} aqadapter ${asyncqueue}
           }
-          ${ns}::mkDriver sct_${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port}
+          ${ns}::mkDriver sct_${name} ${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port}
         }
       }
     }
diff --git a/site_ansto/instrument/config/environment/temperature/srs_sr630_sct.tcl b/site_ansto/instrument/config/environment/temperature/srs_sr630_sct.tcl
index 63b1cd34..276ed687 100644
--- a/site_ansto/instrument/config/environment/temperature/srs_sr630_sct.tcl
+++ b/site_ansto/instrument/config/environment/temperature/srs_sr630_sct.tcl
@@ -202,9 +202,7 @@ proc ::scobj::srs_sr630::mkDriver { sct_controller name device_class simulation_
     sicslist setatt ${name} long_name ${name}
 
     set scobj_hpath /sics/${name}
-    # Start of unnamed group
 
-    # Start of var: id
     hfactory ${scobj_hpath}/id plain user text
     hsetprop ${scobj_hpath}/id read ${ns}::fetch_id ${scobj_hpath} read_id {@}
     hsetprop ${scobj_hpath}/id read_id ${ns}::read_id ${scobj_hpath}
@@ -227,7 +225,6 @@ proc ::scobj::srs_sr630::mkDriver { sct_controller name device_class simulation_
       hsetprop ${scobj_hpath}/id simulated true
     }
 
-    # Start of var: sensor_01
     hfactory ${scobj_hpath}/sensor_01 plain user float
     hsetprop ${scobj_hpath}/sensor_01 read ${ns}::getSensor ${scobj_hpath} readSensor {1}
     hsetprop ${scobj_hpath}/sensor_01 readSensor ${ns}::readSensor ${scobj_hpath}
@@ -249,7 +246,6 @@ proc ::scobj::srs_sr630::mkDriver { sct_controller name device_class simulation_
       hsetprop ${scobj_hpath}/sensor_01 simulated true
     }
 
-    # Start of var: sensor_02
     hfactory ${scobj_hpath}/sensor_02 plain user float
     hsetprop ${scobj_hpath}/sensor_02 read ${ns}::getSensor ${scobj_hpath} readSensor {2}
     hsetprop ${scobj_hpath}/sensor_02 readSensor ${ns}::readSensor ${scobj_hpath}
@@ -271,7 +267,6 @@ proc ::scobj::srs_sr630::mkDriver { sct_controller name device_class simulation_
       hsetprop ${scobj_hpath}/sensor_02 simulated true
     }
 
-    # Start of var: sensor_03
     hfactory ${scobj_hpath}/sensor_03 plain user float
     hsetprop ${scobj_hpath}/sensor_03 read ${ns}::getSensor ${scobj_hpath} readSensor {3}
     hsetprop ${scobj_hpath}/sensor_03 readSensor ${ns}::readSensor ${scobj_hpath}
@@ -293,7 +288,6 @@ proc ::scobj::srs_sr630::mkDriver { sct_controller name device_class simulation_
       hsetprop ${scobj_hpath}/sensor_03 simulated true
     }
 
-    # Start of var: sensor_04
     hfactory ${scobj_hpath}/sensor_04 plain user float
     hsetprop ${scobj_hpath}/sensor_04 read ${ns}::getSensor ${scobj_hpath} readSensor {4}
     hsetprop ${scobj_hpath}/sensor_04 readSensor ${ns}::readSensor ${scobj_hpath}
@@ -315,7 +309,6 @@ proc ::scobj::srs_sr630::mkDriver { sct_controller name device_class simulation_
       hsetprop ${scobj_hpath}/sensor_04 simulated true
     }
 
-    # Start of var: sensor_05
     hfactory ${scobj_hpath}/sensor_05 plain user float
     hsetprop ${scobj_hpath}/sensor_05 read ${ns}::getSensor ${scobj_hpath} readSensor {5}
     hsetprop ${scobj_hpath}/sensor_05 readSensor ${ns}::readSensor ${scobj_hpath}
@@ -337,7 +330,6 @@ proc ::scobj::srs_sr630::mkDriver { sct_controller name device_class simulation_
       hsetprop ${scobj_hpath}/sensor_05 simulated true
     }
 
-    # Start of var: sensor_06
     hfactory ${scobj_hpath}/sensor_06 plain user float
     hsetprop ${scobj_hpath}/sensor_06 read ${ns}::getSensor ${scobj_hpath} readSensor {6}
     hsetprop ${scobj_hpath}/sensor_06 readSensor ${ns}::readSensor ${scobj_hpath}
@@ -359,7 +351,6 @@ proc ::scobj::srs_sr630::mkDriver { sct_controller name device_class simulation_
       hsetprop ${scobj_hpath}/sensor_06 simulated true
     }
 
-    # Start of var: sensor_07
     hfactory ${scobj_hpath}/sensor_07 plain user float
     hsetprop ${scobj_hpath}/sensor_07 read ${ns}::getSensor ${scobj_hpath} readSensor {7}
     hsetprop ${scobj_hpath}/sensor_07 readSensor ${ns}::readSensor ${scobj_hpath}
@@ -381,7 +372,6 @@ proc ::scobj::srs_sr630::mkDriver { sct_controller name device_class simulation_
       hsetprop ${scobj_hpath}/sensor_07 simulated true
     }
 
-    # Start of var: sensor_08
     hfactory ${scobj_hpath}/sensor_08 plain user float
     hsetprop ${scobj_hpath}/sensor_08 read ${ns}::getSensor ${scobj_hpath} readSensor {8}
     hsetprop ${scobj_hpath}/sensor_08 readSensor ${ns}::readSensor ${scobj_hpath}
@@ -406,7 +396,6 @@ proc ::scobj::srs_sr630::mkDriver { sct_controller name device_class simulation_
     hsetprop ${scobj_hpath} data "true"
     hsetprop ${scobj_hpath} klass "@none"
     hsetprop ${scobj_hpath} type "part"
-    # End of unnamed group
     hsetprop ${scobj_hpath} klass ${device_class}
     hsetprop ${scobj_hpath} data true
     hsetprop ${scobj_hpath} debug_threshold 5
@@ -450,8 +439,8 @@ proc add_srs_sr630 {name ip_address tcp_port} {
   ::scobj::srs_sr630::add_driver ${name} "NXdetector" ${simulation_flag} ${ip_address} ${tcp_port}
 }
 
-clientput "file evaluation of sct_srs_sr630.tcl"
-::scobj::srs_sr630::sics_log 9 "file evaluation of sct_srs_sr630.tcl"
+clientput "file evaluation of srs_sr630_sct.tcl"
+::scobj::srs_sr630::sics_log 9 "file evaluation of srs_sr630_sct.tcl"
 
 proc ::scobj::srs_sr630::read_config {} {
   set catch_status [ catch {
@@ -523,7 +512,7 @@ proc ::scobj::srs_sr630::read_config {} {
             }
             makesctcontroller sct_${name} aqadapter ${asyncqueue}
           }
-          ${ns}::mkDriver sct_${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port}
+          ${ns}::mkDriver sct_${name} ${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port}
         }
       }
     }
diff --git a/site_ansto/instrument/config/environment/temperature/watlow_mpm_sct.tcl b/site_ansto/instrument/config/environment/temperature/watlow_mpm_sct.tcl
index cd63ec83..e1c3e08a 100644
--- a/site_ansto/instrument/config/environment/temperature/watlow_mpm_sct.tcl
+++ b/site_ansto/instrument/config/environment/temperature/watlow_mpm_sct.tcl
@@ -83,8 +83,8 @@ proc add_watlow_mpm {name ip_address tcp_port id datype dev_id tol} {
   ::scobj::watlow_mpm::add_driver ${name} "environment" ${simulation_flag} ${ip_address} ${tcp_port} ${id} ${datype} ${dev_id} ${tol}
 }
 
-clientput "file evaluation of sct_watlow_mpm.tcl"
-::scobj::watlow_mpm::sics_log 9 "file evaluation of sct_watlow_mpm.tcl"
+clientput "file evaluation of watlow_mpm_sct.tcl"
+::scobj::watlow_mpm::sics_log 9 "file evaluation of watlow_mpm_sct.tcl"
 
 proc ::scobj::watlow_mpm::read_config {} {
   set catch_status [ catch {
@@ -171,7 +171,7 @@ proc ::scobj::watlow_mpm::read_config {} {
           if { [llength $missing_list] > 0 } {
               error "$name is missing configuration values $missing_list"
           }
-          ${ns}::mkDriver sct_${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port} {*}$arg_list
+          ${ns}::mkDriver sct_${name} ${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port} {*}$arg_list
         }
       }
     }
diff --git a/site_ansto/instrument/config/environment/temperature/watlow_mrm_sct.tcl b/site_ansto/instrument/config/environment/temperature/watlow_mrm_sct.tcl
index cc20171d..09841cef 100644
--- a/site_ansto/instrument/config/environment/temperature/watlow_mrm_sct.tcl
+++ b/site_ansto/instrument/config/environment/temperature/watlow_mrm_sct.tcl
@@ -83,8 +83,8 @@ proc add_watlow_mrm {name ip_address tcp_port id datype dev_id tol} {
   ::scobj::watlow_mrm::add_driver ${name} "environment" ${simulation_flag} ${ip_address} ${tcp_port} ${id} ${datype} ${dev_id} ${tol}
 }
 
-clientput "file evaluation of sct_watlow_mrm.tcl"
-::scobj::watlow_mrm::sics_log 9 "file evaluation of sct_watlow_mrm.tcl"
+clientput "file evaluation of watlow_mrm_sct.tcl"
+::scobj::watlow_mrm::sics_log 9 "file evaluation of watlow_mrm_sct.tcl"
 
 proc ::scobj::watlow_mrm::read_config {} {
   set catch_status [ catch {
@@ -171,7 +171,7 @@ proc ::scobj::watlow_mrm::read_config {} {
           if { [llength $missing_list] > 0 } {
               error "$name is missing configuration values $missing_list"
           }
-          ${ns}::mkDriver sct_${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port} {*}$arg_list
+          ${ns}::mkDriver sct_${name} ${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port} {*}$arg_list
         }
       }
     }
diff --git a/site_ansto/instrument/config/environment/temperature/watlow_mst4_sct.tcl b/site_ansto/instrument/config/environment/temperature/watlow_mst4_sct.tcl
index f3bbd5b9..15417575 100644
--- a/site_ansto/instrument/config/environment/temperature/watlow_mst4_sct.tcl
+++ b/site_ansto/instrument/config/environment/temperature/watlow_mst4_sct.tcl
@@ -83,8 +83,8 @@ proc add_watlow_mst4 {name ip_address tcp_port id datype dev_id tol} {
   ::scobj::watlow_mst4::add_driver ${name} "environment" ${simulation_flag} ${ip_address} ${tcp_port} ${id} ${datype} ${dev_id} ${tol}
 }
 
-clientput "file evaluation of sct_watlow_mst4.tcl"
-::scobj::watlow_mst4::sics_log 9 "file evaluation of sct_watlow_mst4.tcl"
+clientput "file evaluation of watlow_mst4_sct.tcl"
+::scobj::watlow_mst4::sics_log 9 "file evaluation of watlow_mst4_sct.tcl"
 
 proc ::scobj::watlow_mst4::read_config {} {
   set catch_status [ catch {
@@ -171,7 +171,7 @@ proc ::scobj::watlow_mst4::read_config {} {
           if { [llength $missing_list] > 0 } {
               error "$name is missing configuration values $missing_list"
           }
-          ${ns}::mkDriver sct_${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port} {*}$arg_list
+          ${ns}::mkDriver sct_${name} ${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port} {*}$arg_list
         }
       }
     }
diff --git a/site_ansto/instrument/config/environment/temperature/west4100_sct.tcl b/site_ansto/instrument/config/environment/temperature/west4100_sct.tcl
index fa910d2d..3ef95dd5 100644
--- a/site_ansto/instrument/config/environment/temperature/west4100_sct.tcl
+++ b/site_ansto/instrument/config/environment/temperature/west4100_sct.tcl
@@ -62,8 +62,8 @@ proc add_west4100 {name ip_address tcp_port dev_id} {
   ::scobj::west4100::add_driver ${name} "environment" ${simulation_flag} ${ip_address} ${tcp_port} ${dev_id}
 }
 
-clientput "file evaluation of sct_west4100.tcl"
-::scobj::west4100::sics_log 9 "file evaluation of sct_west4100.tcl"
+clientput "file evaluation of west4100_sct.tcl"
+::scobj::west4100::sics_log 9 "file evaluation of west4100_sct.tcl"
 
 proc ::scobj::west4100::read_config {} {
   set catch_status [ catch {
@@ -111,7 +111,7 @@ proc ::scobj::west4100::read_config {} {
           if { [llength $missing_list] > 0 } {
               error "$name is missing configuration values $missing_list"
           }
-          ${ns}::mkDriver sct_${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port} {*}$arg_list
+          ${ns}::mkDriver sct_${name} ${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port} {*}$arg_list
         }
       }
     }
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 98cf7f16..27f1c65f 100644
--- a/site_ansto/instrument/config/environment/temperature/west_6100_sct.tcl
+++ b/site_ansto/instrument/config/environment/temperature/west_6100_sct.tcl
@@ -88,7 +88,7 @@ proc ::scobj::west_6100::checkstatus {tc_root} {
       set sp "[sct target]"
       if {[hpropexists [sct] simulated] && [sct simulated] == "true"} {
         set pv "${sp}"
-        hset ${tc_root}/[sct driveable] ${sp}
+        hupdateif ${tc_root}/[sct driveable] ${sp}
       }
         set pv "[hval ${tc_root}/[sct driveable]]"
       }
@@ -351,9 +351,7 @@ proc ::scobj::west_6100::mkDriver { sct_controller name device_class simulation_
     sicslist setatt ${name} long_name ${name}
 
     set scobj_hpath /sics/${name}
-    # Start of unnamed group
 
-    # Start of var: alarm1
     hfactory ${scobj_hpath}/alarm1 plain user float
     hsetprop ${scobj_hpath}/alarm1 read ${ns}::getDecimal ${scobj_hpath} rdDecimal {13}
     hsetprop ${scobj_hpath}/alarm1 rdDecimal ${ns}::rdDecimal ${scobj_hpath}
@@ -379,7 +377,6 @@ proc ::scobj::west_6100::mkDriver { sct_controller name device_class simulation_
       hsetprop ${scobj_hpath}/alarm1 simulated true
     }
 
-    # Start of var: alarm2
     hfactory ${scobj_hpath}/alarm2 plain user float
     hsetprop ${scobj_hpath}/alarm2 read ${ns}::getDecimal ${scobj_hpath} rdDecimal {14}
     hsetprop ${scobj_hpath}/alarm2 rdDecimal ${ns}::rdDecimal ${scobj_hpath}
@@ -405,7 +402,6 @@ proc ::scobj::west_6100::mkDriver { sct_controller name device_class simulation_
       hsetprop ${scobj_hpath}/alarm2 simulated true
     }
 
-    # Start of var: power
     hfactory ${scobj_hpath}/power plain user int
     hsetprop ${scobj_hpath}/power read ${ns}::getInteger ${scobj_hpath} rdInteger {3}
     hsetprop ${scobj_hpath}/power rdInteger ${ns}::rdInteger ${scobj_hpath}
@@ -427,7 +423,6 @@ proc ::scobj::west_6100::mkDriver { sct_controller name device_class simulation_
       hsetprop ${scobj_hpath}/power simulated true
     }
 
-    # Start of var: powermax
     hfactory ${scobj_hpath}/powermax plain user int
     hsetprop ${scobj_hpath}/powermax read ${ns}::getInteger ${scobj_hpath} rdInteger {20}
     hsetprop ${scobj_hpath}/powermax rdInteger ${ns}::rdInteger ${scobj_hpath}
@@ -453,7 +448,6 @@ proc ::scobj::west_6100::mkDriver { sct_controller name device_class simulation_
       hsetprop ${scobj_hpath}/powermax simulated true
     }
 
-    # Start of var: ramprate
     hfactory ${scobj_hpath}/ramprate plain user float
     hsetprop ${scobj_hpath}/ramprate read ${ns}::getDecimal ${scobj_hpath} rdDecimal {24}
     hsetprop ${scobj_hpath}/ramprate rdDecimal ${ns}::rdDecimal ${scobj_hpath}
@@ -479,7 +473,6 @@ proc ::scobj::west_6100::mkDriver { sct_controller name device_class simulation_
       hsetprop ${scobj_hpath}/ramprate simulated true
     }
 
-    # Start of var: sensor
     hfactory ${scobj_hpath}/sensor plain user float
     hsetprop ${scobj_hpath}/sensor read ${ns}::getDecimal ${scobj_hpath} rdDecimal {1}
     hsetprop ${scobj_hpath}/sensor rdDecimal ${ns}::rdDecimal ${scobj_hpath}
@@ -503,7 +496,6 @@ proc ::scobj::west_6100::mkDriver { sct_controller name device_class simulation_
       hsetprop ${scobj_hpath}/sensor simulated true
     }
 
-    # Start of var: setpoint
     hfactory ${scobj_hpath}/setpoint plain user float
     hsetprop ${scobj_hpath}/setpoint read ${ns}::getDecimal ${scobj_hpath} rdDecimal {2}
     hsetprop ${scobj_hpath}/setpoint rdDecimal ${ns}::rdDecimal ${scobj_hpath}
@@ -540,7 +532,6 @@ proc ::scobj::west_6100::mkDriver { sct_controller name device_class simulation_
       hsetprop ${scobj_hpath}/setpoint simulated true
     }
 
-    # Start of var: w_sp
     hfactory ${scobj_hpath}/w_sp plain user float
     hsetprop ${scobj_hpath}/w_sp read ${ns}::getDecimal ${scobj_hpath} rdDecimal {21}
     hsetprop ${scobj_hpath}/w_sp rdDecimal ${ns}::rdDecimal ${scobj_hpath}
@@ -569,13 +560,10 @@ proc ::scobj::west_6100::mkDriver { sct_controller name device_class simulation_
     hsetprop ${scobj_hpath} data "true"
     hsetprop ${scobj_hpath} klass "@none"
     hsetprop ${scobj_hpath} type "part"
-    # End of unnamed group
     ansto_makesctdrive ${name}_setpoint ${scobj_hpath}/setpoint ${scobj_hpath}/sensor ${sct_controller}
 
-    # Start of named group: aux
     hfactory ${scobj_hpath}/aux plain spy none
 
-    # Start of var: decimal
     hfactory ${scobj_hpath}/aux/decimal plain user int
     hsetprop ${scobj_hpath}/aux/decimal read ${ns}::getInteger ${scobj_hpath} rdInteger {18}
     hsetprop ${scobj_hpath}/aux/decimal rdInteger ${ns}::rdInteger ${scobj_hpath}
@@ -597,7 +585,6 @@ proc ::scobj::west_6100::mkDriver { sct_controller name device_class simulation_
       hsetprop ${scobj_hpath}/aux/decimal simulated true
     }
 
-    # Start of var: instatus
     hfactory ${scobj_hpath}/aux/instatus plain user int
     hsetprop ${scobj_hpath}/aux/instatus read ${ns}::getInteger ${scobj_hpath} rdInteger {133}
     hsetprop ${scobj_hpath}/aux/instatus rdInteger ${ns}::rdInteger ${scobj_hpath}
@@ -618,7 +605,6 @@ proc ::scobj::west_6100::mkDriver { sct_controller name device_class simulation_
       hsetprop ${scobj_hpath}/aux/instatus simulated true
     }
 
-    # Start of var: model
     hfactory ${scobj_hpath}/aux/model plain user int
     hsetprop ${scobj_hpath}/aux/model read ${ns}::getInteger ${scobj_hpath} rdInteger {122}
     hsetprop ${scobj_hpath}/aux/model rdInteger ${ns}::rdInteger ${scobj_hpath}
@@ -641,7 +627,6 @@ proc ::scobj::west_6100::mkDriver { sct_controller name device_class simulation_
     hsetprop ${scobj_hpath}/aux data "false"
     hsetprop ${scobj_hpath}/aux klass "@none"
     hsetprop ${scobj_hpath}/aux type "part"
-    # End of named group: aux
     hsetprop ${scobj_hpath} klass ${device_class}
     hsetprop ${scobj_hpath} data true
     hsetprop ${scobj_hpath} debug_threshold 5
@@ -685,8 +670,8 @@ proc add_west_6100 {name ip_address tcp_port id} {
   ::scobj::west_6100::add_driver ${name} "environment" ${simulation_flag} ${ip_address} ${tcp_port} ${id}
 }
 
-clientput "file evaluation of sct_west_6100.tcl"
-::scobj::west_6100::sics_log 9 "file evaluation of sct_west_6100.tcl"
+clientput "file evaluation of west_6100_sct.tcl"
+::scobj::west_6100::sics_log 9 "file evaluation of west_6100_sct.tcl"
 
 proc ::scobj::west_6100::read_config {} {
   set catch_status [ catch {
@@ -773,7 +758,7 @@ proc ::scobj::west_6100::read_config {} {
           if { [llength $missing_list] > 0 } {
               error "$name is missing configuration values $missing_list"
           }
-          ${ns}::mkDriver sct_${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port} {*}$arg_list
+          ${ns}::mkDriver sct_${name} ${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port} {*}$arg_list
         }
       }
     }
diff --git a/site_ansto/instrument/config/robots/epson_pandp_sct.tcl b/site_ansto/instrument/config/robots/epson_pandp_sct.tcl
index 2b2c167a..f3f5d75b 100644
--- a/site_ansto/instrument/config/robots/epson_pandp_sct.tcl
+++ b/site_ansto/instrument/config/robots/epson_pandp_sct.tcl
@@ -63,8 +63,8 @@ proc add_epson_pandp {name ip_address tcp_port robot_name} {
   ::scobj::epson_pandp::add_driver ${name} "environment" ${simulation_flag} ${ip_address} ${tcp_port} ${robot_name}
 }
 
-clientput "file evaluation of sct_epson_pandp.tcl"
-::scobj::epson_pandp::sics_log 9 "file evaluation of sct_epson_pandp.tcl"
+clientput "file evaluation of epson_pandp_sct.tcl"
+::scobj::epson_pandp::sics_log 9 "file evaluation of epson_pandp_sct.tcl"
 
 proc ::scobj::epson_pandp::read_config {} {
   set catch_status [ catch {
@@ -112,7 +112,7 @@ proc ::scobj::epson_pandp::read_config {} {
           if { [llength $missing_list] > 0 } {
               error "$name is missing configuration values $missing_list"
           }
-          ${ns}::mkDriver sct_${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port} {*}$arg_list
+          ${ns}::mkDriver sct_${name} ${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port} {*}$arg_list
         }
       }
     }
diff --git a/site_ansto/instrument/config/source/reactor_status_sct.tcl b/site_ansto/instrument/config/source/reactor_status_sct.tcl
index 75b789f1..4f8ee88f 100644
--- a/site_ansto/instrument/config/source/reactor_status_sct.tcl
+++ b/site_ansto/instrument/config/source/reactor_status_sct.tcl
@@ -227,9 +227,7 @@ proc ::scobj::reactor_status::mkDriver { sct_controller name device_class simula
     sicslist setatt ${name} long_name ${name}
 
     set scobj_hpath /sics/${name}
-    # Start of unnamed group
 
-    # Start of var: cg123
     hfactory ${scobj_hpath}/cg123 plain spy float
     hsetprop ${scobj_hpath}/cg123 control true
     hsetprop ${scobj_hpath}/cg123 data true
@@ -241,7 +239,6 @@ proc ::scobj::reactor_status::mkDriver { sct_controller name device_class simula
     hsetprop ${scobj_hpath}/cg123 type "part"
     hsetprop ${scobj_hpath}/cg123 nxalias "${name}_cg123"
 
-    # Start of var: cns_out
     hfactory ${scobj_hpath}/cns_out plain spy float
     hsetprop ${scobj_hpath}/cns_out control true
     hsetprop ${scobj_hpath}/cns_out data true
@@ -253,7 +250,6 @@ proc ::scobj::reactor_status::mkDriver { sct_controller name device_class simula
     hsetprop ${scobj_hpath}/cns_out type "part"
     hsetprop ${scobj_hpath}/cns_out nxalias "${name}_cns_out"
 
-    # Start of var: power
     hfactory ${scobj_hpath}/power plain spy float
     hsetprop ${scobj_hpath}/power control true
     hsetprop ${scobj_hpath}/power data true
@@ -265,7 +261,6 @@ proc ::scobj::reactor_status::mkDriver { sct_controller name device_class simula
     hsetprop ${scobj_hpath}/power type "part"
     hsetprop ${scobj_hpath}/power nxalias "${name}_power"
 
-    # Start of var: status
     hfactory ${scobj_hpath}/status plain spy text
     hsetprop ${scobj_hpath}/status read ${ns}::getState ${scobj_hpath} rdAll {GET /Bragg/proposal/reactor.jsp?type=ALL}
     hsetprop ${scobj_hpath}/status rdAll ${ns}::rdAll ${scobj_hpath}
@@ -286,7 +281,6 @@ proc ::scobj::reactor_status::mkDriver { sct_controller name device_class simula
       hsetprop ${scobj_hpath}/status simulated true
     }
 
-    # Start of var: tg123
     hfactory ${scobj_hpath}/tg123 plain spy float
     hsetprop ${scobj_hpath}/tg123 control true
     hsetprop ${scobj_hpath}/tg123 data true
@@ -298,7 +292,6 @@ proc ::scobj::reactor_status::mkDriver { sct_controller name device_class simula
     hsetprop ${scobj_hpath}/tg123 type "part"
     hsetprop ${scobj_hpath}/tg123 nxalias "${name}_tg123"
 
-    # Start of var: tg4
     hfactory ${scobj_hpath}/tg4 plain spy float
     hsetprop ${scobj_hpath}/tg4 control true
     hsetprop ${scobj_hpath}/tg4 data true
@@ -314,7 +307,6 @@ proc ::scobj::reactor_status::mkDriver { sct_controller name device_class simula
     hsetprop ${scobj_hpath} data "true"
     hsetprop ${scobj_hpath} klass "@none"
     hsetprop ${scobj_hpath} type "part"
-    # End of unnamed group
     hsetprop ${scobj_hpath} klass ${device_class}
     hsetprop ${scobj_hpath} data true
     hsetprop ${scobj_hpath} debug_threshold 5
@@ -359,8 +351,8 @@ proc add_reactor_status {name ip_address tcp_port} {
   ::scobj::reactor_status::add_driver ${name} "NXsource" ${simulation_flag} ${ip_address} ${tcp_port}
 }
 
-clientput "file evaluation of sct_reactor_status.tcl"
-::scobj::reactor_status::sics_log 9 "file evaluation of sct_reactor_status.tcl"
+clientput "file evaluation of reactor_status_sct.tcl"
+::scobj::reactor_status::sics_log 9 "file evaluation of reactor_status_sct.tcl"
 
 proc ::scobj::reactor_status::read_config {} {
   set catch_status [ catch {
@@ -432,7 +424,7 @@ proc ::scobj::reactor_status::read_config {} {
             }
             makesctcontroller sct_${name} aqadapter ${asyncqueue}
           }
-          ${ns}::mkDriver sct_${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port}
+          ${ns}::mkDriver sct_${name} ${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port}
         }
       }
     }