diff --git a/hnbgw/HNBGW_Tests.ttcn b/hnbgw/HNBGW_Tests.ttcn
index cd8ac7a..91677b1 100644
--- a/hnbgw/HNBGW_Tests.ttcn
+++ b/hnbgw/HNBGW_Tests.ttcn
@@ -800,12 +800,12 @@
 
 private function f_build_initial_ue_with_nas(TestHdlrParams pars, octetstring nas)
   return RANAP_PDU {
-	var LAI lai := {
+	var RANAP_IEs.LAI lai := {
 		pLMNidentity := hex2oct(pars.hnb.lai.mcc_mnc),
 		lAC := int2oct(pars.hnb.lai.lac, 2),
 		iE_Extensions := omit
 	};
-	var SAI sai := {
+	var RANAP_IEs.SAI sai := {
 		pLMNidentity := lai.pLMNidentity,
 		lAC := lai.lAC,
 		sAC := int2oct(pars.hnb.sac, 2),
@@ -818,7 +818,7 @@
 	}
 	var template RANAP_PDU ret;
 	if (pars.ps_domain) {
-		var RAC rac := '00'O;
+		var RANAP_IEs.RAC rac := '00'O;
 		ret := ts_RANAP_initialUE_PS(lai, rac, sai, nas, sigc_id, grnc_id);
 	} else {
 		ret := ts_RANAP_initialUE_CS(lai, sai, nas, sigc_id, grnc_id);