use osmo_rat_type from libosmocore

Replace locally defined enum ran_type with libosmocore's new enum
osmo_rat_type, and value_string ran_type_names with osmo_rat_type_names.

The string representations change, which has cosmetic effects on the test suite
expectations.

Change-Id: I2c78c265dc99df581e1b00e563d6912c7ffdb36b

24 files changed, 792 insertions, 792 deletions

diff --git a/tests/msc_vlr/msc_vlr_test_authen_reuse.c b/tests/msc_vlr/msc_vlr_test_authen_reuse.c
index 659155795..bdbdae3a0 100644
--- a/tests/msc_vlr/msc_vlr_test_authen_reuse.c
+++ b/tests/msc_vlr/msc_vlr_test_authen_reuse.c
@@ -25,7 +25,7 @@
 
 #include "msc_vlr_tests.h"
 
-static void _test_auth_reuse(enum ran_type via_ran,
+static void _test_auth_reuse(enum osmo_rat_type via_ran,
 			     int set_max_reuse_count,
 			     int loop_requests_without_hlr,
 			     bool final_request_with_hlr)
@@ -83,7 +83,7 @@ static void _test_auth_reuse(enum ran_type via_ran,
 	VERBOSE_ASSERT(auth_request_sent, == true, "%d");
 	VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");
 
-	if (via_ran == RAN_GERAN_A) {
+	if (via_ran == OSMO_RAT_GERAN_A) {
 		btw("MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR");
 		gsup_expect_tx("04010809710000000156f0280102");
 		ms_sends_msg("0554" "e229c19e" "2104" "791f2e41");
@@ -159,7 +159,7 @@ static void _test_auth_reuse(enum ran_type via_ran,
 		VERBOSE_ASSERT(cm_service_result_sent, == RES_NONE, "%d");
 		VERBOSE_ASSERT(auth_request_sent, == true, "%d");
 
-		if (via_ran == RAN_GERAN_A) {
+		if (via_ran == OSMO_RAT_GERAN_A) {
 			btw("MS sends Authen Response, VLR accepts with a CM Service Accept");
 			gsup_expect_tx(NULL);
 			ms_sends_msg("0554" "e229c19e" "2104" "791f2e41");
@@ -231,7 +231,7 @@ static void _test_auth_reuse(enum ran_type via_ran,
 		VERBOSE_ASSERT(auth_request_sent, == true, "%d");
 		VERBOSE_ASSERT(cm_service_result_sent, == RES_NONE, "%d");
 
-		if (via_ran == RAN_GERAN_A) {
+		if (via_ran == OSMO_RAT_GERAN_A) {
 			btw("MS sends Authen Response, VLR accepts with a CM Service Accept");
 			gsup_expect_tx(NULL);
 			ms_sends_msg("0554" "7db47cf7" "2104" "f81e4dc7"); /* 2nd vector's res, s.a. */
@@ -272,42 +272,42 @@ static void _test_auth_reuse(enum ran_type via_ran,
 static void test_auth_use_twice_geran()
 {
 	comment_start();
-	_test_auth_reuse(RAN_GERAN_A, 1, 1, true);
+	_test_auth_reuse(OSMO_RAT_GERAN_A, 1, 1, true);
 	comment_end();
 }
 
 static void test_auth_use_twice_utran()
 {
 	comment_start();
-	_test_auth_reuse(RAN_UTRAN_IU, 1, 1, true);
+	_test_auth_reuse(OSMO_RAT_UTRAN_IU, 1, 1, true);
 	comment_end();
 }
 
 static void test_auth_use_infinitely_geran()
 {
 	comment_start();
-	_test_auth_reuse(RAN_GERAN_A, -1, 3, false);
+	_test_auth_reuse(OSMO_RAT_GERAN_A, -1, 3, false);
 	comment_end();
 }
 
 static void test_auth_use_infinitely_utran()
 {
 	comment_start();
-	_test_auth_reuse(RAN_UTRAN_IU, -1, 3, false);
+	_test_auth_reuse(OSMO_RAT_UTRAN_IU, -1, 3, false);
 	comment_end();
 }
 
 static void test_no_auth_reuse_geran()
 {
 	comment_start();
-	_test_auth_reuse(RAN_GERAN_A, 0, 0, true);
+	_test_auth_reuse(OSMO_RAT_GERAN_A, 0, 0, true);
 	comment_end();
 }
 
 static void test_no_auth_reuse_utran()
 {
 	comment_start();
-	_test_auth_reuse(RAN_UTRAN_IU, 0, 0, true);
+	_test_auth_reuse(OSMO_RAT_UTRAN_IU, 0, 0, true);
 	comment_end();
 }
 
diff --git a/tests/msc_vlr/msc_vlr_test_authen_reuse.err b/tests/msc_vlr/msc_vlr_test_authen_reuse.err
index feb81cd16..e72157941 100644
--- a/tests/msc_vlr/msc_vlr_test_authen_reuse.err
+++ b/tests/msc_vlr/msc_vlr_test_authen_reuse.err
@@ -3,7 +3,7 @@ talloc_total_blocks(tall_bsc_ctx) == 13
 
 ===== test_auth_use_twice_geran
 - Location Update request causes a GSUP Send Auth Info request to HLR
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -52,7 +52,7 @@ DREF VLR subscr IMSI-901700000010650 usage decreases to: 1
   auth_request_sent == 1
   lu_result_sent == 0
 - MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_AUTH_RESP
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_AUTH_RESP
 DREF IMSI-901700000010650: MSC conn use + dtap == 1 (0x2: dtap)
 DRLL Dispatching 04.08 message GSM48_MT_MM_AUTH_RESP (0x5:0x14)
 DMM IMSI-901700000010650: MM UMTS AUTHENTICATION RESPONSE (res = e229c19e791f2e41)
@@ -137,7 +137,7 @@ DREF VLR subscr IMSI-901700000010650_MSISDN-42342 usage increases to: 2
   vsub->tmsi == 0xffffffff
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342 usage decreases to: 1
 - MS sends TMSI Realloc Complete
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_TMSI_REALL_COMPL
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_TMSI_REALL_COMPL
 DREF IMSI-901700000010650_MSISDN-42342: MSC conn use + dtap == 1 (0x2: dtap)
 DRLL Dispatching 04.08 message GSM48_MT_MM_TMSI_REALL_COMPL (0x5:0x1b)
 DMM TMSI Reallocation Completed. Subscriber: IMSI-901700000010650_MSISDN-42342
@@ -158,7 +158,7 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000010650_MSISDN-42342_LU){RAN_CONN_S_ACCEPTED
 DREF IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: MSC conn use + release == 2 (0x102: dtap,release)
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 usage increases to: 3
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 usage decreases to: 2
-- BSSAP Clear --RAN_GERAN_A--> MS
+- BSSAP Clear --GERAN-A--> MS
 DREF IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: MSC conn use - dtap == 1 (0x100: release)
   bssap_clear_sent == 1
 - BSS sends BSSMAP Clear Complete
@@ -184,7 +184,7 @@ DREF VLR subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 usage increase
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 usage decreases to: 1
 ---
 - after a while, a new conn sends a CM Service Request. VLR responds with Auth Req, and reuses old auth vector
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_CM_SERV_REQ
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_CM_SERV_REQ
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -218,7 +218,7 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100_CM_SERV
   cm_service_result_sent == 0
   auth_request_sent == 1
 - MS sends Authen Response, VLR accepts with a CM Service Accept
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_AUTH_RESP
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_AUTH_RESP
 DREF IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: MSC conn use + dtap == 1 (0x2: dtap)
 DRLL Dispatching 04.08 message GSM48_MT_MM_AUTH_RESP (0x5:0x14)
 DMM IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: MM UMTS AUTHENTICATION RESPONSE (res = e229c19e791f2e41)
@@ -255,7 +255,7 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100_CM_SERV
 DREF IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: MSC conn use + release == 1 (0x100: release)
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 usage increases to: 3
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 usage decreases to: 2
-- BSSAP Clear --RAN_GERAN_A--> MS
+- BSSAP Clear --GERAN-A--> MS
   bssap_clear_sent == 1
 - BSS sends BSSMAP Clear Complete
 DREF IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: MSC conn use - release == 0 (0x0: )
@@ -279,7 +279,7 @@ DREF VLR subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 usage increase
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 usage decreases to: 1
 ---
 - after a while, a new conn sends a CM Service Request. VLR responds with Auth Req, and needs to request a second auth vector from HLR
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_CM_SERV_REQ
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_CM_SERV_REQ
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -327,7 +327,7 @@ DREF VLR subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 usage decrease
   auth_request_sent == 1
   cm_service_result_sent == 0
 - MS sends Authen Response, VLR accepts with a CM Service Accept
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_AUTH_RESP
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_AUTH_RESP
 DREF IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: MSC conn use + dtap == 1 (0x2: dtap)
 DRLL Dispatching 04.08 message GSM48_MT_MM_AUTH_RESP (0x5:0x14)
 DMM IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: MM UMTS AUTHENTICATION RESPONSE (res = 7db47cf7f81e4dc7)
@@ -364,7 +364,7 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100_CM_SERV
 DREF IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: MSC conn use + release == 1 (0x100: release)
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 usage increases to: 3
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 usage decreases to: 2
-- BSSAP Clear --RAN_GERAN_A--> MS
+- BSSAP Clear --GERAN-A--> MS
   bssap_clear_sent == 1
 - BSS sends BSSMAP Clear Complete
 DREF IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: MSC conn use - release == 0 (0x0: )
@@ -383,7 +383,7 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100_CM_SERV
   llist_count(&net->ran_conns) == 0
 ---
 - subscriber detaches
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_IMSI_DETACH_IND
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_IMSI_DETACH_IND
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -399,7 +399,7 @@ DREF freeing VLR subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100
 DMM RAN_conn{RAN_CONN_S_NEW}: Received Event RAN_CONN_E_CN_CLOSE
 DMM RAN_conn{RAN_CONN_S_NEW}: state_chg to RAN_CONN_S_RELEASING
 DREF unknown: MSC conn use + release == 2 (0x101: compl_l3,release)
-- BSSAP Clear --RAN_GERAN_A--> MS
+- BSSAP Clear --GERAN-A--> MS
 DREF unknown: MSC conn use - compl_l3 == 1 (0x100: release)
   bssap_clear_sent == 1
 - BSS sends BSSMAP Clear Complete
@@ -418,7 +418,7 @@ talloc_total_blocks(tall_bsc_ctx) == 13
 
 ===== test_auth_use_twice_utran
 - Location Update request causes a GSUP Send Auth Info request to HLR
-  MSC <--RAN_UTRAN_IU-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
+  MSC <--UTRAN-Iu-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -467,7 +467,7 @@ DREF VLR subscr IMSI-901700000010650 usage decreases to: 1
   auth_request_sent == 1
   lu_result_sent == 0
 - MS sends Authen Response, VLR accepts and sends SecurityModeControl
-  MSC <--RAN_UTRAN_IU-- MS: GSM48_MT_MM_AUTH_RESP
+  MSC <--UTRAN-Iu-- MS: GSM48_MT_MM_AUTH_RESP
 DREF IMSI-901700000010650: MSC conn use + dtap == 1 (0x2: dtap)
 DRLL Dispatching 04.08 message GSM48_MT_MM_AUTH_RESP (0x5:0x14)
 DMM IMSI-901700000010650: MM UMTS AUTHENTICATION RESPONSE (res = e229c19e791f2e41)
@@ -497,7 +497,7 @@ DMM <- SECURITY MODE COMPLETE IMSI-901700000010650
 DVLR vlr_lu_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU){VLR_ULA_S_WAIT_CIPH}: Received Event VLR_ULA_E_CIPH_RES
 DVLR vlr_lu_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU){VLR_ULA_S_WAIT_CIPH}: vlr_loc_upd_post_ciph()
 DIUCS IMSI-901700000010650: tx CommonID 901700000010650
-- Iu Common ID --RAN_UTRAN_IU--> MS (IMSI=901700000010650)
+- Iu Common ID --UTRAN-Iu--> MS (IMSI=901700000010650)
 DVLR vlr_lu_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU){VLR_ULA_S_WAIT_CIPH}: vlr_loc_upd_node_4()
 DVLR vlr_lu_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU){VLR_ULA_S_WAIT_CIPH}: state_chg to VLR_ULA_S_WAIT_HLR_UPD
 DVLR upd_hlr_vlr_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: Allocated
@@ -564,7 +564,7 @@ DREF VLR subscr IMSI-901700000010650_MSISDN-42342 usage increases to: 2
   vsub->tmsi == 0xffffffff
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342 usage decreases to: 1
 - MS sends TMSI Realloc Complete
-  MSC <--RAN_UTRAN_IU-- MS: GSM48_MT_MM_TMSI_REALL_COMPL
+  MSC <--UTRAN-Iu-- MS: GSM48_MT_MM_TMSI_REALL_COMPL
 DREF IMSI-901700000010650_MSISDN-42342: MSC conn use + dtap == 1 (0x2: dtap)
 DRLL Dispatching 04.08 message GSM48_MT_MM_TMSI_REALL_COMPL (0x5:0x1b)
 DMM TMSI Reallocation Completed. Subscriber: IMSI-901700000010650_MSISDN-42342
@@ -585,7 +585,7 @@ DMM RAN_conn(UTRAN-Iu-42_IMSI-901700000010650_MSISDN-42342_LU){RAN_CONN_S_ACCEPT
 DREF IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: MSC conn use + release == 2 (0x102: dtap,release)
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 usage increases to: 3
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 usage decreases to: 2
-- Iu Release --RAN_UTRAN_IU--> MS
+- Iu Release --UTRAN-Iu--> MS
 DREF IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: MSC conn use - dtap == 1 (0x100: release)
   iu_release_sent == 1
 - RNC sends Iu Release Complete
@@ -611,7 +611,7 @@ DREF VLR subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 usage increase
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 usage decreases to: 1
 ---
 - after a while, a new conn sends a CM Service Request. VLR responds with Auth Req, and reuses old auth vector
-  MSC <--RAN_UTRAN_IU-- MS: GSM48_MT_MM_CM_SERV_REQ
+  MSC <--UTRAN-Iu-- MS: GSM48_MT_MM_CM_SERV_REQ
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -645,7 +645,7 @@ DMM RAN_conn(UTRAN-Iu-42_IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100_CM_SE
   cm_service_result_sent == 0
   auth_request_sent == 1
 - MS sends Authen Response, VLR accepts and sends SecurityModeControl
-  MSC <--RAN_UTRAN_IU-- MS: GSM48_MT_MM_AUTH_RESP
+  MSC <--UTRAN-Iu-- MS: GSM48_MT_MM_AUTH_RESP
 DREF IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: MSC conn use + dtap == 1 (0x2: dtap)
 DRLL Dispatching 04.08 message GSM48_MT_MM_AUTH_RESP (0x5:0x14)
 DMM IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: MM UMTS AUTHENTICATION RESPONSE (res = e229c19e791f2e41)
@@ -675,7 +675,7 @@ DMM <- SECURITY MODE COMPLETE IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100
 DVLR Process_Access_Request_VLR(UTRAN-Iu-42_IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100_CM_SERVICE_REQ){PR_ARQ_S_WAIT_CIPH}: Received Event PR_ARQ_E_CIPH_RES
 DVLR Process_Access_Request_VLR(UTRAN-Iu-42_IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100_CM_SERVICE_REQ){PR_ARQ_S_WAIT_CIPH}: _proc_arq_vlr_node2_post_ciph()
 DIUCS IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: tx CommonID 901700000010650
-- Iu Common ID --RAN_UTRAN_IU--> MS (IMSI=901700000010650)
+- Iu Common ID --UTRAN-Iu--> MS (IMSI=901700000010650)
 DVLR Process_Access_Request_VLR(UTRAN-Iu-42_IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100_CM_SERVICE_REQ){PR_ARQ_S_WAIT_CIPH}: _proc_arq_vlr_node2_post_vlr()
 DVLR Process_Access_Request_VLR(UTRAN-Iu-42_IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100_CM_SERVICE_REQ){PR_ARQ_S_WAIT_CIPH}: _proc_arq_vlr_post_pres()
 DVLR Process_Access_Request_VLR(UTRAN-Iu-42_IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100_CM_SERVICE_REQ){PR_ARQ_S_WAIT_CIPH}: _proc_arq_vlr_post_trace()
@@ -695,7 +695,7 @@ DMM RAN_conn(UTRAN-Iu-42_IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100_CM_SE
 DREF IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: MSC conn use + release == 1 (0x100: release)
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 usage increases to: 3
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 usage decreases to: 2
-- Iu Release --RAN_UTRAN_IU--> MS
+- Iu Release --UTRAN-Iu--> MS
   iu_release_sent == 1
 - RNC sends Iu Release Complete
 DREF IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: MSC conn use - release == 0 (0x0: )
@@ -719,7 +719,7 @@ DREF VLR subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 usage increase
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 usage decreases to: 1
 ---
 - after a while, a new conn sends a CM Service Request. VLR responds with Auth Req, and needs to request a second auth vector from HLR
-  MSC <--RAN_UTRAN_IU-- MS: GSM48_MT_MM_CM_SERV_REQ
+  MSC <--UTRAN-Iu-- MS: GSM48_MT_MM_CM_SERV_REQ
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -767,7 +767,7 @@ DREF VLR subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 usage decrease
   auth_request_sent == 1
   cm_service_result_sent == 0
 - MS sends Authen Response, VLR accepts and sends SecurityModeControl
-  MSC <--RAN_UTRAN_IU-- MS: GSM48_MT_MM_AUTH_RESP
+  MSC <--UTRAN-Iu-- MS: GSM48_MT_MM_AUTH_RESP
 DREF IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: MSC conn use + dtap == 1 (0x2: dtap)
 DRLL Dispatching 04.08 message GSM48_MT_MM_AUTH_RESP (0x5:0x14)
 DMM IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: MM UMTS AUTHENTICATION RESPONSE (res = 7db47cf7f81e4dc7)
@@ -797,7 +797,7 @@ DMM <- SECURITY MODE COMPLETE IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100
 DVLR Process_Access_Request_VLR(UTRAN-Iu-42_IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100_CM_SERVICE_REQ){PR_ARQ_S_WAIT_CIPH}: Received Event PR_ARQ_E_CIPH_RES
 DVLR Process_Access_Request_VLR(UTRAN-Iu-42_IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100_CM_SERVICE_REQ){PR_ARQ_S_WAIT_CIPH}: _proc_arq_vlr_node2_post_ciph()
 DIUCS IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: tx CommonID 901700000010650
-- Iu Common ID --RAN_UTRAN_IU--> MS (IMSI=901700000010650)
+- Iu Common ID --UTRAN-Iu--> MS (IMSI=901700000010650)
 DVLR Process_Access_Request_VLR(UTRAN-Iu-42_IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100_CM_SERVICE_REQ){PR_ARQ_S_WAIT_CIPH}: _proc_arq_vlr_node2_post_vlr()
 DVLR Process_Access_Request_VLR(UTRAN-Iu-42_IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100_CM_SERVICE_REQ){PR_ARQ_S_WAIT_CIPH}: _proc_arq_vlr_post_pres()
 DVLR Process_Access_Request_VLR(UTRAN-Iu-42_IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100_CM_SERVICE_REQ){PR_ARQ_S_WAIT_CIPH}: _proc_arq_vlr_post_trace()
@@ -817,7 +817,7 @@ DMM RAN_conn(UTRAN-Iu-42_IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100_CM_SE
 DREF IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: MSC conn use + release == 1 (0x100: release)
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 usage increases to: 3
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 usage decreases to: 2
-- Iu Release --RAN_UTRAN_IU--> MS
+- Iu Release --UTRAN-Iu--> MS
   iu_release_sent == 1
 - RNC sends Iu Release Complete
 DREF IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: MSC conn use - release == 0 (0x0: )
@@ -836,7 +836,7 @@ DMM RAN_conn(UTRAN-Iu-42_IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100_CM_SE
   llist_count(&net->ran_conns) == 0
 ---
 - subscriber detaches
-  MSC <--RAN_UTRAN_IU-- MS: GSM48_MT_MM_IMSI_DETACH_IND
+  MSC <--UTRAN-Iu-- MS: GSM48_MT_MM_IMSI_DETACH_IND
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -852,7 +852,7 @@ DREF freeing VLR subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100
 DMM RAN_conn{RAN_CONN_S_NEW}: Received Event RAN_CONN_E_CN_CLOSE
 DMM RAN_conn{RAN_CONN_S_NEW}: state_chg to RAN_CONN_S_RELEASING
 DREF unknown: MSC conn use + release == 2 (0x101: compl_l3,release)
-- Iu Release --RAN_UTRAN_IU--> MS
+- Iu Release --UTRAN-Iu--> MS
 DREF unknown: MSC conn use - compl_l3 == 1 (0x100: release)
   iu_release_sent == 1
 - RNC sends Iu Release Complete
@@ -871,7 +871,7 @@ talloc_total_blocks(tall_bsc_ctx) == 13
 
 ===== test_auth_use_infinitely_geran
 - Location Update request causes a GSUP Send Auth Info request to HLR
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -920,7 +920,7 @@ DREF VLR subscr IMSI-901700000010650 usage decreases to: 1
   auth_request_sent == 1
   lu_result_sent == 0
 - MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_AUTH_RESP
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_AUTH_RESP
 DREF IMSI-901700000010650: MSC conn use + dtap == 1 (0x2: dtap)
 DRLL Dispatching 04.08 message GSM48_MT_MM_AUTH_RESP (0x5:0x14)
 DMM IMSI-901700000010650: MM UMTS AUTHENTICATION RESPONSE (res = e229c19e791f2e41)
@@ -1005,7 +1005,7 @@ DREF VLR subscr IMSI-901700000010650_MSISDN-42342 usage increases to: 2
   vsub->tmsi == 0xffffffff
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342 usage decreases to: 1
 - MS sends TMSI Realloc Complete
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_TMSI_REALL_COMPL
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_TMSI_REALL_COMPL
 DREF IMSI-901700000010650_MSISDN-42342: MSC conn use + dtap == 1 (0x2: dtap)
 DRLL Dispatching 04.08 message GSM48_MT_MM_TMSI_REALL_COMPL (0x5:0x1b)
 DMM TMSI Reallocation Completed. Subscriber: IMSI-901700000010650_MSISDN-42342
@@ -1026,7 +1026,7 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000010650_MSISDN-42342_LU){RAN_CONN_S_ACCEPTED
 DREF IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: MSC conn use + release == 2 (0x102: dtap,release)
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 usage increases to: 3
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 usage decreases to: 2
-- BSSAP Clear --RAN_GERAN_A--> MS
+- BSSAP Clear --GERAN-A--> MS
 DREF IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: MSC conn use - dtap == 1 (0x100: release)
   bssap_clear_sent == 1
 - BSS sends BSSMAP Clear Complete
@@ -1052,7 +1052,7 @@ DREF VLR subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 usage increase
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 usage decreases to: 1
 ---
 - after a while, a new conn sends a CM Service Request. VLR responds with Auth Req, and reuses old auth vector
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_CM_SERV_REQ
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_CM_SERV_REQ
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -1086,7 +1086,7 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100_CM_SERV
   cm_service_result_sent == 0
   auth_request_sent == 1
 - MS sends Authen Response, VLR accepts with a CM Service Accept
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_AUTH_RESP
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_AUTH_RESP
 DREF IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: MSC conn use + dtap == 1 (0x2: dtap)
 DRLL Dispatching 04.08 message GSM48_MT_MM_AUTH_RESP (0x5:0x14)
 DMM IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: MM UMTS AUTHENTICATION RESPONSE (res = e229c19e791f2e41)
@@ -1123,7 +1123,7 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100_CM_SERV
 DREF IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: MSC conn use + release == 1 (0x100: release)
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 usage increases to: 3
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 usage decreases to: 2
-- BSSAP Clear --RAN_GERAN_A--> MS
+- BSSAP Clear --GERAN-A--> MS
   bssap_clear_sent == 1
 - BSS sends BSSMAP Clear Complete
 DREF IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: MSC conn use - release == 0 (0x0: )
@@ -1147,7 +1147,7 @@ DREF VLR subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 usage increase
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 usage decreases to: 1
 ---
 - after a while, a new conn sends a CM Service Request. VLR responds with Auth Req, and reuses old auth vector
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_CM_SERV_REQ
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_CM_SERV_REQ
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -1181,7 +1181,7 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100_CM_SERV
   cm_service_result_sent == 0
   auth_request_sent == 1
 - MS sends Authen Response, VLR accepts with a CM Service Accept
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_AUTH_RESP
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_AUTH_RESP
 DREF IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: MSC conn use + dtap == 1 (0x2: dtap)
 DRLL Dispatching 04.08 message GSM48_MT_MM_AUTH_RESP (0x5:0x14)
 DMM IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: MM UMTS AUTHENTICATION RESPONSE (res = e229c19e791f2e41)
@@ -1218,7 +1218,7 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100_CM_SERV
 DREF IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: MSC conn use + release == 1 (0x100: release)
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 usage increases to: 3
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 usage decreases to: 2
-- BSSAP Clear --RAN_GERAN_A--> MS
+- BSSAP Clear --GERAN-A--> MS
   bssap_clear_sent == 1
 - BSS sends BSSMAP Clear Complete
 DREF IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: MSC conn use - release == 0 (0x0: )
@@ -1242,7 +1242,7 @@ DREF VLR subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 usage increase
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 usage decreases to: 1
 ---
 - after a while, a new conn sends a CM Service Request. VLR responds with Auth Req, and reuses old auth vector
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_CM_SERV_REQ
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_CM_SERV_REQ
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -1276,7 +1276,7 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100_CM_SERV
   cm_service_result_sent == 0
   auth_request_sent == 1
 - MS sends Authen Response, VLR accepts with a CM Service Accept
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_AUTH_RESP
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_AUTH_RESP
 DREF IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: MSC conn use + dtap == 1 (0x2: dtap)
 DRLL Dispatching 04.08 message GSM48_MT_MM_AUTH_RESP (0x5:0x14)
 DMM IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: MM UMTS AUTHENTICATION RESPONSE (res = e229c19e791f2e41)
@@ -1313,7 +1313,7 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100_CM_SERV
 DREF IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: MSC conn use + release == 1 (0x100: release)
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 usage increases to: 3
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 usage decreases to: 2
-- BSSAP Clear --RAN_GERAN_A--> MS
+- BSSAP Clear --GERAN-A--> MS
   bssap_clear_sent == 1
 - BSS sends BSSMAP Clear Complete
 DREF IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: MSC conn use - release == 0 (0x0: )
@@ -1332,7 +1332,7 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100_CM_SERV
   llist_count(&net->ran_conns) == 0
 ---
 - subscriber detaches
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_IMSI_DETACH_IND
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_IMSI_DETACH_IND
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -1348,7 +1348,7 @@ DREF freeing VLR subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100
 DMM RAN_conn{RAN_CONN_S_NEW}: Received Event RAN_CONN_E_CN_CLOSE
 DMM RAN_conn{RAN_CONN_S_NEW}: state_chg to RAN_CONN_S_RELEASING
 DREF unknown: MSC conn use + release == 2 (0x101: compl_l3,release)
-- BSSAP Clear --RAN_GERAN_A--> MS
+- BSSAP Clear --GERAN-A--> MS
 DREF unknown: MSC conn use - compl_l3 == 1 (0x100: release)
   bssap_clear_sent == 1
 - BSS sends BSSMAP Clear Complete
@@ -1367,7 +1367,7 @@ talloc_total_blocks(tall_bsc_ctx) == 13
 
 ===== test_auth_use_infinitely_utran
 - Location Update request causes a GSUP Send Auth Info request to HLR
-  MSC <--RAN_UTRAN_IU-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
+  MSC <--UTRAN-Iu-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -1416,7 +1416,7 @@ DREF VLR subscr IMSI-901700000010650 usage decreases to: 1
   auth_request_sent == 1
   lu_result_sent == 0
 - MS sends Authen Response, VLR accepts and sends SecurityModeControl
-  MSC <--RAN_UTRAN_IU-- MS: GSM48_MT_MM_AUTH_RESP
+  MSC <--UTRAN-Iu-- MS: GSM48_MT_MM_AUTH_RESP
 DREF IMSI-901700000010650: MSC conn use + dtap == 1 (0x2: dtap)
 DRLL Dispatching 04.08 message GSM48_MT_MM_AUTH_RESP (0x5:0x14)
 DMM IMSI-901700000010650: MM UMTS AUTHENTICATION RESPONSE (res = e229c19e791f2e41)
@@ -1446,7 +1446,7 @@ DMM <- SECURITY MODE COMPLETE IMSI-901700000010650
 DVLR vlr_lu_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU){VLR_ULA_S_WAIT_CIPH}: Received Event VLR_ULA_E_CIPH_RES
 DVLR vlr_lu_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU){VLR_ULA_S_WAIT_CIPH}: vlr_loc_upd_post_ciph()
 DIUCS IMSI-901700000010650: tx CommonID 901700000010650
-- Iu Common ID --RAN_UTRAN_IU--> MS (IMSI=901700000010650)
+- Iu Common ID --UTRAN-Iu--> MS (IMSI=901700000010650)
 DVLR vlr_lu_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU){VLR_ULA_S_WAIT_CIPH}: vlr_loc_upd_node_4()
 DVLR vlr_lu_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU){VLR_ULA_S_WAIT_CIPH}: state_chg to VLR_ULA_S_WAIT_HLR_UPD
 DVLR upd_hlr_vlr_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: Allocated
@@ -1513,7 +1513,7 @@ DREF VLR subscr IMSI-901700000010650_MSISDN-42342 usage increases to: 2
   vsub->tmsi == 0xffffffff
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342 usage decreases to: 1
 - MS sends TMSI Realloc Complete
-  MSC <--RAN_UTRAN_IU-- MS: GSM48_MT_MM_TMSI_REALL_COMPL
+  MSC <--UTRAN-Iu-- MS: GSM48_MT_MM_TMSI_REALL_COMPL
 DREF IMSI-901700000010650_MSISDN-42342: MSC conn use + dtap == 1 (0x2: dtap)
 DRLL Dispatching 04.08 message GSM48_MT_MM_TMSI_REALL_COMPL (0x5:0x1b)
 DMM TMSI Reallocation Completed. Subscriber: IMSI-901700000010650_MSISDN-42342
@@ -1534,7 +1534,7 @@ DMM RAN_conn(UTRAN-Iu-42_IMSI-901700000010650_MSISDN-42342_LU){RAN_CONN_S_ACCEPT
 DREF IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: MSC conn use + release == 2 (0x102: dtap,release)
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 usage increases to: 3
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 usage decreases to: 2
-- Iu Release --RAN_UTRAN_IU--> MS
+- Iu Release --UTRAN-Iu--> MS
 DREF IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: MSC conn use - dtap == 1 (0x100: release)
   iu_release_sent == 1
 - RNC sends Iu Release Complete
@@ -1560,7 +1560,7 @@ DREF VLR subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 usage increase
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 usage decreases to: 1
 ---
 - after a while, a new conn sends a CM Service Request. VLR responds with Auth Req, and reuses old auth vector
-  MSC <--RAN_UTRAN_IU-- MS: GSM48_MT_MM_CM_SERV_REQ
+  MSC <--UTRAN-Iu-- MS: GSM48_MT_MM_CM_SERV_REQ
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -1594,7 +1594,7 @@ DMM RAN_conn(UTRAN-Iu-42_IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100_CM_SE
   cm_service_result_sent == 0
   auth_request_sent == 1
 - MS sends Authen Response, VLR accepts and sends SecurityModeControl
-  MSC <--RAN_UTRAN_IU-- MS: GSM48_MT_MM_AUTH_RESP
+  MSC <--UTRAN-Iu-- MS: GSM48_MT_MM_AUTH_RESP
 DREF IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: MSC conn use + dtap == 1 (0x2: dtap)
 DRLL Dispatching 04.08 message GSM48_MT_MM_AUTH_RESP (0x5:0x14)
 DMM IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: MM UMTS AUTHENTICATION RESPONSE (res = e229c19e791f2e41)
@@ -1624,7 +1624,7 @@ DMM <- SECURITY MODE COMPLETE IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100
 DVLR Process_Access_Request_VLR(UTRAN-Iu-42_IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100_CM_SERVICE_REQ){PR_ARQ_S_WAIT_CIPH}: Received Event PR_ARQ_E_CIPH_RES
 DVLR Process_Access_Request_VLR(UTRAN-Iu-42_IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100_CM_SERVICE_REQ){PR_ARQ_S_WAIT_CIPH}: _proc_arq_vlr_node2_post_ciph()
 DIUCS IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: tx CommonID 901700000010650
-- Iu Common ID --RAN_UTRAN_IU--> MS (IMSI=901700000010650)
+- Iu Common ID --UTRAN-Iu--> MS (IMSI=901700000010650)
 DVLR Process_Access_Request_VLR(UTRAN-Iu-42_IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100_CM_SERVICE_REQ){PR_ARQ_S_WAIT_CIPH}: _proc_arq_vlr_node2_post_vlr()
 DVLR Process_Access_Request_VLR(UTRAN-Iu-42_IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100_CM_SERVICE_REQ){PR_ARQ_S_WAIT_CIPH}: _proc_arq_vlr_post_pres()
 DVLR Process_Access_Request_VLR(UTRAN-Iu-42_IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100_CM_SERVICE_REQ){PR_ARQ_S_WAIT_CIPH}: _proc_arq_vlr_post_trace()
@@ -1644,7 +1644,7 @@ DMM RAN_conn(UTRAN-Iu-42_IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100_CM_SE
 DREF IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: MSC conn use + release == 1 (0x100: release)
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 usage increases to: 3
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 usage decreases to: 2
-- Iu Release --RAN_UTRAN_IU--> MS
+- Iu Release --UTRAN-Iu--> MS
   iu_release_sent == 1
 - RNC sends Iu Release Complete
 DREF IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: MSC conn use - release == 0 (0x0: )
@@ -1668,7 +1668,7 @@ DREF VLR subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 usage increase
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 usage decreases to: 1
 ---
 - after a while, a new conn sends a CM Service Request. VLR responds with Auth Req, and reuses old auth vector
-  MSC <--RAN_UTRAN_IU-- MS: GSM48_MT_MM_CM_SERV_REQ
+  MSC <--UTRAN-Iu-- MS: GSM48_MT_MM_CM_SERV_REQ
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -1702,7 +1702,7 @@ DMM RAN_conn(UTRAN-Iu-42_IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100_CM_SE
   cm_service_result_sent == 0
   auth_request_sent == 1
 - MS sends Authen Response, VLR accepts and sends SecurityModeControl
-  MSC <--RAN_UTRAN_IU-- MS: GSM48_MT_MM_AUTH_RESP
+  MSC <--UTRAN-Iu-- MS: GSM48_MT_MM_AUTH_RESP
 DREF IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: MSC conn use + dtap == 1 (0x2: dtap)
 DRLL Dispatching 04.08 message GSM48_MT_MM_AUTH_RESP (0x5:0x14)
 DMM IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: MM UMTS AUTHENTICATION RESPONSE (res = e229c19e791f2e41)
@@ -1732,7 +1732,7 @@ DMM <- SECURITY MODE COMPLETE IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100
 DVLR Process_Access_Request_VLR(UTRAN-Iu-42_IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100_CM_SERVICE_REQ){PR_ARQ_S_WAIT_CIPH}: Received Event PR_ARQ_E_CIPH_RES
 DVLR Process_Access_Request_VLR(UTRAN-Iu-42_IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100_CM_SERVICE_REQ){PR_ARQ_S_WAIT_CIPH}: _proc_arq_vlr_node2_post_ciph()
 DIUCS IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: tx CommonID 901700000010650
-- Iu Common ID --RAN_UTRAN_IU--> MS (IMSI=901700000010650)
+- Iu Common ID --UTRAN-Iu--> MS (IMSI=901700000010650)
 DVLR Process_Access_Request_VLR(UTRAN-Iu-42_IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100_CM_SERVICE_REQ){PR_ARQ_S_WAIT_CIPH}: _proc_arq_vlr_node2_post_vlr()
 DVLR Process_Access_Request_VLR(UTRAN-Iu-42_IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100_CM_SERVICE_REQ){PR_ARQ_S_WAIT_CIPH}: _proc_arq_vlr_post_pres()
 DVLR Process_Access_Request_VLR(UTRAN-Iu-42_IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100_CM_SERVICE_REQ){PR_ARQ_S_WAIT_CIPH}: _proc_arq_vlr_post_trace()
@@ -1752,7 +1752,7 @@ DMM RAN_conn(UTRAN-Iu-42_IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100_CM_SE
 DREF IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: MSC conn use + release == 1 (0x100: release)
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 usage increases to: 3
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 usage decreases to: 2
-- Iu Release --RAN_UTRAN_IU--> MS
+- Iu Release --UTRAN-Iu--> MS
   iu_release_sent == 1
 - RNC sends Iu Release Complete
 DREF IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: MSC conn use - release == 0 (0x0: )
@@ -1776,7 +1776,7 @@ DREF VLR subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 usage increase
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 usage decreases to: 1
 ---
 - after a while, a new conn sends a CM Service Request. VLR responds with Auth Req, and reuses old auth vector
-  MSC <--RAN_UTRAN_IU-- MS: GSM48_MT_MM_CM_SERV_REQ
+  MSC <--UTRAN-Iu-- MS: GSM48_MT_MM_CM_SERV_REQ
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -1810,7 +1810,7 @@ DMM RAN_conn(UTRAN-Iu-42_IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100_CM_SE
   cm_service_result_sent == 0
   auth_request_sent == 1
 - MS sends Authen Response, VLR accepts and sends SecurityModeControl
-  MSC <--RAN_UTRAN_IU-- MS: GSM48_MT_MM_AUTH_RESP
+  MSC <--UTRAN-Iu-- MS: GSM48_MT_MM_AUTH_RESP
 DREF IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: MSC conn use + dtap == 1 (0x2: dtap)
 DRLL Dispatching 04.08 message GSM48_MT_MM_AUTH_RESP (0x5:0x14)
 DMM IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: MM UMTS AUTHENTICATION RESPONSE (res = e229c19e791f2e41)
@@ -1840,7 +1840,7 @@ DMM <- SECURITY MODE COMPLETE IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100
 DVLR Process_Access_Request_VLR(UTRAN-Iu-42_IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100_CM_SERVICE_REQ){PR_ARQ_S_WAIT_CIPH}: Received Event PR_ARQ_E_CIPH_RES
 DVLR Process_Access_Request_VLR(UTRAN-Iu-42_IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100_CM_SERVICE_REQ){PR_ARQ_S_WAIT_CIPH}: _proc_arq_vlr_node2_post_ciph()
 DIUCS IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: tx CommonID 901700000010650
-- Iu Common ID --RAN_UTRAN_IU--> MS (IMSI=901700000010650)
+- Iu Common ID --UTRAN-Iu--> MS (IMSI=901700000010650)
 DVLR Process_Access_Request_VLR(UTRAN-Iu-42_IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100_CM_SERVICE_REQ){PR_ARQ_S_WAIT_CIPH}: _proc_arq_vlr_node2_post_vlr()
 DVLR Process_Access_Request_VLR(UTRAN-Iu-42_IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100_CM_SERVICE_REQ){PR_ARQ_S_WAIT_CIPH}: _proc_arq_vlr_post_pres()
 DVLR Process_Access_Request_VLR(UTRAN-Iu-42_IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100_CM_SERVICE_REQ){PR_ARQ_S_WAIT_CIPH}: _proc_arq_vlr_post_trace()
@@ -1860,7 +1860,7 @@ DMM RAN_conn(UTRAN-Iu-42_IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100_CM_SE
 DREF IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: MSC conn use + release == 1 (0x100: release)
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 usage increases to: 3
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 usage decreases to: 2
-- Iu Release --RAN_UTRAN_IU--> MS
+- Iu Release --UTRAN-Iu--> MS
   iu_release_sent == 1
 - RNC sends Iu Release Complete
 DREF IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: MSC conn use - release == 0 (0x0: )
@@ -1879,7 +1879,7 @@ DMM RAN_conn(UTRAN-Iu-42_IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100_CM_SE
   llist_count(&net->ran_conns) == 0
 ---
 - subscriber detaches
-  MSC <--RAN_UTRAN_IU-- MS: GSM48_MT_MM_IMSI_DETACH_IND
+  MSC <--UTRAN-Iu-- MS: GSM48_MT_MM_IMSI_DETACH_IND
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -1895,7 +1895,7 @@ DREF freeing VLR subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100
 DMM RAN_conn{RAN_CONN_S_NEW}: Received Event RAN_CONN_E_CN_CLOSE
 DMM RAN_conn{RAN_CONN_S_NEW}: state_chg to RAN_CONN_S_RELEASING
 DREF unknown: MSC conn use + release == 2 (0x101: compl_l3,release)
-- Iu Release --RAN_UTRAN_IU--> MS
+- Iu Release --UTRAN-Iu--> MS
 DREF unknown: MSC conn use - compl_l3 == 1 (0x100: release)
   iu_release_sent == 1
 - RNC sends Iu Release Complete
@@ -1914,7 +1914,7 @@ talloc_total_blocks(tall_bsc_ctx) == 13
 
 ===== test_no_auth_reuse_geran
 - Location Update request causes a GSUP Send Auth Info request to HLR
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -1963,7 +1963,7 @@ DREF VLR subscr IMSI-901700000010650 usage decreases to: 1
   auth_request_sent == 1
   lu_result_sent == 0
 - MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_AUTH_RESP
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_AUTH_RESP
 DREF IMSI-901700000010650: MSC conn use + dtap == 1 (0x2: dtap)
 DRLL Dispatching 04.08 message GSM48_MT_MM_AUTH_RESP (0x5:0x14)
 DMM IMSI-901700000010650: MM UMTS AUTHENTICATION RESPONSE (res = e229c19e791f2e41)
@@ -2048,7 +2048,7 @@ DREF VLR subscr IMSI-901700000010650_MSISDN-42342 usage increases to: 2
   vsub->tmsi == 0xffffffff
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342 usage decreases to: 1
 - MS sends TMSI Realloc Complete
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_TMSI_REALL_COMPL
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_TMSI_REALL_COMPL
 DREF IMSI-901700000010650_MSISDN-42342: MSC conn use + dtap == 1 (0x2: dtap)
 DRLL Dispatching 04.08 message GSM48_MT_MM_TMSI_REALL_COMPL (0x5:0x1b)
 DMM TMSI Reallocation Completed. Subscriber: IMSI-901700000010650_MSISDN-42342
@@ -2069,7 +2069,7 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000010650_MSISDN-42342_LU){RAN_CONN_S_ACCEPTED
 DREF IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: MSC conn use + release == 2 (0x102: dtap,release)
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 usage increases to: 3
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 usage decreases to: 2
-- BSSAP Clear --RAN_GERAN_A--> MS
+- BSSAP Clear --GERAN-A--> MS
 DREF IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: MSC conn use - dtap == 1 (0x100: release)
   bssap_clear_sent == 1
 - BSS sends BSSMAP Clear Complete
@@ -2095,7 +2095,7 @@ DREF VLR subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 usage increase
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 usage decreases to: 1
 ---
 - after a while, a new conn sends a CM Service Request. VLR responds with Auth Req, and needs to request a second auth vector from HLR
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_CM_SERV_REQ
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_CM_SERV_REQ
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -2143,7 +2143,7 @@ DREF VLR subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 usage decrease
   auth_request_sent == 1
   cm_service_result_sent == 0
 - MS sends Authen Response, VLR accepts with a CM Service Accept
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_AUTH_RESP
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_AUTH_RESP
 DREF IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: MSC conn use + dtap == 1 (0x2: dtap)
 DRLL Dispatching 04.08 message GSM48_MT_MM_AUTH_RESP (0x5:0x14)
 DMM IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: MM UMTS AUTHENTICATION RESPONSE (res = 7db47cf7f81e4dc7)
@@ -2180,7 +2180,7 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100_CM_SERV
 DREF IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: MSC conn use + release == 1 (0x100: release)
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 usage increases to: 3
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 usage decreases to: 2
-- BSSAP Clear --RAN_GERAN_A--> MS
+- BSSAP Clear --GERAN-A--> MS
   bssap_clear_sent == 1
 - BSS sends BSSMAP Clear Complete
 DREF IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: MSC conn use - release == 0 (0x0: )
@@ -2199,7 +2199,7 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100_CM_SERV
   llist_count(&net->ran_conns) == 0
 ---
 - subscriber detaches
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_IMSI_DETACH_IND
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_IMSI_DETACH_IND
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -2215,7 +2215,7 @@ DREF freeing VLR subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100
 DMM RAN_conn{RAN_CONN_S_NEW}: Received Event RAN_CONN_E_CN_CLOSE
 DMM RAN_conn{RAN_CONN_S_NEW}: state_chg to RAN_CONN_S_RELEASING
 DREF unknown: MSC conn use + release == 2 (0x101: compl_l3,release)
-- BSSAP Clear --RAN_GERAN_A--> MS
+- BSSAP Clear --GERAN-A--> MS
 DREF unknown: MSC conn use - compl_l3 == 1 (0x100: release)
   bssap_clear_sent == 1
 - BSS sends BSSMAP Clear Complete
@@ -2234,7 +2234,7 @@ talloc_total_blocks(tall_bsc_ctx) == 13
 
 ===== test_no_auth_reuse_utran
 - Location Update request causes a GSUP Send Auth Info request to HLR
-  MSC <--RAN_UTRAN_IU-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
+  MSC <--UTRAN-Iu-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -2283,7 +2283,7 @@ DREF VLR subscr IMSI-901700000010650 usage decreases to: 1
   auth_request_sent == 1
   lu_result_sent == 0
 - MS sends Authen Response, VLR accepts and sends SecurityModeControl
-  MSC <--RAN_UTRAN_IU-- MS: GSM48_MT_MM_AUTH_RESP
+  MSC <--UTRAN-Iu-- MS: GSM48_MT_MM_AUTH_RESP
 DREF IMSI-901700000010650: MSC conn use + dtap == 1 (0x2: dtap)
 DRLL Dispatching 04.08 message GSM48_MT_MM_AUTH_RESP (0x5:0x14)
 DMM IMSI-901700000010650: MM UMTS AUTHENTICATION RESPONSE (res = e229c19e791f2e41)
@@ -2313,7 +2313,7 @@ DMM <- SECURITY MODE COMPLETE IMSI-901700000010650
 DVLR vlr_lu_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU){VLR_ULA_S_WAIT_CIPH}: Received Event VLR_ULA_E_CIPH_RES
 DVLR vlr_lu_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU){VLR_ULA_S_WAIT_CIPH}: vlr_loc_upd_post_ciph()
 DIUCS IMSI-901700000010650: tx CommonID 901700000010650
-- Iu Common ID --RAN_UTRAN_IU--> MS (IMSI=901700000010650)
+- Iu Common ID --UTRAN-Iu--> MS (IMSI=901700000010650)
 DVLR vlr_lu_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU){VLR_ULA_S_WAIT_CIPH}: vlr_loc_upd_node_4()
 DVLR vlr_lu_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU){VLR_ULA_S_WAIT_CIPH}: state_chg to VLR_ULA_S_WAIT_HLR_UPD
 DVLR upd_hlr_vlr_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: Allocated
@@ -2380,7 +2380,7 @@ DREF VLR subscr IMSI-901700000010650_MSISDN-42342 usage increases to: 2
   vsub->tmsi == 0xffffffff
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342 usage decreases to: 1
 - MS sends TMSI Realloc Complete
-  MSC <--RAN_UTRAN_IU-- MS: GSM48_MT_MM_TMSI_REALL_COMPL
+  MSC <--UTRAN-Iu-- MS: GSM48_MT_MM_TMSI_REALL_COMPL
 DREF IMSI-901700000010650_MSISDN-42342: MSC conn use + dtap == 1 (0x2: dtap)
 DRLL Dispatching 04.08 message GSM48_MT_MM_TMSI_REALL_COMPL (0x5:0x1b)
 DMM TMSI Reallocation Completed. Subscriber: IMSI-901700000010650_MSISDN-42342
@@ -2401,7 +2401,7 @@ DMM RAN_conn(UTRAN-Iu-42_IMSI-901700000010650_MSISDN-42342_LU){RAN_CONN_S_ACCEPT
 DREF IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: MSC conn use + release == 2 (0x102: dtap,release)
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 usage increases to: 3
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 usage decreases to: 2
-- Iu Release --RAN_UTRAN_IU--> MS
+- Iu Release --UTRAN-Iu--> MS
 DREF IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: MSC conn use - dtap == 1 (0x100: release)
   iu_release_sent == 1
 - RNC sends Iu Release Complete
@@ -2427,7 +2427,7 @@ DREF VLR subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 usage increase
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 usage decreases to: 1
 ---
 - after a while, a new conn sends a CM Service Request. VLR responds with Auth Req, and needs to request a second auth vector from HLR
-  MSC <--RAN_UTRAN_IU-- MS: GSM48_MT_MM_CM_SERV_REQ
+  MSC <--UTRAN-Iu-- MS: GSM48_MT_MM_CM_SERV_REQ
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -2475,7 +2475,7 @@ DREF VLR subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 usage decrease
   auth_request_sent == 1
   cm_service_result_sent == 0
 - MS sends Authen Response, VLR accepts and sends SecurityModeControl
-  MSC <--RAN_UTRAN_IU-- MS: GSM48_MT_MM_AUTH_RESP
+  MSC <--UTRAN-Iu-- MS: GSM48_MT_MM_AUTH_RESP
 DREF IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: MSC conn use + dtap == 1 (0x2: dtap)
 DRLL Dispatching 04.08 message GSM48_MT_MM_AUTH_RESP (0x5:0x14)
 DMM IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: MM UMTS AUTHENTICATION RESPONSE (res = 7db47cf7f81e4dc7)
@@ -2505,7 +2505,7 @@ DMM <- SECURITY MODE COMPLETE IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100
 DVLR Process_Access_Request_VLR(UTRAN-Iu-42_IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100_CM_SERVICE_REQ){PR_ARQ_S_WAIT_CIPH}: Received Event PR_ARQ_E_CIPH_RES
 DVLR Process_Access_Request_VLR(UTRAN-Iu-42_IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100_CM_SERVICE_REQ){PR_ARQ_S_WAIT_CIPH}: _proc_arq_vlr_node2_post_ciph()
 DIUCS IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: tx CommonID 901700000010650
-- Iu Common ID --RAN_UTRAN_IU--> MS (IMSI=901700000010650)
+- Iu Common ID --UTRAN-Iu--> MS (IMSI=901700000010650)
 DVLR Process_Access_Request_VLR(UTRAN-Iu-42_IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100_CM_SERVICE_REQ){PR_ARQ_S_WAIT_CIPH}: _proc_arq_vlr_node2_post_vlr()
 DVLR Process_Access_Request_VLR(UTRAN-Iu-42_IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100_CM_SERVICE_REQ){PR_ARQ_S_WAIT_CIPH}: _proc_arq_vlr_post_pres()
 DVLR Process_Access_Request_VLR(UTRAN-Iu-42_IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100_CM_SERVICE_REQ){PR_ARQ_S_WAIT_CIPH}: _proc_arq_vlr_post_trace()
@@ -2525,7 +2525,7 @@ DMM RAN_conn(UTRAN-Iu-42_IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100_CM_SE
 DREF IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: MSC conn use + release == 1 (0x100: release)
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 usage increases to: 3
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 usage decreases to: 2
-- Iu Release --RAN_UTRAN_IU--> MS
+- Iu Release --UTRAN-Iu--> MS
   iu_release_sent == 1
 - RNC sends Iu Release Complete
 DREF IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: MSC conn use - release == 0 (0x0: )
@@ -2544,7 +2544,7 @@ DMM RAN_conn(UTRAN-Iu-42_IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100_CM_SE
   llist_count(&net->ran_conns) == 0
 ---
 - subscriber detaches
-  MSC <--RAN_UTRAN_IU-- MS: GSM48_MT_MM_IMSI_DETACH_IND
+  MSC <--UTRAN-Iu-- MS: GSM48_MT_MM_IMSI_DETACH_IND
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -2560,7 +2560,7 @@ DREF freeing VLR subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100
 DMM RAN_conn{RAN_CONN_S_NEW}: Received Event RAN_CONN_E_CN_CLOSE
 DMM RAN_conn{RAN_CONN_S_NEW}: state_chg to RAN_CONN_S_RELEASING
 DREF unknown: MSC conn use + release == 2 (0x101: compl_l3,release)
-- Iu Release --RAN_UTRAN_IU--> MS
+- Iu Release --UTRAN-Iu--> MS
 DREF unknown: MSC conn use - compl_l3 == 1 (0x100: release)
   iu_release_sent == 1
 - RNC sends Iu Release Complete
diff --git a/tests/msc_vlr/msc_vlr_test_call.c b/tests/msc_vlr/msc_vlr_test_call.c
index b1ff2c0f3..b5f6b6ce9 100644
--- a/tests/msc_vlr/msc_vlr_test_call.c
+++ b/tests/msc_vlr/msc_vlr_test_call.c
@@ -45,7 +45,7 @@ static void standard_lu()
 
 	net->authentication_required = true;
 	net->vlr->cfg.assign_tmsi = true;
-	rx_from_ran = RAN_UTRAN_IU;
+	rx_from_ran = OSMO_RAT_UTRAN_IU;
 
 	btw("Location Update request causes a GSUP Send Auth Info request to HLR");
 	lu_result_sent = RES_NONE;
diff --git a/tests/msc_vlr/msc_vlr_test_call.err b/tests/msc_vlr/msc_vlr_test_call.err
index 1b41e3459..8f65c5851 100644
--- a/tests/msc_vlr/msc_vlr_test_call.err
+++ b/tests/msc_vlr/msc_vlr_test_call.err
@@ -4,7 +4,7 @@ talloc_total_blocks(tall_bsc_ctx) == 13
 ===== test_call_mo
 - Total time passed: 0.000000 s
 - Location Update request causes a GSUP Send Auth Info request to HLR
-  MSC <--RAN_UTRAN_IU-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
+  MSC <--UTRAN-Iu-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -53,7 +53,7 @@ DREF VLR subscr IMSI-901700000010650 usage decreases to: 1
   auth_request_sent == 1
   lu_result_sent == 0
 - MS sends Authen Response, VLR accepts and sends SecurityModeControl
-  MSC <--RAN_UTRAN_IU-- MS: GSM48_MT_MM_AUTH_RESP
+  MSC <--UTRAN-Iu-- MS: GSM48_MT_MM_AUTH_RESP
 DREF IMSI-901700000010650: MSC conn use + dtap == 1 (0x2: dtap)
 DRLL Dispatching 04.08 message GSM48_MT_MM_AUTH_RESP (0x5:0x14)
 DMM IMSI-901700000010650: MM UMTS AUTHENTICATION RESPONSE (res = e229c19e791f2e41)
@@ -83,7 +83,7 @@ DMM <- SECURITY MODE COMPLETE IMSI-901700000010650
 DVLR vlr_lu_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU){VLR_ULA_S_WAIT_CIPH}: Received Event VLR_ULA_E_CIPH_RES
 DVLR vlr_lu_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU){VLR_ULA_S_WAIT_CIPH}: vlr_loc_upd_post_ciph()
 DIUCS IMSI-901700000010650: tx CommonID 901700000010650
-- Iu Common ID --RAN_UTRAN_IU--> MS (IMSI=901700000010650)
+- Iu Common ID --UTRAN-Iu--> MS (IMSI=901700000010650)
 DVLR vlr_lu_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU){VLR_ULA_S_WAIT_CIPH}: vlr_loc_upd_node_4()
 DVLR vlr_lu_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU){VLR_ULA_S_WAIT_CIPH}: state_chg to VLR_ULA_S_WAIT_HLR_UPD
 DVLR upd_hlr_vlr_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: Allocated
@@ -134,7 +134,7 @@ DREF VLR subscr IMSI-901700000010650_MSISDN-42342 usage decreases to: 1
   llist_count(&net->ran_conns) == 1
 ran_conn_is_accepted() == false
 - MS sends TMSI Realloc Complete
-  MSC <--RAN_UTRAN_IU-- MS: GSM48_MT_MM_TMSI_REALL_COMPL
+  MSC <--UTRAN-Iu-- MS: GSM48_MT_MM_TMSI_REALL_COMPL
 DREF IMSI-901700000010650_MSISDN-42342: MSC conn use + dtap == 1 (0x2: dtap)
 DRLL Dispatching 04.08 message GSM48_MT_MM_TMSI_REALL_COMPL (0x5:0x1b)
 DMM TMSI Reallocation Completed. Subscriber: IMSI-901700000010650_MSISDN-42342
@@ -155,7 +155,7 @@ DMM RAN_conn(UTRAN-Iu-42_IMSI-901700000010650_MSISDN-42342_LU){RAN_CONN_S_ACCEPT
 DREF IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: MSC conn use + release == 2 (0x102: dtap,release)
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 usage increases to: 3
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 usage decreases to: 2
-- Iu Release --RAN_UTRAN_IU--> MS
+- Iu Release --UTRAN-Iu--> MS
 DREF IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: MSC conn use - dtap == 1 (0x100: release)
   iu_release_sent == 1
 - LU was successful, and the conn has already been closed
@@ -181,7 +181,7 @@ DREF VLR subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 usage increase
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 usage decreases to: 1
 ---
 - after a while, a new conn sends a CM Service Request. VLR responds with Auth Req, 2nd auth vector
-  MSC <--RAN_UTRAN_IU-- MS: GSM48_MT_MM_CM_SERV_REQ
+  MSC <--UTRAN-Iu-- MS: GSM48_MT_MM_CM_SERV_REQ
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -217,7 +217,7 @@ DMM RAN_conn(UTRAN-Iu-42_IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100_CM_SE
 - needs auth, not yet accepted
 ran_conn_is_accepted() == false
 - MS sends Authen Response, VLR accepts and sends SecurityModeControl
-  MSC <--RAN_UTRAN_IU-- MS: GSM48_MT_MM_AUTH_RESP
+  MSC <--UTRAN-Iu-- MS: GSM48_MT_MM_AUTH_RESP
 DREF IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: MSC conn use + dtap == 1 (0x2: dtap)
 DRLL Dispatching 04.08 message GSM48_MT_MM_AUTH_RESP (0x5:0x14)
 DMM IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: MM UMTS AUTHENTICATION RESPONSE (res = 7db47cf7f81e4dc7)
@@ -247,7 +247,7 @@ DMM <- SECURITY MODE COMPLETE IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100
 DVLR Process_Access_Request_VLR(UTRAN-Iu-42_IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100_CM_SERVICE_REQ){PR_ARQ_S_WAIT_CIPH}: Received Event PR_ARQ_E_CIPH_RES
 DVLR Process_Access_Request_VLR(UTRAN-Iu-42_IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100_CM_SERVICE_REQ){PR_ARQ_S_WAIT_CIPH}: _proc_arq_vlr_node2_post_ciph()
 DIUCS IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: tx CommonID 901700000010650
-- Iu Common ID --RAN_UTRAN_IU--> MS (IMSI=901700000010650)
+- Iu Common ID --UTRAN-Iu--> MS (IMSI=901700000010650)
 DVLR Process_Access_Request_VLR(UTRAN-Iu-42_IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100_CM_SERVICE_REQ){PR_ARQ_S_WAIT_CIPH}: _proc_arq_vlr_node2_post_vlr()
 DVLR Process_Access_Request_VLR(UTRAN-Iu-42_IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100_CM_SERVICE_REQ){PR_ARQ_S_WAIT_CIPH}: _proc_arq_vlr_post_pres()
 DVLR Process_Access_Request_VLR(UTRAN-Iu-42_IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100_CM_SERVICE_REQ){PR_ARQ_S_WAIT_CIPH}: _proc_arq_vlr_post_trace()
@@ -263,7 +263,7 @@ DMM RAN_conn(UTRAN-Iu-42_IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100_CM_SE
 ---
 - a call is initiated
 - SETUP gets forwarded to MNCC
-  MSC <--RAN_UTRAN_IU-- MS: GSM48_MT_CC_SETUP
+  MSC <--UTRAN-Iu-- MS: GSM48_MT_CC_SETUP
 DREF IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: MSC conn use + dtap == 2 (0xa: dtap,cm_service)
 DRLL Dispatching 04.08 message GSM48_MT_CC_SETUP (0x3:0x5)
 DCC Unknown transaction ID 8, creating new trans.
@@ -287,8 +287,8 @@ DCC (sub 42342) stopping pending guard timer
 DCC (sub 42342) starting guard timer with 180 seconds
 DCC (ti 08 sub 42342) Received 'MNCC_CALL_PROC_REQ' from MNCC in state 1 (INITIATED)
 DCC (ti 08 sub IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100) new state INITIATED -> MO_CALL_PROC
-DMSC msc_tx 2 bytes to IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 via RAN_UTRAN_IU
-- DTAP --RAN_UTRAN_IU--> MS: GSM48_MT_CC_CALL_PROC: 8302
+DMSC msc_tx 2 bytes to IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 via UTRAN-Iu
+- DTAP --UTRAN-Iu--> MS: GSM48_MT_CC_CALL_PROC: 8302
 - DTAP matches expected message
   MS <--Call Assignment-- MSC: subscr=IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 callref=0x80000001
 - Total time passed: 1.000023 s
@@ -298,8 +298,8 @@ DCC (sub 42342) stopping pending guard timer
 DCC (sub 42342) starting guard timer with 180 seconds
 DCC (ti 08 sub 42342) Received 'MNCC_ALERT_REQ' from MNCC in state 3 (MO_CALL_PROC)
 DCC (ti 08 sub IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100) new state MO_CALL_PROC -> CALL_DELIVERED
-DMSC msc_tx 2 bytes to IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 via RAN_UTRAN_IU
-- DTAP --RAN_UTRAN_IU--> MS: GSM48_MT_CC_ALERTING: 8301
+DMSC msc_tx 2 bytes to IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 via UTRAN-Iu
+- DTAP --UTRAN-Iu--> MS: GSM48_MT_CC_ALERTING: 8301
 - DTAP matches expected message
 DMNCC receive message MNCC_SETUP_RSP
 DCC (sub 42342) stopping pending guard timer
@@ -307,11 +307,11 @@ DCC (sub 42342) starting guard timer with 180 seconds
 DCC (ti 08 sub 42342) Received 'MNCC_SETUP_RSP' from MNCC in state 4 (CALL_DELIVERED)
 DCC starting timer T313 with 30 seconds
 DCC (ti 08 sub IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100) new state CALL_DELIVERED -> CONNECT_IND
-DMSC msc_tx 2 bytes to IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 via RAN_UTRAN_IU
-- DTAP --RAN_UTRAN_IU--> MS: GSM48_MT_CC_CONNECT: 8307
+DMSC msc_tx 2 bytes to IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 via UTRAN-Iu
+- DTAP --UTRAN-Iu--> MS: GSM48_MT_CC_CONNECT: 8307
 - DTAP matches expected message
 - Total time passed: 2.000046 s
-  MSC <--RAN_UTRAN_IU-- MS: GSM48_MT_CC_CONNECT_ACK
+  MSC <--UTRAN-Iu-- MS: GSM48_MT_CC_CONNECT_ACK
 DREF IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: MSC conn use + dtap == 2 (0x12: dtap,trans_cc)
 DRLL Dispatching 04.08 message GSM48_MT_CC_CONNECT_ACK (0x3:0xf)
 DCC stopping pending timer T313
@@ -327,7 +327,7 @@ DREF IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: MSC conn use - dtap == 1
 - Total time passed: 125.000091 s
 ---
 - Call ends
-  MSC <--RAN_UTRAN_IU-- MS: GSM48_MT_CC_DISCONNECT
+  MSC <--UTRAN-Iu-- MS: GSM48_MT_CC_DISCONNECT
 DREF IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: MSC conn use + dtap == 2 (0x12: dtap,trans_cc)
 DRLL Dispatching 04.08 message GSM48_MT_CC_DISCONNECT (0x3:0x25)
 DCC (ti 08 sub IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100) new state ACTIVE -> DISCONNECT_IND
@@ -341,10 +341,10 @@ DCC (sub 42342) starting guard timer with 180 seconds
 DCC (ti 08 sub 42342) Received 'MNCC_REL_REQ' from MNCC in state 12 (DISCONNECT_IND)
 DCC starting timer T308 with 10 seconds
 DCC (ti 08 sub IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100) new state DISCONNECT_IND -> RELEASE_REQ
-DMSC msc_tx 2 bytes to IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 via RAN_UTRAN_IU
-- DTAP --RAN_UTRAN_IU--> MS: GSM48_MT_CC_RELEASE: 832d
+DMSC msc_tx 2 bytes to IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 via UTRAN-Iu
+- DTAP --UTRAN-Iu--> MS: GSM48_MT_CC_RELEASE: 832d
 - DTAP matches expected message
-  MSC <--RAN_UTRAN_IU-- MS: GSM48_MT_CC_RELEASE_COMPL
+  MSC <--UTRAN-Iu-- MS: GSM48_MT_CC_RELEASE_COMPL
 DREF IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: MSC conn use + dtap == 2 (0x12: dtap,trans_cc)
 DRLL Dispatching 04.08 message GSM48_MT_CC_RELEASE_COMPL (0x3:0x2a)
 DCC stopping pending timer T308
@@ -363,7 +363,7 @@ DMM RAN_conn(UTRAN-Iu-42_IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100_CM_SE
 DREF IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: MSC conn use + release == 1 (0x100: release)
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 usage increases to: 3
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 usage decreases to: 2
-- Iu Release --RAN_UTRAN_IU--> MS
+- Iu Release --UTRAN-Iu--> MS
 - RNC sends Iu Release Complete
 DREF IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: MSC conn use - release == 0 (0x0: )
 DMM RAN_conn(UTRAN-Iu-42_IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100_CM_SERVICE_REQ){RAN_CONN_S_RELEASING}: Received Event RAN_CONN_E_UNUSED
@@ -387,7 +387,7 @@ talloc_total_blocks(tall_bsc_ctx) == 13
 ===== test_call_mt
 - Total time passed: 0.000000 s
 - Location Update request causes a GSUP Send Auth Info request to HLR
-  MSC <--RAN_UTRAN_IU-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
+  MSC <--UTRAN-Iu-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -436,7 +436,7 @@ DREF VLR subscr IMSI-901700000010650 usage decreases to: 1
   auth_request_sent == 1
   lu_result_sent == 0
 - MS sends Authen Response, VLR accepts and sends SecurityModeControl
-  MSC <--RAN_UTRAN_IU-- MS: GSM48_MT_MM_AUTH_RESP
+  MSC <--UTRAN-Iu-- MS: GSM48_MT_MM_AUTH_RESP
 DREF IMSI-901700000010650: MSC conn use + dtap == 1 (0x2: dtap)
 DRLL Dispatching 04.08 message GSM48_MT_MM_AUTH_RESP (0x5:0x14)
 DMM IMSI-901700000010650: MM UMTS AUTHENTICATION RESPONSE (res = e229c19e791f2e41)
@@ -466,7 +466,7 @@ DMM <- SECURITY MODE COMPLETE IMSI-901700000010650
 DVLR vlr_lu_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU){VLR_ULA_S_WAIT_CIPH}: Received Event VLR_ULA_E_CIPH_RES
 DVLR vlr_lu_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU){VLR_ULA_S_WAIT_CIPH}: vlr_loc_upd_post_ciph()
 DIUCS IMSI-901700000010650: tx CommonID 901700000010650
-- Iu Common ID --RAN_UTRAN_IU--> MS (IMSI=901700000010650)
+- Iu Common ID --UTRAN-Iu--> MS (IMSI=901700000010650)
 DVLR vlr_lu_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU){VLR_ULA_S_WAIT_CIPH}: vlr_loc_upd_node_4()
 DVLR vlr_lu_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU){VLR_ULA_S_WAIT_CIPH}: state_chg to VLR_ULA_S_WAIT_HLR_UPD
 DVLR upd_hlr_vlr_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: Allocated
@@ -517,7 +517,7 @@ DREF VLR subscr IMSI-901700000010650_MSISDN-42342 usage decreases to: 1
   llist_count(&net->ran_conns) == 1
 ran_conn_is_accepted() == false
 - MS sends TMSI Realloc Complete
-  MSC <--RAN_UTRAN_IU-- MS: GSM48_MT_MM_TMSI_REALL_COMPL
+  MSC <--UTRAN-Iu-- MS: GSM48_MT_MM_TMSI_REALL_COMPL
 DREF IMSI-901700000010650_MSISDN-42342: MSC conn use + dtap == 1 (0x2: dtap)
 DRLL Dispatching 04.08 message GSM48_MT_MM_TMSI_REALL_COMPL (0x5:0x1b)
 DMM TMSI Reallocation Completed. Subscriber: IMSI-901700000010650_MSISDN-42342
@@ -538,7 +538,7 @@ DMM RAN_conn(UTRAN-Iu-42_IMSI-901700000010650_MSISDN-42342_LU){RAN_CONN_S_ACCEPT
 DREF IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: MSC conn use + release == 2 (0x102: dtap,release)
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 usage increases to: 3
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 usage decreases to: 2
-- Iu Release --RAN_UTRAN_IU--> MS
+- Iu Release --UTRAN-Iu--> MS
 DREF IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: MSC conn use - dtap == 1 (0x100: release)
   iu_release_sent == 1
 - LU was successful, and the conn has already been closed
@@ -569,14 +569,14 @@ DREF VLR subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 usage increase
 DCC (ti ff sub IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 callref 423) New transaction
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 usage increases to: 3
 DMM Subscriber IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 not paged yet, start paging.
-  RAN_UTRAN_IU sends out paging request to IMSI 901700000010650, TMSI 0x03020100, LAC 23
+  UTRAN-Iu sends out paging request to IMSI 901700000010650, TMSI 0x03020100, LAC 23
   strcmp(paging_expecting_imsi, imsi) == 0
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 usage increases to: 4
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 usage decreases to: 3
   paging_sent == 1
   paging_stopped == 0
 - MS replies with Paging Response, and VLR sends Auth Request
-  MSC <--RAN_UTRAN_IU-- MS: GSM48_MT_RR_PAG_RESP
+  MSC <--UTRAN-Iu-- MS: GSM48_MT_RR_PAG_RESP
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -609,7 +609,7 @@ DMM RAN_conn(UTRAN-Iu-42_IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100_PAGIN
 DMM RAN_conn(UTRAN-Iu-42_IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100_PAGING_RESP){RAN_CONN_S_AUTH_CIPH}: Awaiting results for Auth+Ciph, overruling event RAN_CONN_E_UNUSED
   auth_request_sent == 1
 - MS sends Authen Response, VLR accepts and sends SecurityModeControl
-  MSC <--RAN_UTRAN_IU-- MS: GSM48_MT_MM_AUTH_RESP
+  MSC <--UTRAN-Iu-- MS: GSM48_MT_MM_AUTH_RESP
 DREF IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: MSC conn use + dtap == 1 (0x2: dtap)
 DRLL Dispatching 04.08 message GSM48_MT_MM_AUTH_RESP (0x5:0x14)
 DMM IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: MM UMTS AUTHENTICATION RESPONSE (res = 7db47cf7f81e4dc7)
@@ -638,7 +638,7 @@ DMM <- SECURITY MODE COMPLETE IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100
 DVLR Process_Access_Request_VLR(UTRAN-Iu-42_IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100_PAGING_RESP){PR_ARQ_S_WAIT_CIPH}: Received Event PR_ARQ_E_CIPH_RES
 DVLR Process_Access_Request_VLR(UTRAN-Iu-42_IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100_PAGING_RESP){PR_ARQ_S_WAIT_CIPH}: _proc_arq_vlr_node2_post_ciph()
 DIUCS IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: tx CommonID 901700000010650
-- Iu Common ID --RAN_UTRAN_IU--> MS (IMSI=901700000010650)
+- Iu Common ID --UTRAN-Iu--> MS (IMSI=901700000010650)
 DVLR Process_Access_Request_VLR(UTRAN-Iu-42_IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100_PAGING_RESP){PR_ARQ_S_WAIT_CIPH}: _proc_arq_vlr_node2_post_vlr()
 DVLR Process_Access_Request_VLR(UTRAN-Iu-42_IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100_PAGING_RESP){PR_ARQ_S_WAIT_CIPH}: _proc_arq_vlr_post_pres()
 DVLR Process_Access_Request_VLR(UTRAN-Iu-42_IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100_PAGING_RESP){PR_ARQ_S_WAIT_CIPH}: _proc_arq_vlr_post_trace()
@@ -653,14 +653,14 @@ DCC Paging subscr 42342 succeeded!
 DREF IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: MSC conn use + trans_cc == 1 (0x10: trans_cc)
 DCC starting timer T303 with 30 seconds
 DCC (ti 00 sub IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100) new state NULL -> CALL_PRESENT
-DMSC msc_tx 2 bytes to IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 via RAN_UTRAN_IU
-- DTAP --RAN_UTRAN_IU--> MS: GSM48_MT_CC_SETUP: 0305
+DMSC msc_tx 2 bytes to IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 via UTRAN-Iu
+- DTAP --UTRAN-Iu--> MS: GSM48_MT_CC_SETUP: 0305
 - DTAP matches expected message
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 usage decreases to: 3
 DMM RAN_conn(UTRAN-Iu-42_IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100_PAGING_RESP){RAN_CONN_S_AUTH_CIPH}: state_chg to RAN_CONN_S_ACCEPTED
 DMM RAN_conn(UTRAN-Iu-42_IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100_PAGING_RESP){RAN_CONN_S_ACCEPTED}: ran_conn_fsm_has_active_transactions: connection still has active transaction: CC
   paging_stopped == 1
-  MSC <--RAN_UTRAN_IU-- MS: GSM48_MT_CC_CALL_CONF
+  MSC <--UTRAN-Iu-- MS: GSM48_MT_CC_CALL_CONF
 DREF IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: MSC conn use + dtap == 2 (0x12: dtap,trans_cc)
 DRLL Dispatching 04.08 message GSM48_MT_CC_CALL_CONF (0x3:0x8)
 DCC stopping pending timer T303
@@ -674,7 +674,7 @@ DMM RAN_conn(UTRAN-Iu-42_IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100_PAGIN
 DMM RAN_conn(UTRAN-Iu-42_IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100_PAGING_RESP){RAN_CONN_S_ACCEPTED}: state_chg to RAN_CONN_S_COMMUNICATING
 DREF IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: MSC conn use - dtap == 1 (0x10: trans_cc)
 - Total time passed: 1.000023 s
-  MSC <--RAN_UTRAN_IU-- MS: GSM48_MT_CC_ALERTING
+  MSC <--UTRAN-Iu-- MS: GSM48_MT_CC_ALERTING
 DREF IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: MSC conn use + dtap == 2 (0x12: dtap,trans_cc)
 DRLL Dispatching 04.08 message GSM48_MT_CC_ALERTING (0x3:0x1)
 DCC stopping pending timer T310
@@ -686,7 +686,7 @@ DCC Sending 'MNCC_ALERT_IND' to MNCC.
 DMM RAN_conn(UTRAN-Iu-42_IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100_PAGING_RESP){RAN_CONN_S_COMMUNICATING}: Received Event RAN_CONN_E_COMMUNICATING
 DREF IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: MSC conn use - dtap == 1 (0x10: trans_cc)
 - Total time passed: 2.000046 s
-  MSC <--RAN_UTRAN_IU-- MS: GSM48_MT_CC_CONNECT
+  MSC <--UTRAN-Iu-- MS: GSM48_MT_CC_CONNECT
 DREF IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: MSC conn use + dtap == 2 (0x12: dtap,trans_cc)
 DRLL Dispatching 04.08 message GSM48_MT_CC_CONNECT (0x3:0x7)
 DCC stopping pending timer T301
@@ -701,15 +701,15 @@ DCC (sub 42342) starting guard timer with 180 seconds
 DCC (ti 00 sub 42342) Received 'MNCC_SETUP_COMPL_REQ' from MNCC in state 8 (CONNECT_REQUEST)
 DCC (ti 00 sub IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100) new state CONNECT_REQUEST -> ACTIVE
 DCC (sub 42342) stopping pending guard timer
-DMSC msc_tx 2 bytes to IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 via RAN_UTRAN_IU
-- DTAP --RAN_UTRAN_IU--> MS: GSM48_MT_CC_CONNECT_ACK: 030f
+DMSC msc_tx 2 bytes to IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 via UTRAN-Iu
+- DTAP --UTRAN-Iu--> MS: GSM48_MT_CC_CONNECT_ACK: 030f
 - DTAP matches expected message
 ---
 - RTP stream goes ahead, not shown here.
 - Total time passed: 125.000091 s
 ---
 - Call ends
-  MSC <--RAN_UTRAN_IU-- MS: GSM48_MT_CC_DISCONNECT
+  MSC <--UTRAN-Iu-- MS: GSM48_MT_CC_DISCONNECT
 DREF IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: MSC conn use + dtap == 2 (0x12: dtap,trans_cc)
 DRLL Dispatching 04.08 message GSM48_MT_CC_DISCONNECT (0x3:0x25)
 DCC (ti 00 sub IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100) new state ACTIVE -> DISCONNECT_IND
@@ -723,10 +723,10 @@ DCC (sub 42342) starting guard timer with 180 seconds
 DCC (ti 00 sub 42342) Received 'MNCC_REL_REQ' from MNCC in state 12 (DISCONNECT_IND)
 DCC starting timer T308 with 10 seconds
 DCC (ti 00 sub IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100) new state DISCONNECT_IND -> RELEASE_REQ
-DMSC msc_tx 2 bytes to IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 via RAN_UTRAN_IU
-- DTAP --RAN_UTRAN_IU--> MS: GSM48_MT_CC_RELEASE: 032d
+DMSC msc_tx 2 bytes to IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 via UTRAN-Iu
+- DTAP --UTRAN-Iu--> MS: GSM48_MT_CC_RELEASE: 032d
 - DTAP matches expected message
-  MSC <--RAN_UTRAN_IU-- MS: GSM48_MT_CC_RELEASE_COMPL
+  MSC <--UTRAN-Iu-- MS: GSM48_MT_CC_RELEASE_COMPL
 DREF IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: MSC conn use + dtap == 2 (0x12: dtap,trans_cc)
 DRLL Dispatching 04.08 message GSM48_MT_CC_RELEASE_COMPL (0x3:0x2a)
 DCC stopping pending timer T308
@@ -745,7 +745,7 @@ DMM RAN_conn(UTRAN-Iu-42_IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100_PAGIN
 DREF IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: MSC conn use + release == 1 (0x100: release)
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 usage increases to: 3
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 usage decreases to: 2
-- Iu Release --RAN_UTRAN_IU--> MS
+- Iu Release --UTRAN-Iu--> MS
 - RNC sends Iu Release Complete
 DREF IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: MSC conn use - release == 0 (0x0: )
 DMM RAN_conn(UTRAN-Iu-42_IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100_PAGING_RESP){RAN_CONN_S_RELEASING}: Received Event RAN_CONN_E_UNUSED
@@ -769,7 +769,7 @@ talloc_total_blocks(tall_bsc_ctx) == 13
 ===== test_call_mt2
 - Total time passed: 0.000000 s
 - Location Update request causes a GSUP Send Auth Info request to HLR
-  MSC <--RAN_UTRAN_IU-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
+  MSC <--UTRAN-Iu-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -818,7 +818,7 @@ DREF VLR subscr IMSI-901700000010650 usage decreases to: 1
   auth_request_sent == 1
   lu_result_sent == 0
 - MS sends Authen Response, VLR accepts and sends SecurityModeControl
-  MSC <--RAN_UTRAN_IU-- MS: GSM48_MT_MM_AUTH_RESP
+  MSC <--UTRAN-Iu-- MS: GSM48_MT_MM_AUTH_RESP
 DREF IMSI-901700000010650: MSC conn use + dtap == 1 (0x2: dtap)
 DRLL Dispatching 04.08 message GSM48_MT_MM_AUTH_RESP (0x5:0x14)
 DMM IMSI-901700000010650: MM UMTS AUTHENTICATION RESPONSE (res = e229c19e791f2e41)
@@ -848,7 +848,7 @@ DMM <- SECURITY MODE COMPLETE IMSI-901700000010650
 DVLR vlr_lu_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU){VLR_ULA_S_WAIT_CIPH}: Received Event VLR_ULA_E_CIPH_RES
 DVLR vlr_lu_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU){VLR_ULA_S_WAIT_CIPH}: vlr_loc_upd_post_ciph()
 DIUCS IMSI-901700000010650: tx CommonID 901700000010650
-- Iu Common ID --RAN_UTRAN_IU--> MS (IMSI=901700000010650)
+- Iu Common ID --UTRAN-Iu--> MS (IMSI=901700000010650)
 DVLR vlr_lu_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU){VLR_ULA_S_WAIT_CIPH}: vlr_loc_upd_node_4()
 DVLR vlr_lu_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU){VLR_ULA_S_WAIT_CIPH}: state_chg to VLR_ULA_S_WAIT_HLR_UPD
 DVLR upd_hlr_vlr_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: Allocated
@@ -899,7 +899,7 @@ DREF VLR subscr IMSI-901700000010650_MSISDN-42342 usage decreases to: 1
   llist_count(&net->ran_conns) == 1
 ran_conn_is_accepted() == false
 - MS sends TMSI Realloc Complete
-  MSC <--RAN_UTRAN_IU-- MS: GSM48_MT_MM_TMSI_REALL_COMPL
+  MSC <--UTRAN-Iu-- MS: GSM48_MT_MM_TMSI_REALL_COMPL
 DREF IMSI-901700000010650_MSISDN-42342: MSC conn use + dtap == 1 (0x2: dtap)
 DRLL Dispatching 04.08 message GSM48_MT_MM_TMSI_REALL_COMPL (0x5:0x1b)
 DMM TMSI Reallocation Completed. Subscriber: IMSI-901700000010650_MSISDN-42342
@@ -920,7 +920,7 @@ DMM RAN_conn(UTRAN-Iu-42_IMSI-901700000010650_MSISDN-42342_LU){RAN_CONN_S_ACCEPT
 DREF IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: MSC conn use + release == 2 (0x102: dtap,release)
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 usage increases to: 3
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 usage decreases to: 2
-- Iu Release --RAN_UTRAN_IU--> MS
+- Iu Release --UTRAN-Iu--> MS
 DREF IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: MSC conn use - dtap == 1 (0x100: release)
   iu_release_sent == 1
 - LU was successful, and the conn has already been closed
@@ -951,14 +951,14 @@ DREF VLR subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 usage increase
 DCC (ti ff sub IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 callref 423) New transaction
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 usage increases to: 3
 DMM Subscriber IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 not paged yet, start paging.
-  RAN_UTRAN_IU sends out paging request to IMSI 901700000010650, TMSI 0x03020100, LAC 23
+  UTRAN-Iu sends out paging request to IMSI 901700000010650, TMSI 0x03020100, LAC 23
   strcmp(paging_expecting_imsi, imsi) == 0
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 usage increases to: 4
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 usage decreases to: 3
   paging_sent == 1
   paging_stopped == 0
 - MS replies with Paging Response, and VLR sends Auth Request
-  MSC <--RAN_UTRAN_IU-- MS: GSM48_MT_RR_PAG_RESP
+  MSC <--UTRAN-Iu-- MS: GSM48_MT_RR_PAG_RESP
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -991,7 +991,7 @@ DMM RAN_conn(UTRAN-Iu-42_IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100_PAGIN
 DMM RAN_conn(UTRAN-Iu-42_IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100_PAGING_RESP){RAN_CONN_S_AUTH_CIPH}: Awaiting results for Auth+Ciph, overruling event RAN_CONN_E_UNUSED
   auth_request_sent == 1
 - MS sends Authen Response, VLR accepts and sends SecurityModeControl
-  MSC <--RAN_UTRAN_IU-- MS: GSM48_MT_MM_AUTH_RESP
+  MSC <--UTRAN-Iu-- MS: GSM48_MT_MM_AUTH_RESP
 DREF IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: MSC conn use + dtap == 1 (0x2: dtap)
 DRLL Dispatching 04.08 message GSM48_MT_MM_AUTH_RESP (0x5:0x14)
 DMM IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: MM UMTS AUTHENTICATION RESPONSE (res = 7db47cf7f81e4dc7)
@@ -1020,7 +1020,7 @@ DMM <- SECURITY MODE COMPLETE IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100
 DVLR Process_Access_Request_VLR(UTRAN-Iu-42_IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100_PAGING_RESP){PR_ARQ_S_WAIT_CIPH}: Received Event PR_ARQ_E_CIPH_RES
 DVLR Process_Access_Request_VLR(UTRAN-Iu-42_IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100_PAGING_RESP){PR_ARQ_S_WAIT_CIPH}: _proc_arq_vlr_node2_post_ciph()
 DIUCS IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: tx CommonID 901700000010650
-- Iu Common ID --RAN_UTRAN_IU--> MS (IMSI=901700000010650)
+- Iu Common ID --UTRAN-Iu--> MS (IMSI=901700000010650)
 DVLR Process_Access_Request_VLR(UTRAN-Iu-42_IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100_PAGING_RESP){PR_ARQ_S_WAIT_CIPH}: _proc_arq_vlr_node2_post_vlr()
 DVLR Process_Access_Request_VLR(UTRAN-Iu-42_IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100_PAGING_RESP){PR_ARQ_S_WAIT_CIPH}: _proc_arq_vlr_post_pres()
 DVLR Process_Access_Request_VLR(UTRAN-Iu-42_IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100_PAGING_RESP){PR_ARQ_S_WAIT_CIPH}: _proc_arq_vlr_post_trace()
@@ -1035,14 +1035,14 @@ DCC Paging subscr 42342 succeeded!
 DREF IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: MSC conn use + trans_cc == 1 (0x10: trans_cc)
 DCC starting timer T303 with 30 seconds
 DCC (ti 00 sub IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100) new state NULL -> CALL_PRESENT
-DMSC msc_tx 2 bytes to IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 via RAN_UTRAN_IU
-- DTAP --RAN_UTRAN_IU--> MS: GSM48_MT_CC_SETUP: 0305
+DMSC msc_tx 2 bytes to IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 via UTRAN-Iu
+- DTAP --UTRAN-Iu--> MS: GSM48_MT_CC_SETUP: 0305
 - DTAP matches expected message
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 usage decreases to: 3
 DMM RAN_conn(UTRAN-Iu-42_IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100_PAGING_RESP){RAN_CONN_S_AUTH_CIPH}: state_chg to RAN_CONN_S_ACCEPTED
 DMM RAN_conn(UTRAN-Iu-42_IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100_PAGING_RESP){RAN_CONN_S_ACCEPTED}: ran_conn_fsm_has_active_transactions: connection still has active transaction: CC
   paging_stopped == 1
-  MSC <--RAN_UTRAN_IU-- MS: GSM48_MT_CC_CALL_CONF
+  MSC <--UTRAN-Iu-- MS: GSM48_MT_CC_CALL_CONF
 DREF IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: MSC conn use + dtap == 2 (0x12: dtap,trans_cc)
 DRLL Dispatching 04.08 message GSM48_MT_CC_CALL_CONF (0x3:0x8)
 DCC stopping pending timer T303
@@ -1056,7 +1056,7 @@ DMM RAN_conn(UTRAN-Iu-42_IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100_PAGIN
 DMM RAN_conn(UTRAN-Iu-42_IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100_PAGING_RESP){RAN_CONN_S_ACCEPTED}: state_chg to RAN_CONN_S_COMMUNICATING
 DREF IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: MSC conn use - dtap == 1 (0x10: trans_cc)
 - Total time passed: 1.000023 s
-  MSC <--RAN_UTRAN_IU-- MS: GSM48_MT_CC_ALERTING
+  MSC <--UTRAN-Iu-- MS: GSM48_MT_CC_ALERTING
 DREF IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: MSC conn use + dtap == 2 (0x12: dtap,trans_cc)
 DRLL Dispatching 04.08 message GSM48_MT_CC_ALERTING (0x3:0x1)
 DCC stopping pending timer T310
@@ -1081,8 +1081,8 @@ DCC (sub 42342) starting guard timer with 180 seconds
 DCC (ti 00 sub 42342) Received 'MNCC_REL_REQ' from MNCC in state 7 (CALL_RECEIVED)
 DCC starting timer T308 with 10 seconds
 DCC (ti 00 sub IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100) new state CALL_RECEIVED -> RELEASE_REQ
-DMSC msc_tx 2 bytes to IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 via RAN_UTRAN_IU
-- DTAP --RAN_UTRAN_IU--> MS: GSM48_MT_CC_RELEASE: 032d
+DMSC msc_tx 2 bytes to IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 via UTRAN-Iu
+- DTAP --UTRAN-Iu--> MS: GSM48_MT_CC_RELEASE: 032d
 - DTAP matches expected message
 DMNCC transmit message MNCC_REL_CNF
 DCC Sending 'MNCC_REL_CNF' to MNCC.
@@ -1092,7 +1092,7 @@ DCC (ti 00 sub IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100) new state RELE
 DCC (sub 42342) stopping pending guard timer
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 usage decreases to: 2
 DREF IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: MSC conn use - trans_cc == 1 (0x100: release)
-- Iu Release --RAN_UTRAN_IU--> MS
+- Iu Release --UTRAN-Iu--> MS
 - RNC sends Iu Release Complete
 DREF IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: MSC conn use - release == 0 (0x0: )
 DMM RAN_conn(UTRAN-Iu-42_IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100_PAGING_RESP){RAN_CONN_S_RELEASING}: Received Event RAN_CONN_E_UNUSED
@@ -1117,7 +1117,7 @@ talloc_total_blocks(tall_bsc_ctx) == 13
 ===== test_call_mo_to_unknown
 - Total time passed: 0.000000 s
 - Location Update request causes a GSUP Send Auth Info request to HLR
-  MSC <--RAN_UTRAN_IU-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
+  MSC <--UTRAN-Iu-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -1166,7 +1166,7 @@ DREF VLR subscr IMSI-901700000010650 usage decreases to: 1
   auth_request_sent == 1
   lu_result_sent == 0
 - MS sends Authen Response, VLR accepts and sends SecurityModeControl
-  MSC <--RAN_UTRAN_IU-- MS: GSM48_MT_MM_AUTH_RESP
+  MSC <--UTRAN-Iu-- MS: GSM48_MT_MM_AUTH_RESP
 DREF IMSI-901700000010650: MSC conn use + dtap == 1 (0x2: dtap)
 DRLL Dispatching 04.08 message GSM48_MT_MM_AUTH_RESP (0x5:0x14)
 DMM IMSI-901700000010650: MM UMTS AUTHENTICATION RESPONSE (res = e229c19e791f2e41)
@@ -1196,7 +1196,7 @@ DMM <- SECURITY MODE COMPLETE IMSI-901700000010650
 DVLR vlr_lu_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU){VLR_ULA_S_WAIT_CIPH}: Received Event VLR_ULA_E_CIPH_RES
 DVLR vlr_lu_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU){VLR_ULA_S_WAIT_CIPH}: vlr_loc_upd_post_ciph()
 DIUCS IMSI-901700000010650: tx CommonID 901700000010650
-- Iu Common ID --RAN_UTRAN_IU--> MS (IMSI=901700000010650)
+- Iu Common ID --UTRAN-Iu--> MS (IMSI=901700000010650)
 DVLR vlr_lu_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU){VLR_ULA_S_WAIT_CIPH}: vlr_loc_upd_node_4()
 DVLR vlr_lu_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU){VLR_ULA_S_WAIT_CIPH}: state_chg to VLR_ULA_S_WAIT_HLR_UPD
 DVLR upd_hlr_vlr_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: Allocated
@@ -1247,7 +1247,7 @@ DREF VLR subscr IMSI-901700000010650_MSISDN-42342 usage decreases to: 1
   llist_count(&net->ran_conns) == 1
 ran_conn_is_accepted() == false
 - MS sends TMSI Realloc Complete
-  MSC <--RAN_UTRAN_IU-- MS: GSM48_MT_MM_TMSI_REALL_COMPL
+  MSC <--UTRAN-Iu-- MS: GSM48_MT_MM_TMSI_REALL_COMPL
 DREF IMSI-901700000010650_MSISDN-42342: MSC conn use + dtap == 1 (0x2: dtap)
 DRLL Dispatching 04.08 message GSM48_MT_MM_TMSI_REALL_COMPL (0x5:0x1b)
 DMM TMSI Reallocation Completed. Subscriber: IMSI-901700000010650_MSISDN-42342
@@ -1268,7 +1268,7 @@ DMM RAN_conn(UTRAN-Iu-42_IMSI-901700000010650_MSISDN-42342_LU){RAN_CONN_S_ACCEPT
 DREF IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: MSC conn use + release == 2 (0x102: dtap,release)
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 usage increases to: 3
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 usage decreases to: 2
-- Iu Release --RAN_UTRAN_IU--> MS
+- Iu Release --UTRAN-Iu--> MS
 DREF IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: MSC conn use - dtap == 1 (0x100: release)
   iu_release_sent == 1
 - LU was successful, and the conn has already been closed
@@ -1294,7 +1294,7 @@ DREF VLR subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 usage increase
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 usage decreases to: 1
 ---
 - after a while, a new conn sends a CM Service Request. VLR responds with Auth Req, 2nd auth vector
-  MSC <--RAN_UTRAN_IU-- MS: GSM48_MT_MM_CM_SERV_REQ
+  MSC <--UTRAN-Iu-- MS: GSM48_MT_MM_CM_SERV_REQ
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -1330,7 +1330,7 @@ DMM RAN_conn(UTRAN-Iu-42_IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100_CM_SE
 - needs auth, not yet accepted
 ran_conn_is_accepted() == false
 - MS sends Authen Response, VLR accepts and sends SecurityModeControl
-  MSC <--RAN_UTRAN_IU-- MS: GSM48_MT_MM_AUTH_RESP
+  MSC <--UTRAN-Iu-- MS: GSM48_MT_MM_AUTH_RESP
 DREF IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: MSC conn use + dtap == 1 (0x2: dtap)
 DRLL Dispatching 04.08 message GSM48_MT_MM_AUTH_RESP (0x5:0x14)
 DMM IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: MM UMTS AUTHENTICATION RESPONSE (res = 7db47cf7f81e4dc7)
@@ -1360,7 +1360,7 @@ DMM <- SECURITY MODE COMPLETE IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100
 DVLR Process_Access_Request_VLR(UTRAN-Iu-42_IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100_CM_SERVICE_REQ){PR_ARQ_S_WAIT_CIPH}: Received Event PR_ARQ_E_CIPH_RES
 DVLR Process_Access_Request_VLR(UTRAN-Iu-42_IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100_CM_SERVICE_REQ){PR_ARQ_S_WAIT_CIPH}: _proc_arq_vlr_node2_post_ciph()
 DIUCS IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: tx CommonID 901700000010650
-- Iu Common ID --RAN_UTRAN_IU--> MS (IMSI=901700000010650)
+- Iu Common ID --UTRAN-Iu--> MS (IMSI=901700000010650)
 DVLR Process_Access_Request_VLR(UTRAN-Iu-42_IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100_CM_SERVICE_REQ){PR_ARQ_S_WAIT_CIPH}: _proc_arq_vlr_node2_post_vlr()
 DVLR Process_Access_Request_VLR(UTRAN-Iu-42_IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100_CM_SERVICE_REQ){PR_ARQ_S_WAIT_CIPH}: _proc_arq_vlr_post_pres()
 DVLR Process_Access_Request_VLR(UTRAN-Iu-42_IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100_CM_SERVICE_REQ){PR_ARQ_S_WAIT_CIPH}: _proc_arq_vlr_post_trace()
@@ -1376,7 +1376,7 @@ DMM RAN_conn(UTRAN-Iu-42_IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100_CM_SE
 ---
 - a call is initiated
 - SETUP gets forwarded to MNCC
-  MSC <--RAN_UTRAN_IU-- MS: GSM48_MT_CC_SETUP
+  MSC <--UTRAN-Iu-- MS: GSM48_MT_CC_SETUP
 DREF IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: MSC conn use + dtap == 2 (0xa: dtap,cm_service)
 DRLL Dispatching 04.08 message GSM48_MT_CC_SETUP (0x3:0x5)
 DCC Unknown transaction ID 8, creating new trans.
@@ -1400,8 +1400,8 @@ DCC (sub 42342) stopping pending guard timer
 DCC (sub 42342) starting guard timer with 180 seconds
 DCC (ti 08 sub 42342) Received 'MNCC_CALL_PROC_REQ' from MNCC in state 1 (INITIATED)
 DCC (ti 08 sub IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100) new state INITIATED -> MO_CALL_PROC
-DMSC msc_tx 2 bytes to IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 via RAN_UTRAN_IU
-- DTAP --RAN_UTRAN_IU--> MS: GSM48_MT_CC_CALL_PROC: 8302
+DMSC msc_tx 2 bytes to IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 via UTRAN-Iu
+- DTAP --UTRAN-Iu--> MS: GSM48_MT_CC_CALL_PROC: 8302
 - DTAP matches expected message
   MS <--Call Assignment-- MSC: subscr=IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 callref=0x80000002
 - But the other side's MSISDN could not be resolved, MNCC tells us to cancel
@@ -1411,15 +1411,15 @@ DCC (sub 42342) starting guard timer with 180 seconds
 DCC (ti 08 sub 42342) Received 'MNCC_REL_REQ' from MNCC in state 3 (MO_CALL_PROC)
 DCC starting timer T308 with 10 seconds
 DCC (ti 08 sub IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100) new state MO_CALL_PROC -> RELEASE_REQ
-DMSC msc_tx 2 bytes to IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 via RAN_UTRAN_IU
-- DTAP --RAN_UTRAN_IU--> MS: GSM48_MT_CC_RELEASE: 832d
+DMSC msc_tx 2 bytes to IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 via UTRAN-Iu
+- DTAP --UTRAN-Iu--> MS: GSM48_MT_CC_RELEASE: 832d
 - DTAP matches expected message
 - Total time passed: 10.000023 s
 DCC starting timer T308 with 10 seconds
-DMSC msc_tx 2 bytes to IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 via RAN_UTRAN_IU
-- DTAP --RAN_UTRAN_IU--> MS: GSM48_MT_CC_RELEASE: 832d
+DMSC msc_tx 2 bytes to IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 via UTRAN-Iu
+- DTAP --UTRAN-Iu--> MS: GSM48_MT_CC_RELEASE: 832d
 - DTAP matches expected message
-  MSC <--RAN_UTRAN_IU-- MS: GSM48_MT_CC_RELEASE_COMPL
+  MSC <--UTRAN-Iu-- MS: GSM48_MT_CC_RELEASE_COMPL
 DREF IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: MSC conn use + dtap == 2 (0x12: dtap,trans_cc)
 DRLL Dispatching 04.08 message GSM48_MT_CC_RELEASE_COMPL (0x3:0x2a)
 DCC stopping pending timer T308
@@ -1438,7 +1438,7 @@ DMM RAN_conn(UTRAN-Iu-42_IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100_CM_SE
 DREF IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: MSC conn use + release == 1 (0x100: release)
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 usage increases to: 3
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 usage decreases to: 2
-- Iu Release --RAN_UTRAN_IU--> MS
+- Iu Release --UTRAN-Iu--> MS
 - RNC sends Iu Release Complete
 DREF IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: MSC conn use - release == 0 (0x0: )
 DMM RAN_conn(UTRAN-Iu-42_IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100_CM_SERVICE_REQ){RAN_CONN_S_RELEASING}: Received Event RAN_CONN_E_UNUSED
@@ -1462,7 +1462,7 @@ talloc_total_blocks(tall_bsc_ctx) == 13
 ===== test_call_mo_to_unknown_timeout
 - Total time passed: 0.000000 s
 - Location Update request causes a GSUP Send Auth Info request to HLR
-  MSC <--RAN_UTRAN_IU-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
+  MSC <--UTRAN-Iu-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -1511,7 +1511,7 @@ DREF VLR subscr IMSI-901700000010650 usage decreases to: 1
   auth_request_sent == 1
   lu_result_sent == 0
 - MS sends Authen Response, VLR accepts and sends SecurityModeControl
-  MSC <--RAN_UTRAN_IU-- MS: GSM48_MT_MM_AUTH_RESP
+  MSC <--UTRAN-Iu-- MS: GSM48_MT_MM_AUTH_RESP
 DREF IMSI-901700000010650: MSC conn use + dtap == 1 (0x2: dtap)
 DRLL Dispatching 04.08 message GSM48_MT_MM_AUTH_RESP (0x5:0x14)
 DMM IMSI-901700000010650: MM UMTS AUTHENTICATION RESPONSE (res = e229c19e791f2e41)
@@ -1541,7 +1541,7 @@ DMM <- SECURITY MODE COMPLETE IMSI-901700000010650
 DVLR vlr_lu_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU){VLR_ULA_S_WAIT_CIPH}: Received Event VLR_ULA_E_CIPH_RES
 DVLR vlr_lu_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU){VLR_ULA_S_WAIT_CIPH}: vlr_loc_upd_post_ciph()
 DIUCS IMSI-901700000010650: tx CommonID 901700000010650
-- Iu Common ID --RAN_UTRAN_IU--> MS (IMSI=901700000010650)
+- Iu Common ID --UTRAN-Iu--> MS (IMSI=901700000010650)
 DVLR vlr_lu_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU){VLR_ULA_S_WAIT_CIPH}: vlr_loc_upd_node_4()
 DVLR vlr_lu_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU){VLR_ULA_S_WAIT_CIPH}: state_chg to VLR_ULA_S_WAIT_HLR_UPD
 DVLR upd_hlr_vlr_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: Allocated
@@ -1592,7 +1592,7 @@ DREF VLR subscr IMSI-901700000010650_MSISDN-42342 usage decreases to: 1
   llist_count(&net->ran_conns) == 1
 ran_conn_is_accepted() == false
 - MS sends TMSI Realloc Complete
-  MSC <--RAN_UTRAN_IU-- MS: GSM48_MT_MM_TMSI_REALL_COMPL
+  MSC <--UTRAN-Iu-- MS: GSM48_MT_MM_TMSI_REALL_COMPL
 DREF IMSI-901700000010650_MSISDN-42342: MSC conn use + dtap == 1 (0x2: dtap)
 DRLL Dispatching 04.08 message GSM48_MT_MM_TMSI_REALL_COMPL (0x5:0x1b)
 DMM TMSI Reallocation Completed. Subscriber: IMSI-901700000010650_MSISDN-42342
@@ -1613,7 +1613,7 @@ DMM RAN_conn(UTRAN-Iu-42_IMSI-901700000010650_MSISDN-42342_LU){RAN_CONN_S_ACCEPT
 DREF IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: MSC conn use + release == 2 (0x102: dtap,release)
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 usage increases to: 3
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 usage decreases to: 2
-- Iu Release --RAN_UTRAN_IU--> MS
+- Iu Release --UTRAN-Iu--> MS
 DREF IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: MSC conn use - dtap == 1 (0x100: release)
   iu_release_sent == 1
 - LU was successful, and the conn has already been closed
@@ -1639,7 +1639,7 @@ DREF VLR subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 usage increase
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 usage decreases to: 1
 ---
 - after a while, a new conn sends a CM Service Request. VLR responds with Auth Req, 2nd auth vector
-  MSC <--RAN_UTRAN_IU-- MS: GSM48_MT_MM_CM_SERV_REQ
+  MSC <--UTRAN-Iu-- MS: GSM48_MT_MM_CM_SERV_REQ
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -1675,7 +1675,7 @@ DMM RAN_conn(UTRAN-Iu-42_IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100_CM_SE
 - needs auth, not yet accepted
 ran_conn_is_accepted() == false
 - MS sends Authen Response, VLR accepts and sends SecurityModeControl
-  MSC <--RAN_UTRAN_IU-- MS: GSM48_MT_MM_AUTH_RESP
+  MSC <--UTRAN-Iu-- MS: GSM48_MT_MM_AUTH_RESP
 DREF IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: MSC conn use + dtap == 1 (0x2: dtap)
 DRLL Dispatching 04.08 message GSM48_MT_MM_AUTH_RESP (0x5:0x14)
 DMM IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: MM UMTS AUTHENTICATION RESPONSE (res = 7db47cf7f81e4dc7)
@@ -1705,7 +1705,7 @@ DMM <- SECURITY MODE COMPLETE IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100
 DVLR Process_Access_Request_VLR(UTRAN-Iu-42_IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100_CM_SERVICE_REQ){PR_ARQ_S_WAIT_CIPH}: Received Event PR_ARQ_E_CIPH_RES
 DVLR Process_Access_Request_VLR(UTRAN-Iu-42_IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100_CM_SERVICE_REQ){PR_ARQ_S_WAIT_CIPH}: _proc_arq_vlr_node2_post_ciph()
 DIUCS IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: tx CommonID 901700000010650
-- Iu Common ID --RAN_UTRAN_IU--> MS (IMSI=901700000010650)
+- Iu Common ID --UTRAN-Iu--> MS (IMSI=901700000010650)
 DVLR Process_Access_Request_VLR(UTRAN-Iu-42_IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100_CM_SERVICE_REQ){PR_ARQ_S_WAIT_CIPH}: _proc_arq_vlr_node2_post_vlr()
 DVLR Process_Access_Request_VLR(UTRAN-Iu-42_IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100_CM_SERVICE_REQ){PR_ARQ_S_WAIT_CIPH}: _proc_arq_vlr_post_pres()
 DVLR Process_Access_Request_VLR(UTRAN-Iu-42_IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100_CM_SERVICE_REQ){PR_ARQ_S_WAIT_CIPH}: _proc_arq_vlr_post_trace()
@@ -1721,7 +1721,7 @@ DMM RAN_conn(UTRAN-Iu-42_IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100_CM_SE
 ---
 - a call is initiated
 - SETUP gets forwarded to MNCC
-  MSC <--RAN_UTRAN_IU-- MS: GSM48_MT_CC_SETUP
+  MSC <--UTRAN-Iu-- MS: GSM48_MT_CC_SETUP
 DREF IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: MSC conn use + dtap == 2 (0xa: dtap,cm_service)
 DRLL Dispatching 04.08 message GSM48_MT_CC_SETUP (0x3:0x5)
 DCC Unknown transaction ID 8, creating new trans.
@@ -1745,8 +1745,8 @@ DCC (sub 42342) stopping pending guard timer
 DCC (sub 42342) starting guard timer with 180 seconds
 DCC (ti 08 sub 42342) Received 'MNCC_CALL_PROC_REQ' from MNCC in state 1 (INITIATED)
 DCC (ti 08 sub IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100) new state INITIATED -> MO_CALL_PROC
-DMSC msc_tx 2 bytes to IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 via RAN_UTRAN_IU
-- DTAP --RAN_UTRAN_IU--> MS: GSM48_MT_CC_CALL_PROC: 8302
+DMSC msc_tx 2 bytes to IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 via UTRAN-Iu
+- DTAP --UTRAN-Iu--> MS: GSM48_MT_CC_CALL_PROC: 8302
 - DTAP matches expected message
   MS <--Call Assignment-- MSC: subscr=IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 callref=0x80000003
 - But the other side's MSISDN could not be resolved, MNCC tells us to cancel
@@ -1756,14 +1756,14 @@ DCC (sub 42342) starting guard timer with 180 seconds
 DCC (ti 08 sub 42342) Received 'MNCC_REL_REQ' from MNCC in state 3 (MO_CALL_PROC)
 DCC starting timer T308 with 10 seconds
 DCC (ti 08 sub IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100) new state MO_CALL_PROC -> RELEASE_REQ
-DMSC msc_tx 2 bytes to IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 via RAN_UTRAN_IU
-- DTAP --RAN_UTRAN_IU--> MS: GSM48_MT_CC_RELEASE: 832d
+DMSC msc_tx 2 bytes to IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 via UTRAN-Iu
+- DTAP --UTRAN-Iu--> MS: GSM48_MT_CC_RELEASE: 832d
 - DTAP matches expected message
 - Despite our repeated CC Release Requests, the MS does not respond anymore
 - Total time passed: 10.000023 s
 DCC starting timer T308 with 10 seconds
-DMSC msc_tx 2 bytes to IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 via RAN_UTRAN_IU
-- DTAP --RAN_UTRAN_IU--> MS: GSM48_MT_CC_RELEASE: 832d
+DMSC msc_tx 2 bytes to IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 via UTRAN-Iu
+- DTAP --UTRAN-Iu--> MS: GSM48_MT_CC_RELEASE: 832d
 - DTAP matches expected message
 - The CC Release times out and we still properly clear the conn
 - Total time passed: 20.000046 s
@@ -1780,7 +1780,7 @@ DMM RAN_conn(UTRAN-Iu-42_IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100_CM_SE
 DREF IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: MSC conn use + release == 1 (0x100: release)
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 usage increases to: 3
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 usage decreases to: 2
-- Iu Release --RAN_UTRAN_IU--> MS
+- Iu Release --UTRAN-Iu--> MS
 - RNC sends Iu Release Complete
 DREF IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: MSC conn use - release == 0 (0x0: )
 DMM RAN_conn(UTRAN-Iu-42_IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100_CM_SERVICE_REQ){RAN_CONN_S_RELEASING}: Received Event RAN_CONN_E_UNUSED
diff --git a/tests/msc_vlr/msc_vlr_test_gsm_authen.c b/tests/msc_vlr/msc_vlr_test_gsm_authen.c
index 81297815d..46dd9a1c6 100644
--- a/tests/msc_vlr/msc_vlr_test_gsm_authen.c
+++ b/tests/msc_vlr/msc_vlr_test_gsm_authen.c
@@ -115,8 +115,8 @@ static void test_gsm_authen()
 	VERBOSE_ASSERT(cm_service_result_sent, == RES_ACCEPT, "%d");
 
 	/* Release connection */
-	expect_bssap_clear(RAN_GERAN_A);
-	conn_conclude_cm_service_req(g_conn, RAN_GERAN_A);
+	expect_bssap_clear(OSMO_RAT_GERAN_A);
+	conn_conclude_cm_service_req(g_conn, OSMO_RAT_GERAN_A);
 
 	btw("all requests serviced, conn has been released");
 	bss_sends_clear_complete();
@@ -333,8 +333,8 @@ static void test_gsm_authen_tmsi()
 	VERBOSE_ASSERT(cm_service_result_sent, == RES_ACCEPT, "%d");
 
 	/* Release connection */
-	expect_bssap_clear(RAN_GERAN_A);
-	conn_conclude_cm_service_req(g_conn, RAN_GERAN_A);
+	expect_bssap_clear(OSMO_RAT_GERAN_A);
+	conn_conclude_cm_service_req(g_conn, OSMO_RAT_GERAN_A);
 
 	btw("all requests serviced, conn has been released");
 	bss_sends_clear_complete();
@@ -728,7 +728,7 @@ static void test_gsm_milenage_authen()
 	comment_start();
 
 	net->authentication_required = true;
-	rx_from_ran = RAN_GERAN_A;
+	rx_from_ran = OSMO_RAT_GERAN_A;
 
 	btw("Location Update request causes a GSUP Send Auth Info request to HLR");
 	lu_result_sent = RES_NONE;
@@ -828,8 +828,8 @@ static void test_gsm_milenage_authen()
 	VERBOSE_ASSERT(cm_service_result_sent, == RES_ACCEPT, "%d");
 
 	/* Release connection */
-	expect_bssap_clear(RAN_GERAN_A);
-	conn_conclude_cm_service_req(g_conn, RAN_GERAN_A);
+	expect_bssap_clear(OSMO_RAT_GERAN_A);
+	conn_conclude_cm_service_req(g_conn, OSMO_RAT_GERAN_A);
 
 	btw("all requests serviced, conn has been released");
 	bss_sends_clear_complete();
diff --git a/tests/msc_vlr/msc_vlr_test_gsm_authen.err b/tests/msc_vlr/msc_vlr_test_gsm_authen.err
index d5839c7a6..920f7171d 100644
--- a/tests/msc_vlr/msc_vlr_test_gsm_authen.err
+++ b/tests/msc_vlr/msc_vlr_test_gsm_authen.err
@@ -3,7 +3,7 @@ talloc_total_blocks(tall_bsc_ctx) == 13
 
 ===== test_gsm_authen
 - Location Update request causes a GSUP Send Auth Info request to HLR
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -70,7 +70,7 @@ DRLL Dispatching 04.08 message SMS:0x01 (0x9:0x1)
 DRLL subscr IMSI-901700000004620: Message not permitted for initial conn: SMS:0x01
   lu_result_sent == 0
 - MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_AUTH_RESP
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_AUTH_RESP
 DREF IMSI-901700000004620: MSC conn use + dtap == 1 (0x2: dtap)
 DRLL Dispatching 04.08 message GSM48_MT_MM_AUTH_RESP (0x5:0x14)
 DMM IMSI-901700000004620: MM GSM AUTHENTICATION RESPONSE (sres = 2d8b2c3e)
@@ -144,7 +144,7 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_LU){RAN_CONN_S_ACCEPTED
 DREF IMSI-901700000004620_MSISDN-46071: MSC conn use + release == 1 (0x100: release)
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage increases to: 4
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage decreases to: 3
-- BSSAP Clear --RAN_GERAN_A--> MS
+- BSSAP Clear --GERAN-A--> MS
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage decreases to: 2
 <-- GSUP rx OSMO_GSUP_MSGT_UPDATE_LOCATION_RESULT: vlr_gsupc_read_cb() returns 0
   bssap_clear_sent == 1
@@ -167,7 +167,7 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_LU){RAN_CONN_S_RELEASED
   llist_count(&net->ran_conns) == 0
 ---
 - after a while, a new conn sends a CM Service Request. VLR responds with Auth Req, 2nd auth vector
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_CM_SERV_REQ
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_CM_SERV_REQ
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -211,7 +211,7 @@ DRLL subscr IMSI-901700000004620_MSISDN-46071: Message not permitted for initial
 DRLL Dispatching 04.08 message SMS:0x01 (0x9:0x1)
 DRLL subscr IMSI-901700000004620_MSISDN-46071: Message not permitted for initial conn: SMS:0x01
 - MS sends Authen Response, VLR accepts with a CM Service Accept
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_AUTH_RESP
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_AUTH_RESP
 DREF IMSI-901700000004620_MSISDN-46071: MSC conn use + dtap == 1 (0x2: dtap)
 DRLL Dispatching 04.08 message GSM48_MT_MM_AUTH_RESP (0x5:0x14)
 DMM IMSI-901700000004620_MSISDN-46071: MM GSM AUTHENTICATION RESPONSE (sres = 20bde240)
@@ -248,7 +248,7 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_CM_SERVICE_REQ){RAN_CON
 DREF IMSI-901700000004620_MSISDN-46071: MSC conn use + release == 1 (0x100: release)
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage increases to: 3
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage decreases to: 2
-- BSSAP Clear --RAN_GERAN_A--> MS
+- BSSAP Clear --GERAN-A--> MS
   bssap_clear_sent == 1
 - all requests serviced, conn has been released
 - BSS sends BSSMAP Clear Complete
@@ -273,7 +273,7 @@ DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage increases to: 3
 DCC (ti 00 sub IMSI-901700000004620_MSISDN-46071 callref 40000001) New transaction
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage increases to: 4
 DMM Subscriber IMSI-901700000004620_MSISDN-46071 not paged yet, start paging.
-  RAN_GERAN_A sends out paging request to IMSI 901700000004620, TMSI 0xffffffff, LAC 23
+  GERAN-A sends out paging request to IMSI 901700000004620, TMSI 0xffffffff, LAC 23
   strcmp(paging_expecting_imsi, imsi) == 0
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage increases to: 5
   llist_count(&vsub->cs.requests) == 1
@@ -285,7 +285,7 @@ DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage increases to: 5
   llist_count(&vsub->cs.requests) == 1
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage decreases to: 4
 - MS replies with Paging Response, and VLR sends Auth Request with third key
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_RR_PAG_RESP
+  MSC <--GERAN-A-- MS: GSM48_MT_RR_PAG_RESP
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -328,7 +328,7 @@ DRLL subscr IMSI-901700000004620_MSISDN-46071: Message not permitted for initial
 DRLL Dispatching 04.08 message SMS:0x01 (0x9:0x1)
 DRLL subscr IMSI-901700000004620_MSISDN-46071: Message not permitted for initial conn: SMS:0x01
 - MS sends Authen Response, VLR accepts and sends pending SMS
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_AUTH_RESP
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_AUTH_RESP
 DREF IMSI-901700000004620_MSISDN-46071: MSC conn use + dtap == 1 (0x2: dtap)
 DRLL Dispatching 04.08 message GSM48_MT_MM_AUTH_RESP (0x5:0x14)
 DMM IMSI-901700000004620_MSISDN-46071: MM GSM AUTHENTICATION RESPONSE (sres = a29514ae)
@@ -355,8 +355,8 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_PAGING_RESP){RAN_CONN_S
 DPAG Paging success for IMSI-901700000004620_MSISDN-46071 (event=0)
 DPAG Calling paging cbfn.
 DREF IMSI-901700000004620_MSISDN-46071: MSC conn use + trans_sms == 2 (0x22: dtap,trans_sms)
-DMSC msc_tx 91 bytes to IMSI-901700000004620_MSISDN-46071 via RAN_GERAN_A
-- DTAP --RAN_GERAN_A--> MS: SMS:0x01: 09015801000791447758100650004c0005806470f1000007101000000000445079da1e1ee7416937485e9ea7c965373d1d6683c270383b3d0ed3d36ff71c949e83c22072799e9687c5ec32a81d96afcbf4b4fb0c7ac3e9e9b7db05
+DMSC msc_tx 91 bytes to IMSI-901700000004620_MSISDN-46071 via GERAN-A
+- DTAP --GERAN-A--> MS: SMS:0x01: 09015801000791447758100650004c0005806470f1000007101000000000445079da1e1ee7416937485e9ea7c965373d1d6683c270383b3d0ed3d36ff71c949e83c22072799e9687c5ec32a81d96afcbf4b4fb0c7ac3e9e9b7db05
 - DTAP matches expected message
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage decreases to: 4
 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_PAGING_RESP){RAN_CONN_S_AUTH_CIPH}: state_chg to RAN_CONN_S_ACCEPTED
@@ -371,7 +371,7 @@ DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage decreases to: 4
 - conn is still open to wait for SMS ack dance
   llist_count(&net->ran_conns) == 1
 - MS replies with CP-ACK for received SMS
-  MSC <--RAN_GERAN_A-- MS: SMS:0x04
+  MSC <--GERAN-A-- MS: SMS:0x04
 DREF IMSI-901700000004620_MSISDN-46071: MSC conn use + dtap == 2 (0x22: dtap,trans_sms)
 DRLL Dispatching 04.08 message SMS:0x04 (0x9:0x4)
 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_PAGING_RESP){RAN_CONN_S_ACCEPTED}: Received Event RAN_CONN_E_COMMUNICATING
@@ -379,12 +379,12 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_PAGING_RESP){RAN_CONN_S
 DREF IMSI-901700000004620_MSISDN-46071: MSC conn use - dtap == 1 (0x20: trans_sms)
   llist_count(&net->ran_conns) == 1
 - MS also sends RP-ACK, MSC in turn sends CP-ACK for that
-  MSC <--RAN_GERAN_A-- MS: SMS:0x01
+  MSC <--GERAN-A-- MS: SMS:0x01
 DREF IMSI-901700000004620_MSISDN-46071: MSC conn use + dtap == 2 (0x22: dtap,trans_sms)
 DRLL Dispatching 04.08 message SMS:0x01 (0x9:0x1)
 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_PAGING_RESP){RAN_CONN_S_COMMUNICATING}: Received Event RAN_CONN_E_COMMUNICATING
-DMSC msc_tx 2 bytes to IMSI-901700000004620_MSISDN-46071 via RAN_GERAN_A
-- DTAP --RAN_GERAN_A--> MS: SMS:0x04: 0904
+DMSC msc_tx 2 bytes to IMSI-901700000004620_MSISDN-46071 via GERAN-A
+- DTAP --GERAN-A--> MS: SMS:0x04: 0904
 - DTAP matches expected message
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage decreases to: 3
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage decreases to: 2
@@ -395,7 +395,7 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_PAGING_RESP){RAN_CONN_S
 DREF IMSI-901700000004620_MSISDN-46071: MSC conn use + release == 1 (0x100: release)
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage increases to: 3
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage decreases to: 2
-- BSSAP Clear --RAN_GERAN_A--> MS
+- BSSAP Clear --GERAN-A--> MS
   dtap_tx_confirmed == 1
   bssap_clear_sent == 1
 - SMS is done, conn is gone
@@ -415,7 +415,7 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_PAGING_RESP){RAN_CONN_S
   llist_count(&net->ran_conns) == 0
 ---
 - subscriber detaches
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_IMSI_DETACH_IND
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_IMSI_DETACH_IND
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -431,7 +431,7 @@ DREF freeing VLR subscr IMSI-901700000004620_MSISDN-46071
 DMM RAN_conn{RAN_CONN_S_NEW}: Received Event RAN_CONN_E_CN_CLOSE
 DMM RAN_conn{RAN_CONN_S_NEW}: state_chg to RAN_CONN_S_RELEASING
 DREF unknown: MSC conn use + release == 2 (0x101: compl_l3,release)
-- BSSAP Clear --RAN_GERAN_A--> MS
+- BSSAP Clear --GERAN-A--> MS
 DREF unknown: MSC conn use - compl_l3 == 1 (0x100: release)
   bssap_clear_sent == 1
 - BSS sends BSSMAP Clear Complete
@@ -450,7 +450,7 @@ talloc_total_blocks(tall_bsc_ctx) == 13
 
 ===== test_gsm_authen_tmsi
 - Location Update request causes a GSUP Send Auth Info request to HLR
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -517,7 +517,7 @@ DRLL Dispatching 04.08 message SMS:0x01 (0x9:0x1)
 DRLL subscr IMSI-901700000004620: Message not permitted for initial conn: SMS:0x01
   lu_result_sent == 0
 - MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_AUTH_RESP
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_AUTH_RESP
 DREF IMSI-901700000004620: MSC conn use + dtap == 1 (0x2: dtap)
 DRLL Dispatching 04.08 message GSM48_MT_MM_AUTH_RESP (0x5:0x14)
 DMM IMSI-901700000004620: MM GSM AUTHENTICATION RESPONSE (sres = 2d8b2c3e)
@@ -601,7 +601,7 @@ DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage increases to: 2
   vsub->tmsi == 0xffffffff
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage decreases to: 1
 - MS sends TMSI Realloc Complete
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_TMSI_REALL_COMPL
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_TMSI_REALL_COMPL
 DREF IMSI-901700000004620_MSISDN-46071: MSC conn use + dtap == 1 (0x2: dtap)
 DRLL Dispatching 04.08 message GSM48_MT_MM_TMSI_REALL_COMPL (0x5:0x1b)
 DMM TMSI Reallocation Completed. Subscriber: IMSI-901700000004620_MSISDN-46071
@@ -622,7 +622,7 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_LU){RAN_CONN_S_ACCEPTED
 DREF IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100: MSC conn use + release == 2 (0x102: dtap,release)
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100 usage increases to: 3
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100 usage decreases to: 2
-- BSSAP Clear --RAN_GERAN_A--> MS
+- BSSAP Clear --GERAN-A--> MS
 DREF IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100: MSC conn use - dtap == 1 (0x100: release)
   bssap_clear_sent == 1
 - LU was successful, and the conn has already been closed
@@ -650,7 +650,7 @@ DREF VLR subscr IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100 usage increase
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100 usage decreases to: 1
 ---
 - after a while, a new conn sends a CM Service Request using above TMSI. VLR responds with Auth Req, 2nd auth vector
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_CM_SERV_REQ
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_CM_SERV_REQ
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -694,7 +694,7 @@ DRLL subscr IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100: Message not permi
 DRLL Dispatching 04.08 message SMS:0x01 (0x9:0x1)
 DRLL subscr IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100: Message not permitted for initial conn: SMS:0x01
 - MS sends Authen Response, VLR accepts with a CM Service Accept
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_AUTH_RESP
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_AUTH_RESP
 DREF IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100: MSC conn use + dtap == 1 (0x2: dtap)
 DRLL Dispatching 04.08 message GSM48_MT_MM_AUTH_RESP (0x5:0x14)
 DMM IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100: MM GSM AUTHENTICATION RESPONSE (sres = 20bde240)
@@ -731,7 +731,7 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100_CM_SERV
 DREF IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100: MSC conn use + release == 1 (0x100: release)
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100 usage increases to: 3
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100 usage decreases to: 2
-- BSSAP Clear --RAN_GERAN_A--> MS
+- BSSAP Clear --GERAN-A--> MS
   bssap_clear_sent == 1
 - all requests serviced, conn has been released
 - BSS sends BSSMAP Clear Complete
@@ -756,7 +756,7 @@ DREF VLR subscr IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100 usage increase
 DCC (ti 00 sub IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100 callref 40000002) New transaction
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100 usage increases to: 4
 DMM Subscriber IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100 not paged yet, start paging.
-  RAN_GERAN_A sends out paging request to IMSI 901700000004620, TMSI 0x03020100, LAC 23
+  GERAN-A sends out paging request to IMSI 901700000004620, TMSI 0x03020100, LAC 23
   paging_expecting_tmsi == 0x03020100
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100 usage increases to: 5
   llist_count(&vsub->cs.requests) == 1
@@ -768,7 +768,7 @@ DREF VLR subscr IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100 usage increase
   llist_count(&vsub->cs.requests) == 1
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100 usage decreases to: 4
 - MS replies with Paging Response using TMSI, and VLR sends Auth Request with third key
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_RR_PAG_RESP
+  MSC <--GERAN-A-- MS: GSM48_MT_RR_PAG_RESP
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -811,7 +811,7 @@ DRLL subscr IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100: Message not permi
 DRLL Dispatching 04.08 message SMS:0x01 (0x9:0x1)
 DRLL subscr IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100: Message not permitted for initial conn: SMS:0x01
 - MS sends Authen Response, VLR accepts and sends pending SMS
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_AUTH_RESP
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_AUTH_RESP
 DREF IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100: MSC conn use + dtap == 1 (0x2: dtap)
 DRLL Dispatching 04.08 message GSM48_MT_MM_AUTH_RESP (0x5:0x14)
 DMM IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100: MM GSM AUTHENTICATION RESPONSE (sres = a29514ae)
@@ -838,8 +838,8 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100_PAGING_
 DPAG Paging success for IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100 (event=0)
 DPAG Calling paging cbfn.
 DREF IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100: MSC conn use + trans_sms == 2 (0x22: dtap,trans_sms)
-DMSC msc_tx 91 bytes to IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100 via RAN_GERAN_A
-- DTAP --RAN_GERAN_A--> MS: SMS:0x01: 09015801000791447758100650004c0005806470f1000007101000000000445079da1e1ee7416937485e9ea7c965373d1d6683c270383b3d0ed3d36ff71c949e83c22072799e9687c5ec32a81d96afcbf4b4fb0c7ac3e9e9b7db05
+DMSC msc_tx 91 bytes to IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100 via GERAN-A
+- DTAP --GERAN-A--> MS: SMS:0x01: 09015801000791447758100650004c0005806470f1000007101000000000445079da1e1ee7416937485e9ea7c965373d1d6683c270383b3d0ed3d36ff71c949e83c22072799e9687c5ec32a81d96afcbf4b4fb0c7ac3e9e9b7db05
 - DTAP matches expected message
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100 usage decreases to: 4
 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100_PAGING_RESP){RAN_CONN_S_AUTH_CIPH}: state_chg to RAN_CONN_S_ACCEPTED
@@ -854,7 +854,7 @@ DREF VLR subscr IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100 usage decrease
 - conn is still open to wait for SMS ack dance
   llist_count(&net->ran_conns) == 1
 - MS replies with CP-ACK for received SMS
-  MSC <--RAN_GERAN_A-- MS: SMS:0x04
+  MSC <--GERAN-A-- MS: SMS:0x04
 DREF IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100: MSC conn use + dtap == 2 (0x22: dtap,trans_sms)
 DRLL Dispatching 04.08 message SMS:0x04 (0x9:0x4)
 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100_PAGING_RESP){RAN_CONN_S_ACCEPTED}: Received Event RAN_CONN_E_COMMUNICATING
@@ -862,12 +862,12 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100_PAGING_
 DREF IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100: MSC conn use - dtap == 1 (0x20: trans_sms)
   llist_count(&net->ran_conns) == 1
 - MS also sends RP-ACK, MSC in turn sends CP-ACK for that
-  MSC <--RAN_GERAN_A-- MS: SMS:0x01
+  MSC <--GERAN-A-- MS: SMS:0x01
 DREF IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100: MSC conn use + dtap == 2 (0x22: dtap,trans_sms)
 DRLL Dispatching 04.08 message SMS:0x01 (0x9:0x1)
 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100_PAGING_RESP){RAN_CONN_S_COMMUNICATING}: Received Event RAN_CONN_E_COMMUNICATING
-DMSC msc_tx 2 bytes to IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100 via RAN_GERAN_A
-- DTAP --RAN_GERAN_A--> MS: SMS:0x04: 0904
+DMSC msc_tx 2 bytes to IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100 via GERAN-A
+- DTAP --GERAN-A--> MS: SMS:0x04: 0904
 - DTAP matches expected message
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100 usage decreases to: 3
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100 usage decreases to: 2
@@ -878,7 +878,7 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100_PAGING_
 DREF IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100: MSC conn use + release == 1 (0x100: release)
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100 usage increases to: 3
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100 usage decreases to: 2
-- BSSAP Clear --RAN_GERAN_A--> MS
+- BSSAP Clear --GERAN-A--> MS
   dtap_tx_confirmed == 1
   bssap_clear_sent == 1
 - SMS is done, conn is gone
@@ -899,7 +899,7 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100_PAGING_
 ---
 - subscriber sends LU Request, this time with the TMSI
 - Location Update request causes an Auth Req to MS
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -933,7 +933,7 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100_LU){RAN
   auth_request_sent == 1
   lu_result_sent == 0
 - MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_AUTH_RESP
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_AUTH_RESP
 DREF IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100: MSC conn use + dtap == 1 (0x2: dtap)
 DRLL Dispatching 04.08 message GSM48_MT_MM_AUTH_RESP (0x5:0x14)
 DMM IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100: MM GSM AUTHENTICATION RESPONSE (sres = 5afc8d72)
@@ -1017,7 +1017,7 @@ DREF VLR subscr IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100 usage increase
   vsub->tmsi == 0x03020100
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100 usage decreases to: 2
 - MS sends TMSI Realloc Complete
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_TMSI_REALL_COMPL
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_TMSI_REALL_COMPL
 DREF IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100: MSC conn use + dtap == 1 (0x2: dtap)
 DRLL Dispatching 04.08 message GSM48_MT_MM_TMSI_REALL_COMPL (0x5:0x1b)
 DMM TMSI Reallocation Completed. Subscriber: IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100
@@ -1037,7 +1037,7 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100_LU){RAN
 DREF IMSI-901700000004620_MSISDN-46071_TMSI-0x07060504: MSC conn use + release == 2 (0x102: dtap,release)
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071_TMSI-0x07060504 usage increases to: 3
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071_TMSI-0x07060504 usage decreases to: 2
-- BSSAP Clear --RAN_GERAN_A--> MS
+- BSSAP Clear --GERAN-A--> MS
 DREF IMSI-901700000004620_MSISDN-46071_TMSI-0x07060504: MSC conn use - dtap == 1 (0x100: release)
   bssap_clear_sent == 1
 - LU was successful, and the conn has already been closed
@@ -1065,7 +1065,7 @@ DREF VLR subscr IMSI-901700000004620_MSISDN-46071_TMSI-0x07060504 usage increase
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071_TMSI-0x07060504 usage decreases to: 1
 ---
 - subscriber detaches, using new TMSI
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_IMSI_DETACH_IND
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_IMSI_DETACH_IND
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -1081,7 +1081,7 @@ DREF freeing VLR subscr IMSI-901700000004620_MSISDN-46071_TMSI-0x07060504
 DMM RAN_conn{RAN_CONN_S_NEW}: Received Event RAN_CONN_E_CN_CLOSE
 DMM RAN_conn{RAN_CONN_S_NEW}: state_chg to RAN_CONN_S_RELEASING
 DREF unknown: MSC conn use + release == 2 (0x101: compl_l3,release)
-- BSSAP Clear --RAN_GERAN_A--> MS
+- BSSAP Clear --GERAN-A--> MS
 DREF unknown: MSC conn use - compl_l3 == 1 (0x100: release)
   bssap_clear_sent == 1
 - BSS sends BSSMAP Clear Complete
@@ -1100,7 +1100,7 @@ talloc_total_blocks(tall_bsc_ctx) == 13
 
 ===== test_gsm_authen_imei
 - Location Update request causes a GSUP Send Auth Info request to HLR
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -1167,7 +1167,7 @@ DRLL Dispatching 04.08 message SMS:0x01 (0x9:0x1)
 DRLL subscr IMSI-901700000004620: Message not permitted for initial conn: SMS:0x01
   lu_result_sent == 0
 - MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_AUTH_RESP
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_AUTH_RESP
 DREF IMSI-901700000004620: MSC conn use + dtap == 1 (0x2: dtap)
 DRLL Dispatching 04.08 message GSM48_MT_MM_AUTH_RESP (0x5:0x14)
 DMM IMSI-901700000004620: MM GSM AUTHENTICATION RESPONSE (sres = 2d8b2c3e)
@@ -1226,8 +1226,8 @@ DVLR lu_compl_vlr_fsm(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_LU){LU_COMPL_V
 DVLR lu_compl_vlr_fsm(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_LU){LU_COMPL_VLR_S_INIT}: state_chg to LU_COMPL_VLR_S_WAIT_SUB_PRES
 DVLR lu_compl_vlr_fsm(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_LU){LU_COMPL_VLR_S_WAIT_SUB_PRES}: Received Event LU_COMPL_VLR_E_SUB_PRES_COMPL
 DVLR lu_compl_vlr_fsm(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_LU){LU_COMPL_VLR_S_WAIT_SUB_PRES}: state_chg to LU_COMPL_VLR_S_WAIT_IMEI
-DMSC msc_tx 3 bytes to IMSI-901700000004620_MSISDN-46071 via RAN_GERAN_A
-- DTAP --RAN_GERAN_A--> MS: GSM48_MT_MM_ID_REQ: 051802
+DMSC msc_tx 3 bytes to IMSI-901700000004620_MSISDN-46071 via GERAN-A
+- DTAP --GERAN-A--> MS: GSM48_MT_MM_ID_REQ: 051802
 - DTAP matches expected message
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage decreases to: 1
 <-- GSUP rx OSMO_GSUP_MSGT_UPDATE_LOCATION_RESULT: vlr_gsupc_read_cb() returns 0
@@ -1247,7 +1247,7 @@ DRLL subscr IMSI-901700000004620_MSISDN-46071: Message not permitted for initial
 DRLL Dispatching 04.08 message SMS:0x01 (0x9:0x1)
 DRLL subscr IMSI-901700000004620_MSISDN-46071: Message not permitted for initial conn: SMS:0x01
 - MS replies with an Identity Response
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_ID_RESP
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_ID_RESP
 DREF IMSI-901700000004620_MSISDN-46071: MSC conn use + dtap == 1 (0x2: dtap)
 DRLL Dispatching 04.08 message GSM48_MT_MM_ID_RESP (0x5:0x19)
 DMM IDENTITY RESPONSE: MI(IMEI)=423423423423420
@@ -1270,7 +1270,7 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_LU){RAN_CONN_S_ACCEPTED
 DREF IMSI-901700000004620_MSISDN-46071: MSC conn use + release == 2 (0x102: dtap,release)
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage increases to: 3
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage decreases to: 2
-- BSSAP Clear --RAN_GERAN_A--> MS
+- BSSAP Clear --GERAN-A--> MS
 DREF IMSI-901700000004620_MSISDN-46071: MSC conn use - dtap == 1 (0x100: release)
   bssap_clear_sent == 1
 - LU was successful, and the conn has already been closed
@@ -1296,7 +1296,7 @@ DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage increases to: 2
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage decreases to: 1
 ---
 - subscriber detaches
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_IMSI_DETACH_IND
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_IMSI_DETACH_IND
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -1312,7 +1312,7 @@ DREF freeing VLR subscr IMSI-901700000004620_MSISDN-46071
 DMM RAN_conn{RAN_CONN_S_NEW}: Received Event RAN_CONN_E_CN_CLOSE
 DMM RAN_conn{RAN_CONN_S_NEW}: state_chg to RAN_CONN_S_RELEASING
 DREF unknown: MSC conn use + release == 2 (0x101: compl_l3,release)
-- BSSAP Clear --RAN_GERAN_A--> MS
+- BSSAP Clear --GERAN-A--> MS
 DREF unknown: MSC conn use - compl_l3 == 1 (0x100: release)
   bssap_clear_sent == 1
 - BSS sends BSSMAP Clear Complete
@@ -1331,7 +1331,7 @@ talloc_total_blocks(tall_bsc_ctx) == 13
 
 ===== test_gsm_authen_tmsi_imei
 - Location Update request causes a GSUP Send Auth Info request to HLR
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -1398,7 +1398,7 @@ DRLL Dispatching 04.08 message SMS:0x01 (0x9:0x1)
 DRLL subscr IMSI-901700000004620: Message not permitted for initial conn: SMS:0x01
   lu_result_sent == 0
 - MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_AUTH_RESP
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_AUTH_RESP
 DREF IMSI-901700000004620: MSC conn use + dtap == 1 (0x2: dtap)
 DRLL Dispatching 04.08 message GSM48_MT_MM_AUTH_RESP (0x5:0x14)
 DMM IMSI-901700000004620: MM GSM AUTHENTICATION RESPONSE (sres = 2d8b2c3e)
@@ -1457,8 +1457,8 @@ DVLR lu_compl_vlr_fsm(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_LU){LU_COMPL_V
 DVLR lu_compl_vlr_fsm(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_LU){LU_COMPL_VLR_S_INIT}: state_chg to LU_COMPL_VLR_S_WAIT_SUB_PRES
 DVLR lu_compl_vlr_fsm(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_LU){LU_COMPL_VLR_S_WAIT_SUB_PRES}: Received Event LU_COMPL_VLR_E_SUB_PRES_COMPL
 DVLR lu_compl_vlr_fsm(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_LU){LU_COMPL_VLR_S_WAIT_SUB_PRES}: state_chg to LU_COMPL_VLR_S_WAIT_IMEI_TMSI
-DMSC msc_tx 3 bytes to IMSI-901700000004620_MSISDN-46071 via RAN_GERAN_A
-- DTAP --RAN_GERAN_A--> MS: GSM48_MT_MM_ID_REQ: 051802
+DMSC msc_tx 3 bytes to IMSI-901700000004620_MSISDN-46071 via GERAN-A
+- DTAP --GERAN-A--> MS: GSM48_MT_MM_ID_REQ: 051802
 - DTAP matches expected message
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage decreases to: 1
 <-- GSUP rx OSMO_GSUP_MSGT_UPDATE_LOCATION_RESULT: vlr_gsupc_read_cb() returns 0
@@ -1478,7 +1478,7 @@ DRLL subscr IMSI-901700000004620_MSISDN-46071: Message not permitted for initial
 DRLL Dispatching 04.08 message SMS:0x01 (0x9:0x1)
 DRLL subscr IMSI-901700000004620_MSISDN-46071: Message not permitted for initial conn: SMS:0x01
 - MS replies with an Identity Response
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_ID_RESP
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_ID_RESP
 DREF IMSI-901700000004620_MSISDN-46071: MSC conn use + dtap == 1 (0x2: dtap)
 DRLL Dispatching 04.08 message GSM48_MT_MM_ID_RESP (0x5:0x19)
 DMM IDENTITY RESPONSE: MI(IMEI)=423423423423420
@@ -1512,7 +1512,7 @@ DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage increases to: 2
   vsub->tmsi == 0xffffffff
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage decreases to: 1
 - MS sends TMSI Realloc Complete
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_TMSI_REALL_COMPL
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_TMSI_REALL_COMPL
 DREF IMSI-901700000004620_MSISDN-46071: MSC conn use + dtap == 1 (0x2: dtap)
 DRLL Dispatching 04.08 message GSM48_MT_MM_TMSI_REALL_COMPL (0x5:0x1b)
 DMM TMSI Reallocation Completed. Subscriber: IMSI-901700000004620_MSISDN-46071
@@ -1533,7 +1533,7 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_LU){RAN_CONN_S_ACCEPTED
 DREF IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100: MSC conn use + release == 2 (0x102: dtap,release)
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100 usage increases to: 3
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100 usage decreases to: 2
-- BSSAP Clear --RAN_GERAN_A--> MS
+- BSSAP Clear --GERAN-A--> MS
 DREF IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100: MSC conn use - dtap == 1 (0x100: release)
   bssap_clear_sent == 1
 - LU was successful, and the conn has already been closed
@@ -1559,7 +1559,7 @@ DREF VLR subscr IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100 usage increase
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100 usage decreases to: 1
 ---
 - subscriber detaches, using TMSI
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_IMSI_DETACH_IND
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_IMSI_DETACH_IND
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -1575,7 +1575,7 @@ DREF freeing VLR subscr IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100
 DMM RAN_conn{RAN_CONN_S_NEW}: Received Event RAN_CONN_E_CN_CLOSE
 DMM RAN_conn{RAN_CONN_S_NEW}: state_chg to RAN_CONN_S_RELEASING
 DREF unknown: MSC conn use + release == 2 (0x101: compl_l3,release)
-- BSSAP Clear --RAN_GERAN_A--> MS
+- BSSAP Clear --GERAN-A--> MS
 DREF unknown: MSC conn use - compl_l3 == 1 (0x100: release)
   bssap_clear_sent == 1
 - BSS sends BSSMAP Clear Complete
@@ -1594,7 +1594,7 @@ talloc_total_blocks(tall_bsc_ctx) == 13
 
 ===== test_gsm_milenage_authen
 - Location Update request causes a GSUP Send Auth Info request to HLR
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -1642,7 +1642,7 @@ DREF VLR subscr IMSI-901700000010650 usage decreases to: 1
   auth_request_sent == 1
   lu_result_sent == 0
 - MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_AUTH_RESP
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_AUTH_RESP
 DREF IMSI-901700000010650: MSC conn use + dtap == 1 (0x2: dtap)
 DRLL Dispatching 04.08 message GSM48_MT_MM_AUTH_RESP (0x5:0x14)
 DMM IMSI-901700000010650: MM GSM AUTHENTICATION RESPONSE (sres = 9b36efdf)
@@ -1716,7 +1716,7 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000010650_MSISDN-42342_LU){RAN_CONN_S_ACCEPTED
 DREF IMSI-901700000010650_MSISDN-42342: MSC conn use + release == 1 (0x100: release)
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342 usage increases to: 4
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342 usage decreases to: 3
-- BSSAP Clear --RAN_GERAN_A--> MS
+- BSSAP Clear --GERAN-A--> MS
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342 usage decreases to: 2
 <-- GSUP rx OSMO_GSUP_MSGT_UPDATE_LOCATION_RESULT: vlr_gsupc_read_cb() returns 0
   bssap_clear_sent == 1
@@ -1739,7 +1739,7 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000010650_MSISDN-42342_LU){RAN_CONN_S_RELEASED
   llist_count(&net->ran_conns) == 0
 ---
 - after a while, a new conn sends a CM Service Request. VLR responds with Auth Req, 2nd auth vector
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_CM_SERV_REQ
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_CM_SERV_REQ
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -1783,7 +1783,7 @@ DRLL subscr IMSI-901700000010650_MSISDN-42342: Message not permitted for initial
 DRLL Dispatching 04.08 message SMS:0x01 (0x9:0x1)
 DRLL subscr IMSI-901700000010650_MSISDN-42342: Message not permitted for initial conn: SMS:0x01
 - MS sends Authen Response, VLR accepts with a CM Service Accept
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_AUTH_RESP
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_AUTH_RESP
 DREF IMSI-901700000010650_MSISDN-42342: MSC conn use + dtap == 1 (0x2: dtap)
 DRLL Dispatching 04.08 message GSM48_MT_MM_AUTH_RESP (0x5:0x14)
 DMM IMSI-901700000010650_MSISDN-42342: MM GSM AUTHENTICATION RESPONSE (sres = 85aa3130)
@@ -1820,7 +1820,7 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000010650_MSISDN-42342_CM_SERVICE_REQ){RAN_CON
 DREF IMSI-901700000010650_MSISDN-42342: MSC conn use + release == 1 (0x100: release)
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342 usage increases to: 3
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342 usage decreases to: 2
-- BSSAP Clear --RAN_GERAN_A--> MS
+- BSSAP Clear --GERAN-A--> MS
   bssap_clear_sent == 1
 - all requests serviced, conn has been released
 - BSS sends BSSMAP Clear Complete
@@ -1845,7 +1845,7 @@ DREF VLR subscr IMSI-901700000010650_MSISDN-42342 usage increases to: 3
 DCC (ti 00 sub IMSI-901700000010650_MSISDN-42342 callref 40000003) New transaction
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342 usage increases to: 4
 DMM Subscriber IMSI-901700000010650_MSISDN-42342 not paged yet, start paging.
-  RAN_GERAN_A sends out paging request to IMSI 901700000010650, TMSI 0xffffffff, LAC 23
+  GERAN-A sends out paging request to IMSI 901700000010650, TMSI 0xffffffff, LAC 23
   strcmp(paging_expecting_imsi, imsi) == 0
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342 usage increases to: 5
   llist_count(&vsub->cs.requests) == 1
@@ -1857,7 +1857,7 @@ DREF VLR subscr IMSI-901700000010650_MSISDN-42342 usage increases to: 5
   llist_count(&vsub->cs.requests) == 1
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342 usage decreases to: 4
 - MS replies with Paging Response, and VLR sends Auth Request with third key
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_RR_PAG_RESP
+  MSC <--GERAN-A-- MS: GSM48_MT_RR_PAG_RESP
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -1900,7 +1900,7 @@ DRLL subscr IMSI-901700000010650_MSISDN-42342: Message not permitted for initial
 DRLL Dispatching 04.08 message SMS:0x01 (0x9:0x1)
 DRLL subscr IMSI-901700000010650_MSISDN-42342: Message not permitted for initial conn: SMS:0x01
 - MS sends Authen Response, VLR accepts and sends pending SMS
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_AUTH_RESP
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_AUTH_RESP
 DREF IMSI-901700000010650_MSISDN-42342: MSC conn use + dtap == 1 (0x2: dtap)
 DRLL Dispatching 04.08 message GSM48_MT_MM_AUTH_RESP (0x5:0x14)
 DMM IMSI-901700000010650_MSISDN-42342: MM GSM AUTHENTICATION RESPONSE (sres = 69d5f9fb)
@@ -1927,8 +1927,8 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000010650_MSISDN-42342_PAGING_RESP){RAN_CONN_S
 DPAG Paging success for IMSI-901700000010650_MSISDN-42342 (event=0)
 DPAG Calling paging cbfn.
 DREF IMSI-901700000010650_MSISDN-42342: MSC conn use + trans_sms == 2 (0x22: dtap,trans_sms)
-DMSC msc_tx 91 bytes to IMSI-901700000010650_MSISDN-42342 via RAN_GERAN_A
-- DTAP --RAN_GERAN_A--> MS: SMS:0x01: 09015801000791447758100650004c0005802443f2000007101000000000445079da1e1ee7416937485e9ea7c965373d1d6683c270383b3d0ed3d36ff71c949e83c22072799e9687c5ec32a81d96afcbf4b4fb0c7ac3e9e9b7db05
+DMSC msc_tx 91 bytes to IMSI-901700000010650_MSISDN-42342 via GERAN-A
+- DTAP --GERAN-A--> MS: SMS:0x01: 09015801000791447758100650004c0005802443f2000007101000000000445079da1e1ee7416937485e9ea7c965373d1d6683c270383b3d0ed3d36ff71c949e83c22072799e9687c5ec32a81d96afcbf4b4fb0c7ac3e9e9b7db05
 - DTAP matches expected message
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342 usage decreases to: 4
 DMM RAN_conn(GERAN-A-0_IMSI-901700000010650_MSISDN-42342_PAGING_RESP){RAN_CONN_S_AUTH_CIPH}: state_chg to RAN_CONN_S_ACCEPTED
@@ -1943,7 +1943,7 @@ DREF VLR subscr IMSI-901700000010650_MSISDN-42342 usage decreases to: 4
 - conn is still open to wait for SMS ack dance
   llist_count(&net->ran_conns) == 1
 - MS replies with CP-ACK for received SMS
-  MSC <--RAN_GERAN_A-- MS: SMS:0x04
+  MSC <--GERAN-A-- MS: SMS:0x04
 DREF IMSI-901700000010650_MSISDN-42342: MSC conn use + dtap == 2 (0x22: dtap,trans_sms)
 DRLL Dispatching 04.08 message SMS:0x04 (0x9:0x4)
 DMM RAN_conn(GERAN-A-0_IMSI-901700000010650_MSISDN-42342_PAGING_RESP){RAN_CONN_S_ACCEPTED}: Received Event RAN_CONN_E_COMMUNICATING
@@ -1951,12 +1951,12 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000010650_MSISDN-42342_PAGING_RESP){RAN_CONN_S
 DREF IMSI-901700000010650_MSISDN-42342: MSC conn use - dtap == 1 (0x20: trans_sms)
   llist_count(&net->ran_conns) == 1
 - MS also sends RP-ACK, MSC in turn sends CP-ACK for that
-  MSC <--RAN_GERAN_A-- MS: SMS:0x01
+  MSC <--GERAN-A-- MS: SMS:0x01
 DREF IMSI-901700000010650_MSISDN-42342: MSC conn use + dtap == 2 (0x22: dtap,trans_sms)
 DRLL Dispatching 04.08 message SMS:0x01 (0x9:0x1)
 DMM RAN_conn(GERAN-A-0_IMSI-901700000010650_MSISDN-42342_PAGING_RESP){RAN_CONN_S_COMMUNICATING}: Received Event RAN_CONN_E_COMMUNICATING
-DMSC msc_tx 2 bytes to IMSI-901700000010650_MSISDN-42342 via RAN_GERAN_A
-- DTAP --RAN_GERAN_A--> MS: SMS:0x04: 0904
+DMSC msc_tx 2 bytes to IMSI-901700000010650_MSISDN-42342 via GERAN-A
+- DTAP --GERAN-A--> MS: SMS:0x04: 0904
 - DTAP matches expected message
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342 usage decreases to: 3
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342 usage decreases to: 2
@@ -1967,7 +1967,7 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000010650_MSISDN-42342_PAGING_RESP){RAN_CONN_S
 DREF IMSI-901700000010650_MSISDN-42342: MSC conn use + release == 1 (0x100: release)
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342 usage increases to: 3
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342 usage decreases to: 2
-- BSSAP Clear --RAN_GERAN_A--> MS
+- BSSAP Clear --GERAN-A--> MS
   dtap_tx_confirmed == 1
   bssap_clear_sent == 1
 - SMS is done, conn is gone
@@ -1987,7 +1987,7 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000010650_MSISDN-42342_PAGING_RESP){RAN_CONN_S
   llist_count(&net->ran_conns) == 0
 ---
 - subscriber detaches
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_IMSI_DETACH_IND
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_IMSI_DETACH_IND
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -2003,7 +2003,7 @@ DREF freeing VLR subscr IMSI-901700000010650_MSISDN-42342
 DMM RAN_conn{RAN_CONN_S_NEW}: Received Event RAN_CONN_E_CN_CLOSE
 DMM RAN_conn{RAN_CONN_S_NEW}: state_chg to RAN_CONN_S_RELEASING
 DREF unknown: MSC conn use + release == 2 (0x101: compl_l3,release)
-- BSSAP Clear --RAN_GERAN_A--> MS
+- BSSAP Clear --GERAN-A--> MS
 DREF unknown: MSC conn use - compl_l3 == 1 (0x100: release)
   bssap_clear_sent == 1
 - BSS sends BSSMAP Clear Complete
@@ -2023,7 +2023,7 @@ talloc_total_blocks(tall_bsc_ctx) == 13
 ===== test_wrong_sres_length
 - Total time passed: 0.000000 s
 - Location Update request causes a GSUP Send Auth Info request to HLR
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -2090,7 +2090,7 @@ DRLL Dispatching 04.08 message SMS:0x01 (0x9:0x1)
 DRLL subscr IMSI-901700000004620: Message not permitted for initial conn: SMS:0x01
   lu_result_sent == 0
 - MS sends Authen Response with too short SRES data, auth is thwarted.
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_AUTH_RESP
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_AUTH_RESP
 DREF IMSI-901700000004620: MSC conn use + dtap == 1 (0x2: dtap)
 DRLL Dispatching 04.08 message GSM48_MT_MM_AUTH_RESP (0x5:0x14)
 DMM IMSI-901700000004620: MM AUTHENTICATION RESPONSE: l3 length invalid: 5
@@ -2115,7 +2115,7 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_AUTH_CIPH}: state_chg
 DREF IMSI-901700000004620: MSC conn use + release == 2 (0x102: dtap,release)
 DREF VLR subscr IMSI-901700000004620 usage increases to: 2
 DREF VLR subscr IMSI-901700000004620 usage decreases to: 1
-- BSSAP Clear --RAN_GERAN_A--> MS
+- BSSAP Clear --GERAN-A--> MS
 DREF IMSI-901700000004620: MSC conn use - dtap == 1 (0x100: release)
   lu_result_sent == 2
 - BSS sends BSSMAP Clear Complete
diff --git a/tests/msc_vlr/msc_vlr_test_gsm_ciph.c b/tests/msc_vlr/msc_vlr_test_gsm_ciph.c
index 8f256b162..a641ec22e 100644
--- a/tests/msc_vlr/msc_vlr_test_gsm_ciph.c
+++ b/tests/msc_vlr/msc_vlr_test_gsm_ciph.c
@@ -126,8 +126,8 @@ static void test_ciph()
 	VERBOSE_ASSERT(cm_service_result_sent, == RES_NONE, "%d");
 
 	/* Release connection */
-	expect_bssap_clear(RAN_GERAN_A);
-	conn_conclude_cm_service_req(g_conn, RAN_GERAN_A);
+	expect_bssap_clear(OSMO_RAT_GERAN_A);
+	conn_conclude_cm_service_req(g_conn, OSMO_RAT_GERAN_A);
 
 	btw("all requests serviced, conn has been released");
 	bss_sends_clear_complete();
@@ -366,8 +366,8 @@ static void test_ciph_tmsi()
 	VERBOSE_ASSERT(cm_service_result_sent, == RES_NONE, "%d");
 
 	/* Release connection */
-	expect_bssap_clear(RAN_GERAN_A);
-	conn_conclude_cm_service_req(g_conn, RAN_GERAN_A);
+	expect_bssap_clear(OSMO_RAT_GERAN_A);
+	conn_conclude_cm_service_req(g_conn, OSMO_RAT_GERAN_A);
 
 	btw("all requests serviced, conn has been released");
 	bss_sends_clear_complete();
@@ -833,7 +833,7 @@ static void test_gsm_ciph_in_umts_env()
 
 	/* implicit: net->authentication_required = true; */
 	net->a5_encryption_mask = (1 << 1);
-	rx_from_ran = RAN_GERAN_A;
+	rx_from_ran = OSMO_RAT_GERAN_A;
 
 	btw("Location Update request causes a GSUP Send Auth Info request to HLR");
 	lu_result_sent = RES_NONE;
@@ -963,8 +963,8 @@ static void test_gsm_ciph_in_umts_env()
 	VERBOSE_ASSERT(cm_service_result_sent, == RES_NONE, "%d");
 
 	/* Release connection */
-	expect_bssap_clear(RAN_GERAN_A);
-	conn_conclude_cm_service_req(g_conn, RAN_GERAN_A);
+	expect_bssap_clear(OSMO_RAT_GERAN_A);
+	conn_conclude_cm_service_req(g_conn, OSMO_RAT_GERAN_A);
 
 	btw("all requests serviced, conn has been released");
 	bss_sends_clear_complete();
@@ -1159,8 +1159,8 @@ static void test_a5_3_supported()
 	VERBOSE_ASSERT(cm_service_result_sent, == RES_NONE, "%d");
 
 	/* Release connection */
-	expect_bssap_clear(RAN_GERAN_A);
-	conn_conclude_cm_service_req(g_conn, RAN_GERAN_A);
+	expect_bssap_clear(OSMO_RAT_GERAN_A);
+	conn_conclude_cm_service_req(g_conn, OSMO_RAT_GERAN_A);
 
 	btw("all requests serviced, conn has been released");
 	bss_sends_clear_complete();
@@ -1381,8 +1381,8 @@ static void test_cm_service_needs_classmark_update()
 	VERBOSE_ASSERT(cm_service_result_sent, == RES_NONE, "%d");
 
 	/* Release connection */
-	expect_bssap_clear(RAN_GERAN_A);
-	conn_conclude_cm_service_req(g_conn, RAN_GERAN_A);
+	expect_bssap_clear(OSMO_RAT_GERAN_A);
+	conn_conclude_cm_service_req(g_conn, OSMO_RAT_GERAN_A);
 
 	btw("all requests serviced, conn has been released");
 	bss_sends_clear_complete();
diff --git a/tests/msc_vlr/msc_vlr_test_gsm_ciph.err b/tests/msc_vlr/msc_vlr_test_gsm_ciph.err
index b8290e5ca..f0be4d746 100644
--- a/tests/msc_vlr/msc_vlr_test_gsm_ciph.err
+++ b/tests/msc_vlr/msc_vlr_test_gsm_ciph.err
@@ -3,7 +3,7 @@ talloc_total_blocks(tall_bsc_ctx) == 13
 
 ===== test_ciph
 - Location Update request causes a GSUP Send Auth Info request to HLR
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -51,7 +51,7 @@ DREF VLR subscr IMSI-901700000004620 usage decreases to: 1
   lu_result_sent == 0
   auth_request_sent == 1
 - MS sends Authen Response, VLR accepts and sends Ciphering Mode Command to MS
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_AUTH_RESP
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_AUTH_RESP
 DREF IMSI-901700000004620: MSC conn use + dtap == 1 (0x2: dtap)
 DRLL Dispatching 04.08 message GSM48_MT_MM_AUTH_RESP (0x5:0x14)
 DMM IMSI-901700000004620: MM GSM AUTHENTICATION RESPONSE (sres = 2d8b2c3e)
@@ -89,7 +89,7 @@ DRLL Dispatching 04.08 message SMS:0x01 (0x9:0x1)
 DRLL subscr IMSI-901700000004620: Message not permitted for initial conn: SMS:0x01
   lu_result_sent == 0
 - MS sends Ciphering Mode Complete, VLR accepts and sends GSUP LU Req to HLR
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_RR_CIPH_M_COMPL
+  MSC <--GERAN-A-- MS: GSM48_MT_RR_CIPH_M_COMPL
 DRR IMSI-901700000004620: CIPHERING MODE COMPLETE
 DVLR vlr_lu_fsm(GERAN-A-0_IMSI-901700000004620_LU){VLR_ULA_S_WAIT_CIPH}: Received Event VLR_ULA_E_CIPH_RES
 DVLR vlr_lu_fsm(GERAN-A-0_IMSI-901700000004620_LU){VLR_ULA_S_WAIT_CIPH}: vlr_loc_upd_post_ciph()
@@ -148,7 +148,7 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_LU){RAN_CONN_S_ACCEPTED
 DREF IMSI-901700000004620_MSISDN-46071: MSC conn use + release == 1 (0x100: release)
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage increases to: 4
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage decreases to: 3
-- BSSAP Clear --RAN_GERAN_A--> MS
+- BSSAP Clear --GERAN-A--> MS
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage decreases to: 2
 <-- GSUP rx OSMO_GSUP_MSGT_UPDATE_LOCATION_RESULT: vlr_gsupc_read_cb() returns 0
   bssap_clear_sent == 1
@@ -171,7 +171,7 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_LU){RAN_CONN_S_RELEASED
   llist_count(&net->ran_conns) == 0
 ---
 - after a while, a new conn sends a CM Service Request. VLR responds with Auth Req, 2nd auth vector
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_CM_SERV_REQ
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_CM_SERV_REQ
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -215,7 +215,7 @@ DRLL subscr IMSI-901700000004620_MSISDN-46071: Message not permitted for initial
 DRLL Dispatching 04.08 message SMS:0x01 (0x9:0x1)
 DRLL subscr IMSI-901700000004620_MSISDN-46071: Message not permitted for initial conn: SMS:0x01
 - MS sends Authen Response, VLR accepts and requests Ciphering
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_AUTH_RESP
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_AUTH_RESP
 DREF IMSI-901700000004620_MSISDN-46071: MSC conn use + dtap == 1 (0x2: dtap)
 DRLL Dispatching 04.08 message GSM48_MT_MM_AUTH_RESP (0x5:0x14)
 DMM IMSI-901700000004620_MSISDN-46071: MM GSM AUTHENTICATION RESPONSE (sres = 20bde240)
@@ -253,7 +253,7 @@ DRLL subscr IMSI-901700000004620_MSISDN-46071: Message not permitted for initial
 DRLL Dispatching 04.08 message SMS:0x01 (0x9:0x1)
 DRLL subscr IMSI-901700000004620_MSISDN-46071: Message not permitted for initial conn: SMS:0x01
 - MS sends Ciphering Mode Complete, VLR accepts; above Ciphering is an implicit CM Service Accept
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_RR_CIPH_M_COMPL
+  MSC <--GERAN-A-- MS: GSM48_MT_RR_CIPH_M_COMPL
 DRR IMSI-901700000004620_MSISDN-46071: CIPHERING MODE COMPLETE
 DVLR Process_Access_Request_VLR(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_CM_SERVICE_REQ){PR_ARQ_S_WAIT_CIPH}: Received Event PR_ARQ_E_CIPH_RES
 DVLR Process_Access_Request_VLR(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_CM_SERVICE_REQ){PR_ARQ_S_WAIT_CIPH}: _proc_arq_vlr_node2_post_ciph()
@@ -276,7 +276,7 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_CM_SERVICE_REQ){RAN_CON
 DREF IMSI-901700000004620_MSISDN-46071: MSC conn use + release == 1 (0x100: release)
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage increases to: 3
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage decreases to: 2
-- BSSAP Clear --RAN_GERAN_A--> MS
+- BSSAP Clear --GERAN-A--> MS
   bssap_clear_sent == 1
 - all requests serviced, conn has been released
 - BSS sends BSSMAP Clear Complete
@@ -301,7 +301,7 @@ DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage increases to: 3
 DCC (ti 00 sub IMSI-901700000004620_MSISDN-46071 callref 40000001) New transaction
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage increases to: 4
 DMM Subscriber IMSI-901700000004620_MSISDN-46071 not paged yet, start paging.
-  RAN_GERAN_A sends out paging request to IMSI 901700000004620, TMSI 0xffffffff, LAC 23
+  GERAN-A sends out paging request to IMSI 901700000004620, TMSI 0xffffffff, LAC 23
   strcmp(paging_expecting_imsi, imsi) == 0
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage increases to: 5
   llist_count(&vsub->cs.requests) == 1
@@ -313,7 +313,7 @@ DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage increases to: 5
   llist_count(&vsub->cs.requests) == 1
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage decreases to: 4
 - MS replies with Paging Response, and VLR sends Auth Request with third key
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_RR_PAG_RESP
+  MSC <--GERAN-A-- MS: GSM48_MT_RR_PAG_RESP
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -356,7 +356,7 @@ DRLL subscr IMSI-901700000004620_MSISDN-46071: Message not permitted for initial
 DRLL Dispatching 04.08 message SMS:0x01 (0x9:0x1)
 DRLL subscr IMSI-901700000004620_MSISDN-46071: Message not permitted for initial conn: SMS:0x01
 - MS sends Authen Response, VLR accepts and requests Ciphering
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_AUTH_RESP
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_AUTH_RESP
 DREF IMSI-901700000004620_MSISDN-46071: MSC conn use + dtap == 1 (0x2: dtap)
 DRLL Dispatching 04.08 message GSM48_MT_MM_AUTH_RESP (0x5:0x14)
 DMM IMSI-901700000004620_MSISDN-46071: MM GSM AUTHENTICATION RESPONSE (sres = a29514ae)
@@ -393,7 +393,7 @@ DRLL subscr IMSI-901700000004620_MSISDN-46071: Message not permitted for initial
 DRLL Dispatching 04.08 message SMS:0x01 (0x9:0x1)
 DRLL subscr IMSI-901700000004620_MSISDN-46071: Message not permitted for initial conn: SMS:0x01
 - MS sends Ciphering Mode Complete, VLR accepts and sends pending SMS
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_RR_CIPH_M_COMPL
+  MSC <--GERAN-A-- MS: GSM48_MT_RR_CIPH_M_COMPL
 DRR IMSI-901700000004620_MSISDN-46071: CIPHERING MODE COMPLETE
 DVLR Process_Access_Request_VLR(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_PAGING_RESP){PR_ARQ_S_WAIT_CIPH}: Received Event PR_ARQ_E_CIPH_RES
 DVLR Process_Access_Request_VLR(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_PAGING_RESP){PR_ARQ_S_WAIT_CIPH}: _proc_arq_vlr_node2_post_ciph()
@@ -408,8 +408,8 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_PAGING_RESP){RAN_CONN_S
 DPAG Paging success for IMSI-901700000004620_MSISDN-46071 (event=0)
 DPAG Calling paging cbfn.
 DREF IMSI-901700000004620_MSISDN-46071: MSC conn use + trans_sms == 1 (0x20: trans_sms)
-DMSC msc_tx 91 bytes to IMSI-901700000004620_MSISDN-46071 via RAN_GERAN_A
-- DTAP --RAN_GERAN_A--> MS: SMS:0x01: 09015801000791447758100650004c0005806470f1000007101000000000445079da1e1ee7416937485e9ea7c965373d1d6683c270383b3d0ed3d36ff71c949e83c22072799e9687c5ec32a81d96afcbf4b4fb0c7ac3e9e9b7db05
+DMSC msc_tx 91 bytes to IMSI-901700000004620_MSISDN-46071 via GERAN-A
+- DTAP --GERAN-A--> MS: SMS:0x01: 09015801000791447758100650004c0005806470f1000007101000000000445079da1e1ee7416937485e9ea7c965373d1d6683c270383b3d0ed3d36ff71c949e83c22072799e9687c5ec32a81d96afcbf4b4fb0c7ac3e9e9b7db05
 - DTAP matches expected message
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage decreases to: 4
 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_PAGING_RESP){RAN_CONN_S_AUTH_CIPH}: state_chg to RAN_CONN_S_ACCEPTED
@@ -423,7 +423,7 @@ DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage decreases to: 4
 - conn is still open to wait for SMS ack dance
   llist_count(&net->ran_conns) == 1
 - MS replies with CP-ACK for received SMS
-  MSC <--RAN_GERAN_A-- MS: SMS:0x04
+  MSC <--GERAN-A-- MS: SMS:0x04
 DREF IMSI-901700000004620_MSISDN-46071: MSC conn use + dtap == 2 (0x22: dtap,trans_sms)
 DRLL Dispatching 04.08 message SMS:0x04 (0x9:0x4)
 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_PAGING_RESP){RAN_CONN_S_ACCEPTED}: Received Event RAN_CONN_E_COMMUNICATING
@@ -431,12 +431,12 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_PAGING_RESP){RAN_CONN_S
 DREF IMSI-901700000004620_MSISDN-46071: MSC conn use - dtap == 1 (0x20: trans_sms)
   llist_count(&net->ran_conns) == 1
 - MS also sends RP-ACK, MSC in turn sends CP-ACK for that
-  MSC <--RAN_GERAN_A-- MS: SMS:0x01
+  MSC <--GERAN-A-- MS: SMS:0x01
 DREF IMSI-901700000004620_MSISDN-46071: MSC conn use + dtap == 2 (0x22: dtap,trans_sms)
 DRLL Dispatching 04.08 message SMS:0x01 (0x9:0x1)
 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_PAGING_RESP){RAN_CONN_S_COMMUNICATING}: Received Event RAN_CONN_E_COMMUNICATING
-DMSC msc_tx 2 bytes to IMSI-901700000004620_MSISDN-46071 via RAN_GERAN_A
-- DTAP --RAN_GERAN_A--> MS: SMS:0x04: 0904
+DMSC msc_tx 2 bytes to IMSI-901700000004620_MSISDN-46071 via GERAN-A
+- DTAP --GERAN-A--> MS: SMS:0x04: 0904
 - DTAP matches expected message
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage decreases to: 3
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage decreases to: 2
@@ -447,7 +447,7 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_PAGING_RESP){RAN_CONN_S
 DREF IMSI-901700000004620_MSISDN-46071: MSC conn use + release == 1 (0x100: release)
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage increases to: 3
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage decreases to: 2
-- BSSAP Clear --RAN_GERAN_A--> MS
+- BSSAP Clear --GERAN-A--> MS
   dtap_tx_confirmed == 1
   bssap_clear_sent == 1
 - SMS is done, conn is gone
@@ -467,7 +467,7 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_PAGING_RESP){RAN_CONN_S
   llist_count(&net->ran_conns) == 0
 ---
 - subscriber detaches
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_IMSI_DETACH_IND
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_IMSI_DETACH_IND
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -483,7 +483,7 @@ DREF freeing VLR subscr IMSI-901700000004620_MSISDN-46071
 DMM RAN_conn{RAN_CONN_S_NEW}: Received Event RAN_CONN_E_CN_CLOSE
 DMM RAN_conn{RAN_CONN_S_NEW}: state_chg to RAN_CONN_S_RELEASING
 DREF unknown: MSC conn use + release == 2 (0x101: compl_l3,release)
-- BSSAP Clear --RAN_GERAN_A--> MS
+- BSSAP Clear --GERAN-A--> MS
 DREF unknown: MSC conn use - compl_l3 == 1 (0x100: release)
   bssap_clear_sent == 1
 - BSS sends BSSMAP Clear Complete
@@ -502,7 +502,7 @@ talloc_total_blocks(tall_bsc_ctx) == 13
 
 ===== test_ciph_tmsi
 - Location Update request causes a GSUP Send Auth Info request to HLR
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -550,7 +550,7 @@ DREF VLR subscr IMSI-901700000004620 usage decreases to: 1
   auth_request_sent == 1
   lu_result_sent == 0
 - MS sends Authen Response, VLR accepts and sends Ciphering Mode Command to MS
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_AUTH_RESP
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_AUTH_RESP
 DREF IMSI-901700000004620: MSC conn use + dtap == 1 (0x2: dtap)
 DRLL Dispatching 04.08 message GSM48_MT_MM_AUTH_RESP (0x5:0x14)
 DMM IMSI-901700000004620: MM GSM AUTHENTICATION RESPONSE (sres = 2d8b2c3e)
@@ -589,7 +589,7 @@ DRLL Dispatching 04.08 message SMS:0x01 (0x9:0x1)
 DRLL subscr IMSI-901700000004620: Message not permitted for initial conn: SMS:0x01
   lu_result_sent == 0
 - MS sends Ciphering Mode Complete, VLR accepts and sends GSUP LU Req to HLR
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_RR_CIPH_M_COMPL
+  MSC <--GERAN-A-- MS: GSM48_MT_RR_CIPH_M_COMPL
 DRR IMSI-901700000004620: CIPHERING MODE COMPLETE
 DVLR vlr_lu_fsm(GERAN-A-0_IMSI-901700000004620_LU){VLR_ULA_S_WAIT_CIPH}: Received Event VLR_ULA_E_CIPH_RES
 DVLR vlr_lu_fsm(GERAN-A-0_IMSI-901700000004620_LU){VLR_ULA_S_WAIT_CIPH}: vlr_loc_upd_post_ciph()
@@ -658,7 +658,7 @@ DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage increases to: 2
   vsub->tmsi == 0xffffffff
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage decreases to: 1
 - MS sends TMSI Realloc Complete
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_TMSI_REALL_COMPL
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_TMSI_REALL_COMPL
 DREF IMSI-901700000004620_MSISDN-46071: MSC conn use + dtap == 1 (0x2: dtap)
 DRLL Dispatching 04.08 message GSM48_MT_MM_TMSI_REALL_COMPL (0x5:0x1b)
 DMM TMSI Reallocation Completed. Subscriber: IMSI-901700000004620_MSISDN-46071
@@ -679,7 +679,7 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_LU){RAN_CONN_S_ACCEPTED
 DREF IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100: MSC conn use + release == 2 (0x102: dtap,release)
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100 usage increases to: 3
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100 usage decreases to: 2
-- BSSAP Clear --RAN_GERAN_A--> MS
+- BSSAP Clear --GERAN-A--> MS
 DREF IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100: MSC conn use - dtap == 1 (0x100: release)
   bssap_clear_sent == 1
 - LU was successful, and the conn has already been closed
@@ -707,7 +707,7 @@ DREF VLR subscr IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100 usage increase
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100 usage decreases to: 1
 ---
 - after a while, a new conn sends a CM Service Request using above TMSI. VLR responds with Auth Req, 2nd auth vector
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_CM_SERV_REQ
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_CM_SERV_REQ
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -751,7 +751,7 @@ DRLL subscr IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100: Message not permi
 DRLL Dispatching 04.08 message SMS:0x01 (0x9:0x1)
 DRLL subscr IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100: Message not permitted for initial conn: SMS:0x01
 - MS sends Authen Response, VLR accepts and requests Ciphering
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_AUTH_RESP
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_AUTH_RESP
 DREF IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100: MSC conn use + dtap == 1 (0x2: dtap)
 DRLL Dispatching 04.08 message GSM48_MT_MM_AUTH_RESP (0x5:0x14)
 DMM IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100: MM GSM AUTHENTICATION RESPONSE (sres = 20bde240)
@@ -789,7 +789,7 @@ DRLL subscr IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100: Message not permi
 DRLL Dispatching 04.08 message SMS:0x01 (0x9:0x1)
 DRLL subscr IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100: Message not permitted for initial conn: SMS:0x01
 - MS sends Ciphering Mode Complete, VLR accepts; above Ciphering is an implicit CM Service Accept
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_RR_CIPH_M_COMPL
+  MSC <--GERAN-A-- MS: GSM48_MT_RR_CIPH_M_COMPL
 DRR IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100: CIPHERING MODE COMPLETE
 DVLR Process_Access_Request_VLR(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100_CM_SERVICE_REQ){PR_ARQ_S_WAIT_CIPH}: Received Event PR_ARQ_E_CIPH_RES
 DVLR Process_Access_Request_VLR(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100_CM_SERVICE_REQ){PR_ARQ_S_WAIT_CIPH}: _proc_arq_vlr_node2_post_ciph()
@@ -812,7 +812,7 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100_CM_SERV
 DREF IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100: MSC conn use + release == 1 (0x100: release)
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100 usage increases to: 3
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100 usage decreases to: 2
-- BSSAP Clear --RAN_GERAN_A--> MS
+- BSSAP Clear --GERAN-A--> MS
   bssap_clear_sent == 1
 - all requests serviced, conn has been released
 - BSS sends BSSMAP Clear Complete
@@ -837,7 +837,7 @@ DREF VLR subscr IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100 usage increase
 DCC (ti 00 sub IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100 callref 40000002) New transaction
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100 usage increases to: 4
 DMM Subscriber IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100 not paged yet, start paging.
-  RAN_GERAN_A sends out paging request to IMSI 901700000004620, TMSI 0x03020100, LAC 23
+  GERAN-A sends out paging request to IMSI 901700000004620, TMSI 0x03020100, LAC 23
   paging_expecting_tmsi == 0x03020100
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100 usage increases to: 5
   llist_count(&vsub->cs.requests) == 1
@@ -849,7 +849,7 @@ DREF VLR subscr IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100 usage increase
   llist_count(&vsub->cs.requests) == 1
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100 usage decreases to: 4
 - MS replies with Paging Response using TMSI, and VLR sends Auth Request with third key
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_RR_PAG_RESP
+  MSC <--GERAN-A-- MS: GSM48_MT_RR_PAG_RESP
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -892,7 +892,7 @@ DRLL subscr IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100: Message not permi
 DRLL Dispatching 04.08 message SMS:0x01 (0x9:0x1)
 DRLL subscr IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100: Message not permitted for initial conn: SMS:0x01
 - MS sends Authen Response, VLR accepts and requests Ciphering
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_AUTH_RESP
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_AUTH_RESP
 DREF IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100: MSC conn use + dtap == 1 (0x2: dtap)
 DRLL Dispatching 04.08 message GSM48_MT_MM_AUTH_RESP (0x5:0x14)
 DMM IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100: MM GSM AUTHENTICATION RESPONSE (sres = a29514ae)
@@ -929,7 +929,7 @@ DRLL subscr IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100: Message not permi
 DRLL Dispatching 04.08 message SMS:0x01 (0x9:0x1)
 DRLL subscr IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100: Message not permitted for initial conn: SMS:0x01
 - MS sends Ciphering Mode Complete, VLR accepts and sends pending SMS
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_RR_CIPH_M_COMPL
+  MSC <--GERAN-A-- MS: GSM48_MT_RR_CIPH_M_COMPL
 DRR IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100: CIPHERING MODE COMPLETE
 DVLR Process_Access_Request_VLR(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100_PAGING_RESP){PR_ARQ_S_WAIT_CIPH}: Received Event PR_ARQ_E_CIPH_RES
 DVLR Process_Access_Request_VLR(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100_PAGING_RESP){PR_ARQ_S_WAIT_CIPH}: _proc_arq_vlr_node2_post_ciph()
@@ -944,8 +944,8 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100_PAGING_
 DPAG Paging success for IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100 (event=0)
 DPAG Calling paging cbfn.
 DREF IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100: MSC conn use + trans_sms == 1 (0x20: trans_sms)
-DMSC msc_tx 91 bytes to IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100 via RAN_GERAN_A
-- DTAP --RAN_GERAN_A--> MS: SMS:0x01: 09015801000791447758100650004c0005806470f1000007101000000000445079da1e1ee7416937485e9ea7c965373d1d6683c270383b3d0ed3d36ff71c949e83c22072799e9687c5ec32a81d96afcbf4b4fb0c7ac3e9e9b7db05
+DMSC msc_tx 91 bytes to IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100 via GERAN-A
+- DTAP --GERAN-A--> MS: SMS:0x01: 09015801000791447758100650004c0005806470f1000007101000000000445079da1e1ee7416937485e9ea7c965373d1d6683c270383b3d0ed3d36ff71c949e83c22072799e9687c5ec32a81d96afcbf4b4fb0c7ac3e9e9b7db05
 - DTAP matches expected message
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100 usage decreases to: 4
 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100_PAGING_RESP){RAN_CONN_S_AUTH_CIPH}: state_chg to RAN_CONN_S_ACCEPTED
@@ -959,7 +959,7 @@ DREF VLR subscr IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100 usage decrease
 - conn is still open to wait for SMS ack dance
   llist_count(&net->ran_conns) == 1
 - MS replies with CP-ACK for received SMS
-  MSC <--RAN_GERAN_A-- MS: SMS:0x04
+  MSC <--GERAN-A-- MS: SMS:0x04
 DREF IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100: MSC conn use + dtap == 2 (0x22: dtap,trans_sms)
 DRLL Dispatching 04.08 message SMS:0x04 (0x9:0x4)
 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100_PAGING_RESP){RAN_CONN_S_ACCEPTED}: Received Event RAN_CONN_E_COMMUNICATING
@@ -967,12 +967,12 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100_PAGING_
 DREF IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100: MSC conn use - dtap == 1 (0x20: trans_sms)
   llist_count(&net->ran_conns) == 1
 - MS also sends RP-ACK, MSC in turn sends CP-ACK for that
-  MSC <--RAN_GERAN_A-- MS: SMS:0x01
+  MSC <--GERAN-A-- MS: SMS:0x01
 DREF IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100: MSC conn use + dtap == 2 (0x22: dtap,trans_sms)
 DRLL Dispatching 04.08 message SMS:0x01 (0x9:0x1)
 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100_PAGING_RESP){RAN_CONN_S_COMMUNICATING}: Received Event RAN_CONN_E_COMMUNICATING
-DMSC msc_tx 2 bytes to IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100 via RAN_GERAN_A
-- DTAP --RAN_GERAN_A--> MS: SMS:0x04: 0904
+DMSC msc_tx 2 bytes to IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100 via GERAN-A
+- DTAP --GERAN-A--> MS: SMS:0x04: 0904
 - DTAP matches expected message
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100 usage decreases to: 3
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100 usage decreases to: 2
@@ -983,7 +983,7 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100_PAGING_
 DREF IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100: MSC conn use + release == 1 (0x100: release)
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100 usage increases to: 3
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100 usage decreases to: 2
-- BSSAP Clear --RAN_GERAN_A--> MS
+- BSSAP Clear --GERAN-A--> MS
   dtap_tx_confirmed == 1
   bssap_clear_sent == 1
 - SMS is done, conn is gone
@@ -1003,7 +1003,7 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100_PAGING_
   llist_count(&net->ran_conns) == 0
 ---
 - subscriber detaches, using TMSI
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_IMSI_DETACH_IND
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_IMSI_DETACH_IND
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -1019,7 +1019,7 @@ DREF freeing VLR subscr IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100
 DMM RAN_conn{RAN_CONN_S_NEW}: Received Event RAN_CONN_E_CN_CLOSE
 DMM RAN_conn{RAN_CONN_S_NEW}: state_chg to RAN_CONN_S_RELEASING
 DREF unknown: MSC conn use + release == 2 (0x101: compl_l3,release)
-- BSSAP Clear --RAN_GERAN_A--> MS
+- BSSAP Clear --GERAN-A--> MS
 DREF unknown: MSC conn use - compl_l3 == 1 (0x100: release)
   bssap_clear_sent == 1
 - BSS sends BSSMAP Clear Complete
@@ -1038,7 +1038,7 @@ talloc_total_blocks(tall_bsc_ctx) == 13
 
 ===== test_ciph_imei
 - Location Update request causes a GSUP Send Auth Info request to HLR
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -1086,7 +1086,7 @@ DREF VLR subscr IMSI-901700000004620 usage decreases to: 1
   auth_request_sent == 1
   lu_result_sent == 0
 - MS sends Authen Response, VLR accepts and sends Ciphering Mode Command to MS
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_AUTH_RESP
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_AUTH_RESP
 DREF IMSI-901700000004620: MSC conn use + dtap == 1 (0x2: dtap)
 DRLL Dispatching 04.08 message GSM48_MT_MM_AUTH_RESP (0x5:0x14)
 DMM IMSI-901700000004620: MM GSM AUTHENTICATION RESPONSE (sres = 2d8b2c3e)
@@ -1124,7 +1124,7 @@ DRLL Dispatching 04.08 message SMS:0x01 (0x9:0x1)
 DRLL subscr IMSI-901700000004620: Message not permitted for initial conn: SMS:0x01
   lu_result_sent == 0
 - MS sends Ciphering Mode Complete, VLR accepts and sends GSUP LU Req to HLR
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_RR_CIPH_M_COMPL
+  MSC <--GERAN-A-- MS: GSM48_MT_RR_CIPH_M_COMPL
 DRR IMSI-901700000004620: CIPHERING MODE COMPLETE
 DVLR vlr_lu_fsm(GERAN-A-0_IMSI-901700000004620_LU){VLR_ULA_S_WAIT_CIPH}: Received Event VLR_ULA_E_CIPH_RES
 DVLR vlr_lu_fsm(GERAN-A-0_IMSI-901700000004620_LU){VLR_ULA_S_WAIT_CIPH}: vlr_loc_upd_post_ciph()
@@ -1168,8 +1168,8 @@ DVLR lu_compl_vlr_fsm(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_LU){LU_COMPL_V
 DVLR lu_compl_vlr_fsm(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_LU){LU_COMPL_VLR_S_INIT}: state_chg to LU_COMPL_VLR_S_WAIT_SUB_PRES
 DVLR lu_compl_vlr_fsm(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_LU){LU_COMPL_VLR_S_WAIT_SUB_PRES}: Received Event LU_COMPL_VLR_E_SUB_PRES_COMPL
 DVLR lu_compl_vlr_fsm(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_LU){LU_COMPL_VLR_S_WAIT_SUB_PRES}: state_chg to LU_COMPL_VLR_S_WAIT_IMEI
-DMSC msc_tx 3 bytes to IMSI-901700000004620_MSISDN-46071 via RAN_GERAN_A
-- DTAP --RAN_GERAN_A--> MS: GSM48_MT_MM_ID_REQ: 051802
+DMSC msc_tx 3 bytes to IMSI-901700000004620_MSISDN-46071 via GERAN-A
+- DTAP --GERAN-A--> MS: GSM48_MT_MM_ID_REQ: 051802
 - DTAP matches expected message
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage decreases to: 1
 <-- GSUP rx OSMO_GSUP_MSGT_UPDATE_LOCATION_RESULT: vlr_gsupc_read_cb() returns 0
@@ -1189,7 +1189,7 @@ DRLL subscr IMSI-901700000004620_MSISDN-46071: Message not permitted for initial
 DRLL Dispatching 04.08 message SMS:0x01 (0x9:0x1)
 DRLL subscr IMSI-901700000004620_MSISDN-46071: Message not permitted for initial conn: SMS:0x01
 - MS replies with an Identity Response
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_ID_RESP
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_ID_RESP
 DREF IMSI-901700000004620_MSISDN-46071: MSC conn use + dtap == 1 (0x2: dtap)
 DRLL Dispatching 04.08 message GSM48_MT_MM_ID_RESP (0x5:0x19)
 DMM IDENTITY RESPONSE: MI(IMEI)=423423423423420
@@ -1212,7 +1212,7 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_LU){RAN_CONN_S_ACCEPTED
 DREF IMSI-901700000004620_MSISDN-46071: MSC conn use + release == 2 (0x102: dtap,release)
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage increases to: 3
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage decreases to: 2
-- BSSAP Clear --RAN_GERAN_A--> MS
+- BSSAP Clear --GERAN-A--> MS
 DREF IMSI-901700000004620_MSISDN-46071: MSC conn use - dtap == 1 (0x100: release)
   bssap_clear_sent == 1
 - LU was successful, and the conn has already been closed
@@ -1238,7 +1238,7 @@ DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage increases to: 2
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage decreases to: 1
 ---
 - subscriber detaches
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_IMSI_DETACH_IND
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_IMSI_DETACH_IND
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -1254,7 +1254,7 @@ DREF freeing VLR subscr IMSI-901700000004620_MSISDN-46071
 DMM RAN_conn{RAN_CONN_S_NEW}: Received Event RAN_CONN_E_CN_CLOSE
 DMM RAN_conn{RAN_CONN_S_NEW}: state_chg to RAN_CONN_S_RELEASING
 DREF unknown: MSC conn use + release == 2 (0x101: compl_l3,release)
-- BSSAP Clear --RAN_GERAN_A--> MS
+- BSSAP Clear --GERAN-A--> MS
 DREF unknown: MSC conn use - compl_l3 == 1 (0x100: release)
   bssap_clear_sent == 1
 - BSS sends BSSMAP Clear Complete
@@ -1273,7 +1273,7 @@ talloc_total_blocks(tall_bsc_ctx) == 13
 
 ===== test_ciph_imeisv
 - Location Update request causes a GSUP Send Auth Info request to HLR
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -1321,7 +1321,7 @@ DREF VLR subscr IMSI-901700000004620 usage decreases to: 1
   auth_request_sent == 1
   lu_result_sent == 0
 - MS sends Authen Response, VLR accepts and sends Ciphering Mode Command to MS
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_AUTH_RESP
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_AUTH_RESP
 DREF IMSI-901700000004620: MSC conn use + dtap == 1 (0x2: dtap)
 DRLL Dispatching 04.08 message GSM48_MT_MM_AUTH_RESP (0x5:0x14)
 DMM IMSI-901700000004620: MM GSM AUTHENTICATION RESPONSE (sres = 2d8b2c3e)
@@ -1364,7 +1364,7 @@ DREF VLR subscr IMSI-901700000004620 usage increases to: 2
   vsub->imeisv[0] == 0
 DREF VLR subscr IMSI-901700000004620 usage decreases to: 1
 - MS sends Ciphering Mode Complete with IMEISV, VLR accepts and sends GSUP LU Req to HLR
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_RR_CIPH_M_COMPL
+  MSC <--GERAN-A-- MS: GSM48_MT_RR_CIPH_M_COMPL
 DRR IMSI-901700000004620: CIPHERING MODE COMPLETE
 DVLR vlr_lu_fsm(GERAN-A-0_IMSI-901700000004620_LU){VLR_ULA_S_WAIT_CIPH}: Received Event VLR_ULA_E_CIPH_RES
 DVLR vlr_lu_fsm(GERAN-A-0_IMSI-901700000004620_LU){VLR_ULA_S_WAIT_CIPH}: got IMEISV: 4234234234234275F
@@ -1439,7 +1439,7 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_LU){RAN_CONN_S_ACCEPTED
 DREF IMSI-901700000004620_MSISDN-46071: MSC conn use + release == 1 (0x100: release)
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage increases to: 4
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage decreases to: 3
-- BSSAP Clear --RAN_GERAN_A--> MS
+- BSSAP Clear --GERAN-A--> MS
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage decreases to: 2
 <-- GSUP rx OSMO_GSUP_MSGT_UPDATE_LOCATION_RESULT: vlr_gsupc_read_cb() returns 0
   bssap_clear_sent == 1
@@ -1462,7 +1462,7 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_LU){RAN_CONN_S_RELEASED
   llist_count(&net->ran_conns) == 0
 ---
 - subscriber detaches
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_IMSI_DETACH_IND
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_IMSI_DETACH_IND
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -1478,7 +1478,7 @@ DREF freeing VLR subscr IMSI-901700000004620_MSISDN-46071
 DMM RAN_conn{RAN_CONN_S_NEW}: Received Event RAN_CONN_E_CN_CLOSE
 DMM RAN_conn{RAN_CONN_S_NEW}: state_chg to RAN_CONN_S_RELEASING
 DREF unknown: MSC conn use + release == 2 (0x101: compl_l3,release)
-- BSSAP Clear --RAN_GERAN_A--> MS
+- BSSAP Clear --GERAN-A--> MS
 DREF unknown: MSC conn use - compl_l3 == 1 (0x100: release)
   bssap_clear_sent == 1
 - BSS sends BSSMAP Clear Complete
@@ -1497,7 +1497,7 @@ talloc_total_blocks(tall_bsc_ctx) == 13
 
 ===== test_ciph_tmsi_imei
 - Location Update request causes a GSUP Send Auth Info request to HLR
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -1545,7 +1545,7 @@ DREF VLR subscr IMSI-901700000004620 usage decreases to: 1
   auth_request_sent == 1
   lu_result_sent == 0
 - MS sends Authen Response, VLR accepts and sends Ciphering Mode Command to MS
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_AUTH_RESP
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_AUTH_RESP
 DREF IMSI-901700000004620: MSC conn use + dtap == 1 (0x2: dtap)
 DRLL Dispatching 04.08 message GSM48_MT_MM_AUTH_RESP (0x5:0x14)
 DMM IMSI-901700000004620: MM GSM AUTHENTICATION RESPONSE (sres = 2d8b2c3e)
@@ -1583,7 +1583,7 @@ DRLL Dispatching 04.08 message SMS:0x01 (0x9:0x1)
 DRLL subscr IMSI-901700000004620: Message not permitted for initial conn: SMS:0x01
   lu_result_sent == 0
 - MS sends Ciphering Mode Complete, VLR accepts and sends GSUP LU Req to HLR
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_RR_CIPH_M_COMPL
+  MSC <--GERAN-A-- MS: GSM48_MT_RR_CIPH_M_COMPL
 DRR IMSI-901700000004620: CIPHERING MODE COMPLETE
 DVLR vlr_lu_fsm(GERAN-A-0_IMSI-901700000004620_LU){VLR_ULA_S_WAIT_CIPH}: Received Event VLR_ULA_E_CIPH_RES
 DVLR vlr_lu_fsm(GERAN-A-0_IMSI-901700000004620_LU){VLR_ULA_S_WAIT_CIPH}: vlr_loc_upd_post_ciph()
@@ -1627,8 +1627,8 @@ DVLR lu_compl_vlr_fsm(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_LU){LU_COMPL_V
 DVLR lu_compl_vlr_fsm(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_LU){LU_COMPL_VLR_S_INIT}: state_chg to LU_COMPL_VLR_S_WAIT_SUB_PRES
 DVLR lu_compl_vlr_fsm(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_LU){LU_COMPL_VLR_S_WAIT_SUB_PRES}: Received Event LU_COMPL_VLR_E_SUB_PRES_COMPL
 DVLR lu_compl_vlr_fsm(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_LU){LU_COMPL_VLR_S_WAIT_SUB_PRES}: state_chg to LU_COMPL_VLR_S_WAIT_IMEI_TMSI
-DMSC msc_tx 3 bytes to IMSI-901700000004620_MSISDN-46071 via RAN_GERAN_A
-- DTAP --RAN_GERAN_A--> MS: GSM48_MT_MM_ID_REQ: 051802
+DMSC msc_tx 3 bytes to IMSI-901700000004620_MSISDN-46071 via GERAN-A
+- DTAP --GERAN-A--> MS: GSM48_MT_MM_ID_REQ: 051802
 - DTAP matches expected message
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage decreases to: 1
 <-- GSUP rx OSMO_GSUP_MSGT_UPDATE_LOCATION_RESULT: vlr_gsupc_read_cb() returns 0
@@ -1648,7 +1648,7 @@ DRLL subscr IMSI-901700000004620_MSISDN-46071: Message not permitted for initial
 DRLL Dispatching 04.08 message SMS:0x01 (0x9:0x1)
 DRLL subscr IMSI-901700000004620_MSISDN-46071: Message not permitted for initial conn: SMS:0x01
 - MS replies with an Identity Response
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_ID_RESP
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_ID_RESP
 DREF IMSI-901700000004620_MSISDN-46071: MSC conn use + dtap == 1 (0x2: dtap)
 DRLL Dispatching 04.08 message GSM48_MT_MM_ID_RESP (0x5:0x19)
 DMM IDENTITY RESPONSE: MI(IMEI)=423423423423420
@@ -1682,7 +1682,7 @@ DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage increases to: 2
   vsub->tmsi == 0xffffffff
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage decreases to: 1
 - MS sends TMSI Realloc Complete
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_TMSI_REALL_COMPL
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_TMSI_REALL_COMPL
 DREF IMSI-901700000004620_MSISDN-46071: MSC conn use + dtap == 1 (0x2: dtap)
 DRLL Dispatching 04.08 message GSM48_MT_MM_TMSI_REALL_COMPL (0x5:0x1b)
 DMM TMSI Reallocation Completed. Subscriber: IMSI-901700000004620_MSISDN-46071
@@ -1703,7 +1703,7 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_LU){RAN_CONN_S_ACCEPTED
 DREF IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100: MSC conn use + release == 2 (0x102: dtap,release)
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100 usage increases to: 3
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100 usage decreases to: 2
-- BSSAP Clear --RAN_GERAN_A--> MS
+- BSSAP Clear --GERAN-A--> MS
 DREF IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100: MSC conn use - dtap == 1 (0x100: release)
   bssap_clear_sent == 1
 - LU was successful, and the conn has already been closed
@@ -1729,7 +1729,7 @@ DREF VLR subscr IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100 usage increase
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100 usage decreases to: 1
 ---
 - subscriber detaches, using TMSI
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_IMSI_DETACH_IND
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_IMSI_DETACH_IND
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -1745,7 +1745,7 @@ DREF freeing VLR subscr IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100
 DMM RAN_conn{RAN_CONN_S_NEW}: Received Event RAN_CONN_E_CN_CLOSE
 DMM RAN_conn{RAN_CONN_S_NEW}: state_chg to RAN_CONN_S_RELEASING
 DREF unknown: MSC conn use + release == 2 (0x101: compl_l3,release)
-- BSSAP Clear --RAN_GERAN_A--> MS
+- BSSAP Clear --GERAN-A--> MS
 DREF unknown: MSC conn use - compl_l3 == 1 (0x100: release)
   bssap_clear_sent == 1
 - BSS sends BSSMAP Clear Complete
@@ -1764,7 +1764,7 @@ talloc_total_blocks(tall_bsc_ctx) == 13
 
 ===== test_gsm_ciph_in_umts_env
 - Location Update request causes a GSUP Send Auth Info request to HLR
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -1813,7 +1813,7 @@ DREF VLR subscr IMSI-901700000010650 usage decreases to: 1
   auth_request_sent == 1
   lu_result_sent == 0
 - MS sends *GSM AKA* Authen Response, VLR accepts and sends Ciphering Mode Command to MS
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_AUTH_RESP
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_AUTH_RESP
 DREF IMSI-901700000010650: MSC conn use + dtap == 1 (0x2: dtap)
 DRLL Dispatching 04.08 message GSM48_MT_MM_AUTH_RESP (0x5:0x14)
 DMM IMSI-901700000010650: MM GSM AUTHENTICATION RESPONSE (sres = dacc4b26)
@@ -1839,7 +1839,7 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000010650_LU){RAN_CONN_S_AUTH_CIPH}: Received
 DMM RAN_conn(GERAN-A-0_IMSI-901700000010650_LU){RAN_CONN_S_AUTH_CIPH}: Awaiting results for Auth+Ciph, overruling event RAN_CONN_E_UNUSED
   lu_result_sent == 0
 - MS sends Ciphering Mode Complete, VLR accepts and sends GSUP LU Req to HLR
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_RR_CIPH_M_COMPL
+  MSC <--GERAN-A-- MS: GSM48_MT_RR_CIPH_M_COMPL
 DRR IMSI-901700000010650: CIPHERING MODE COMPLETE
 DVLR vlr_lu_fsm(GERAN-A-0_IMSI-901700000010650_LU){VLR_ULA_S_WAIT_CIPH}: Received Event VLR_ULA_E_CIPH_RES
 DVLR vlr_lu_fsm(GERAN-A-0_IMSI-901700000010650_LU){VLR_ULA_S_WAIT_CIPH}: vlr_loc_upd_post_ciph()
@@ -1898,7 +1898,7 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000010650_MSISDN-42342_LU){RAN_CONN_S_ACCEPTED
 DREF IMSI-901700000010650_MSISDN-42342: MSC conn use + release == 1 (0x100: release)
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342 usage increases to: 4
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342 usage decreases to: 3
-- BSSAP Clear --RAN_GERAN_A--> MS
+- BSSAP Clear --GERAN-A--> MS
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342 usage decreases to: 2
 <-- GSUP rx OSMO_GSUP_MSGT_UPDATE_LOCATION_RESULT: vlr_gsupc_read_cb() returns 0
   bssap_clear_sent == 1
@@ -1921,7 +1921,7 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000010650_MSISDN-42342_LU){RAN_CONN_S_RELEASED
   llist_count(&net->ran_conns) == 0
 ---
 - after a while, a new conn sends a CM Service Request. VLR responds with *UMTS AKA* Auth Req, 2nd auth vector
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_CM_SERV_REQ
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_CM_SERV_REQ
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -1966,7 +1966,7 @@ DRLL subscr IMSI-901700000010650_MSISDN-42342: Message not permitted for initial
 DRLL Dispatching 04.08 message SMS:0x01 (0x9:0x1)
 DRLL subscr IMSI-901700000010650_MSISDN-42342: Message not permitted for initial conn: SMS:0x01
 - MS sends *GSM AKA* Authen Response, VLR accepts and requests Ciphering
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_AUTH_RESP
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_AUTH_RESP
 DREF IMSI-901700000010650_MSISDN-42342: MSC conn use + dtap == 1 (0x2: dtap)
 DRLL Dispatching 04.08 message GSM48_MT_MM_AUTH_RESP (0x5:0x14)
 DMM IMSI-901700000010650_MSISDN-42342: MM GSM AUTHENTICATION RESPONSE (sres = 2fb4cfad)
@@ -1993,7 +1993,7 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000010650_MSISDN-42342_CM_SERVICE_REQ){RAN_CON
   cm_service_result_sent == 0
   cipher_mode_cmd_sent == 1
 - MS sends Ciphering Mode Complete, VLR accepts; above Ciphering is an implicit CM Service Accept
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_RR_CIPH_M_COMPL
+  MSC <--GERAN-A-- MS: GSM48_MT_RR_CIPH_M_COMPL
 DRR IMSI-901700000010650_MSISDN-42342: CIPHERING MODE COMPLETE
 DVLR Process_Access_Request_VLR(GERAN-A-0_IMSI-901700000010650_MSISDN-42342_CM_SERVICE_REQ){PR_ARQ_S_WAIT_CIPH}: Received Event PR_ARQ_E_CIPH_RES
 DVLR Process_Access_Request_VLR(GERAN-A-0_IMSI-901700000010650_MSISDN-42342_CM_SERVICE_REQ){PR_ARQ_S_WAIT_CIPH}: _proc_arq_vlr_node2_post_ciph()
@@ -2016,7 +2016,7 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000010650_MSISDN-42342_CM_SERVICE_REQ){RAN_CON
 DREF IMSI-901700000010650_MSISDN-42342: MSC conn use + release == 1 (0x100: release)
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342 usage increases to: 3
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342 usage decreases to: 2
-- BSSAP Clear --RAN_GERAN_A--> MS
+- BSSAP Clear --GERAN-A--> MS
   bssap_clear_sent == 1
 - all requests serviced, conn has been released
 - BSS sends BSSMAP Clear Complete
@@ -2041,7 +2041,7 @@ DREF VLR subscr IMSI-901700000010650_MSISDN-42342 usage increases to: 3
 DCC (ti 00 sub IMSI-901700000010650_MSISDN-42342 callref 40000003) New transaction
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342 usage increases to: 4
 DMM Subscriber IMSI-901700000010650_MSISDN-42342 not paged yet, start paging.
-  RAN_GERAN_A sends out paging request to IMSI 901700000010650, TMSI 0xffffffff, LAC 23
+  GERAN-A sends out paging request to IMSI 901700000010650, TMSI 0xffffffff, LAC 23
   strcmp(paging_expecting_imsi, imsi) == 0
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342 usage increases to: 5
   llist_count(&vsub->cs.requests) == 1
@@ -2053,7 +2053,7 @@ DREF VLR subscr IMSI-901700000010650_MSISDN-42342 usage increases to: 5
   llist_count(&vsub->cs.requests) == 1
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342 usage decreases to: 4
 - MS replies with Paging Response, and VLR sends *UMTS AKA* Auth Request with third key
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_RR_PAG_RESP
+  MSC <--GERAN-A-- MS: GSM48_MT_RR_PAG_RESP
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -2097,7 +2097,7 @@ DRLL subscr IMSI-901700000010650_MSISDN-42342: Message not permitted for initial
 DRLL Dispatching 04.08 message SMS:0x01 (0x9:0x1)
 DRLL subscr IMSI-901700000010650_MSISDN-42342: Message not permitted for initial conn: SMS:0x01
 - MS sends *GSM AKA* Authen Response, VLR accepts and requests Ciphering
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_AUTH_RESP
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_AUTH_RESP
 DREF IMSI-901700000010650_MSISDN-42342: MSC conn use + dtap == 1 (0x2: dtap)
 DRLL Dispatching 04.08 message GSM48_MT_MM_AUTH_RESP (0x5:0x14)
 DMM IMSI-901700000010650_MSISDN-42342: MM GSM AUTHENTICATION RESPONSE (sres = 0ff61e0f)
@@ -2123,7 +2123,7 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000010650_MSISDN-42342_PAGING_RESP){RAN_CONN_S
 DMM RAN_conn(GERAN-A-0_IMSI-901700000010650_MSISDN-42342_PAGING_RESP){RAN_CONN_S_AUTH_CIPH}: Awaiting results for Auth+Ciph, overruling event RAN_CONN_E_UNUSED
   cipher_mode_cmd_sent == 1
 - MS sends Ciphering Mode Complete, VLR accepts and sends pending SMS
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_RR_CIPH_M_COMPL
+  MSC <--GERAN-A-- MS: GSM48_MT_RR_CIPH_M_COMPL
 DRR IMSI-901700000010650_MSISDN-42342: CIPHERING MODE COMPLETE
 DVLR Process_Access_Request_VLR(GERAN-A-0_IMSI-901700000010650_MSISDN-42342_PAGING_RESP){PR_ARQ_S_WAIT_CIPH}: Received Event PR_ARQ_E_CIPH_RES
 DVLR Process_Access_Request_VLR(GERAN-A-0_IMSI-901700000010650_MSISDN-42342_PAGING_RESP){PR_ARQ_S_WAIT_CIPH}: _proc_arq_vlr_node2_post_ciph()
@@ -2138,8 +2138,8 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000010650_MSISDN-42342_PAGING_RESP){RAN_CONN_S
 DPAG Paging success for IMSI-901700000010650_MSISDN-42342 (event=0)
 DPAG Calling paging cbfn.
 DREF IMSI-901700000010650_MSISDN-42342: MSC conn use + trans_sms == 1 (0x20: trans_sms)
-DMSC msc_tx 91 bytes to IMSI-901700000010650_MSISDN-42342 via RAN_GERAN_A
-- DTAP --RAN_GERAN_A--> MS: SMS:0x01: 09015801000791447758100650004c0005802443f2000007101000000000445079da1e1ee7416937485e9ea7c965373d1d6683c270383b3d0ed3d36ff71c949e83c22072799e9687c5ec32a81d96afcbf4b4fb0c7ac3e9e9b7db05
+DMSC msc_tx 91 bytes to IMSI-901700000010650_MSISDN-42342 via GERAN-A
+- DTAP --GERAN-A--> MS: SMS:0x01: 09015801000791447758100650004c0005802443f2000007101000000000445079da1e1ee7416937485e9ea7c965373d1d6683c270383b3d0ed3d36ff71c949e83c22072799e9687c5ec32a81d96afcbf4b4fb0c7ac3e9e9b7db05
 - DTAP matches expected message
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342 usage decreases to: 4
 DMM RAN_conn(GERAN-A-0_IMSI-901700000010650_MSISDN-42342_PAGING_RESP){RAN_CONN_S_AUTH_CIPH}: state_chg to RAN_CONN_S_ACCEPTED
@@ -2153,7 +2153,7 @@ DREF VLR subscr IMSI-901700000010650_MSISDN-42342 usage decreases to: 4
 - conn is still open to wait for SMS ack dance
   llist_count(&net->ran_conns) == 1
 - MS replies with CP-ACK for received SMS
-  MSC <--RAN_GERAN_A-- MS: SMS:0x04
+  MSC <--GERAN-A-- MS: SMS:0x04
 DREF IMSI-901700000010650_MSISDN-42342: MSC conn use + dtap == 2 (0x22: dtap,trans_sms)
 DRLL Dispatching 04.08 message SMS:0x04 (0x9:0x4)
 DMM RAN_conn(GERAN-A-0_IMSI-901700000010650_MSISDN-42342_PAGING_RESP){RAN_CONN_S_ACCEPTED}: Received Event RAN_CONN_E_COMMUNICATING
@@ -2161,12 +2161,12 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000010650_MSISDN-42342_PAGING_RESP){RAN_CONN_S
 DREF IMSI-901700000010650_MSISDN-42342: MSC conn use - dtap == 1 (0x20: trans_sms)
   llist_count(&net->ran_conns) == 1
 - MS also sends RP-ACK, MSC in turn sends CP-ACK for that
-  MSC <--RAN_GERAN_A-- MS: SMS:0x01
+  MSC <--GERAN-A-- MS: SMS:0x01
 DREF IMSI-901700000010650_MSISDN-42342: MSC conn use + dtap == 2 (0x22: dtap,trans_sms)
 DRLL Dispatching 04.08 message SMS:0x01 (0x9:0x1)
 DMM RAN_conn(GERAN-A-0_IMSI-901700000010650_MSISDN-42342_PAGING_RESP){RAN_CONN_S_COMMUNICATING}: Received Event RAN_CONN_E_COMMUNICATING
-DMSC msc_tx 2 bytes to IMSI-901700000010650_MSISDN-42342 via RAN_GERAN_A
-- DTAP --RAN_GERAN_A--> MS: SMS:0x04: 0904
+DMSC msc_tx 2 bytes to IMSI-901700000010650_MSISDN-42342 via GERAN-A
+- DTAP --GERAN-A--> MS: SMS:0x04: 0904
 - DTAP matches expected message
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342 usage decreases to: 3
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342 usage decreases to: 2
@@ -2177,7 +2177,7 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000010650_MSISDN-42342_PAGING_RESP){RAN_CONN_S
 DREF IMSI-901700000010650_MSISDN-42342: MSC conn use + release == 1 (0x100: release)
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342 usage increases to: 3
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342 usage decreases to: 2
-- BSSAP Clear --RAN_GERAN_A--> MS
+- BSSAP Clear --GERAN-A--> MS
   dtap_tx_confirmed == 1
   bssap_clear_sent == 1
 - SMS is done, conn is gone
@@ -2197,7 +2197,7 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000010650_MSISDN-42342_PAGING_RESP){RAN_CONN_S
   llist_count(&net->ran_conns) == 0
 ---
 - subscriber detaches
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_IMSI_DETACH_IND
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_IMSI_DETACH_IND
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -2213,7 +2213,7 @@ DREF freeing VLR subscr IMSI-901700000010650_MSISDN-42342
 DMM RAN_conn{RAN_CONN_S_NEW}: Received Event RAN_CONN_E_CN_CLOSE
 DMM RAN_conn{RAN_CONN_S_NEW}: state_chg to RAN_CONN_S_RELEASING
 DREF unknown: MSC conn use + release == 2 (0x101: compl_l3,release)
-- BSSAP Clear --RAN_GERAN_A--> MS
+- BSSAP Clear --GERAN-A--> MS
 DREF unknown: MSC conn use - compl_l3 == 1 (0x100: release)
   bssap_clear_sent == 1
 - BSS sends BSSMAP Clear Complete
@@ -2232,7 +2232,7 @@ talloc_total_blocks(tall_bsc_ctx) == 13
 
 ===== test_a5_3_supported
 - Location Update request causes a GSUP Send Auth Info request to HLR
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -2281,7 +2281,7 @@ DREF VLR subscr IMSI-901700000004620 usage decreases to: 1
   auth_request_sent == 1
 ---
 - MS sends Authen Response, VLR accepts and wants to send Ciphering Mode Command to MS -- but needs Classmark 2 to determine whether A5/3 is supported
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_AUTH_RESP
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_AUTH_RESP
 DREF IMSI-901700000004620: MSC conn use + dtap == 1 (0x2: dtap)
 DRLL Dispatching 04.08 message GSM48_MT_MM_AUTH_RESP (0x5:0x14)
 DMM IMSI-901700000004620: MM GSM AUTHENTICATION RESPONSE (sres = 2d8b2c3e)
@@ -2315,7 +2315,7 @@ DMM -> CIPHER MODE COMMAND IMSI-901700000004620
 - ...key: 61855fb81fc2a800
   lu_result_sent == 0
 - MS sends Ciphering Mode Complete, VLR accepts and sends GSUP LU Req to HLR
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_RR_CIPH_M_COMPL
+  MSC <--GERAN-A-- MS: GSM48_MT_RR_CIPH_M_COMPL
 DRR IMSI-901700000004620: CIPHERING MODE COMPLETE
 DVLR vlr_lu_fsm(GERAN-A-0_IMSI-901700000004620_LU){VLR_ULA_S_WAIT_CIPH}: Received Event VLR_ULA_E_CIPH_RES
 DVLR vlr_lu_fsm(GERAN-A-0_IMSI-901700000004620_LU){VLR_ULA_S_WAIT_CIPH}: vlr_loc_upd_post_ciph()
@@ -2374,7 +2374,7 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-42342_LU){RAN_CONN_S_ACCEPTED
 DREF IMSI-901700000004620_MSISDN-42342: MSC conn use + release == 1 (0x100: release)
 DREF VLR subscr IMSI-901700000004620_MSISDN-42342 usage increases to: 4
 DREF VLR subscr IMSI-901700000004620_MSISDN-42342 usage decreases to: 3
-- BSSAP Clear --RAN_GERAN_A--> MS
+- BSSAP Clear --GERAN-A--> MS
 DREF VLR subscr IMSI-901700000004620_MSISDN-42342 usage decreases to: 2
 <-- GSUP rx OSMO_GSUP_MSGT_UPDATE_LOCATION_RESULT: vlr_gsupc_read_cb() returns 0
   bssap_clear_sent == 1
@@ -2397,7 +2397,7 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-42342_LU){RAN_CONN_S_RELEASED
   llist_count(&net->ran_conns) == 0
 ---
 - after a while, a new conn sends a CM Service Request. VLR responds with Auth Req, 2nd auth vector
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_CM_SERV_REQ
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_CM_SERV_REQ
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -2441,7 +2441,7 @@ DRLL subscr IMSI-901700000004620_MSISDN-42342: Message not permitted for initial
 DRLL Dispatching 04.08 message SMS:0x01 (0x9:0x1)
 DRLL subscr IMSI-901700000004620_MSISDN-42342: Message not permitted for initial conn: SMS:0x01
 - MS sends Authen Response, VLR accepts and requests Ciphering. We already know Classmark 3, so no need to request Classmark Update.
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_AUTH_RESP
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_AUTH_RESP
 DREF IMSI-901700000004620_MSISDN-42342: MSC conn use + dtap == 1 (0x2: dtap)
 DRLL Dispatching 04.08 message GSM48_MT_MM_AUTH_RESP (0x5:0x14)
 DMM IMSI-901700000004620_MSISDN-42342: MM GSM AUTHENTICATION RESPONSE (sres = 20bde240)
@@ -2479,7 +2479,7 @@ DRLL subscr IMSI-901700000004620_MSISDN-42342: Message not permitted for initial
 DRLL Dispatching 04.08 message SMS:0x01 (0x9:0x1)
 DRLL subscr IMSI-901700000004620_MSISDN-42342: Message not permitted for initial conn: SMS:0x01
 - MS sends Ciphering Mode Complete, VLR accepts; above Ciphering is an implicit CM Service Accept
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_RR_CIPH_M_COMPL
+  MSC <--GERAN-A-- MS: GSM48_MT_RR_CIPH_M_COMPL
 DRR IMSI-901700000004620_MSISDN-42342: CIPHERING MODE COMPLETE
 DVLR Process_Access_Request_VLR(GERAN-A-0_IMSI-901700000004620_MSISDN-42342_CM_SERVICE_REQ){PR_ARQ_S_WAIT_CIPH}: Received Event PR_ARQ_E_CIPH_RES
 DVLR Process_Access_Request_VLR(GERAN-A-0_IMSI-901700000004620_MSISDN-42342_CM_SERVICE_REQ){PR_ARQ_S_WAIT_CIPH}: _proc_arq_vlr_node2_post_ciph()
@@ -2502,7 +2502,7 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-42342_CM_SERVICE_REQ){RAN_CON
 DREF IMSI-901700000004620_MSISDN-42342: MSC conn use + release == 1 (0x100: release)
 DREF VLR subscr IMSI-901700000004620_MSISDN-42342 usage increases to: 3
 DREF VLR subscr IMSI-901700000004620_MSISDN-42342 usage decreases to: 2
-- BSSAP Clear --RAN_GERAN_A--> MS
+- BSSAP Clear --GERAN-A--> MS
   bssap_clear_sent == 1
 - all requests serviced, conn has been released
 - BSS sends BSSMAP Clear Complete
@@ -2527,7 +2527,7 @@ DREF VLR subscr IMSI-901700000004620_MSISDN-42342 usage increases to: 3
 DCC (ti 00 sub IMSI-901700000004620_MSISDN-42342 callref 40000004) New transaction
 DREF VLR subscr IMSI-901700000004620_MSISDN-42342 usage increases to: 4
 DMM Subscriber IMSI-901700000004620_MSISDN-42342 not paged yet, start paging.
-  RAN_GERAN_A sends out paging request to IMSI 901700000004620, TMSI 0xffffffff, LAC 23
+  GERAN-A sends out paging request to IMSI 901700000004620, TMSI 0xffffffff, LAC 23
   strcmp(paging_expecting_imsi, imsi) == 0
 DREF VLR subscr IMSI-901700000004620_MSISDN-42342 usage increases to: 5
   llist_count(&vsub->cs.requests) == 1
@@ -2539,7 +2539,7 @@ DREF VLR subscr IMSI-901700000004620_MSISDN-42342 usage increases to: 5
   llist_count(&vsub->cs.requests) == 1
 DREF VLR subscr IMSI-901700000004620_MSISDN-42342 usage decreases to: 4
 - MS replies with Paging Response, and VLR sends Auth Request with third key
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_RR_PAG_RESP
+  MSC <--GERAN-A-- MS: GSM48_MT_RR_PAG_RESP
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -2582,7 +2582,7 @@ DRLL subscr IMSI-901700000004620_MSISDN-42342: Message not permitted for initial
 DRLL Dispatching 04.08 message SMS:0x01 (0x9:0x1)
 DRLL subscr IMSI-901700000004620_MSISDN-42342: Message not permitted for initial conn: SMS:0x01
 - MS sends Authen Response, VLR accepts and requests Ciphering
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_AUTH_RESP
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_AUTH_RESP
 DREF IMSI-901700000004620_MSISDN-42342: MSC conn use + dtap == 1 (0x2: dtap)
 DRLL Dispatching 04.08 message GSM48_MT_MM_AUTH_RESP (0x5:0x14)
 DMM IMSI-901700000004620_MSISDN-42342: MM GSM AUTHENTICATION RESPONSE (sres = a29514ae)
@@ -2619,7 +2619,7 @@ DRLL subscr IMSI-901700000004620_MSISDN-42342: Message not permitted for initial
 DRLL Dispatching 04.08 message SMS:0x01 (0x9:0x1)
 DRLL subscr IMSI-901700000004620_MSISDN-42342: Message not permitted for initial conn: SMS:0x01
 - MS sends Ciphering Mode Complete, VLR accepts and sends pending SMS
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_RR_CIPH_M_COMPL
+  MSC <--GERAN-A-- MS: GSM48_MT_RR_CIPH_M_COMPL
 DRR IMSI-901700000004620_MSISDN-42342: CIPHERING MODE COMPLETE
 DVLR Process_Access_Request_VLR(GERAN-A-0_IMSI-901700000004620_MSISDN-42342_PAGING_RESP){PR_ARQ_S_WAIT_CIPH}: Received Event PR_ARQ_E_CIPH_RES
 DVLR Process_Access_Request_VLR(GERAN-A-0_IMSI-901700000004620_MSISDN-42342_PAGING_RESP){PR_ARQ_S_WAIT_CIPH}: _proc_arq_vlr_node2_post_ciph()
@@ -2634,8 +2634,8 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-42342_PAGING_RESP){RAN_CONN_S
 DPAG Paging success for IMSI-901700000004620_MSISDN-42342 (event=0)
 DPAG Calling paging cbfn.
 DREF IMSI-901700000004620_MSISDN-42342: MSC conn use + trans_sms == 1 (0x20: trans_sms)
-DMSC msc_tx 91 bytes to IMSI-901700000004620_MSISDN-42342 via RAN_GERAN_A
-- DTAP --RAN_GERAN_A--> MS: SMS:0x01: 09015801000791447758100650004c0005802443f2000007101000000000445079da1e1ee7416937485e9ea7c965373d1d6683c270383b3d0ed3d36ff71c949e83c22072799e9687c5ec32a81d96afcbf4b4fb0c7ac3e9e9b7db05
+DMSC msc_tx 91 bytes to IMSI-901700000004620_MSISDN-42342 via GERAN-A
+- DTAP --GERAN-A--> MS: SMS:0x01: 09015801000791447758100650004c0005802443f2000007101000000000445079da1e1ee7416937485e9ea7c965373d1d6683c270383b3d0ed3d36ff71c949e83c22072799e9687c5ec32a81d96afcbf4b4fb0c7ac3e9e9b7db05
 - DTAP matches expected message
 DREF VLR subscr IMSI-901700000004620_MSISDN-42342 usage decreases to: 4
 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-42342_PAGING_RESP){RAN_CONN_S_AUTH_CIPH}: state_chg to RAN_CONN_S_ACCEPTED
@@ -2649,7 +2649,7 @@ DREF VLR subscr IMSI-901700000004620_MSISDN-42342 usage decreases to: 4
 - conn is still open to wait for SMS ack dance
   llist_count(&net->ran_conns) == 1
 - MS replies with CP-ACK for received SMS
-  MSC <--RAN_GERAN_A-- MS: SMS:0x04
+  MSC <--GERAN-A-- MS: SMS:0x04
 DREF IMSI-901700000004620_MSISDN-42342: MSC conn use + dtap == 2 (0x22: dtap,trans_sms)
 DRLL Dispatching 04.08 message SMS:0x04 (0x9:0x4)
 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-42342_PAGING_RESP){RAN_CONN_S_ACCEPTED}: Received Event RAN_CONN_E_COMMUNICATING
@@ -2657,12 +2657,12 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-42342_PAGING_RESP){RAN_CONN_S
 DREF IMSI-901700000004620_MSISDN-42342: MSC conn use - dtap == 1 (0x20: trans_sms)
   llist_count(&net->ran_conns) == 1
 - MS also sends RP-ACK, MSC in turn sends CP-ACK for that
-  MSC <--RAN_GERAN_A-- MS: SMS:0x01
+  MSC <--GERAN-A-- MS: SMS:0x01
 DREF IMSI-901700000004620_MSISDN-42342: MSC conn use + dtap == 2 (0x22: dtap,trans_sms)
 DRLL Dispatching 04.08 message SMS:0x01 (0x9:0x1)
 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-42342_PAGING_RESP){RAN_CONN_S_COMMUNICATING}: Received Event RAN_CONN_E_COMMUNICATING
-DMSC msc_tx 2 bytes to IMSI-901700000004620_MSISDN-42342 via RAN_GERAN_A
-- DTAP --RAN_GERAN_A--> MS: SMS:0x04: 0904
+DMSC msc_tx 2 bytes to IMSI-901700000004620_MSISDN-42342 via GERAN-A
+- DTAP --GERAN-A--> MS: SMS:0x04: 0904
 - DTAP matches expected message
 DREF VLR subscr IMSI-901700000004620_MSISDN-42342 usage decreases to: 3
 DREF VLR subscr IMSI-901700000004620_MSISDN-42342 usage decreases to: 2
@@ -2673,7 +2673,7 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-42342_PAGING_RESP){RAN_CONN_S
 DREF IMSI-901700000004620_MSISDN-42342: MSC conn use + release == 1 (0x100: release)
 DREF VLR subscr IMSI-901700000004620_MSISDN-42342 usage increases to: 3
 DREF VLR subscr IMSI-901700000004620_MSISDN-42342 usage decreases to: 2
-- BSSAP Clear --RAN_GERAN_A--> MS
+- BSSAP Clear --GERAN-A--> MS
   dtap_tx_confirmed == 1
   bssap_clear_sent == 1
 - SMS is done, conn is gone
@@ -2693,7 +2693,7 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-42342_PAGING_RESP){RAN_CONN_S
   llist_count(&net->ran_conns) == 0
 ---
 - subscriber detaches
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_IMSI_DETACH_IND
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_IMSI_DETACH_IND
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -2709,7 +2709,7 @@ DREF freeing VLR subscr IMSI-901700000004620_MSISDN-42342
 DMM RAN_conn{RAN_CONN_S_NEW}: Received Event RAN_CONN_E_CN_CLOSE
 DMM RAN_conn{RAN_CONN_S_NEW}: state_chg to RAN_CONN_S_RELEASING
 DREF unknown: MSC conn use + release == 2 (0x101: compl_l3,release)
-- BSSAP Clear --RAN_GERAN_A--> MS
+- BSSAP Clear --GERAN-A--> MS
 DREF unknown: MSC conn use - compl_l3 == 1 (0x100: release)
   bssap_clear_sent == 1
 - BSS sends BSSMAP Clear Complete
@@ -2728,7 +2728,7 @@ talloc_total_blocks(tall_bsc_ctx) == 13
 
 ===== test_cm_service_needs_classmark_update
 - Location Update request causes a GSUP Send Auth Info request to HLR
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -2777,7 +2777,7 @@ DREF VLR subscr IMSI-901700000004620 usage decreases to: 1
   auth_request_sent == 1
 ---
 - MS sends Authen Response, VLR accepts and wants to send Ciphering Mode Command to MS -- but needs Classmark 2 to determine whether A5/3 is supported
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_AUTH_RESP
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_AUTH_RESP
 DREF IMSI-901700000004620: MSC conn use + dtap == 1 (0x2: dtap)
 DRLL Dispatching 04.08 message GSM48_MT_MM_AUTH_RESP (0x5:0x14)
 DMM IMSI-901700000004620: MM GSM AUTHENTICATION RESPONSE (sres = 2d8b2c3e)
@@ -2811,7 +2811,7 @@ DMM -> CIPHER MODE COMMAND IMSI-901700000004620
 - ...key: 61855fb81fc2a800
   lu_result_sent == 0
 - MS sends Ciphering Mode Complete, VLR accepts and sends GSUP LU Req to HLR
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_RR_CIPH_M_COMPL
+  MSC <--GERAN-A-- MS: GSM48_MT_RR_CIPH_M_COMPL
 DRR IMSI-901700000004620: CIPHERING MODE COMPLETE
 DVLR vlr_lu_fsm(GERAN-A-0_IMSI-901700000004620_LU){VLR_ULA_S_WAIT_CIPH}: Received Event VLR_ULA_E_CIPH_RES
 DVLR vlr_lu_fsm(GERAN-A-0_IMSI-901700000004620_LU){VLR_ULA_S_WAIT_CIPH}: vlr_loc_upd_post_ciph()
@@ -2870,7 +2870,7 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-42342_LU){RAN_CONN_S_ACCEPTED
 DREF IMSI-901700000004620_MSISDN-42342: MSC conn use + release == 1 (0x100: release)
 DREF VLR subscr IMSI-901700000004620_MSISDN-42342 usage increases to: 4
 DREF VLR subscr IMSI-901700000004620_MSISDN-42342 usage decreases to: 3
-- BSSAP Clear --RAN_GERAN_A--> MS
+- BSSAP Clear --GERAN-A--> MS
 DREF VLR subscr IMSI-901700000004620_MSISDN-42342 usage decreases to: 2
 <-- GSUP rx OSMO_GSUP_MSGT_UPDATE_LOCATION_RESULT: vlr_gsupc_read_cb() returns 0
   bssap_clear_sent == 1
@@ -2893,7 +2893,7 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-42342_LU){RAN_CONN_S_RELEASED
   llist_count(&net->ran_conns) == 0
 ---
 - after a while, a new conn sends a CM Service Request. VLR responds with Auth Req, 2nd auth vector
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_CM_SERV_REQ
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_CM_SERV_REQ
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -2937,7 +2937,7 @@ DRLL subscr IMSI-901700000004620_MSISDN-42342: Message not permitted for initial
 DRLL Dispatching 04.08 message SMS:0x01 (0x9:0x1)
 DRLL subscr IMSI-901700000004620_MSISDN-42342: Message not permitted for initial conn: SMS:0x01
 - MS sends Authen Response, VLR accepts and requests Ciphering. We already know Classmark 3, so no need to request Classmark Update.
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_AUTH_RESP
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_AUTH_RESP
 DREF IMSI-901700000004620_MSISDN-42342: MSC conn use + dtap == 1 (0x2: dtap)
 DRLL Dispatching 04.08 message GSM48_MT_MM_AUTH_RESP (0x5:0x14)
 DMM IMSI-901700000004620_MSISDN-42342: MM GSM AUTHENTICATION RESPONSE (sres = 20bde240)
@@ -2975,7 +2975,7 @@ DRLL subscr IMSI-901700000004620_MSISDN-42342: Message not permitted for initial
 DRLL Dispatching 04.08 message SMS:0x01 (0x9:0x1)
 DRLL subscr IMSI-901700000004620_MSISDN-42342: Message not permitted for initial conn: SMS:0x01
 - MS sends Ciphering Mode Complete, VLR accepts; above Ciphering is an implicit CM Service Accept
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_RR_CIPH_M_COMPL
+  MSC <--GERAN-A-- MS: GSM48_MT_RR_CIPH_M_COMPL
 DRR IMSI-901700000004620_MSISDN-42342: CIPHERING MODE COMPLETE
 DVLR Process_Access_Request_VLR(GERAN-A-0_IMSI-901700000004620_MSISDN-42342_CM_SERVICE_REQ){PR_ARQ_S_WAIT_CIPH}: Received Event PR_ARQ_E_CIPH_RES
 DVLR Process_Access_Request_VLR(GERAN-A-0_IMSI-901700000004620_MSISDN-42342_CM_SERVICE_REQ){PR_ARQ_S_WAIT_CIPH}: _proc_arq_vlr_node2_post_ciph()
@@ -2998,7 +2998,7 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-42342_CM_SERVICE_REQ){RAN_CON
 DREF IMSI-901700000004620_MSISDN-42342: MSC conn use + release == 1 (0x100: release)
 DREF VLR subscr IMSI-901700000004620_MSISDN-42342 usage increases to: 3
 DREF VLR subscr IMSI-901700000004620_MSISDN-42342 usage decreases to: 2
-- BSSAP Clear --RAN_GERAN_A--> MS
+- BSSAP Clear --GERAN-A--> MS
   bssap_clear_sent == 1
 - all requests serviced, conn has been released
 - BSS sends BSSMAP Clear Complete
@@ -3023,7 +3023,7 @@ DREF VLR subscr IMSI-901700000004620_MSISDN-42342 usage increases to: 3
 DCC (ti 00 sub IMSI-901700000004620_MSISDN-42342 callref 40000005) New transaction
 DREF VLR subscr IMSI-901700000004620_MSISDN-42342 usage increases to: 4
 DMM Subscriber IMSI-901700000004620_MSISDN-42342 not paged yet, start paging.
-  RAN_GERAN_A sends out paging request to IMSI 901700000004620, TMSI 0xffffffff, LAC 23
+  GERAN-A sends out paging request to IMSI 901700000004620, TMSI 0xffffffff, LAC 23
   strcmp(paging_expecting_imsi, imsi) == 0
 DREF VLR subscr IMSI-901700000004620_MSISDN-42342 usage increases to: 5
   llist_count(&vsub->cs.requests) == 1
@@ -3035,7 +3035,7 @@ DREF VLR subscr IMSI-901700000004620_MSISDN-42342 usage increases to: 5
   llist_count(&vsub->cs.requests) == 1
 DREF VLR subscr IMSI-901700000004620_MSISDN-42342 usage decreases to: 4
 - MS replies with Paging Response, and VLR sends Auth Request with third key
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_RR_PAG_RESP
+  MSC <--GERAN-A-- MS: GSM48_MT_RR_PAG_RESP
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -3072,7 +3072,7 @@ DREF VLR subscr IMSI-901700000004620_MSISDN-42342 usage increases to: 6
 DREF VLR subscr IMSI-901700000004620_MSISDN-42342 usage decreases to: 5
 - MS sends Authen Response, VLR accepts and requests Ciphering
 - MS sends Authen Response, VLR accepts and requests Ciphering. Normally, we'd know Classmark 3, but this test removed it. Hence a Classmark Request is generated.
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_AUTH_RESP
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_AUTH_RESP
 DREF IMSI-901700000004620_MSISDN-42342: MSC conn use + dtap == 1 (0x2: dtap)
 DRLL Dispatching 04.08 message GSM48_MT_MM_AUTH_RESP (0x5:0x14)
 DMM IMSI-901700000004620_MSISDN-42342: MM GSM AUTHENTICATION RESPONSE (sres = a29514ae)
@@ -3106,7 +3106,7 @@ DMM -> CIPHER MODE COMMAND IMSI-901700000004620_MSISDN-42342
 - needs ciph, not yet accepted
 ran_conn_is_accepted() == false
 - MS sends Ciphering Mode Complete, VLR accepts and sends pending SMS
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_RR_CIPH_M_COMPL
+  MSC <--GERAN-A-- MS: GSM48_MT_RR_CIPH_M_COMPL
 DRR IMSI-901700000004620_MSISDN-42342: CIPHERING MODE COMPLETE
 DVLR Process_Access_Request_VLR(GERAN-A-0_IMSI-901700000004620_MSISDN-42342_PAGING_RESP){PR_ARQ_S_WAIT_CIPH}: Received Event PR_ARQ_E_CIPH_RES
 DVLR Process_Access_Request_VLR(GERAN-A-0_IMSI-901700000004620_MSISDN-42342_PAGING_RESP){PR_ARQ_S_WAIT_CIPH}: _proc_arq_vlr_node2_post_ciph()
@@ -3121,8 +3121,8 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-42342_PAGING_RESP){RAN_CONN_S
 DPAG Paging success for IMSI-901700000004620_MSISDN-42342 (event=0)
 DPAG Calling paging cbfn.
 DREF IMSI-901700000004620_MSISDN-42342: MSC conn use + trans_sms == 1 (0x20: trans_sms)
-DMSC msc_tx 91 bytes to IMSI-901700000004620_MSISDN-42342 via RAN_GERAN_A
-- DTAP --RAN_GERAN_A--> MS: SMS:0x01: 09015801000791447758100650004c0005802443f2000007101000000000445079da1e1ee7416937485e9ea7c965373d1d6683c270383b3d0ed3d36ff71c949e83c22072799e9687c5ec32a81d96afcbf4b4fb0c7ac3e9e9b7db05
+DMSC msc_tx 91 bytes to IMSI-901700000004620_MSISDN-42342 via GERAN-A
+- DTAP --GERAN-A--> MS: SMS:0x01: 09015801000791447758100650004c0005802443f2000007101000000000445079da1e1ee7416937485e9ea7c965373d1d6683c270383b3d0ed3d36ff71c949e83c22072799e9687c5ec32a81d96afcbf4b4fb0c7ac3e9e9b7db05
 - DTAP matches expected message
 DREF VLR subscr IMSI-901700000004620_MSISDN-42342 usage decreases to: 4
 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-42342_PAGING_RESP){RAN_CONN_S_AUTH_CIPH}: state_chg to RAN_CONN_S_ACCEPTED
@@ -3136,7 +3136,7 @@ DREF VLR subscr IMSI-901700000004620_MSISDN-42342 usage decreases to: 4
 - conn is still open to wait for SMS ack dance
   llist_count(&net->ran_conns) == 1
 - MS replies with CP-ACK for received SMS
-  MSC <--RAN_GERAN_A-- MS: SMS:0x04
+  MSC <--GERAN-A-- MS: SMS:0x04
 DREF IMSI-901700000004620_MSISDN-42342: MSC conn use + dtap == 2 (0x22: dtap,trans_sms)
 DRLL Dispatching 04.08 message SMS:0x04 (0x9:0x4)
 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-42342_PAGING_RESP){RAN_CONN_S_ACCEPTED}: Received Event RAN_CONN_E_COMMUNICATING
@@ -3144,12 +3144,12 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-42342_PAGING_RESP){RAN_CONN_S
 DREF IMSI-901700000004620_MSISDN-42342: MSC conn use - dtap == 1 (0x20: trans_sms)
   llist_count(&net->ran_conns) == 1
 - MS also sends RP-ACK, MSC in turn sends CP-ACK for that
-  MSC <--RAN_GERAN_A-- MS: SMS:0x01
+  MSC <--GERAN-A-- MS: SMS:0x01
 DREF IMSI-901700000004620_MSISDN-42342: MSC conn use + dtap == 2 (0x22: dtap,trans_sms)
 DRLL Dispatching 04.08 message SMS:0x01 (0x9:0x1)
 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-42342_PAGING_RESP){RAN_CONN_S_COMMUNICATING}: Received Event RAN_CONN_E_COMMUNICATING
-DMSC msc_tx 2 bytes to IMSI-901700000004620_MSISDN-42342 via RAN_GERAN_A
-- DTAP --RAN_GERAN_A--> MS: SMS:0x04: 0904
+DMSC msc_tx 2 bytes to IMSI-901700000004620_MSISDN-42342 via GERAN-A
+- DTAP --GERAN-A--> MS: SMS:0x04: 0904
 - DTAP matches expected message
 DREF VLR subscr IMSI-901700000004620_MSISDN-42342 usage decreases to: 3
 DREF VLR subscr IMSI-901700000004620_MSISDN-42342 usage decreases to: 2
@@ -3160,7 +3160,7 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-42342_PAGING_RESP){RAN_CONN_S
 DREF IMSI-901700000004620_MSISDN-42342: MSC conn use + release == 1 (0x100: release)
 DREF VLR subscr IMSI-901700000004620_MSISDN-42342 usage increases to: 3
 DREF VLR subscr IMSI-901700000004620_MSISDN-42342 usage decreases to: 2
-- BSSAP Clear --RAN_GERAN_A--> MS
+- BSSAP Clear --GERAN-A--> MS
   dtap_tx_confirmed == 1
   bssap_clear_sent == 1
 - SMS is done, conn is gone
@@ -3180,7 +3180,7 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-42342_PAGING_RESP){RAN_CONN_S
   llist_count(&net->ran_conns) == 0
 ---
 - subscriber detaches
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_IMSI_DETACH_IND
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_IMSI_DETACH_IND
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -3196,7 +3196,7 @@ DREF freeing VLR subscr IMSI-901700000004620_MSISDN-42342
 DMM RAN_conn{RAN_CONN_S_NEW}: Received Event RAN_CONN_E_CN_CLOSE
 DMM RAN_conn{RAN_CONN_S_NEW}: state_chg to RAN_CONN_S_RELEASING
 DREF unknown: MSC conn use + release == 2 (0x101: compl_l3,release)
-- BSSAP Clear --RAN_GERAN_A--> MS
+- BSSAP Clear --GERAN-A--> MS
 DREF unknown: MSC conn use - compl_l3 == 1 (0x100: release)
   bssap_clear_sent == 1
 - BSS sends BSSMAP Clear Complete
diff --git a/tests/msc_vlr/msc_vlr_test_hlr_reject.err b/tests/msc_vlr/msc_vlr_test_hlr_reject.err
index d9c85f2ae..063928f51 100644
--- a/tests/msc_vlr/msc_vlr_test_hlr_reject.err
+++ b/tests/msc_vlr/msc_vlr_test_hlr_reject.err
@@ -3,7 +3,7 @@ talloc_total_blocks(tall_bsc_ctx) == 13
 
 ===== test_hlr_rej_auth_info_unknown_imsi
 - Location Update request causes a GSUP Send Auth Info request to HLR
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -55,7 +55,7 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_AUTH_CIPH}: state_chg
 DREF IMSI-901700000004620: MSC conn use + release == 1 (0x100: release)
 DREF VLR subscr IMSI-901700000004620 usage increases to: 3
 DREF VLR subscr IMSI-901700000004620 usage decreases to: 2
-- BSSAP Clear --RAN_GERAN_A--> MS
+- BSSAP Clear --GERAN-A--> MS
 DREF VLR subscr IMSI-901700000004620 usage decreases to: 1
 <-- GSUP rx OSMO_GSUP_MSGT_SEND_AUTH_INFO_ERROR: vlr_gsupc_read_cb() returns 0
   auth_request_sent == 0
@@ -84,7 +84,7 @@ talloc_total_blocks(tall_bsc_ctx) == 13
 
 ===== test_hlr_rej_auth_info_net_fail
 - Location Update request causes a GSUP Send Auth Info request to HLR
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -136,7 +136,7 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_AUTH_CIPH}: state_chg
 DREF IMSI-901700000004620: MSC conn use + release == 1 (0x100: release)
 DREF VLR subscr IMSI-901700000004620 usage increases to: 3
 DREF VLR subscr IMSI-901700000004620 usage decreases to: 2
-- BSSAP Clear --RAN_GERAN_A--> MS
+- BSSAP Clear --GERAN-A--> MS
 DREF VLR subscr IMSI-901700000004620 usage decreases to: 1
 <-- GSUP rx OSMO_GSUP_MSGT_SEND_AUTH_INFO_ERROR: vlr_gsupc_read_cb() returns 0
   auth_request_sent == 0
@@ -167,7 +167,7 @@ talloc_total_blocks(tall_bsc_ctx) == 13
 ---
 - Submit a used auth tuple in the VLR
 - Location Update request causes a GSUP Send Auth Info request to HLR
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -215,7 +215,7 @@ DREF VLR subscr IMSI-901700000004620 usage decreases to: 1
   auth_request_sent == 1
   lu_result_sent == 0
 - MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_AUTH_RESP
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_AUTH_RESP
 DREF IMSI-901700000004620: MSC conn use + dtap == 1 (0x2: dtap)
 DRLL Dispatching 04.08 message GSM48_MT_MM_AUTH_RESP (0x5:0x14)
 DMM IMSI-901700000004620: MM GSM AUTHENTICATION RESPONSE (sres = 2d8b2c3e)
@@ -289,7 +289,7 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_LU){RAN_CONN_S_ACCEPTED
 DREF IMSI-901700000004620_MSISDN-46071: MSC conn use + release == 1 (0x100: release)
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage increases to: 4
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage decreases to: 3
-- BSSAP Clear --RAN_GERAN_A--> MS
+- BSSAP Clear --GERAN-A--> MS
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage decreases to: 2
 <-- GSUP rx OSMO_GSUP_MSGT_UPDATE_LOCATION_RESULT: vlr_gsupc_read_cb() returns 0
   bssap_clear_sent == 1
@@ -318,7 +318,7 @@ DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage decreases to: 1
 ---
 - Another LU wants to get new tuples; even though HLR sends Network Failure, we are reusing the old tuples.
 - Location Update request causes a GSUP Send Auth Info request to HLR
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -364,7 +364,7 @@ DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage decreases to: 2
   auth_request_sent == 1
   lu_result_sent == 0
 - MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_AUTH_RESP
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_AUTH_RESP
 DREF IMSI-901700000004620_MSISDN-46071: MSC conn use + dtap == 1 (0x2: dtap)
 DRLL Dispatching 04.08 message GSM48_MT_MM_AUTH_RESP (0x5:0x14)
 DMM IMSI-901700000004620_MSISDN-46071: MM GSM AUTHENTICATION RESPONSE (sres = 2d8b2c3e)
@@ -437,7 +437,7 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_LU){RAN_CONN_S_ACCEPTED
 DREF IMSI-901700000004620_MSISDN-46071: MSC conn use + release == 1 (0x100: release)
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage increases to: 4
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage decreases to: 3
-- BSSAP Clear --RAN_GERAN_A--> MS
+- BSSAP Clear --GERAN-A--> MS
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage decreases to: 2
 <-- GSUP rx OSMO_GSUP_MSGT_UPDATE_LOCATION_RESULT: vlr_gsupc_read_cb() returns 0
   bssap_clear_sent == 1
@@ -468,7 +468,7 @@ talloc_total_blocks(tall_bsc_ctx) == 13
 ---
 - Submit a used auth tuple in the VLR
 - Location Update request causes a GSUP Send Auth Info request to HLR
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -516,7 +516,7 @@ DREF VLR subscr IMSI-901700000004620 usage decreases to: 1
   auth_request_sent == 1
   lu_result_sent == 0
 - MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_AUTH_RESP
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_AUTH_RESP
 DREF IMSI-901700000004620: MSC conn use + dtap == 1 (0x2: dtap)
 DRLL Dispatching 04.08 message GSM48_MT_MM_AUTH_RESP (0x5:0x14)
 DMM IMSI-901700000004620: MM GSM AUTHENTICATION RESPONSE (sres = 2d8b2c3e)
@@ -590,7 +590,7 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_LU){RAN_CONN_S_ACCEPTED
 DREF IMSI-901700000004620_MSISDN-46071: MSC conn use + release == 1 (0x100: release)
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage increases to: 4
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage decreases to: 3
-- BSSAP Clear --RAN_GERAN_A--> MS
+- BSSAP Clear --GERAN-A--> MS
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage decreases to: 2
 <-- GSUP rx OSMO_GSUP_MSGT_UPDATE_LOCATION_RESULT: vlr_gsupc_read_cb() returns 0
   bssap_clear_sent == 1
@@ -619,7 +619,7 @@ DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage decreases to: 1
 ---
 - Another LU wants to get new tuples; HLR sends Network Failure, we reject.
 - Location Update request causes a GSUP Send Auth Info request to HLR
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -669,7 +669,7 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_LU){RAN_CONN_S_AUTH_CIP
 DREF IMSI-901700000004620_MSISDN-46071: MSC conn use + release == 1 (0x100: release)
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage increases to: 4
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage decreases to: 3
-- BSSAP Clear --RAN_GERAN_A--> MS
+- BSSAP Clear --GERAN-A--> MS
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage decreases to: 2
 <-- GSUP rx OSMO_GSUP_MSGT_SEND_AUTH_INFO_ERROR: vlr_gsupc_read_cb() returns 0
   auth_request_sent == 0
@@ -700,7 +700,7 @@ talloc_total_blocks(tall_bsc_ctx) == 13
 ---
 - Submit a used auth tuple in the VLR
 - Location Update request causes a GSUP Send Auth Info request to HLR
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -748,7 +748,7 @@ DREF VLR subscr IMSI-901700000004620 usage decreases to: 1
   auth_request_sent == 1
   lu_result_sent == 0
 - MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_AUTH_RESP
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_AUTH_RESP
 DREF IMSI-901700000004620: MSC conn use + dtap == 1 (0x2: dtap)
 DRLL Dispatching 04.08 message GSM48_MT_MM_AUTH_RESP (0x5:0x14)
 DMM IMSI-901700000004620: MM GSM AUTHENTICATION RESPONSE (sres = 2d8b2c3e)
@@ -822,7 +822,7 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_LU){RAN_CONN_S_ACCEPTED
 DREF IMSI-901700000004620_MSISDN-46071: MSC conn use + release == 1 (0x100: release)
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage increases to: 4
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage decreases to: 3
-- BSSAP Clear --RAN_GERAN_A--> MS
+- BSSAP Clear --GERAN-A--> MS
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage decreases to: 2
 <-- GSUP rx OSMO_GSUP_MSGT_UPDATE_LOCATION_RESULT: vlr_gsupc_read_cb() returns 0
   bssap_clear_sent == 1
@@ -852,7 +852,7 @@ DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage decreases to: 1
 - Another LU wants to get new tuples; HLR sends IMSI Unknown. Even though we would re-use an old tuple, reject the unknown IMSI.
   net->vlr->cfg.auth_reuse_old_sets_on_error == 1
 - Location Update request causes a GSUP Send Auth Info request to HLR
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -902,7 +902,7 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_LU){RAN_CONN_S_AUTH_CIP
 DREF IMSI-901700000004620_MSISDN-46071: MSC conn use + release == 1 (0x100: release)
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage increases to: 4
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage decreases to: 3
-- BSSAP Clear --RAN_GERAN_A--> MS
+- BSSAP Clear --GERAN-A--> MS
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage decreases to: 2
 <-- GSUP rx OSMO_GSUP_MSGT_SEND_AUTH_INFO_ERROR: vlr_gsupc_read_cb() returns 0
   auth_request_sent == 0
@@ -931,7 +931,7 @@ talloc_total_blocks(tall_bsc_ctx) == 13
 
 ===== test_hlr_acc_but_no_auth_tuples
 - Location Update request causes a GSUP Send Auth Info request to HLR
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -982,7 +982,7 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_AUTH_CIPH}: state_chg
 DREF IMSI-901700000004620: MSC conn use + release == 1 (0x100: release)
 DREF VLR subscr IMSI-901700000004620 usage increases to: 3
 DREF VLR subscr IMSI-901700000004620 usage decreases to: 2
-- BSSAP Clear --RAN_GERAN_A--> MS
+- BSSAP Clear --GERAN-A--> MS
 DREF VLR subscr IMSI-901700000004620 usage decreases to: 1
 <-- GSUP rx OSMO_GSUP_MSGT_SEND_AUTH_INFO_RESULT: vlr_gsupc_read_cb() returns 0
   auth_request_sent == 0
@@ -1011,7 +1011,7 @@ talloc_total_blocks(tall_bsc_ctx) == 13
 
 ===== test_hlr_rej_lu
 - Location Update request causes a GSUP LU request to HLR
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -1066,7 +1066,7 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_AUTH_CIPH}: state_chg
 DREF IMSI-901700000004620: MSC conn use + release == 1 (0x100: release)
 DREF VLR subscr IMSI-901700000004620 usage increases to: 3
 DREF VLR subscr IMSI-901700000004620 usage decreases to: 2
-- BSSAP Clear --RAN_GERAN_A--> MS
+- BSSAP Clear --GERAN-A--> MS
 DREF VLR subscr IMSI-901700000004620 usage decreases to: 1
 <-- GSUP rx OSMO_GSUP_MSGT_UPDATE_LOCATION_ERROR: vlr_gsupc_read_cb() returns 0
   lu_result_sent == 2
@@ -1094,7 +1094,7 @@ talloc_total_blocks(tall_bsc_ctx) == 13
 
 ===== test_hlr_no_insert_data
 - Location Update request causes a GSUP LU request to HLR
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -1163,7 +1163,7 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_ACCEPTED}: state_chg
 DREF IMSI-901700000004620: MSC conn use + release == 1 (0x100: release)
 DREF VLR subscr IMSI-901700000004620 usage increases to: 4
 DREF VLR subscr IMSI-901700000004620 usage decreases to: 3
-- BSSAP Clear --RAN_GERAN_A--> MS
+- BSSAP Clear --GERAN-A--> MS
 DREF VLR subscr IMSI-901700000004620 usage decreases to: 2
 <-- GSUP rx OSMO_GSUP_MSGT_UPDATE_LOCATION_RESULT: vlr_gsupc_read_cb() returns 0
   bssap_clear_sent == 1
diff --git a/tests/msc_vlr/msc_vlr_test_hlr_timeout.err b/tests/msc_vlr/msc_vlr_test_hlr_timeout.err
index 0c976193a..f7939f0e6 100644
--- a/tests/msc_vlr/msc_vlr_test_hlr_timeout.err
+++ b/tests/msc_vlr/msc_vlr_test_hlr_timeout.err
@@ -4,7 +4,7 @@ talloc_total_blocks(tall_bsc_ctx) == 13
 ===== test_hlr_timeout_lu_auth_info
 - Total time passed: 0.000000 s
 - Location Update request causes a GSUP Send Auth Info request to HLR
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -61,7 +61,7 @@ DVLR vlr_lu_fsm(GERAN-A-0_IMSI-901700000004620_LU){VLR_ULA_S_WAIT_AUTH}: state_c
 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_RELEASING}: Received Event RAN_CONN_E_CN_CLOSE
 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_RELEASING}: Event RAN_CONN_E_CN_CLOSE not permitted
 DREF VLR subscr IMSI-901700000004620 usage decreases to: 1
-- BSSAP Clear --RAN_GERAN_A--> MS
+- BSSAP Clear --GERAN-A--> MS
 - RAN_CONN_TIMEOUT has passed, conn is gone.
   bssap_clear_sent == 1
 - BSS sends BSSMAP Clear Complete
@@ -93,7 +93,7 @@ talloc_total_blocks(tall_bsc_ctx) == 13
 ===== test_hlr_timeout_lu_upd_loc_result
 - Total time passed: 0.000000 s
 - Location Update request causes a GSUP LU request to HLR
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -170,7 +170,7 @@ DVLR vlr_lu_fsm(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_LU){VLR_ULA_S_WAIT_H
 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_LU){RAN_CONN_S_RELEASING}: Received Event RAN_CONN_E_CN_CLOSE
 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_LU){RAN_CONN_S_RELEASING}: Event RAN_CONN_E_CN_CLOSE not permitted
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage decreases to: 1
-- BSSAP Clear --RAN_GERAN_A--> MS
+- BSSAP Clear --GERAN-A--> MS
 - RAN_CONN_TIMEOUT has passed, conn is gone.
   bssap_clear_sent == 1
 - BSS sends BSSMAP Clear Complete
diff --git a/tests/msc_vlr/msc_vlr_test_ms_timeout.c b/tests/msc_vlr/msc_vlr_test_ms_timeout.c
index b09bcee25..3702a0cfb 100644
--- a/tests/msc_vlr/msc_vlr_test_ms_timeout.c
+++ b/tests/msc_vlr/msc_vlr_test_ms_timeout.c
@@ -190,7 +190,7 @@ static void test_ms_timeout_paging()
 	struct vlr_subscr *vsub;
 	const char *imsi = "901700000004620";
 
-	rx_from_ran = RAN_GERAN_A;
+	rx_from_ran = OSMO_RAT_GERAN_A;
 
 	comment_start();
 
diff --git a/tests/msc_vlr/msc_vlr_test_ms_timeout.err b/tests/msc_vlr/msc_vlr_test_ms_timeout.err
index 6e3f0149c..682f20079 100644
--- a/tests/msc_vlr/msc_vlr_test_ms_timeout.err
+++ b/tests/msc_vlr/msc_vlr_test_ms_timeout.err
@@ -4,7 +4,7 @@ talloc_total_blocks(tall_bsc_ctx) == 13
 ===== test_ms_timeout_lu_auth_resp
 - Total time passed: 0.000000 s
 - Location Update request causes a GSUP Send Auth Info request to HLR
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -81,7 +81,7 @@ DVLR vlr_lu_fsm(GERAN-A-0_IMSI-901700000004620_LU){VLR_ULA_S_WAIT_AUTH}: state_c
 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_RELEASING}: Received Event RAN_CONN_E_CN_CLOSE
 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_RELEASING}: Event RAN_CONN_E_CN_CLOSE not permitted
 DREF VLR subscr IMSI-901700000004620 usage decreases to: 1
-- BSSAP Clear --RAN_GERAN_A--> MS
+- BSSAP Clear --GERAN-A--> MS
 - RAN_CONN_TIMEOUT has passed, conn is gone.
   bssap_clear_sent == 1
 - BSS sends BSSMAP Clear Complete
@@ -113,7 +113,7 @@ talloc_total_blocks(tall_bsc_ctx) == 13
 ===== test_ms_timeout_cm_auth_resp
 - Total time passed: 0.000000 s
 - Location Update request causes a GSUP Send Auth Info request to HLR
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -161,7 +161,7 @@ DREF VLR subscr IMSI-901700000004620 usage decreases to: 1
   auth_request_sent == 1
   lu_result_sent == 0
 - MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_AUTH_RESP
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_AUTH_RESP
 DREF IMSI-901700000004620: MSC conn use + dtap == 1 (0x2: dtap)
 DRLL Dispatching 04.08 message GSM48_MT_MM_AUTH_RESP (0x5:0x14)
 DMM IMSI-901700000004620: MM GSM AUTHENTICATION RESPONSE (sres = 2d8b2c3e)
@@ -235,7 +235,7 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_LU){RAN_CONN_S_ACCEPTED
 DREF IMSI-901700000004620_MSISDN-46071: MSC conn use + release == 1 (0x100: release)
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage increases to: 4
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage decreases to: 3
-- BSSAP Clear --RAN_GERAN_A--> MS
+- BSSAP Clear --GERAN-A--> MS
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage decreases to: 2
 <-- GSUP rx OSMO_GSUP_MSGT_UPDATE_LOCATION_RESULT: vlr_gsupc_read_cb() returns 0
   bssap_clear_sent == 1
@@ -258,7 +258,7 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_LU){RAN_CONN_S_RELEASED
   llist_count(&net->ran_conns) == 0
 ---
 - after a while, a new conn sends a CM Service Request. VLR responds with Auth Req, 2nd auth vector
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_CM_SERV_REQ
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_CM_SERV_REQ
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -323,7 +323,7 @@ DVLR Process_Access_Request_VLR(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_CM_S
 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_CM_SERVICE_REQ){RAN_CONN_S_RELEASING}: Received Event RAN_CONN_E_CN_CLOSE
 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_CM_SERVICE_REQ){RAN_CONN_S_RELEASING}: Event RAN_CONN_E_CN_CLOSE not permitted
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage decreases to: 2
-- BSSAP Clear --RAN_GERAN_A--> MS
+- BSSAP Clear --GERAN-A--> MS
 - RAN_CONN_TIMEOUT has passed, conn is gone.
   bssap_clear_sent == 1
 - BSS sends BSSMAP Clear Complete
@@ -354,7 +354,7 @@ talloc_total_blocks(tall_bsc_ctx) == 13
 ===== test_ms_timeout_paging
 - Total time passed: 0.000000 s
 - Location Update request causes a GSUP LU request to HLR
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -435,7 +435,7 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_LU){RAN_CONN_S_ACCEPTED
 DREF IMSI-901700000004620_MSISDN-46071: MSC conn use + release == 1 (0x100: release)
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage increases to: 4
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage decreases to: 3
-- BSSAP Clear --RAN_GERAN_A--> MS
+- BSSAP Clear --GERAN-A--> MS
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage decreases to: 2
 <-- GSUP rx OSMO_GSUP_MSGT_UPDATE_LOCATION_RESULT: vlr_gsupc_read_cb() returns 0
 - LU was successful, and the conn has already been closed
@@ -464,7 +464,7 @@ DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage increases to: 3
 DCC (ti 00 sub IMSI-901700000004620_MSISDN-46071 callref 40000001) New transaction
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage increases to: 4
 DMM Subscriber IMSI-901700000004620_MSISDN-46071 not paged yet, start paging.
-  RAN_GERAN_A sends out paging request to IMSI 901700000004620, TMSI 0xffffffff, LAC 23
+  GERAN-A sends out paging request to IMSI 901700000004620, TMSI 0xffffffff, LAC 23
   strcmp(paging_expecting_imsi, imsi) == 0
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage increases to: 5
   llist_count(&vsub->cs.requests) == 1
@@ -505,7 +505,7 @@ DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage increases to: 3
 DCC (ti 00 sub IMSI-901700000004620_MSISDN-46071 callref 40000003) New transaction
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage increases to: 4
 DMM Subscriber IMSI-901700000004620_MSISDN-46071 not paged yet, start paging.
-  RAN_GERAN_A sends out paging request to IMSI 901700000004620, TMSI 0xffffffff, LAC 23
+  GERAN-A sends out paging request to IMSI 901700000004620, TMSI 0xffffffff, LAC 23
   strcmp(paging_expecting_imsi, imsi) == 0
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage increases to: 5
   llist_count(&vsub->cs.requests) == 1
@@ -514,7 +514,7 @@ DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage decreases to: 4
   paging_stopped == 0
 ---
 - subscriber detaches, pagings are canceled
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_IMSI_DETACH_IND
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_IMSI_DETACH_IND
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -535,7 +535,7 @@ DREF freeing VLR subscr IMSI-901700000004620_MSISDN-46071
 DMM RAN_conn{RAN_CONN_S_NEW}: Received Event RAN_CONN_E_CN_CLOSE
 DMM RAN_conn{RAN_CONN_S_NEW}: state_chg to RAN_CONN_S_RELEASING
 DREF unknown: MSC conn use + release == 2 (0x101: compl_l3,release)
-- BSSAP Clear --RAN_GERAN_A--> MS
+- BSSAP Clear --GERAN-A--> MS
 DREF unknown: MSC conn use - compl_l3 == 1 (0x100: release)
   bssap_clear_sent == 1
   paging_stopped == 1
@@ -556,7 +556,7 @@ talloc_total_blocks(tall_bsc_ctx) == 13
 ===== test_classmark_update_timeout
 - Total time passed: 0.000000 s
 - Location Update request causes a GSUP Send Auth Info request to HLR
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -605,7 +605,7 @@ DREF VLR subscr IMSI-901700000004620 usage decreases to: 1
   auth_request_sent == 1
 ---
 - MS sends Authen Response, VLR accepts and wants to send Ciphering Mode Command to MS -- but needs Classmark 2 to determine whether A5/3 is supported
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_AUTH_RESP
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_AUTH_RESP
 DREF IMSI-901700000004620: MSC conn use + dtap == 1 (0x2: dtap)
 DRLL Dispatching 04.08 message GSM48_MT_MM_AUTH_RESP (0x5:0x14)
 DMM IMSI-901700000004620: MM GSM AUTHENTICATION RESPONSE (sres = 2d8b2c3e)
@@ -659,7 +659,7 @@ DVLR vlr_lu_fsm(GERAN-A-0_IMSI-901700000004620_LU){VLR_ULA_S_WAIT_CIPH}: state_c
 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_RELEASING}: Received Event RAN_CONN_E_CN_CLOSE
 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_RELEASING}: Event RAN_CONN_E_CN_CLOSE not permitted
 DREF VLR subscr IMSI-901700000004620 usage decreases to: 1
-- BSSAP Clear --RAN_GERAN_A--> MS
+- BSSAP Clear --GERAN-A--> MS
 - RAN_CONN_TIMEOUT has passed, conn is gone.
   bssap_clear_sent == 1
 - BSS sends BSSMAP Clear Complete
diff --git a/tests/msc_vlr/msc_vlr_test_no_authen.c b/tests/msc_vlr/msc_vlr_test_no_authen.c
index b34ddd7d9..3162149dc 100644
--- a/tests/msc_vlr/msc_vlr_test_no_authen.c
+++ b/tests/msc_vlr/msc_vlr_test_no_authen.c
@@ -29,7 +29,7 @@ static void test_no_authen()
 	const char *imsi = "901700000004620";
 	
 	/* No auth only works on GERAN */
-	rx_from_ran = RAN_GERAN_A;
+	rx_from_ran = OSMO_RAT_GERAN_A;
 
 	comment_start();
 
@@ -73,8 +73,8 @@ static void test_no_authen()
 	EXPECT_ACCEPTED(true);
 
 	/* Release connection */
-	expect_bssap_clear(RAN_GERAN_A);
-	conn_conclude_cm_service_req(g_conn, RAN_GERAN_A);
+	expect_bssap_clear(OSMO_RAT_GERAN_A);
+	conn_conclude_cm_service_req(g_conn, OSMO_RAT_GERAN_A);
 
 	btw("all requests serviced, conn has been released");
 	bss_sends_clear_complete();
@@ -169,7 +169,7 @@ static void test_no_authen_tmsi()
 	struct vlr_subscr *vsub;
 	const char *imsi = "901700000004620";
 
-	rx_from_ran = RAN_GERAN_A;
+	rx_from_ran = OSMO_RAT_GERAN_A;
 
 	comment_start();
 
@@ -236,8 +236,8 @@ static void test_no_authen_tmsi()
 	EXPECT_ACCEPTED(true);
 
 	/* Release connection */
-	expect_bssap_clear(RAN_GERAN_A);
-	conn_conclude_cm_service_req(g_conn, RAN_GERAN_A);
+	expect_bssap_clear(OSMO_RAT_GERAN_A);
+	conn_conclude_cm_service_req(g_conn, OSMO_RAT_GERAN_A);
 
 	btw("all requests serviced, conn has been released");
 	bss_sends_clear_complete();
@@ -392,7 +392,7 @@ static void test_no_authen_imei()
 	struct vlr_subscr *vsub;
 	const char *imsi = "901700000004620";
 
-	rx_from_ran = RAN_GERAN_A;
+	rx_from_ran = OSMO_RAT_GERAN_A;
 
 	comment_start();
 
@@ -462,7 +462,7 @@ static void test_no_authen_tmsi_imei()
 	struct vlr_subscr *vsub;
 	const char *imsi = "901700000004620";
 
-	rx_from_ran = RAN_GERAN_A;
+	rx_from_ran = OSMO_RAT_GERAN_A;
 
 	comment_start();
 
@@ -542,7 +542,7 @@ static void test_no_authen_imeisv()
 	const char *imsi = "901700000004620";
 	
 	/* No auth only works on GERAN */
-	rx_from_ran = RAN_GERAN_A;
+	rx_from_ran = OSMO_RAT_GERAN_A;
 
 	comment_start();
 
@@ -604,7 +604,7 @@ static void test_no_authen_imeisv_imei()
 	struct vlr_subscr *vsub;
 	const char *imsi = "901700000004620";
 
-	rx_from_ran = RAN_GERAN_A;
+	rx_from_ran = OSMO_RAT_GERAN_A;
 
 	comment_start();
 
@@ -684,7 +684,7 @@ static void test_no_authen_imeisv_tmsi()
 	struct vlr_subscr *vsub;
 	const char *imsi = "901700000004620";
 
-	rx_from_ran = RAN_GERAN_A;
+	rx_from_ran = OSMO_RAT_GERAN_A;
 
 	comment_start();
 
@@ -825,7 +825,7 @@ static void test_no_authen_imeisv_tmsi_imei()
 	struct vlr_subscr *vsub;
 	const char *imsi = "901700000004620";
 
-	rx_from_ran = RAN_GERAN_A;
+	rx_from_ran = OSMO_RAT_GERAN_A;
 
 	comment_start();
 
@@ -918,7 +918,7 @@ static void test_no_authen_subscr_expire()
 	const char *imsi = "901700000004620";
 
 	/* No auth only works on GERAN */
-	rx_from_ran = RAN_GERAN_A;
+	rx_from_ran = OSMO_RAT_GERAN_A;
 
 	comment_start();
 
diff --git a/tests/msc_vlr/msc_vlr_test_no_authen.err b/tests/msc_vlr/msc_vlr_test_no_authen.err
index 36fca7fce..11d6e8b17 100644
--- a/tests/msc_vlr/msc_vlr_test_no_authen.err
+++ b/tests/msc_vlr/msc_vlr_test_no_authen.err
@@ -3,7 +3,7 @@ talloc_total_blocks(tall_bsc_ctx) == 13
 
 ===== test_no_authen
 - Location Update request causes a GSUP LU request to HLR
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -96,7 +96,7 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_LU){RAN_CONN_S_ACCEPTED
 DREF IMSI-901700000004620_MSISDN-46071: MSC conn use + release == 1 (0x100: release)
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage increases to: 4
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage decreases to: 3
-- BSSAP Clear --RAN_GERAN_A--> MS
+- BSSAP Clear --GERAN-A--> MS
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage decreases to: 2
 <-- GSUP rx OSMO_GSUP_MSGT_UPDATE_LOCATION_RESULT: vlr_gsupc_read_cb() returns 0
 - LU was successful, and the conn has already been closed
@@ -119,7 +119,7 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_LU){RAN_CONN_S_RELEASED
   llist_count(&net->ran_conns) == 0
 ---
 - after a while, a new conn sends a CM Service Request
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_CM_SERV_REQ
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_CM_SERV_REQ
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -160,7 +160,7 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_CM_SERVICE_REQ){RAN_CON
 DREF IMSI-901700000004620_MSISDN-46071: MSC conn use + release == 1 (0x100: release)
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage increases to: 3
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage decreases to: 2
-- BSSAP Clear --RAN_GERAN_A--> MS
+- BSSAP Clear --GERAN-A--> MS
   bssap_clear_sent == 1
 - all requests serviced, conn has been released
 - BSS sends BSSMAP Clear Complete
@@ -185,7 +185,7 @@ DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage increases to: 3
 DCC (ti 00 sub IMSI-901700000004620_MSISDN-46071 callref 40000001) New transaction
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage increases to: 4
 DMM Subscriber IMSI-901700000004620_MSISDN-46071 not paged yet, start paging.
-  RAN_GERAN_A sends out paging request to IMSI 901700000004620, TMSI 0xffffffff, LAC 23
+  GERAN-A sends out paging request to IMSI 901700000004620, TMSI 0xffffffff, LAC 23
   strcmp(paging_expecting_imsi, imsi) == 0
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage increases to: 5
   llist_count(&vsub->cs.requests) == 1
@@ -197,7 +197,7 @@ DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage increases to: 5
   llist_count(&vsub->cs.requests) == 1
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage decreases to: 4
 - MS replies with Paging Response, we deliver the SMS
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_RR_PAG_RESP
+  MSC <--GERAN-A-- MS: GSM48_MT_RR_PAG_RESP
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -225,8 +225,8 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_PAGING_RESP){RAN_CONN_S
 DPAG Paging success for IMSI-901700000004620_MSISDN-46071 (event=0)
 DPAG Calling paging cbfn.
 DREF IMSI-901700000004620_MSISDN-46071: MSC conn use + trans_sms == 2 (0x21: compl_l3,trans_sms)
-DMSC msc_tx 91 bytes to IMSI-901700000004620_MSISDN-46071 via RAN_GERAN_A
-- DTAP --RAN_GERAN_A--> MS: SMS:0x01: 09015801000791447758100650004c0005806470f1000007101000000000445079da1e1ee7416937485e9ea7c965373d1d6683c270383b3d0ed3d36ff71c949e83c22072799e9687c5ec32a81d96afcbf4b4fb0c7ac3e9e9b7db05
+DMSC msc_tx 91 bytes to IMSI-901700000004620_MSISDN-46071 via GERAN-A
+- DTAP --GERAN-A--> MS: SMS:0x01: 09015801000791447758100650004c0005806470f1000007101000000000445079da1e1ee7416937485e9ea7c965373d1d6683c270383b3d0ed3d36ff71c949e83c22072799e9687c5ec32a81d96afcbf4b4fb0c7ac3e9e9b7db05
 - DTAP matches expected message
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage decreases to: 5
 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_PAGING_RESP){RAN_CONN_S_NEW}: state_chg to RAN_CONN_S_ACCEPTED
@@ -243,7 +243,7 @@ DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage decreases to: 4
 - conn is still open to wait for SMS ack dance
   llist_count(&net->ran_conns) == 1
 - MS replies with CP-ACK for received SMS
-  MSC <--RAN_GERAN_A-- MS: SMS:0x04
+  MSC <--GERAN-A-- MS: SMS:0x04
 DREF IMSI-901700000004620_MSISDN-46071: MSC conn use + dtap == 2 (0x22: dtap,trans_sms)
 DRLL Dispatching 04.08 message SMS:0x04 (0x9:0x4)
 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_PAGING_RESP){RAN_CONN_S_ACCEPTED}: Received Event RAN_CONN_E_COMMUNICATING
@@ -251,12 +251,12 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_PAGING_RESP){RAN_CONN_S
 DREF IMSI-901700000004620_MSISDN-46071: MSC conn use - dtap == 1 (0x20: trans_sms)
   llist_count(&net->ran_conns) == 1
 - MS also sends RP-ACK, MSC in turn sends CP-ACK for that
-  MSC <--RAN_GERAN_A-- MS: SMS:0x01
+  MSC <--GERAN-A-- MS: SMS:0x01
 DREF IMSI-901700000004620_MSISDN-46071: MSC conn use + dtap == 2 (0x22: dtap,trans_sms)
 DRLL Dispatching 04.08 message SMS:0x01 (0x9:0x1)
 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_PAGING_RESP){RAN_CONN_S_COMMUNICATING}: Received Event RAN_CONN_E_COMMUNICATING
-DMSC msc_tx 2 bytes to IMSI-901700000004620_MSISDN-46071 via RAN_GERAN_A
-- DTAP --RAN_GERAN_A--> MS: SMS:0x04: 0904
+DMSC msc_tx 2 bytes to IMSI-901700000004620_MSISDN-46071 via GERAN-A
+- DTAP --GERAN-A--> MS: SMS:0x04: 0904
 - DTAP matches expected message
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage decreases to: 3
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage decreases to: 2
@@ -267,7 +267,7 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_PAGING_RESP){RAN_CONN_S
 DREF IMSI-901700000004620_MSISDN-46071: MSC conn use + release == 1 (0x100: release)
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage increases to: 3
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage decreases to: 2
-- BSSAP Clear --RAN_GERAN_A--> MS
+- BSSAP Clear --GERAN-A--> MS
   dtap_tx_confirmed == 1
   bssap_clear_sent == 1
 - SMS is done, conn is gone
@@ -287,7 +287,7 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_PAGING_RESP){RAN_CONN_S
   llist_count(&net->ran_conns) == 0
 ---
 - subscriber detaches
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_IMSI_DETACH_IND
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_IMSI_DETACH_IND
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -303,7 +303,7 @@ DREF freeing VLR subscr IMSI-901700000004620_MSISDN-46071
 DMM RAN_conn{RAN_CONN_S_NEW}: Received Event RAN_CONN_E_CN_CLOSE
 DMM RAN_conn{RAN_CONN_S_NEW}: state_chg to RAN_CONN_S_RELEASING
 DREF unknown: MSC conn use + release == 2 (0x101: compl_l3,release)
-- BSSAP Clear --RAN_GERAN_A--> MS
+- BSSAP Clear --GERAN-A--> MS
 DREF unknown: MSC conn use - compl_l3 == 1 (0x100: release)
   bssap_clear_sent == 1
 - BSS sends BSSMAP Clear Complete
@@ -322,7 +322,7 @@ talloc_total_blocks(tall_bsc_ctx) == 13
 
 ===== test_no_authen_tmsi
 - Location Update request causes a GSUP LU request to HLR
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -425,7 +425,7 @@ DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage increases to: 2
   vsub->tmsi == 0xffffffff
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage decreases to: 1
 - MS sends TMSI Realloc Complete
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_TMSI_REALL_COMPL
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_TMSI_REALL_COMPL
 DREF IMSI-901700000004620_MSISDN-46071: MSC conn use + dtap == 1 (0x2: dtap)
 DRLL Dispatching 04.08 message GSM48_MT_MM_TMSI_REALL_COMPL (0x5:0x1b)
 DMM TMSI Reallocation Completed. Subscriber: IMSI-901700000004620_MSISDN-46071
@@ -446,7 +446,7 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_LU){RAN_CONN_S_ACCEPTED
 DREF IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100: MSC conn use + release == 2 (0x102: dtap,release)
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100 usage increases to: 3
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100 usage decreases to: 2
-- BSSAP Clear --RAN_GERAN_A--> MS
+- BSSAP Clear --GERAN-A--> MS
 DREF IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100: MSC conn use - dtap == 1 (0x100: release)
   bssap_clear_sent == 1
 - LU was successful, and the conn has already been closed
@@ -474,7 +474,7 @@ DREF VLR subscr IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100 usage increase
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100 usage decreases to: 1
 ---
 - after a while, a new conn sends a CM Service Request using above TMSI
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_CM_SERV_REQ
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_CM_SERV_REQ
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -515,7 +515,7 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100_CM_SERV
 DREF IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100: MSC conn use + release == 1 (0x100: release)
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100 usage increases to: 3
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100 usage decreases to: 2
-- BSSAP Clear --RAN_GERAN_A--> MS
+- BSSAP Clear --GERAN-A--> MS
   bssap_clear_sent == 1
 - all requests serviced, conn has been released
 - BSS sends BSSMAP Clear Complete
@@ -540,7 +540,7 @@ DREF VLR subscr IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100 usage increase
 DCC (ti 00 sub IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100 callref 40000002) New transaction
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100 usage increases to: 4
 DMM Subscriber IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100 not paged yet, start paging.
-  RAN_GERAN_A sends out paging request to IMSI 901700000004620, TMSI 0x03020100, LAC 23
+  GERAN-A sends out paging request to IMSI 901700000004620, TMSI 0x03020100, LAC 23
   paging_expecting_tmsi == 0x03020100
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100 usage increases to: 5
   llist_count(&vsub->cs.requests) == 1
@@ -552,7 +552,7 @@ DREF VLR subscr IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100 usage increase
   llist_count(&vsub->cs.requests) == 1
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100 usage decreases to: 4
 - MS replies with Paging Response using TMSI, we deliver the SMS
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_RR_PAG_RESP
+  MSC <--GERAN-A-- MS: GSM48_MT_RR_PAG_RESP
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -580,8 +580,8 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100_PAGING_
 DPAG Paging success for IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100 (event=0)
 DPAG Calling paging cbfn.
 DREF IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100: MSC conn use + trans_sms == 2 (0x21: compl_l3,trans_sms)
-DMSC msc_tx 91 bytes to IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100 via RAN_GERAN_A
-- DTAP --RAN_GERAN_A--> MS: SMS:0x01: 09015801000791447758100650004c0005806470f1000007101000000000445079da1e1ee7416937485e9ea7c965373d1d6683c270383b3d0ed3d36ff71c949e83c22072799e9687c5ec32a81d96afcbf4b4fb0c7ac3e9e9b7db05
+DMSC msc_tx 91 bytes to IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100 via GERAN-A
+- DTAP --GERAN-A--> MS: SMS:0x01: 09015801000791447758100650004c0005806470f1000007101000000000445079da1e1ee7416937485e9ea7c965373d1d6683c270383b3d0ed3d36ff71c949e83c22072799e9687c5ec32a81d96afcbf4b4fb0c7ac3e9e9b7db05
 - DTAP matches expected message
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100 usage decreases to: 5
 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100_PAGING_RESP){RAN_CONN_S_NEW}: state_chg to RAN_CONN_S_ACCEPTED
@@ -598,7 +598,7 @@ DREF VLR subscr IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100 usage decrease
 - conn is still open to wait for SMS ack dance
   llist_count(&net->ran_conns) == 1
 - MS replies with CP-ACK for received SMS
-  MSC <--RAN_GERAN_A-- MS: SMS:0x04
+  MSC <--GERAN-A-- MS: SMS:0x04
 DREF IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100: MSC conn use + dtap == 2 (0x22: dtap,trans_sms)
 DRLL Dispatching 04.08 message SMS:0x04 (0x9:0x4)
 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100_PAGING_RESP){RAN_CONN_S_ACCEPTED}: Received Event RAN_CONN_E_COMMUNICATING
@@ -606,12 +606,12 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100_PAGING_
 DREF IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100: MSC conn use - dtap == 1 (0x20: trans_sms)
   llist_count(&net->ran_conns) == 1
 - MS also sends RP-ACK, MSC in turn sends CP-ACK for that
-  MSC <--RAN_GERAN_A-- MS: SMS:0x01
+  MSC <--GERAN-A-- MS: SMS:0x01
 DREF IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100: MSC conn use + dtap == 2 (0x22: dtap,trans_sms)
 DRLL Dispatching 04.08 message SMS:0x01 (0x9:0x1)
 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100_PAGING_RESP){RAN_CONN_S_COMMUNICATING}: Received Event RAN_CONN_E_COMMUNICATING
-DMSC msc_tx 2 bytes to IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100 via RAN_GERAN_A
-- DTAP --RAN_GERAN_A--> MS: SMS:0x04: 0904
+DMSC msc_tx 2 bytes to IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100 via GERAN-A
+- DTAP --GERAN-A--> MS: SMS:0x04: 0904
 - DTAP matches expected message
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100 usage decreases to: 3
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100 usage decreases to: 2
@@ -622,7 +622,7 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100_PAGING_
 DREF IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100: MSC conn use + release == 1 (0x100: release)
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100 usage increases to: 3
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100 usage decreases to: 2
-- BSSAP Clear --RAN_GERAN_A--> MS
+- BSSAP Clear --GERAN-A--> MS
   dtap_tx_confirmed == 1
   bssap_clear_sent == 1
 - SMS is done, conn is gone
@@ -643,7 +643,7 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100_PAGING_
 ---
 - subscriber sends LU Request, this time with the TMSI
 - Location Update request causes a GSUP LU request to HLR
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -744,7 +744,7 @@ DREF VLR subscr IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100 usage increase
   vsub->tmsi == 0x03020100
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100 usage decreases to: 2
 - MS sends TMSI Realloc Complete
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_TMSI_REALL_COMPL
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_TMSI_REALL_COMPL
 DREF IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100: MSC conn use + dtap == 1 (0x2: dtap)
 DRLL Dispatching 04.08 message GSM48_MT_MM_TMSI_REALL_COMPL (0x5:0x1b)
 DMM TMSI Reallocation Completed. Subscriber: IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100
@@ -764,7 +764,7 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100_LU){RAN
 DREF IMSI-901700000004620_MSISDN-46071_TMSI-0x07060504: MSC conn use + release == 2 (0x102: dtap,release)
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071_TMSI-0x07060504 usage increases to: 3
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071_TMSI-0x07060504 usage decreases to: 2
-- BSSAP Clear --RAN_GERAN_A--> MS
+- BSSAP Clear --GERAN-A--> MS
 DREF IMSI-901700000004620_MSISDN-46071_TMSI-0x07060504: MSC conn use - dtap == 1 (0x100: release)
   bssap_clear_sent == 1
 - LU was successful, and the conn has already been closed
@@ -792,7 +792,7 @@ DREF VLR subscr IMSI-901700000004620_MSISDN-46071_TMSI-0x07060504 usage increase
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071_TMSI-0x07060504 usage decreases to: 1
 ---
 - subscriber detaches, using new TMSI
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_IMSI_DETACH_IND
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_IMSI_DETACH_IND
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -808,7 +808,7 @@ DREF freeing VLR subscr IMSI-901700000004620_MSISDN-46071_TMSI-0x07060504
 DMM RAN_conn{RAN_CONN_S_NEW}: Received Event RAN_CONN_E_CN_CLOSE
 DMM RAN_conn{RAN_CONN_S_NEW}: state_chg to RAN_CONN_S_RELEASING
 DREF unknown: MSC conn use + release == 2 (0x101: compl_l3,release)
-- BSSAP Clear --RAN_GERAN_A--> MS
+- BSSAP Clear --GERAN-A--> MS
 DREF unknown: MSC conn use - compl_l3 == 1 (0x100: release)
   bssap_clear_sent == 1
 - BSS sends BSSMAP Clear Complete
@@ -827,7 +827,7 @@ talloc_total_blocks(tall_bsc_ctx) == 13
 
 ===== test_no_authen_imei
 - Location Update request causes a GSUP LU request to HLR
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -905,8 +905,8 @@ DVLR lu_compl_vlr_fsm(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_LU){LU_COMPL_V
 DVLR lu_compl_vlr_fsm(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_LU){LU_COMPL_VLR_S_INIT}: state_chg to LU_COMPL_VLR_S_WAIT_SUB_PRES
 DVLR lu_compl_vlr_fsm(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_LU){LU_COMPL_VLR_S_WAIT_SUB_PRES}: Received Event LU_COMPL_VLR_E_SUB_PRES_COMPL
 DVLR lu_compl_vlr_fsm(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_LU){LU_COMPL_VLR_S_WAIT_SUB_PRES}: state_chg to LU_COMPL_VLR_S_WAIT_IMEI
-DMSC msc_tx 3 bytes to IMSI-901700000004620_MSISDN-46071 via RAN_GERAN_A
-- DTAP --RAN_GERAN_A--> MS: GSM48_MT_MM_ID_REQ: 051802
+DMSC msc_tx 3 bytes to IMSI-901700000004620_MSISDN-46071 via GERAN-A
+- DTAP --GERAN-A--> MS: GSM48_MT_MM_ID_REQ: 051802
 - DTAP matches expected message
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage decreases to: 1
 <-- GSUP rx OSMO_GSUP_MSGT_UPDATE_LOCATION_RESULT: vlr_gsupc_read_cb() returns 0
@@ -926,7 +926,7 @@ DRLL subscr IMSI-901700000004620_MSISDN-46071: Message not permitted for initial
 DRLL Dispatching 04.08 message SMS:0x01 (0x9:0x1)
 DRLL subscr IMSI-901700000004620_MSISDN-46071: Message not permitted for initial conn: SMS:0x01
 - MS replies with an Identity Response
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_ID_RESP
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_ID_RESP
 DREF IMSI-901700000004620_MSISDN-46071: MSC conn use + dtap == 1 (0x2: dtap)
 DRLL Dispatching 04.08 message GSM48_MT_MM_ID_RESP (0x5:0x19)
 DMM IDENTITY RESPONSE: MI(IMEI)=423423423423420
@@ -949,7 +949,7 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_LU){RAN_CONN_S_ACCEPTED
 DREF IMSI-901700000004620_MSISDN-46071: MSC conn use + release == 2 (0x102: dtap,release)
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage increases to: 3
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage decreases to: 2
-- BSSAP Clear --RAN_GERAN_A--> MS
+- BSSAP Clear --GERAN-A--> MS
 DREF IMSI-901700000004620_MSISDN-46071: MSC conn use - dtap == 1 (0x100: release)
   bssap_clear_sent == 1
 - LU was successful, and the conn has already been closed
@@ -975,7 +975,7 @@ DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage increases to: 2
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage decreases to: 1
 ---
 - subscriber detaches
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_IMSI_DETACH_IND
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_IMSI_DETACH_IND
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -991,7 +991,7 @@ DREF freeing VLR subscr IMSI-901700000004620_MSISDN-46071
 DMM RAN_conn{RAN_CONN_S_NEW}: Received Event RAN_CONN_E_CN_CLOSE
 DMM RAN_conn{RAN_CONN_S_NEW}: state_chg to RAN_CONN_S_RELEASING
 DREF unknown: MSC conn use + release == 2 (0x101: compl_l3,release)
-- BSSAP Clear --RAN_GERAN_A--> MS
+- BSSAP Clear --GERAN-A--> MS
 DREF unknown: MSC conn use - compl_l3 == 1 (0x100: release)
   bssap_clear_sent == 1
 - BSS sends BSSMAP Clear Complete
@@ -1010,7 +1010,7 @@ talloc_total_blocks(tall_bsc_ctx) == 13
 
 ===== test_no_authen_tmsi_imei
 - Location Update request causes a GSUP LU request to HLR
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -1088,8 +1088,8 @@ DVLR lu_compl_vlr_fsm(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_LU){LU_COMPL_V
 DVLR lu_compl_vlr_fsm(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_LU){LU_COMPL_VLR_S_INIT}: state_chg to LU_COMPL_VLR_S_WAIT_SUB_PRES
 DVLR lu_compl_vlr_fsm(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_LU){LU_COMPL_VLR_S_WAIT_SUB_PRES}: Received Event LU_COMPL_VLR_E_SUB_PRES_COMPL
 DVLR lu_compl_vlr_fsm(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_LU){LU_COMPL_VLR_S_WAIT_SUB_PRES}: state_chg to LU_COMPL_VLR_S_WAIT_IMEI_TMSI
-DMSC msc_tx 3 bytes to IMSI-901700000004620_MSISDN-46071 via RAN_GERAN_A
-- DTAP --RAN_GERAN_A--> MS: GSM48_MT_MM_ID_REQ: 051802
+DMSC msc_tx 3 bytes to IMSI-901700000004620_MSISDN-46071 via GERAN-A
+- DTAP --GERAN-A--> MS: GSM48_MT_MM_ID_REQ: 051802
 - DTAP matches expected message
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage decreases to: 1
 <-- GSUP rx OSMO_GSUP_MSGT_UPDATE_LOCATION_RESULT: vlr_gsupc_read_cb() returns 0
@@ -1109,7 +1109,7 @@ DRLL subscr IMSI-901700000004620_MSISDN-46071: Message not permitted for initial
 DRLL Dispatching 04.08 message SMS:0x01 (0x9:0x1)
 DRLL subscr IMSI-901700000004620_MSISDN-46071: Message not permitted for initial conn: SMS:0x01
 - MS replies with an Identity Response
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_ID_RESP
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_ID_RESP
 DREF IMSI-901700000004620_MSISDN-46071: MSC conn use + dtap == 1 (0x2: dtap)
 DRLL Dispatching 04.08 message GSM48_MT_MM_ID_RESP (0x5:0x19)
 DMM IDENTITY RESPONSE: MI(IMEI)=423423423423420
@@ -1136,7 +1136,7 @@ DRLL subscr IMSI-901700000004620_MSISDN-46071: Message not permitted for initial
 DRLL Dispatching 04.08 message SMS:0x01 (0x9:0x1)
 DRLL subscr IMSI-901700000004620_MSISDN-46071: Message not permitted for initial conn: SMS:0x01
 - MS sends TMSI Realloc Complete
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_TMSI_REALL_COMPL
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_TMSI_REALL_COMPL
 DREF IMSI-901700000004620_MSISDN-46071: MSC conn use + dtap == 1 (0x2: dtap)
 DRLL Dispatching 04.08 message GSM48_MT_MM_TMSI_REALL_COMPL (0x5:0x1b)
 DMM TMSI Reallocation Completed. Subscriber: IMSI-901700000004620_MSISDN-46071
@@ -1157,7 +1157,7 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_LU){RAN_CONN_S_ACCEPTED
 DREF IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100: MSC conn use + release == 2 (0x102: dtap,release)
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100 usage increases to: 3
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100 usage decreases to: 2
-- BSSAP Clear --RAN_GERAN_A--> MS
+- BSSAP Clear --GERAN-A--> MS
 DREF IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100: MSC conn use - dtap == 1 (0x100: release)
   bssap_clear_sent == 1
 - LU was successful, and the conn has already been closed
@@ -1184,7 +1184,7 @@ DREF VLR subscr IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100 usage increase
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100 usage decreases to: 1
 ---
 - subscriber detaches
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_IMSI_DETACH_IND
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_IMSI_DETACH_IND
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -1200,7 +1200,7 @@ DREF freeing VLR subscr IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100
 DMM RAN_conn{RAN_CONN_S_NEW}: Received Event RAN_CONN_E_CN_CLOSE
 DMM RAN_conn{RAN_CONN_S_NEW}: state_chg to RAN_CONN_S_RELEASING
 DREF unknown: MSC conn use + release == 2 (0x101: compl_l3,release)
-- BSSAP Clear --RAN_GERAN_A--> MS
+- BSSAP Clear --GERAN-A--> MS
 DREF unknown: MSC conn use - compl_l3 == 1 (0x100: release)
   bssap_clear_sent == 1
 - BSS sends BSSMAP Clear Complete
@@ -1219,7 +1219,7 @@ talloc_total_blocks(tall_bsc_ctx) == 13
 
 ===== test_no_authen_imeisv
 - Location Update request causes an IMEISV ID request back to the MS
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -1237,8 +1237,8 @@ DVLR New subscr, IMSI: 901700000004620
 DREF VLR subscr IMSI-901700000004620 usage increases to: 2
 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_NEW}: Updated ID
 DREF VLR subscr IMSI-901700000004620 usage decreases to: 1
-DMSC msc_tx 3 bytes to IMSI-901700000004620 via RAN_GERAN_A
-- DTAP --RAN_GERAN_A--> MS: GSM48_MT_MM_ID_REQ: 051803
+DMSC msc_tx 3 bytes to IMSI-901700000004620 via GERAN-A
+- DTAP --GERAN-A--> MS: GSM48_MT_MM_ID_REQ: 051803
 - DTAP matches expected message
 DVLR vlr_lu_fsm(GERAN-A-0_IMSI-901700000004620_LU){VLR_ULA_S_IDLE}: state_chg to VLR_ULA_S_WAIT_IMEISV
 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_NEW}: Received Event RAN_CONN_E_COMPLETE_LAYER_3
@@ -1247,7 +1247,7 @@ DREF IMSI-901700000004620: MSC conn use - compl_l3 == 0 (0x0: )
 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_AUTH_CIPH}: Received Event RAN_CONN_E_UNUSED
 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_AUTH_CIPH}: Awaiting results for Auth+Ciph, overruling event RAN_CONN_E_UNUSED
 - MS replies with an Identity Response, causes LU to commence with a GSUP LU request to HLR
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_ID_RESP
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_ID_RESP
 DREF IMSI-901700000004620: MSC conn use + dtap == 1 (0x2: dtap)
 DRLL Dispatching 04.08 message GSM48_MT_MM_ID_RESP (0x5:0x19)
 DMM IDENTITY RESPONSE: MI(IMEI-SV)=4234234234234275
@@ -1330,7 +1330,7 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_LU){RAN_CONN_S_ACCEPTED
 DREF IMSI-901700000004620_MSISDN-46071: MSC conn use + release == 1 (0x100: release)
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage increases to: 4
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage decreases to: 3
-- BSSAP Clear --RAN_GERAN_A--> MS
+- BSSAP Clear --GERAN-A--> MS
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage decreases to: 2
 <-- GSUP rx OSMO_GSUP_MSGT_UPDATE_LOCATION_RESULT: vlr_gsupc_read_cb() returns 0
 - LU was successful, and the conn has already been closed
@@ -1353,7 +1353,7 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_LU){RAN_CONN_S_RELEASED
   llist_count(&net->ran_conns) == 0
 ---
 - subscriber detaches
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_IMSI_DETACH_IND
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_IMSI_DETACH_IND
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -1369,7 +1369,7 @@ DREF freeing VLR subscr IMSI-901700000004620_MSISDN-46071
 DMM RAN_conn{RAN_CONN_S_NEW}: Received Event RAN_CONN_E_CN_CLOSE
 DMM RAN_conn{RAN_CONN_S_NEW}: state_chg to RAN_CONN_S_RELEASING
 DREF unknown: MSC conn use + release == 2 (0x101: compl_l3,release)
-- BSSAP Clear --RAN_GERAN_A--> MS
+- BSSAP Clear --GERAN-A--> MS
 DREF unknown: MSC conn use - compl_l3 == 1 (0x100: release)
   bssap_clear_sent == 1
 - BSS sends BSSMAP Clear Complete
@@ -1388,7 +1388,7 @@ talloc_total_blocks(tall_bsc_ctx) == 13
 
 ===== test_no_authen_imeisv_imei
 - Location Update request causes an IMEISV ID request back to the MS
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -1406,8 +1406,8 @@ DVLR New subscr, IMSI: 901700000004620
 DREF VLR subscr IMSI-901700000004620 usage increases to: 2
 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_NEW}: Updated ID
 DREF VLR subscr IMSI-901700000004620 usage decreases to: 1
-DMSC msc_tx 3 bytes to IMSI-901700000004620 via RAN_GERAN_A
-- DTAP --RAN_GERAN_A--> MS: GSM48_MT_MM_ID_REQ: 051803
+DMSC msc_tx 3 bytes to IMSI-901700000004620 via GERAN-A
+- DTAP --GERAN-A--> MS: GSM48_MT_MM_ID_REQ: 051803
 - DTAP matches expected message
 DVLR vlr_lu_fsm(GERAN-A-0_IMSI-901700000004620_LU){VLR_ULA_S_IDLE}: state_chg to VLR_ULA_S_WAIT_IMEISV
 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_NEW}: Received Event RAN_CONN_E_COMPLETE_LAYER_3
@@ -1416,7 +1416,7 @@ DREF IMSI-901700000004620: MSC conn use - compl_l3 == 0 (0x0: )
 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_AUTH_CIPH}: Received Event RAN_CONN_E_UNUSED
 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_AUTH_CIPH}: Awaiting results for Auth+Ciph, overruling event RAN_CONN_E_UNUSED
 - MS replies with an Identity Response, causes LU to commence with a GSUP LU request to HLR
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_ID_RESP
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_ID_RESP
 DREF IMSI-901700000004620: MSC conn use + dtap == 1 (0x2: dtap)
 DRLL Dispatching 04.08 message GSM48_MT_MM_ID_RESP (0x5:0x19)
 DMM IDENTITY RESPONSE: MI(IMEI-SV)=4234234234234275
@@ -1484,8 +1484,8 @@ DVLR lu_compl_vlr_fsm(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_LU){LU_COMPL_V
 DVLR lu_compl_vlr_fsm(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_LU){LU_COMPL_VLR_S_INIT}: state_chg to LU_COMPL_VLR_S_WAIT_SUB_PRES
 DVLR lu_compl_vlr_fsm(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_LU){LU_COMPL_VLR_S_WAIT_SUB_PRES}: Received Event LU_COMPL_VLR_E_SUB_PRES_COMPL
 DVLR lu_compl_vlr_fsm(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_LU){LU_COMPL_VLR_S_WAIT_SUB_PRES}: state_chg to LU_COMPL_VLR_S_WAIT_IMEI
-DMSC msc_tx 3 bytes to IMSI-901700000004620_MSISDN-46071 via RAN_GERAN_A
-- DTAP --RAN_GERAN_A--> MS: GSM48_MT_MM_ID_REQ: 051802
+DMSC msc_tx 3 bytes to IMSI-901700000004620_MSISDN-46071 via GERAN-A
+- DTAP --GERAN-A--> MS: GSM48_MT_MM_ID_REQ: 051802
 - DTAP matches expected message
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage decreases to: 1
 <-- GSUP rx OSMO_GSUP_MSGT_UPDATE_LOCATION_RESULT: vlr_gsupc_read_cb() returns 0
@@ -1505,7 +1505,7 @@ DRLL subscr IMSI-901700000004620_MSISDN-46071: Message not permitted for initial
 DRLL Dispatching 04.08 message SMS:0x01 (0x9:0x1)
 DRLL subscr IMSI-901700000004620_MSISDN-46071: Message not permitted for initial conn: SMS:0x01
 - MS replies with an Identity Response
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_ID_RESP
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_ID_RESP
 DREF IMSI-901700000004620_MSISDN-46071: MSC conn use + dtap == 1 (0x2: dtap)
 DRLL Dispatching 04.08 message GSM48_MT_MM_ID_RESP (0x5:0x19)
 DMM IDENTITY RESPONSE: MI(IMEI)=423423423423420
@@ -1528,7 +1528,7 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_LU){RAN_CONN_S_ACCEPTED
 DREF IMSI-901700000004620_MSISDN-46071: MSC conn use + release == 2 (0x102: dtap,release)
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage increases to: 3
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage decreases to: 2
-- BSSAP Clear --RAN_GERAN_A--> MS
+- BSSAP Clear --GERAN-A--> MS
 DREF IMSI-901700000004620_MSISDN-46071: MSC conn use - dtap == 1 (0x100: release)
   bssap_clear_sent == 1
 - LU was successful, and the conn has already been closed
@@ -1554,7 +1554,7 @@ DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage increases to: 2
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage decreases to: 1
 ---
 - subscriber detaches
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_IMSI_DETACH_IND
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_IMSI_DETACH_IND
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -1570,7 +1570,7 @@ DREF freeing VLR subscr IMSI-901700000004620_MSISDN-46071
 DMM RAN_conn{RAN_CONN_S_NEW}: Received Event RAN_CONN_E_CN_CLOSE
 DMM RAN_conn{RAN_CONN_S_NEW}: state_chg to RAN_CONN_S_RELEASING
 DREF unknown: MSC conn use + release == 2 (0x101: compl_l3,release)
-- BSSAP Clear --RAN_GERAN_A--> MS
+- BSSAP Clear --GERAN-A--> MS
 DREF unknown: MSC conn use - compl_l3 == 1 (0x100: release)
   bssap_clear_sent == 1
 - BSS sends BSSMAP Clear Complete
@@ -1589,7 +1589,7 @@ talloc_total_blocks(tall_bsc_ctx) == 13
 
 ===== test_no_authen_imeisv_tmsi
 - Location Update request causes an IMEISV ID request back to the MS
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -1607,8 +1607,8 @@ DVLR New subscr, IMSI: 901700000004620
 DREF VLR subscr IMSI-901700000004620 usage increases to: 2
 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_NEW}: Updated ID
 DREF VLR subscr IMSI-901700000004620 usage decreases to: 1
-DMSC msc_tx 3 bytes to IMSI-901700000004620 via RAN_GERAN_A
-- DTAP --RAN_GERAN_A--> MS: GSM48_MT_MM_ID_REQ: 051803
+DMSC msc_tx 3 bytes to IMSI-901700000004620 via GERAN-A
+- DTAP --GERAN-A--> MS: GSM48_MT_MM_ID_REQ: 051803
 - DTAP matches expected message
 DVLR vlr_lu_fsm(GERAN-A-0_IMSI-901700000004620_LU){VLR_ULA_S_IDLE}: state_chg to VLR_ULA_S_WAIT_IMEISV
 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_NEW}: Received Event RAN_CONN_E_COMPLETE_LAYER_3
@@ -1617,7 +1617,7 @@ DREF IMSI-901700000004620: MSC conn use - compl_l3 == 0 (0x0: )
 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_AUTH_CIPH}: Received Event RAN_CONN_E_UNUSED
 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_AUTH_CIPH}: Awaiting results for Auth+Ciph, overruling event RAN_CONN_E_UNUSED
 - MS replies with an Identity Response, causes LU to commence with a GSUP LU request to HLR
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_ID_RESP
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_ID_RESP
 DREF IMSI-901700000004620: MSC conn use + dtap == 1 (0x2: dtap)
 DRLL Dispatching 04.08 message GSM48_MT_MM_ID_RESP (0x5:0x19)
 DMM IDENTITY RESPONSE: MI(IMEI-SV)=4234234234234275
@@ -1710,7 +1710,7 @@ DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage increases to: 2
   vsub->tmsi == 0xffffffff
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage decreases to: 1
 - MS sends TMSI Realloc Complete
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_TMSI_REALL_COMPL
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_TMSI_REALL_COMPL
 DREF IMSI-901700000004620_MSISDN-46071: MSC conn use + dtap == 1 (0x2: dtap)
 DRLL Dispatching 04.08 message GSM48_MT_MM_TMSI_REALL_COMPL (0x5:0x1b)
 DMM TMSI Reallocation Completed. Subscriber: IMSI-901700000004620_MSISDN-46071
@@ -1731,7 +1731,7 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_LU){RAN_CONN_S_ACCEPTED
 DREF IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100: MSC conn use + release == 2 (0x102: dtap,release)
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100 usage increases to: 3
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100 usage decreases to: 2
-- BSSAP Clear --RAN_GERAN_A--> MS
+- BSSAP Clear --GERAN-A--> MS
 DREF IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100: MSC conn use - dtap == 1 (0x100: release)
   bssap_clear_sent == 1
 - LU was successful, and the conn has already been closed
@@ -1753,7 +1753,7 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_LU){RAN_CONN_S_RELEASED
 ---
 - subscriber sends LU Request, this time with the TMSI
 - Location Update request causes an IMEISV ID request back to the MS
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -1769,8 +1769,8 @@ DREF VLR subscr IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100 usage increase
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100 usage increases to: 3
 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100_LU){RAN_CONN_S_NEW}: Updated ID
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100 usage decreases to: 2
-DMSC msc_tx 3 bytes to IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100 via RAN_GERAN_A
-- DTAP --RAN_GERAN_A--> MS: GSM48_MT_MM_ID_REQ: 051803
+DMSC msc_tx 3 bytes to IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100 via GERAN-A
+- DTAP --GERAN-A--> MS: GSM48_MT_MM_ID_REQ: 051803
 - DTAP matches expected message
 DVLR vlr_lu_fsm(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100_LU){VLR_ULA_S_IDLE}: state_chg to VLR_ULA_S_WAIT_IMEISV
 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100_LU){RAN_CONN_S_NEW}: Received Event RAN_CONN_E_COMPLETE_LAYER_3
@@ -1779,7 +1779,7 @@ DREF IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100: MSC conn use - compl_l3
 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100_LU){RAN_CONN_S_AUTH_CIPH}: Received Event RAN_CONN_E_UNUSED
 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100_LU){RAN_CONN_S_AUTH_CIPH}: Awaiting results for Auth+Ciph, overruling event RAN_CONN_E_UNUSED
 - MS replies with an Identity Response, causes LU to commence with a GSUP LU request to HLR
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_ID_RESP
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_ID_RESP
 DREF IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100: MSC conn use + dtap == 1 (0x2: dtap)
 DRLL Dispatching 04.08 message GSM48_MT_MM_ID_RESP (0x5:0x19)
 DMM IDENTITY RESPONSE: MI(IMEI-SV)=5234234234234276
@@ -1872,7 +1872,7 @@ DREF VLR subscr IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100 usage increase
   vsub->tmsi == 0x03020100
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100 usage decreases to: 2
 - MS sends TMSI Realloc Complete
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_TMSI_REALL_COMPL
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_TMSI_REALL_COMPL
 DREF IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100: MSC conn use + dtap == 1 (0x2: dtap)
 DRLL Dispatching 04.08 message GSM48_MT_MM_TMSI_REALL_COMPL (0x5:0x1b)
 DMM TMSI Reallocation Completed. Subscriber: IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100
@@ -1892,7 +1892,7 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100_LU){RAN
 DREF IMSI-901700000004620_MSISDN-46071_TMSI-0x07060504: MSC conn use + release == 2 (0x102: dtap,release)
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071_TMSI-0x07060504 usage increases to: 3
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071_TMSI-0x07060504 usage decreases to: 2
-- BSSAP Clear --RAN_GERAN_A--> MS
+- BSSAP Clear --GERAN-A--> MS
 DREF IMSI-901700000004620_MSISDN-46071_TMSI-0x07060504: MSC conn use - dtap == 1 (0x100: release)
   bssap_clear_sent == 1
 - LU was successful, and the conn has already been closed
@@ -1920,7 +1920,7 @@ DREF VLR subscr IMSI-901700000004620_MSISDN-46071_TMSI-0x07060504 usage increase
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071_TMSI-0x07060504 usage decreases to: 1
 ---
 - subscriber detaches, using new TMSI
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_IMSI_DETACH_IND
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_IMSI_DETACH_IND
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -1936,7 +1936,7 @@ DREF freeing VLR subscr IMSI-901700000004620_MSISDN-46071_TMSI-0x07060504
 DMM RAN_conn{RAN_CONN_S_NEW}: Received Event RAN_CONN_E_CN_CLOSE
 DMM RAN_conn{RAN_CONN_S_NEW}: state_chg to RAN_CONN_S_RELEASING
 DREF unknown: MSC conn use + release == 2 (0x101: compl_l3,release)
-- BSSAP Clear --RAN_GERAN_A--> MS
+- BSSAP Clear --GERAN-A--> MS
 DREF unknown: MSC conn use - compl_l3 == 1 (0x100: release)
   bssap_clear_sent == 1
 - BSS sends BSSMAP Clear Complete
@@ -1955,7 +1955,7 @@ talloc_total_blocks(tall_bsc_ctx) == 13
 
 ===== test_no_authen_imeisv_tmsi_imei
 - Location Update request causes an IMEISV ID request back to the MS
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -1973,8 +1973,8 @@ DVLR New subscr, IMSI: 901700000004620
 DREF VLR subscr IMSI-901700000004620 usage increases to: 2
 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_NEW}: Updated ID
 DREF VLR subscr IMSI-901700000004620 usage decreases to: 1
-DMSC msc_tx 3 bytes to IMSI-901700000004620 via RAN_GERAN_A
-- DTAP --RAN_GERAN_A--> MS: GSM48_MT_MM_ID_REQ: 051803
+DMSC msc_tx 3 bytes to IMSI-901700000004620 via GERAN-A
+- DTAP --GERAN-A--> MS: GSM48_MT_MM_ID_REQ: 051803
 - DTAP matches expected message
 DVLR vlr_lu_fsm(GERAN-A-0_IMSI-901700000004620_LU){VLR_ULA_S_IDLE}: state_chg to VLR_ULA_S_WAIT_IMEISV
 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_NEW}: Received Event RAN_CONN_E_COMPLETE_LAYER_3
@@ -1983,7 +1983,7 @@ DREF IMSI-901700000004620: MSC conn use - compl_l3 == 0 (0x0: )
 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_AUTH_CIPH}: Received Event RAN_CONN_E_UNUSED
 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_AUTH_CIPH}: Awaiting results for Auth+Ciph, overruling event RAN_CONN_E_UNUSED
 - MS replies with an Identity Response, causes LU to commence with a GSUP LU request to HLR
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_ID_RESP
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_ID_RESP
 DREF IMSI-901700000004620: MSC conn use + dtap == 1 (0x2: dtap)
 DRLL Dispatching 04.08 message GSM48_MT_MM_ID_RESP (0x5:0x19)
 DMM IDENTITY RESPONSE: MI(IMEI-SV)=4234234234234275
@@ -2051,8 +2051,8 @@ DVLR lu_compl_vlr_fsm(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_LU){LU_COMPL_V
 DVLR lu_compl_vlr_fsm(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_LU){LU_COMPL_VLR_S_INIT}: state_chg to LU_COMPL_VLR_S_WAIT_SUB_PRES
 DVLR lu_compl_vlr_fsm(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_LU){LU_COMPL_VLR_S_WAIT_SUB_PRES}: Received Event LU_COMPL_VLR_E_SUB_PRES_COMPL
 DVLR lu_compl_vlr_fsm(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_LU){LU_COMPL_VLR_S_WAIT_SUB_PRES}: state_chg to LU_COMPL_VLR_S_WAIT_IMEI_TMSI
-DMSC msc_tx 3 bytes to IMSI-901700000004620_MSISDN-46071 via RAN_GERAN_A
-- DTAP --RAN_GERAN_A--> MS: GSM48_MT_MM_ID_REQ: 051802
+DMSC msc_tx 3 bytes to IMSI-901700000004620_MSISDN-46071 via GERAN-A
+- DTAP --GERAN-A--> MS: GSM48_MT_MM_ID_REQ: 051802
 - DTAP matches expected message
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage decreases to: 1
 <-- GSUP rx OSMO_GSUP_MSGT_UPDATE_LOCATION_RESULT: vlr_gsupc_read_cb() returns 0
@@ -2072,7 +2072,7 @@ DRLL subscr IMSI-901700000004620_MSISDN-46071: Message not permitted for initial
 DRLL Dispatching 04.08 message SMS:0x01 (0x9:0x1)
 DRLL subscr IMSI-901700000004620_MSISDN-46071: Message not permitted for initial conn: SMS:0x01
 - MS replies with an Identity Response
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_ID_RESP
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_ID_RESP
 DREF IMSI-901700000004620_MSISDN-46071: MSC conn use + dtap == 1 (0x2: dtap)
 DRLL Dispatching 04.08 message GSM48_MT_MM_ID_RESP (0x5:0x19)
 DMM IDENTITY RESPONSE: MI(IMEI)=423423423423420
@@ -2099,7 +2099,7 @@ DRLL subscr IMSI-901700000004620_MSISDN-46071: Message not permitted for initial
 DRLL Dispatching 04.08 message SMS:0x01 (0x9:0x1)
 DRLL subscr IMSI-901700000004620_MSISDN-46071: Message not permitted for initial conn: SMS:0x01
 - MS sends TMSI Realloc Complete
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_TMSI_REALL_COMPL
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_TMSI_REALL_COMPL
 DREF IMSI-901700000004620_MSISDN-46071: MSC conn use + dtap == 1 (0x2: dtap)
 DRLL Dispatching 04.08 message GSM48_MT_MM_TMSI_REALL_COMPL (0x5:0x1b)
 DMM TMSI Reallocation Completed. Subscriber: IMSI-901700000004620_MSISDN-46071
@@ -2120,7 +2120,7 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_LU){RAN_CONN_S_ACCEPTED
 DREF IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100: MSC conn use + release == 2 (0x102: dtap,release)
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100 usage increases to: 3
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100 usage decreases to: 2
-- BSSAP Clear --RAN_GERAN_A--> MS
+- BSSAP Clear --GERAN-A--> MS
 DREF IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100: MSC conn use - dtap == 1 (0x100: release)
   bssap_clear_sent == 1
 - LU was successful, and the conn has already been closed
@@ -2148,7 +2148,7 @@ DREF VLR subscr IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100 usage increase
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100 usage decreases to: 1
 ---
 - subscriber detaches
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_IMSI_DETACH_IND
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_IMSI_DETACH_IND
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -2164,7 +2164,7 @@ DREF freeing VLR subscr IMSI-901700000004620_MSISDN-46071_TMSI-0x03020100
 DMM RAN_conn{RAN_CONN_S_NEW}: Received Event RAN_CONN_E_CN_CLOSE
 DMM RAN_conn{RAN_CONN_S_NEW}: state_chg to RAN_CONN_S_RELEASING
 DREF unknown: MSC conn use + release == 2 (0x101: compl_l3,release)
-- BSSAP Clear --RAN_GERAN_A--> MS
+- BSSAP Clear --GERAN-A--> MS
 DREF unknown: MSC conn use - compl_l3 == 1 (0x100: release)
   bssap_clear_sent == 1
 - BSS sends BSSMAP Clear Complete
@@ -2185,7 +2185,7 @@ talloc_total_blocks(tall_bsc_ctx) == 13
 - Total time passed: 0.000000 s
 - Total time passed: 61.000000 s
 - Location Update request causes a GSUP LU request to HLR
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -2266,7 +2266,7 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_LU){RAN_CONN_S_ACCEPTED
 DREF IMSI-901700000004620_MSISDN-46071: MSC conn use + release == 1 (0x100: release)
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage increases to: 4
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage decreases to: 3
-- BSSAP Clear --RAN_GERAN_A--> MS
+- BSSAP Clear --GERAN-A--> MS
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage decreases to: 2
 <-- GSUP rx OSMO_GSUP_MSGT_UPDATE_LOCATION_RESULT: vlr_gsupc_read_cb() returns 0
 - LU was successful, and the conn has already been closed
diff --git a/tests/msc_vlr/msc_vlr_test_reject_concurrency.c b/tests/msc_vlr/msc_vlr_test_reject_concurrency.c
index fcc8db7da..66d2e392c 100644
--- a/tests/msc_vlr/msc_vlr_test_reject_concurrency.c
+++ b/tests/msc_vlr/msc_vlr_test_reject_concurrency.c
@@ -315,8 +315,8 @@ static void test_reject_paging_resp_during_cm()
 	BTW("The original CM Service Request can conclude");
 
 	/* Release connection */
-	expect_bssap_clear(RAN_GERAN_A);
-	conn_conclude_cm_service_req(g_conn, RAN_GERAN_A);
+	expect_bssap_clear(OSMO_RAT_GERAN_A);
+	conn_conclude_cm_service_req(g_conn, OSMO_RAT_GERAN_A);
 
 	btw("all requests serviced, conn has been released");
 	bss_sends_clear_complete();
diff --git a/tests/msc_vlr/msc_vlr_test_reject_concurrency.err b/tests/msc_vlr/msc_vlr_test_reject_concurrency.err
index b862e72b8..3d428aaa2 100644
--- a/tests/msc_vlr/msc_vlr_test_reject_concurrency.err
+++ b/tests/msc_vlr/msc_vlr_test_reject_concurrency.err
@@ -3,7 +3,7 @@ talloc_total_blocks(tall_bsc_ctx) == 13
 
 ===== test_reject_2nd_conn
 - Location Update Request on one connection
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -40,7 +40,7 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_AUTH_CIPH}: Awaiting
   lu_result_sent == 0
   llist_count(&net->ran_conns) == 1
 - Another Location Update Request from the same subscriber on another connection is rejected
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -59,7 +59,7 @@ DVLR vlr_lu_fsm(GERAN-A-0_unknown_LU){VLR_ULA_S_IDLE}: state_chg to VLR_ULA_S_DO
 DMM RAN_conn(GERAN-A-0_unknown_LU){RAN_CONN_S_NEW}: Received Event RAN_CONN_E_CN_CLOSE
 DMM RAN_conn(GERAN-A-0_unknown_LU){RAN_CONN_S_NEW}: state_chg to RAN_CONN_S_RELEASING
 DREF unknown: MSC conn use + release == 2 (0x101: compl_l3,release)
-- BSSAP Clear --RAN_GERAN_A--> MS
+- BSSAP Clear --GERAN-A--> MS
 DREF VLR subscr IMSI-901700000004620 usage decreases to: 1
 DRR 901700000004620: internal error during Location Updating attempt
 DREF unknown: MSC conn use - compl_l3 == 1 (0x100: release)
@@ -127,7 +127,7 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_LU){RAN_CONN_S_ACCEPTED
 DREF IMSI-901700000004620_MSISDN-46071: MSC conn use + release == 1 (0x100: release)
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage increases to: 4
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage decreases to: 3
-- BSSAP Clear --RAN_GERAN_A--> MS
+- BSSAP Clear --GERAN-A--> MS
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage decreases to: 2
 <-- GSUP rx OSMO_GSUP_MSGT_UPDATE_LOCATION_RESULT: vlr_gsupc_read_cb() returns 0
   bssap_clear_sent == 1
@@ -156,7 +156,7 @@ talloc_total_blocks(tall_bsc_ctx) == 13
 
 ===== test_reject_lu_during_lu
 - Location Update Request
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -194,7 +194,7 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_AUTH_CIPH}: Awaiting
   llist_count(&net->ran_conns) == 1
 ---
 - Another Location Update Request from the same subscriber on the same conn is dropped silently
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
 DREF IMSI-901700000004620: MSC conn use + dtap == 1 (0x2: dtap)
 DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8)
 DMM Cannot accept another LU, conn already busy establishing authenticity; extraneous LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH
@@ -251,7 +251,7 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_LU){RAN_CONN_S_ACCEPTED
 DREF IMSI-901700000004620_MSISDN-46071: MSC conn use + release == 1 (0x100: release)
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage increases to: 4
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage decreases to: 3
-- BSSAP Clear --RAN_GERAN_A--> MS
+- BSSAP Clear --GERAN-A--> MS
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage decreases to: 2
 <-- GSUP rx OSMO_GSUP_MSGT_UPDATE_LOCATION_RESULT: vlr_gsupc_read_cb() returns 0
   bssap_clear_sent == 1
@@ -280,7 +280,7 @@ talloc_total_blocks(tall_bsc_ctx) == 13
 
 ===== test_reject_cm_during_lu
 - Location Update Request
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -318,14 +318,14 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_AUTH_CIPH}: Awaiting
   llist_count(&net->ran_conns) == 1
 ---
 - A CM Service Request in the middle of a LU is rejected
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_CM_SERV_REQ
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_CM_SERV_REQ
 DREF IMSI-901700000004620: MSC conn use + dtap == 1 (0x2: dtap)
 DRLL Dispatching 04.08 message GSM48_MT_MM_CM_SERV_REQ (0x5:0x24)
 DMM <- CM SERVICE REQUEST serv_type=0x08 MI(IMSI)=901700000004620
 DMM Cannot accept CM Service Request, conn already busy establishing authenticity
 DMM -> CM SERVICE Reject cause: 22
-DMSC msc_tx 3 bytes to IMSI-901700000004620 via RAN_GERAN_A
-- DTAP --RAN_GERAN_A--> MS: GSM48_MT_MM_CM_SERV_REJ: 052216
+DMSC msc_tx 3 bytes to IMSI-901700000004620 via GERAN-A
+- DTAP --GERAN-A--> MS: GSM48_MT_MM_CM_SERV_REJ: 052216
 - DTAP matches expected message
 DREF IMSI-901700000004620: MSC conn use - dtap == 0 (0x0: )
 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_AUTH_CIPH}: Received Event RAN_CONN_E_UNUSED
@@ -382,7 +382,7 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_LU){RAN_CONN_S_ACCEPTED
 DREF IMSI-901700000004620_MSISDN-46071: MSC conn use + release == 1 (0x100: release)
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage increases to: 4
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage decreases to: 3
-- BSSAP Clear --RAN_GERAN_A--> MS
+- BSSAP Clear --GERAN-A--> MS
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage decreases to: 2
 <-- GSUP rx OSMO_GSUP_MSGT_UPDATE_LOCATION_RESULT: vlr_gsupc_read_cb() returns 0
   bssap_clear_sent == 1
@@ -411,7 +411,7 @@ talloc_total_blocks(tall_bsc_ctx) == 13
 
 ===== test_reject_paging_resp_during_lu
 - Location Update Request
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -449,7 +449,7 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_AUTH_CIPH}: Awaiting
   llist_count(&net->ran_conns) == 1
 ---
 - An erratic Paging Response is dropped silently
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_RR_PAG_RESP
+  MSC <--GERAN-A-- MS: GSM48_MT_RR_PAG_RESP
 DREF IMSI-901700000004620: MSC conn use + dtap == 1 (0x2: dtap)
 DRLL Dispatching 04.08 message GSM48_MT_RR_PAG_RESP (0x6:0x27)
 DMM Ignoring Paging Response, conn already busy establishing authenticity
@@ -506,7 +506,7 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_LU){RAN_CONN_S_ACCEPTED
 DREF IMSI-901700000004620_MSISDN-46071: MSC conn use + release == 1 (0x100: release)
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage increases to: 4
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage decreases to: 3
-- BSSAP Clear --RAN_GERAN_A--> MS
+- BSSAP Clear --GERAN-A--> MS
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage decreases to: 2
 <-- GSUP rx OSMO_GSUP_MSGT_UPDATE_LOCATION_RESULT: vlr_gsupc_read_cb() returns 0
   bssap_clear_sent == 1
@@ -537,7 +537,7 @@ talloc_total_blocks(tall_bsc_ctx) == 13
 ---
 - Subscriber does a normal LU
 - Location Update Request
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -619,7 +619,7 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_LU){RAN_CONN_S_ACCEPTED
 DREF IMSI-901700000004620_MSISDN-46071: MSC conn use + release == 1 (0x100: release)
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage increases to: 4
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage decreases to: 3
-- BSSAP Clear --RAN_GERAN_A--> MS
+- BSSAP Clear --GERAN-A--> MS
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage decreases to: 2
 <-- GSUP rx OSMO_GSUP_MSGT_UPDATE_LOCATION_RESULT: vlr_gsupc_read_cb() returns 0
   bssap_clear_sent == 1
@@ -642,7 +642,7 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_LU){RAN_CONN_S_RELEASED
   llist_count(&net->ran_conns) == 0
 ---
 - Subscriber does a normal CM Service Request
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_CM_SERV_REQ
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_CM_SERV_REQ
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -677,7 +677,7 @@ DREF IMSI-901700000004620_MSISDN-46071: MSC conn use - compl_l3 == 1 (0x8: cm_se
   cm_service_result_sent == 1
 ran_conn_is_accepted() == true
 - A LU request on an open conn is dropped silently
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
 DREF IMSI-901700000004620_MSISDN-46071: MSC conn use + dtap == 2 (0xa: dtap,cm_service)
 DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8)
 DMM Cannot accept another LU, conn already established; extraneous LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH
@@ -686,7 +686,7 @@ DREF IMSI-901700000004620_MSISDN-46071: MSC conn use - dtap == 1 (0x8: cm_servic
   llist_count(&net->ran_conns) == 1
 ---
 - subscriber detaches
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_IMSI_DETACH_IND
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_IMSI_DETACH_IND
 DREF IMSI-901700000004620_MSISDN-46071: MSC conn use + dtap == 2 (0xa: dtap,cm_service)
 DRLL Dispatching 04.08 message GSM48_MT_MM_IMSI_DETACH_IND (0x5:0x1)
 DMM IMSI DETACH INDICATION: MI(IMSI)=901700000004620
@@ -702,7 +702,7 @@ DREF IMSI-901700000004620_MSISDN-46071: MSC conn use + release == 3 (0x10a: dtap
 DREF IMSI-901700000004620_MSISDN-46071: MSC conn use - cm_service == 2 (0x102: dtap,release)
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage increases to: 2
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage decreases to: 1
-- BSSAP Clear --RAN_GERAN_A--> MS
+- BSSAP Clear --GERAN-A--> MS
 DREF IMSI-901700000004620_MSISDN-46071: MSC conn use - dtap == 1 (0x100: release)
   bssap_clear_sent == 1
 - BSS sends BSSMAP Clear Complete
@@ -729,7 +729,7 @@ talloc_total_blocks(tall_bsc_ctx) == 13
 ---
 - Subscriber does a normal LU
 - Location Update Request
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -811,7 +811,7 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_LU){RAN_CONN_S_ACCEPTED
 DREF IMSI-901700000004620_MSISDN-46071: MSC conn use + release == 1 (0x100: release)
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage increases to: 4
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage decreases to: 3
-- BSSAP Clear --RAN_GERAN_A--> MS
+- BSSAP Clear --GERAN-A--> MS
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage decreases to: 2
 <-- GSUP rx OSMO_GSUP_MSGT_UPDATE_LOCATION_RESULT: vlr_gsupc_read_cb() returns 0
   bssap_clear_sent == 1
@@ -834,7 +834,7 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_LU){RAN_CONN_S_RELEASED
   llist_count(&net->ran_conns) == 0
 ---
 - Subscriber does a normal CM Service Request
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_CM_SERV_REQ
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_CM_SERV_REQ
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -869,7 +869,7 @@ DREF IMSI-901700000004620_MSISDN-46071: MSC conn use - compl_l3 == 1 (0x8: cm_se
   cm_service_result_sent == 1
 ran_conn_is_accepted() == true
 - A second CM Service Request on the same conn is accepted without another auth dance
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_CM_SERV_REQ
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_CM_SERV_REQ
 DREF IMSI-901700000004620_MSISDN-46071: MSC conn use + dtap == 2 (0xa: dtap,cm_service)
 DRLL Dispatching 04.08 message GSM48_MT_MM_CM_SERV_REQ (0x5:0x24)
 DMM <- CM SERVICE REQUEST serv_type=0x08 MI(IMSI)=901700000004620
@@ -881,7 +881,7 @@ DREF IMSI-901700000004620_MSISDN-46071: MSC conn use - dtap == 1 (0x8: cm_servic
   llist_count(&net->ran_conns) == 1
 ---
 - subscriber detaches
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_IMSI_DETACH_IND
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_IMSI_DETACH_IND
 DREF IMSI-901700000004620_MSISDN-46071: MSC conn use + dtap == 2 (0xa: dtap,cm_service)
 DRLL Dispatching 04.08 message GSM48_MT_MM_IMSI_DETACH_IND (0x5:0x1)
 DMM IMSI DETACH INDICATION: MI(IMSI)=901700000004620
@@ -897,7 +897,7 @@ DREF IMSI-901700000004620_MSISDN-46071: MSC conn use + release == 3 (0x10a: dtap
 DREF IMSI-901700000004620_MSISDN-46071: MSC conn use - cm_service == 2 (0x102: dtap,release)
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage increases to: 2
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage decreases to: 1
-- BSSAP Clear --RAN_GERAN_A--> MS
+- BSSAP Clear --GERAN-A--> MS
 DREF IMSI-901700000004620_MSISDN-46071: MSC conn use - dtap == 1 (0x100: release)
   bssap_clear_sent == 1
 - BSS sends BSSMAP Clear Complete
@@ -924,7 +924,7 @@ talloc_total_blocks(tall_bsc_ctx) == 13
 ---
 - Subscriber does a normal LU
 - Location Update Request
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -1006,7 +1006,7 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_LU){RAN_CONN_S_ACCEPTED
 DREF IMSI-901700000004620_MSISDN-46071: MSC conn use + release == 1 (0x100: release)
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage increases to: 4
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage decreases to: 3
-- BSSAP Clear --RAN_GERAN_A--> MS
+- BSSAP Clear --GERAN-A--> MS
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage decreases to: 2
 <-- GSUP rx OSMO_GSUP_MSGT_UPDATE_LOCATION_RESULT: vlr_gsupc_read_cb() returns 0
   bssap_clear_sent == 1
@@ -1029,7 +1029,7 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_LU){RAN_CONN_S_RELEASED
   llist_count(&net->ran_conns) == 0
 ---
 - Subscriber does a normal CM Service Request
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_CM_SERV_REQ
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_CM_SERV_REQ
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -1065,7 +1065,7 @@ DREF IMSI-901700000004620_MSISDN-46071: MSC conn use - compl_l3 == 1 (0x8: cm_se
 ran_conn_is_accepted() == true
 ---
 - An erratic Paging Response on the same conn is dropped silently
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_RR_PAG_RESP
+  MSC <--GERAN-A-- MS: GSM48_MT_RR_PAG_RESP
 DREF IMSI-901700000004620_MSISDN-46071: MSC conn use + dtap == 2 (0xa: dtap,cm_service)
 DRLL Dispatching 04.08 message GSM48_MT_RR_PAG_RESP (0x6:0x27)
 DMM Ignoring Paging Response, conn already established
@@ -1080,7 +1080,7 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_CM_SERVICE_REQ){RAN_CON
 DREF IMSI-901700000004620_MSISDN-46071: MSC conn use + release == 1 (0x100: release)
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage increases to: 3
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage decreases to: 2
-- BSSAP Clear --RAN_GERAN_A--> MS
+- BSSAP Clear --GERAN-A--> MS
   bssap_clear_sent == 1
 - all requests serviced, conn has been released
 - BSS sends BSSMAP Clear Complete
@@ -1107,7 +1107,7 @@ talloc_total_blocks(tall_bsc_ctx) == 13
 ---
 - Subscriber does a normal LU
 - Location Update Request
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -1189,7 +1189,7 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_LU){RAN_CONN_S_ACCEPTED
 DREF IMSI-901700000004620_MSISDN-46071: MSC conn use + release == 1 (0x100: release)
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage increases to: 4
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage decreases to: 3
-- BSSAP Clear --RAN_GERAN_A--> MS
+- BSSAP Clear --GERAN-A--> MS
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage decreases to: 2
 <-- GSUP rx OSMO_GSUP_MSGT_UPDATE_LOCATION_RESULT: vlr_gsupc_read_cb() returns 0
   bssap_clear_sent == 1
@@ -1218,7 +1218,7 @@ DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage increases to: 3
 DCC (ti 00 sub IMSI-901700000004620_MSISDN-46071 callref 40000001) New transaction
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage increases to: 4
 DMM Subscriber IMSI-901700000004620_MSISDN-46071 not paged yet, start paging.
-  RAN_GERAN_A sends out paging request to IMSI 901700000004620, TMSI 0xffffffff, LAC 23
+  GERAN-A sends out paging request to IMSI 901700000004620, TMSI 0xffffffff, LAC 23
   strcmp(paging_expecting_imsi, imsi) == 0
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage increases to: 5
   llist_count(&vsub->cs.requests) == 1
@@ -1226,7 +1226,7 @@ DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage decreases to: 4
   paging_sent == 1
   paging_stopped == 0
 - MS replies with Paging Response, we deliver the SMS
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_RR_PAG_RESP
+  MSC <--GERAN-A-- MS: GSM48_MT_RR_PAG_RESP
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -1254,8 +1254,8 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_PAGING_RESP){RAN_CONN_S
 DPAG Paging success for IMSI-901700000004620_MSISDN-46071 (event=0)
 DPAG Calling paging cbfn.
 DREF IMSI-901700000004620_MSISDN-46071: MSC conn use + trans_sms == 2 (0x21: compl_l3,trans_sms)
-DMSC msc_tx 91 bytes to IMSI-901700000004620_MSISDN-46071 via RAN_GERAN_A
-- DTAP --RAN_GERAN_A--> MS: SMS:0x01: 09015801000791447758100650004c0005806470f1000007101000000000445079da1e1ee7416937485e9ea7c965373d1d6683c270383b3d0ed3d36ff71c949e83c22072799e9687c5ec32a81d96afcbf4b4fb0c7ac3e9e9b7db05
+DMSC msc_tx 91 bytes to IMSI-901700000004620_MSISDN-46071 via GERAN-A
+- DTAP --GERAN-A--> MS: SMS:0x01: 09015801000791447758100650004c0005806470f1000007101000000000445079da1e1ee7416937485e9ea7c965373d1d6683c270383b3d0ed3d36ff71c949e83c22072799e9687c5ec32a81d96afcbf4b4fb0c7ac3e9e9b7db05
 - DTAP matches expected message
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage decreases to: 5
 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_PAGING_RESP){RAN_CONN_S_NEW}: state_chg to RAN_CONN_S_ACCEPTED
@@ -1269,7 +1269,7 @@ DREF IMSI-901700000004620_MSISDN-46071: MSC conn use - compl_l3 == 1 (0x20: tran
   llist_count(&net->ran_conns) == 1
 ---
 - MS sends erratic LU Request, which is dropped silently
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
 DREF IMSI-901700000004620_MSISDN-46071: MSC conn use + dtap == 2 (0x22: dtap,trans_sms)
 DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8)
 DMM Cannot accept another LU, conn already established; extraneous LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH
@@ -1277,7 +1277,7 @@ DREF IMSI-901700000004620_MSISDN-46071: MSC conn use - dtap == 1 (0x20: trans_sm
   lu_result_sent == 0
   llist_count(&net->ran_conns) == 1
 - MS replies with CP-ACK for received SMS
-  MSC <--RAN_GERAN_A-- MS: SMS:0x04
+  MSC <--GERAN-A-- MS: SMS:0x04
 DREF IMSI-901700000004620_MSISDN-46071: MSC conn use + dtap == 2 (0x22: dtap,trans_sms)
 DRLL Dispatching 04.08 message SMS:0x04 (0x9:0x4)
 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_PAGING_RESP){RAN_CONN_S_ACCEPTED}: Received Event RAN_CONN_E_COMMUNICATING
@@ -1285,12 +1285,12 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_PAGING_RESP){RAN_CONN_S
 DREF IMSI-901700000004620_MSISDN-46071: MSC conn use - dtap == 1 (0x20: trans_sms)
   llist_count(&net->ran_conns) == 1
 - MS also sends RP-ACK, MSC in turn sends CP-ACK for that
-  MSC <--RAN_GERAN_A-- MS: SMS:0x01
+  MSC <--GERAN-A-- MS: SMS:0x01
 DREF IMSI-901700000004620_MSISDN-46071: MSC conn use + dtap == 2 (0x22: dtap,trans_sms)
 DRLL Dispatching 04.08 message SMS:0x01 (0x9:0x1)
 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_PAGING_RESP){RAN_CONN_S_COMMUNICATING}: Received Event RAN_CONN_E_COMMUNICATING
-DMSC msc_tx 2 bytes to IMSI-901700000004620_MSISDN-46071 via RAN_GERAN_A
-- DTAP --RAN_GERAN_A--> MS: SMS:0x04: 0904
+DMSC msc_tx 2 bytes to IMSI-901700000004620_MSISDN-46071 via GERAN-A
+- DTAP --GERAN-A--> MS: SMS:0x04: 0904
 - DTAP matches expected message
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage decreases to: 3
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage decreases to: 2
@@ -1301,7 +1301,7 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_PAGING_RESP){RAN_CONN_S
 DREF IMSI-901700000004620_MSISDN-46071: MSC conn use + release == 1 (0x100: release)
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage increases to: 3
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage decreases to: 2
-- BSSAP Clear --RAN_GERAN_A--> MS
+- BSSAP Clear --GERAN-A--> MS
   dtap_tx_confirmed == 1
   bssap_clear_sent == 1
 - BSS sends BSSMAP Clear Complete
@@ -1329,7 +1329,7 @@ talloc_total_blocks(tall_bsc_ctx) == 13
 ---
 - Subscriber does a normal LU
 - Location Update Request
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -1411,7 +1411,7 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_LU){RAN_CONN_S_ACCEPTED
 DREF IMSI-901700000004620_MSISDN-46071: MSC conn use + release == 1 (0x100: release)
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage increases to: 4
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage decreases to: 3
-- BSSAP Clear --RAN_GERAN_A--> MS
+- BSSAP Clear --GERAN-A--> MS
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage decreases to: 2
 <-- GSUP rx OSMO_GSUP_MSGT_UPDATE_LOCATION_RESULT: vlr_gsupc_read_cb() returns 0
   bssap_clear_sent == 1
@@ -1440,7 +1440,7 @@ DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage increases to: 3
 DCC (ti 00 sub IMSI-901700000004620_MSISDN-46071 callref 40000002) New transaction
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage increases to: 4
 DMM Subscriber IMSI-901700000004620_MSISDN-46071 not paged yet, start paging.
-  RAN_GERAN_A sends out paging request to IMSI 901700000004620, TMSI 0xffffffff, LAC 23
+  GERAN-A sends out paging request to IMSI 901700000004620, TMSI 0xffffffff, LAC 23
   strcmp(paging_expecting_imsi, imsi) == 0
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage increases to: 5
   llist_count(&vsub->cs.requests) == 1
@@ -1448,7 +1448,7 @@ DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage decreases to: 4
   paging_sent == 1
   paging_stopped == 0
 - MS replies with Paging Response, we deliver the SMS
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_RR_PAG_RESP
+  MSC <--GERAN-A-- MS: GSM48_MT_RR_PAG_RESP
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -1476,8 +1476,8 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_PAGING_RESP){RAN_CONN_S
 DPAG Paging success for IMSI-901700000004620_MSISDN-46071 (event=0)
 DPAG Calling paging cbfn.
 DREF IMSI-901700000004620_MSISDN-46071: MSC conn use + trans_sms == 2 (0x21: compl_l3,trans_sms)
-DMSC msc_tx 91 bytes to IMSI-901700000004620_MSISDN-46071 via RAN_GERAN_A
-- DTAP --RAN_GERAN_A--> MS: SMS:0x01: 09015801000791447758100650004c0005806470f1000007101000000000445079da1e1ee7416937485e9ea7c965373d1d6683c270383b3d0ed3d36ff71c949e83c22072799e9687c5ec32a81d96afcbf4b4fb0c7ac3e9e9b7db05
+DMSC msc_tx 91 bytes to IMSI-901700000004620_MSISDN-46071 via GERAN-A
+- DTAP --GERAN-A--> MS: SMS:0x01: 09015801000791447758100650004c0005806470f1000007101000000000445079da1e1ee7416937485e9ea7c965373d1d6683c270383b3d0ed3d36ff71c949e83c22072799e9687c5ec32a81d96afcbf4b4fb0c7ac3e9e9b7db05
 - DTAP matches expected message
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage decreases to: 5
 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_PAGING_RESP){RAN_CONN_S_NEW}: state_chg to RAN_CONN_S_ACCEPTED
@@ -1491,7 +1491,7 @@ DREF IMSI-901700000004620_MSISDN-46071: MSC conn use - compl_l3 == 1 (0x20: tran
   llist_count(&net->ran_conns) == 1
 ---
 - CM Service Request during open connection is accepted
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_CM_SERV_REQ
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_CM_SERV_REQ
 DREF IMSI-901700000004620_MSISDN-46071: MSC conn use + dtap == 2 (0x22: dtap,trans_sms)
 DRLL Dispatching 04.08 message GSM48_MT_MM_CM_SERV_REQ (0x5:0x24)
 DMM <- CM SERVICE REQUEST serv_type=0x08 MI(IMSI)=901700000004620
@@ -1504,7 +1504,7 @@ DREF IMSI-901700000004620_MSISDN-46071: MSC conn use - dtap == 2 (0x28: cm_servi
   llist_count(&net->ran_conns) == 1
   g_conn->received_cm_service_request == 1
 - MS replies with CP-ACK for received SMS
-  MSC <--RAN_GERAN_A-- MS: SMS:0x04
+  MSC <--GERAN-A-- MS: SMS:0x04
 DREF IMSI-901700000004620_MSISDN-46071: MSC conn use + dtap == 3 (0x2a: dtap,cm_service,trans_sms)
 DRLL Dispatching 04.08 message SMS:0x04 (0x9:0x4)
 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_PAGING_RESP){RAN_CONN_S_ACCEPTED}: Received Event RAN_CONN_E_COMMUNICATING
@@ -1512,12 +1512,12 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_PAGING_RESP){RAN_CONN_S
 DREF IMSI-901700000004620_MSISDN-46071: MSC conn use - dtap == 2 (0x28: cm_service,trans_sms)
   llist_count(&net->ran_conns) == 1
 - MS also sends RP-ACK, MSC in turn sends CP-ACK for that
-  MSC <--RAN_GERAN_A-- MS: SMS:0x01
+  MSC <--GERAN-A-- MS: SMS:0x01
 DREF IMSI-901700000004620_MSISDN-46071: MSC conn use + dtap == 3 (0x2a: dtap,cm_service,trans_sms)
 DRLL Dispatching 04.08 message SMS:0x01 (0x9:0x1)
 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_PAGING_RESP){RAN_CONN_S_COMMUNICATING}: Received Event RAN_CONN_E_COMMUNICATING
-DMSC msc_tx 2 bytes to IMSI-901700000004620_MSISDN-46071 via RAN_GERAN_A
-- DTAP --RAN_GERAN_A--> MS: SMS:0x04: 0904
+DMSC msc_tx 2 bytes to IMSI-901700000004620_MSISDN-46071 via GERAN-A
+- DTAP --GERAN-A--> MS: SMS:0x04: 0904
 - DTAP matches expected message
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage decreases to: 3
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage decreases to: 2
@@ -1528,7 +1528,7 @@ DREF IMSI-901700000004620_MSISDN-46071: MSC conn use - dtap == 1 (0x8: cm_servic
   llist_count(&net->ran_conns) == 1
 ---
 - subscriber detaches
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_IMSI_DETACH_IND
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_IMSI_DETACH_IND
 DREF IMSI-901700000004620_MSISDN-46071: MSC conn use + dtap == 2 (0xa: dtap,cm_service)
 DRLL Dispatching 04.08 message GSM48_MT_MM_IMSI_DETACH_IND (0x5:0x1)
 DMM IMSI DETACH INDICATION: MI(IMSI)=901700000004620
@@ -1544,7 +1544,7 @@ DREF IMSI-901700000004620_MSISDN-46071: MSC conn use + release == 3 (0x10a: dtap
 DREF IMSI-901700000004620_MSISDN-46071: MSC conn use - cm_service == 2 (0x102: dtap,release)
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage increases to: 2
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage decreases to: 1
-- BSSAP Clear --RAN_GERAN_A--> MS
+- BSSAP Clear --GERAN-A--> MS
 DREF IMSI-901700000004620_MSISDN-46071: MSC conn use - dtap == 1 (0x100: release)
   bssap_clear_sent == 1
 - BSS sends BSSMAP Clear Complete
@@ -1571,7 +1571,7 @@ talloc_total_blocks(tall_bsc_ctx) == 13
 ---
 - Subscriber does a normal LU
 - Location Update Request
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -1653,7 +1653,7 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_LU){RAN_CONN_S_ACCEPTED
 DREF IMSI-901700000004620_MSISDN-46071: MSC conn use + release == 1 (0x100: release)
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage increases to: 4
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage decreases to: 3
-- BSSAP Clear --RAN_GERAN_A--> MS
+- BSSAP Clear --GERAN-A--> MS
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage decreases to: 2
 <-- GSUP rx OSMO_GSUP_MSGT_UPDATE_LOCATION_RESULT: vlr_gsupc_read_cb() returns 0
   bssap_clear_sent == 1
@@ -1682,7 +1682,7 @@ DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage increases to: 3
 DCC (ti 00 sub IMSI-901700000004620_MSISDN-46071 callref 40000003) New transaction
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage increases to: 4
 DMM Subscriber IMSI-901700000004620_MSISDN-46071 not paged yet, start paging.
-  RAN_GERAN_A sends out paging request to IMSI 901700000004620, TMSI 0xffffffff, LAC 23
+  GERAN-A sends out paging request to IMSI 901700000004620, TMSI 0xffffffff, LAC 23
   strcmp(paging_expecting_imsi, imsi) == 0
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage increases to: 5
   llist_count(&vsub->cs.requests) == 1
@@ -1690,7 +1690,7 @@ DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage decreases to: 4
   paging_sent == 1
   paging_stopped == 0
 - MS replies with Paging Response, we deliver the SMS
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_RR_PAG_RESP
+  MSC <--GERAN-A-- MS: GSM48_MT_RR_PAG_RESP
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -1718,8 +1718,8 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_PAGING_RESP){RAN_CONN_S
 DPAG Paging success for IMSI-901700000004620_MSISDN-46071 (event=0)
 DPAG Calling paging cbfn.
 DREF IMSI-901700000004620_MSISDN-46071: MSC conn use + trans_sms == 2 (0x21: compl_l3,trans_sms)
-DMSC msc_tx 91 bytes to IMSI-901700000004620_MSISDN-46071 via RAN_GERAN_A
-- DTAP --RAN_GERAN_A--> MS: SMS:0x01: 09015801000791447758100650004c0005806470f1000007101000000000445079da1e1ee7416937485e9ea7c965373d1d6683c270383b3d0ed3d36ff71c949e83c22072799e9687c5ec32a81d96afcbf4b4fb0c7ac3e9e9b7db05
+DMSC msc_tx 91 bytes to IMSI-901700000004620_MSISDN-46071 via GERAN-A
+- DTAP --GERAN-A--> MS: SMS:0x01: 09015801000791447758100650004c0005806470f1000007101000000000445079da1e1ee7416937485e9ea7c965373d1d6683c270383b3d0ed3d36ff71c949e83c22072799e9687c5ec32a81d96afcbf4b4fb0c7ac3e9e9b7db05
 - DTAP matches expected message
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage decreases to: 5
 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_PAGING_RESP){RAN_CONN_S_NEW}: state_chg to RAN_CONN_S_ACCEPTED
@@ -1733,13 +1733,13 @@ DREF IMSI-901700000004620_MSISDN-46071: MSC conn use - compl_l3 == 1 (0x20: tran
   llist_count(&net->ran_conns) == 1
 ---
 - MS sends another erratic Paging Response which is dropped silently
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_RR_PAG_RESP
+  MSC <--GERAN-A-- MS: GSM48_MT_RR_PAG_RESP
 DREF IMSI-901700000004620_MSISDN-46071: MSC conn use + dtap == 2 (0x22: dtap,trans_sms)
 DRLL Dispatching 04.08 message GSM48_MT_RR_PAG_RESP (0x6:0x27)
 DMM Ignoring Paging Response, conn already established
 DREF IMSI-901700000004620_MSISDN-46071: MSC conn use - dtap == 1 (0x20: trans_sms)
 - MS replies with CP-ACK for received SMS
-  MSC <--RAN_GERAN_A-- MS: SMS:0x04
+  MSC <--GERAN-A-- MS: SMS:0x04
 DREF IMSI-901700000004620_MSISDN-46071: MSC conn use + dtap == 2 (0x22: dtap,trans_sms)
 DRLL Dispatching 04.08 message SMS:0x04 (0x9:0x4)
 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_PAGING_RESP){RAN_CONN_S_ACCEPTED}: Received Event RAN_CONN_E_COMMUNICATING
@@ -1747,12 +1747,12 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_PAGING_RESP){RAN_CONN_S
 DREF IMSI-901700000004620_MSISDN-46071: MSC conn use - dtap == 1 (0x20: trans_sms)
   llist_count(&net->ran_conns) == 1
 - MS also sends RP-ACK, MSC in turn sends CP-ACK for that
-  MSC <--RAN_GERAN_A-- MS: SMS:0x01
+  MSC <--GERAN-A-- MS: SMS:0x01
 DREF IMSI-901700000004620_MSISDN-46071: MSC conn use + dtap == 2 (0x22: dtap,trans_sms)
 DRLL Dispatching 04.08 message SMS:0x01 (0x9:0x1)
 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_PAGING_RESP){RAN_CONN_S_COMMUNICATING}: Received Event RAN_CONN_E_COMMUNICATING
-DMSC msc_tx 2 bytes to IMSI-901700000004620_MSISDN-46071 via RAN_GERAN_A
-- DTAP --RAN_GERAN_A--> MS: SMS:0x04: 0904
+DMSC msc_tx 2 bytes to IMSI-901700000004620_MSISDN-46071 via GERAN-A
+- DTAP --GERAN-A--> MS: SMS:0x04: 0904
 - DTAP matches expected message
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage decreases to: 3
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage decreases to: 2
@@ -1763,7 +1763,7 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_PAGING_RESP){RAN_CONN_S
 DREF IMSI-901700000004620_MSISDN-46071: MSC conn use + release == 1 (0x100: release)
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage increases to: 3
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage decreases to: 2
-- BSSAP Clear --RAN_GERAN_A--> MS
+- BSSAP Clear --GERAN-A--> MS
   dtap_tx_confirmed == 1
   bssap_clear_sent == 1
 - BSS sends BSSMAP Clear Complete
diff --git a/tests/msc_vlr/msc_vlr_test_rest.c b/tests/msc_vlr/msc_vlr_test_rest.c
index 501e3d33a..458738390 100644
--- a/tests/msc_vlr/msc_vlr_test_rest.c
+++ b/tests/msc_vlr/msc_vlr_test_rest.c
@@ -31,7 +31,7 @@ static void test_early_stage()
 	EXPECT_ACCEPTED(false);
 
 	btw("freshly allocated conn");
-	g_conn = ran_conn_alloc(net, RAN_GERAN_A, 123);
+	g_conn = ran_conn_alloc(net, OSMO_RAT_GERAN_A, 123);
 	EXPECT_ACCEPTED(false);
 
 	btw("conn_fsm present, in state NEW");
@@ -43,7 +43,7 @@ static void test_early_stage()
 
 	btw("fake: acceptance");
 	g_conn->vsub = vlr_subscr_alloc(net->vlr);
-	g_conn->via_ran = RAN_GERAN_A;
+	g_conn->via_ran = OSMO_RAT_GERAN_A;
 	OSMO_ASSERT(g_conn->vsub);
 	/* mark as silent call so it sticks around */
 	g_conn->silent_call = 1;
diff --git a/tests/msc_vlr/msc_vlr_test_rest.err b/tests/msc_vlr/msc_vlr_test_rest.err
index d33b38511..7a1102fcb 100644
--- a/tests/msc_vlr/msc_vlr_test_rest.err
+++ b/tests/msc_vlr/msc_vlr_test_rest.err
@@ -30,7 +30,7 @@ DMM RAN_conn{RAN_CONN_S_ACCEPTED}: state_chg to RAN_CONN_S_RELEASING
 DREF unknown: MSC conn use + release == 1 (0x100: release)
 DREF VLR subscr unknown usage increases to: 2
 DREF VLR subscr unknown usage decreases to: 1
-- BSSAP Clear --RAN_GERAN_A--> MS
+- BSSAP Clear --GERAN-A--> MS
   bssap_clear_sent == 1
 - BSS sends BSSMAP Clear Complete
 DREF unknown: MSC conn use - release == 0 (0x0: )
@@ -52,7 +52,7 @@ talloc_total_blocks(tall_bsc_ctx) == 13
 
 ===== test_cm_service_without_lu
 - CM Service Request without a prior Location Updating
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_CM_SERV_REQ
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_CM_SERV_REQ
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -70,7 +70,7 @@ DVLR Process_Access_Request_VLR(GERAN-A-0_unknown_CM_SERVICE_REQ){PR_ARQ_S_DONE}
 DMM RAN_conn(GERAN-A-0_unknown_CM_SERVICE_REQ){RAN_CONN_S_NEW}: Received Event RAN_CONN_E_CN_CLOSE
 DMM RAN_conn(GERAN-A-0_unknown_CM_SERVICE_REQ){RAN_CONN_S_NEW}: state_chg to RAN_CONN_S_RELEASING
 DREF unknown: MSC conn use + release == 2 (0x101: compl_l3,release)
-- BSSAP Clear --RAN_GERAN_A--> MS
+- BSSAP Clear --GERAN-A--> MS
 DRR 901700000004620: subscriber not allowed to do a CM Service Request
 DREF unknown: MSC conn use - compl_l3 == 1 (0x100: release)
   bssap_clear_sent == 1
@@ -95,7 +95,7 @@ talloc_total_blocks(tall_bsc_ctx) == 13
 
 ===== test_two_lu
 - Location Update request causes a GSUP LU request to HLR
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -188,7 +188,7 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_LU){RAN_CONN_S_ACCEPTED
 DREF IMSI-901700000004620_MSISDN-46071: MSC conn use + release == 1 (0x100: release)
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage increases to: 4
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage decreases to: 3
-- BSSAP Clear --RAN_GERAN_A--> MS
+- BSSAP Clear --GERAN-A--> MS
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage decreases to: 2
 <-- GSUP rx OSMO_GSUP_MSGT_UPDATE_LOCATION_RESULT: vlr_gsupc_read_cb() returns 0
   bssap_clear_sent == 1
@@ -212,7 +212,7 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_LU){RAN_CONN_S_RELEASED
 ---
 - verify that the MS can send another LU request
 - Location Update request causes a GSUP LU request to HLR
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -302,7 +302,7 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_LU){RAN_CONN_S_ACCEPTED
 DREF IMSI-901700000004620_MSISDN-46071: MSC conn use + release == 1 (0x100: release)
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage increases to: 4
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage decreases to: 3
-- BSSAP Clear --RAN_GERAN_A--> MS
+- BSSAP Clear --GERAN-A--> MS
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage decreases to: 2
 <-- GSUP rx OSMO_GSUP_MSGT_UPDATE_LOCATION_RESULT: vlr_gsupc_read_cb() returns 0
   bssap_clear_sent == 1
@@ -325,7 +325,7 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_LU){RAN_CONN_S_RELEASED
   llist_count(&net->ran_conns) == 0
 ---
 - subscriber detaches
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_IMSI_DETACH_IND
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_IMSI_DETACH_IND
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -341,7 +341,7 @@ DREF freeing VLR subscr IMSI-901700000004620_MSISDN-46071
 DMM RAN_conn{RAN_CONN_S_NEW}: Received Event RAN_CONN_E_CN_CLOSE
 DMM RAN_conn{RAN_CONN_S_NEW}: state_chg to RAN_CONN_S_RELEASING
 DREF unknown: MSC conn use + release == 2 (0x101: compl_l3,release)
-- BSSAP Clear --RAN_GERAN_A--> MS
+- BSSAP Clear --GERAN-A--> MS
 DREF unknown: MSC conn use - compl_l3 == 1 (0x100: release)
   bssap_clear_sent == 1
 - BSS sends BSSMAP Clear Complete
@@ -360,7 +360,7 @@ talloc_total_blocks(tall_bsc_ctx) == 13
 
 ===== test_lu_unknown_tmsi
 - Location Update request with unknown TMSI sends ID Request for IMSI
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -379,8 +379,8 @@ DMM RAN_conn(GERAN-A-0_TMSI-0x23422342_LU){RAN_CONN_S_NEW}: Updated ID
 DREF VLR subscr TMSI-0x23422342 usage decreases to: 1
 DVLR vlr_lu_fsm(GERAN-A-0_TMSI-0x23422342_LU){VLR_ULA_S_IDLE}: vlr_loc_upd_want_imsi()
 DVLR vlr_lu_fsm(GERAN-A-0_TMSI-0x23422342_LU){VLR_ULA_S_IDLE}: state_chg to VLR_ULA_S_WAIT_IMSI
-DMSC msc_tx 3 bytes to TMSI-0x23422342 via RAN_GERAN_A
-- DTAP --RAN_GERAN_A--> MS: GSM48_MT_MM_ID_REQ: 051801
+DMSC msc_tx 3 bytes to TMSI-0x23422342 via GERAN-A
+- DTAP --GERAN-A--> MS: GSM48_MT_MM_ID_REQ: 051801
 - DTAP matches expected message
 DMM RAN_conn(GERAN-A-0_TMSI-0x23422342_LU){RAN_CONN_S_NEW}: Received Event RAN_CONN_E_COMPLETE_LAYER_3
 DMM RAN_conn(GERAN-A-0_TMSI-0x23422342_LU){RAN_CONN_S_NEW}: state_chg to RAN_CONN_S_AUTH_CIPH
@@ -399,7 +399,7 @@ DRLL subscr TMSI-0x23422342: Message not permitted for initial conn: GSM48_MT_RR
 DRLL Dispatching 04.08 message SMS:0x01 (0x9:0x1)
 DRLL subscr TMSI-0x23422342: Message not permitted for initial conn: SMS:0x01
 - MS tells us the IMSI, causes a GSUP LU request to HLR
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_ID_RESP
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_ID_RESP
 DREF TMSI-0x23422342: MSC conn use + dtap == 1 (0x2: dtap)
 DRLL Dispatching 04.08 message GSM48_MT_MM_ID_RESP (0x5:0x19)
 DMM IDENTITY RESPONSE: MI(IMSI)=901700000004620
@@ -479,7 +479,7 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_TMSI-0x23422342_LU){RAN
 DREF IMSI-901700000004620_MSISDN-46071_TMSI-0x23422342: MSC conn use + release == 1 (0x100: release)
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071_TMSI-0x23422342 usage increases to: 4
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071_TMSI-0x23422342 usage decreases to: 3
-- BSSAP Clear --RAN_GERAN_A--> MS
+- BSSAP Clear --GERAN-A--> MS
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071_TMSI-0x23422342 usage decreases to: 2
 <-- GSUP rx OSMO_GSUP_MSGT_UPDATE_LOCATION_RESULT: vlr_gsupc_read_cb() returns 0
   bssap_clear_sent == 1
diff --git a/tests/msc_vlr/msc_vlr_test_ss.c b/tests/msc_vlr/msc_vlr_test_ss.c
index 832293c52..0390196ee 100644
--- a/tests/msc_vlr/msc_vlr_test_ss.c
+++ b/tests/msc_vlr/msc_vlr_test_ss.c
@@ -75,7 +75,7 @@ static void perform_lu(void)
 	EXPECT_CONN_COUNT(0);
 }
 
-static void _test_ss_ussd_mo(enum ran_type via_ran)
+static void _test_ss_ussd_mo(enum osmo_rat_type via_ran)
 {
 	/* TODO: UTRAN requires auth and ciph */
 	rx_from_ran = via_ran;
@@ -117,7 +117,7 @@ static void _test_ss_ussd_mo(enum ran_type via_ran)
 	EXPECT_CONN_COUNT(0);
 }
 
-static void _test_ss_ussd_no(enum ran_type via_ran)
+static void _test_ss_ussd_no(enum osmo_rat_type via_ran)
 {
 	struct vlr_subscr *vsub;
 
@@ -194,7 +194,7 @@ static void _test_ss_ussd_no(enum ran_type via_ran)
 static void test_ss_ussd_mo_geran()
 {
 	comment_start();
-	_test_ss_ussd_mo(RAN_GERAN_A);
+	_test_ss_ussd_mo(OSMO_RAT_GERAN_A);
 	clear_vlr();
 	comment_end();
 }
@@ -202,7 +202,7 @@ static void test_ss_ussd_mo_geran()
 static void test_ss_ussd_no_geran()
 {
 	comment_start();
-	_test_ss_ussd_no(RAN_GERAN_A);
+	_test_ss_ussd_no(OSMO_RAT_GERAN_A);
 	clear_vlr();
 	comment_end();
 }
diff --git a/tests/msc_vlr/msc_vlr_test_ss.err b/tests/msc_vlr/msc_vlr_test_ss.err
index 86d017163..6e0684e5e 100644
--- a/tests/msc_vlr/msc_vlr_test_ss.err
+++ b/tests/msc_vlr/msc_vlr_test_ss.err
@@ -3,7 +3,7 @@ talloc_total_blocks(tall_bsc_ctx) == 13
 
 ===== test_ss_ussd_mo_geran
 - Location Update request causes a GSUP LU request to HLR
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -84,7 +84,7 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_LU){RAN_CONN_S_ACCEPTED
 DREF IMSI-901700000004620_MSISDN-46071: MSC conn use + release == 1 (0x100: release)
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage increases to: 4
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage decreases to: 3
-- BSSAP Clear --RAN_GERAN_A--> MS
+- BSSAP Clear --GERAN-A--> MS
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage decreases to: 2
 <-- GSUP rx OSMO_GSUP_MSGT_UPDATE_LOCATION_RESULT: vlr_gsupc_read_cb() returns 0
 - LU was successful, and the conn has already been closed
@@ -112,7 +112,7 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_LU){RAN_CONN_S_RELEASED
   llist_count(&net->ran_conns) == 0
 ---
 - after a while, a new conn sends a CM Service Request
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_CM_SERV_REQ
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_CM_SERV_REQ
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -146,7 +146,7 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_CM_SERVICE_REQ){RAN_CON
 DREF IMSI-901700000004620_MSISDN-46071: MSC conn use - compl_l3 == 1 (0x8: cm_service)
   cm_service_result_sent == 1
 ran_conn_is_accepted() == true
-  MSC <--RAN_GERAN_A-- MS: GSM0480_MTYPE_REGISTER
+  MSC <--GERAN-A-- MS: GSM0480_MTYPE_REGISTER
 DREF IMSI-901700000004620_MSISDN-46071: MSC conn use + dtap == 2 (0xa: dtap,cm_service)
 DRLL Dispatching 04.08 message GSM0480_MTYPE_REGISTER (0xb:0x3b)
 DMM Received SS/USSD data (trans_id=8, msg_type=GSM0480_MTYPE_REGISTER)
@@ -164,8 +164,8 @@ DREF IMSI-901700000004620_MSISDN-46071: MSC conn use - dtap == 1 (0x40: trans_nc
 DVLR GSUP rx 61: 20010809710000004026f03004200000013101033527a225020101302002013b301b04010f0416d9775d0e2ae3e965f73cfd7683d27310cd06bbc51a0d
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage increases to: 4
 DMSC Routed to GSM 09.11 SS/USSD handler
-DMSC msc_tx 43 bytes to IMSI-901700000004620_MSISDN-46071 via RAN_GERAN_A
-- DTAP --RAN_GERAN_A--> MS: GSM0480_MTYPE_RELEASE_COMPLETE: 8b2a1c27a225020101302002013b301b04010f0416d9775d0e2ae3e965f73cfd7683d27310cd06bbc51a0d
+DMSC msc_tx 43 bytes to IMSI-901700000004620_MSISDN-46071 via GERAN-A
+- DTAP --GERAN-A--> MS: GSM0480_MTYPE_RELEASE_COMPLETE: 8b2a1c27a225020101302002013b301b04010f0416d9775d0e2ae3e965f73cfd7683d27310cd06bbc51a0d
 - DTAP matches expected message
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage decreases to: 3
 DREF IMSI-901700000004620_MSISDN-46071: MSC conn use - trans_nc_ss == 0 (0x0: )
@@ -174,7 +174,7 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_CM_SERVICE_REQ){RAN_CON
 DREF IMSI-901700000004620_MSISDN-46071: MSC conn use + release == 1 (0x100: release)
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage increases to: 4
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage decreases to: 3
-- BSSAP Clear --RAN_GERAN_A--> MS
+- BSSAP Clear --GERAN-A--> MS
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage decreases to: 2
 <-- GSUP rx OSMO_GSUP_MSGT_PROC_SS_REQUEST: vlr_gsupc_read_cb() returns 0
   dtap_tx_confirmed == 1
@@ -202,7 +202,7 @@ talloc_total_blocks(tall_bsc_ctx) == 13
 
 ===== test_ss_ussd_no_geran
 - Location Update request causes a GSUP LU request to HLR
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -283,7 +283,7 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_LU){RAN_CONN_S_ACCEPTED
 DREF IMSI-901700000004620_MSISDN-46071: MSC conn use + release == 1 (0x100: release)
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage increases to: 4
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage decreases to: 3
-- BSSAP Clear --RAN_GERAN_A--> MS
+- BSSAP Clear --GERAN-A--> MS
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage decreases to: 2
 <-- GSUP rx OSMO_GSUP_MSGT_UPDATE_LOCATION_RESULT: vlr_gsupc_read_cb() returns 0
 - LU was successful, and the conn has already been closed
@@ -322,7 +322,7 @@ DCC (ti ff sub IMSI-901700000004620_MSISDN-46071 callref 20000101) New transacti
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage increases to: 4
 DMM Triggering Paging Request
 DMM Subscriber IMSI-901700000004620_MSISDN-46071 not paged yet, start paging.
-  RAN_GERAN_A sends out paging request to IMSI 901700000004620, TMSI 0xffffffff, LAC 23
+  GERAN-A sends out paging request to IMSI 901700000004620, TMSI 0xffffffff, LAC 23
   strcmp(paging_expecting_imsi, imsi) == 0
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage increases to: 5
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage decreases to: 4
@@ -336,7 +336,7 @@ DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage increases to: 4
   llist_count(&vsub->cs.requests) == 1
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage decreases to: 3
 - MS replies with Paging Response, we deliver the NC/USSD
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_RR_PAG_RESP
+  MSC <--GERAN-A-- MS: GSM48_MT_RR_PAG_RESP
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -365,8 +365,8 @@ DPAG Paging success for IMSI-901700000004620_MSISDN-46071 (event=0)
 DPAG Calling paging cbfn.
 DMM Paging subscr 46071 succeeded!
 DREF IMSI-901700000004620_MSISDN-46071: MSC conn use + trans_nc_ss == 2 (0x41: compl_l3,trans_nc_ss)
-DMSC msc_tx 25 bytes to IMSI-901700000004620_MSISDN-46071 via RAN_GERAN_A
-- DTAP --RAN_GERAN_A--> MS: GSM0480_MTYPE_REGISTER: 0b3b1c15a11302010102013b300b04010f0406aa510c061b01
+DMSC msc_tx 25 bytes to IMSI-901700000004620_MSISDN-46071 via GERAN-A
+- DTAP --GERAN-A--> MS: GSM0480_MTYPE_REGISTER: 0b3b1c15a11302010102013b300b04010f0406aa510c061b01
 - DTAP matches expected message
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage decreases to: 4
 DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_PAGING_RESP){RAN_CONN_S_NEW}: state_chg to RAN_CONN_S_ACCEPTED
@@ -377,7 +377,7 @@ DREF IMSI-901700000004620_MSISDN-46071: MSC conn use - compl_l3 == 1 (0x40: tran
   dtap_tx_confirmed == 1
   paging_stopped == 1
 - MS responds to SS/USSD request
-  MSC <--RAN_GERAN_A-- MS: GSM0480_MTYPE_FACILITY
+  MSC <--GERAN-A-- MS: GSM0480_MTYPE_FACILITY
 DREF IMSI-901700000004620_MSISDN-46071: MSC conn use + dtap == 2 (0x42: dtap,trans_nc_ss)
 DRLL Dispatching 04.08 message GSM0480_MTYPE_FACILITY (0xb:0x3a)
 DMM Received SS/USSD data (trans_id=0, msg_type=GSM0480_MTYPE_FACILITY)
@@ -392,8 +392,8 @@ DREF IMSI-901700000004620_MSISDN-46071: MSC conn use - dtap == 1 (0x40: trans_nc
 DVLR GSUP rx 20: 20010809710000004026f0300420000101310103
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage increases to: 4
 DMSC Routed to GSM 09.11 SS/USSD handler
-DMSC msc_tx 2 bytes to IMSI-901700000004620_MSISDN-46071 via RAN_GERAN_A
-- DTAP --RAN_GERAN_A--> MS: GSM0480_MTYPE_RELEASE_COMPLETE: 0b2a
+DMSC msc_tx 2 bytes to IMSI-901700000004620_MSISDN-46071 via GERAN-A
+- DTAP --GERAN-A--> MS: GSM0480_MTYPE_RELEASE_COMPLETE: 0b2a
 - DTAP matches expected message
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage decreases to: 3
 DREF IMSI-901700000004620_MSISDN-46071: MSC conn use - trans_nc_ss == 0 (0x0: )
@@ -402,7 +402,7 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_PAGING_RESP){RAN_CONN_S
 DREF IMSI-901700000004620_MSISDN-46071: MSC conn use + release == 1 (0x100: release)
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage increases to: 4
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage decreases to: 3
-- BSSAP Clear --RAN_GERAN_A--> MS
+- BSSAP Clear --GERAN-A--> MS
 DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage decreases to: 2
 <-- GSUP rx OSMO_GSUP_MSGT_PROC_SS_REQUEST: vlr_gsupc_read_cb() returns 0
   dtap_tx_confirmed == 1
diff --git a/tests/msc_vlr/msc_vlr_test_umts_authen.c b/tests/msc_vlr/msc_vlr_test_umts_authen.c
index 62e280e3e..beeea22af 100644
--- a/tests/msc_vlr/msc_vlr_test_umts_authen.c
+++ b/tests/msc_vlr/msc_vlr_test_umts_authen.c
@@ -23,7 +23,7 @@
 
 #include "msc_vlr_tests.h"
 
-static void _test_umts_authen(enum ran_type via_ran)
+static void _test_umts_authen(enum osmo_rat_type via_ran)
 {
 	struct vlr_subscr *vsub;
 	const char *imsi = "901700000010650";
@@ -122,7 +122,7 @@ static void _test_umts_authen(enum ran_type via_ran)
 	VERBOSE_ASSERT(auth_request_sent, == true, "%d");
 	VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");
 
-	if (via_ran == RAN_GERAN_A) {
+	if (via_ran == OSMO_RAT_GERAN_A) {
 		btw("MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR");
 		gsup_expect_tx("04010809710000000156f0280102");
 		ms_sends_msg("0554" "e229c19e" "2104" "791f2e41");
@@ -193,7 +193,7 @@ static void _test_umts_authen(enum ran_type via_ran)
 	EXPECT_ACCEPTED(false);
 	thwart_rx_non_initial_requests();
 
-	if (via_ran == RAN_GERAN_A) {
+	if (via_ran == OSMO_RAT_GERAN_A) {
 		btw("MS sends Authen Response, VLR accepts with a CM Service Accept");
 		gsup_expect_tx(NULL);
 		ms_sends_msg("0554" "7db47cf7" "2104" "f81e4dc7"); /* 2nd vector's res, s.a. */
@@ -255,7 +255,7 @@ static void _test_umts_authen(enum ran_type via_ran)
 	EXPECT_ACCEPTED(false);
 	thwart_rx_non_initial_requests();
 
-	if (via_ran == RAN_GERAN_A) {
+	if (via_ran == OSMO_RAT_GERAN_A) {
 		btw("MS sends Authen Response, VLR accepts and sends pending SMS");
 		dtap_expect_tx(sms);
 		ms_sends_msg("0554" "706f9967" "2104" "19ba609c"); /* 3nd vector's res, s.a. */
@@ -313,14 +313,14 @@ static void _test_umts_authen(enum ran_type via_ran)
 static void test_umts_authen_geran()
 {
 	comment_start();
-	_test_umts_authen(RAN_GERAN_A);
+	_test_umts_authen(OSMO_RAT_GERAN_A);
 	comment_end();
 }
 
 static void test_umts_authen_utran()
 {
 	comment_start();
-	_test_umts_authen(RAN_UTRAN_IU);
+	_test_umts_authen(OSMO_RAT_UTRAN_IU);
 	comment_end();
 }
 
@@ -334,7 +334,7 @@ extern int milenage_f1(const u8 *opc, const u8 *k, const u8 *_rand,
 		       const u8 *sqn, const u8 *amf, u8 *mac_a, u8 *mac_s);
 #endif
 
-static void _test_umts_authen_resync(enum ran_type via_ran)
+static void _test_umts_authen_resync(enum osmo_rat_type via_ran)
 {
 	struct vlr_subscr *vsub;
 	const char *imsi = "901700000010650";
@@ -491,7 +491,7 @@ static void _test_umts_authen_resync(enum ran_type via_ran)
 	VERBOSE_ASSERT(auth_request_sent, == true, "%d");
 	VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");
 
-	if (via_ran == RAN_GERAN_A) {
+	if (via_ran == OSMO_RAT_GERAN_A) {
 		btw("MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR");
 		gsup_expect_tx("04010809710000000156f0280102");
 		ms_sends_msg("0554" "1df5f0b4" "2104" "f22b696e");
@@ -550,18 +550,18 @@ static void _test_umts_authen_resync(enum ran_type via_ran)
 static void test_umts_authen_resync_geran()
 {
 	comment_start();
-	_test_umts_authen_resync(RAN_GERAN_A);
+	_test_umts_authen_resync(OSMO_RAT_GERAN_A);
 	comment_end();
 }
 
 static void test_umts_authen_resync_utran()
 {
 	comment_start();
-	_test_umts_authen_resync(RAN_UTRAN_IU);
+	_test_umts_authen_resync(OSMO_RAT_UTRAN_IU);
 	comment_end();
 }
 
-static void _test_umts_authen_too_short_res(enum ran_type via_ran)
+static void _test_umts_authen_too_short_res(enum osmo_rat_type via_ran)
 {
 	net->authentication_required = true;
 	net->vlr->cfg.assign_tmsi = true;
@@ -650,18 +650,18 @@ static void _test_umts_authen_too_short_res(enum ran_type via_ran)
 static void test_umts_authen_too_short_res_geran()
 {
 	comment_start();
-	_test_umts_authen_too_short_res(RAN_GERAN_A);
+	_test_umts_authen_too_short_res(OSMO_RAT_GERAN_A);
 	comment_end();
 }
 
 static void test_umts_authen_too_short_res_utran()
 {
 	comment_start();
-	_test_umts_authen_too_short_res(RAN_UTRAN_IU);
+	_test_umts_authen_too_short_res(OSMO_RAT_UTRAN_IU);
 	comment_end();
 }
 
-static void _test_umts_authen_too_long_res(enum ran_type via_ran)
+static void _test_umts_authen_too_long_res(enum osmo_rat_type via_ran)
 {
 	net->authentication_required = true;
 	net->vlr->cfg.assign_tmsi = true;
@@ -750,18 +750,18 @@ static void _test_umts_authen_too_long_res(enum ran_type via_ran)
 static void test_umts_authen_too_long_res_geran()
 {
 	comment_start();
-	_test_umts_authen_too_long_res(RAN_GERAN_A);
+	_test_umts_authen_too_long_res(OSMO_RAT_GERAN_A);
 	comment_end();
 }
 
 static void test_umts_authen_too_long_res_utran()
 {
 	comment_start();
-	_test_umts_authen_too_long_res(RAN_UTRAN_IU);
+	_test_umts_authen_too_long_res(OSMO_RAT_UTRAN_IU);
 	comment_end();
 }
 
-static void _test_umts_authen_only_sres(enum ran_type via_ran)
+static void _test_umts_authen_only_sres(enum osmo_rat_type via_ran)
 {
 	net->authentication_required = true;
 	net->vlr->cfg.assign_tmsi = true;
@@ -835,7 +835,7 @@ static void _test_umts_authen_only_sres(enum ran_type via_ran)
 	VERBOSE_ASSERT(auth_request_sent, == true, "%d");
 	VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d");
 
-	if (via_ran == RAN_GERAN_A)
+	if (via_ran == OSMO_RAT_GERAN_A)
 		btw("MS sends Authen Response of wrong RES size, VLR thwarts:"
 		    " GERAN reports an SRES mismatch");
 	else
@@ -855,14 +855,14 @@ static void _test_umts_authen_only_sres(enum ran_type via_ran)
 static void test_umts_authen_only_sres_geran()
 {
 	comment_start();
-	_test_umts_authen_only_sres(RAN_GERAN_A);
+	_test_umts_authen_only_sres(OSMO_RAT_GERAN_A);
 	comment_end();
 }
 
 static void test_umts_authen_only_sres_utran()
 {
 	comment_start();
-	_test_umts_authen_only_sres(RAN_UTRAN_IU);
+	_test_umts_authen_only_sres(OSMO_RAT_UTRAN_IU);
 	comment_end();
 }
 
diff --git a/tests/msc_vlr/msc_vlr_test_umts_authen.err b/tests/msc_vlr/msc_vlr_test_umts_authen.err
index bad0e63d8..6ec952599 100644
--- a/tests/msc_vlr/msc_vlr_test_umts_authen.err
+++ b/tests/msc_vlr/msc_vlr_test_umts_authen.err
@@ -3,7 +3,7 @@ talloc_total_blocks(tall_bsc_ctx) == 13
 
 ===== test_umts_authen_geran
 - Location Update request causes a GSUP Send Auth Info request to HLR
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -52,7 +52,7 @@ DREF VLR subscr IMSI-901700000010650 usage decreases to: 1
   auth_request_sent == 1
   lu_result_sent == 0
 - MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_AUTH_RESP
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_AUTH_RESP
 DREF IMSI-901700000010650: MSC conn use + dtap == 1 (0x2: dtap)
 DRLL Dispatching 04.08 message GSM48_MT_MM_AUTH_RESP (0x5:0x14)
 DMM IMSI-901700000010650: MM UMTS AUTHENTICATION RESPONSE (res = e229c19e791f2e41)
@@ -137,7 +137,7 @@ DREF VLR subscr IMSI-901700000010650_MSISDN-42342 usage increases to: 2
   vsub->tmsi == 0xffffffff
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342 usage decreases to: 1
 - MS sends TMSI Realloc Complete
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_TMSI_REALL_COMPL
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_TMSI_REALL_COMPL
 DREF IMSI-901700000010650_MSISDN-42342: MSC conn use + dtap == 1 (0x2: dtap)
 DRLL Dispatching 04.08 message GSM48_MT_MM_TMSI_REALL_COMPL (0x5:0x1b)
 DMM TMSI Reallocation Completed. Subscriber: IMSI-901700000010650_MSISDN-42342
@@ -158,7 +158,7 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000010650_MSISDN-42342_LU){RAN_CONN_S_ACCEPTED
 DREF IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: MSC conn use + release == 2 (0x102: dtap,release)
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 usage increases to: 3
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 usage decreases to: 2
-- BSSAP Clear --RAN_GERAN_A--> MS
+- BSSAP Clear --GERAN-A--> MS
 DREF IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: MSC conn use - dtap == 1 (0x100: release)
   bssap_clear_sent == 1
 - BSS sends BSSMAP Clear Complete
@@ -179,7 +179,7 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000010650_MSISDN-42342_LU){RAN_CONN_S_RELEASED
   llist_count(&net->ran_conns) == 0
 ---
 - after a while, a new conn sends a CM Service Request. VLR responds with Auth Req, 2nd auth vector
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_CM_SERV_REQ
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_CM_SERV_REQ
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -224,7 +224,7 @@ DRLL subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: Message not permi
 DRLL Dispatching 04.08 message SMS:0x01 (0x9:0x1)
 DRLL subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: Message not permitted for initial conn: SMS:0x01
 - MS sends Authen Response, VLR accepts with a CM Service Accept
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_AUTH_RESP
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_AUTH_RESP
 DREF IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: MSC conn use + dtap == 1 (0x2: dtap)
 DRLL Dispatching 04.08 message GSM48_MT_MM_AUTH_RESP (0x5:0x14)
 DMM IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: MM UMTS AUTHENTICATION RESPONSE (res = 7db47cf7f81e4dc7)
@@ -261,7 +261,7 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100_CM_SERV
 DREF IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: MSC conn use + release == 1 (0x100: release)
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 usage increases to: 3
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 usage decreases to: 2
-- BSSAP Clear --RAN_GERAN_A--> MS
+- BSSAP Clear --GERAN-A--> MS
   bssap_clear_sent == 1
 - BSS sends BSSMAP Clear Complete
 DREF IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: MSC conn use - release == 0 (0x0: )
@@ -286,7 +286,7 @@ DREF VLR subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 usage increase
 DCC (ti 00 sub IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 callref 40000001) New transaction
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 usage increases to: 4
 DMM Subscriber IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 not paged yet, start paging.
-  RAN_GERAN_A sends out paging request to IMSI 901700000010650, TMSI 0x03020100, LAC 23
+  GERAN-A sends out paging request to IMSI 901700000010650, TMSI 0x03020100, LAC 23
   strcmp(paging_expecting_imsi, imsi) == 0
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 usage increases to: 5
   llist_count(&vsub->cs.requests) == 1
@@ -298,7 +298,7 @@ DREF VLR subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 usage increase
   llist_count(&vsub->cs.requests) == 1
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 usage decreases to: 4
 - MS replies with Paging Response, and VLR sends Auth Request with third key
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_RR_PAG_RESP
+  MSC <--GERAN-A-- MS: GSM48_MT_RR_PAG_RESP
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -342,7 +342,7 @@ DRLL subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: Message not permi
 DRLL Dispatching 04.08 message SMS:0x01 (0x9:0x1)
 DRLL subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: Message not permitted for initial conn: SMS:0x01
 - MS sends Authen Response, VLR accepts and sends pending SMS
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_AUTH_RESP
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_AUTH_RESP
 DREF IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: MSC conn use + dtap == 1 (0x2: dtap)
 DRLL Dispatching 04.08 message GSM48_MT_MM_AUTH_RESP (0x5:0x14)
 DMM IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: MM UMTS AUTHENTICATION RESPONSE (res = 706f996719ba609c)
@@ -369,8 +369,8 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100_PAGING_
 DPAG Paging success for IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 (event=0)
 DPAG Calling paging cbfn.
 DREF IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: MSC conn use + trans_sms == 2 (0x22: dtap,trans_sms)
-DMSC msc_tx 91 bytes to IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 via RAN_GERAN_A
-- DTAP --RAN_GERAN_A--> MS: SMS:0x01: 09015801000791447758100650004c0005802443f2000007101000000000445079da1e1ee7416937485e9ea7c965373d1d6683c270383b3d0ed3d36ff71c949e83c22072799e9687c5ec32a81d96afcbf4b4fb0c7ac3e9e9b7db05
+DMSC msc_tx 91 bytes to IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 via GERAN-A
+- DTAP --GERAN-A--> MS: SMS:0x01: 09015801000791447758100650004c0005802443f2000007101000000000445079da1e1ee7416937485e9ea7c965373d1d6683c270383b3d0ed3d36ff71c949e83c22072799e9687c5ec32a81d96afcbf4b4fb0c7ac3e9e9b7db05
 - DTAP matches expected message
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 usage decreases to: 4
 DMM RAN_conn(GERAN-A-0_IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100_PAGING_RESP){RAN_CONN_S_AUTH_CIPH}: state_chg to RAN_CONN_S_ACCEPTED
@@ -385,7 +385,7 @@ DREF VLR subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 usage decrease
 - conn is still open to wait for SMS ack dance
   llist_count(&net->ran_conns) == 1
 - MS replies with CP-ACK for received SMS
-  MSC <--RAN_GERAN_A-- MS: SMS:0x04
+  MSC <--GERAN-A-- MS: SMS:0x04
 DREF IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: MSC conn use + dtap == 2 (0x22: dtap,trans_sms)
 DRLL Dispatching 04.08 message SMS:0x04 (0x9:0x4)
 DMM RAN_conn(GERAN-A-0_IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100_PAGING_RESP){RAN_CONN_S_ACCEPTED}: Received Event RAN_CONN_E_COMMUNICATING
@@ -393,12 +393,12 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100_PAGING_
 DREF IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: MSC conn use - dtap == 1 (0x20: trans_sms)
   llist_count(&net->ran_conns) == 1
 - MS also sends RP-ACK, MSC in turn sends CP-ACK for that
-  MSC <--RAN_GERAN_A-- MS: SMS:0x01
+  MSC <--GERAN-A-- MS: SMS:0x01
 DREF IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: MSC conn use + dtap == 2 (0x22: dtap,trans_sms)
 DRLL Dispatching 04.08 message SMS:0x01 (0x9:0x1)
 DMM RAN_conn(GERAN-A-0_IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100_PAGING_RESP){RAN_CONN_S_COMMUNICATING}: Received Event RAN_CONN_E_COMMUNICATING
-DMSC msc_tx 2 bytes to IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 via RAN_GERAN_A
-- DTAP --RAN_GERAN_A--> MS: SMS:0x04: 0904
+DMSC msc_tx 2 bytes to IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 via GERAN-A
+- DTAP --GERAN-A--> MS: SMS:0x04: 0904
 - DTAP matches expected message
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 usage decreases to: 3
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 usage decreases to: 2
@@ -409,7 +409,7 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100_PAGING_
 DREF IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: MSC conn use + release == 1 (0x100: release)
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 usage increases to: 3
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 usage decreases to: 2
-- BSSAP Clear --RAN_GERAN_A--> MS
+- BSSAP Clear --GERAN-A--> MS
   dtap_tx_confirmed == 1
   bssap_clear_sent == 1
 - BSS sends BSSMAP Clear Complete
@@ -429,7 +429,7 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100_PAGING_
   llist_count(&net->ran_conns) == 0
 ---
 - subscriber detaches
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_IMSI_DETACH_IND
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_IMSI_DETACH_IND
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -445,7 +445,7 @@ DREF freeing VLR subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100
 DMM RAN_conn{RAN_CONN_S_NEW}: Received Event RAN_CONN_E_CN_CLOSE
 DMM RAN_conn{RAN_CONN_S_NEW}: state_chg to RAN_CONN_S_RELEASING
 DREF unknown: MSC conn use + release == 2 (0x101: compl_l3,release)
-- BSSAP Clear --RAN_GERAN_A--> MS
+- BSSAP Clear --GERAN-A--> MS
 DREF unknown: MSC conn use - compl_l3 == 1 (0x100: release)
   bssap_clear_sent == 1
 - BSS sends BSSMAP Clear Complete
@@ -464,7 +464,7 @@ talloc_total_blocks(tall_bsc_ctx) == 13
 
 ===== test_umts_authen_utran
 - Location Update request causes a GSUP Send Auth Info request to HLR
-  MSC <--RAN_UTRAN_IU-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
+  MSC <--UTRAN-Iu-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -513,7 +513,7 @@ DREF VLR subscr IMSI-901700000010650 usage decreases to: 1
   auth_request_sent == 1
   lu_result_sent == 0
 - MS sends Authen Response, VLR accepts and sends SecurityModeControl
-  MSC <--RAN_UTRAN_IU-- MS: GSM48_MT_MM_AUTH_RESP
+  MSC <--UTRAN-Iu-- MS: GSM48_MT_MM_AUTH_RESP
 DREF IMSI-901700000010650: MSC conn use + dtap == 1 (0x2: dtap)
 DRLL Dispatching 04.08 message GSM48_MT_MM_AUTH_RESP (0x5:0x14)
 DMM IMSI-901700000010650: MM UMTS AUTHENTICATION RESPONSE (res = e229c19e791f2e41)
@@ -543,7 +543,7 @@ DMM <- SECURITY MODE COMPLETE IMSI-901700000010650
 DVLR vlr_lu_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU){VLR_ULA_S_WAIT_CIPH}: Received Event VLR_ULA_E_CIPH_RES
 DVLR vlr_lu_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU){VLR_ULA_S_WAIT_CIPH}: vlr_loc_upd_post_ciph()
 DIUCS IMSI-901700000010650: tx CommonID 901700000010650
-- Iu Common ID --RAN_UTRAN_IU--> MS (IMSI=901700000010650)
+- Iu Common ID --UTRAN-Iu--> MS (IMSI=901700000010650)
 DVLR vlr_lu_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU){VLR_ULA_S_WAIT_CIPH}: vlr_loc_upd_node_4()
 DVLR vlr_lu_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU){VLR_ULA_S_WAIT_CIPH}: state_chg to VLR_ULA_S_WAIT_HLR_UPD
 DVLR upd_hlr_vlr_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: Allocated
@@ -610,7 +610,7 @@ DREF VLR subscr IMSI-901700000010650_MSISDN-42342 usage increases to: 2
   vsub->tmsi == 0xffffffff
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342 usage decreases to: 1
 - MS sends TMSI Realloc Complete
-  MSC <--RAN_UTRAN_IU-- MS: GSM48_MT_MM_TMSI_REALL_COMPL
+  MSC <--UTRAN-Iu-- MS: GSM48_MT_MM_TMSI_REALL_COMPL
 DREF IMSI-901700000010650_MSISDN-42342: MSC conn use + dtap == 1 (0x2: dtap)
 DRLL Dispatching 04.08 message GSM48_MT_MM_TMSI_REALL_COMPL (0x5:0x1b)
 DMM TMSI Reallocation Completed. Subscriber: IMSI-901700000010650_MSISDN-42342
@@ -631,7 +631,7 @@ DMM RAN_conn(UTRAN-Iu-42_IMSI-901700000010650_MSISDN-42342_LU){RAN_CONN_S_ACCEPT
 DREF IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: MSC conn use + release == 2 (0x102: dtap,release)
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 usage increases to: 3
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 usage decreases to: 2
-- Iu Release --RAN_UTRAN_IU--> MS
+- Iu Release --UTRAN-Iu--> MS
 DREF IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: MSC conn use - dtap == 1 (0x100: release)
   iu_release_sent == 1
 - RNC sends Iu Release Complete
@@ -652,7 +652,7 @@ DMM RAN_conn(UTRAN-Iu-42_IMSI-901700000010650_MSISDN-42342_LU){RAN_CONN_S_RELEAS
   llist_count(&net->ran_conns) == 0
 ---
 - after a while, a new conn sends a CM Service Request. VLR responds with Auth Req, 2nd auth vector
-  MSC <--RAN_UTRAN_IU-- MS: GSM48_MT_MM_CM_SERV_REQ
+  MSC <--UTRAN-Iu-- MS: GSM48_MT_MM_CM_SERV_REQ
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -697,7 +697,7 @@ DRLL subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: Message not permi
 DRLL Dispatching 04.08 message SMS:0x01 (0x9:0x1)
 DRLL subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: Message not permitted for initial conn: SMS:0x01
 - MS sends Authen Response, VLR accepts and sends SecurityModeControl
-  MSC <--RAN_UTRAN_IU-- MS: GSM48_MT_MM_AUTH_RESP
+  MSC <--UTRAN-Iu-- MS: GSM48_MT_MM_AUTH_RESP
 DREF IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: MSC conn use + dtap == 1 (0x2: dtap)
 DRLL Dispatching 04.08 message GSM48_MT_MM_AUTH_RESP (0x5:0x14)
 DMM IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: MM UMTS AUTHENTICATION RESPONSE (res = 7db47cf7f81e4dc7)
@@ -727,7 +727,7 @@ DMM <- SECURITY MODE COMPLETE IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100
 DVLR Process_Access_Request_VLR(UTRAN-Iu-42_IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100_CM_SERVICE_REQ){PR_ARQ_S_WAIT_CIPH}: Received Event PR_ARQ_E_CIPH_RES
 DVLR Process_Access_Request_VLR(UTRAN-Iu-42_IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100_CM_SERVICE_REQ){PR_ARQ_S_WAIT_CIPH}: _proc_arq_vlr_node2_post_ciph()
 DIUCS IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: tx CommonID 901700000010650
-- Iu Common ID --RAN_UTRAN_IU--> MS (IMSI=901700000010650)
+- Iu Common ID --UTRAN-Iu--> MS (IMSI=901700000010650)
 DVLR Process_Access_Request_VLR(UTRAN-Iu-42_IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100_CM_SERVICE_REQ){PR_ARQ_S_WAIT_CIPH}: _proc_arq_vlr_node2_post_vlr()
 DVLR Process_Access_Request_VLR(UTRAN-Iu-42_IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100_CM_SERVICE_REQ){PR_ARQ_S_WAIT_CIPH}: _proc_arq_vlr_post_pres()
 DVLR Process_Access_Request_VLR(UTRAN-Iu-42_IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100_CM_SERVICE_REQ){PR_ARQ_S_WAIT_CIPH}: _proc_arq_vlr_post_trace()
@@ -747,7 +747,7 @@ DMM RAN_conn(UTRAN-Iu-42_IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100_CM_SE
 DREF IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: MSC conn use + release == 1 (0x100: release)
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 usage increases to: 3
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 usage decreases to: 2
-- Iu Release --RAN_UTRAN_IU--> MS
+- Iu Release --UTRAN-Iu--> MS
   iu_release_sent == 1
 - RNC sends Iu Release Complete
 DREF IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: MSC conn use - release == 0 (0x0: )
@@ -772,7 +772,7 @@ DREF VLR subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 usage increase
 DCC (ti 00 sub IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 callref 40000002) New transaction
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 usage increases to: 4
 DMM Subscriber IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 not paged yet, start paging.
-  RAN_UTRAN_IU sends out paging request to IMSI 901700000010650, TMSI 0x03020100, LAC 23
+  UTRAN-Iu sends out paging request to IMSI 901700000010650, TMSI 0x03020100, LAC 23
   strcmp(paging_expecting_imsi, imsi) == 0
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 usage increases to: 5
   llist_count(&vsub->cs.requests) == 1
@@ -784,7 +784,7 @@ DREF VLR subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 usage increase
   llist_count(&vsub->cs.requests) == 1
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 usage decreases to: 4
 - MS replies with Paging Response, and VLR sends Auth Request with third key
-  MSC <--RAN_UTRAN_IU-- MS: GSM48_MT_RR_PAG_RESP
+  MSC <--UTRAN-Iu-- MS: GSM48_MT_RR_PAG_RESP
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -828,7 +828,7 @@ DRLL subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: Message not permi
 DRLL Dispatching 04.08 message SMS:0x01 (0x9:0x1)
 DRLL subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: Message not permitted for initial conn: SMS:0x01
 - MS sends Authen Response, VLR accepts and sends SecurityModeControl
-  MSC <--RAN_UTRAN_IU-- MS: GSM48_MT_MM_AUTH_RESP
+  MSC <--UTRAN-Iu-- MS: GSM48_MT_MM_AUTH_RESP
 DREF IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: MSC conn use + dtap == 1 (0x2: dtap)
 DRLL Dispatching 04.08 message GSM48_MT_MM_AUTH_RESP (0x5:0x14)
 DMM IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: MM UMTS AUTHENTICATION RESPONSE (res = 706f996719ba609c)
@@ -858,7 +858,7 @@ DMM <- SECURITY MODE COMPLETE IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100
 DVLR Process_Access_Request_VLR(UTRAN-Iu-42_IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100_PAGING_RESP){PR_ARQ_S_WAIT_CIPH}: Received Event PR_ARQ_E_CIPH_RES
 DVLR Process_Access_Request_VLR(UTRAN-Iu-42_IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100_PAGING_RESP){PR_ARQ_S_WAIT_CIPH}: _proc_arq_vlr_node2_post_ciph()
 DIUCS IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: tx CommonID 901700000010650
-- Iu Common ID --RAN_UTRAN_IU--> MS (IMSI=901700000010650)
+- Iu Common ID --UTRAN-Iu--> MS (IMSI=901700000010650)
 DVLR Process_Access_Request_VLR(UTRAN-Iu-42_IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100_PAGING_RESP){PR_ARQ_S_WAIT_CIPH}: _proc_arq_vlr_node2_post_vlr()
 DVLR Process_Access_Request_VLR(UTRAN-Iu-42_IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100_PAGING_RESP){PR_ARQ_S_WAIT_CIPH}: _proc_arq_vlr_post_pres()
 DVLR Process_Access_Request_VLR(UTRAN-Iu-42_IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100_PAGING_RESP){PR_ARQ_S_WAIT_CIPH}: _proc_arq_vlr_post_trace()
@@ -870,8 +870,8 @@ DMM RAN_conn(UTRAN-Iu-42_IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100_PAGIN
 DPAG Paging success for IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 (event=0)
 DPAG Calling paging cbfn.
 DREF IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: MSC conn use + trans_sms == 1 (0x20: trans_sms)
-DMSC msc_tx 91 bytes to IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 via RAN_UTRAN_IU
-- DTAP --RAN_UTRAN_IU--> MS: SMS:0x01: 09015801000791447758100650004c0005802443f2000007101000000000445079da1e1ee7416937485e9ea7c965373d1d6683c270383b3d0ed3d36ff71c949e83c22072799e9687c5ec32a81d96afcbf4b4fb0c7ac3e9e9b7db05
+DMSC msc_tx 91 bytes to IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 via UTRAN-Iu
+- DTAP --UTRAN-Iu--> MS: SMS:0x01: 09015801000791447758100650004c0005802443f2000007101000000000445079da1e1ee7416937485e9ea7c965373d1d6683c270383b3d0ed3d36ff71c949e83c22072799e9687c5ec32a81d96afcbf4b4fb0c7ac3e9e9b7db05
 - DTAP matches expected message
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 usage decreases to: 4
 DMM RAN_conn(UTRAN-Iu-42_IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100_PAGING_RESP){RAN_CONN_S_AUTH_CIPH}: state_chg to RAN_CONN_S_ACCEPTED
@@ -884,7 +884,7 @@ DREF VLR subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 usage decrease
 - conn is still open to wait for SMS ack dance
   llist_count(&net->ran_conns) == 1
 - MS replies with CP-ACK for received SMS
-  MSC <--RAN_UTRAN_IU-- MS: SMS:0x04
+  MSC <--UTRAN-Iu-- MS: SMS:0x04
 DREF IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: MSC conn use + dtap == 2 (0x22: dtap,trans_sms)
 DRLL Dispatching 04.08 message SMS:0x04 (0x9:0x4)
 DMM RAN_conn(UTRAN-Iu-42_IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100_PAGING_RESP){RAN_CONN_S_ACCEPTED}: Received Event RAN_CONN_E_COMMUNICATING
@@ -892,12 +892,12 @@ DMM RAN_conn(UTRAN-Iu-42_IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100_PAGIN
 DREF IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: MSC conn use - dtap == 1 (0x20: trans_sms)
   llist_count(&net->ran_conns) == 1
 - MS also sends RP-ACK, MSC in turn sends CP-ACK for that
-  MSC <--RAN_UTRAN_IU-- MS: SMS:0x01
+  MSC <--UTRAN-Iu-- MS: SMS:0x01
 DREF IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: MSC conn use + dtap == 2 (0x22: dtap,trans_sms)
 DRLL Dispatching 04.08 message SMS:0x01 (0x9:0x1)
 DMM RAN_conn(UTRAN-Iu-42_IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100_PAGING_RESP){RAN_CONN_S_COMMUNICATING}: Received Event RAN_CONN_E_COMMUNICATING
-DMSC msc_tx 2 bytes to IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 via RAN_UTRAN_IU
-- DTAP --RAN_UTRAN_IU--> MS: SMS:0x04: 0904
+DMSC msc_tx 2 bytes to IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 via UTRAN-Iu
+- DTAP --UTRAN-Iu--> MS: SMS:0x04: 0904
 - DTAP matches expected message
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 usage decreases to: 3
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 usage decreases to: 2
@@ -908,7 +908,7 @@ DMM RAN_conn(UTRAN-Iu-42_IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100_PAGIN
 DREF IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: MSC conn use + release == 1 (0x100: release)
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 usage increases to: 3
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 usage decreases to: 2
-- Iu Release --RAN_UTRAN_IU--> MS
+- Iu Release --UTRAN-Iu--> MS
   dtap_tx_confirmed == 1
   iu_release_sent == 1
 - RNC sends Iu Release Complete
@@ -928,7 +928,7 @@ DMM RAN_conn(UTRAN-Iu-42_IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100_PAGIN
   llist_count(&net->ran_conns) == 0
 ---
 - subscriber detaches
-  MSC <--RAN_UTRAN_IU-- MS: GSM48_MT_MM_IMSI_DETACH_IND
+  MSC <--UTRAN-Iu-- MS: GSM48_MT_MM_IMSI_DETACH_IND
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -944,7 +944,7 @@ DREF freeing VLR subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100
 DMM RAN_conn{RAN_CONN_S_NEW}: Received Event RAN_CONN_E_CN_CLOSE
 DMM RAN_conn{RAN_CONN_S_NEW}: state_chg to RAN_CONN_S_RELEASING
 DREF unknown: MSC conn use + release == 2 (0x101: compl_l3,release)
-- Iu Release --RAN_UTRAN_IU--> MS
+- Iu Release --UTRAN-Iu--> MS
 DREF unknown: MSC conn use - compl_l3 == 1 (0x100: release)
   iu_release_sent == 1
 - RNC sends Iu Release Complete
@@ -963,7 +963,7 @@ talloc_total_blocks(tall_bsc_ctx) == 13
 
 ===== test_umts_authen_resync_geran
 - Location Update request causes a GSUP Send Auth Info request to HLR
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -1012,7 +1012,7 @@ DREF VLR subscr IMSI-901700000010650 usage decreases to: 1
   auth_request_sent == 1
   lu_result_sent == 0
 - MS sends Authen Failure with Resync cause, VLR sends GSUP to HLR to resync
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_AUTH_FAIL
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_AUTH_FAIL
 DREF IMSI-901700000010650: MSC conn use + dtap == 1 (0x2: dtap)
 DRLL Dispatching 04.08 message GSM48_MT_MM_AUTH_FAIL (0x5:0x1c)
 DMM IMSI-901700000010650: MM R99 AUTHENTICATION SYNCH (AUTS = 979498b1f72d3e28c59fa2e72f9c)
@@ -1043,7 +1043,7 @@ DREF VLR subscr IMSI-901700000010650 usage decreases to: 1
   auth_request_sent == 1
   lu_result_sent == 0
 - MS sends Authen Response, VLR accepts and sends GSUP LU Req to HLR
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_AUTH_RESP
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_AUTH_RESP
 DREF IMSI-901700000010650: MSC conn use + dtap == 1 (0x2: dtap)
 DRLL Dispatching 04.08 message GSM48_MT_MM_AUTH_RESP (0x5:0x14)
 DMM IMSI-901700000010650: MM UMTS AUTHENTICATION RESPONSE (res = 1df5f0b4f22b696e)
@@ -1128,7 +1128,7 @@ DREF VLR subscr IMSI-901700000010650_MSISDN-42342 usage increases to: 2
   vsub->tmsi == 0xffffffff
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342 usage decreases to: 1
 - MS sends TMSI Realloc Complete
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_TMSI_REALL_COMPL
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_TMSI_REALL_COMPL
 DREF IMSI-901700000010650_MSISDN-42342: MSC conn use + dtap == 1 (0x2: dtap)
 DRLL Dispatching 04.08 message GSM48_MT_MM_TMSI_REALL_COMPL (0x5:0x1b)
 DMM TMSI Reallocation Completed. Subscriber: IMSI-901700000010650_MSISDN-42342
@@ -1149,7 +1149,7 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000010650_MSISDN-42342_LU){RAN_CONN_S_ACCEPTED
 DREF IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: MSC conn use + release == 2 (0x102: dtap,release)
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 usage increases to: 3
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 usage decreases to: 2
-- BSSAP Clear --RAN_GERAN_A--> MS
+- BSSAP Clear --GERAN-A--> MS
 DREF IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: MSC conn use - dtap == 1 (0x100: release)
   bssap_clear_sent == 1
 - BSS sends BSSMAP Clear Complete
@@ -1176,7 +1176,7 @@ talloc_total_blocks(tall_bsc_ctx) == 13
 
 ===== test_umts_authen_resync_utran
 - Location Update request causes a GSUP Send Auth Info request to HLR
-  MSC <--RAN_UTRAN_IU-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
+  MSC <--UTRAN-Iu-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -1225,7 +1225,7 @@ DREF VLR subscr IMSI-901700000010650 usage decreases to: 1
   auth_request_sent == 1
   lu_result_sent == 0
 - MS sends Authen Failure with Resync cause, VLR sends GSUP to HLR to resync
-  MSC <--RAN_UTRAN_IU-- MS: GSM48_MT_MM_AUTH_FAIL
+  MSC <--UTRAN-Iu-- MS: GSM48_MT_MM_AUTH_FAIL
 DREF IMSI-901700000010650: MSC conn use + dtap == 1 (0x2: dtap)
 DRLL Dispatching 04.08 message GSM48_MT_MM_AUTH_FAIL (0x5:0x1c)
 DMM IMSI-901700000010650: MM R99 AUTHENTICATION SYNCH (AUTS = 979498b1f72d3e28c59fa2e72f9c)
@@ -1256,7 +1256,7 @@ DREF VLR subscr IMSI-901700000010650 usage decreases to: 1
   auth_request_sent == 1
   lu_result_sent == 0
 - MS sends Authen Response, VLR accepts and sends SecurityModeControl
-  MSC <--RAN_UTRAN_IU-- MS: GSM48_MT_MM_AUTH_RESP
+  MSC <--UTRAN-Iu-- MS: GSM48_MT_MM_AUTH_RESP
 DREF IMSI-901700000010650: MSC conn use + dtap == 1 (0x2: dtap)
 DRLL Dispatching 04.08 message GSM48_MT_MM_AUTH_RESP (0x5:0x14)
 DMM IMSI-901700000010650: MM UMTS AUTHENTICATION RESPONSE (res = 1df5f0b4f22b696e)
@@ -1286,7 +1286,7 @@ DMM <- SECURITY MODE COMPLETE IMSI-901700000010650
 DVLR vlr_lu_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU){VLR_ULA_S_WAIT_CIPH}: Received Event VLR_ULA_E_CIPH_RES
 DVLR vlr_lu_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU){VLR_ULA_S_WAIT_CIPH}: vlr_loc_upd_post_ciph()
 DIUCS IMSI-901700000010650: tx CommonID 901700000010650
-- Iu Common ID --RAN_UTRAN_IU--> MS (IMSI=901700000010650)
+- Iu Common ID --UTRAN-Iu--> MS (IMSI=901700000010650)
 DVLR vlr_lu_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU){VLR_ULA_S_WAIT_CIPH}: vlr_loc_upd_node_4()
 DVLR vlr_lu_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU){VLR_ULA_S_WAIT_CIPH}: state_chg to VLR_ULA_S_WAIT_HLR_UPD
 DVLR upd_hlr_vlr_fsm(UTRAN-Iu-42_IMSI-901700000010650_LU){UPD_HLR_VLR_S_INIT}: Allocated
@@ -1353,7 +1353,7 @@ DREF VLR subscr IMSI-901700000010650_MSISDN-42342 usage increases to: 2
   vsub->tmsi == 0xffffffff
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342 usage decreases to: 1
 - MS sends TMSI Realloc Complete
-  MSC <--RAN_UTRAN_IU-- MS: GSM48_MT_MM_TMSI_REALL_COMPL
+  MSC <--UTRAN-Iu-- MS: GSM48_MT_MM_TMSI_REALL_COMPL
 DREF IMSI-901700000010650_MSISDN-42342: MSC conn use + dtap == 1 (0x2: dtap)
 DRLL Dispatching 04.08 message GSM48_MT_MM_TMSI_REALL_COMPL (0x5:0x1b)
 DMM TMSI Reallocation Completed. Subscriber: IMSI-901700000010650_MSISDN-42342
@@ -1374,7 +1374,7 @@ DMM RAN_conn(UTRAN-Iu-42_IMSI-901700000010650_MSISDN-42342_LU){RAN_CONN_S_ACCEPT
 DREF IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: MSC conn use + release == 2 (0x102: dtap,release)
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 usage increases to: 3
 DREF VLR subscr IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100 usage decreases to: 2
-- Iu Release --RAN_UTRAN_IU--> MS
+- Iu Release --UTRAN-Iu--> MS
 DREF IMSI-901700000010650_MSISDN-42342_TMSI-0x03020100: MSC conn use - dtap == 1 (0x100: release)
   iu_release_sent == 1
 - RNC sends Iu Release Complete
@@ -1401,7 +1401,7 @@ talloc_total_blocks(tall_bsc_ctx) == 13
 
 ===== test_umts_authen_too_short_res_geran
 - Location Update request causes a GSUP Send Auth Info request to HLR
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -1450,7 +1450,7 @@ DREF VLR subscr IMSI-901700000010650 usage decreases to: 1
   auth_request_sent == 1
   lu_result_sent == 0
 - MS sends Authen Response of wrong RES size, VLR thwarts
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_AUTH_RESP
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_AUTH_RESP
 DREF IMSI-901700000010650: MSC conn use + dtap == 1 (0x2: dtap)
 DRLL Dispatching 04.08 message GSM48_MT_MM_AUTH_RESP (0x5:0x14)
 DMM IMSI-901700000010650: MM UMTS AUTHENTICATION RESPONSE (res = e229c19e791f2e)
@@ -1473,7 +1473,7 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000010650_LU){RAN_CONN_S_AUTH_CIPH}: state_chg
 DREF IMSI-901700000010650: MSC conn use + release == 2 (0x102: dtap,release)
 DREF VLR subscr IMSI-901700000010650 usage increases to: 2
 DREF VLR subscr IMSI-901700000010650 usage decreases to: 1
-- BSSAP Clear --RAN_GERAN_A--> MS
+- BSSAP Clear --GERAN-A--> MS
 DREF IMSI-901700000010650: MSC conn use - dtap == 1 (0x100: release)
   lu_result_sent == 2
   bssap_clear_sent == 1
@@ -1500,7 +1500,7 @@ talloc_total_blocks(tall_bsc_ctx) == 13
 
 ===== test_umts_authen_too_short_res_utran
 - Location Update request causes a GSUP Send Auth Info request to HLR
-  MSC <--RAN_UTRAN_IU-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
+  MSC <--UTRAN-Iu-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -1549,7 +1549,7 @@ DREF VLR subscr IMSI-901700000010650 usage decreases to: 1
   auth_request_sent == 1
   lu_result_sent == 0
 - MS sends Authen Response of wrong RES size, VLR thwarts
-  MSC <--RAN_UTRAN_IU-- MS: GSM48_MT_MM_AUTH_RESP
+  MSC <--UTRAN-Iu-- MS: GSM48_MT_MM_AUTH_RESP
 DREF IMSI-901700000010650: MSC conn use + dtap == 1 (0x2: dtap)
 DRLL Dispatching 04.08 message GSM48_MT_MM_AUTH_RESP (0x5:0x14)
 DMM IMSI-901700000010650: MM UMTS AUTHENTICATION RESPONSE (res = e229c19e791f2e)
@@ -1572,7 +1572,7 @@ DMM RAN_conn(UTRAN-Iu-42_IMSI-901700000010650_LU){RAN_CONN_S_AUTH_CIPH}: state_c
 DREF IMSI-901700000010650: MSC conn use + release == 2 (0x102: dtap,release)
 DREF VLR subscr IMSI-901700000010650 usage increases to: 2
 DREF VLR subscr IMSI-901700000010650 usage decreases to: 1
-- Iu Release --RAN_UTRAN_IU--> MS
+- Iu Release --UTRAN-Iu--> MS
 DREF IMSI-901700000010650: MSC conn use - dtap == 1 (0x100: release)
   lu_result_sent == 2
   iu_release_sent == 1
@@ -1599,7 +1599,7 @@ talloc_total_blocks(tall_bsc_ctx) == 13
 
 ===== test_umts_authen_too_long_res_geran
 - Location Update request causes a GSUP Send Auth Info request to HLR
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -1648,7 +1648,7 @@ DREF VLR subscr IMSI-901700000010650 usage decreases to: 1
   auth_request_sent == 1
   lu_result_sent == 0
 - MS sends Authen Response of wrong RES size, VLR thwarts
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_AUTH_RESP
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_AUTH_RESP
 DREF IMSI-901700000010650: MSC conn use + dtap == 1 (0x2: dtap)
 DRLL Dispatching 04.08 message GSM48_MT_MM_AUTH_RESP (0x5:0x14)
 DMM IMSI-901700000010650: MM UMTS AUTHENTICATION RESPONSE (res = e229c19e791f2e4123)
@@ -1671,7 +1671,7 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000010650_LU){RAN_CONN_S_AUTH_CIPH}: state_chg
 DREF IMSI-901700000010650: MSC conn use + release == 2 (0x102: dtap,release)
 DREF VLR subscr IMSI-901700000010650 usage increases to: 2
 DREF VLR subscr IMSI-901700000010650 usage decreases to: 1
-- BSSAP Clear --RAN_GERAN_A--> MS
+- BSSAP Clear --GERAN-A--> MS
 DREF IMSI-901700000010650: MSC conn use - dtap == 1 (0x100: release)
   lu_result_sent == 2
   bssap_clear_sent == 1
@@ -1698,7 +1698,7 @@ talloc_total_blocks(tall_bsc_ctx) == 13
 
 ===== test_umts_authen_too_long_res_utran
 - Location Update request causes a GSUP Send Auth Info request to HLR
-  MSC <--RAN_UTRAN_IU-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
+  MSC <--UTRAN-Iu-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -1747,7 +1747,7 @@ DREF VLR subscr IMSI-901700000010650 usage decreases to: 1
   auth_request_sent == 1
   lu_result_sent == 0
 - MS sends Authen Response of wrong RES size, VLR thwarts
-  MSC <--RAN_UTRAN_IU-- MS: GSM48_MT_MM_AUTH_RESP
+  MSC <--UTRAN-Iu-- MS: GSM48_MT_MM_AUTH_RESP
 DREF IMSI-901700000010650: MSC conn use + dtap == 1 (0x2: dtap)
 DRLL Dispatching 04.08 message GSM48_MT_MM_AUTH_RESP (0x5:0x14)
 DMM IMSI-901700000010650: MM UMTS AUTHENTICATION RESPONSE (res = e229c19e791f2e4123)
@@ -1770,7 +1770,7 @@ DMM RAN_conn(UTRAN-Iu-42_IMSI-901700000010650_LU){RAN_CONN_S_AUTH_CIPH}: state_c
 DREF IMSI-901700000010650: MSC conn use + release == 2 (0x102: dtap,release)
 DREF VLR subscr IMSI-901700000010650 usage increases to: 2
 DREF VLR subscr IMSI-901700000010650 usage decreases to: 1
-- Iu Release --RAN_UTRAN_IU--> MS
+- Iu Release --UTRAN-Iu--> MS
 DREF IMSI-901700000010650: MSC conn use - dtap == 1 (0x100: release)
   lu_result_sent == 2
   iu_release_sent == 1
@@ -1797,7 +1797,7 @@ talloc_total_blocks(tall_bsc_ctx) == 13
 
 ===== test_umts_authen_only_sres_geran
 - Location Update request causes a GSUP Send Auth Info request to HLR
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -1846,7 +1846,7 @@ DREF VLR subscr IMSI-901700000010650 usage decreases to: 1
   auth_request_sent == 1
   lu_result_sent == 0
 - MS sends Authen Response of wrong RES size, VLR thwarts: GERAN reports an SRES mismatch
-  MSC <--RAN_GERAN_A-- MS: GSM48_MT_MM_AUTH_RESP
+  MSC <--GERAN-A-- MS: GSM48_MT_MM_AUTH_RESP
 DREF IMSI-901700000010650: MSC conn use + dtap == 1 (0x2: dtap)
 DRLL Dispatching 04.08 message GSM48_MT_MM_AUTH_RESP (0x5:0x14)
 DMM IMSI-901700000010650: MM GSM AUTHENTICATION RESPONSE (sres = e229c19e)
@@ -1869,7 +1869,7 @@ DMM RAN_conn(GERAN-A-0_IMSI-901700000010650_LU){RAN_CONN_S_AUTH_CIPH}: state_chg
 DREF IMSI-901700000010650: MSC conn use + release == 2 (0x102: dtap,release)
 DREF VLR subscr IMSI-901700000010650 usage increases to: 2
 DREF VLR subscr IMSI-901700000010650 usage decreases to: 1
-- BSSAP Clear --RAN_GERAN_A--> MS
+- BSSAP Clear --GERAN-A--> MS
 DREF IMSI-901700000010650: MSC conn use - dtap == 1 (0x100: release)
   lu_result_sent == 2
   bssap_clear_sent == 1
@@ -1896,7 +1896,7 @@ talloc_total_blocks(tall_bsc_ctx) == 13
 
 ===== test_umts_authen_only_sres_utran
 - Location Update request causes a GSUP Send Auth Info request to HLR
-  MSC <--RAN_UTRAN_IU-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
+  MSC <--UTRAN-Iu-- MS: GSM48_MT_MM_LOC_UPD_REQUEST
   new conn
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
@@ -1945,7 +1945,7 @@ DREF VLR subscr IMSI-901700000010650 usage decreases to: 1
   auth_request_sent == 1
   lu_result_sent == 0
 - MS sends Authen Response of wrong RES size, VLR thwarts: UTRAN disallows GSM AKA altogether
-  MSC <--RAN_UTRAN_IU-- MS: GSM48_MT_MM_AUTH_RESP
+  MSC <--UTRAN-Iu-- MS: GSM48_MT_MM_AUTH_RESP
 DREF IMSI-901700000010650: MSC conn use + dtap == 1 (0x2: dtap)
 DRLL Dispatching 04.08 message GSM48_MT_MM_AUTH_RESP (0x5:0x14)
 DMM IMSI-901700000010650: MM GSM AUTHENTICATION RESPONSE (sres = e229c19e)
@@ -1968,7 +1968,7 @@ DMM RAN_conn(UTRAN-Iu-42_IMSI-901700000010650_LU){RAN_CONN_S_AUTH_CIPH}: state_c
 DREF IMSI-901700000010650: MSC conn use + release == 2 (0x102: dtap,release)
 DREF VLR subscr IMSI-901700000010650 usage increases to: 2
 DREF VLR subscr IMSI-901700000010650 usage decreases to: 1
-- Iu Release --RAN_UTRAN_IU--> MS
+- Iu Release --UTRAN-Iu--> MS
 DREF IMSI-901700000010650: MSC conn use - dtap == 1 (0x100: release)
   lu_result_sent == 2
   iu_release_sent == 1
diff --git a/tests/msc_vlr/msc_vlr_tests.c b/tests/msc_vlr/msc_vlr_tests.c
index 9de64f6dc..6b2ee74d4 100644
--- a/tests/msc_vlr/msc_vlr_tests.c
+++ b/tests/msc_vlr/msc_vlr_tests.c
@@ -178,7 +178,7 @@ bool conn_exists(const struct ran_conn *conn)
 
 /* Simplified version of the cm_service_request_concludes() */
 void conn_conclude_cm_service_req(struct ran_conn *conn,
-				  enum ran_type via_ran)
+				  enum osmo_rat_type via_ran)
 {
 	btw("Concluding CM Service Request");
 
@@ -191,13 +191,13 @@ void conn_conclude_cm_service_req(struct ran_conn *conn,
 	ASSERT_RELEASE_CLEAR(via_ran);
 }
 
-enum ran_type rx_from_ran = RAN_GERAN_A;
+enum osmo_rat_type rx_from_ran = OSMO_RAT_GERAN_A;
 
 struct ran_conn *conn_new(void)
 {
 	struct ran_conn *conn;
 	conn = ran_conn_alloc(net, rx_from_ran, 23);
-	if (conn->via_ran == RAN_UTRAN_IU) {
+	if (conn->via_ran == OSMO_RAT_UTRAN_IU) {
 		struct ranap_ue_conn_ctx *ue_ctx = talloc_zero(conn, struct ranap_ue_conn_ctx);
 		*ue_ctx = (struct ranap_ue_conn_ctx){
 			.conn_id = 42,
@@ -214,7 +214,7 @@ void rx_from_ms(struct msgb *msg)
 	struct gsm48_hdr *gh = msgb_l3(msg);
 
 	log("MSC <--%s-- MS: %s",
-	    ran_type_name(rx_from_ran),
+	    osmo_rat_type_name(rx_from_ran),
 	    gh_type_name(gh));
 
 	if (!conn_exists(g_conn))
@@ -358,10 +358,10 @@ void paging_expect_tmsi(uint32_t tmsi)
 	paging_expecting_imsi = NULL;
 }
 
-static int _paging_sent(enum ran_type via_ran, const char *imsi, uint32_t tmsi, uint32_t lac)
+static int _paging_sent(enum osmo_rat_type via_ran, const char *imsi, uint32_t tmsi, uint32_t lac)
 {
 	log("%s sends out paging request to IMSI %s, TMSI 0x%08x, LAC %u",
-	    ran_type_name(via_ran), imsi, tmsi, lac);
+	    osmo_rat_type_name(via_ran), imsi, tmsi, lac);
 	OSMO_ASSERT(paging_expecting_imsi || (paging_expecting_tmsi != GSM_RESERVED_TMSI));
 	if (paging_expecting_imsi)
 		VERBOSE_ASSERT(strcmp(paging_expecting_imsi, imsi), == 0, "%d");
@@ -377,14 +377,14 @@ static int _paging_sent(enum ran_type via_ran, const char *imsi, uint32_t tmsi,
 int __real_ranap_iu_page_cs(const char *imsi, const uint32_t *tmsi, uint16_t lac);
 int __wrap_ranap_iu_page_cs(const char *imsi, const uint32_t *tmsi, uint16_t lac)
 {
-	return _paging_sent(RAN_UTRAN_IU, imsi, tmsi ? *tmsi : GSM_RESERVED_TMSI, lac);
+	return _paging_sent(OSMO_RAT_UTRAN_IU, imsi, tmsi ? *tmsi : GSM_RESERVED_TMSI, lac);
 }
 
 /* override, requires '-Wl,--wrap=a_iface_tx_paging' */
 int __real_a_iface_tx_paging(const char *imsi, uint32_t tmsi, uint16_t lac);
 int __wrap_a_iface_tx_paging(const char *imsi, uint32_t tmsi, uint16_t lac)
 {
-	return _paging_sent(RAN_GERAN_A, imsi, tmsi, lac);
+	return _paging_sent(OSMO_RAT_GERAN_A, imsi, tmsi, lac);
 }
 
 /* override, requires '-Wl,--wrap=msc_stop_paging' */
@@ -437,7 +437,7 @@ void clear_vlr()
 	net->vlr->cfg.auth_tuple_max_reuse_count = 0;
 	net->vlr->cfg.auth_reuse_old_sets_on_error = false;
 
-	rx_from_ran = RAN_GERAN_A;
+	rx_from_ran = OSMO_RAT_GERAN_A;
 	auth_request_sent = false;
 	auth_request_expect_rand = NULL;
 	auth_request_expect_autn = NULL;
@@ -581,10 +581,10 @@ int __wrap_osmo_gsup_client_send(struct osmo_gsup_client *gsupc, struct msgb *ms
 	return 0;
 }
 
-static int _validate_dtap(struct msgb *msg, enum ran_type to_ran)
+static int _validate_dtap(struct msgb *msg, enum osmo_rat_type to_ran)
 {
 	btw("DTAP --%s--> MS: %s: %s",
-	    ran_type_name(to_ran), gh_type_name((void*)msg->data),
+	    osmo_rat_type_name(to_ran), gh_type_name((void*)msg->data),
 	    osmo_hexdump_nospc(msg->data, msg->len));
 
 	OSMO_ASSERT(dtap_tx_expected);
@@ -612,14 +612,14 @@ static int _validate_dtap(struct msgb *msg, enum ran_type to_ran)
 int __real_ranap_iu_tx(struct msgb *msg, uint8_t sapi);
 int __wrap_ranap_iu_tx(struct msgb *msg, uint8_t sapi)
 {
-	return _validate_dtap(msg, RAN_UTRAN_IU);
+	return _validate_dtap(msg, OSMO_RAT_UTRAN_IU);
 }
 
 /* override, requires '-Wl,--wrap=ranap_iu_tx_release' */
 int __real_ranap_iu_tx_release(struct ranap_ue_conn_ctx *ctx, const struct RANAP_Cause *cause);
 int __wrap_ranap_iu_tx_release(struct ranap_ue_conn_ctx *ctx, const struct RANAP_Cause *cause)
 {
-	btw("Iu Release --%s--> MS", ran_type_name(RAN_UTRAN_IU));
+	btw("Iu Release --%s--> MS", osmo_rat_type_name(OSMO_RAT_UTRAN_IU));
 	OSMO_ASSERT(iu_release_expected);
 	iu_release_expected = false;
 	iu_release_sent = true;
@@ -630,7 +630,7 @@ int __wrap_ranap_iu_tx_release(struct ranap_ue_conn_ctx *ctx, const struct RANAP
 int __real_ranap_iu_tx_common_id(struct ranap_ue_conn_ctx *ue_ctx, const char *imsi);
 int __wrap_ranap_iu_tx_common_id(struct ranap_ue_conn_ctx *ue_ctx, const char *imsi)
 {
-	btw("Iu Common ID --%s--> MS (IMSI=%s)", ran_type_name(RAN_UTRAN_IU), imsi);
+	btw("Iu Common ID --%s--> MS (IMSI=%s)", osmo_rat_type_name(OSMO_RAT_UTRAN_IU), imsi);
 	return 0;
 }
 
@@ -638,14 +638,14 @@ int __wrap_ranap_iu_tx_common_id(struct ranap_ue_conn_ctx *ue_ctx, const char *i
 int __real_a_iface_tx_dtap(struct msgb *msg);
 int __wrap_a_iface_tx_dtap(struct msgb *msg)
 {
-	return _validate_dtap(msg, RAN_GERAN_A);
+	return _validate_dtap(msg, OSMO_RAT_GERAN_A);
 }
 
 /* override, requires '-Wl,--wrap=a_iface_tx_clear_cmd' */
 int __real_a_iface_tx_clear_cmd(struct ran_conn *conn);
 int __wrap_a_iface_tx_clear_cmd(struct ran_conn *conn)
 {
-	btw("BSSAP Clear --%s--> MS", ran_type_name(RAN_GERAN_A));
+	btw("BSSAP Clear --%s--> MS", osmo_rat_type_name(OSMO_RAT_GERAN_A));
 	OSMO_ASSERT(bssap_clear_expected);
 	bssap_clear_expected = false;
 	bssap_clear_sent = true;
@@ -824,7 +824,7 @@ static int fake_vlr_tx_ciph_mode_cmd(void *msc_conn_ref, bool umts_aka, bool ret
 	/* If we built without support for IU, fake the IU part here. The root cause is that we don't
 	 * have differing sets of expected outputs for --enable-iu and --disable-iu. */
 	struct ran_conn *conn = msc_conn_ref;
-	if (conn->via_ran == RAN_UTRAN_IU) {
+	if (conn->via_ran == OSMO_RAT_UTRAN_IU) {
 		DEBUGP(DMM, "-> SECURITY MODE CONTROL %s\n", vlr_subscr_name(conn->vsub));
 		rc = __wrap_ranap_iu_tx_sec_mode_cmd(conn->iu.ue_ctx, &conn->vsub->last_tuple->vec,
 						     0, 1);
@@ -839,7 +839,7 @@ static int fake_vlr_tx_ciph_mode_cmd(void *msc_conn_ref, bool umts_aka, bool ret
 void ms_sends_security_mode_complete()
 {
 	OSMO_ASSERT(g_conn);
-	OSMO_ASSERT(g_conn->via_ran == RAN_UTRAN_IU);
+	OSMO_ASSERT(g_conn->via_ran == OSMO_RAT_UTRAN_IU);
 	OSMO_ASSERT(g_conn->iu.ue_ctx);
 	ran_conn_rx_sec_mode_compl(g_conn);
 }
@@ -848,7 +848,7 @@ void bss_sends_clear_complete()
 {
 	btw("BSS sends BSSMAP Clear Complete");
 	OSMO_ASSERT(g_conn);
-	OSMO_ASSERT(g_conn->via_ran == RAN_GERAN_A);
+	OSMO_ASSERT(g_conn->via_ran == OSMO_RAT_GERAN_A);
 	ran_conn_rx_bssmap_clear_complete(g_conn);
 }
 
@@ -856,7 +856,7 @@ void rnc_sends_release_complete()
 {
 	btw("RNC sends Iu Release Complete");
 	OSMO_ASSERT(g_conn);
-	OSMO_ASSERT(g_conn->via_ran == RAN_UTRAN_IU);
+	OSMO_ASSERT(g_conn->via_ran == OSMO_RAT_UTRAN_IU);
 	ran_conn_rx_iu_release_complete(g_conn);
 }
 
diff --git a/tests/msc_vlr/msc_vlr_tests.h b/tests/msc_vlr/msc_vlr_tests.h
index 7eb6d240a..b35053c6f 100644
--- a/tests/msc_vlr/msc_vlr_tests.h
+++ b/tests/msc_vlr/msc_vlr_tests.h
@@ -53,7 +53,7 @@ extern struct gsm_network *net;
 extern struct gsm_bts *the_bts;
 extern void *msgb_ctx;
 
-extern enum ran_type rx_from_ran;
+extern enum osmo_rat_type rx_from_ran;
 
 extern const char *gsup_tx_expected;
 extern bool gsup_tx_confirmed;
@@ -125,13 +125,13 @@ static inline void expect_bssap_clear()
 	bssap_clear_sent = false;
 }
 
-static inline void expect_release_clear(enum ran_type via_ran)
+static inline void expect_release_clear(enum osmo_rat_type via_ran)
 {
 	switch (via_ran) {
-	case RAN_GERAN_A:
+	case OSMO_RAT_GERAN_A:
 		expect_bssap_clear();
 		return;
-	case RAN_UTRAN_IU:
+	case OSMO_RAT_UTRAN_IU:
 		expect_iu_release();
 		return;
 	default:
@@ -153,7 +153,7 @@ struct msgb *msgb_from_hex(const char *label, uint16_t size, const char *hex);
 void clear_vlr();
 bool conn_exists(const struct ran_conn *conn);
 void conn_conclude_cm_service_req(struct ran_conn *conn,
-				  enum ran_type via_ran);
+				  enum osmo_rat_type via_ran);
 
 void dtap_expect_tx(const char *hex);
 void dtap_expect_tx_ussd(char *ussd_text);
@@ -234,10 +234,10 @@ extern const struct timeval fake_time_start_time;
 
 #define ASSERT_RELEASE_CLEAR(via_ran) \
 	switch (via_ran) { \
-	case RAN_GERAN_A: \
+	case OSMO_RAT_GERAN_A: \
 		VERBOSE_ASSERT(bssap_clear_sent, == true, "%d"); \
 		break; \
-	case RAN_UTRAN_IU: \
+	case OSMO_RAT_UTRAN_IU: \
 		VERBOSE_ASSERT(iu_release_sent, == true, "%d"); \
 		break; \
 	default: \
@@ -245,13 +245,13 @@ extern const struct timeval fake_time_start_time;
 		break; \
 	}
 
-static inline void bss_rnc_sends_release_clear_complete(enum ran_type via_ran)
+static inline void bss_rnc_sends_release_clear_complete(enum osmo_rat_type via_ran)
 {
 	switch (via_ran) {
-	case RAN_GERAN_A:
+	case OSMO_RAT_GERAN_A:
 		bss_sends_clear_complete();
 		return;
-	case RAN_UTRAN_IU:
+	case OSMO_RAT_UTRAN_IU:
 		rnc_sends_release_complete();
 		return;
 	default: