diff --git a/LibOneM2M/OneM2M_Functions.ttcn b/LibOneM2M/OneM2M_Functions.ttcn
index ab6ac4393ea4fc83b33b70186fa1079c45a27628..a266b381033e0e16fb9a109d442c3000e9317677 100644
--- a/LibOneM2M/OneM2M_Functions.ttcn
+++ b/LibOneM2M/OneM2M_Functions.ttcn
@@ -2490,7 +2490,7 @@ module OneM2M_Functions {
 						
 						v_myResource.aEAnnc.resourceName := "aEAnnc" & int2str(v_resourceIndex);
 						v_myResource.aEAnnc.resourceType := p_resourceType;
-						v_myResource.aEAnnc.resourceID := "ae" & int2str(v_resourceIndex);
+						v_myResource.aEAnnc.resourceID := "aeA" & int2str(v_resourceIndex);
 						v_myResource.aEAnnc.parentID := f_getResourceId(vc_localResourcesList[p_parentIndex].resource);
 						v_myResource.aEAnnc.creationTime := fx_generateTimestamp();
 						v_myResource.aEAnnc.lastModifiedTime := v_myResource.aEAnnc.creationTime;
@@ -2545,7 +2545,7 @@ module OneM2M_Functions {
 					
 					v_myResource.accessControlPolicy.resourceName := "accessControlPolicy" & int2str(v_resourceIndex);
 					v_myResource.accessControlPolicy.resourceType := p_resourceType;
-					v_myResource.accessControlPolicy.resourceID := "accessControlPolicy" & int2str(v_resourceIndex);
+					v_myResource.accessControlPolicy.resourceID := "acp" & int2str(v_resourceIndex);
 					v_myResource.accessControlPolicy.parentID := f_getResourceId(vc_localResourcesList[p_parentIndex].resource);
 					v_myResource.accessControlPolicy.creationTime := fx_generateTimestamp();
 					if(not(ispresent(p_resource.accessControlPolicy.expirationTime))) {
@@ -2567,7 +2567,7 @@ module OneM2M_Functions {
 						if(not(ispresent(p_resource.aE.expirationTime))) {
 							v_myResource.aE.expirationTime := "20301231T012345";
 						}
-						v_myResource.aE.resourceID := "ae" & int2str(v_resourceIndex);
+						v_myResource.aE.resourceID := "Cae" & int2str(v_resourceIndex);
 						v_myResource.aE.aE_ID := v_myResource.aE.resourceID;
 						v_myResource.aE.resourceName := "ae" & int2str(v_resourceIndex);
 					}
@@ -2583,18 +2583,18 @@ module OneM2M_Functions {
 							v_myResource.container.expirationTime := "20301231T012345";
 						}
 						v_myResource.container.resourceID := "cnt" & int2str(v_resourceIndex);
-						v_myResource.container.resourceName := "cnt" & int2str(v_resourceIndex);
+						v_myResource.container.resourceName := "container" & int2str(v_resourceIndex);
 					}
 										
 				} else if(p_resourceType == int4 and ispresent(p_resource)) {
 					if(ischosen(p_resource.contentInstance)){
 						v_myResource.contentInstance := valueof(p_resource.contentInstance);
-						v_myResource.contentInstance.resourceID := "cnt" & int2str(v_resourceIndex);
-						v_myResource.contentInstance.resourceName := "cnt" & int2str(v_resourceIndex);
+						v_myResource.contentInstance.resourceID := "cin" & int2str(v_resourceIndex);
+						v_myResource.contentInstance.resourceName := "contentInstance" & int2str(v_resourceIndex);
 						v_myResource.contentInstance.resourceType := p_resourceType;
       					v_myResource.contentInstance.parentID := f_getResourceId(vc_localResourcesList[p_parentIndex].resource);
 						v_myResource.contentInstance.creationTime := fx_generateTimestamp();
-						v_myResource.contentInstance.lastModifiedTime := v_myResource.container.creationTime;											
+						v_myResource.contentInstance.lastModifiedTime := v_myResource.contentInstance.creationTime;											
 						if(not(ispresent(p_resource.contentInstance.expirationTime))) {
 							v_myResource.contentInstance.expirationTime := "20301231T012345";
 						}