diff --git a/docs/guides/access-control-guide.md b/docs/guides/access-control-guide.md
index 6aa20e032825d5..46878ab1cfca09 100644
--- a/docs/guides/access-control-guide.md
+++ b/docs/guides/access-control-guide.md
@@ -552,13 +552,13 @@ await devCtrl.WriteAttribute(1, [ (0, Clusters.AccessControl.Attributes.Acl( [
     authMode = Clusters.AccessControl.Enums.AccessControlEntryAuthModeEnum.kGroup,
     subjects = [ 123, 456 ],
     targets = [
-      Clusters.AccessControl.Structs.Target(
+      Clusters.AccessControl.Structs.AccessControlTargetStruct(
         cluster = Clusters.OnOff.id,
       ),
-      Clusters.AccessControl.Structs.Target(
+      Clusters.AccessControl.Structs.AccessControlTargetStruct(
         endpoint = 1,
       ),
-      Clusters.AccessControl.Structs.Target(
+      Clusters.AccessControl.Structs.AccessControlTargetStruct(
         cluster = Clusters.LevelControl.id,
         endpoint = 2,
       ),
diff --git a/docs/guides/repl/Matter_Access_Control.ipynb b/docs/guides/repl/Matter_Access_Control.ipynb
index 8bc0c44a72a5ac..4d0d1853af206e 100644
--- a/docs/guides/repl/Matter_Access_Control.ipynb
+++ b/docs/guides/repl/Matter_Access_Control.ipynb
@@ -733,7 +733,7 @@
     "    fabricIndex = 1,\n",
     "    privilege = Clusters.AccessControl.Enums.AccessControlEntryPrivilegeEnum.kOperate,\n",
     "    authMode = Clusters.AccessControl.Enums.AccessControlEntryAuthModeEnum.kCase,\n",
-    "    targets = [ Clusters.AccessControl.Structs.Target(\n",
+    "    targets = [ Clusters.AccessControl.Structs.AccessControlTargetStruct(\n",
     "        endpoint = 1,\n",
     "    ) ] ) )\n",
     "acl"
diff --git a/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter b/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
index 946139ffd745b8..efb3595a682a07 100644
--- a/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
+++ b/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
@@ -565,7 +565,7 @@ server cluster AccessControl = 31 {
     kRemoved = 2;
   }
 
-  struct Target {
+  struct AccessControlTargetStruct {
     nullable cluster_id cluster = 0;
     nullable endpoint_no endpoint = 1;
     nullable devtype_id deviceType = 2;
@@ -575,7 +575,7 @@ server cluster AccessControl = 31 {
     fabric_sensitive AccessControlEntryPrivilegeEnum privilege = 1;
     fabric_sensitive AccessControlEntryAuthModeEnum authMode = 2;
     nullable fabric_sensitive int64u subjects[] = 3;
-    nullable fabric_sensitive Target targets[] = 4;
+    nullable fabric_sensitive AccessControlTargetStruct targets[] = 4;
     fabric_idx fabricIndex = 254;
   }
 
diff --git a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter
index a1c11bf2222ad3..352c979fdb45d0 100644
--- a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter
+++ b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter
@@ -437,7 +437,7 @@ server cluster AccessControl = 31 {
     kRemoved = 2;
   }
 
-  struct Target {
+  struct AccessControlTargetStruct {
     nullable cluster_id cluster = 0;
     nullable endpoint_no endpoint = 1;
     nullable devtype_id deviceType = 2;
@@ -447,7 +447,7 @@ server cluster AccessControl = 31 {
     fabric_sensitive AccessControlEntryPrivilegeEnum privilege = 1;
     fabric_sensitive AccessControlEntryAuthModeEnum authMode = 2;
     nullable fabric_sensitive int64u subjects[] = 3;
-    nullable fabric_sensitive Target targets[] = 4;
+    nullable fabric_sensitive AccessControlTargetStruct targets[] = 4;
     fabric_idx fabricIndex = 254;
   }
 
diff --git a/examples/bridge-app/bridge-common/bridge-app.matter b/examples/bridge-app/bridge-common/bridge-app.matter
index d124f8ac6d96a3..42522020a4ac25 100644
--- a/examples/bridge-app/bridge-common/bridge-app.matter
+++ b/examples/bridge-app/bridge-common/bridge-app.matter
@@ -272,7 +272,7 @@ client cluster AccessControl = 31 {
     kRemoved = 2;
   }
 
-  struct Target {
+  struct AccessControlTargetStruct {
     nullable cluster_id cluster = 0;
     nullable endpoint_no endpoint = 1;
     nullable devtype_id deviceType = 2;
@@ -282,7 +282,7 @@ client cluster AccessControl = 31 {
     fabric_sensitive AccessControlEntryPrivilegeEnum privilege = 1;
     fabric_sensitive AccessControlEntryAuthModeEnum authMode = 2;
     nullable fabric_sensitive int64u subjects[] = 3;
-    nullable fabric_sensitive Target targets[] = 4;
+    nullable fabric_sensitive AccessControlTargetStruct targets[] = 4;
     fabric_idx fabricIndex = 254;
   }
 
@@ -345,7 +345,7 @@ server cluster AccessControl = 31 {
     kRemoved = 2;
   }
 
-  struct Target {
+  struct AccessControlTargetStruct {
     nullable cluster_id cluster = 0;
     nullable endpoint_no endpoint = 1;
     nullable devtype_id deviceType = 2;
@@ -355,7 +355,7 @@ server cluster AccessControl = 31 {
     fabric_sensitive AccessControlEntryPrivilegeEnum privilege = 1;
     fabric_sensitive AccessControlEntryAuthModeEnum authMode = 2;
     nullable fabric_sensitive int64u subjects[] = 3;
-    nullable fabric_sensitive Target targets[] = 4;
+    nullable fabric_sensitive AccessControlTargetStruct targets[] = 4;
     fabric_idx fabricIndex = 254;
   }
 
diff --git a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter
index f877b18150cb75..209fab4eed6f9f 100644
--- a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter
+++ b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter
@@ -328,7 +328,7 @@ server cluster AccessControl = 31 {
     kRemoved = 2;
   }
 
-  struct Target {
+  struct AccessControlTargetStruct {
     nullable cluster_id cluster = 0;
     nullable endpoint_no endpoint = 1;
     nullable devtype_id deviceType = 2;
@@ -338,7 +338,7 @@ server cluster AccessControl = 31 {
     fabric_sensitive AccessControlEntryPrivilegeEnum privilege = 1;
     fabric_sensitive AccessControlEntryAuthModeEnum authMode = 2;
     nullable fabric_sensitive int64u subjects[] = 3;
-    nullable fabric_sensitive Target targets[] = 4;
+    nullable fabric_sensitive AccessControlTargetStruct targets[] = 4;
     fabric_idx fabricIndex = 254;
   }
 
diff --git a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter
index 95535c1230eeb7..d0c664d461632c 100644
--- a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter
+++ b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter
@@ -327,7 +327,7 @@ server cluster AccessControl = 31 {
     kRemoved = 2;
   }
 
-  struct Target {
+  struct AccessControlTargetStruct {
     nullable cluster_id cluster = 0;
     nullable endpoint_no endpoint = 1;
     nullable devtype_id deviceType = 2;
@@ -337,7 +337,7 @@ server cluster AccessControl = 31 {
     fabric_sensitive AccessControlEntryPrivilegeEnum privilege = 1;
     fabric_sensitive AccessControlEntryAuthModeEnum authMode = 2;
     nullable fabric_sensitive int64u subjects[] = 3;
-    nullable fabric_sensitive Target targets[] = 4;
+    nullable fabric_sensitive AccessControlTargetStruct targets[] = 4;
     fabric_idx fabricIndex = 254;
   }
 
diff --git a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter
index 0640defe3eaa8d..c8a31a267133bb 100644
--- a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter
+++ b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter
@@ -179,7 +179,7 @@ server cluster AccessControl = 31 {
     kRemoved = 2;
   }
 
-  struct Target {
+  struct AccessControlTargetStruct {
     nullable cluster_id cluster = 0;
     nullable endpoint_no endpoint = 1;
     nullable devtype_id deviceType = 2;
@@ -189,7 +189,7 @@ server cluster AccessControl = 31 {
     fabric_sensitive AccessControlEntryPrivilegeEnum privilege = 1;
     fabric_sensitive AccessControlEntryAuthModeEnum authMode = 2;
     nullable fabric_sensitive int64u subjects[] = 3;
-    nullable fabric_sensitive Target targets[] = 4;
+    nullable fabric_sensitive AccessControlTargetStruct targets[] = 4;
     fabric_idx fabricIndex = 254;
   }
 
diff --git a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter
index 3b2901c8a7a177..34e861f1c403d0 100644
--- a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter
+++ b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter
@@ -328,7 +328,7 @@ server cluster AccessControl = 31 {
     kRemoved = 2;
   }
 
-  struct Target {
+  struct AccessControlTargetStruct {
     nullable cluster_id cluster = 0;
     nullable endpoint_no endpoint = 1;
     nullable devtype_id deviceType = 2;
@@ -338,7 +338,7 @@ server cluster AccessControl = 31 {
     fabric_sensitive AccessControlEntryPrivilegeEnum privilege = 1;
     fabric_sensitive AccessControlEntryAuthModeEnum authMode = 2;
     nullable fabric_sensitive int64u subjects[] = 3;
-    nullable fabric_sensitive Target targets[] = 4;
+    nullable fabric_sensitive AccessControlTargetStruct targets[] = 4;
     fabric_idx fabricIndex = 254;
   }
 
diff --git a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter
index 97343489973995..84b311674b00da 100644
--- a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter
+++ b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter
@@ -179,7 +179,7 @@ server cluster AccessControl = 31 {
     kRemoved = 2;
   }
 
-  struct Target {
+  struct AccessControlTargetStruct {
     nullable cluster_id cluster = 0;
     nullable endpoint_no endpoint = 1;
     nullable devtype_id deviceType = 2;
@@ -189,7 +189,7 @@ server cluster AccessControl = 31 {
     fabric_sensitive AccessControlEntryPrivilegeEnum privilege = 1;
     fabric_sensitive AccessControlEntryAuthModeEnum authMode = 2;
     nullable fabric_sensitive int64u subjects[] = 3;
-    nullable fabric_sensitive Target targets[] = 4;
+    nullable fabric_sensitive AccessControlTargetStruct targets[] = 4;
     fabric_idx fabricIndex = 254;
   }
 
diff --git a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter
index da48fd8620215e..bd6fb19f08d653 100644
--- a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter
+++ b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter
@@ -328,7 +328,7 @@ server cluster AccessControl = 31 {
     kRemoved = 2;
   }
 
-  struct Target {
+  struct AccessControlTargetStruct {
     nullable cluster_id cluster = 0;
     nullable endpoint_no endpoint = 1;
     nullable devtype_id deviceType = 2;
@@ -338,7 +338,7 @@ server cluster AccessControl = 31 {
     fabric_sensitive AccessControlEntryPrivilegeEnum privilege = 1;
     fabric_sensitive AccessControlEntryAuthModeEnum authMode = 2;
     nullable fabric_sensitive int64u subjects[] = 3;
-    nullable fabric_sensitive Target targets[] = 4;
+    nullable fabric_sensitive AccessControlTargetStruct targets[] = 4;
     fabric_idx fabricIndex = 254;
   }
 
diff --git a/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter b/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter
index 27823b667a74b2..582bd4f96ce6e8 100644
--- a/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter
+++ b/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter
@@ -166,7 +166,7 @@ server cluster AccessControl = 31 {
     kRemoved = 2;
   }
 
-  struct Target {
+  struct AccessControlTargetStruct {
     nullable cluster_id cluster = 0;
     nullable endpoint_no endpoint = 1;
     nullable devtype_id deviceType = 2;
@@ -176,7 +176,7 @@ server cluster AccessControl = 31 {
     fabric_sensitive AccessControlEntryPrivilegeEnum privilege = 1;
     fabric_sensitive AccessControlEntryAuthModeEnum authMode = 2;
     nullable fabric_sensitive int64u subjects[] = 3;
-    nullable fabric_sensitive Target targets[] = 4;
+    nullable fabric_sensitive AccessControlTargetStruct targets[] = 4;
     fabric_idx fabricIndex = 254;
   }
 
diff --git a/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter b/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter
index 4ecf95da1ebf9b..d49c8e7f5e9563 100644
--- a/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter
+++ b/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter
@@ -250,7 +250,7 @@ server cluster AccessControl = 31 {
     kRemoved = 2;
   }
 
-  struct Target {
+  struct AccessControlTargetStruct {
     nullable cluster_id cluster = 0;
     nullable endpoint_no endpoint = 1;
     nullable devtype_id deviceType = 2;
@@ -260,7 +260,7 @@ server cluster AccessControl = 31 {
     fabric_sensitive AccessControlEntryPrivilegeEnum privilege = 1;
     fabric_sensitive AccessControlEntryAuthModeEnum authMode = 2;
     nullable fabric_sensitive int64u subjects[] = 3;
-    nullable fabric_sensitive Target targets[] = 4;
+    nullable fabric_sensitive AccessControlTargetStruct targets[] = 4;
     fabric_idx fabricIndex = 254;
   }
 
diff --git a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter
index 63f51e5ea5ee6a..c7497fb1c97570 100644
--- a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter
+++ b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter
@@ -322,7 +322,7 @@ server cluster AccessControl = 31 {
     kRemoved = 2;
   }
 
-  struct Target {
+  struct AccessControlTargetStruct {
     nullable cluster_id cluster = 0;
     nullable endpoint_no endpoint = 1;
     nullable devtype_id deviceType = 2;
@@ -332,7 +332,7 @@ server cluster AccessControl = 31 {
     fabric_sensitive AccessControlEntryPrivilegeEnum privilege = 1;
     fabric_sensitive AccessControlEntryAuthModeEnum authMode = 2;
     nullable fabric_sensitive int64u subjects[] = 3;
-    nullable fabric_sensitive Target targets[] = 4;
+    nullable fabric_sensitive AccessControlTargetStruct targets[] = 4;
     fabric_idx fabricIndex = 254;
   }
 
diff --git a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter
index 5d6d52e5d51ee2..b88238c22b429f 100644
--- a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter
+++ b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter
@@ -250,7 +250,7 @@ server cluster AccessControl = 31 {
     kRemoved = 2;
   }
 
-  struct Target {
+  struct AccessControlTargetStruct {
     nullable cluster_id cluster = 0;
     nullable endpoint_no endpoint = 1;
     nullable devtype_id deviceType = 2;
@@ -260,7 +260,7 @@ server cluster AccessControl = 31 {
     fabric_sensitive AccessControlEntryPrivilegeEnum privilege = 1;
     fabric_sensitive AccessControlEntryAuthModeEnum authMode = 2;
     nullable fabric_sensitive int64u subjects[] = 3;
-    nullable fabric_sensitive Target targets[] = 4;
+    nullable fabric_sensitive AccessControlTargetStruct targets[] = 4;
     fabric_idx fabricIndex = 254;
   }
 
diff --git a/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter b/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter
index a1d3bd0dbb437f..4a7bfc0b5da180 100644
--- a/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter
+++ b/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter
@@ -250,7 +250,7 @@ server cluster AccessControl = 31 {
     kRemoved = 2;
   }
 
-  struct Target {
+  struct AccessControlTargetStruct {
     nullable cluster_id cluster = 0;
     nullable endpoint_no endpoint = 1;
     nullable devtype_id deviceType = 2;
@@ -260,7 +260,7 @@ server cluster AccessControl = 31 {
     fabric_sensitive AccessControlEntryPrivilegeEnum privilege = 1;
     fabric_sensitive AccessControlEntryAuthModeEnum authMode = 2;
     nullable fabric_sensitive int64u subjects[] = 3;
-    nullable fabric_sensitive Target targets[] = 4;
+    nullable fabric_sensitive AccessControlTargetStruct targets[] = 4;
     fabric_idx fabricIndex = 254;
   }
 
diff --git a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter
index ac8a603b1269eb..4ed6d772f53b4f 100644
--- a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter
+++ b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter
@@ -250,7 +250,7 @@ server cluster AccessControl = 31 {
     kRemoved = 2;
   }
 
-  struct Target {
+  struct AccessControlTargetStruct {
     nullable cluster_id cluster = 0;
     nullable endpoint_no endpoint = 1;
     nullable devtype_id deviceType = 2;
@@ -260,7 +260,7 @@ server cluster AccessControl = 31 {
     fabric_sensitive AccessControlEntryPrivilegeEnum privilege = 1;
     fabric_sensitive AccessControlEntryAuthModeEnum authMode = 2;
     nullable fabric_sensitive int64u subjects[] = 3;
-    nullable fabric_sensitive Target targets[] = 4;
+    nullable fabric_sensitive AccessControlTargetStruct targets[] = 4;
     fabric_idx fabricIndex = 254;
   }
 
diff --git a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter
index d60e467378e6c8..6e0ec096b149cd 100644
--- a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter
+++ b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter
@@ -328,7 +328,7 @@ server cluster AccessControl = 31 {
     kRemoved = 2;
   }
 
-  struct Target {
+  struct AccessControlTargetStruct {
     nullable cluster_id cluster = 0;
     nullable endpoint_no endpoint = 1;
     nullable devtype_id deviceType = 2;
@@ -338,7 +338,7 @@ server cluster AccessControl = 31 {
     fabric_sensitive AccessControlEntryPrivilegeEnum privilege = 1;
     fabric_sensitive AccessControlEntryAuthModeEnum authMode = 2;
     nullable fabric_sensitive int64u subjects[] = 3;
-    nullable fabric_sensitive Target targets[] = 4;
+    nullable fabric_sensitive AccessControlTargetStruct targets[] = 4;
     fabric_idx fabricIndex = 254;
   }
 
diff --git a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter
index 889f6dbe0895ed..f4b22d6633e7b1 100644
--- a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter
+++ b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter
@@ -291,7 +291,7 @@ server cluster AccessControl = 31 {
     kRemoved = 2;
   }
 
-  struct Target {
+  struct AccessControlTargetStruct {
     nullable cluster_id cluster = 0;
     nullable endpoint_no endpoint = 1;
     nullable devtype_id deviceType = 2;
@@ -301,7 +301,7 @@ server cluster AccessControl = 31 {
     fabric_sensitive AccessControlEntryPrivilegeEnum privilege = 1;
     fabric_sensitive AccessControlEntryAuthModeEnum authMode = 2;
     nullable fabric_sensitive int64u subjects[] = 3;
-    nullable fabric_sensitive Target targets[] = 4;
+    nullable fabric_sensitive AccessControlTargetStruct targets[] = 4;
     fabric_idx fabricIndex = 254;
   }
 
diff --git a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter
index a2334a9ac6fd6a..8f5974a3d71e54 100644
--- a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter
+++ b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter
@@ -227,7 +227,7 @@ server cluster AccessControl = 31 {
     kRemoved = 2;
   }
 
-  struct Target {
+  struct AccessControlTargetStruct {
     nullable cluster_id cluster = 0;
     nullable endpoint_no endpoint = 1;
     nullable devtype_id deviceType = 2;
@@ -237,7 +237,7 @@ server cluster AccessControl = 31 {
     fabric_sensitive AccessControlEntryPrivilegeEnum privilege = 1;
     fabric_sensitive AccessControlEntryAuthModeEnum authMode = 2;
     nullable fabric_sensitive int64u subjects[] = 3;
-    nullable fabric_sensitive Target targets[] = 4;
+    nullable fabric_sensitive AccessControlTargetStruct targets[] = 4;
     fabric_idx fabricIndex = 254;
   }
 
diff --git a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter
index e25f30f691fbf6..b38c45a2bd3477 100644
--- a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter
+++ b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter
@@ -250,7 +250,7 @@ server cluster AccessControl = 31 {
     kRemoved = 2;
   }
 
-  struct Target {
+  struct AccessControlTargetStruct {
     nullable cluster_id cluster = 0;
     nullable endpoint_no endpoint = 1;
     nullable devtype_id deviceType = 2;
@@ -260,7 +260,7 @@ server cluster AccessControl = 31 {
     fabric_sensitive AccessControlEntryPrivilegeEnum privilege = 1;
     fabric_sensitive AccessControlEntryAuthModeEnum authMode = 2;
     nullable fabric_sensitive int64u subjects[] = 3;
-    nullable fabric_sensitive Target targets[] = 4;
+    nullable fabric_sensitive AccessControlTargetStruct targets[] = 4;
     fabric_idx fabricIndex = 254;
   }
 
diff --git a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter
index 75b4b86c9f1443..4f34fdd41dae6d 100644
--- a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter
+++ b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter
@@ -322,7 +322,7 @@ server cluster AccessControl = 31 {
     kRemoved = 2;
   }
 
-  struct Target {
+  struct AccessControlTargetStruct {
     nullable cluster_id cluster = 0;
     nullable endpoint_no endpoint = 1;
     nullable devtype_id deviceType = 2;
@@ -332,7 +332,7 @@ server cluster AccessControl = 31 {
     fabric_sensitive AccessControlEntryPrivilegeEnum privilege = 1;
     fabric_sensitive AccessControlEntryAuthModeEnum authMode = 2;
     nullable fabric_sensitive int64u subjects[] = 3;
-    nullable fabric_sensitive Target targets[] = 4;
+    nullable fabric_sensitive AccessControlTargetStruct targets[] = 4;
     fabric_idx fabricIndex = 254;
   }
 
diff --git a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter
index 38b122b44ea457..fbb9233d5d9a9f 100644
--- a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter
+++ b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter
@@ -250,7 +250,7 @@ server cluster AccessControl = 31 {
     kRemoved = 2;
   }
 
-  struct Target {
+  struct AccessControlTargetStruct {
     nullable cluster_id cluster = 0;
     nullable endpoint_no endpoint = 1;
     nullable devtype_id deviceType = 2;
@@ -260,7 +260,7 @@ server cluster AccessControl = 31 {
     fabric_sensitive AccessControlEntryPrivilegeEnum privilege = 1;
     fabric_sensitive AccessControlEntryAuthModeEnum authMode = 2;
     nullable fabric_sensitive int64u subjects[] = 3;
-    nullable fabric_sensitive Target targets[] = 4;
+    nullable fabric_sensitive AccessControlTargetStruct targets[] = 4;
     fabric_idx fabricIndex = 254;
   }
 
diff --git a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter
index f45c4ad63689ec..1dc75f8abc6d55 100644
--- a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter
+++ b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter
@@ -179,7 +179,7 @@ server cluster AccessControl = 31 {
     kRemoved = 2;
   }
 
-  struct Target {
+  struct AccessControlTargetStruct {
     nullable cluster_id cluster = 0;
     nullable endpoint_no endpoint = 1;
     nullable devtype_id deviceType = 2;
@@ -189,7 +189,7 @@ server cluster AccessControl = 31 {
     fabric_sensitive AccessControlEntryPrivilegeEnum privilege = 1;
     fabric_sensitive AccessControlEntryAuthModeEnum authMode = 2;
     nullable fabric_sensitive int64u subjects[] = 3;
-    nullable fabric_sensitive Target targets[] = 4;
+    nullable fabric_sensitive AccessControlTargetStruct targets[] = 4;
     fabric_idx fabricIndex = 254;
   }
 
diff --git a/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter b/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter
index 4fb63ee98280f7..3995f242f0931b 100644
--- a/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter
+++ b/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter
@@ -179,7 +179,7 @@ server cluster AccessControl = 31 {
     kRemoved = 2;
   }
 
-  struct Target {
+  struct AccessControlTargetStruct {
     nullable cluster_id cluster = 0;
     nullable endpoint_no endpoint = 1;
     nullable devtype_id deviceType = 2;
@@ -189,7 +189,7 @@ server cluster AccessControl = 31 {
     fabric_sensitive AccessControlEntryPrivilegeEnum privilege = 1;
     fabric_sensitive AccessControlEntryAuthModeEnum authMode = 2;
     nullable fabric_sensitive int64u subjects[] = 3;
-    nullable fabric_sensitive Target targets[] = 4;
+    nullable fabric_sensitive AccessControlTargetStruct targets[] = 4;
     fabric_idx fabricIndex = 254;
   }
 
diff --git a/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.matter b/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.matter
index 492e2d81c7fc67..18715acb6f5ec4 100644
--- a/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.matter
+++ b/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.matter
@@ -166,7 +166,7 @@ server cluster AccessControl = 31 {
     kRemoved = 2;
   }
 
-  struct Target {
+  struct AccessControlTargetStruct {
     nullable cluster_id cluster = 0;
     nullable endpoint_no endpoint = 1;
     nullable devtype_id deviceType = 2;
@@ -176,7 +176,7 @@ server cluster AccessControl = 31 {
     fabric_sensitive AccessControlEntryPrivilegeEnum privilege = 1;
     fabric_sensitive AccessControlEntryAuthModeEnum authMode = 2;
     nullable fabric_sensitive int64u subjects[] = 3;
-    nullable fabric_sensitive Target targets[] = 4;
+    nullable fabric_sensitive AccessControlTargetStruct targets[] = 4;
     fabric_idx fabricIndex = 254;
   }
 
diff --git a/examples/dynamic-bridge-app/bridge-common/bridge-app.matter b/examples/dynamic-bridge-app/bridge-common/bridge-app.matter
index 1509a4b1a3e89c..81ee27dfd43ef9 100644
--- a/examples/dynamic-bridge-app/bridge-common/bridge-app.matter
+++ b/examples/dynamic-bridge-app/bridge-common/bridge-app.matter
@@ -272,7 +272,7 @@ client cluster AccessControl = 31 {
     kRemoved = 2;
   }
 
-  struct Target {
+  struct AccessControlTargetStruct {
     nullable cluster_id cluster = 0;
     nullable endpoint_no endpoint = 1;
     nullable devtype_id deviceType = 2;
@@ -282,7 +282,7 @@ client cluster AccessControl = 31 {
     fabric_sensitive AccessControlEntryPrivilegeEnum privilege = 1;
     fabric_sensitive AccessControlEntryAuthModeEnum authMode = 2;
     nullable fabric_sensitive int64u subjects[] = 3;
-    nullable fabric_sensitive Target targets[] = 4;
+    nullable fabric_sensitive AccessControlTargetStruct targets[] = 4;
     fabric_idx fabricIndex = 254;
   }
 
@@ -345,7 +345,7 @@ server cluster AccessControl = 31 {
     kRemoved = 2;
   }
 
-  struct Target {
+  struct AccessControlTargetStruct {
     nullable cluster_id cluster = 0;
     nullable endpoint_no endpoint = 1;
     nullable devtype_id deviceType = 2;
@@ -355,7 +355,7 @@ server cluster AccessControl = 31 {
     fabric_sensitive AccessControlEntryPrivilegeEnum privilege = 1;
     fabric_sensitive AccessControlEntryAuthModeEnum authMode = 2;
     nullable fabric_sensitive int64u subjects[] = 3;
-    nullable fabric_sensitive Target targets[] = 4;
+    nullable fabric_sensitive AccessControlTargetStruct targets[] = 4;
     fabric_idx fabricIndex = 254;
   }
 
diff --git a/examples/light-switch-app/light-switch-common/light-switch-app.matter b/examples/light-switch-app/light-switch-common/light-switch-app.matter
index d6121d1d021e52..da4208b3f9b036 100644
--- a/examples/light-switch-app/light-switch-common/light-switch-app.matter
+++ b/examples/light-switch-app/light-switch-common/light-switch-app.matter
@@ -474,7 +474,7 @@ server cluster AccessControl = 31 {
     kRemoved = 2;
   }
 
-  struct Target {
+  struct AccessControlTargetStruct {
     nullable cluster_id cluster = 0;
     nullable endpoint_no endpoint = 1;
     nullable devtype_id deviceType = 2;
@@ -484,7 +484,7 @@ server cluster AccessControl = 31 {
     fabric_sensitive AccessControlEntryPrivilegeEnum privilege = 1;
     fabric_sensitive AccessControlEntryAuthModeEnum authMode = 2;
     nullable fabric_sensitive int64u subjects[] = 3;
-    nullable fabric_sensitive Target targets[] = 4;
+    nullable fabric_sensitive AccessControlTargetStruct targets[] = 4;
     fabric_idx fabricIndex = 254;
   }
 
diff --git a/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.matter b/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.matter
index fb480cc02709f3..2dbd199b75aa36 100644
--- a/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.matter
+++ b/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.matter
@@ -336,7 +336,7 @@ server cluster AccessControl = 31 {
     kRemoved = 2;
   }
 
-  struct Target {
+  struct AccessControlTargetStruct {
     nullable cluster_id cluster = 0;
     nullable endpoint_no endpoint = 1;
     nullable devtype_id deviceType = 2;
@@ -346,7 +346,7 @@ server cluster AccessControl = 31 {
     fabric_sensitive AccessControlEntryPrivilegeEnum privilege = 1;
     fabric_sensitive AccessControlEntryAuthModeEnum authMode = 2;
     nullable fabric_sensitive int64u subjects[] = 3;
-    nullable fabric_sensitive Target targets[] = 4;
+    nullable fabric_sensitive AccessControlTargetStruct targets[] = 4;
     fabric_idx fabricIndex = 254;
   }
 
diff --git a/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.matter b/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.matter
index 1bd328d9902415..0716b734e7f564 100644
--- a/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.matter
+++ b/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.matter
@@ -336,7 +336,7 @@ server cluster AccessControl = 31 {
     kRemoved = 2;
   }
 
-  struct Target {
+  struct AccessControlTargetStruct {
     nullable cluster_id cluster = 0;
     nullable endpoint_no endpoint = 1;
     nullable devtype_id deviceType = 2;
@@ -346,7 +346,7 @@ server cluster AccessControl = 31 {
     fabric_sensitive AccessControlEntryPrivilegeEnum privilege = 1;
     fabric_sensitive AccessControlEntryAuthModeEnum authMode = 2;
     nullable fabric_sensitive int64u subjects[] = 3;
-    nullable fabric_sensitive Target targets[] = 4;
+    nullable fabric_sensitive AccessControlTargetStruct targets[] = 4;
     fabric_idx fabricIndex = 254;
   }
 
diff --git a/examples/lighting-app/lighting-common/lighting-app.matter b/examples/lighting-app/lighting-common/lighting-app.matter
index 95ebbc9ec993d4..c78228137c6bb1 100644
--- a/examples/lighting-app/lighting-common/lighting-app.matter
+++ b/examples/lighting-app/lighting-common/lighting-app.matter
@@ -336,7 +336,7 @@ server cluster AccessControl = 31 {
     kRemoved = 2;
   }
 
-  struct Target {
+  struct AccessControlTargetStruct {
     nullable cluster_id cluster = 0;
     nullable endpoint_no endpoint = 1;
     nullable devtype_id deviceType = 2;
@@ -346,7 +346,7 @@ server cluster AccessControl = 31 {
     fabric_sensitive AccessControlEntryPrivilegeEnum privilege = 1;
     fabric_sensitive AccessControlEntryAuthModeEnum authMode = 2;
     nullable fabric_sensitive int64u subjects[] = 3;
-    nullable fabric_sensitive Target targets[] = 4;
+    nullable fabric_sensitive AccessControlTargetStruct targets[] = 4;
     fabric_idx fabricIndex = 254;
   }
 
diff --git a/examples/lighting-app/nxp/zap/lighting-on-off.matter b/examples/lighting-app/nxp/zap/lighting-on-off.matter
index 387a168abe9443..34bf74292995e6 100644
--- a/examples/lighting-app/nxp/zap/lighting-on-off.matter
+++ b/examples/lighting-app/nxp/zap/lighting-on-off.matter
@@ -329,7 +329,7 @@ server cluster AccessControl = 31 {
     kRemoved = 2;
   }
 
-  struct Target {
+  struct AccessControlTargetStruct {
     nullable cluster_id cluster = 0;
     nullable endpoint_no endpoint = 1;
     nullable devtype_id deviceType = 2;
@@ -339,7 +339,7 @@ server cluster AccessControl = 31 {
     fabric_sensitive AccessControlEntryPrivilegeEnum privilege = 1;
     fabric_sensitive AccessControlEntryAuthModeEnum authMode = 2;
     nullable fabric_sensitive int64u subjects[] = 3;
-    nullable fabric_sensitive Target targets[] = 4;
+    nullable fabric_sensitive AccessControlTargetStruct targets[] = 4;
     fabric_idx fabricIndex = 254;
   }
 
diff --git a/examples/lighting-app/qpg/zap/light.matter b/examples/lighting-app/qpg/zap/light.matter
index a92a666f4710e9..40c423237c181a 100644
--- a/examples/lighting-app/qpg/zap/light.matter
+++ b/examples/lighting-app/qpg/zap/light.matter
@@ -332,7 +332,7 @@ server cluster AccessControl = 31 {
     kRemoved = 2;
   }
 
-  struct Target {
+  struct AccessControlTargetStruct {
     nullable cluster_id cluster = 0;
     nullable endpoint_no endpoint = 1;
     nullable devtype_id deviceType = 2;
@@ -342,7 +342,7 @@ server cluster AccessControl = 31 {
     fabric_sensitive AccessControlEntryPrivilegeEnum privilege = 1;
     fabric_sensitive AccessControlEntryAuthModeEnum authMode = 2;
     nullable fabric_sensitive int64u subjects[] = 3;
-    nullable fabric_sensitive Target targets[] = 4;
+    nullable fabric_sensitive AccessControlTargetStruct targets[] = 4;
     fabric_idx fabricIndex = 254;
   }
 
diff --git a/examples/lighting-app/silabs/efr32/data_model/lighting-thread-app.matter b/examples/lighting-app/silabs/efr32/data_model/lighting-thread-app.matter
index 250b1f18ebb39f..2f59d01d4fcbdd 100644
--- a/examples/lighting-app/silabs/efr32/data_model/lighting-thread-app.matter
+++ b/examples/lighting-app/silabs/efr32/data_model/lighting-thread-app.matter
@@ -336,7 +336,7 @@ server cluster AccessControl = 31 {
     kRemoved = 2;
   }
 
-  struct Target {
+  struct AccessControlTargetStruct {
     nullable cluster_id cluster = 0;
     nullable endpoint_no endpoint = 1;
     nullable devtype_id deviceType = 2;
@@ -346,7 +346,7 @@ server cluster AccessControl = 31 {
     fabric_sensitive AccessControlEntryPrivilegeEnum privilege = 1;
     fabric_sensitive AccessControlEntryAuthModeEnum authMode = 2;
     nullable fabric_sensitive int64u subjects[] = 3;
-    nullable fabric_sensitive Target targets[] = 4;
+    nullable fabric_sensitive AccessControlTargetStruct targets[] = 4;
     fabric_idx fabricIndex = 254;
   }
 
diff --git a/examples/lighting-app/silabs/efr32/data_model/lighting-wifi-app.matter b/examples/lighting-app/silabs/efr32/data_model/lighting-wifi-app.matter
index 20248c67383065..73d2de73ab4308 100644
--- a/examples/lighting-app/silabs/efr32/data_model/lighting-wifi-app.matter
+++ b/examples/lighting-app/silabs/efr32/data_model/lighting-wifi-app.matter
@@ -336,7 +336,7 @@ server cluster AccessControl = 31 {
     kRemoved = 2;
   }
 
-  struct Target {
+  struct AccessControlTargetStruct {
     nullable cluster_id cluster = 0;
     nullable endpoint_no endpoint = 1;
     nullable devtype_id deviceType = 2;
@@ -346,7 +346,7 @@ server cluster AccessControl = 31 {
     fabric_sensitive AccessControlEntryPrivilegeEnum privilege = 1;
     fabric_sensitive AccessControlEntryAuthModeEnum authMode = 2;
     nullable fabric_sensitive int64u subjects[] = 3;
-    nullable fabric_sensitive Target targets[] = 4;
+    nullable fabric_sensitive AccessControlTargetStruct targets[] = 4;
     fabric_idx fabricIndex = 254;
   }
 
diff --git a/examples/lock-app/lock-common/lock-app.matter b/examples/lock-app/lock-common/lock-app.matter
index 805736e96c7bba..8c6c9a892e0cc0 100644
--- a/examples/lock-app/lock-common/lock-app.matter
+++ b/examples/lock-app/lock-common/lock-app.matter
@@ -143,7 +143,7 @@ server cluster AccessControl = 31 {
     kRemoved = 2;
   }
 
-  struct Target {
+  struct AccessControlTargetStruct {
     nullable cluster_id cluster = 0;
     nullable endpoint_no endpoint = 1;
     nullable devtype_id deviceType = 2;
@@ -153,7 +153,7 @@ server cluster AccessControl = 31 {
     fabric_sensitive AccessControlEntryPrivilegeEnum privilege = 1;
     fabric_sensitive AccessControlEntryAuthModeEnum authMode = 2;
     nullable fabric_sensitive int64u subjects[] = 3;
-    nullable fabric_sensitive Target targets[] = 4;
+    nullable fabric_sensitive AccessControlTargetStruct targets[] = 4;
     fabric_idx fabricIndex = 254;
   }
 
diff --git a/examples/lock-app/nxp/zap/lock-app.matter b/examples/lock-app/nxp/zap/lock-app.matter
index a417b7f3f53522..2d99894bcf4d4f 100644
--- a/examples/lock-app/nxp/zap/lock-app.matter
+++ b/examples/lock-app/nxp/zap/lock-app.matter
@@ -101,7 +101,7 @@ server cluster AccessControl = 31 {
     kRemoved = 2;
   }
 
-  struct Target {
+  struct AccessControlTargetStruct {
     nullable cluster_id cluster = 0;
     nullable endpoint_no endpoint = 1;
     nullable devtype_id deviceType = 2;
@@ -111,7 +111,7 @@ server cluster AccessControl = 31 {
     fabric_sensitive AccessControlEntryPrivilegeEnum privilege = 1;
     fabric_sensitive AccessControlEntryAuthModeEnum authMode = 2;
     nullable fabric_sensitive int64u subjects[] = 3;
-    nullable fabric_sensitive Target targets[] = 4;
+    nullable fabric_sensitive AccessControlTargetStruct targets[] = 4;
     fabric_idx fabricIndex = 254;
   }
 
diff --git a/examples/lock-app/qpg/zap/lock.matter b/examples/lock-app/qpg/zap/lock.matter
index f77fed34c24f25..bf9b12ed538632 100644
--- a/examples/lock-app/qpg/zap/lock.matter
+++ b/examples/lock-app/qpg/zap/lock.matter
@@ -166,7 +166,7 @@ server cluster AccessControl = 31 {
     kRemoved = 2;
   }
 
-  struct Target {
+  struct AccessControlTargetStruct {
     nullable cluster_id cluster = 0;
     nullable endpoint_no endpoint = 1;
     nullable devtype_id deviceType = 2;
@@ -176,7 +176,7 @@ server cluster AccessControl = 31 {
     fabric_sensitive AccessControlEntryPrivilegeEnum privilege = 1;
     fabric_sensitive AccessControlEntryAuthModeEnum authMode = 2;
     nullable fabric_sensitive int64u subjects[] = 3;
-    nullable fabric_sensitive Target targets[] = 4;
+    nullable fabric_sensitive AccessControlTargetStruct targets[] = 4;
     fabric_idx fabricIndex = 254;
   }
 
diff --git a/examples/log-source-app/log-source-common/log-source-app.matter b/examples/log-source-app/log-source-common/log-source-app.matter
index 28a4b171b81e71..101588c19c93f3 100644
--- a/examples/log-source-app/log-source-common/log-source-app.matter
+++ b/examples/log-source-app/log-source-common/log-source-app.matter
@@ -36,7 +36,7 @@ server cluster AccessControl = 31 {
     kRemoved = 2;
   }
 
-  struct Target {
+  struct AccessControlTargetStruct {
     nullable cluster_id cluster = 0;
     nullable endpoint_no endpoint = 1;
     nullable devtype_id deviceType = 2;
@@ -46,7 +46,7 @@ server cluster AccessControl = 31 {
     fabric_sensitive AccessControlEntryPrivilegeEnum privilege = 1;
     fabric_sensitive AccessControlEntryAuthModeEnum authMode = 2;
     nullable fabric_sensitive int64u subjects[] = 3;
-    nullable fabric_sensitive Target targets[] = 4;
+    nullable fabric_sensitive AccessControlTargetStruct targets[] = 4;
     fabric_idx fabricIndex = 254;
   }
 
diff --git a/examples/ota-provider-app/ota-provider-common/ota-provider-app.matter b/examples/ota-provider-app/ota-provider-common/ota-provider-app.matter
index 4e61fd9904cffd..998567c2530fac 100644
--- a/examples/ota-provider-app/ota-provider-common/ota-provider-app.matter
+++ b/examples/ota-provider-app/ota-provider-common/ota-provider-app.matter
@@ -55,7 +55,7 @@ client cluster AccessControl = 31 {
     kRemoved = 2;
   }
 
-  struct Target {
+  struct AccessControlTargetStruct {
     nullable cluster_id cluster = 0;
     nullable endpoint_no endpoint = 1;
     nullable devtype_id deviceType = 2;
@@ -65,7 +65,7 @@ client cluster AccessControl = 31 {
     fabric_sensitive AccessControlEntryPrivilegeEnum privilege = 1;
     fabric_sensitive AccessControlEntryAuthModeEnum authMode = 2;
     nullable fabric_sensitive int64u subjects[] = 3;
-    nullable fabric_sensitive Target targets[] = 4;
+    nullable fabric_sensitive AccessControlTargetStruct targets[] = 4;
     fabric_idx fabricIndex = 254;
   }
 
@@ -128,7 +128,7 @@ server cluster AccessControl = 31 {
     kRemoved = 2;
   }
 
-  struct Target {
+  struct AccessControlTargetStruct {
     nullable cluster_id cluster = 0;
     nullable endpoint_no endpoint = 1;
     nullable devtype_id deviceType = 2;
@@ -138,7 +138,7 @@ server cluster AccessControl = 31 {
     fabric_sensitive AccessControlEntryPrivilegeEnum privilege = 1;
     fabric_sensitive AccessControlEntryAuthModeEnum authMode = 2;
     nullable fabric_sensitive int64u subjects[] = 3;
-    nullable fabric_sensitive Target targets[] = 4;
+    nullable fabric_sensitive AccessControlTargetStruct targets[] = 4;
     fabric_idx fabricIndex = 254;
   }
 
diff --git a/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter b/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter
index e2b8ee36f81270..6f1a22ac175f81 100644
--- a/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter
+++ b/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter
@@ -228,7 +228,7 @@ server cluster AccessControl = 31 {
     kRemoved = 2;
   }
 
-  struct Target {
+  struct AccessControlTargetStruct {
     nullable cluster_id cluster = 0;
     nullable endpoint_no endpoint = 1;
     nullable devtype_id deviceType = 2;
@@ -238,7 +238,7 @@ server cluster AccessControl = 31 {
     fabric_sensitive AccessControlEntryPrivilegeEnum privilege = 1;
     fabric_sensitive AccessControlEntryAuthModeEnum authMode = 2;
     nullable fabric_sensitive int64u subjects[] = 3;
-    nullable fabric_sensitive Target targets[] = 4;
+    nullable fabric_sensitive AccessControlTargetStruct targets[] = 4;
     fabric_idx fabricIndex = 254;
   }
 
diff --git a/examples/placeholder/linux/apps/app1/config.matter b/examples/placeholder/linux/apps/app1/config.matter
index c7a4d886fda5c1..1865188c3118af 100644
--- a/examples/placeholder/linux/apps/app1/config.matter
+++ b/examples/placeholder/linux/apps/app1/config.matter
@@ -512,7 +512,7 @@ server cluster AccessControl = 31 {
     kRemoved = 2;
   }
 
-  struct Target {
+  struct AccessControlTargetStruct {
     nullable cluster_id cluster = 0;
     nullable endpoint_no endpoint = 1;
     nullable devtype_id deviceType = 2;
@@ -522,7 +522,7 @@ server cluster AccessControl = 31 {
     fabric_sensitive AccessControlEntryPrivilegeEnum privilege = 1;
     fabric_sensitive AccessControlEntryAuthModeEnum authMode = 2;
     nullable fabric_sensitive int64u subjects[] = 3;
-    nullable fabric_sensitive Target targets[] = 4;
+    nullable fabric_sensitive AccessControlTargetStruct targets[] = 4;
     fabric_idx fabricIndex = 254;
   }
 
diff --git a/examples/placeholder/linux/apps/app2/config.matter b/examples/placeholder/linux/apps/app2/config.matter
index 7e3ce228e46058..7ae83770cc884a 100644
--- a/examples/placeholder/linux/apps/app2/config.matter
+++ b/examples/placeholder/linux/apps/app2/config.matter
@@ -512,7 +512,7 @@ server cluster AccessControl = 31 {
     kRemoved = 2;
   }
 
-  struct Target {
+  struct AccessControlTargetStruct {
     nullable cluster_id cluster = 0;
     nullable endpoint_no endpoint = 1;
     nullable devtype_id deviceType = 2;
@@ -522,7 +522,7 @@ server cluster AccessControl = 31 {
     fabric_sensitive AccessControlEntryPrivilegeEnum privilege = 1;
     fabric_sensitive AccessControlEntryAuthModeEnum authMode = 2;
     nullable fabric_sensitive int64u subjects[] = 3;
-    nullable fabric_sensitive Target targets[] = 4;
+    nullable fabric_sensitive AccessControlTargetStruct targets[] = 4;
     fabric_idx fabricIndex = 254;
   }
 
diff --git a/examples/pump-app/pump-common/pump-app.matter b/examples/pump-app/pump-common/pump-app.matter
index 295e3a28d25392..3bac4bf2a3e799 100644
--- a/examples/pump-app/pump-common/pump-app.matter
+++ b/examples/pump-app/pump-common/pump-app.matter
@@ -257,7 +257,7 @@ server cluster AccessControl = 31 {
     kRemoved = 2;
   }
 
-  struct Target {
+  struct AccessControlTargetStruct {
     nullable cluster_id cluster = 0;
     nullable endpoint_no endpoint = 1;
     nullable devtype_id deviceType = 2;
@@ -267,7 +267,7 @@ server cluster AccessControl = 31 {
     fabric_sensitive AccessControlEntryPrivilegeEnum privilege = 1;
     fabric_sensitive AccessControlEntryAuthModeEnum authMode = 2;
     nullable fabric_sensitive int64u subjects[] = 3;
-    nullable fabric_sensitive Target targets[] = 4;
+    nullable fabric_sensitive AccessControlTargetStruct targets[] = 4;
     fabric_idx fabricIndex = 254;
   }
 
diff --git a/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter b/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter
index a6569cfe537871..a28e9bb575af0b 100644
--- a/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter
+++ b/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter
@@ -182,7 +182,7 @@ server cluster AccessControl = 31 {
     kRemoved = 2;
   }
 
-  struct Target {
+  struct AccessControlTargetStruct {
     nullable cluster_id cluster = 0;
     nullable endpoint_no endpoint = 1;
     nullable devtype_id deviceType = 2;
@@ -192,7 +192,7 @@ server cluster AccessControl = 31 {
     fabric_sensitive AccessControlEntryPrivilegeEnum privilege = 1;
     fabric_sensitive AccessControlEntryAuthModeEnum authMode = 2;
     nullable fabric_sensitive int64u subjects[] = 3;
-    nullable fabric_sensitive Target targets[] = 4;
+    nullable fabric_sensitive AccessControlTargetStruct targets[] = 4;
     fabric_idx fabricIndex = 254;
   }
 
diff --git a/examples/temperature-measurement-app/temperature-measurement-common/temperature-measurement.matter b/examples/temperature-measurement-app/temperature-measurement-common/temperature-measurement.matter
index 80bcc673f64119..ebe168fb236915 100644
--- a/examples/temperature-measurement-app/temperature-measurement-common/temperature-measurement.matter
+++ b/examples/temperature-measurement-app/temperature-measurement-common/temperature-measurement.matter
@@ -55,7 +55,7 @@ server cluster AccessControl = 31 {
     kRemoved = 2;
   }
 
-  struct Target {
+  struct AccessControlTargetStruct {
     nullable cluster_id cluster = 0;
     nullable endpoint_no endpoint = 1;
     nullable devtype_id deviceType = 2;
@@ -65,7 +65,7 @@ server cluster AccessControl = 31 {
     fabric_sensitive AccessControlEntryPrivilegeEnum privilege = 1;
     fabric_sensitive AccessControlEntryAuthModeEnum authMode = 2;
     nullable fabric_sensitive int64u subjects[] = 3;
-    nullable fabric_sensitive Target targets[] = 4;
+    nullable fabric_sensitive AccessControlTargetStruct targets[] = 4;
     fabric_idx fabricIndex = 254;
   }
 
diff --git a/examples/thermostat/thermostat-common/thermostat.matter b/examples/thermostat/thermostat-common/thermostat.matter
index 6e4528e50cffd7..2338de0db03649 100644
--- a/examples/thermostat/thermostat-common/thermostat.matter
+++ b/examples/thermostat/thermostat-common/thermostat.matter
@@ -350,7 +350,7 @@ server cluster AccessControl = 31 {
     kRemoved = 2;
   }
 
-  struct Target {
+  struct AccessControlTargetStruct {
     nullable cluster_id cluster = 0;
     nullable endpoint_no endpoint = 1;
     nullable devtype_id deviceType = 2;
@@ -360,7 +360,7 @@ server cluster AccessControl = 31 {
     fabric_sensitive AccessControlEntryPrivilegeEnum privilege = 1;
     fabric_sensitive AccessControlEntryAuthModeEnum authMode = 2;
     nullable fabric_sensitive int64u subjects[] = 3;
-    nullable fabric_sensitive Target targets[] = 4;
+    nullable fabric_sensitive AccessControlTargetStruct targets[] = 4;
     fabric_idx fabricIndex = 254;
   }
 
diff --git a/examples/tv-app/tv-common/tv-app.matter b/examples/tv-app/tv-common/tv-app.matter
index ccec137cbe0382..c86d83ad658a8d 100644
--- a/examples/tv-app/tv-common/tv-app.matter
+++ b/examples/tv-app/tv-common/tv-app.matter
@@ -245,7 +245,7 @@ server cluster AccessControl = 31 {
     kRemoved = 2;
   }
 
-  struct Target {
+  struct AccessControlTargetStruct {
     nullable cluster_id cluster = 0;
     nullable endpoint_no endpoint = 1;
     nullable devtype_id deviceType = 2;
@@ -255,7 +255,7 @@ server cluster AccessControl = 31 {
     fabric_sensitive AccessControlEntryPrivilegeEnum privilege = 1;
     fabric_sensitive AccessControlEntryAuthModeEnum authMode = 2;
     nullable fabric_sensitive int64u subjects[] = 3;
-    nullable fabric_sensitive Target targets[] = 4;
+    nullable fabric_sensitive AccessControlTargetStruct targets[] = 4;
     fabric_idx fabricIndex = 254;
   }
 
diff --git a/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter b/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter
index 679f0da2f11e81..ce145138afd91b 100644
--- a/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter
+++ b/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter
@@ -402,7 +402,7 @@ server cluster AccessControl = 31 {
     kRemoved = 2;
   }
 
-  struct Target {
+  struct AccessControlTargetStruct {
     nullable cluster_id cluster = 0;
     nullable endpoint_no endpoint = 1;
     nullable devtype_id deviceType = 2;
@@ -412,7 +412,7 @@ server cluster AccessControl = 31 {
     fabric_sensitive AccessControlEntryPrivilegeEnum privilege = 1;
     fabric_sensitive AccessControlEntryAuthModeEnum authMode = 2;
     nullable fabric_sensitive int64u subjects[] = 3;
-    nullable fabric_sensitive Target targets[] = 4;
+    nullable fabric_sensitive AccessControlTargetStruct targets[] = 4;
     fabric_idx fabricIndex = 254;
   }
 
diff --git a/examples/window-app/common/window-app.matter b/examples/window-app/common/window-app.matter
index 144b19bd761a57..95241b99403f68 100644
--- a/examples/window-app/common/window-app.matter
+++ b/examples/window-app/common/window-app.matter
@@ -283,7 +283,7 @@ server cluster AccessControl = 31 {
     kRemoved = 2;
   }
 
-  struct Target {
+  struct AccessControlTargetStruct {
     nullable cluster_id cluster = 0;
     nullable endpoint_no endpoint = 1;
     nullable devtype_id deviceType = 2;
@@ -293,7 +293,7 @@ server cluster AccessControl = 31 {
     fabric_sensitive AccessControlEntryPrivilegeEnum privilege = 1;
     fabric_sensitive AccessControlEntryAuthModeEnum authMode = 2;
     nullable fabric_sensitive int64u subjects[] = 3;
-    nullable fabric_sensitive Target targets[] = 4;
+    nullable fabric_sensitive AccessControlTargetStruct targets[] = 4;
     fabric_idx fabricIndex = 254;
   }
 
diff --git a/src/app/server/AclStorage.cpp b/src/app/server/AclStorage.cpp
index 62b90ebab3e98c..03ebc7a1341906 100644
--- a/src/app/server/AclStorage.cpp
+++ b/src/app/server/AclStorage.cpp
@@ -27,7 +27,7 @@ using Entry            = AccessControl::Entry;
 using EntryListener    = AccessControl::EntryListener;
 using StagingAuthMode  = Clusters::AccessControl::AccessControlEntryAuthModeEnum;
 using StagingPrivilege = Clusters::AccessControl::AccessControlEntryPrivilegeEnum;
-using StagingTarget    = Clusters::AccessControl::Structs::Target::Type;
+using StagingTarget    = Clusters::AccessControl::Structs::AccessControlTargetStruct::Type;
 using Target           = AccessControl::Entry::Target;
 
 namespace {
diff --git a/src/app/server/AclStorage.h b/src/app/server/AclStorage.h
index bb12737328375e..6300bb66a5fb60 100644
--- a/src/app/server/AclStorage.h
+++ b/src/app/server/AclStorage.h
@@ -94,7 +94,7 @@ class AclStorage
     {
         using Entry         = Access::AccessControl::Entry;
         using StagingEntry  = Clusters::AccessControl::Structs::AccessControlEntryStruct::Type;
-        using StagingTarget = Clusters::AccessControl::Structs::Target::Type;
+        using StagingTarget = Clusters::AccessControl::Structs::AccessControlTargetStruct::Type;
 
     public:
         EncodableEntry(const Entry & entry) : mEntry(entry) {}
diff --git a/src/app/server/DefaultAclStorage.cpp b/src/app/server/DefaultAclStorage.cpp
index d36aaca31b8c3d..58d0d18feedda6 100644
--- a/src/app/server/DefaultAclStorage.cpp
+++ b/src/app/server/DefaultAclStorage.cpp
@@ -28,7 +28,7 @@ using Entry            = AccessControl::Entry;
 using EntryListener    = AccessControl::EntryListener;
 using StagingAuthMode  = Clusters::AccessControl::AccessControlEntryAuthModeEnum;
 using StagingPrivilege = Clusters::AccessControl::AccessControlEntryPrivilegeEnum;
-using StagingTarget    = Clusters::AccessControl::Structs::Target::Type;
+using StagingTarget    = Clusters::AccessControl::Structs::AccessControlTargetStruct::Type;
 using Target           = AccessControl::Entry::Target;
 
 namespace {
diff --git a/src/app/zap-templates/zcl/data-model/chip/access-control-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/access-control-cluster.xml
index ef1f55528ddf08..9dfca25814f008 100644
--- a/src/app/zap-templates/zcl/data-model/chip/access-control-cluster.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/access-control-cluster.xml
@@ -40,7 +40,7 @@ limitations under the License.
     <item name="Removed" value="0x02"/>
   </enum>
 
-  <struct name="Target">
+  <struct name="AccessControlTargetStruct">
     <cluster code="0x001F"/>
     <item fieldId="0" name="Cluster" type="cluster_id" isNullable="true"/>
     <item fieldId="1" name="Endpoint" type="endpoint_no" isNullable="true"/>
@@ -52,7 +52,7 @@ limitations under the License.
     <item fieldId="1" name="Privilege" type="AccessControlEntryPrivilegeEnum" isFabricSensitive="true"/>
     <item fieldId="2" name="AuthMode" type="AccessControlEntryAuthModeEnum" isFabricSensitive="true"/>
     <item fieldId="3" name="Subjects" type="INT64U" isNullable="true" array="true" isFabricSensitive="true"/>
-    <item fieldId="4" name="Targets" type="Target" isNullable="true" array="true" isFabricSensitive="true"/>
+    <item fieldId="4" name="Targets" type="AccessControlTargetStruct" isNullable="true" array="true" isFabricSensitive="true"/>
   </struct>
 
   <struct name="AccessControlExtensionStruct" isFabricScoped="true">
diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter
index 271670f7c03ac9..d5be767865f9ab 100644
--- a/src/controller/data_model/controller-clusters.matter
+++ b/src/controller/data_model/controller-clusters.matter
@@ -598,7 +598,7 @@ client cluster AccessControl = 31 {
     kRemoved = 2;
   }
 
-  struct Target {
+  struct AccessControlTargetStruct {
     nullable cluster_id cluster = 0;
     nullable endpoint_no endpoint = 1;
     nullable devtype_id deviceType = 2;
@@ -608,7 +608,7 @@ client cluster AccessControl = 31 {
     fabric_sensitive AccessControlEntryPrivilegeEnum privilege = 1;
     fabric_sensitive AccessControlEntryAuthModeEnum authMode = 2;
     nullable fabric_sensitive int64u subjects[] = 3;
-    nullable fabric_sensitive Target targets[] = 4;
+    nullable fabric_sensitive AccessControlTargetStruct targets[] = 4;
     fabric_idx fabricIndex = 254;
   }
 
diff --git a/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp b/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp
index 83f0c0b049b319..c3928fc61bab68 100644
--- a/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp
+++ b/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp
@@ -2368,24 +2368,27 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
                                 entry_3.deviceType.Value(), newElement_3_deviceType);
                         }
 
-                        jclass targetStructClass_4;
+                        jclass accessControlTargetStructStructClass_4;
                         err = chip::JniReferences::GetInstance().GetClassRef(
-                            env, "chip/devicecontroller/ChipStructs$AccessControlClusterTarget", targetStructClass_4);
+                            env, "chip/devicecontroller/ChipStructs$AccessControlClusterAccessControlTargetStruct",
+                            accessControlTargetStructStructClass_4);
                         if (err != CHIP_NO_ERROR)
                         {
-                            ChipLogError(Zcl, "Could not find class ChipStructs$AccessControlClusterTarget");
+                            ChipLogError(Zcl, "Could not find class ChipStructs$AccessControlClusterAccessControlTargetStruct");
                             return nullptr;
                         }
-                        jmethodID targetStructCtor_4 = env->GetMethodID(targetStructClass_4, "<init>",
-                                                                        "(Ljava/lang/Long;Ljava/lang/Integer;Ljava/lang/Long;)V");
-                        if (targetStructCtor_4 == nullptr)
+                        jmethodID accessControlTargetStructStructCtor_4 =
+                            env->GetMethodID(accessControlTargetStructStructClass_4, "<init>",
+                                             "(Ljava/lang/Long;Ljava/lang/Integer;Ljava/lang/Long;)V");
+                        if (accessControlTargetStructStructCtor_4 == nullptr)
                         {
-                            ChipLogError(Zcl, "Could not find ChipStructs$AccessControlClusterTarget constructor");
+                            ChipLogError(Zcl,
+                                         "Could not find ChipStructs$AccessControlClusterAccessControlTargetStruct constructor");
                             return nullptr;
                         }
 
-                        newElement_3 = env->NewObject(targetStructClass_4, targetStructCtor_4, newElement_3_cluster,
-                                                      newElement_3_endpoint, newElement_3_deviceType);
+                        newElement_3 = env->NewObject(accessControlTargetStructStructClass_4, accessControlTargetStructStructCtor_4,
+                                                      newElement_3_cluster, newElement_3_endpoint, newElement_3_deviceType);
                         chip::JniReferences::GetInstance().AddToList(newElement_0_targets, newElement_3);
                     }
                 }
diff --git a/src/controller/java/zap-generated/CHIPEventTLVValueDecoder.cpp b/src/controller/java/zap-generated/CHIPEventTLVValueDecoder.cpp
index 698b243a3100d1..97e66071a4f163 100644
--- a/src/controller/java/zap-generated/CHIPEventTLVValueDecoder.cpp
+++ b/src/controller/java/zap-generated/CHIPEventTLVValueDecoder.cpp
@@ -277,24 +277,27 @@ jobject DecodeEventValue(const app::ConcreteEventPath & aPath, TLV::TLVReader &
                                 entry_3.deviceType.Value(), newElement_3_deviceType);
                         }
 
-                        jclass targetStructClass_4;
+                        jclass accessControlTargetStructStructClass_4;
                         err = chip::JniReferences::GetInstance().GetClassRef(
-                            env, "chip/devicecontroller/ChipStructs$AccessControlClusterTarget", targetStructClass_4);
+                            env, "chip/devicecontroller/ChipStructs$AccessControlClusterAccessControlTargetStruct",
+                            accessControlTargetStructStructClass_4);
                         if (err != CHIP_NO_ERROR)
                         {
-                            ChipLogError(Zcl, "Could not find class ChipStructs$AccessControlClusterTarget");
+                            ChipLogError(Zcl, "Could not find class ChipStructs$AccessControlClusterAccessControlTargetStruct");
                             return nullptr;
                         }
-                        jmethodID targetStructCtor_4 = env->GetMethodID(targetStructClass_4, "<init>",
-                                                                        "(Ljava/lang/Long;Ljava/lang/Integer;Ljava/lang/Long;)V");
-                        if (targetStructCtor_4 == nullptr)
+                        jmethodID accessControlTargetStructStructCtor_4 =
+                            env->GetMethodID(accessControlTargetStructStructClass_4, "<init>",
+                                             "(Ljava/lang/Long;Ljava/lang/Integer;Ljava/lang/Long;)V");
+                        if (accessControlTargetStructStructCtor_4 == nullptr)
                         {
-                            ChipLogError(Zcl, "Could not find ChipStructs$AccessControlClusterTarget constructor");
+                            ChipLogError(Zcl,
+                                         "Could not find ChipStructs$AccessControlClusterAccessControlTargetStruct constructor");
                             return nullptr;
                         }
 
-                        newElement_3 = env->NewObject(targetStructClass_4, targetStructCtor_4, newElement_3_cluster,
-                                                      newElement_3_endpoint, newElement_3_deviceType);
+                        newElement_3 = env->NewObject(accessControlTargetStructStructClass_4, accessControlTargetStructStructCtor_4,
+                                                      newElement_3_cluster, newElement_3_endpoint, newElement_3_deviceType);
                         chip::JniReferences::GetInstance().AddToList(value_latestValue_targets, newElement_3);
                     }
                 }
diff --git a/src/controller/java/zap-generated/CHIPReadCallbacks.cpp b/src/controller/java/zap-generated/CHIPReadCallbacks.cpp
index 67b729f61bba45..1bc26a0625e228 100644
--- a/src/controller/java/zap-generated/CHIPReadCallbacks.cpp
+++ b/src/controller/java/zap-generated/CHIPReadCallbacks.cpp
@@ -4618,24 +4618,25 @@ void CHIPAccessControlAclAttributeCallback::CallbackFn(
                         entry_3.deviceType.Value(), newElement_3_deviceType);
                 }
 
-                jclass targetStructClass_4;
+                jclass accessControlTargetStructStructClass_4;
                 err = chip::JniReferences::GetInstance().GetClassRef(
-                    env, "chip/devicecontroller/ChipStructs$AccessControlClusterTarget", targetStructClass_4);
+                    env, "chip/devicecontroller/ChipStructs$AccessControlClusterAccessControlTargetStruct",
+                    accessControlTargetStructStructClass_4);
                 if (err != CHIP_NO_ERROR)
                 {
-                    ChipLogError(Zcl, "Could not find class ChipStructs$AccessControlClusterTarget");
+                    ChipLogError(Zcl, "Could not find class ChipStructs$AccessControlClusterAccessControlTargetStruct");
                     return;
                 }
-                jmethodID targetStructCtor_4 =
-                    env->GetMethodID(targetStructClass_4, "<init>", "(Ljava/lang/Long;Ljava/lang/Integer;Ljava/lang/Long;)V");
-                if (targetStructCtor_4 == nullptr)
+                jmethodID accessControlTargetStructStructCtor_4 = env->GetMethodID(
+                    accessControlTargetStructStructClass_4, "<init>", "(Ljava/lang/Long;Ljava/lang/Integer;Ljava/lang/Long;)V");
+                if (accessControlTargetStructStructCtor_4 == nullptr)
                 {
-                    ChipLogError(Zcl, "Could not find ChipStructs$AccessControlClusterTarget constructor");
+                    ChipLogError(Zcl, "Could not find ChipStructs$AccessControlClusterAccessControlTargetStruct constructor");
                     return;
                 }
 
-                newElement_3 = env->NewObject(targetStructClass_4, targetStructCtor_4, newElement_3_cluster, newElement_3_endpoint,
-                                              newElement_3_deviceType);
+                newElement_3 = env->NewObject(accessControlTargetStructStructClass_4, accessControlTargetStructStructCtor_4,
+                                              newElement_3_cluster, newElement_3_endpoint, newElement_3_deviceType);
                 chip::JniReferences::GetInstance().AddToList(newElement_0_targets, newElement_3);
             }
         }
diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ChipStructs.java b/src/controller/java/zap-generated/chip/devicecontroller/ChipStructs.java
index 2e3c03514c24b4..a039df15f6aa64 100644
--- a/src/controller/java/zap-generated/chip/devicecontroller/ChipStructs.java
+++ b/src/controller/java/zap-generated/chip/devicecontroller/ChipStructs.java
@@ -142,12 +142,12 @@ public String toString() {
     }
   }
 
-  public static class AccessControlClusterTarget {
+  public static class AccessControlClusterAccessControlTargetStruct {
     public @Nullable Long cluster;
     public @Nullable Integer endpoint;
     public @Nullable Long deviceType;
 
-    public AccessControlClusterTarget(
+    public AccessControlClusterAccessControlTargetStruct(
         @Nullable Long cluster, @Nullable Integer endpoint, @Nullable Long deviceType) {
       this.cluster = cluster;
       this.endpoint = endpoint;
@@ -157,7 +157,7 @@ public AccessControlClusterTarget(
     @Override
     public String toString() {
       StringBuilder output = new StringBuilder();
-      output.append("AccessControlClusterTarget {\n");
+      output.append("AccessControlClusterAccessControlTargetStruct {\n");
       output.append("\tcluster: ");
       output.append(cluster);
       output.append("\n");
@@ -176,14 +176,14 @@ public static class AccessControlClusterAccessControlEntryStruct {
     public Integer privilege;
     public Integer authMode;
     public @Nullable ArrayList<Object> subjects;
-    public @Nullable ArrayList<ChipStructs.AccessControlClusterTarget> targets;
+    public @Nullable ArrayList<ChipStructs.AccessControlClusterAccessControlTargetStruct> targets;
     public Integer fabricIndex;
 
     public AccessControlClusterAccessControlEntryStruct(
         Integer privilege,
         Integer authMode,
         @Nullable ArrayList<Object> subjects,
-        @Nullable ArrayList<ChipStructs.AccessControlClusterTarget> targets,
+        @Nullable ArrayList<ChipStructs.AccessControlClusterAccessControlTargetStruct> targets,
         Integer fabricIndex) {
       this.privilege = privilege;
       this.authMode = authMode;
diff --git a/src/controller/python/chip/clusters/Objects.py b/src/controller/python/chip/clusters/Objects.py
index 3a9e9e0ac2656a..be3f932adda39d 100644
--- a/src/controller/python/chip/clusters/Objects.py
+++ b/src/controller/python/chip/clusters/Objects.py
@@ -3164,7 +3164,7 @@ class ChangeTypeEnum(MatterIntEnum):
 
     class Structs:
         @dataclass
-        class Target(ClusterObject):
+        class AccessControlTargetStruct(ClusterObject):
             @ChipUtility.classproperty
             def descriptor(cls) -> ClusterObjectDescriptor:
                 return ClusterObjectDescriptor(
@@ -3187,14 +3187,14 @@ def descriptor(cls) -> ClusterObjectDescriptor:
                         ClusterObjectFieldDescriptor(Label="privilege", Tag=1, Type=AccessControl.Enums.AccessControlEntryPrivilegeEnum),
                         ClusterObjectFieldDescriptor(Label="authMode", Tag=2, Type=AccessControl.Enums.AccessControlEntryAuthModeEnum),
                         ClusterObjectFieldDescriptor(Label="subjects", Tag=3, Type=typing.Union[Nullable, typing.List[uint]]),
-                        ClusterObjectFieldDescriptor(Label="targets", Tag=4, Type=typing.Union[Nullable, typing.List[AccessControl.Structs.Target]]),
+                        ClusterObjectFieldDescriptor(Label="targets", Tag=4, Type=typing.Union[Nullable, typing.List[AccessControl.Structs.AccessControlTargetStruct]]),
                         ClusterObjectFieldDescriptor(Label="fabricIndex", Tag=254, Type=uint),
                     ])
 
             privilege: 'AccessControl.Enums.AccessControlEntryPrivilegeEnum' = 0
             authMode: 'AccessControl.Enums.AccessControlEntryAuthModeEnum' = 0
             subjects: 'typing.Union[Nullable, typing.List[uint]]' = NullValue
-            targets: 'typing.Union[Nullable, typing.List[AccessControl.Structs.Target]]' = NullValue
+            targets: 'typing.Union[Nullable, typing.List[AccessControl.Structs.AccessControlTargetStruct]]' = NullValue
             fabricIndex: 'uint' = 0
 
         @dataclass
diff --git a/src/darwin/Framework/CHIP/templates/availability.yaml b/src/darwin/Framework/CHIP/templates/availability.yaml
index 9e555f56a20f68..b879c185b19170 100644
--- a/src/darwin/Framework/CHIP/templates/availability.yaml
+++ b/src/darwin/Framework/CHIP/templates/availability.yaml
@@ -7410,6 +7410,8 @@
                   - targetTemperature
                   - targetTemperatureLevel
       structs:
+          AccessControl:
+              - AccessControlTargetStruct
           BasicInformation:
               - ProductAppearanceStruct
           BridgedDeviceBasicInformation:
@@ -7417,6 +7419,11 @@
           TemperatureControl:
               - TemperatureLevelStruct
       struct fields:
+          AccessControl:
+              AccessControlTargetStruct:
+                  - cluster
+                  - endpoint
+                  - deviceType
           BasicInformation:
               ProductAppearanceStruct:
                   - finish
@@ -7850,6 +7857,9 @@
           # We apparently forgot to deprecate BridgedDeviceBasic when we
           # introduced BridgedDeviceBasicInformation.
           - BridgedDeviceBasic
+      structs:
+          AccessControl:
+              - Target
       bitmaps:
           Groups:
               - GroupClusterFeature
@@ -7866,6 +7876,9 @@
       commands:
           TimeSynchronization:
               SetUTCTime: SetUtcTime
+      structs:
+          AccessControl:
+              AccessControlTargetStruct: Target
       enum values:
           TimeSynchronization:
               TimeSourceEnum:
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm b/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm
index a5027126bde65b..8b79ca995852f5 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm
@@ -1939,8 +1939,8 @@ static id _Nullable DecodeAttributeValueForAccessControlCluster(
                         auto iter_3 = entry_0.targets.Value().begin();
                         while (iter_3.Next()) {
                             auto & entry_3 = iter_3.GetValue();
-                            MTRAccessControlClusterTarget * newElement_3;
-                            newElement_3 = [MTRAccessControlClusterTarget new];
+                            MTRAccessControlClusterAccessControlTargetStruct * newElement_3;
+                            newElement_3 = [MTRAccessControlClusterAccessControlTargetStruct new];
                             if (entry_3.cluster.IsNull()) {
                                 newElement_3.cluster = nil;
                             } else {
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm
index 0d495ffe954171..4e311a758ad203 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm
@@ -11192,11 +11192,13 @@ - (void)writeAttributeACLWithValue:(NSArray * _Nonnull)value
                                     }
                                     listFreer.add(listHolder_3);
                                     for (size_t i_3 = 0; i_3 < element_0.targets.count; ++i_3) {
-                                        if (![element_0.targets[i_3] isKindOfClass:[MTRAccessControlClusterTarget class]]) {
+                                        if (![element_0.targets[i_3]
+                                                isKindOfClass:[MTRAccessControlClusterAccessControlTargetStruct class]]) {
                                             // Wrong kind of value.
                                             return CHIP_ERROR_INVALID_ARGUMENT;
                                         }
-                                        auto element_3 = (MTRAccessControlClusterTarget *) element_0.targets[i_3];
+                                        auto element_3
+                                            = (MTRAccessControlClusterAccessControlTargetStruct *) element_0.targets[i_3];
                                         if (element_3.cluster == nil) {
                                             listHolder_3->mList[i_3].cluster.SetNull();
                                         } else {
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.mm b/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.mm
index 5062aff3ef13eb..425e075a3553cb 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.mm
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.mm
@@ -2388,8 +2388,8 @@
                     auto iter_3 = entry_0.targets.Value().begin();
                     while (iter_3.Next()) {
                         auto & entry_3 = iter_3.GetValue();
-                        MTRAccessControlClusterTarget * newElement_3;
-                        newElement_3 = [MTRAccessControlClusterTarget new];
+                        MTRAccessControlClusterAccessControlTargetStruct * newElement_3;
+                        newElement_3 = [MTRAccessControlClusterAccessControlTargetStruct new];
                         if (entry_3.cluster.IsNull()) {
                             newElement_3.cluster = nil;
                         } else {
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTREventTLVValueDecoder.mm b/src/darwin/Framework/CHIP/zap-generated/MTREventTLVValueDecoder.mm
index 3e1a0cb177f531..156a4ee0a0f14f 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTREventTLVValueDecoder.mm
+++ b/src/darwin/Framework/CHIP/zap-generated/MTREventTLVValueDecoder.mm
@@ -214,8 +214,8 @@ static id _Nullable DecodeEventPayloadForAccessControlCluster(EventId aEventId,
                         auto iter_3 = cppValue.latestValue.Value().targets.Value().begin();
                         while (iter_3.Next()) {
                             auto & entry_3 = iter_3.GetValue();
-                            MTRAccessControlClusterTarget * newElement_3;
-                            newElement_3 = [MTRAccessControlClusterTarget new];
+                            MTRAccessControlClusterAccessControlTargetStruct * newElement_3;
+                            newElement_3 = [MTRAccessControlClusterAccessControlTargetStruct new];
                             if (entry_3.cluster.IsNull()) {
                                 newElement_3.cluster = nil;
                             } else {
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h
index fa0842de1b7f15..e4be21e114dba3 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h
@@ -57,13 +57,17 @@ API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 @property (nonatomic, copy) NSNumber * _Nonnull fabricIndex API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
 @end
 
-API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
-@interface MTRAccessControlClusterTarget : NSObject <NSCopying>
-@property (nonatomic, copy) NSNumber * _Nullable cluster API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
-@property (nonatomic, copy) NSNumber * _Nullable endpoint API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
-@property (nonatomic, copy) NSNumber * _Nullable deviceType API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
+MTR_NEWLY_AVAILABLE
+@interface MTRAccessControlClusterAccessControlTargetStruct : NSObject <NSCopying>
+@property (nonatomic, copy) NSNumber * _Nullable cluster MTR_NEWLY_AVAILABLE;
+@property (nonatomic, copy) NSNumber * _Nullable endpoint MTR_NEWLY_AVAILABLE;
+@property (nonatomic, copy) NSNumber * _Nullable deviceType MTR_NEWLY_AVAILABLE;
 @end
 
+API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+MTR_NEWLY_DEPRECATED("Please use MTRAccessControlClusterAccessControlTargetStruct")
+@interface MTRAccessControlClusterTarget : MTRAccessControlClusterAccessControlTargetStruct
+@end
 API_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4))
 @interface MTRAccessControlClusterAccessControlEntryStruct : NSObject <NSCopying>
 @property (nonatomic, copy) NSNumber * _Nonnull privilege API_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4));
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm
index f34a16a25558db..a2f6fce25c9eee 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm
@@ -185,7 +185,7 @@ - (NSString *)description
 
 @end
 
-@implementation MTRAccessControlClusterTarget
+@implementation MTRAccessControlClusterAccessControlTargetStruct
 - (instancetype)init
 {
     if (self = [super init]) {
@@ -201,7 +201,7 @@ - (instancetype)init
 
 - (id)copyWithZone:(NSZone * _Nullable)zone
 {
-    auto other = [[MTRAccessControlClusterTarget alloc] init];
+    auto other = [[MTRAccessControlClusterAccessControlTargetStruct alloc] init];
 
     other.cluster = self.cluster;
     other.endpoint = self.endpoint;
@@ -219,6 +219,9 @@ - (NSString *)description
 
 @end
 
+@implementation MTRAccessControlClusterTarget : MTRAccessControlClusterAccessControlTargetStruct
+@end
+
 @implementation MTRAccessControlClusterAccessControlEntryStruct
 - (instancetype)init
 {
diff --git a/src/python_testing/TC_ACE_1_3.py b/src/python_testing/TC_ACE_1_3.py
index 2d81b78230fe5f..3fa0383219be03 100644
--- a/src/python_testing/TC_ACE_1_3.py
+++ b/src/python_testing/TC_ACE_1_3.py
@@ -85,12 +85,12 @@ async def test_TC_ACE_1_3(self):
             privilege=Clusters.AccessControl.Enums.AccessControlEntryPrivilegeEnum.kAdminister,
             authMode=Clusters.AccessControl.Enums.AccessControlEntryAuthModeEnum.kCase,
             subjects=[TH0_nodeid],
-            targets=[Clusters.AccessControl.Structs.Target(endpoint=0, cluster=0x001f)])
+            targets=[Clusters.AccessControl.Structs.AccessControlTargetStruct(endpoint=0, cluster=0x001f)])
         all_view = Clusters.AccessControl.Structs.AccessControlEntryStruct(
             privilege=Clusters.AccessControl.Enums.AccessControlEntryPrivilegeEnum.kView,
             authMode=Clusters.AccessControl.Enums.AccessControlEntryAuthModeEnum.kCase,
             subjects=[],
-            targets=[Clusters.AccessControl.Structs.Target(endpoint=0)])
+            targets=[Clusters.AccessControl.Structs.AccessControlTargetStruct(endpoint=0)])
         acl = [TH0_admin_acl, all_view]
         await self.write_acl(acl)
 
@@ -108,7 +108,7 @@ async def test_TC_ACE_1_3(self):
             privilege=Clusters.AccessControl.Enums.AccessControlEntryPrivilegeEnum.kView,
             authMode=Clusters.AccessControl.Enums.AccessControlEntryAuthModeEnum.kCase,
             subjects=[TH1_nodeid],
-            targets=[Clusters.AccessControl.Structs.Target(endpoint=0)])
+            targets=[Clusters.AccessControl.Structs.AccessControlTargetStruct(endpoint=0)])
         acl = [TH0_admin_acl, th1_view]
         await self.write_acl(acl)
         self.print_step(7, "TH1 reads EP0 descriptor - expect SUCCESS")
@@ -125,7 +125,7 @@ async def test_TC_ACE_1_3(self):
             privilege=Clusters.AccessControl.Enums.AccessControlEntryPrivilegeEnum.kView,
             authMode=Clusters.AccessControl.Enums.AccessControlEntryAuthModeEnum.kCase,
             subjects=[TH2_nodeid],
-            targets=[Clusters.AccessControl.Structs.Target(endpoint=0)])
+            targets=[Clusters.AccessControl.Structs.AccessControlTargetStruct(endpoint=0)])
 
         acl = [TH0_admin_acl, th2_view]
         await self.write_acl(acl)
@@ -143,7 +143,7 @@ async def test_TC_ACE_1_3(self):
             privilege=Clusters.AccessControl.Enums.AccessControlEntryPrivilegeEnum.kView,
             authMode=Clusters.AccessControl.Enums.AccessControlEntryAuthModeEnum.kCase,
             subjects=[TH3_nodeid],
-            targets=[Clusters.AccessControl.Structs.Target(endpoint=0)])
+            targets=[Clusters.AccessControl.Structs.AccessControlTargetStruct(endpoint=0)])
 
         acl = [TH0_admin_acl, th3_view]
         await self.write_acl(acl)
@@ -161,7 +161,7 @@ async def test_TC_ACE_1_3(self):
             privilege=Clusters.AccessControl.Enums.AccessControlEntryPrivilegeEnum.kView,
             authMode=Clusters.AccessControl.Enums.AccessControlEntryAuthModeEnum.kCase,
             subjects=[TH1_nodeid, TH2_nodeid],
-            targets=[Clusters.AccessControl.Structs.Target(endpoint=0)])
+            targets=[Clusters.AccessControl.Structs.AccessControlTargetStruct(endpoint=0)])
 
         acl = [TH0_admin_acl, th12_view]
         await self.write_acl(acl)
@@ -179,7 +179,7 @@ async def test_TC_ACE_1_3(self):
             privilege=Clusters.AccessControl.Enums.AccessControlEntryPrivilegeEnum.kView,
             authMode=Clusters.AccessControl.Enums.AccessControlEntryAuthModeEnum.kCase,
             subjects=[TH1_nodeid, TH3_nodeid],
-            targets=[Clusters.AccessControl.Structs.Target(endpoint=0)])
+            targets=[Clusters.AccessControl.Structs.AccessControlTargetStruct(endpoint=0)])
 
         acl = [TH0_admin_acl, th13_view]
         await self.write_acl(acl)
@@ -197,7 +197,7 @@ async def test_TC_ACE_1_3(self):
             privilege=Clusters.AccessControl.Enums.AccessControlEntryPrivilegeEnum.kView,
             authMode=Clusters.AccessControl.Enums.AccessControlEntryAuthModeEnum.kCase,
             subjects=[TH2_nodeid, TH3_nodeid],
-            targets=[Clusters.AccessControl.Structs.Target(endpoint=0)])
+            targets=[Clusters.AccessControl.Structs.AccessControlTargetStruct(endpoint=0)])
 
         acl = [TH0_admin_acl, th23_view]
         await self.write_acl(acl)
@@ -215,7 +215,7 @@ async def test_TC_ACE_1_3(self):
             privilege=Clusters.AccessControl.Enums.AccessControlEntryPrivilegeEnum.kView,
             authMode=Clusters.AccessControl.Enums.AccessControlEntryAuthModeEnum.kCase,
             subjects=[TH1_nodeid, TH2_nodeid, TH3_nodeid],
-            targets=[Clusters.AccessControl.Structs.Target(endpoint=0)])
+            targets=[Clusters.AccessControl.Structs.AccessControlTargetStruct(endpoint=0)])
 
         acl = [TH0_admin_acl, th123_view]
         await self.write_acl(acl)
@@ -233,7 +233,7 @@ async def test_TC_ACE_1_3(self):
             privilege=Clusters.AccessControl.Enums.AccessControlEntryPrivilegeEnum.kView,
             authMode=Clusters.AccessControl.Enums.AccessControlEntryAuthModeEnum.kCase,
             subjects=[acl_subject(cat1v1)],
-            targets=[Clusters.AccessControl.Structs.Target(endpoint=0)])
+            targets=[Clusters.AccessControl.Structs.AccessControlTargetStruct(endpoint=0)])
         acl = [TH0_admin_acl, cat1v1_view]
         await self.write_acl(acl)
 
@@ -251,7 +251,7 @@ async def test_TC_ACE_1_3(self):
             privilege=Clusters.AccessControl.Enums.AccessControlEntryPrivilegeEnum.kView,
             authMode=Clusters.AccessControl.Enums.AccessControlEntryAuthModeEnum.kCase,
             subjects=[acl_subject(cat1v2)],
-            targets=[Clusters.AccessControl.Structs.Target(endpoint=0)])
+            targets=[Clusters.AccessControl.Structs.AccessControlTargetStruct(endpoint=0)])
 
         acl = [TH0_admin_acl, cat1v2_view]
         await self.write_acl(acl)
@@ -270,7 +270,7 @@ async def test_TC_ACE_1_3(self):
             privilege=Clusters.AccessControl.Enums.AccessControlEntryPrivilegeEnum.kView,
             authMode=Clusters.AccessControl.Enums.AccessControlEntryAuthModeEnum.kCase,
             subjects=[acl_subject(cat1v3)],
-            targets=[Clusters.AccessControl.Structs.Target(endpoint=0)])
+            targets=[Clusters.AccessControl.Structs.AccessControlTargetStruct(endpoint=0)])
 
         acl = [TH0_admin_acl, cat1v3_view]
         await self.write_acl(acl)
@@ -289,7 +289,7 @@ async def test_TC_ACE_1_3(self):
             privilege=Clusters.AccessControl.Enums.AccessControlEntryPrivilegeEnum.kView,
             authMode=Clusters.AccessControl.Enums.AccessControlEntryAuthModeEnum.kCase,
             subjects=[acl_subject(cat2v1)],
-            targets=[Clusters.AccessControl.Structs.Target(endpoint=0)])
+            targets=[Clusters.AccessControl.Structs.AccessControlTargetStruct(endpoint=0)])
 
         acl = [TH0_admin_acl, cat2v1_view]
         await self.write_acl(acl)
@@ -308,7 +308,7 @@ async def test_TC_ACE_1_3(self):
             privilege=Clusters.AccessControl.Enums.AccessControlEntryPrivilegeEnum.kView,
             authMode=Clusters.AccessControl.Enums.AccessControlEntryAuthModeEnum.kCase,
             subjects=[acl_subject(cat2v2)],
-            targets=[Clusters.AccessControl.Structs.Target(endpoint=0)])
+            targets=[Clusters.AccessControl.Structs.AccessControlTargetStruct(endpoint=0)])
 
         acl = [TH0_admin_acl, cat2v2_view]
         await self.write_acl(acl)
@@ -327,7 +327,7 @@ async def test_TC_ACE_1_3(self):
             privilege=Clusters.AccessControl.Enums.AccessControlEntryPrivilegeEnum.kView,
             authMode=Clusters.AccessControl.Enums.AccessControlEntryAuthModeEnum.kCase,
             subjects=[acl_subject(cat2v3)],
-            targets=[Clusters.AccessControl.Structs.Target(endpoint=0)])
+            targets=[Clusters.AccessControl.Structs.AccessControlTargetStruct(endpoint=0)])
 
         acl = [TH0_admin_acl, cat2v3_view]
         await self.write_acl(acl)
diff --git a/src/python_testing/TC_ACE_1_4.py b/src/python_testing/TC_ACE_1_4.py
index 8091ee38926b32..0878e7d8e57395 100644
--- a/src/python_testing/TC_ACE_1_4.py
+++ b/src/python_testing/TC_ACE_1_4.py
@@ -110,7 +110,7 @@ async def test_TC_ACE_1_4(self):
             privilege=Clusters.AccessControl.Enums.AccessControlEntryPrivilegeEnum.kAdminister,
             authMode=Clusters.AccessControl.Enums.AccessControlEntryAuthModeEnum.kCase,
             subjects=[],
-            targets=[Clusters.AccessControl.Structs.Target(endpoint=0, cluster=Clusters.AccessControl.id)])
+            targets=[Clusters.AccessControl.Structs.AccessControlTargetStruct(endpoint=0, cluster=Clusters.AccessControl.id)])
         all_view = Clusters.AccessControl.Structs.AccessControlEntryStruct(
             privilege=Clusters.AccessControl.Enums.AccessControlEntryPrivilegeEnum.kView,
             authMode=Clusters.AccessControl.Enums.AccessControlEntryAuthModeEnum.kCase,
@@ -133,7 +133,7 @@ async def test_TC_ACE_1_4(self):
             privilege=Clusters.AccessControl.Enums.AccessControlEntryPrivilegeEnum.kView,
             authMode=Clusters.AccessControl.Enums.AccessControlEntryAuthModeEnum.kCase,
             subjects=[],
-            targets=[Clusters.AccessControl.Structs.Target(cluster=Clusters.Descriptor.id)])
+            targets=[Clusters.AccessControl.Structs.AccessControlTargetStruct(cluster=Clusters.Descriptor.id)])
 
         acl = [admin_acl, descriptor_view]
         await self.write_acl(acl)
@@ -152,7 +152,7 @@ async def test_TC_ACE_1_4(self):
             privilege=Clusters.AccessControl.Enums.AccessControlEntryPrivilegeEnum.kView,
             authMode=Clusters.AccessControl.Enums.AccessControlEntryAuthModeEnum.kCase,
             subjects=[],
-            targets=[Clusters.AccessControl.Structs.Target(cluster=self.cluster.id)])
+            targets=[Clusters.AccessControl.Structs.AccessControlTargetStruct(cluster=self.cluster.id)])
 
         acl = [admin_acl, appcluster_view]
         await self.write_acl(acl)
@@ -171,7 +171,7 @@ async def test_TC_ACE_1_4(self):
             privilege=Clusters.AccessControl.Enums.AccessControlEntryPrivilegeEnum.kView,
             authMode=Clusters.AccessControl.Enums.AccessControlEntryAuthModeEnum.kCase,
             subjects=[],
-            targets=[Clusters.AccessControl.Structs.Target(endpoint=self.endpoint, cluster=Clusters.Descriptor.id)])
+            targets=[Clusters.AccessControl.Structs.AccessControlTargetStruct(endpoint=self.endpoint, cluster=Clusters.Descriptor.id)])
 
         acl = [admin_acl, descriptor_appendpoint_view]
         await self.write_acl(acl)
@@ -190,7 +190,7 @@ async def test_TC_ACE_1_4(self):
             privilege=Clusters.AccessControl.Enums.AccessControlEntryPrivilegeEnum.kView,
             authMode=Clusters.AccessControl.Enums.AccessControlEntryAuthModeEnum.kCase,
             subjects=[],
-            targets=[Clusters.AccessControl.Structs.Target(endpoint=self.endpoint, cluster=self.cluster.id)])
+            targets=[Clusters.AccessControl.Structs.AccessControlTargetStruct(endpoint=self.endpoint, cluster=self.cluster.id)])
 
         acl = [admin_acl, appcluster_appendpoint_view]
         await self.write_acl(acl)
@@ -209,7 +209,7 @@ async def test_TC_ACE_1_4(self):
             privilege=Clusters.AccessControl.Enums.AccessControlEntryPrivilegeEnum.kView,
             authMode=Clusters.AccessControl.Enums.AccessControlEntryAuthModeEnum.kCase,
             subjects=[],
-            targets=[Clusters.AccessControl.Structs.Target(endpoint=self.endpoint)])
+            targets=[Clusters.AccessControl.Structs.AccessControlTargetStruct(endpoint=self.endpoint)])
 
         acl = [admin_acl, allclusters_appendpoint_view]
         await self.write_acl(acl)
@@ -228,7 +228,7 @@ async def test_TC_ACE_1_4(self):
             privilege=Clusters.AccessControl.Enums.AccessControlEntryPrivilegeEnum.kView,
             authMode=Clusters.AccessControl.Enums.AccessControlEntryAuthModeEnum.kCase,
             subjects=[],
-            targets=[Clusters.AccessControl.Structs.Target(deviceType=0x0016)])
+            targets=[Clusters.AccessControl.Structs.AccessControlTargetStruct(deviceType=0x0016)])
 
         acl = [admin_acl, rootnode_view]
         await self.write_acl(acl)
@@ -247,7 +247,7 @@ async def test_TC_ACE_1_4(self):
             privilege=Clusters.AccessControl.Enums.AccessControlEntryPrivilegeEnum.kView,
             authMode=Clusters.AccessControl.Enums.AccessControlEntryAuthModeEnum.kCase,
             subjects=[],
-            targets=[Clusters.AccessControl.Structs.Target(deviceType=self.devtype)])
+            targets=[Clusters.AccessControl.Structs.AccessControlTargetStruct(deviceType=self.devtype)])
 
         acl = [admin_acl, appdevtype_view]
         await self.write_acl(acl)
@@ -266,7 +266,7 @@ async def test_TC_ACE_1_4(self):
             privilege=Clusters.AccessControl.Enums.AccessControlEntryPrivilegeEnum.kView,
             authMode=Clusters.AccessControl.Enums.AccessControlEntryAuthModeEnum.kCase,
             subjects=[],
-            targets=[Clusters.AccessControl.Structs.Target(cluster=0x001d, deviceType=self.devtype)])
+            targets=[Clusters.AccessControl.Structs.AccessControlTargetStruct(cluster=0x001d, deviceType=self.devtype)])
 
         acl = [admin_acl, descriptor_appdevtype_view]
         await self.write_acl(acl)
@@ -285,7 +285,7 @@ async def test_TC_ACE_1_4(self):
             privilege=Clusters.AccessControl.Enums.AccessControlEntryPrivilegeEnum.kView,
             authMode=Clusters.AccessControl.Enums.AccessControlEntryAuthModeEnum.kCase,
             subjects=[],
-            targets=[Clusters.AccessControl.Structs.Target(cluster=self.cluster.id, deviceType=self.devtype)])
+            targets=[Clusters.AccessControl.Structs.AccessControlTargetStruct(cluster=self.cluster.id, deviceType=self.devtype)])
 
         acl = [admin_acl, appcluster_appdevtype_view]
         await self.write_acl(acl)
@@ -304,8 +304,8 @@ async def test_TC_ACE_1_4(self):
             privilege=Clusters.AccessControl.Enums.AccessControlEntryPrivilegeEnum.kView,
             authMode=Clusters.AccessControl.Enums.AccessControlEntryAuthModeEnum.kCase,
             subjects=[],
-            targets=[Clusters.AccessControl.Structs.Target(cluster=Clusters.Descriptor.id, endpoint=0),
-                     Clusters.AccessControl.Structs.Target(cluster=self.cluster.id, endpoint=self.endpoint)])
+            targets=[Clusters.AccessControl.Structs.AccessControlTargetStruct(cluster=Clusters.Descriptor.id, endpoint=0),
+                     Clusters.AccessControl.Structs.AccessControlTargetStruct(cluster=self.cluster.id, endpoint=self.endpoint)])
 
         acl = [admin_acl, multitarget_view]
         await self.write_acl(acl)
diff --git a/src/python_testing/TC_RR_1_1.py b/src/python_testing/TC_RR_1_1.py
index 1028a8b4f27b84..895de247c22cb9 100644
--- a/src/python_testing/TC_RR_1_1.py
+++ b/src/python_testing/TC_RR_1_1.py
@@ -759,14 +759,14 @@ def build_acl(self, enable_access_to_group_cluster: bool):
         # Administer ACL entry
         admin_subjects = [0xFFFF_FFFD_0001_0001, 0x2000_0000_0000_0001, 0x2000_0000_0000_0002, 0x2000_0000_0000_0003]
 
-        admin_target_field_2 = Clusters.AccessControl.Structs.Target(cluster=0xFFF1_FC00, deviceType=0xFFF1_BC30)
+        admin_target_field_2 = Clusters.AccessControl.Structs.AccessControlTargetStruct(cluster=0xFFF1_FC00, deviceType=0xFFF1_BC30)
         if enable_access_to_group_cluster:
-            admin_target_field_2 = Clusters.AccessControl.Structs.Target(cluster=0x0000_0004)
+            admin_target_field_2 = Clusters.AccessControl.Structs.AccessControlTargetStruct(cluster=0x0000_0004)
 
         admin_targets = [
-            Clusters.AccessControl.Structs.Target(endpoint=0),
+            Clusters.AccessControl.Structs.AccessControlTargetStruct(endpoint=0),
             admin_target_field_2,
-            Clusters.AccessControl.Structs.Target(cluster=0xFFF1_FC01, deviceType=0xFFF1_BC31)
+            Clusters.AccessControl.Structs.AccessControlTargetStruct(cluster=0xFFF1_FC01, deviceType=0xFFF1_BC31)
         ]
         admin_acl_entry = Clusters.AccessControl.Structs.AccessControlEntryStruct(
             privilege=Clusters.AccessControl.Enums.AccessControlEntryPrivilegeEnum.kAdminister,
@@ -779,9 +779,9 @@ def build_acl(self, enable_access_to_group_cluster: bool):
         # Manage ACL entry
         manage_subjects = [0x1000_0000_0000_0001, 0x1000_0000_0000_0002, 0x1000_0000_0000_0003, 0x1000_0000_0000_0004]
         manage_targets = [
-            Clusters.AccessControl.Structs.Target(cluster=0xFFF1_FC00, deviceType=0xFFF1_BC20),
-            Clusters.AccessControl.Structs.Target(cluster=0xFFF1_FC01, deviceType=0xFFF1_BC21),
-            Clusters.AccessControl.Structs.Target(cluster=0xFFF1_FC02, deviceType=0xFFF1_BC22)
+            Clusters.AccessControl.Structs.AccessControlTargetStruct(cluster=0xFFF1_FC00, deviceType=0xFFF1_BC20),
+            Clusters.AccessControl.Structs.AccessControlTargetStruct(cluster=0xFFF1_FC01, deviceType=0xFFF1_BC21),
+            Clusters.AccessControl.Structs.AccessControlTargetStruct(cluster=0xFFF1_FC02, deviceType=0xFFF1_BC22)
         ]
 
         manage_acl_entry = Clusters.AccessControl.Structs.AccessControlEntryStruct(
@@ -795,9 +795,9 @@ def build_acl(self, enable_access_to_group_cluster: bool):
         # Operate ACL entry
         operate_subjects = [0x3000_0000_0000_0001, 0x3000_0000_0000_0002, 0x3000_0000_0000_0003, 0x3000_0000_0000_0004]
         operate_targets = [
-            Clusters.AccessControl.Structs.Target(cluster=0xFFF1_FC40, deviceType=0xFFF1_BC20),
-            Clusters.AccessControl.Structs.Target(cluster=0xFFF1_FC41, deviceType=0xFFF1_BC21),
-            Clusters.AccessControl.Structs.Target(cluster=0xFFF1_FC42, deviceType=0xFFF1_BC42)
+            Clusters.AccessControl.Structs.AccessControlTargetStruct(cluster=0xFFF1_FC40, deviceType=0xFFF1_BC20),
+            Clusters.AccessControl.Structs.AccessControlTargetStruct(cluster=0xFFF1_FC41, deviceType=0xFFF1_BC21),
+            Clusters.AccessControl.Structs.AccessControlTargetStruct(cluster=0xFFF1_FC42, deviceType=0xFFF1_BC42)
         ]
 
         operate_acl_entry = Clusters.AccessControl.Structs.AccessControlEntryStruct(
@@ -811,9 +811,9 @@ def build_acl(self, enable_access_to_group_cluster: bool):
         # View ACL entry
         view_subjects = [0x4000_0000_0000_0001, 0x4000_0000_0000_0002, 0x4000_0000_0000_0003, 0x4000_0000_0000_0004]
         view_targets = [
-            Clusters.AccessControl.Structs.Target(cluster=0xFFF1_FC80, deviceType=0xFFF1_BC20),
-            Clusters.AccessControl.Structs.Target(cluster=0xFFF1_FC81, deviceType=0xFFF1_BC21),
-            Clusters.AccessControl.Structs.Target(cluster=0xFFF1_FC82, deviceType=0xFFF1_BC22)
+            Clusters.AccessControl.Structs.AccessControlTargetStruct(cluster=0xFFF1_FC80, deviceType=0xFFF1_BC20),
+            Clusters.AccessControl.Structs.AccessControlTargetStruct(cluster=0xFFF1_FC81, deviceType=0xFFF1_BC21),
+            Clusters.AccessControl.Structs.AccessControlTargetStruct(cluster=0xFFF1_FC82, deviceType=0xFFF1_BC22)
         ]
 
         view_acl_entry = Clusters.AccessControl.Structs.AccessControlEntryStruct(
diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp
index dcb81394d725f3..ddada78c641ff2 100644
--- a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp
+++ b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp
@@ -2825,7 +2825,7 @@ namespace Events {} // namespace Events
 } // namespace Binding
 namespace AccessControl {
 namespace Structs {
-namespace Target {
+namespace AccessControlTargetStruct {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
@@ -2872,7 +2872,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     return CHIP_NO_ERROR;
 }
 
-} // namespace Target
+} // namespace AccessControlTargetStruct
 namespace AccessControlEntryStruct {
 CHIP_ERROR Type::EncodeForWrite(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h
index 5b3532d8d28375..013a950074f6ff 100644
--- a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h
+++ b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h
@@ -3413,7 +3413,7 @@ struct TypeInfo
 } // namespace Binding
 namespace AccessControl {
 namespace Structs {
-namespace Target {
+namespace AccessControlTargetStruct {
 enum class Fields : uint8_t
 {
     kCluster    = 0,
@@ -3437,7 +3437,7 @@ struct Type
 
 using DecodableType = Type;
 
-} // namespace Target
+} // namespace AccessControlTargetStruct
 namespace AccessControlEntryStruct {
 enum class Fields : uint8_t
 {
@@ -3454,7 +3454,7 @@ struct Type
     AccessControlEntryPrivilegeEnum privilege = static_cast<AccessControlEntryPrivilegeEnum>(0);
     AccessControlEntryAuthModeEnum authMode   = static_cast<AccessControlEntryAuthModeEnum>(0);
     DataModel::Nullable<DataModel::List<const uint64_t>> subjects;
-    DataModel::Nullable<DataModel::List<const Structs::Target::Type>> targets;
+    DataModel::Nullable<DataModel::List<const Structs::AccessControlTargetStruct::Type>> targets;
     chip::FabricIndex fabricIndex = static_cast<chip::FabricIndex>(0);
 
     static constexpr bool kIsFabricScoped = true;
@@ -3476,7 +3476,7 @@ struct DecodableType
     AccessControlEntryPrivilegeEnum privilege = static_cast<AccessControlEntryPrivilegeEnum>(0);
     AccessControlEntryAuthModeEnum authMode   = static_cast<AccessControlEntryAuthModeEnum>(0);
     DataModel::Nullable<DataModel::DecodableList<uint64_t>> subjects;
-    DataModel::Nullable<DataModel::DecodableList<Structs::Target::DecodableType>> targets;
+    DataModel::Nullable<DataModel::DecodableList<Structs::AccessControlTargetStruct::DecodableType>> targets;
     chip::FabricIndex fabricIndex = static_cast<chip::FabricIndex>(0);
 
     CHIP_ERROR Decode(TLV::TLVReader & reader);
diff --git a/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp b/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp
index 677a212a03428d..2e5bea9e2fb698 100644
--- a/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp
+++ b/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp
@@ -171,7 +171,8 @@ void ComplexArgumentParser::Finalize(chip::app::Clusters::Binding::Structs::Targ
     ComplexArgumentParser::Finalize(request.fabricIndex);
 }
 
-CHIP_ERROR ComplexArgumentParser::Setup(const char * label, chip::app::Clusters::AccessControl::Structs::Target::Type & request,
+CHIP_ERROR ComplexArgumentParser::Setup(const char * label,
+                                        chip::app::Clusters::AccessControl::Structs::AccessControlTargetStruct::Type & request,
                                         Json::Value & value)
 {
     VerifyOrReturnError(value.isObject(), CHIP_ERROR_INVALID_ARGUMENT);
@@ -179,9 +180,12 @@ CHIP_ERROR ComplexArgumentParser::Setup(const char * label, chip::app::Clusters:
     // Copy to track which members we already processed.
     Json::Value valueCopy(value);
 
-    ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("Target.cluster", "cluster", value.isMember("cluster")));
-    ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("Target.endpoint", "endpoint", value.isMember("endpoint")));
-    ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("Target.deviceType", "deviceType", value.isMember("deviceType")));
+    ReturnErrorOnFailure(
+        ComplexArgumentParser::EnsureMemberExist("AccessControlTargetStruct.cluster", "cluster", value.isMember("cluster")));
+    ReturnErrorOnFailure(
+        ComplexArgumentParser::EnsureMemberExist("AccessControlTargetStruct.endpoint", "endpoint", value.isMember("endpoint")));
+    ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("AccessControlTargetStruct.deviceType", "deviceType",
+                                                                  value.isMember("deviceType")));
 
     char labelWithMember[kMaxLabelLength];
     snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "cluster");
@@ -199,7 +203,7 @@ CHIP_ERROR ComplexArgumentParser::Setup(const char * label, chip::app::Clusters:
     return ComplexArgumentParser::EnsureNoMembersRemaining(label, valueCopy);
 }
 
-void ComplexArgumentParser::Finalize(chip::app::Clusters::AccessControl::Structs::Target::Type & request)
+void ComplexArgumentParser::Finalize(chip::app::Clusters::AccessControl::Structs::AccessControlTargetStruct::Type & request)
 {
     ComplexArgumentParser::Finalize(request.cluster);
     ComplexArgumentParser::Finalize(request.endpoint);
diff --git a/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.h b/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.h
index 29b99ab6438648..a73e784a7dffd7 100644
--- a/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.h
+++ b/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.h
@@ -42,10 +42,10 @@ static CHIP_ERROR Setup(const char * label, chip::app::Clusters::Binding::Struct
 
 static void Finalize(chip::app::Clusters::Binding::Structs::TargetStruct::Type & request);
 
-static CHIP_ERROR Setup(const char * label, chip::app::Clusters::AccessControl::Structs::Target::Type & request,
+static CHIP_ERROR Setup(const char * label, chip::app::Clusters::AccessControl::Structs::AccessControlTargetStruct::Type & request,
                         Json::Value & value);
 
-static void Finalize(chip::app::Clusters::AccessControl::Structs::Target::Type & request);
+static void Finalize(chip::app::Clusters::AccessControl::Structs::AccessControlTargetStruct::Type & request);
 
 static CHIP_ERROR Setup(const char * label, chip::app::Clusters::AccessControl::Structs::AccessControlEntryStruct::Type & request,
                         Json::Value & value);
diff --git a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp
index 239d5d2d1c9660..500d0a370a863d 100644
--- a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp
+++ b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp
@@ -145,8 +145,9 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
     return CHIP_NO_ERROR;
 }
 
-CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const chip::app::Clusters::AccessControl::Structs::Target::DecodableType & value)
+CHIP_ERROR
+DataModelLogger::LogValue(const char * label, size_t indent,
+                          const chip::app::Clusters::AccessControl::Structs::AccessControlTargetStruct::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
     {
diff --git a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.h b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.h
index 753b6f8ed99ea1..24df49586083b8 100644
--- a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.h
+++ b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.h
@@ -33,7 +33,7 @@ static CHIP_ERROR LogValue(const char * label, size_t indent,
                            const chip::app::Clusters::Binding::Structs::TargetStruct::DecodableType & value);
 
 static CHIP_ERROR LogValue(const char * label, size_t indent,
-                           const chip::app::Clusters::AccessControl::Structs::Target::DecodableType & value);
+                           const chip::app::Clusters::AccessControl::Structs::AccessControlTargetStruct::DecodableType & value);
 
 static CHIP_ERROR LogValue(const char * label, size_t indent,
                            const chip::app::Clusters::AccessControl::Structs::AccessControlEntryStruct::DecodableType & value);
diff --git a/zzz_generated/chip-tool/zap-generated/test/Commands.h b/zzz_generated/chip-tool/zap-generated/test/Commands.h
index 483c1f2ea30cea..f0325c29f5e748 100644
--- a/zzz_generated/chip-tool/zap-generated/test/Commands.h
+++ b/zzz_generated/chip-tool/zap-generated/test/Commands.h
@@ -1262,7 +1262,8 @@ class TestAccessControlClusterSuite : public TestCommand
                 listHolder_0->mList[0].targets.SetNonNull();
 
                 {
-                    auto * listHolder_3 = new ListHolder<chip::app::Clusters::AccessControl::Structs::Target::Type>(3);
+                    auto * listHolder_3 =
+                        new ListHolder<chip::app::Clusters::AccessControl::Structs::AccessControlTargetStruct::Type>(3);
                     listFreer.add(listHolder_3);
 
                     listHolder_3->mList[0].cluster.SetNull();
@@ -1282,8 +1283,8 @@ class TestAccessControlClusterSuite : public TestCommand
                     listHolder_3->mList[2].deviceType.SetNull();
 
                     listHolder_0->mList[0].targets.Value() =
-                        chip::app::DataModel::List<chip::app::Clusters::AccessControl::Structs::Target::Type>(listHolder_3->mList,
-                                                                                                              3);
+                        chip::app::DataModel::List<chip::app::Clusters::AccessControl::Structs::AccessControlTargetStruct::Type>(
+                            listHolder_3->mList, 3);
                 }
                 listHolder_0->mList[0].fabricIndex = 0U;
 
@@ -1305,7 +1306,8 @@ class TestAccessControlClusterSuite : public TestCommand
                 listHolder_0->mList[1].targets.SetNonNull();
 
                 {
-                    auto * listHolder_3 = new ListHolder<chip::app::Clusters::AccessControl::Structs::Target::Type>(3);
+                    auto * listHolder_3 =
+                        new ListHolder<chip::app::Clusters::AccessControl::Structs::AccessControlTargetStruct::Type>(3);
                     listFreer.add(listHolder_3);
 
                     listHolder_3->mList[0].cluster.SetNull();
@@ -1325,8 +1327,8 @@ class TestAccessControlClusterSuite : public TestCommand
                     listHolder_3->mList[2].deviceType.SetNull();
 
                     listHolder_0->mList[1].targets.Value() =
-                        chip::app::DataModel::List<chip::app::Clusters::AccessControl::Structs::Target::Type>(listHolder_3->mList,
-                                                                                                              3);
+                        chip::app::DataModel::List<chip::app::Clusters::AccessControl::Structs::AccessControlTargetStruct::Type>(
+                            listHolder_3->mList, 3);
                 }
                 listHolder_0->mList[1].fabricIndex = 0U;
 
@@ -1348,7 +1350,8 @@ class TestAccessControlClusterSuite : public TestCommand
                 listHolder_0->mList[2].targets.SetNonNull();
 
                 {
-                    auto * listHolder_3 = new ListHolder<chip::app::Clusters::AccessControl::Structs::Target::Type>(3);
+                    auto * listHolder_3 =
+                        new ListHolder<chip::app::Clusters::AccessControl::Structs::AccessControlTargetStruct::Type>(3);
                     listFreer.add(listHolder_3);
 
                     listHolder_3->mList[0].cluster.SetNull();
@@ -1368,8 +1371,8 @@ class TestAccessControlClusterSuite : public TestCommand
                     listHolder_3->mList[2].deviceType.SetNull();
 
                     listHolder_0->mList[2].targets.Value() =
-                        chip::app::DataModel::List<chip::app::Clusters::AccessControl::Structs::Target::Type>(listHolder_3->mList,
-                                                                                                              3);
+                        chip::app::DataModel::List<chip::app::Clusters::AccessControl::Structs::AccessControlTargetStruct::Type>(
+                            listHolder_3->mList, 3);
                 }
                 listHolder_0->mList[2].fabricIndex = 0U;
 
@@ -1391,7 +1394,8 @@ class TestAccessControlClusterSuite : public TestCommand
                 listHolder_0->mList[3].targets.SetNonNull();
 
                 {
-                    auto * listHolder_3 = new ListHolder<chip::app::Clusters::AccessControl::Structs::Target::Type>(3);
+                    auto * listHolder_3 =
+                        new ListHolder<chip::app::Clusters::AccessControl::Structs::AccessControlTargetStruct::Type>(3);
                     listFreer.add(listHolder_3);
 
                     listHolder_3->mList[0].cluster.SetNull();
@@ -1411,8 +1415,8 @@ class TestAccessControlClusterSuite : public TestCommand
                     listHolder_3->mList[2].deviceType.SetNull();
 
                     listHolder_0->mList[3].targets.Value() =
-                        chip::app::DataModel::List<chip::app::Clusters::AccessControl::Structs::Target::Type>(listHolder_3->mList,
-                                                                                                              3);
+                        chip::app::DataModel::List<chip::app::Clusters::AccessControl::Structs::AccessControlTargetStruct::Type>(
+                            listHolder_3->mList, 3);
                 }
                 listHolder_0->mList[3].fabricIndex = 0U;
 
@@ -1455,7 +1459,7 @@ class TestAccessControlClusterSuite : public TestCommand
                 listHolder_0->mList[1].targets.SetNonNull();
 
                 listHolder_0->mList[1].targets.Value() =
-                    chip::app::DataModel::List<chip::app::Clusters::AccessControl::Structs::Target::Type>();
+                    chip::app::DataModel::List<chip::app::Clusters::AccessControl::Structs::AccessControlTargetStruct::Type>();
                 listHolder_0->mList[1].fabricIndex = 0U;
 
                 value = chip::app::DataModel::List<chip::app::Clusters::AccessControl::Structs::AccessControlEntryStruct::Type>(
@@ -1613,7 +1617,8 @@ class TestAccessControlClusterSuite : public TestCommand
                 listHolder_0->mList[1].targets.SetNonNull();
 
                 {
-                    auto * listHolder_3 = new ListHolder<chip::app::Clusters::AccessControl::Structs::Target::Type>(1);
+                    auto * listHolder_3 =
+                        new ListHolder<chip::app::Clusters::AccessControl::Structs::AccessControlTargetStruct::Type>(1);
                     listFreer.add(listHolder_3);
 
                     listHolder_3->mList[0].cluster.SetNull();
@@ -1621,8 +1626,8 @@ class TestAccessControlClusterSuite : public TestCommand
                     listHolder_3->mList[0].deviceType.SetNull();
 
                     listHolder_0->mList[1].targets.Value() =
-                        chip::app::DataModel::List<chip::app::Clusters::AccessControl::Structs::Target::Type>(listHolder_3->mList,
-                                                                                                              1);
+                        chip::app::DataModel::List<chip::app::Clusters::AccessControl::Structs::AccessControlTargetStruct::Type>(
+                            listHolder_3->mList, 1);
                 }
                 listHolder_0->mList[1].fabricIndex = 0U;
 
@@ -1726,7 +1731,8 @@ class TestAccessControlClusterSuite : public TestCommand
                 listHolder_0->mList[1].targets.SetNonNull();
 
                 {
-                    auto * listHolder_3 = new ListHolder<chip::app::Clusters::AccessControl::Structs::Target::Type>(20);
+                    auto * listHolder_3 =
+                        new ListHolder<chip::app::Clusters::AccessControl::Structs::AccessControlTargetStruct::Type>(20);
                     listFreer.add(listHolder_3);
 
                     listHolder_3->mList[0].cluster.SetNull();
@@ -1830,8 +1836,8 @@ class TestAccessControlClusterSuite : public TestCommand
                     listHolder_3->mList[19].deviceType.SetNull();
 
                     listHolder_0->mList[1].targets.Value() =
-                        chip::app::DataModel::List<chip::app::Clusters::AccessControl::Structs::Target::Type>(listHolder_3->mList,
-                                                                                                              20);
+                        chip::app::DataModel::List<chip::app::Clusters::AccessControl::Structs::AccessControlTargetStruct::Type>(
+                            listHolder_3->mList, 20);
                 }
                 listHolder_0->mList[1].fabricIndex = 0U;
 
@@ -1864,7 +1870,8 @@ class TestAccessControlClusterSuite : public TestCommand
                 listHolder_0->mList[0].targets.SetNonNull();
 
                 {
-                    auto * listHolder_3 = new ListHolder<chip::app::Clusters::AccessControl::Structs::Target::Type>(3);
+                    auto * listHolder_3 =
+                        new ListHolder<chip::app::Clusters::AccessControl::Structs::AccessControlTargetStruct::Type>(3);
                     listFreer.add(listHolder_3);
 
                     listHolder_3->mList[0].cluster.SetNull();
@@ -1884,8 +1891,8 @@ class TestAccessControlClusterSuite : public TestCommand
                     listHolder_3->mList[2].deviceType.SetNull();
 
                     listHolder_0->mList[0].targets.Value() =
-                        chip::app::DataModel::List<chip::app::Clusters::AccessControl::Structs::Target::Type>(listHolder_3->mList,
-                                                                                                              3);
+                        chip::app::DataModel::List<chip::app::Clusters::AccessControl::Structs::AccessControlTargetStruct::Type>(
+                            listHolder_3->mList, 3);
                 }
                 listHolder_0->mList[0].fabricIndex = 0U;
 
@@ -1907,7 +1914,8 @@ class TestAccessControlClusterSuite : public TestCommand
                 listHolder_0->mList[1].targets.SetNonNull();
 
                 {
-                    auto * listHolder_3 = new ListHolder<chip::app::Clusters::AccessControl::Structs::Target::Type>(3);
+                    auto * listHolder_3 =
+                        new ListHolder<chip::app::Clusters::AccessControl::Structs::AccessControlTargetStruct::Type>(3);
                     listFreer.add(listHolder_3);
 
                     listHolder_3->mList[0].cluster.SetNull();
@@ -1927,8 +1935,8 @@ class TestAccessControlClusterSuite : public TestCommand
                     listHolder_3->mList[2].deviceType.SetNull();
 
                     listHolder_0->mList[1].targets.Value() =
-                        chip::app::DataModel::List<chip::app::Clusters::AccessControl::Structs::Target::Type>(listHolder_3->mList,
-                                                                                                              3);
+                        chip::app::DataModel::List<chip::app::Clusters::AccessControl::Structs::AccessControlTargetStruct::Type>(
+                            listHolder_3->mList, 3);
                 }
                 listHolder_0->mList[1].fabricIndex = 0U;
 
@@ -1950,7 +1958,8 @@ class TestAccessControlClusterSuite : public TestCommand
                 listHolder_0->mList[2].targets.SetNonNull();
 
                 {
-                    auto * listHolder_3 = new ListHolder<chip::app::Clusters::AccessControl::Structs::Target::Type>(3);
+                    auto * listHolder_3 =
+                        new ListHolder<chip::app::Clusters::AccessControl::Structs::AccessControlTargetStruct::Type>(3);
                     listFreer.add(listHolder_3);
 
                     listHolder_3->mList[0].cluster.SetNull();
@@ -1970,8 +1979,8 @@ class TestAccessControlClusterSuite : public TestCommand
                     listHolder_3->mList[2].deviceType.SetNull();
 
                     listHolder_0->mList[2].targets.Value() =
-                        chip::app::DataModel::List<chip::app::Clusters::AccessControl::Structs::Target::Type>(listHolder_3->mList,
-                                                                                                              3);
+                        chip::app::DataModel::List<chip::app::Clusters::AccessControl::Structs::AccessControlTargetStruct::Type>(
+                            listHolder_3->mList, 3);
                 }
                 listHolder_0->mList[2].fabricIndex = 0U;
 
@@ -1993,7 +2002,8 @@ class TestAccessControlClusterSuite : public TestCommand
                 listHolder_0->mList[3].targets.SetNonNull();
 
                 {
-                    auto * listHolder_3 = new ListHolder<chip::app::Clusters::AccessControl::Structs::Target::Type>(3);
+                    auto * listHolder_3 =
+                        new ListHolder<chip::app::Clusters::AccessControl::Structs::AccessControlTargetStruct::Type>(3);
                     listFreer.add(listHolder_3);
 
                     listHolder_3->mList[0].cluster.SetNull();
@@ -2013,8 +2023,8 @@ class TestAccessControlClusterSuite : public TestCommand
                     listHolder_3->mList[2].deviceType.SetNull();
 
                     listHolder_0->mList[3].targets.Value() =
-                        chip::app::DataModel::List<chip::app::Clusters::AccessControl::Structs::Target::Type>(listHolder_3->mList,
-                                                                                                              3);
+                        chip::app::DataModel::List<chip::app::Clusters::AccessControl::Structs::AccessControlTargetStruct::Type>(
+                            listHolder_3->mList, 3);
                 }
                 listHolder_0->mList[3].fabricIndex = 0U;
 
@@ -2036,7 +2046,8 @@ class TestAccessControlClusterSuite : public TestCommand
                 listHolder_0->mList[4].targets.SetNonNull();
 
                 {
-                    auto * listHolder_3 = new ListHolder<chip::app::Clusters::AccessControl::Structs::Target::Type>(3);
+                    auto * listHolder_3 =
+                        new ListHolder<chip::app::Clusters::AccessControl::Structs::AccessControlTargetStruct::Type>(3);
                     listFreer.add(listHolder_3);
 
                     listHolder_3->mList[0].cluster.SetNull();
@@ -2056,8 +2067,8 @@ class TestAccessControlClusterSuite : public TestCommand
                     listHolder_3->mList[2].deviceType.SetNull();
 
                     listHolder_0->mList[4].targets.Value() =
-                        chip::app::DataModel::List<chip::app::Clusters::AccessControl::Structs::Target::Type>(listHolder_3->mList,
-                                                                                                              3);
+                        chip::app::DataModel::List<chip::app::Clusters::AccessControl::Structs::AccessControlTargetStruct::Type>(
+                            listHolder_3->mList, 3);
                 }
                 listHolder_0->mList[4].fabricIndex = 0U;
 
@@ -4153,7 +4164,8 @@ class Test_TC_ACL_2_4Suite : public TestCommand
                 listHolder_0->mList[1].targets.SetNonNull();
 
                 {
-                    auto * listHolder_3 = new ListHolder<chip::app::Clusters::AccessControl::Structs::Target::Type>(1);
+                    auto * listHolder_3 =
+                        new ListHolder<chip::app::Clusters::AccessControl::Structs::AccessControlTargetStruct::Type>(1);
                     listFreer.add(listHolder_3);
 
                     listHolder_3->mList[0].cluster.SetNonNull();
@@ -4163,8 +4175,8 @@ class Test_TC_ACL_2_4Suite : public TestCommand
                     listHolder_3->mList[0].deviceType.SetNull();
 
                     listHolder_0->mList[1].targets.Value() =
-                        chip::app::DataModel::List<chip::app::Clusters::AccessControl::Structs::Target::Type>(listHolder_3->mList,
-                                                                                                              1);
+                        chip::app::DataModel::List<chip::app::Clusters::AccessControl::Structs::AccessControlTargetStruct::Type>(
+                            listHolder_3->mList, 1);
                 }
                 listHolder_0->mList[1].fabricIndex = CurrentFabricIndex;
 
@@ -4186,7 +4198,8 @@ class Test_TC_ACL_2_4Suite : public TestCommand
                 listHolder_0->mList[2].targets.SetNonNull();
 
                 {
-                    auto * listHolder_3 = new ListHolder<chip::app::Clusters::AccessControl::Structs::Target::Type>(1);
+                    auto * listHolder_3 =
+                        new ListHolder<chip::app::Clusters::AccessControl::Structs::AccessControlTargetStruct::Type>(1);
                     listFreer.add(listHolder_3);
 
                     listHolder_3->mList[0].cluster.SetNonNull();
@@ -4196,8 +4209,8 @@ class Test_TC_ACL_2_4Suite : public TestCommand
                     listHolder_3->mList[0].deviceType.SetNull();
 
                     listHolder_0->mList[2].targets.Value() =
-                        chip::app::DataModel::List<chip::app::Clusters::AccessControl::Structs::Target::Type>(listHolder_3->mList,
-                                                                                                              1);
+                        chip::app::DataModel::List<chip::app::Clusters::AccessControl::Structs::AccessControlTargetStruct::Type>(
+                            listHolder_3->mList, 1);
                 }
                 listHolder_0->mList[2].fabricIndex = CurrentFabricIndex;
 
@@ -4263,7 +4276,8 @@ class Test_TC_ACL_2_4Suite : public TestCommand
                 listHolder_0->mList[1].targets.SetNonNull();
 
                 {
-                    auto * listHolder_3 = new ListHolder<chip::app::Clusters::AccessControl::Structs::Target::Type>(1);
+                    auto * listHolder_3 =
+                        new ListHolder<chip::app::Clusters::AccessControl::Structs::AccessControlTargetStruct::Type>(1);
                     listFreer.add(listHolder_3);
 
                     listHolder_3->mList[0].cluster.SetNonNull();
@@ -4273,8 +4287,8 @@ class Test_TC_ACL_2_4Suite : public TestCommand
                     listHolder_3->mList[0].deviceType.SetNull();
 
                     listHolder_0->mList[1].targets.Value() =
-                        chip::app::DataModel::List<chip::app::Clusters::AccessControl::Structs::Target::Type>(listHolder_3->mList,
-                                                                                                              1);
+                        chip::app::DataModel::List<chip::app::Clusters::AccessControl::Structs::AccessControlTargetStruct::Type>(
+                            listHolder_3->mList, 1);
                 }
                 listHolder_0->mList[1].fabricIndex = CurrentFabricIndex;
 
@@ -4296,7 +4310,8 @@ class Test_TC_ACL_2_4Suite : public TestCommand
                 listHolder_0->mList[2].targets.SetNonNull();
 
                 {
-                    auto * listHolder_3 = new ListHolder<chip::app::Clusters::AccessControl::Structs::Target::Type>(1);
+                    auto * listHolder_3 =
+                        new ListHolder<chip::app::Clusters::AccessControl::Structs::AccessControlTargetStruct::Type>(1);
                     listFreer.add(listHolder_3);
 
                     listHolder_3->mList[0].cluster.SetNonNull();
@@ -4306,8 +4321,8 @@ class Test_TC_ACL_2_4Suite : public TestCommand
                     listHolder_3->mList[0].deviceType.SetNull();
 
                     listHolder_0->mList[2].targets.Value() =
-                        chip::app::DataModel::List<chip::app::Clusters::AccessControl::Structs::Target::Type>(listHolder_3->mList,
-                                                                                                              1);
+                        chip::app::DataModel::List<chip::app::Clusters::AccessControl::Structs::AccessControlTargetStruct::Type>(
+                            listHolder_3->mList, 1);
                 }
                 listHolder_0->mList[2].fabricIndex = CurrentFabricIndex;
 
@@ -4373,7 +4388,8 @@ class Test_TC_ACL_2_4Suite : public TestCommand
                 listHolder_0->mList[1].targets.SetNonNull();
 
                 {
-                    auto * listHolder_3 = new ListHolder<chip::app::Clusters::AccessControl::Structs::Target::Type>(2);
+                    auto * listHolder_3 =
+                        new ListHolder<chip::app::Clusters::AccessControl::Structs::AccessControlTargetStruct::Type>(2);
                     listFreer.add(listHolder_3);
 
                     listHolder_3->mList[0].cluster.SetNonNull();
@@ -4389,8 +4405,8 @@ class Test_TC_ACL_2_4Suite : public TestCommand
                     listHolder_3->mList[1].deviceType.Value() = 44UL;
 
                     listHolder_0->mList[1].targets.Value() =
-                        chip::app::DataModel::List<chip::app::Clusters::AccessControl::Structs::Target::Type>(listHolder_3->mList,
-                                                                                                              2);
+                        chip::app::DataModel::List<chip::app::Clusters::AccessControl::Structs::AccessControlTargetStruct::Type>(
+                            listHolder_3->mList, 2);
                 }
                 listHolder_0->mList[1].fabricIndex = CurrentFabricIndex;
 
@@ -4412,7 +4428,8 @@ class Test_TC_ACL_2_4Suite : public TestCommand
                 listHolder_0->mList[2].targets.SetNonNull();
 
                 {
-                    auto * listHolder_3 = new ListHolder<chip::app::Clusters::AccessControl::Structs::Target::Type>(2);
+                    auto * listHolder_3 =
+                        new ListHolder<chip::app::Clusters::AccessControl::Structs::AccessControlTargetStruct::Type>(2);
                     listFreer.add(listHolder_3);
 
                     listHolder_3->mList[0].cluster.SetNonNull();
@@ -4428,8 +4445,8 @@ class Test_TC_ACL_2_4Suite : public TestCommand
                     listHolder_3->mList[1].deviceType.Value() = 88UL;
 
                     listHolder_0->mList[2].targets.Value() =
-                        chip::app::DataModel::List<chip::app::Clusters::AccessControl::Structs::Target::Type>(listHolder_3->mList,
-                                                                                                              2);
+                        chip::app::DataModel::List<chip::app::Clusters::AccessControl::Structs::AccessControlTargetStruct::Type>(
+                            listHolder_3->mList, 2);
                 }
                 listHolder_0->mList[2].fabricIndex = CurrentFabricIndex;
 
@@ -4485,7 +4502,8 @@ class Test_TC_ACL_2_4Suite : public TestCommand
                 listHolder_0->mList[1].targets.SetNonNull();
 
                 {
-                    auto * listHolder_3 = new ListHolder<chip::app::Clusters::AccessControl::Structs::Target::Type>(2);
+                    auto * listHolder_3 =
+                        new ListHolder<chip::app::Clusters::AccessControl::Structs::AccessControlTargetStruct::Type>(2);
                     listFreer.add(listHolder_3);
 
                     listHolder_3->mList[0].cluster.SetNonNull();
@@ -4501,8 +4519,8 @@ class Test_TC_ACL_2_4Suite : public TestCommand
                     listHolder_3->mList[1].deviceType.Value() = 44UL;
 
                     listHolder_0->mList[1].targets.Value() =
-                        chip::app::DataModel::List<chip::app::Clusters::AccessControl::Structs::Target::Type>(listHolder_3->mList,
-                                                                                                              2);
+                        chip::app::DataModel::List<chip::app::Clusters::AccessControl::Structs::AccessControlTargetStruct::Type>(
+                            listHolder_3->mList, 2);
                 }
                 listHolder_0->mList[1].fabricIndex = CurrentFabricIndex;
 
@@ -4514,7 +4532,8 @@ class Test_TC_ACL_2_4Suite : public TestCommand
                 listHolder_0->mList[2].targets.SetNonNull();
 
                 {
-                    auto * listHolder_3 = new ListHolder<chip::app::Clusters::AccessControl::Structs::Target::Type>(2);
+                    auto * listHolder_3 =
+                        new ListHolder<chip::app::Clusters::AccessControl::Structs::AccessControlTargetStruct::Type>(2);
                     listFreer.add(listHolder_3);
 
                     listHolder_3->mList[0].cluster.SetNonNull();
@@ -4530,8 +4549,8 @@ class Test_TC_ACL_2_4Suite : public TestCommand
                     listHolder_3->mList[1].deviceType.Value() = 88UL;
 
                     listHolder_0->mList[2].targets.Value() =
-                        chip::app::DataModel::List<chip::app::Clusters::AccessControl::Structs::Target::Type>(listHolder_3->mList,
-                                                                                                              2);
+                        chip::app::DataModel::List<chip::app::Clusters::AccessControl::Structs::AccessControlTargetStruct::Type>(
+                            listHolder_3->mList, 2);
                 }
                 listHolder_0->mList[2].fabricIndex = CurrentFabricIndex;
 
@@ -5330,7 +5349,8 @@ class Test_TC_ACL_2_4Suite : public TestCommand
                 listHolder_0->mList[1].targets.SetNonNull();
 
                 {
-                    auto * listHolder_3 = new ListHolder<chip::app::Clusters::AccessControl::Structs::Target::Type>(1);
+                    auto * listHolder_3 =
+                        new ListHolder<chip::app::Clusters::AccessControl::Structs::AccessControlTargetStruct::Type>(1);
                     listFreer.add(listHolder_3);
 
                     listHolder_3->mList[0].cluster.SetNull();
@@ -5338,8 +5358,8 @@ class Test_TC_ACL_2_4Suite : public TestCommand
                     listHolder_3->mList[0].deviceType.SetNull();
 
                     listHolder_0->mList[1].targets.Value() =
-                        chip::app::DataModel::List<chip::app::Clusters::AccessControl::Structs::Target::Type>(listHolder_3->mList,
-                                                                                                              1);
+                        chip::app::DataModel::List<chip::app::Clusters::AccessControl::Structs::AccessControlTargetStruct::Type>(
+                            listHolder_3->mList, 1);
                 }
                 listHolder_0->mList[1].fabricIndex = CurrentFabricIndex;
 
@@ -5387,7 +5407,8 @@ class Test_TC_ACL_2_4Suite : public TestCommand
                 listHolder_0->mList[1].targets.SetNonNull();
 
                 {
-                    auto * listHolder_3 = new ListHolder<chip::app::Clusters::AccessControl::Structs::Target::Type>(1);
+                    auto * listHolder_3 =
+                        new ListHolder<chip::app::Clusters::AccessControl::Structs::AccessControlTargetStruct::Type>(1);
                     listFreer.add(listHolder_3);
 
                     listHolder_3->mList[0].cluster.SetNonNull();
@@ -5396,8 +5417,8 @@ class Test_TC_ACL_2_4Suite : public TestCommand
                     listHolder_3->mList[0].deviceType.SetNull();
 
                     listHolder_0->mList[1].targets.Value() =
-                        chip::app::DataModel::List<chip::app::Clusters::AccessControl::Structs::Target::Type>(listHolder_3->mList,
-                                                                                                              1);
+                        chip::app::DataModel::List<chip::app::Clusters::AccessControl::Structs::AccessControlTargetStruct::Type>(
+                            listHolder_3->mList, 1);
                 }
                 listHolder_0->mList[1].fabricIndex = CurrentFabricIndex;
 
@@ -5445,7 +5466,8 @@ class Test_TC_ACL_2_4Suite : public TestCommand
                 listHolder_0->mList[1].targets.SetNonNull();
 
                 {
-                    auto * listHolder_3 = new ListHolder<chip::app::Clusters::AccessControl::Structs::Target::Type>(1);
+                    auto * listHolder_3 =
+                        new ListHolder<chip::app::Clusters::AccessControl::Structs::AccessControlTargetStruct::Type>(1);
                     listFreer.add(listHolder_3);
 
                     listHolder_3->mList[0].cluster.SetNull();
@@ -5454,8 +5476,8 @@ class Test_TC_ACL_2_4Suite : public TestCommand
                     listHolder_3->mList[0].deviceType.SetNull();
 
                     listHolder_0->mList[1].targets.Value() =
-                        chip::app::DataModel::List<chip::app::Clusters::AccessControl::Structs::Target::Type>(listHolder_3->mList,
-                                                                                                              1);
+                        chip::app::DataModel::List<chip::app::Clusters::AccessControl::Structs::AccessControlTargetStruct::Type>(
+                            listHolder_3->mList, 1);
                 }
                 listHolder_0->mList[1].fabricIndex = CurrentFabricIndex;
 
@@ -5503,7 +5525,8 @@ class Test_TC_ACL_2_4Suite : public TestCommand
                 listHolder_0->mList[1].targets.SetNonNull();
 
                 {
-                    auto * listHolder_3 = new ListHolder<chip::app::Clusters::AccessControl::Structs::Target::Type>(1);
+                    auto * listHolder_3 =
+                        new ListHolder<chip::app::Clusters::AccessControl::Structs::AccessControlTargetStruct::Type>(1);
                     listFreer.add(listHolder_3);
 
                     listHolder_3->mList[0].cluster.SetNull();
@@ -5512,8 +5535,8 @@ class Test_TC_ACL_2_4Suite : public TestCommand
                     listHolder_3->mList[0].deviceType.Value() = 4294967295UL;
 
                     listHolder_0->mList[1].targets.Value() =
-                        chip::app::DataModel::List<chip::app::Clusters::AccessControl::Structs::Target::Type>(listHolder_3->mList,
-                                                                                                              1);
+                        chip::app::DataModel::List<chip::app::Clusters::AccessControl::Structs::AccessControlTargetStruct::Type>(
+                            listHolder_3->mList, 1);
                 }
                 listHolder_0->mList[1].fabricIndex = CurrentFabricIndex;
 
@@ -5561,7 +5584,8 @@ class Test_TC_ACL_2_4Suite : public TestCommand
                 listHolder_0->mList[1].targets.SetNonNull();
 
                 {
-                    auto * listHolder_3 = new ListHolder<chip::app::Clusters::AccessControl::Structs::Target::Type>(1);
+                    auto * listHolder_3 =
+                        new ListHolder<chip::app::Clusters::AccessControl::Structs::AccessControlTargetStruct::Type>(1);
                     listFreer.add(listHolder_3);
 
                     listHolder_3->mList[0].cluster.SetNull();
@@ -5571,8 +5595,8 @@ class Test_TC_ACL_2_4Suite : public TestCommand
                     listHolder_3->mList[0].deviceType.Value() = 33UL;
 
                     listHolder_0->mList[1].targets.Value() =
-                        chip::app::DataModel::List<chip::app::Clusters::AccessControl::Structs::Target::Type>(listHolder_3->mList,
-                                                                                                              1);
+                        chip::app::DataModel::List<chip::app::Clusters::AccessControl::Structs::AccessControlTargetStruct::Type>(
+                            listHolder_3->mList, 1);
                 }
                 listHolder_0->mList[1].fabricIndex = CurrentFabricIndex;
 
@@ -5620,7 +5644,8 @@ class Test_TC_ACL_2_4Suite : public TestCommand
                 listHolder_0->mList[1].targets.SetNonNull();
 
                 {
-                    auto * listHolder_3 = new ListHolder<chip::app::Clusters::AccessControl::Structs::Target::Type>(1);
+                    auto * listHolder_3 =
+                        new ListHolder<chip::app::Clusters::AccessControl::Structs::AccessControlTargetStruct::Type>(1);
                     listFreer.add(listHolder_3);
 
                     listHolder_3->mList[0].cluster.SetNonNull();
@@ -5631,8 +5656,8 @@ class Test_TC_ACL_2_4Suite : public TestCommand
                     listHolder_3->mList[0].deviceType.Value() = 33UL;
 
                     listHolder_0->mList[1].targets.Value() =
-                        chip::app::DataModel::List<chip::app::Clusters::AccessControl::Structs::Target::Type>(listHolder_3->mList,
-                                                                                                              1);
+                        chip::app::DataModel::List<chip::app::Clusters::AccessControl::Structs::AccessControlTargetStruct::Type>(
+                            listHolder_3->mList, 1);
                 }
                 listHolder_0->mList[1].fabricIndex = CurrentFabricIndex;
 
@@ -8076,7 +8101,8 @@ class Test_TC_ACE_1_1Suite : public TestCommand
                 listHolder_0->mList[0].targets.SetNonNull();
 
                 {
-                    auto * listHolder_3 = new ListHolder<chip::app::Clusters::AccessControl::Structs::Target::Type>(1);
+                    auto * listHolder_3 =
+                        new ListHolder<chip::app::Clusters::AccessControl::Structs::AccessControlTargetStruct::Type>(1);
                     listFreer.add(listHolder_3);
 
                     listHolder_3->mList[0].cluster.SetNull();
@@ -8085,8 +8111,8 @@ class Test_TC_ACE_1_1Suite : public TestCommand
                     listHolder_3->mList[0].deviceType.SetNull();
 
                     listHolder_0->mList[0].targets.Value() =
-                        chip::app::DataModel::List<chip::app::Clusters::AccessControl::Structs::Target::Type>(listHolder_3->mList,
-                                                                                                              1);
+                        chip::app::DataModel::List<chip::app::Clusters::AccessControl::Structs::AccessControlTargetStruct::Type>(
+                            listHolder_3->mList, 1);
                 }
                 listHolder_0->mList[0].fabricIndex = 1U;
 
@@ -8168,7 +8194,8 @@ class Test_TC_ACE_1_1Suite : public TestCommand
                 listHolder_0->mList[0].targets.SetNonNull();
 
                 {
-                    auto * listHolder_3 = new ListHolder<chip::app::Clusters::AccessControl::Structs::Target::Type>(1);
+                    auto * listHolder_3 =
+                        new ListHolder<chip::app::Clusters::AccessControl::Structs::AccessControlTargetStruct::Type>(1);
                     listFreer.add(listHolder_3);
 
                     listHolder_3->mList[0].cluster.SetNonNull();
@@ -8178,8 +8205,8 @@ class Test_TC_ACE_1_1Suite : public TestCommand
                     listHolder_3->mList[0].deviceType.SetNull();
 
                     listHolder_0->mList[0].targets.Value() =
-                        chip::app::DataModel::List<chip::app::Clusters::AccessControl::Structs::Target::Type>(listHolder_3->mList,
-                                                                                                              1);
+                        chip::app::DataModel::List<chip::app::Clusters::AccessControl::Structs::AccessControlTargetStruct::Type>(
+                            listHolder_3->mList, 1);
                 }
                 listHolder_0->mList[0].fabricIndex = 1U;
 
@@ -8198,7 +8225,8 @@ class Test_TC_ACE_1_1Suite : public TestCommand
                 listHolder_0->mList[1].targets.SetNonNull();
 
                 {
-                    auto * listHolder_3 = new ListHolder<chip::app::Clusters::AccessControl::Structs::Target::Type>(1);
+                    auto * listHolder_3 =
+                        new ListHolder<chip::app::Clusters::AccessControl::Structs::AccessControlTargetStruct::Type>(1);
                     listFreer.add(listHolder_3);
 
                     listHolder_3->mList[0].cluster.SetNull();
@@ -8207,8 +8235,8 @@ class Test_TC_ACE_1_1Suite : public TestCommand
                     listHolder_3->mList[0].deviceType.SetNull();
 
                     listHolder_0->mList[1].targets.Value() =
-                        chip::app::DataModel::List<chip::app::Clusters::AccessControl::Structs::Target::Type>(listHolder_3->mList,
-                                                                                                              1);
+                        chip::app::DataModel::List<chip::app::Clusters::AccessControl::Structs::AccessControlTargetStruct::Type>(
+                            listHolder_3->mList, 1);
                 }
                 listHolder_0->mList[1].fabricIndex = 1U;
 
@@ -8290,7 +8318,8 @@ class Test_TC_ACE_1_1Suite : public TestCommand
                 listHolder_0->mList[0].targets.SetNonNull();
 
                 {
-                    auto * listHolder_3 = new ListHolder<chip::app::Clusters::AccessControl::Structs::Target::Type>(1);
+                    auto * listHolder_3 =
+                        new ListHolder<chip::app::Clusters::AccessControl::Structs::AccessControlTargetStruct::Type>(1);
                     listFreer.add(listHolder_3);
 
                     listHolder_3->mList[0].cluster.SetNonNull();
@@ -8300,8 +8329,8 @@ class Test_TC_ACE_1_1Suite : public TestCommand
                     listHolder_3->mList[0].deviceType.SetNull();
 
                     listHolder_0->mList[0].targets.Value() =
-                        chip::app::DataModel::List<chip::app::Clusters::AccessControl::Structs::Target::Type>(listHolder_3->mList,
-                                                                                                              1);
+                        chip::app::DataModel::List<chip::app::Clusters::AccessControl::Structs::AccessControlTargetStruct::Type>(
+                            listHolder_3->mList, 1);
                 }
                 listHolder_0->mList[0].fabricIndex = 1U;
 
@@ -8320,7 +8349,8 @@ class Test_TC_ACE_1_1Suite : public TestCommand
                 listHolder_0->mList[1].targets.SetNonNull();
 
                 {
-                    auto * listHolder_3 = new ListHolder<chip::app::Clusters::AccessControl::Structs::Target::Type>(1);
+                    auto * listHolder_3 =
+                        new ListHolder<chip::app::Clusters::AccessControl::Structs::AccessControlTargetStruct::Type>(1);
                     listFreer.add(listHolder_3);
 
                     listHolder_3->mList[0].cluster.SetNull();
@@ -8329,8 +8359,8 @@ class Test_TC_ACE_1_1Suite : public TestCommand
                     listHolder_3->mList[0].deviceType.SetNull();
 
                     listHolder_0->mList[1].targets.Value() =
-                        chip::app::DataModel::List<chip::app::Clusters::AccessControl::Structs::Target::Type>(listHolder_3->mList,
-                                                                                                              1);
+                        chip::app::DataModel::List<chip::app::Clusters::AccessControl::Structs::AccessControlTargetStruct::Type>(
+                            listHolder_3->mList, 1);
                 }
                 listHolder_0->mList[1].fabricIndex = 1U;
 
@@ -8412,7 +8442,8 @@ class Test_TC_ACE_1_1Suite : public TestCommand
                 listHolder_0->mList[0].targets.SetNonNull();
 
                 {
-                    auto * listHolder_3 = new ListHolder<chip::app::Clusters::AccessControl::Structs::Target::Type>(1);
+                    auto * listHolder_3 =
+                        new ListHolder<chip::app::Clusters::AccessControl::Structs::AccessControlTargetStruct::Type>(1);
                     listFreer.add(listHolder_3);
 
                     listHolder_3->mList[0].cluster.SetNonNull();
@@ -8422,8 +8453,8 @@ class Test_TC_ACE_1_1Suite : public TestCommand
                     listHolder_3->mList[0].deviceType.SetNull();
 
                     listHolder_0->mList[0].targets.Value() =
-                        chip::app::DataModel::List<chip::app::Clusters::AccessControl::Structs::Target::Type>(listHolder_3->mList,
-                                                                                                              1);
+                        chip::app::DataModel::List<chip::app::Clusters::AccessControl::Structs::AccessControlTargetStruct::Type>(
+                            listHolder_3->mList, 1);
                 }
                 listHolder_0->mList[0].fabricIndex = 1U;
 
@@ -8442,7 +8473,8 @@ class Test_TC_ACE_1_1Suite : public TestCommand
                 listHolder_0->mList[1].targets.SetNonNull();
 
                 {
-                    auto * listHolder_3 = new ListHolder<chip::app::Clusters::AccessControl::Structs::Target::Type>(1);
+                    auto * listHolder_3 =
+                        new ListHolder<chip::app::Clusters::AccessControl::Structs::AccessControlTargetStruct::Type>(1);
                     listFreer.add(listHolder_3);
 
                     listHolder_3->mList[0].cluster.SetNull();
@@ -8451,8 +8483,8 @@ class Test_TC_ACE_1_1Suite : public TestCommand
                     listHolder_3->mList[0].deviceType.SetNull();
 
                     listHolder_0->mList[1].targets.Value() =
-                        chip::app::DataModel::List<chip::app::Clusters::AccessControl::Structs::Target::Type>(listHolder_3->mList,
-                                                                                                              1);
+                        chip::app::DataModel::List<chip::app::Clusters::AccessControl::Structs::AccessControlTargetStruct::Type>(
+                            listHolder_3->mList, 1);
                 }
                 listHolder_0->mList[1].fabricIndex = 1U;
 
@@ -8534,7 +8566,8 @@ class Test_TC_ACE_1_1Suite : public TestCommand
                 listHolder_0->mList[0].targets.SetNonNull();
 
                 {
-                    auto * listHolder_3 = new ListHolder<chip::app::Clusters::AccessControl::Structs::Target::Type>(1);
+                    auto * listHolder_3 =
+                        new ListHolder<chip::app::Clusters::AccessControl::Structs::AccessControlTargetStruct::Type>(1);
                     listFreer.add(listHolder_3);
 
                     listHolder_3->mList[0].cluster.SetNonNull();
@@ -8544,8 +8577,8 @@ class Test_TC_ACE_1_1Suite : public TestCommand
                     listHolder_3->mList[0].deviceType.SetNull();
 
                     listHolder_0->mList[0].targets.Value() =
-                        chip::app::DataModel::List<chip::app::Clusters::AccessControl::Structs::Target::Type>(listHolder_3->mList,
-                                                                                                              1);
+                        chip::app::DataModel::List<chip::app::Clusters::AccessControl::Structs::AccessControlTargetStruct::Type>(
+                            listHolder_3->mList, 1);
                 }
                 listHolder_0->mList[0].fabricIndex = 1U;
 
@@ -8903,7 +8936,8 @@ class Test_TC_ACE_1_5Suite : public TestCommand
                 listHolder_0->mList[0].targets.SetNonNull();
 
                 {
-                    auto * listHolder_3 = new ListHolder<chip::app::Clusters::AccessControl::Structs::Target::Type>(1);
+                    auto * listHolder_3 =
+                        new ListHolder<chip::app::Clusters::AccessControl::Structs::AccessControlTargetStruct::Type>(1);
                     listFreer.add(listHolder_3);
 
                     listHolder_3->mList[0].cluster.SetNonNull();
@@ -8913,8 +8947,8 @@ class Test_TC_ACE_1_5Suite : public TestCommand
                     listHolder_3->mList[0].deviceType.SetNull();
 
                     listHolder_0->mList[0].targets.Value() =
-                        chip::app::DataModel::List<chip::app::Clusters::AccessControl::Structs::Target::Type>(listHolder_3->mList,
-                                                                                                              1);
+                        chip::app::DataModel::List<chip::app::Clusters::AccessControl::Structs::AccessControlTargetStruct::Type>(
+                            listHolder_3->mList, 1);
                 }
                 listHolder_0->mList[0].fabricIndex = th1FabricIndex;
 
@@ -8926,7 +8960,8 @@ class Test_TC_ACE_1_5Suite : public TestCommand
                 listHolder_0->mList[1].targets.SetNonNull();
 
                 {
-                    auto * listHolder_3 = new ListHolder<chip::app::Clusters::AccessControl::Structs::Target::Type>(1);
+                    auto * listHolder_3 =
+                        new ListHolder<chip::app::Clusters::AccessControl::Structs::AccessControlTargetStruct::Type>(1);
                     listFreer.add(listHolder_3);
 
                     listHolder_3->mList[0].cluster.SetNonNull();
@@ -8936,8 +8971,8 @@ class Test_TC_ACE_1_5Suite : public TestCommand
                     listHolder_3->mList[0].deviceType.SetNull();
 
                     listHolder_0->mList[1].targets.Value() =
-                        chip::app::DataModel::List<chip::app::Clusters::AccessControl::Structs::Target::Type>(listHolder_3->mList,
-                                                                                                              1);
+                        chip::app::DataModel::List<chip::app::Clusters::AccessControl::Structs::AccessControlTargetStruct::Type>(
+                            listHolder_3->mList, 1);
                 }
                 listHolder_0->mList[1].fabricIndex = th1FabricIndex;
 
@@ -8978,7 +9013,8 @@ class Test_TC_ACE_1_5Suite : public TestCommand
                 listHolder_0->mList[0].targets.SetNonNull();
 
                 {
-                    auto * listHolder_3 = new ListHolder<chip::app::Clusters::AccessControl::Structs::Target::Type>(1);
+                    auto * listHolder_3 =
+                        new ListHolder<chip::app::Clusters::AccessControl::Structs::AccessControlTargetStruct::Type>(1);
                     listFreer.add(listHolder_3);
 
                     listHolder_3->mList[0].cluster.SetNonNull();
@@ -8988,8 +9024,8 @@ class Test_TC_ACE_1_5Suite : public TestCommand
                     listHolder_3->mList[0].deviceType.SetNull();
 
                     listHolder_0->mList[0].targets.Value() =
-                        chip::app::DataModel::List<chip::app::Clusters::AccessControl::Structs::Target::Type>(listHolder_3->mList,
-                                                                                                              1);
+                        chip::app::DataModel::List<chip::app::Clusters::AccessControl::Structs::AccessControlTargetStruct::Type>(
+                            listHolder_3->mList, 1);
                 }
                 listHolder_0->mList[0].fabricIndex = th2FabricIndex;
 
@@ -9001,7 +9037,8 @@ class Test_TC_ACE_1_5Suite : public TestCommand
                 listHolder_0->mList[1].targets.SetNonNull();
 
                 {
-                    auto * listHolder_3 = new ListHolder<chip::app::Clusters::AccessControl::Structs::Target::Type>(1);
+                    auto * listHolder_3 =
+                        new ListHolder<chip::app::Clusters::AccessControl::Structs::AccessControlTargetStruct::Type>(1);
                     listFreer.add(listHolder_3);
 
                     listHolder_3->mList[0].cluster.SetNonNull();
@@ -9011,8 +9048,8 @@ class Test_TC_ACE_1_5Suite : public TestCommand
                     listHolder_3->mList[0].deviceType.SetNull();
 
                     listHolder_0->mList[1].targets.Value() =
-                        chip::app::DataModel::List<chip::app::Clusters::AccessControl::Structs::Target::Type>(listHolder_3->mList,
-                                                                                                              1);
+                        chip::app::DataModel::List<chip::app::Clusters::AccessControl::Structs::AccessControlTargetStruct::Type>(
+                            listHolder_3->mList, 1);
                 }
                 listHolder_0->mList[1].fabricIndex = th2FabricIndex;
 
@@ -39338,7 +39375,8 @@ class OTA_SuccessfulTransferSuite : public TestCommand
                 listHolder_0->mList[1].targets.SetNonNull();
 
                 {
-                    auto * listHolder_3 = new ListHolder<chip::app::Clusters::AccessControl::Structs::Target::Type>(1);
+                    auto * listHolder_3 =
+                        new ListHolder<chip::app::Clusters::AccessControl::Structs::AccessControlTargetStruct::Type>(1);
                     listFreer.add(listHolder_3);
 
                     listHolder_3->mList[0].cluster.SetNonNull();
@@ -39347,8 +39385,8 @@ class OTA_SuccessfulTransferSuite : public TestCommand
                     listHolder_3->mList[0].deviceType.SetNull();
 
                     listHolder_0->mList[1].targets.Value() =
-                        chip::app::DataModel::List<chip::app::Clusters::AccessControl::Structs::Target::Type>(listHolder_3->mList,
-                                                                                                              1);
+                        chip::app::DataModel::List<chip::app::Clusters::AccessControl::Structs::AccessControlTargetStruct::Type>(
+                            listHolder_3->mList, 1);
                 }
                 listHolder_0->mList[1].fabricIndex = 1U;
 
@@ -77530,7 +77568,8 @@ class TestAccessControlConstraintsSuite : public TestCommand
                 listHolder_0->mList[1].targets.SetNonNull();
 
                 {
-                    auto * listHolder_3 = new ListHolder<chip::app::Clusters::AccessControl::Structs::Target::Type>(1);
+                    auto * listHolder_3 =
+                        new ListHolder<chip::app::Clusters::AccessControl::Structs::AccessControlTargetStruct::Type>(1);
                     listFreer.add(listHolder_3);
 
                     listHolder_3->mList[0].cluster.SetNull();
@@ -77538,8 +77577,8 @@ class TestAccessControlConstraintsSuite : public TestCommand
                     listHolder_3->mList[0].deviceType.SetNull();
 
                     listHolder_0->mList[1].targets.Value() =
-                        chip::app::DataModel::List<chip::app::Clusters::AccessControl::Structs::Target::Type>(listHolder_3->mList,
-                                                                                                              1);
+                        chip::app::DataModel::List<chip::app::Clusters::AccessControl::Structs::AccessControlTargetStruct::Type>(
+                            listHolder_3->mList, 1);
                 }
                 listHolder_0->mList[1].fabricIndex = 1U;
 
@@ -77582,7 +77621,8 @@ class TestAccessControlConstraintsSuite : public TestCommand
                 listHolder_0->mList[1].targets.SetNonNull();
 
                 {
-                    auto * listHolder_3 = new ListHolder<chip::app::Clusters::AccessControl::Structs::Target::Type>(1);
+                    auto * listHolder_3 =
+                        new ListHolder<chip::app::Clusters::AccessControl::Structs::AccessControlTargetStruct::Type>(1);
                     listFreer.add(listHolder_3);
 
                     listHolder_3->mList[0].cluster.SetNull();
@@ -77592,8 +77632,8 @@ class TestAccessControlConstraintsSuite : public TestCommand
                     listHolder_3->mList[0].deviceType.Value() = 33UL;
 
                     listHolder_0->mList[1].targets.Value() =
-                        chip::app::DataModel::List<chip::app::Clusters::AccessControl::Structs::Target::Type>(listHolder_3->mList,
-                                                                                                              1);
+                        chip::app::DataModel::List<chip::app::Clusters::AccessControl::Structs::AccessControlTargetStruct::Type>(
+                            listHolder_3->mList, 1);
                 }
                 listHolder_0->mList[1].fabricIndex = 1U;
 
diff --git a/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h b/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h
index a7411f0d9f3ec5..0b0fe0fc2522a7 100644
--- a/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h
+++ b/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h
@@ -9617,8 +9617,8 @@ class WriteAccessControlAcl : public WriteAttribute {
                     { // Scope for our temporary variables
                         auto * array_3 = [NSMutableArray new];
                         for (auto & entry_3 : entry_0.targets.Value()) {
-                            MTRAccessControlClusterTarget * newElement_3;
-                            newElement_3 = [MTRAccessControlClusterTarget new];
+                            MTRAccessControlClusterAccessControlTargetStruct * newElement_3;
+                            newElement_3 = [MTRAccessControlClusterAccessControlTargetStruct new];
                             if (entry_3.cluster.IsNull()) {
                                 newElement_3.cluster = nil;
                             } else {
diff --git a/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h b/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h
index 7a8e4717a769af..b104e9c8a0430b 100644
--- a/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h
+++ b/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h
@@ -517,20 +517,20 @@ class TestAccessControlCluster : public TestCommandBridge {
             ((MTRAccessControlClusterAccessControlEntryStruct *) temp_0[0]).subjects = nil;
             {
                 NSMutableArray * temp_3 = [[NSMutableArray alloc] init];
-                temp_3[0] = [[MTRAccessControlClusterTarget alloc] init];
-                ((MTRAccessControlClusterTarget *) temp_3[0]).cluster = nil;
-                ((MTRAccessControlClusterTarget *) temp_3[0]).endpoint = [NSNumber numberWithUnsignedShort:0U];
-                ((MTRAccessControlClusterTarget *) temp_3[0]).deviceType = nil;
+                temp_3[0] = [[MTRAccessControlClusterAccessControlTargetStruct alloc] init];
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[0]).cluster = nil;
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[0]).endpoint = [NSNumber numberWithUnsignedShort:0U];
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[0]).deviceType = nil;
 
-                temp_3[1] = [[MTRAccessControlClusterTarget alloc] init];
-                ((MTRAccessControlClusterTarget *) temp_3[1]).cluster = [NSNumber numberWithUnsignedInt:1UL];
-                ((MTRAccessControlClusterTarget *) temp_3[1]).endpoint = nil;
-                ((MTRAccessControlClusterTarget *) temp_3[1]).deviceType = nil;
+                temp_3[1] = [[MTRAccessControlClusterAccessControlTargetStruct alloc] init];
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[1]).cluster = [NSNumber numberWithUnsignedInt:1UL];
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[1]).endpoint = nil;
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[1]).deviceType = nil;
 
-                temp_3[2] = [[MTRAccessControlClusterTarget alloc] init];
-                ((MTRAccessControlClusterTarget *) temp_3[2]).cluster = [NSNumber numberWithUnsignedInt:2UL];
-                ((MTRAccessControlClusterTarget *) temp_3[2]).endpoint = [NSNumber numberWithUnsignedShort:3U];
-                ((MTRAccessControlClusterTarget *) temp_3[2]).deviceType = nil;
+                temp_3[2] = [[MTRAccessControlClusterAccessControlTargetStruct alloc] init];
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[2]).cluster = [NSNumber numberWithUnsignedInt:2UL];
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[2]).endpoint = [NSNumber numberWithUnsignedShort:3U];
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[2]).deviceType = nil;
 
                 ((MTRAccessControlClusterAccessControlEntryStruct *) temp_0[0]).targets = temp_3;
             }
@@ -549,20 +549,20 @@ class TestAccessControlCluster : public TestCommandBridge {
             }
             {
                 NSMutableArray * temp_3 = [[NSMutableArray alloc] init];
-                temp_3[0] = [[MTRAccessControlClusterTarget alloc] init];
-                ((MTRAccessControlClusterTarget *) temp_3[0]).cluster = nil;
-                ((MTRAccessControlClusterTarget *) temp_3[0]).endpoint = [NSNumber numberWithUnsignedShort:8U];
-                ((MTRAccessControlClusterTarget *) temp_3[0]).deviceType = nil;
+                temp_3[0] = [[MTRAccessControlClusterAccessControlTargetStruct alloc] init];
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[0]).cluster = nil;
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[0]).endpoint = [NSNumber numberWithUnsignedShort:8U];
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[0]).deviceType = nil;
 
-                temp_3[1] = [[MTRAccessControlClusterTarget alloc] init];
-                ((MTRAccessControlClusterTarget *) temp_3[1]).cluster = [NSNumber numberWithUnsignedInt:9UL];
-                ((MTRAccessControlClusterTarget *) temp_3[1]).endpoint = nil;
-                ((MTRAccessControlClusterTarget *) temp_3[1]).deviceType = nil;
+                temp_3[1] = [[MTRAccessControlClusterAccessControlTargetStruct alloc] init];
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[1]).cluster = [NSNumber numberWithUnsignedInt:9UL];
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[1]).endpoint = nil;
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[1]).deviceType = nil;
 
-                temp_3[2] = [[MTRAccessControlClusterTarget alloc] init];
-                ((MTRAccessControlClusterTarget *) temp_3[2]).cluster = [NSNumber numberWithUnsignedInt:10UL];
-                ((MTRAccessControlClusterTarget *) temp_3[2]).endpoint = [NSNumber numberWithUnsignedShort:11U];
-                ((MTRAccessControlClusterTarget *) temp_3[2]).deviceType = nil;
+                temp_3[2] = [[MTRAccessControlClusterAccessControlTargetStruct alloc] init];
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[2]).cluster = [NSNumber numberWithUnsignedInt:10UL];
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[2]).endpoint = [NSNumber numberWithUnsignedShort:11U];
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[2]).deviceType = nil;
 
                 ((MTRAccessControlClusterAccessControlEntryStruct *) temp_0[1]).targets = temp_3;
             }
@@ -581,20 +581,20 @@ class TestAccessControlCluster : public TestCommandBridge {
             }
             {
                 NSMutableArray * temp_3 = [[NSMutableArray alloc] init];
-                temp_3[0] = [[MTRAccessControlClusterTarget alloc] init];
-                ((MTRAccessControlClusterTarget *) temp_3[0]).cluster = nil;
-                ((MTRAccessControlClusterTarget *) temp_3[0]).endpoint = [NSNumber numberWithUnsignedShort:16U];
-                ((MTRAccessControlClusterTarget *) temp_3[0]).deviceType = nil;
+                temp_3[0] = [[MTRAccessControlClusterAccessControlTargetStruct alloc] init];
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[0]).cluster = nil;
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[0]).endpoint = [NSNumber numberWithUnsignedShort:16U];
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[0]).deviceType = nil;
 
-                temp_3[1] = [[MTRAccessControlClusterTarget alloc] init];
-                ((MTRAccessControlClusterTarget *) temp_3[1]).cluster = [NSNumber numberWithUnsignedInt:17UL];
-                ((MTRAccessControlClusterTarget *) temp_3[1]).endpoint = nil;
-                ((MTRAccessControlClusterTarget *) temp_3[1]).deviceType = nil;
+                temp_3[1] = [[MTRAccessControlClusterAccessControlTargetStruct alloc] init];
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[1]).cluster = [NSNumber numberWithUnsignedInt:17UL];
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[1]).endpoint = nil;
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[1]).deviceType = nil;
 
-                temp_3[2] = [[MTRAccessControlClusterTarget alloc] init];
-                ((MTRAccessControlClusterTarget *) temp_3[2]).cluster = [NSNumber numberWithUnsignedInt:18UL];
-                ((MTRAccessControlClusterTarget *) temp_3[2]).endpoint = [NSNumber numberWithUnsignedShort:19U];
-                ((MTRAccessControlClusterTarget *) temp_3[2]).deviceType = nil;
+                temp_3[2] = [[MTRAccessControlClusterAccessControlTargetStruct alloc] init];
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[2]).cluster = [NSNumber numberWithUnsignedInt:18UL];
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[2]).endpoint = [NSNumber numberWithUnsignedShort:19U];
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[2]).deviceType = nil;
 
                 ((MTRAccessControlClusterAccessControlEntryStruct *) temp_0[2]).targets = temp_3;
             }
@@ -613,20 +613,20 @@ class TestAccessControlCluster : public TestCommandBridge {
             }
             {
                 NSMutableArray * temp_3 = [[NSMutableArray alloc] init];
-                temp_3[0] = [[MTRAccessControlClusterTarget alloc] init];
-                ((MTRAccessControlClusterTarget *) temp_3[0]).cluster = nil;
-                ((MTRAccessControlClusterTarget *) temp_3[0]).endpoint = [NSNumber numberWithUnsignedShort:24U];
-                ((MTRAccessControlClusterTarget *) temp_3[0]).deviceType = nil;
+                temp_3[0] = [[MTRAccessControlClusterAccessControlTargetStruct alloc] init];
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[0]).cluster = nil;
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[0]).endpoint = [NSNumber numberWithUnsignedShort:24U];
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[0]).deviceType = nil;
 
-                temp_3[1] = [[MTRAccessControlClusterTarget alloc] init];
-                ((MTRAccessControlClusterTarget *) temp_3[1]).cluster = [NSNumber numberWithUnsignedInt:25UL];
-                ((MTRAccessControlClusterTarget *) temp_3[1]).endpoint = nil;
-                ((MTRAccessControlClusterTarget *) temp_3[1]).deviceType = nil;
+                temp_3[1] = [[MTRAccessControlClusterAccessControlTargetStruct alloc] init];
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[1]).cluster = [NSNumber numberWithUnsignedInt:25UL];
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[1]).endpoint = nil;
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[1]).deviceType = nil;
 
-                temp_3[2] = [[MTRAccessControlClusterTarget alloc] init];
-                ((MTRAccessControlClusterTarget *) temp_3[2]).cluster = [NSNumber numberWithUnsignedInt:26UL];
-                ((MTRAccessControlClusterTarget *) temp_3[2]).endpoint = [NSNumber numberWithUnsignedShort:27U];
-                ((MTRAccessControlClusterTarget *) temp_3[2]).deviceType = nil;
+                temp_3[2] = [[MTRAccessControlClusterAccessControlTargetStruct alloc] init];
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[2]).cluster = [NSNumber numberWithUnsignedInt:26UL];
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[2]).endpoint = [NSNumber numberWithUnsignedShort:27U];
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[2]).deviceType = nil;
 
                 ((MTRAccessControlClusterAccessControlEntryStruct *) temp_0[3]).targets = temp_3;
             }
@@ -677,72 +677,72 @@ class TestAccessControlCluster : public TestCommandBridge {
                                         [((MTRAccessControlClusterAccessControlEntryStruct *) actualValue[0]).targets count],
                                         static_cast<uint32_t>(3)));
                                     VerifyOrReturn(CheckValueNull("Cluster",
-                                        ((MTRAccessControlClusterTarget *) ((MTRAccessControlClusterAccessControlEntryStruct *)
-                                                                                actualValue[0])
+                                        ((MTRAccessControlClusterAccessControlTargetStruct *) ((MTRAccessControlClusterAccessControlEntryStruct *)
+                                                                                                   actualValue[0])
                                                 .targets[0])
                                             .cluster));
                                     VerifyOrReturn(CheckValueNonNull("Endpoint",
-                                        ((MTRAccessControlClusterTarget *) ((MTRAccessControlClusterAccessControlEntryStruct *)
-                                                                                actualValue[0])
+                                        ((MTRAccessControlClusterAccessControlTargetStruct *) ((MTRAccessControlClusterAccessControlEntryStruct *)
+                                                                                                   actualValue[0])
                                                 .targets[0])
                                             .endpoint));
                                     VerifyOrReturn(CheckValue("Endpoint",
-                                        ((MTRAccessControlClusterTarget *) ((MTRAccessControlClusterAccessControlEntryStruct *)
-                                                                                actualValue[0])
+                                        ((MTRAccessControlClusterAccessControlTargetStruct *) ((MTRAccessControlClusterAccessControlEntryStruct *)
+                                                                                                   actualValue[0])
                                                 .targets[0])
                                             .endpoint,
                                         0U));
                                     VerifyOrReturn(CheckValueNull("DeviceType",
-                                        ((MTRAccessControlClusterTarget *) ((MTRAccessControlClusterAccessControlEntryStruct *)
-                                                                                actualValue[0])
+                                        ((MTRAccessControlClusterAccessControlTargetStruct *) ((MTRAccessControlClusterAccessControlEntryStruct *)
+                                                                                                   actualValue[0])
                                                 .targets[0])
                                             .deviceType));
                                     VerifyOrReturn(CheckValueNonNull("Cluster",
-                                        ((MTRAccessControlClusterTarget *) ((MTRAccessControlClusterAccessControlEntryStruct *)
-                                                                                actualValue[0])
+                                        ((MTRAccessControlClusterAccessControlTargetStruct *) ((MTRAccessControlClusterAccessControlEntryStruct *)
+                                                                                                   actualValue[0])
                                                 .targets[1])
                                             .cluster));
                                     VerifyOrReturn(CheckValue("Cluster",
-                                        ((MTRAccessControlClusterTarget *) ((MTRAccessControlClusterAccessControlEntryStruct *)
-                                                                                actualValue[0])
+                                        ((MTRAccessControlClusterAccessControlTargetStruct *) ((MTRAccessControlClusterAccessControlEntryStruct *)
+                                                                                                   actualValue[0])
                                                 .targets[1])
                                             .cluster,
                                         1UL));
                                     VerifyOrReturn(CheckValueNull("Endpoint",
-                                        ((MTRAccessControlClusterTarget *) ((MTRAccessControlClusterAccessControlEntryStruct *)
-                                                                                actualValue[0])
+                                        ((MTRAccessControlClusterAccessControlTargetStruct *) ((MTRAccessControlClusterAccessControlEntryStruct *)
+                                                                                                   actualValue[0])
                                                 .targets[1])
                                             .endpoint));
                                     VerifyOrReturn(CheckValueNull("DeviceType",
-                                        ((MTRAccessControlClusterTarget *) ((MTRAccessControlClusterAccessControlEntryStruct *)
-                                                                                actualValue[0])
+                                        ((MTRAccessControlClusterAccessControlTargetStruct *) ((MTRAccessControlClusterAccessControlEntryStruct *)
+                                                                                                   actualValue[0])
                                                 .targets[1])
                                             .deviceType));
                                     VerifyOrReturn(CheckValueNonNull("Cluster",
-                                        ((MTRAccessControlClusterTarget *) ((MTRAccessControlClusterAccessControlEntryStruct *)
-                                                                                actualValue[0])
+                                        ((MTRAccessControlClusterAccessControlTargetStruct *) ((MTRAccessControlClusterAccessControlEntryStruct *)
+                                                                                                   actualValue[0])
                                                 .targets[2])
                                             .cluster));
                                     VerifyOrReturn(CheckValue("Cluster",
-                                        ((MTRAccessControlClusterTarget *) ((MTRAccessControlClusterAccessControlEntryStruct *)
-                                                                                actualValue[0])
+                                        ((MTRAccessControlClusterAccessControlTargetStruct *) ((MTRAccessControlClusterAccessControlEntryStruct *)
+                                                                                                   actualValue[0])
                                                 .targets[2])
                                             .cluster,
                                         2UL));
                                     VerifyOrReturn(CheckValueNonNull("Endpoint",
-                                        ((MTRAccessControlClusterTarget *) ((MTRAccessControlClusterAccessControlEntryStruct *)
-                                                                                actualValue[0])
+                                        ((MTRAccessControlClusterAccessControlTargetStruct *) ((MTRAccessControlClusterAccessControlEntryStruct *)
+                                                                                                   actualValue[0])
                                                 .targets[2])
                                             .endpoint));
                                     VerifyOrReturn(CheckValue("Endpoint",
-                                        ((MTRAccessControlClusterTarget *) ((MTRAccessControlClusterAccessControlEntryStruct *)
-                                                                                actualValue[0])
+                                        ((MTRAccessControlClusterAccessControlTargetStruct *) ((MTRAccessControlClusterAccessControlEntryStruct *)
+                                                                                                   actualValue[0])
                                                 .targets[2])
                                             .endpoint,
                                         3U));
                                     VerifyOrReturn(CheckValueNull("DeviceType",
-                                        ((MTRAccessControlClusterTarget *) ((MTRAccessControlClusterAccessControlEntryStruct *)
-                                                                                actualValue[0])
+                                        ((MTRAccessControlClusterAccessControlTargetStruct *) ((MTRAccessControlClusterAccessControlEntryStruct *)
+                                                                                                   actualValue[0])
                                                 .targets[2])
                                             .deviceType));
                                     VerifyOrReturn(CheckValue("FabricIndex",
@@ -770,72 +770,72 @@ class TestAccessControlCluster : public TestCommandBridge {
                                         [((MTRAccessControlClusterAccessControlEntryStruct *) actualValue[1]).targets count],
                                         static_cast<uint32_t>(3)));
                                     VerifyOrReturn(CheckValueNull("Cluster",
-                                        ((MTRAccessControlClusterTarget *) ((MTRAccessControlClusterAccessControlEntryStruct *)
-                                                                                actualValue[1])
+                                        ((MTRAccessControlClusterAccessControlTargetStruct *) ((MTRAccessControlClusterAccessControlEntryStruct *)
+                                                                                                   actualValue[1])
                                                 .targets[0])
                                             .cluster));
                                     VerifyOrReturn(CheckValueNonNull("Endpoint",
-                                        ((MTRAccessControlClusterTarget *) ((MTRAccessControlClusterAccessControlEntryStruct *)
-                                                                                actualValue[1])
+                                        ((MTRAccessControlClusterAccessControlTargetStruct *) ((MTRAccessControlClusterAccessControlEntryStruct *)
+                                                                                                   actualValue[1])
                                                 .targets[0])
                                             .endpoint));
                                     VerifyOrReturn(CheckValue("Endpoint",
-                                        ((MTRAccessControlClusterTarget *) ((MTRAccessControlClusterAccessControlEntryStruct *)
-                                                                                actualValue[1])
+                                        ((MTRAccessControlClusterAccessControlTargetStruct *) ((MTRAccessControlClusterAccessControlEntryStruct *)
+                                                                                                   actualValue[1])
                                                 .targets[0])
                                             .endpoint,
                                         8U));
                                     VerifyOrReturn(CheckValueNull("DeviceType",
-                                        ((MTRAccessControlClusterTarget *) ((MTRAccessControlClusterAccessControlEntryStruct *)
-                                                                                actualValue[1])
+                                        ((MTRAccessControlClusterAccessControlTargetStruct *) ((MTRAccessControlClusterAccessControlEntryStruct *)
+                                                                                                   actualValue[1])
                                                 .targets[0])
                                             .deviceType));
                                     VerifyOrReturn(CheckValueNonNull("Cluster",
-                                        ((MTRAccessControlClusterTarget *) ((MTRAccessControlClusterAccessControlEntryStruct *)
-                                                                                actualValue[1])
+                                        ((MTRAccessControlClusterAccessControlTargetStruct *) ((MTRAccessControlClusterAccessControlEntryStruct *)
+                                                                                                   actualValue[1])
                                                 .targets[1])
                                             .cluster));
                                     VerifyOrReturn(CheckValue("Cluster",
-                                        ((MTRAccessControlClusterTarget *) ((MTRAccessControlClusterAccessControlEntryStruct *)
-                                                                                actualValue[1])
+                                        ((MTRAccessControlClusterAccessControlTargetStruct *) ((MTRAccessControlClusterAccessControlEntryStruct *)
+                                                                                                   actualValue[1])
                                                 .targets[1])
                                             .cluster,
                                         9UL));
                                     VerifyOrReturn(CheckValueNull("Endpoint",
-                                        ((MTRAccessControlClusterTarget *) ((MTRAccessControlClusterAccessControlEntryStruct *)
-                                                                                actualValue[1])
+                                        ((MTRAccessControlClusterAccessControlTargetStruct *) ((MTRAccessControlClusterAccessControlEntryStruct *)
+                                                                                                   actualValue[1])
                                                 .targets[1])
                                             .endpoint));
                                     VerifyOrReturn(CheckValueNull("DeviceType",
-                                        ((MTRAccessControlClusterTarget *) ((MTRAccessControlClusterAccessControlEntryStruct *)
-                                                                                actualValue[1])
+                                        ((MTRAccessControlClusterAccessControlTargetStruct *) ((MTRAccessControlClusterAccessControlEntryStruct *)
+                                                                                                   actualValue[1])
                                                 .targets[1])
                                             .deviceType));
                                     VerifyOrReturn(CheckValueNonNull("Cluster",
-                                        ((MTRAccessControlClusterTarget *) ((MTRAccessControlClusterAccessControlEntryStruct *)
-                                                                                actualValue[1])
+                                        ((MTRAccessControlClusterAccessControlTargetStruct *) ((MTRAccessControlClusterAccessControlEntryStruct *)
+                                                                                                   actualValue[1])
                                                 .targets[2])
                                             .cluster));
                                     VerifyOrReturn(CheckValue("Cluster",
-                                        ((MTRAccessControlClusterTarget *) ((MTRAccessControlClusterAccessControlEntryStruct *)
-                                                                                actualValue[1])
+                                        ((MTRAccessControlClusterAccessControlTargetStruct *) ((MTRAccessControlClusterAccessControlEntryStruct *)
+                                                                                                   actualValue[1])
                                                 .targets[2])
                                             .cluster,
                                         10UL));
                                     VerifyOrReturn(CheckValueNonNull("Endpoint",
-                                        ((MTRAccessControlClusterTarget *) ((MTRAccessControlClusterAccessControlEntryStruct *)
-                                                                                actualValue[1])
+                                        ((MTRAccessControlClusterAccessControlTargetStruct *) ((MTRAccessControlClusterAccessControlEntryStruct *)
+                                                                                                   actualValue[1])
                                                 .targets[2])
                                             .endpoint));
                                     VerifyOrReturn(CheckValue("Endpoint",
-                                        ((MTRAccessControlClusterTarget *) ((MTRAccessControlClusterAccessControlEntryStruct *)
-                                                                                actualValue[1])
+                                        ((MTRAccessControlClusterAccessControlTargetStruct *) ((MTRAccessControlClusterAccessControlEntryStruct *)
+                                                                                                   actualValue[1])
                                                 .targets[2])
                                             .endpoint,
                                         11U));
                                     VerifyOrReturn(CheckValueNull("DeviceType",
-                                        ((MTRAccessControlClusterTarget *) ((MTRAccessControlClusterAccessControlEntryStruct *)
-                                                                                actualValue[1])
+                                        ((MTRAccessControlClusterAccessControlTargetStruct *) ((MTRAccessControlClusterAccessControlEntryStruct *)
+                                                                                                   actualValue[1])
                                                 .targets[2])
                                             .deviceType));
                                     VerifyOrReturn(CheckValue("FabricIndex",
@@ -863,72 +863,72 @@ class TestAccessControlCluster : public TestCommandBridge {
                                         [((MTRAccessControlClusterAccessControlEntryStruct *) actualValue[2]).targets count],
                                         static_cast<uint32_t>(3)));
                                     VerifyOrReturn(CheckValueNull("Cluster",
-                                        ((MTRAccessControlClusterTarget *) ((MTRAccessControlClusterAccessControlEntryStruct *)
-                                                                                actualValue[2])
+                                        ((MTRAccessControlClusterAccessControlTargetStruct *) ((MTRAccessControlClusterAccessControlEntryStruct *)
+                                                                                                   actualValue[2])
                                                 .targets[0])
                                             .cluster));
                                     VerifyOrReturn(CheckValueNonNull("Endpoint",
-                                        ((MTRAccessControlClusterTarget *) ((MTRAccessControlClusterAccessControlEntryStruct *)
-                                                                                actualValue[2])
+                                        ((MTRAccessControlClusterAccessControlTargetStruct *) ((MTRAccessControlClusterAccessControlEntryStruct *)
+                                                                                                   actualValue[2])
                                                 .targets[0])
                                             .endpoint));
                                     VerifyOrReturn(CheckValue("Endpoint",
-                                        ((MTRAccessControlClusterTarget *) ((MTRAccessControlClusterAccessControlEntryStruct *)
-                                                                                actualValue[2])
+                                        ((MTRAccessControlClusterAccessControlTargetStruct *) ((MTRAccessControlClusterAccessControlEntryStruct *)
+                                                                                                   actualValue[2])
                                                 .targets[0])
                                             .endpoint,
                                         16U));
                                     VerifyOrReturn(CheckValueNull("DeviceType",
-                                        ((MTRAccessControlClusterTarget *) ((MTRAccessControlClusterAccessControlEntryStruct *)
-                                                                                actualValue[2])
+                                        ((MTRAccessControlClusterAccessControlTargetStruct *) ((MTRAccessControlClusterAccessControlEntryStruct *)
+                                                                                                   actualValue[2])
                                                 .targets[0])
                                             .deviceType));
                                     VerifyOrReturn(CheckValueNonNull("Cluster",
-                                        ((MTRAccessControlClusterTarget *) ((MTRAccessControlClusterAccessControlEntryStruct *)
-                                                                                actualValue[2])
+                                        ((MTRAccessControlClusterAccessControlTargetStruct *) ((MTRAccessControlClusterAccessControlEntryStruct *)
+                                                                                                   actualValue[2])
                                                 .targets[1])
                                             .cluster));
                                     VerifyOrReturn(CheckValue("Cluster",
-                                        ((MTRAccessControlClusterTarget *) ((MTRAccessControlClusterAccessControlEntryStruct *)
-                                                                                actualValue[2])
+                                        ((MTRAccessControlClusterAccessControlTargetStruct *) ((MTRAccessControlClusterAccessControlEntryStruct *)
+                                                                                                   actualValue[2])
                                                 .targets[1])
                                             .cluster,
                                         17UL));
                                     VerifyOrReturn(CheckValueNull("Endpoint",
-                                        ((MTRAccessControlClusterTarget *) ((MTRAccessControlClusterAccessControlEntryStruct *)
-                                                                                actualValue[2])
+                                        ((MTRAccessControlClusterAccessControlTargetStruct *) ((MTRAccessControlClusterAccessControlEntryStruct *)
+                                                                                                   actualValue[2])
                                                 .targets[1])
                                             .endpoint));
                                     VerifyOrReturn(CheckValueNull("DeviceType",
-                                        ((MTRAccessControlClusterTarget *) ((MTRAccessControlClusterAccessControlEntryStruct *)
-                                                                                actualValue[2])
+                                        ((MTRAccessControlClusterAccessControlTargetStruct *) ((MTRAccessControlClusterAccessControlEntryStruct *)
+                                                                                                   actualValue[2])
                                                 .targets[1])
                                             .deviceType));
                                     VerifyOrReturn(CheckValueNonNull("Cluster",
-                                        ((MTRAccessControlClusterTarget *) ((MTRAccessControlClusterAccessControlEntryStruct *)
-                                                                                actualValue[2])
+                                        ((MTRAccessControlClusterAccessControlTargetStruct *) ((MTRAccessControlClusterAccessControlEntryStruct *)
+                                                                                                   actualValue[2])
                                                 .targets[2])
                                             .cluster));
                                     VerifyOrReturn(CheckValue("Cluster",
-                                        ((MTRAccessControlClusterTarget *) ((MTRAccessControlClusterAccessControlEntryStruct *)
-                                                                                actualValue[2])
+                                        ((MTRAccessControlClusterAccessControlTargetStruct *) ((MTRAccessControlClusterAccessControlEntryStruct *)
+                                                                                                   actualValue[2])
                                                 .targets[2])
                                             .cluster,
                                         18UL));
                                     VerifyOrReturn(CheckValueNonNull("Endpoint",
-                                        ((MTRAccessControlClusterTarget *) ((MTRAccessControlClusterAccessControlEntryStruct *)
-                                                                                actualValue[2])
+                                        ((MTRAccessControlClusterAccessControlTargetStruct *) ((MTRAccessControlClusterAccessControlEntryStruct *)
+                                                                                                   actualValue[2])
                                                 .targets[2])
                                             .endpoint));
                                     VerifyOrReturn(CheckValue("Endpoint",
-                                        ((MTRAccessControlClusterTarget *) ((MTRAccessControlClusterAccessControlEntryStruct *)
-                                                                                actualValue[2])
+                                        ((MTRAccessControlClusterAccessControlTargetStruct *) ((MTRAccessControlClusterAccessControlEntryStruct *)
+                                                                                                   actualValue[2])
                                                 .targets[2])
                                             .endpoint,
                                         19U));
                                     VerifyOrReturn(CheckValueNull("DeviceType",
-                                        ((MTRAccessControlClusterTarget *) ((MTRAccessControlClusterAccessControlEntryStruct *)
-                                                                                actualValue[2])
+                                        ((MTRAccessControlClusterAccessControlTargetStruct *) ((MTRAccessControlClusterAccessControlEntryStruct *)
+                                                                                                   actualValue[2])
                                                 .targets[2])
                                             .deviceType));
                                     VerifyOrReturn(CheckValue("FabricIndex",
@@ -956,72 +956,72 @@ class TestAccessControlCluster : public TestCommandBridge {
                                         [((MTRAccessControlClusterAccessControlEntryStruct *) actualValue[3]).targets count],
                                         static_cast<uint32_t>(3)));
                                     VerifyOrReturn(CheckValueNull("Cluster",
-                                        ((MTRAccessControlClusterTarget *) ((MTRAccessControlClusterAccessControlEntryStruct *)
-                                                                                actualValue[3])
+                                        ((MTRAccessControlClusterAccessControlTargetStruct *) ((MTRAccessControlClusterAccessControlEntryStruct *)
+                                                                                                   actualValue[3])
                                                 .targets[0])
                                             .cluster));
                                     VerifyOrReturn(CheckValueNonNull("Endpoint",
-                                        ((MTRAccessControlClusterTarget *) ((MTRAccessControlClusterAccessControlEntryStruct *)
-                                                                                actualValue[3])
+                                        ((MTRAccessControlClusterAccessControlTargetStruct *) ((MTRAccessControlClusterAccessControlEntryStruct *)
+                                                                                                   actualValue[3])
                                                 .targets[0])
                                             .endpoint));
                                     VerifyOrReturn(CheckValue("Endpoint",
-                                        ((MTRAccessControlClusterTarget *) ((MTRAccessControlClusterAccessControlEntryStruct *)
-                                                                                actualValue[3])
+                                        ((MTRAccessControlClusterAccessControlTargetStruct *) ((MTRAccessControlClusterAccessControlEntryStruct *)
+                                                                                                   actualValue[3])
                                                 .targets[0])
                                             .endpoint,
                                         24U));
                                     VerifyOrReturn(CheckValueNull("DeviceType",
-                                        ((MTRAccessControlClusterTarget *) ((MTRAccessControlClusterAccessControlEntryStruct *)
-                                                                                actualValue[3])
+                                        ((MTRAccessControlClusterAccessControlTargetStruct *) ((MTRAccessControlClusterAccessControlEntryStruct *)
+                                                                                                   actualValue[3])
                                                 .targets[0])
                                             .deviceType));
                                     VerifyOrReturn(CheckValueNonNull("Cluster",
-                                        ((MTRAccessControlClusterTarget *) ((MTRAccessControlClusterAccessControlEntryStruct *)
-                                                                                actualValue[3])
+                                        ((MTRAccessControlClusterAccessControlTargetStruct *) ((MTRAccessControlClusterAccessControlEntryStruct *)
+                                                                                                   actualValue[3])
                                                 .targets[1])
                                             .cluster));
                                     VerifyOrReturn(CheckValue("Cluster",
-                                        ((MTRAccessControlClusterTarget *) ((MTRAccessControlClusterAccessControlEntryStruct *)
-                                                                                actualValue[3])
+                                        ((MTRAccessControlClusterAccessControlTargetStruct *) ((MTRAccessControlClusterAccessControlEntryStruct *)
+                                                                                                   actualValue[3])
                                                 .targets[1])
                                             .cluster,
                                         25UL));
                                     VerifyOrReturn(CheckValueNull("Endpoint",
-                                        ((MTRAccessControlClusterTarget *) ((MTRAccessControlClusterAccessControlEntryStruct *)
-                                                                                actualValue[3])
+                                        ((MTRAccessControlClusterAccessControlTargetStruct *) ((MTRAccessControlClusterAccessControlEntryStruct *)
+                                                                                                   actualValue[3])
                                                 .targets[1])
                                             .endpoint));
                                     VerifyOrReturn(CheckValueNull("DeviceType",
-                                        ((MTRAccessControlClusterTarget *) ((MTRAccessControlClusterAccessControlEntryStruct *)
-                                                                                actualValue[3])
+                                        ((MTRAccessControlClusterAccessControlTargetStruct *) ((MTRAccessControlClusterAccessControlEntryStruct *)
+                                                                                                   actualValue[3])
                                                 .targets[1])
                                             .deviceType));
                                     VerifyOrReturn(CheckValueNonNull("Cluster",
-                                        ((MTRAccessControlClusterTarget *) ((MTRAccessControlClusterAccessControlEntryStruct *)
-                                                                                actualValue[3])
+                                        ((MTRAccessControlClusterAccessControlTargetStruct *) ((MTRAccessControlClusterAccessControlEntryStruct *)
+                                                                                                   actualValue[3])
                                                 .targets[2])
                                             .cluster));
                                     VerifyOrReturn(CheckValue("Cluster",
-                                        ((MTRAccessControlClusterTarget *) ((MTRAccessControlClusterAccessControlEntryStruct *)
-                                                                                actualValue[3])
+                                        ((MTRAccessControlClusterAccessControlTargetStruct *) ((MTRAccessControlClusterAccessControlEntryStruct *)
+                                                                                                   actualValue[3])
                                                 .targets[2])
                                             .cluster,
                                         26UL));
                                     VerifyOrReturn(CheckValueNonNull("Endpoint",
-                                        ((MTRAccessControlClusterTarget *) ((MTRAccessControlClusterAccessControlEntryStruct *)
-                                                                                actualValue[3])
+                                        ((MTRAccessControlClusterAccessControlTargetStruct *) ((MTRAccessControlClusterAccessControlEntryStruct *)
+                                                                                                   actualValue[3])
                                                 .targets[2])
                                             .endpoint));
                                     VerifyOrReturn(CheckValue("Endpoint",
-                                        ((MTRAccessControlClusterTarget *) ((MTRAccessControlClusterAccessControlEntryStruct *)
-                                                                                actualValue[3])
+                                        ((MTRAccessControlClusterAccessControlTargetStruct *) ((MTRAccessControlClusterAccessControlEntryStruct *)
+                                                                                                   actualValue[3])
                                                 .targets[2])
                                             .endpoint,
                                         27U));
                                     VerifyOrReturn(CheckValueNull("DeviceType",
-                                        ((MTRAccessControlClusterTarget *) ((MTRAccessControlClusterAccessControlEntryStruct *)
-                                                                                actualValue[3])
+                                        ((MTRAccessControlClusterAccessControlTargetStruct *) ((MTRAccessControlClusterAccessControlEntryStruct *)
+                                                                                                   actualValue[3])
                                                 .targets[2])
                                             .deviceType));
                                     VerifyOrReturn(CheckValue("FabricIndex",
@@ -1382,10 +1382,10 @@ class TestAccessControlCluster : public TestCommandBridge {
             ((MTRAccessControlClusterAccessControlEntryStruct *) temp_0[1]).subjects = nil;
             {
                 NSMutableArray * temp_3 = [[NSMutableArray alloc] init];
-                temp_3[0] = [[MTRAccessControlClusterTarget alloc] init];
-                ((MTRAccessControlClusterTarget *) temp_3[0]).cluster = nil;
-                ((MTRAccessControlClusterTarget *) temp_3[0]).endpoint = nil;
-                ((MTRAccessControlClusterTarget *) temp_3[0]).deviceType = nil;
+                temp_3[0] = [[MTRAccessControlClusterAccessControlTargetStruct alloc] init];
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[0]).cluster = nil;
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[0]).endpoint = nil;
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[0]).deviceType = nil;
 
                 ((MTRAccessControlClusterAccessControlEntryStruct *) temp_0[1]).targets = temp_3;
             }
@@ -1567,105 +1567,105 @@ class TestAccessControlCluster : public TestCommandBridge {
             ((MTRAccessControlClusterAccessControlEntryStruct *) temp_0[1]).subjects = nil;
             {
                 NSMutableArray * temp_3 = [[NSMutableArray alloc] init];
-                temp_3[0] = [[MTRAccessControlClusterTarget alloc] init];
-                ((MTRAccessControlClusterTarget *) temp_3[0]).cluster = nil;
-                ((MTRAccessControlClusterTarget *) temp_3[0]).endpoint = [NSNumber numberWithUnsignedShort:1U];
-                ((MTRAccessControlClusterTarget *) temp_3[0]).deviceType = nil;
-
-                temp_3[1] = [[MTRAccessControlClusterTarget alloc] init];
-                ((MTRAccessControlClusterTarget *) temp_3[1]).cluster = nil;
-                ((MTRAccessControlClusterTarget *) temp_3[1]).endpoint = [NSNumber numberWithUnsignedShort:2U];
-                ((MTRAccessControlClusterTarget *) temp_3[1]).deviceType = nil;
-
-                temp_3[2] = [[MTRAccessControlClusterTarget alloc] init];
-                ((MTRAccessControlClusterTarget *) temp_3[2]).cluster = nil;
-                ((MTRAccessControlClusterTarget *) temp_3[2]).endpoint = [NSNumber numberWithUnsignedShort:3U];
-                ((MTRAccessControlClusterTarget *) temp_3[2]).deviceType = nil;
-
-                temp_3[3] = [[MTRAccessControlClusterTarget alloc] init];
-                ((MTRAccessControlClusterTarget *) temp_3[3]).cluster = nil;
-                ((MTRAccessControlClusterTarget *) temp_3[3]).endpoint = [NSNumber numberWithUnsignedShort:4U];
-                ((MTRAccessControlClusterTarget *) temp_3[3]).deviceType = nil;
-
-                temp_3[4] = [[MTRAccessControlClusterTarget alloc] init];
-                ((MTRAccessControlClusterTarget *) temp_3[4]).cluster = nil;
-                ((MTRAccessControlClusterTarget *) temp_3[4]).endpoint = [NSNumber numberWithUnsignedShort:5U];
-                ((MTRAccessControlClusterTarget *) temp_3[4]).deviceType = nil;
-
-                temp_3[5] = [[MTRAccessControlClusterTarget alloc] init];
-                ((MTRAccessControlClusterTarget *) temp_3[5]).cluster = nil;
-                ((MTRAccessControlClusterTarget *) temp_3[5]).endpoint = [NSNumber numberWithUnsignedShort:6U];
-                ((MTRAccessControlClusterTarget *) temp_3[5]).deviceType = nil;
-
-                temp_3[6] = [[MTRAccessControlClusterTarget alloc] init];
-                ((MTRAccessControlClusterTarget *) temp_3[6]).cluster = nil;
-                ((MTRAccessControlClusterTarget *) temp_3[6]).endpoint = [NSNumber numberWithUnsignedShort:7U];
-                ((MTRAccessControlClusterTarget *) temp_3[6]).deviceType = nil;
-
-                temp_3[7] = [[MTRAccessControlClusterTarget alloc] init];
-                ((MTRAccessControlClusterTarget *) temp_3[7]).cluster = nil;
-                ((MTRAccessControlClusterTarget *) temp_3[7]).endpoint = [NSNumber numberWithUnsignedShort:8U];
-                ((MTRAccessControlClusterTarget *) temp_3[7]).deviceType = nil;
-
-                temp_3[8] = [[MTRAccessControlClusterTarget alloc] init];
-                ((MTRAccessControlClusterTarget *) temp_3[8]).cluster = nil;
-                ((MTRAccessControlClusterTarget *) temp_3[8]).endpoint = [NSNumber numberWithUnsignedShort:9U];
-                ((MTRAccessControlClusterTarget *) temp_3[8]).deviceType = nil;
-
-                temp_3[9] = [[MTRAccessControlClusterTarget alloc] init];
-                ((MTRAccessControlClusterTarget *) temp_3[9]).cluster = nil;
-                ((MTRAccessControlClusterTarget *) temp_3[9]).endpoint = [NSNumber numberWithUnsignedShort:10U];
-                ((MTRAccessControlClusterTarget *) temp_3[9]).deviceType = nil;
-
-                temp_3[10] = [[MTRAccessControlClusterTarget alloc] init];
-                ((MTRAccessControlClusterTarget *) temp_3[10]).cluster = nil;
-                ((MTRAccessControlClusterTarget *) temp_3[10]).endpoint = [NSNumber numberWithUnsignedShort:11U];
-                ((MTRAccessControlClusterTarget *) temp_3[10]).deviceType = nil;
-
-                temp_3[11] = [[MTRAccessControlClusterTarget alloc] init];
-                ((MTRAccessControlClusterTarget *) temp_3[11]).cluster = nil;
-                ((MTRAccessControlClusterTarget *) temp_3[11]).endpoint = [NSNumber numberWithUnsignedShort:12U];
-                ((MTRAccessControlClusterTarget *) temp_3[11]).deviceType = nil;
-
-                temp_3[12] = [[MTRAccessControlClusterTarget alloc] init];
-                ((MTRAccessControlClusterTarget *) temp_3[12]).cluster = nil;
-                ((MTRAccessControlClusterTarget *) temp_3[12]).endpoint = [NSNumber numberWithUnsignedShort:13U];
-                ((MTRAccessControlClusterTarget *) temp_3[12]).deviceType = nil;
-
-                temp_3[13] = [[MTRAccessControlClusterTarget alloc] init];
-                ((MTRAccessControlClusterTarget *) temp_3[13]).cluster = nil;
-                ((MTRAccessControlClusterTarget *) temp_3[13]).endpoint = [NSNumber numberWithUnsignedShort:14U];
-                ((MTRAccessControlClusterTarget *) temp_3[13]).deviceType = nil;
-
-                temp_3[14] = [[MTRAccessControlClusterTarget alloc] init];
-                ((MTRAccessControlClusterTarget *) temp_3[14]).cluster = nil;
-                ((MTRAccessControlClusterTarget *) temp_3[14]).endpoint = [NSNumber numberWithUnsignedShort:15U];
-                ((MTRAccessControlClusterTarget *) temp_3[14]).deviceType = nil;
-
-                temp_3[15] = [[MTRAccessControlClusterTarget alloc] init];
-                ((MTRAccessControlClusterTarget *) temp_3[15]).cluster = nil;
-                ((MTRAccessControlClusterTarget *) temp_3[15]).endpoint = [NSNumber numberWithUnsignedShort:16U];
-                ((MTRAccessControlClusterTarget *) temp_3[15]).deviceType = nil;
-
-                temp_3[16] = [[MTRAccessControlClusterTarget alloc] init];
-                ((MTRAccessControlClusterTarget *) temp_3[16]).cluster = nil;
-                ((MTRAccessControlClusterTarget *) temp_3[16]).endpoint = [NSNumber numberWithUnsignedShort:17U];
-                ((MTRAccessControlClusterTarget *) temp_3[16]).deviceType = nil;
-
-                temp_3[17] = [[MTRAccessControlClusterTarget alloc] init];
-                ((MTRAccessControlClusterTarget *) temp_3[17]).cluster = nil;
-                ((MTRAccessControlClusterTarget *) temp_3[17]).endpoint = [NSNumber numberWithUnsignedShort:18U];
-                ((MTRAccessControlClusterTarget *) temp_3[17]).deviceType = nil;
-
-                temp_3[18] = [[MTRAccessControlClusterTarget alloc] init];
-                ((MTRAccessControlClusterTarget *) temp_3[18]).cluster = nil;
-                ((MTRAccessControlClusterTarget *) temp_3[18]).endpoint = [NSNumber numberWithUnsignedShort:19U];
-                ((MTRAccessControlClusterTarget *) temp_3[18]).deviceType = nil;
-
-                temp_3[19] = [[MTRAccessControlClusterTarget alloc] init];
-                ((MTRAccessControlClusterTarget *) temp_3[19]).cluster = nil;
-                ((MTRAccessControlClusterTarget *) temp_3[19]).endpoint = [NSNumber numberWithUnsignedShort:20U];
-                ((MTRAccessControlClusterTarget *) temp_3[19]).deviceType = nil;
+                temp_3[0] = [[MTRAccessControlClusterAccessControlTargetStruct alloc] init];
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[0]).cluster = nil;
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[0]).endpoint = [NSNumber numberWithUnsignedShort:1U];
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[0]).deviceType = nil;
+
+                temp_3[1] = [[MTRAccessControlClusterAccessControlTargetStruct alloc] init];
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[1]).cluster = nil;
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[1]).endpoint = [NSNumber numberWithUnsignedShort:2U];
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[1]).deviceType = nil;
+
+                temp_3[2] = [[MTRAccessControlClusterAccessControlTargetStruct alloc] init];
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[2]).cluster = nil;
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[2]).endpoint = [NSNumber numberWithUnsignedShort:3U];
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[2]).deviceType = nil;
+
+                temp_3[3] = [[MTRAccessControlClusterAccessControlTargetStruct alloc] init];
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[3]).cluster = nil;
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[3]).endpoint = [NSNumber numberWithUnsignedShort:4U];
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[3]).deviceType = nil;
+
+                temp_3[4] = [[MTRAccessControlClusterAccessControlTargetStruct alloc] init];
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[4]).cluster = nil;
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[4]).endpoint = [NSNumber numberWithUnsignedShort:5U];
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[4]).deviceType = nil;
+
+                temp_3[5] = [[MTRAccessControlClusterAccessControlTargetStruct alloc] init];
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[5]).cluster = nil;
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[5]).endpoint = [NSNumber numberWithUnsignedShort:6U];
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[5]).deviceType = nil;
+
+                temp_3[6] = [[MTRAccessControlClusterAccessControlTargetStruct alloc] init];
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[6]).cluster = nil;
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[6]).endpoint = [NSNumber numberWithUnsignedShort:7U];
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[6]).deviceType = nil;
+
+                temp_3[7] = [[MTRAccessControlClusterAccessControlTargetStruct alloc] init];
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[7]).cluster = nil;
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[7]).endpoint = [NSNumber numberWithUnsignedShort:8U];
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[7]).deviceType = nil;
+
+                temp_3[8] = [[MTRAccessControlClusterAccessControlTargetStruct alloc] init];
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[8]).cluster = nil;
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[8]).endpoint = [NSNumber numberWithUnsignedShort:9U];
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[8]).deviceType = nil;
+
+                temp_3[9] = [[MTRAccessControlClusterAccessControlTargetStruct alloc] init];
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[9]).cluster = nil;
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[9]).endpoint = [NSNumber numberWithUnsignedShort:10U];
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[9]).deviceType = nil;
+
+                temp_3[10] = [[MTRAccessControlClusterAccessControlTargetStruct alloc] init];
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[10]).cluster = nil;
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[10]).endpoint = [NSNumber numberWithUnsignedShort:11U];
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[10]).deviceType = nil;
+
+                temp_3[11] = [[MTRAccessControlClusterAccessControlTargetStruct alloc] init];
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[11]).cluster = nil;
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[11]).endpoint = [NSNumber numberWithUnsignedShort:12U];
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[11]).deviceType = nil;
+
+                temp_3[12] = [[MTRAccessControlClusterAccessControlTargetStruct alloc] init];
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[12]).cluster = nil;
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[12]).endpoint = [NSNumber numberWithUnsignedShort:13U];
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[12]).deviceType = nil;
+
+                temp_3[13] = [[MTRAccessControlClusterAccessControlTargetStruct alloc] init];
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[13]).cluster = nil;
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[13]).endpoint = [NSNumber numberWithUnsignedShort:14U];
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[13]).deviceType = nil;
+
+                temp_3[14] = [[MTRAccessControlClusterAccessControlTargetStruct alloc] init];
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[14]).cluster = nil;
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[14]).endpoint = [NSNumber numberWithUnsignedShort:15U];
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[14]).deviceType = nil;
+
+                temp_3[15] = [[MTRAccessControlClusterAccessControlTargetStruct alloc] init];
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[15]).cluster = nil;
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[15]).endpoint = [NSNumber numberWithUnsignedShort:16U];
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[15]).deviceType = nil;
+
+                temp_3[16] = [[MTRAccessControlClusterAccessControlTargetStruct alloc] init];
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[16]).cluster = nil;
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[16]).endpoint = [NSNumber numberWithUnsignedShort:17U];
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[16]).deviceType = nil;
+
+                temp_3[17] = [[MTRAccessControlClusterAccessControlTargetStruct alloc] init];
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[17]).cluster = nil;
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[17]).endpoint = [NSNumber numberWithUnsignedShort:18U];
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[17]).deviceType = nil;
+
+                temp_3[18] = [[MTRAccessControlClusterAccessControlTargetStruct alloc] init];
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[18]).cluster = nil;
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[18]).endpoint = [NSNumber numberWithUnsignedShort:19U];
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[18]).deviceType = nil;
+
+                temp_3[19] = [[MTRAccessControlClusterAccessControlTargetStruct alloc] init];
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[19]).cluster = nil;
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[19]).endpoint = [NSNumber numberWithUnsignedShort:20U];
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[19]).deviceType = nil;
 
                 ((MTRAccessControlClusterAccessControlEntryStruct *) temp_0[1]).targets = temp_3;
             }
@@ -1740,20 +1740,20 @@ class TestAccessControlCluster : public TestCommandBridge {
             ((MTRAccessControlClusterAccessControlEntryStruct *) temp_0[0]).subjects = nil;
             {
                 NSMutableArray * temp_3 = [[NSMutableArray alloc] init];
-                temp_3[0] = [[MTRAccessControlClusterTarget alloc] init];
-                ((MTRAccessControlClusterTarget *) temp_3[0]).cluster = nil;
-                ((MTRAccessControlClusterTarget *) temp_3[0]).endpoint = [NSNumber numberWithUnsignedShort:0U];
-                ((MTRAccessControlClusterTarget *) temp_3[0]).deviceType = nil;
+                temp_3[0] = [[MTRAccessControlClusterAccessControlTargetStruct alloc] init];
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[0]).cluster = nil;
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[0]).endpoint = [NSNumber numberWithUnsignedShort:0U];
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[0]).deviceType = nil;
 
-                temp_3[1] = [[MTRAccessControlClusterTarget alloc] init];
-                ((MTRAccessControlClusterTarget *) temp_3[1]).cluster = [NSNumber numberWithUnsignedInt:1UL];
-                ((MTRAccessControlClusterTarget *) temp_3[1]).endpoint = nil;
-                ((MTRAccessControlClusterTarget *) temp_3[1]).deviceType = nil;
+                temp_3[1] = [[MTRAccessControlClusterAccessControlTargetStruct alloc] init];
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[1]).cluster = [NSNumber numberWithUnsignedInt:1UL];
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[1]).endpoint = nil;
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[1]).deviceType = nil;
 
-                temp_3[2] = [[MTRAccessControlClusterTarget alloc] init];
-                ((MTRAccessControlClusterTarget *) temp_3[2]).cluster = [NSNumber numberWithUnsignedInt:2UL];
-                ((MTRAccessControlClusterTarget *) temp_3[2]).endpoint = [NSNumber numberWithUnsignedShort:3U];
-                ((MTRAccessControlClusterTarget *) temp_3[2]).deviceType = nil;
+                temp_3[2] = [[MTRAccessControlClusterAccessControlTargetStruct alloc] init];
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[2]).cluster = [NSNumber numberWithUnsignedInt:2UL];
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[2]).endpoint = [NSNumber numberWithUnsignedShort:3U];
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[2]).deviceType = nil;
 
                 ((MTRAccessControlClusterAccessControlEntryStruct *) temp_0[0]).targets = temp_3;
             }
@@ -1772,20 +1772,20 @@ class TestAccessControlCluster : public TestCommandBridge {
             }
             {
                 NSMutableArray * temp_3 = [[NSMutableArray alloc] init];
-                temp_3[0] = [[MTRAccessControlClusterTarget alloc] init];
-                ((MTRAccessControlClusterTarget *) temp_3[0]).cluster = nil;
-                ((MTRAccessControlClusterTarget *) temp_3[0]).endpoint = [NSNumber numberWithUnsignedShort:8U];
-                ((MTRAccessControlClusterTarget *) temp_3[0]).deviceType = nil;
+                temp_3[0] = [[MTRAccessControlClusterAccessControlTargetStruct alloc] init];
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[0]).cluster = nil;
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[0]).endpoint = [NSNumber numberWithUnsignedShort:8U];
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[0]).deviceType = nil;
 
-                temp_3[1] = [[MTRAccessControlClusterTarget alloc] init];
-                ((MTRAccessControlClusterTarget *) temp_3[1]).cluster = [NSNumber numberWithUnsignedInt:9UL];
-                ((MTRAccessControlClusterTarget *) temp_3[1]).endpoint = nil;
-                ((MTRAccessControlClusterTarget *) temp_3[1]).deviceType = nil;
+                temp_3[1] = [[MTRAccessControlClusterAccessControlTargetStruct alloc] init];
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[1]).cluster = [NSNumber numberWithUnsignedInt:9UL];
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[1]).endpoint = nil;
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[1]).deviceType = nil;
 
-                temp_3[2] = [[MTRAccessControlClusterTarget alloc] init];
-                ((MTRAccessControlClusterTarget *) temp_3[2]).cluster = [NSNumber numberWithUnsignedInt:10UL];
-                ((MTRAccessControlClusterTarget *) temp_3[2]).endpoint = [NSNumber numberWithUnsignedShort:11U];
-                ((MTRAccessControlClusterTarget *) temp_3[2]).deviceType = nil;
+                temp_3[2] = [[MTRAccessControlClusterAccessControlTargetStruct alloc] init];
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[2]).cluster = [NSNumber numberWithUnsignedInt:10UL];
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[2]).endpoint = [NSNumber numberWithUnsignedShort:11U];
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[2]).deviceType = nil;
 
                 ((MTRAccessControlClusterAccessControlEntryStruct *) temp_0[1]).targets = temp_3;
             }
@@ -1804,20 +1804,20 @@ class TestAccessControlCluster : public TestCommandBridge {
             }
             {
                 NSMutableArray * temp_3 = [[NSMutableArray alloc] init];
-                temp_3[0] = [[MTRAccessControlClusterTarget alloc] init];
-                ((MTRAccessControlClusterTarget *) temp_3[0]).cluster = nil;
-                ((MTRAccessControlClusterTarget *) temp_3[0]).endpoint = [NSNumber numberWithUnsignedShort:16U];
-                ((MTRAccessControlClusterTarget *) temp_3[0]).deviceType = nil;
+                temp_3[0] = [[MTRAccessControlClusterAccessControlTargetStruct alloc] init];
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[0]).cluster = nil;
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[0]).endpoint = [NSNumber numberWithUnsignedShort:16U];
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[0]).deviceType = nil;
 
-                temp_3[1] = [[MTRAccessControlClusterTarget alloc] init];
-                ((MTRAccessControlClusterTarget *) temp_3[1]).cluster = [NSNumber numberWithUnsignedInt:17UL];
-                ((MTRAccessControlClusterTarget *) temp_3[1]).endpoint = nil;
-                ((MTRAccessControlClusterTarget *) temp_3[1]).deviceType = nil;
+                temp_3[1] = [[MTRAccessControlClusterAccessControlTargetStruct alloc] init];
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[1]).cluster = [NSNumber numberWithUnsignedInt:17UL];
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[1]).endpoint = nil;
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[1]).deviceType = nil;
 
-                temp_3[2] = [[MTRAccessControlClusterTarget alloc] init];
-                ((MTRAccessControlClusterTarget *) temp_3[2]).cluster = [NSNumber numberWithUnsignedInt:18UL];
-                ((MTRAccessControlClusterTarget *) temp_3[2]).endpoint = [NSNumber numberWithUnsignedShort:19U];
-                ((MTRAccessControlClusterTarget *) temp_3[2]).deviceType = nil;
+                temp_3[2] = [[MTRAccessControlClusterAccessControlTargetStruct alloc] init];
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[2]).cluster = [NSNumber numberWithUnsignedInt:18UL];
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[2]).endpoint = [NSNumber numberWithUnsignedShort:19U];
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[2]).deviceType = nil;
 
                 ((MTRAccessControlClusterAccessControlEntryStruct *) temp_0[2]).targets = temp_3;
             }
@@ -1836,20 +1836,20 @@ class TestAccessControlCluster : public TestCommandBridge {
             }
             {
                 NSMutableArray * temp_3 = [[NSMutableArray alloc] init];
-                temp_3[0] = [[MTRAccessControlClusterTarget alloc] init];
-                ((MTRAccessControlClusterTarget *) temp_3[0]).cluster = nil;
-                ((MTRAccessControlClusterTarget *) temp_3[0]).endpoint = [NSNumber numberWithUnsignedShort:24U];
-                ((MTRAccessControlClusterTarget *) temp_3[0]).deviceType = nil;
+                temp_3[0] = [[MTRAccessControlClusterAccessControlTargetStruct alloc] init];
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[0]).cluster = nil;
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[0]).endpoint = [NSNumber numberWithUnsignedShort:24U];
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[0]).deviceType = nil;
 
-                temp_3[1] = [[MTRAccessControlClusterTarget alloc] init];
-                ((MTRAccessControlClusterTarget *) temp_3[1]).cluster = [NSNumber numberWithUnsignedInt:25UL];
-                ((MTRAccessControlClusterTarget *) temp_3[1]).endpoint = nil;
-                ((MTRAccessControlClusterTarget *) temp_3[1]).deviceType = nil;
+                temp_3[1] = [[MTRAccessControlClusterAccessControlTargetStruct alloc] init];
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[1]).cluster = [NSNumber numberWithUnsignedInt:25UL];
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[1]).endpoint = nil;
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[1]).deviceType = nil;
 
-                temp_3[2] = [[MTRAccessControlClusterTarget alloc] init];
-                ((MTRAccessControlClusterTarget *) temp_3[2]).cluster = [NSNumber numberWithUnsignedInt:26UL];
-                ((MTRAccessControlClusterTarget *) temp_3[2]).endpoint = [NSNumber numberWithUnsignedShort:27U];
-                ((MTRAccessControlClusterTarget *) temp_3[2]).deviceType = nil;
+                temp_3[2] = [[MTRAccessControlClusterAccessControlTargetStruct alloc] init];
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[2]).cluster = [NSNumber numberWithUnsignedInt:26UL];
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[2]).endpoint = [NSNumber numberWithUnsignedShort:27U];
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[2]).deviceType = nil;
 
                 ((MTRAccessControlClusterAccessControlEntryStruct *) temp_0[3]).targets = temp_3;
             }
@@ -1868,20 +1868,20 @@ class TestAccessControlCluster : public TestCommandBridge {
             }
             {
                 NSMutableArray * temp_3 = [[NSMutableArray alloc] init];
-                temp_3[0] = [[MTRAccessControlClusterTarget alloc] init];
-                ((MTRAccessControlClusterTarget *) temp_3[0]).cluster = nil;
-                ((MTRAccessControlClusterTarget *) temp_3[0]).endpoint = [NSNumber numberWithUnsignedShort:32U];
-                ((MTRAccessControlClusterTarget *) temp_3[0]).deviceType = nil;
+                temp_3[0] = [[MTRAccessControlClusterAccessControlTargetStruct alloc] init];
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[0]).cluster = nil;
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[0]).endpoint = [NSNumber numberWithUnsignedShort:32U];
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[0]).deviceType = nil;
 
-                temp_3[1] = [[MTRAccessControlClusterTarget alloc] init];
-                ((MTRAccessControlClusterTarget *) temp_3[1]).cluster = [NSNumber numberWithUnsignedInt:33UL];
-                ((MTRAccessControlClusterTarget *) temp_3[1]).endpoint = nil;
-                ((MTRAccessControlClusterTarget *) temp_3[1]).deviceType = nil;
+                temp_3[1] = [[MTRAccessControlClusterAccessControlTargetStruct alloc] init];
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[1]).cluster = [NSNumber numberWithUnsignedInt:33UL];
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[1]).endpoint = nil;
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[1]).deviceType = nil;
 
-                temp_3[2] = [[MTRAccessControlClusterTarget alloc] init];
-                ((MTRAccessControlClusterTarget *) temp_3[2]).cluster = [NSNumber numberWithUnsignedInt:34UL];
-                ((MTRAccessControlClusterTarget *) temp_3[2]).endpoint = [NSNumber numberWithUnsignedShort:35U];
-                ((MTRAccessControlClusterTarget *) temp_3[2]).deviceType = nil;
+                temp_3[2] = [[MTRAccessControlClusterAccessControlTargetStruct alloc] init];
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[2]).cluster = [NSNumber numberWithUnsignedInt:34UL];
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[2]).endpoint = [NSNumber numberWithUnsignedShort:35U];
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[2]).deviceType = nil;
 
                 ((MTRAccessControlClusterAccessControlEntryStruct *) temp_0[4]).targets = temp_3;
             }
@@ -1935,72 +1935,72 @@ class TestAccessControlCluster : public TestCommandBridge {
                                         [((MTRAccessControlClusterAccessControlEntryStruct *) actualValue[0]).targets count],
                                         static_cast<uint32_t>(3)));
                                     VerifyOrReturn(CheckValueNull("Cluster",
-                                        ((MTRAccessControlClusterTarget *) ((MTRAccessControlClusterAccessControlEntryStruct *)
-                                                                                actualValue[0])
+                                        ((MTRAccessControlClusterAccessControlTargetStruct *) ((MTRAccessControlClusterAccessControlEntryStruct *)
+                                                                                                   actualValue[0])
                                                 .targets[0])
                                             .cluster));
                                     VerifyOrReturn(CheckValueNonNull("Endpoint",
-                                        ((MTRAccessControlClusterTarget *) ((MTRAccessControlClusterAccessControlEntryStruct *)
-                                                                                actualValue[0])
+                                        ((MTRAccessControlClusterAccessControlTargetStruct *) ((MTRAccessControlClusterAccessControlEntryStruct *)
+                                                                                                   actualValue[0])
                                                 .targets[0])
                                             .endpoint));
                                     VerifyOrReturn(CheckValue("Endpoint",
-                                        ((MTRAccessControlClusterTarget *) ((MTRAccessControlClusterAccessControlEntryStruct *)
-                                                                                actualValue[0])
+                                        ((MTRAccessControlClusterAccessControlTargetStruct *) ((MTRAccessControlClusterAccessControlEntryStruct *)
+                                                                                                   actualValue[0])
                                                 .targets[0])
                                             .endpoint,
                                         0U));
                                     VerifyOrReturn(CheckValueNull("DeviceType",
-                                        ((MTRAccessControlClusterTarget *) ((MTRAccessControlClusterAccessControlEntryStruct *)
-                                                                                actualValue[0])
+                                        ((MTRAccessControlClusterAccessControlTargetStruct *) ((MTRAccessControlClusterAccessControlEntryStruct *)
+                                                                                                   actualValue[0])
                                                 .targets[0])
                                             .deviceType));
                                     VerifyOrReturn(CheckValueNonNull("Cluster",
-                                        ((MTRAccessControlClusterTarget *) ((MTRAccessControlClusterAccessControlEntryStruct *)
-                                                                                actualValue[0])
+                                        ((MTRAccessControlClusterAccessControlTargetStruct *) ((MTRAccessControlClusterAccessControlEntryStruct *)
+                                                                                                   actualValue[0])
                                                 .targets[1])
                                             .cluster));
                                     VerifyOrReturn(CheckValue("Cluster",
-                                        ((MTRAccessControlClusterTarget *) ((MTRAccessControlClusterAccessControlEntryStruct *)
-                                                                                actualValue[0])
+                                        ((MTRAccessControlClusterAccessControlTargetStruct *) ((MTRAccessControlClusterAccessControlEntryStruct *)
+                                                                                                   actualValue[0])
                                                 .targets[1])
                                             .cluster,
                                         1UL));
                                     VerifyOrReturn(CheckValueNull("Endpoint",
-                                        ((MTRAccessControlClusterTarget *) ((MTRAccessControlClusterAccessControlEntryStruct *)
-                                                                                actualValue[0])
+                                        ((MTRAccessControlClusterAccessControlTargetStruct *) ((MTRAccessControlClusterAccessControlEntryStruct *)
+                                                                                                   actualValue[0])
                                                 .targets[1])
                                             .endpoint));
                                     VerifyOrReturn(CheckValueNull("DeviceType",
-                                        ((MTRAccessControlClusterTarget *) ((MTRAccessControlClusterAccessControlEntryStruct *)
-                                                                                actualValue[0])
+                                        ((MTRAccessControlClusterAccessControlTargetStruct *) ((MTRAccessControlClusterAccessControlEntryStruct *)
+                                                                                                   actualValue[0])
                                                 .targets[1])
                                             .deviceType));
                                     VerifyOrReturn(CheckValueNonNull("Cluster",
-                                        ((MTRAccessControlClusterTarget *) ((MTRAccessControlClusterAccessControlEntryStruct *)
-                                                                                actualValue[0])
+                                        ((MTRAccessControlClusterAccessControlTargetStruct *) ((MTRAccessControlClusterAccessControlEntryStruct *)
+                                                                                                   actualValue[0])
                                                 .targets[2])
                                             .cluster));
                                     VerifyOrReturn(CheckValue("Cluster",
-                                        ((MTRAccessControlClusterTarget *) ((MTRAccessControlClusterAccessControlEntryStruct *)
-                                                                                actualValue[0])
+                                        ((MTRAccessControlClusterAccessControlTargetStruct *) ((MTRAccessControlClusterAccessControlEntryStruct *)
+                                                                                                   actualValue[0])
                                                 .targets[2])
                                             .cluster,
                                         2UL));
                                     VerifyOrReturn(CheckValueNonNull("Endpoint",
-                                        ((MTRAccessControlClusterTarget *) ((MTRAccessControlClusterAccessControlEntryStruct *)
-                                                                                actualValue[0])
+                                        ((MTRAccessControlClusterAccessControlTargetStruct *) ((MTRAccessControlClusterAccessControlEntryStruct *)
+                                                                                                   actualValue[0])
                                                 .targets[2])
                                             .endpoint));
                                     VerifyOrReturn(CheckValue("Endpoint",
-                                        ((MTRAccessControlClusterTarget *) ((MTRAccessControlClusterAccessControlEntryStruct *)
-                                                                                actualValue[0])
+                                        ((MTRAccessControlClusterAccessControlTargetStruct *) ((MTRAccessControlClusterAccessControlEntryStruct *)
+                                                                                                   actualValue[0])
                                                 .targets[2])
                                             .endpoint,
                                         3U));
                                     VerifyOrReturn(CheckValueNull("DeviceType",
-                                        ((MTRAccessControlClusterTarget *) ((MTRAccessControlClusterAccessControlEntryStruct *)
-                                                                                actualValue[0])
+                                        ((MTRAccessControlClusterAccessControlTargetStruct *) ((MTRAccessControlClusterAccessControlEntryStruct *)
+                                                                                                   actualValue[0])
                                                 .targets[2])
                                             .deviceType));
                                     VerifyOrReturn(CheckValue("FabricIndex",
@@ -2028,72 +2028,72 @@ class TestAccessControlCluster : public TestCommandBridge {
                                         [((MTRAccessControlClusterAccessControlEntryStruct *) actualValue[1]).targets count],
                                         static_cast<uint32_t>(3)));
                                     VerifyOrReturn(CheckValueNull("Cluster",
-                                        ((MTRAccessControlClusterTarget *) ((MTRAccessControlClusterAccessControlEntryStruct *)
-                                                                                actualValue[1])
+                                        ((MTRAccessControlClusterAccessControlTargetStruct *) ((MTRAccessControlClusterAccessControlEntryStruct *)
+                                                                                                   actualValue[1])
                                                 .targets[0])
                                             .cluster));
                                     VerifyOrReturn(CheckValueNonNull("Endpoint",
-                                        ((MTRAccessControlClusterTarget *) ((MTRAccessControlClusterAccessControlEntryStruct *)
-                                                                                actualValue[1])
+                                        ((MTRAccessControlClusterAccessControlTargetStruct *) ((MTRAccessControlClusterAccessControlEntryStruct *)
+                                                                                                   actualValue[1])
                                                 .targets[0])
                                             .endpoint));
                                     VerifyOrReturn(CheckValue("Endpoint",
-                                        ((MTRAccessControlClusterTarget *) ((MTRAccessControlClusterAccessControlEntryStruct *)
-                                                                                actualValue[1])
+                                        ((MTRAccessControlClusterAccessControlTargetStruct *) ((MTRAccessControlClusterAccessControlEntryStruct *)
+                                                                                                   actualValue[1])
                                                 .targets[0])
                                             .endpoint,
                                         8U));
                                     VerifyOrReturn(CheckValueNull("DeviceType",
-                                        ((MTRAccessControlClusterTarget *) ((MTRAccessControlClusterAccessControlEntryStruct *)
-                                                                                actualValue[1])
+                                        ((MTRAccessControlClusterAccessControlTargetStruct *) ((MTRAccessControlClusterAccessControlEntryStruct *)
+                                                                                                   actualValue[1])
                                                 .targets[0])
                                             .deviceType));
                                     VerifyOrReturn(CheckValueNonNull("Cluster",
-                                        ((MTRAccessControlClusterTarget *) ((MTRAccessControlClusterAccessControlEntryStruct *)
-                                                                                actualValue[1])
+                                        ((MTRAccessControlClusterAccessControlTargetStruct *) ((MTRAccessControlClusterAccessControlEntryStruct *)
+                                                                                                   actualValue[1])
                                                 .targets[1])
                                             .cluster));
                                     VerifyOrReturn(CheckValue("Cluster",
-                                        ((MTRAccessControlClusterTarget *) ((MTRAccessControlClusterAccessControlEntryStruct *)
-                                                                                actualValue[1])
+                                        ((MTRAccessControlClusterAccessControlTargetStruct *) ((MTRAccessControlClusterAccessControlEntryStruct *)
+                                                                                                   actualValue[1])
                                                 .targets[1])
                                             .cluster,
                                         9UL));
                                     VerifyOrReturn(CheckValueNull("Endpoint",
-                                        ((MTRAccessControlClusterTarget *) ((MTRAccessControlClusterAccessControlEntryStruct *)
-                                                                                actualValue[1])
+                                        ((MTRAccessControlClusterAccessControlTargetStruct *) ((MTRAccessControlClusterAccessControlEntryStruct *)
+                                                                                                   actualValue[1])
                                                 .targets[1])
                                             .endpoint));
                                     VerifyOrReturn(CheckValueNull("DeviceType",
-                                        ((MTRAccessControlClusterTarget *) ((MTRAccessControlClusterAccessControlEntryStruct *)
-                                                                                actualValue[1])
+                                        ((MTRAccessControlClusterAccessControlTargetStruct *) ((MTRAccessControlClusterAccessControlEntryStruct *)
+                                                                                                   actualValue[1])
                                                 .targets[1])
                                             .deviceType));
                                     VerifyOrReturn(CheckValueNonNull("Cluster",
-                                        ((MTRAccessControlClusterTarget *) ((MTRAccessControlClusterAccessControlEntryStruct *)
-                                                                                actualValue[1])
+                                        ((MTRAccessControlClusterAccessControlTargetStruct *) ((MTRAccessControlClusterAccessControlEntryStruct *)
+                                                                                                   actualValue[1])
                                                 .targets[2])
                                             .cluster));
                                     VerifyOrReturn(CheckValue("Cluster",
-                                        ((MTRAccessControlClusterTarget *) ((MTRAccessControlClusterAccessControlEntryStruct *)
-                                                                                actualValue[1])
+                                        ((MTRAccessControlClusterAccessControlTargetStruct *) ((MTRAccessControlClusterAccessControlEntryStruct *)
+                                                                                                   actualValue[1])
                                                 .targets[2])
                                             .cluster,
                                         10UL));
                                     VerifyOrReturn(CheckValueNonNull("Endpoint",
-                                        ((MTRAccessControlClusterTarget *) ((MTRAccessControlClusterAccessControlEntryStruct *)
-                                                                                actualValue[1])
+                                        ((MTRAccessControlClusterAccessControlTargetStruct *) ((MTRAccessControlClusterAccessControlEntryStruct *)
+                                                                                                   actualValue[1])
                                                 .targets[2])
                                             .endpoint));
                                     VerifyOrReturn(CheckValue("Endpoint",
-                                        ((MTRAccessControlClusterTarget *) ((MTRAccessControlClusterAccessControlEntryStruct *)
-                                                                                actualValue[1])
+                                        ((MTRAccessControlClusterAccessControlTargetStruct *) ((MTRAccessControlClusterAccessControlEntryStruct *)
+                                                                                                   actualValue[1])
                                                 .targets[2])
                                             .endpoint,
                                         11U));
                                     VerifyOrReturn(CheckValueNull("DeviceType",
-                                        ((MTRAccessControlClusterTarget *) ((MTRAccessControlClusterAccessControlEntryStruct *)
-                                                                                actualValue[1])
+                                        ((MTRAccessControlClusterAccessControlTargetStruct *) ((MTRAccessControlClusterAccessControlEntryStruct *)
+                                                                                                   actualValue[1])
                                                 .targets[2])
                                             .deviceType));
                                     VerifyOrReturn(CheckValue("FabricIndex",
@@ -2121,72 +2121,72 @@ class TestAccessControlCluster : public TestCommandBridge {
                                         [((MTRAccessControlClusterAccessControlEntryStruct *) actualValue[2]).targets count],
                                         static_cast<uint32_t>(3)));
                                     VerifyOrReturn(CheckValueNull("Cluster",
-                                        ((MTRAccessControlClusterTarget *) ((MTRAccessControlClusterAccessControlEntryStruct *)
-                                                                                actualValue[2])
+                                        ((MTRAccessControlClusterAccessControlTargetStruct *) ((MTRAccessControlClusterAccessControlEntryStruct *)
+                                                                                                   actualValue[2])
                                                 .targets[0])
                                             .cluster));
                                     VerifyOrReturn(CheckValueNonNull("Endpoint",
-                                        ((MTRAccessControlClusterTarget *) ((MTRAccessControlClusterAccessControlEntryStruct *)
-                                                                                actualValue[2])
+                                        ((MTRAccessControlClusterAccessControlTargetStruct *) ((MTRAccessControlClusterAccessControlEntryStruct *)
+                                                                                                   actualValue[2])
                                                 .targets[0])
                                             .endpoint));
                                     VerifyOrReturn(CheckValue("Endpoint",
-                                        ((MTRAccessControlClusterTarget *) ((MTRAccessControlClusterAccessControlEntryStruct *)
-                                                                                actualValue[2])
+                                        ((MTRAccessControlClusterAccessControlTargetStruct *) ((MTRAccessControlClusterAccessControlEntryStruct *)
+                                                                                                   actualValue[2])
                                                 .targets[0])
                                             .endpoint,
                                         16U));
                                     VerifyOrReturn(CheckValueNull("DeviceType",
-                                        ((MTRAccessControlClusterTarget *) ((MTRAccessControlClusterAccessControlEntryStruct *)
-                                                                                actualValue[2])
+                                        ((MTRAccessControlClusterAccessControlTargetStruct *) ((MTRAccessControlClusterAccessControlEntryStruct *)
+                                                                                                   actualValue[2])
                                                 .targets[0])
                                             .deviceType));
                                     VerifyOrReturn(CheckValueNonNull("Cluster",
-                                        ((MTRAccessControlClusterTarget *) ((MTRAccessControlClusterAccessControlEntryStruct *)
-                                                                                actualValue[2])
+                                        ((MTRAccessControlClusterAccessControlTargetStruct *) ((MTRAccessControlClusterAccessControlEntryStruct *)
+                                                                                                   actualValue[2])
                                                 .targets[1])
                                             .cluster));
                                     VerifyOrReturn(CheckValue("Cluster",
-                                        ((MTRAccessControlClusterTarget *) ((MTRAccessControlClusterAccessControlEntryStruct *)
-                                                                                actualValue[2])
+                                        ((MTRAccessControlClusterAccessControlTargetStruct *) ((MTRAccessControlClusterAccessControlEntryStruct *)
+                                                                                                   actualValue[2])
                                                 .targets[1])
                                             .cluster,
                                         17UL));
                                     VerifyOrReturn(CheckValueNull("Endpoint",
-                                        ((MTRAccessControlClusterTarget *) ((MTRAccessControlClusterAccessControlEntryStruct *)
-                                                                                actualValue[2])
+                                        ((MTRAccessControlClusterAccessControlTargetStruct *) ((MTRAccessControlClusterAccessControlEntryStruct *)
+                                                                                                   actualValue[2])
                                                 .targets[1])
                                             .endpoint));
                                     VerifyOrReturn(CheckValueNull("DeviceType",
-                                        ((MTRAccessControlClusterTarget *) ((MTRAccessControlClusterAccessControlEntryStruct *)
-                                                                                actualValue[2])
+                                        ((MTRAccessControlClusterAccessControlTargetStruct *) ((MTRAccessControlClusterAccessControlEntryStruct *)
+                                                                                                   actualValue[2])
                                                 .targets[1])
                                             .deviceType));
                                     VerifyOrReturn(CheckValueNonNull("Cluster",
-                                        ((MTRAccessControlClusterTarget *) ((MTRAccessControlClusterAccessControlEntryStruct *)
-                                                                                actualValue[2])
+                                        ((MTRAccessControlClusterAccessControlTargetStruct *) ((MTRAccessControlClusterAccessControlEntryStruct *)
+                                                                                                   actualValue[2])
                                                 .targets[2])
                                             .cluster));
                                     VerifyOrReturn(CheckValue("Cluster",
-                                        ((MTRAccessControlClusterTarget *) ((MTRAccessControlClusterAccessControlEntryStruct *)
-                                                                                actualValue[2])
+                                        ((MTRAccessControlClusterAccessControlTargetStruct *) ((MTRAccessControlClusterAccessControlEntryStruct *)
+                                                                                                   actualValue[2])
                                                 .targets[2])
                                             .cluster,
                                         18UL));
                                     VerifyOrReturn(CheckValueNonNull("Endpoint",
-                                        ((MTRAccessControlClusterTarget *) ((MTRAccessControlClusterAccessControlEntryStruct *)
-                                                                                actualValue[2])
+                                        ((MTRAccessControlClusterAccessControlTargetStruct *) ((MTRAccessControlClusterAccessControlEntryStruct *)
+                                                                                                   actualValue[2])
                                                 .targets[2])
                                             .endpoint));
                                     VerifyOrReturn(CheckValue("Endpoint",
-                                        ((MTRAccessControlClusterTarget *) ((MTRAccessControlClusterAccessControlEntryStruct *)
-                                                                                actualValue[2])
+                                        ((MTRAccessControlClusterAccessControlTargetStruct *) ((MTRAccessControlClusterAccessControlEntryStruct *)
+                                                                                                   actualValue[2])
                                                 .targets[2])
                                             .endpoint,
                                         19U));
                                     VerifyOrReturn(CheckValueNull("DeviceType",
-                                        ((MTRAccessControlClusterTarget *) ((MTRAccessControlClusterAccessControlEntryStruct *)
-                                                                                actualValue[2])
+                                        ((MTRAccessControlClusterAccessControlTargetStruct *) ((MTRAccessControlClusterAccessControlEntryStruct *)
+                                                                                                   actualValue[2])
                                                 .targets[2])
                                             .deviceType));
                                     VerifyOrReturn(CheckValue("FabricIndex",
@@ -2214,72 +2214,72 @@ class TestAccessControlCluster : public TestCommandBridge {
                                         [((MTRAccessControlClusterAccessControlEntryStruct *) actualValue[3]).targets count],
                                         static_cast<uint32_t>(3)));
                                     VerifyOrReturn(CheckValueNull("Cluster",
-                                        ((MTRAccessControlClusterTarget *) ((MTRAccessControlClusterAccessControlEntryStruct *)
-                                                                                actualValue[3])
+                                        ((MTRAccessControlClusterAccessControlTargetStruct *) ((MTRAccessControlClusterAccessControlEntryStruct *)
+                                                                                                   actualValue[3])
                                                 .targets[0])
                                             .cluster));
                                     VerifyOrReturn(CheckValueNonNull("Endpoint",
-                                        ((MTRAccessControlClusterTarget *) ((MTRAccessControlClusterAccessControlEntryStruct *)
-                                                                                actualValue[3])
+                                        ((MTRAccessControlClusterAccessControlTargetStruct *) ((MTRAccessControlClusterAccessControlEntryStruct *)
+                                                                                                   actualValue[3])
                                                 .targets[0])
                                             .endpoint));
                                     VerifyOrReturn(CheckValue("Endpoint",
-                                        ((MTRAccessControlClusterTarget *) ((MTRAccessControlClusterAccessControlEntryStruct *)
-                                                                                actualValue[3])
+                                        ((MTRAccessControlClusterAccessControlTargetStruct *) ((MTRAccessControlClusterAccessControlEntryStruct *)
+                                                                                                   actualValue[3])
                                                 .targets[0])
                                             .endpoint,
                                         24U));
                                     VerifyOrReturn(CheckValueNull("DeviceType",
-                                        ((MTRAccessControlClusterTarget *) ((MTRAccessControlClusterAccessControlEntryStruct *)
-                                                                                actualValue[3])
+                                        ((MTRAccessControlClusterAccessControlTargetStruct *) ((MTRAccessControlClusterAccessControlEntryStruct *)
+                                                                                                   actualValue[3])
                                                 .targets[0])
                                             .deviceType));
                                     VerifyOrReturn(CheckValueNonNull("Cluster",
-                                        ((MTRAccessControlClusterTarget *) ((MTRAccessControlClusterAccessControlEntryStruct *)
-                                                                                actualValue[3])
+                                        ((MTRAccessControlClusterAccessControlTargetStruct *) ((MTRAccessControlClusterAccessControlEntryStruct *)
+                                                                                                   actualValue[3])
                                                 .targets[1])
                                             .cluster));
                                     VerifyOrReturn(CheckValue("Cluster",
-                                        ((MTRAccessControlClusterTarget *) ((MTRAccessControlClusterAccessControlEntryStruct *)
-                                                                                actualValue[3])
+                                        ((MTRAccessControlClusterAccessControlTargetStruct *) ((MTRAccessControlClusterAccessControlEntryStruct *)
+                                                                                                   actualValue[3])
                                                 .targets[1])
                                             .cluster,
                                         25UL));
                                     VerifyOrReturn(CheckValueNull("Endpoint",
-                                        ((MTRAccessControlClusterTarget *) ((MTRAccessControlClusterAccessControlEntryStruct *)
-                                                                                actualValue[3])
+                                        ((MTRAccessControlClusterAccessControlTargetStruct *) ((MTRAccessControlClusterAccessControlEntryStruct *)
+                                                                                                   actualValue[3])
                                                 .targets[1])
                                             .endpoint));
                                     VerifyOrReturn(CheckValueNull("DeviceType",
-                                        ((MTRAccessControlClusterTarget *) ((MTRAccessControlClusterAccessControlEntryStruct *)
-                                                                                actualValue[3])
+                                        ((MTRAccessControlClusterAccessControlTargetStruct *) ((MTRAccessControlClusterAccessControlEntryStruct *)
+                                                                                                   actualValue[3])
                                                 .targets[1])
                                             .deviceType));
                                     VerifyOrReturn(CheckValueNonNull("Cluster",
-                                        ((MTRAccessControlClusterTarget *) ((MTRAccessControlClusterAccessControlEntryStruct *)
-                                                                                actualValue[3])
+                                        ((MTRAccessControlClusterAccessControlTargetStruct *) ((MTRAccessControlClusterAccessControlEntryStruct *)
+                                                                                                   actualValue[3])
                                                 .targets[2])
                                             .cluster));
                                     VerifyOrReturn(CheckValue("Cluster",
-                                        ((MTRAccessControlClusterTarget *) ((MTRAccessControlClusterAccessControlEntryStruct *)
-                                                                                actualValue[3])
+                                        ((MTRAccessControlClusterAccessControlTargetStruct *) ((MTRAccessControlClusterAccessControlEntryStruct *)
+                                                                                                   actualValue[3])
                                                 .targets[2])
                                             .cluster,
                                         26UL));
                                     VerifyOrReturn(CheckValueNonNull("Endpoint",
-                                        ((MTRAccessControlClusterTarget *) ((MTRAccessControlClusterAccessControlEntryStruct *)
-                                                                                actualValue[3])
+                                        ((MTRAccessControlClusterAccessControlTargetStruct *) ((MTRAccessControlClusterAccessControlEntryStruct *)
+                                                                                                   actualValue[3])
                                                 .targets[2])
                                             .endpoint));
                                     VerifyOrReturn(CheckValue("Endpoint",
-                                        ((MTRAccessControlClusterTarget *) ((MTRAccessControlClusterAccessControlEntryStruct *)
-                                                                                actualValue[3])
+                                        ((MTRAccessControlClusterAccessControlTargetStruct *) ((MTRAccessControlClusterAccessControlEntryStruct *)
+                                                                                                   actualValue[3])
                                                 .targets[2])
                                             .endpoint,
                                         27U));
                                     VerifyOrReturn(CheckValueNull("DeviceType",
-                                        ((MTRAccessControlClusterTarget *) ((MTRAccessControlClusterAccessControlEntryStruct *)
-                                                                                actualValue[3])
+                                        ((MTRAccessControlClusterAccessControlTargetStruct *) ((MTRAccessControlClusterAccessControlEntryStruct *)
+                                                                                                   actualValue[3])
                                                 .targets[2])
                                             .deviceType));
                                     VerifyOrReturn(CheckValue("FabricIndex",
@@ -4608,10 +4608,10 @@ class Test_TC_ACE_1_1 : public TestCommandBridge {
             }
             {
                 NSMutableArray * temp_3 = [[NSMutableArray alloc] init];
-                temp_3[0] = [[MTRAccessControlClusterTarget alloc] init];
-                ((MTRAccessControlClusterTarget *) temp_3[0]).cluster = nil;
-                ((MTRAccessControlClusterTarget *) temp_3[0]).endpoint = [NSNumber numberWithUnsignedShort:0U];
-                ((MTRAccessControlClusterTarget *) temp_3[0]).deviceType = nil;
+                temp_3[0] = [[MTRAccessControlClusterAccessControlTargetStruct alloc] init];
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[0]).cluster = nil;
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[0]).endpoint = [NSNumber numberWithUnsignedShort:0U];
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[0]).deviceType = nil;
 
                 ((MTRAccessControlClusterAccessControlEntryStruct *) temp_0[0]).targets = temp_3;
             }
@@ -4792,10 +4792,10 @@ class Test_TC_ACE_1_1 : public TestCommandBridge {
             }
             {
                 NSMutableArray * temp_3 = [[NSMutableArray alloc] init];
-                temp_3[0] = [[MTRAccessControlClusterTarget alloc] init];
-                ((MTRAccessControlClusterTarget *) temp_3[0]).cluster = [NSNumber numberWithUnsignedInt:31UL];
-                ((MTRAccessControlClusterTarget *) temp_3[0]).endpoint = [NSNumber numberWithUnsignedShort:0U];
-                ((MTRAccessControlClusterTarget *) temp_3[0]).deviceType = nil;
+                temp_3[0] = [[MTRAccessControlClusterAccessControlTargetStruct alloc] init];
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[0]).cluster = [NSNumber numberWithUnsignedInt:31UL];
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[0]).endpoint = [NSNumber numberWithUnsignedShort:0U];
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[0]).deviceType = nil;
 
                 ((MTRAccessControlClusterAccessControlEntryStruct *) temp_0[0]).targets = temp_3;
             }
@@ -4811,10 +4811,10 @@ class Test_TC_ACE_1_1 : public TestCommandBridge {
             }
             {
                 NSMutableArray * temp_3 = [[NSMutableArray alloc] init];
-                temp_3[0] = [[MTRAccessControlClusterTarget alloc] init];
-                ((MTRAccessControlClusterTarget *) temp_3[0]).cluster = nil;
-                ((MTRAccessControlClusterTarget *) temp_3[0]).endpoint = [NSNumber numberWithUnsignedShort:0U];
-                ((MTRAccessControlClusterTarget *) temp_3[0]).deviceType = nil;
+                temp_3[0] = [[MTRAccessControlClusterAccessControlTargetStruct alloc] init];
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[0]).cluster = nil;
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[0]).endpoint = [NSNumber numberWithUnsignedShort:0U];
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[0]).deviceType = nil;
 
                 ((MTRAccessControlClusterAccessControlEntryStruct *) temp_0[1]).targets = temp_3;
             }
@@ -5003,10 +5003,10 @@ class Test_TC_ACE_1_1 : public TestCommandBridge {
             }
             {
                 NSMutableArray * temp_3 = [[NSMutableArray alloc] init];
-                temp_3[0] = [[MTRAccessControlClusterTarget alloc] init];
-                ((MTRAccessControlClusterTarget *) temp_3[0]).cluster = [NSNumber numberWithUnsignedInt:31UL];
-                ((MTRAccessControlClusterTarget *) temp_3[0]).endpoint = [NSNumber numberWithUnsignedShort:0U];
-                ((MTRAccessControlClusterTarget *) temp_3[0]).deviceType = nil;
+                temp_3[0] = [[MTRAccessControlClusterAccessControlTargetStruct alloc] init];
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[0]).cluster = [NSNumber numberWithUnsignedInt:31UL];
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[0]).endpoint = [NSNumber numberWithUnsignedShort:0U];
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[0]).deviceType = nil;
 
                 ((MTRAccessControlClusterAccessControlEntryStruct *) temp_0[0]).targets = temp_3;
             }
@@ -5022,10 +5022,10 @@ class Test_TC_ACE_1_1 : public TestCommandBridge {
             }
             {
                 NSMutableArray * temp_3 = [[NSMutableArray alloc] init];
-                temp_3[0] = [[MTRAccessControlClusterTarget alloc] init];
-                ((MTRAccessControlClusterTarget *) temp_3[0]).cluster = nil;
-                ((MTRAccessControlClusterTarget *) temp_3[0]).endpoint = [NSNumber numberWithUnsignedShort:0U];
-                ((MTRAccessControlClusterTarget *) temp_3[0]).deviceType = nil;
+                temp_3[0] = [[MTRAccessControlClusterAccessControlTargetStruct alloc] init];
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[0]).cluster = nil;
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[0]).endpoint = [NSNumber numberWithUnsignedShort:0U];
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[0]).deviceType = nil;
 
                 ((MTRAccessControlClusterAccessControlEntryStruct *) temp_0[1]).targets = temp_3;
             }
@@ -5217,10 +5217,10 @@ class Test_TC_ACE_1_1 : public TestCommandBridge {
             }
             {
                 NSMutableArray * temp_3 = [[NSMutableArray alloc] init];
-                temp_3[0] = [[MTRAccessControlClusterTarget alloc] init];
-                ((MTRAccessControlClusterTarget *) temp_3[0]).cluster = [NSNumber numberWithUnsignedInt:31UL];
-                ((MTRAccessControlClusterTarget *) temp_3[0]).endpoint = [NSNumber numberWithUnsignedShort:0U];
-                ((MTRAccessControlClusterTarget *) temp_3[0]).deviceType = nil;
+                temp_3[0] = [[MTRAccessControlClusterAccessControlTargetStruct alloc] init];
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[0]).cluster = [NSNumber numberWithUnsignedInt:31UL];
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[0]).endpoint = [NSNumber numberWithUnsignedShort:0U];
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[0]).deviceType = nil;
 
                 ((MTRAccessControlClusterAccessControlEntryStruct *) temp_0[0]).targets = temp_3;
             }
@@ -5236,10 +5236,10 @@ class Test_TC_ACE_1_1 : public TestCommandBridge {
             }
             {
                 NSMutableArray * temp_3 = [[NSMutableArray alloc] init];
-                temp_3[0] = [[MTRAccessControlClusterTarget alloc] init];
-                ((MTRAccessControlClusterTarget *) temp_3[0]).cluster = nil;
-                ((MTRAccessControlClusterTarget *) temp_3[0]).endpoint = [NSNumber numberWithUnsignedShort:0U];
-                ((MTRAccessControlClusterTarget *) temp_3[0]).deviceType = nil;
+                temp_3[0] = [[MTRAccessControlClusterAccessControlTargetStruct alloc] init];
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[0]).cluster = nil;
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[0]).endpoint = [NSNumber numberWithUnsignedShort:0U];
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[0]).deviceType = nil;
 
                 ((MTRAccessControlClusterAccessControlEntryStruct *) temp_0[1]).targets = temp_3;
             }
@@ -5432,10 +5432,10 @@ class Test_TC_ACE_1_1 : public TestCommandBridge {
             }
             {
                 NSMutableArray * temp_3 = [[NSMutableArray alloc] init];
-                temp_3[0] = [[MTRAccessControlClusterTarget alloc] init];
-                ((MTRAccessControlClusterTarget *) temp_3[0]).cluster = [NSNumber numberWithUnsignedInt:31UL];
-                ((MTRAccessControlClusterTarget *) temp_3[0]).endpoint = [NSNumber numberWithUnsignedShort:0U];
-                ((MTRAccessControlClusterTarget *) temp_3[0]).deviceType = nil;
+                temp_3[0] = [[MTRAccessControlClusterAccessControlTargetStruct alloc] init];
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[0]).cluster = [NSNumber numberWithUnsignedInt:31UL];
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[0]).endpoint = [NSNumber numberWithUnsignedShort:0U];
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[0]).deviceType = nil;
 
                 ((MTRAccessControlClusterAccessControlEntryStruct *) temp_0[0]).targets = temp_3;
             }
@@ -6031,10 +6031,10 @@ class Test_TC_ACE_1_5 : public TestCommandBridge {
             }
             {
                 NSMutableArray * temp_3 = [[NSMutableArray alloc] init];
-                temp_3[0] = [[MTRAccessControlClusterTarget alloc] init];
-                ((MTRAccessControlClusterTarget *) temp_3[0]).cluster = [NSNumber numberWithUnsignedInt:31UL];
-                ((MTRAccessControlClusterTarget *) temp_3[0]).endpoint = [NSNumber numberWithUnsignedShort:0U];
-                ((MTRAccessControlClusterTarget *) temp_3[0]).deviceType = nil;
+                temp_3[0] = [[MTRAccessControlClusterAccessControlTargetStruct alloc] init];
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[0]).cluster = [NSNumber numberWithUnsignedInt:31UL];
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[0]).endpoint = [NSNumber numberWithUnsignedShort:0U];
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[0]).deviceType = nil;
 
                 ((MTRAccessControlClusterAccessControlEntryStruct *) temp_0[0]).targets = temp_3;
             }
@@ -6046,10 +6046,10 @@ class Test_TC_ACE_1_5 : public TestCommandBridge {
             ((MTRAccessControlClusterAccessControlEntryStruct *) temp_0[1]).subjects = nil;
             {
                 NSMutableArray * temp_3 = [[NSMutableArray alloc] init];
-                temp_3[0] = [[MTRAccessControlClusterTarget alloc] init];
-                ((MTRAccessControlClusterTarget *) temp_3[0]).cluster = [NSNumber numberWithUnsignedInt:29UL];
-                ((MTRAccessControlClusterTarget *) temp_3[0]).endpoint = [NSNumber numberWithUnsignedShort:0U];
-                ((MTRAccessControlClusterTarget *) temp_3[0]).deviceType = nil;
+                temp_3[0] = [[MTRAccessControlClusterAccessControlTargetStruct alloc] init];
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[0]).cluster = [NSNumber numberWithUnsignedInt:29UL];
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[0]).endpoint = [NSNumber numberWithUnsignedShort:0U];
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[0]).deviceType = nil;
 
                 ((MTRAccessControlClusterAccessControlEntryStruct *) temp_0[1]).targets = temp_3;
             }
@@ -6102,10 +6102,10 @@ class Test_TC_ACE_1_5 : public TestCommandBridge {
             }
             {
                 NSMutableArray * temp_3 = [[NSMutableArray alloc] init];
-                temp_3[0] = [[MTRAccessControlClusterTarget alloc] init];
-                ((MTRAccessControlClusterTarget *) temp_3[0]).cluster = [NSNumber numberWithUnsignedInt:31UL];
-                ((MTRAccessControlClusterTarget *) temp_3[0]).endpoint = [NSNumber numberWithUnsignedShort:0U];
-                ((MTRAccessControlClusterTarget *) temp_3[0]).deviceType = nil;
+                temp_3[0] = [[MTRAccessControlClusterAccessControlTargetStruct alloc] init];
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[0]).cluster = [NSNumber numberWithUnsignedInt:31UL];
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[0]).endpoint = [NSNumber numberWithUnsignedShort:0U];
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[0]).deviceType = nil;
 
                 ((MTRAccessControlClusterAccessControlEntryStruct *) temp_0[0]).targets = temp_3;
             }
@@ -6117,10 +6117,10 @@ class Test_TC_ACE_1_5 : public TestCommandBridge {
             ((MTRAccessControlClusterAccessControlEntryStruct *) temp_0[1]).subjects = nil;
             {
                 NSMutableArray * temp_3 = [[NSMutableArray alloc] init];
-                temp_3[0] = [[MTRAccessControlClusterTarget alloc] init];
-                ((MTRAccessControlClusterTarget *) temp_3[0]).cluster = [NSNumber numberWithUnsignedInt:40UL];
-                ((MTRAccessControlClusterTarget *) temp_3[0]).endpoint = [NSNumber numberWithUnsignedShort:0U];
-                ((MTRAccessControlClusterTarget *) temp_3[0]).deviceType = nil;
+                temp_3[0] = [[MTRAccessControlClusterAccessControlTargetStruct alloc] init];
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[0]).cluster = [NSNumber numberWithUnsignedInt:40UL];
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[0]).endpoint = [NSNumber numberWithUnsignedShort:0U];
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[0]).deviceType = nil;
 
                 ((MTRAccessControlClusterAccessControlEntryStruct *) temp_0[1]).targets = temp_3;
             }
@@ -53587,10 +53587,10 @@ class OTA_SuccessfulTransfer : public TestCommandBridge {
             ((MTRAccessControlClusterAccessControlEntryStruct *) temp_0[1]).subjects = nil;
             {
                 NSMutableArray * temp_3 = [[NSMutableArray alloc] init];
-                temp_3[0] = [[MTRAccessControlClusterTarget alloc] init];
-                ((MTRAccessControlClusterTarget *) temp_3[0]).cluster = [NSNumber numberWithUnsignedInt:41UL];
-                ((MTRAccessControlClusterTarget *) temp_3[0]).endpoint = nil;
-                ((MTRAccessControlClusterTarget *) temp_3[0]).deviceType = nil;
+                temp_3[0] = [[MTRAccessControlClusterAccessControlTargetStruct alloc] init];
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[0]).cluster = [NSNumber numberWithUnsignedInt:41UL];
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[0]).endpoint = nil;
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[0]).deviceType = nil;
 
                 ((MTRAccessControlClusterAccessControlEntryStruct *) temp_0[1]).targets = temp_3;
             }
@@ -114534,10 +114534,10 @@ class TestAccessControlConstraints : public TestCommandBridge {
             ((MTRAccessControlClusterAccessControlEntryStruct *) temp_0[1]).subjects = nil;
             {
                 NSMutableArray * temp_3 = [[NSMutableArray alloc] init];
-                temp_3[0] = [[MTRAccessControlClusterTarget alloc] init];
-                ((MTRAccessControlClusterTarget *) temp_3[0]).cluster = nil;
-                ((MTRAccessControlClusterTarget *) temp_3[0]).endpoint = nil;
-                ((MTRAccessControlClusterTarget *) temp_3[0]).deviceType = nil;
+                temp_3[0] = [[MTRAccessControlClusterAccessControlTargetStruct alloc] init];
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[0]).cluster = nil;
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[0]).endpoint = nil;
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[0]).deviceType = nil;
 
                 ((MTRAccessControlClusterAccessControlEntryStruct *) temp_0[1]).targets = temp_3;
             }
@@ -114587,10 +114587,10 @@ class TestAccessControlConstraints : public TestCommandBridge {
             ((MTRAccessControlClusterAccessControlEntryStruct *) temp_0[1]).subjects = nil;
             {
                 NSMutableArray * temp_3 = [[NSMutableArray alloc] init];
-                temp_3[0] = [[MTRAccessControlClusterTarget alloc] init];
-                ((MTRAccessControlClusterTarget *) temp_3[0]).cluster = nil;
-                ((MTRAccessControlClusterTarget *) temp_3[0]).endpoint = [NSNumber numberWithUnsignedShort:22U];
-                ((MTRAccessControlClusterTarget *) temp_3[0]).deviceType = [NSNumber numberWithUnsignedInt:33UL];
+                temp_3[0] = [[MTRAccessControlClusterAccessControlTargetStruct alloc] init];
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[0]).cluster = nil;
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[0]).endpoint = [NSNumber numberWithUnsignedShort:22U];
+                ((MTRAccessControlClusterAccessControlTargetStruct *) temp_3[0]).deviceType = [NSNumber numberWithUnsignedInt:33UL];
 
                 ((MTRAccessControlClusterAccessControlEntryStruct *) temp_0[1]).targets = temp_3;
             }