diff --git a/tests/msc_vlr/msc_vlr_test_call.c b/tests/msc_vlr/msc_vlr_test_call.c
index dfa3141c6..339233c18 100644
--- a/tests/msc_vlr/msc_vlr_test_call.c
+++ b/tests/msc_vlr/msc_vlr_test_call.c
@@ -43,7 +43,7 @@ static void on_call_release_mncc_sends_to_cc(uint32_t msg_type, struct gsm_mncc
 
 #define IMSI "901700000010650"
 
-static void standard_lu()
+static void lu_utran_tmsi()
 {
 	struct vlr_subscr *vsub;
 
@@ -173,7 +173,7 @@ static void test_call_mo()
 
 	fake_time_start();
 
-	standard_lu();
+	lu_utran_tmsi();
 
 	BTW("after a while, a new conn sends a CM Service Request. VLR responds with Auth Req, 2nd auth vector");
 	auth_request_sent = false;
@@ -291,7 +291,7 @@ static void test_call_mt()
 
 	fake_time_start();
 
-	standard_lu();
+	lu_utran_tmsi();
 
 	BTW("after a while, MNCC asks us to setup a call, causing Paging");
 
@@ -394,7 +394,7 @@ static void test_call_mt2()
 
 	fake_time_start();
 
-	standard_lu();
+	lu_utran_tmsi();
 
 	BTW("after a while, MNCC asks us to setup a call, causing Paging");
 
@@ -489,7 +489,7 @@ static void test_call_mo_to_unknown()
 
 	fake_time_start();
 
-	standard_lu();
+	lu_utran_tmsi();
 
 	BTW("after a while, a new conn sends a CM Service Request. VLR responds with Auth Req, 2nd auth vector");
 	auth_request_sent = false;
@@ -585,7 +585,7 @@ static void test_call_mo_to_unknown_timeout()
 
 	fake_time_start();
 
-	standard_lu();
+	lu_utran_tmsi();
 
 	BTW("after a while, a new conn sends a CM Service Request. VLR responds with Auth Req, 2nd auth vector");
 	auth_request_sent = false;
diff --git a/tests/msc_vlr/msc_vlr_test_call.err b/tests/msc_vlr/msc_vlr_test_call.err
index 07e10a5af..8c394d050 100644
--- a/tests/msc_vlr/msc_vlr_test_call.err
+++ b/tests/msc_vlr/msc_vlr_test_call.err
@@ -189,11 +189,11 @@ DMSC msub_fsm{terminating}: Deferring: will deallocate with msc_a(IMSI-901700000
 DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU){MSC_A_ST_RELEASED}: Deallocated, including all deferred deallocations
 - msub gone
   llist_count(&msub_list) == 0
-DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 + standard_lu: now used by 2 (attached,standard_lu)
+DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 + lu_utran_tmsi: now used by 2 (attached,lu_utran_tmsi)
   vsub != NULL == 1
   strcmp(vsub->imsi, IMSI) == 0
   LAC == 23
-DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 - standard_lu: now used by 1 (attached)
+DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 - lu_utran_tmsi: now used by 1 (attached)
 
 
 - after a while, a new conn sends a CM Service Request. VLR responds with Auth Req, 2nd auth vector
@@ -663,11 +663,11 @@ DMSC msub_fsm{terminating}: Deferring: will deallocate with msc_a(IMSI-901700000
 DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU){MSC_A_ST_RELEASED}: Deallocated, including all deferred deallocations
 - msub gone
   llist_count(&msub_list) == 0
-DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 + standard_lu: now used by 2 (attached,standard_lu)
+DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 + lu_utran_tmsi: now used by 2 (attached,lu_utran_tmsi)
   vsub != NULL == 1
   strcmp(vsub->imsi, IMSI) == 0
   LAC == 23
-DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 - standard_lu: now used by 1 (attached)
+DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 - lu_utran_tmsi: now used by 1 (attached)
 
 
 - after a while, MNCC asks us to setup a call, causing Paging
@@ -1134,11 +1134,11 @@ DMSC msub_fsm{terminating}: Deferring: will deallocate with msc_a(IMSI-901700000
 DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU){MSC_A_ST_RELEASED}: Deallocated, including all deferred deallocations
 - msub gone
   llist_count(&msub_list) == 0
-DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 + standard_lu: now used by 2 (attached,standard_lu)
+DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 + lu_utran_tmsi: now used by 2 (attached,lu_utran_tmsi)
   vsub != NULL == 1
   strcmp(vsub->imsi, IMSI) == 0
   LAC == 23
-DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 - standard_lu: now used by 1 (attached)
+DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 - lu_utran_tmsi: now used by 1 (attached)
 
 
 - after a while, MNCC asks us to setup a call, causing Paging
@@ -1559,11 +1559,11 @@ DMSC msub_fsm{terminating}: Deferring: will deallocate with msc_a(IMSI-901700000
 DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU){MSC_A_ST_RELEASED}: Deallocated, including all deferred deallocations
 - msub gone
   llist_count(&msub_list) == 0
-DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 + standard_lu: now used by 2 (attached,standard_lu)
+DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 + lu_utran_tmsi: now used by 2 (attached,lu_utran_tmsi)
   vsub != NULL == 1
   strcmp(vsub->imsi, IMSI) == 0
   LAC == 23
-DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 - standard_lu: now used by 1 (attached)
+DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 - lu_utran_tmsi: now used by 1 (attached)
 
 
 - after a while, a new conn sends a CM Service Request. VLR responds with Auth Req, 2nd auth vector
@@ -1987,11 +1987,11 @@ DMSC msub_fsm{terminating}: Deferring: will deallocate with msc_a(IMSI-901700000
 DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:LU){MSC_A_ST_RELEASED}: Deallocated, including all deferred deallocations
 - msub gone
   llist_count(&msub_list) == 0
-DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 + standard_lu: now used by 2 (attached,standard_lu)
+DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 + lu_utran_tmsi: now used by 2 (attached,lu_utran_tmsi)
   vsub != NULL == 1
   strcmp(vsub->imsi, IMSI) == 0
   LAC == 23
-DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 - standard_lu: now used by 1 (attached)
+DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 - lu_utran_tmsi: now used by 1 (attached)
 
 
 - after a while, a new conn sends a CM Service Request. VLR responds with Auth Req, 2nd auth vector