diff --git a/OneM2M_Templates.ttcn b/OneM2M_Templates.ttcn
index 2386f14287c5ede4f26a530537f311e251c6e86d..710889ae6f2b4652225b8626a2cdcc97c5e3303b 100644
--- a/OneM2M_Templates.ttcn
+++ b/OneM2M_Templates.ttcn
@@ -406,7 +406,7 @@ module OneM2M_Templates {
 				requestIdentifier := "m_createAe" & f_rnd(1, 1000000),
 				resourceType := int2,
 				primitiveContent := {
-					any_1 := {{AE_optional := m_contentCreateAe(c_aeAuxName, p_accessControlPolicyIDs, p_appId)}}	
+					any_1 := {{AE_optional := m_contentCreateAe(p_accessControlPolicyIDs, c_aeAuxName, p_appId)}}	
 				},
 				role := omit,
 				originatingTimestamp := omit,
@@ -986,7 +986,7 @@ module OneM2M_Templates {
     	 * @param p_name Resource name
     	 * @param p_accessControlPolicyIDs ACP IDs for the AE
     	 */
-    	template (value) AE_optional m_contentCreateAe (in template (omit) AcpType p_accessControlPolicyIDs, in template (omit)  XSD.String p_name := c_defaultResourceName) := {
+    	template (value) AE_optional m_contentCreateAe (in template (omit) AcpType p_accessControlPolicyIDs, in template (omit)  XSD.String p_name := c_defaultResourceName, in template (omit) XSD.ID p_appId := PX_APP_ID) := {
 
 			resourceName := p_name,//O
 			resourceType := omit,//NP
diff --git a/OneM2M_Testcases.ttcn b/OneM2M_Testcases.ttcn
index faab37746fe7d1043f6947b8041b01493774cbe8..9a6862f54527a900a3e4b896d67a35387b40fa58 100644
--- a/OneM2M_Testcases.ttcn
+++ b/OneM2M_Testcases.ttcn
@@ -125,7 +125,7 @@ module OneM2M_Testcases {
 				//Test Body
 				v_request := valueof(m_createAe(PX_APP_ID, omit, omit));	
 				
-				v_request := f_getCreateRequestPrimitive(v_resourceType, omit, v_request, v_cseBaseIndex);
+				v_request := f_getCreateRequestPrimitive(v_resourceType, v_request, v_cseBaseIndex);
 				
 				mcaPort.send(m_request(v_request));
 				
@@ -165,7 +165,7 @@ module OneM2M_Testcases {
 				//Test Body
 				v_request := valueof(m_createAe(PX_APP_ID, omit, "C-AE-ID-STEM"));				
     									
-				v_request := f_getCreateRequestPrimitive(v_resourceType, omit, v_request, v_cseBaseIndex);
+				v_request := f_getCreateRequestPrimitive(v_resourceType, v_request, v_cseBaseIndex);
 
 					mcaPort.send(m_request(v_request));
 					tc_ac.start;
@@ -204,7 +204,7 @@ module OneM2M_Testcases {
 				// Test Body
 				v_request := valueof(m_createAe(PX_APP_ID, omit, omit));				
     									
-				v_request := f_getCreateRequestPrimitive(v_resourceType, omit, v_request, v_cseBaseIndex);
+				v_request := f_getCreateRequestPrimitive(v_resourceType, v_request, v_cseBaseIndex);
 				
 					mcaPort.send(m_request(v_request));
 					tc_ac.start;
@@ -243,7 +243,7 @@ module OneM2M_Testcases {
 				//Test Body	
 				v_request := valueof(m_createAe(PX_APP_ID, omit, "C-AE-ID-STEM"));				
     									
-				v_request := f_getCreateRequestPrimitive(v_resourceType, omit, v_request, v_cseBaseIndex);
+				v_request := f_getCreateRequestPrimitive(v_resourceType, v_request, v_cseBaseIndex);
 		
 					mcaPort.send(m_request(v_request));
 					tc_ac.start;
@@ -282,7 +282,7 @@ module OneM2M_Testcases {
 				//Test Body
 				v_request := valueof(m_createAe(PX_APP_ID, omit, "C-AE-ID-STEM"));				
     									
-				v_request := f_getCreateRequestPrimitive(v_resourceType, omit, v_request, v_cseBaseIndex);
+				v_request := f_getCreateRequestPrimitive(v_resourceType, v_request, v_cseBaseIndex);
 	  	  		
 					mcaPort.send(m_request(v_request));
 					tc_ac.start;
@@ -3756,7 +3756,7 @@ module OneM2M_Testcases {
      	     	v_aeAuxIndex := f_preamble_registerAe();
      	     	     	     	
      	     	//Set requestPrimitive
-     	     	v_request	 := f_getCreateRequestPrimitive(int10, omit, m_createLocationPolicy(p_aeResourceAddress, omit, omit, omit, omit), v_aeAuxIndex);
+     	     	v_request	 := f_getCreateRequestPrimitive(int10, m_createLocationPolicy(p_aeResourceAddress, omit, omit, omit, omit), v_aeAuxIndex);
      	     	
      	     	//Test Body
      	     	mcaPort.send(m_request(v_request));
@@ -3801,7 +3801,7 @@ module OneM2M_Testcases {
      	     	v_aeAuxIndex := f_preamble_registerAe();
      	     	     	     	
      	     	//Set requestPrimitive
-     	     	v_request	 := f_getCreateRequestPrimitive(int10, omit, m_createLocationPolicy(p_aeResourceAddress, omit, locationUpdatePeriod, locationTargetID, locationServerAddress), v_aeAuxIndex);
+     	     	v_request	 := f_getCreateRequestPrimitive(int10, m_createLocationPolicy(p_aeResourceAddress, omit, locationUpdatePeriod, locationTargetID, locationServerAddress), v_aeAuxIndex);
      	     	    									
     			// Test Body					
     			mcaPort.send(m_request(v_request));
@@ -3850,7 +3850,7 @@ module OneM2M_Testcases {
      	     	p_aeResourceAddress		:= f_addPrefix(f_getResourceAddress(v_aeAuxIndex));
      	     	
      	     	//Set requestPrimitive
-     	     	v_request				:= f_getCreateRequestPrimitive(int10, omit, m_createLocationPolicy(p_aeResourceAddress, omit, locationUpdatePeriod, locationTargetID, locationServerAddress), v_aeAuxIndex);
+     	     	v_request				:= f_getCreateRequestPrimitive(int10, m_createLocationPolicy(p_aeResourceAddress, omit, locationUpdatePeriod, locationTargetID, locationServerAddress), v_aeAuxIndex);
      	        									
     			// Test Body					
     			mcaPort.send(m_request(v_request));
@@ -3892,7 +3892,7 @@ module OneM2M_Testcases {
      	     	v_aeAuxIndex 	:= f_preamble_registerAe();
      	     	
      	     	//Set requestPrimitive
-     	     	v_request		:= f_getCreateRequestPrimitive(int10, omit, m_createLocationPolicy(p_targetResourceAddress, omit, locationUpdatePeriod, locationTargetID, locationServerAddress), v_aeAuxIndex);
+     	     	v_request		:= f_getCreateRequestPrimitive(int10, m_createLocationPolicy(p_targetResourceAddress, omit, locationUpdatePeriod, locationTargetID, locationServerAddress), v_aeAuxIndex);
      	    							
     			// Test Body					
     			mcaPort.send(m_request(v_request));