diff --git a/.gitlab/tests/cram/arcadyan-mozart/100-prplmesh.t b/.gitlab/tests/cram/arcadyan-mozart/100-prplmesh.t
index 63d61d64ba..7874d973b4 100644
--- a/.gitlab/tests/cram/arcadyan-mozart/100-prplmesh.t
+++ b/.gitlab/tests/cram/arcadyan-mozart/100-prplmesh.t
@@ -53,7 +53,7 @@ Restart prplmesh:
   $ R logger -t cram "Restart prplmesh"
   $ R "( /etc/init.d/prplmesh gateway_mode ; sleep 2 ) > /tmp/prplmesh-gw-mode.log 2>&1 ; logger -t prplmesh-gateway-mode < /tmp/prplmesh-gw-mode.log"
 
-  $ R "ubus -t 60 wait_for Device.WiFi"
+  $ R "ubus -t 60 wait_for X_PRPLWARE-COM_WiFiController.Network.Device.1"
 
 Start wireless:
 
diff --git a/.gitlab/tests/cram/mxl25641-hdk-6/110-prplmesh-dataelements.t b/.gitlab/tests/cram/mxl25641-hdk-6/110-prplmesh-dataelements.t
index 16987525b2..090015f6bf 100644
--- a/.gitlab/tests/cram/mxl25641-hdk-6/110-prplmesh-dataelements.t
+++ b/.gitlab/tests/cram/mxl25641-hdk-6/110-prplmesh-dataelements.t
@@ -34,7 +34,7 @@ Restart prplmesh:
 
   $ R "( /etc/init.d/prplmesh gateway_mode ; sleep 2 ) > /tmp/prplmesh-gw-mode.log 2>&1 ; logger -t prplmesh-gateway-mode < /tmp/prplmesh-gw-mode.log"
 
-  $ R "ubus -t 60 wait_for Device.WiFi"
+  $ R "ubus -t 60 wait_for X_PRPLWARE-COM_WiFiController.Network.Device.1"
 
 First call of AccessPointCommit, controller should push empty config to agents:
 
diff --git a/.gitlab/tests/cram/prpl-haze/100-prplmesh.t b/.gitlab/tests/cram/prpl-haze/100-prplmesh.t
index f56f443001..708be79899 100644
--- a/.gitlab/tests/cram/prpl-haze/100-prplmesh.t
+++ b/.gitlab/tests/cram/prpl-haze/100-prplmesh.t
@@ -53,7 +53,7 @@ Restart prplmesh:
   $ R logger -t cram "Restart prplmesh"
   $ R "( /etc/init.d/prplmesh gateway_mode ; sleep 2 ) > /tmp/prplmesh-gw-mode.log 2>&1 ; logger -t prplmesh-gateway-mode < /tmp/prplmesh-gw-mode.log"
 
-  $ R "ubus -t 60 wait_for Device.WiFi"
+  $ R "ubus -t 60 wait_for X_PRPLWARE-COM_WiFiController.Network.Device.1"
 
 Start wireless:
 
diff --git a/.gitlab/tests/cram/turris-omnia/100-prplmesh.t b/.gitlab/tests/cram/turris-omnia/100-prplmesh.t
index efd12480ae..cf6ee32397 100644
--- a/.gitlab/tests/cram/turris-omnia/100-prplmesh.t
+++ b/.gitlab/tests/cram/turris-omnia/100-prplmesh.t
@@ -29,7 +29,7 @@ Restart prplmesh:
   $ R logger -t cram "Restart prplmesh"
   $ R "( /etc/init.d/prplmesh gateway_mode ; sleep 2 ) > /tmp/prplmesh-gw-mode.log 2>&1 ; logger -t prplmesh-gateway-mode < /tmp/prplmesh-gw-mode.log"
 
-  $ R "ubus -t 60 wait_for Device.WiFi"
+  $ R "ubus -t 60 wait_for X_PRPLWARE-COM_WiFiController.Network.Device.1"
 
 
 Start wireless:
diff --git a/.gitlab/tests/cram/urx851-b0-dk/110-prplmesh-dataelements.t b/.gitlab/tests/cram/urx851-b0-dk/110-prplmesh-dataelements.t
index dd5feb283d..f6967fd622 100644
--- a/.gitlab/tests/cram/urx851-b0-dk/110-prplmesh-dataelements.t
+++ b/.gitlab/tests/cram/urx851-b0-dk/110-prplmesh-dataelements.t
@@ -34,7 +34,7 @@ Restart prplmesh:
 
   $ R "( /etc/init.d/prplmesh gateway_mode ; sleep 2 ) > /tmp/prplmesh-gw-mode.log 2>&1 ; logger -t prplmesh-gateway-mode < /tmp/prplmesh-gw-mode.log"
 
-  $ R "ubus -t 60 wait_for Device.WiFi"
+  $ R "ubus -t 60 wait_for X_PRPLWARE-COM_WiFiController.Network.Device.1"
 
 First call of AccessPointCommit, controller should push empty config to agents:
 
diff --git a/.gitlab/tests/cram/wifi/wifi-scheduler.t b/.gitlab/tests/cram/wifi/wifi-scheduler.t
index 485445befe..f932c2f8c8 100644
--- a/.gitlab/tests/cram/wifi/wifi-scheduler.t
+++ b/.gitlab/tests/cram/wifi/wifi-scheduler.t
@@ -62,6 +62,8 @@ Configure controller:
   $ R "sed -i 's/use_dataelements_vap_configs=0/use_dataelements_vap_configs=1/g' /opt/prplmesh/config/beerocks_controller.conf"
   $ R "( /etc/init.d/prplmesh gateway_mode ; sleep 2 ) > /tmp/prplmesh-gw-mode.log 2>&1 ; logger -t prplmesh-gateway-mode < /tmp/prplmesh-gw-mode.log"
 
+  $ R "ubus -t 60 wait_for X_PRPLWARE-COM_WiFiController.Network.Device.1"
+
 Create prplMesh acces point and enable it:
 
   $ R logger -t cram "first call of AccessPointCommit pushes empty config, global teardown"
diff --git a/.gitlab/tests/cram/wnc-freedom/110-prplmesh-dataelements.t b/.gitlab/tests/cram/wnc-freedom/110-prplmesh-dataelements.t
index 52029d2794..b63935c1eb 100644
--- a/.gitlab/tests/cram/wnc-freedom/110-prplmesh-dataelements.t
+++ b/.gitlab/tests/cram/wnc-freedom/110-prplmesh-dataelements.t
@@ -34,7 +34,7 @@ Restart prplmesh:
 
   $ R "( /etc/init.d/prplmesh gateway_mode ; sleep 2 ) > /tmp/prplmesh-gw-mode.log 2>&1 ; logger -t prplmesh-gateway-mode < /tmp/prplmesh-gw-mode.log"
 
-  $ R "ubus -t 60 wait_for Device.WiFi"
+  $ R "ubus -t 60 wait_for X_PRPLWARE-COM_WiFiController.Network.Device.1"
 
 First call of AccessPointCommit, controller should push empty config to agents: