diff --git a/OneM2M_Testcases_AE.ttcn b/OneM2M_Testcases_AE.ttcn
index 5ed4bf4142117e51de930669f961db63dbe6153a..1a9944c0253f0ed40022c47cd8fc278b7f6727b3 100644
--- a/OneM2M_Testcases_AE.ttcn
+++ b/OneM2M_Testcases_AE.ttcn
@@ -77,7 +77,7 @@ module OneM2M_Testcases_AE {
 						var integer v_resourceIndex := -1;
 						var MsgIn v_request;
 						var PrimitiveContent v_modifiedResource;
-						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid CREATE Request for container containing To set to " & f_getResourceAddress(-1, e_nonHierarchical, p_primitiveScope);
+						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid CREATE Request for container containing To set to " & f_getLocalResourceAddress(-1, e_nonHierarchical, p_primitiveScope);
 						
 						if(not(PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT)) {
 							setverdict(inconc, __SCOPE__, ": Unstructured-CSE-Relative-Resource-ID format support is required to run this test case");
@@ -159,7 +159,7 @@ module OneM2M_Testcases_AE {
 						var ResponsePrimitive v_responsePrimitive;
 						var template UtTriggerPrimitive v_utRequest := m_utCreateContainer;
 						var UtTriggerAckPrimitive v_trigger_response;
-						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid CREATE Request for container containing To set to " & f_getResourceAddress(-1, e_hierarchical, p_primitiveScope);
+						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid CREATE Request for container containing To set to " & f_getLocalResourceAddress(-1, e_hierarchical, p_primitiveScope);
 						
 						
 						//Test Control
@@ -171,7 +171,7 @@ module OneM2M_Testcases_AE {
 						f_cf03Up();
 	
 						//Send Trigger Message
-						v_utRequest.to_ := f_getResourceAddress(-1, e_hierarchical, p_primitiveScope);
+						v_utRequest.to_ := f_getLocalResourceAddress(-1, e_hierarchical, p_primitiveScope);
 						v_utRequest.from_ := "UNINITIALIZED";
 						f_sendUtPrimitive(v_utRequest,v_action);
 							
@@ -252,7 +252,7 @@ module OneM2M_Testcases_AE {
 						var UtTriggerAckPrimitive v_trigger_response;
 						var integer v_auxInteger;
 						var PrimitiveContent v_localResource;
-						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid UPDATE Request for container containing To set to " & f_getResourceAddress(-1, e_nonHierarchical, p_primitiveScope);
+						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid UPDATE Request for container containing To set to " & f_getLocalResourceAddress(-1, e_nonHierarchical, p_primitiveScope);
 						
 						
 						if(not(PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT)) {
@@ -271,7 +271,7 @@ module OneM2M_Testcases_AE {
 						
 						tc_ac.start;
 						alt {
-							[] mcaPortIn.receive(mw_request(mw_updateContainer(omit,v_utRequest.to_))) {
+							[] mcaPortIn.receive(mw_request(mw_updateContainer(-,v_utRequest.to_))) {
 								tc_ac.stop;
 								setverdict(pass, __SCOPE__, " : Container update request received successfuly");
 							
@@ -340,7 +340,7 @@ module OneM2M_Testcases_AE {
 						var UtTriggerAckPrimitive v_trigger_response;
 						var integer v_auxInteger;
 						var PrimitiveContent v_localResource;
-						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid UPDATE Request for container containing To set to " & f_getResourceAddress(-1, e_hierarchical, p_primitiveScope);
+						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid UPDATE Request for container containing To set to " & f_getLocalResourceAddress(-1, e_hierarchical, p_primitiveScope);
 						
 						if(not(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT)) {
 							setverdict(inconc, __SCOPE__, ": Structured-CSE-Relative-Resource-ID format support is required to run this test case");
@@ -357,7 +357,7 @@ module OneM2M_Testcases_AE {
 								
 						tc_ac.start;
 						alt {
-							[] mcaPortIn.receive(mw_request(mw_updateContainer(omit,v_utRequest.to_))) {
+							[] mcaPortIn.receive(mw_request(mw_updateContainer(-,v_utRequest.to_))) {
 								tc_ac.stop;
 								setverdict(pass, __SCOPE__, " : Container update request received successfuly");
 							
@@ -432,7 +432,7 @@ module OneM2M_Testcases_AE {
 						var UtTriggerAckPrimitive v_trigger_response;
 						var integer v_auxInteger;
 						var PrimitiveContent v_localResource;
-						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid RETRIEVE Request for container containing To set to " & f_getResourceAddress(-1, e_nonHierarchical, p_primitiveScope);
+						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid RETRIEVE Request for container containing To set to " & f_getLocalResourceAddress(-1, e_nonHierarchical, p_primitiveScope);
 						
 						if(not(PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT)) {
 							setverdict(inconc, __SCOPE__, ": Unstructured-CSE-Relative-Resource-ID format support is required to run this test case");
@@ -444,7 +444,7 @@ module OneM2M_Testcases_AE {
 						//Send Trigger Message
 						v_localResource := f_ae_generateLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), -1, int3);
 						v_auxInteger := f_setLocalResource(v_localResource, int3);
-						v_utRequestTemplate := m_utRetrieveResource(f_getResourceAddress(v_auxInteger, e_nonHierarchical, p_primitiveScope),"UNINITIALIZED");
+						v_utRequestTemplate := m_utRetrieveResource(f_getLocalResourceAddress(v_auxInteger, e_nonHierarchical, p_primitiveScope),"UNINITIALIZED");
 						f_sendUtPrimitive(v_utRequestTemplate,v_action);
                         v_utRequest := valueof(v_utRequestTemplate);
 			
@@ -520,7 +520,7 @@ module OneM2M_Testcases_AE {
 						var UtTriggerAckPrimitive v_trigger_response;
 						var integer v_auxInteger;
 						var PrimitiveContent v_localResource;
-						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid RETRIEVE Request for container containing To set to " & f_getResourceAddress(-1, e_hierarchical, p_primitiveScope);
+						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid RETRIEVE Request for container containing To set to " & f_getLocalResourceAddress(-1, e_hierarchical, p_primitiveScope);
 						
 						if(not(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT)) {
 							setverdict(inconc, __SCOPE__, ": Structured-CSE-Relative-Resource-ID format support is required to run this test case");
@@ -532,7 +532,7 @@ module OneM2M_Testcases_AE {
 						//Send Trigger Message
 						v_localResource := f_ae_generateLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), -1, int3);
 						v_auxInteger := f_setLocalResource(v_localResource, int3);
-						v_utRequestTemplate := m_utRetrieveResource(f_getResourceAddress(v_auxInteger, e_hierarchical, p_primitiveScope),"UNINITIALIZED");
+						v_utRequestTemplate := m_utRetrieveResource(f_getLocalResourceAddress(v_auxInteger, e_hierarchical, p_primitiveScope),"UNINITIALIZED");
                         v_utRequest := valueof(v_utRequestTemplate);
 						f_sendUtPrimitive(v_utRequest,v_action);
 
@@ -612,7 +612,7 @@ module OneM2M_Testcases_AE {
 						var UtTriggerAckPrimitive v_trigger_response;
 						var integer v_auxInteger;
 						var PrimitiveContent v_localResource;
-						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid DELETE Request for container containing To set to " & f_getResourceAddress(-1, e_nonHierarchical, p_primitiveScope);
+						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid DELETE Request for container containing To set to " & f_getLocalResourceAddress(-1, e_nonHierarchical, p_primitiveScope);
 
 						if(not(PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT)) {
 							setverdict(inconc, __SCOPE__, ": Unstructured-CSE-Relative-Resource-ID format support is required to run this test case");
@@ -624,7 +624,7 @@ module OneM2M_Testcases_AE {
 						//Send Trigger Message
 						v_localResource := f_ae_generateLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), -1, int3);
 						v_auxInteger := f_setLocalResource(v_localResource, int3);
-						v_utRequest.to_ := f_getResourceAddress(v_auxInteger, e_nonHierarchical, p_primitiveScope);
+						v_utRequest.to_ := f_getLocalResourceAddress(v_auxInteger, e_nonHierarchical, p_primitiveScope);
 						v_utRequest.from_ := "UNINITIALIZED";
 						f_sendUtPrimitive(v_utRequest,v_action);
 			
@@ -699,7 +699,7 @@ module OneM2M_Testcases_AE {
 						var UtTriggerAckPrimitive v_trigger_response;
 						var integer v_auxInteger;
 						var PrimitiveContent v_localResource;
-						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid DELETE Request for container containing To set to " & f_getResourceAddress(-1, e_hierarchical, p_primitiveScope);
+						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid DELETE Request for container containing To set to " & f_getLocalResourceAddress(-1, e_hierarchical, p_primitiveScope);
 						
 						if(not(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT)) {
 							setverdict(inconc, __SCOPE__, ": Structured-CSE-Relative-Resource-ID format support is required to run this test case");
@@ -711,7 +711,7 @@ module OneM2M_Testcases_AE {
 						//Send Trigger Message
 						v_localResource := f_ae_generateLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), -1, int3);
 						v_auxInteger := f_setLocalResource(v_localResource, int3);
-						v_utRequest.to_ := f_getResourceAddress(v_auxInteger, e_hierarchical, p_primitiveScope);
+						v_utRequest.to_ := f_getLocalResourceAddress(v_auxInteger, e_hierarchical, p_primitiveScope);
 						v_utRequest.from_ := "UNINITIALIZED";
 						f_sendUtPrimitive(v_utRequest,v_action);
 				
@@ -1489,60 +1489,60 @@ module OneM2M_Testcases_AE {
 					 */
 					
 					testcase TC_AE_DMR_UPD_002_ET() runs on CseSimu system AeSystem {
-						var integer v_auxInteger := f_setResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2);
+						var integer v_auxInteger := f_setLocalResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2);
 						
 						var template RequestPrimitive v_request := mw_updateContainer;
 						var template UtTriggerPrimitive v_utRequest := m_utUpdateContainer;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid UPDATE Request for Container updating attribute expirationTime";
-						v_utRequest.to_ := f_getResourceAddress(v_auxInteger);
+						v_utRequest.to_ := f_getLocalResourceAddress(v_auxInteger);
 						v_utRequest.primitiveContent.container.expirationTime := "20301231T012345";
 						v_request.primitiveContent.container.expirationTime := ?;
 						f_AE_DMR_UPD_002(v_utRequest,v_request,v_action);
 					}
 					
 					testcase TC_AE_DMR_UPD_002_LBL() runs on CseSimu system AeSystem {
-						var integer v_auxInteger := f_setResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2);
+						var integer v_auxInteger := f_setLocalResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2);
 						
 						var template RequestPrimitive v_request := mw_updateContainer;
 						var template UtTriggerPrimitive v_utRequest := m_utUpdateContainer;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid UPDATE Request for Container updating attribute labels";
-						v_utRequest.to_ := f_getResourceAddress(v_auxInteger);
+						v_utRequest.to_ := f_getLocalResourceAddress(v_auxInteger);
 						v_utRequest.primitiveContent.container.labels := {"UNINITIALIZED"};
 						v_request.primitiveContent.container.labels := ?;
 						f_AE_DMR_UPD_002(v_utRequest,v_request,v_action);
 					}
 					
 					testcase TC_AE_DMR_UPD_002_MNI() runs on CseSimu system AeSystem {
-						var integer v_auxInteger := f_setResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2);
+						var integer v_auxInteger := f_setLocalResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2);
 						
 						var template RequestPrimitive v_request := mw_updateContainer;
 						var template UtTriggerPrimitive v_utRequest := m_utUpdateContainer;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid UPDATE Request for Container updating attribute maxNrOfInstances";
-						v_utRequest.to_ := f_getResourceAddress(v_auxInteger);
+						v_utRequest.to_ := f_getLocalResourceAddress(v_auxInteger);
 						v_utRequest.primitiveContent.container.maxNrOfInstances := 1;
 						v_request.primitiveContent.container.maxNrOfInstances := ?;
 						f_AE_DMR_UPD_002(v_utRequest,v_request,v_action);
 					}
 					
 					testcase TC_AE_DMR_UPD_002_MBS() runs on CseSimu system AeSystem {
-						var integer v_auxInteger := f_setResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2);
+						var integer v_auxInteger := f_setLocalResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2);
 						
 						var template RequestPrimitive v_request := mw_updateContainer;
 						var template UtTriggerPrimitive v_utRequest := m_utUpdateContainer;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid UPDATE Request for Container updating attribute maxByteSize";
-						v_utRequest.to_ := f_getResourceAddress(v_auxInteger);
+						v_utRequest.to_ := f_getLocalResourceAddress(v_auxInteger);
 						v_utRequest.primitiveContent.container.maxByteSize := 1;
 						v_request.primitiveContent.container.maxByteSize := ?;
 						f_AE_DMR_UPD_002(v_utRequest,v_request,v_action);
 					}
 					
 					testcase TC_AE_DMR_UPD_002_MIA() runs on CseSimu system AeSystem {
-						var integer v_auxInteger := f_setResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2);
+						var integer v_auxInteger := f_setLocalResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2);
 						var template RequestPrimitive v_request := mw_updateContainer;
 						var template UtTriggerPrimitive v_utRequest := m_utUpdateContainer;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid UPDATE Request for Container updating attribute maxInstanceAge";
                         
-						v_utRequest.to_ := f_getResourceAddress(v_auxInteger);
+						v_utRequest.to_ := f_getLocalResourceAddress(v_auxInteger);
 						v_utRequest.primitiveContent.container.maxInstanceAge := 1;
 						v_request.primitiveContent.container.maxInstanceAge := ?;
 						f_AE_DMR_UPD_002(v_utRequest,v_request,v_action);
@@ -1601,21 +1601,21 @@ module OneM2M_Testcases_AE {
 					 */
 	
 				 	testcase TC_AE_DMR_RET_001_CB() runs on CseSimu system AeSystem {
-						var integer v_auxInteger := f_setResource(valueof(m_primitiveContentCSEBase(m_contentCreateCSEBase)), int5);
+						var integer v_auxInteger := f_setLocalResource(valueof(m_primitiveContentCSEBase(m_contentCreateCSEBase)), int5);
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid RETRIEVE Request for CSEBase";
-						f_AE_DMR_RET_001(int5, f_getResourceAddress(v_auxInteger),v_action);
+						f_AE_DMR_RET_001(int5, f_getLocalResourceAddress(v_auxInteger),v_action);
 				 	}
 				 	
 					testcase TC_AE_DMR_RET_001_AE() runs on CseSimu system AeSystem {
-						var integer v_auxInteger := f_setResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2);
+						var integer v_auxInteger := f_setLocalResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2);
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid RETRIEVE Request for AE";
-						f_AE_DMR_RET_001(int2, f_getResourceAddress(v_auxInteger),v_action);
+						f_AE_DMR_RET_001(int2, f_getLocalResourceAddress(v_auxInteger),v_action);
 					}
 	
 					testcase TC_AE_DMR_RET_001_CNT() runs on CseSimu system AeSystem {
-						var integer v_auxInteger := f_setResource(valueof(m_primitiveContentContainer(m_contentCreateContainer())), int3);
+						var integer v_auxInteger := f_setLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer())), int3);
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid RETRIEVE Request for Container";
-						f_AE_DMR_RET_001(int3, f_getResourceAddress(v_auxInteger),v_action);
+						f_AE_DMR_RET_001(int3, f_getLocalResourceAddress(v_auxInteger),v_action);
 					}
 	
 					function f_AE_DMR_RET_001(ResourceType p_resourceType, XSD.AnyURI p_address, in universal charstring p_action) runs on CseSimu {
@@ -1667,8 +1667,8 @@ module OneM2M_Testcases_AE {
 	
 				testcase TC_AE_DMR_RET_002() runs on CseSimu system AeSystem {
 	
-					var integer v_auxInteger := f_setResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), int3);
-					var XSD.AnyURI v_address := f_getResourceAddress(v_auxInteger);
+					var integer v_auxInteger := f_setLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), int3);
+					var XSD.AnyURI v_address := f_getLocalResourceAddress(v_auxInteger);
 	
 					//variables
 					var template UtTriggerPrimitive v_utRequest := m_utRetrieveResource (v_address & "/" & c_resourceShortNameOldest, "UNINITIALIZED");
@@ -1715,8 +1715,8 @@ module OneM2M_Testcases_AE {
 	
 				testcase TC_AE_DMR_RET_003() runs on CseSimu system AeSystem {
 	
-					var integer v_auxInteger := f_setResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), int3);
-					var XSD.AnyURI v_address := f_getResourceAddress(v_auxInteger);
+					var integer v_auxInteger := f_setLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), int3);
+					var XSD.AnyURI v_address := f_getLocalResourceAddress(v_auxInteger);
 	
 					//variables
 					var template UtTriggerPrimitive v_utRequest := m_utRetrieveResource (v_address & "/" & c_resourceShortNameLatest, "UNINITIALIZED");
@@ -1763,8 +1763,8 @@ module OneM2M_Testcases_AE {
 				
 				testcase TC_AE_DMR_RET_004() runs on CseSimu system AeSystem {
 					
-					var integer v_auxInteger := f_setResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), int3);
-					var XSD.AnyURI v_address := f_getResourceAddress(v_auxInteger);
+					var integer v_auxInteger := f_setLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), int3);
+					var XSD.AnyURI v_address := f_getLocalResourceAddress(v_auxInteger);
 		
 					//variables
 					var template UtTriggerPrimitive v_utRequest := m_utRetrieveResource (v_address, "UNINITIALIZED");
@@ -1812,8 +1812,8 @@ module OneM2M_Testcases_AE {
 
 				testcase TC_AE_DMR_RET_005 () runs on CseSimu system AeSystem {
 	
-					var integer v_auxInteger := f_setResource(valueof(m_primitiveContentContentInstance(m_contentCreateContentInstance)), int4);
-					var XSD.AnyURI v_address := f_getResourceAddress(v_auxInteger);
+					var integer v_auxInteger := f_setLocalResource(valueof(m_primitiveContentContentInstance(m_contentCreateContentInstance)), int4);
+					var XSD.AnyURI v_address := f_getLocalResourceAddress(v_auxInteger);
 
 					//variables
 					var template UtTriggerPrimitive v_utRequest := m_utRetrieveResource (v_address, "UNINITIALIZED");
@@ -1865,8 +1865,8 @@ module OneM2M_Testcases_AE {
 
 				testcase TC_AE_DMR_DEL_001() runs on CseSimu system AeSystem {
 
-					var integer v_auxInteger := f_setResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), int3);
-					var XSD.AnyURI v_address := f_getResourceAddress(v_auxInteger);
+					var integer v_auxInteger := f_setLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), int3);
+					var XSD.AnyURI v_address := f_getLocalResourceAddress(v_auxInteger);
 
 					//variables
 					var template UtTriggerPrimitive v_utRequest := m_utDeleteResource (v_address & "/" & c_resourceShortNameOldest, "UNINITIALIZED");
@@ -1913,8 +1913,8 @@ module OneM2M_Testcases_AE {
 
 				testcase TC_AE_DMR_DEL_002() runs on CseSimu system AeSystem {
 
-					var integer v_auxInteger := f_setResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), int3);
-					var XSD.AnyURI v_address := f_getResourceAddress(v_auxInteger);
+					var integer v_auxInteger := f_setLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), int3);
+					var XSD.AnyURI v_address := f_getLocalResourceAddress(v_auxInteger);
 
 					//variables
 					var template UtTriggerPrimitive v_utRequest := m_utDeleteResource (v_address & "/" & c_resourceShortNameLatest, "UNINITIALIZED");
@@ -1961,8 +1961,8 @@ module OneM2M_Testcases_AE {
 
 				testcase TC_AE_DMR_DEL_003() runs on CseSimu system AeSystem {
 	
-					var integer v_auxInteger := f_setResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), int3);
-					var XSD.AnyURI v_address := f_getResourceAddress(v_auxInteger);
+					var integer v_auxInteger := f_setLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), int3);
+					var XSD.AnyURI v_address := f_getLocalResourceAddress(v_auxInteger);
 
 					//variables
 					var template UtTriggerPrimitive v_utRequest := m_utDeleteResource (v_address, "UNINITIALIZED");
@@ -2010,8 +2010,8 @@ module OneM2M_Testcases_AE {
 
 				testcase TC_AE_DMR_DEL_004 () runs on CseSimu system AeSystem {
 
-					var integer v_auxInteger := f_setResource(valueof(m_primitiveContentContentInstance(m_contentCreateContentInstance)),int4);
-					var XSD.AnyURI v_address := f_getResourceAddress(v_auxInteger);
+					var integer v_auxInteger := f_setLocalResource(valueof(m_primitiveContentContentInstance(m_contentCreateContentInstance)),int4);
+					var XSD.AnyURI v_address := f_getLocalResourceAddress(v_auxInteger);
 
 					//variables
 					var template UtTriggerPrimitive v_utRequest := m_utDeleteResource (v_address, "UNINITIALIZED");
@@ -2074,8 +2074,8 @@ module OneM2M_Testcases_AE {
 					var ResponsePrimitive v_responsePrimitive;
 					var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid subscription creation request";
 				  	
-					var integer v_auxInteger := f_setResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2);
-					v_utRequest.to_ := f_getResourceAddress(v_auxInteger);
+					var integer v_auxInteger := f_setLocalResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2);
+					v_utRequest.to_ := f_getLocalResourceAddress(v_auxInteger);
 
 				  	f_cf03Up();
 
@@ -2119,12 +2119,12 @@ module OneM2M_Testcases_AE {
 						var template RequestPrimitive v_requestT := mw_createSubscription;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid subscription creation request with optional attribute accessControlPolicyIDs";
 
-						var integer v_auxInteger := f_setResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2);
-						v_utRequest.to_ := f_getResourceAddress(v_auxInteger);
+						var integer v_auxInteger := f_setLocalResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2);
+						v_utRequest.to_ := f_getLocalResourceAddress(v_auxInteger);
 						v_utRequest.primitiveContent.subscription.notificationURI := {"UNINITIALIZED"};
 						v_utRequest.primitiveContent.subscription.accessControlPolicyIDs := {"UNINITIALIZED"};
 	
-						v_requestT.to_ := f_getResourceAddress(v_auxInteger);
+						v_requestT.to_ := f_getLocalResourceAddress(v_auxInteger);
 						v_requestT.primitiveContent.subscription.notificationURI := ?;
 						v_requestT.primitiveContent.subscription.accessControlPolicyIDs := ?;
 	
@@ -2135,13 +2135,13 @@ module OneM2M_Testcases_AE {
 						var template UtTriggerPrimitive v_utRequest := m_utCreateSubscription;
                         var template RequestPrimitive v_requestT := mw_createSubscription;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid subscription creation request with optional attribute createdBefore";
-						var integer v_auxInteger := f_setResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2);
-						v_utRequest.to_ := f_getResourceAddress(v_auxInteger);
+						var integer v_auxInteger := f_setLocalResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2);
+						v_utRequest.to_ := f_getLocalResourceAddress(v_auxInteger);
 						v_utRequest.primitiveContent.subscription.notificationURI := {"UNINITIALIZED"};
 						v_utRequest.primitiveContent.subscription.eventNotificationCriteria.createdBefore := "20301231T012345";
 	
 						
-						v_requestT.to_ := f_getResourceAddress(v_auxInteger);
+						v_requestT.to_ := f_getLocalResourceAddress(v_auxInteger);
 						v_requestT.primitiveContent.subscription.notificationURI := ?;
 						v_requestT.primitiveContent.subscription.eventNotificationCriteria.createdBefore := ?;
 	
@@ -2153,12 +2153,12 @@ module OneM2M_Testcases_AE {
 						var template RequestPrimitive v_requestT := mw_createSubscription;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid subscription creation request with optional attribute expirationCounter";
 
-						var integer v_auxInteger := f_setResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2);
-						v_utRequest.to_ := f_getResourceAddress(v_auxInteger);
+						var integer v_auxInteger := f_setLocalResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2);
+						v_utRequest.to_ := f_getLocalResourceAddress(v_auxInteger);
 						v_utRequest.primitiveContent.subscription.notificationURI := {"UNINITIALIZED"};
 						v_utRequest.primitiveContent.subscription.expirationCounter := 1;
 	
-						v_requestT.to_ := f_getResourceAddress(v_auxInteger);
+						v_requestT.to_ := f_getLocalResourceAddress(v_auxInteger);
 						v_requestT.primitiveContent.subscription.notificationURI := ?;
 						v_requestT.primitiveContent.subscription.expirationCounter := ?;
 	
@@ -2170,12 +2170,12 @@ module OneM2M_Testcases_AE {
 						var template RequestPrimitive v_requestT := mw_createSubscription;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid subscription creation request with optional attribute notificationForwardingURI";
 
-						var integer v_auxInteger := f_setResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2);
-						v_utRequest.to_ := f_getResourceAddress(v_auxInteger);
+						var integer v_auxInteger := f_setLocalResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2);
+						v_utRequest.to_ := f_getLocalResourceAddress(v_auxInteger);
 						v_utRequest.primitiveContent.subscription.notificationURI := {"UNINITIALIZED"};
 						v_utRequest.primitiveContent.subscription.notificationForwardingURI := "UNINITIALIZED";
 	
-						v_requestT.to_ := f_getResourceAddress(v_auxInteger);
+						v_requestT.to_ := f_getLocalResourceAddress(v_auxInteger);
 						v_requestT.primitiveContent.subscription.notificationURI := ?;
 						v_requestT.primitiveContent.subscription.notificationForwardingURI := ?;
 	
@@ -2187,12 +2187,12 @@ module OneM2M_Testcases_AE {
 						var template RequestPrimitive v_requestT := mw_createSubscription;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid subscription creation request with optional attribute notificationContentType";
 
-						var integer v_auxInteger := f_setResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2);
-						v_utRequest.to_ := f_getResourceAddress(v_auxInteger);
+						var integer v_auxInteger := f_setLocalResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2);
+						v_utRequest.to_ := f_getLocalResourceAddress(v_auxInteger);
 						v_utRequest.primitiveContent.subscription.notificationURI := {"UNINITIALIZED"};
 						v_utRequest.primitiveContent.subscription.notificationContentType := int1;
 	
-						v_requestT.to_ := f_getResourceAddress(v_auxInteger);
+						v_requestT.to_ := f_getLocalResourceAddress(v_auxInteger);
 						v_requestT.primitiveContent.subscription.notificationURI := ?;
 						v_requestT.primitiveContent.subscription.notificationContentType := ?;
 	
@@ -2204,12 +2204,12 @@ module OneM2M_Testcases_AE {
 						var template RequestPrimitive v_requestT := mw_createSubscription;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid subscription creation request with optional attribute notificationEventCat";
 
-						var integer v_auxInteger := f_setResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2);
-						v_utRequest.to_ := f_getResourceAddress(v_auxInteger);
+						var integer v_auxInteger := f_setLocalResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2);
+						v_utRequest.to_ := f_getLocalResourceAddress(v_auxInteger);
 						v_utRequest.primitiveContent.subscription.notificationURI := {"UNINITIALIZED"};
 						v_utRequest.primitiveContent.subscription.notificationEventCat.alt_1 := 100;
 	
-						v_requestT.to_ := f_getResourceAddress(v_auxInteger);
+						v_requestT.to_ := f_getLocalResourceAddress(v_auxInteger);
 						v_requestT.primitiveContent.subscription.notificationURI := ?;
 						v_requestT.primitiveContent.subscription.notificationEventCat.alt_ := ?;
 	
@@ -2221,12 +2221,12 @@ module OneM2M_Testcases_AE {
 						var template RequestPrimitive v_requestT := mw_createSubscription;
 						var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid subscription creation request with optional attribute subscriberURI";
 
-						var integer v_auxInteger := f_setResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2);
-						v_utRequest.to_ := f_getResourceAddress(v_auxInteger);
+						var integer v_auxInteger := f_setLocalResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2);
+						v_utRequest.to_ := f_getLocalResourceAddress(v_auxInteger);
 						v_utRequest.primitiveContent.subscription.notificationURI := {"UNINITIALIZED"};
 						v_utRequest.primitiveContent.subscription.subscriberURI := "UNINITIALIZED";
 	
-						v_requestT.to_ := f_getResourceAddress(v_auxInteger);
+						v_requestT.to_ := f_getLocalResourceAddress(v_auxInteger);
 						v_requestT.primitiveContent.subscription.notificationURI := ?;
 						v_requestT.primitiveContent.subscription.subscriberURI := ?;
 	
@@ -2288,8 +2288,8 @@ module OneM2M_Testcases_AE {
 					var ResponsePrimitive v_responsePrimitive;
 					var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid AE Registration CREATE Request";
   	
-					var integer v_auxInteger := f_setResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2);
-					v_utRequest.to_ := f_getResourceAddress(v_auxInteger);
+					var integer v_auxInteger := f_setLocalResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2);
+					v_utRequest.to_ := f_getLocalResourceAddress(v_auxInteger);
 
 					f_cf03Up();
 
@@ -2319,7 +2319,7 @@ module OneM2M_Testcases_AE {
 					
 					//create Subscription
 					v_utRequest := m_utCreateSubscription;
-					v_utRequest.to_ := f_getResourceAddress(-1);
+					v_utRequest.to_ := f_getLocalResourceAddress(-1);
 					v_action := "Please, send a valid CREATE request for Subscription";
 					f_sendUtPrimitive(v_utRequest,v_action);
 					
@@ -2379,8 +2379,8 @@ module OneM2M_Testcases_AE {
 					var ResponsePrimitive v_responsePrimitive;
 					var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid AE Registration CREATE Request";
   	
-					var integer v_auxInteger := f_setResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2);
-					v_utRequest.to_ := f_getResourceAddress(v_auxInteger);
+					var integer v_auxInteger := f_setLocalResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2);
+					v_utRequest.to_ := f_getLocalResourceAddress(v_auxInteger);
 
 					f_cf03Up();
 
@@ -2410,7 +2410,7 @@ module OneM2M_Testcases_AE {
 					
 					//create Subscription
 					v_utRequest := m_utCreateSubscription;
-					v_utRequest.to_ := f_getResourceAddress(-1);
+					v_utRequest.to_ := f_getLocalResourceAddress(-1);
 					v_action := "Please, send a valid CREATE request for Subscription";
 					f_sendUtPrimitive(v_utRequest,v_action);