diff --git a/upf/UPF_Tests.ttcn b/upf/UPF_Tests.ttcn
index ca1a0f6..fb4ef08 100644
--- a/upf/UPF_Tests.ttcn
+++ b/upf/UPF_Tests.ttcn
@@ -163,6 +163,7 @@
 }
 
 type record GTP_Action {
+	/* kind = ("tunend"|"tunmap") */
 	charstring kind,
 	charstring gtp_access_ip,
 	OCT4 teid_access_r,
@@ -629,7 +630,7 @@
 }
 
 /* Return a rule set that does GTP encapsulation/decapsulation */
-private function f_ruleset_endecaps(GTP_Action gtp) return PFCP_Ruleset
+private function f_ruleset_tunend(GTP_Action gtp) return PFCP_Ruleset
 {
 	var PFCP_Ruleset rules := { {}, {} };
 	f_ruleset_add_GTP_decaps(rules, ts_PFCP_F_TEID_ipv4(gtp.teid_access_l, gtp.gtp_access_ip));
@@ -655,7 +656,7 @@
 		up_seid := -,
 		cp_seid := f_next_seid(),
 		gtp := {
-			kind := "endecaps",
+			kind := "tunend",
 			gtp_access_ip := "127.0.0.2",
 			teid_access_r := f_next_remote_teid(),
 			teid_access_l := f_next_local_teid(),
@@ -671,7 +672,7 @@
 private function f_session_est_default() runs on CPF_ConnHdlr return PFCP_session
 {
 	var PFCP_session s := f_create_PFCP_session();
-	f_session_est(s, f_ruleset_endecaps(s.gtp));
+	f_session_est(s, f_ruleset_tunend(s.gtp));
 	return s;
 }