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

1 files changed, 93 insertions, 93 deletions

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