From 2781021f60fbd9473ac97aa22ec7e3e9eea8ac9a Mon Sep 17 00:00:00 2001
From: Vivien Nicolas <vnicolas@apple.com>
Date: Thu, 20 Jan 2022 23:07:30 +0100
Subject: [PATCH] Add ids/Events.h (#13689)

* Add ids/Events.h

* Update generated code
---
 src/app/common/templates/templates.json       |   5 +
 .../templates/app/cluster-objects.zapt        |  10 +-
 .../templates/app/ids/Events.zapt             |  32 ++
 src/platform/Linux/PlatformManagerImpl.cpp    |  31 +-
 .../zap-generated/cluster-objects.h           | 256 ++++++--------
 .../app-common/zap-generated/ids/Events.h     | 312 ++++++++++++++++++
 6 files changed, 473 insertions(+), 173 deletions(-)
 create mode 100644 src/app/zap-templates/templates/app/ids/Events.zapt
 create mode 100644 zzz_generated/app-common/app-common/zap-generated/ids/Events.h

diff --git a/src/app/common/templates/templates.json b/src/app/common/templates/templates.json
index 366ef0457fff13..6a7286ac922a0b 100644
--- a/src/app/common/templates/templates.json
+++ b/src/app/common/templates/templates.json
@@ -104,6 +104,11 @@
             "name": "Commands Ids header",
             "output": "ids/Commands.h"
         },
+        {
+            "path": "../../zap-templates/templates/app/ids/Events.zapt",
+            "name": "Events Ids header",
+            "output": "ids/Events.h"
+        },
         {
             "path": "../../zap-templates/templates/app/cluster-objects.zapt",
             "name": "Cluster objects header for Interaction Model",
diff --git a/src/app/zap-templates/templates/app/cluster-objects.zapt b/src/app/zap-templates/templates/app/cluster-objects.zapt
index 79090e851e4ed3..bcc515dd53b298 100644
--- a/src/app/zap-templates/templates/app/cluster-objects.zapt
+++ b/src/app/zap-templates/templates/app/cluster-objects.zapt
@@ -12,9 +12,10 @@
 #include <lib/support/BitFlags.h>
 #include <protocols/interaction_model/Constants.h>
 #include <app-common/zap-generated/enums.h>
-#include <app-common/zap-generated/ids/Commands.h>
-#include <app-common/zap-generated/ids/Clusters.h>
 #include <app-common/zap-generated/ids/Attributes.h>
+#include <app-common/zap-generated/ids/Clusters.h>
+#include <app-common/zap-generated/ids/Commands.h>
+#include <app-common/zap-generated/ids/Events.h>
 
 namespace chip {
 namespace app {
@@ -187,7 +188,6 @@ namespace Events {
 {{/first}}
 namespace {{asUpperCamelCase name}} {
 static constexpr PriorityLevel kPriorityLevel = PriorityLevel::{{asUpperCamelCase priority}};
-static constexpr EventId kEventId = {{asMEI manufacturerCode code}};
 
 enum class Fields {
     {{#zcl_event_fields}}
@@ -199,7 +199,7 @@ struct Type
 {
 public:
     static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return kEventId; }
+    static constexpr EventId GetEventId() { return Events::{{asUpperCamelCase name}}::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::{{asUpperCamelCase parent.name}}::Id; }
 
     {{#zcl_event_fields}}
@@ -212,7 +212,7 @@ public:
 struct DecodableType {
 public:
     static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return kEventId; }
+    static constexpr EventId GetEventId() { return Events::{{asUpperCamelCase name}}::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::{{asUpperCamelCase parent.name}}::Id; }
 
     {{#zcl_event_fields}}
diff --git a/src/app/zap-templates/templates/app/ids/Events.zapt b/src/app/zap-templates/templates/app/ids/Events.zapt
new file mode 100644
index 00000000000000..dca5a226aa1c1c
--- /dev/null
+++ b/src/app/zap-templates/templates/app/ids/Events.zapt
@@ -0,0 +1,32 @@
+{{> header}}
+
+#pragma once
+
+#include <app/util/basic-types.h>
+
+namespace chip {
+namespace app {
+namespace Clusters {
+
+{{#zcl_clusters}}
+{{#zcl_events}}
+{{#first}}
+namespace {{asUpperCamelCase parent.label}} {
+namespace Events {
+
+{{/first}}
+namespace {{asUpperCamelCase name}} {
+static constexpr EventId Id = {{asMEI manufacturerCode code}};
+} // namespace {{asUpperCamelCase name}}
+
+{{#last}}
+} // namespace Events
+} // namespace {{asUpperCamelCase parent.label}}
+
+{{/last}}
+{{/zcl_events}}
+{{/zcl_clusters}}
+
+} // namespace Clusters
+} // namespace app
+} // namespace chip
diff --git a/src/platform/Linux/PlatformManagerImpl.cpp b/src/platform/Linux/PlatformManagerImpl.cpp
index d9fbaeb9d32c1a..6b4ad3ebf17368 100644
--- a/src/platform/Linux/PlatformManagerImpl.cpp
+++ b/src/platform/Linux/PlatformManagerImpl.cpp
@@ -25,6 +25,7 @@
 #include <platform/internal/CHIPDeviceLayerInternal.h>
 
 #include <app-common/zap-generated/enums.h>
+#include <app-common/zap-generated/ids/Events.h>
 #include <lib/support/CHIPMem.h>
 #include <lib/support/logging/CHIPLogging.h>
 #include <platform/DeviceControlServer.h>
@@ -88,19 +89,19 @@ void SignalHandler(int signum)
         err = CHIP_ERROR_REBOOT_SIGNAL_RECEIVED;
         break;
     case SIGTRAP:
-        PlatformMgrImpl().HandleSoftwareFault(SoftwareDiagnostics::Events::SoftwareFault::kEventId);
+        PlatformMgrImpl().HandleSoftwareFault(SoftwareDiagnostics::Events::SoftwareFault::Id);
         break;
     case SIGILL:
-        PlatformMgrImpl().HandleGeneralFault(GeneralDiagnostics::Events::HardwareFaultChange::kEventId);
+        PlatformMgrImpl().HandleGeneralFault(GeneralDiagnostics::Events::HardwareFaultChange::Id);
         break;
     case SIGALRM:
-        PlatformMgrImpl().HandleGeneralFault(GeneralDiagnostics::Events::RadioFaultChange::kEventId);
+        PlatformMgrImpl().HandleGeneralFault(GeneralDiagnostics::Events::RadioFaultChange::Id);
         break;
     case SIGVTALRM:
-        PlatformMgrImpl().HandleGeneralFault(GeneralDiagnostics::Events::NetworkFaultChange::kEventId);
+        PlatformMgrImpl().HandleGeneralFault(GeneralDiagnostics::Events::NetworkFaultChange::Id);
         break;
     case SIGIO:
-        PlatformMgrImpl().HandleSwitchEvent(Switch::Events::SwitchLatched::kEventId);
+        PlatformMgrImpl().HandleSwitchEvent(Switch::Events::SwitchLatched::Id);
         break;
     default:
         break;
@@ -385,7 +386,7 @@ void PlatformManagerImpl::HandleGeneralFault(uint32_t EventId)
         return;
     }
 
-    if (EventId == GeneralDiagnostics::Events::HardwareFaultChange::kEventId)
+    if (EventId == GeneralDiagnostics::Events::HardwareFaultChange::Id)
     {
         GeneralFaults<kMaxHardwareFaults> previous;
         GeneralFaults<kMaxHardwareFaults> current;
@@ -402,7 +403,7 @@ void PlatformManagerImpl::HandleGeneralFault(uint32_t EventId)
 #endif
         delegate->OnHardwareFaultsDetected(previous, current);
     }
-    else if (EventId == GeneralDiagnostics::Events::RadioFaultChange::kEventId)
+    else if (EventId == GeneralDiagnostics::Events::RadioFaultChange::Id)
     {
         GeneralFaults<kMaxRadioFaults> previous;
         GeneralFaults<kMaxRadioFaults> current;
@@ -419,7 +420,7 @@ void PlatformManagerImpl::HandleGeneralFault(uint32_t EventId)
 #endif
         delegate->OnRadioFaultsDetected(previous, current);
     }
-    else if (EventId == GeneralDiagnostics::Events::NetworkFaultChange::kEventId)
+    else if (EventId == GeneralDiagnostics::Events::NetworkFaultChange::Id)
     {
         GeneralFaults<kMaxNetworkFaults> previous;
         GeneralFaults<kMaxNetworkFaults> current;
@@ -470,7 +471,7 @@ void PlatformManagerImpl::HandleSwitchEvent(uint32_t EventId)
         return;
     }
 
-    if (EventId == Switch::Events::SwitchLatched::kEventId)
+    if (EventId == Switch::Events::SwitchLatched::Id)
     {
         uint8_t newPosition = 0;
 
@@ -479,7 +480,7 @@ void PlatformManagerImpl::HandleSwitchEvent(uint32_t EventId)
 #endif
         delegate->OnSwitchLatched(newPosition);
     }
-    else if (EventId == Switch::Events::InitialPress::kEventId)
+    else if (EventId == Switch::Events::InitialPress::Id)
     {
         uint8_t newPosition = 0;
 
@@ -488,7 +489,7 @@ void PlatformManagerImpl::HandleSwitchEvent(uint32_t EventId)
 #endif
         delegate->OnInitialPressed(newPosition);
     }
-    else if (EventId == Switch::Events::LongPress::kEventId)
+    else if (EventId == Switch::Events::LongPress::Id)
     {
         uint8_t newPosition = 0;
 
@@ -497,7 +498,7 @@ void PlatformManagerImpl::HandleSwitchEvent(uint32_t EventId)
 #endif
         delegate->OnLongPressed(newPosition);
     }
-    else if (EventId == Switch::Events::ShortRelease::kEventId)
+    else if (EventId == Switch::Events::ShortRelease::Id)
     {
         uint8_t previousPosition = 0;
 
@@ -506,7 +507,7 @@ void PlatformManagerImpl::HandleSwitchEvent(uint32_t EventId)
 #endif
         delegate->OnShortReleased(previousPosition);
     }
-    else if (EventId == Switch::Events::LongRelease::kEventId)
+    else if (EventId == Switch::Events::LongRelease::Id)
     {
         uint8_t previousPosition = 0;
 
@@ -515,7 +516,7 @@ void PlatformManagerImpl::HandleSwitchEvent(uint32_t EventId)
 #endif
         delegate->OnLongReleased(previousPosition);
     }
-    else if (EventId == Switch::Events::MultiPressOngoing::kEventId)
+    else if (EventId == Switch::Events::MultiPressOngoing::Id)
     {
         uint8_t newPosition                   = 0;
         uint8_t currentNumberOfPressesCounted = 0;
@@ -526,7 +527,7 @@ void PlatformManagerImpl::HandleSwitchEvent(uint32_t EventId)
 #endif
         delegate->OnMultiPressOngoing(newPosition, currentNumberOfPressesCounted);
     }
-    else if (EventId == Switch::Events::MultiPressComplete::kEventId)
+    else if (EventId == Switch::Events::MultiPressComplete::Id)
     {
         uint8_t newPosition                 = 0;
         uint8_t totalNumberOfPressesCounted = 0;
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 b7de5f24dad72b..64bbdcf3f43936 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
@@ -23,6 +23,7 @@
 #include <app-common/zap-generated/ids/Attributes.h>
 #include <app-common/zap-generated/ids/Clusters.h>
 #include <app-common/zap-generated/ids/Commands.h>
+#include <app-common/zap-generated/ids/Events.h>
 #include <app/EventLoggingTypes.h>
 #include <app/data-model/DecodableList.h>
 #include <app/data-model/Decode.h>
@@ -6586,7 +6587,6 @@ struct TypeInfo
 namespace Events {
 namespace AccessControlEntryChanged {
 static constexpr PriorityLevel kPriorityLevel = PriorityLevel::Info;
-static constexpr EventId kEventId             = 0x00000000;
 
 enum class Fields
 {
@@ -6601,7 +6601,7 @@ struct Type
 {
 public:
     static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return kEventId; }
+    static constexpr EventId GetEventId() { return Events::AccessControlEntryChanged::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::AccessControl::Id; }
 
     chip::FabricIndex adminFabricIndex = static_cast<chip::FabricIndex>(0);
@@ -6617,7 +6617,7 @@ struct DecodableType
 {
 public:
     static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return kEventId; }
+    static constexpr EventId GetEventId() { return Events::AccessControlEntryChanged::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::AccessControl::Id; }
 
     chip::FabricIndex adminFabricIndex = static_cast<chip::FabricIndex>(0);
@@ -6631,7 +6631,6 @@ struct DecodableType
 } // namespace AccessControlEntryChanged
 namespace AccessControlExtensionChanged {
 static constexpr PriorityLevel kPriorityLevel = PriorityLevel::Info;
-static constexpr EventId kEventId             = 0x00000001;
 
 enum class Fields
 {
@@ -6646,7 +6645,7 @@ struct Type
 {
 public:
     static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return kEventId; }
+    static constexpr EventId GetEventId() { return Events::AccessControlExtensionChanged::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::AccessControl::Id; }
 
     chip::FabricIndex adminFabricIndex = static_cast<chip::FabricIndex>(0);
@@ -6662,7 +6661,7 @@ struct DecodableType
 {
 public:
     static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return kEventId; }
+    static constexpr EventId GetEventId() { return Events::AccessControlExtensionChanged::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::AccessControl::Id; }
 
     chip::FabricIndex adminFabricIndex = static_cast<chip::FabricIndex>(0);
@@ -7726,7 +7725,6 @@ struct TypeInfo
 namespace Events {
 namespace StateChanged {
 static constexpr PriorityLevel kPriorityLevel = PriorityLevel::Info;
-static constexpr EventId kEventId             = 0x00000000;
 
 enum class Fields
 {
@@ -7739,7 +7737,7 @@ struct Type
 {
 public:
     static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return kEventId; }
+    static constexpr EventId GetEventId() { return Events::StateChanged::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::BridgedActions::Id; }
 
     uint16_t actionID        = static_cast<uint16_t>(0);
@@ -7753,7 +7751,7 @@ struct DecodableType
 {
 public:
     static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return kEventId; }
+    static constexpr EventId GetEventId() { return Events::StateChanged::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::BridgedActions::Id; }
 
     uint16_t actionID        = static_cast<uint16_t>(0);
@@ -7765,7 +7763,6 @@ struct DecodableType
 } // namespace StateChanged
 namespace ActionFailed {
 static constexpr PriorityLevel kPriorityLevel = PriorityLevel::Info;
-static constexpr EventId kEventId             = 0x00000001;
 
 enum class Fields
 {
@@ -7779,7 +7776,7 @@ struct Type
 {
 public:
     static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return kEventId; }
+    static constexpr EventId GetEventId() { return Events::ActionFailed::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::BridgedActions::Id; }
 
     uint16_t actionID        = static_cast<uint16_t>(0);
@@ -7794,7 +7791,7 @@ struct DecodableType
 {
 public:
     static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return kEventId; }
+    static constexpr EventId GetEventId() { return Events::ActionFailed::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::BridgedActions::Id; }
 
     uint16_t actionID        = static_cast<uint16_t>(0);
@@ -8153,7 +8150,6 @@ struct TypeInfo
 namespace Events {
 namespace StartUp {
 static constexpr PriorityLevel kPriorityLevel = PriorityLevel::Critical;
-static constexpr EventId kEventId             = 0x00000000;
 
 enum class Fields
 {
@@ -8164,7 +8160,7 @@ struct Type
 {
 public:
     static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return kEventId; }
+    static constexpr EventId GetEventId() { return Events::StartUp::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::Basic::Id; }
 
     uint32_t softwareVersion = static_cast<uint32_t>(0);
@@ -8176,7 +8172,7 @@ struct DecodableType
 {
 public:
     static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return kEventId; }
+    static constexpr EventId GetEventId() { return Events::StartUp::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::Basic::Id; }
 
     uint32_t softwareVersion = static_cast<uint32_t>(0);
@@ -8186,7 +8182,6 @@ struct DecodableType
 } // namespace StartUp
 namespace ShutDown {
 static constexpr PriorityLevel kPriorityLevel = PriorityLevel::Critical;
-static constexpr EventId kEventId             = 0x00000001;
 
 enum class Fields
 {
@@ -8196,7 +8191,7 @@ struct Type
 {
 public:
     static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return kEventId; }
+    static constexpr EventId GetEventId() { return Events::ShutDown::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::Basic::Id; }
 
     CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
@@ -8206,7 +8201,7 @@ struct DecodableType
 {
 public:
     static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return kEventId; }
+    static constexpr EventId GetEventId() { return Events::ShutDown::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::Basic::Id; }
 
     CHIP_ERROR Decode(TLV::TLVReader & reader);
@@ -8214,7 +8209,6 @@ struct DecodableType
 } // namespace ShutDown
 namespace Leave {
 static constexpr PriorityLevel kPriorityLevel = PriorityLevel::Info;
-static constexpr EventId kEventId             = 0x00000002;
 
 enum class Fields
 {
@@ -8224,7 +8218,7 @@ struct Type
 {
 public:
     static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return kEventId; }
+    static constexpr EventId GetEventId() { return Events::Leave::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::Basic::Id; }
 
     CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
@@ -8234,7 +8228,7 @@ struct DecodableType
 {
 public:
     static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return kEventId; }
+    static constexpr EventId GetEventId() { return Events::Leave::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::Basic::Id; }
 
     CHIP_ERROR Decode(TLV::TLVReader & reader);
@@ -8242,7 +8236,6 @@ struct DecodableType
 } // namespace Leave
 namespace ReachableChanged {
 static constexpr PriorityLevel kPriorityLevel = PriorityLevel::Info;
-static constexpr EventId kEventId             = 0x00000003;
 
 enum class Fields
 {
@@ -8253,7 +8246,7 @@ struct Type
 {
 public:
     static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return kEventId; }
+    static constexpr EventId GetEventId() { return Events::ReachableChanged::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::Basic::Id; }
 
     bool reachableNewValue = static_cast<bool>(0);
@@ -8265,7 +8258,7 @@ struct DecodableType
 {
 public:
     static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return kEventId; }
+    static constexpr EventId GetEventId() { return Events::ReachableChanged::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::Basic::Id; }
 
     bool reachableNewValue = static_cast<bool>(0);
@@ -8823,7 +8816,6 @@ struct TypeInfo
 namespace Events {
 namespace StateTransition {
 static constexpr PriorityLevel kPriorityLevel = PriorityLevel::Info;
-static constexpr EventId kEventId             = 0x00000000;
 
 enum class Fields
 {
@@ -8837,7 +8829,7 @@ struct Type
 {
 public:
     static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return kEventId; }
+    static constexpr EventId GetEventId() { return Events::StateTransition::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::OtaSoftwareUpdateRequestor::Id; }
 
     DataModel::Nullable<OTAUpdateStateEnum> previousState;
@@ -8852,7 +8844,7 @@ struct DecodableType
 {
 public:
     static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return kEventId; }
+    static constexpr EventId GetEventId() { return Events::StateTransition::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::OtaSoftwareUpdateRequestor::Id; }
 
     DataModel::Nullable<OTAUpdateStateEnum> previousState;
@@ -8865,7 +8857,6 @@ struct DecodableType
 } // namespace StateTransition
 namespace VersionApplied {
 static constexpr PriorityLevel kPriorityLevel = PriorityLevel::Critical;
-static constexpr EventId kEventId             = 0x00000001;
 
 enum class Fields
 {
@@ -8877,7 +8868,7 @@ struct Type
 {
 public:
     static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return kEventId; }
+    static constexpr EventId GetEventId() { return Events::VersionApplied::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::OtaSoftwareUpdateRequestor::Id; }
 
     uint32_t softwareVersion = static_cast<uint32_t>(0);
@@ -8890,7 +8881,7 @@ struct DecodableType
 {
 public:
     static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return kEventId; }
+    static constexpr EventId GetEventId() { return Events::VersionApplied::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::OtaSoftwareUpdateRequestor::Id; }
 
     uint32_t softwareVersion = static_cast<uint32_t>(0);
@@ -8901,7 +8892,6 @@ struct DecodableType
 } // namespace VersionApplied
 namespace DownloadError {
 static constexpr PriorityLevel kPriorityLevel = PriorityLevel::Info;
-static constexpr EventId kEventId             = 0x00000002;
 
 enum class Fields
 {
@@ -8915,7 +8905,7 @@ struct Type
 {
 public:
     static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return kEventId; }
+    static constexpr EventId GetEventId() { return Events::DownloadError::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::OtaSoftwareUpdateRequestor::Id; }
 
     uint32_t softwareVersion = static_cast<uint32_t>(0);
@@ -8930,7 +8920,7 @@ struct DecodableType
 {
 public:
     static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return kEventId; }
+    static constexpr EventId GetEventId() { return Events::DownloadError::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::OtaSoftwareUpdateRequestor::Id; }
 
     uint32_t softwareVersion = static_cast<uint32_t>(0);
@@ -11185,7 +11175,6 @@ struct TypeInfo
 namespace Events {
 namespace HardwareFaultChange {
 static constexpr PriorityLevel kPriorityLevel = PriorityLevel::Critical;
-static constexpr EventId kEventId             = 0x00000000;
 
 enum class Fields
 {
@@ -11197,7 +11186,7 @@ struct Type
 {
 public:
     static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return kEventId; }
+    static constexpr EventId GetEventId() { return Events::HardwareFaultChange::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::GeneralDiagnostics::Id; }
 
     DataModel::List<const HardwareFaultType> current;
@@ -11210,7 +11199,7 @@ struct DecodableType
 {
 public:
     static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return kEventId; }
+    static constexpr EventId GetEventId() { return Events::HardwareFaultChange::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::GeneralDiagnostics::Id; }
 
     DataModel::DecodableList<HardwareFaultType> current;
@@ -11221,7 +11210,6 @@ struct DecodableType
 } // namespace HardwareFaultChange
 namespace RadioFaultChange {
 static constexpr PriorityLevel kPriorityLevel = PriorityLevel::Critical;
-static constexpr EventId kEventId             = 0x00000001;
 
 enum class Fields
 {
@@ -11233,7 +11221,7 @@ struct Type
 {
 public:
     static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return kEventId; }
+    static constexpr EventId GetEventId() { return Events::RadioFaultChange::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::GeneralDiagnostics::Id; }
 
     DataModel::List<const RadioFaultType> current;
@@ -11246,7 +11234,7 @@ struct DecodableType
 {
 public:
     static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return kEventId; }
+    static constexpr EventId GetEventId() { return Events::RadioFaultChange::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::GeneralDiagnostics::Id; }
 
     DataModel::DecodableList<RadioFaultType> current;
@@ -11257,7 +11245,6 @@ struct DecodableType
 } // namespace RadioFaultChange
 namespace NetworkFaultChange {
 static constexpr PriorityLevel kPriorityLevel = PriorityLevel::Critical;
-static constexpr EventId kEventId             = 0x00000002;
 
 enum class Fields
 {
@@ -11269,7 +11256,7 @@ struct Type
 {
 public:
     static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return kEventId; }
+    static constexpr EventId GetEventId() { return Events::NetworkFaultChange::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::GeneralDiagnostics::Id; }
 
     DataModel::List<const NetworkFaultType> current;
@@ -11282,7 +11269,7 @@ struct DecodableType
 {
 public:
     static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return kEventId; }
+    static constexpr EventId GetEventId() { return Events::NetworkFaultChange::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::GeneralDiagnostics::Id; }
 
     DataModel::DecodableList<NetworkFaultType> current;
@@ -11293,7 +11280,6 @@ struct DecodableType
 } // namespace NetworkFaultChange
 namespace BootReason {
 static constexpr PriorityLevel kPriorityLevel = PriorityLevel::Critical;
-static constexpr EventId kEventId             = 0x00000003;
 
 enum class Fields
 {
@@ -11304,7 +11290,7 @@ struct Type
 {
 public:
     static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return kEventId; }
+    static constexpr EventId GetEventId() { return Events::BootReason::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::GeneralDiagnostics::Id; }
 
     BootReasonType bootReason = static_cast<BootReasonType>(0);
@@ -11316,7 +11302,7 @@ struct DecodableType
 {
 public:
     static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return kEventId; }
+    static constexpr EventId GetEventId() { return Events::BootReason::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::GeneralDiagnostics::Id; }
 
     BootReasonType bootReason = static_cast<BootReasonType>(0);
@@ -11530,7 +11516,6 @@ struct TypeInfo
 namespace Events {
 namespace SoftwareFault {
 static constexpr PriorityLevel kPriorityLevel = PriorityLevel::Info;
-static constexpr EventId kEventId             = 0x00000000;
 
 enum class Fields
 {
@@ -11541,7 +11526,7 @@ struct Type
 {
 public:
     static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return kEventId; }
+    static constexpr EventId GetEventId() { return Events::SoftwareFault::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::SoftwareDiagnostics::Id; }
 
     Structs::SoftwareFault::Type softwareFault;
@@ -11553,7 +11538,7 @@ struct DecodableType
 {
 public:
     static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return kEventId; }
+    static constexpr EventId GetEventId() { return Events::SoftwareFault::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::SoftwareDiagnostics::Id; }
 
     Structs::SoftwareFault::DecodableType softwareFault;
@@ -12666,7 +12651,6 @@ struct TypeInfo
 namespace Events {
 namespace ConnectionStatus {
 static constexpr PriorityLevel kPriorityLevel = PriorityLevel::Info;
-static constexpr EventId kEventId             = 0x00000000;
 
 enum class Fields
 {
@@ -12677,7 +12661,7 @@ struct Type
 {
 public:
     static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return kEventId; }
+    static constexpr EventId GetEventId() { return Events::ConnectionStatus::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::ThreadNetworkDiagnostics::Id; }
 
     ThreadConnectionStatus connectionStatus = static_cast<ThreadConnectionStatus>(0);
@@ -12689,7 +12673,7 @@ struct DecodableType
 {
 public:
     static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return kEventId; }
+    static constexpr EventId GetEventId() { return Events::ConnectionStatus::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::ThreadNetworkDiagnostics::Id; }
 
     ThreadConnectionStatus connectionStatus = static_cast<ThreadConnectionStatus>(0);
@@ -13013,7 +12997,6 @@ struct TypeInfo
 namespace Events {
 namespace Disconnection {
 static constexpr PriorityLevel kPriorityLevel = PriorityLevel::Info;
-static constexpr EventId kEventId             = 0x00000000;
 
 enum class Fields
 {
@@ -13024,7 +13007,7 @@ struct Type
 {
 public:
     static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return kEventId; }
+    static constexpr EventId GetEventId() { return Events::Disconnection::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::WiFiNetworkDiagnostics::Id; }
 
     uint16_t reasonCode = static_cast<uint16_t>(0);
@@ -13036,7 +13019,7 @@ struct DecodableType
 {
 public:
     static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return kEventId; }
+    static constexpr EventId GetEventId() { return Events::Disconnection::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::WiFiNetworkDiagnostics::Id; }
 
     uint16_t reasonCode = static_cast<uint16_t>(0);
@@ -13046,7 +13029,6 @@ struct DecodableType
 } // namespace Disconnection
 namespace AssociationFailure {
 static constexpr PriorityLevel kPriorityLevel = PriorityLevel::Info;
-static constexpr EventId kEventId             = 0x00000001;
 
 enum class Fields
 {
@@ -13058,7 +13040,7 @@ struct Type
 {
 public:
     static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return kEventId; }
+    static constexpr EventId GetEventId() { return Events::AssociationFailure::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::WiFiNetworkDiagnostics::Id; }
 
     AssociationFailureCause associationFailure = static_cast<AssociationFailureCause>(0);
@@ -13071,7 +13053,7 @@ struct DecodableType
 {
 public:
     static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return kEventId; }
+    static constexpr EventId GetEventId() { return Events::AssociationFailure::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::WiFiNetworkDiagnostics::Id; }
 
     AssociationFailureCause associationFailure = static_cast<AssociationFailureCause>(0);
@@ -13082,7 +13064,6 @@ struct DecodableType
 } // namespace AssociationFailure
 namespace ConnectionStatus {
 static constexpr PriorityLevel kPriorityLevel = PriorityLevel::Info;
-static constexpr EventId kEventId             = 0x00000002;
 
 enum class Fields
 {
@@ -13093,7 +13074,7 @@ struct Type
 {
 public:
     static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return kEventId; }
+    static constexpr EventId GetEventId() { return Events::ConnectionStatus::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::WiFiNetworkDiagnostics::Id; }
 
     WiFiConnectionStatus connectionStatus = static_cast<WiFiConnectionStatus>(0);
@@ -13105,7 +13086,7 @@ struct DecodableType
 {
 public:
     static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return kEventId; }
+    static constexpr EventId GetEventId() { return Events::ConnectionStatus::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::WiFiNetworkDiagnostics::Id; }
 
     WiFiConnectionStatus connectionStatus = static_cast<WiFiConnectionStatus>(0);
@@ -13893,7 +13874,6 @@ struct TypeInfo
 namespace Events {
 namespace SwitchLatched {
 static constexpr PriorityLevel kPriorityLevel = PriorityLevel::Info;
-static constexpr EventId kEventId             = 0x00000000;
 
 enum class Fields
 {
@@ -13904,7 +13884,7 @@ struct Type
 {
 public:
     static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return kEventId; }
+    static constexpr EventId GetEventId() { return Events::SwitchLatched::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::Switch::Id; }
 
     uint8_t newPosition = static_cast<uint8_t>(0);
@@ -13916,7 +13896,7 @@ struct DecodableType
 {
 public:
     static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return kEventId; }
+    static constexpr EventId GetEventId() { return Events::SwitchLatched::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::Switch::Id; }
 
     uint8_t newPosition = static_cast<uint8_t>(0);
@@ -13926,7 +13906,6 @@ struct DecodableType
 } // namespace SwitchLatched
 namespace InitialPress {
 static constexpr PriorityLevel kPriorityLevel = PriorityLevel::Info;
-static constexpr EventId kEventId             = 0x00000001;
 
 enum class Fields
 {
@@ -13937,7 +13916,7 @@ struct Type
 {
 public:
     static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return kEventId; }
+    static constexpr EventId GetEventId() { return Events::InitialPress::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::Switch::Id; }
 
     uint8_t newPosition = static_cast<uint8_t>(0);
@@ -13949,7 +13928,7 @@ struct DecodableType
 {
 public:
     static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return kEventId; }
+    static constexpr EventId GetEventId() { return Events::InitialPress::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::Switch::Id; }
 
     uint8_t newPosition = static_cast<uint8_t>(0);
@@ -13959,7 +13938,6 @@ struct DecodableType
 } // namespace InitialPress
 namespace LongPress {
 static constexpr PriorityLevel kPriorityLevel = PriorityLevel::Info;
-static constexpr EventId kEventId             = 0x00000002;
 
 enum class Fields
 {
@@ -13970,7 +13948,7 @@ struct Type
 {
 public:
     static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return kEventId; }
+    static constexpr EventId GetEventId() { return Events::LongPress::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::Switch::Id; }
 
     uint8_t newPosition = static_cast<uint8_t>(0);
@@ -13982,7 +13960,7 @@ struct DecodableType
 {
 public:
     static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return kEventId; }
+    static constexpr EventId GetEventId() { return Events::LongPress::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::Switch::Id; }
 
     uint8_t newPosition = static_cast<uint8_t>(0);
@@ -13992,7 +13970,6 @@ struct DecodableType
 } // namespace LongPress
 namespace ShortRelease {
 static constexpr PriorityLevel kPriorityLevel = PriorityLevel::Info;
-static constexpr EventId kEventId             = 0x00000003;
 
 enum class Fields
 {
@@ -14003,7 +13980,7 @@ struct Type
 {
 public:
     static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return kEventId; }
+    static constexpr EventId GetEventId() { return Events::ShortRelease::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::Switch::Id; }
 
     uint8_t previousPosition = static_cast<uint8_t>(0);
@@ -14015,7 +13992,7 @@ struct DecodableType
 {
 public:
     static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return kEventId; }
+    static constexpr EventId GetEventId() { return Events::ShortRelease::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::Switch::Id; }
 
     uint8_t previousPosition = static_cast<uint8_t>(0);
@@ -14025,7 +14002,6 @@ struct DecodableType
 } // namespace ShortRelease
 namespace LongRelease {
 static constexpr PriorityLevel kPriorityLevel = PriorityLevel::Info;
-static constexpr EventId kEventId             = 0x00000004;
 
 enum class Fields
 {
@@ -14036,7 +14012,7 @@ struct Type
 {
 public:
     static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return kEventId; }
+    static constexpr EventId GetEventId() { return Events::LongRelease::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::Switch::Id; }
 
     uint8_t previousPosition = static_cast<uint8_t>(0);
@@ -14048,7 +14024,7 @@ struct DecodableType
 {
 public:
     static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return kEventId; }
+    static constexpr EventId GetEventId() { return Events::LongRelease::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::Switch::Id; }
 
     uint8_t previousPosition = static_cast<uint8_t>(0);
@@ -14058,7 +14034,6 @@ struct DecodableType
 } // namespace LongRelease
 namespace MultiPressOngoing {
 static constexpr PriorityLevel kPriorityLevel = PriorityLevel::Info;
-static constexpr EventId kEventId             = 0x00000005;
 
 enum class Fields
 {
@@ -14070,7 +14045,7 @@ struct Type
 {
 public:
     static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return kEventId; }
+    static constexpr EventId GetEventId() { return Events::MultiPressOngoing::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::Switch::Id; }
 
     uint8_t newPosition                   = static_cast<uint8_t>(0);
@@ -14083,7 +14058,7 @@ struct DecodableType
 {
 public:
     static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return kEventId; }
+    static constexpr EventId GetEventId() { return Events::MultiPressOngoing::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::Switch::Id; }
 
     uint8_t newPosition                   = static_cast<uint8_t>(0);
@@ -14094,7 +14069,6 @@ struct DecodableType
 } // namespace MultiPressOngoing
 namespace MultiPressComplete {
 static constexpr PriorityLevel kPriorityLevel = PriorityLevel::Info;
-static constexpr EventId kEventId             = 0x00000006;
 
 enum class Fields
 {
@@ -14106,7 +14080,7 @@ struct Type
 {
 public:
     static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return kEventId; }
+    static constexpr EventId GetEventId() { return Events::MultiPressComplete::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::Switch::Id; }
 
     uint8_t newPosition                 = static_cast<uint8_t>(0);
@@ -14119,7 +14093,7 @@ struct DecodableType
 {
 public:
     static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return kEventId; }
+    static constexpr EventId GetEventId() { return Events::MultiPressComplete::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::Switch::Id; }
 
     uint8_t newPosition                 = static_cast<uint8_t>(0);
@@ -15928,7 +15902,6 @@ struct TypeInfo
 namespace Events {
 namespace StateChange {
 static constexpr PriorityLevel kPriorityLevel = PriorityLevel::Info;
-static constexpr EventId kEventId             = 0x00000000;
 
 enum class Fields
 {
@@ -15939,7 +15912,7 @@ struct Type
 {
 public:
     static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return kEventId; }
+    static constexpr EventId GetEventId() { return Events::StateChange::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::BooleanState::Id; }
 
     bool stateValue = static_cast<bool>(0);
@@ -15951,7 +15924,7 @@ struct DecodableType
 {
 public:
     static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return kEventId; }
+    static constexpr EventId GetEventId() { return Events::StateChange::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::BooleanState::Id; }
 
     bool stateValue = static_cast<bool>(0);
@@ -19255,7 +19228,6 @@ struct TypeInfo
 namespace Events {
 namespace DoorLockAlarm {
 static constexpr PriorityLevel kPriorityLevel = PriorityLevel::Critical;
-static constexpr EventId kEventId             = 0x00000000;
 
 enum class Fields
 {
@@ -19266,7 +19238,7 @@ struct Type
 {
 public:
     static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return kEventId; }
+    static constexpr EventId GetEventId() { return Events::DoorLockAlarm::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; }
 
     DlAlarmCode alarmCode = static_cast<DlAlarmCode>(0);
@@ -19278,7 +19250,7 @@ struct DecodableType
 {
 public:
     static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return kEventId; }
+    static constexpr EventId GetEventId() { return Events::DoorLockAlarm::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; }
 
     DlAlarmCode alarmCode = static_cast<DlAlarmCode>(0);
@@ -19288,7 +19260,6 @@ struct DecodableType
 } // namespace DoorLockAlarm
 namespace DoorStateChange {
 static constexpr PriorityLevel kPriorityLevel = PriorityLevel::Critical;
-static constexpr EventId kEventId             = 0x00000001;
 
 enum class Fields
 {
@@ -19299,7 +19270,7 @@ struct Type
 {
 public:
     static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return kEventId; }
+    static constexpr EventId GetEventId() { return Events::DoorStateChange::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; }
 
     DlDoorState doorState = static_cast<DlDoorState>(0);
@@ -19311,7 +19282,7 @@ struct DecodableType
 {
 public:
     static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return kEventId; }
+    static constexpr EventId GetEventId() { return Events::DoorStateChange::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; }
 
     DlDoorState doorState = static_cast<DlDoorState>(0);
@@ -19321,7 +19292,6 @@ struct DecodableType
 } // namespace DoorStateChange
 namespace LockOperation {
 static constexpr PriorityLevel kPriorityLevel = PriorityLevel::Critical;
-static constexpr EventId kEventId             = 0x00000002;
 
 enum class Fields
 {
@@ -19337,7 +19307,7 @@ struct Type
 {
 public:
     static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return kEventId; }
+    static constexpr EventId GetEventId() { return Events::LockOperation::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; }
 
     DlLockOperationType lockOperationType = static_cast<DlLockOperationType>(0);
@@ -19354,7 +19324,7 @@ struct DecodableType
 {
 public:
     static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return kEventId; }
+    static constexpr EventId GetEventId() { return Events::LockOperation::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; }
 
     DlLockOperationType lockOperationType = static_cast<DlLockOperationType>(0);
@@ -19369,7 +19339,6 @@ struct DecodableType
 } // namespace LockOperation
 namespace LockOperationError {
 static constexpr PriorityLevel kPriorityLevel = PriorityLevel::Critical;
-static constexpr EventId kEventId             = 0x00000003;
 
 enum class Fields
 {
@@ -19386,7 +19355,7 @@ struct Type
 {
 public:
     static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return kEventId; }
+    static constexpr EventId GetEventId() { return Events::LockOperationError::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; }
 
     DlLockOperationType lockOperationType = static_cast<DlLockOperationType>(0);
@@ -19404,7 +19373,7 @@ struct DecodableType
 {
 public:
     static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return kEventId; }
+    static constexpr EventId GetEventId() { return Events::LockOperationError::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; }
 
     DlLockOperationType lockOperationType = static_cast<DlLockOperationType>(0);
@@ -19420,7 +19389,6 @@ struct DecodableType
 } // namespace LockOperationError
 namespace LockUserChange {
 static constexpr PriorityLevel kPriorityLevel = PriorityLevel::Info;
-static constexpr EventId kEventId             = 0x00000004;
 
 enum class Fields
 {
@@ -19437,7 +19405,7 @@ struct Type
 {
 public:
     static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return kEventId; }
+    static constexpr EventId GetEventId() { return Events::LockUserChange::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; }
 
     DlLockDataType lockDataType           = static_cast<DlLockDataType>(0);
@@ -19455,7 +19423,7 @@ struct DecodableType
 {
 public:
     static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return kEventId; }
+    static constexpr EventId GetEventId() { return Events::LockUserChange::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; }
 
     DlLockDataType lockDataType           = static_cast<DlLockDataType>(0);
@@ -20796,7 +20764,6 @@ struct TypeInfo
 namespace Events {
 namespace SupplyVoltageLow {
 static constexpr PriorityLevel kPriorityLevel = PriorityLevel::Info;
-static constexpr EventId kEventId             = 0x00000000;
 
 enum class Fields
 {
@@ -20806,7 +20773,7 @@ struct Type
 {
 public:
     static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return kEventId; }
+    static constexpr EventId GetEventId() { return Events::SupplyVoltageLow::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::PumpConfigurationAndControl::Id; }
 
     CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
@@ -20816,7 +20783,7 @@ struct DecodableType
 {
 public:
     static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return kEventId; }
+    static constexpr EventId GetEventId() { return Events::SupplyVoltageLow::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::PumpConfigurationAndControl::Id; }
 
     CHIP_ERROR Decode(TLV::TLVReader & reader);
@@ -20824,7 +20791,6 @@ struct DecodableType
 } // namespace SupplyVoltageLow
 namespace SupplyVoltageHigh {
 static constexpr PriorityLevel kPriorityLevel = PriorityLevel::Info;
-static constexpr EventId kEventId             = 0x00000001;
 
 enum class Fields
 {
@@ -20834,7 +20800,7 @@ struct Type
 {
 public:
     static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return kEventId; }
+    static constexpr EventId GetEventId() { return Events::SupplyVoltageHigh::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::PumpConfigurationAndControl::Id; }
 
     CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
@@ -20844,7 +20810,7 @@ struct DecodableType
 {
 public:
     static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return kEventId; }
+    static constexpr EventId GetEventId() { return Events::SupplyVoltageHigh::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::PumpConfigurationAndControl::Id; }
 
     CHIP_ERROR Decode(TLV::TLVReader & reader);
@@ -20852,7 +20818,6 @@ struct DecodableType
 } // namespace SupplyVoltageHigh
 namespace PowerMissingPhase {
 static constexpr PriorityLevel kPriorityLevel = PriorityLevel::Info;
-static constexpr EventId kEventId             = 0x00000002;
 
 enum class Fields
 {
@@ -20862,7 +20827,7 @@ struct Type
 {
 public:
     static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return kEventId; }
+    static constexpr EventId GetEventId() { return Events::PowerMissingPhase::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::PumpConfigurationAndControl::Id; }
 
     CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
@@ -20872,7 +20837,7 @@ struct DecodableType
 {
 public:
     static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return kEventId; }
+    static constexpr EventId GetEventId() { return Events::PowerMissingPhase::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::PumpConfigurationAndControl::Id; }
 
     CHIP_ERROR Decode(TLV::TLVReader & reader);
@@ -20880,7 +20845,6 @@ struct DecodableType
 } // namespace PowerMissingPhase
 namespace SystemPressureLow {
 static constexpr PriorityLevel kPriorityLevel = PriorityLevel::Info;
-static constexpr EventId kEventId             = 0x00000003;
 
 enum class Fields
 {
@@ -20890,7 +20854,7 @@ struct Type
 {
 public:
     static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return kEventId; }
+    static constexpr EventId GetEventId() { return Events::SystemPressureLow::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::PumpConfigurationAndControl::Id; }
 
     CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
@@ -20900,7 +20864,7 @@ struct DecodableType
 {
 public:
     static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return kEventId; }
+    static constexpr EventId GetEventId() { return Events::SystemPressureLow::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::PumpConfigurationAndControl::Id; }
 
     CHIP_ERROR Decode(TLV::TLVReader & reader);
@@ -20908,7 +20872,6 @@ struct DecodableType
 } // namespace SystemPressureLow
 namespace SystemPressureHigh {
 static constexpr PriorityLevel kPriorityLevel = PriorityLevel::Info;
-static constexpr EventId kEventId             = 0x00000004;
 
 enum class Fields
 {
@@ -20918,7 +20881,7 @@ struct Type
 {
 public:
     static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return kEventId; }
+    static constexpr EventId GetEventId() { return Events::SystemPressureHigh::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::PumpConfigurationAndControl::Id; }
 
     CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
@@ -20928,7 +20891,7 @@ struct DecodableType
 {
 public:
     static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return kEventId; }
+    static constexpr EventId GetEventId() { return Events::SystemPressureHigh::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::PumpConfigurationAndControl::Id; }
 
     CHIP_ERROR Decode(TLV::TLVReader & reader);
@@ -20936,7 +20899,6 @@ struct DecodableType
 } // namespace SystemPressureHigh
 namespace DryRunning {
 static constexpr PriorityLevel kPriorityLevel = PriorityLevel::Critical;
-static constexpr EventId kEventId             = 0x00000005;
 
 enum class Fields
 {
@@ -20946,7 +20908,7 @@ struct Type
 {
 public:
     static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return kEventId; }
+    static constexpr EventId GetEventId() { return Events::DryRunning::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::PumpConfigurationAndControl::Id; }
 
     CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
@@ -20956,7 +20918,7 @@ struct DecodableType
 {
 public:
     static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return kEventId; }
+    static constexpr EventId GetEventId() { return Events::DryRunning::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::PumpConfigurationAndControl::Id; }
 
     CHIP_ERROR Decode(TLV::TLVReader & reader);
@@ -20964,7 +20926,6 @@ struct DecodableType
 } // namespace DryRunning
 namespace MotorTemperatureHigh {
 static constexpr PriorityLevel kPriorityLevel = PriorityLevel::Info;
-static constexpr EventId kEventId             = 0x00000006;
 
 enum class Fields
 {
@@ -20974,7 +20935,7 @@ struct Type
 {
 public:
     static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return kEventId; }
+    static constexpr EventId GetEventId() { return Events::MotorTemperatureHigh::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::PumpConfigurationAndControl::Id; }
 
     CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
@@ -20984,7 +20945,7 @@ struct DecodableType
 {
 public:
     static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return kEventId; }
+    static constexpr EventId GetEventId() { return Events::MotorTemperatureHigh::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::PumpConfigurationAndControl::Id; }
 
     CHIP_ERROR Decode(TLV::TLVReader & reader);
@@ -20992,7 +20953,6 @@ struct DecodableType
 } // namespace MotorTemperatureHigh
 namespace PumpMotorFatalFailure {
 static constexpr PriorityLevel kPriorityLevel = PriorityLevel::Critical;
-static constexpr EventId kEventId             = 0x00000007;
 
 enum class Fields
 {
@@ -21002,7 +20962,7 @@ struct Type
 {
 public:
     static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return kEventId; }
+    static constexpr EventId GetEventId() { return Events::PumpMotorFatalFailure::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::PumpConfigurationAndControl::Id; }
 
     CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
@@ -21012,7 +20972,7 @@ struct DecodableType
 {
 public:
     static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return kEventId; }
+    static constexpr EventId GetEventId() { return Events::PumpMotorFatalFailure::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::PumpConfigurationAndControl::Id; }
 
     CHIP_ERROR Decode(TLV::TLVReader & reader);
@@ -21020,7 +20980,6 @@ struct DecodableType
 } // namespace PumpMotorFatalFailure
 namespace ElectronicTemperatureHigh {
 static constexpr PriorityLevel kPriorityLevel = PriorityLevel::Info;
-static constexpr EventId kEventId             = 0x00000008;
 
 enum class Fields
 {
@@ -21030,7 +20989,7 @@ struct Type
 {
 public:
     static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return kEventId; }
+    static constexpr EventId GetEventId() { return Events::ElectronicTemperatureHigh::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::PumpConfigurationAndControl::Id; }
 
     CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
@@ -21040,7 +20999,7 @@ struct DecodableType
 {
 public:
     static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return kEventId; }
+    static constexpr EventId GetEventId() { return Events::ElectronicTemperatureHigh::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::PumpConfigurationAndControl::Id; }
 
     CHIP_ERROR Decode(TLV::TLVReader & reader);
@@ -21048,7 +21007,6 @@ struct DecodableType
 } // namespace ElectronicTemperatureHigh
 namespace PumpBlocked {
 static constexpr PriorityLevel kPriorityLevel = PriorityLevel::Critical;
-static constexpr EventId kEventId             = 0x00000009;
 
 enum class Fields
 {
@@ -21058,7 +21016,7 @@ struct Type
 {
 public:
     static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return kEventId; }
+    static constexpr EventId GetEventId() { return Events::PumpBlocked::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::PumpConfigurationAndControl::Id; }
 
     CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
@@ -21068,7 +21026,7 @@ struct DecodableType
 {
 public:
     static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return kEventId; }
+    static constexpr EventId GetEventId() { return Events::PumpBlocked::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::PumpConfigurationAndControl::Id; }
 
     CHIP_ERROR Decode(TLV::TLVReader & reader);
@@ -21076,7 +21034,6 @@ struct DecodableType
 } // namespace PumpBlocked
 namespace SensorFailure {
 static constexpr PriorityLevel kPriorityLevel = PriorityLevel::Info;
-static constexpr EventId kEventId             = 0x0000000A;
 
 enum class Fields
 {
@@ -21086,7 +21043,7 @@ struct Type
 {
 public:
     static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return kEventId; }
+    static constexpr EventId GetEventId() { return Events::SensorFailure::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::PumpConfigurationAndControl::Id; }
 
     CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
@@ -21096,7 +21053,7 @@ struct DecodableType
 {
 public:
     static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return kEventId; }
+    static constexpr EventId GetEventId() { return Events::SensorFailure::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::PumpConfigurationAndControl::Id; }
 
     CHIP_ERROR Decode(TLV::TLVReader & reader);
@@ -21104,7 +21061,6 @@ struct DecodableType
 } // namespace SensorFailure
 namespace ElectronicNonFatalFailure {
 static constexpr PriorityLevel kPriorityLevel = PriorityLevel::Info;
-static constexpr EventId kEventId             = 0x0000000B;
 
 enum class Fields
 {
@@ -21114,7 +21070,7 @@ struct Type
 {
 public:
     static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return kEventId; }
+    static constexpr EventId GetEventId() { return Events::ElectronicNonFatalFailure::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::PumpConfigurationAndControl::Id; }
 
     CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
@@ -21124,7 +21080,7 @@ struct DecodableType
 {
 public:
     static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return kEventId; }
+    static constexpr EventId GetEventId() { return Events::ElectronicNonFatalFailure::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::PumpConfigurationAndControl::Id; }
 
     CHIP_ERROR Decode(TLV::TLVReader & reader);
@@ -21132,7 +21088,6 @@ struct DecodableType
 } // namespace ElectronicNonFatalFailure
 namespace ElectronicFatalFailure {
 static constexpr PriorityLevel kPriorityLevel = PriorityLevel::Critical;
-static constexpr EventId kEventId             = 0x0000000C;
 
 enum class Fields
 {
@@ -21142,7 +21097,7 @@ struct Type
 {
 public:
     static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return kEventId; }
+    static constexpr EventId GetEventId() { return Events::ElectronicFatalFailure::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::PumpConfigurationAndControl::Id; }
 
     CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
@@ -21152,7 +21107,7 @@ struct DecodableType
 {
 public:
     static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return kEventId; }
+    static constexpr EventId GetEventId() { return Events::ElectronicFatalFailure::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::PumpConfigurationAndControl::Id; }
 
     CHIP_ERROR Decode(TLV::TLVReader & reader);
@@ -21160,7 +21115,6 @@ struct DecodableType
 } // namespace ElectronicFatalFailure
 namespace GeneralFault {
 static constexpr PriorityLevel kPriorityLevel = PriorityLevel::Info;
-static constexpr EventId kEventId             = 0x0000000D;
 
 enum class Fields
 {
@@ -21170,7 +21124,7 @@ struct Type
 {
 public:
     static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return kEventId; }
+    static constexpr EventId GetEventId() { return Events::GeneralFault::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::PumpConfigurationAndControl::Id; }
 
     CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
@@ -21180,7 +21134,7 @@ struct DecodableType
 {
 public:
     static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return kEventId; }
+    static constexpr EventId GetEventId() { return Events::GeneralFault::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::PumpConfigurationAndControl::Id; }
 
     CHIP_ERROR Decode(TLV::TLVReader & reader);
@@ -21188,7 +21142,6 @@ struct DecodableType
 } // namespace GeneralFault
 namespace Leakage {
 static constexpr PriorityLevel kPriorityLevel = PriorityLevel::Info;
-static constexpr EventId kEventId             = 0x0000000E;
 
 enum class Fields
 {
@@ -21198,7 +21151,7 @@ struct Type
 {
 public:
     static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return kEventId; }
+    static constexpr EventId GetEventId() { return Events::Leakage::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::PumpConfigurationAndControl::Id; }
 
     CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
@@ -21208,7 +21161,7 @@ struct DecodableType
 {
 public:
     static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return kEventId; }
+    static constexpr EventId GetEventId() { return Events::Leakage::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::PumpConfigurationAndControl::Id; }
 
     CHIP_ERROR Decode(TLV::TLVReader & reader);
@@ -21216,7 +21169,6 @@ struct DecodableType
 } // namespace Leakage
 namespace AirDetection {
 static constexpr PriorityLevel kPriorityLevel = PriorityLevel::Info;
-static constexpr EventId kEventId             = 0x0000000F;
 
 enum class Fields
 {
@@ -21226,7 +21178,7 @@ struct Type
 {
 public:
     static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return kEventId; }
+    static constexpr EventId GetEventId() { return Events::AirDetection::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::PumpConfigurationAndControl::Id; }
 
     CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
@@ -21236,7 +21188,7 @@ struct DecodableType
 {
 public:
     static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return kEventId; }
+    static constexpr EventId GetEventId() { return Events::AirDetection::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::PumpConfigurationAndControl::Id; }
 
     CHIP_ERROR Decode(TLV::TLVReader & reader);
@@ -21244,7 +21196,6 @@ struct DecodableType
 } // namespace AirDetection
 namespace TurbineOperation {
 static constexpr PriorityLevel kPriorityLevel = PriorityLevel::Info;
-static constexpr EventId kEventId             = 0x00000010;
 
 enum class Fields
 {
@@ -21254,7 +21205,7 @@ struct Type
 {
 public:
     static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return kEventId; }
+    static constexpr EventId GetEventId() { return Events::TurbineOperation::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::PumpConfigurationAndControl::Id; }
 
     CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
@@ -21264,7 +21215,7 @@ struct DecodableType
 {
 public:
     static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return kEventId; }
+    static constexpr EventId GetEventId() { return Events::TurbineOperation::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::PumpConfigurationAndControl::Id; }
 
     CHIP_ERROR Decode(TLV::TLVReader & reader);
@@ -36106,7 +36057,6 @@ struct TypeInfo
 namespace Events {
 namespace TestEvent {
 static constexpr PriorityLevel kPriorityLevel = PriorityLevel::Info;
-static constexpr EventId kEventId             = 0x00000001;
 
 enum class Fields
 {
@@ -36122,7 +36072,7 @@ struct Type
 {
 public:
     static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return kEventId; }
+    static constexpr EventId GetEventId() { return Events::TestEvent::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
 
     uint8_t arg1    = static_cast<uint8_t>(0);
@@ -36139,7 +36089,7 @@ struct DecodableType
 {
 public:
     static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return kEventId; }
+    static constexpr EventId GetEventId() { return Events::TestEvent::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::TestCluster::Id; }
 
     uint8_t arg1    = static_cast<uint8_t>(0);
diff --git a/zzz_generated/app-common/app-common/zap-generated/ids/Events.h b/zzz_generated/app-common/app-common/zap-generated/ids/Events.h
new file mode 100644
index 00000000000000..b42a2a5d588ad2
--- /dev/null
+++ b/zzz_generated/app-common/app-common/zap-generated/ids/Events.h
@@ -0,0 +1,312 @@
+/*
+ *
+ *    Copyright (c) 2021 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+// THIS FILE IS GENERATED BY ZAP
+
+#pragma once
+
+#include <app/util/basic-types.h>
+
+namespace chip {
+namespace app {
+namespace Clusters {
+
+namespace AccessControl {
+namespace Events {
+
+namespace AccessControlEntryChanged {
+static constexpr EventId Id = 0x00000000;
+} // namespace AccessControlEntryChanged
+
+namespace AccessControlExtensionChanged {
+static constexpr EventId Id = 0x00000001;
+} // namespace AccessControlExtensionChanged
+
+} // namespace Events
+} // namespace AccessControl
+
+namespace BridgedActions {
+namespace Events {
+
+namespace StateChanged {
+static constexpr EventId Id = 0x00000000;
+} // namespace StateChanged
+
+namespace ActionFailed {
+static constexpr EventId Id = 0x00000001;
+} // namespace ActionFailed
+
+} // namespace Events
+} // namespace BridgedActions
+
+namespace Basic {
+namespace Events {
+
+namespace StartUp {
+static constexpr EventId Id = 0x00000000;
+} // namespace StartUp
+
+namespace ShutDown {
+static constexpr EventId Id = 0x00000001;
+} // namespace ShutDown
+
+namespace Leave {
+static constexpr EventId Id = 0x00000002;
+} // namespace Leave
+
+namespace ReachableChanged {
+static constexpr EventId Id = 0x00000003;
+} // namespace ReachableChanged
+
+} // namespace Events
+} // namespace Basic
+
+namespace OtaSoftwareUpdateRequestor {
+namespace Events {
+
+namespace StateTransition {
+static constexpr EventId Id = 0x00000000;
+} // namespace StateTransition
+
+namespace VersionApplied {
+static constexpr EventId Id = 0x00000001;
+} // namespace VersionApplied
+
+namespace DownloadError {
+static constexpr EventId Id = 0x00000002;
+} // namespace DownloadError
+
+} // namespace Events
+} // namespace OtaSoftwareUpdateRequestor
+
+namespace GeneralDiagnostics {
+namespace Events {
+
+namespace HardwareFaultChange {
+static constexpr EventId Id = 0x00000000;
+} // namespace HardwareFaultChange
+
+namespace RadioFaultChange {
+static constexpr EventId Id = 0x00000001;
+} // namespace RadioFaultChange
+
+namespace NetworkFaultChange {
+static constexpr EventId Id = 0x00000002;
+} // namespace NetworkFaultChange
+
+namespace BootReason {
+static constexpr EventId Id = 0x00000003;
+} // namespace BootReason
+
+} // namespace Events
+} // namespace GeneralDiagnostics
+
+namespace SoftwareDiagnostics {
+namespace Events {
+
+namespace SoftwareFault {
+static constexpr EventId Id = 0x00000000;
+} // namespace SoftwareFault
+
+} // namespace Events
+} // namespace SoftwareDiagnostics
+
+namespace ThreadNetworkDiagnostics {
+namespace Events {
+
+namespace ConnectionStatus {
+static constexpr EventId Id = 0x00000000;
+} // namespace ConnectionStatus
+
+} // namespace Events
+} // namespace ThreadNetworkDiagnostics
+
+namespace WiFiNetworkDiagnostics {
+namespace Events {
+
+namespace Disconnection {
+static constexpr EventId Id = 0x00000000;
+} // namespace Disconnection
+
+namespace AssociationFailure {
+static constexpr EventId Id = 0x00000001;
+} // namespace AssociationFailure
+
+namespace ConnectionStatus {
+static constexpr EventId Id = 0x00000002;
+} // namespace ConnectionStatus
+
+} // namespace Events
+} // namespace WiFiNetworkDiagnostics
+
+namespace Switch {
+namespace Events {
+
+namespace SwitchLatched {
+static constexpr EventId Id = 0x00000000;
+} // namespace SwitchLatched
+
+namespace InitialPress {
+static constexpr EventId Id = 0x00000001;
+} // namespace InitialPress
+
+namespace LongPress {
+static constexpr EventId Id = 0x00000002;
+} // namespace LongPress
+
+namespace ShortRelease {
+static constexpr EventId Id = 0x00000003;
+} // namespace ShortRelease
+
+namespace LongRelease {
+static constexpr EventId Id = 0x00000004;
+} // namespace LongRelease
+
+namespace MultiPressOngoing {
+static constexpr EventId Id = 0x00000005;
+} // namespace MultiPressOngoing
+
+namespace MultiPressComplete {
+static constexpr EventId Id = 0x00000006;
+} // namespace MultiPressComplete
+
+} // namespace Events
+} // namespace Switch
+
+namespace BooleanState {
+namespace Events {
+
+namespace StateChange {
+static constexpr EventId Id = 0x00000000;
+} // namespace StateChange
+
+} // namespace Events
+} // namespace BooleanState
+
+namespace DoorLock {
+namespace Events {
+
+namespace DoorLockAlarm {
+static constexpr EventId Id = 0x00000000;
+} // namespace DoorLockAlarm
+
+namespace DoorStateChange {
+static constexpr EventId Id = 0x00000001;
+} // namespace DoorStateChange
+
+namespace LockOperation {
+static constexpr EventId Id = 0x00000002;
+} // namespace LockOperation
+
+namespace LockOperationError {
+static constexpr EventId Id = 0x00000003;
+} // namespace LockOperationError
+
+namespace LockUserChange {
+static constexpr EventId Id = 0x00000004;
+} // namespace LockUserChange
+
+} // namespace Events
+} // namespace DoorLock
+
+namespace PumpConfigurationAndControl {
+namespace Events {
+
+namespace SupplyVoltageLow {
+static constexpr EventId Id = 0x00000000;
+} // namespace SupplyVoltageLow
+
+namespace SupplyVoltageHigh {
+static constexpr EventId Id = 0x00000001;
+} // namespace SupplyVoltageHigh
+
+namespace PowerMissingPhase {
+static constexpr EventId Id = 0x00000002;
+} // namespace PowerMissingPhase
+
+namespace SystemPressureLow {
+static constexpr EventId Id = 0x00000003;
+} // namespace SystemPressureLow
+
+namespace SystemPressureHigh {
+static constexpr EventId Id = 0x00000004;
+} // namespace SystemPressureHigh
+
+namespace DryRunning {
+static constexpr EventId Id = 0x00000005;
+} // namespace DryRunning
+
+namespace MotorTemperatureHigh {
+static constexpr EventId Id = 0x00000006;
+} // namespace MotorTemperatureHigh
+
+namespace PumpMotorFatalFailure {
+static constexpr EventId Id = 0x00000007;
+} // namespace PumpMotorFatalFailure
+
+namespace ElectronicTemperatureHigh {
+static constexpr EventId Id = 0x00000008;
+} // namespace ElectronicTemperatureHigh
+
+namespace PumpBlocked {
+static constexpr EventId Id = 0x00000009;
+} // namespace PumpBlocked
+
+namespace SensorFailure {
+static constexpr EventId Id = 0x0000000A;
+} // namespace SensorFailure
+
+namespace ElectronicNonFatalFailure {
+static constexpr EventId Id = 0x0000000B;
+} // namespace ElectronicNonFatalFailure
+
+namespace ElectronicFatalFailure {
+static constexpr EventId Id = 0x0000000C;
+} // namespace ElectronicFatalFailure
+
+namespace GeneralFault {
+static constexpr EventId Id = 0x0000000D;
+} // namespace GeneralFault
+
+namespace Leakage {
+static constexpr EventId Id = 0x0000000E;
+} // namespace Leakage
+
+namespace AirDetection {
+static constexpr EventId Id = 0x0000000F;
+} // namespace AirDetection
+
+namespace TurbineOperation {
+static constexpr EventId Id = 0x00000010;
+} // namespace TurbineOperation
+
+} // namespace Events
+} // namespace PumpConfigurationAndControl
+
+namespace TestCluster {
+namespace Events {
+
+namespace TestEvent {
+static constexpr EventId Id = 0x00000001;
+} // namespace TestEvent
+
+} // namespace Events
+} // namespace TestCluster
+
+} // namespace Clusters
+} // namespace app
+} // namespace chip