diff --git a/tangostationcontrol/tangostationcontrol/devices/apsct.py b/tangostationcontrol/tangostationcontrol/devices/apsct.py
index 78a0626d8a12985d944c752e544aff93209373be..b32c5d0c8b1637a99f7e429c44083246491fe332 100644
--- a/tangostationcontrol/tangostationcontrol/devices/apsct.py
+++ b/tangostationcontrol/tangostationcontrol/devices/apsct.py
@@ -103,32 +103,22 @@ class APSCT(opcua_device):
     @command()
     @DebugIt()
     @only_when_on()
-    def CLK_off(self):
+    def APSCT_off(self):
         """
 
         :return:None
         """
-        self.opcua_connection.call_method(["CLK_off"])
+        self.opcua_connection.call_method(["APSCT_off"])
 
     @command()
     @DebugIt()
     @only_when_on()
-    def CLK_on(self):
+    def APSCT_on(self):
         """
 
         :return:None
         """
-        self.opcua_connection.call_method(["CLK_on"])
-
-    @command()
-    @DebugIt()
-    @only_when_on()
-    def CLK_PLL_setup(self):
-        """
-
-        :return:None
-        """
-        self.opcua_connection.call_method(["CLK_PLL_setup"])
+        self.opcua_connection.call_method(["APSCT_on"])
 
 # ----------
 # Run server
diff --git a/tangostationcontrol/tangostationcontrol/devices/recv.py b/tangostationcontrol/tangostationcontrol/devices/recv.py
index a9eee4160f9b7a6f981119c58ad2e707df0cf717..f53bb804404a8c77bbf419d1eec2c857f9bca2e6 100644
--- a/tangostationcontrol/tangostationcontrol/devices/recv.py
+++ b/tangostationcontrol/tangostationcontrol/devices/recv.py
@@ -131,22 +131,22 @@ class RECV(opcua_device):
     @command()
     @DebugIt()
     @only_when_on()
-    def ADC_on(self):
+    def RCU_DTH_off(self):
         """
 
         :return:None
         """
-        self.opcua_connection.call_method(["ADC_on"])
+        self.opcua_connection.call_method(["RCU_DTH_off"])
 
     @command()
     @DebugIt()
     @only_when_on()
-    def RCU_update(self):
+    def RCU_DTH_on(self):
         """
 
         :return:None
         """
-        self.opcua_connection.call_method(["RCU_update"])
+        self.opcua_connection.call_method(["RCU_DTH_on"])
 
     def _initialise_hardware(self):
         """ Initialise the RCU hardware. """
diff --git a/tangostationcontrol/tangostationcontrol/devices/unb2.py b/tangostationcontrol/tangostationcontrol/devices/unb2.py
index 0076a37a25c0838f8324a409f08223fab79b92f1..bf06f4c6ad586eb4b9d6775c8f0fd1643cb20045 100644
--- a/tangostationcontrol/tangostationcontrol/devices/unb2.py
+++ b/tangostationcontrol/tangostationcontrol/devices/unb2.py
@@ -121,6 +121,26 @@ class UNB2(opcua_device):
     # Commands
     # --------
 
+    @command()
+    @DebugIt()
+    @only_when_on()
+    def UNB2_off(self):
+        """
+
+        :return:None
+        """
+        self.opcua_connection.call_method(["UNB2_off"])
+
+    @command()
+    @DebugIt()
+    @only_when_on()
+    def UNB2_on(self):
+        """
+
+        :return:None
+        """
+        self.opcua_connection.call_method(["UNB2_on"])
+
 # ----------
 # Run server
 # ----------