diff --git a/msc/BSC_ConnectionHandler.ttcn b/msc/BSC_ConnectionHandler.ttcn
index 0b2344f..0eace36 100644
--- a/msc/BSC_ConnectionHandler.ttcn
+++ b/msc/BSC_ConnectionHandler.ttcn
@@ -7,7 +7,7 @@
 import from IPL4asp_Types all;
 import from SCCPasp_Types all;
 import from BSSAP_Types all;
-import from BSSMAP_Emulation all;
+import from RAN_Emulation all;
 import from BSSMAP_Templates all;
 
 import from GSUP_Types all;
@@ -42,7 +42,7 @@
 import from SGsAP_Emulation all;
 
 /* this component represents a single subscriber connection */
-type component BSC_ConnHdlr extends BSSAP_ConnHdlr, MNCC_ConnHdlr, GSUP_ConnHdlr, MGCP_ConnHdlr, SMPP_ConnHdlr, CTRL_Adapter_CT, SGsAP_ConnHdlr {
+type component BSC_ConnHdlr extends RAN_ConnHdlr, MNCC_ConnHdlr, GSUP_ConnHdlr, MGCP_ConnHdlr, SMPP_ConnHdlr, CTRL_Adapter_CT, SGsAP_ConnHdlr {
 	var BSC_ConnHdlrPars g_pars;
 	timer g_Tguard := 60.0;
 	port TELNETasp_PT MSCVTY;
@@ -155,10 +155,10 @@
 }
 
 
-/* Callback function from general BSSMAP_Emulation whenever a connectionless
+/* Callback function from general RAN_Emulation whenever a connectionless
  * BSSMAP message arrives. Canreturn a PDU_BSSAPthat should be sent in return */
 private function BscUnitdataCallback(PDU_BSSAP bssap)
-runs on BSSMAP_Emulation_CT return template PDU_BSSAP {
+runs on RAN_Emulation_CT return template PDU_BSSAP {
 	var template PDU_BSSAP resp := omit;
 
 	log("BSSMAP_BscUnitdataCallback");
@@ -172,9 +172,9 @@
 	return resp;
 }
 
-const BssmapOps BSC_BssmapOps := {
+const RanOps BSC_RanOps := {
 	/* Create call-back for inbound connections from MSC (hand-over) */
-	create_cb := refers(BSSMAP_Emulation.ExpectedCreateCallback),
+	create_cb := refers(RAN_Emulation.ExpectedCreateCallback),
 	unitdata_cb := refers(BscUnitdataCallback),
 	decode_dtap := true,
 	role_ms := true,
@@ -196,7 +196,7 @@
 
 
 
-/* Encode 'l3' and ask BSSMAP_Emulation to create new connection with COMPL L3 INFO */
+/* Encode 'l3' and ask RAN_Emulation to create new connection with COMPL L3 INFO */
 function f_bssap_compl_l3(PDU_ML3_MS_NW l3)
 runs on BSC_ConnHdlr {
 	log("Sending COMPL L3: ", l3);
@@ -204,8 +204,8 @@
 	BSSAP.send(ts_BSSAP_Conn_Req(g_pars.sccp_addr_peer, g_pars.sccp_addr_own,
 				     valueof(ts_BSSMAP_ComplL3(g_pars.cell_id, l3_enc))));
 	alt {
-	[] BSSAP.receive(BSSAP_Conn_Prim:MSC_CONN_PRIM_CONF_IND) {}
-	[] BSSAP.receive(BSSAP_Conn_Prim:MSC_CONN_PRIM_DISC_IND) {
+	[] BSSAP.receive(RAN_Conn_Prim:MSC_CONN_PRIM_CONF_IND) {}
+	[] BSSAP.receive(RAN_Conn_Prim:MSC_CONN_PRIM_DISC_IND) {
 			setverdict(fail, "DISC.ind from SCCP");
 			mtc.stop;
 		}
@@ -386,12 +386,12 @@
 	/* FIXME: there could be pending SMS or other common procedures by the MSC, let's ignore them */
 	BSSAP.receive(tr_BSSMAP_ClearCommand);
 	BSSAP.send(ts_BSSMAP_ClearComplete);
-	BSSAP.receive(BSSAP_Conn_Prim:MSC_CONN_PRIM_DISC_IND);
+	BSSAP.receive(RAN_Conn_Prim:MSC_CONN_PRIM_DISC_IND);
 	setverdict(pass);
 }
 
 function f_foo() runs on BSC_ConnHdlr{
-	/* SCCP CC handled by BSSMAP_Emulation_CT.main() */
+	/* SCCP CC handled by RAN_Emulation_CT.main() */
 	/* Expect auth, if enabled */
 
 	/* TODO: ISD */
@@ -484,7 +484,7 @@
 	var MNCC_PDU mncc;
 	var MgcpCommand mgcp_cmd;
 
-	f_bssmap_register_imsi(g_pars.imsi, g_pars.tmsi);
+	f_ran_register_imsi(g_pars.imsi, g_pars.tmsi);
 
 	f_establish_fully(EST_TYPE_PAG_RESP);
 
@@ -560,7 +560,7 @@
 	f_mt_call_initate(cpars);
 
 	/* BSC <- MSC: Expect paging. FIXME: By TMSI or not? */
-	f_bssmap_register_imsi(g_pars.imsi, g_pars.tmsi);
+	f_ran_register_imsi(g_pars.imsi, g_pars.tmsi);
 	BSSAP.receive(tr_BSSMAP_Paging(g_pars.imsi));
 
 	/* Complete the call via BSSAP */
@@ -690,7 +690,7 @@
 	interleave {
 	[] BSSAP.receive(t_clear) {
 		BSSAP.send(ts_BSSMAP_ClearComplete);
-		BSSAP.receive(BSSAP_Conn_Prim:MSC_CONN_PRIM_DISC_IND);
+		BSSAP.receive(RAN_Conn_Prim:MSC_CONN_PRIM_DISC_IND);
 		}
 	[] MGCP.receive(tr_DLCX(?)) -> value mgcp_cmd {
 		if (respond_to_dlcx) {
@@ -790,7 +790,7 @@
 	[] BSSAP.receive(tr_BSSMAP_ClearCommand) {
 		BSSAP.send(ts_BSSMAP_ClearComplete);
 		alt {
-		[] BSSAP.receive(BSSAP_Conn_Prim:MSC_CONN_PRIM_DISC_IND) {
+		[] BSSAP.receive(RAN_Conn_Prim:MSC_CONN_PRIM_DISC_IND) {
 			setverdict(pass);
 			}
 		[] BSSAP.receive {