diff --git a/site_ansto/instrument/config/environment/sct_nhq_200.tcl b/site_ansto/instrument/config/environment/sct_nhq_200.tcl
index dabf95a9..4aef7fb3 100644
--- a/site_ansto/instrument/config/environment/sct_nhq_200.tcl
+++ b/site_ansto/instrument/config/environment/sct_nhq_200.tcl
@@ -276,7 +276,7 @@ proc ::scobj::nhq_200::mkDriver { sct_controller name ip_address tcp_port } {
 
     MakeSICSObj ${name} SCT_OBJECT
 
-    sicslist setatt ${name} klass environment
+    sicslist setatt ${name} klass NXdetector
     sicslist setatt ${name} long_name ${name}
 
     set scobj_hpath /sics/${name}
@@ -311,11 +311,11 @@ proc ::scobj::nhq_200::mkDriver { sct_controller name ip_address tcp_port } {
     hsetprop ${scobj_hpath} klass "@none"
     hsetprop ${scobj_hpath} type "part"
 
-    if {[string equal -nocase [SplitReply [environment_simulation]] "false"]} {
+    if {[string equal -nocase [SplitReply [detector_simulation]] "false"]} {
       ${sct_controller} poll ${scobj_hpath}/break 10
       ${sct_controller} poll ${scobj_hpath}/id 10
     } else {
-      ::scobj::nhq_200::sics_log 9 "[environment_simulation] => No poll/write for nhq_200"
+      ::scobj::nhq_200::sics_log 9 "[detector_simulation] => No poll/write for nhq_200"
     }
 
     hfactory ${scobj_hpath}/ch1 plain spy none
@@ -488,7 +488,7 @@ proc ::scobj::nhq_200::mkDriver { sct_controller name ip_address tcp_port } {
     hsetprop ${scobj_hpath}/ch1/voltage type "part"
     hsetprop ${scobj_hpath}/ch1/voltage nxalias "${name}_ch1_voltage"
 
-    if {[string equal -nocase [SplitReply [environment_simulation]] "false"]} {
+    if {[string equal -nocase [SplitReply [detector_simulation]] "false"]} {
       ${sct_controller} poll ${scobj_hpath}/ch1/auto_start 5
       ${sct_controller} poll ${scobj_hpath}/ch1/current 5
       ${sct_controller} poll ${scobj_hpath}/ch1/i_lim 5
@@ -505,7 +505,7 @@ proc ::scobj::nhq_200::mkDriver { sct_controller name ip_address tcp_port } {
       ${sct_controller} write ${scobj_hpath}/ch1/v_ramp
       ${sct_controller} write ${scobj_hpath}/ch1/v_sp
     } else {
-      ::scobj::nhq_200::sics_log 9 "[environment_simulation] => No poll/write for nhq_200"
+      ::scobj::nhq_200::sics_log 9 "[detector_simulation] => No poll/write for nhq_200"
     }
 
     hfactory ${scobj_hpath}/ch2 plain spy none
@@ -678,7 +678,7 @@ proc ::scobj::nhq_200::mkDriver { sct_controller name ip_address tcp_port } {
     hsetprop ${scobj_hpath}/ch2/voltage type "part"
     hsetprop ${scobj_hpath}/ch2/voltage nxalias "${name}_ch2_voltage"
 
-    if {[string equal -nocase [SplitReply [environment_simulation]] "false"]} {
+    if {[string equal -nocase [SplitReply [detector_simulation]] "false"]} {
       ${sct_controller} poll ${scobj_hpath}/ch2/auto_start 5
       ${sct_controller} poll ${scobj_hpath}/ch2/current 5
       ${sct_controller} poll ${scobj_hpath}/ch2/i_lim 5
@@ -695,12 +695,12 @@ proc ::scobj::nhq_200::mkDriver { sct_controller name ip_address tcp_port } {
       ${sct_controller} write ${scobj_hpath}/ch2/v_ramp
       ${sct_controller} write ${scobj_hpath}/ch2/v_sp
     } else {
-      ::scobj::nhq_200::sics_log 9 "[environment_simulation] => No poll/write for nhq_200"
+      ::scobj::nhq_200::sics_log 9 "[detector_simulation] => No poll/write for nhq_200"
     }
-    hsetprop ${scobj_hpath} klass environment
+    hsetprop ${scobj_hpath} klass NXdetector
     hsetprop ${scobj_hpath} data true
     hsetprop ${scobj_hpath} debug_threshold 5
-    if {[string equal -nocase [SplitReply [environment_simulation]] "false"]} {
+    if {[string equal -nocase [SplitReply [detector_simulation]] "false"]} {
       ansto_makesctdrive ${name}_ch1_v_sp ${scobj_hpath}/ch1/v_sp ${scobj_hpath}/ch1/voltage ${sct_controller}
       ansto_makesctdrive ${name}_ch2_v_sp ${scobj_hpath}/ch2/v_sp ${scobj_hpath}/ch2/voltage ${sct_controller}
     }
@@ -719,7 +719,7 @@ namespace eval ::scobj::nhq_200 {
 proc add_nhq_200 {name ip_address tcp_port} {
   set catch_status [ catch {
     ::scobj::nhq_200::sics_log 9 "add_nhq_200 ${name} ${ip_address} ${tcp_port}"
-    if {[string equal -nocase [SplitReply [environment_simulation]] "false"]} {
+    if {[string equal -nocase [SplitReply [detector_simulation]] "false"]} {
       if {[string equal -nocase "aqadapter" "${ip_address}"]} {
         ::scobj::nhq_200::sics_log 9 "makesctcontroller sct_${name} aqadapter ${tcp_port}"
         makesctcontroller sct_${name} aqadapter ${tcp_port}
@@ -728,7 +728,7 @@ proc add_nhq_200 {name ip_address tcp_port} {
         makesctcontroller sct_${name} std ${ip_address}:${tcp_port}
       }
     } else {
-      ::scobj::nhq_200::sics_log 9 "[environment_simulation] => No sctcontroller for nhq_200"
+      ::scobj::nhq_200::sics_log 9 "[detector_simulation] => No sctcontroller for nhq_200"
     }
     ::scobj::nhq_200::sics_log 1 "::scobj::nhq_200::mkDriver sct_${name} ${name} ${ip_address} ${tcp_port}"
     ::scobj::nhq_200::mkDriver sct_${name} ${name} ${ip_address} ${tcp_port}
@@ -761,9 +761,9 @@ proc ::scobj::nhq_200::read_config {} {
           continue
         }
         if { [string equal -nocase [dict get $v "driver"] "nhq_200"] } {
-          if { ![string equal -nocase [SplitReply [environment_simulation]] "false"] } {
+          if { ![string equal -nocase [SplitReply [detector_simulation]] "false"] } {
             set asyncqueue "null"
-            ${ns}::sics_log 9 "[environment_simulation] => using null asyncqueue"
+            ${ns}::sics_log 9 "[detector_simulation] => using null asyncqueue"
           } elseif { [dict exists $v "asyncqueue"] } {
             set asyncqueue [dict get $v "asyncqueue"]
             if { [string equal -nocase ${asyncqueue} "sct"] } {
diff --git a/site_ansto/instrument/config/environment/temperature/sct_lakeshore_218.tcl b/site_ansto/instrument/config/environment/temperature/sct_lakeshore_218.tcl
index f01dc469..60da9895 100644
--- a/site_ansto/instrument/config/environment/temperature/sct_lakeshore_218.tcl
+++ b/site_ansto/instrument/config/environment/temperature/sct_lakeshore_218.tcl
@@ -164,7 +164,7 @@ proc ::scobj::lakeshore_218::mkDriver { sct_controller name ip_address tcp_port
 
     MakeSICSObj ${name} SCT_OBJECT
 
-    sicslist setatt ${name} klass environment
+    sicslist setatt ${name} klass NXdetector
     sicslist setatt ${name} long_name ${name}
 
     set scobj_hpath /sics/${name}
@@ -186,10 +186,10 @@ proc ::scobj::lakeshore_218::mkDriver { sct_controller name ip_address tcp_port
     hsetprop ${scobj_hpath} klass "@none"
     hsetprop ${scobj_hpath} type "part"
 
-    if {[string equal -nocase [SplitReply [environment_simulation]] "false"]} {
+    if {[string equal -nocase [SplitReply [detector_simulation]] "false"]} {
       ${sct_controller} poll ${scobj_hpath}/krdg 1
     } else {
-      ::scobj::lakeshore_218::sics_log 9 "[environment_simulation] => No poll/write for lakeshore_218"
+      ::scobj::lakeshore_218::sics_log 9 "[detector_simulation] => No poll/write for lakeshore_218"
     }
 
     hfactory ${scobj_hpath}/sensor plain spy none
@@ -301,7 +301,7 @@ proc ::scobj::lakeshore_218::mkDriver { sct_controller name ip_address tcp_port
     hsetprop ${scobj_hpath}/sensor/ch8 type "part"
     hsetprop ${scobj_hpath}/sensor/ch8 nxalias "${name}_sensor_ch8"
 
-    if {[string equal -nocase [SplitReply [environment_simulation]] "false"]} {
+    if {[string equal -nocase [SplitReply [detector_simulation]] "false"]} {
       ${sct_controller} poll ${scobj_hpath}/sensor/ch1 1
       ${sct_controller} poll ${scobj_hpath}/sensor/ch2 1
       ${sct_controller} poll ${scobj_hpath}/sensor/ch3 1
@@ -311,9 +311,9 @@ proc ::scobj::lakeshore_218::mkDriver { sct_controller name ip_address tcp_port
       ${sct_controller} poll ${scobj_hpath}/sensor/ch7 1
       ${sct_controller} poll ${scobj_hpath}/sensor/ch8 1
     } else {
-      ::scobj::lakeshore_218::sics_log 9 "[environment_simulation] => No poll/write for lakeshore_218"
+      ::scobj::lakeshore_218::sics_log 9 "[detector_simulation] => No poll/write for lakeshore_218"
     }
-    hsetprop ${scobj_hpath} klass environment
+    hsetprop ${scobj_hpath} klass NXdetector
     hsetprop ${scobj_hpath} data true
     hsetprop ${scobj_hpath} debug_threshold 5
 # mkDriver hook code goes here
@@ -331,7 +331,7 @@ namespace eval ::scobj::lakeshore_218 {
 proc add_lakeshore_218 {name ip_address tcp_port} {
   set catch_status [ catch {
     ::scobj::lakeshore_218::sics_log 9 "add_lakeshore_218 ${name} ${ip_address} ${tcp_port}"
-    if {[string equal -nocase [SplitReply [environment_simulation]] "false"]} {
+    if {[string equal -nocase [SplitReply [detector_simulation]] "false"]} {
       if {[string equal -nocase "aqadapter" "${ip_address}"]} {
         ::scobj::lakeshore_218::sics_log 9 "makesctcontroller sct_${name} aqadapter ${tcp_port}"
         makesctcontroller sct_${name} aqadapter ${tcp_port}
@@ -340,7 +340,7 @@ proc add_lakeshore_218 {name ip_address tcp_port} {
         makesctcontroller sct_${name} std ${ip_address}:${tcp_port}
       }
     } else {
-      ::scobj::lakeshore_218::sics_log 9 "[environment_simulation] => No sctcontroller for lakeshore_218"
+      ::scobj::lakeshore_218::sics_log 9 "[detector_simulation] => No sctcontroller for lakeshore_218"
     }
     ::scobj::lakeshore_218::sics_log 1 "::scobj::lakeshore_218::mkDriver sct_${name} ${name} ${ip_address} ${tcp_port}"
     ::scobj::lakeshore_218::mkDriver sct_${name} ${name} ${ip_address} ${tcp_port}
@@ -373,9 +373,9 @@ proc ::scobj::lakeshore_218::read_config {} {
           continue
         }
         if { [string equal -nocase [dict get $v "driver"] "lakeshore_218"] } {
-          if { ![string equal -nocase [SplitReply [environment_simulation]] "false"] } {
+          if { ![string equal -nocase [SplitReply [detector_simulation]] "false"] } {
             set asyncqueue "null"
-            ${ns}::sics_log 9 "[environment_simulation] => using null asyncqueue"
+            ${ns}::sics_log 9 "[detector_simulation] => using null asyncqueue"
           } elseif { [dict exists $v "asyncqueue"] } {
             set asyncqueue [dict get $v "asyncqueue"]
             if { [string equal -nocase ${asyncqueue} "sct"] } {
diff --git a/site_ansto/instrument/config/environment/temperature/sct_srs_sr630.tcl b/site_ansto/instrument/config/environment/temperature/sct_srs_sr630.tcl
index d9d11943..3f31e76d 100644
--- a/site_ansto/instrument/config/environment/temperature/sct_srs_sr630.tcl
+++ b/site_ansto/instrument/config/environment/temperature/sct_srs_sr630.tcl
@@ -198,7 +198,7 @@ proc ::scobj::srs_sr630::mkDriver { sct_controller name ip_address tcp_port } {
 
     MakeSICSObj ${name} SCT_OBJECT
 
-    sicslist setatt ${name} klass environment
+    sicslist setatt ${name} klass NXdetector
     sicslist setatt ${name} long_name ${name}
 
     set scobj_hpath /sics/${name}
@@ -325,7 +325,7 @@ proc ::scobj::srs_sr630::mkDriver { sct_controller name ip_address tcp_port } {
     hsetprop ${scobj_hpath} klass "@none"
     hsetprop ${scobj_hpath} type "part"
 
-    if {[string equal -nocase [SplitReply [environment_simulation]] "false"]} {
+    if {[string equal -nocase [SplitReply [detector_simulation]] "false"]} {
       ${sct_controller} poll ${scobj_hpath}/id 600
       ${sct_controller} poll ${scobj_hpath}/sensor_01 60
       ${sct_controller} poll ${scobj_hpath}/sensor_02 600
@@ -336,9 +336,9 @@ proc ::scobj::srs_sr630::mkDriver { sct_controller name ip_address tcp_port } {
       ${sct_controller} poll ${scobj_hpath}/sensor_07 600
       ${sct_controller} poll ${scobj_hpath}/sensor_08 600
     } else {
-      ::scobj::srs_sr630::sics_log 9 "[environment_simulation] => No poll/write for srs_sr630"
+      ::scobj::srs_sr630::sics_log 9 "[detector_simulation] => No poll/write for srs_sr630"
     }
-    hsetprop ${scobj_hpath} klass environment
+    hsetprop ${scobj_hpath} klass NXdetector
     hsetprop ${scobj_hpath} data true
     hsetprop ${scobj_hpath} debug_threshold 5
 # mkDriver hook code goes here
@@ -356,7 +356,7 @@ namespace eval ::scobj::srs_sr630 {
 proc add_srs_sr630 {name ip_address tcp_port} {
   set catch_status [ catch {
     ::scobj::srs_sr630::sics_log 9 "add_srs_sr630 ${name} ${ip_address} ${tcp_port}"
-    if {[string equal -nocase [SplitReply [environment_simulation]] "false"]} {
+    if {[string equal -nocase [SplitReply [detector_simulation]] "false"]} {
       if {[string equal -nocase "aqadapter" "${ip_address}"]} {
         ::scobj::srs_sr630::sics_log 9 "makesctcontroller sct_${name} aqadapter ${tcp_port}"
         makesctcontroller sct_${name} aqadapter ${tcp_port}
@@ -365,7 +365,7 @@ proc add_srs_sr630 {name ip_address tcp_port} {
         makesctcontroller sct_${name} std ${ip_address}:${tcp_port}
       }
     } else {
-      ::scobj::srs_sr630::sics_log 9 "[environment_simulation] => No sctcontroller for srs_sr630"
+      ::scobj::srs_sr630::sics_log 9 "[detector_simulation] => No sctcontroller for srs_sr630"
     }
     ::scobj::srs_sr630::sics_log 1 "::scobj::srs_sr630::mkDriver sct_${name} ${name} ${ip_address} ${tcp_port}"
     ::scobj::srs_sr630::mkDriver sct_${name} ${name} ${ip_address} ${tcp_port}
@@ -398,9 +398,9 @@ proc ::scobj::srs_sr630::read_config {} {
           continue
         }
         if { [string equal -nocase [dict get $v "driver"] "srs_sr630"] } {
-          if { ![string equal -nocase [SplitReply [environment_simulation]] "false"] } {
+          if { ![string equal -nocase [SplitReply [detector_simulation]] "false"] } {
             set asyncqueue "null"
-            ${ns}::sics_log 9 "[environment_simulation] => using null asyncqueue"
+            ${ns}::sics_log 9 "[detector_simulation] => using null asyncqueue"
           } elseif { [dict exists $v "asyncqueue"] } {
             set asyncqueue [dict get $v "asyncqueue"]
             if { [string equal -nocase ${asyncqueue} "sct"] } {