diff --git a/LibOneM2M/OneM2M_Functions.ttcn b/LibOneM2M/OneM2M_Functions.ttcn
index 37a8cf4d07ceed91debf3f307c6208254c35d8b7..3056b25dabd30f23c88fc9e9d5c0f55c60b07c9f 100644
--- a/LibOneM2M/OneM2M_Functions.ttcn
+++ b/LibOneM2M/OneM2M_Functions.ttcn
@@ -3353,9 +3353,9 @@ module OneM2M_Functions {
 				vc_response.primitive.responsePrimitive := valueof(m_responsePrimitive(int4004,p_request.requestIdentifier));
 		
 			} else {
-				setverdict(pass, __SCOPE__&":INFO: Resource created successfuly");
+				setverdict(pass, __SCOPE__&":INFO: Resource updated successfuly");
 				f_updateLocalResource(v_targetLocalResourceIndex, p_request.primitiveContent);
-				vc_response.primitive.responsePrimitive := valueof(m_responsePrimitive(int2001,p_request.requestIdentifier));
+				vc_response.primitive.responsePrimitive := valueof(m_responsePrimitive(int2004,p_request.requestIdentifier));
 				vc_response.primitive.responsePrimitive.primitiveContent := vc_localResourcesList[v_targetLocalResourceIndex].resource;
 			}
 			vc_response.primitive.responsePrimitive.from_ := PX_CSE1_ID;
@@ -3376,8 +3376,8 @@ module OneM2M_Functions {
 				vc_response.primitive.responsePrimitive := valueof(m_responsePrimitive(int4004,p_request.requestIdentifier));
 		
 			} else {
-				setverdict(pass, __SCOPE__&":INFO: Resource created successfuly");
-				vc_response.primitive.responsePrimitive := valueof(m_responsePrimitive(int2001,p_request.requestIdentifier));
+				setverdict(pass, __SCOPE__&":INFO: Resource retrieved successfuly");
+				vc_response.primitive.responsePrimitive := valueof(m_responsePrimitive(int2000,p_request.requestIdentifier));
 				vc_response.primitive.responsePrimitive.primitiveContent := vc_localResourcesList[v_targetLocalResourceIndex].resource;
 			}
 			vc_response.primitive.responsePrimitive.from_ := PX_CSE1_ID;
@@ -3398,8 +3398,8 @@ module OneM2M_Functions {
 				vc_response.primitive.responsePrimitive := valueof(m_responsePrimitive(int4004,p_request.requestIdentifier));
 		
 			} else {
-				setverdict(pass, __SCOPE__&":INFO: Resource created successfuly");
-				vc_response.primitive.responsePrimitive := valueof(m_responsePrimitive(int2001,p_request.requestIdentifier));
+				setverdict(pass, __SCOPE__&":INFO: Resource deleted successfuly");
+				vc_response.primitive.responsePrimitive := valueof(m_responsePrimitive(int2002,p_request.requestIdentifier));
 			}
 			vc_response.primitive.responsePrimitive.from_ := PX_CSE1_ID;
 			vc_response.primitive.responsePrimitive.to_ := p_request.from_;