diff --git a/site_ansto/instrument/tas/config/counter/counter.tcl b/site_ansto/instrument/tas/config/counter/counter.tcl
index 78736638..f0a9886f 100644
--- a/site_ansto/instrument/tas/config/counter/counter.tcl
+++ b/site_ansto/instrument/tas/config/counter/counter.tcl
@@ -17,7 +17,7 @@ proc ::counter::isc_initialize {} {
     variable isc_portlist
     variable isc_beam_monitor_list {MONITOR_1 MONITOR_2}
 
-    set isc_monitor_address "das2-[SplitReply [instrument]]"
+    set isc_monitor_address [hostnam "das2-[SplitReply [instrument]]"]
     set isc_portlist [list 33000 33001 33002 33003 33004 33005 33006 33007]
     set isc_numchannels [llength $isc_beam_monitor_list]
     ::counter::ic_initialize
diff --git a/site_ansto/instrument/tas/config/motors/motor_configuration.tcl b/site_ansto/instrument/tas/config/motors/motor_configuration.tcl
index b831ca87..0e2f7c24 100644
--- a/site_ansto/instrument/tas/config/motors/motor_configuration.tcl
+++ b/site_ansto/instrument/tas/config/motors/motor_configuration.tcl
@@ -11,20 +11,20 @@ set animal taipan
 set sim_mode [SplitReply [motor_simulation]]
 
 # Setup addresses of Galil DMC2280 controllers.
-set dmc2280_controller1(host) mc1-$animal
-set dmc2280_controller1(port) pmc1-$animal
+set dmc2280_controller1(host) [hostnam mc1-$animal]
+set dmc2280_controller1(port) [portnum pmc1-$animal]
 
-set dmc2280_controller2(host) mc2-$animal
-set dmc2280_controller2(port) pmc2-$animal
+set dmc2280_controller2(host) [hostnam mc2-$animal]
+set dmc2280_controller2(port) [portnum pmc2-$animal]
 
-set dmc2280_controller3(host) mc3-$animal
-set dmc2280_controller3(port) pmc3-$animal
+set dmc2280_controller3(host) [hostnam mc3-$animal]
+set dmc2280_controller3(port) [portnum pmc3-$animal]
 
-set dmc2280_controller4(host) mc4-$animal
-set dmc2280_controller4(port) pmc4-$animal
+set dmc2280_controller4(host) [hostnam mc4-$animal]
+set dmc2280_controller4(port) [portnum pmc4-$animal]
 
-set dmc2280_controller6(host) mc6-$animal
-set dmc2280_controller6(port) pmc6-$animal
+set dmc2280_controller6(host) [hostnam mc6-$animal]
+set dmc2280_controller6(port) [portnum pmc6-$animal]
 
 if {$sim_mode == "true"} {
   set motor_driver_type asim