diff --git a/sccp/SCCP_Tests.default b/sccp/SCCP_Tests.default
index a051517..6dda647 100644
--- a/sccp/SCCP_Tests.default
+++ b/sccp/SCCP_Tests.default
@@ -16,7 +16,7 @@
 M3UA_Emulation.tsp_logVerbose := true;
 M3UA_Emulation.tsp_SCTP_Server_Mode := false;
 M3UA_Emulation.tsp_M3UA_Server_Mode := false;
-SCCP_Tests.sccp_cfg := {
+SCCP_Tests.mp_sccp_cfg := {
 	{
 			sccp_service_type := "mtp3_itu",
 			sctp_addr := { 2905, "127.0.0.1", 2905, "127.0.0.2" },
diff --git a/sccp/SCCP_Tests.ttcn b/sccp/SCCP_Tests.ttcn
index 835c934..62c62c6 100644
--- a/sccp/SCCP_Tests.ttcn
+++ b/sccp/SCCP_Tests.ttcn
@@ -55,7 +55,7 @@
 
 type record of SCCP_Configuration SCCP_Configurations;
 modulepar {
-	SCCP_Configurations sccp_cfg;
+	SCCP_Configurations mp_sccp_cfg;
 }
 
 function f_init(SCCP_Configuration cfg) runs on MTC_CT {
@@ -106,13 +106,13 @@
 	var octetstring vl_userdata :='12345678901234567890'O;
 	var ASP_SCCP_N_UNITDATA_ind vl_N_UNITDATA_ind;
 
-	f_init(sccp_cfg[0]);
+	f_init(mp_sccp_cfg[0]);
 
 	/* Called address with routing indicator set to Global Title Address. This used to trigger the crash. */
 	v_CalledAddress := valueof(ts_SccpAddr_GT('012345'H));
 
-	v_CallingAddress := valueof(ts_SccpAddr_PC_SSN(sccp_cfg[0].own_pc, sccp_cfg[0].own_ssn,
-						       sccp_cfg[0].sio, sccp_cfg[0].sccp_service_type));
+	v_CallingAddress := valueof(ts_SccpAddr_PC_SSN(mp_sccp_cfg[0].own_pc, mp_sccp_cfg[0].own_ssn,
+						       mp_sccp_cfg[0].sio, mp_sccp_cfg[0].sccp_service_type));
 	A_PORT.send(t_ASP_N_UNITDATA_req(v_CalledAddress, v_CallingAddress, '00000001'B /* sequence control */,
 					 '00000001'B /* return option */, vl_userdata, omit));
 
diff --git a/sccp/SCCP_Tests_RAW.ttcn b/sccp/SCCP_Tests_RAW.ttcn
index 78ce80f..0091cb4 100644
--- a/sccp/SCCP_Tests_RAW.ttcn
+++ b/sccp/SCCP_Tests_RAW.ttcn
@@ -156,11 +156,11 @@
 /* Verify sccp_demo_user answers a CR with a CC for PC and SSN set up to echo back */
 testcase TC_cr_cc() runs on SCCP_Test_RAW_CT {
 	var SCCP_PAR_Address calling, called;
-	called := valueof(ts_SccpAddr_PC_SSN(sccp_cfg[0].peer_pc, sccp_cfg[0].peer_ssn,
-					     sccp_cfg[0].sio, sccp_cfg[0].sccp_service_type));
-	calling := valueof(ts_SccpAddr_PC_SSN(sccp_cfg[0].own_pc, sccp_cfg[0].own_ssn,
-					     sccp_cfg[0].sio, sccp_cfg[0].sccp_service_type));
-	f_init_raw(sccp_cfg[0]);
+	called := valueof(ts_SccpAddr_PC_SSN(mp_sccp_cfg[0].peer_pc, mp_sccp_cfg[0].peer_ssn,
+					     mp_sccp_cfg[0].sio, mp_sccp_cfg[0].sccp_service_type));
+	calling := valueof(ts_SccpAddr_PC_SSN(mp_sccp_cfg[0].own_pc, mp_sccp_cfg[0].own_ssn,
+					     mp_sccp_cfg[0].sio, mp_sccp_cfg[0].sccp_service_type));
+	f_init_raw(mp_sccp_cfg[0]);
 	f_sleep(1.0);
 	f_send_sccp(ts_SCCP_CR('000001'O, calling, called));
 	f_exp_sccp(tr_SCCP_CC('000001'O, ?));