project-chip · mergify · Nov 6, 2025 · Nov 6, 2025
diff --git a/scripts/py_matter_idl/matter/idl/generators/cpp/sdk/Ids.h.jinja b/scripts/py_matter_idl/matter/idl/generators/cpp/sdk/Ids.h.jinja
@@ -1,11 +1,10 @@
 // DO NOT EDIT MANUALLY - Generated file
 //
-// Identifier constant values for cluster {{cluster.name}} (cluster code: {{"%d/0x04%X" | format(cluster.code, cluster.code)}})
+// Identifier constant values for cluster {{cluster.name}} (cluster code: {{"%d/0x%04X" | format(cluster.code, cluster.code)}})
 // based on {{input_name}}
 #pragma once
 
 #include <clusters/{{cluster.name}}/AttributeIds.h>
 #include <clusters/{{cluster.name}}/ClusterId.h>
 #include <clusters/{{cluster.name}}/CommandIds.h>
 #include <clusters/{{cluster.name}}/EventIds.h>
-
diff --git a/zzz_generated/app-common/clusters/AccessControl/Ids.h b/zzz_generated/app-common/clusters/AccessControl/Ids.h
@@ -1,6 +1,6 @@
 // DO NOT EDIT MANUALLY - Generated file
 //
-// Identifier constant values for cluster AccessControl (cluster code: 31/0x041F)
+// Identifier constant values for cluster AccessControl (cluster code: 31/0x001F)
 // based on src/controller/data_model/controller-clusters.matter
 #pragma once
 

diff --git a/zzz_generated/app-common/clusters/AccountLogin/Ids.h b/zzz_generated/app-common/clusters/AccountLogin/Ids.h
@@ -1,6 +1,6 @@
 // DO NOT EDIT MANUALLY - Generated file
 //
-// Identifier constant values for cluster AccountLogin (cluster code: 1294/0x0450E)
+// Identifier constant values for cluster AccountLogin (cluster code: 1294/0x050E)
 // based on src/controller/data_model/controller-clusters.matter
 #pragma once
 

diff --git a/zzz_generated/app-common/clusters/Actions/Ids.h b/zzz_generated/app-common/clusters/Actions/Ids.h
@@ -1,6 +1,6 @@
 // DO NOT EDIT MANUALLY - Generated file
 //
-// Identifier constant values for cluster Actions (cluster code: 37/0x0425)
+// Identifier constant values for cluster Actions (cluster code: 37/0x0025)
 // based on src/controller/data_model/controller-clusters.matter
 #pragma once
 

diff --git a/zzz_generated/app-common/clusters/ActivatedCarbonFilterMonitoring/Ids.h b/zzz_generated/app-common/clusters/ActivatedCarbonFilterMonitoring/Ids.h
@@ -1,6 +1,6 @@
 // DO NOT EDIT MANUALLY - Generated file
 //
-// Identifier constant values for cluster ActivatedCarbonFilterMonitoring (cluster code: 114/0x0472)
+// Identifier constant values for cluster ActivatedCarbonFilterMonitoring (cluster code: 114/0x0072)
 // based on src/controller/data_model/controller-clusters.matter
 #pragma once
 

diff --git a/zzz_generated/app-common/clusters/AdministratorCommissioning/Ids.h b/zzz_generated/app-common/clusters/AdministratorCommissioning/Ids.h
@@ -1,6 +1,6 @@
 // DO NOT EDIT MANUALLY - Generated file
 //
-// Identifier constant values for cluster AdministratorCommissioning (cluster code: 60/0x043C)
+// Identifier constant values for cluster AdministratorCommissioning (cluster code: 60/0x003C)
 // based on src/controller/data_model/controller-clusters.matter
 #pragma once
 

diff --git a/zzz_generated/app-common/clusters/AirQuality/Ids.h b/zzz_generated/app-common/clusters/AirQuality/Ids.h
@@ -1,6 +1,6 @@
 // DO NOT EDIT MANUALLY - Generated file
 //
-// Identifier constant values for cluster AirQuality (cluster code: 91/0x045B)
+// Identifier constant values for cluster AirQuality (cluster code: 91/0x005B)
 // based on src/controller/data_model/controller-clusters.matter
 #pragma once
 

diff --git a/zzz_generated/app-common/clusters/ApplicationBasic/Ids.h b/zzz_generated/app-common/clusters/ApplicationBasic/Ids.h
@@ -1,6 +1,6 @@
 // DO NOT EDIT MANUALLY - Generated file
 //
-// Identifier constant values for cluster ApplicationBasic (cluster code: 1293/0x0450D)
+// Identifier constant values for cluster ApplicationBasic (cluster code: 1293/0x050D)
 // based on src/controller/data_model/controller-clusters.matter
 #pragma once
 

diff --git a/zzz_generated/app-common/clusters/ApplicationLauncher/Ids.h b/zzz_generated/app-common/clusters/ApplicationLauncher/Ids.h
@@ -1,6 +1,6 @@
 // DO NOT EDIT MANUALLY - Generated file
 //
-// Identifier constant values for cluster ApplicationLauncher (cluster code: 1292/0x0450C)
+// Identifier constant values for cluster ApplicationLauncher (cluster code: 1292/0x050C)
 // based on src/controller/data_model/controller-clusters.matter
 #pragma once
 

diff --git a/zzz_generated/app-common/clusters/AudioOutput/Ids.h b/zzz_generated/app-common/clusters/AudioOutput/Ids.h
@@ -1,6 +1,6 @@
 // DO NOT EDIT MANUALLY - Generated file
 //
-// Identifier constant values for cluster AudioOutput (cluster code: 1291/0x0450B)
+// Identifier constant values for cluster AudioOutput (cluster code: 1291/0x050B)
 // based on src/controller/data_model/controller-clusters.matter
 #pragma once
 

diff --git a/zzz_generated/app-common/clusters/BallastConfiguration/Ids.h b/zzz_generated/app-common/clusters/BallastConfiguration/Ids.h
@@ -1,6 +1,6 @@
 // DO NOT EDIT MANUALLY - Generated file
 //
-// Identifier constant values for cluster BallastConfiguration (cluster code: 769/0x04301)
+// Identifier constant values for cluster BallastConfiguration (cluster code: 769/0x0301)
 // based on src/controller/data_model/controller-clusters.matter
 #pragma once
 

diff --git a/zzz_generated/app-common/clusters/BasicInformation/Ids.h b/zzz_generated/app-common/clusters/BasicInformation/Ids.h
@@ -1,6 +1,6 @@
 // DO NOT EDIT MANUALLY - Generated file
 //
-// Identifier constant values for cluster BasicInformation (cluster code: 40/0x0428)
+// Identifier constant values for cluster BasicInformation (cluster code: 40/0x0028)
 // based on src/controller/data_model/controller-clusters.matter
 #pragma once
 

diff --git a/zzz_generated/app-common/clusters/Binding/Ids.h b/zzz_generated/app-common/clusters/Binding/Ids.h
@@ -1,6 +1,6 @@
 // DO NOT EDIT MANUALLY - Generated file
 //
-// Identifier constant values for cluster Binding (cluster code: 30/0x041E)
+// Identifier constant values for cluster Binding (cluster code: 30/0x001E)
 // based on src/controller/data_model/controller-clusters.matter
 #pragma once
 

diff --git a/zzz_generated/app-common/clusters/BooleanState/Ids.h b/zzz_generated/app-common/clusters/BooleanState/Ids.h
@@ -1,6 +1,6 @@
 // DO NOT EDIT MANUALLY - Generated file
 //
-// Identifier constant values for cluster BooleanState (cluster code: 69/0x0445)
+// Identifier constant values for cluster BooleanState (cluster code: 69/0x0045)
 // based on src/controller/data_model/controller-clusters.matter
 #pragma once
 

diff --git a/zzz_generated/app-common/clusters/BooleanStateConfiguration/Ids.h b/zzz_generated/app-common/clusters/BooleanStateConfiguration/Ids.h
@@ -1,6 +1,6 @@
 // DO NOT EDIT MANUALLY - Generated file
 //
-// Identifier constant values for cluster BooleanStateConfiguration (cluster code: 128/0x0480)
+// Identifier constant values for cluster BooleanStateConfiguration (cluster code: 128/0x0080)
 // based on src/controller/data_model/controller-clusters.matter
 #pragma once
 

diff --git a/zzz_generated/app-common/clusters/BridgedDeviceBasicInformation/Ids.h b/zzz_generated/app-common/clusters/BridgedDeviceBasicInformation/Ids.h
@@ -1,6 +1,6 @@
 // DO NOT EDIT MANUALLY - Generated file
 //
-// Identifier constant values for cluster BridgedDeviceBasicInformation (cluster code: 57/0x0439)
+// Identifier constant values for cluster BridgedDeviceBasicInformation (cluster code: 57/0x0039)
 // based on src/controller/data_model/controller-clusters.matter
 #pragma once
 

diff --git a/zzz_generated/app-common/clusters/CameraAvSettingsUserLevelManagement/Ids.h b/zzz_generated/app-common/clusters/CameraAvSettingsUserLevelManagement/Ids.h
@@ -1,6 +1,6 @@
 // DO NOT EDIT MANUALLY - Generated file
 //
-// Identifier constant values for cluster CameraAvSettingsUserLevelManagement (cluster code: 1362/0x04552)
+// Identifier constant values for cluster CameraAvSettingsUserLevelManagement (cluster code: 1362/0x0552)
 // based on src/controller/data_model/controller-clusters.matter
 #pragma once
 

diff --git a/zzz_generated/app-common/clusters/CameraAvStreamManagement/Ids.h b/zzz_generated/app-common/clusters/CameraAvStreamManagement/Ids.h
@@ -1,6 +1,6 @@
 // DO NOT EDIT MANUALLY - Generated file
 //
-// Identifier constant values for cluster CameraAvStreamManagement (cluster code: 1361/0x04551)
+// Identifier constant values for cluster CameraAvStreamManagement (cluster code: 1361/0x0551)
 // based on src/controller/data_model/controller-clusters.matter
 #pragma once
 

diff --git a/zzz_generated/app-common/clusters/CarbonDioxideConcentrationMeasurement/Ids.h b/zzz_generated/app-common/clusters/CarbonDioxideConcentrationMeasurement/Ids.h
@@ -1,6 +1,6 @@
 // DO NOT EDIT MANUALLY - Generated file
 //
-// Identifier constant values for cluster CarbonDioxideConcentrationMeasurement (cluster code: 1037/0x0440D)
+// Identifier constant values for cluster CarbonDioxideConcentrationMeasurement (cluster code: 1037/0x040D)
 // based on src/controller/data_model/controller-clusters.matter
 #pragma once
 

diff --git a/zzz_generated/app-common/clusters/CarbonMonoxideConcentrationMeasurement/Ids.h b/zzz_generated/app-common/clusters/CarbonMonoxideConcentrationMeasurement/Ids.h
@@ -1,6 +1,6 @@
 // DO NOT EDIT MANUALLY - Generated file
 //
-// Identifier constant values for cluster CarbonMonoxideConcentrationMeasurement (cluster code: 1036/0x0440C)
+// Identifier constant values for cluster CarbonMonoxideConcentrationMeasurement (cluster code: 1036/0x040C)
 // based on src/controller/data_model/controller-clusters.matter
 #pragma once
 

diff --git a/zzz_generated/app-common/clusters/Channel/Ids.h b/zzz_generated/app-common/clusters/Channel/Ids.h
@@ -1,6 +1,6 @@
 // DO NOT EDIT MANUALLY - Generated file
 //
-// Identifier constant values for cluster Channel (cluster code: 1284/0x04504)
+// Identifier constant values for cluster Channel (cluster code: 1284/0x0504)
 // based on src/controller/data_model/controller-clusters.matter
 #pragma once
 

diff --git a/zzz_generated/app-common/clusters/Chime/Ids.h b/zzz_generated/app-common/clusters/Chime/Ids.h
@@ -1,6 +1,6 @@
 // DO NOT EDIT MANUALLY - Generated file
 //
-// Identifier constant values for cluster Chime (cluster code: 1366/0x04556)
+// Identifier constant values for cluster Chime (cluster code: 1366/0x0556)
 // based on src/controller/data_model/controller-clusters.matter
 #pragma once
 

diff --git a/zzz_generated/app-common/clusters/ClosureControl/Ids.h b/zzz_generated/app-common/clusters/ClosureControl/Ids.h
@@ -1,6 +1,6 @@
 // DO NOT EDIT MANUALLY - Generated file
 //
-// Identifier constant values for cluster ClosureControl (cluster code: 260/0x04104)
+// Identifier constant values for cluster ClosureControl (cluster code: 260/0x0104)
 // based on src/controller/data_model/controller-clusters.matter
 #pragma once
 

diff --git a/zzz_generated/app-common/clusters/ClosureDimension/Ids.h b/zzz_generated/app-common/clusters/ClosureDimension/Ids.h
@@ -1,6 +1,6 @@
 // DO NOT EDIT MANUALLY - Generated file
 //
-// Identifier constant values for cluster ClosureDimension (cluster code: 261/0x04105)
+// Identifier constant values for cluster ClosureDimension (cluster code: 261/0x0105)
 // based on src/controller/data_model/controller-clusters.matter
 #pragma once
 

diff --git a/zzz_generated/app-common/clusters/ColorControl/Ids.h b/zzz_generated/app-common/clusters/ColorControl/Ids.h
@@ -1,6 +1,6 @@
 // DO NOT EDIT MANUALLY - Generated file
 //
-// Identifier constant values for cluster ColorControl (cluster code: 768/0x04300)
+// Identifier constant values for cluster ColorControl (cluster code: 768/0x0300)
 // based on src/controller/data_model/controller-clusters.matter
 #pragma once
 

diff --git a/zzz_generated/app-common/clusters/CommissionerControl/Ids.h b/zzz_generated/app-common/clusters/CommissionerControl/Ids.h
@@ -1,6 +1,6 @@
 // DO NOT EDIT MANUALLY - Generated file
 //
-// Identifier constant values for cluster CommissionerControl (cluster code: 1873/0x04751)
+// Identifier constant values for cluster CommissionerControl (cluster code: 1873/0x0751)
 // based on src/controller/data_model/controller-clusters.matter
 #pragma once
 

diff --git a/zzz_generated/app-common/clusters/CommodityMetering/Ids.h b/zzz_generated/app-common/clusters/CommodityMetering/Ids.h
@@ -1,6 +1,6 @@
 // DO NOT EDIT MANUALLY - Generated file
 //
-// Identifier constant values for cluster CommodityMetering (cluster code: 2823/0x04B07)
+// Identifier constant values for cluster CommodityMetering (cluster code: 2823/0x0B07)
 // based on src/controller/data_model/controller-clusters.matter
 #pragma once
 

diff --git a/zzz_generated/app-common/clusters/CommodityPrice/Ids.h b/zzz_generated/app-common/clusters/CommodityPrice/Ids.h
@@ -1,6 +1,6 @@
 // DO NOT EDIT MANUALLY - Generated file
 //
-// Identifier constant values for cluster CommodityPrice (cluster code: 149/0x0495)
+// Identifier constant values for cluster CommodityPrice (cluster code: 149/0x0095)
 // based on src/controller/data_model/controller-clusters.matter
 #pragma once
 

diff --git a/zzz_generated/app-common/clusters/CommodityTariff/Ids.h b/zzz_generated/app-common/clusters/CommodityTariff/Ids.h
@@ -1,6 +1,6 @@
 // DO NOT EDIT MANUALLY - Generated file
 //
-// Identifier constant values for cluster CommodityTariff (cluster code: 1792/0x04700)
+// Identifier constant values for cluster CommodityTariff (cluster code: 1792/0x0700)
 // based on src/controller/data_model/controller-clusters.matter
 #pragma once
 

diff --git a/zzz_generated/app-common/clusters/ContentAppObserver/Ids.h b/zzz_generated/app-common/clusters/ContentAppObserver/Ids.h
@@ -1,6 +1,6 @@
 // DO NOT EDIT MANUALLY - Generated file
 //
-// Identifier constant values for cluster ContentAppObserver (cluster code: 1296/0x04510)
+// Identifier constant values for cluster ContentAppObserver (cluster code: 1296/0x0510)
 // based on src/controller/data_model/controller-clusters.matter
 #pragma once
 

diff --git a/zzz_generated/app-common/clusters/ContentControl/Ids.h b/zzz_generated/app-common/clusters/ContentControl/Ids.h
@@ -1,6 +1,6 @@
 // DO NOT EDIT MANUALLY - Generated file
 //
-// Identifier constant values for cluster ContentControl (cluster code: 1295/0x0450F)
+// Identifier constant values for cluster ContentControl (cluster code: 1295/0x050F)
 // based on src/controller/data_model/controller-clusters.matter
 #pragma once
 

diff --git a/zzz_generated/app-common/clusters/ContentLauncher/Ids.h b/zzz_generated/app-common/clusters/ContentLauncher/Ids.h
@@ -1,6 +1,6 @@
 // DO NOT EDIT MANUALLY - Generated file
 //
-// Identifier constant values for cluster ContentLauncher (cluster code: 1290/0x0450A)
+// Identifier constant values for cluster ContentLauncher (cluster code: 1290/0x050A)
 // based on src/controller/data_model/controller-clusters.matter
 #pragma once
 

diff --git a/zzz_generated/app-common/clusters/Descriptor/Ids.h b/zzz_generated/app-common/clusters/Descriptor/Ids.h
@@ -1,6 +1,6 @@
 // DO NOT EDIT MANUALLY - Generated file
 //
-// Identifier constant values for cluster Descriptor (cluster code: 29/0x041D)
+// Identifier constant values for cluster Descriptor (cluster code: 29/0x001D)
 // based on src/controller/data_model/controller-clusters.matter
 #pragma once
 

diff --git a/zzz_generated/app-common/clusters/DeviceEnergyManagement/Ids.h b/zzz_generated/app-common/clusters/DeviceEnergyManagement/Ids.h
@@ -1,6 +1,6 @@
 // DO NOT EDIT MANUALLY - Generated file
 //
-// Identifier constant values for cluster DeviceEnergyManagement (cluster code: 152/0x0498)
+// Identifier constant values for cluster DeviceEnergyManagement (cluster code: 152/0x0098)
 // based on src/controller/data_model/controller-clusters.matter
 #pragma once
 

diff --git a/zzz_generated/app-common/clusters/DeviceEnergyManagementMode/Ids.h b/zzz_generated/app-common/clusters/DeviceEnergyManagementMode/Ids.h
@@ -1,6 +1,6 @@
 // DO NOT EDIT MANUALLY - Generated file
 //
-// Identifier constant values for cluster DeviceEnergyManagementMode (cluster code: 159/0x049F)
+// Identifier constant values for cluster DeviceEnergyManagementMode (cluster code: 159/0x009F)
 // based on src/controller/data_model/controller-clusters.matter
 #pragma once
 

diff --git a/zzz_generated/app-common/clusters/DiagnosticLogs/Ids.h b/zzz_generated/app-common/clusters/DiagnosticLogs/Ids.h
@@ -1,6 +1,6 @@
 // DO NOT EDIT MANUALLY - Generated file
 //
-// Identifier constant values for cluster DiagnosticLogs (cluster code: 50/0x0432)
+// Identifier constant values for cluster DiagnosticLogs (cluster code: 50/0x0032)
 // based on src/controller/data_model/controller-clusters.matter
 #pragma once
 

diff --git a/zzz_generated/app-common/clusters/DishwasherAlarm/Ids.h b/zzz_generated/app-common/clusters/DishwasherAlarm/Ids.h
@@ -1,6 +1,6 @@
 // DO NOT EDIT MANUALLY - Generated file
 //
-// Identifier constant values for cluster DishwasherAlarm (cluster code: 93/0x045D)
+// Identifier constant values for cluster DishwasherAlarm (cluster code: 93/0x005D)
 // based on src/controller/data_model/controller-clusters.matter
 #pragma once
 

diff --git a/zzz_generated/app-common/clusters/DishwasherMode/Ids.h b/zzz_generated/app-common/clusters/DishwasherMode/Ids.h
@@ -1,6 +1,6 @@
 // DO NOT EDIT MANUALLY - Generated file
 //
-// Identifier constant values for cluster DishwasherMode (cluster code: 89/0x0459)
+// Identifier constant values for cluster DishwasherMode (cluster code: 89/0x0059)
 // based on src/controller/data_model/controller-clusters.matter
 #pragma once
 

diff --git a/zzz_generated/app-common/clusters/DoorLock/Ids.h b/zzz_generated/app-common/clusters/DoorLock/Ids.h
@@ -1,6 +1,6 @@
 // DO NOT EDIT MANUALLY - Generated file
 //
-// Identifier constant values for cluster DoorLock (cluster code: 257/0x04101)
+// Identifier constant values for cluster DoorLock (cluster code: 257/0x0101)
 // based on src/controller/data_model/controller-clusters.matter
 #pragma once
 

diff --git a/zzz_generated/app-common/clusters/EcosystemInformation/Ids.h b/zzz_generated/app-common/clusters/EcosystemInformation/Ids.h
@@ -1,6 +1,6 @@
 // DO NOT EDIT MANUALLY - Generated file
 //
-// Identifier constant values for cluster EcosystemInformation (cluster code: 1872/0x04750)
+// Identifier constant values for cluster EcosystemInformation (cluster code: 1872/0x0750)
 // based on src/controller/data_model/controller-clusters.matter
 #pragma once
 

diff --git a/zzz_generated/app-common/clusters/ElectricalEnergyMeasurement/Ids.h b/zzz_generated/app-common/clusters/ElectricalEnergyMeasurement/Ids.h
@@ -1,6 +1,6 @@
 // DO NOT EDIT MANUALLY - Generated file
 //
-// Identifier constant values for cluster ElectricalEnergyMeasurement (cluster code: 145/0x0491)
+// Identifier constant values for cluster ElectricalEnergyMeasurement (cluster code: 145/0x0091)
 // based on src/controller/data_model/controller-clusters.matter
 #pragma once
 

diff --git a/zzz_generated/app-common/clusters/ElectricalGridConditions/Ids.h b/zzz_generated/app-common/clusters/ElectricalGridConditions/Ids.h
@@ -1,6 +1,6 @@
 // DO NOT EDIT MANUALLY - Generated file
 //
-// Identifier constant values for cluster ElectricalGridConditions (cluster code: 160/0x04A0)
+// Identifier constant values for cluster ElectricalGridConditions (cluster code: 160/0x00A0)
 // based on src/controller/data_model/controller-clusters.matter
 #pragma once
 

diff --git a/zzz_generated/app-common/clusters/ElectricalPowerMeasurement/Ids.h b/zzz_generated/app-common/clusters/ElectricalPowerMeasurement/Ids.h
@@ -1,6 +1,6 @@
 // DO NOT EDIT MANUALLY - Generated file
 //
-// Identifier constant values for cluster ElectricalPowerMeasurement (cluster code: 144/0x0490)
+// Identifier constant values for cluster ElectricalPowerMeasurement (cluster code: 144/0x0090)
 // based on src/controller/data_model/controller-clusters.matter
 #pragma once
 

diff --git a/zzz_generated/app-common/clusters/EnergyEvse/Ids.h b/zzz_generated/app-common/clusters/EnergyEvse/Ids.h
@@ -1,6 +1,6 @@
 // DO NOT EDIT MANUALLY - Generated file
 //
-// Identifier constant values for cluster EnergyEvse (cluster code: 153/0x0499)
+// Identifier constant values for cluster EnergyEvse (cluster code: 153/0x0099)
 // based on src/controller/data_model/controller-clusters.matter
 #pragma once
 

diff --git a/zzz_generated/app-common/clusters/EnergyEvseMode/Ids.h b/zzz_generated/app-common/clusters/EnergyEvseMode/Ids.h
@@ -1,6 +1,6 @@
 // DO NOT EDIT MANUALLY - Generated file
 //
-// Identifier constant values for cluster EnergyEvseMode (cluster code: 157/0x049D)
+// Identifier constant values for cluster EnergyEvseMode (cluster code: 157/0x009D)
 // based on src/controller/data_model/controller-clusters.matter
 #pragma once
 

diff --git a/zzz_generated/app-common/clusters/EnergyPreference/Ids.h b/zzz_generated/app-common/clusters/EnergyPreference/Ids.h
@@ -1,6 +1,6 @@
 // DO NOT EDIT MANUALLY - Generated file
 //
-// Identifier constant values for cluster EnergyPreference (cluster code: 155/0x049B)
+// Identifier constant values for cluster EnergyPreference (cluster code: 155/0x009B)
 // based on src/controller/data_model/controller-clusters.matter
 #pragma once
 

diff --git a/zzz_generated/app-common/clusters/EthernetNetworkDiagnostics/Ids.h b/zzz_generated/app-common/clusters/EthernetNetworkDiagnostics/Ids.h
@@ -1,6 +1,6 @@
 // DO NOT EDIT MANUALLY - Generated file
 //
-// Identifier constant values for cluster EthernetNetworkDiagnostics (cluster code: 55/0x0437)
+// Identifier constant values for cluster EthernetNetworkDiagnostics (cluster code: 55/0x0037)
 // based on src/controller/data_model/controller-clusters.matter
 #pragma once
 

diff --git a/zzz_generated/app-common/clusters/FanControl/Ids.h b/zzz_generated/app-common/clusters/FanControl/Ids.h
@@ -1,6 +1,6 @@
 // DO NOT EDIT MANUALLY - Generated file
 //
-// Identifier constant values for cluster FanControl (cluster code: 514/0x04202)
+// Identifier constant values for cluster FanControl (cluster code: 514/0x0202)
 // based on src/controller/data_model/controller-clusters.matter
 #pragma once
 

diff --git a/zzz_generated/app-common/clusters/FaultInjection/Ids.h b/zzz_generated/app-common/clusters/FaultInjection/Ids.h
@@ -1,6 +1,6 @@
 // DO NOT EDIT MANUALLY - Generated file
 //
-// Identifier constant values for cluster FaultInjection (cluster code: 4294048774/0x04FFF1FC06)
+// Identifier constant values for cluster FaultInjection (cluster code: 4294048774/0xFFF1FC06)
 // based on src/controller/data_model/controller-clusters.matter
 #pragma once