diff --git a/LibOneM2M/OneM2M_Templates.ttcn b/LibOneM2M/OneM2M_Templates.ttcn
index d471a7b715c9d0c35044086d0ef2a544cd3c31d4..d3ab79cd0857010a2aefae9cf15c2af9f44b59b2 100644
--- a/LibOneM2M/OneM2M_Templates.ttcn
+++ b/LibOneM2M/OneM2M_Templates.ttcn
@@ -3840,7 +3840,7 @@ module OneM2M_Templates {
 		}
 		
 		template AccessControlPolicy_optional mw_contentAcp_rc4 modifies mw_contentAcpBase := {
-			choice := {subscription_list := ?}	//O
+			choice := {choice_list := ?}	//O
 		}
 		
 		template AccessControlPolicy_optional mw_contentAcp_rc5 modifies mw_contentAcpBase := {
diff --git a/LibOneM2M/OneM2M_Types.ttcn b/LibOneM2M/OneM2M_Types.ttcn
index 275953bb2f8bd3ad3424590856985e75793992ad..f804670f51d58f88a465aedf691c77c571517d03 100644
--- a/LibOneM2M/OneM2M_Types.ttcn
+++ b/LibOneM2M/OneM2M_Types.ttcn
@@ -6718,7 +6718,9 @@ group OptionalResourceTypes {
 		SetOfAcrs selfPrivileges optional,
 		union {
 			record length(1 .. infinity) of ChildResourceRef childResource_list,
-			record length(1 .. infinity) of Subscription subscription_list
+			record length(1 .. infinity) of union {
+				Subscription subscription
+			} choice_list
 		} choice optional
 	}
 	with {
@@ -6729,8 +6731,8 @@ group OptionalResourceTypes {
 	  variant (choice) "untagged";
 	  variant (choice.childResource_list) "untagged";
 	  variant (choice.childResource_list[-]) "name as 'childResource'";
-	  variant (choice.subscription_list) "untagged";
-	  variant (choice.subscription_list[-]) "name as 'subscription'";
+	  variant (choice.choice_list) "untagged";
+	  variant (choice.choice_list[-]) "untagged";
 	};
 	type record AccessControlPolicyAnnc_optional
 	{
@@ -6747,7 +6749,9 @@ group OptionalResourceTypes {
 		SetOfAcrs selfPrivileges optional,
 		union {
 			record length(1 .. infinity) of ChildResourceRef childResource_list,
-			record length(1 .. infinity) of Subscription subscription_list
+			record length(1 .. infinity) of union {
+				Subscription subscription
+			} choice_list
 		} choice optional
 	}
 	with {
@@ -6757,8 +6761,8 @@ group OptionalResourceTypes {
 	  variant (choice) "untagged";
 	  variant (choice.childResource_list) "untagged";
 	  variant (choice.childResource_list[-]) "name as 'childResource'";
-	  variant (choice.subscription_list) "untagged";
-	  variant (choice.subscription_list[-]) "name as 'subscription'";
+	  variant (choice.choice_list) "untagged";
+	  variant (choice.choice_list[-]) "untagged";
 	};
 
 	type record AE_optional