diff --git a/sysmocom/suites/debug/interactive.py b/sysmocom/suites/debug/interactive.py
index fa53cc8..3b6a338 100755
--- a/sysmocom/suites/debug/interactive.py
+++ b/sysmocom/suites/debug/interactive.py
@@ -54,7 +54,7 @@
   elif 'wait-registered'.startswith(cmd):
     try:
       for m in modems:
-          wait(m.is_connected, msc.mcc_mnc())
+          wait(m.is_registered, msc.mcc_mnc())
       wait(msc.subscriber_attached, *modems)
     except Timeout:
       print('Timeout while waiting for registration.')
diff --git a/sysmocom/suites/dynts/switch_tch_pdch.py b/sysmocom/suites/dynts/switch_tch_pdch.py
index 7be4be7..26c108e 100755
--- a/sysmocom/suites/dynts/switch_tch_pdch.py
+++ b/sysmocom/suites/dynts/switch_tch_pdch.py
@@ -76,8 +76,8 @@
 ms_mt.log_info()
 
 print('waiting for modems to attach...')
-wait(ms_mo.is_connected, msc.mcc_mnc())
-wait(ms_mt.is_connected, msc.mcc_mnc())
+wait(ms_mo.is_registered, msc.mcc_mnc())
+wait(ms_mt.is_registered, msc.mcc_mnc())
 wait(msc.subscriber_attached, ms_mo)
 wait(msc.subscriber_attached, ms_mt)
 
diff --git a/sysmocom/suites/encryption/lib/testlib.py b/sysmocom/suites/encryption/lib/testlib.py
index ed76e6f..87581c6 100644
--- a/sysmocom/suites/encryption/lib/testlib.py
+++ b/sysmocom/suites/encryption/lib/testlib.py
@@ -39,7 +39,7 @@
         sleep(40) # TODO: read pcap or CTRL interface and look for Rejected? (gsm_a.dtap.msg_mm_type == 0x04)
         print('Asserting modem did not register')
         # FIXME: this can fail because ofono qmi signals registered before being accepted by network. See OS#2458
-        # assert not ms.is_connected(msc.mcc_mnc())
+        # assert not ms.is_registered(msc.mcc_mnc())
         assert not msc.subscriber_attached(ms)
 
         hlr.subscriber_delete(ms)
@@ -50,5 +50,5 @@
     else:
         print('Attempt connection with wrong KI, should work as it is not used...')
     ms.connect(msc.mcc_mnc())
-    wait(ms.is_connected, msc.mcc_mnc())
+    wait(ms.is_registered, msc.mcc_mnc())
     wait(msc.subscriber_attached, ms)
diff --git a/sysmocom/suites/gprs/lib/testlib.py b/sysmocom/suites/gprs/lib/testlib.py
index 1421229..510dc72 100644
--- a/sysmocom/suites/gprs/lib/testlib.py
+++ b/sysmocom/suites/gprs/lib/testlib.py
@@ -85,7 +85,7 @@
 
     print('waiting for modems to attach...')
     for ms in ms_li:
-        wait(ms.is_connected, msc.mcc_mnc())
+        wait(ms.is_registered, msc.mcc_mnc())
     wait(msc.subscriber_attached, *ms_li)
 
     print('waiting for modems to attach to data services...')
diff --git a/sysmocom/suites/gprs/ping.py b/sysmocom/suites/gprs/ping.py
index 9a7acde..421aa26 100755
--- a/sysmocom/suites/gprs/ping.py
+++ b/sysmocom/suites/gprs/ping.py
@@ -40,7 +40,7 @@
 ms.log_info()
 
 print('waiting for modems to attach...')
-wait(ms.is_connected, msc.mcc_mnc())
+wait(ms.is_registered, msc.mcc_mnc())
 wait(msc.subscriber_attached, ms)
 
 print('waiting for modems to attach to data services...')
diff --git a/sysmocom/suites/gprs/ping_idle_ping.py b/sysmocom/suites/gprs/ping_idle_ping.py
index 88ecbdb..099650c 100755
--- a/sysmocom/suites/gprs/ping_idle_ping.py
+++ b/sysmocom/suites/gprs/ping_idle_ping.py
@@ -45,7 +45,7 @@
 ms.log_info()
 
 print('waiting for modems to attach...')
-wait(ms.is_connected, msc.mcc_mnc())
+wait(ms.is_registered, msc.mcc_mnc())
 wait(msc.subscriber_attached, ms)
 
 print('waiting for modems to attach to data services...')
diff --git a/sysmocom/suites/nitb_debug/interactive.py b/sysmocom/suites/nitb_debug/interactive.py
index bd68a57..21f4175 100755
--- a/sysmocom/suites/nitb_debug/interactive.py
+++ b/sysmocom/suites/nitb_debug/interactive.py
@@ -31,7 +31,7 @@
   elif 'wait-registered'.startswith(cmd):
     try:
       for m in modems:
-         wait(m.is_connected, nitb.mcc_mnc())
+         wait(m.is_registered, nitb.mcc_mnc())
       wait(nitb.subscriber_attached, *modems)
     except Timeout:
       print('Timeout while waiting for registration.')
diff --git a/sysmocom/suites/nitb_netreg/register.py b/sysmocom/suites/nitb_netreg/register.py
index fd171b3..4977f66 100755
--- a/sysmocom/suites/nitb_netreg/register.py
+++ b/sysmocom/suites/nitb_netreg/register.py
@@ -18,5 +18,5 @@
 
 print(ms.info())
 
-wait(ms.is_connected, nitb.mcc_mnc())
+wait(ms.is_registered, nitb.mcc_mnc())
 wait(nitb.subscriber_attached, ms)
diff --git a/sysmocom/suites/nitb_netreg/register_default.py b/sysmocom/suites/nitb_netreg/register_default.py
index 6531049..67299fe 100755
--- a/sysmocom/suites/nitb_netreg/register_default.py
+++ b/sysmocom/suites/nitb_netreg/register_default.py
@@ -18,5 +18,5 @@
 
 print(ms.info())
 
-wait(ms.is_connected)
+wait(ms.is_registered)
 wait(nitb.subscriber_attached, ms)
diff --git a/sysmocom/suites/nitb_smpp/esme_ms_sms_storeforward.py b/sysmocom/suites/nitb_smpp/esme_ms_sms_storeforward.py
index 29a5ced..f9617e2 100755
--- a/sysmocom/suites/nitb_smpp/esme_ms_sms_storeforward.py
+++ b/sysmocom/suites/nitb_smpp/esme_ms_sms_storeforward.py
@@ -38,7 +38,7 @@
 
 print('MS registers and will receive the SMS...')
 ms.connect(nitb.mcc_mnc())
-wait(ms.is_connected, nitb.mcc_mnc())
+wait(ms.is_registered, nitb.mcc_mnc())
 wait(nitb.subscriber_attached, ms)
 wait(ms.sms_was_received, msg)
 print('Waiting to receive and consume sms receipt with reference', umref)
diff --git a/sysmocom/suites/nitb_smpp/esme_ms_sms_transaction.py b/sysmocom/suites/nitb_smpp/esme_ms_sms_transaction.py
index 2963b6e..ade8054 100755
--- a/sysmocom/suites/nitb_smpp/esme_ms_sms_transaction.py
+++ b/sysmocom/suites/nitb_smpp/esme_ms_sms_transaction.py
@@ -28,7 +28,7 @@
 
 ms.log_info()
 print('waiting for modem to attach...')
-wait(ms.is_connected, nitb.mcc_mnc())
+wait(ms.is_registered, nitb.mcc_mnc())
 wait(nitb.subscriber_attached, ms)
 
 print('sending first sms...')
diff --git a/sysmocom/suites/nitb_sms/mo_mt_sms.py b/sysmocom/suites/nitb_sms/mo_mt_sms.py
index d1cece6..0f2ebfc 100755
--- a/sysmocom/suites/nitb_sms/mo_mt_sms.py
+++ b/sysmocom/suites/nitb_sms/mo_mt_sms.py
@@ -22,8 +22,8 @@
 ms_mt.log_info()
 
 print('waiting for modems to attach...')
-wait(ms_mo.is_connected, nitb.mcc_mnc())
-wait(ms_mt.is_connected, nitb.mcc_mnc())
+wait(ms_mo.is_registered, nitb.mcc_mnc())
+wait(ms_mt.is_registered, nitb.mcc_mnc())
 wait(nitb.subscriber_attached, ms_mo, ms_mt)
 
 sms = ms_mo.sms_send(ms_mt)
diff --git a/sysmocom/suites/nitb_ussd/assert_extension.py b/sysmocom/suites/nitb_ussd/assert_extension.py
index 6246e61..e547131 100755
--- a/sysmocom/suites/nitb_ussd/assert_extension.py
+++ b/sysmocom/suites/nitb_ussd/assert_extension.py
@@ -19,7 +19,7 @@
 ms.log_info()
 
 print('waiting for modems to attach...')
-wait(ms.is_connected, nitb.mcc_mnc())
+wait(ms.is_registered, nitb.mcc_mnc())
 wait(nitb.subscriber_attached, ms)
 
 # ofono (qmi) currently changes state to 'registered' jut after sending
diff --git a/sysmocom/suites/smpp/esme_ms_sms_storeforward.py b/sysmocom/suites/smpp/esme_ms_sms_storeforward.py
index 232d1d3..6ec414b 100755
--- a/sysmocom/suites/smpp/esme_ms_sms_storeforward.py
+++ b/sysmocom/suites/smpp/esme_ms_sms_storeforward.py
@@ -50,7 +50,7 @@
 
 print('MS registers and will receive the SMS...')
 ms.connect(msc.mcc_mnc())
-wait(ms.is_connected, msc.mcc_mnc())
+wait(ms.is_registered, msc.mcc_mnc())
 wait(msc.subscriber_attached, ms)
 wait(ms.sms_was_received, msg)
 print('Waiting to receive and consume sms receipt with reference', umref)
diff --git a/sysmocom/suites/smpp/esme_ms_sms_transaction.py b/sysmocom/suites/smpp/esme_ms_sms_transaction.py
index d42012b..5a5a470 100755
--- a/sysmocom/suites/smpp/esme_ms_sms_transaction.py
+++ b/sysmocom/suites/smpp/esme_ms_sms_transaction.py
@@ -38,7 +38,7 @@
 
 ms.log_info()
 print('waiting for modem to attach...')
-wait(ms.is_connected, msc.mcc_mnc())
+wait(ms.is_registered, msc.mcc_mnc())
 wait(msc.subscriber_attached, ms)
 
 print('sending first sms...')
diff --git a/sysmocom/suites/sms/mo_mt_sms.py b/sysmocom/suites/sms/mo_mt_sms.py
index 51e78c0..d7606e4 100755
--- a/sysmocom/suites/sms/mo_mt_sms.py
+++ b/sysmocom/suites/sms/mo_mt_sms.py
@@ -33,8 +33,8 @@
 ms_mt.log_info()
 
 print('waiting for modems to attach...')
-wait(ms_mo.is_connected, msc.mcc_mnc())
-wait(ms_mt.is_connected, msc.mcc_mnc())
+wait(ms_mo.is_registered, msc.mcc_mnc())
+wait(ms_mt.is_registered, msc.mcc_mnc())
 wait(msc.subscriber_attached, ms_mo, ms_mt)
 
 sms = ms_mo.sms_send(ms_mt)
diff --git a/sysmocom/suites/ussd/assert_extension.py b/sysmocom/suites/ussd/assert_extension.py
index bac311f..87f2ee5 100755
--- a/sysmocom/suites/ussd/assert_extension.py
+++ b/sysmocom/suites/ussd/assert_extension.py
@@ -31,7 +31,7 @@
 ms.log_info()
 
 print('waiting for modems to attach...')
-wait(ms.is_connected, msc.mcc_mnc())
+wait(ms.is_registered, msc.mcc_mnc())
 wait(msc.subscriber_attached, ms)
 
 # ofono (qmi) currently changes state to 'registered' jut after sending
diff --git a/sysmocom/suites/voice/lib/testlib.py b/sysmocom/suites/voice/lib/testlib.py
index 3ec6d67..83a6de4 100644
--- a/sysmocom/suites/voice/lib/testlib.py
+++ b/sysmocom/suites/voice/lib/testlib.py
@@ -45,8 +45,8 @@
     ms_mt.log_info()
 
     print('waiting for modems to attach...')
-    wait(ms_mo.is_connected, msc.mcc_mnc())
-    wait(ms_mt.is_connected, msc.mcc_mnc())
+    wait(ms_mo.is_registered, msc.mcc_mnc())
+    wait(ms_mt.is_registered, msc.mcc_mnc())
     wait(msc.subscriber_attached, ms_mo, ms_mt)
 
     assert len(ms_mo.call_id_list()) == 0 and len(ms_mt.call_id_list()) == 0