diff --git a/standard-tests/3gpp/IMS.tdlan2 b/standard-tests/3gpp/IMS.tdlan2
index 37e2b6cc9ca783d11b2c13e846cf6a3359342b10..26d40b0d869ac6804c014ea1aed98979294fe9b5 100644
--- a/standard-tests/3gpp/IMS.tdlan2
+++ b/standard-tests/3gpp/IMS.tdlan2
@@ -15,7 +15,7 @@ file and shall not imply any sub-license right.
 */
 
 //Translated from [i.6], Section 4.5.1.
-TDLan Specification IMS_NNI_General_Capabilities {
+Package IMS_NNI_General_Capabilities {
     //Procedures carried out by a component of a test configuration 
     //or an actor during test execution
     Action preConditions : "Pre-test conditions:
@@ -64,10 +64,10 @@ TDLan Specification IMS_NNI_General_Capabilities {
     
     //Relevant data definitions
     Type MSG (optional TCP of type CONTENT);
-    MSG MESSAGE ;
-    MSG DING ;
-    MSG DELIVERY_REPORT ;
-    MSG M_200_OK ;
+    MSG MESSAGE() ;
+    MSG DING() ;
+    MSG DELIVERY_REPORT() ;
+    MSG M_200_OK() ;
     
     Type CONTENT ;
     CONTENT tcp;
diff --git a/standard-tests/onem2m/cse_dmr.tplan2 b/standard-tests/onem2m/cse_dmr.tplan2
index d1f46be8094b862df7af47bf447b1297b6c2c872..60552b8c6982934e7a3b76f514faf935cea550a4 100644
--- a/standard-tests/onem2m/cse_dmr.tplan2
+++ b/standard-tests/onem2m/cse_dmr.tplan2
@@ -21,6 +21,7 @@ Package onem2m_cse_dmr {
 		entities:
 		- AE
 		- IUT
+		- container_resource
 		;
 		events:
 		- being_in
@@ -33,7 +34,6 @@ Package onem2m_cse_dmr {
 		- perform_DELETE_operation_on
 		- increments
 		- sends
-		- container_resource
 		;
 	}
 	
@@ -63,7 +63,7 @@ Package onem2m_cse_dmr {
 					From indicating value AE_ID;
 			}
 			then {
-				the IUT entity increments the stateTag attribute in the container_resource 
+				the IUT entity increments the stateTag ^attribute in the container_resource entity
 				and the IUT entity sends a valid Response containing 
 					Response Status Code set to 2002; /* (DELETED) */ 
 			}