diff --git a/OneM2M_Testcases_AE_Release_1.ttcn b/OneM2M_Testcases_AE_Release_1.ttcn
index 0c7bbbbe445bb6772b2a84f1c9687b207cd1403e..337e34e5d6eb6a0ad4e151b2a2a99c4d54179d4d 100644
--- a/OneM2M_Testcases_AE_Release_1.ttcn
+++ b/OneM2M_Testcases_AE_Release_1.ttcn
@@ -401,7 +401,7 @@ module OneM2M_Testcases_AE_Release_1 {
 							tc_ac.stop;
 							setverdict(pass, __SCOPE__, " : AE registration request is accepted!!");
 							//v_responsePrimitive := valueof(m_responsePrimitiveTemp(int2000, omit));
-							v_responsePrimitive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));
+							v_responsePrimitive := valueof(m_responsePrimitive(int2001, v_request.primitive.requestPrimitive.requestIdentifier, omit));
 							
 							//send back responsePrimitive
 							mcaPortIn.send(m_response(v_responsePrimitive));
@@ -558,7 +558,7 @@ module OneM2M_Testcases_AE_Release_1 {
 							setverdict(pass, __SCOPE__, " : AE deregistration request is accepted!");
 	
 							//v_responsePrimitive := valueof(m_responsePrimitiveTemp(int2000, omit));
-							v_responsePrimitive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));
+							v_responsePrimitive := valueof(m_responsePrimitive(int2001, v_request.primitive.requestPrimitive.requestIdentifier, omit));
 	
 							//send back responsePrimitive
 							mcaPortIn.send(m_response(v_responsePrimitive));
@@ -609,7 +609,7 @@ module OneM2M_Testcases_AE_Release_1 {
 							setverdict(pass, __SCOPE__, " : Container creation request is accepted!");
 	
 							//set responseStatusCode back to SUT
-							v_responsePrimitive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));
+							v_responsePrimitive := valueof(m_responsePrimitive(int2001, v_request.primitive.requestPrimitive.requestIdentifier, omit));
 							
 							//send back responsePrimitive
 							mcaPortIn.send(m_response(v_responsePrimitive));
@@ -654,7 +654,7 @@ module OneM2M_Testcases_AE_Release_1 {
 							setverdict(pass, __SCOPE__, " : ContentInstance creation request is accepted!!");
 							
 							//set responseStatusCode back to SUT
-							v_responsePrimitive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));
+							v_responsePrimitive := valueof(m_responsePrimitive(int2001, v_request.primitive.requestPrimitive.requestIdentifier, omit));
 	
 							//send back responsePrimitive
 							mcaPortIn.send(m_response(v_responsePrimitive));
@@ -1067,7 +1067,7 @@ module OneM2M_Testcases_AE_Release_1 {
 							setverdict(pass, __SCOPE__, " : retrieve attribute oldest request is accepted!");
 	
 							//set responseStatusCode back to SUT
-							v_responsePrimitive := valueof(m_responsePrimitive(int2000, "To_be_defined", omit));
+							v_responsePrimitive := valueof(m_responsePrimitive(int2000, v_request.primitive.requestPrimitive.requestIdentifier, omit));
 	
 							//send back responsePrimitive
 							mcaPortIn.send(m_response(v_responsePrimitive));
@@ -1115,7 +1115,7 @@ module OneM2M_Testcases_AE_Release_1 {
 							setverdict(pass, __SCOPE__, " : retrieve attribute latest request is accepted!!");
 	
 							//set responseStatusCode back to SUT
-							v_responsePrimitive := valueof(m_responsePrimitive(int2000, "To_be_defined", omit));
+							v_responsePrimitive := valueof(m_responsePrimitive(int2000, v_request.primitive.requestPrimitive.requestIdentifier, omit));
 	
 							//send back responsePrimitive
 							mcaPortIn.send(m_response(v_responsePrimitive));
@@ -1164,7 +1164,7 @@ module OneM2M_Testcases_AE_Release_1 {
 							setverdict(pass, __SCOPE__, " : retrieve resource type request is accepted!!");
 			
 							//set responseStatusCode back to SUT
-							v_responsePrimitive := valueof(m_responsePrimitive(int2000, "To_be_defined", omit));
+							v_responsePrimitive := valueof(m_responsePrimitive(int2000, v_request.primitive.requestPrimitive.requestIdentifier, omit));
 
 							//send back responsePrimitive
 							mcaPortIn.send(m_response(v_responsePrimitive));
@@ -1213,7 +1213,7 @@ module OneM2M_Testcases_AE_Release_1 {
 							setverdict(pass, __SCOPE__, " : retrieve resource type request is accepted!!");
 
 							//set responseStatusCode back to SUT
-							v_responsePrimitive := valueof(m_responsePrimitive(int2000, "To_be_defined", omit));
+							v_responsePrimitive := valueof(m_responsePrimitive(int2000, v_request.primitive.requestPrimitive.requestIdentifier, omit));
 
 							//send back responsePrimitive
 							mcaPortIn.send(m_response(v_responsePrimitive));
@@ -1265,7 +1265,7 @@ module OneM2M_Testcases_AE_Release_1 {
 							setverdict(pass, __SCOPE__, " : delete attribute oldest request is accepted!!");
 
 							//set responseStatusCode back to SUT
-							v_responsePrimitive := valueof(m_responsePrimitive(int2002, "To_be_defined", omit));
+							v_responsePrimitive := valueof(m_responsePrimitive(int2002, v_request.primitive.requestPrimitive.requestIdentifier, omit));
 
 							//send back responsePrimitive
 							mcaPortIn.send(m_response(v_responsePrimitive));
@@ -1313,7 +1313,7 @@ module OneM2M_Testcases_AE_Release_1 {
 							setverdict(pass, __SCOPE__, " : delete attribute latest request is accepted!!");
 
 							//set responseStatusCode back to SUT
-							v_responsePrimitive := valueof(m_responsePrimitive(int2002, "To_be_defined", omit));
+							v_responsePrimitive := valueof(m_responsePrimitive(int2002, v_request.primitive.requestPrimitive.requestIdentifier, omit));
 
 							//send back responsePrimitive
 							mcaPortIn.send(m_response(v_responsePrimitive));
@@ -1362,7 +1362,7 @@ module OneM2M_Testcases_AE_Release_1 {
 							setverdict(pass, __SCOPE__, " : delete resource type request is accepted!!");
 
 							//set responseStatusCode back to SUT
-							v_responsePrimitive := valueof(m_responsePrimitive(int2002, "To_be_defined", omit));
+							v_responsePrimitive := valueof(m_responsePrimitive(int2002, v_request.primitive.requestPrimitive.requestIdentifier, omit));
 
 							//send back responsePrimitive
 							mcaPortIn.send(m_response(v_responsePrimitive));
@@ -1411,7 +1411,7 @@ module OneM2M_Testcases_AE_Release_1 {
 							setverdict(pass, __SCOPE__, " : delete resource type request is accepted!!");
 
 							//set responseStatusCode back to SUT
-							v_responsePrimitive := valueof(m_responsePrimitive(int2002, "To_be_defined", omit));
+							v_responsePrimitive := valueof(m_responsePrimitive(int2002, v_request.primitive.requestPrimitive.requestIdentifier, omit));
 
 							//send back responsePrimitive
 							mcaPortIn.send(m_response(v_responsePrimitive));
@@ -1467,7 +1467,7 @@ module OneM2M_Testcases_AE_Release_1 {
 							setverdict(pass, __SCOPE__, " : Subscription creation request is accepted!");
 
 							//set responseStatusCode back to SUT
-							v_responsePrimitive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));
+							v_responsePrimitive := valueof(m_responsePrimitive(int2001, v_request.primitive.requestPrimitive.requestIdentifier, omit));
 		
 							//send back responsePrimitive
 							mcaPortIn.send(m_response(v_responsePrimitive));
@@ -1640,7 +1640,7 @@ module OneM2M_Testcases_AE_Release_1 {
 						[] mcaPortIn.receive(mw_request(mw_createAe)) -> value v_request {
 							tc_ac.stop;
 							setverdict(pass, __SCOPE__, " : AE registration request is accepted!!");
-							v_responsePrimitive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));
+							v_responsePrimitive := valueof(m_responsePrimitive(int2001, v_request.primitive.requestPrimitive.requestIdentifier, omit));
 			
 							//send back responsePrimitive
 							mcaPortIn.send(m_response(v_responsePrimitive));
@@ -1670,7 +1670,7 @@ module OneM2M_Testcases_AE_Release_1 {
 							setverdict(pass, __SCOPE__, " : Subscription creation request is accepted!");
 
 							//set responseStatusCode back to SUT
-							v_responsePrimitive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));
+							v_responsePrimitive := valueof(m_responsePrimitive(int2001, v_request.primitive.requestPrimitive.requestIdentifier, omit));
 
 							//send back responsePrimitive
 							mcaPortIn.send(m_response(v_responsePrimitive));
@@ -1731,7 +1731,7 @@ module OneM2M_Testcases_AE_Release_1 {
 						[] mcaPortIn.receive(mw_request(mw_createAe)) -> value v_request {
 							tc_ac.stop;
 							setverdict(pass, __SCOPE__, " : AE registration request is accepted!!");
-							v_responsePrimitive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));
+							v_responsePrimitive := valueof(m_responsePrimitive(int2001, v_request.primitive.requestPrimitive.requestIdentifier, omit));
 			
 							//send back responsePrimitive
 							mcaPortIn.send(m_response(v_responsePrimitive));
@@ -1761,7 +1761,7 @@ module OneM2M_Testcases_AE_Release_1 {
 							setverdict(pass, __SCOPE__, " : Subscription creation request is accepted!");
 
 							//set responseStatusCode back to SUT
-							v_responsePrimitive := valueof(m_responsePrimitive(int2001, "To_be_defined", omit));
+							v_responsePrimitive := valueof(m_responsePrimitive(int2001, v_request.primitive.requestPrimitive.requestIdentifier, omit));
 
 							//send back responsePrimitive
 							mcaPortIn.send(m_response(v_responsePrimitive));