diff --git a/OneM2M_PermutationFunctions.ttcn b/OneM2M_PermutationFunctions.ttcn
index 0fcf98729f5f534eb293b071edc49c9f5cbbdba6..4c07ff21992e7170944fc0b2a69320b8be80bbd8 100644
--- a/OneM2M_PermutationFunctions.ttcn
+++ b/OneM2M_PermutationFunctions.ttcn
@@ -184,7 +184,7 @@ module OneM2M_PermutationFunctions {
 								
 						tc_ac.start;
 						alt {
-							[] mcaPortIn.receive(mw_request(mw_updateContainer(-,v_utRequest.requestPrimitive.to_))) -> value (v_request) {
+							[] mcaPortIn.receive(mw_request(mw_updateContainer(-,v_utRequest.requestPrimitive.to_))) -> value v_request {
 								tc_ac.stop;
 								setverdict(pass, __SCOPE__ & " : Container update request received successfuly");
 								f_processUpdateRequestPrimitive(v_request.primitive.requestPrimitive);
@@ -275,7 +275,7 @@ module OneM2M_PermutationFunctions {
 						
 						tc_ac.start;
 						alt {
-							[] mcaPortIn.receive(mw_request(mw_retrieve(v_utRequest.requestPrimitive.to_))) -> value (v_request) {
+							[] mcaPortIn.receive(mw_request(mw_retrieve(v_utRequest.requestPrimitive.to_))) -> value v_request {
 								tc_ac.stop;
 								setverdict(pass, __SCOPE__ & " : Container retrieve request received successfuly");
 								f_processRetrieveRequestPrimitive(v_request.primitive.requestPrimitive);
@@ -510,7 +510,7 @@ module OneM2M_PermutationFunctions {
 						alt{
 	
 							//receive MsgIn requestPrimitive
-							[] mcaPortIn.receive(mw_request(p_request)) -> value (v_request) {
+							[] mcaPortIn.receive(mw_request(p_request)) -> value v_request {
 								tc_ac.stop;
 								setverdict(pass, __SCOPE__ & " : Container creation request is accepted!!");
 								v_resourceIndex := f_processCreateRequestPrimitive(v_request.primitive.requestPrimitive);	
@@ -596,7 +596,7 @@ module OneM2M_PermutationFunctions {
 						alt{
 
 							//receive MsgIn requestPrimitive
-							[] mcaPortIn.receive(mw_request(p_request)) -> value (v_request) {
+							[] mcaPortIn.receive(mw_request(p_request)) -> value v_request {
 								tc_ac.stop;
 								setverdict(pass, __SCOPE__ & " : Container update request is accepted!!");
 								f_processUpdateRequestPrimitive(v_request.primitive.requestPrimitive);
@@ -1433,7 +1433,7 @@ module OneM2M_PermutationFunctions {
 	
 					}
 					
-					function f_CSE_REG_CRE_028(RequestPrimitive p_request, template PrimitiveContent p_contentResponse) runs on CseSimu{ //system CseSystem {
+					function f_CSE_REG_CRE_028(RequestPrimitive p_request, template PrimitiveContent p_contentResponse) runs on CseSimu {
 						//Local variables
 						var ResourceType v_resourceType := int16;	//remoteCSE	
 						// Test control
@@ -2085,7 +2085,7 @@ module OneM2M_PermutationFunctions {
 					    				
 					}//end f_CSE_DMR_CRE_001_cseSimu
     									
-					function f_CSE_DMR_CRE_002(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive) runs on AeSimu return ResponsePrimitive{//system CseSystem { MRO system keyword not supported on functions in Titan
+					function f_CSE_DMR_CRE_002(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive) runs on AeSimu return ResponsePrimitive {
 				
 						// Local variables
 						var MsgIn v_response;
@@ -2149,7 +2149,7 @@ module OneM2M_PermutationFunctions {
 				
 					}//end f_CSE_DMR_CRE_002
 					
-					function f_CSE_DMR_CRE_003(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive) runs on AeSimu {//system CseSystem { MRO system keyword not supported on functions in Titan
+					function f_CSE_DMR_CRE_003(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive) runs on AeSimu {
     				
 						// Local variables
 						var MsgIn v_response;
@@ -2209,7 +2209,7 @@ module OneM2M_PermutationFunctions {
     				
 					}//end f_CSE_DMR_CRE_003
     				
-					function f_CSE_DMR_CRE_004(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive) runs on AeSimu {//system CseSystem { MRO system keyword not supported on functions in Titan
+					function f_CSE_DMR_CRE_004(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive) runs on AeSimu {
     				
 						// Local variables
 						var MsgIn v_response;
diff --git a/OneM2M_Testcases_CSE_Release_1.ttcn b/OneM2M_Testcases_CSE_Release_1.ttcn
index 8de0e84ee963005e98348ac81dfe74c6aabc6d60..f5abe420ec2db3985b9b91acc36357112146e3cb 100644
--- a/OneM2M_Testcases_CSE_Release_1.ttcn
+++ b/OneM2M_Testcases_CSE_Release_1.ttcn
@@ -3980,7 +3980,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					  	  		
 				}
 				
-				function f_CSE_DMR_CRE_007() runs on AeSimu system CseSystem {
+				function f_CSE_DMR_CRE_007() runs on AeSimu {
 					// Local variables
 					var template RequestPrimitive v_createRequestContainer := m_createContainerBase;
 					var template RequestPrimitive v_createRequestContentInstance := m_createContentInstanceBase;
@@ -4064,7 +4064,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					v_ae1.done;
 					  	  		
 				}		
-				function f_CSE_DMR_CRE_008() runs on AeSimu system CseSystem {
+				function f_CSE_DMR_CRE_008() runs on AeSimu {
 					//Local variables
 					var template RequestPrimitive v_createRequestContainer := m_createContainerBase;
 					var template RequestPrimitive v_createRequestContentInstance := m_createContentInstanceBase;
@@ -4152,7 +4152,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					  	  		
 				}
 				
-				function f_CSE_DMR_CRE_009() runs on AeSimu system CseSystem {
+				function f_CSE_DMR_CRE_009() runs on AeSimu {
 					// Local variables
 					var template RequestPrimitive v_createRequest := m_createContainerBase;
 					var MsgIn v_response;
@@ -4232,7 +4232,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 				  	  		
 				}					
 				
-				function f_CSE_DMR_CRE_010() runs on AeSimu system CseSystem {
+				function f_CSE_DMR_CRE_010() runs on AeSimu {
 					// Local variables
 					var template RequestPrimitive v_createRequest := m_createContainerBase;
 					var MsgIn v_response;
@@ -4312,7 +4312,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					  	  		
 				}
 				
-				function f_CSE_DMR_CRE_011() runs on AeSimu system CseSystem {
+				function f_CSE_DMR_CRE_011() runs on AeSimu {
 					// Local variables
 					var template RequestPrimitive v_createRequest := m_createContainerBase;
 					var MsgIn v_response;
@@ -4580,7 +4580,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 				  	  		
 				}
 				
-				function f_CSE_DMR_CRE_013() runs on AeSimu system CseSystem {
+				function f_CSE_DMR_CRE_013() runs on AeSimu {
 					// Local variables
 					var template RequestPrimitive v_createRequest := m_createContainerBase;
 					var MsgIn v_response;
@@ -4809,7 +4809,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 				  	  		
 				}
 				
-				function f_CSE_DMR_RET_010() runs on AeSimu system CseSystem {
+				function f_CSE_DMR_RET_010() runs on AeSimu {
 					// Local variables
 					var integer v_aeIndex := -1;
 					var integer v_containerIndex := -1;
@@ -4886,7 +4886,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 				  	  		
 				}
 
-				function f_CSE_DMR_RET_012() runs on AeSimu system CseSystem {
+				function f_CSE_DMR_RET_012() runs on AeSimu {
 					// Local variables
 					var integer v_aeIndex := -1;
 					var integer v_containerIndex := -1;
@@ -6428,7 +6428,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					v_ae1.done;
 				  	  		
 				}
-				function f_CSE_DMR_UPD_010() runs on AeSimu system CseSystem {
+				function f_CSE_DMR_UPD_010() runs on AeSimu {
 					var MsgIn v_response;
 					var integer v_aeIndex := -1;
 					var integer v_containerIndex := -1;
@@ -6503,7 +6503,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					v_ae1.done;
 				  	  		
 				}
-				function f_CSE_DMR_UPD_011() runs on AeSimu system CseSystem {
+				function f_CSE_DMR_UPD_011() runs on AeSimu {
 					// Local variables
 					var MsgIn v_response;
 					var RequestPrimitive v_request;
@@ -6586,7 +6586,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					v_ae1.done;
 				  	  		
 				}
-				function f_CSE_DMR_UPD_012() runs on AeSimu system CseSystem {
+				function f_CSE_DMR_UPD_012() runs on AeSimu {
 					// Local variables
 					var MsgIn v_response;
 					var RequestPrimitive v_request;
@@ -6671,7 +6671,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 					v_ae1.done;
 				  	  		
 				}
-				function f_CSE_DMR_UPD_013() runs on AeSimu system CseSystem {
+				function f_CSE_DMR_UPD_013() runs on AeSimu {
 					// Local variables
 					var MsgIn v_response;
 					var RequestPrimitive v_request;
@@ -8285,7 +8285,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 				  	  		
 				}
 
-				function f_CSE_DMR_DEL_005() runs on AeSimu system CseSystem {
+				function f_CSE_DMR_DEL_005() runs on AeSimu {
 					// Local variables
 					var MsgIn v_response;
 					var RequestPrimitive v_request;
@@ -8385,7 +8385,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 				  	  		
 				}
 				
-				function f_CSE_DMR_DEL_006() runs on AeSimu system CseSystem {
+				function f_CSE_DMR_DEL_006() runs on AeSimu {
 					// Local variables
 					var integer v_aeIndex := -1;
 					var integer v_containerIndex := -1;
@@ -8454,7 +8454,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 				  	  		
 				}
 				
-				function f_CSE_DMR_DEL_007() runs on AeSimu system CseSystem {
+				function f_CSE_DMR_DEL_007() runs on AeSimu {
 					// Local variables
 					var MsgIn v_response;
 					var RequestPrimitive v_request;
@@ -8548,7 +8548,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 				  	  		
 				}
 
-				function f_CSE_DMR_DEL_009() runs on AeSimu system CseSystem {
+				function f_CSE_DMR_DEL_009() runs on AeSimu {
 					// Local variables
 					var MsgIn v_response;
 					var RequestPrimitive v_request;