diff --git a/ggsn_tests/GGSN_Tests.ttcn b/ggsn_tests/GGSN_Tests.ttcn
index 6a61177..68157f3 100644
--- a/ggsn_tests/GGSN_Tests.ttcn
+++ b/ggsn_tests/GGSN_Tests.ttcn
@@ -18,11 +18,14 @@
 	import from Misc_Helpers all;
 	import from IPL4asp_PortType all;
 	import from IPL4asp_Types all;
-	import from GTP_CodecPort all;
-	import from GTP_CodecPort_CtrlFunct all;
-	import from GTP_Templates all;
+	import from GTPv1C_CodecPort all;
+	import from GTPv1U_CodecPort all;
+	import from GTPv1C_CodecPort_CtrlFunct all;
+	import from GTPv1U_CodecPort_CtrlFunct all;
 	import from GTPC_Types all;
 	import from GTPU_Types all;
+	import from GTPv1C_Templates all;
+	import from GTPv1U_Templates all;
 	import from IPCP_Types all;
 	import from PAP_Types all;
 	import from IP_Types all;
@@ -121,8 +124,8 @@
 		var OCT4 g_sgsn_ip_c;
 		var OCT4 g_sgsn_ip_u;
 		/* FIXME: parse remName from config file */
-		var GtpPeer g_peer_c := { connId := 0, remName := m_ggsn_ip_gtpc, remPort := GTP1C_PORT };
-		var GtpPeer g_peer_u := { connId := 0, remName := m_ggsn_ip_gtpu, remPort := GTP1U_PORT };
+		var Gtp1cPeer g_peer_c := { connId := 0, remName := m_ggsn_ip_gtpc, remPort := GTP1C_PORT };
+		var Gtp1uPeer g_peer_u := { connId := 0, remName := m_ggsn_ip_gtpu, remPort := GTP1U_PORT };
 		timer T_default := 3.0;
 
 		/* next to-be-sent GTP-C sequence number */
@@ -279,12 +282,12 @@
 
 		var Result res;
 		map(self:GTPC, system:GTPC);
-		res := GTP_CodecPort_CtrlFunct.f_IPL4_listen(GTPC, m_bind_ip_gtpc, GTP1C_PORT, {udp:={}});
+		res := GTPv1C_CodecPort_CtrlFunct.f_IPL4_listen(GTPC, m_bind_ip_gtpc, GTP1C_PORT, {udp:={}});
 		log("GTP1C ConnectionID: ", res.connId);
 		g_peer_c.connId := res.connId;
 
 		map(self:GTPU, system:GTPU);
-		res := GTP_CodecPort_CtrlFunct.f_GTPU_listen(GTPU, m_bind_ip_gtpu, GTP1U_PORT, {udp:={}});
+		res := GTPv1U_CodecPort_CtrlFunct.f_GTPU_listen(GTPU, m_bind_ip_gtpu, GTP1U_PORT, {udp:={}});
 		g_peer_u.connId:= res.connId;
 
 		g_restart_ctr := f_rnd_octstring(1);