diff --git a/LibOneM2M/OneM2M_Functions.ttcn b/LibOneM2M/OneM2M_Functions.ttcn
index e9ff326587c412aebcf02c47d4e7ba7690d47d5b..32c136dd083d9bd060750fd8485d845de9ad4f78 100644
--- a/LibOneM2M/OneM2M_Functions.ttcn
+++ b/LibOneM2M/OneM2M_Functions.ttcn
@@ -2559,7 +2559,7 @@ module OneM2M_Functions {
 				 * @param p_expectedResourceIndex Expected target parent resource of the announcemnet
 				 * @verdict 
 				 */
-				function f_cse_announcementProcedure_createHandler(template RequestPrimitive p_requestprimitive := mw_createAnnc, in ResponseStatusCode p_responseStatusCode := int2001, template (omit) integer p_expectedParentResourceIndex := vc_localRemoteCseIndex) runs on CseSimu return integer{
+				function f_cse_announcementProcedure_createHandler(template RequestPrimitive p_requestPrimitive := mw_createAnnc, in ResponseStatusCode p_responseStatusCode := int2001, template (omit) integer p_expectedParentResourceIndex := vc_localRemoteCseIndex) runs on CseSimu return integer{
 					// Local variables
 					var integer v_announcedResourceIndex;
 				
@@ -2568,7 +2568,7 @@ module OneM2M_Functions {
 				
 					tc_ac.start;
 					alt {
-						[] mccPortIn.receive(mw_request(p_requestprimitive)) -> value vc_request {
+						[] mccPortIn.receive(mw_request(p_requestPrimitive)) -> value vc_request {
 							tc_ac.stop;
 							setverdict(pass, __SCOPE__ & ":INFO: Expected Announcement received");
 							v_announcedResourceIndex := f_processCreateRequestPrimitive(vc_request.primitive.requestPrimitive, p_responseStatusCode, p_expectedParentResourceIndex);
@@ -2577,7 +2577,7 @@ module OneM2M_Functions {
 								setverdict(fail, __SCOPE__ & ":ERROR: Wrong target resource address");
 									}	
 									}
-						[] mccPortIn.receive(mw_request(?)) -> value vc_request {
+						[] mccPortIn.receive(mw_request(mw_createAnnc)) -> value vc_request {
 							tc_ac.stop;
 							setverdict(fail, __SCOPE__ & ":ERROR:  Request received with unexpected parameters");
 							v_announcedResourceIndex := f_processCreateRequestPrimitive(vc_request.primitive.requestPrimitive, int4000);