diff --git a/hnbgw/HNBGW_Tests.ttcn b/hnbgw/HNBGW_Tests.ttcn
index 89b243b..cd8ac7a 100644
--- a/hnbgw/HNBGW_Tests.ttcn
+++ b/hnbgw/HNBGW_Tests.ttcn
@@ -560,7 +560,7 @@
 /* helper function to start all of the simulated hNodeBs */
 function f_start_hnbs() runs on test_CT {
 	for (var integer i:= 0; i < g_num_hnbs; i := i+1) {
-		f_hnbap_register(i, i);
+		f_hnbap_hnb_register(i, i);
 	}
 }
 
@@ -887,7 +887,7 @@
  ***********************************************************************/
 
 
-function f_hnbap_register(integer hnb_idx := 0, integer cell_id := 0, boolean expect_reject := false) runs on test_CT
+function f_hnbap_hnb_register(integer hnb_idx := 0, integer cell_id := 0, boolean expect_reject := false) runs on test_CT
 {
 	timer T := 2.0;
 
@@ -926,7 +926,7 @@
 testcase TC_hnb_register() runs on test_CT {
 	g_num_hnbs := 1;
 	f_init(start_hnb := false);
-	f_hnbap_register(0);
+	f_hnbap_hnb_register(0);
 	f_shutdown_helper();
 }
 
@@ -935,8 +935,8 @@
 testcase TC_hnb_register_duplicate() runs on test_CT {
 	g_num_hnbs := 2;
 	f_init(start_hnb := false);
-	f_hnbap_register(0);
-	f_hnbap_register(1, 0, expect_reject := true);
+	f_hnbap_hnb_register(0);
+	f_hnbap_hnb_register(1, 0, expect_reject := true);
 	f_verify_talloc_count(HNBGWVTY, {"struct hnb_context"}, expect_count := 1);
 	f_shutdown_helper();
 }
@@ -947,8 +947,8 @@
 testcase TC_hnb_register_duplicate_reuse_sctp_assoc() runs on test_CT {
 	g_num_hnbs := 1;
 	f_init(start_hnb := false);
-	f_hnbap_register(0);
-	f_hnbap_register(0);
+	f_hnbap_hnb_register(0);
+	f_hnbap_hnb_register(0);
 	f_verify_talloc_count(HNBGWVTY, {"struct hnb_context"}, expect_count := 1);
 	f_shutdown_helper();
 }
@@ -958,9 +958,9 @@
 testcase TC_hnb_reregister_reuse_sctp_assoc() runs on test_CT {
 	g_num_hnbs := 1;
 	f_init(start_hnb := false);
-	f_hnbap_register(0);
+	f_hnbap_hnb_register(0);
 	HNBAP[0].send(ts_HNBAP_HNBDe_Register(ts_HnbapCause(unspecified)));
-	f_hnbap_register(0);
+	f_hnbap_hnb_register(0);
 	f_verify_talloc_count(HNBGWVTY, {"struct hnb_context"}, expect_count := 1);
 	f_shutdown_helper();
 }