diff --git a/OneM2M_PermutationFunctions.ttcn b/OneM2M_PermutationFunctions.ttcn
index 7081b526f25db4c1b264f354ed2aa2f6d6126622..9c2ee01a253361e9b175f04a249248b3de7d7aec 100644
--- a/OneM2M_PermutationFunctions.ttcn
+++ b/OneM2M_PermutationFunctions.ttcn
@@ -2362,30 +2362,30 @@ module OneM2M_PermutationFunctions {
 						tc_ac.stop;
 						setverdict(pass, __SCOPE__ & ": Request primitive retargeted successfully");
 						f_processCreateRequestPrimitive(vc_request.primitive.requestPrimitive);
-						mccPortIn.send(m_response(vc_response.primitive.responsePrimitive));
+						f_send(e_mcc_in_port, 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);
-						mccPortIn.send(m_response(vc_response.primitive.responsePrimitive));
+						f_send(e_mcc_in_port, 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);
-						mccPortIn.send(m_response(vc_response.primitive.responsePrimitive));
+						f_send(e_mcc_in_port, 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);
-						mccPortIn.send(m_response(vc_response.primitive.responsePrimitive));
+						f_send(e_mcc_in_port, m_response(vc_response.primitive.responsePrimitive));
 					}
 					[] mccPortIn.receive(mw_request(?)) -> value vc_request {
 						tc_ac.stop;
 						setverdict(fail, __SCOPE__ & ": Wrong request received");
-						mccPortIn.send(m_response(m_responsePrimitive(int4000, vc_request.primitive.requestPrimitive.requestIdentifier)));
+						f_send(e_mcc_in_port, m_response(m_responsePrimitive(int4000, vc_request.primitive.requestPrimitive.requestIdentifier)));
 					}
 					[] tc_ac.timeout {
 						setverdict(fail, __SCOPE__ & ": No answer while retargeting request");