diff --git a/site_ansto/instrument/reflectometer/config/motors/motor_configuration.tcl b/site_ansto/instrument/reflectometer/config/motors/motor_configuration.tcl
index 555d4bdd..1f93a378 100644
--- a/site_ansto/instrument/reflectometer/config/motors/motor_configuration.tcl
+++ b/site_ansto/instrument/reflectometer/config/motors/motor_configuration.tcl
@@ -1,5 +1,5 @@
-# $Revision: 1.17 $
-# $Date: 2007-07-22 05:23:40 $
+# $Revision: 1.18 $
+# $Date: 2007-08-16 06:38:45 $
 # Author: Ferdi Franceschini (ffr@ansto.gov.au)
 # Last revision by: $Author: ffr $
 
@@ -7,11 +7,6 @@
 
 set animal platypus
 set sim_mode [SplitReply [motor_simulation]]
-if {$sim_mode == "true"} {
-  set motor_driver_type asim
-} else {
-  set motor_driver_type DMC2280
-}
 
 # Setup addresses of Galil DMC2280 controllers.
 set dmc2280_controller1(host) mc1-$animal
@@ -26,10 +21,15 @@ set dmc2280_controller3(port) pmc3-$animal
 set dmc2280_controller4(host) mc4-$animal
 set dmc2280_controller4(port) pmc4-$animal
 
-MakeAsyncQueue mc1 DMC2280 $dmc2280_controller1(host) $dmc2280_controller1(port)
-MakeAsyncQueue mc2 DMC2280 $dmc2280_controller2(host) $dmc2280_controller2(port)
-MakeAsyncQueue mc3 DMC2280 $dmc2280_controller3(host) $dmc2280_controller3(port)
-MakeAsyncQueue mc4 DMC2280 $dmc2280_controller4(host) $dmc2280_controller4(port)
+if {$sim_mode == "true"} {
+  set motor_driver_type asim
+} else {
+  set motor_driver_type DMC2280
+  MakeAsyncQueue mc1 DMC2280 $dmc2280_controller1(host) $dmc2280_controller1(port)
+  MakeAsyncQueue mc2 DMC2280 $dmc2280_controller2(host) $dmc2280_controller2(port)
+  MakeAsyncQueue mc3 DMC2280 $dmc2280_controller3(host) $dmc2280_controller3(port)
+  MakeAsyncQueue mc4 DMC2280 $dmc2280_controller4(host) $dmc2280_controller4(port)
+}
 
 #Measured absolute encoder reading at home position
 
@@ -214,7 +214,7 @@ Motor bz $motor_driver_type [params \
   absEncHome $bz_home\
   cntsPerX [expr -8192.0/6.0]]
 bz part detector
-bz long_name shade
+bz long_name shade_vertical_translation
 bz softlowerlim 0
 bz softupperlim 275
 bz home 0
@@ -465,7 +465,7 @@ Motor dz $motor_driver_type [params \
   absEncHome $dz_home\
   cntsPerX [expr -8192.0/5.0]]
 dz part detector
-dz long_name detector
+dz long_name vertical_translation
 dz softlowerlim 0
 dz softupperlim 1351
 dz home 0
diff --git a/site_ansto/instrument/rsd/config/motors/motor_configuration.tcl b/site_ansto/instrument/rsd/config/motors/motor_configuration.tcl
index c6053d3c..c0f07785 100644
--- a/site_ansto/instrument/rsd/config/motors/motor_configuration.tcl
+++ b/site_ansto/instrument/rsd/config/motors/motor_configuration.tcl
@@ -1,5 +1,5 @@
-# $Revision: 1.11 $
-# $Date: 2007-07-22 05:58:52 $
+# $Revision: 1.12 $
+# $Date: 2007-08-16 06:39:17 $
 # Author: Ferdi Franceschini (ffr@ansto.gov.au)
 # Last revision by: $Author: ffr $
 
@@ -7,11 +7,6 @@
 
 set animal kowari
 set sim_mode [SplitReply [motor_simulation]]
-if {$sim_mode == "true"} {
-  set motor_driver_type asim
-} else {
-  set motor_driver_type DMC2280
-}
 
 # Setup addresses of Galil DMC2280 controllers.
 set dmc2280_controller1(host) mc1-$animal
@@ -26,10 +21,15 @@ set dmc2280_controller3(port) pmc3-$animal
 set dmc2280_controller4(host) mc4-$animal
 set dmc2280_controller4(port) pmc4-$animal
 
-MakeAsyncQueue mc1 DMC2280 $dmc2280_controller1(host) $dmc2280_controller1(port)
-MakeAsyncQueue mc2 DMC2280 $dmc2280_controller2(host) $dmc2280_controller2(port)
-MakeAsyncQueue mc3 DMC2280 $dmc2280_controller3(host) $dmc2280_controller3(port)
-MakeAsyncQueue mc4 DMC2280 $dmc2280_controller4(host) $dmc2280_controller4(port)
+if {$sim_mode == "true"} {
+  set motor_driver_type asim
+} else {
+  set motor_driver_type DMC2280
+  MakeAsyncQueue mc1 DMC2280 $dmc2280_controller1(host) $dmc2280_controller1(port)
+  MakeAsyncQueue mc2 DMC2280 $dmc2280_controller2(host) $dmc2280_controller2(port)
+  MakeAsyncQueue mc3 DMC2280 $dmc2280_controller3(host) $dmc2280_controller3(port)
+  MakeAsyncQueue mc4 DMC2280 $dmc2280_controller4(host) $dmc2280_controller4(port)
+}
 
 #Measured absolute encoder reading at home position
 #  7830128, 7493025, 7431942, 7891548, 28473828, 11307802, 0, 0
@@ -447,7 +447,7 @@ Motor psw $motor_driver_type [params \
   stepsPerX -20125\
   motorHome 2040518]
 psw part aperture.primary
-psw part long_name width
+psw long_name width
 setHomeandRange -motor psw -home 0 -lowrange 0 -uprange 30 
 
 ## Primary Slit, height, 0-30mm
@@ -541,6 +541,9 @@ publish mthGet user
 MakeConfigurableMotor mth
 mth readscript mthGet
 mth drivescript mthSet
+sicslist setatt mth klass crystal
+sicslist setatt mth units degrees
+sicslist setatt mth long_name half_takeoff_angle
 
 proc sthGet {} { return [expr [SplitReply [stth]]/2.0]}
 proc sthSet {val} { return "stth=[SplitReply [stth]]"}
@@ -549,6 +552,9 @@ publish sthSet user
 MakeConfigurableMotor sth
 sth readscript sthGet
 sth drivescript sthSet
+sicslist setatt sth klass sample
+sicslist setatt sth units degrees
+sicslist setatt sth long_name half_azimuthal_angle
 
 #--------------------------------------------------------
 
diff --git a/site_ansto/instrument/sans/config/motors/motor_configuration.tcl b/site_ansto/instrument/sans/config/motors/motor_configuration.tcl
index 2f5ed5ea..6134af7c 100644
--- a/site_ansto/instrument/sans/config/motors/motor_configuration.tcl
+++ b/site_ansto/instrument/sans/config/motors/motor_configuration.tcl
@@ -1,17 +1,12 @@
-# $Revision: 1.4 $
-# $Date: 2007-08-10 00:34:32 $
+# $Revision: 1.5 $
+# $Date: 2007-08-16 06:40:00 $
 # Author: Ferdi Franceschini (ffr@ansto.gov.au)
-# Last revision by: $Author: dcl $
+# Last revision by: $Author: ffr $
 
 # START MOTOR CONFIGURATION
 
 set animal quokka
 set sim_mode [SplitReply [motor_simulation]]
-if {$sim_mode == "true"} {
-  set motor_driver_type asim
-} else {
-  set motor_driver_type DMC2280
-}
 
 # Setup addresses of Galil DMC2280 controllers.
 set dmc2280_controller1(host) mc1-$animal
@@ -26,10 +21,15 @@ set dmc2280_controller3(port) pmc3-$animal
 set dmc2280_controller4(host) mc4-$animal
 set dmc2280_controller4(port) pmc4-$animal
 
-MakeAsyncQueue mc1 DMC2280 $dmc2280_controller1(host) $dmc2280_controller1(port)
-MakeAsyncQueue mc2 DMC2280 $dmc2280_controller2(host) $dmc2280_controller2(port)
-MakeAsyncQueue mc3 DMC2280 $dmc2280_controller3(host) $dmc2280_controller3(port)
-MakeAsyncQueue mc4 DMC2280 $dmc2280_controller4(host) $dmc2280_controller4(port)
+if {$sim_mode == "true"} {
+  set motor_driver_type asim
+} else {
+  set motor_driver_type DMC2280
+  MakeAsyncQueue mc1 DMC2280 $dmc2280_controller1(host) $dmc2280_controller1(port)
+  MakeAsyncQueue mc2 DMC2280 $dmc2280_controller2(host) $dmc2280_controller2(port)
+  MakeAsyncQueue mc3 DMC2280 $dmc2280_controller3(host) $dmc2280_controller3(port)
+  MakeAsyncQueue mc4 DMC2280 $dmc2280_controller4(host) $dmc2280_controller4(port)
+}
 
 #Measured absolute encoder reading at home position