diff --git a/bsc-nat/BSC_MS_Simulation.ttcn b/bsc-nat/BSC_MS_Simulation.ttcn
index 2f1961b..c45b5ac 100644
--- a/bsc-nat/BSC_MS_Simulation.ttcn
+++ b/bsc-nat/BSC_MS_Simulation.ttcn
@@ -9,7 +9,7 @@
 import from SCCP_Emulation all;
 
 import from BSSAP_CodecPort all;
-import from BSSMAP_Emulation all;
+import from RAN_Emulation all;
 
 import from BSC_MS_ConnectionHandler all;
 
@@ -17,7 +17,7 @@
 	/* component references */
 	var IPA_Emulation_CT vc_IPA;
 	var SCCP_CT vc_SCCP;
-	var BSSMAP_Emulation_CT vc_BSSMAP;
+	var RAN_Emulation_CT vc_BSSMAP;
 	/* test port to SCCP emulation */
 	port SCCPasp_PT SCCP;
 
@@ -48,7 +48,7 @@
 	/* create components for IPA/SCCP/BSS[M]AP stack */
 	vc_IPA := IPA_Emulation_CT.create(id & "-IPA");
 	vc_SCCP := SCCP_CT.create(id & "-SCCP");
-	vc_BSSMAP := BSSMAP_Emulation_CT.create(id & "-BSSMAP");
+	vc_BSSMAP := RAN_Emulation_CT.create(id & "-BSSMAP");
 
 	map(vc_IPA:IPA_PORT, system:IPA_CODEC_PT);
 
@@ -64,7 +64,7 @@
 	/* start components */
 	vc_IPA.start(IPA_Emulation.main_client(remote_ip, remote_port, local_ip, local_port, ccm_pars));
 	vc_SCCP.start(SCCPStart(sccp_pars));
-	vc_BSSMAP.start(BSSMAP_Emulation.main(BSC_MS_ConnectionHandler.BSC_MS_BssmapOps, id));
+	vc_BSSMAP.start(RAN_Emulation.main(BSC_MS_ConnectionHandler.BSC_MS_RanOps, id));
 
 	/* Initial delay to wait for IPA connection establishment */
 	T.start(2.0);