diff --git a/LibOneM2M/OneM2M_Functions.ttcn b/LibOneM2M/OneM2M_Functions.ttcn
index f8833910310ddfaa2f511622fac9007dee5356f5..d03d9c607f7f0a27e30f0e86a25ffd3d05303c0c 100644
--- a/LibOneM2M/OneM2M_Functions.ttcn
+++ b/LibOneM2M/OneM2M_Functions.ttcn
@@ -41,32 +41,10 @@ module OneM2M_Functions {
 			map(self:mcaPortIn, system:mcaPortIn) param (PX_TS_AE1.mcaPortIn);
 			map(self:acPort, system:acPort);
 			
-			if (ischosen(PX_TS_AE1.mcaPort.binding.httpBindingDesc)) { // FIXME Create a function to initialize vc_myInterfaces
-				v_binding := "HTTP";
-				v_host := PX_TS_AE1.mcaPort.binding.httpBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_AE1.mcaPort.binding.httpBindingDesc.bindingDesc.remotePort); 
-			} else if (ischosen(PX_TS_AE1.mcaPort.binding.coapBindingDesc)) {
-				v_binding := "COAP";
-				v_host := PX_TS_AE1.mcaPort.binding.coapBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_AE1.mcaPort.binding.coapBindingDesc.bindingDesc.remotePort);
-			} else if (ischosen(PX_TS_AE1.mcaPort.binding.mqttBindingDesc)) {
-				v_binding := "MQTT";
-				v_host := PX_TS_AE1.mcaPort.binding.mqttBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_AE1.mcaPort.binding.mqttBindingDesc.bindingDesc.remotePort);
-			} else {
-				v_binding := "WSCK";
-				v_host := PX_TS_AE1.mcaPort.binding.wsBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_AE1.mcaPort.binding.wsBindingDesc.bindingDesc.remotePort);
-			}
-     	 	
-     	 	if (ischosen(PX_TS_AE1.mcaPortIn.binding.httpBindingDesc)) {
-		    	v_binding_in := "HTTP";
-		    } else if (ischosen(PX_TS_AE1.mcaPortIn.binding.coapBindingDesc)) {
-		    	v_binding_in := "COAP";
-		    } else if (ischosen(PX_TS_AE1.mcaPortIn.binding.mqttBindingDesc)) {
-		    	v_binding_in := "MQTT";
-		    } else {
-		    	v_binding_in := "WSCK";
-		    }
+			f_setProtocolBinding(PX_TS_AE1.mcaPort, PX_TS_AE1.mcaPortIn, v_binding, v_host, v_binding_in);
 			
-			vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mca_port))] := { mcaPort, v_host, v_binding, c_serializationLabel[enum2int(PX_TS_AE1.mcaPort.serialization)] };
-      		vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mca_in_port))] := { mcaPortIn, v_host, v_binding_in, c_serializationLabel[enum2int(PX_TS_AE1.mcaPortIn.serialization)] };
+			vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mcaPort))] := { mcaPort, v_host, v_binding, c_serializationLabel[enum2int(PX_TS_AE1.mcaPort.serialization)] };
+      		vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mcaPortIn))] := { mcaPortIn, v_host, v_binding_in, c_serializationLabel[enum2int(PX_TS_AE1.mcaPortIn.serialization)] };
 			
 			activate(a_default());
 			vc_aeSimu := activate(a_cse_cf01());
@@ -102,32 +80,10 @@ module OneM2M_Functions {
 			map(self:mcaPortIn, system:mcaPortIn) param (PX_TS_AE2.mcaPortIn);
 			map(self:acPort, system:acPort);
 	
-		    if (ischosen(PX_TS_AE2.mcaPort.binding.httpBindingDesc)) {
-		        v_binding := "HTTP";
-		        v_host := PX_TS_AE2.mcaPort.binding.httpBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_AE2.mcaPort.binding.httpBindingDesc.bindingDesc.remotePort);
-		    } else if (ischosen(PX_TS_AE2.mcaPort.binding.coapBindingDesc)) {
-		        v_binding := "COAP";
-		        v_host := PX_TS_AE2.mcaPort.binding.coapBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_AE2.mcaPort.binding.coapBindingDesc.bindingDesc.remotePort);
-		    } else if (ischosen(PX_TS_AE2.mcaPort.binding.mqttBindingDesc)) {
-		        v_binding := "MQTT";
-		        v_host := PX_TS_AE2.mcaPort.binding.mqttBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_AE2.mcaPort.binding.mqttBindingDesc.bindingDesc.remotePort);
-		    } else {
-		        v_binding := "WSCK";
-		        v_host := PX_TS_AE2.mcaPort.binding.wsBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_AE2.mcaPort.binding.wsBindingDesc.bindingDesc.remotePort);
-		    }
-		    
-		    if (ischosen(PX_TS_AE2.mcaPortIn.binding.httpBindingDesc)) {
-		        v_binding_in := "HTTP";
-		    } else if (ischosen(PX_TS_AE2.mcaPortIn.binding.coapBindingDesc)) {
-		        v_binding_in := "COAP";
-		    } else if (ischosen(PX_TS_AE2.mcaPortIn.binding.mqttBindingDesc)) {
-		        v_binding_in := "MQTT";
-		    } else {
-		    	v_binding_in := "WSCK";
-		    }
-      
-      		vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mca_port))] := { mcaPort, v_host, v_binding, c_serializationLabel[enum2int(PX_TS_AE2.mcaPort.serialization)] };
-      		vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mca_in_port))] := { mcaPortIn, v_host, v_binding_in, c_serializationLabel[enum2int(PX_TS_AE2.mcaPortIn.serialization)] };
+			f_setProtocolBinding(PX_TS_AE2.mcaPort, PX_TS_AE2.mcaPortIn, v_binding, v_host, v_binding_in);
+			
+      		vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mcaPort))] := { mcaPort, v_host, v_binding, c_serializationLabel[enum2int(PX_TS_AE2.mcaPort.serialization)] };
+      		vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mcaPortIn))] := { mcaPortIn, v_host, v_binding_in, c_serializationLabel[enum2int(PX_TS_AE2.mcaPortIn.serialization)] };
 
 			//Initialze the IUT
 							
@@ -156,32 +112,10 @@ module OneM2M_Functions {
 				map(self:utPort, system:utPort) param (PX_TS_UT);
 			}
 
-		    if (ischosen(PX_TS_AE1.mcaPort.binding.httpBindingDesc)) {
-		        v_binding := "HTTP";
-		        v_host := PX_TS_AE1.mcaPort.binding.httpBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_AE1.mcaPort.binding.httpBindingDesc.bindingDesc.remotePort);
-		    } else if (ischosen(PX_TS_AE1.mcaPort.binding.coapBindingDesc)) {
-		        v_binding := "COAP";
-		        v_host := PX_TS_AE1.mcaPort.binding.coapBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_AE1.mcaPort.binding.coapBindingDesc.bindingDesc.remotePort);
-		    } else if (ischosen(PX_TS_AE1.mcaPort.binding.mqttBindingDesc)) {
-		        v_binding := "MQTT";
-		        v_host := PX_TS_AE1.mcaPort.binding.mqttBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_AE1.mcaPort.binding.mqttBindingDesc.bindingDesc.remotePort);
-		    } else {
-		    	v_binding := "WSCK";
-		        v_host := PX_TS_AE1.mcaPort.binding.wsBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_AE1.mcaPort.binding.wsBindingDesc.bindingDesc.remotePort);
-		    }
-		    
-			if (ischosen(PX_TS_AE1.mcaPortIn.binding.httpBindingDesc)) {
-				v_binding_in := "HTTP";
-			} else if (ischosen(PX_TS_AE1.mcaPortIn.binding.coapBindingDesc)) {
-				v_binding_in := "COAP";
-			} else if (ischosen(PX_TS_AE1.mcaPortIn.binding.mqttBindingDesc)) {
-				v_binding_in := "MQTT";
-			} else {
-				v_binding_in := "WSCK";
-			}
-		      
-		    vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mca_port))] := { mcaPort, v_host, v_binding, c_serializationLabel[enum2int(PX_TS_AE1.mcaPort.serialization)] };
-			vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mca_in_port))] := { mcaPortIn, v_host, v_binding_in, c_serializationLabel[enum2int(PX_TS_AE1.mcaPortIn.serialization)] };
+			f_setProtocolBinding(PX_TS_AE1.mcaPort, PX_TS_AE1.mcaPortIn, v_binding, v_host, v_binding_in);
+			
+			vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mcaPort))] := { mcaPort, v_host, v_binding, c_serializationLabel[enum2int(PX_TS_AE1.mcaPort.serialization)] };
+			vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mcaPortIn))] := { mcaPortIn, v_host, v_binding_in, c_serializationLabel[enum2int(PX_TS_AE1.mcaPortIn.serialization)] };
 			
 			activate(a_default());
 			vc_aeSimu := activate(a_cse_cf02_ae1());
@@ -215,32 +149,10 @@ module OneM2M_Functions {
 			map(self:mccPortIn, system:mccPortIn) param (PX_TS_CSE1.mccPortIn);
 			map(self:acPort, system:acPort);
 						
-		    if (ischosen(PX_TS_CSE1.mccPort.binding.httpBindingDesc)) {
-		        v_binding := "HTTP";
-		        v_host := PX_TS_CSE1.mcaPort.binding.httpBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_CSE1.mccPort.binding.httpBindingDesc.bindingDesc.remotePort);
-		    } else if (ischosen(PX_TS_CSE1.mccPort.binding.coapBindingDesc)) {
-		        v_binding := "COAP";
-		        v_host := PX_TS_CSE1.mcaPort.binding.coapBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_CSE1.mccPort.binding.coapBindingDesc.bindingDesc.remotePort);
-		    } else if (ischosen(PX_TS_CSE1.mccPort.binding.mqttBindingDesc)) {
-		        v_binding := "MQTT";
-		        v_host := PX_TS_CSE1.mcaPort.binding.mqttBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_CSE1.mccPort.binding.mqttBindingDesc.bindingDesc.remotePort);
-		    } else {
-		        v_binding := "WSCK";
-		        v_host := PX_TS_CSE1.mcaPort.binding.wsBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_CSE1.mccPort.binding.wsBindingDesc.bindingDesc.remotePort);
-		    }
-		    
-		    if (ischosen(PX_TS_CSE1.mccPortIn.binding.httpBindingDesc)) {
-		    	v_binding_in := "HTTP";
-		    } else if (ischosen(PX_TS_CSE1.mccPortIn.binding.coapBindingDesc)) {
-		        v_binding_in := "COAP";
-		    } else if (ischosen(PX_TS_CSE1.mccPortIn.binding.mqttBindingDesc)) {
-		        v_binding_in := "MQTT";
-		    } else {
-		        v_binding_in := "WSCK";
-		    }
-		      
-		    vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mcc_port))] := { mccPort, v_host, v_binding, c_serializationLabel[enum2int(PX_TS_CSE1.mccPort.serialization)] };
-		    vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mcc_in_port))] := { mccPortIn, v_host, v_binding, c_serializationLabel[enum2int(PX_TS_CSE1.mccPortIn.serialization)] };
+			f_setProtocolBinding(PX_TS_CSE1.mccPort, PX_TS_CSE1.mccPortIn, v_binding, v_host, v_binding_in);
+			  
+		    vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mccPort))] := { mccPort, v_host, v_binding, c_serializationLabel[enum2int(PX_TS_CSE1.mccPort.serialization)] };
+		    vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mccPortIn))] := { mccPortIn, v_host, v_binding, c_serializationLabel[enum2int(PX_TS_CSE1.mccPortIn.serialization)] };
       
 			v_cSEBaseResource := f_generateLocalResource(-, -1, int5);
 			vc_cSEBaseIndex := f_setLocalResource(v_cSEBaseResource, int5, -1);
@@ -278,31 +190,10 @@ module OneM2M_Functions {
 				map(self:utPort, system:utPort) param (PX_TS_UT);
 			}
 			
-			if (ischosen(PX_TS_CSE1.mccPort.binding.httpBindingDesc)) {
-				v_binding := "HTTP";
-				v_host := PX_TS_CSE1.mccPort.binding.httpBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_CSE1.mccPort.binding.httpBindingDesc.bindingDesc.remotePort);
-			} else if (ischosen(PX_TS_CSE1.mccPort.binding.coapBindingDesc)) {
-				v_binding := "COAP";
-				v_host := PX_TS_CSE1.mccPort.binding.coapBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_CSE1.mccPort.binding.coapBindingDesc.bindingDesc.remotePort);
-			} else if (ischosen(PX_TS_CSE1.mccPort.binding.mqttBindingDesc)) {
-				v_binding := "MQTT";
-				v_host := PX_TS_CSE1.mccPort.binding.mqttBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_CSE1.mccPort.binding.mqttBindingDesc.bindingDesc.remotePort);
-			} else {
-				v_binding := "WSCK";
-				v_host := PX_TS_CSE1.mccPort.binding.wsBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_CSE1.mccPort.binding.wsBindingDesc.bindingDesc.remotePort);
-			}
-		    if (ischosen(PX_TS_CSE1.mccPortIn.binding.httpBindingDesc)) {
-		    	v_binding_in := "HTTP";
-		    } else if (ischosen(PX_TS_CSE1.mccPortIn.binding.coapBindingDesc)) {
-		        v_binding_in := "COAP";
-		    } else if (ischosen(PX_TS_CSE1.mccPortIn.binding.mqttBindingDesc)) {
-		    	v_binding_in := "MQTT";
-		    } else {
-		    	v_binding_in := "WSCK";
-		    }
-      
-			vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mcc_port))] := { mccPort, v_host, v_binding, c_serializationLabel[enum2int(PX_TS_CSE1.mccPort.serialization)] };
-			vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mcc_in_port))] := { mccPortIn, v_host, v_binding_in, c_serializationLabel[enum2int(PX_TS_CSE1.mccPortIn.serialization)] };
+			f_setProtocolBinding(PX_TS_CSE1.mccPort, PX_TS_CSE1.mccPortIn, v_binding, v_host, v_binding_in);
+			
+			vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mccPort))] := { mccPort, v_host, v_binding, c_serializationLabel[enum2int(PX_TS_CSE1.mccPort.serialization)] };
+			vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mccPortIn))] := { mccPortIn, v_host, v_binding_in, c_serializationLabel[enum2int(PX_TS_CSE1.mccPortIn.serialization)] };
 			
 			activate(a_default());
 			vc_cseSimu := activate(a_cse_cf02_cse1());
@@ -332,31 +223,10 @@ module OneM2M_Functions {
 			map(self:mcaPortIn, system:mcaPortIn) param (PX_TS_AE1.mcaPortIn);
 			map(self:acPort, system:acPort);
 			
-			if (ischosen(PX_TS_AE1.mcaPort.binding.httpBindingDesc)) {
-			  v_binding := "HTTP";
-			  v_host := PX_TS_AE1.mcaPort.binding.httpBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_AE1.mcaPort.binding.httpBindingDesc.bindingDesc.remotePort);
-			} else if (ischosen(PX_TS_AE1.mcaPort.binding.coapBindingDesc)) {
-			  v_binding := "COAP";
-			  v_host := PX_TS_AE1.mcaPort.binding.coapBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_AE1.mcaPort.binding.coapBindingDesc.bindingDesc.remotePort);
-			} else if (ischosen(PX_TS_AE1.mcaPort.binding.mqttBindingDesc)) {
-			  v_binding := "MQTT";
-			  v_host := PX_TS_AE1.mcaPort.binding.mqttBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_AE1.mcaPort.binding.mqttBindingDesc.bindingDesc.remotePort);
-			} else {
-			  v_binding := "WSCK";
-			  v_host := PX_TS_AE1.mcaPort.binding.wsBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_AE1.mcaPort.binding.wsBindingDesc.bindingDesc.remotePort);
-			}
-			if (ischosen(PX_TS_AE1.mcaPortIn.binding.httpBindingDesc)) {
-			  v_binding_in := "HTTP";
-			} else if (ischosen(PX_TS_AE1.mcaPortIn.binding.coapBindingDesc)) {
-			  v_binding_in := "COAP";
-			} else if (ischosen(PX_TS_AE1.mcaPortIn.binding.mqttBindingDesc)) {
-			  v_binding_in := "MQTT";
-			} else {
-			  v_binding_in := "WSCK";
-			}
-      
-			vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mca_port))] := { mcaPort, v_host, v_binding, c_serializationLabel[enum2int(PX_TS_AE1.mcaPort.serialization)] };
-			vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mca_in_port))] := { mcaPortIn, v_host, v_binding_in, c_serializationLabel[enum2int(PX_TS_AE1.mcaPortIn.serialization)] };
+			f_setProtocolBinding(PX_TS_AE1.mcaPort, PX_TS_AE1.mcaPortIn, v_binding, v_host, v_binding_in);
+			
+			vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mcaPort))] := { mcaPort, v_host, v_binding, c_serializationLabel[enum2int(PX_TS_AE1.mcaPort.serialization)] };
+			vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mcaPortIn))] := { mcaPortIn, v_host, v_binding_in, c_serializationLabel[enum2int(PX_TS_AE1.mcaPortIn.serialization)] };
       
 			//Initialze the IUT
 							
@@ -387,32 +257,10 @@ module OneM2M_Functions {
 			map(self:mcaPortIn, system:mcaPortIn) param (PX_TS_CSE1.mcaPortIn);//TODO To be consistent, we should use mcaPortIn for AE testing
 			map(self:acPort, system:acPort);
 			
-			if (ischosen(PX_TS_CSE1.mcaPort.binding.httpBindingDesc)) {
-				v_binding := "HTTP";
-				v_host := PX_TS_CSE1.mcaPort.binding.httpBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_CSE1.mcaPort.binding.httpBindingDesc.bindingDesc.remotePort);
-			} else if (ischosen(PX_TS_CSE1.mcaPort.binding.coapBindingDesc)) {
-				v_binding := "COAP";
-				v_host := PX_TS_CSE1.mcaPort.binding.coapBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_CSE1.mcaPort.binding.coapBindingDesc.bindingDesc.remotePort);
-			} else if (ischosen(PX_TS_CSE1.mcaPort.binding.mqttBindingDesc)) {
-				v_binding := "MQTT";
-				v_host := PX_TS_CSE1.mcaPort.binding.mqttBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_CSE1.mcaPort.binding.mqttBindingDesc.bindingDesc.remotePort);
-			} else {
-				v_binding := "WSCK";
-				v_host := PX_TS_CSE1.mcaPort.binding.wsBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_CSE1.mcaPort.binding.wsBindingDesc.bindingDesc.remotePort);
-			}
-      		
-			if (ischosen(PX_TS_CSE1.mcaPortIn.binding.httpBindingDesc)) {
-				v_binding_in := "HTTP";
-			} else if (ischosen(PX_TS_CSE1.mcaPortIn.binding.coapBindingDesc)) {
-				v_binding_in := "COAP";
-			} else if (ischosen(PX_TS_CSE1.mcaPortIn.binding.mqttBindingDesc)) {
-				v_binding_in := "MQTT";
-			} else {
-				v_binding_in := "WSCK";
-			}
+			f_setProtocolBinding(PX_TS_CSE1.mcaPort, PX_TS_CSE1.mcaPortIn, v_binding, v_host, v_binding_in);
 			
-			vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mca_port))] := { mcaPort, v_host, v_binding, c_serializationLabel[enum2int(PX_TS_CSE1.mcaPort.serialization)] };
-			vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mca_in_port))] := { mcaPortIn, v_host, v_binding_in, c_serializationLabel[enum2int(PX_TS_CSE1.mcaPortIn.serialization)] };
+			vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mcaPort))] := { mcaPort, v_host, v_binding, c_serializationLabel[enum2int(PX_TS_CSE1.mcaPort.serialization)] };
+			vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mcaPortIn))] := { mcaPortIn, v_host, v_binding_in, c_serializationLabel[enum2int(PX_TS_CSE1.mcaPortIn.serialization)] };
 			
 			if(PX_UT_IMPLEMENTED) {
 				map(self:utPort, system:utPort) param (PX_TS_UT);
@@ -454,31 +302,10 @@ module OneM2M_Functions {
 				map(self:utPort, system:utPort) param (PX_TS_UT);
 			}
 			
-			if (ischosen(PX_TS_CSE1.mccPort.binding.httpBindingDesc)) {
-			  v_binding := "HTTP";
-			  v_host := PX_TS_CSE1.mccPort.binding.httpBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_CSE1.mccPort.binding.httpBindingDesc.bindingDesc.remotePort);
-			} else if (ischosen(PX_TS_CSE1.mccPort.binding.coapBindingDesc)) {
-			  v_binding := "COAP";
-			  v_host := PX_TS_CSE1.mccPort.binding.coapBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_CSE1.mccPort.binding.coapBindingDesc.bindingDesc.remotePort);
-			} else if (ischosen(PX_TS_CSE1.mccPort.binding.mqttBindingDesc)) {
-			  v_binding := "MQTT";
-			  v_host := PX_TS_CSE1.mccPort.binding.mqttBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_CSE1.mccPort.binding.mqttBindingDesc.bindingDesc.remotePort);
-			} else {
-			  v_binding := "WSCK";
-			  v_host := PX_TS_CSE1.mccPort.binding.wsBindingDesc.bindingDesc.sutAddress & ":" & int2str(PX_TS_CSE1.mccPort.binding.wsBindingDesc.bindingDesc.remotePort);
-			}
-		   	if (ischosen(PX_TS_CSE1.mccPortIn.binding.httpBindingDesc)) {
-		    	v_binding_in := "HTTP";
-		    } else if (ischosen(PX_TS_CSE1.mccPortIn.binding.coapBindingDesc)) {
-		    	v_binding_in := "COAP";
-		    } else if (ischosen(PX_TS_CSE1.mccPortIn.binding.mqttBindingDesc)) {
-		    	v_binding_in := "MQTT";
-		    } else {
-		    	v_binding_in := "WSCK";
-		    }
-      
-      		vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mcc_port))] := { mccPort, v_host, v_binding, c_serializationLabel[enum2int(PX_TS_CSE1.mccPort.serialization)] };
-      		vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mcc_in_port))] := { mccPortIn, v_host, v_binding_in, c_serializationLabel[enum2int(PX_TS_CSE1.mccPortIn.serialization)] };
+			f_setProtocolBinding(PX_TS_CSE1.mccPort, PX_TS_CSE1.mccPortIn, v_binding, v_host, v_binding_in);
+			
+      		vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mccPort))] := { mccPort, v_host, v_binding, c_serializationLabel[enum2int(PX_TS_CSE1.mccPort.serialization)] };
+      		vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mccPortIn))] := { mccPortIn, v_host, v_binding_in, c_serializationLabel[enum2int(PX_TS_CSE1.mccPortIn.serialization)] };
       
 			activate(a_default());
 			vc_cseSimu := activate(a_cse_cf04());
@@ -1138,7 +965,7 @@ module OneM2M_Functions {
 				
 				v_request := f_getCreateRequestPrimitive(int2, v_request, -1);
 				
-				f_send(e_mca_port, m_request(v_request));
+				f_send(e_mcaPort, m_request(v_request));
 				
 				tc_ac.start;
 				alt {
@@ -1201,10 +1028,10 @@ module OneM2M_Functions {
 					//TODO Test, to be removed
 					v_request.to_ := f_getResourceAddress();
 					
-					f_send(e_mca_port, m_request(v_request));
-					//f_send(e_mca_port, m_request(m_createAeAux(p_name, {PX_URI_CSE & PX_CSE_NAME & "/" & PX_ACPAUX_NAME})));
+					f_send(e_mcaPort, m_request(v_request));
+					//f_send(e_mcaPort, m_request(m_createAeAux(p_name, {PX_URI_CSE & PX_CSE_NAME & "/" & PX_ACPAUX_NAME})));
 				} else {
-					f_send(e_mca_port, m_request(m_createAe(p_appId)));
+					f_send(e_mcaPort, m_request(m_createAe(p_appId)));
 				}
 				tc_ac.start;
 				alt {
@@ -1385,7 +1212,7 @@ module OneM2M_Functions {
 						
 						v_request.from_ := f_getOriginator(vc_resourcesIndexToBeDeleted[i]);
 
-						f_send(e_mca_port, m_request(v_request));
+						f_send(e_mcaPort, m_request(v_request));
 						
 						tc_ac.start;
 						alt {
@@ -1477,7 +1304,7 @@ module OneM2M_Functions {
 			
 						v_request := valueof(m_delete(v_resourceAddress, f_getOriginator(v_resourceIndex, vc_testSystemRole)));
 
-						f_send(e_mcc_port, m_request(v_request));
+						f_send(e_mccPort, m_request(v_request));
 			
 						tc_ac.start;
 						alt {
@@ -1507,7 +1334,7 @@ module OneM2M_Functions {
 								//v_request := valueof(m_delete(v_childResourceRefs[0], f_getOriginator(vc_remoteCseIndex)));
 								v_request := valueof(m_delete(v_childResourceRefs[0]));//TODO Originator super user to be replaced by CSE1_ID (line above)
 								
-								f_send(e_mcc_port, m_request(v_request));
+								f_send(e_mccPort, m_request(v_request));
 	
 								tc_ac.start;
 								alt {
@@ -1538,7 +1365,7 @@ module OneM2M_Functions {
 								[] mccPortIn.receive(mw_request(mw_delete(f_getLocalResourceAddress(vc_localRemoteCseIndex)))) -> value vc_request {
 									tc_ac.stop;
 									f_processDeleteRequestPrimitive(vc_request.primitive.requestPrimitive);
-										f_send(e_mcc_in_port, m_response(vc_response.primitive.responsePrimitive));
+										f_send(e_mccPortIn, m_response(vc_response.primitive.responsePrimitive));
 									log(__SCOPE__&": INFO: Deregistration performed successfully");
 								}
 								[] tc_ac.timeout {
@@ -1574,7 +1401,7 @@ module OneM2M_Functions {
 								
 				v_request := f_getCreateRequestPrimitive(p_resourceType, p_requestPrimitive, p_parentIndex);
 			
-				f_send(e_mca_port, m_request(v_request));
+				f_send(e_mcaPort, m_request(v_request));
 				tc_ac.start;
 				alt {
 					[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value vc_response {
@@ -1654,7 +1481,7 @@ module OneM2M_Functions {
 				
 				v_request := f_getCreateRequestPrimitive(int1, v_request, -1);
 								
-				f_send(e_mca_port, m_request(v_request));
+				f_send(e_mcaPort, m_request(v_request));
 				tc_ac.start;
 				alt {
 					[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value vc_response {
@@ -1699,7 +1526,7 @@ module OneM2M_Functions {
 				
 				v_request := f_getUpdateRequestPrimitive(p_resourceType, p_resourceIndex, p_request);
 				
-				f_send(e_mca_port, m_request(valueof(v_request), p_nullFields));
+				f_send(e_mcaPort, m_request(valueof(v_request), p_nullFields));
 				tc_ac.start;
 				alt {
 					[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value vc_response {
@@ -1731,7 +1558,7 @@ module OneM2M_Functions {
 			 */
 			function f_cse_retrieveResource(integer p_resourceIndex) runs on AeSimu return PrimitiveContent{
 
-				f_send(e_mca_port, m_request(m_retrieve(f_getResourceAddress(p_resourceIndex), f_getOriginator(p_resourceIndex))));
+				f_send(e_mcaPort, m_request(m_retrieve(f_getResourceAddress(p_resourceIndex), f_getOriginator(p_resourceIndex))));
 				tc_ac.start;
 				alt {
 					[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value vc_response {
@@ -1767,7 +1594,7 @@ module OneM2M_Functions {
 				v_retrieveRequest := m_retrieve(f_getResourceAddress(p_resourceIndex), f_getOriginator(p_resourceIndex));
 				if (ispresent(p_roleResourceID)) {v_retrieveRequest.roleIDs := {p_roleResourceID};}
 				if (ispresent(p_tokenResourceID)) {v_retrieveRequest.tokenIDs := {p_tokenResourceID};}
-				f_send(e_mca_port, m_request(v_retrieveRequest));
+				f_send(e_mcaPort, m_request(v_retrieveRequest));
 				
 				tc_ac.start;
 				alt {
@@ -1805,7 +1632,7 @@ module OneM2M_Functions {
 					v_request := valueof(p_requestPrimitive);
 				}
 				
-				f_send(e_mca_port, m_request(v_request));
+				f_send(e_mcaPort, m_request(v_request));
 						
 				tc_ac.start;
 				alt {
@@ -1836,7 +1663,7 @@ module OneM2M_Functions {
 			 */
 			function f_cse_operationResource(template RequestPrimitive p_requestPrimitive) runs on AeSimu return PrimitiveContent{
 
-				f_send(e_mca_port, m_request(valueof(p_requestPrimitive)));
+				f_send(e_mcaPort, m_request(valueof(p_requestPrimitive)));
 				
 				tc_ac.start;
 				alt {
@@ -1867,7 +1694,7 @@ module OneM2M_Functions {
 			function f_cse_isResourcePresent (integer p_resourceIndex) runs on AeSimu return boolean {
 			
 				//Check to see if the resource is present or not
-				f_send(e_mca_port, m_request(m_retrieve(f_getResourceAddress(p_resourceIndex), f_getOriginator(p_resourceIndex))));
+				f_send(e_mcaPort, m_request(m_retrieve(f_getResourceAddress(p_resourceIndex), f_getOriginator(p_resourceIndex))));
 				tc_ac.start;
 				alt {
 					[] mcaPort.receive(mw_response(mw_responsePrimitive(int2000))) {
@@ -1904,7 +1731,7 @@ module OneM2M_Functions {
 				log(testcasename() & ":INFO: Hierarchical addressing method is required to check the non presence of the resource");
 				
 				//Check to see if the resource has NOT been created
-				f_send(e_mca_port, m_request(m_retrieve(f_getResourceAddress(p_parentIndex, e_hierarchical) & "/" & p_resourceName, f_getOriginator(p_parentIndex))));
+				f_send(e_mcaPort, m_request(m_retrieve(f_getResourceAddress(p_parentIndex, e_hierarchical) & "/" & p_resourceName, f_getOriginator(p_parentIndex))));
 				tc_ac.start;
 				alt {
 					[] mcaPort.receive(mw_response(mw_responsePrimitive(int4004))) {
@@ -1941,7 +1768,7 @@ module OneM2M_Functions {
 				v_request.from_ := f_getOriginator(vc_acpAuxIndex);
 				v_request.primitiveContent.accessControlPolicy.privileges.accessControlRule_list := {valueof(m_createAcr(PX_ACOR, p_allowedOperations))};
 							
-				f_send(e_mca_port, m_request(v_request));
+				f_send(e_mcaPort, m_request(v_request));
 				tc_ac.start;
 				alt {
 					[] mcaPort.receive(mw_response(mw_responsePrimitiveOK))  {
@@ -1975,7 +1802,7 @@ module OneM2M_Functions {
 			
 				v_request := f_getCreateRequestPrimitive(p_resourceType, p_requestPrimitive, p_parentIndex);
 		
-				f_send(e_mca_port, m_request(v_request));
+				f_send(e_mcaPort, m_request(v_request));
 					
 			}
 			
@@ -1993,7 +1820,7 @@ module OneM2M_Functions {
 				
 				v_request := f_getUpdateRequestPrimitive(p_resourceType, p_targetIndex, p_requestUpdatePrimitive);
 
-				f_send(e_mca_port, m_request(v_request));
+				f_send(e_mcaPort, m_request(v_request));
 		
 			}
 			
@@ -2102,7 +1929,7 @@ module OneM2M_Functions {
 					if(getverdict != pass) {
 						v_responsePrimitive.responseStatusCode := int4000; 
 					}
-					f_send(e_mca_in_port, m_response(v_responsePrimitive));
+					f_send(e_mcaPortIn, m_response(v_responsePrimitive));
 					
 				} //end f_cse_notifyProcedure_subscriptionVerificationHandler
         
@@ -2127,7 +1954,7 @@ module OneM2M_Functions {
 							//Send response in any case
 							v_responsePrimitive := valueof(m_responseNotification(int2000, omit));
 							v_responsePrimitive.requestIdentifier := vc_request.primitive.requestPrimitive.requestIdentifier;
-							f_send(e_mca_in_port, m_response(v_responsePrimitive));
+							f_send(e_mcaPortIn, m_response(v_responsePrimitive));
 							tc_ac.start;
 							repeat;
 						}
@@ -2166,7 +1993,7 @@ module OneM2M_Functions {
 							//Send response in any case
 							v_responsePrimitive := valueof(m_responseNotification(int2000, omit));
 							v_responsePrimitive.requestIdentifier := vc_request.primitive.requestPrimitive.requestIdentifier;
-							f_send(e_mca_in_port, m_response(v_responsePrimitive));
+							f_send(e_mcaPortIn, m_response(v_responsePrimitive));
 						}
 						[] tc_ac.timeout {
 							setverdict(fail, __SCOPE__ & ":ERROR: No notification received");
@@ -2207,7 +2034,7 @@ module OneM2M_Functions {
 					}
 					
 					if(isvalue(v_responsePrimitive)) {
-						f_send(e_mca_in_port, m_response(v_responsePrimitive));
+						f_send(e_mcaPortIn, m_response(v_responsePrimitive));
 					}
 					
     	
@@ -2244,7 +2071,7 @@ module OneM2M_Functions {
 							//Send response in any case
 							v_responsePrimitive := valueof(m_responseNotification(int2000, omit));
 							v_responsePrimitive.requestIdentifier := vc_request.primitive.requestPrimitive.requestIdentifier;
-							f_send(e_mca_in_port, m_response(v_responsePrimitive));
+							f_send(e_mcaPortIn, m_response(v_responsePrimitive));
 						}
 						[] mcaPortIn.receive(mw_request(mw_notifyNotification(mw_contentNotification(?)))) -> value vc_request {
 							tc_ac.stop;
@@ -2257,7 +2084,7 @@ module OneM2M_Functions {
 							//Send response in any case
 							v_responsePrimitive := valueof(m_responseNotification(int2000, omit));
 							v_responsePrimitive.requestIdentifier := vc_request.primitive.requestPrimitive.requestIdentifier;
-							f_send(e_mca_in_port, m_response(v_responsePrimitive));
+							f_send(e_mcaPortIn, m_response(v_responsePrimitive));
 							v_notificationsReceived := v_notificationsReceived + 1;
 							if(v_notificationsReceived < p_numberOfAggregatedNotification) {
 								tc_ac.start;
@@ -2288,7 +2115,7 @@ module OneM2M_Functions {
 							tc_ac.stop;
 							v_responsePrimitive := valueof(m_responseNotification(int2000, omit));
 							v_responsePrimitive.requestIdentifier := vc_request.primitive.requestPrimitive.requestIdentifier;
-							f_send(e_mca_in_port, m_response(v_responsePrimitive));
+							f_send(e_mcaPortIn, m_response(v_responsePrimitive));
 							if(not(match(vc_request.primitive.requestPrimitive.primitiveContent.notification.subscriptionDeletion, true))) {
 								setverdict(fail, __SCOPE__ & ":ERROR: subscriptionDeletion attribute have to be set to TRUE");
 							}
@@ -2344,7 +2171,7 @@ module OneM2M_Functions {
 					//p_requestPrimitive.from_ := PX_CSE1_ID;
 					p_requestPrimitive.from_ := f_getOriginator(vc_remoteCseIndex, e_cse);
 					
-					f_send(e_mcc_port, m_request(valueof(p_requestPrimitive)));
+					f_send(e_mccPort, m_request(valueof(p_requestPrimitive)));
 					tc_ac.start;
 					alt {
 						[] mccPort.receive(mw_response(mw_responseNotify(int2000))) -> value vc_response {
@@ -2390,7 +2217,7 @@ module OneM2M_Functions {
 							v_responsePrimitive := valueof(m_responseNotification(int2000, omit));
 							v_responsePrimitive.primitiveContent.securityInfo.securityInfoType:=int2; //Dynamic Authorization Response
 							v_responsePrimitive.requestIdentifier := vc_request.primitive.requestPrimitive.requestIdentifier;
-							f_send(e_mca_in_port, m_response(v_responsePrimitive));
+							f_send(e_mcaPortIn, m_response(v_responsePrimitive));
 						}
 						[] mcaPortIn.receive{
 							tc_ac.stop;
@@ -2459,7 +2286,7 @@ module OneM2M_Functions {
 						{
 							v_responsePrimitive.primitiveContent.securityInfo.securityInfoType:=int1; //DynamicAuthorizationRequest
 						}
-						f_send(e_mca_in_port, m_response(v_responsePrimitive));
+						f_send(e_mcaPortIn, m_response(v_responsePrimitive));
 					}
 
 				} //end f_cse_notifyProcedure_dynamicAuthorizationHandler
@@ -2524,13 +2351,13 @@ module OneM2M_Functions {
 							}
 							v_responsePrimitive.from_ := PX_TS_CSE1.cseId;
 							v_responsePrimitive.to_ := v_request.primitive.requestPrimitive.from_;
-							f_send(e_mcc_in_port, m_response(v_responsePrimitive));			
+							f_send(e_mccPortIn, m_response(v_responsePrimitive));			
 						}
 						[] mccPortIn.receive(mw_request(?)) -> value v_request {
 							tc_ac.stop;
 							setverdict(fail, __SCOPE__ & ":ERROR:  Request received with unexpected parameters");
 							v_responsePrimitive := valueof(m_responsePrimitive(int4000,v_request.primitive.requestPrimitive.requestIdentifier));
-							f_send(e_mcc_in_port, m_response(v_responsePrimitive));
+							f_send(e_mccPortIn, m_response(v_responsePrimitive));
 						}
 						[] tc_ac.timeout {
 							setverdict(fail, __SCOPE__ & ":ERROR:  No announcement received");
@@ -2558,7 +2385,7 @@ module OneM2M_Functions {
 				
 					v_request := f_getCreateRequestPrimitive(f_getAnnouncedResourceType(p_resourceType), p_requestPrimitive, vc_remoteCseIndex);
 			
-					f_send(e_mcc_port, m_request(v_request));
+					f_send(e_mccPort, m_request(v_request));
 					tc_ac.start;
 					alt {
 						[] mccPort.receive(mw_response(mw_responsePrimitiveOK)) -> value vc_response {
@@ -2610,12 +2437,12 @@ module OneM2M_Functions {
 							setverdict(pass, __SCOPE__ & ":INFO: Expected UPDATE Announcement received");
 	
 							f_processUpdateRequestPrimitive(v_request.primitive.requestPrimitive);
-							f_send(e_mcc_in_port, m_response(vc_response.primitive.responsePrimitive));
+							f_send(e_mccPortIn, m_response(vc_response.primitive.responsePrimitive));
 						}
 						[] mccPortIn.receive(mw_request(?)) -> value v_request {
 							setverdict(fail, __SCOPE__ & ":ERROR:  Request received with unexpected parameters");
 							v_responsePrimitive := valueof(m_responsePrimitive(int4000,v_request.primitive.requestPrimitive.requestIdentifier));
-							f_send(e_mcc_in_port, m_response(v_responsePrimitive));
+							f_send(e_mccPortIn, m_response(v_responsePrimitive));
 						}
 						[] tc_ac.timeout {
 							setverdict(fail, __SCOPE__ & ":ERROR:  No announcement received");
@@ -2651,12 +2478,12 @@ module OneM2M_Functions {
 							setverdict(pass, __SCOPE__ & ":INFO: Expected DELETE Announcement received");
 	
 							f_processDeleteRequestPrimitive(v_request.primitive.requestPrimitive);
-							f_send(e_mcc_in_port, m_response(vc_response.primitive.responsePrimitive));
+							f_send(e_mccPortIn, m_response(vc_response.primitive.responsePrimitive));
 						}
 						[] mccPortIn.receive(mw_request(?)) -> value v_request {
 							setverdict(fail, __SCOPE__ & ":ERROR:  Request received with unexpected parameters");
 							v_responsePrimitive := valueof(m_responsePrimitive(int4000,v_request.primitive.requestPrimitive.requestIdentifier));
-							f_send(e_mcc_in_port, m_response(v_responsePrimitive));
+							f_send(e_mccPortIn, m_response(v_responsePrimitive));
 						}
 						[] tc_ac.timeout {
 							setverdict(fail, __SCOPE__ & ":ERROR:  No announcement received");
@@ -2688,7 +2515,7 @@ module OneM2M_Functions {
 					[] mccPortIn.receive(mw_request(p_request)) -> value vc_request {
 						tc_ac.stop;
 						v_localResourceIndex := f_processCreateRequestPrimitive(vc_request.primitive.requestPrimitive, p_responseStatusCode);
-						f_send(e_mcc_in_port, m_response(vc_response.primitive.responsePrimitive));
+						f_send(e_mccPortIn, m_response(vc_response.primitive.responsePrimitive));
 					}
 					[] tc_ac.timeout {
 						setverdict(inconc, __SCOPE__&":INFO: No creation for resource received");
@@ -2740,7 +2567,7 @@ module OneM2M_Functions {
 						}
 						v_response.from_ := PX_TS_CSE1.cseId;
 						v_response.to_ := vc_request.primitive.requestPrimitive.from_;
-            f_send(e_mcc_in_port, m_response(v_response));
+            f_send(e_mccPortIn, m_response(v_response));
 					}
     					
 					[] tc_ac.timeout {
@@ -2761,7 +2588,7 @@ module OneM2M_Functions {
 			 */
 			function f_cse_updateAnnouncedResource(in RequestPrimitive p_requestPrimitive) runs on CseSimu {
 
-        f_send(e_mcc_port, m_request(p_requestPrimitive));
+        f_send(e_mccPort, m_request(p_requestPrimitive));
 				tc_ac.start;
 				alt {
 					[] mccPort.receive(mw_response(mw_responsePrimitiveOK)) -> value vc_response {
@@ -2809,7 +2636,7 @@ module OneM2M_Functions {
 						} else {
 							setverdict(inconc, __SCOPE__&":INFO: Unexpected resource update");
 						}
-						f_send(e_mcc_in_port, m_response(vc_response.primitive.responsePrimitive));
+						f_send(e_mccPortIn, m_response(vc_response.primitive.responsePrimitive));
 						
 					}
 					[] tc_ac.timeout {
@@ -2844,7 +2671,7 @@ module OneM2M_Functions {
 						} else {
 							setverdict(inconc, __SCOPE__&":INFO: Unexpected resource retrieval");
 						}
-						f_send(e_mcc_in_port, m_response(vc_response.primitive.responsePrimitive));
+						f_send(e_mccPortIn, m_response(vc_response.primitive.responsePrimitive));
 						
 					}
 					[] tc_ac.timeout {
@@ -2881,7 +2708,7 @@ module OneM2M_Functions {
 						} else {
 							setverdict(inconc, __SCOPE__&":INFO: Unexpected resource retrieval");
 						}
-						f_send(e_mcc_in_port, m_response(vc_response.primitive.responsePrimitive));
+						f_send(e_mccPortIn, m_response(vc_response.primitive.responsePrimitive));
 				
 					}
 					[] mccPortIn.receive(mw_request(mw_create())) -> value vc_request {
@@ -2891,7 +2718,7 @@ module OneM2M_Functions {
 						
 						setverdict(pass, __SCOPE__&":INFO: Subgroup creation received");
 						
-						f_send(e_mcc_in_port, m_response(vc_response.primitive.responsePrimitive));
+						f_send(e_mccPortIn, m_response(vc_response.primitive.responsePrimitive));
 					}
 					[] tc_ac.timeout {
 						setverdict(inconc, __SCOPE__&":INFO: No answer while retrieving resource");
@@ -2913,7 +2740,7 @@ module OneM2M_Functions {
 				var RequestPrimitive v_requestPrimitive;
 				var URIList v_uriList := {};
 				v_requestPrimitive := valueof(m_retrieveChildResourceRefs(f_getResourceAddress(p_targetResourceIndex), p_originator));
-				f_send(e_mcc_port, m_request(v_requestPrimitive));
+				f_send(e_mccPort, m_request(v_requestPrimitive));
 				
 				tc_ac.start;
 				alt {
@@ -2958,7 +2785,7 @@ module OneM2M_Functions {
 						} else {
 							setverdict(inconc, __SCOPE__&":INFO: Unexpected resource retrieval");
 						}
-						f_send(e_mcc_in_port, m_response(vc_response.primitive.responsePrimitive));
+						f_send(e_mccPortIn, m_response(vc_response.primitive.responsePrimitive));
 						
 					}
 					[] tc_ac.timeout {
@@ -2978,7 +2805,7 @@ module OneM2M_Functions {
 			function f_cse_isResourcePresent_cseSimu (integer p_resourceIndex) runs on CseSimu return boolean {
 
 				//Check to see if the resource is present or not
-				f_send(e_mcc_port, m_request(m_retrieve(f_getResourceAddress(p_resourceIndex), f_getOriginator(p_resourceIndex))));
+				f_send(e_mccPort, m_request(m_retrieve(f_getResourceAddress(p_resourceIndex), f_getOriginator(p_resourceIndex))));
 				
 				tc_ac.start;
 				alt {
@@ -3016,7 +2843,7 @@ module OneM2M_Functions {
 				log(testcasename() & ":INFO: Hierarchical addressing method is required to check the non presence of the resource");
 				
 				//Check to see if the resource has NOT been created
-				f_send(e_mcc_port, m_request(m_retrieve(f_getResourceAddress(p_parentIndex, e_hierarchical) & "/" & p_resourceName, f_getOriginator(p_parentIndex))));
+				f_send(e_mccPort, m_request(m_retrieve(f_getResourceAddress(p_parentIndex, e_hierarchical) & "/" & p_resourceName, f_getOriginator(p_parentIndex))));
 				
 				tc_ac.start;
 				alt {
@@ -3060,7 +2887,7 @@ module OneM2M_Functions {
 
 				v_request := f_getCreateRequestPrimitive(int16, p_requestPrimitive, -1);
 
-				f_send(e_mcc_port, m_request(v_request));
+				f_send(e_mccPort, m_request(v_request));
 				tc_ac.start;
 				alt {
 					[] mccPort.receive(mw_response(mw_responsePrimitiveOK(p_contentResponse))) -> value v_response {
@@ -3124,7 +2951,7 @@ module OneM2M_Functions {
 						v_response.from_ := PX_TS_CSE1.cseId;
 						v_response.to_ := v_request.primitive.requestPrimitive.from_;
 						v_response.primitiveContent.remoteCSE := vc_localResourcesList[vc_localRemoteCseIndex].resource.remoteCSE;
-						f_send(e_mcc_in_port, m_response(v_response));
+						f_send(e_mccPortIn, m_response(v_response));
 						
 						vc_remoteCseIndex := f_setResource(valueof(m_primitiveContentRemoteCSE(m_contentMyRemoteCSEResource(f_getCompletePoA(PX_TS_CSE1.mcaPortIn, "")))), int16, -1, false);
 						v_resourceIndex := vc_remoteCseIndex;
@@ -3162,7 +2989,7 @@ module OneM2M_Functions {
 						setverdict(pass, __SCOPE__&":INFO: CREATE Request received successfuly");
 						v_responsePrimitive := f_getCreateResponsePrimitive(vc_request.primitive.requestPrimitive.resourceType, vc_request.primitive.requestPrimitive);
 						v_responsePrimitive.responseStatusCode := int2001;
-						f_send(e_mcc_in_port, m_response(v_responsePrimitive));
+						f_send(e_mccPortIn, m_response(v_responsePrimitive));
 					}
 					[] mccPortIn.receive(mw_request(?)) {
 						tc_ac.stop;
@@ -3691,7 +3518,7 @@ module OneM2M_Functions {
 					
 				v_request := f_getCreateRequestPrimitive(p_resourceType, p_requestPrimitive, p_parentIndex);
 
-        f_send(e_mcc_port, m_request(v_request));
+        f_send(e_mccPort, m_request(v_request));
 				tc_ac.start;
 				alt {
 					[] mccPort.receive(mw_response(mw_responsePrimitiveOK)) -> value vc_response {
@@ -3731,7 +3558,7 @@ module OneM2M_Functions {
 				
 				f_processCreateRequestPrimitive(p_requestPrimitive.primitive.requestPrimitive);
 				
-				f_send(e_mcc_in_port, m_response(vc_response.primitive.responsePrimitive));
+				f_send(e_mccPortIn, m_response(vc_response.primitive.responsePrimitive));
 			
 			}
 									
@@ -3754,7 +3581,7 @@ module OneM2M_Functions {
 					//Send response 
 					v_responsePrimitive := valueof(m_responseNotification(int2000, omit));
 					v_responsePrimitive.requestIdentifier := v_request.primitive.requestPrimitive.requestIdentifier;
-					f_send(e_mca_in_port, m_response(v_responsePrimitive));
+					f_send(e_mcaPortIn, m_response(v_responsePrimitive));
 					log(__SCOPE__&": WARNING: Unexpected Notification message received");
 					repeat;
 				}
@@ -3762,7 +3589,7 @@ module OneM2M_Functions {
 					//Send response 
 					v_responsePrimitive := valueof(m_responseNotification(int2000, omit));
 					v_responsePrimitive.requestIdentifier := v_request.primitive.requestPrimitive.requestIdentifier;
-					f_send(e_mca_in_port, m_response(v_responsePrimitive));
+					f_send(e_mcaPortIn, m_response(v_responsePrimitive));
 					log(__SCOPE__&": WARNING: Unexpected Notification for Subscription Verification message received");
 					repeat;
 				}
@@ -3827,7 +3654,7 @@ module OneM2M_Functions {
 					
 					v_localResourceIndex := f_processCreateRequestPrimitive(v_request.primitive.requestPrimitive);
 	
-					f_send(e_mcc_in_port, m_response(vc_response.primitive.responsePrimitive));
+					f_send(e_mccPortIn, m_response(vc_response.primitive.responsePrimitive));
 					repeat;
 				}
 				[] mccPortIn.receive(mw_request(mw_retrieve(?))) -> value v_request {
@@ -3835,9 +3662,9 @@ module OneM2M_Functions {
 					
 					f_processRetrieveRequestPrimitive(v_request.primitive.requestPrimitive);
 					if(ischosen(vc_response.primitive.responsePrimitive.primitiveContent.cSEBase)) {
-						f_send(e_mcc_in_port, m_response(vc_response.primitive.responsePrimitive, {{"parentID", omit}})); 
+						f_send(e_mccPortIn, m_response(vc_response.primitive.responsePrimitive, {{"parentID", omit}})); 
 					} else {
-						f_send(e_mcc_in_port, m_response(vc_response.primitive.responsePrimitive));
+						f_send(e_mccPortIn, m_response(vc_response.primitive.responsePrimitive));
 					}
 					repeat;
 				}
@@ -3845,14 +3672,14 @@ module OneM2M_Functions {
 					log(__SCOPE__&": WARNING: Unexpected UPDATE message received");
 
 					f_processUpdateRequestPrimitive(v_request.primitive.requestPrimitive);
-					f_send(e_mcc_in_port, m_response(vc_response.primitive.responsePrimitive));
+					f_send(e_mccPortIn, m_response(vc_response.primitive.responsePrimitive));
 					repeat;
 				}
 				[] mccPortIn.receive(mw_request(mw_delete())) -> value v_request {
 					log(__SCOPE__&": WARNING: Unexpected DELETE message received");
 
 					f_processDeleteRequestPrimitive(v_request.primitive.requestPrimitive);
-					f_send(e_mcc_in_port, m_response(vc_response.primitive.responsePrimitive));
+					f_send(e_mccPortIn, m_response(vc_response.primitive.responsePrimitive));
 					repeat;
 				}
 				[] mccPortIn.receive(mw_request(mw_notify)) -> value v_request {
@@ -3861,7 +3688,7 @@ module OneM2M_Functions {
 					//Send response in any case
 					v_response := valueof(m_responseNotification(int2000, omit));
 					v_response.requestIdentifier := vc_request.primitive.requestPrimitive.requestIdentifier;
-					f_send(e_mcc_in_port, m_response(v_response));
+					f_send(e_mccPortIn, m_response(v_response));
 					repeat;
 				}
 				[] mccPortIn.receive (mw_request(?)){
@@ -3887,7 +3714,7 @@ module OneM2M_Functions {
 					//Send response in any case
 					v_response := valueof(m_responseNotification(int2000, omit));
 					v_response.requestIdentifier := vc_request.primitive.requestPrimitive.requestIdentifier;
-					f_send(e_mca_in_port, m_response(v_response));
+					f_send(e_mcaPortIn, m_response(v_response));
 					repeat;
 				}
 			 	[] mcaPortIn.receive {
@@ -3972,7 +3799,7 @@ module OneM2M_Functions {
     					
 						v_localResourceIndex := f_processCreateRequestPrimitive(v_request.primitive.requestPrimitive);
 						
-						f_send(e_mca_in_port, m_response(vc_response.primitive.responsePrimitive));
+						f_send(e_mcaPortIn, m_response(vc_response.primitive.responsePrimitive));
 							
 					}
     					
@@ -4018,11 +3845,11 @@ module OneM2M_Functions {
 						v_modifiedResource := f_generateLocalResource(v_rp.primitiveContent, v_parentIndex, v_rp.resourceType);
 						v_resourceIndex := f_setLocalResource(v_modifiedResource, int2, v_parentIndex);
 						if(v_resourceIndex != -1) {
-							f_send(e_mca_in_port, m_response(m_responsePrimitive_content(int2001, v_rp.requestIdentifier, v_modifiedResource)));
+							f_send(e_mcaPortIn, m_response(m_responsePrimitive_content(int2001, v_rp.requestIdentifier, v_modifiedResource)));
 							setverdict(pass, __SCOPE__&":INFO: Container created successfuly");
 						}
 						else {
-							f_send(e_mca_in_port, m_response(m_responsePrimitive(int5000, v_request.primitive.requestPrimitive.requestIdentifier)));
+							f_send(e_mcaPortIn, m_response(m_responsePrimitive(int5000, v_request.primitive.requestPrimitive.requestIdentifier)));
 							setverdict(inconc, __SCOPE__&":INFO: Container creation failed");
 						}					
 					}
@@ -4065,11 +3892,11 @@ module OneM2M_Functions {
 						v_modifiedResource := f_generateLocalResource(v_rp.primitiveContent, v_parentIndex, v_rp.resourceType);
 						v_resourceIndex := f_setLocalResource(v_modifiedResource, int2, v_parentIndex);
 						if(v_resourceIndex != -1) {
-							f_send(e_mca_in_port, m_response(m_responsePrimitive_content(int2001, v_rp.requestIdentifier, v_modifiedResource)));
+							f_send(e_mcaPortIn, m_response(m_responsePrimitive_content(int2001, v_rp.requestIdentifier, v_modifiedResource)));
 							setverdict(pass, __SCOPE__&":INFO: Polling Channel created successfuly");
 						}
 						else {
-							f_send(e_mca_in_port, m_response(m_responsePrimitive(int5000, v_request.primitive.requestPrimitive.requestIdentifier)));
+							f_send(e_mcaPortIn, m_response(m_responsePrimitive(int5000, v_request.primitive.requestPrimitive.requestIdentifier)));
 							setverdict(inconc, __SCOPE__&":INFO: Polling Channel creation failed");
 						}					
 					}
@@ -4102,7 +3929,7 @@ module OneM2M_Functions {
 					[] mcaPortIn.receive(mw_request(p_request)) -> value vc_request {
 						tc_ac.stop;
 						v_localResourceIndex := f_processCreateRequestPrimitive(vc_request.primitive.requestPrimitive);
-						f_send(e_mca_in_port, m_response(vc_response.primitive.responsePrimitive));
+						f_send(e_mcaPortIn, m_response(vc_response.primitive.responsePrimitive));
 					}
 					[] tc_ac.timeout {
 						setverdict(inconc, __SCOPE__&":INFO: No creation for resource received");
@@ -4144,7 +3971,7 @@ module OneM2M_Functions {
 					//Send response in any case
 					v_response := valueof(m_responseNotification(int2000, omit));
 					v_response.requestIdentifier := vc_request.primitive.requestPrimitive.requestIdentifier;
-					f_send(e_mca_in_port, m_response(v_response));
+					f_send(e_mcaPortIn, m_response(v_response));
 					tc_ac.start(10.0);
 					repeat;
 				}
@@ -4152,7 +3979,7 @@ module OneM2M_Functions {
 					
 					v_localResourceIndex := f_processCreateRequestPrimitive(v_request.primitive.requestPrimitive);
 	
-					f_send(e_mcc_in_port, m_response(vc_response.primitive.responsePrimitive));
+					f_send(e_mccPortIn, m_response(vc_response.primitive.responsePrimitive));
 					tc_ac.start(10.0);
 					repeat;
 				}
@@ -5397,6 +5224,41 @@ module OneM2M_Functions {
 			return valueof(p_resource);					
 		}
 
+		/**
+			@desc Set protocol binding and host for the given ports
+			@param p_sendingPort Config parameters of sending port
+			@param p_receivingPort Config parameters of receiving port
+			@param p_protocolBindingOut Protocol binding for sending port
+			@param p_targetIutAddress Target IUT address
+			@param p_protocolBindingIn	Protocol binding for receiving port
+		*/
+		function f_setProtocolBinding(in PortDesc p_sendingPort, in PortDesc p_receivingPort, out charstring p_protocolBindingOut, out charstring p_targetIutAddress, out charstring p_protocolBindingIn) runs on Tester {
+			
+			if (ischosen(p_sendingPort.binding.httpBindingDesc)) { // FIXME Create a function to initialize vc_myInterfaces
+				p_protocolBindingOut := "HTTP";
+				p_targetIutAddress := p_sendingPort.binding.httpBindingDesc.bindingDesc.sutAddress & ":" & int2str(p_sendingPort.binding.httpBindingDesc.bindingDesc.remotePort); 
+			} else if (ischosen(p_sendingPort.binding.coapBindingDesc)) {
+				p_protocolBindingOut := "COAP";
+				p_targetIutAddress := p_sendingPort.binding.coapBindingDesc.bindingDesc.sutAddress & ":" & int2str(p_sendingPort.binding.coapBindingDesc.bindingDesc.remotePort);
+			} else if (ischosen(p_sendingPort.binding.mqttBindingDesc)) {
+				p_protocolBindingOut := "MQTT";
+				p_targetIutAddress := p_sendingPort.binding.mqttBindingDesc.bindingDesc.sutAddress & ":" & int2str(p_sendingPort.binding.mqttBindingDesc.bindingDesc.remotePort);
+			} else {
+				p_protocolBindingOut := "WSCK";
+				p_targetIutAddress := p_sendingPort.binding.wsBindingDesc.bindingDesc.sutAddress & ":" & int2str(p_sendingPort.binding.wsBindingDesc.bindingDesc.remotePort);
+			}
+     	 	
+     	 	if (ischosen(p_receivingPort.binding.httpBindingDesc)) {
+				p_protocolBindingIn := "HTTP";
+		    } else if (ischosen(p_receivingPort.binding.coapBindingDesc)) {
+				p_protocolBindingIn := "COAP";
+		    } else if (ischosen(p_receivingPort.binding.mqttBindingDesc)) {
+				p_protocolBindingIn := "MQTT";
+		    } else {
+				p_protocolBindingIn := "WSCK";
+		    }
+								
+		} // end f_setProtocolBinding
 
 		/**
 		 * @desc Checks the nodeLink attribute of a Device Model
@@ -5936,18 +5798,18 @@ module OneM2M_Functions {
 						}
 				
 						if((vc_config == e_cf01) or (((vc_config == e_cf02) or (vc_config == e_cf02CseSimuMaster)) and (vc_testSystemRole == e_ae)) or (vc_config == e_cf03)) {
-							if(vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mca_port))].myProtocolBinding == "MQTT") {
+							if(vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mcaPort))].myProtocolBinding == "MQTT") {
 								acPort.send(AcRequestPrimitive:{p_event & "_mcaPort", {charstring := v_spRelativeAeIdForMqtt}});
 			}
-							if(vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mca_in_port))].myProtocolBinding == "MQTT") {
+							if(vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mcaPortIn))].myProtocolBinding == "MQTT") {
 								acPort.send(AcRequestPrimitive:{p_event & "_mcaPortIn", {charstring := v_spRelativeAeIdForMqtt}});	
 							}
 						}
 						if((((vc_config == e_cf02) or (vc_config == e_cf02CseSimuMaster)) and (vc_testSystemRole == e_cse)) or (vc_config == e_cf04)) {
-							if(vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mcc_port))].myProtocolBinding == "MQTT") {
+							if(vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mccPort))].myProtocolBinding == "MQTT") {
 								acPort.send(AcRequestPrimitive:{p_event & "_mccPort", {charstring := v_spRelativeAeIdForMqtt}});	
 							}
-							if(vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mcc_in_port))].myProtocolBinding == "MQTT") {
+							if(vc_myInterfaces[enum2int(valueof(InterfaceIds:e_mccPortIn))].myProtocolBinding == "MQTT") {
 								acPort.send(AcRequestPrimitive:{p_event  & "_mccPortIn", {charstring := v_spRelativeAeIdForMqtt}});	
 							}
 						}
diff --git a/LibOneM2M/OneM2M_TestSystem.ttcn b/LibOneM2M/OneM2M_TestSystem.ttcn
index 572b38842241414192e5522439c2bd8b63f79a30..898912bcb35e649242c6ddd7517d208c93bee6fc 100644
--- a/LibOneM2M/OneM2M_TestSystem.ttcn
+++ b/LibOneM2M/OneM2M_TestSystem.ttcn
@@ -21,10 +21,10 @@ module OneM2M_TestSystem {
  */	
   
   type enumerated InterfaceIds {
-  	e_mca_port    (0),
-  	e_mca_in_port (1),
-    e_mcc_port    (2),
-    e_mcc_in_port (3)
+  	e_mcaPort    (0),
+  	e_mcaPortIn (1),
+    e_mccPort   (2),
+    e_mccPortIn (3)
   }
   
   type record Interface {
diff --git a/OneM2M_PermutationFunctions.ttcn b/OneM2M_PermutationFunctions.ttcn
index 497000d2dd8de77e1c01d0849bb540498c1531e0..9a56a8f730d1bea3cfd8ca39f8e9555f8e43ec6f 100644
--- a/OneM2M_PermutationFunctions.ttcn
+++ b/OneM2M_PermutationFunctions.ttcn
@@ -51,12 +51,12 @@ module OneM2M_PermutationFunctions {
 								tc_ac.stop;
 								setverdict(pass, __SCOPE__ & " : Container creation request received successfuly");
 								v_resourceIndex := f_processCreateRequestPrimitive(v_request.primitive.requestPrimitive);	
-								f_send(e_mca_in_port, m_response(vc_response.primitive.responsePrimitive));
+								f_send(e_mcaPortIn, m_response(vc_response.primitive.responsePrimitive));
 							}
 							[] mcaPortIn.receive(mw_request(mw_createContainer())) -> value v_request {
 								tc_ac.stop;
 								setverdict(fail, __SCOPE__ & " : Create Request with unexpected target");
-								f_send(e_mca_in_port, m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))));
+								f_send(e_mcaPortIn, m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))));
 								stop;
 							}
 							[] tc_ac.timeout {
@@ -94,12 +94,12 @@ module OneM2M_PermutationFunctions {
 								tc_ac.stop;
 								setverdict(pass, __SCOPE__ & " : Container creation request received successfuly");
 								v_resourceIndex := f_processCreateRequestPrimitive(v_request.primitive.requestPrimitive);	
-								f_send(e_mca_in_port, m_response(vc_response.primitive.responsePrimitive));
+								f_send(e_mcaPortIn, m_response(vc_response.primitive.responsePrimitive));
 							}
 							[] mcaPortIn.receive(mw_request(mw_createContainer())) -> value v_request {
 								tc_ac.stop;
 								setverdict(fail, __SCOPE__ & " : Create Request with unexpected target");
-								f_send(e_mca_in_port, m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))));
+								f_send(e_mcaPortIn, m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))));
 								stop;
 							}
 							[] tc_ac.timeout {
@@ -143,12 +143,12 @@ module OneM2M_PermutationFunctions {
 								tc_ac.stop;
 								setverdict(pass, __SCOPE__ & " : Container update request received successfuly");
 								f_processUpdateRequestPrimitive(v_request.primitive.requestPrimitive);
-								f_send(e_mca_in_port, m_response(vc_response.primitive.responsePrimitive));
+								f_send(e_mcaPortIn, m_response(vc_response.primitive.responsePrimitive));
 							}
 							[] mcaPortIn.receive(mw_request(mw_updateContainer())) {
 								tc_ac.stop;
 								setverdict(fail, __SCOPE__ & " : Update Request with unexpected target");
-								f_send(e_mca_in_port, m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))));
+								f_send(e_mcaPortIn, m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))));
 								stop;
 							}
 							[] tc_ac.timeout {
@@ -186,12 +186,12 @@ module OneM2M_PermutationFunctions {
 								tc_ac.stop;
 								setverdict(pass, __SCOPE__ & " : Container update request received successfuly");
 								f_processUpdateRequestPrimitive(v_request.primitive.requestPrimitive);
-								f_send(e_mca_in_port, m_response(vc_response.primitive.responsePrimitive));
+								f_send(e_mcaPortIn, m_response(vc_response.primitive.responsePrimitive));
 							}
 							[] mcaPortIn.receive(mw_request(mw_updateContainer())) {
 								tc_ac.stop;
 								setverdict(fail, __SCOPE__ & " : Update Request with unexpected target");
-								f_send(e_mca_in_port, m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))));
+								f_send(e_mcaPortIn, m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))));
 								stop;
 							}
 							[] tc_ac.timeout {
@@ -234,12 +234,12 @@ module OneM2M_PermutationFunctions {
 								tc_ac.stop;
 								setverdict(pass, __SCOPE__ & " : Container retrieve request received successfuly");
 								f_processRetrieveRequestPrimitive(v_request.primitive.requestPrimitive);
-								f_send(e_mca_in_port, m_response(vc_response.primitive.responsePrimitive));
+								f_send(e_mcaPortIn, m_response(vc_response.primitive.responsePrimitive));
 							}
 							[] mcaPortIn.receive(mw_request(mw_retrieve(?))) -> value v_request {
 								tc_ac.stop;
 								setverdict(fail, __SCOPE__ & " : Retrieve request with unexpected target");
-								f_send(e_mca_in_port, m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))));
+								f_send(e_mcaPortIn, m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))));
 								stop;
 							}
 							[] tc_ac.timeout {
@@ -277,12 +277,12 @@ module OneM2M_PermutationFunctions {
 								tc_ac.stop;
 								setverdict(pass, __SCOPE__ & " : Container retrieve request received successfuly");
 								f_processRetrieveRequestPrimitive(v_request.primitive.requestPrimitive);
-								f_send(e_mca_in_port, m_response(vc_response.primitive.responsePrimitive));
+								f_send(e_mcaPortIn, m_response(vc_response.primitive.responsePrimitive));
 							}
 							[] mcaPortIn.receive(mw_request(mw_retrieve(?))) -> value v_request {
 								tc_ac.stop;
 								setverdict(fail, __SCOPE__ & " : Retrieve request with unexpected target");
-								f_send(e_mca_in_port, m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))));
+								f_send(e_mcaPortIn, m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))));
 								stop;
 							}
 							[] tc_ac.timeout {
@@ -325,12 +325,12 @@ module OneM2M_PermutationFunctions {
 								tc_ac.stop;
 								setverdict(pass, __SCOPE__ & " : Container delete request received successfuly");
 								f_processDeleteRequestPrimitive(v_request.primitive.requestPrimitive);
-								f_send(e_mca_in_port, m_response(vc_response.primitive.responsePrimitive));
+								f_send(e_mcaPortIn, m_response(vc_response.primitive.responsePrimitive));
 							}
 							[] mcaPortIn.receive(mw_request(mw_delete(?))) -> value v_request {
 								tc_ac.stop;
 								setverdict(fail, __SCOPE__ & " : Delete request with unexpected target");
-								f_send(e_mca_in_port, m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))));
+								f_send(e_mcaPortIn, m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))));
 								stop;
 							}
 							[] tc_ac.timeout {
@@ -369,12 +369,12 @@ module OneM2M_PermutationFunctions {
 								tc_ac.stop;
 								setverdict(pass, __SCOPE__ & " : Container delete request received successfuly");
 								f_processDeleteRequestPrimitive(v_request.primitive.requestPrimitive);
-								f_send(e_mca_in_port, m_response(vc_response.primitive.responsePrimitive));
+								f_send(e_mcaPortIn, m_response(vc_response.primitive.responsePrimitive));
 							}
 							[] mcaPortIn.receive(mw_request(mw_delete(?))) -> value v_request {
 								tc_ac.stop;
 								setverdict(fail, __SCOPE__ & " : Delete request with unexpected target");
-								f_send(e_mca_in_port, m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))));
+								f_send(e_mcaPortIn, m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))));
 								stop;
 							}
 							[] tc_ac.timeout {
@@ -420,12 +420,12 @@ module OneM2M_PermutationFunctions {
 							   v_resourceIndex := f_processCreateRequestPrimitive(v_request.primitive.requestPrimitive);	
 							
 							   //send back responsePrimitive
-							   f_send(e_mca_in_port, m_response(vc_response.primitive.responsePrimitive));
+							   f_send(e_mcaPortIn, m_response(vc_response.primitive.responsePrimitive));
 						   }
 							[] mcaPortIn.receive(mw_request(mw_createAe())) -> value v_request {
 							   tc_ac.stop;
 							   setverdict(fail, __SCOPE__ & " : Unexpected AE registration request");
-								f_send(e_mca_in_port, m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))));
+								f_send(e_mcaPortIn, m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))));
 						   }
 						   [] tc_ac.timeout{
 							   setverdict(fail, __SCOPE__ & " : Timeout due to no response received from requested SUT!");
@@ -475,13 +475,13 @@ module OneM2M_PermutationFunctions {
 								setverdict(pass, __SCOPE__ & " : ContentInstance creation request is accepted!!");
 								v_resourceIndex := f_processCreateRequestPrimitive(v_request.primitive.requestPrimitive);	
 								//send back responsePrimitive
-								f_send(e_mca_in_port, m_response(vc_response.primitive.responsePrimitive));
+								f_send(e_mcaPortIn, m_response(vc_response.primitive.responsePrimitive));
 							}
 	
 							[] mcaPortIn.receive(mw_request(mw_create)) -> value v_request{
 								tc_ac.stop;
 								setverdict(fail, __SCOPE__ & " : Unexpected CREATE request ");
-								f_send(e_mca_in_port, m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))));
+								f_send(e_mcaPortIn, m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))));
 							}
 							[] tc_ac.timeout{
 								setverdict(fail, __SCOPE__ & " : Timeout due to no response received from requested SUT!");
@@ -513,12 +513,12 @@ module OneM2M_PermutationFunctions {
 								setverdict(pass, __SCOPE__ & " : Container creation request is accepted!!");
 								v_resourceIndex := f_processCreateRequestPrimitive(v_request.primitive.requestPrimitive);	
 								//send back responsePrimitive
-								f_send(e_mca_in_port, m_response(vc_response.primitive.responsePrimitive));
+								f_send(e_mcaPortIn, m_response(vc_response.primitive.responsePrimitive));
 							}
 							[] mcaPortIn.receive(mw_request(mw_create)) {
 								tc_ac.stop;
 								setverdict(fail, __SCOPE__ & " : Unexpected CREATE request ");
-								f_send(e_mca_in_port, m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))));
+								f_send(e_mcaPortIn, m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))));
 							}
 							[] tc_ac.timeout{
 								setverdict(fail, __SCOPE__ & " : Timeout due to no response received from requested SUT!");
@@ -558,12 +558,12 @@ module OneM2M_PermutationFunctions {
 							   tc_ac.stop;
 							   setverdict(pass, __SCOPE__ & " : AE update request is accepted!");
 							   f_processUpdateRequestPrimitive(v_request.primitive.requestPrimitive);
-							   f_send(e_mca_in_port, m_response(vc_response.primitive.responsePrimitive));
+							   f_send(e_mcaPortIn, m_response(vc_response.primitive.responsePrimitive));
 							}
 							[] mcaPortIn.receive(mw_request(mw_update)) -> value v_request {
 							   tc_ac.stop;
 							   setverdict(fail, __SCOPE__ & " : Unexpected UPDATE request");
-								f_send(e_mca_in_port, m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))));
+								f_send(e_mcaPortIn, m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))));
 						   }
 						   [] tc_ac.timeout{
 							   setverdict(fail, __SCOPE__ & " : Timeout due to no response received from requested SUT!");
@@ -598,12 +598,12 @@ module OneM2M_PermutationFunctions {
 								tc_ac.stop;
 								setverdict(pass, __SCOPE__ & " : Container update request is accepted!!");
 								f_processUpdateRequestPrimitive(v_request.primitive.requestPrimitive);
-								f_send(e_mca_in_port, m_response(vc_response.primitive.responsePrimitive));
+								f_send(e_mcaPortIn, m_response(vc_response.primitive.responsePrimitive));
 							}
 							[] mcaPortIn.receive(mw_request(mw_update)) {
 								tc_ac.stop;
 								setverdict(fail, __SCOPE__ & " : Unexpected UPDATE request");
-								f_send(e_mca_in_port, m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))));
+								f_send(e_mcaPortIn, m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))));
 							}
 							[] tc_ac.timeout{
 								setverdict(fail, __SCOPE__ & " : Timeout due to no response received from requested SUT!");
@@ -647,12 +647,12 @@ module OneM2M_PermutationFunctions {
 								tc_ac.stop;
 								setverdict(pass, __SCOPE__ & " : retrieve resource type request is accepted!!");
 								v_responsePrimitive := valueof(m_responsePrimitive(int2000, v_request.primitive.requestPrimitive.requestIdentifier, vc_localResourcesList[v_resourceIndex].resource));
-								f_send(e_mca_in_port, m_response(v_responsePrimitive));
+								f_send(e_mcaPortIn, m_response(v_responsePrimitive));
 							}
 							[] mcaPortIn.receive (mw_request(mw_retrieve(?))){
 								tc_ac.stop;
 								setverdict(fail, __SCOPE__ & " : Retrieve request for unexpected target");
-								f_send(e_mca_in_port, m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))));
+								f_send(e_mcaPortIn, m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))));
 							}
 							[] tc_ac.timeout{
 								setverdict(fail, __SCOPE__ & " : Timeout due to no response received from requested SUT!");
@@ -701,12 +701,12 @@ module OneM2M_PermutationFunctions {
 								v_resourceIndex := f_setLocalResource(v_resource, v_request.primitive.requestPrimitive.resourceType, v_parentIndex);	
 								v_responsePrimitive := valueof(m_responsePrimitive(int2001, v_request.primitive.requestPrimitive.requestIdentifier, vc_localResourcesList[v_resourceIndex].resource));
 								//send back responsePrimitive
-								f_send(e_mca_in_port, m_response(v_responsePrimitive));
+								f_send(e_mcaPortIn, m_response(v_responsePrimitive));
 							}
 							[] mcaPortIn.receive {
 								tc_ac.stop;
 								setverdict(fail, __SCOPE__ & " : Subscription creation request is rejected due to not including the optional attribute!");
-								f_send(e_mca_in_port, m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))));
+								f_send(e_mcaPortIn, m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))));
 							}
 							[] tc_ac.timeout{
 								setverdict(fail, __SCOPE__ & " : Timeout due to no response received from requested SUT!");
@@ -750,13 +750,13 @@ module OneM2M_PermutationFunctions {
 							tc_ac.stop;
 							setverdict(pass, __SCOPE__ & " : Device model creation request is accepted");
 							v_resourceIndex := f_processCreateRequestPrimitive(vc_request.primitive.requestPrimitive);	
-							f_send(e_mca_in_port, m_response(vc_response.primitive.responsePrimitive));
+							f_send(e_mcaPortIn, m_response(vc_response.primitive.responsePrimitive));
 						}
 						[] mcaPortIn.receive(mw_request(mw_create)) -> value vc_request {
 							tc_ac.stop;
 							//Send Response
 							v_resourceIndex := f_processCreateRequestPrimitive(vc_request.primitive.requestPrimitive);	
-							f_send(e_mca_in_port, m_response(vc_response.primitive.responsePrimitive));
+							f_send(e_mcaPortIn, m_response(vc_response.primitive.responsePrimitive));
 							tc_ac.start;
 							repeat;					
 						}
@@ -795,13 +795,13 @@ module OneM2M_PermutationFunctions {
 							tc_ac.stop;
 							setverdict(pass, __SCOPE__ & " : Module class creation request is accepted");
 							v_resourceIndex := f_processCreateRequestPrimitive(vc_request.primitive.requestPrimitive);	
-							f_send(e_mca_in_port, m_response(vc_response.primitive.responsePrimitive));
+							f_send(e_mcaPortIn, m_response(vc_response.primitive.responsePrimitive));
 						}
 						[] mcaPortIn.receive(mw_request(mw_create)) -> value vc_request {
 							tc_ac.stop;
 							//Send response
 							v_resourceIndex := f_processCreateRequestPrimitive(vc_request.primitive.requestPrimitive);	
-							f_send(e_mca_in_port, m_response(vc_response.primitive.responsePrimitive));
+							f_send(e_mcaPortIn, m_response(vc_response.primitive.responsePrimitive));
 							tc_ac.start;
 							repeat;
 						}
@@ -843,7 +843,7 @@ module OneM2M_PermutationFunctions {
 						[v_deviceInfoCreated] mcaPortIn.receive(mw_request(p_requestPrimitive)) -> value vc_request {
 							tc_ac.stop;
 							v_resourceIndex := f_processCreateRequestPrimitive(vc_request.primitive.requestPrimitive);	
-							f_send(e_mca_in_port, m_response(vc_response.primitive.responsePrimitive));
+							f_send(e_mcaPortIn, m_response(vc_response.primitive.responsePrimitive));
 							if(f_checkNodeLink(vc_request.primitive.requestPrimitive.primitiveContent, f_getResourceAddress(v_resourceIndexNode)))
 							{
 								setverdict(pass, __SCOPE__ & " : Device model Properties creation request is correct");
@@ -859,7 +859,7 @@ module OneM2M_PermutationFunctions {
 							v_nodeCreated := true;	
 							//Set deviceInfo parent
 							v_requestPrimitiveDeviceInfo.to_ := f_getResourceAddress(v_resourceIndexNode);
-							f_send(e_mca_in_port, m_response(vc_response.primitive.responsePrimitive));
+							f_send(e_mcaPortIn, m_response(vc_response.primitive.responsePrimitive));
 							tc_ac.start;
 							repeat;
 						}
@@ -867,7 +867,7 @@ module OneM2M_PermutationFunctions {
 							tc_ac.stop;
 							v_resourceIndexDeviceInfo := f_processCreateRequestPrimitive(vc_request.primitive.requestPrimitive);
 							v_deviceInfoCreated := true;	
-							f_send(e_mca_in_port, m_response(vc_response.primitive.responsePrimitive));
+							f_send(e_mcaPortIn, m_response(vc_response.primitive.responsePrimitive));
 							tc_ac.start;
 							repeat;
 						}
@@ -875,7 +875,7 @@ module OneM2M_PermutationFunctions {
 							tc_ac.stop;
 							//Send Response
 							v_resourceIndex := f_processCreateRequestPrimitive(vc_request.primitive.requestPrimitive);	
-							f_send(e_mca_in_port, m_response(vc_response.primitive.responsePrimitive));
+							f_send(e_mcaPortIn, m_response(vc_response.primitive.responsePrimitive));
 							tc_ac.start;
 							repeat;	
 						}
@@ -914,13 +914,13 @@ module OneM2M_PermutationFunctions {
 							tc_ac.stop;
 							setverdict(pass, __SCOPE__ & " : Module class creation request contains required Properties");
 							v_resourceIndex := f_processCreateRequestPrimitive(vc_request.primitive.requestPrimitive);	
-							f_send(e_mca_in_port, m_response(vc_response.primitive.responsePrimitive));
+							f_send(e_mcaPortIn, m_response(vc_response.primitive.responsePrimitive));
 						}
 						[] mcaPortIn.receive(mw_request(mw_create)) -> value vc_request {
 							tc_ac.stop;
 							//Send response
 							v_resourceIndex := f_processCreateRequestPrimitive(vc_request.primitive.requestPrimitive);	
-							f_send(e_mca_in_port, m_response(vc_response.primitive.responsePrimitive));
+							f_send(e_mcaPortIn, m_response(vc_response.primitive.responsePrimitive));
 							tc_ac.start;
 							repeat;
 						}
@@ -959,13 +959,13 @@ module OneM2M_PermutationFunctions {
 							tc_ac.stop;
 							setverdict(pass, __SCOPE__ & " : Module class creation request contains required DataPoints");
 							v_resourceIndex := f_processCreateRequestPrimitive(vc_request.primitive.requestPrimitive);	
-							f_send(e_mca_in_port, m_response(vc_response.primitive.responsePrimitive));
+							f_send(e_mcaPortIn, m_response(vc_response.primitive.responsePrimitive));
 						}
 						[] mcaPortIn.receive(mw_request(mw_create)) -> value vc_request {
 							tc_ac.stop;
 							//Send response
 							v_resourceIndex := f_processCreateRequestPrimitive(vc_request.primitive.requestPrimitive);	
-							f_send(e_mca_in_port, m_response(vc_response.primitive.responsePrimitive));
+							f_send(e_mcaPortIn, m_response(vc_response.primitive.responsePrimitive));
 							tc_ac.start;
 							repeat;
 						}
@@ -1024,7 +1024,7 @@ module OneM2M_PermutationFunctions {
 						v_request := f_getCreateRequestPrimitive(int3, m_createContainerBase, v_resourceIndex);
 						v_request.to_ := f_getResourceAddress(v_resourceIndex, v_addressingMethod, v_primitiveScope);
 						
-						f_send(e_mca_port, m_request(v_request));
+						f_send(e_mcaPort, m_request(v_request));
 						
 						tc_ac.start;
 						alt {
@@ -1085,7 +1085,7 @@ module OneM2M_PermutationFunctions {
 						v_request := f_getCreateRequestPrimitive(int3, m_createContainerBase, v_resourceIndex);
 						v_request.to_ := f_getResourceAddress(v_resourceIndex, v_addressingMethod, v_primitiveScope);
 												
-						f_send(e_mca_port, m_request(v_request));
+						f_send(e_mcaPort, m_request(v_request));
 						tc_ac.start;
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) {
@@ -1146,7 +1146,7 @@ module OneM2M_PermutationFunctions {
 						v_request := f_getCreateRequestPrimitive(int3, m_createContainerBase, v_resourceIndex);
 						v_request.to_ := f_useShortcutInResourceId(f_getResourceAddress(v_resourceIndex, v_addressingMethod, v_primitiveScope));
 												
-						f_send(e_mca_port, m_request(v_request));
+						f_send(e_mcaPort, m_request(v_request));
 						tc_ac.start;
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) {
@@ -1207,7 +1207,7 @@ module OneM2M_PermutationFunctions {
 						v_request := f_getCreateRequestPrimitive(int3, m_createContainerBase, v_resourceIndex);
 						v_request.to_ := f_getResourceAddress(v_resourceIndex, v_addressingMethod, v_primitiveScope);
 												
-						f_send(e_mca_port, m_request(v_request));
+						f_send(e_mcaPort, m_request(v_request));
 						tc_ac.start;
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) {
@@ -1269,7 +1269,7 @@ module OneM2M_PermutationFunctions {
 						v_addressingMethod := e_nonHierarchical;
 						v_primitiveScope := p_primitiveScope;
 						
-						f_send(e_mca_port, m_request(m_retrieve(f_getResourceAddress(v_resourceIndex, v_addressingMethod, v_primitiveScope), f_getOriginator(v_resourceIndex))));
+						f_send(e_mcaPort, m_request(m_retrieve(f_getResourceAddress(v_resourceIndex, v_addressingMethod, v_primitiveScope), f_getOriginator(v_resourceIndex))));
 						tc_ac.start;
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2000))) {
@@ -1326,7 +1326,7 @@ module OneM2M_PermutationFunctions {
 						v_addressingMethod := e_hierarchical;
 						v_primitiveScope := p_primitiveScope;
 						
-						f_send(e_mca_port, m_request(m_retrieve(f_getResourceAddress(v_resourceIndex, v_addressingMethod, v_primitiveScope), f_getOriginator(v_resourceIndex))));
+						f_send(e_mcaPort, m_request(m_retrieve(f_getResourceAddress(v_resourceIndex, v_addressingMethod, v_primitiveScope), f_getOriginator(v_resourceIndex))));
 						tc_ac.start;
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2000))) {
@@ -1383,7 +1383,7 @@ module OneM2M_PermutationFunctions {
 						v_addressingMethod := e_hierarchical;
 						v_primitiveScope := p_primitiveScope;
 						
-						f_send(e_mca_port, m_request(m_retrieve(f_useShortcutInResourceId(f_getResourceAddress(v_resourceIndex, v_addressingMethod, v_primitiveScope)), f_getOriginator(v_resourceIndex))));
+						f_send(e_mcaPort, m_request(m_retrieve(f_useShortcutInResourceId(f_getResourceAddress(v_resourceIndex, v_addressingMethod, v_primitiveScope)), f_getOriginator(v_resourceIndex))));
 						tc_ac.start;
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2000))) {
@@ -1440,7 +1440,7 @@ module OneM2M_PermutationFunctions {
 						v_addressingMethod := e_hybrid;
 						v_primitiveScope := p_primitiveScope;
 						
-						f_send(e_mca_port, m_request(m_retrieve(f_getResourceAddress(v_resourceIndex, v_addressingMethod, v_primitiveScope), f_getOriginator(v_resourceIndex))));
+						f_send(e_mcaPort, m_request(m_retrieve(f_getResourceAddress(v_resourceIndex, v_addressingMethod, v_primitiveScope), f_getOriginator(v_resourceIndex))));
 						tc_ac.start;
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2000))) {
@@ -1507,7 +1507,7 @@ module OneM2M_PermutationFunctions {
 						v_updateRequest := f_getUpdateRequestPrimitive(int3, v_resourceIndex, v_updateRequest);
 						v_updateRequest.to_ := f_getResourceAddress(v_resourceIndex, v_addressingMethod, v_primitiveScope);
 						
-						f_send(e_mca_port, m_request(v_updateRequest));
+						f_send(e_mcaPort, m_request(v_updateRequest));
 						tc_ac.start;
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) {
@@ -1570,7 +1570,7 @@ module OneM2M_PermutationFunctions {
 						v_updateRequest := f_getUpdateRequestPrimitive(int3, v_resourceIndex, v_updateRequest);
 						v_updateRequest.to_ := f_getResourceAddress(v_resourceIndex, v_addressingMethod, v_primitiveScope);
 						
-						f_send(e_mca_port, m_request(v_updateRequest));
+						f_send(e_mcaPort, m_request(v_updateRequest));
 						tc_ac.start;
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) {
@@ -1633,7 +1633,7 @@ module OneM2M_PermutationFunctions {
 						v_updateRequest := f_getUpdateRequestPrimitive(int3, v_resourceIndex, v_updateRequest);
 						v_updateRequest.to_ := f_useShortcutInResourceId(f_getResourceAddress(v_resourceIndex, v_addressingMethod, v_primitiveScope));
 						
-						f_send(e_mca_port, m_request(v_updateRequest));
+						f_send(e_mcaPort, m_request(v_updateRequest));
 						tc_ac.start;
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) {
@@ -1696,7 +1696,7 @@ module OneM2M_PermutationFunctions {
 						v_updateRequest := f_getUpdateRequestPrimitive(int3, v_resourceIndex, v_updateRequest);
 						v_updateRequest.to_ := f_getResourceAddress(v_resourceIndex, v_addressingMethod, v_primitiveScope);
 						
-						f_send(e_mca_port, m_request(v_updateRequest));
+						f_send(e_mcaPort, m_request(v_updateRequest));
 						tc_ac.start;
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) {
@@ -1760,7 +1760,7 @@ module OneM2M_PermutationFunctions {
 						
 						v_request := valueof(m_delete(f_getResourceAddress(v_resourceIndex, v_addressingMethod, v_primitiveScope), f_getOriginator(v_resourceIndex)));
 												
-						f_send(e_mca_port, m_request(v_request));
+						f_send(e_mcaPort, m_request(v_request));
 						tc_ac.start;
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2002))) {
@@ -1820,7 +1820,7 @@ module OneM2M_PermutationFunctions {
 						
 						v_request := valueof(m_delete(f_getResourceAddress(v_resourceIndex, v_addressingMethod, v_primitiveScope), f_getOriginator(v_resourceIndex)));
 						
-						f_send(e_mca_port, m_request(v_request));
+						f_send(e_mcaPort, m_request(v_request));
 						tc_ac.start;
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2002))) {
@@ -1880,7 +1880,7 @@ module OneM2M_PermutationFunctions {
 						
 						v_request := valueof(m_delete(f_useShortcutInResourceId(f_getResourceAddress(v_resourceIndex, v_addressingMethod, v_primitiveScope)), f_getOriginator(v_resourceIndex)));
 						
-						f_send(e_mca_port, m_request(v_request));
+						f_send(e_mcaPort, m_request(v_request));
 						tc_ac.start;
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2002))) {
@@ -1940,7 +1940,7 @@ module OneM2M_PermutationFunctions {
 						
 						v_request := valueof(m_delete(f_getResourceAddress(v_resourceIndex, v_addressingMethod, v_primitiveScope), f_getOriginator(v_resourceIndex)));
 						
-						f_send(e_mca_port, m_request(v_request));
+						f_send(e_mcaPort, m_request(v_request));
 						tc_ac.start;
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2002))) {
@@ -2004,7 +2004,7 @@ module OneM2M_PermutationFunctions {
 					
 					v_request := f_getCreateRequestPrimitive(v_resourceType, v_request, -1);
 					
-					f_send(e_mca_port, m_request(v_request));
+					f_send(e_mcaPort, m_request(v_request));
 					
 					tc_ac.start;
 					alt {
@@ -2057,7 +2057,7 @@ module OneM2M_PermutationFunctions {
 	    									
 					v_request := f_getCreateRequestPrimitive(v_resourceType, v_request, -1);
 	
-					f_send(e_mca_port, m_request(v_request));
+					f_send(e_mcaPort, m_request(v_request));
 					tc_ac.start;
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response{
@@ -2101,7 +2101,7 @@ module OneM2M_PermutationFunctions {
 						v_request := valueof(p_createAe);
 						v_request := f_getCreateRequestPrimitive(v_resourceType, v_request, -1);
 						
-					f_send(e_mca_port, m_request(v_request));
+					f_send(e_mcaPort, m_request(v_request));
 						tc_ac.start;
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response{
@@ -2147,7 +2147,7 @@ module OneM2M_PermutationFunctions {
 						// Test Body
 						v_request := f_getCreateRequestPrimitive(v_resourceType, p_requestPrimitive, -1);
 					
-					f_send(e_mcc_port, m_request(v_request));
+					f_send(e_mccPort, m_request(v_request));
 						tc_ac.start;
 						alt {
 							[] mccPort.receive(mw_response(mw_responsePrimitive(int2001, f_getTemplateFromPrimitiveContent(v_request.primitiveContent)))) -> value v_response {
@@ -2201,7 +2201,7 @@ module OneM2M_PermutationFunctions {
 						// Test Body
 						v_request := f_getCreateRequestPrimitive(int2, p_createRequestPrimitive, -1);
 						
-					f_send(e_mca_port, m_request(v_request));
+					f_send(e_mcaPort, m_request(v_request));
 						tc_ac.start;
 						alt {
 							 [] mcaPort.receive(mw_response(mw_responsePrimitive(int4000))) { //BAD REQUEST
@@ -2259,7 +2259,7 @@ module OneM2M_PermutationFunctions {
 								v_responsePrimitive := valueof(m_responsePrimitive(int2001, v_request.primitive.requestPrimitive.requestIdentifier, omit));
 
 								//send back responsePrimitive
-							f_send(e_mcc_in_port, m_response(v_responsePrimitive));
+							f_send(e_mccPortIn, m_response(v_responsePrimitive));
 							}
 							[] mccPortIn.receive {
 								tc_ac.stop;
@@ -2328,7 +2328,7 @@ module OneM2M_PermutationFunctions {
 						 // Preamble
 						 v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
 						 
-						 f_send(e_mca_port, m_request(m_retrieve(f_getResourceAddress(), f_getOriginator(v_aeIndex))));
+						 f_send(e_mcaPort, m_request(m_retrieve(f_getResourceAddress(), f_getOriginator(v_aeIndex))));
 						 tc_ac.start;
 						 alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2000, p_contentResponse))) -> value v_response {
@@ -2374,7 +2374,7 @@ module OneM2M_PermutationFunctions {
 						 // Preamble
 						 v_aeIndex := f_cse_createResource(int2, p_createRequestPrimitive, -1);
 		 
-             f_send(e_mca_port, m_request(m_retrieve(f_getResourceAddress(v_aeIndex), f_getOriginator(v_aeIndex))));//TODO Maybe PX_SUPER_AE_ID
+             f_send(e_mcaPort, m_request(m_retrieve(f_getResourceAddress(v_aeIndex), f_getOriginator(v_aeIndex))));//TODO Maybe PX_SUPER_AE_ID
 						 tc_ac.start;
 						 alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2000, p_contentResponse))) -> value v_response {
@@ -2420,7 +2420,7 @@ module OneM2M_PermutationFunctions {
 
 						// Preamble
 						vc_remoteCseIndex := f_cse_registerRemoteCse(p_createRequestPrimitive);
-						f_send(e_mcc_port, m_request(m_retrieve(f_getResourceAddress(vc_remoteCseIndex), f_getOriginator(vc_remoteCseIndex))));
+						f_send(e_mccPort, m_request(m_retrieve(f_getResourceAddress(vc_remoteCseIndex), f_getOriginator(vc_remoteCseIndex))));
 					    tc_ac.start;
 						alt {
 							[] mccPort.receive(mw_response(mw_responsePrimitive(int2000, p_contentResponse))) -> value v_response {
@@ -2473,7 +2473,7 @@ module OneM2M_PermutationFunctions {
 						// Test Body
 						v_request := f_getUpdateRequestPrimitive(int16, vc_remoteCseIndex, p_requestPrimitive);
 	
-						f_send(e_mcc_port, m_request(v_request));
+						f_send(e_mccPort, m_request(v_request));
 						tc_ac.start;
 						alt {
 							[] mccPort.receive(mw_response(mw_responsePrimitive(int2004, f_getTemplateFromPrimitiveContent(v_request.primitiveContent)))) -> value v_response {
@@ -2616,30 +2616,30 @@ module OneM2M_PermutationFunctions {
 						tc_ac.stop;
 						setverdict(pass, __SCOPE__ & ": Request primitive retargeted successfully");
 						f_processCreateRequestPrimitive(vc_request.primitive.requestPrimitive);
-						f_send(e_mcc_in_port, m_response(vc_response.primitive.responsePrimitive));
+						f_send(e_mccPortIn, m_response(vc_response.primitive.responsePrimitive));
 					}
 					[v_responseStatusCode == int2000] mccPortIn.receive(mw_request(mw_retrieve(v_targetResourceAddress))) -> value vc_request {
 						tc_ac.stop;
 						setverdict(pass, __SCOPE__ & ": Request primitive retargeted successfully");
 						f_processRetrieveRequestPrimitive(vc_request.primitive.requestPrimitive);
-						f_send(e_mcc_in_port, m_response(vc_response.primitive.responsePrimitive));
+						f_send(e_mccPortIn, m_response(vc_response.primitive.responsePrimitive));
 					}
 					[v_responseStatusCode == int2004] mccPortIn.receive(mw_request(mw_update(-, v_targetResourceAddress))) -> value vc_request {
 						tc_ac.stop;
 						setverdict(pass, __SCOPE__ & ": Request primitive retargeted successfully");
 						f_processUpdateRequestPrimitive(vc_request.primitive.requestPrimitive);
-						f_send(e_mcc_in_port, m_response(vc_response.primitive.responsePrimitive));
+						f_send(e_mccPortIn, m_response(vc_response.primitive.responsePrimitive));
 					}
 					[v_responseStatusCode == int2002] mccPortIn.receive(mw_request(mw_delete(v_targetResourceAddress))) -> value vc_request {
 						tc_ac.stop;
 						setverdict(pass, __SCOPE__ & ": Request primitive retargeted successfully");
 						f_processDeleteRequestPrimitive(vc_request.primitive.requestPrimitive);
-						f_send(e_mcc_in_port, m_response(vc_response.primitive.responsePrimitive));
+						f_send(e_mccPortIn, m_response(vc_response.primitive.responsePrimitive));
 					}
 					[] mccPortIn.receive(mw_request(?)) -> value vc_request {
 						tc_ac.stop;
 						setverdict(fail, __SCOPE__ & ": Wrong request received");
-						f_send(e_mcc_in_port, m_response(m_responsePrimitive(int4000, vc_request.primitive.requestPrimitive.requestIdentifier)));
+						f_send(e_mccPortIn, m_response(m_responsePrimitive(int4000, vc_request.primitive.requestPrimitive.requestIdentifier)));
 					}
 					[] tc_ac.timeout {
 						setverdict(fail, __SCOPE__ & ": No answer while retargeting request");
@@ -2705,7 +2705,7 @@ module OneM2M_PermutationFunctions {
 					vc_cse1.start(f_cse_deleteResourceHandler(v_targetResourceIndex));
 				}
 
-				f_send(e_mca_port, m_request(valueof(p_requestPrimitive)));
+				f_send(e_mcaPort, m_request(valueof(p_requestPrimitive)));
 				tc_ac.start;
 				alt {
 					[] mcaPort.receive(mw_response(mw_responsePrimitive(v_responseStatusCode))) -> value vc_response {
@@ -2809,7 +2809,7 @@ module OneM2M_PermutationFunctions {
 					
 					v_request := f_getCreateRequestPrimitive(p_resourceType, p_requestPrimitive, v_parentIndex);
 					
-					f_send(e_mca_port, m_request(v_request));
+					f_send(e_mcaPort, m_request(v_request));
 					tc_ac.start;
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value vc_response {
@@ -2891,7 +2891,7 @@ module OneM2M_PermutationFunctions {
 					
 						v_request := f_getCreateRequestPrimitive(p_resourceType, p_requestPrimitive, v_parentIndex);
 					
-						f_send(e_mcc_port, m_request(v_request));
+						f_send(e_mccPort, m_request(v_request));
 						tc_ac.start;
 						alt {
 							[] mccPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value vc_response {
@@ -2954,7 +2954,7 @@ module OneM2M_PermutationFunctions {
 						// Test Body
 						v_request := f_getCreateRequestPrimitive(p_resourceType, p_requestPrimitive, v_aeIndex);
 						
-						f_send(e_mca_port, m_request(v_request));
+						f_send(e_mcaPort, m_request(v_request));
 						tc_ac.start;
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value vc_response {
@@ -3031,7 +3031,7 @@ module OneM2M_PermutationFunctions {
 							vc_ae2.start(f_cse_notifyProcedure_subscriptionVerificationHandler());
 						}
     					
-						f_send(e_mca_port, m_request(v_request));
+						f_send(e_mcaPort, m_request(v_request));
 						tc_ac.start;
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int4105))) -> value v_response {
@@ -3090,7 +3090,7 @@ module OneM2M_PermutationFunctions {
 						// Test Body
 						v_request := f_getCreateRequestPrimitive(p_resourceType, p_requestPrimitive, v_aeIndex);
 						
-						f_send(e_mca_port, m_request(v_request));
+						f_send(e_mcaPort, m_request(v_request));
 						tc_ac.start;
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int4103))) -> value v_response {
@@ -3147,7 +3147,7 @@ module OneM2M_PermutationFunctions {
 						// Test Body
 						v_request := f_getCreateRequestPrimitive(p_resourceType, p_requestPrimitive, v_aeIndex);
 						
-						f_send(e_mca_port, m_request(v_request, {p_invalidAttribute}));
+						f_send(e_mcaPort, m_request(v_request, {p_invalidAttribute}));
 						tc_ac.start;
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int4000))) -> value v_response {
@@ -3206,7 +3206,7 @@ module OneM2M_PermutationFunctions {
 						// Test Body
 						v_request := f_getCreateRequestPrimitive(p_resourceType, p_requestPrimitive, v_aeIndex);
 					
-						f_send(e_mca_port, m_request(v_request));
+						f_send(e_mcaPort, m_request(v_request));
 						tc_ac.start;
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value vc_response {
@@ -3272,7 +3272,7 @@ module OneM2M_PermutationFunctions {
 						// Test Body
 						v_request := f_getCreateRequestPrimitive(p_resourceTypeChild, p_requestPrimitiveChild2, v_parentIndex);	////Child2
 
-						f_send(e_mca_port, m_request(v_request));
+						f_send(e_mcaPort, m_request(v_request));
 						tc_ac.start;
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
@@ -3334,7 +3334,7 @@ module OneM2M_PermutationFunctions {
 	
 						v_request := f_getCreateRequestPrimitive(p_resourceTypeChild, p_requestPrimitiveChild2, v_parentIndex);	//Child2
 	
-						f_send(e_mca_port, m_request(v_request));
+						f_send(e_mcaPort, m_request(v_request));
 						tc_ac.start;
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
@@ -3416,9 +3416,9 @@ module OneM2M_PermutationFunctions {
 						v_request := f_getCreateRequestPrimitive(p_resourceType, p_requestPrimitive, v_parentIndex);
 					
 						if(v_myOptionalAttribute == "creator") {
-							f_send(e_mca_port, m_request(v_request, {{v_myOptionalAttribute, omit}}));
+							f_send(e_mcaPort, m_request(v_request, {{v_myOptionalAttribute, omit}}));
 						} else {
-							f_send(e_mca_port, m_request(v_request));
+							f_send(e_mcaPort, m_request(v_request));
 						}
 						tc_ac.start;
 						alt {
@@ -3483,7 +3483,7 @@ module OneM2M_PermutationFunctions {
 						// Test Body
 						v_request := f_getCreateRequestPrimitive(p_resourceTypeChild, p_requestPrimitiveChild, v_parentIndex);
 	
-						f_send(e_mca_port, m_request(v_request));
+						f_send(e_mcaPort, m_request(v_request));
 						tc_ac.start;
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int5207))) -> value v_response {
@@ -3534,7 +3534,7 @@ module OneM2M_PermutationFunctions {
 						// Test Body
 						v_request := f_getCreateRequestPrimitive(p_childResourceType, p_childRequestPrimitive, v_resourceIndex); 
 	
-						f_send(e_mca_port, m_request(v_request));
+						f_send(e_mcaPort, m_request(v_request));
 						tc_ac.start;
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
@@ -3555,7 +3555,7 @@ module OneM2M_PermutationFunctions {
 						}	
 						
 						//Check currentByteSize
-						f_send(e_mca_port, m_request(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex))));
+						f_send(e_mcaPort, m_request(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex))));
 
 						tc_ac.start;
 						alt {
@@ -3609,7 +3609,7 @@ module OneM2M_PermutationFunctions {
 						v_request := f_getCreateRequestPrimitive(p_resourceType, p_requestPrimitive, v_aeIndex);
 						v_request.resultContent := int0;//Attributes
 						
-						f_send(e_mca_port, m_request(v_request));
+						f_send(e_mcaPort, m_request(v_request));
 						tc_ac.start;
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001, omit))) -> value v_response {
@@ -3665,7 +3665,7 @@ module OneM2M_PermutationFunctions {
 						v_request := f_getCreateRequestPrimitive(p_resourceType, p_requestPrimitive, v_aeIndex);
 						v_request.resultContent := int2;//Attributes
 						
-						f_send(e_mca_port, m_request(v_request));
+						f_send(e_mcaPort, m_request(v_request));
 						tc_ac.start;
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001, p_contentResponse))) -> value v_response {
@@ -3726,7 +3726,7 @@ module OneM2M_PermutationFunctions {
 						v_request := f_getCreateRequestPrimitive(p_resourceType, p_requestPrimitive, v_aeIndex);
 						v_request.resultContent := int3;//Attributes + Hierarchichal Address
 						
-						f_send(e_mca_port, m_request(v_request));
+						f_send(e_mcaPort, m_request(v_request));
 						tc_ac.start;
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001, p_contentResponse))) -> value v_response {
@@ -3783,7 +3783,7 @@ module OneM2M_PermutationFunctions {
 						// Test Body
 						v_request := f_getCreateRequestPrimitive(int3, m_createContainerBase, v_aeIndex);
 						v_request.resultContent := p_resultContent;
-						f_send(e_mca_port, m_request(v_request));
+						f_send(e_mcaPort, m_request(v_request));
 						tc_ac.start;
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int4000))) { //BAD REQUEST
@@ -3835,7 +3835,7 @@ module OneM2M_PermutationFunctions {
 						v_request := f_getCreateRequestPrimitive(p_resourceType, p_requestPrimitive, v_aeIndex);
 						v_request.resultContent := int1;//Attributes
 						
-						f_send(e_mca_port, m_request(v_request));
+						f_send(e_mcaPort, m_request(v_request));
 						tc_ac.start;
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001, p_contentResponse))) -> value v_response {
@@ -3892,7 +3892,7 @@ module OneM2M_PermutationFunctions {
 						v_request := f_getCreateRequestPrimitive(p_resourceType, p_requestPrimitive, v_aeIndex);
 						v_request.resultContent := int9;//Modified Attributes
 						
-						f_send(e_mca_port, m_request(v_request));
+						f_send(e_mcaPort, m_request(v_request));
 						tc_ac.start;
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001, p_contentResponse))) -> value v_response {
@@ -3950,7 +3950,7 @@ module OneM2M_PermutationFunctions {
 	
 						v_request := f_getCreateRequestPrimitive(p_resourceType, p_requestPrimitive, v_aEAnncIndex);
 	
-						f_send(e_mcc_port, m_request(v_request));
+						f_send(e_mccPort, m_request(v_request));
 						tc_ac.start;
 						alt {
 							[] mccPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value vc_response {
@@ -4015,7 +4015,7 @@ module OneM2M_PermutationFunctions {
 						// Test Body
 						v_request := f_getCreateRequestPrimitive(p_resourceType, p_requestPrimitive, v_parentIndex);
 						
-						f_send(e_mca_port, m_request(v_request));
+						f_send(e_mcaPort, m_request(v_request));
 						
 						vc_cse1.start(f_cse_receiveCreateRequest_cseSimu(p_requestAnnc));
 						vc_cse1.done;	
@@ -4068,7 +4068,7 @@ module OneM2M_PermutationFunctions {
 						v_request := f_getCreateRequestPrimitive(p_resourceType, p_requestPrimitive, v_parentIndex);
 						
 						vc_cse1.start(f_cse_receiveCreateRequest_cseSimu(p_requestAnnc));						
-						f_send(e_mca_port, m_request(v_request));
+						f_send(e_mcaPort, m_request(v_request));
 						vc_cse1.done;	
     								
 						vc_request.primitive.requestPrimitive := f_getRequestPrimitive(vc_cse1);
@@ -4119,7 +4119,7 @@ module OneM2M_PermutationFunctions {
 						v_resourceIndex := f_cse_createResource(p_resourceType, p_requestPrimitive, v_parentIndex); 				
     									
 						// Test Body
-						f_send(e_mca_port, m_request(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex))));
+						f_send(e_mcaPort, m_request(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex))));
 
 						tc_ac.start;
 						alt {
@@ -4186,7 +4186,7 @@ module OneM2M_PermutationFunctions {
 						v_resourceIndex := f_cse_createResource(p_resourceType, p_requestPrimitive, v_aeIndex); 	
 
 						// Test Body
-						f_send(e_mca_port, m_request(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex))));
+						f_send(e_mcaPort, m_request(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex))));
 
 						tc_ac.start;
 						alt {
@@ -4239,7 +4239,7 @@ module OneM2M_PermutationFunctions {
 						v_resourceIndex := f_cse_createResource(p_resourceType, p_requestPrimitive, v_aeIndex); 				
     									
 						// Test Body
-						f_send(e_mca_port, m_request(m_retrieveAttributeToOption(f_getResourceAddress(v_resourceIndex) & v_attribute, f_getOriginator(v_resourceIndex))));
+						f_send(e_mcaPort, m_request(m_retrieveAttributeToOption(f_getResourceAddress(v_resourceIndex) & v_attribute, f_getOriginator(v_resourceIndex))));
 
 						tc_ac.start;
 						alt {
@@ -4295,7 +4295,7 @@ module OneM2M_PermutationFunctions {
 						v_resourceIndex := f_cse_createResource(p_resourceType, p_requestPrimitive, v_aeIndex); 				
     									
 						// Test Body
-						f_send(e_mca_port, m_request(m_retrieveAttributeContentOption(f_getResourceAddress(v_resourceIndex) ,	{"pi"}, f_getOriginator(v_resourceIndex))));
+						f_send(e_mcaPort, m_request(m_retrieveAttributeContentOption(f_getResourceAddress(v_resourceIndex) ,	{"pi"}, f_getOriginator(v_resourceIndex))));
 
 						tc_ac.start;
 						alt {
@@ -4351,7 +4351,7 @@ module OneM2M_PermutationFunctions {
 						v_resourceIndex := f_cse_createResource(p_resourceType, p_requestPrimitive, v_aeIndex); 				
     									
 						// Test Body
-						f_send(e_mca_port, m_request(m_retrieveAttributeContentOption(f_getResourceAddress(v_resourceIndex) ,
+						f_send(e_mcaPort, m_request(m_retrieveAttributeContentOption(f_getResourceAddress(v_resourceIndex) ,
 																						{"pi", "ct"}, f_getOriginator(v_resourceIndex))));
 
 						tc_ac.start;
@@ -4408,7 +4408,7 @@ module OneM2M_PermutationFunctions {
 						v_resourceIndex := f_cse_createResource(p_resourceType, p_requestPrimitive, v_aeIndex); 				
     									
 						// Test Body
-						f_send(e_mca_port, m_request(m_retrieveAttributeContentOption(f_getResourceAddress(v_resourceIndex),
+						f_send(e_mcaPort, m_request(m_retrieveAttributeContentOption(f_getResourceAddress(v_resourceIndex),
 																						{"lbl"}, f_getOriginator(v_resourceIndex))));
 
 						tc_ac.start;
@@ -4461,7 +4461,7 @@ module OneM2M_PermutationFunctions {
 						v_resourceIndex := f_cse_createResource(p_resourceType, p_requestPrimitive, v_aeIndex); 				
     									
 						// Test Body
-						f_send(e_mca_port, m_request(m_retrieveAttributeContentOption(f_getResourceAddress(v_resourceIndex),
+						f_send(e_mcaPort, m_request(m_retrieveAttributeContentOption(f_getResourceAddress(v_resourceIndex),
 																						p_attributeList, f_getOriginator(v_resourceIndex))));
 
 						tc_ac.start;
@@ -4545,7 +4545,7 @@ module OneM2M_PermutationFunctions {
 						}
 						
 						// Test Body
-						f_send(e_mca_port, m_request(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_aeIndex))));//from AE ID
+						f_send(e_mcaPort, m_request(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_aeIndex))));//from AE ID
 
 						tc_ac.start;
 						alt {
@@ -4641,7 +4641,7 @@ module OneM2M_PermutationFunctions {
 						}
 								
 						// Test Body
-						f_send(e_mca_port, m_request(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_aeIndex))));//from AE ID
+						f_send(e_mcaPort, m_request(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_aeIndex))));//from AE ID
 
 						tc_ac.start;
 						alt {
@@ -4716,7 +4716,7 @@ module OneM2M_PermutationFunctions {
 						}
 						
 						// Test Body
-						f_send(e_mca_port, m_request(m_retrieveAttributeToOption(f_getResourceAddress(v_resourceIndex) & v_attribute, f_getOriginator(v_aeIndex))));//from AE ID
+						f_send(e_mcaPort, m_request(m_retrieveAttributeToOption(f_getResourceAddress(v_resourceIndex) & v_attribute, f_getOriginator(v_aeIndex))));//from AE ID
 
 						tc_ac.start;
 						alt {
@@ -4797,7 +4797,7 @@ module OneM2M_PermutationFunctions {
 							v_resourceIndex := f_getRemoteCseResource(vc_cse1);
 						}
 						
-						f_send(e_mca_port, m_request(m_retrieveAttributeContentOption(f_getResourceAddress(v_resourceIndex) , {"pi"}, f_getOriginator(v_aeIndex))));//from AE ID
+						f_send(e_mcaPort, m_request(m_retrieveAttributeContentOption(f_getResourceAddress(v_resourceIndex) , {"pi"}, f_getOriginator(v_aeIndex))));//from AE ID
 
 						tc_ac.start;
 						alt {
@@ -4878,7 +4878,7 @@ module OneM2M_PermutationFunctions {
 							v_resourceIndex := f_getRemoteCseResource(vc_cse1);
 						}
 						
-						f_send(e_mca_port,m_request(m_retrieveAttributeContentOption(f_getResourceAddress(v_resourceIndex) ,
+						f_send(e_mcaPort,m_request(m_retrieveAttributeContentOption(f_getResourceAddress(v_resourceIndex) ,
 																						{"pi", "ct"}, f_getOriginator(v_aeIndex))));//from AE ID
 
 						tc_ac.start;
@@ -4960,7 +4960,7 @@ module OneM2M_PermutationFunctions {
 							v_resourceIndex := f_getRemoteCseResource(vc_cse1);
 						}
 						
-						f_send(e_mca_port, m_request(m_retrieveAttributeContentOption(f_getResourceAddress(v_resourceIndex),
+						f_send(e_mcaPort, m_request(m_retrieveAttributeContentOption(f_getResourceAddress(v_resourceIndex),
 																						{"lbl"}, f_getOriginator(v_aeIndex))));//from AE ID
 
 						tc_ac.start;
@@ -5038,7 +5038,7 @@ module OneM2M_PermutationFunctions {
 							v_resourceIndex := f_getRemoteCseResource(vc_cse1);
 						}
 						
-						f_send(e_mca_port, m_request(m_retrieveAttributeContentOption(f_getResourceAddress(v_resourceIndex),
+						f_send(e_mcaPort, m_request(m_retrieveAttributeContentOption(f_getResourceAddress(v_resourceIndex),
 																						{"lbl", "at"}, f_getOriginator(v_aeIndex))));//from AE ID
 
 						tc_ac.start;
@@ -5095,7 +5095,7 @@ module OneM2M_PermutationFunctions {
 					// Test Body
 					v_request := valueof(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex)));
 					v_request.resultContent := p_resultContent;
-					f_send(e_mca_port, m_request(v_request));
+					f_send(e_mcaPort, m_request(v_request));
 					tc_ac.start;
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int4000))) { //BAD REQUEST
@@ -5160,7 +5160,7 @@ module OneM2M_PermutationFunctions {
 						// Test Body
 						v_request := valueof(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex)));
 						v_request.resultContent := int1;//Attributes
-						f_send(e_mca_port, m_request(v_request));
+						f_send(e_mcaPort, m_request(v_request));
 						tc_ac.start;
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2000, p_contentResponse))) -> value v_response {
@@ -5229,7 +5229,7 @@ module OneM2M_PermutationFunctions {
 						// Test Body
 						v_request := valueof(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex)));
 						v_request.resultContent := int4;//Attributes and child resources
-						f_send(e_mca_port, m_request(v_request));
+						f_send(e_mcaPort, m_request(v_request));
 						tc_ac.start;
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2000, p_contentResponse))) -> value v_response {
@@ -5299,7 +5299,7 @@ module OneM2M_PermutationFunctions {
 						// Test Body
 						v_request := valueof(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex)));
 						v_request.resultContent := int5;//attributes and child resource references
-						f_send(e_mca_port, m_request(v_request));
+						f_send(e_mcaPort, m_request(v_request));
 						tc_ac.start;
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2000, p_contentResponse))) -> value v_response {
@@ -5368,7 +5368,7 @@ module OneM2M_PermutationFunctions {
 						// Test Body
 						v_request := valueof(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex)));
 						v_request.resultContent := int6;//Child resource references
-						f_send(e_mca_port, m_request(v_request));
+						f_send(e_mcaPort, m_request(v_request));
 						tc_ac.start;
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2000, p_contentResponse))) -> value v_response {
@@ -5437,7 +5437,7 @@ module OneM2M_PermutationFunctions {
 						// Test Body
 						v_request := valueof(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex)));
 						v_request.resultContent := int8;//Child resources
-						f_send(e_mca_port, m_request(v_request));
+						f_send(e_mcaPort, m_request(v_request));
 						tc_ac.start;
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2000, p_contentResponse))) -> value v_response {
@@ -5498,7 +5498,7 @@ module OneM2M_PermutationFunctions {
 						// Test Body
 						v_request := f_getUpdateRequestPrimitive(p_resourceType, v_resourceIndex, p_updateRequestPrimitive);
 						
-						f_send(e_mca_port, m_request(v_request));
+						f_send(e_mcaPort, m_request(v_request));
 						tc_ac.start;
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value vc_response {
@@ -5559,7 +5559,7 @@ module OneM2M_PermutationFunctions {
 						// Test Body
 						v_request := f_getUpdateRequestPrimitive(p_resourceType, v_resourceIndex, p_updateRequestPrimitive);
 						
-						f_send(e_mca_port, m_request(v_request));
+						f_send(e_mcaPort, m_request(v_request));
 						tc_ac.start;
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value vc_response {
@@ -5619,7 +5619,7 @@ module OneM2M_PermutationFunctions {
 						// Test Body
 						v_request := f_getUpdateRequestPrimitive(p_resourceType, v_resourceIndex, p_updateRequestPrimitive);
 						
-						f_send(e_mca_port, m_request(v_request, p_nullFields));
+						f_send(e_mcaPort, m_request(v_request, p_nullFields));
 						tc_ac.start;
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value vc_response {
@@ -5677,7 +5677,7 @@ module OneM2M_PermutationFunctions {
 						// Test Body
 						v_request := f_getUpdateRequestPrimitive(p_resourceType, v_resourceIndex, p_updateRequestPrimitive);
 						
-						f_send(e_mca_port, m_request(v_request, p_nullFields));
+						f_send(e_mcaPort, m_request(v_request, p_nullFields));
 						tc_ac.start;
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value vc_response {
@@ -5742,7 +5742,7 @@ module OneM2M_PermutationFunctions {
 						// Test Body
 						v_request := f_getUpdateRequestPrimitive(p_resourceType, v_resourceIndex, p_updateRequestPrimitive);
 						
-						f_send(e_mca_port, m_request(v_request));
+						f_send(e_mcaPort, m_request(v_request));
 						tc_ac.start;
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int4103))) -> value v_response {
@@ -5798,7 +5798,7 @@ module OneM2M_PermutationFunctions {
 						// Test Body
 						v_request := f_getUpdateRequestPrimitive(p_resourceType, v_resourceIndex, p_updateRequestPrimitive);
 						
-						f_send(e_mca_port, m_request(v_request));
+						f_send(e_mcaPort, m_request(v_request));
 						tc_ac.start;
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int4000))) -> value v_response {
@@ -5854,7 +5854,7 @@ module OneM2M_PermutationFunctions {
 						// Test Body
 						v_request := f_getUpdateRequestPrimitive(p_resourceType, v_resourceIndex, p_updateRequestPrimitive);
 						
-						f_send(e_mca_port, m_request(v_request, p_nullFields));
+						f_send(e_mcaPort, m_request(v_request, p_nullFields));
 						tc_ac.start;
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int4000))) -> value v_response {
@@ -5910,7 +5910,7 @@ module OneM2M_PermutationFunctions {
 						// Test Body
 						v_request := f_getUpdateRequestPrimitive(p_resourceType, v_resourceIndex, p_updateRequestPrimitive);
 	
-						f_send(e_mca_port, m_request(v_request));
+						f_send(e_mcaPort, m_request(v_request));
 						
 						tc_ac.start;
 						alt {
@@ -5962,7 +5962,7 @@ module OneM2M_PermutationFunctions {
 						
 						f_cse_updateResource(p_resourceType, v_resourceIndex, p_updateRequestPrimitive);
 					
-						f_send(e_mca_port, m_request(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex))));
+						f_send(e_mcaPort, m_request(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex))));
 					
 						tc_ac.start;
 						alt {
@@ -6013,7 +6013,7 @@ module OneM2M_PermutationFunctions {
 						//Test Body
 						v_request := f_getUpdateRequestPrimitive(p_resourceTypeChild, v_childIndex, p_updateRequestPrimitive);
 
-						f_send(e_mca_port, m_request(v_request));
+						f_send(e_mcaPort, m_request(v_request));
 						tc_ac.start;
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int4005))) -> value v_response {
@@ -6069,7 +6069,7 @@ module OneM2M_PermutationFunctions {
 						// Test Body
 						v_request := f_getUpdateRequestPrimitive(p_resourceType, v_resourceIndex, p_updateRequestPrimitive);
 		
-						f_send(e_mca_port, m_request(v_request));
+						f_send(e_mcaPort, m_request(v_request));
 						tc_ac.start;
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value vc_response {
@@ -6150,7 +6150,7 @@ module OneM2M_PermutationFunctions {
 						//Test Body
 						vc_request.primitive.requestPrimitive := f_getUpdateRequestPrimitive(p_resourceType, v_resourceIndex, p_updateRequestPrimitive);
  
-						f_send(e_mca_port, m_request(vc_request.primitive.requestPrimitive)); //CSEBase
+						f_send(e_mcaPort, m_request(vc_request.primitive.requestPrimitive)); //CSEBase
 						tc_ac.start;
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value vc_response {
@@ -6239,7 +6239,7 @@ module OneM2M_PermutationFunctions {
 							v_request.primitiveContent.subscription.notificationURI := {f_getResourceAddress(v_aeIndex)};							
 						}
 						
-						f_send(e_mca_port, m_request(v_request));
+						f_send(e_mcaPort, m_request(v_request));
 						
 						tc_ac.start;
 						alt {
@@ -6260,7 +6260,7 @@ module OneM2M_PermutationFunctions {
 								setverdict(pass, __SCOPE__ & ":INFO: Notification for Subscription verification received");
 								v_responsePrimitive := valueof(m_responseNotification(int2000, omit));
 								v_responsePrimitive.requestIdentifier := vc_request.primitive.requestPrimitive.requestIdentifier;
-								f_send(e_mca_in_port, m_response(v_responsePrimitive));
+								f_send(e_mcaPortIn, m_response(v_responsePrimitive));
 								tc_ac.start;
 								repeat;
 							}
@@ -6397,7 +6397,7 @@ module OneM2M_PermutationFunctions {
 							v_responsePrimitive := valueof(m_responsePrimitive(int2004,v_request.primitive.requestPrimitive.requestIdentifier));
 							v_responsePrimitive.from_ := PX_TS_CSE1.cseId;
 							v_responsePrimitive.to_ := v_request.primitive.requestPrimitive.from_;
-							f_send(e_mcc_in_port, m_response(v_responsePrimitive));			
+							f_send(e_mccPortIn, m_response(v_responsePrimitive));			
 						}
 						[] tc_ac.timeout {
 							setverdict(fail, __SCOPE__ & ":ERROR:  No announcement received");
@@ -6437,7 +6437,7 @@ module OneM2M_PermutationFunctions {
 					v_updateRequest.primitiveContent.container.labels := {"VALUE_1"};
 					v_updateRequest := f_getUpdateRequestPrimitive(p_resourceType, v_resourceIndex, v_updateRequest);
 					v_updateRequest.resultContent := p_resultContent;
-					f_send(e_mca_port, m_request(v_updateRequest));
+					f_send(e_mcaPort, m_request(v_updateRequest));
 					tc_ac.start;
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int4000))) { //BAD REQUEST
@@ -6502,7 +6502,7 @@ module OneM2M_PermutationFunctions {
 						// Test Body
 						v_request := f_getUpdateRequestPrimitive(p_resourceType, v_resourceIndex, p_updateRequestPrimitive);
 						v_request.resultContent := int0;//Nothing
-						f_send(e_mca_port, m_request(v_request));
+						f_send(e_mcaPort, m_request(v_request));
 						tc_ac.start;
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2004, omit))) -> value v_response {
@@ -6571,7 +6571,7 @@ module OneM2M_PermutationFunctions {
 						// Test Body
 						v_request := f_getUpdateRequestPrimitive(p_resourceType, v_resourceIndex, p_updateRequestPrimitive);
 						v_request.resultContent := int1;//Attributes
-						f_send(e_mca_port, m_request(v_request));
+						f_send(e_mcaPort, m_request(v_request));
 						tc_ac.start;
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2004, p_contentResponse))) -> value v_response {
@@ -6640,7 +6640,7 @@ module OneM2M_PermutationFunctions {
 						// Test Body
 						v_request := f_getUpdateRequestPrimitive(p_resourceType, v_resourceIndex, p_updateRequestPrimitive);
 						v_request.resultContent := int9;//Modified Attributes
-						f_send(e_mca_port, m_request(v_request));
+						f_send(e_mcaPort, m_request(v_request));
 						tc_ac.start;
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2004, p_contentResponse))) -> value v_response {
@@ -6710,7 +6710,7 @@ module OneM2M_PermutationFunctions {
 						// Test Body
 						v_request := valueof(m_delete(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex)));
 						                		
-						f_send(e_mca_port, m_request(v_request));
+						f_send(e_mcaPort, m_request(v_request));
 						tc_ac.start;
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2002))) -> value v_response {
@@ -6798,7 +6798,7 @@ module OneM2M_PermutationFunctions {
 						v_request := valueof(m_delete(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex)));
 						v_request.from_ := f_getOriginator(v_aeIndex);
                 		
-						f_send(e_mca_port, m_request(v_request));
+						f_send(e_mcaPort, m_request(v_request));
 						tc_ac.start;
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int4103))) -> value v_response {
@@ -6872,7 +6872,7 @@ module OneM2M_PermutationFunctions {
 						f_checkAeSimuStatus();
                 		
 						// Test Body
-						f_send(e_mca_port, m_request(m_delete(f_getResourceAddress(v_childResourceIndex), f_getOriginator(v_childResourceIndex))));
+						f_send(e_mcaPort, m_request(m_delete(f_getResourceAddress(v_childResourceIndex), f_getOriginator(v_childResourceIndex))));
                 
 						tc_ac.start;
 						alt {
@@ -6924,7 +6924,7 @@ module OneM2M_PermutationFunctions {
 						v_childResourceIndex := f_cse_createResource(p_resourceTypeChild, p_requestPrimitiveChild, v_resourceIndex); 
 				
 						// Test Body
-						f_send(e_mca_port, m_request(m_delete(f_getResourceAddress(v_childResourceIndex), f_getOriginator(v_childResourceIndex))));
+						f_send(e_mcaPort, m_request(m_delete(f_getResourceAddress(v_childResourceIndex), f_getOriginator(v_childResourceIndex))));
 					
 						tc_ac.start;
 						alt {
@@ -7054,7 +7054,7 @@ module OneM2M_PermutationFunctions {
 					v_request := valueof(m_delete(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex)));
 					v_request.resultContent := p_resultContent;
 					
-					f_send(e_mca_port, m_request(v_request));
+					f_send(e_mcaPort, m_request(v_request));
 					tc_ac.start;
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int4000))) { //BAD REQUEST
@@ -7120,7 +7120,7 @@ module OneM2M_PermutationFunctions {
 						v_request := valueof(m_delete(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex)));
 						v_request.resultContent := int0;//Nothing
 						
-						f_send(e_mca_port, m_request(v_request));
+						f_send(e_mcaPort, m_request(v_request));
 						tc_ac.start;
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2002, omit))) -> value v_response {
@@ -7190,7 +7190,7 @@ module OneM2M_PermutationFunctions {
 						v_request := valueof(m_delete(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex)));
 						v_request.resultContent := int1;//Attributes
 						
-						f_send(e_mca_port, m_request(v_request));
+						f_send(e_mcaPort, m_request(v_request));
 						tc_ac.start;
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2002, p_contentResponse))) -> value v_response {
@@ -7286,7 +7286,7 @@ module OneM2M_PermutationFunctions {
 						
 						// Test Body
 	
-						f_send(e_mca_port, m_request(valueof(p_requestPrimitive)));
+						f_send(e_mcaPort, m_request(valueof(p_requestPrimitive)));
 						tc_ac.start;
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2000))) -> value vc_response {
@@ -7362,7 +7362,7 @@ module OneM2M_PermutationFunctions {
 	
 						// Test Body
 	
-						f_send(e_mca_port, m_request(valueof(p_requestPrimitive)));
+						f_send(e_mcaPort, m_request(valueof(p_requestPrimitive)));
 						tc_ac.start;
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int4103))) -> value vc_response {
@@ -7428,7 +7428,7 @@ module OneM2M_PermutationFunctions {
 	
 						// Test Body
 	
-						f_send(e_mca_port, m_request(valueof(p_requestPrimitive)));
+						f_send(e_mcaPort, m_request(valueof(p_requestPrimitive)));
 						tc_ac.start;
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2000))) -> value vc_response {
@@ -7504,7 +7504,7 @@ module OneM2M_PermutationFunctions {
 	
 						// Test Body
 	
-						f_send(e_mca_port, m_request(valueof(p_requestPrimitive)));
+						f_send(e_mcaPort, m_request(valueof(p_requestPrimitive)));
 						tc_ac.start;
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int4103))) -> value vc_response {
@@ -7579,7 +7579,7 @@ module OneM2M_PermutationFunctions {
 	
 						// Test Body
 	
-						f_send(e_mca_port, m_request(valueof(p_requestPrimitive)));
+						f_send(e_mcaPort, m_request(valueof(p_requestPrimitive)));
 						tc_ac.start;
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2000))) -> value vc_response {
@@ -7678,7 +7678,7 @@ module OneM2M_PermutationFunctions {
 	
 						// Test Body
 	
-						f_send(e_mca_port, m_request(valueof(p_requestPrimitive)));
+						f_send(e_mcaPort, m_request(valueof(p_requestPrimitive)));
 						tc_ac.start;
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2000))) -> value vc_response {
@@ -7751,7 +7751,7 @@ module OneM2M_PermutationFunctions {
 				v_resourceIndex := f_cse_createResource(c_containerResourceType, m_createContainerBase, v_aeIndex);
 				v_childResourceIndex := f_cse_createResource(c_containerResourceType, m_createContainerBase, v_resourceIndex); 
 				v_request := valueof(m_retrieveFilterCriteria(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex), p_filterCriteria));
-				f_send(e_mca_port, m_request(v_request));
+				f_send(e_mcaPort, m_request(v_request));
 				tc_ac.start;
 				alt {
 	
@@ -7819,7 +7819,7 @@ module OneM2M_PermutationFunctions {
 					v_request := f_getCreateRequestPrimitive(int23, v_createSubscriptionRequest, v_childResourceIndex);//Subscription under child
 	
 					// Test Body
-					f_send(e_mca_port, m_request(v_request));
+					f_send(e_mcaPort, m_request(v_request));
 					tc_ac.start;
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int5203))) -> value v_response {
@@ -7922,7 +7922,7 @@ module OneM2M_PermutationFunctions {
 							p_requestPrimitive.from_ := "UnknowOriginator";
 							p_requestPrimitive.requestIdentifier := valueof(p_requestPrimitive.requestIdentifier) & f_rnd(1, 1000000);
 	
-							f_send(e_mca_port, m_request(valueof(p_requestPrimitive)));
+							f_send(e_mcaPort, m_request(valueof(p_requestPrimitive)));
 							tc_ac.start;
 							alt {
 								[] mcaPort.receive(mw_response(mw_responsePrimitive(int4103))) -> value v_response {
@@ -7993,7 +7993,7 @@ module OneM2M_PermutationFunctions {
 							p_requestPrimitive.from_ := f_getOriginator(v_aeIndex);
 							p_requestPrimitive.requestIdentifier := valueof(p_requestPrimitive.requestIdentifier) & f_rnd(1, 1000000);
 	
-							f_send(e_mca_port, m_request(valueof(p_requestPrimitive)));
+							f_send(e_mcaPort, m_request(valueof(p_requestPrimitive)));
 							tc_ac.start;
 							alt {
 								[] mcaPort.receive(mw_response(mw_responsePrimitive(p_responseStatusCode))) -> value v_response {
@@ -8049,7 +8049,7 @@ module OneM2M_PermutationFunctions {
 							p_requestPrimitive.from_ := "testDomain";
 							p_requestPrimitive.requestIdentifier := valueof(p_requestPrimitive.requestIdentifier) & f_rnd(1, 1000000);
 							
-							f_send(e_mca_port, m_request(valueof(p_requestPrimitive)));
+							f_send(e_mcaPort, m_request(valueof(p_requestPrimitive)));
 							tc_ac.start;
 							alt {
 								[] mcaPort.receive(mw_response(mw_responsePrimitive(p_responseStatusCode))) -> value v_response {
@@ -8075,7 +8075,7 @@ module OneM2M_PermutationFunctions {
 							v_updateRequest := valueof(m_updateAcpPrivileges(v_setOfArcs, v_setOfArcs));
 							v_updateRequest := f_getUpdateRequestPrimitive(int1, v_acpIndex, v_updateRequest);
 							v_updateRequest.from_ := "testDomain";
-							f_send(e_mca_port, m_request(v_updateRequest));
+							f_send(e_mcaPort, m_request(v_updateRequest));
 							tc_ac.start;
 							alt {
 								[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
@@ -8123,7 +8123,7 @@ module OneM2M_PermutationFunctions {
 							p_requestPrimitive.from_ := "UnknowOriginator";
 							p_requestPrimitive.requestIdentifier := valueof(p_requestPrimitive.requestIdentifier) & f_rnd(1, 1000000);
 			
-							f_send(e_mca_port, m_request(valueof(p_requestPrimitive)));
+							f_send(e_mcaPort, m_request(valueof(p_requestPrimitive)));
 							tc_ac.start;
 							alt {
 								[] mcaPort.receive(mw_response(mw_responsePrimitive(p_responseStatusCode))) -> value v_response {
@@ -8181,7 +8181,7 @@ module OneM2M_PermutationFunctions {
 							p_requestPrimitive.from_ := f_getOriginator(v_aeIndex);
 							p_requestPrimitive.requestIdentifier := valueof(p_requestPrimitive.requestIdentifier) & f_rnd(1, 1000000);
 			
-							f_send(e_mca_port, m_request(valueof(p_requestPrimitive)));
+							f_send(e_mcaPort, m_request(valueof(p_requestPrimitive)));
 							tc_ac.start;
 							alt {
 								[] mcaPort.receive(mw_response(mw_responsePrimitive(p_responseStatusCode))) -> value v_response {
@@ -8251,7 +8251,7 @@ module OneM2M_PermutationFunctions {
 							p_requestPrimitive.from_ := f_getOriginator(v_aeIndex);
 							p_requestPrimitive.requestIdentifier := valueof(p_requestPrimitive.requestIdentifier) & f_rnd(1, 1000000);
 			
-							f_send(e_mca_port, m_request(valueof(p_requestPrimitive)));
+							f_send(e_mcaPort, m_request(valueof(p_requestPrimitive)));
 							tc_ac.start;
 							alt {
 								[] mcaPort.receive(mw_response(mw_responsePrimitive(int4103))) -> value v_response {
@@ -8314,7 +8314,7 @@ module OneM2M_PermutationFunctions {
 							p_requestPrimitive.from_ := f_getOriginator(v_aeIndex);
 							p_requestPrimitive.requestIdentifier := valueof(p_requestPrimitive.requestIdentifier) & f_rnd(1, 1000000);
 			
-							f_send(e_mca_port, m_request(valueof(p_requestPrimitive)));
+							f_send(e_mcaPort, m_request(valueof(p_requestPrimitive)));
 							tc_ac.start;
 							alt {
 								[] mcaPort.receive(mw_response(mw_responsePrimitive(p_responseStatusCode))) -> value v_response {
@@ -8372,7 +8372,7 @@ module OneM2M_PermutationFunctions {
 							p_requestPrimitive.from_ := f_getOriginator(v_aeIndex);
 							p_requestPrimitive.requestIdentifier := valueof(p_requestPrimitive.requestIdentifier) & f_rnd(1, 1000000);
 			
-							f_send(e_mca_port, m_request(valueof(p_requestPrimitive)));
+							f_send(e_mcaPort, m_request(valueof(p_requestPrimitive)));
 							tc_ac.start;
 							alt {
 								[] mcaPort.receive(mw_response(mw_responsePrimitive(int4103))) -> value v_response {
@@ -8428,7 +8428,7 @@ module OneM2M_PermutationFunctions {
 							p_requestPrimitive.from_ := f_getOriginator(v_aeIndex);
 							p_requestPrimitive.requestIdentifier := valueof(p_requestPrimitive.requestIdentifier) & f_rnd(1, 1000000);
 			
-							f_send(e_mca_port, m_request(valueof(p_requestPrimitive)));
+							f_send(e_mcaPort, m_request(valueof(p_requestPrimitive)));
 							tc_ac.start;
 							alt {
 								[] mcaPort.receive(mw_response(mw_responsePrimitive(p_responseStatusCode))) -> value v_response {
@@ -8489,7 +8489,7 @@ module OneM2M_PermutationFunctions {
 							p_requestPrimitive.from_ := f_getOriginator(v_aeIndex);
 							p_requestPrimitive.requestIdentifier := valueof(p_requestPrimitive.requestIdentifier) & f_rnd(1, 1000000);
 			
-							f_send(e_mca_port, m_request(valueof(p_requestPrimitive)));
+							f_send(e_mcaPort, m_request(valueof(p_requestPrimitive)));
 							tc_ac.start;
 							alt {
 								[] mcaPort.receive(mw_response(mw_responsePrimitive(int4103))) -> value v_response {
@@ -8545,7 +8545,7 @@ module OneM2M_PermutationFunctions {
 							p_requestPrimitive.from_ := f_getOriginator(v_aeIndex);
 							p_requestPrimitive.requestIdentifier := valueof(p_requestPrimitive.requestIdentifier) & f_rnd(1, 1000000);
 	
-							f_send(e_mca_port, m_request(valueof(p_requestPrimitive)));
+							f_send(e_mcaPort, m_request(valueof(p_requestPrimitive)));
 							tc_ac.start;
 							alt {
 								[] mcaPort.receive(mw_response(mw_responsePrimitive(p_responseStatusCode))) -> value v_response {
@@ -8606,7 +8606,7 @@ module OneM2M_PermutationFunctions {
 							// Test Body
 							v_request := f_getCreateRequestPrimitive(int3, p_requestPrimitive, v_containerIndex);
 							
-							f_send(e_mca_port, m_request(valueof(v_request)));
+							f_send(e_mcaPort, m_request(valueof(v_request)));
 							tc_ac.start;
 							alt {
 								[] mcaPort.receive(mw_response(mw_responsePrimitive(int4103))) -> value v_response {
@@ -8694,7 +8694,7 @@ module OneM2M_PermutationFunctions {
 					//Retrieve the parent resource index
 					v_AEAnncResourceIndex := f_getLatestLocalResourceIndex(vc_cse1);
 					vc_cse1.start(f_cse_announcementProcedure_createHandler(p_createRequestAnnc, -, v_AEAnncResourceIndex));	
-					f_send(e_mca_port, m_request(v_request));
+					f_send(e_mcaPort, m_request(v_request));
 
 					tc_ac.start;
 					alt {
@@ -8814,7 +8814,7 @@ module OneM2M_PermutationFunctions {
 							}
 							v_responsePrimitive.from_ := PX_TS_CSE1.cseId;
 							v_responsePrimitive.to_ := v_request.primitive.requestPrimitive.from_;
-							f_send(e_mcc_in_port, m_response(valueof(v_responsePrimitive)));
+							f_send(e_mccPortIn, m_response(valueof(v_responsePrimitive)));
 						}
 						[] tc_ac.timeout {
 							setverdict(fail, __SCOPE__ & ":ERROR:  No announcement received");
@@ -8836,7 +8836,7 @@ module OneM2M_PermutationFunctions {
 					
 							v_responsePrimitive := valueof(m_responsePrimitive(int2001,v_request.primitive.requestPrimitive.requestIdentifier));
 							v_responsePrimitive.primitiveContent := v_announcedResource;
-							f_send(e_mcc_in_port, m_response(v_responsePrimitive));
+							f_send(e_mccPortIn, m_response(v_responsePrimitive));
 						}
 						[] tc_ac.timeout {
 							setverdict(fail, __SCOPE__ & ":ERROR:  No announcement received");
@@ -8887,7 +8887,7 @@ module OneM2M_PermutationFunctions {
 					v_containerAnncResourceIndex := f_getLatestLocalResourceIndex(vc_cse1);
 					v_request := f_getCreateRequestPrimitive(p_resourceType, p_requestCreatePrimitive, v_resourceIndex);
 					vc_cse1.start(f_cse_announcementProcedure_createHandler(p_createRequestAnnc,int4000, v_containerAnncResourceIndex));	
-					f_send(e_mca_port, m_request(v_request));
+					f_send(e_mcaPort, m_request(v_request));
 
 					tc_ac.start;
 					alt {
@@ -9010,7 +9010,7 @@ module OneM2M_PermutationFunctions {
 										
 							v_responsePrimitive := valueof(m_responsePrimitive(int2001,v_request.primitive.requestPrimitive.requestIdentifier));
 							v_responsePrimitive.primitiveContent := v_announcedResource;
-							f_send(e_mcc_in_port, m_response(v_responsePrimitive));
+							f_send(e_mccPortIn, m_response(v_responsePrimitive));
 						}
 						[] tc_ac.timeout {
 							setverdict(fail, __SCOPE__ & ":ERROR:  No announcement received");
@@ -9037,7 +9037,7 @@ module OneM2M_PermutationFunctions {
 							
 							v_responsePrimitive := valueof(m_responsePrimitive(int2001,v_request.primitive.requestPrimitive.requestIdentifier));
 							v_responsePrimitive.primitiveContent := v_announcedResource;
-							f_send(e_mcc_in_port, m_response(v_responsePrimitive));
+							f_send(e_mccPortIn, m_response(v_responsePrimitive));
 						}
 						[] tc_ac.timeout {
 							setverdict(fail, __SCOPE__ & ":ERROR:  No announcement received");
@@ -9142,7 +9142,7 @@ module OneM2M_PermutationFunctions {
 										
 							v_responsePrimitive := valueof(m_responsePrimitive(int2001,v_request.primitive.requestPrimitive.requestIdentifier));
 							v_responsePrimitive.primitiveContent := v_announcedResource;
-							f_send(e_mcc_in_port, m_response(v_responsePrimitive));
+							f_send(e_mccPortIn, m_response(v_responsePrimitive));
 						}
 						[] tc_ac.timeout {
 							setverdict(fail, __SCOPE__ & ":ERROR:  No announcement received");
@@ -9169,7 +9169,7 @@ module OneM2M_PermutationFunctions {
 							
 							v_responsePrimitive := valueof(m_responsePrimitive(int2001,v_request.primitive.requestPrimitive.requestIdentifier));
 							v_responsePrimitive.primitiveContent := v_announcedResource;
-							f_send(e_mcc_in_port, m_response(v_responsePrimitive));
+							f_send(e_mccPortIn, m_response(v_responsePrimitive));
 						}
 						[] tc_ac.timeout {
 							setverdict(fail, __SCOPE__ & ":ERROR:  No announcement received");
@@ -9308,7 +9308,7 @@ module OneM2M_PermutationFunctions {
 					v_resourceAnncIndex := f_cse_createResource(p_resourceType,p_createRequestAnnc);
 
 					// Test Body
-					f_send(e_mca_port, m_request(m_retrieve(f_getResourceAddress(), f_getOriginator(v_resourceAnncIndex))));
+					f_send(e_mcaPort, m_request(m_retrieve(f_getResourceAddress(), f_getOriginator(v_resourceAnncIndex))));
 					tc_ac.start;
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int2000))) -> value v_response {
@@ -9542,7 +9542,7 @@ module OneM2M_PermutationFunctions {
 	
 					vc_cse1.start(f_cse_announcementProcedure_deleteHandler());	
 					v_updateRequest := f_getUpdateRequestPrimitive(p_resourceType, v_resourceIndex, p_requestUpdatePrimitive);
-					f_send(e_mca_port, m_request(v_updateRequest, p_nullFields));
+					f_send(e_mcaPort, m_request(v_updateRequest, p_nullFields));
 	
 					tc_ac.start;
 					alt {
@@ -9667,7 +9667,7 @@ module OneM2M_PermutationFunctions {
 							v_responsePrimitive := valueof(m_responsePrimitive(int2004,vc_request.primitive.requestPrimitive.requestIdentifier));
 							v_responsePrimitive.from_ := PX_TS_CSE1.cseId;
 							v_responsePrimitive.to_ := vc_request.primitive.requestPrimitive.from_;
-							f_send(e_mcc_in_port, m_response(v_responsePrimitive));			
+							f_send(e_mccPortIn, m_response(v_responsePrimitive));			
 						}
 						[] tc_ac.timeout {
 							setverdict(fail, __SCOPE__ & ":ERROR:  No announcement received");
@@ -9830,7 +9830,7 @@ module OneM2M_PermutationFunctions {
 
 					vc_cse1.start(f_cse_announcementProcedure_updateHandler());
 					v_updateRequest := f_getUpdateRequestPrimitive(p_resourceType, v_resourceIndex, p_requestUpdatePrimitive);
-					f_send(e_mca_port, m_request(v_updateRequest));
+					f_send(e_mcaPort, m_request(v_updateRequest));
 
 					tc_ac.start;
 					alt {
@@ -9913,7 +9913,7 @@ module OneM2M_PermutationFunctions {
 							v_responsePrimitive := valueof(m_responsePrimitive(int2004,v_request.primitive.requestPrimitive.requestIdentifier));
 							v_responsePrimitive.from_ := PX_TS_CSE1.cseId;
 							v_responsePrimitive.to_ := v_request.primitive.requestPrimitive.from_;
-							f_send(e_mcc_in_port, m_response(v_responsePrimitive));			
+							f_send(e_mccPortIn, m_response(v_responsePrimitive));			
 						}
 						[] tc_ac.timeout {
 							setverdict(fail, __SCOPE__ & ":ERROR:  No announcement received");
@@ -9978,7 +9978,7 @@ module OneM2M_PermutationFunctions {
 							v_responsePrimitive := valueof(m_responsePrimitive(int2004,v_request.primitive.requestPrimitive.requestIdentifier));
 							v_responsePrimitive.from_ := PX_TS_CSE1.cseId;
 							v_responsePrimitive.to_ := v_request.primitive.requestPrimitive.from_;
-							f_send(e_mcc_in_port, m_response(v_responsePrimitive));			
+							f_send(e_mccPortIn, m_response(v_responsePrimitive));			
 						}
 						[] tc_ac.timeout {
 							setverdict(fail, __SCOPE__ & ":ERROR:  No announcement received");
@@ -10043,7 +10043,7 @@ module OneM2M_PermutationFunctions {
 							v_responsePrimitive := valueof(m_responsePrimitive(int2004,v_request.primitive.requestPrimitive.requestIdentifier));
 							v_responsePrimitive.from_ := PX_TS_CSE1.cseId;
 							v_responsePrimitive.to_ := v_request.primitive.requestPrimitive.from_;
-							f_send(e_mcc_in_port, m_response(v_responsePrimitive));			
+							f_send(e_mccPortIn, m_response(v_responsePrimitive));			
 						}
 						[] tc_ac.timeout {
 							setverdict(fail, __SCOPE__ & ":ERROR:  No announcement received");
@@ -10107,7 +10107,7 @@ module OneM2M_PermutationFunctions {
 							v_responsePrimitive := valueof(m_responsePrimitive(int2004,vc_request.primitive.requestPrimitive.requestIdentifier));
 							v_responsePrimitive.from_ := PX_TS_CSE1.cseId;
 							v_responsePrimitive.to_ := vc_request.primitive.requestPrimitive.from_;
-							f_send(e_mcc_in_port, m_response(v_responsePrimitive));			
+							f_send(e_mccPortIn, m_response(v_responsePrimitive));			
 						}
 						[] tc_ac.timeout {
 							setverdict(fail, __SCOPE__ & ":ERROR:  No announcement received");
@@ -10152,7 +10152,7 @@ module OneM2M_PermutationFunctions {
 
 					vc_cse1.start(f_cse_announcementProcedure_updateHandler());
 					v_updateRequest := f_getUpdateRequestPrimitive(p_resourceType, v_resourceIndex, p_requestUpdatePrimitive);
-					f_send(e_mca_port, m_request(v_updateRequest, p_nullFields));
+					f_send(e_mcaPort, m_request(v_updateRequest, p_nullFields));
 
 					tc_ac.start;
 					alt {
@@ -10216,7 +10216,7 @@ module OneM2M_PermutationFunctions {
 					v_AEAnncResourceIndex := f_getLatestResourceIndex(vc_cse1);
 					vc_cse1.start(f_cse_announcementProcedure_createHandler(p_createRequestAnnc,int4000, v_AEAnncResourceIndex));
 					v_updateRequest := f_getUpdateRequestPrimitive(p_resourceType, v_resourceIndex, p_requestUpdatePrimitive);
-					f_send(e_mca_port, m_request(v_updateRequest));
+					f_send(e_mcaPort, m_request(v_updateRequest));
 
 					tc_ac.start;
 					alt {
@@ -10282,7 +10282,7 @@ module OneM2M_PermutationFunctions {
 				  	
 					vc_cse1.start(f_cse_announcementProcedure_deleteHandler());	
 					v_request := valueof(m_delete(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex)));
-					f_send(e_mca_port, m_request(v_request));
+					f_send(e_mcaPort, m_request(v_request));
 					
 					tc_ac.start;
 					alt {
@@ -10424,7 +10424,7 @@ module OneM2M_PermutationFunctions {
 				p_requestPrimitive.to_ := f_getResourceAddress(v_resourceIndex);
 				p_requestPrimitive.from_ := f_getOriginator(v_aeIndex2);	
 				
-				f_send(e_mca_port, m_request(valueof(p_requestPrimitive)));
+				f_send(e_mcaPort, m_request(valueof(p_requestPrimitive)));
 				tc_ac.start;
 				alt {
 					[] mcaPort.receive(mw_response(mw_responsePrimitive(int4103))) {
@@ -10488,7 +10488,7 @@ module OneM2M_PermutationFunctions {
 					
 					// Test Body
 
-					f_send(e_mca_port, m_request(valueof(p_requestPrimitive)));
+					f_send(e_mcaPort, m_request(valueof(p_requestPrimitive)));
 					tc_ac.start;
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(p_responseStatusCode))) -> value v_response {
@@ -10559,7 +10559,7 @@ module OneM2M_PermutationFunctions {
 					
 					// Test Body
 
-						f_send(e_mca_port, m_request(valueof(p_requestPrimitive)));
+						f_send(e_mcaPort, m_request(valueof(p_requestPrimitive)));
 					tc_ac.start;
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int5206))) -> value v_response {
@@ -10626,7 +10626,7 @@ module OneM2M_PermutationFunctions {
 	
 					// Test Body
 
-						f_send(e_mca_port, m_request(valueof(p_requestPrimitive)));
+						f_send(e_mcaPort, m_request(valueof(p_requestPrimitive)));
 					tc_ac.start;
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int1001, v_contentResponse))) -> value v_response {
@@ -10701,7 +10701,7 @@ module OneM2M_PermutationFunctions {
 
 					// Test Body
 
-						f_send(e_mca_port, m_request(valueof(p_requestPrimitive)));
+						f_send(e_mcaPort, m_request(valueof(p_requestPrimitive)));
 					tc_ac.start;
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int1001, v_contentResponseUri))) -> value v_response {
@@ -10745,7 +10745,7 @@ module OneM2M_PermutationFunctions {
 							v_primitiveContent.container := mw_contentContainer_rc1;
 							//v_primitiveContent := omit;
 						}
-							f_send(e_mca_port, m_request(m_retrieve(v_requestResourceURI, f_getOriginator(v_aeIndex))));
+							f_send(e_mcaPort, m_request(m_retrieve(v_requestResourceURI, f_getOriginator(v_aeIndex))));
 						tc_ac.start;
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2000, v_contentResponseRequestResource))) -> value v_response{
@@ -10776,7 +10776,7 @@ module OneM2M_PermutationFunctions {
 									setverdict(fail, testcasename() & ": RequestStatus: FAIL");
 								}else{								//PENDING, FORWARDING or PARTIALLY_COMPLETED
 									f_sleep(PX_TAC/5.0);
-										f_send(e_mca_port, m_request(m_retrieve(v_requestResourceURI, f_getOriginator(v_aeIndex))));
+										f_send(e_mcaPort, m_request(m_retrieve(v_requestResourceURI, f_getOriginator(v_aeIndex))));
 									repeat;								
 								}
 							}
@@ -10838,7 +10838,7 @@ module OneM2M_PermutationFunctions {
 					p_requestPrimitive.responseType := {int2,omit};		//nonBlockingRequestAsynch
 					// Test Body
 
-						f_send(e_mca_port, m_request(valueof(p_requestPrimitive)));
+						f_send(e_mcaPort, m_request(valueof(p_requestPrimitive)));
 					tc_ac.start;
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int1002, omit))) -> value v_response {
@@ -10907,7 +10907,7 @@ module OneM2M_PermutationFunctions {
 	
 					// Test Body
 
-						f_send(e_mca_port, m_request(valueof(p_requestPrimitive)));
+						f_send(e_mcaPort, m_request(valueof(p_requestPrimitive)));
 					tc_ac.start;
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int1002, v_contentResponse))) -> value v_response {
@@ -10974,7 +10974,7 @@ module OneM2M_PermutationFunctions {
 					p_requestPrimitive.from_ := f_getOriginator(v_aeIndex);					
 					p_requestPrimitive.responseType := {int2, omit};		//nonBlockingRequestAsynch and no notification target list is provided"
 
-						f_send(e_mca_port, m_request(valueof(p_requestPrimitive)));
+						f_send(e_mcaPort, m_request(valueof(p_requestPrimitive)));
 					tc_ac.start;
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int1002, v_contentResponse))) -> value v_response {
@@ -11052,7 +11052,7 @@ module OneM2M_PermutationFunctions {
 
 					// Test Body
 
-						f_send(e_mca_port, m_request(valueof(p_requestPrimitive)));
+						f_send(e_mcaPort, m_request(valueof(p_requestPrimitive)));
 					tc_ac.start;
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int1002, v_contentResponse))) -> value v_response {
@@ -11137,7 +11137,7 @@ module OneM2M_PermutationFunctions {
 
 					// Test Body
 
-						f_send(e_mca_port, m_request(valueof(p_requestPrimitive)));
+						f_send(e_mcaPort, m_request(valueof(p_requestPrimitive)));
 					tc_ac.start;
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int1002, v_contentResponse))) -> value v_response {
diff --git a/OneM2M_Testcases_AE_Release_1.ttcn b/OneM2M_Testcases_AE_Release_1.ttcn
index 360deb63cf91b6049b3a89d853078af5aa3fbb1f..c637be595608462b480cde692091e54dab184da6 100644
--- a/OneM2M_Testcases_AE_Release_1.ttcn
+++ b/OneM2M_Testcases_AE_Release_1.ttcn
@@ -485,12 +485,12 @@ module OneM2M_Testcases_AE_Release_1 {
 							v_resourceIndex := f_processCreateRequestPrimitive(v_request.primitive.requestPrimitive);	
 							
 							//send back responsePrimitive
-							f_send(e_mca_in_port, m_response(vc_response.primitive.responsePrimitive));
+							f_send(e_mcaPortIn, m_response(vc_response.primitive.responsePrimitive));
 						}
 						[] mcaPortIn.receive(mw_request(mw_createAe())) -> value v_request {
 							tc_ac.stop;
 							setverdict(fail, __SCOPE__ & " : Unexpected AE registration request");
-							f_send(e_mca_in_port, m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))));
+							f_send(e_mcaPortIn, m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))));
 						}
 						[] tc_ac.timeout{
 							setverdict(fail, __SCOPE__ & " : Timeout due to no response received from requested SUT!");
@@ -703,12 +703,12 @@ module OneM2M_Testcases_AE_Release_1 {
 							v_responsePrimitive := valueof(m_responsePrimitive(int2002, v_request.primitive.requestPrimitive.requestIdentifier, omit));
 	
 							//send back responsePrimitive
-							f_send(e_mca_in_port, m_response(v_responsePrimitive));
+							f_send(e_mcaPortIn, m_response(v_responsePrimitive));
 						}
 						[] mcaPortIn.receive (mw_request(mw_delete(?)))  {
 							tc_ac.stop;
 							setverdict(fail, __SCOPE__ & " : Unexpected DELETE request");
-							f_send(e_mca_in_port, m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))));
+							f_send(e_mcaPortIn, m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))));
 						}
 						[] tc_ac.timeout{
 							setverdict(fail, __SCOPE__ & " : Timeout due to no response received from requested SUT!");
@@ -764,12 +764,12 @@ module OneM2M_Testcases_AE_Release_1 {
 							setverdict(pass, __SCOPE__ & " : Container creation request is accepted!");
 							v_resourceIndex := f_processCreateRequestPrimitive(v_request.primitive.requestPrimitive);	
 							//send back responsePrimitive
-							f_send(e_mca_in_port, m_response(vc_response.primitive.responsePrimitive));
+							f_send(e_mcaPortIn, m_response(vc_response.primitive.responsePrimitive));
 						}
 						[] mcaPortIn.receive(mw_request(mw_create)) -> value v_request{
 							tc_ac.stop;
 							setverdict(fail, __SCOPE__ & " : Unexpected CREATE request ");
-							f_send(e_mca_in_port, m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))));
+							f_send(e_mcaPortIn, m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))));
 						}
 						[] tc_ac.timeout{
 							setverdict(fail, __SCOPE__ & " : Timeout due to no response received from requested SUT!");
@@ -822,12 +822,12 @@ module OneM2M_Testcases_AE_Release_1 {
 							setverdict(pass, __SCOPE__ & " : ContentInstance creation request is accepted!!");
 							v_resourceIndex := f_processCreateRequestPrimitive(v_request.primitive.requestPrimitive);	
 							//send back responsePrimitive
-							f_send(e_mca_in_port, m_response(vc_response.primitive.responsePrimitive));
+							f_send(e_mcaPortIn, m_response(vc_response.primitive.responsePrimitive));
 						}
 						[] mcaPortIn.receive(mw_request(mw_create)) -> value v_request {
 							tc_ac.stop;
 							setverdict(fail, __SCOPE__ & " : Unexpected CREATE request ");
-							f_send(e_mca_in_port, m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))));
+							f_send(e_mcaPortIn, m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))));
 						}
 						[] tc_ac.timeout{
 							setverdict(fail, __SCOPE__ & " : Timeout due to no response received from requested SUT!");
@@ -1323,12 +1323,12 @@ module OneM2M_Testcases_AE_Release_1 {
 							tc_ac.stop;
 							setverdict(pass, __SCOPE__ & " : retrieve attribute oldest request is accepted!");
 							v_responsePrimitive := valueof(m_responsePrimitive(int2000, v_request.primitive.requestPrimitive.requestIdentifier, vc_localResourcesList[v_resourceIndex].resource));
-							f_send(e_mca_in_port, m_response(v_responsePrimitive));
+							f_send(e_mcaPortIn, m_response(v_responsePrimitive));
 						}
 						[] mcaPortIn.receive(mw_request(mw_retrieve(?))) -> value v_request {
 							tc_ac.stop;
 							setverdict(fail, __SCOPE__ & " : Retrieve Request for unexpected target");
-							f_send(e_mca_in_port, m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))));
+							f_send(e_mcaPortIn, m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))));
 						}
 						[] tc_ac.timeout{
 							setverdict(fail, __SCOPE__ & " : Timeout due to no response received from requested SUT!");
@@ -1383,12 +1383,12 @@ module OneM2M_Testcases_AE_Release_1 {
 							tc_ac.stop;
 							setverdict(pass, __SCOPE__ & " : retrieve attribute latest request is accepted!!");
 							v_responsePrimitive := valueof(m_responsePrimitive(int2000, v_request.primitive.requestPrimitive.requestIdentifier, vc_localResourcesList[v_resourceIndex].resource));
-							f_send(e_mca_in_port, m_response(v_responsePrimitive));
+							f_send(e_mcaPortIn, m_response(v_responsePrimitive));
 						}
 						[] mcaPortIn.receive(mw_request(mw_retrieve(?))) -> value v_request {
 							tc_ac.stop;
 							setverdict(fail, __SCOPE__ & " : Retrieve Request for unexpected target");
-							f_send(e_mca_in_port, m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))));
+							f_send(e_mcaPortIn, m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))));
 						}
 						[] tc_ac.timeout{
 							setverdict(fail, __SCOPE__ & " : Timeout due to no response received from requested SUT!");
@@ -1439,12 +1439,12 @@ module OneM2M_Testcases_AE_Release_1 {
 							tc_ac.stop;
 							setverdict(pass, __SCOPE__ & " : retrieve resource type request is accepted!!");
 							v_responsePrimitive := valueof(m_responsePrimitive(int2000, v_request.primitive.requestPrimitive.requestIdentifier, vc_localResourcesList[v_resourceIndex].resource));
-							f_send(e_mca_in_port, m_response(v_responsePrimitive));
+							f_send(e_mcaPortIn, m_response(v_responsePrimitive));
 						}
 						[] mcaPortIn.receive(mw_request(mw_retrieve(?))) -> value v_request {
 							tc_ac.stop;
 							setverdict(fail, __SCOPE__ & " : Retrieve Request for unexpected target");
-							f_send(e_mca_in_port, m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))));
+							f_send(e_mcaPortIn, m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))));
 						}
 						[] tc_ac.timeout{
 							setverdict(fail, __SCOPE__ & " : Timeout due to no response received from requested SUT!");
@@ -1497,12 +1497,12 @@ module OneM2M_Testcases_AE_Release_1 {
 							tc_ac.stop;
 							setverdict(pass, __SCOPE__ & " : retrieve resource type request is accepted!!");
 							v_responsePrimitive := valueof(m_responsePrimitive(int2000, v_request.primitive.requestPrimitive.requestIdentifier, vc_localResourcesList[v_resourceIndex].resource));
-							f_send(e_mca_in_port, m_response(v_responsePrimitive));
+							f_send(e_mcaPortIn, m_response(v_responsePrimitive));
 						}
 						[] mcaPortIn.receive(mw_request(mw_retrieve(?))) -> value v_request {
 							tc_ac.stop;
 							setverdict(fail, __SCOPE__ & " : Retrieve Request for unexpected target");
-							f_send(e_mca_in_port, m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))));
+							f_send(e_mcaPortIn, m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))));
 						}
 						[] tc_ac.timeout{
 							setverdict(fail, __SCOPE__ & " : Timeout due to no response received from requested SUT!");
@@ -1561,13 +1561,13 @@ module OneM2M_Testcases_AE_Release_1 {
 							v_responsePrimitive := valueof(m_responsePrimitive(int2002, v_request.primitive.requestPrimitive.requestIdentifier, omit));
 
 							//send back responsePrimitive
-							f_send(e_mca_in_port, m_response(v_responsePrimitive));
+							f_send(e_mcaPortIn, m_response(v_responsePrimitive));
 							tc_ac.stop;
 						}
 						[] mcaPortIn.receive (mw_request(mw_delete(?))) -> value v_request {
 							tc_ac.stop;
 							setverdict(fail, __SCOPE__ & " : Delete request for unexpected target");
-							f_send(e_mca_in_port, m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))));
+							f_send(e_mcaPortIn, m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))));
 						}
 						[] tc_ac.timeout{
 							setverdict(fail, __SCOPE__ & " : Timeout due to no response received from requested SUT!");
@@ -1622,13 +1622,13 @@ module OneM2M_Testcases_AE_Release_1 {
 							v_responsePrimitive := valueof(m_responsePrimitive(int2002, v_request.primitive.requestPrimitive.requestIdentifier, omit));
 
 							//send back responsePrimitive
-							f_send(e_mca_in_port, m_response(v_responsePrimitive));
+							f_send(e_mcaPortIn, m_response(v_responsePrimitive));
 							tc_ac.stop;
 						}
 						[] mcaPortIn.receive (mw_request(mw_delete(?))) -> value v_request {
 							tc_ac.stop;
 							setverdict(fail, __SCOPE__ & " : Delete request for unexpected target");
-							f_send(e_mca_in_port, m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))));
+							f_send(e_mcaPortIn, m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))));
 						}
 						[] tc_ac.timeout{
 							setverdict(fail, __SCOPE__ & " : Timeout due to no response received from requested SUT!");
@@ -1683,13 +1683,13 @@ module OneM2M_Testcases_AE_Release_1 {
 							v_responsePrimitive := valueof(m_responsePrimitive(int2002, v_request.primitive.requestPrimitive.requestIdentifier, omit));
 
 							//send back responsePrimitive
-							f_send(e_mca_in_port, m_response(v_responsePrimitive));
+							f_send(e_mcaPortIn, m_response(v_responsePrimitive));
 							tc_ac.stop;
 						}
 						[] mcaPortIn.receive (mw_request(mw_delete(?))) -> value v_request {
 							tc_ac.stop;
 							setverdict(fail, __SCOPE__ & " : Delete request for unexpected target");
-							f_send(e_mca_in_port, m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))));
+							f_send(e_mcaPortIn, m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))));
 						}
 						[] tc_ac.timeout{
 							setverdict(fail, __SCOPE__ & " : Timeout due to no response received from requested SUT!");
@@ -1746,13 +1746,13 @@ module OneM2M_Testcases_AE_Release_1 {
 							v_responsePrimitive := valueof(m_responsePrimitive(int2002, v_request.primitive.requestPrimitive.requestIdentifier, omit));
 
 							//send back responsePrimitive
-							f_send(e_mca_in_port, m_response(v_responsePrimitive));
+							f_send(e_mcaPortIn, m_response(v_responsePrimitive));
 							tc_ac.stop;
 						}
 						[] mcaPortIn.receive (mw_request(mw_delete(?))) -> value v_request {
 							tc_ac.stop;
 							setverdict(fail, __SCOPE__ & " : Delete request for unexpected target");
-							f_send(e_mca_in_port, m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))));
+							f_send(e_mcaPortIn, m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))));
 						}
 						[] tc_ac.timeout{
 							setverdict(fail, __SCOPE__ & " : Timeout due to no response received from requested SUT!");
@@ -1814,12 +1814,12 @@ module OneM2M_Testcases_AE_Release_1 {
 							v_responsePrimitive := valueof(m_responsePrimitive(int2001, v_request.primitive.requestPrimitive.requestIdentifier, vc_localResourcesList[v_resourceIndex].resource));
 							
 							//send back responsePrimitive
-							f_send(e_mca_in_port, m_response(v_responsePrimitive));
+							f_send(e_mcaPortIn, m_response(v_responsePrimitive));
 						}
 						[] mcaPortIn.receive {
 							tc_ac.stop;
 							setverdict(fail, __SCOPE__ & " : Subscription creation request is rejected due to not including mandatory attributes!!");
-							f_send(e_mca_in_port, m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))));
+							f_send(e_mcaPortIn, m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))));
 						}
 						[] tc_ac.timeout{
 							setverdict(fail, __SCOPE__ & " : Timeout due to no response received from requested SUT!");
@@ -1991,7 +1991,7 @@ module OneM2M_Testcases_AE_Release_1 {
 					v_req := valueof(m_notifyNotification("", m_contentNotification_subscriptionVerification(PX_TS_CSE1.cseId)));
 					v_req.from_ := PX_TS_CSE1.cseId;
 					
-					f_send(e_mca_port, m_request(v_req));
+					f_send(e_mcaPort, m_request(v_req));
 					
 					tc_ac.start;
 					alt{
@@ -2046,7 +2046,7 @@ module OneM2M_Testcases_AE_Release_1 {
 					v_req := valueof(m_notifyAggregatedNotification);
 					v_req.from_ := PX_TS_CSE1.cseId;
 					
-					f_send(e_mca_port, m_request(v_req));
+					f_send(e_mcaPort, m_request(v_req));
 
 					tc_ac.start;
 					alt{
diff --git a/OneM2M_Testcases_AE_Release_3.ttcn b/OneM2M_Testcases_AE_Release_3.ttcn
index bda41938f7506356e7fe5687a70d9f040881c60f..8c6750c9f39db868342c897d3cc873e5c6f0c2fa 100644
--- a/OneM2M_Testcases_AE_Release_3.ttcn
+++ b/OneM2M_Testcases_AE_Release_3.ttcn
@@ -1415,7 +1415,7 @@ module OneM2M_Testcases_AE_Release_3 {
 						v_notifyRequest.primitiveContent.securityInfo.securityInfoType := int6;
 						v_notifyRequest.primitiveContent.securityInfo.escertkeMessage := fx_generateESCertKEMessage('2D00'O);
 							
-						f_send(e_mcc_port, m_request(v_notifyRequest));
+						f_send(e_mccPort, m_request(v_notifyRequest));
 						
 						tc_ac.start;
 						alt {
@@ -1524,7 +1524,7 @@ module OneM2M_Testcases_AE_Release_3 {
 							v_notifyResponse2.primitiveContent.securityInfo.securityInfoType := int6;
 							v_notifyResponse2.primitiveContent.securityInfo.escertkeMessage := fx_generateESCertKEMessage(incomingMessage);
 							
-							f_send(e_mca_in_port, m_response(v_notifyResponse2));
+							f_send(e_mcaPortIn, m_response(v_notifyResponse2));
 							
 							tc_ac.start;
 							alt {
@@ -1605,7 +1605,7 @@ module OneM2M_Testcases_AE_Release_3 {
 						v_notifyRequest1.primitiveContent.securityInfo.securityInfoType := int6;
 						v_notifyRequest1.primitiveContent.securityInfo.escertkeMessage := fx_generateESCertKEMessage('2D00'O);
 							
-						f_send(e_mcc_port, m_request(v_notifyRequest1));
+						f_send(e_mccPort, m_request(v_notifyRequest1));
 						
 						tc_ac.start;
 						alt {
@@ -1640,7 +1640,7 @@ module OneM2M_Testcases_AE_Release_3 {
 							v_notifyRequest2.primitiveContent.securityInfo.securityInfoType := int6;
 							v_notifyRequest2.primitiveContent.securityInfo.escertkeMessage := fx_generateESCertKEMessage(incomingMessage);
 							
-							f_send(e_mcc_port, m_request(v_notifyRequest2));
+							f_send(e_mccPort, m_request(v_notifyRequest2));
 						
 							alt {
 								[] mcaPort.receive(mw_response(v_notifyResponse2)) {
diff --git a/OneM2M_Testcases_CSE_Release_1.ttcn b/OneM2M_Testcases_CSE_Release_1.ttcn
index 806a9f3475b451d2cf3aadfbc2e84fddcb5df533..3cb506c336edc1d207de55883cd344a855f39ea8 100644
--- a/OneM2M_Testcases_CSE_Release_1.ttcn
+++ b/OneM2M_Testcases_CSE_Release_1.ttcn
@@ -51,7 +51,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						
 					v_request := valueof(m_delete(v_resourceAddress, PX_SUPER_AE_ID));
 					    
-					f_send(e_mca_port, m_request(v_request));
+					f_send(e_mcaPort, m_request(v_request));
 					
 					t_ac.start;
 					alt {
@@ -538,7 +538,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 	    											
 					v_request := f_getCreateRequestPrimitive(int2, m_createAe(PX_TS_AE1.appId, omit, PX_NOT_ALLOWED_C_AE_IDS[0]), -1);
 			
-					f_send(e_mca_port, m_request(v_request));
+					f_send(e_mcaPort, m_request(v_request));
 					tc_ac.start;
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int4107))) {
@@ -737,7 +737,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					
 					vc_cse1.start(f_cse_announcementProcedure_createHandler(v_requestPrimitive));
 					
-					f_send(e_mca_port, m_request(f_getCreateRequestPrimitive(int2, m_createAe(PX_TS_AE1.appId, omit, "S"),-1)));
+					f_send(e_mcaPort, m_request(f_getCreateRequestPrimitive(int2, m_createAe(PX_TS_AE1.appId, omit, "S"),-1)));
 					
 					//Test Body
 					tc_ac.start;
@@ -835,7 +835,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 							tc_ac.stop;
 							setverdict(pass, __SCOPE__ & ": AE Announced UPDATE received");
 							f_processUpdateRequestPrimitive(vc_request.primitive.requestPrimitive);
-							f_send(e_mcc_in_port, m_response(vc_response.primitive.responsePrimitive));
+							f_send(e_mccPortIn, m_response(vc_response.primitive.responsePrimitive));
 						}
 						[] mccPortIn.receive(mw_request(mw_update)) {
 							tc_ac.stop;
@@ -906,7 +906,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					v_request.primitiveContent.aEAnnc.labels := {"Credential-ID:None"};
 					v_request.primitiveContent.aEAnnc.link := PX_TS_CSE1.cseId & "/" & vc_resourcesList[v_aeAnncIndex].resource.aEAnnc.aE_ID;
 		  	  		
-					f_send(e_mcc_port, m_request(v_request));
+					f_send(e_mccPort, m_request(v_request));
 					tc_ac.start;
 	
 					alt {
@@ -985,7 +985,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					vc_cse1.start(f_cse_announcementProcedure_updateHandler(v_updateAeAnnc));
 
 					v_request := valueof(m_createAe(PX_TS_AE1.appId, omit, f_getResourceId(vc_resourcesList[v_aeIndex].resource)));
-					f_send(e_mca_port, m_request(v_request));
+					f_send(e_mcaPort, m_request(v_request));
 					
 					tc_ac.start;
 					alt {
@@ -1055,7 +1055,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 	
 					v_request := f_getCreateRequestPrimitive(v_resourceType, v_request, -1);
 	
-					f_send(e_mca_port, m_request(v_request));
+					f_send(e_mcaPort, m_request(v_request));
 	
 					tc_ac.start;
 					alt {
@@ -1217,7 +1217,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 	    									
 					v_request := f_getCreateRequestPrimitive(v_resourceType, v_request, v_cseBaseIndex);
 					
-					f_send(e_mca_port, m_request(v_request));
+					f_send(e_mcaPort, m_request(v_request));
 					tc_ac.start;
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int4107))) {
@@ -1312,7 +1312,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					// Test Body
 					v_request := f_getCreateRequestPrimitive(v_resourceType, v_createRequestPrimitive, -1);
 	
-					f_send(e_mcc_port, m_request(v_request));
+					f_send(e_mccPort, m_request(v_request));
 					tc_ac.start;
 					alt {
 						[] mccPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
@@ -1376,7 +1376,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					// Test Body
 					v_request := f_getCreateRequestPrimitive(v_resourceType, v_createRequestPrimitive, -1);
 
-					f_send(e_mcc_port, m_request(v_request));
+					f_send(e_mccPort, m_request(v_request));
 					tc_ac.start;
 					alt {
 						[] mccPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
@@ -1437,7 +1437,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					
 					v_request := f_getCreateRequestPrimitive(v_resourceType, v_request, -1);
 					
-					f_send(e_mca_port, m_request(v_request));
+					f_send(e_mcaPort, m_request(v_request));
 					
 					tc_ac.start;
 					alt {
@@ -1512,7 +1512,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					v_request := f_getCreateRequestPrimitive(v_resourceType, m_createCSEBaseBase, -1); 
 					v_request.from_ := f_getOriginator(v_aeIndex);
 					
-					f_send(e_mca_port, m_request(v_request));
+					f_send(e_mcaPort, m_request(v_request));
 					tc_ac.start;
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int4005))) {
@@ -1568,7 +1568,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 
 					v_request := f_getCreateRequestPrimitive(v_resourceType, v_request, -1);
 
-					f_send(e_mca_port, m_request(v_request));
+					f_send(e_mcaPort, m_request(v_request));
 
 					tc_ac.start;
 					alt {
@@ -1638,7 +1638,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 	    									
 					v_request := f_getCreateRequestPrimitive(v_resourceType, v_request, -1);
 					
-					f_send(e_mca_port, m_request(v_request));
+					f_send(e_mcaPort, m_request(v_request));
 					tc_ac.start;
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int4105))) {
@@ -1724,7 +1724,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 							}
 							v_response.from_ := PX_TS_CSE1.cseId;
 							v_response.to_ := v_request.primitive.requestPrimitive.from_;
-							f_send(e_mcc_in_port, m_response(v_response));	
+							f_send(e_mccPortIn, m_response(v_response));	
 							tc_ac.start(10.0);
 							repeat;
 						}
@@ -1774,7 +1774,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 
 					// Preamble
 					v_request := f_getCreateRequestPrimitive(int16, m_createRemoteCSEBase, -1);
-					f_send(e_mcc_port, m_request(v_request));
+					f_send(e_mccPort, m_request(v_request));
 
 					// Test Body
 					tc_ac.start;
@@ -2041,7 +2041,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					v_request := f_getCreateRequestPrimitive(int10002, v_request, vc_remoteCseIndex);
 					v_primitiveContent.aEAnnc := mw_contentAeAnnc_base;
 					
-					f_send(e_mcc_port, m_request(v_request));
+					f_send(e_mccPort, m_request(v_request));
 					
 					tc_ac.start;
 					alt {
@@ -2111,7 +2111,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					
 					v_request := valueof(m_createAe(PX_TS_AE1.appId, omit, PX_ALLOWED_S_AE_IDS[0]));	
 					v_request := f_getCreateRequestPrimitive(int2, v_request, -1);
-					f_send(e_mca_port, m_request(v_request));
+					f_send(e_mcaPort, m_request(v_request));
 					
 					f_aeSimu_checkComponentDoneAndGetVerdict(vc_cse1);
 					
@@ -2187,7 +2187,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					v_request := f_getCreateRequestPrimitive(int10002, v_request, vc_remoteCseIndex);
 					v_primitiveContent.aEAnnc := mw_contentAeAnnc_base;
 					
-					f_send(e_mcc_port, m_request(v_request));
+					f_send(e_mccPort, m_request(v_request));
 					
 					tc_ac.start;
 					alt {
@@ -2257,7 +2257,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					
 					v_request := f_getCreateRequestPrimitive(v_resourceType, v_request, -1);
 					
-					f_send(e_mca_port, m_request(v_request));
+					f_send(e_mcaPort, m_request(v_request));
 					
 					tc_ac.start;
 					alt {
@@ -2322,7 +2322,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					// Test Body
 					v_contentResponse.cSEBase := mw_contentCSEBase_rc1;
 					
-					f_send(e_mca_port, m_request(m_retrieve(f_getResourceAddress(), f_getOriginator(v_aeIndex))));//TODO Maybe PX_SUPER_AE_ID
+					f_send(e_mcaPort, m_request(m_retrieve(f_getResourceAddress(), f_getOriginator(v_aeIndex))));//TODO Maybe PX_SUPER_AE_ID
 	
 					tc_ac.start;
 					alt {
@@ -2422,7 +2422,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					// Test Body
 					v_contentResponse.aE := mw_contentAeBase;
 	
-					f_send(e_mca_port, m_request(m_retrieve(f_getResourceAddress(v_aeIndex), f_getOriginator(v_aeIndex))));//TODO Maybe PX_SUPER_AE_ID
+					f_send(e_mcaPort, m_request(m_retrieve(f_getResourceAddress(v_aeIndex), f_getOriginator(v_aeIndex))));//TODO Maybe PX_SUPER_AE_ID
 
 					tc_ac.start;
 					alt {
@@ -2547,7 +2547,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					v_contentResponse_IN.cSEBase := mw_contentCSEBase_rc1;
 					v_contentResponse_IN.cSEBase.cseType := int1;
 	
-					f_send(e_mca_port, m_request(m_retrieve(f_getResourceAddress(), f_getOriginator(v_aeIndex))));//TODO Maybe PX_SUPER_AE_ID 
+					f_send(e_mcaPort, m_request(m_retrieve(f_getResourceAddress(), f_getOriginator(v_aeIndex))));//TODO Maybe PX_SUPER_AE_ID 
 					
 					tc_ac.start;
 					alt {
@@ -2629,7 +2629,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 				    
 					 v_contentResponse.remoteCSE := mw_contentRemoteCSEBase;
  
-					 f_send(e_mcc_port, m_request(m_retrieve(f_getResourceAddress(vc_remoteCseIndex), f_getOriginator(vc_remoteCseIndex))));
+					 f_send(e_mccPort, m_request(m_retrieve(f_getResourceAddress(vc_remoteCseIndex), f_getOriginator(vc_remoteCseIndex))));
 					 tc_ac.start;
 					 alt {
 						 [] mccPort.receive(mw_response(mw_responsePrimitive(int2000, v_contentResponse))) -> value v_response {
@@ -2768,7 +2768,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					// Test Body
 					v_contentResponse.cSEBase := mw_contentCSEBase_rc1;
 
-					f_send(e_mca_port, m_request(m_retrieve(f_getResourceAddress(), f_getOriginator(v_aeIndex))));//TODO Maybe PX_SUPER_AE_ID
+					f_send(e_mcaPort, m_request(m_retrieve(f_getResourceAddress(), f_getOriginator(v_aeIndex))));//TODO Maybe PX_SUPER_AE_ID
 
 					tc_ac.start;
 					alt {
@@ -2872,7 +2872,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 							}
 							v_response.from_ := PX_TS_CSE1.cseId;
 							v_response.to_ := v_request.primitive.requestPrimitive.from_;
-							f_send(e_mcc_in_port, m_response(v_response));
+							f_send(e_mccPortIn, m_response(v_response));
 						}
 						[] mccPortIn.receive(mw_request(?)) {
 							tc_ac.stop;
@@ -2923,7 +2923,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					 
  					 v_contentResponse.remoteCSE := mw_contentRemoteCSEBase;
 	 
-					 f_send(e_mcc_port, m_request(m_retrieve(f_getResourceAddress(vc_remoteCseIndex), f_getOriginator(vc_remoteCseIndex))));
+					 f_send(e_mccPort, m_request(m_retrieve(f_getResourceAddress(vc_remoteCseIndex), f_getOriginator(vc_remoteCseIndex))));
 					 tc_ac.start;
 					 alt {
 						[] mccPort.receive(mw_response(mw_responsePrimitive(int2000, v_contentResponse))) -> value v_response {
@@ -2994,7 +2994,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					v_updateRequest.primitiveContent.cSEBase.labels := v_labels_1;
 					v_request := f_getUpdateRequestPrimitive(int5, c_cseBaseIndex, v_updateRequest);
 					
-					f_send(e_mca_port, m_request(v_request));
+					f_send(e_mcaPort, m_request(v_request));
 					tc_ac.start;
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int4005))) {
@@ -3177,7 +3177,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 		
 					// Test Body
 					v_request := valueof(m_delete(f_getResourceAddress(), f_getOriginator()));
-					f_send(e_mca_port, m_request(v_request));
+					f_send(e_mcaPort, m_request(v_request));
 					tc_ac.start;
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int4005))) {
@@ -3230,7 +3230,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					// Test Body
 					v_request := valueof(m_delete(f_getResourceAddress(vc_remoteCseIndex), f_getOriginator(vc_remoteCseIndex)));
 
-					f_send(e_mcc_port, m_request(v_request));
+					f_send(e_mccPort, m_request(v_request));
 					tc_ac.start;
 					alt {
 						[] mccPort.receive(mw_response(mw_responsePrimitive(int2002))) {
@@ -3296,7 +3296,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					// Test Body
 					v_request := valueof(m_delete(f_getResourceAddress(v_aeIndex), f_getOriginator(v_aeIndex)));
 
-					f_send(e_mca_port, m_request(v_request));
+					f_send(e_mcaPort, m_request(v_request));
 					tc_ac.start;
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int2002))) {
@@ -3386,7 +3386,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 							}	
 							v_response.from_ := PX_TS_CSE1.cseId;
 							v_response.to_ := v_request.primitive.requestPrimitive.from_;
-							f_send(e_mcc_in_port, m_response(v_response));
+							f_send(e_mccPortIn, m_response(v_response));
 						}
 						[] mccPortIn.receive(mw_request(?)) {
 							tc_ac.stop;
@@ -3440,7 +3440,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					// Test Body
 					v_request := valueof(m_delete(f_getResourceAddress(v_aeIndex), f_getOriginator(v_aeIndex)));
 
-					f_send(e_mca_port, m_request(v_request));
+					f_send(e_mcaPort, m_request(v_request));
 					tc_ac.start;
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int2002))) {
@@ -3524,7 +3524,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 							tc_ac.stop;
 							setverdict(pass, __SCOPE__ & ": AE Announced UPDATE received");
 							f_processUpdateRequestPrimitive(vc_request.primitive.requestPrimitive);
-							f_send(e_mcc_in_port, m_response(vc_response.primitive.responsePrimitive));
+							f_send(e_mccPortIn, m_response(vc_response.primitive.responsePrimitive));
 						}
 						[] mccPortIn.receive(mw_request(mw_update)) {
 							tc_ac.stop;
@@ -3587,7 +3587,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					vc_cse1.start(f_cse_announcementProcedure_updateHandler(v_updateAeAnnc));
 					
 					v_request := valueof(m_delete(f_getResourceAddress(v_aeIndex), f_getOriginator(v_aeIndex)));
-					f_send(e_mca_port, m_request(v_request));
+					f_send(e_mcaPort, m_request(v_request));
 					
 					//Test Body
 					f_aeSimu_checkComponentDoneAndGetVerdict(vc_cse1);
@@ -4279,7 +4279,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					v_contentInstanceIndex := f_cse_createResource(int4, m_createContentInstanceBase, v_containerIndex);
 				
 					// Test Body
-					f_send(e_mca_port, m_request(m_retrieve(f_getResourceAddress(v_containerIndex), f_getOriginator(v_containerIndex))));
+					f_send(e_mcaPort, m_request(m_retrieve(f_getResourceAddress(v_containerIndex), f_getOriginator(v_containerIndex))));
 					
 					v_contentResponse.container := mw_contentContainerBase;
 					
@@ -4358,7 +4358,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					
 					v_request := f_getCreateRequestPrimitive(int3, v_createRequest, v_containerIndex);
 				
-					f_send(e_mca_port, m_request(v_request));
+					f_send(e_mcaPort, m_request(v_request));
 					tc_ac.start;
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int4005))) -> value v_response {
@@ -4436,7 +4436,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					
 					v_request := f_getCreateRequestPrimitive(int3, v_createRequest, v_containerIndex);
 				
-					f_send(e_mca_port, m_request(v_request));
+					f_send(e_mcaPort, m_request(v_request));
 					tc_ac.start;
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int4005))) -> value v_response {
@@ -4851,7 +4851,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					v_contentResponse.contentInstance.resourceName := vc_resourcesList[v_contentInstanceIndex1].resource.contentInstance.resourceName;
 									
 					// Test Body
-					f_send(e_mca_port, m_request(m_retrieve(f_getResourceAddress(v_containerIndex) & "/" & c_resourceShortNameOldest, f_getOriginator(v_containerIndex))));
+					f_send(e_mcaPort, m_request(m_retrieve(f_getResourceAddress(v_containerIndex) & "/" & c_resourceShortNameOldest, f_getOriginator(v_containerIndex))));
 
 					tc_ac.start;
 					alt {
@@ -4928,7 +4928,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					 
 					
 					// Test Body
-					f_send(e_mca_port, m_request(m_retrieve(f_getResourceAddress(v_containerIndex) & "/" & c_resourceShortNameLatest, f_getOriginator(v_containerIndex))));
+					f_send(e_mcaPort, m_request(m_retrieve(f_getResourceAddress(v_containerIndex) & "/" & c_resourceShortNameLatest, f_getOriginator(v_containerIndex))));
 
 					tc_ac.start;
 					alt {
@@ -5899,7 +5899,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					v_request := f_getUpdateRequestPrimitive(v_resourceType, v_aeIndex, v_updateRequest);
 					v_request.to_ := v_targetResourceAddress;
 					
-					f_send(e_mca_port, m_request(v_request));
+					f_send(e_mcaPort, m_request(v_request));
 					
 					tc_ac.start;
 					alt {
@@ -6387,7 +6387,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 				  	
 					v_request.to_ := v_request.to_ & "/" & c_resourceShortNameLatest;		//<latest>
 
-					f_send(e_mca_port, m_request(v_request));
+					f_send(e_mcaPort, m_request(v_request));
 					tc_ac.start;
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int4005))) -> value v_response {
@@ -6470,7 +6470,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 				  	
 					v_request.to_ := v_request.to_ & "/" & c_resourceShortNameOldest;		//<oldest>
 
-					f_send(e_mca_port, m_request(v_request));
+					f_send(e_mcaPort, m_request(v_request));
 					tc_ac.start;
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int4005))) -> value v_response {
@@ -8030,7 +8030,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					// Test Body
 					v_request := valueof(m_delete(f_getResourceAddress(v_containerIndex) & "/" & c_resourceShortNameLatest, f_getOriginator(v_containerIndex)));
 					            	
-					f_send(e_mca_port, m_request(v_request));
+					f_send(e_mcaPort, m_request(v_request));
 					tc_ac.start;
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int2002))) -> value v_response {
@@ -8052,7 +8052,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					
 					f_checkAeSimuStatus();
 		       		            	
-					f_send(e_mca_port, m_request(m_retrieve((f_getResourceAddress(v_contentInstanceIndex_2)), f_getOriginator(v_contentInstanceIndex_2))));
+					f_send(e_mcaPort, m_request(m_retrieve((f_getResourceAddress(v_contentInstanceIndex_2)), f_getOriginator(v_contentInstanceIndex_2))));
 				            
 					tc_ac.start;
 					alt {
@@ -8122,7 +8122,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					// Test Body
 					v_request := valueof(m_delete(f_getResourceAddress(v_containerIndex) & "/" & c_resourceShortNameOldest, f_getOriginator(v_containerIndex)));
 					            	
-					f_send(e_mca_port, m_request(v_request));
+					f_send(e_mcaPort, m_request(v_request));
 					tc_ac.start;
 					alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2002))) -> value v_response {
@@ -8144,7 +8144,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					   
 					f_checkAeSimuStatus();
 					   
-					f_send(e_mca_port, m_request(m_retrieve((f_getResourceAddress(v_contentInstanceIndex_1)), f_getOriginator(v_contentInstanceIndex_1))));
+					f_send(e_mcaPort, m_request(m_retrieve((f_getResourceAddress(v_contentInstanceIndex_1)), f_getOriginator(v_contentInstanceIndex_1))));
 				            
 					tc_ac.start;
 					alt {
@@ -8249,7 +8249,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					v_request := f_getCreateRequestPrimitive(int23, v_createRequest, v_aeIndex);//Subscription 
 					
 					// Test Body
-					f_send(e_mca_port, m_request(v_request));
+					f_send(e_mcaPort, m_request(v_request));
 					tc_ac.start;
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int4103))) -> value v_response {
@@ -8321,7 +8321,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					v_request.primitiveContent.subscription.notificationURI := {"NotReachableNotificationURI"};
 					
 					// Test Body
-					f_send(e_mca_port, m_request(v_request));
+					f_send(e_mcaPort, m_request(v_request));
 					tc_ac.start;
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int5204))) -> value v_response { //SUBSCRIPTION_VERIFICATION_INITIATION_FAILED
@@ -8470,7 +8470,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					
 					vc_ae2.start(f_cse_notifyProcedure_representationHandler(v_contentNotification)); // check if the notification is well received and if its content matchs
 					
-					f_send(e_mca_port, m_request(v_request));
+					f_send(e_mcaPort, m_request(v_request));
 					tc_ac.start;
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
@@ -8555,7 +8555,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					v_request:= f_getUpdateRequestPrimitive(int2, v_aeIndex, v_updateRequest); // Update request
 					v_request.primitiveContent.aE.labels := v_labels_1; 
 
-					f_send(e_mca_port, m_request(v_request));
+					f_send(e_mcaPort, m_request(v_request));
 					tc_ac.start;
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value v_response {
@@ -8641,7 +8641,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					v_notificationContent.notificationEvent := omit;
 					vc_ae2.start(f_cse_notifyProcedure_subscriptionDeletionHandler(v_notificationContent)); // check that no notification is received
 					
-					f_send(e_mca_port, m_request(v_request));
+					f_send(e_mcaPort, m_request(v_request));
 					tc_ac.start;
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int2002))) -> value v_response {
@@ -8734,7 +8734,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						// Test Body
 						v_createRequest := f_getCreateRequestPrimitive(c_accessControlPolicyType, v_createRequest, v_aeIndex);
 						
-						f_send(e_mca_port, m_request(v_createRequest));
+						f_send(e_mcaPort, m_request(v_createRequest));
 						tc_ac.start;
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
@@ -8817,7 +8817,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						// Test Body
 						v_createRequest := f_getCreateRequestPrimitive(c_accessControlPolicyType, v_createRequest, v_aeIndex);// CSE child resource
 						
-						f_send(e_mca_port, m_request(v_createRequest));
+						f_send(e_mcaPort, m_request(v_createRequest));
 						tc_ac.start;
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
@@ -8894,7 +8894,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						// Test Body
 						v_createRequest := f_getCreateRequestPrimitive(c_accessControlPolicyType, v_createRequest, -1);
 						
-						f_send(e_mca_port, m_request(v_createRequest));
+						f_send(e_mcaPort, m_request(v_createRequest));
 						tc_ac.start;
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001, v_contentResponse))) -> value v_response {
@@ -8973,7 +8973,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						// Test Body
 						v_createRequest := f_getCreateRequestPrimitive(c_accessControlPolicyType, v_createRequest, -1);
 						
-						f_send(e_mca_port, m_request(v_createRequest));
+						f_send(e_mcaPort, m_request(v_createRequest));
 						tc_ac.start;
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int4000))) -> value v_response {
@@ -9071,7 +9071,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						v_updateRequest.primitiveContent.aE.accessControlPolicyIDs := {f_getResourceId(vc_resourcesList[v_acpIndex2].resource)};
 						v_updateRequest := f_getUpdateRequestPrimitive(int1, v_aeIndex, v_updateRequest);
 						
-						f_send(e_mca_port, m_request(v_updateRequest));
+						f_send(e_mcaPort, m_request(v_updateRequest));
 						tc_ac.start;
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value v_response {
@@ -9163,7 +9163,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						v_updateRequest.primitiveContent.aE.accessControlPolicyIDs := {f_getResourceId(vc_resourcesList[v_acpIndex2].resource)};
 						v_updateRequest := f_getUpdateRequestPrimitive(int1, v_aeIndex, v_updateRequest);
 
-						f_send(e_mca_port, m_request(v_updateRequest));
+						f_send(e_mcaPort, m_request(v_updateRequest));
 						tc_ac.start;
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int4103))) -> value v_response {
@@ -9719,7 +9719,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 				
 				// Test Body
 				v_request := valueof(m_retrieveFilterUsageOption(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex), int1));
-				f_send(e_mca_port, m_request(v_request));
+				f_send(e_mcaPort, m_request(v_request));
 				tc_ac.start;
 				alt {
 					[] mcaPort.receive(mw_response(mw_responseDiscovery)){
@@ -9787,7 +9787,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 				
 				// Test Body
 				v_request := valueof(m_retrieveFilterUsageOptionLabel(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex), int1, v_labels));
-				f_send(e_mca_port, m_request(v_request));
+				f_send(e_mcaPort, m_request(v_request));
 				tc_ac.start;
 				alt {
 					[] mcaPort.receive(mw_response(mw_responseDiscovery)) -> value v_response {
@@ -9859,7 +9859,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 				
 				// Test Body
 				v_request := valueof(m_retrieveFilterUsageOptionLabel(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex), int1, v_labels));
-				f_send(e_mca_port, m_request(v_request));
+				f_send(e_mcaPort, m_request(v_request));
 				tc_ac.start;
 				alt {
 					[] mcaPort.receive(mw_response(mw_responseDiscovery)) -> value v_response {
@@ -9931,7 +9931,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 				
 				// Test Body
 				v_request := valueof(m_retrieveDiscResTypeFilterUsageOption(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex), int2, int1));
-				f_send(e_mca_port, m_request(v_request));
+				f_send(e_mcaPort, m_request(v_request));
 				tc_ac.start;
 				alt {
 					[] mcaPort.receive(mw_response(mw_responseDiscovery)) -> value v_response {
@@ -10010,7 +10010,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 				v_resourceIndex := f_cse_createResource(c_containerResourceType, v_requestPrimitive, v_aeIndex);
 				v_childResourceIndex := f_cse_createResource(c_containerResourceType, m_createContainerBase, v_resourceIndex);
 				v_request := valueof(m_retrieveFilterUsageOption(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex), int1));
-				f_send(e_mca_port, m_request(v_request));
+				f_send(e_mcaPort, m_request(v_request));
 				tc_ac.start;
 				alt {
 					[] mcaPort.receive(mw_response(mw_responsePrimitive(int4103))) {
@@ -10075,7 +10075,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					v_request := valueof(m_retrieveFilterUsageOption(f_getResourceAddress(v_aeIndex) & "/" & v_resourceId, f_getOriginator(v_resourceIndex), int1));
 				}
 			
-				f_send(e_mca_port, m_request(v_request));
+				f_send(e_mcaPort, m_request(v_request));
 				tc_ac.start;
 				alt {
 				
@@ -10144,7 +10144,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 				v_invalidFilterCriteria.sizeBelow := 1;//Whatever value, it will be overwritten by forceFields parameter
 				v_request := valueof(m_retrieveFilterCriteria(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex), v_invalidFilterCriteria));
 				v_invalidAttribute := {name := "filterCriteria.sizeBelow", value_ := "-1"};
-				f_send(e_mca_port, m_request(v_request, {v_invalidAttribute}));
+				f_send(e_mcaPort, m_request(v_request, {v_invalidAttribute}));
 				tc_ac.start;
 				alt {
 				
@@ -10288,7 +10288,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 				v_resourceIndex := f_cse_createResource(c_containerResourceType, v_createRequest, v_aeIndex);
 				
 				v_request := valueof(m_retrieveFilterUsageOptionLabel(f_getResourceAddress(v_aeIndex), f_getOriginator(v_resourceIndex), int1, v_labels));
-				f_send(e_mca_port, m_request(v_request));
+				f_send(e_mcaPort, m_request(v_request));
 				tc_ac.start;
 				alt {
 					[] mcaPort.receive(mw_response(mw_responseDiscovery)) -> value v_response {
@@ -10360,7 +10360,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 				
 				// Test Body
 				v_request := valueof(m_retrieveDiscResTypeFilterUsageOption(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex), int1, int1));
-				f_send(e_mca_port, m_request(v_request));
+				f_send(e_mcaPort, m_request(v_request));
 				tc_ac.start;
 				alt {
 					[] mcaPort.receive(mw_response(mw_responseDiscovery)) -> value v_response {
@@ -10433,7 +10433,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 				
 				// Test Body
 				v_request := valueof(m_retrieveFilterUsageOption(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex), int1));
-				f_send(e_mca_port, m_request(v_request));
+				f_send(e_mcaPort, m_request(v_request));
 				tc_ac.start;
 				alt {
 					[] mcaPort.receive(mw_response(mw_responseDiscovery)) -> value v_response {
@@ -10522,7 +10522,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					v_request := f_getCreateRequestPrimitive(int9, v_createRequest, v_aeIndex);
                 
                                                                          
-					f_send(e_mca_port, m_request(v_request));
+					f_send(e_mcaPort, m_request(v_request));
 					tc_ac.start;
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int6010))) -> value v_response {
@@ -10622,7 +10622,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					
 					vc_cse1.start(f_cse_memberTypeValidationHandler(v_targetResourceIndex, int4103));
 
-					f_send(e_mca_port, m_request(v_request));
+					f_send(e_mcaPort, m_request(v_request));
 					tc_ac.start;
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int5105))) -> value v_response {
@@ -10695,7 +10695,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					v_createRequest := f_getCreateRequestPrimitive(int9, v_createRequest, v_aeIndex);
             		
 					// Test Body                                              
-					f_send(e_mca_port, m_request(v_createRequest));
+					f_send(e_mcaPort, m_request(v_createRequest));
 					tc_ac.start;
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
@@ -10760,7 +10760,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					v_createRequest := f_getCreateRequestPrimitive(int9, v_createRequest, v_aeIndex);
                 	
 					// Test Body       
-					f_send(e_mca_port, m_request(v_createRequest));
+					f_send(e_mcaPort, m_request(v_createRequest));
 					tc_ac.start;
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
@@ -10827,7 +10827,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					v_createRequest := f_getCreateRequestPrimitive(int9, v_createRequest, v_aeIndex);                                                            
                     
 					// Test Body
-					f_send(e_mca_port, m_request(v_createRequest));
+					f_send(e_mcaPort, m_request(v_createRequest));
 					tc_ac.start;
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
@@ -10909,7 +10909,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					v_createRequest := f_getCreateRequestPrimitive(int9, v_createRequest, v_aeIndex);                                                       
                     
 					// Test Body               
-					f_send(e_mca_port, m_request(v_createRequest));
+					f_send(e_mcaPort, m_request(v_createRequest));
 					tc_ac.start;
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
@@ -10991,7 +10991,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					v_createRequest := f_getCreateRequestPrimitive(int9, v_createRequest, v_aeIndex);                                                       
                     
 					// Test Body
-					f_send(e_mca_port, m_request(v_createRequest));
+					f_send(e_mcaPort, m_request(v_createRequest));
 					tc_ac.start;
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int4110))) -> value v_response {
@@ -11080,7 +11080,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					v_fanoutPointAddress := f_getResourceAddress(v_groupIndex) & "/" & c_resourceShortNameFanOutPoint & "/" & c_resourceShortNameLatest;
 					
 					// Test Body
-					f_send(e_mca_port, m_request(m_retrieve(v_fanoutPointAddress, f_getOriginator(v_aeIndex_1)))); //TODO see if it is correct or if we have to use PX_SUPER_ADMIN
+					f_send(e_mcaPort, m_request(m_retrieve(v_fanoutPointAddress, f_getOriginator(v_aeIndex_1)))); //TODO see if it is correct or if we have to use PX_SUPER_ADMIN
 					tc_ac.start;
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int2000))) -> value v_response {
@@ -11191,7 +11191,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					// Test Body
                 	vc_cse1.start(f_cse_memberTypeValidationHandler(v_containerLocalIndex_2, int4103));
                 	
-					f_send(e_mca_port, m_request(v_request));
+					f_send(e_mcaPort, m_request(v_request));
 					tc_ac.start;
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int5105))) -> value v_response {
@@ -11266,7 +11266,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					v_updateRequest := f_getUpdateRequestPrimitive(int9, v_groupIndex, v_updateRequest);
 					
 					//Test Body
-					f_send(e_mca_port, m_request(v_updateRequest));
+					f_send(e_mcaPort, m_request(v_updateRequest));
 					tc_ac.start;
 					alt {
 						 [] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value v_response {
@@ -11356,7 +11356,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					v_updateRequest := f_getUpdateRequestPrimitive(int9, v_groupIndex, v_updateRequest);
 					
 					// Test Body
-					f_send(e_mca_port, m_request(v_updateRequest));// TODO see if the memberTypeValidated is present in the update response
+					f_send(e_mcaPort, m_request(v_updateRequest));// TODO see if the memberTypeValidated is present in the update response
 					tc_ac.start;
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value v_response {
@@ -11446,7 +11446,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					v_updateRequest := f_getUpdateRequestPrimitive(int9, v_groupIndex, v_updateRequest);
 					
 					// Test Body
-					f_send(e_mca_port, m_request(v_updateRequest));// TODO see if the memberTypeValidated is present in the update response
+					f_send(e_mcaPort, m_request(v_updateRequest));// TODO see if the memberTypeValidated is present in the update response
 					tc_ac.start;
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value v_response {
@@ -11553,7 +11553,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					
 					//Test Body
                     
-					f_send(e_mca_port, m_request(v_updateRequest));
+					f_send(e_mcaPort, m_request(v_updateRequest));
 					tc_ac.start;
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value v_response {
@@ -11660,7 +11660,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					v_updateRequest := f_getUpdateRequestPrimitive(int9, v_groupIndex, v_updateRequest);
                 					
 					//Test Body
-					f_send(e_mca_port, m_request(v_updateRequest));
+					f_send(e_mcaPort, m_request(v_updateRequest));
 					tc_ac.start;
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int4110))) -> value v_response {
@@ -11742,7 +11742,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					v_memberIDs := v_memberIDs & {f_getResourceId(vc_resourcesList[v_containerIndex_3].resource)};
 					v_request.primitiveContent.group_.memberIDs := v_memberIDs;
         
-					f_send(e_mca_port, m_request(v_request));
+					f_send(e_mcaPort, m_request(v_request));
 					tc_ac.start;
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int6010))) -> value v_response {
@@ -11824,7 +11824,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					v_updateRequest := f_getUpdateRequestPrimitive(int9, v_groupIndex, v_updateRequest);
 					
 					//Test Body
-					f_send(e_mca_port, m_request(v_updateRequest));
+					f_send(e_mcaPort, m_request(v_updateRequest));
 					tc_ac.start;
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int6010))) -> value v_response {
@@ -11928,7 +11928,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					v_updateRequest.primitiveContent.group_.memberIDs := {v_memberId_1, v_remoteGroupAddress & "/" & "fopt"};
         			v_request := f_getUpdateRequestPrimitive(c_ResourceTypeGroup, v_groupIndex, v_updateRequest);
 
-					f_send(e_mca_port, m_request(v_request));
+					f_send(e_mcaPort, m_request(v_request));
 					tc_ac.start;
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value v_response {
@@ -12046,7 +12046,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					v_request.to_ := f_getResourceAddress(v_remoteCSEIndex);
 					//Content set to <remoteCSE> resource containing onlineStatus := false;
         
-					f_send(e_mca_port, m_request(v_request));
+					f_send(e_mcaPort, m_request(v_request));
 					tc_ac.start;
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value v_response {
diff --git a/OneM2M_Testcases_CSE_Release_2.ttcn b/OneM2M_Testcases_CSE_Release_2.ttcn
index 26049d433ed8f0ecbe9d1e4ca2e18820b1d25f93..0f7bf03c06f2ea8d9485804f9c18e7b186e0d8fb 100644
--- a/OneM2M_Testcases_CSE_Release_2.ttcn
+++ b/OneM2M_Testcases_CSE_Release_2.ttcn
@@ -41,7 +41,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						
 					v_request := valueof(m_delete(v_resourceAddress, PX_SUPER_AE_ID));
 					    
-					f_send(e_mca_port, m_request(v_request));
+					f_send(e_mcaPort, m_request(v_request));
 					
 					t_ac.start;
 					alt {
@@ -2214,7 +2214,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					// Test Body
 					v_request := f_getCreateRequestPrimitive(int23, v_createRequest, v_aeIndex);//Subscription 
 					
-					f_send(e_mca_port, m_request(v_request));
+					f_send(e_mcaPort, m_request(v_request));
 					
 					tc_ac.start;
 					alt {
@@ -2293,7 +2293,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					// Test Body
 					v_request := f_getCreateRequestPrimitive(int23, v_createRequest, v_aeIndex);//Subscription 
 					
-					f_send(e_mca_port, m_request(v_request));
+					f_send(e_mcaPort, m_request(v_request));
 					
 					tc_ac.start;
 					alt {
@@ -2397,14 +2397,14 @@ module OneM2M_Testcases_CSE_Release_2 {
 							setverdict(pass, __SCOPE__ & ":INFO: Notification received");
 							v_responsePrimitive := valueof(m_responseNotification(int2000, omit));
 							v_responsePrimitive.requestIdentifier := vc_request.primitive.requestPrimitive.requestIdentifier;
-							f_send(e_mca_in_port, m_httpResponse(v_responsePrimitive));
+							f_send(e_mcaPortIn, m_httpResponse(v_responsePrimitive));
 						}
 						[] mcaPortIn.receive(mw_request(mw_notifyNotification(mw_contentNotification(?)))) -> value vc_request {
 							tc_ac.stop;
 							setverdict(inconc, __SCOPE__ & ":ERROR: Notification received but verificationRequest isn't set to TRUE");
 							v_responsePrimitive := valueof(m_responseNotification(int4000, omit));
 							v_responsePrimitive.requestIdentifier := vc_request.primitive.requestPrimitive.requestIdentifier;
-							f_send(e_mca_in_port, m_httpResponse(v_responsePrimitive));						
+							f_send(e_mcaPortIn, m_httpResponse(v_responsePrimitive));						
 						}
 						[] tc_ac.timeout {
 							if (not(vc_ae2.running)){
@@ -2441,7 +2441,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 							//Send response in any case
 							v_responsePrimitive := valueof(m_responseNotification(int2000, omit));
 							v_responsePrimitive.requestIdentifier := vc_request.primitive.requestPrimitive.requestIdentifier;
-							f_send(e_mca_in_port, m_response(v_responsePrimitive));
+							f_send(e_mcaPortIn, m_response(v_responsePrimitive));
 							
 						}
 						[] tc_ac.timeout {
@@ -2520,7 +2520,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 			
 					v_request:= f_getUpdateRequestPrimitive(int2, v_aeIndex, v_updateRequest);
 					
-					f_send(e_mca_port, m_request(v_request));
+					f_send(e_mcaPort, m_request(v_request));
 					tc_ac.start;
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value v_response {
@@ -2602,7 +2602,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					
 					v_request:= f_getUpdateRequestPrimitive(int2, v_aeIndex, v_updateRequest);
 					
-					f_send(e_mca_port, m_request(v_request));
+					f_send(e_mcaPort, m_request(v_request));
 					tc_ac.start;
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value v_response {
@@ -2690,7 +2690,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					
 					f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
 					
-					f_send(e_mca_port, m_request(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex))));
+					f_send(e_mcaPort, m_request(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex))));
 	
 					tc_ac.start;
 					alt {
@@ -2781,7 +2781,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					
 					f_aeSimu_checkComponentDoneAndGetVerdict(vc_ae2);
 
-					f_send(e_mca_port, m_request(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex))));
+					f_send(e_mcaPort, m_request(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex))));
 
 					tc_ac.start;
 					alt {
@@ -2865,7 +2865,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					// Test Body
 					vc_ae2.start(f_cse_notifyProcedure_noNotificationHandler()); // check that no notification is received
 		
-					f_send(e_mca_port, m_request(v_request));
+					f_send(e_mcaPort, m_request(v_request));
 					tc_ac.start;
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value v_response {
@@ -3095,7 +3095,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					// Test Body
 					vc_ae2.start(f_cse_notifyProcedure_representationHandler(v_contentResponse)); // check if the notification is well received and if its content matchs
 					
-					f_send(e_mca_port, m_request(v_request));
+					f_send(e_mcaPort, m_request(v_request));
 					tc_ac.start;
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value v_response {
@@ -3182,7 +3182,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					
 					v_deleteRequest:= valueof(m_delete(f_getResourceAddress(v_aeIndex), f_getOriginator(v_aeIndex))); // Ae delete request
 										
-					f_send(e_mca_port, m_request(v_deleteRequest));
+					f_send(e_mcaPort, m_request(v_deleteRequest));
 					tc_ac.start;
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int2002))) -> value v_response {
@@ -3266,7 +3266,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					
 					v_deleteRequest := valueof(m_delete(f_getResourceAddress(v_containerResourceIndex), f_getOriginator(v_containerResourceIndex)));// Container deletion request
 										
-					f_send(e_mca_port, m_request(v_deleteRequest));
+					f_send(e_mcaPort, m_request(v_deleteRequest));
 					tc_ac.start;
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int2002))) -> value v_response {
@@ -3364,7 +3364,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					v_resourceIndex := f_cse_createResource(int15, m_createPollingChannelBase, v_aeIndex);
 					
 					v_req1 := valueof(m_retrievePollingRequest(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex)));
-					f_send(e_mca_port, m_request(v_req1));
+					f_send(e_mcaPort, m_request(v_req1));
 					
 					v_req2 := valueof(m_notifyNotification(f_getResourceAddress(v_aeIndex), m_contentNotification_subscriptionVerification(PX_TS_CSE1.cseId)));
 					
@@ -3403,7 +3403,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					v_resp2.requestIdentifier := v_resp1.primitive.responsePrimitive.primitiveContent.requestPrimitive.requestIdentifier;//requestIdentifier of req2
 					v_req3 := valueof(m_notifyResponsePrimitive(f_getResourceAddress(v_resourceIndex) & "/" & c_resourceShortNamePollingChannelUri, v_resp2));
 					v_req3.from_ := f_getOriginator(v_aeIndex);
-					f_send(e_mca_port, m_request(v_req3));
+					f_send(e_mcaPort, m_request(v_req3));
 					 
 					tc_ac.start;
 					alt {
@@ -3478,7 +3478,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					v_req2.from_ := PX_TS_CSE1.cseId;
 					
 					v_req1 := valueof(m_retrievePollingRequest(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex)));
-					f_send(e_mca_port, m_request(v_req1));
+					f_send(e_mcaPort, m_request(v_req1));
 									
 					tc_ac.start;
 					alt {
@@ -3511,7 +3511,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					v_resp2.requestIdentifier := v_resp1.primitive.responsePrimitive.primitiveContent.requestPrimitive.requestIdentifier;//requestIdentifier of req2
 					v_req3 := valueof(m_notifyResponsePrimitive(f_getResourceAddress(v_resourceIndex) & "/" & c_resourceShortNamePollingChannelUri, v_resp2));
 					v_req3.from_ := f_getOriginator(v_aeIndex);
-					f_send(e_mca_port, m_request(v_req3));
+					f_send(e_mcaPort, m_request(v_req3));
 					 
 					tc_ac.start;
 					alt {
@@ -3581,7 +3581,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					v_resourceIndex := f_cse_createResource(int15, m_createPollingChannelBase, v_aeIndex);
 					 
 					v_req1 := valueof(m_retrievePollingRequest(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex)));
-					f_send(e_mca_port, m_request(v_req1));
+					f_send(e_mcaPort, m_request(v_req1));
 					
 					v_req2 := valueof(m_notifyNotification(f_getResourceAddress(v_aeIndex), m_contentNotification_subscriptionVerification(PX_TS_CSE1.cseId)));
 					
@@ -3618,7 +3618,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					v_resp2.requestIdentifier := v_resp1.primitive.responsePrimitive.primitiveContent.requestPrimitive.requestIdentifier;
 					v_req3 := valueof(m_notifyResponsePrimitive(f_getResourceAddress(v_resourceIndex) & "/" & c_resourceShortNamePollingChannelUri, v_resp2));
 					v_req3.from_ := f_getOriginator(v_aeIndex);
-					f_send(e_mca_port, m_request(v_req3));
+					f_send(e_mcaPort, m_request(v_req3));
 					 
 					tc_ac.start;
 					alt {
@@ -3706,7 +3706,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 							//Put in the primitiveContent a Notify request (req2) (simulated) from another node CSE
 							v_request_req2 := valueof(m_notify(f_getResourceAddress(vc_remoteCseIndex)));
 							v_response_rsp1.primitiveContent := { requestPrimitive := v_request_req2 };
-							f_send(e_mcc_in_port, m_response(v_response_rsp1));
+							f_send(e_mccPortIn, m_response(v_response_rsp1));
 					   }
 					   [] tc_ac.timeout {
 						   setverdict(inconc, __SCOPE__&":INFO: No request received for creating resource type Polling Channel");
@@ -3809,7 +3809,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					v_req1 := valueof(m_retrievePollingRequest(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex)));
 					v_req1.requestExpirationTimestamp := { alt_1 := 10000};
 					 
-					f_send(e_mca_port, m_request(v_req1));
+					f_send(e_mcaPort, m_request(v_req1));
 	
 					 tc_ac.start;
 					 alt {
@@ -4347,7 +4347,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					v_request.primitiveContent := { genericInterworkingService_invalid := valueof(m_contentCreateGenericInterworkingService_invalid) }; 
 					v_request := f_getCreateRequestPrimitive(int28, v_request, v_aeIndex);
 						
-					f_send(e_mca_port, m_request(v_request));
+					f_send(e_mcaPort, m_request(v_request));
 					tc_ac.start;
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int4000))) -> value vc_response {
@@ -4413,7 +4413,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					v_request.primitiveContent.genericInterworkingService.containerDefinition := "urn:m2m:nonExistingSchemaDefinition.xsd";
 					v_request := f_getCreateRequestPrimitive(int28, v_request, v_aeIndex);
 						
-					f_send(e_mca_port, m_request(v_request));
+					f_send(e_mcaPort, m_request(v_request));
 					tc_ac.start;
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int4000))) -> value vc_response {
@@ -4498,7 +4498,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 	
 						f_cse_updateResource(int28, v_resourceIndex, v_updateRequest);
 					
-						f_send(e_mca_port, m_request(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex))));
+						f_send(e_mcaPort, m_request(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex))));
 					
 						tc_ac.start;
 						alt {
@@ -4570,7 +4570,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 	
 						f_cse_updateResource(int28, v_resourceIndex, v_updateRequest);
 					
-						f_send(e_mca_port, m_request(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex))));
+						f_send(e_mcaPort, m_request(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex))));
 					
 						tc_ac.start;
 						alt {
@@ -4640,7 +4640,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 					// Test Body
 					v_updateRequest := f_getUpdateRequestPrimitive(int28, v_resourceIndex, v_updateRequest);
 					
-					f_send(e_mca_port, m_request(v_updateRequest));
+					f_send(e_mcaPort, m_request(v_updateRequest));
 					
 					tc_ac.start;
 					alt {
diff --git a/OneM2M_Testcases_CSE_Release_3.ttcn b/OneM2M_Testcases_CSE_Release_3.ttcn
index 950cac470291222a93df088591ea089ba37c6ad3..2a15bf897b425ac9068371b165262a0ea5444ecd 100644
--- a/OneM2M_Testcases_CSE_Release_3.ttcn
+++ b/OneM2M_Testcases_CSE_Release_3.ttcn
@@ -42,7 +42,7 @@ module OneM2M_Testcases_CSE_Release_3 {
 						
 					v_request := valueof(m_delete(v_resourceAddress, PX_SUPER_AE_ID));
 					    
-					f_send(e_mca_port, m_request(v_request));
+					f_send(e_mcaPort, m_request(v_request));
 					
 					t_ac.start;
 					alt {
@@ -2045,7 +2045,7 @@ module OneM2M_Testcases_CSE_Release_3 {
 							v_targetResourceAddress := f_getResourceAddress(v_aeIndex) & "/" & v_resourceName;
 						}
 						
-						f_send(e_mca_port, m_request(m_retrieve(v_targetResourceAddress, f_getOriginator(v_aeIndex))));
+						f_send(e_mcaPort, m_request(m_retrieve(v_targetResourceAddress, f_getOriginator(v_aeIndex))));
 
 						tc_ac.start;
 						alt {
@@ -2581,7 +2581,7 @@ module OneM2M_Testcases_CSE_Release_3 {
 						v_containerIndex := f_cse_createResource(int3, m_createContainerBase, v_aeIndex); 	
 		
 						// Test Body
-						f_send(e_mca_port, m_request(m_retrieve(f_getResourceAddress(v_containerIndex) & "/" & c_resourceShortNameLatest, f_getOriginator(v_containerIndex))));
+						f_send(e_mcaPort, m_request(m_retrieve(f_getResourceAddress(v_containerIndex) & "/" & c_resourceShortNameLatest, f_getOriginator(v_containerIndex))));
 
 						tc_ac.start;
 						alt {
@@ -2647,7 +2647,7 @@ module OneM2M_Testcases_CSE_Release_3 {
 						v_containerIndex := f_cse_createResource(int3, m_createContainerBase, v_aeIndex); 	
 		
 						// Test Body
-						f_send(e_mca_port, m_request(m_retrieve(f_getResourceAddress(v_containerIndex) & "/" & c_resourceShortNameOldest, f_getOriginator(v_containerIndex))));
+						f_send(e_mcaPort, m_request(m_retrieve(f_getResourceAddress(v_containerIndex) & "/" & c_resourceShortNameOldest, f_getOriginator(v_containerIndex))));
 
 						tc_ac.start;
 						alt {
@@ -5970,7 +5970,7 @@ module OneM2M_Testcases_CSE_Release_3 {
 							v_request := valueof(m_delete(f_getResourceAddress(v_aeIndex) & "/" & v_resourceIdOrName, f_getOriginator(v_aeIndex)));
 						}
                 		
-						f_send(e_mca_port, m_request(v_request));
+						f_send(e_mcaPort, m_request(v_request));
 						tc_ac.start;
 						alt {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int4004))) -> value v_response {
@@ -6119,7 +6119,7 @@ module OneM2M_Testcases_CSE_Release_3 {
 							
 						// Test Body
 						v_request := valueof(m_delete(f_getResourceAddress(v_containerIndex) & "/" & c_resourceShortNameLatest, f_getOriginator(v_containerIndex)));
-						f_send(e_mca_port, m_request(v_request));
+						f_send(e_mcaPort, m_request(v_request));
 						tc_ac.start;
 						alt {
 								[] mcaPort.receive(mw_response(mw_responsePrimitive(int4004))) -> value v_response {
@@ -6188,7 +6188,7 @@ module OneM2M_Testcases_CSE_Release_3 {
 							
 						// Test Body
 						v_request := valueof(m_delete(f_getResourceAddress(v_containerIndex) & "/" & c_resourceShortNameOldest, f_getOriginator(v_containerIndex)));
-						f_send(e_mca_port, m_request(v_request));
+						f_send(e_mcaPort, m_request(v_request));
 						tc_ac.start;
 						alt {
 								[] mcaPort.receive(mw_response(mw_responsePrimitive(int4004))) -> value v_response {
@@ -6295,7 +6295,7 @@ module OneM2M_Testcases_CSE_Release_3 {
 				v_request	 := f_getCreateRequestPrimitive(int10, m_createLocationPolicy(v_locationSource, omit, omit, omit, omit), v_aeIndex);
      	     	
 				//Test Body
-				f_send(e_mca_port, m_request(v_request));
+				f_send(e_mcaPort, m_request(v_request));
 				tc_ac.start;
 				alt{
 				  [] mcaPort.receive(mw_response(mw_responsePrimitive(int4000))) -> value v_response { //BAD REQUEST
@@ -6368,7 +6368,7 @@ module OneM2M_Testcases_CSE_Release_3 {
 				v_request	 := f_getCreateRequestPrimitive(int10, m_createLocationPolicy(v_locationSource, omit, locationUpdatePeriod, locationTargetID, locationServerAddress), v_aeAuxIndex);
      	     	    									
 				// Test Body					
-				f_send(e_mca_port, m_request(v_request));
+				f_send(e_mcaPort, m_request(v_request));
 				tc_ac.start;
 				alt {
 					[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
@@ -6452,7 +6452,7 @@ module OneM2M_Testcases_CSE_Release_3 {
 				v_request				:= f_getCreateRequestPrimitive(int10, m_createLocationPolicy(v_locationSource,omit, locationUpdatePeriod, locationTargetID, locationServerAddress), v_aeIndex);
      	        									
 				// Test Body					
-				f_send(e_mca_port, m_request(v_request));
+				f_send(e_mcaPort, m_request(v_request));
 				tc_ac.start;
 				alt {
 					[] mcaPort.receive(mw_response(mw_responsePrimitive(int4103))) -> value v_response {
@@ -6524,7 +6524,7 @@ module OneM2M_Testcases_CSE_Release_3 {
 				v_request		:= f_getCreateRequestPrimitive(int10, m_createLocationPolicy(v_locationSource, omit, locationUpdatePeriod, locationTargetID, locationServerAddress), v_aeIndex);
      	    							
 				// Test Body					
-				f_send(e_mca_port, m_request(v_request));
+				f_send(e_mcaPort, m_request(v_request));
 				tc_ac.start;
 				alt {
 					[] mcaPort.receive(mw_response(mw_responsePrimitive(int4000))) -> value v_response {
@@ -6602,7 +6602,7 @@ module OneM2M_Testcases_CSE_Release_3 {
 				v_request					:= f_getUpdateRequestPrimitive(int10, v_locPolicyResourceIndex, m_updateLocationPolicy(f_getResourceAddress(v_locPolicyResourceIndex), omit, locationUpdatePeriod_invalid));
      	     	    									
 				// Test Body					
-				f_send(e_mca_port, m_request(v_request));
+				f_send(e_mcaPort, m_request(v_request));
 				tc_ac.start;
 				alt {
 					[] mcaPort.receive(mw_response(mw_responsePrimitive(int4000))) -> value v_response {
@@ -6675,7 +6675,7 @@ module OneM2M_Testcases_CSE_Release_3 {
 			  v_locContainerResourceIndex	:= f_cse_createResource(int3, v_container_request_preamble, v_locPolicyResourceIndex);//created container index
 			  			  	
 			  //Test Body - retrieve the created container resource
-			  f_send(e_mca_port, m_request(valueof(m_retrieve(f_getResourceAddress(v_locContainerResourceIndex), f_getOriginator(v_locContainerResourceIndex))))); 
+			  f_send(e_mcaPort, m_request(valueof(m_retrieve(f_getResourceAddress(v_locContainerResourceIndex), f_getOriginator(v_locContainerResourceIndex))))); 
 			  tc_ac.start;
 			  alt{
 				[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response{
@@ -6751,7 +6751,7 @@ module OneM2M_Testcases_CSE_Release_3 {
 				v_request	  := f_getCreateRequestPrimitive(int10, m_createLocationPolicy(v_locationSource, omit, locationUpdatePeriod, omit, omit), v_aeAuxIndex);
 			   									
 				// Test Body					
-				f_send(e_mca_port, m_request(v_request));
+				f_send(e_mcaPort, m_request(v_request));
 				tc_ac.start;
 				alt {
 					[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
@@ -6829,7 +6829,7 @@ module OneM2M_Testcases_CSE_Release_3 {
 				v_request	  := f_getCreateRequestPrimitive(int10, m_createLocationPolicy(v_locationSource, omit, omit, omit, omit), v_aeAuxIndex);
 			  									
 				// Test Body					
-				f_send(e_mca_port, m_request(v_request));
+				f_send(e_mcaPort, m_request(v_request));
 				tc_ac.start;
 				alt {
 					[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
@@ -6914,7 +6914,7 @@ module OneM2M_Testcases_CSE_Release_3 {
 				v_subscriptionResourceIndex		:= f_cse_createResource(int23, v_subscription_request_preamble, v_locContainerResourceIndex);
 				
 			  //Test Body - retrieve the <latest> resource of the created container resource linked with the locationPolicy resource
-			  f_send(e_mca_port, m_request(valueof(m_retrieve(f_getResourceAddress(v_locContainerResourceIndex) & "/" & "latest", f_getOriginator(v_locContainerResourceIndex)))));
+			  f_send(e_mcaPort, m_request(valueof(m_retrieve(f_getResourceAddress(v_locContainerResourceIndex) & "/" & "latest", f_getOriginator(v_locContainerResourceIndex)))));
 			  tc_ac.start;
 			  alt{
 				[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response{
@@ -6988,7 +6988,7 @@ module OneM2M_Testcases_CSE_Release_3 {
 				v_subscriptionResourceIndex		:= f_cse_createResource(int23, v_subscription_request_preamble, v_locContainerResourceIndex);
 				
 			  //Test Body - retrieve the <latest> resource of the created container resource linked with the locationPolicy resource
-			  f_send(e_mca_port, m_request(valueof(m_retrieve(f_getResourceAddress(v_locContainerResourceIndex) & "/" & "latest", f_getOriginator(v_locContainerResourceIndex)))));
+			  f_send(e_mcaPort, m_request(valueof(m_retrieve(f_getResourceAddress(v_locContainerResourceIndex) & "/" & "latest", f_getOriginator(v_locContainerResourceIndex)))));
 			  tc_ac.start;
 			  alt{
 				[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response{
@@ -7061,7 +7061,7 @@ module OneM2M_Testcases_CSE_Release_3 {
 				v_subscriptionResourceIndex		:= f_cse_createResource(int23, v_subscription_request_preamble, v_locContainerResourceIndex);
 				
 			  //Test Body - retrieve the <latest> resource of the created container resource linked with the locationPolicy resource
-			  f_send(e_mca_port, m_request(valueof(m_retrieve(f_getResourceAddress(v_locContainerResourceIndex) & "/" & "latest", f_getOriginator(v_locContainerResourceIndex)))));
+			  f_send(e_mcaPort, m_request(valueof(m_retrieve(f_getResourceAddress(v_locContainerResourceIndex) & "/" & "latest", f_getOriginator(v_locContainerResourceIndex)))));
 			  tc_ac.start;
 			  alt{
 				[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response{
@@ -7149,7 +7149,7 @@ module OneM2M_Testcases_CSE_Release_3 {
 					v_subscription_request_preamble	:= valueof(m_createSubscription(f_getResourceAddress(v_locContainerResourceIndex), c_defaultResourceName, -));
     				    				
 				  //Test Body
-				  f_send(e_mca_port, m_request(valueof(f_getCreateRequestPrimitive(int23, v_subscription_request_preamble, v_locContainerResourceIndex)))); 
+				  f_send(e_mcaPort, m_request(valueof(f_getCreateRequestPrimitive(int23, v_subscription_request_preamble, v_locContainerResourceIndex)))); 
 				  tc_ac.start;
 				  alt{
 					[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response{
@@ -7214,7 +7214,7 @@ module OneM2M_Testcases_CSE_Release_3 {
 			  v_locPolicyResourceIndex	:= f_cse_createResource(int10, v_locpolicy_request_preamble, v_aeAuxIndex);//created locationpolicy index
 				
 			  //Test Body - retrieve the created locationpolicy resource
-			  f_send(e_mca_port, m_request(valueof(m_retrieve(f_getResourceAddress(v_locPolicyResourceIndex), f_getOriginator(v_locPolicyResourceIndex))))); 
+			  f_send(e_mcaPort, m_request(valueof(m_retrieve(f_getResourceAddress(v_locPolicyResourceIndex), f_getOriginator(v_locPolicyResourceIndex))))); 
 			  tc_ac.start;
 			  alt{
 				[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response{
@@ -7341,7 +7341,7 @@ module OneM2M_Testcases_CSE_Release_3 {
 						var RequestPrimitive v_notifyRequest := valueof(m_notify(f_getResourceAddress())); //Outer primitive
 						v_notifyRequest.primitiveContent.securityInfo.securityInfoType := int3;
 							
-						f_send(e_mca_port, m_request(v_notifyRequest));
+						f_send(e_mcaPort, m_request(v_notifyRequest));
 
 						tc_ac.start;
 						alt {
@@ -7414,7 +7414,7 @@ module OneM2M_Testcases_CSE_Release_3 {
 						v_retrieveRequest.primitiveContent.securityInfo.securityInfoType := int5; //ESPrim object
 						v_retrieveRequest.primitiveContent.securityInfo.esprimObject := fx_generate_ESPrim_object(v_retrieveRequest); //E2eCompactJWE
 							
-						f_send(e_mca_port, m_request(v_retrieveRequest));
+						f_send(e_mcaPort, m_request(v_retrieveRequest));
 
 						tc_ac.start;
 						alt {
@@ -7501,7 +7501,7 @@ module OneM2M_Testcases_CSE_Release_3 {
 						v_retrieveRequest.from_ := "other_AE_ID";
 						v_retrieveRequest.primitiveContent.securityInfo.esprimObject := fx_generate_ESPrim_object(v_retrieveRequest); //E2eCompactJWE
 							
-						f_send(e_mca_port, m_request(v_retrieveRequest));
+						f_send(e_mcaPort, m_request(v_retrieveRequest));
 
 						tc_ac.start;
 						alt {
@@ -7599,7 +7599,7 @@ module OneM2M_Testcases_CSE_Release_3 {
 							[] mcaPortIn.receive(mw_request(?)) -> value vc_request {
 								tc_ac.stop;
 								setverdict(fail, __SCOPE__ & " : Unexpected request received");
-								f_send(e_mcc_in_port, m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))));
+								f_send(e_mccPortIn, m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))));
 							}
 							[] tc_ac.timeout{
 								setverdict(fail, __SCOPE__ & " : Timeout due to no retrieve request received from SUT");
@@ -7670,7 +7670,7 @@ module OneM2M_Testcases_CSE_Release_3 {
 									if(ispresent(vc_request.primitive.requestPrimitive.primitiveContent.remoteCSE.e2eSecInfo)) {
 										setverdict(pass, __SCOPE__ & " : Received retrieve request for e2eSecInfo attribute");
 										//send back responsePrimitive
-										f_send(e_mcc_in_port, m_response(vc_response.primitive.responsePrimitive));
+										f_send(e_mccPortIn, m_response(vc_response.primitive.responsePrimitive));
 									}
 									else
 									{
@@ -7685,7 +7685,7 @@ module OneM2M_Testcases_CSE_Release_3 {
 							[] mccPortIn.receive(mw_request(?)) -> value vc_request {
 								tc_ac.stop;
 								setverdict(inconc, __SCOPE__ & " : Unexpected request received");
-								f_send(e_mcc_in_port, m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))));
+								f_send(e_mccPortIn, m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))));
 							}
 							[] tc_ac.timeout{
 								setverdict(inconc, __SCOPE__ & " : Timeout due to no retrieve request received from SUT");
@@ -7779,7 +7779,7 @@ module OneM2M_Testcases_CSE_Release_3 {
 									if(ispresent(vc_request.primitive.requestPrimitive.primitiveContent.remoteCSE.e2eSecInfo)) {
 										setverdict(pass, __SCOPE__ & " : Received retrieve request for e2eSecInfo attribute");
 										//send back responsePrimitive
-										f_send(e_mcc_in_port, m_response(vc_response.primitive.responsePrimitive));
+										f_send(e_mccPortIn, m_response(vc_response.primitive.responsePrimitive));
 									}
 									else
 									{
@@ -7794,7 +7794,7 @@ module OneM2M_Testcases_CSE_Release_3 {
 							[] mccPortIn.receive(mw_request(?)) -> value vc_request {
 								tc_ac.stop;
 								setverdict(inconc, __SCOPE__ & " : Unexpected request received");
-								f_send(e_mcc_in_port, m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))));
+								f_send(e_mccPortIn, m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))));
 							}
 							[] tc_ac.timeout{
 								setverdict(inconc, __SCOPE__ & " : Timeout due to no retrieve request received from SUT");
@@ -7893,12 +7893,12 @@ module OneM2M_Testcases_CSE_Release_3 {
 								v_resourceIndex := f_processCreateRequestPrimitive(v_request.primitive.requestPrimitive);	
 								
 								//send back responsePrimitive
-								f_send(e_mcc_in_port, m_response(vc_response.primitive.responsePrimitive));
+								f_send(e_mccPortIn, m_response(vc_response.primitive.responsePrimitive));
 							}
 							[] mccPortIn.receive(mw_request(mw_create())) -> value v_request {
 								tc_ac.stop;
 								setverdict(fail, __SCOPE__ & " : Unexpected create request");
-								f_send(e_mcc_in_port, m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))));
+								f_send(e_mccPortIn, m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))));
 							}
 							[] tc_ac.timeout{
 								setverdict(fail, __SCOPE__ & " : Timeout due to no create request received from SUT");
@@ -7949,7 +7949,7 @@ module OneM2M_Testcases_CSE_Release_3 {
 				
 						// Test Body
 						var RequestPrimitive v_createRequest := f_getCreateRequestPrimitive(int31, m_createRoleBase, -1);
-						f_send(e_mcc_port, m_request(v_createRequest));
+						f_send(e_mccPort, m_request(v_createRequest));
 
 						tc_ac.start;
 						alt {
@@ -8032,12 +8032,12 @@ module OneM2M_Testcases_CSE_Release_3 {
 								v_resourceIndex := f_processCreateRequestPrimitive(v_request.primitive.requestPrimitive);	
 								
 								//send back responsePrimitive
-								f_send(e_mcc_in_port, m_response(vc_response.primitive.responsePrimitive));
+								f_send(e_mccPortIn, m_response(vc_response.primitive.responsePrimitive));
 							}
 							[] mccPortIn.receive(mw_request(mw_create())) -> value v_request {
 								tc_ac.stop;
 								setverdict(fail, __SCOPE__ & " : Unexpected create request");
-								f_send(e_mcc_in_port, m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))));
+								f_send(e_mccPortIn, m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit))));
 							}
 							[] tc_ac.timeout{
 								setverdict(fail, __SCOPE__ & " : Timeout due to no create request received from SUT");
@@ -8088,7 +8088,7 @@ module OneM2M_Testcases_CSE_Release_3 {
 				
 						// Test Body
 						var RequestPrimitive v_createRequest := f_getCreateRequestPrimitive(int32, m_createTokenBase, -1);
-						f_send(e_mcc_port, m_request(v_createRequest));
+						f_send(e_mccPort, m_request(v_createRequest));
 
 						tc_ac.start;
 						alt {
@@ -8158,7 +8158,7 @@ module OneM2M_Testcases_CSE_Release_3 {
 							
 						// Test Body
 						var RequestPrimitive v_retrieveRequest := valueof(m_retrieve(v_targetResourceAddress,f_getOriginator())); 	
-						f_send(e_mcc_port, m_request(v_retrieveRequest));
+						f_send(e_mccPort, m_request(v_retrieveRequest));
 
 						tc_ac.start;
 						alt {
@@ -8225,7 +8225,7 @@ module OneM2M_Testcases_CSE_Release_3 {
 							
 						// Test Body
 						var RequestPrimitive v_retrieveRequest := valueof(m_retrieve(v_tokenResourceAddress,f_getOriginator())); 	
-						f_send(e_mcc_port, m_request(v_retrieveRequest));
+						f_send(e_mccPort, m_request(v_retrieveRequest));
 
 						tc_ac.start;
 						alt {
@@ -8429,7 +8429,7 @@ module OneM2M_Testcases_CSE_Release_3 {
 						v_retrieveRequest := m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex));
 						v_retrieveRequest.roleIDs := {v_roleResourceID};
 						v_retrieveRequest.tokenIDs := {v_tokenResourceID};
-						f_send(e_mca_port, m_request(v_retrieveRequest));
+						f_send(e_mcaPort, m_request(v_retrieveRequest));
 						
 						tc_ac.start;
 						alt {
@@ -8585,7 +8585,7 @@ module OneM2M_Testcases_CSE_Release_3 {
 						v_notifyRequest.primitiveContent.securityInfo.securityInfoType := int6;
 						v_notifyRequest.primitiveContent.securityInfo.escertkeMessage := fx_generateESCertKEMessage('2D00'O);
 							
-						f_send(e_mcc_port, m_request(v_notifyRequest));
+						f_send(e_mccPort, m_request(v_notifyRequest));
 						
 						tc_ac.start;
 						alt {
@@ -8694,7 +8694,7 @@ module OneM2M_Testcases_CSE_Release_3 {
 							v_notifyResponse2.primitiveContent.securityInfo.securityInfoType := int6;
 							v_notifyResponse2.primitiveContent.securityInfo.escertkeMessage := fx_generateESCertKEMessage(incomingMessage);
 							
-							f_send(e_mca_in_port, m_response(v_notifyResponse2));
+							f_send(e_mcaPortIn, m_response(v_notifyResponse2));
 							
 							tc_ac.start;
 							alt {
@@ -8774,7 +8774,7 @@ module OneM2M_Testcases_CSE_Release_3 {
 						v_notifyRequest1.primitiveContent.securityInfo.securityInfoType := int6;
 						v_notifyRequest1.primitiveContent.securityInfo.escertkeMessage := fx_generateESCertKEMessage('2D00'O);
 							
-						f_send(e_mcc_port, m_request(v_notifyRequest1));
+						f_send(e_mccPort, m_request(v_notifyRequest1));
 						
 						tc_ac.start;
 						alt {
@@ -8809,7 +8809,7 @@ module OneM2M_Testcases_CSE_Release_3 {
 							v_notifyRequest2.primitiveContent.securityInfo.securityInfoType := int6;
 							v_notifyRequest2.primitiveContent.securityInfo.escertkeMessage := fx_generateESCertKEMessage(incomingMessage);
 							
-							f_send(e_mcc_port, m_request(v_notifyRequest2));
+							f_send(e_mccPort, m_request(v_notifyRequest2));
 						
 							tc_ac.start;
 							alt {
@@ -11181,7 +11181,7 @@ module OneM2M_Testcases_CSE_Release_3 {
 					//Create data points and force a missingDataPoint
 					f_cse_generateMissingDataPoint(v_resourceIndex);
 					// Test Body
-    				f_send(e_mca_port, m_request(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex))));
+    				f_send(e_mcaPort, m_request(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex))));
 					tc_ac.start;
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int2000))) -> value v_response {
@@ -11263,7 +11263,7 @@ module OneM2M_Testcases_CSE_Release_3 {
 					f_cse_generateMissingDataPoint(v_resourceIndex);
 					
 					//Retrieve first missing data point
-    				f_send(e_mca_port, m_request(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex))));
+    				f_send(e_mcaPort, m_request(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex))));
 
 					tc_ac.start;
 					alt {
@@ -11307,7 +11307,7 @@ module OneM2M_Testcases_CSE_Release_3 {
 					f_cse_generateMissingDataPoint(v_resourceIndex);
 					
 					//Retrieve second missing data point
-					f_send(e_mca_port, m_request(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex))));
+					f_send(e_mcaPort, m_request(m_retrieve(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex))));
 	
 					tc_ac.start;
 					alt {
@@ -11493,7 +11493,7 @@ module OneM2M_Testcases_CSE_Release_3 {
 							//Send response in any case
 							v_responsePrimitive := valueof(m_responseNotification(int2000, omit));
 							v_responsePrimitive.requestIdentifier := vc_request.primitive.requestPrimitive.requestIdentifier;
-							f_send(e_mca_in_port, m_response(v_responsePrimitive));
+							f_send(e_mcaPortIn, m_response(v_responsePrimitive));
 						}
 						[] tc_ac.timeout {
 							setverdict(pass, __SCOPE__ & ": Notification not received");
@@ -11501,7 +11501,7 @@ module OneM2M_Testcases_CSE_Release_3 {
 					}	
 					
 					//Check if the IUT restarts missing data point counter and timer
-					f_send(e_mca_port, m_request(m_retrieve(f_getResourceAddress(v_timeSeriesIndex), f_getOriginator(v_timeSeriesIndex))));
+					f_send(e_mcaPort, m_request(m_retrieve(f_getResourceAddress(v_timeSeriesIndex), f_getOriginator(v_timeSeriesIndex))));
 					
 					v_contentResponse.timeSeries := mw_contentTimeSeries_rc1;
 					v_contentResponse.timeSeries.missingDataCurrentNr := 0;
@@ -11607,7 +11607,7 @@ module OneM2M_Testcases_CSE_Release_3 {
 							//Send response 
 							v_notificationResponse := valueof(m_responseNotification(int2000, omit));
 							v_notificationResponse.requestIdentifier := vc_request.primitive.requestPrimitive.requestIdentifier;
-							f_send(e_mca_in_port, m_response(v_notificationResponse));
+							f_send(e_mcaPortIn, m_response(v_notificationResponse));
 
 							//Check mandatory fields
 							if(vc_request.primitive.requestPrimitive.primitiveContent.securityInfo.securityInfoType==int1) {
@@ -11708,7 +11708,7 @@ module OneM2M_Testcases_CSE_Release_3 {
 							//Send response 
 							v_notificationResponse := valueof(m_responseNotification(int2000, omit));
 							v_notificationResponse.requestIdentifier := vc_request.primitive.requestPrimitive.requestIdentifier;
-							f_send(e_mca_in_port, m_response(v_notificationResponse));
+							f_send(e_mcaPortIn, m_response(v_notificationResponse));
 							
 							//Check mandatory fields
 							if(vc_request.primitive.requestPrimitive.primitiveContent.securityInfo.securityInfoType==int1) {
@@ -11825,7 +11825,7 @@ module OneM2M_Testcases_CSE_Release_3 {
 					v_containerIndex := f_cse_createResource(int3, v_createRequest, v_aeIndex); 	
 		
 					// Test Body
-					f_send(e_mca_port, m_request(m_retrieve(f_getResourceAddress(v_containerIndex) & "/" & c_resourceShortNameLatest, f_getOriginator(v_containerIndex))));
+					f_send(e_mcaPort, m_request(m_retrieve(f_getResourceAddress(v_containerIndex) & "/" & c_resourceShortNameLatest, f_getOriginator(v_containerIndex))));
 					
 					tc_ac.start;
 					alt {
@@ -11903,7 +11903,7 @@ module OneM2M_Testcases_CSE_Release_3 {
 					v_containerIndex := f_cse_createResource(int3, v_createRequest2, v_aeIndex); 	
 		
 					// Test Body
-					f_send(e_mca_port, m_request(m_retrieve(f_getResourceAddress(v_containerIndex) & "/" & c_resourceShortNameLatest, f_getOriginator(v_containerIndex))));
+					f_send(e_mcaPort, m_request(m_retrieve(f_getResourceAddress(v_containerIndex) & "/" & c_resourceShortNameLatest, f_getOriginator(v_containerIndex))));
 					
 					tc_ac.start;
 					alt {
@@ -12088,7 +12088,7 @@ module OneM2M_Testcases_CSE_Release_3 {
 					
 					v_request := valueof(m_retrieve(f_getResourceAddress(v_containerIndex), f_getOriginator(v_ae2Index)));
 					v_request.resultContent := int8;//Child resources
-					f_send(e_mca_port, m_request(v_request));
+					f_send(e_mcaPort, m_request(v_request));
 					v_contentResponse2.accessControlPolicy := mw_contentAcp_any;
 					
 					tc_ac.start;