diff --git a/OneM2M_Testcases.ttcn b/OneM2M_Testcases.ttcn
index da259bdf27b0832eed72debc855483671a01bdc5..4c40468a7329a6feff6aa661e681d8564eacd139 100644
--- a/OneM2M_Testcases.ttcn
+++ b/OneM2M_Testcases.ttcn
@@ -954,7 +954,7 @@ module OneM2M_Testcases {
 				 * @desc Check that the IUT rejects an AE registration (allowed App-ID, not allowed C-AE-ID-STEM provided by AE) 
 				 * 
 				 */
-				testcase TC_CSE_REG_CRE_004() runs on InCseSimu system CseSystem {
+				testcase TC_CSE_REG_CRE_004() runs on AeSimu system CseSystem {
 		  	  	
 					var MsgIn v_response;
 					var RequestPrimitive v_request;
@@ -962,24 +962,25 @@ module OneM2M_Testcases {
 					var ResourceType v_resourceType := int2;
 	                
 					// Test component configuration
-					f_cf01UpCseSimuMaster();
+					f_cf01Up();
 		  	  	
 					//Preambule
 					//vc_remoteCseIndex := f_cse_registrationRemoteCse(mw_createRemoteCSEBase);
 					//TODO: create serviceSubscribedProfile, Node, and serviceSubscribedAppRule
+					v_cseBaseIndex := f_cse_preamble_createServiceSubscribedProfile({"C*"}); //c_CRUDNDi);
 					
 					//Test Body	
 					//v_request := valueof(m_createAe(PX_APP_ID, omit, "C-AE-ID-STEM"));				
 	    											
-					vc_aeSimu.start(f_cse_createResource(int2, m_createAe(PX_APP_ID, omit, "C")));
+					f_cse_createResource(int2, m_createAe(PX_APP_ID, omit, "C"));
 			
 					tc_ac.start;
 					alt {
-						[] mccPort.receive(mw_response(mw_responsePrimitive(int4005))) {
+						[] mcaPort.receive(mw_response(mw_responsePrimitive(int4005))) {
 							tc_ac.stop;
 							setverdict(pass, __SCOPE__ & ": AE creation rejected.");
 						}
-						[] mccPort.receive(mw_response(mw_responsePrimitiveInverse(int4005))) -> value v_response{
+						[] mcaPort.receive(mw_response(mw_responsePrimitiveInverse(int4005))) -> value v_response{
 							tc_ac.stop;
 							setverdict(fail, __SCOPE__ & ": Error while creating AE with status code " & int2str(enum2int(v_response.primitive.responsePrimitive.responseStatusCode)));
 						}
@@ -989,10 +990,10 @@ module OneM2M_Testcases {
 					}
 									
 					// Postamble
-					f_cse_postamble_deleteResourcesCSE();
+					f_cse_postamble_deleteResources();
 						
 					// Tear down
-					f_cf01DownCseSimuMaster();
+					f_cf01Down();
 						
 				}