diff --git a/OneM2M_Testcases.ttcn b/OneM2M_Testcases.ttcn
index ee729794a5e59bbc4529136e695e7f35edcd0f85..bcf0ccadec0512475c5cbf278411fc3521fb17bb 100644
--- a/OneM2M_Testcases.ttcn
+++ b/OneM2M_Testcases.ttcn
@@ -2180,12 +2180,11 @@ module OneM2M_Testcases {
 					
 					testcase TC_CSE_DMR_CRE_BI_010() runs on CseTester system CseSystem {
 						// Local variables
-						var template RequestPrimitive v_createRequest := m_createContentInstanceBase;
+						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var MsgIn v_response;
 						var RequestPrimitive v_request;
 						var integer v_aeIndex := -1;
 						var integer v_containerIndex := -1;
-						const XSD.NCName c_contentInstanceName := "la";
 						
 						// Test control
 				
@@ -2200,9 +2199,9 @@ module OneM2M_Testcases {
 						v_containerIndex := f_cse_createResource(int3, m_createContainerBase, v_aeIndex);
 					
 						// Test Body
-						v_createRequest.primitiveContent.any_1[0].ContentInstance_optional.resourceName := c_contentInstanceName;
+						v_createRequest.primitiveContent.any_1[0].Container_optional.resourceName := c_resourceShortNameLatest;
 						
-						v_request := f_getCreateRequestPrimitive(int4, v_createRequest, v_containerIndex);
+						v_request := f_getCreateRequestPrimitive(int3, v_createRequest, v_containerIndex);
 					
 						mcaPort.send(m_request(v_request));
 						tc_ac.start;
@@ -2234,12 +2233,11 @@ module OneM2M_Testcases {
 					
 					testcase TC_CSE_DMR_CRE_BI_011() runs on CseTester system CseSystem {
 						// Local variables
-						var template RequestPrimitive v_createRequest := m_createContentInstanceBase;
+						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var MsgIn v_response;
 						var RequestPrimitive v_request;
 						var integer v_aeIndex := -1;
 						var integer v_containerIndex := -1;
-						const XSD.NCName c_contentInstanceName := "ol";
 						
 						// Test control
 				
@@ -2254,9 +2252,9 @@ module OneM2M_Testcases {
 						v_containerIndex := f_cse_createResource(int3, m_createContainerBase, v_aeIndex);
 					
 						// Test Body
-						v_createRequest.primitiveContent.any_1[0].ContentInstance_optional.resourceName := c_contentInstanceName;
+						v_createRequest.primitiveContent.any_1[0].Container_optional.resourceName := c_resourceShortNameOldest;
 						
-						v_request := f_getCreateRequestPrimitive(int4, v_createRequest, v_containerIndex);
+						v_request := f_getCreateRequestPrimitive(int3, v_createRequest, v_containerIndex);
 					
 						mcaPort.send(m_request(v_request));
 						tc_ac.start;