diff --git a/library/NS_Emulation.ttcn b/library/NS_Emulation.ttcn
index b8807da..0198da8 100644
--- a/library/NS_Emulation.ttcn
+++ b/library/NS_Emulation.ttcn
@@ -14,8 +14,8 @@
 	import from BSSGP_Types all;
 	import from Osmocom_Gb_Types all;
 	import from NS_Provider_IPL4 all;
+	import from Osmocom_Types all;
 	import from IPL4asp_Types all;
-	import from PCUIF_Types all;
 
 	type record NsUnitdataRequest {
 		BssgpBvci	bvci,
@@ -132,7 +132,7 @@
 	}
 
 	type record NSConfiguration {
-		PCUIF_AddrType remote_proto,
+		AddressFamily address_family,
 		PortNumber local_udp_port,
 		charstring local_ip,
 		PortNumber remote_udp_port,