diff --git a/tests/rlcmac/RLCMACTest.cpp b/tests/rlcmac/RLCMACTest.cpp
index 140b2f2..c6ad192 100644
--- a/tests/rlcmac/RLCMACTest.cpp
+++ b/tests/rlcmac/RLCMACTest.cpp
@@ -259,8 +259,8 @@
         OSMO_ASSERT(data.Count_MS_RA_capability_value == 1);
 
         /* Make sure GPRS / EGPRS multislot class is parsed correctly */
-        printf("GPRS multislot class = %u\n", Decoding::get_ms_class_by_capability(&data));
-        printf("EGPRS multislot class = %u\n", Decoding::get_egprs_ms_class_by_capability(&data));
+        printf("GPRS multislot class = %u\n", get_ms_class_by_capability(&data));
+        printf("EGPRS multislot class = %u\n", get_egprs_ms_class_by_capability(&data));
 
         /* Test encoding of decoded MS RA Capability */
         printf("=== Test encoding of MS RA Capability ===\n");
@@ -466,8 +466,8 @@
 	OSMO_ASSERT(data.Count_MS_RA_capability_value == 3);
 
 	/* Make sure GPRS / EGPRS multislot class is parsed correctly */
-	printf("GPRS multislot class = %u\n", Decoding::get_ms_class_by_capability(&data));
-	printf("EGPRS multislot class = %u\n", Decoding::get_egprs_ms_class_by_capability(&data));
+	printf("GPRS multislot class = %u\n", get_ms_class_by_capability(&data));
+	printf("EGPRS multislot class = %u\n", get_egprs_ms_class_by_capability(&data));
 
 	bitvec_free(bv_dec);
 }
diff --git a/tests/tbf/TbfTest.cpp b/tests/tbf/TbfTest.cpp
index ef26862..fbcb503 100644
--- a/tests/tbf/TbfTest.cpp
+++ b/tests/tbf/TbfTest.cpp
@@ -500,7 +500,7 @@
 
 		snprintf(imsi, sizeof(imsi), "001001%09d", i);
 
-		rc = gprs_rlcmac_dl_tbf::handle(bts, tlli, 0, imsi, ms_class, 0,
+		rc = dl_tbf_handle(bts, tlli, 0, imsi, ms_class, 0,
 			delay_csec, buf, sizeof(buf));
 
 		if (rc < 0)
@@ -545,7 +545,7 @@
 
 	/* Handle LLC frame 1 */
 	memset(buf, 1, sizeof(buf));
-	rc = gprs_rlcmac_dl_tbf::handle(bts, tlli, 0, imsi, ms_class, 0,
+	rc = dl_tbf_handle(bts, tlli, 0, imsi, ms_class, 0,
 		delay_csec, buf, sizeof(buf));
 	OSMO_ASSERT(rc >= 0);
 
@@ -556,7 +556,7 @@
 
 	/* Handle LLC frame 2 */
 	memset(buf, 2, sizeof(buf));
-	rc = gprs_rlcmac_dl_tbf::handle(bts, tlli, 0, imsi, ms_class, 0,
+	rc = dl_tbf_handle(bts, tlli, 0, imsi, ms_class, 0,
 		delay_csec, buf, sizeof(buf));
 	OSMO_ASSERT(rc >= 0);
 
@@ -565,7 +565,7 @@
 
 	/* Handle LLC frame 3 */
 	memset(buf, 3, sizeof(buf));
-	rc = gprs_rlcmac_dl_tbf::handle(bts, tlli, 0, imsi, ms_class, 0,
+	rc = dl_tbf_handle(bts, tlli, 0, imsi, ms_class, 0,
 		delay_csec, buf, sizeof(buf));
 	OSMO_ASSERT(rc >= 0);
 
@@ -1651,7 +1651,7 @@
 
 	ms = bts_ms_store(bts)->get_ms(tlli, 0, imsi);
 
-	gprs_rlcmac_dl_tbf::handle(bts, tlli, 0, imsi, 0, 0,
+	dl_tbf_handle(bts, tlli, 0, imsi, 0, 0,
 		1000, data, data_size);
 
 	ms = bts_ms_by_imsi(bts, imsi);
@@ -2206,7 +2206,7 @@
 	gprs_bssgp_init(bts, 3234, 3234, 1, 1, false, 0, 0, 0);
 
 	/* Does not support EGPRS */
-	rc = gprs_rlcmac_dl_tbf::handle(bts, tlli, 0, imsi, ms_class, 0,
+	rc = dl_tbf_handle(bts, tlli, 0, imsi, ms_class, 0,
 		delay_csec, buf, sizeof(buf));
 
 	OSMO_ASSERT(rc == 0);