diff --git a/OneM2M_Types.ttcn b/OneM2M_Types.ttcn
index 261eefe5e6c62b0d47e956662e582c33ecc61084..568709c7bf8dc51c93b19745bdbf03ca67a94f4c 100644
--- a/OneM2M_Types.ttcn
+++ b/OneM2M_Types.ttcn
@@ -2346,7 +2346,7 @@ type record EventNotificationCriteria
 }
 with {
   variant "name as uncapitalized";
-  variant (operationMonitor_list) "untagged";
+  //variant (operationMonitor_list) "untagged";
   variant (operationMonitor_list[-]) "name as 'operationMonitor'";
 //  variant (notificationEventType_list) "untagged";
   variant (notificationEventType_list[-]) "name as 'notificationEventType'";
@@ -2394,15 +2394,15 @@ with {
   variant "name as uncapitalized";
   variant (childResourceType) "list";
   variant (parentResourceType) "list";
-  variant (contentType_list) "untagged";
+  //variant (contentType_list) "untagged";
   variant (contentType_list[-]) "name as 'contentType'";
-  variant (attribute_list) "untagged";
+  //variant (attribute_list) "untagged";
   variant (attribute_list[-]) "name as 'attribute'";
-  variant (childAttribute_list) "untagged";
+  //variant (childAttribute_list) "untagged";
   variant (childAttribute_list[-]) "name as 'childAttribute'";
-  variant (parentAttribute_list) "untagged";
+  //variant (parentAttribute_list) "untagged";
   variant (parentAttribute_list[-]) "name as 'parentAttribute'";
-  variant (semanticsFilter_list) "untagged";
+  //variant (semanticsFilter_list) "untagged";
   variant (semanticsFilter_list[-]) "name as 'semanticsFilter'";
 };
 
@@ -2652,15 +2652,15 @@ type record AccessControlRule
 }
 with {
   variant "name as uncapitalized";
-  variant (accessControlContexts_list) "untagged";
+  //variant (accessControlContexts_list) "untagged";
   variant (accessControlContexts_list[-]) "name as 'accessControlContexts'";
-  variant (accessControlContexts_list[-].accessControlWindow_list) "untagged";
+  //variant (accessControlContexts_list[-].accessControlWindow_list) "untagged";
   variant (accessControlContexts_list[-].accessControlWindow_list[-]) "name as 'accessControlWindow'";
   variant (accessControlContexts_list[-].accessControlIpAddresses.ipv4Addresses) "list";
   variant (accessControlContexts_list[-].accessControlIpAddresses.ipv6Addresses) "list";
   //variant (accessControlAuthenticationFlag) "text 'true' as '1'";
   //variant (accessControlAuthenticationFlag) "text 'false' as '0'";
-  variant (accessControlObjectDetails_list) "untagged";
+  //variant (accessControlObjectDetails_list) "untagged";
   variant (accessControlObjectDetails_list[-]) "name as 'accessControlObjectDetails'";
   variant (accessControlObjectDetails_list[-].childResourceType) "list";
 };
@@ -9616,7 +9616,7 @@ with {
   variant (choice.childResource_list[-]) "name as 'childResource'";
   variant (choice.choice_list) "untagged";
   variant (choice.choice_list[-]) "untagged";
-  variant (choice.choice_list[-].action_) "name as 'action'";
+  //variant (choice.choice_list[-].action_) "name as 'action'";
 };