diff --git a/zzz_generated/all-clusters-app/zap-generated/af-gen-event.h b/zzz_generated/all-clusters-app/zap-generated/af-gen-event.h
index 16b1619b03e2d8..2568a68d25bd0d 100644
--- a/zzz_generated/all-clusters-app/zap-generated/af-gen-event.h
+++ b/zzz_generated/all-clusters-app/zap-generated/af-gen-event.h
@@ -60,18 +60,16 @@
 
 // EmberEventData structs used to populate the EmberEventData table
 #define EMBER_AF_GENERATED_EVENTS                                                                                                  \
-        { &emberAfBarrierControlClusterServerTickCallbackControl1,                                                                 \
-          emberAfBarrierControlClusterServerTickCallbackWrapperFunction1 },
+    { &emberAfBarrierControlClusterServerTickCallbackControl1, emberAfBarrierControlClusterServerTickCallbackWrapperFunction1 },
 
 #define EMBER_AF_GENERATED_EVENT_STRINGS                                                                                           \
-    "Barrier Control Cluster Server EP 1", "Door Lock Server Cluster Plugin Lockout",         \
-        "Door Lock Server Cluster Plugin Relock",
+    "Barrier Control Cluster Server EP 1", "Door Lock Server Cluster Plugin Lockout", "Door Lock Server Cluster Plugin Relock",
 
 // The length of the event context table used to track and retrieve cluster events
 #define EMBER_AF_EVENT_CONTEXT_LENGTH 1
 
 // EmberAfEventContext structs used to populate the EmberAfEventContext table
 #define EMBER_AF_GENERATED_EVENT_CONTEXT                                                                                           \
-        { 0x1, 0x103, false, EMBER_AF_LONG_POLL, EMBER_AF_OK_TO_SLEEP, &emberAfBarrierControlClusterServerTickCallbackControl1 },
+    { 0x1, 0x103, false, EMBER_AF_LONG_POLL, EMBER_AF_OK_TO_SLEEP, &emberAfBarrierControlClusterServerTickCallbackControl1 },
 
 #endif // __AF_GEN_EVENT__
diff --git a/zzz_generated/thermostat/zap-generated/af-gen-event.h b/zzz_generated/thermostat/zap-generated/af-gen-event.h
index c3a3471370d3c5..304e548dc50993 100644
--- a/zzz_generated/thermostat/zap-generated/af-gen-event.h
+++ b/zzz_generated/thermostat/zap-generated/af-gen-event.h
@@ -66,19 +66,17 @@
 
 // EmberEventData structs used to populate the EmberEventData table
 #define EMBER_AF_GENERATED_EVENTS                                                                                                  \
-        { &emberAfBarrierControlClusterServerTickCallbackControl1,                                                                 \
-          emberAfBarrierControlClusterServerTickCallbackWrapperFunction1 },
+    { &emberAfBarrierControlClusterServerTickCallbackControl1, emberAfBarrierControlClusterServerTickCallbackWrapperFunction1 },
 
 #define EMBER_AF_GENERATED_EVENT_STRINGS                                                                                           \
-    "Barrier Control Cluster Server EP 1",                                                    \
-        "Color Control Cluster Server Plugin HueSatTransition", "Color Control Cluster Server Plugin TempTransition",              \
-        "Color Control Cluster Server Plugin XyTransition", "Door Lock Server Cluster Plugin Lockout",                             \
-        "Door Lock Server Cluster Plugin Relock", "IAS Zone Server Plugin ManageQueue",
+    "Barrier Control Cluster Server EP 1", "Color Control Cluster Server Plugin HueSatTransition",                                 \
+        "Color Control Cluster Server Plugin TempTransition", "Color Control Cluster Server Plugin XyTransition",                  \
+        "Door Lock Server Cluster Plugin Lockout", "Door Lock Server Cluster Plugin Relock", "IAS Zone Server Plugin ManageQueue",
 
 // The length of the event context table used to track and retrieve cluster events
 #define EMBER_AF_EVENT_CONTEXT_LENGTH 2
 
 // EmberAfEventContext structs used to populate the EmberAfEventContext table
 #define EMBER_AF_GENERATED_EVENT_CONTEXT                                                                                           \
-        { 0x1, 0x103, false, EMBER_AF_LONG_POLL, EMBER_AF_OK_TO_SLEEP, &emberAfBarrierControlClusterServerTickCallbackControl1 },
+    { 0x1, 0x103, false, EMBER_AF_LONG_POLL, EMBER_AF_OK_TO_SLEEP, &emberAfBarrierControlClusterServerTickCallbackControl1 },
 #endif // __AF_GEN_EVENT__
diff --git a/zzz_generated/tv-casting-app/zap-generated/af-gen-event.h b/zzz_generated/tv-casting-app/zap-generated/af-gen-event.h
index 5a304d2ca510a5..bc2ea99352827c 100644
--- a/zzz_generated/tv-casting-app/zap-generated/af-gen-event.h
+++ b/zzz_generated/tv-casting-app/zap-generated/af-gen-event.h
@@ -61,19 +61,17 @@
 
 // EmberEventData structs used to populate the EmberEventData table
 #define EMBER_AF_GENERATED_EVENTS                                                                                                  \
-        { &emberAfBarrierControlClusterServerTickCallbackControl1,                                                                 \
-          emberAfBarrierControlClusterServerTickCallbackWrapperFunction1 },
+    { &emberAfBarrierControlClusterServerTickCallbackControl1, emberAfBarrierControlClusterServerTickCallbackWrapperFunction1 },
 
 #define EMBER_AF_GENERATED_EVENT_STRINGS                                                                                           \
-    "Barrier Control Cluster Server EP 1",                                                    \
-        "Color Control Cluster Server Plugin HueSatTransition", "Color Control Cluster Server Plugin TempTransition",              \
-        "Color Control Cluster Server Plugin XyTransition", "Door Lock Server Cluster Plugin Lockout",                             \
-        "Door Lock Server Cluster Plugin Relock",
+    "Barrier Control Cluster Server EP 1", "Color Control Cluster Server Plugin HueSatTransition",                                 \
+        "Color Control Cluster Server Plugin TempTransition", "Color Control Cluster Server Plugin XyTransition",                  \
+        "Door Lock Server Cluster Plugin Lockout", "Door Lock Server Cluster Plugin Relock",
 
 // The length of the event context table used to track and retrieve cluster events
 #define EMBER_AF_EVENT_CONTEXT_LENGTH 1
 
 // EmberAfEventContext structs used to populate the EmberAfEventContext table
 #define EMBER_AF_GENERATED_EVENT_CONTEXT                                                                                           \
-        { 0x1, 0x103, false, EMBER_AF_LONG_POLL, EMBER_AF_OK_TO_SLEEP, &emberAfBarrierControlClusterServerTickCallbackControl1 },
+    { 0x1, 0x103, false, EMBER_AF_LONG_POLL, EMBER_AF_OK_TO_SLEEP, &emberAfBarrierControlClusterServerTickCallbackControl1 },
 #endif // __AF_GEN_EVENT__