diff --git a/hnodeb/HNBGW_ConnectionHandler.ttcn b/hnodeb/HNBGW_ConnectionHandler.ttcn
index 8e95616..e256963 100644
--- a/hnodeb/HNBGW_ConnectionHandler.ttcn
+++ b/hnodeb/HNBGW_ConnectionHandler.ttcn
@@ -35,8 +35,8 @@
 import from HNBLLIF_Templates all;
 
 import from GTP_Emulation all;
-import from GTP_Templates all;
-import from GTP_CodecPort all;
+import from GTPv1U_Templates all;
+import from GTPv1U_CodecPort all;
 import from GTPU_Types all;
 
 /* this component represents a single Iuh connection at the HNBGW. */
@@ -192,14 +192,14 @@
 	sac := 4
 }
 
-template (value) GtpPeer ts_GtpPeerU(charstring ip) := {
+template (value) Gtp1uPeer ts_GtpPeerU(charstring ip) := {
 	connId := 1,
 	remName := ip,
 	remPort := GTP1U_PORT
 }
 
 function f_gtpu_send(uint32_t tei, octetstring payload) runs on HNBGW_ConnHdlr {
-	var GtpPeer peer := valueof(ts_GtpPeerU(g_pars.hnodeb_addr));
+	var Gtp1uPeer peer := valueof(ts_GtpPeerU(g_pars.hnodeb_addr));
 	GTP.send(ts_GTP1U_GPDU(peer, 0 /*seq*/, int2oct(tei, 4),  payload));
 }