diff --git a/OneM2M_Testcases.ttcn b/OneM2M_Testcases.ttcn
index 14765e3fe038296e32ea6306aad2f8245bd9977e..b858053677f0850db7c39c4fbf1abbf4da51dbda 100644
--- a/OneM2M_Testcases.ttcn
+++ b/OneM2M_Testcases.ttcn
@@ -1540,7 +1540,7 @@ module OneM2M_Testcases {
 				 * @desc Check that the IUT rejects the create request of <CSEBase> resource.
 				 * 
 				 */
-				testcase TC_CSE_REG_CRE_027() runs on InCseSimu system CseSystem {
+				testcase TC_CSE_REG_CRE_027() runs on AeSimu system CseSystem {
 	
 					// Local variables
 					var RequestPrimitive v_request;
@@ -1550,23 +1550,23 @@ module OneM2M_Testcases {
 					// Test control
 
 					// Test component configuration
-					f_cf01UpCseSimuMaster();
+					f_cf02Up();
 
 					// Test adapter configuration
 
 					// Preamble
-					vc_remoteCseIndex := f_cse_registrationRemoteCse(mw_createRemoteCSEBase);
+					vc_cseSimu.start(f_cse_registrationRemoteCse(mw_createRemoteCSEBase));
 
 					// Test Body
-					vc_aeSimu.start(f_cse_createResource(int2, m_createAe(PX_APP_ID, omit, omit)));
+					f_cse_createResource(int2, m_createAe(PX_APP_ID, omit, omit));
 	
 					tc_ac.start;
 					alt {
-						[] mccPort.receive(mw_response(mw_responsePrimitive(int2001))) {
+						[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) {
 							tc_ac.stop;
 							setverdict(pass, __SCOPE__ & ": AE creation successful.");
 						}
-						[] mccPort.receive {
+						[] mcaPort.receive {
 							tc_ac.stop;
 							setverdict(fail, __SCOPE__ & ": Error while creating AE");
 						}
@@ -1576,10 +1576,10 @@ module OneM2M_Testcases {
 					}	
 
 					// Postamble
-					f_cse_postamble_deleteResourcesCSE();
+					f_cse_postamble_deleteResources();
 
 					// Tear down
-					f_cf01DownCseSimuMaster();
+					f_cf02Down();
 
 				}//end TC_CSE_REG_CRE_027