diff --git a/tangostationcontrol/tangostationcontrol/devices/recv.py b/tangostationcontrol/tangostationcontrol/devices/recv.py
index aeaa506c3d0cca422426db7316dd095bc34e7de6..c17e9803d4c11c87239946706b4d936cb62bb773 100644
--- a/tangostationcontrol/tangostationcontrol/devices/recv.py
+++ b/tangostationcontrol/tangostationcontrol/devices/recv.py
@@ -69,7 +69,7 @@ class RECV(opcua_device):
         default_value=[0] * 96
     )
 
-    RCU_PWR_ANT_on_RW = device_property(
+    RCU_PWR_ANT_on_RW_default = device_property(
         dtype='DevVarBooleanArray',
         mandatory=False,
         default_value=[False] * 96 # turn power off by default in test setups, f.e. to prevent blowing up the noise sources
diff --git a/tangostationcontrol/tangostationcontrol/devices/sdp/sdp.py b/tangostationcontrol/tangostationcontrol/devices/sdp/sdp.py
index d35701ee4821919631a3c4b791c631ca142ae4f0..a87c6b6e00b06ccfe4275055db5772b036dd8995 100644
--- a/tangostationcontrol/tangostationcontrol/devices/sdp/sdp.py
+++ b/tangostationcontrol/tangostationcontrol/devices/sdp/sdp.py
@@ -59,20 +59,20 @@ class SDP(opcua_device):
 
     # If we enable the waveform generator, we want some sane defaults.
 
-    FPGA_wg_amplitude_RW = device_property(
+    FPGA_wg_amplitude_RW_default = device_property(
         dtype='DevVarDoubleArray',
         mandatory=False,
         default_value=[[0.1] * 12] * 16
     )
 
-    FPGA_wg_frequency_RW = device_property(
+    FPGA_wg_frequency_RW_default = device_property(
         dtype='DevVarDoubleArray',
         mandatory=False,
         # Emit a signal on subband 102
         default_value=[[102 * 200e6/1024] * 12] * 16
     )
 
-    FPGA_wg_phase_RW = device_property(
+    FPGA_wg_phase_RW_default = device_property(
         dtype='DevVarDoubleArray',
         mandatory=False,
         default_value=[[0.0] * 12] * 16
diff --git a/tangostationcontrol/tangostationcontrol/devices/unb2.py b/tangostationcontrol/tangostationcontrol/devices/unb2.py
index ba0c1364efe3af800ca0a3cf3ae7be313d1a38ac..b64b86b0e344d0b6642fb6364ff31ae983fbece9 100644
--- a/tangostationcontrol/tangostationcontrol/devices/unb2.py
+++ b/tangostationcontrol/tangostationcontrol/devices/unb2.py
@@ -63,12 +63,6 @@ class UNB2(opcua_device):
     N_DDR = 2
     N_QSFP = 6
 
-    UNB2_mask_RW_default = device_property(
-        dtype='DevVarBooleanArray',
-        mandatory=False,
-        default_value=[True] * 2
-    )
-
     TRANSLATOR_DEFAULT_SETTINGS = [
         'UNB2_mask_RW',
         'UNB2TR_monitor_rate_RW'