diff --git a/OneM2M_Testcases_CSE_Release_2.ttcn b/OneM2M_Testcases_CSE_Release_2.ttcn
index 3f4e7fd99bb2fab430c30eb258fe0951b0fad024..bcb692a9582a0025d35053c5d03269167ec8a247 100644
--- a/OneM2M_Testcases_CSE_Release_2.ttcn
+++ b/OneM2M_Testcases_CSE_Release_2.ttcn
@@ -2099,12 +2099,11 @@ module OneM2M_Testcases_CSE_Release_2 {
 						
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var RequestPrimitive v_requestPrimitive;
-						var XSD.NonNegativeInteger maxByteSize := 512;		//Correct value? Shall be indicated in TP?
+						var XSD.NonNegativeInteger v_maxByteSize := 512;
 						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
-						//v_createRequest.primitiveContent.container.announceTo := {f_getAnnouncementTargetPoA()};
 						v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
-						v_createRequest.primitiveContent.container.maxByteSize := maxByteSize;						
-						v_createRequest.primitiveContent.container.announcedAttribute := {"maxByteSize"};		//Correct value? Shall be indicated in TP?
+						v_createRequest.primitiveContent.container.maxByteSize := v_maxByteSize;						
+						v_createRequest.primitiveContent.container.announcedAttribute := {"mbs"};
 	
 						v_ae1.start(f_CSE_DMR_CRE_021(int3, v_createRequest, mw_createContainerAnncBase()));//Container
 						v_ae1.done;
@@ -2113,7 +2112,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 							//Check if maxByteSize attribute has been announced
 							v_requestPrimitive := f_getRequestPrimitive(v_ae1);
 							if (ispresent(v_requestPrimitive.primitiveContent.containerAnnc.maxByteSize)){
-								if(v_requestPrimitive.primitiveContent.containerAnnc.maxByteSize != maxByteSize){
+								if(v_requestPrimitive.primitiveContent.containerAnnc.maxByteSize != v_maxByteSize){
 									setverdict(fail, __SCOPE__ & ": Error: Value of maxByteSize has not been announced successfully");
 								}else{
 									setverdict(pass, __SCOPE__ & ": Value of maxByteSize has been announced successfully");
@@ -2130,12 +2129,11 @@ module OneM2M_Testcases_CSE_Release_2 {
 						
 						var template RequestPrimitive v_createRequest := m_createContentInstanceBase;
 						var RequestPrimitive v_requestPrimitive;
-						var XSD.NonNegativeInteger v_contentSize := 512;			//Correct value? Shall be indicated in TP?
+						var XSD.NonNegativeInteger v_contentSize := 512;			
 						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
-						//v_createRequest.primitiveContent.contentInstance.announceTo := {f_getAnnouncementTargetPoA()};
 						v_createRequest.primitiveContent.contentInstance.announceTo := {PX_CSE1_ID};
 						v_createRequest.primitiveContent.contentInstance.contentSize := v_contentSize;						
-						v_createRequest.primitiveContent.contentInstance.announcedAttribute := {"contentSize"};	//Correct value? Shall be indicated in TP?
+						v_createRequest.primitiveContent.contentInstance.announcedAttribute := {"cs"};
 		
 						v_ae1.start(f_CSE_DMR_CRE_021(int4, v_createRequest, mw_createContentInstanceAnncBase()));//ContentInstance
 						v_ae1.done;
@@ -2161,11 +2159,11 @@ module OneM2M_Testcases_CSE_Release_2 {
 						
 						var template RequestPrimitive v_createRequest := m_createGroupBase;
 						var RequestPrimitive v_requestPrimitive;
-						var XSD.PositiveInteger maxNrOfMembers := 10;						//Correct value? Shall be indicated in TP?
+						var XSD.PositiveInteger v_maxNrOfMembers := 10;						
 						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
-						v_createRequest.primitiveContent.group_.announceTo := {f_getAnnouncementTargetPoA()};
-						v_createRequest.primitiveContent.group_.maxNrOfMembers := maxNrOfMembers;
-						v_createRequest.primitiveContent.group_.announcedAttribute := {"maxNrOfMembers"};	//Correct value? Shall be indicated in TP?
+						v_createRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
+						v_createRequest.primitiveContent.group_.maxNrOfMembers := v_maxNrOfMembers;
+						v_createRequest.primitiveContent.group_.announcedAttribute := {"mnm"};	
 		
 						v_ae1.start(f_CSE_DMR_CRE_021(int9, v_createRequest, mw_createGroupAnncBase()));//Group
 						v_ae1.done;
@@ -2174,7 +2172,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 							//Check if maxNrOfMembers attribute has been announced
 							v_requestPrimitive := f_getRequestPrimitive(v_ae1);
 							if (ispresent(v_requestPrimitive.primitiveContent.groupAnnc.maxNrOfMembers)){
-								if(v_requestPrimitive.primitiveContent.groupAnnc.maxNrOfMembers != maxNrOfMembers){
+								if(v_requestPrimitive.primitiveContent.groupAnnc.maxNrOfMembers != v_maxNrOfMembers){
 									setverdict(fail, __SCOPE__ & ": Error: Value of maxNrOfMembers has not been announced successfully");
 								}else{
 									setverdict(pass, __SCOPE__ & ": Value of maxNrOfMembers has been announced successfully");
@@ -2191,11 +2189,11 @@ module OneM2M_Testcases_CSE_Release_2 {
 						
 						var template RequestPrimitive v_createRequest := m_createLocationPolicy(int1, omit, omit, omit, omit);
 						var RequestPrimitive v_requestPrimitive;
-						var LocationSource locationSource := int1;//Network-based		//Correct value? Shall be indicated in TP?
+						var LocationSource v_locationSource := int1;//Network-based
 						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
-						v_createRequest.primitiveContent.locationPolicy.announceTo := {f_getAnnouncementTargetPoA()};
-						v_createRequest.primitiveContent.locationPolicy.locationSource := locationSource;
-						v_createRequest.primitiveContent.locationPolicy.announcedAttribute := {"locationSource"};		//Correct value? Shall be indicated in TP?
+						v_createRequest.primitiveContent.locationPolicy.announceTo := {PX_CSE1_ID};
+						v_createRequest.primitiveContent.locationPolicy.locationSource := v_locationSource;
+						v_createRequest.primitiveContent.locationPolicy.announcedAttribute := {"los"};
 		
 						v_ae1.start(f_CSE_DMR_CRE_021(int10, v_createRequest, mw_createLocationPolicyAnncBase()));//LocationPolicy
 						v_ae1.done;
@@ -2204,7 +2202,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 							//Check if locationSource attribute has been announced
 							v_requestPrimitive := f_getRequestPrimitive(v_ae1);
 							if (ispresent(v_requestPrimitive.primitiveContent.locationPolicyAnnc.locationSource)){
-								if(v_requestPrimitive.primitiveContent.locationPolicyAnnc.locationSource != locationSource){
+								if(v_requestPrimitive.primitiveContent.locationPolicyAnnc.locationSource != v_locationSource){
 									setverdict(fail, __SCOPE__ & ": Error: Value of locationSource has not been announced successfully");
 								}else{
 									setverdict(pass, __SCOPE__ & ": Value of locationSource has been announced successfully");
@@ -2221,11 +2219,11 @@ module OneM2M_Testcases_CSE_Release_2 {
 						
 						var template RequestPrimitive v_createRequest := m_createMgmtObjBase;
 						var RequestPrimitive v_requestPrimitive;
-						var XSD.String description := "Description of mgmtObj";	//Correct value? Shall be indicated in TP?
+						var XSD.String description := "Description of mgmtObj";
 						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
-						v_createRequest.primitiveContent.mgmtResource.announceTo := {f_getAnnouncementTargetPoA()};
+						v_createRequest.primitiveContent.mgmtResource.announceTo := {PX_CSE1_ID};
 						v_createRequest.primitiveContent.mgmtResource.description := description;			
-						v_createRequest.primitiveContent.mgmtResource.announcedAttribute := {"description"};			//Correct value? Shall be indicated in TP?
+						v_createRequest.primitiveContent.mgmtResource.announcedAttribute := {"dc"};
 
 						v_ae1.start(f_CSE_DMR_CRE_021(int13, v_createRequest, mw_createMgmtObjAnncBase()));//MgmtObj
 						v_ae1.done;
@@ -2266,11 +2264,11 @@ module OneM2M_Testcases_CSE_Release_2 {
 						
 						var template RequestPrimitive v_createRequest := m_createScheduleBase;
 						var RequestPrimitive v_requestPrimitive;
-						var ScheduleEntries scheduleElement := {{"0 0 0,1,2 1 1 * *"}};
+						var ScheduleEntries v_scheduleElement := {{"0 0 0,1,2 1 1 * *"}};
 						f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1);
-						v_createRequest.primitiveContent.schedule.announceTo := {f_getAnnouncementTargetPoA()};
-						v_createRequest.primitiveContent.schedule.scheduleElement := scheduleElement;			//Correct value? Shall be indicated in TP?
-						v_createRequest.primitiveContent.schedule.announcedAttribute := {"scheduleElement"};			//Correct value? Shall be indicated in TP?
+						v_createRequest.primitiveContent.schedule.announceTo := {PX_CSE1_ID};
+						v_createRequest.primitiveContent.schedule.scheduleElement := v_scheduleElement;
+						v_createRequest.primitiveContent.schedule.announcedAttribute := {"se"};
 						
 						v_ae1.start(f_CSE_DMR_CRE_021(int18, v_createRequest, mw_createScheduleAnncBase()));//Schedule
 						v_ae1.done;
@@ -2279,7 +2277,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 							//Check if scheduleElement attribute has been announced
 							v_requestPrimitive := f_getRequestPrimitive(v_ae1);
 							if (ispresent(v_requestPrimitive.primitiveContent.scheduleAnnc.scheduleElement)){
-								if(v_requestPrimitive.primitiveContent.scheduleAnnc.scheduleElement != scheduleElement){
+								if(v_requestPrimitive.primitiveContent.scheduleAnnc.scheduleElement != v_scheduleElement){
 									setverdict(fail, __SCOPE__ & ": Error: Value of scheduleElement has not been announced successfully");
 								}else{
 									setverdict(pass, __SCOPE__ & ": Value of scheduleElement has been announced successfully");
@@ -2295,12 +2293,11 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template RequestPrimitive v_createRequest := m_createTimeSeriesBase;
 						var RequestPrimitive v_requestPrimitive;
-						var XSD.NonNegativeInteger v_maxByteSize := 512;		//Correct value? Shall be indicated in TP?
+						var XSD.NonNegativeInteger v_maxByteSize := 512;
 
-						//v_createRequest.primitiveContent.container.announceTo := {f_getAnnouncementTargetPoA()};
 						v_createRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID};
 						v_createRequest.primitiveContent.timeSeries.maxByteSize := v_maxByteSize;						
-						v_createRequest.primitiveContent.timeSeries.announcedAttribute := {"maxByteSize"};		//Correct value? Shall be indicated in TP?
+						v_createRequest.primitiveContent.timeSeries.announcedAttribute := {"mbs"};
 
 						v_ae1.start(f_CSE_DMR_CRE_021(int29, v_createRequest, mw_createTimeSeriesAnncBase()));//TimeSeries
 						v_ae1.done;
@@ -2325,12 +2322,11 @@ module OneM2M_Testcases_CSE_Release_2 {
 						var AeSimu v_ae1 := AeSimu.create("AE1") alive;
 						var template RequestPrimitive v_createRequest := m_createTimeSeriesInstanceBase;
 						var RequestPrimitive v_requestPrimitive;
-						var XSD.NonNegativeInteger v_sequenceNr := 8;		//Correct value? Shall be indicated in TP?
+						var XSD.NonNegativeInteger v_sequenceNr := 8;
 
-						//v_createRequest.primitiveContent.container.announceTo := {f_getAnnouncementTargetPoA()};
 						v_createRequest.primitiveContent.timeSeriesInstance.announceTo := {PX_CSE1_ID};
 						v_createRequest.primitiveContent.timeSeriesInstance.sequenceNr := v_sequenceNr;						
-						v_createRequest.primitiveContent.timeSeriesInstance.announcedAttribute := {"sequenceNr"};		//Correct value? Shall be indicated in TP?
+						v_createRequest.primitiveContent.timeSeriesInstance.announcedAttribute := {"snr"};
 
 						v_ae1.start(f_CSE_DMR_CRE_021(int30, v_createRequest, mw_createTimeSeriesInstanceAnncBase()));//TimeSeriesInstance
 						v_ae1.done;
@@ -6992,7 +6988,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 	
 						v_createRequestAnnc.primitiveContent.containerAnnc.maxByteSize := v_maxByteSize;
 	
-						v_updateRequest.primitiveContent.container.announcedAttribute := {"maxByteSize"};
+						v_updateRequest.primitiveContent.container.announcedAttribute := {"mbs"};
 	
 						v_updateRequestAnnc.primitiveContent.containerAnnc.maxByteSize := v_maxByteSize;
   
@@ -7014,7 +7010,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 	
 						v_createRequestAnnc.primitiveContent.groupAnnc.memberType := v_memberType;
 	
-						v_updateRequest.primitiveContent.group_.announcedAttribute := {"memberType"};
+						v_updateRequest.primitiveContent.group_.announcedAttribute := {"mt"};
 	
 						v_updateRequestAnnc.primitiveContent.groupAnnc.memberType := v_memberType;
   
@@ -7033,7 +7029,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						v_createRequest.primitiveContent.schedule.announceTo := {PX_CSE1_ID};
 						v_createRequestAnnc.primitiveContent.scheduleAnnc.scheduleElement := {{"0 0 0,1,2 1 1 * *"}};//Attribute 1
 
-						v_updateRequest.primitiveContent.schedule.announcedAttribute := {"scheduleElement"};
+						v_updateRequest.primitiveContent.schedule.announcedAttribute := {"se"};
 						v_updateRequestAnnc.primitiveContent.scheduleAnnc.scheduleElement := {{"1 1 1,2 1 1 * *"}}; //Attribute 1
   
 						v_cse1.start(f_CSE_DMR_UPD_018(int18, v_createRequest, v_createRequestAnnc, v_updateRequest, v_updateRequestAnnc));//Group
@@ -7054,7 +7050,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 
 						v_createRequestAnnc.primitiveContent.timeSeriesAnnc.maxByteSize := v_maxByteSize;
 
-						v_updateRequest.primitiveContent.timeSeries.announcedAttribute := {"maxByteSize"};
+						v_updateRequest.primitiveContent.timeSeries.announcedAttribute := {"mbs"};
 
 						v_updateRequestAnnc.primitiveContent.timeSeriesAnnc.maxByteSize := v_maxByteSize;
   
@@ -10171,7 +10167,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						 var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
   
 						 v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
-						 v_createRequest.primitiveContent.container.announcedAttribute := {"maxByteSize"};
+						 v_createRequest.primitiveContent.container.announcedAttribute := {"mbs"};
   
 						 v_cse1.start(f_CSE_ANNC_CRE_008_CseSimu(int3, v_createRequestAnnc, v_createRequest));//Container
 						 v_cse1.done;
@@ -10184,7 +10180,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						 var template RequestPrimitive v_createRequestAnnc := mw_createContentInstanceAnnc;
   
 						 v_createRequest.primitiveContent.contentInstance.announceTo := {PX_CSE1_ID};
-						 v_createRequest.primitiveContent.contentInstance.announcedAttribute := {"contentInfo"};
+						 v_createRequest.primitiveContent.contentInstance.announcedAttribute := {"cnf"};
   
 						 v_cse1.start(f_CSE_ANNC_CRE_008_CseSimu(int4, v_createRequestAnnc, v_createRequest));//ContentInstance
 						 v_cse1.done;
@@ -10197,7 +10193,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						 var template RequestPrimitive v_createRequestAnnc := mw_createGroupAnncBase;
   
 						 v_createRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
-						 v_createRequest.primitiveContent.group_.announcedAttribute := {"memberType"};
+						 v_createRequest.primitiveContent.group_.announcedAttribute := {"mt"};
   
 						 v_cse1.start(f_CSE_ANNC_CRE_008_CseSimu(int9, v_createRequestAnnc, v_createRequest));//Group
 						 v_cse1.done;
@@ -10211,7 +10207,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						 var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesAnncBase;
   
 						 v_createRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID};
-						 v_createRequest.primitiveContent.timeSeries.announcedAttribute := {"maxByteSize"};
+						 v_createRequest.primitiveContent.timeSeries.announcedAttribute := {"mbs"};
   
 						 v_cse1.start(f_CSE_ANNC_CRE_008_CseSimu(int29, v_createRequestAnnc, v_createRequest));//TimeSeries
 						 v_cse1.done;
@@ -10224,7 +10220,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						 var template RequestPrimitive v_createRequestAnnc := mw_createTimeSeriesInstanceAnncBase;
 	  
 						 v_createRequest.primitiveContent.timeSeriesInstance.announceTo := {PX_CSE1_ID};
-						 v_createRequest.primitiveContent.timeSeriesInstance.announcedAttribute := {"contentSize"};
+						 v_createRequest.primitiveContent.timeSeriesInstance.announcedAttribute := {"cs"};
 	  
 						 v_cse1.start(f_CSE_ANNC_CRE_008_CseSimu(int30, v_createRequestAnnc, v_createRequest));//TimeSeriesInstance
 						 v_cse1.done;
@@ -10910,7 +10906,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						v_createRequest.primitiveContent.container.maxByteSize := v_maxByteSize;
 						v_createRequest.primitiveContent.container.announcedAttribute := v_announcedAttribute;
 
-						v_updateRequest.primitiveContent.container.announcedAttribute := {"maxByteSize"};
+						v_updateRequest.primitiveContent.container.announcedAttribute := {"mbs"};
   
 						v_ae1.start(f_CSE_ANNC_UPD_008(int3, v_createRequestAnnc, v_createRequest, v_updateRequest));//Container
 						v_ae1.done;
@@ -10956,7 +10952,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						v_createRequest.primitiveContent.group_.memberType := v_memberType;
 						v_createRequest.primitiveContent.group_.announcedAttribute := v_announcedAttribute;
 
-						v_updateRequest.primitiveContent.group_.announcedAttribute := {"memberType"};
+						v_updateRequest.primitiveContent.group_.announcedAttribute := {"mt"};
   
 						v_ae1.start(f_CSE_ANNC_UPD_008(int9, v_createRequestAnnc, v_createRequest, v_updateRequest));//Group
 						v_ae1.done;
@@ -11002,7 +10998,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						v_createRequest.primitiveContent.timeSeries.maxByteSize := v_maxByteSize;
 						v_createRequest.primitiveContent.timeSeries.announcedAttribute := v_announcedAttribute;
 
-						v_updateRequest.primitiveContent.timeSeries.announcedAttribute := {"maxByteSize"};
+						v_updateRequest.primitiveContent.timeSeries.announcedAttribute := {"mbs"};
   
 						v_ae1.start(f_CSE_ANNC_UPD_008(int29, v_createRequestAnnc, v_createRequest, v_updateRequest));//TimeSeries
 						v_ae1.done;
@@ -11049,7 +11045,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						
 						v_createRequestAnnc.primitiveContent.containerAnnc.maxByteSize := v_maxByteSize;
 						
-						v_updateRequest.primitiveContent.container.announcedAttribute := {"maxByteSize"};
+						v_updateRequest.primitiveContent.container.announcedAttribute := {"mbs"};
 						
 						v_updateRequestAnnc.primitiveContent.containerAnnc.maxByteSize := v_maxByteSize;
   
@@ -11071,7 +11067,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 						
 						v_createRequestAnnc.primitiveContent.groupAnnc.memberType := v_memberType;
 						
-						v_updateRequest.primitiveContent.group_.announcedAttribute := {"memberType"};
+						v_updateRequest.primitiveContent.group_.announcedAttribute := {"mt"};
 						
 						v_updateRequestAnnc.primitiveContent.groupAnnc.memberType := v_memberType;
   
@@ -11093,7 +11089,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 	
 						v_createRequestAnnc.primitiveContent.timeSeriesAnnc.maxByteSize := v_maxByteSize;
 	
-						v_updateRequest.primitiveContent.timeSeries.announcedAttribute := {"maxByteSize"};
+						v_updateRequest.primitiveContent.timeSeries.announcedAttribute := {"mbs"};
 	
 						v_updateRequestAnnc.primitiveContent.timeSeriesAnnc.maxByteSize := v_maxByteSize;
   
@@ -11213,7 +11209,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 
 						v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
 						v_createRequest.primitiveContent.container.maxByteSize := v_maxByteSize_1;
-						v_createRequest.primitiveContent.container.announcedAttribute := {"maxByteSize"};	
+						v_createRequest.primitiveContent.container.announcedAttribute := {"mbs"};	
 		
 						v_createRequestAnnc.primitiveContent.containerAnnc.maxByteSize := v_maxByteSize_1;
 		
@@ -11237,7 +11233,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 
 						v_createRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
 						v_createRequest.primitiveContent.group_.memberType := v_memberType_1;
-						v_createRequest.primitiveContent.group_.announcedAttribute := {"memberType"};
+						v_createRequest.primitiveContent.group_.announcedAttribute := {"mt"};
 		
 						v_createRequestAnnc.primitiveContent.groupAnnc.memberType := v_memberType_1;
 		
@@ -11261,7 +11257,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 
 						v_createRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID};
 						v_createRequest.primitiveContent.timeSeries.maxByteSize := v_maxByteSize_1;
-						v_createRequest.primitiveContent.timeSeries.announcedAttribute := {"maxByteSize"};	
+						v_createRequest.primitiveContent.timeSeries.announcedAttribute := {"mbs"};	
 
 						v_createRequestAnnc.primitiveContent.timeSeriesAnnc.maxByteSize := v_maxByteSize_1;
 
@@ -11291,7 +11287,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 
 						v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
 						v_createRequest.primitiveContent.container.maxByteSize := v_maxByteSize;
-						v_createRequest.primitiveContent.container.announcedAttribute := {"maxByteSize"};	
+						v_createRequest.primitiveContent.container.announcedAttribute := {"mbs"};	
 
 						v_createRequestAnnc.primitiveContent.containerAnnc.maxByteSize := v_maxByteSize;
 						
@@ -11329,7 +11325,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 
 						v_createRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
 						v_createRequest.primitiveContent.group_.memberType := v_memberType;
-						v_createRequest.primitiveContent.group_.announcedAttribute := {"memberType"};
+						v_createRequest.primitiveContent.group_.announcedAttribute := {"mt"};
 
 						v_createRequestAnnc.primitiveContent.groupAnnc.memberType := v_memberType;
 
@@ -11366,7 +11362,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 
 						v_createRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID};
 						v_createRequest.primitiveContent.timeSeries.maxByteSize := v_maxByteSize;
-						v_createRequest.primitiveContent.timeSeries.announcedAttribute := {"maxByteSize"};	
+						v_createRequest.primitiveContent.timeSeries.announcedAttribute := {"mbs"};	
 
 						v_createRequestAnnc.primitiveContent.timeSeriesAnnc.maxByteSize := v_maxByteSize;
 	
@@ -11408,7 +11404,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 	  
 						v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
 						v_createRequest.primitiveContent.container.maxByteSize := v_maxByteSize;
-						v_createRequest.primitiveContent.container.announcedAttribute := {"maxByteSize"};
+						v_createRequest.primitiveContent.container.announcedAttribute := {"mbs"};
 		
 						v_updateRequest.primitiveContent.container.announcedAttribute := v_announcedAttribute;
 						v_nullFields := {{"announcedAttribute", omit}};
@@ -11452,7 +11448,7 @@ module OneM2M_Testcases_CSE_Release_2 {
 	  
 						v_createRequest.primitiveContent.group_.announceTo := {PX_CSE1_ID};
 						v_createRequest.primitiveContent.group_.memberType := v_memberType;
-						v_createRequest.primitiveContent.group_.announcedAttribute := {"memberType"};
+						v_createRequest.primitiveContent.group_.announcedAttribute := {"mt"};
 		
 						v_updateRequest.primitiveContent.group_.announcedAttribute := v_announcedAttribute;
 						v_nullFields := {{"announcedAttribute", omit}};
@@ -11495,7 +11491,7 @@ module OneM2M_Testcases_CSE_Release_2 {
   
 						v_createRequest.primitiveContent.timeSeries.announceTo := {PX_CSE1_ID};
 						v_createRequest.primitiveContent.timeSeries.maxByteSize := v_maxByteSize;
-						v_createRequest.primitiveContent.timeSeries.announcedAttribute := {"maxByteSize"};
+						v_createRequest.primitiveContent.timeSeries.announcedAttribute := {"mbs"};
 
 						v_updateRequest.primitiveContent.container.announcedAttribute := v_announcedAttribute;
 						v_nullFields := {{"announcedAttribute", omit}};