diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index 5caf143d66436e..f4163ca2f77c4e 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -182,7 +182,7 @@ jobs:
                       src/app/zap-templates/zcl/data-model/silabs/zll.xml \
                     "
             - name: Build Apps
-              timeout-minutes: 45
+              timeout-minutes: 60
               run: |
                   scripts/run_in_build_env.sh './scripts/build_python.sh --install_wheel build-env'
                   ./scripts/run_in_build_env.sh \
diff --git a/.pullapprove.yml b/.pullapprove.yml
index 3b0e577c2f7b32..74eee17032a03e 100644
--- a/.pullapprove.yml
+++ b/.pullapprove.yml
@@ -160,6 +160,14 @@ groups:
             teams: [reviewers-silabs]
         reviews:
             request: 10
+    shared-reviewers-somfy:
+        type: optional
+        conditions:
+            - files.include('*')
+        reviewers:
+            teams: [reviewers-somfy]
+        reviews:
+            request: 10
     shared-reviewers-tcl:
         type: optional
         conditions:
diff --git a/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter b/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
index 60dcee96599899..18ca22ae62fa7c 100644
--- a/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
+++ b/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
@@ -215,6 +215,53 @@ server cluster Scenes = 5 {
   fabric command GetSceneMembership(GetSceneMembershipRequest): GetSceneMembershipResponse = 6;
 }
 
+client cluster OnOff = 6 {
+  enum OnOffDelayedAllOffEffectVariant : ENUM8 {
+    kFadeToOffIn0p8Seconds = 0;
+    kNoFade = 1;
+    k50PercentDimDownIn0p8SecondsThenFadeToOffIn12Seconds = 2;
+  }
+
+  enum OnOffDyingLightEffectVariant : ENUM8 {
+    k20PercenterDimUpIn0p5SecondsThenFadeToOffIn1Second = 0;
+  }
+
+  enum OnOffEffectIdentifier : ENUM8 {
+    kDelayedAllOff = 0;
+    kDyingLight = 1;
+  }
+
+  enum OnOffStartUpOnOff : ENUM8 {
+    kOff = 0;
+    kOn = 1;
+    kTogglePreviousOnOff = 2;
+  }
+
+  bitmap OnOffControl : BITMAP8 {
+    kAcceptOnlyWhenOn = 0x1;
+  }
+
+  bitmap OnOffFeature : BITMAP32 {
+    kLighting = 0x1;
+  }
+
+  bitmap SceneFeatures : BITMAP32 {
+    kSceneNames = 0x1;
+  }
+
+  readonly attribute boolean onOff = 0;
+  readonly attribute boolean globalSceneControl = 16384;
+  attribute int16u onTime = 16385;
+  attribute int16u offWaitTime = 16386;
+  attribute access(write: manage) nullable OnOffStartUpOnOff startUpOnOff = 16387;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  command Off(): DefaultSuccess = 0;
+  command On(): DefaultSuccess = 1;
+  command Toggle(): DefaultSuccess = 2;
+}
+
 server cluster OnOff = 6 {
   enum OnOffDelayedAllOffEffectVariant : ENUM8 {
     kFadeToOffIn0p8Seconds = 0;
@@ -1123,7 +1170,7 @@ server cluster GeneralDiagnostics = 51 {
     kSoftwareReset = 6;
   }
 
-  enum HardwareFault : ENUM8 {
+  enum HardwareFaultEnum : ENUM8 {
     kUnspecified = 0;
     kRadio = 1;
     kSensor = 2;
@@ -1137,7 +1184,7 @@ server cluster GeneralDiagnostics = 51 {
     kTamperDetected = 10;
   }
 
-  enum InterfaceType : ENUM8 {
+  enum InterfaceTypeEnum : ENUM8 {
     kUnspecified = 0;
     kWiFi = 1;
     kEthernet = 2;
@@ -1145,14 +1192,14 @@ server cluster GeneralDiagnostics = 51 {
     kThread = 4;
   }
 
-  enum NetworkFaultType : ENUM8 {
+  enum NetworkFaultEnum : ENUM8 {
     kUnspecified = 0;
     kHardwareFailure = 1;
     kNetworkJammed = 2;
     kConnectionFailed = 3;
   }
 
-  enum RadioFault : ENUM8 {
+  enum RadioFaultEnum : ENUM8 {
     kUnspecified = 0;
     kWiFiFault = 1;
     kCellularFault = 2;
@@ -1170,22 +1217,22 @@ server cluster GeneralDiagnostics = 51 {
     octet_string<8> hardwareAddress = 4;
     octet_string IPv4Addresses[] = 5;
     octet_string IPv6Addresses[] = 6;
-    InterfaceType type = 7;
+    InterfaceTypeEnum type = 7;
   }
 
   critical event HardwareFaultChange = 0 {
-    HardwareFault current[] = 0;
-    HardwareFault previous[] = 1;
+    HardwareFaultEnum current[] = 0;
+    HardwareFaultEnum previous[] = 1;
   }
 
   critical event RadioFaultChange = 1 {
-    RadioFault current[] = 0;
-    RadioFault previous[] = 1;
+    RadioFaultEnum current[] = 0;
+    RadioFaultEnum previous[] = 1;
   }
 
   critical event NetworkFaultChange = 2 {
-    NetworkFaultType current[] = 0;
-    NetworkFaultType previous[] = 1;
+    NetworkFaultEnum current[] = 0;
+    NetworkFaultEnum previous[] = 1;
   }
 
   critical event BootReason = 3 {
@@ -1197,9 +1244,9 @@ server cluster GeneralDiagnostics = 51 {
   readonly attribute int64u upTime = 2;
   readonly attribute int32u totalOperationalHours = 3;
   readonly attribute BootReasonEnum bootReason = 4;
-  readonly attribute HardwareFault activeHardwareFaults[] = 5;
-  readonly attribute RadioFault activeRadioFaults[] = 6;
-  readonly attribute NetworkFaultType activeNetworkFaults[] = 7;
+  readonly attribute HardwareFaultEnum activeHardwareFaults[] = 5;
+  readonly attribute RadioFaultEnum activeRadioFaults[] = 6;
+  readonly attribute NetworkFaultEnum activeNetworkFaults[] = 7;
   readonly attribute boolean testEventTriggersEnabled = 8;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -1466,7 +1513,7 @@ server cluster WiFiNetworkDiagnostics = 54 {
 }
 
 server cluster EthernetNetworkDiagnostics = 55 {
-  enum PHYRate : ENUM8 {
+  enum PHYRateEnum : ENUM8 {
     kRate10M = 0;
     kRate100M = 1;
     kRate1G = 2;
@@ -1479,7 +1526,7 @@ server cluster EthernetNetworkDiagnostics = 55 {
     kRate400G = 9;
   }
 
-  readonly attribute nullable PHYRate PHYRate = 0;
+  readonly attribute nullable PHYRateEnum PHYRate = 0;
   readonly attribute nullable boolean fullDuplex = 1;
   readonly attribute int64u packetRxCount = 2;
   readonly attribute int64u packetTxCount = 3;
@@ -1541,7 +1588,7 @@ server cluster Switch = 59 {
 }
 
 server cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatus : ENUM8 {
+  enum CommissioningWindowStatusEnum : ENUM8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
     kBasicWindowOpen = 2;
@@ -1553,7 +1600,7 @@ server cluster AdministratorCommissioning = 60 {
     kWindowNotOpen = 4;
   }
 
-  readonly attribute CommissioningWindowStatus windowStatus = 0;
+  readonly attribute CommissioningWindowStatusEnum windowStatus = 0;
   readonly attribute nullable fabric_idx adminFabricIndex = 1;
   readonly attribute nullable int16u adminVendorId = 2;
   readonly attribute bitmap32 featureMap = 65532;
@@ -1813,7 +1860,7 @@ server cluster ModeSelect = 80 {
 }
 
 server cluster DoorLock = 257 {
-  enum DlAlarmCode : ENUM8 {
+  enum AlarmCodeEnum : ENUM8 {
     kLockJammed = 0;
     kLockFactoryReset = 1;
     kLockRadioPowerCycled = 3;
@@ -1824,13 +1871,13 @@ server cluster DoorLock = 257 {
     kForcedUser = 8;
   }
 
-  enum DlCredentialRule : ENUM8 {
+  enum CredentialRuleEnum : ENUM8 {
     kSingle = 0;
-    kDouble = 1;
+    kDual = 1;
     kTri = 2;
   }
 
-  enum DlCredentialType : ENUM8 {
+  enum CredentialTypeEnum : ENUM8 {
     kProgrammingPIN = 0;
     kPin = 1;
     kRfid = 2;
@@ -1839,40 +1886,12 @@ server cluster DoorLock = 257 {
     kFace = 5;
   }
 
-  enum DlDataOperationType : ENUM8 {
+  enum DataOperationTypeEnum : ENUM8 {
     kAdd = 0;
     kClear = 1;
     kModify = 2;
   }
 
-  enum DlDoorState : ENUM8 {
-    kDoorOpen = 0;
-    kDoorClosed = 1;
-    kDoorJammed = 2;
-    kDoorForcedOpen = 3;
-    kDoorUnspecifiedError = 4;
-    kDoorAjar = 5;
-  }
-
-  enum DlLockDataType : ENUM8 {
-    kUnspecified = 0;
-    kProgrammingCode = 1;
-    kUserIndex = 2;
-    kWeekDaySchedule = 3;
-    kYearDaySchedule = 4;
-    kHolidaySchedule = 5;
-    kPin = 6;
-    kRfid = 7;
-    kFingerprint = 8;
-  }
-
-  enum DlLockOperationType : ENUM8 {
-    kLock = 0;
-    kUnlock = 1;
-    kNonAccessUserEvent = 2;
-    kForcedUserEvent = 3;
-  }
-
   enum DlLockState : ENUM8 {
     kNotFullyLocked = 0;
     kLocked = 1;
@@ -1893,35 +1912,6 @@ server cluster DoorLock = 257 {
     kDoorFurniture = 10;
   }
 
-  enum DlOperatingMode : ENUM8 {
-    kNormal = 0;
-    kVacation = 1;
-    kPrivacy = 2;
-    kNoRemoteLockUnlock = 3;
-    kPassage = 4;
-  }
-
-  enum DlOperationError : ENUM8 {
-    kUnspecified = 0;
-    kInvalidCredential = 1;
-    kDisabledUserDenied = 2;
-    kRestricted = 3;
-    kInsufficientBattery = 4;
-  }
-
-  enum DlOperationSource : ENUM8 {
-    kUnspecified = 0;
-    kManual = 1;
-    kProprietaryRemote = 2;
-    kKeypad = 3;
-    kAuto = 4;
-    kButton = 5;
-    kSchedule = 6;
-    kRemote = 7;
-    kRfid = 8;
-    kBiometric = 9;
-  }
-
   enum DlStatus : ENUM8 {
     kSuccess = 0;
     kFailure = 1;
@@ -1932,25 +1922,6 @@ server cluster DoorLock = 257 {
     kNotFound = 139;
   }
 
-  enum DlUserStatus : ENUM8 {
-    kAvailable = 0;
-    kOccupiedEnabled = 1;
-    kOccupiedDisabled = 3;
-  }
-
-  enum DlUserType : ENUM8 {
-    kUnrestrictedUser = 0;
-    kYearDayScheduleUser = 1;
-    kWeekDayScheduleUser = 2;
-    kProgrammingUser = 3;
-    kNonAccessUser = 4;
-    kForcedUser = 5;
-    kDisposableUser = 6;
-    kExpiringUser = 7;
-    kScheduleRestrictedUser = 8;
-    kRemoteOnlyUser = 9;
-  }
-
   enum DoorLockOperationEventCode : ENUM8 {
     kUnknownOrMfgSpecific = 0;
     kLock = 1;
@@ -2002,19 +1973,83 @@ server cluster DoorLock = 257 {
     kNotSupported = 255;
   }
 
-  bitmap DlCredentialRuleMask : BITMAP8 {
-    kSingle = 0x1;
-    kDual = 0x2;
-    kTri = 0x4;
+  enum DoorStateEnum : ENUM8 {
+    kDoorOpen = 0;
+    kDoorClosed = 1;
+    kDoorJammed = 2;
+    kDoorForcedOpen = 3;
+    kDoorUnspecifiedError = 4;
+    kDoorAjar = 5;
   }
 
-  bitmap DlCredentialRulesSupport : BITMAP8 {
-    kSingle = 0x1;
-    kDual = 0x2;
-    kTri = 0x4;
+  enum LockDataTypeEnum : ENUM8 {
+    kUnspecified = 0;
+    kProgrammingCode = 1;
+    kUserIndex = 2;
+    kWeekDaySchedule = 3;
+    kYearDaySchedule = 4;
+    kHolidaySchedule = 5;
+    kPin = 6;
+    kRfid = 7;
+    kFingerprint = 8;
+  }
+
+  enum LockOperationTypeEnum : ENUM8 {
+    kLock = 0;
+    kUnlock = 1;
+    kNonAccessUserEvent = 2;
+    kForcedUserEvent = 3;
+  }
+
+  enum OperatingModeEnum : ENUM8 {
+    kNormal = 0;
+    kVacation = 1;
+    kPrivacy = 2;
+    kNoRemoteLockUnlock = 3;
+    kPassage = 4;
+  }
+
+  enum OperationErrorEnum : ENUM8 {
+    kUnspecified = 0;
+    kInvalidCredential = 1;
+    kDisabledUserDenied = 2;
+    kRestricted = 3;
+    kInsufficientBattery = 4;
+  }
+
+  enum OperationSourceEnum : ENUM8 {
+    kUnspecified = 0;
+    kManual = 1;
+    kProprietaryRemote = 2;
+    kKeypad = 3;
+    kAuto = 4;
+    kButton = 5;
+    kSchedule = 6;
+    kRemote = 7;
+    kRfid = 8;
+    kBiometric = 9;
   }
 
-  bitmap DlDaysMaskMap : BITMAP8 {
+  enum UserStatusEnum : ENUM8 {
+    kAvailable = 0;
+    kOccupiedEnabled = 1;
+    kOccupiedDisabled = 3;
+  }
+
+  enum UserTypeEnum : ENUM8 {
+    kUnrestrictedUser = 0;
+    kYearDayScheduleUser = 1;
+    kWeekDayScheduleUser = 2;
+    kProgrammingUser = 3;
+    kNonAccessUser = 4;
+    kForcedUser = 5;
+    kDisposableUser = 6;
+    kExpiringUser = 7;
+    kScheduleRestrictedUser = 8;
+    kRemoteOnlyUser = 9;
+  }
+
+  bitmap DaysMaskMap : BITMAP8 {
     kSunday = 0x1;
     kMonday = 0x2;
     kTuesday = 0x4;
@@ -2024,6 +2059,18 @@ server cluster DoorLock = 257 {
     kSaturday = 0x40;
   }
 
+  bitmap DlCredentialRuleMask : BITMAP8 {
+    kSingle = 0x1;
+    kDual = 0x2;
+    kTri = 0x4;
+  }
+
+  bitmap DlCredentialRulesSupport : BITMAP8 {
+    kSingle = 0x1;
+    kDual = 0x2;
+    kTri = 0x4;
+  }
+
   bitmap DlDefaultConfigurationRegister : BITMAP16 {
     kEnableLocalProgrammingEnabled = 0x1;
     kKeypadInterfaceDefaultAccessEnabled = 0x2;
@@ -2128,56 +2175,56 @@ server cluster DoorLock = 257 {
   }
 
   bitmap DoorLockFeature : BITMAP32 {
-    kPINCredentials = 0x1;
-    kRFIDCredentials = 0x2;
+    kPinCredential = 0x1;
+    kRfidCredential = 0x2;
     kFingerCredentials = 0x4;
     kLogging = 0x8;
-    kWeekDaySchedules = 0x10;
+    kWeekDayAccessSchedules = 0x10;
     kDoorPositionSensor = 0x20;
     kFaceCredentials = 0x40;
-    kCredentialsOTA = 0x80;
-    kUsersManagement = 0x100;
-    kNotifications = 0x200;
-    kYearDaySchedules = 0x400;
+    kCredentialsOverTheAirAccess = 0x80;
+    kUser = 0x100;
+    kNotification = 0x200;
+    kYearDayAccessSchedules = 0x400;
     kHolidaySchedules = 0x800;
   }
 
-  struct DlCredential {
-    DlCredentialType credentialType = 0;
+  struct CredentialStruct {
+    CredentialTypeEnum credentialType = 0;
     int16u credentialIndex = 1;
   }
 
   critical event DoorLockAlarm = 0 {
-    DlAlarmCode alarmCode = 0;
+    AlarmCodeEnum alarmCode = 0;
   }
 
   critical event DoorStateChange = 1 {
-    DlDoorState doorState = 0;
+    DoorStateEnum doorState = 0;
   }
 
   critical event LockOperation = 2 {
-    DlLockOperationType lockOperationType = 0;
-    DlOperationSource operationSource = 1;
+    LockOperationTypeEnum lockOperationType = 0;
+    OperationSourceEnum operationSource = 1;
     nullable INT16U userIndex = 2;
     nullable fabric_idx fabricIndex = 3;
     nullable NODE_ID sourceNode = 4;
-    optional nullable DlCredential credentials[] = 5;
+    optional nullable CredentialStruct credentials[] = 5;
   }
 
   critical event LockOperationError = 3 {
-    DlLockOperationType lockOperationType = 0;
-    DlOperationSource operationSource = 1;
-    DlOperationError operationError = 2;
+    LockOperationTypeEnum lockOperationType = 0;
+    OperationSourceEnum operationSource = 1;
+    OperationErrorEnum operationError = 2;
     nullable INT16U userIndex = 3;
     nullable fabric_idx fabricIndex = 4;
     nullable NODE_ID sourceNode = 5;
-    optional nullable DlCredential credentials[] = 6;
+    optional nullable CredentialStruct credentials[] = 6;
   }
 
   info event LockUserChange = 4 {
-    DlLockDataType lockDataType = 0;
-    DlDataOperationType dataOperationType = 1;
-    DlOperationSource operationSource = 2;
+    LockDataTypeEnum lockDataType = 0;
+    DataOperationTypeEnum dataOperationType = 1;
+    OperationSourceEnum operationSource = 2;
     nullable INT16U userIndex = 3;
     nullable fabric_idx fabricIndex = 4;
     nullable NODE_ID sourceNode = 5;
@@ -2187,7 +2234,7 @@ server cluster DoorLock = 257 {
   readonly attribute nullable DlLockState lockState = 0;
   readonly attribute DlLockType lockType = 1;
   readonly attribute boolean actuatorEnabled = 2;
-  readonly attribute nullable DlDoorState doorState = 3;
+  readonly attribute nullable DoorStateEnum doorState = 3;
   attribute access(write: manage) int32u doorOpenEvents = 4;
   attribute access(write: manage) int32u doorClosedEvents = 5;
   attribute access(write: manage) int16u openPeriod = 6;
@@ -2206,7 +2253,7 @@ server cluster DoorLock = 257 {
   attribute access(write: manage) char_string<3> language = 33;
   attribute access(write: manage) int32u autoRelockTime = 35;
   attribute access(write: manage) int8u soundVolume = 36;
-  attribute access(write: manage) DlOperatingMode operatingMode = 37;
+  attribute access(write: manage) OperatingModeEnum operatingMode = 37;
   readonly attribute DlSupportedOperatingModes supportedOperatingModes = 38;
   readonly attribute DlDefaultConfigurationRegister defaultConfigurationRegister = 39;
   attribute access(write: manage) boolean enableOneTouchLocking = 41;
@@ -2219,22 +2266,22 @@ server cluster DoorLock = 257 {
   readonly attribute int16u clusterRevision = 65533;
 
   request struct LockDoorRequest {
-    optional OCTET_STRING pinCode = 0;
+    optional OCTET_STRING PINCode = 0;
   }
 
   request struct UnlockDoorRequest {
-    optional OCTET_STRING pinCode = 0;
+    optional OCTET_STRING PINCode = 0;
   }
 
   request struct UnlockWithTimeoutRequest {
     INT16U timeout = 0;
-    optional OCTET_STRING pinCode = 1;
+    optional OCTET_STRING PINCode = 1;
   }
 
   request struct SetWeekDayScheduleRequest {
     INT8U weekDayIndex = 0;
     INT16U userIndex = 1;
-    DlDaysMaskMap daysMask = 2;
+    DaysMaskMap daysMask = 2;
     INT8U startHour = 3;
     INT8U startMinute = 4;
     INT8U endHour = 5;
@@ -2264,13 +2311,13 @@ server cluster DoorLock = 257 {
   }
 
   request struct SetUserRequest {
-    DlDataOperationType operationType = 0;
+    DataOperationTypeEnum operationType = 0;
     INT16U userIndex = 1;
     nullable CHAR_STRING userName = 2;
-    nullable INT32U userUniqueId = 3;
-    nullable DlUserStatus userStatus = 4;
-    nullable DlUserType userType = 5;
-    nullable DlCredentialRule credentialRule = 6;
+    nullable INT32U userUniqueID = 3;
+    nullable UserStatusEnum userStatus = 4;
+    nullable UserTypeEnum userType = 5;
+    nullable CredentialRuleEnum credentialRule = 6;
   }
 
   request struct GetUserRequest {
@@ -2282,30 +2329,30 @@ server cluster DoorLock = 257 {
   }
 
   request struct SetCredentialRequest {
-    DlDataOperationType operationType = 0;
-    DlCredential credential = 1;
+    DataOperationTypeEnum operationType = 0;
+    CredentialStruct credential = 1;
     LONG_OCTET_STRING credentialData = 2;
     nullable INT16U userIndex = 3;
-    nullable DlUserStatus userStatus = 4;
-    nullable DlUserType userType = 5;
+    nullable UserStatusEnum userStatus = 4;
+    nullable UserTypeEnum userType = 5;
   }
 
   request struct GetCredentialStatusRequest {
-    DlCredential credential = 0;
+    CredentialStruct credential = 0;
   }
 
   request struct ClearCredentialRequest {
-    nullable DlCredential credential = 0;
+    nullable CredentialStruct credential = 0;
   }
 
   response struct GetUserResponse = 28 {
     INT16U userIndex = 0;
     nullable CHAR_STRING userName = 1;
-    nullable INT32U userUniqueId = 2;
-    nullable DlUserStatus userStatus = 3;
-    nullable DlUserType userType = 4;
-    nullable DlCredentialRule credentialRule = 5;
-    nullable DlCredential credentials[] = 6;
+    nullable INT32U userUniqueID = 2;
+    nullable UserStatusEnum userStatus = 3;
+    nullable UserTypeEnum userType = 4;
+    nullable CredentialRuleEnum credentialRule = 5;
+    nullable CredentialStruct credentials[] = 6;
     nullable fabric_idx creatorFabricIndex = 7;
     nullable fabric_idx lastModifiedFabricIndex = 8;
     nullable INT16U nextUserIndex = 9;
@@ -2516,6 +2563,16 @@ server cluster PumpConfigurationAndControl = 512 {
     kLocal = 3;
   }
 
+  bitmap PumpFeature : BITMAP32 {
+    kConstantPressure = 0x1;
+    kCompensatedPressure = 0x2;
+    kConstantFlow = 0x4;
+    kConstantSpeed = 0x8;
+    kConstantTemperature = 0x10;
+    kAutomatic = 0x20;
+    kLocal = 0x40;
+  }
+
   bitmap PumpStatus : BITMAP16 {
     kDeviceFault = 0x1;
     kSupplyfault = 0x2;
@@ -2965,7 +3022,7 @@ server cluster ColorControl = 768 {
   }
 
   request struct MoveToColorTemperatureRequest {
-    INT16U colorTemperature = 0;
+    INT16U colorTemperatureMireds = 0;
     INT16U transitionTime = 1;
     BITMAP8 optionsMask = 2;
     BITMAP8 optionsOverride = 3;
@@ -4271,6 +4328,7 @@ endpoint 0 {
 }
 endpoint 1 {
   device type onofflight = 256, version 1;
+  binding cluster OnOff;
 
   server cluster Identify {
     ram      attribute identifyTime;
@@ -4513,8 +4571,8 @@ endpoint 1 {
     ram      attribute lifetimeEnergyConsumed;
     ram      attribute operationMode;
     ram      attribute controlMode;
-    ram      attribute featureMap;
-    ram      attribute clusterRevision default = 3;
+    ram      attribute featureMap default = 0x1F;
+    ram      attribute clusterRevision default = 4;
   }
 
   server cluster Thermostat {
diff --git a/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap b/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap
index 260eb750385755..492ab63d4b5a91 100644
--- a/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap
+++ b/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap
@@ -5121,7 +5121,7 @@
               "code": 0,
               "mfgCode": null,
               "side": "server",
-              "type": "PHYRate",
+              "type": "PHYRateEnum",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -5395,7 +5395,7 @@
           ]
         },
         {
-          "name": "AdministratorCommissioning",
+          "name": "Administrator Commissioning",
           "code": 60,
           "mfgCode": null,
           "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
@@ -5447,7 +5447,7 @@
           ]
         },
         {
-          "name": "AdministratorCommissioning",
+          "name": "Administrator Commissioning",
           "code": 60,
           "mfgCode": null,
           "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
@@ -5459,7 +5459,7 @@
               "code": 0,
               "mfgCode": null,
               "side": "server",
-              "type": "CommissioningWindowStatus",
+              "type": "CommissioningWindowStatusEnum",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -6221,7 +6221,7 @@
               "code": 3,
               "mfgCode": null,
               "side": "server",
-              "type": "DlDoorState",
+              "type": "DoorStateEnum",
               "included": 0,
               "storageOption": "RAM",
               "singleton": 0,
@@ -6301,7 +6301,7 @@
               "code": 37,
               "mfgCode": null,
               "side": "server",
-              "type": "DlOperatingMode",
+              "type": "OperatingModeEnum",
               "included": 0,
               "storageOption": "RAM",
               "singleton": 0,
@@ -9366,7 +9366,7 @@
           "mfgCode": null,
           "define": "ON_OFF_CLUSTER",
           "side": "client",
-          "enabled": 0,
+          "enabled": 1,
           "commands": [
             {
               "name": "Off",
@@ -13031,7 +13031,7 @@
               "code": 3,
               "mfgCode": null,
               "side": "server",
-              "type": "DlDoorState",
+              "type": "DoorStateEnum",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -13351,7 +13351,7 @@
               "code": 37,
               "mfgCode": null,
               "side": "server",
-              "type": "DlOperatingMode",
+              "type": "OperatingModeEnum",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -14724,7 +14724,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "0",
+              "defaultValue": "0x1F",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
@@ -14740,7 +14740,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "3",
+              "defaultValue": "4",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -22985,7 +22985,7 @@
               "code": 3,
               "mfgCode": null,
               "side": "server",
-              "type": "DlDoorState",
+              "type": "DoorStateEnum",
               "included": 0,
               "storageOption": "RAM",
               "singleton": 0,
@@ -23065,7 +23065,7 @@
               "code": 37,
               "mfgCode": null,
               "side": "server",
-              "type": "DlOperatingMode",
+              "type": "OperatingModeEnum",
               "included": 0,
               "storageOption": "RAM",
               "singleton": 0,
diff --git a/examples/all-clusters-app/ameba/main/include/ColorControlCommands.h b/examples/all-clusters-app/ameba/main/include/ColorControlCommands.h
index f4514470b3e630..00e36e434160b6 100644
--- a/examples/all-clusters-app/ameba/main/include/ColorControlCommands.h
+++ b/examples/all-clusters-app/ameba/main/include/ColorControlCommands.h
@@ -453,10 +453,10 @@ void ProcessColorControlUnicastBindingCommand(BindingCommandData * data, const E
         break;
 
     case Clusters::ColorControl::Commands::MoveToColorTemperature::Id:
-        moveToColorTemperatureCommand.colorTemperature = static_cast<uint16_t>(data->args[0]);
-        moveToColorTemperatureCommand.transitionTime   = static_cast<uint16_t>(data->args[1]);
-        moveToColorTemperatureCommand.optionsMask      = static_cast<uint8_t>(data->args[2]);
-        moveToColorTemperatureCommand.optionsOverride  = static_cast<uint8_t>(data->args[3]);
+        moveToColorTemperatureCommand.colorTemperatureMireds = static_cast<uint16_t>(data->args[0]);
+        moveToColorTemperatureCommand.transitionTime         = static_cast<uint16_t>(data->args[1]);
+        moveToColorTemperatureCommand.optionsMask            = static_cast<uint8_t>(data->args[2]);
+        moveToColorTemperatureCommand.optionsOverride        = static_cast<uint8_t>(data->args[3]);
         Controller::InvokeCommandRequest(peer_device->GetExchangeManager(), peer_device->GetSecureSession().Value(), binding.remote,
                                          moveToColorTemperatureCommand, onSuccess, onFailure);
         break;
@@ -658,10 +658,10 @@ void ProcessColorControlGroupBindingCommand(BindingCommandData * data, const Emb
         break;
 
     case Clusters::ColorControl::Commands::MoveToColorTemperature::Id:
-        moveToColorTemperatureCommand.colorTemperature = static_cast<uint16_t>(data->args[0]);
-        moveToColorTemperatureCommand.transitionTime   = static_cast<uint16_t>(data->args[1]);
-        moveToColorTemperatureCommand.optionsMask      = static_cast<uint8_t>(data->args[2]);
-        moveToColorTemperatureCommand.optionsOverride  = static_cast<uint8_t>(data->args[3]);
+        moveToColorTemperatureCommand.colorTemperatureMireds = static_cast<uint16_t>(data->args[0]);
+        moveToColorTemperatureCommand.transitionTime         = static_cast<uint16_t>(data->args[1]);
+        moveToColorTemperatureCommand.optionsMask            = static_cast<uint8_t>(data->args[2]);
+        moveToColorTemperatureCommand.optionsOverride        = static_cast<uint8_t>(data->args[3]);
         Controller::InvokeGroupCommandRequest(&exchangeMgr, binding.fabricIndex, binding.groupId, moveToColorTemperatureCommand);
         break;
 
diff --git a/examples/all-clusters-app/linux/AllClustersCommandDelegate.cpp b/examples/all-clusters-app/linux/AllClustersCommandDelegate.cpp
index d7bebc065904f4..40765c36888680 100644
--- a/examples/all-clusters-app/linux/AllClustersCommandDelegate.cpp
+++ b/examples/all-clusters-app/linux/AllClustersCommandDelegate.cpp
@@ -183,13 +183,13 @@ void AllClustersAppCommandHandler::OnGeneralFaultEventHandler(uint32_t eventId)
 
 #if CHIP_CONFIG_TEST
         // On Linux Simulation, set following hardware faults statically.
-        ReturnOnFailure(previous.add(EMBER_ZCL_HARDWARE_FAULT_RADIO));
-        ReturnOnFailure(previous.add(EMBER_ZCL_HARDWARE_FAULT_POWER_SOURCE));
+        ReturnOnFailure(previous.add(EMBER_ZCL_HARDWARE_FAULT_ENUM_RADIO));
+        ReturnOnFailure(previous.add(EMBER_ZCL_HARDWARE_FAULT_ENUM_POWER_SOURCE));
 
-        ReturnOnFailure(current.add(EMBER_ZCL_HARDWARE_FAULT_RADIO));
-        ReturnOnFailure(current.add(EMBER_ZCL_HARDWARE_FAULT_SENSOR));
-        ReturnOnFailure(current.add(EMBER_ZCL_HARDWARE_FAULT_POWER_SOURCE));
-        ReturnOnFailure(current.add(EMBER_ZCL_HARDWARE_FAULT_USER_INTERFACE_FAULT));
+        ReturnOnFailure(current.add(EMBER_ZCL_HARDWARE_FAULT_ENUM_RADIO));
+        ReturnOnFailure(current.add(EMBER_ZCL_HARDWARE_FAULT_ENUM_SENSOR));
+        ReturnOnFailure(current.add(EMBER_ZCL_HARDWARE_FAULT_ENUM_POWER_SOURCE));
+        ReturnOnFailure(current.add(EMBER_ZCL_HARDWARE_FAULT_ENUM_USER_INTERFACE_FAULT));
 #endif
         Clusters::GeneralDiagnosticsServer::Instance().OnHardwareFaultsDetect(previous, current);
     }
@@ -200,13 +200,13 @@ void AllClustersAppCommandHandler::OnGeneralFaultEventHandler(uint32_t eventId)
 
 #if CHIP_CONFIG_TEST
         // On Linux Simulation, set following radio faults statically.
-        ReturnOnFailure(previous.add(EMBER_ZCL_RADIO_FAULT_WI_FI_FAULT));
-        ReturnOnFailure(previous.add(EMBER_ZCL_RADIO_FAULT_THREAD_FAULT));
+        ReturnOnFailure(previous.add(EMBER_ZCL_RADIO_FAULT_ENUM_WI_FI_FAULT));
+        ReturnOnFailure(previous.add(EMBER_ZCL_RADIO_FAULT_ENUM_THREAD_FAULT));
 
-        ReturnOnFailure(current.add(EMBER_ZCL_RADIO_FAULT_WI_FI_FAULT));
-        ReturnOnFailure(current.add(EMBER_ZCL_RADIO_FAULT_CELLULAR_FAULT));
-        ReturnOnFailure(current.add(EMBER_ZCL_RADIO_FAULT_THREAD_FAULT));
-        ReturnOnFailure(current.add(EMBER_ZCL_RADIO_FAULT_NFC_FAULT));
+        ReturnOnFailure(current.add(EMBER_ZCL_RADIO_FAULT_ENUM_WI_FI_FAULT));
+        ReturnOnFailure(current.add(EMBER_ZCL_RADIO_FAULT_ENUM_CELLULAR_FAULT));
+        ReturnOnFailure(current.add(EMBER_ZCL_RADIO_FAULT_ENUM_THREAD_FAULT));
+        ReturnOnFailure(current.add(EMBER_ZCL_RADIO_FAULT_ENUM_NFC_FAULT));
 #endif
         Clusters::GeneralDiagnosticsServer::Instance().OnRadioFaultsDetect(previous, current);
     }
@@ -217,12 +217,12 @@ void AllClustersAppCommandHandler::OnGeneralFaultEventHandler(uint32_t eventId)
 
 #if CHIP_CONFIG_TEST
         // On Linux Simulation, set following radio faults statically.
-        ReturnOnFailure(previous.add(EMBER_ZCL_NETWORK_FAULT_TYPE_HARDWARE_FAILURE));
-        ReturnOnFailure(previous.add(EMBER_ZCL_NETWORK_FAULT_TYPE_NETWORK_JAMMED));
+        ReturnOnFailure(previous.add(EMBER_ZCL_NETWORK_FAULT_ENUM_HARDWARE_FAILURE));
+        ReturnOnFailure(previous.add(EMBER_ZCL_NETWORK_FAULT_ENUM_NETWORK_JAMMED));
 
-        ReturnOnFailure(current.add(EMBER_ZCL_NETWORK_FAULT_TYPE_HARDWARE_FAILURE));
-        ReturnOnFailure(current.add(EMBER_ZCL_NETWORK_FAULT_TYPE_NETWORK_JAMMED));
-        ReturnOnFailure(current.add(EMBER_ZCL_NETWORK_FAULT_TYPE_CONNECTION_FAILED));
+        ReturnOnFailure(current.add(EMBER_ZCL_NETWORK_FAULT_ENUM_HARDWARE_FAILURE));
+        ReturnOnFailure(current.add(EMBER_ZCL_NETWORK_FAULT_ENUM_NETWORK_JAMMED));
+        ReturnOnFailure(current.add(EMBER_ZCL_NETWORK_FAULT_ENUM_CONNECTION_FAILED));
 #endif
         Clusters::GeneralDiagnosticsServer::Instance().OnNetworkFaultsDetect(previous, current);
     }
diff --git a/examples/all-clusters-app/nrfconnect/main/ZclDoorLockCallbacks.cpp b/examples/all-clusters-app/nrfconnect/main/ZclDoorLockCallbacks.cpp
index 0ab2703cb268b2..068b990444b4f5 100644
--- a/examples/all-clusters-app/nrfconnect/main/ZclDoorLockCallbacks.cpp
+++ b/examples/all-clusters-app/nrfconnect/main/ZclDoorLockCallbacks.cpp
@@ -30,15 +30,16 @@ LOG_MODULE_DECLARE(app, CONFIG_CHIP_APP_LOG_LEVEL);
 
 // Provided some empty callbacks and replaced feature map
 // to simulate DoorLock endpoint for All-Clusters-App example
-// without using kUsersManagement|kAccessSchedules|kRFIDCredentials|kPINCredentials
+// without using kUser|kAccessSchedules|kRfidCredential|kPinCredential
 
-bool emberAfPluginDoorLockOnDoorLockCommand(chip::EndpointId endpointId, const Optional<ByteSpan> & pinCode, DlOperationError & err)
+bool emberAfPluginDoorLockOnDoorLockCommand(chip::EndpointId endpointId, const Optional<ByteSpan> & pinCode,
+                                            OperationErrorEnum & err)
 {
     return true;
 }
 
 bool emberAfPluginDoorLockOnDoorUnlockCommand(chip::EndpointId endpointId, const Optional<ByteSpan> & pinCode,
-                                              DlOperationError & err)
+                                              OperationErrorEnum & err)
 {
     return true;
 }
@@ -48,7 +49,7 @@ void emberAfDoorLockClusterInitCallback(EndpointId endpoint)
     DoorLockServer::Instance().InitServer(endpoint);
 
     // Set FeatureMap to 0, default is:
-    // (kUsersManagement|kAccessSchedules|kRFIDCredentials|kPINCredentials) 0x113
+    // (kUser|kAccessSchedules|kRfidCredential|kPinCredential) 0x113
     EmberAfStatus status = DoorLock::Attributes::FeatureMap::Set(endpoint, 0);
     if (status != EMBER_ZCL_STATUS_SUCCESS)
     {
diff --git a/examples/all-clusters-app/telink/src/ZclDoorLockCallbacks.cpp b/examples/all-clusters-app/telink/src/ZclDoorLockCallbacks.cpp
index edaa86e44d5125..ddf996bfc48f2c 100644
--- a/examples/all-clusters-app/telink/src/ZclDoorLockCallbacks.cpp
+++ b/examples/all-clusters-app/telink/src/ZclDoorLockCallbacks.cpp
@@ -30,15 +30,16 @@ LOG_MODULE_DECLARE(app, CONFIG_MATTER_LOG_LEVEL);
 
 // Provided some empty callbacks and replaced feature map
 // to simulate DoorLock endpoint for All-Clusters-App example
-// without using kUsersManagement|kAccessSchedules|kRFIDCredentials|kPINCredentials
+// without using kUser|kAccessSchedules|kRfidCredential|kPinCredential
 
-bool emberAfPluginDoorLockOnDoorLockCommand(chip::EndpointId endpointId, const Optional<ByteSpan> & pinCode, DlOperationError & err)
+bool emberAfPluginDoorLockOnDoorLockCommand(chip::EndpointId endpointId, const Optional<ByteSpan> & pinCode,
+                                            OperationErrorEnum & err)
 {
     return true;
 }
 
 bool emberAfPluginDoorLockOnDoorUnlockCommand(chip::EndpointId endpointId, const Optional<ByteSpan> & pinCode,
-                                              DlOperationError & err)
+                                              OperationErrorEnum & err)
 {
     return true;
 }
@@ -48,7 +49,7 @@ void emberAfDoorLockClusterInitCallback(EndpointId endpoint)
     DoorLockServer::Instance().InitServer(endpoint);
 
     // Set FeatureMap to 0, default is:
-    // (kUsersManagement|kAccessSchedules|kRFIDCredentials|kPINCredentials) 0x113
+    // (kUser|kAccessSchedules|kRfidCredential|kPinCredential) 0x113
     EmberAfStatus status = DoorLock::Attributes::FeatureMap::Set(endpoint, 0);
     if (status != EMBER_ZCL_STATUS_SUCCESS)
     {
diff --git a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter
index 98845287f96850..6f0389d641c243 100644
--- a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter
+++ b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter
@@ -1052,7 +1052,7 @@ server cluster GeneralDiagnostics = 51 {
     kSoftwareReset = 6;
   }
 
-  enum HardwareFault : ENUM8 {
+  enum HardwareFaultEnum : ENUM8 {
     kUnspecified = 0;
     kRadio = 1;
     kSensor = 2;
@@ -1066,7 +1066,7 @@ server cluster GeneralDiagnostics = 51 {
     kTamperDetected = 10;
   }
 
-  enum InterfaceType : ENUM8 {
+  enum InterfaceTypeEnum : ENUM8 {
     kUnspecified = 0;
     kWiFi = 1;
     kEthernet = 2;
@@ -1074,14 +1074,14 @@ server cluster GeneralDiagnostics = 51 {
     kThread = 4;
   }
 
-  enum NetworkFaultType : ENUM8 {
+  enum NetworkFaultEnum : ENUM8 {
     kUnspecified = 0;
     kHardwareFailure = 1;
     kNetworkJammed = 2;
     kConnectionFailed = 3;
   }
 
-  enum RadioFault : ENUM8 {
+  enum RadioFaultEnum : ENUM8 {
     kUnspecified = 0;
     kWiFiFault = 1;
     kCellularFault = 2;
@@ -1099,22 +1099,22 @@ server cluster GeneralDiagnostics = 51 {
     octet_string<8> hardwareAddress = 4;
     octet_string IPv4Addresses[] = 5;
     octet_string IPv6Addresses[] = 6;
-    InterfaceType type = 7;
+    InterfaceTypeEnum type = 7;
   }
 
   critical event HardwareFaultChange = 0 {
-    HardwareFault current[] = 0;
-    HardwareFault previous[] = 1;
+    HardwareFaultEnum current[] = 0;
+    HardwareFaultEnum previous[] = 1;
   }
 
   critical event RadioFaultChange = 1 {
-    RadioFault current[] = 0;
-    RadioFault previous[] = 1;
+    RadioFaultEnum current[] = 0;
+    RadioFaultEnum previous[] = 1;
   }
 
   critical event NetworkFaultChange = 2 {
-    NetworkFaultType current[] = 0;
-    NetworkFaultType previous[] = 1;
+    NetworkFaultEnum current[] = 0;
+    NetworkFaultEnum previous[] = 1;
   }
 
   critical event BootReason = 3 {
@@ -1317,7 +1317,7 @@ server cluster WiFiNetworkDiagnostics = 54 {
 }
 
 server cluster EthernetNetworkDiagnostics = 55 {
-  enum PHYRate : ENUM8 {
+  enum PHYRateEnum : ENUM8 {
     kRate10M = 0;
     kRate100M = 1;
     kRate1G = 2;
@@ -1330,7 +1330,7 @@ server cluster EthernetNetworkDiagnostics = 55 {
     kRate400G = 9;
   }
 
-  readonly attribute nullable PHYRate PHYRate = 0;
+  readonly attribute nullable PHYRateEnum PHYRate = 0;
   readonly attribute nullable boolean fullDuplex = 1;
   readonly attribute int64u packetRxCount = 2;
   readonly attribute int64u packetTxCount = 3;
@@ -1391,7 +1391,7 @@ server cluster Switch = 59 {
 }
 
 server cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatus : ENUM8 {
+  enum CommissioningWindowStatusEnum : ENUM8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
     kBasicWindowOpen = 2;
@@ -1403,7 +1403,7 @@ server cluster AdministratorCommissioning = 60 {
     kWindowNotOpen = 4;
   }
 
-  readonly attribute CommissioningWindowStatus windowStatus = 0;
+  readonly attribute CommissioningWindowStatusEnum windowStatus = 0;
   readonly attribute nullable fabric_idx adminFabricIndex = 1;
   readonly attribute nullable int16u adminVendorId = 2;
   readonly attribute bitmap32 featureMap = 65532;
@@ -1655,7 +1655,7 @@ server cluster ModeSelect = 80 {
 }
 
 server cluster DoorLock = 257 {
-  enum DlAlarmCode : ENUM8 {
+  enum AlarmCodeEnum : ENUM8 {
     kLockJammed = 0;
     kLockFactoryReset = 1;
     kLockRadioPowerCycled = 3;
@@ -1666,13 +1666,13 @@ server cluster DoorLock = 257 {
     kForcedUser = 8;
   }
 
-  enum DlCredentialRule : ENUM8 {
+  enum CredentialRuleEnum : ENUM8 {
     kSingle = 0;
-    kDouble = 1;
+    kDual = 1;
     kTri = 2;
   }
 
-  enum DlCredentialType : ENUM8 {
+  enum CredentialTypeEnum : ENUM8 {
     kProgrammingPIN = 0;
     kPin = 1;
     kRfid = 2;
@@ -1681,40 +1681,12 @@ server cluster DoorLock = 257 {
     kFace = 5;
   }
 
-  enum DlDataOperationType : ENUM8 {
+  enum DataOperationTypeEnum : ENUM8 {
     kAdd = 0;
     kClear = 1;
     kModify = 2;
   }
 
-  enum DlDoorState : ENUM8 {
-    kDoorOpen = 0;
-    kDoorClosed = 1;
-    kDoorJammed = 2;
-    kDoorForcedOpen = 3;
-    kDoorUnspecifiedError = 4;
-    kDoorAjar = 5;
-  }
-
-  enum DlLockDataType : ENUM8 {
-    kUnspecified = 0;
-    kProgrammingCode = 1;
-    kUserIndex = 2;
-    kWeekDaySchedule = 3;
-    kYearDaySchedule = 4;
-    kHolidaySchedule = 5;
-    kPin = 6;
-    kRfid = 7;
-    kFingerprint = 8;
-  }
-
-  enum DlLockOperationType : ENUM8 {
-    kLock = 0;
-    kUnlock = 1;
-    kNonAccessUserEvent = 2;
-    kForcedUserEvent = 3;
-  }
-
   enum DlLockState : ENUM8 {
     kNotFullyLocked = 0;
     kLocked = 1;
@@ -1735,35 +1707,6 @@ server cluster DoorLock = 257 {
     kDoorFurniture = 10;
   }
 
-  enum DlOperatingMode : ENUM8 {
-    kNormal = 0;
-    kVacation = 1;
-    kPrivacy = 2;
-    kNoRemoteLockUnlock = 3;
-    kPassage = 4;
-  }
-
-  enum DlOperationError : ENUM8 {
-    kUnspecified = 0;
-    kInvalidCredential = 1;
-    kDisabledUserDenied = 2;
-    kRestricted = 3;
-    kInsufficientBattery = 4;
-  }
-
-  enum DlOperationSource : ENUM8 {
-    kUnspecified = 0;
-    kManual = 1;
-    kProprietaryRemote = 2;
-    kKeypad = 3;
-    kAuto = 4;
-    kButton = 5;
-    kSchedule = 6;
-    kRemote = 7;
-    kRfid = 8;
-    kBiometric = 9;
-  }
-
   enum DlStatus : ENUM8 {
     kSuccess = 0;
     kFailure = 1;
@@ -1774,25 +1717,6 @@ server cluster DoorLock = 257 {
     kNotFound = 139;
   }
 
-  enum DlUserStatus : ENUM8 {
-    kAvailable = 0;
-    kOccupiedEnabled = 1;
-    kOccupiedDisabled = 3;
-  }
-
-  enum DlUserType : ENUM8 {
-    kUnrestrictedUser = 0;
-    kYearDayScheduleUser = 1;
-    kWeekDayScheduleUser = 2;
-    kProgrammingUser = 3;
-    kNonAccessUser = 4;
-    kForcedUser = 5;
-    kDisposableUser = 6;
-    kExpiringUser = 7;
-    kScheduleRestrictedUser = 8;
-    kRemoteOnlyUser = 9;
-  }
-
   enum DoorLockOperationEventCode : ENUM8 {
     kUnknownOrMfgSpecific = 0;
     kLock = 1;
@@ -1844,19 +1768,83 @@ server cluster DoorLock = 257 {
     kNotSupported = 255;
   }
 
-  bitmap DlCredentialRuleMask : BITMAP8 {
-    kSingle = 0x1;
-    kDual = 0x2;
-    kTri = 0x4;
+  enum DoorStateEnum : ENUM8 {
+    kDoorOpen = 0;
+    kDoorClosed = 1;
+    kDoorJammed = 2;
+    kDoorForcedOpen = 3;
+    kDoorUnspecifiedError = 4;
+    kDoorAjar = 5;
   }
 
-  bitmap DlCredentialRulesSupport : BITMAP8 {
-    kSingle = 0x1;
-    kDual = 0x2;
-    kTri = 0x4;
+  enum LockDataTypeEnum : ENUM8 {
+    kUnspecified = 0;
+    kProgrammingCode = 1;
+    kUserIndex = 2;
+    kWeekDaySchedule = 3;
+    kYearDaySchedule = 4;
+    kHolidaySchedule = 5;
+    kPin = 6;
+    kRfid = 7;
+    kFingerprint = 8;
+  }
+
+  enum LockOperationTypeEnum : ENUM8 {
+    kLock = 0;
+    kUnlock = 1;
+    kNonAccessUserEvent = 2;
+    kForcedUserEvent = 3;
+  }
+
+  enum OperatingModeEnum : ENUM8 {
+    kNormal = 0;
+    kVacation = 1;
+    kPrivacy = 2;
+    kNoRemoteLockUnlock = 3;
+    kPassage = 4;
+  }
+
+  enum OperationErrorEnum : ENUM8 {
+    kUnspecified = 0;
+    kInvalidCredential = 1;
+    kDisabledUserDenied = 2;
+    kRestricted = 3;
+    kInsufficientBattery = 4;
   }
 
-  bitmap DlDaysMaskMap : BITMAP8 {
+  enum OperationSourceEnum : ENUM8 {
+    kUnspecified = 0;
+    kManual = 1;
+    kProprietaryRemote = 2;
+    kKeypad = 3;
+    kAuto = 4;
+    kButton = 5;
+    kSchedule = 6;
+    kRemote = 7;
+    kRfid = 8;
+    kBiometric = 9;
+  }
+
+  enum UserStatusEnum : ENUM8 {
+    kAvailable = 0;
+    kOccupiedEnabled = 1;
+    kOccupiedDisabled = 3;
+  }
+
+  enum UserTypeEnum : ENUM8 {
+    kUnrestrictedUser = 0;
+    kYearDayScheduleUser = 1;
+    kWeekDayScheduleUser = 2;
+    kProgrammingUser = 3;
+    kNonAccessUser = 4;
+    kForcedUser = 5;
+    kDisposableUser = 6;
+    kExpiringUser = 7;
+    kScheduleRestrictedUser = 8;
+    kRemoteOnlyUser = 9;
+  }
+
+  bitmap DaysMaskMap : BITMAP8 {
     kSunday = 0x1;
     kMonday = 0x2;
     kTuesday = 0x4;
@@ -1866,6 +1854,18 @@ server cluster DoorLock = 257 {
     kSaturday = 0x40;
   }
 
+  bitmap DlCredentialRuleMask : BITMAP8 {
+    kSingle = 0x1;
+    kDual = 0x2;
+    kTri = 0x4;
+  }
+
+  bitmap DlCredentialRulesSupport : BITMAP8 {
+    kSingle = 0x1;
+    kDual = 0x2;
+    kTri = 0x4;
+  }
+
   bitmap DlDefaultConfigurationRegister : BITMAP16 {
     kEnableLocalProgrammingEnabled = 0x1;
     kKeypadInterfaceDefaultAccessEnabled = 0x2;
@@ -1970,56 +1970,56 @@ server cluster DoorLock = 257 {
   }
 
   bitmap DoorLockFeature : BITMAP32 {
-    kPINCredentials = 0x1;
-    kRFIDCredentials = 0x2;
+    kPinCredential = 0x1;
+    kRfidCredential = 0x2;
     kFingerCredentials = 0x4;
     kLogging = 0x8;
-    kWeekDaySchedules = 0x10;
+    kWeekDayAccessSchedules = 0x10;
     kDoorPositionSensor = 0x20;
     kFaceCredentials = 0x40;
-    kCredentialsOTA = 0x80;
-    kUsersManagement = 0x100;
-    kNotifications = 0x200;
-    kYearDaySchedules = 0x400;
+    kCredentialsOverTheAirAccess = 0x80;
+    kUser = 0x100;
+    kNotification = 0x200;
+    kYearDayAccessSchedules = 0x400;
     kHolidaySchedules = 0x800;
   }
 
-  struct DlCredential {
-    DlCredentialType credentialType = 0;
+  struct CredentialStruct {
+    CredentialTypeEnum credentialType = 0;
     int16u credentialIndex = 1;
   }
 
   critical event DoorLockAlarm = 0 {
-    DlAlarmCode alarmCode = 0;
+    AlarmCodeEnum alarmCode = 0;
   }
 
   critical event DoorStateChange = 1 {
-    DlDoorState doorState = 0;
+    DoorStateEnum doorState = 0;
   }
 
   critical event LockOperation = 2 {
-    DlLockOperationType lockOperationType = 0;
-    DlOperationSource operationSource = 1;
+    LockOperationTypeEnum lockOperationType = 0;
+    OperationSourceEnum operationSource = 1;
     nullable INT16U userIndex = 2;
     nullable fabric_idx fabricIndex = 3;
     nullable NODE_ID sourceNode = 4;
-    optional nullable DlCredential credentials[] = 5;
+    optional nullable CredentialStruct credentials[] = 5;
   }
 
   critical event LockOperationError = 3 {
-    DlLockOperationType lockOperationType = 0;
-    DlOperationSource operationSource = 1;
-    DlOperationError operationError = 2;
+    LockOperationTypeEnum lockOperationType = 0;
+    OperationSourceEnum operationSource = 1;
+    OperationErrorEnum operationError = 2;
     nullable INT16U userIndex = 3;
     nullable fabric_idx fabricIndex = 4;
     nullable NODE_ID sourceNode = 5;
-    optional nullable DlCredential credentials[] = 6;
+    optional nullable CredentialStruct credentials[] = 6;
   }
 
   info event LockUserChange = 4 {
-    DlLockDataType lockDataType = 0;
-    DlDataOperationType dataOperationType = 1;
-    DlOperationSource operationSource = 2;
+    LockDataTypeEnum lockDataType = 0;
+    DataOperationTypeEnum dataOperationType = 1;
+    OperationSourceEnum operationSource = 2;
     nullable INT16U userIndex = 3;
     nullable fabric_idx fabricIndex = 4;
     nullable NODE_ID sourceNode = 5;
@@ -2030,17 +2030,17 @@ server cluster DoorLock = 257 {
   readonly attribute DlLockType lockType = 1;
   readonly attribute boolean actuatorEnabled = 2;
   attribute access(write: manage) int32u autoRelockTime = 35;
-  attribute access(write: manage) DlOperatingMode operatingMode = 37;
+  attribute access(write: manage) OperatingModeEnum operatingMode = 37;
   readonly attribute DlSupportedOperatingModes supportedOperatingModes = 38;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
 
   request struct LockDoorRequest {
-    optional OCTET_STRING pinCode = 0;
+    optional OCTET_STRING PINCode = 0;
   }
 
   request struct UnlockDoorRequest {
-    optional OCTET_STRING pinCode = 0;
+    optional OCTET_STRING PINCode = 0;
   }
 
   timed command LockDoor(LockDoorRequest): DefaultSuccess = 0;
@@ -2169,6 +2169,16 @@ server cluster PumpConfigurationAndControl = 512 {
     kLocal = 3;
   }
 
+  bitmap PumpFeature : BITMAP32 {
+    kConstantPressure = 0x1;
+    kCompensatedPressure = 0x2;
+    kConstantFlow = 0x4;
+    kConstantSpeed = 0x8;
+    kConstantTemperature = 0x10;
+    kAutomatic = 0x20;
+    kLocal = 0x40;
+  }
+
   bitmap PumpStatus : BITMAP16 {
     kDeviceFault = 0x1;
     kSupplyfault = 0x2;
@@ -2235,6 +2245,8 @@ server cluster PumpConfigurationAndControl = 512 {
   readonly attribute nullable int16s maxPressure = 0;
   readonly attribute nullable int16u maxSpeed = 1;
   readonly attribute nullable int16u maxFlow = 2;
+  readonly attribute nullable int16s minConstPressure = 3;
+  readonly attribute nullable int16s maxConstPressure = 4;
   readonly attribute PumpOperationMode effectiveOperationMode = 17;
   readonly attribute PumpControlMode effectiveControlMode = 18;
   readonly attribute nullable int16s capacity = 19;
@@ -3664,12 +3676,14 @@ endpoint 1 {
     ram      attribute maxPressure;
     ram      attribute maxSpeed;
     ram      attribute maxFlow;
+    ram      attribute minConstPressure;
+    ram      attribute maxConstPressure;
     ram      attribute effectiveOperationMode;
     ram      attribute effectiveControlMode;
     ram      attribute capacity;
     ram      attribute operationMode;
-    ram      attribute featureMap;
-    ram      attribute clusterRevision default = 3;
+    ram      attribute featureMap default = 1;
+    ram      attribute clusterRevision default = 4;
   }
 
   server cluster Thermostat {
diff --git a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap
index aba2e9b00a89ac..e5c4258b21f8fd 100644
--- a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap
+++ b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap
@@ -5121,7 +5121,7 @@
               "code": 0,
               "mfgCode": null,
               "side": "server",
-              "type": "PHYRate",
+              "type": "PHYRateEnum",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -5395,7 +5395,7 @@
           ]
         },
         {
-          "name": "AdministratorCommissioning",
+          "name": "Administrator Commissioning",
           "code": 60,
           "mfgCode": null,
           "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
@@ -5447,7 +5447,7 @@
           ]
         },
         {
-          "name": "AdministratorCommissioning",
+          "name": "Administrator Commissioning",
           "code": 60,
           "mfgCode": null,
           "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
@@ -5459,7 +5459,7 @@
               "code": 0,
               "mfgCode": null,
               "side": "server",
-              "type": "CommissioningWindowStatus",
+              "type": "CommissioningWindowStatusEnum",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -6221,7 +6221,7 @@
               "code": 3,
               "mfgCode": null,
               "side": "server",
-              "type": "DlDoorState",
+              "type": "DoorStateEnum",
               "included": 0,
               "storageOption": "RAM",
               "singleton": 0,
@@ -6301,7 +6301,7 @@
               "code": 37,
               "mfgCode": null,
               "side": "server",
-              "type": "DlOperatingMode",
+              "type": "OperatingModeEnum",
               "included": 0,
               "storageOption": "RAM",
               "singleton": 0,
@@ -12651,7 +12651,7 @@
               "code": 3,
               "mfgCode": null,
               "side": "server",
-              "type": "DlDoorState",
+              "type": "DoorStateEnum",
               "included": 0,
               "storageOption": "RAM",
               "singleton": 0,
@@ -12971,7 +12971,7 @@
               "code": 37,
               "mfgCode": null,
               "side": "server",
-              "type": "DlOperatingMode",
+              "type": "OperatingModeEnum",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -13956,11 +13956,11 @@
               "mfgCode": null,
               "side": "server",
               "type": "int16s",
-              "included": 0,
+              "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "",
+              "defaultValue": null,
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
@@ -13972,11 +13972,11 @@
               "mfgCode": null,
               "side": "server",
               "type": "int16s",
-              "included": 0,
+              "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "",
+              "defaultValue": null,
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
@@ -14280,7 +14280,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "0",
+              "defaultValue": "1",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
@@ -14296,7 +14296,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "3",
+              "defaultValue": "4",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -22547,7 +22547,7 @@
               "code": 3,
               "mfgCode": null,
               "side": "server",
-              "type": "DlDoorState",
+              "type": "DoorStateEnum",
               "included": 0,
               "storageOption": "RAM",
               "singleton": 0,
@@ -22627,7 +22627,7 @@
               "code": 37,
               "mfgCode": null,
               "side": "server",
-              "type": "DlOperatingMode",
+              "type": "OperatingModeEnum",
               "included": 0,
               "storageOption": "RAM",
               "singleton": 0,
diff --git a/examples/bridge-app/bridge-common/bridge-app.matter b/examples/bridge-app/bridge-common/bridge-app.matter
index 5d5c889277e1ff..9ad049a62dd53c 100644
--- a/examples/bridge-app/bridge-common/bridge-app.matter
+++ b/examples/bridge-app/bridge-common/bridge-app.matter
@@ -801,7 +801,7 @@ server cluster GeneralDiagnostics = 51 {
     kSoftwareReset = 6;
   }
 
-  enum HardwareFault : ENUM8 {
+  enum HardwareFaultEnum : ENUM8 {
     kUnspecified = 0;
     kRadio = 1;
     kSensor = 2;
@@ -815,7 +815,7 @@ server cluster GeneralDiagnostics = 51 {
     kTamperDetected = 10;
   }
 
-  enum InterfaceType : ENUM8 {
+  enum InterfaceTypeEnum : ENUM8 {
     kUnspecified = 0;
     kWiFi = 1;
     kEthernet = 2;
@@ -823,14 +823,14 @@ server cluster GeneralDiagnostics = 51 {
     kThread = 4;
   }
 
-  enum NetworkFaultType : ENUM8 {
+  enum NetworkFaultEnum : ENUM8 {
     kUnspecified = 0;
     kHardwareFailure = 1;
     kNetworkJammed = 2;
     kConnectionFailed = 3;
   }
 
-  enum RadioFault : ENUM8 {
+  enum RadioFaultEnum : ENUM8 {
     kUnspecified = 0;
     kWiFiFault = 1;
     kCellularFault = 2;
@@ -848,22 +848,22 @@ server cluster GeneralDiagnostics = 51 {
     octet_string<8> hardwareAddress = 4;
     octet_string IPv4Addresses[] = 5;
     octet_string IPv6Addresses[] = 6;
-    InterfaceType type = 7;
+    InterfaceTypeEnum type = 7;
   }
 
   critical event HardwareFaultChange = 0 {
-    HardwareFault current[] = 0;
-    HardwareFault previous[] = 1;
+    HardwareFaultEnum current[] = 0;
+    HardwareFaultEnum previous[] = 1;
   }
 
   critical event RadioFaultChange = 1 {
-    RadioFault current[] = 0;
-    RadioFault previous[] = 1;
+    RadioFaultEnum current[] = 0;
+    RadioFaultEnum previous[] = 1;
   }
 
   critical event NetworkFaultChange = 2 {
-    NetworkFaultType current[] = 0;
-    NetworkFaultType previous[] = 1;
+    NetworkFaultEnum current[] = 0;
+    NetworkFaultEnum previous[] = 1;
   }
 
   critical event BootReason = 3 {
@@ -875,9 +875,9 @@ server cluster GeneralDiagnostics = 51 {
   readonly attribute int64u upTime = 2;
   readonly attribute int32u totalOperationalHours = 3;
   readonly attribute BootReasonEnum bootReason = 4;
-  readonly attribute HardwareFault activeHardwareFaults[] = 5;
-  readonly attribute RadioFault activeRadioFaults[] = 6;
-  readonly attribute NetworkFaultType activeNetworkFaults[] = 7;
+  readonly attribute HardwareFaultEnum activeHardwareFaults[] = 5;
+  readonly attribute RadioFaultEnum activeRadioFaults[] = 6;
+  readonly attribute NetworkFaultEnum activeNetworkFaults[] = 7;
   readonly attribute boolean testEventTriggersEnabled = 8;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -1138,7 +1138,7 @@ server cluster WiFiNetworkDiagnostics = 54 {
 }
 
 server cluster EthernetNetworkDiagnostics = 55 {
-  enum PHYRate : ENUM8 {
+  enum PHYRateEnum : ENUM8 {
     kRate10M = 0;
     kRate100M = 1;
     kRate1G = 2;
@@ -1151,7 +1151,7 @@ server cluster EthernetNetworkDiagnostics = 55 {
     kRate400G = 9;
   }
 
-  readonly attribute nullable PHYRate PHYRate = 0;
+  readonly attribute nullable PHYRateEnum PHYRate = 0;
   readonly attribute nullable boolean fullDuplex = 1;
   readonly attribute int64u packetRxCount = 2;
   readonly attribute int64u packetTxCount = 3;
@@ -1213,7 +1213,7 @@ server cluster Switch = 59 {
 }
 
 server cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatus : ENUM8 {
+  enum CommissioningWindowStatusEnum : ENUM8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
     kBasicWindowOpen = 2;
@@ -1225,7 +1225,7 @@ server cluster AdministratorCommissioning = 60 {
     kWindowNotOpen = 4;
   }
 
-  readonly attribute CommissioningWindowStatus windowStatus = 0;
+  readonly attribute CommissioningWindowStatusEnum windowStatus = 0;
   readonly attribute nullable fabric_idx adminFabricIndex = 1;
   readonly attribute nullable int16u adminVendorId = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
diff --git a/examples/bridge-app/bridge-common/bridge-app.zap b/examples/bridge-app/bridge-common/bridge-app.zap
index 28c59bdbd6369e..e7ea939cda1709 100644
--- a/examples/bridge-app/bridge-common/bridge-app.zap
+++ b/examples/bridge-app/bridge-common/bridge-app.zap
@@ -3855,7 +3855,7 @@
               "code": 0,
               "mfgCode": null,
               "side": "server",
-              "type": "PHYRate",
+              "type": "PHYRateEnum",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -4029,7 +4029,7 @@
           ]
         },
         {
-          "name": "AdministratorCommissioning",
+          "name": "Administrator Commissioning",
           "code": 60,
           "mfgCode": null,
           "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
@@ -4097,7 +4097,7 @@
           ]
         },
         {
-          "name": "AdministratorCommissioning",
+          "name": "Administrator Commissioning",
           "code": 60,
           "mfgCode": null,
           "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
@@ -4109,7 +4109,7 @@
               "code": 0,
               "mfgCode": null,
               "side": "server",
-              "type": "CommissioningWindowStatus",
+              "type": "CommissioningWindowStatusEnum",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
diff --git a/examples/chef/common/stubs.cpp b/examples/chef/common/stubs.cpp
index f170d306ff9ff3..f0339ff76f14b1 100644
--- a/examples/chef/common/stubs.cpp
+++ b/examples/chef/common/stubs.cpp
@@ -2,24 +2,23 @@
 #include <app-common/zap-generated/attribute-type.h>
 #include <app-common/zap-generated/attributes/Accessors.h>
 #include <app-common/zap-generated/callback.h>
-#include <app-common/zap-generated/command-id.h>
 
 // Include door lock callbacks only when the server is enabled
 #ifdef EMBER_AF_PLUGIN_DOOR_LOCK_SERVER
 #include <app/clusters/door-lock-server/door-lock-server.h>
 
 bool emberAfPluginDoorLockOnDoorLockCommand(chip::EndpointId endpointId, const chip::Optional<chip::ByteSpan> & pinCode,
-                                            chip::app::Clusters::DoorLock::DlOperationError & err)
+                                            chip::app::Clusters::DoorLock::OperationErrorEnum & err)
 {
-    err = DlOperationError::kUnspecified;
+    err = OperationErrorEnum::kUnspecified;
     // TBD: LockManager, check pinCode, ...
     return DoorLockServer::Instance().SetLockState(endpointId, DlLockState::kLocked);
 }
 
 bool emberAfPluginDoorLockOnDoorUnlockCommand(chip::EndpointId endpointId, const chip::Optional<chip::ByteSpan> & pinCode,
-                                              chip::app::Clusters::DoorLock::DlOperationError & err)
+                                              chip::app::Clusters::DoorLock::OperationErrorEnum & err)
 {
-    err = DlOperationError::kUnspecified;
+    err = OperationErrorEnum::kUnspecified;
     // TBD: LockManager, check pinCode, ...
     return DoorLockServer::Instance().SetLockState(endpointId, DlLockState::kUnlocked);
 }
diff --git a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter
index 1b36a25668237a..050a119036d258 100644
--- a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter
+++ b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter
@@ -656,7 +656,7 @@ server cluster GeneralDiagnostics = 51 {
     kSoftwareReset = 6;
   }
 
-  enum HardwareFault : ENUM8 {
+  enum HardwareFaultEnum : ENUM8 {
     kUnspecified = 0;
     kRadio = 1;
     kSensor = 2;
@@ -670,7 +670,7 @@ server cluster GeneralDiagnostics = 51 {
     kTamperDetected = 10;
   }
 
-  enum InterfaceType : ENUM8 {
+  enum InterfaceTypeEnum : ENUM8 {
     kUnspecified = 0;
     kWiFi = 1;
     kEthernet = 2;
@@ -678,14 +678,14 @@ server cluster GeneralDiagnostics = 51 {
     kThread = 4;
   }
 
-  enum NetworkFaultType : ENUM8 {
+  enum NetworkFaultEnum : ENUM8 {
     kUnspecified = 0;
     kHardwareFailure = 1;
     kNetworkJammed = 2;
     kConnectionFailed = 3;
   }
 
-  enum RadioFault : ENUM8 {
+  enum RadioFaultEnum : ENUM8 {
     kUnspecified = 0;
     kWiFiFault = 1;
     kCellularFault = 2;
@@ -703,22 +703,22 @@ server cluster GeneralDiagnostics = 51 {
     octet_string<8> hardwareAddress = 4;
     octet_string IPv4Addresses[] = 5;
     octet_string IPv6Addresses[] = 6;
-    InterfaceType type = 7;
+    InterfaceTypeEnum type = 7;
   }
 
   critical event HardwareFaultChange = 0 {
-    HardwareFault current[] = 0;
-    HardwareFault previous[] = 1;
+    HardwareFaultEnum current[] = 0;
+    HardwareFaultEnum previous[] = 1;
   }
 
   critical event RadioFaultChange = 1 {
-    RadioFault current[] = 0;
-    RadioFault previous[] = 1;
+    RadioFaultEnum current[] = 0;
+    RadioFaultEnum previous[] = 1;
   }
 
   critical event NetworkFaultChange = 2 {
-    NetworkFaultType current[] = 0;
-    NetworkFaultType previous[] = 1;
+    NetworkFaultEnum current[] = 0;
+    NetworkFaultEnum previous[] = 1;
   }
 
   critical event BootReason = 3 {
@@ -730,9 +730,9 @@ server cluster GeneralDiagnostics = 51 {
   readonly attribute int64u upTime = 2;
   readonly attribute int32u totalOperationalHours = 3;
   readonly attribute BootReasonEnum bootReason = 4;
-  readonly attribute HardwareFault activeHardwareFaults[] = 5;
-  readonly attribute RadioFault activeRadioFaults[] = 6;
-  readonly attribute NetworkFaultType activeNetworkFaults[] = 7;
+  readonly attribute HardwareFaultEnum activeHardwareFaults[] = 5;
+  readonly attribute RadioFaultEnum activeRadioFaults[] = 6;
+  readonly attribute NetworkFaultEnum activeNetworkFaults[] = 7;
   readonly attribute boolean testEventTriggersEnabled = 8;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
@@ -996,7 +996,7 @@ server cluster WiFiNetworkDiagnostics = 54 {
 }
 
 server cluster EthernetNetworkDiagnostics = 55 {
-  enum PHYRate : ENUM8 {
+  enum PHYRateEnum : ENUM8 {
     kRate10M = 0;
     kRate100M = 1;
     kRate1G = 2;
@@ -1009,7 +1009,7 @@ server cluster EthernetNetworkDiagnostics = 55 {
     kRate400G = 9;
   }
 
-  readonly attribute nullable PHYRate PHYRate = 0;
+  readonly attribute nullable PHYRateEnum PHYRate = 0;
   readonly attribute nullable boolean fullDuplex = 1;
   readonly attribute int64u packetRxCount = 2;
   readonly attribute int64u packetTxCount = 3;
@@ -1068,7 +1068,7 @@ server cluster Switch = 59 {
 }
 
 server cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatus : ENUM8 {
+  enum CommissioningWindowStatusEnum : ENUM8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
     kBasicWindowOpen = 2;
@@ -1080,7 +1080,7 @@ server cluster AdministratorCommissioning = 60 {
     kWindowNotOpen = 4;
   }
 
-  readonly attribute CommissioningWindowStatus windowStatus = 0;
+  readonly attribute CommissioningWindowStatusEnum windowStatus = 0;
   readonly attribute nullable fabric_idx adminFabricIndex = 1;
   readonly attribute nullable int16u adminVendorId = 2;
   readonly attribute bitmap32 featureMap = 65532;
diff --git a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.zap b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.zap
index ae48c3f3208850..db21fdca32ba5b 100644
--- a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.zap
+++ b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.zap
@@ -4265,7 +4265,7 @@
               "code": 0,
               "mfgCode": null,
               "side": "server",
-              "type": "PHYRate",
+              "type": "PHYRateEnum",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -4489,7 +4489,7 @@
           ]
         },
         {
-          "name": "AdministratorCommissioning",
+          "name": "Administrator Commissioning",
           "code": 60,
           "mfgCode": null,
           "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
@@ -4541,7 +4541,7 @@
           ]
         },
         {
-          "name": "AdministratorCommissioning",
+          "name": "Administrator Commissioning",
           "code": 60,
           "mfgCode": null,
           "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
@@ -4553,7 +4553,7 @@
               "code": 0,
               "mfgCode": null,
               "side": "server",
-              "type": "CommissioningWindowStatus",
+              "type": "CommissioningWindowStatusEnum",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
diff --git a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter
index 41a65b560101dd..a73febd35b22ab 100644
--- a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter
+++ b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter
@@ -768,7 +768,7 @@ server cluster GeneralDiagnostics = 51 {
     kSoftwareReset = 6;
   }
 
-  enum HardwareFault : ENUM8 {
+  enum HardwareFaultEnum : ENUM8 {
     kUnspecified = 0;
     kRadio = 1;
     kSensor = 2;
@@ -782,7 +782,7 @@ server cluster GeneralDiagnostics = 51 {
     kTamperDetected = 10;
   }
 
-  enum InterfaceType : ENUM8 {
+  enum InterfaceTypeEnum : ENUM8 {
     kUnspecified = 0;
     kWiFi = 1;
     kEthernet = 2;
@@ -790,14 +790,14 @@ server cluster GeneralDiagnostics = 51 {
     kThread = 4;
   }
 
-  enum NetworkFaultType : ENUM8 {
+  enum NetworkFaultEnum : ENUM8 {
     kUnspecified = 0;
     kHardwareFailure = 1;
     kNetworkJammed = 2;
     kConnectionFailed = 3;
   }
 
-  enum RadioFault : ENUM8 {
+  enum RadioFaultEnum : ENUM8 {
     kUnspecified = 0;
     kWiFiFault = 1;
     kCellularFault = 2;
@@ -815,22 +815,22 @@ server cluster GeneralDiagnostics = 51 {
     octet_string<8> hardwareAddress = 4;
     octet_string IPv4Addresses[] = 5;
     octet_string IPv6Addresses[] = 6;
-    InterfaceType type = 7;
+    InterfaceTypeEnum type = 7;
   }
 
   critical event HardwareFaultChange = 0 {
-    HardwareFault current[] = 0;
-    HardwareFault previous[] = 1;
+    HardwareFaultEnum current[] = 0;
+    HardwareFaultEnum previous[] = 1;
   }
 
   critical event RadioFaultChange = 1 {
-    RadioFault current[] = 0;
-    RadioFault previous[] = 1;
+    RadioFaultEnum current[] = 0;
+    RadioFaultEnum previous[] = 1;
   }
 
   critical event NetworkFaultChange = 2 {
-    NetworkFaultType current[] = 0;
-    NetworkFaultType previous[] = 1;
+    NetworkFaultEnum current[] = 0;
+    NetworkFaultEnum previous[] = 1;
   }
 
   critical event BootReason = 3 {
@@ -842,9 +842,9 @@ server cluster GeneralDiagnostics = 51 {
   readonly attribute int64u upTime = 2;
   readonly attribute int32u totalOperationalHours = 3;
   readonly attribute BootReasonEnum bootReason = 4;
-  readonly attribute HardwareFault activeHardwareFaults[] = 5;
-  readonly attribute RadioFault activeRadioFaults[] = 6;
-  readonly attribute NetworkFaultType activeNetworkFaults[] = 7;
+  readonly attribute HardwareFaultEnum activeHardwareFaults[] = 5;
+  readonly attribute RadioFaultEnum activeRadioFaults[] = 6;
+  readonly attribute NetworkFaultEnum activeNetworkFaults[] = 7;
   readonly attribute boolean testEventTriggersEnabled = 8;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
@@ -887,7 +887,7 @@ server cluster SoftwareDiagnostics = 52 {
 }
 
 server cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatus : ENUM8 {
+  enum CommissioningWindowStatusEnum : ENUM8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
     kBasicWindowOpen = 2;
@@ -899,7 +899,7 @@ server cluster AdministratorCommissioning = 60 {
     kWindowNotOpen = 4;
   }
 
-  readonly attribute CommissioningWindowStatus windowStatus = 0;
+  readonly attribute CommissioningWindowStatusEnum windowStatus = 0;
   readonly attribute nullable fabric_idx adminFabricIndex = 1;
   readonly attribute nullable int16u adminVendorId = 2;
   readonly attribute bitmap32 featureMap = 65532;
@@ -1283,7 +1283,7 @@ server cluster ColorControl = 768 {
   }
 
   request struct MoveToColorTemperatureRequest {
-    INT16U colorTemperature = 0;
+    INT16U colorTemperatureMireds = 0;
     INT16U transitionTime = 1;
     BITMAP8 optionsMask = 2;
     BITMAP8 optionsOverride = 3;
diff --git a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.zap b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.zap
index f63cd021a54e1b..7f5d6b13b6277f 100644
--- a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.zap
+++ b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.zap
@@ -4361,7 +4361,7 @@
               "code": 0,
               "mfgCode": null,
               "side": "server",
-              "type": "PHYRate",
+              "type": "PHYRateEnum",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -4617,7 +4617,7 @@
           ]
         },
         {
-          "name": "AdministratorCommissioning",
+          "name": "Administrator Commissioning",
           "code": 60,
           "mfgCode": null,
           "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
@@ -4669,7 +4669,7 @@
           ]
         },
         {
-          "name": "AdministratorCommissioning",
+          "name": "Administrator Commissioning",
           "code": 60,
           "mfgCode": null,
           "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
@@ -4681,7 +4681,7 @@
               "code": 0,
               "mfgCode": null,
               "side": "server",
-              "type": "CommissioningWindowStatus",
+              "type": "CommissioningWindowStatusEnum",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
diff --git a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter
index c0273c715dbac3..c78e19271ca6bd 100644
--- a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter
+++ b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter
@@ -641,7 +641,7 @@ server cluster GeneralDiagnostics = 51 {
     kSoftwareReset = 6;
   }
 
-  enum HardwareFault : ENUM8 {
+  enum HardwareFaultEnum : ENUM8 {
     kUnspecified = 0;
     kRadio = 1;
     kSensor = 2;
@@ -655,7 +655,7 @@ server cluster GeneralDiagnostics = 51 {
     kTamperDetected = 10;
   }
 
-  enum InterfaceType : ENUM8 {
+  enum InterfaceTypeEnum : ENUM8 {
     kUnspecified = 0;
     kWiFi = 1;
     kEthernet = 2;
@@ -663,14 +663,14 @@ server cluster GeneralDiagnostics = 51 {
     kThread = 4;
   }
 
-  enum NetworkFaultType : ENUM8 {
+  enum NetworkFaultEnum : ENUM8 {
     kUnspecified = 0;
     kHardwareFailure = 1;
     kNetworkJammed = 2;
     kConnectionFailed = 3;
   }
 
-  enum RadioFault : ENUM8 {
+  enum RadioFaultEnum : ENUM8 {
     kUnspecified = 0;
     kWiFiFault = 1;
     kCellularFault = 2;
@@ -688,22 +688,22 @@ server cluster GeneralDiagnostics = 51 {
     octet_string<8> hardwareAddress = 4;
     octet_string IPv4Addresses[] = 5;
     octet_string IPv6Addresses[] = 6;
-    InterfaceType type = 7;
+    InterfaceTypeEnum type = 7;
   }
 
   critical event HardwareFaultChange = 0 {
-    HardwareFault current[] = 0;
-    HardwareFault previous[] = 1;
+    HardwareFaultEnum current[] = 0;
+    HardwareFaultEnum previous[] = 1;
   }
 
   critical event RadioFaultChange = 1 {
-    RadioFault current[] = 0;
-    RadioFault previous[] = 1;
+    RadioFaultEnum current[] = 0;
+    RadioFaultEnum previous[] = 1;
   }
 
   critical event NetworkFaultChange = 2 {
-    NetworkFaultType current[] = 0;
-    NetworkFaultType previous[] = 1;
+    NetworkFaultEnum current[] = 0;
+    NetworkFaultEnum previous[] = 1;
   }
 
   critical event BootReason = 3 {
@@ -715,9 +715,9 @@ server cluster GeneralDiagnostics = 51 {
   readonly attribute int64u upTime = 2;
   readonly attribute int32u totalOperationalHours = 3;
   readonly attribute BootReasonEnum bootReason = 4;
-  readonly attribute HardwareFault activeHardwareFaults[] = 5;
-  readonly attribute RadioFault activeRadioFaults[] = 6;
-  readonly attribute NetworkFaultType activeNetworkFaults[] = 7;
+  readonly attribute HardwareFaultEnum activeHardwareFaults[] = 5;
+  readonly attribute RadioFaultEnum activeRadioFaults[] = 6;
+  readonly attribute NetworkFaultEnum activeNetworkFaults[] = 7;
   readonly attribute boolean testEventTriggersEnabled = 8;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
@@ -803,7 +803,7 @@ server cluster Switch = 59 {
 }
 
 server cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatus : ENUM8 {
+  enum CommissioningWindowStatusEnum : ENUM8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
     kBasicWindowOpen = 2;
@@ -815,7 +815,7 @@ server cluster AdministratorCommissioning = 60 {
     kWindowNotOpen = 4;
   }
 
-  readonly attribute CommissioningWindowStatus windowStatus = 0;
+  readonly attribute CommissioningWindowStatusEnum windowStatus = 0;
   readonly attribute nullable fabric_idx adminFabricIndex = 1;
   readonly attribute nullable int16u adminVendorId = 2;
   readonly attribute bitmap32 featureMap = 65532;
diff --git a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.zap b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.zap
index b6d56032c51f1f..54f47666dbe4c8 100644
--- a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.zap
+++ b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.zap
@@ -4265,7 +4265,7 @@
               "code": 0,
               "mfgCode": null,
               "side": "server",
-              "type": "PHYRate",
+              "type": "PHYRateEnum",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -4489,7 +4489,7 @@
           ]
         },
         {
-          "name": "AdministratorCommissioning",
+          "name": "Administrator Commissioning",
           "code": 60,
           "mfgCode": null,
           "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
@@ -4541,7 +4541,7 @@
           ]
         },
         {
-          "name": "AdministratorCommissioning",
+          "name": "Administrator Commissioning",
           "code": 60,
           "mfgCode": null,
           "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
@@ -4553,7 +4553,7 @@
               "code": 0,
               "mfgCode": null,
               "side": "server",
-              "type": "CommissioningWindowStatus",
+              "type": "CommissioningWindowStatusEnum",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
diff --git a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter
index dc4e9b8436caac..5f2806abc28224 100644
--- a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter
+++ b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter
@@ -790,7 +790,7 @@ server cluster GeneralDiagnostics = 51 {
     kSoftwareReset = 6;
   }
 
-  enum HardwareFault : ENUM8 {
+  enum HardwareFaultEnum : ENUM8 {
     kUnspecified = 0;
     kRadio = 1;
     kSensor = 2;
@@ -804,7 +804,7 @@ server cluster GeneralDiagnostics = 51 {
     kTamperDetected = 10;
   }
 
-  enum InterfaceType : ENUM8 {
+  enum InterfaceTypeEnum : ENUM8 {
     kUnspecified = 0;
     kWiFi = 1;
     kEthernet = 2;
@@ -812,14 +812,14 @@ server cluster GeneralDiagnostics = 51 {
     kThread = 4;
   }
 
-  enum NetworkFaultType : ENUM8 {
+  enum NetworkFaultEnum : ENUM8 {
     kUnspecified = 0;
     kHardwareFailure = 1;
     kNetworkJammed = 2;
     kConnectionFailed = 3;
   }
 
-  enum RadioFault : ENUM8 {
+  enum RadioFaultEnum : ENUM8 {
     kUnspecified = 0;
     kWiFiFault = 1;
     kCellularFault = 2;
@@ -837,22 +837,22 @@ server cluster GeneralDiagnostics = 51 {
     octet_string<8> hardwareAddress = 4;
     octet_string IPv4Addresses[] = 5;
     octet_string IPv6Addresses[] = 6;
-    InterfaceType type = 7;
+    InterfaceTypeEnum type = 7;
   }
 
   critical event HardwareFaultChange = 0 {
-    HardwareFault current[] = 0;
-    HardwareFault previous[] = 1;
+    HardwareFaultEnum current[] = 0;
+    HardwareFaultEnum previous[] = 1;
   }
 
   critical event RadioFaultChange = 1 {
-    RadioFault current[] = 0;
-    RadioFault previous[] = 1;
+    RadioFaultEnum current[] = 0;
+    RadioFaultEnum previous[] = 1;
   }
 
   critical event NetworkFaultChange = 2 {
-    NetworkFaultType current[] = 0;
-    NetworkFaultType previous[] = 1;
+    NetworkFaultEnum current[] = 0;
+    NetworkFaultEnum previous[] = 1;
   }
 
   critical event BootReason = 3 {
@@ -864,9 +864,9 @@ server cluster GeneralDiagnostics = 51 {
   readonly attribute int64u upTime = 2;
   readonly attribute int32u totalOperationalHours = 3;
   readonly attribute BootReasonEnum bootReason = 4;
-  readonly attribute HardwareFault activeHardwareFaults[] = 5;
-  readonly attribute RadioFault activeRadioFaults[] = 6;
-  readonly attribute NetworkFaultType activeNetworkFaults[] = 7;
+  readonly attribute HardwareFaultEnum activeHardwareFaults[] = 5;
+  readonly attribute RadioFaultEnum activeRadioFaults[] = 6;
+  readonly attribute NetworkFaultEnum activeNetworkFaults[] = 7;
   readonly attribute boolean testEventTriggersEnabled = 8;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
@@ -952,7 +952,7 @@ server cluster Switch = 59 {
 }
 
 server cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatus : ENUM8 {
+  enum CommissioningWindowStatusEnum : ENUM8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
     kBasicWindowOpen = 2;
@@ -964,7 +964,7 @@ server cluster AdministratorCommissioning = 60 {
     kWindowNotOpen = 4;
   }
 
-  readonly attribute CommissioningWindowStatus windowStatus = 0;
+  readonly attribute CommissioningWindowStatusEnum windowStatus = 0;
   readonly attribute nullable fabric_idx adminFabricIndex = 1;
   readonly attribute nullable int16u adminVendorId = 2;
   readonly attribute bitmap32 featureMap = 65532;
diff --git a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.zap b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.zap
index 95bffc4c6a8f6e..bbb0c0cd734d79 100644
--- a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.zap
+++ b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.zap
@@ -4265,7 +4265,7 @@
               "code": 0,
               "mfgCode": null,
               "side": "server",
-              "type": "PHYRate",
+              "type": "PHYRateEnum",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -4489,7 +4489,7 @@
           ]
         },
         {
-          "name": "AdministratorCommissioning",
+          "name": "Administrator Commissioning",
           "code": 60,
           "mfgCode": null,
           "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
@@ -4541,7 +4541,7 @@
           ]
         },
         {
-          "name": "AdministratorCommissioning",
+          "name": "Administrator Commissioning",
           "code": 60,
           "mfgCode": null,
           "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
@@ -4553,7 +4553,7 @@
               "code": 0,
               "mfgCode": null,
               "side": "server",
-              "type": "CommissioningWindowStatus",
+              "type": "CommissioningWindowStatusEnum",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
diff --git a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter
index 56f3be8455f82c..20cc3bb20da76b 100644
--- a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter
+++ b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter
@@ -641,7 +641,7 @@ server cluster GeneralDiagnostics = 51 {
     kSoftwareReset = 6;
   }
 
-  enum HardwareFault : ENUM8 {
+  enum HardwareFaultEnum : ENUM8 {
     kUnspecified = 0;
     kRadio = 1;
     kSensor = 2;
@@ -655,7 +655,7 @@ server cluster GeneralDiagnostics = 51 {
     kTamperDetected = 10;
   }
 
-  enum InterfaceType : ENUM8 {
+  enum InterfaceTypeEnum : ENUM8 {
     kUnspecified = 0;
     kWiFi = 1;
     kEthernet = 2;
@@ -663,14 +663,14 @@ server cluster GeneralDiagnostics = 51 {
     kThread = 4;
   }
 
-  enum NetworkFaultType : ENUM8 {
+  enum NetworkFaultEnum : ENUM8 {
     kUnspecified = 0;
     kHardwareFailure = 1;
     kNetworkJammed = 2;
     kConnectionFailed = 3;
   }
 
-  enum RadioFault : ENUM8 {
+  enum RadioFaultEnum : ENUM8 {
     kUnspecified = 0;
     kWiFiFault = 1;
     kCellularFault = 2;
@@ -688,22 +688,22 @@ server cluster GeneralDiagnostics = 51 {
     octet_string<8> hardwareAddress = 4;
     octet_string IPv4Addresses[] = 5;
     octet_string IPv6Addresses[] = 6;
-    InterfaceType type = 7;
+    InterfaceTypeEnum type = 7;
   }
 
   critical event HardwareFaultChange = 0 {
-    HardwareFault current[] = 0;
-    HardwareFault previous[] = 1;
+    HardwareFaultEnum current[] = 0;
+    HardwareFaultEnum previous[] = 1;
   }
 
   critical event RadioFaultChange = 1 {
-    RadioFault current[] = 0;
-    RadioFault previous[] = 1;
+    RadioFaultEnum current[] = 0;
+    RadioFaultEnum previous[] = 1;
   }
 
   critical event NetworkFaultChange = 2 {
-    NetworkFaultType current[] = 0;
-    NetworkFaultType previous[] = 1;
+    NetworkFaultEnum current[] = 0;
+    NetworkFaultEnum previous[] = 1;
   }
 
   critical event BootReason = 3 {
@@ -715,9 +715,9 @@ server cluster GeneralDiagnostics = 51 {
   readonly attribute int64u upTime = 2;
   readonly attribute int32u totalOperationalHours = 3;
   readonly attribute BootReasonEnum bootReason = 4;
-  readonly attribute HardwareFault activeHardwareFaults[] = 5;
-  readonly attribute RadioFault activeRadioFaults[] = 6;
-  readonly attribute NetworkFaultType activeNetworkFaults[] = 7;
+  readonly attribute HardwareFaultEnum activeHardwareFaults[] = 5;
+  readonly attribute RadioFaultEnum activeRadioFaults[] = 6;
+  readonly attribute NetworkFaultEnum activeNetworkFaults[] = 7;
   readonly attribute boolean testEventTriggersEnabled = 8;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
@@ -803,7 +803,7 @@ server cluster Switch = 59 {
 }
 
 server cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatus : ENUM8 {
+  enum CommissioningWindowStatusEnum : ENUM8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
     kBasicWindowOpen = 2;
@@ -815,7 +815,7 @@ server cluster AdministratorCommissioning = 60 {
     kWindowNotOpen = 4;
   }
 
-  readonly attribute CommissioningWindowStatus windowStatus = 0;
+  readonly attribute CommissioningWindowStatusEnum windowStatus = 0;
   readonly attribute nullable fabric_idx adminFabricIndex = 1;
   readonly attribute nullable int16u adminVendorId = 2;
   readonly attribute bitmap32 featureMap = 65532;
@@ -1028,7 +1028,7 @@ server cluster FixedLabel = 64 {
 }
 
 server cluster DoorLock = 257 {
-  enum DlAlarmCode : ENUM8 {
+  enum AlarmCodeEnum : ENUM8 {
     kLockJammed = 0;
     kLockFactoryReset = 1;
     kLockRadioPowerCycled = 3;
@@ -1039,13 +1039,13 @@ server cluster DoorLock = 257 {
     kForcedUser = 8;
   }
 
-  enum DlCredentialRule : ENUM8 {
+  enum CredentialRuleEnum : ENUM8 {
     kSingle = 0;
-    kDouble = 1;
+    kDual = 1;
     kTri = 2;
   }
 
-  enum DlCredentialType : ENUM8 {
+  enum CredentialTypeEnum : ENUM8 {
     kProgrammingPIN = 0;
     kPin = 1;
     kRfid = 2;
@@ -1054,40 +1054,12 @@ server cluster DoorLock = 257 {
     kFace = 5;
   }
 
-  enum DlDataOperationType : ENUM8 {
+  enum DataOperationTypeEnum : ENUM8 {
     kAdd = 0;
     kClear = 1;
     kModify = 2;
   }
 
-  enum DlDoorState : ENUM8 {
-    kDoorOpen = 0;
-    kDoorClosed = 1;
-    kDoorJammed = 2;
-    kDoorForcedOpen = 3;
-    kDoorUnspecifiedError = 4;
-    kDoorAjar = 5;
-  }
-
-  enum DlLockDataType : ENUM8 {
-    kUnspecified = 0;
-    kProgrammingCode = 1;
-    kUserIndex = 2;
-    kWeekDaySchedule = 3;
-    kYearDaySchedule = 4;
-    kHolidaySchedule = 5;
-    kPin = 6;
-    kRfid = 7;
-    kFingerprint = 8;
-  }
-
-  enum DlLockOperationType : ENUM8 {
-    kLock = 0;
-    kUnlock = 1;
-    kNonAccessUserEvent = 2;
-    kForcedUserEvent = 3;
-  }
-
   enum DlLockState : ENUM8 {
     kNotFullyLocked = 0;
     kLocked = 1;
@@ -1108,35 +1080,6 @@ server cluster DoorLock = 257 {
     kDoorFurniture = 10;
   }
 
-  enum DlOperatingMode : ENUM8 {
-    kNormal = 0;
-    kVacation = 1;
-    kPrivacy = 2;
-    kNoRemoteLockUnlock = 3;
-    kPassage = 4;
-  }
-
-  enum DlOperationError : ENUM8 {
-    kUnspecified = 0;
-    kInvalidCredential = 1;
-    kDisabledUserDenied = 2;
-    kRestricted = 3;
-    kInsufficientBattery = 4;
-  }
-
-  enum DlOperationSource : ENUM8 {
-    kUnspecified = 0;
-    kManual = 1;
-    kProprietaryRemote = 2;
-    kKeypad = 3;
-    kAuto = 4;
-    kButton = 5;
-    kSchedule = 6;
-    kRemote = 7;
-    kRfid = 8;
-    kBiometric = 9;
-  }
-
   enum DlStatus : ENUM8 {
     kSuccess = 0;
     kFailure = 1;
@@ -1147,25 +1090,6 @@ server cluster DoorLock = 257 {
     kNotFound = 139;
   }
 
-  enum DlUserStatus : ENUM8 {
-    kAvailable = 0;
-    kOccupiedEnabled = 1;
-    kOccupiedDisabled = 3;
-  }
-
-  enum DlUserType : ENUM8 {
-    kUnrestrictedUser = 0;
-    kYearDayScheduleUser = 1;
-    kWeekDayScheduleUser = 2;
-    kProgrammingUser = 3;
-    kNonAccessUser = 4;
-    kForcedUser = 5;
-    kDisposableUser = 6;
-    kExpiringUser = 7;
-    kScheduleRestrictedUser = 8;
-    kRemoteOnlyUser = 9;
-  }
-
   enum DoorLockOperationEventCode : ENUM8 {
     kUnknownOrMfgSpecific = 0;
     kLock = 1;
@@ -1217,19 +1141,83 @@ server cluster DoorLock = 257 {
     kNotSupported = 255;
   }
 
-  bitmap DlCredentialRuleMask : BITMAP8 {
-    kSingle = 0x1;
-    kDual = 0x2;
-    kTri = 0x4;
+  enum DoorStateEnum : ENUM8 {
+    kDoorOpen = 0;
+    kDoorClosed = 1;
+    kDoorJammed = 2;
+    kDoorForcedOpen = 3;
+    kDoorUnspecifiedError = 4;
+    kDoorAjar = 5;
   }
 
-  bitmap DlCredentialRulesSupport : BITMAP8 {
-    kSingle = 0x1;
-    kDual = 0x2;
-    kTri = 0x4;
+  enum LockDataTypeEnum : ENUM8 {
+    kUnspecified = 0;
+    kProgrammingCode = 1;
+    kUserIndex = 2;
+    kWeekDaySchedule = 3;
+    kYearDaySchedule = 4;
+    kHolidaySchedule = 5;
+    kPin = 6;
+    kRfid = 7;
+    kFingerprint = 8;
+  }
+
+  enum LockOperationTypeEnum : ENUM8 {
+    kLock = 0;
+    kUnlock = 1;
+    kNonAccessUserEvent = 2;
+    kForcedUserEvent = 3;
+  }
+
+  enum OperatingModeEnum : ENUM8 {
+    kNormal = 0;
+    kVacation = 1;
+    kPrivacy = 2;
+    kNoRemoteLockUnlock = 3;
+    kPassage = 4;
+  }
+
+  enum OperationErrorEnum : ENUM8 {
+    kUnspecified = 0;
+    kInvalidCredential = 1;
+    kDisabledUserDenied = 2;
+    kRestricted = 3;
+    kInsufficientBattery = 4;
+  }
+
+  enum OperationSourceEnum : ENUM8 {
+    kUnspecified = 0;
+    kManual = 1;
+    kProprietaryRemote = 2;
+    kKeypad = 3;
+    kAuto = 4;
+    kButton = 5;
+    kSchedule = 6;
+    kRemote = 7;
+    kRfid = 8;
+    kBiometric = 9;
+  }
+
+  enum UserStatusEnum : ENUM8 {
+    kAvailable = 0;
+    kOccupiedEnabled = 1;
+    kOccupiedDisabled = 3;
+  }
+
+  enum UserTypeEnum : ENUM8 {
+    kUnrestrictedUser = 0;
+    kYearDayScheduleUser = 1;
+    kWeekDayScheduleUser = 2;
+    kProgrammingUser = 3;
+    kNonAccessUser = 4;
+    kForcedUser = 5;
+    kDisposableUser = 6;
+    kExpiringUser = 7;
+    kScheduleRestrictedUser = 8;
+    kRemoteOnlyUser = 9;
   }
 
-  bitmap DlDaysMaskMap : BITMAP8 {
+  bitmap DaysMaskMap : BITMAP8 {
     kSunday = 0x1;
     kMonday = 0x2;
     kTuesday = 0x4;
@@ -1239,6 +1227,18 @@ server cluster DoorLock = 257 {
     kSaturday = 0x40;
   }
 
+  bitmap DlCredentialRuleMask : BITMAP8 {
+    kSingle = 0x1;
+    kDual = 0x2;
+    kTri = 0x4;
+  }
+
+  bitmap DlCredentialRulesSupport : BITMAP8 {
+    kSingle = 0x1;
+    kDual = 0x2;
+    kTri = 0x4;
+  }
+
   bitmap DlDefaultConfigurationRegister : BITMAP16 {
     kEnableLocalProgrammingEnabled = 0x1;
     kKeypadInterfaceDefaultAccessEnabled = 0x2;
@@ -1343,51 +1343,51 @@ server cluster DoorLock = 257 {
   }
 
   bitmap DoorLockFeature : BITMAP32 {
-    kPINCredentials = 0x1;
-    kRFIDCredentials = 0x2;
+    kPinCredential = 0x1;
+    kRfidCredential = 0x2;
     kFingerCredentials = 0x4;
     kLogging = 0x8;
-    kWeekDaySchedules = 0x10;
+    kWeekDayAccessSchedules = 0x10;
     kDoorPositionSensor = 0x20;
     kFaceCredentials = 0x40;
-    kCredentialsOTA = 0x80;
-    kUsersManagement = 0x100;
-    kNotifications = 0x200;
-    kYearDaySchedules = 0x400;
+    kCredentialsOverTheAirAccess = 0x80;
+    kUser = 0x100;
+    kNotification = 0x200;
+    kYearDayAccessSchedules = 0x400;
     kHolidaySchedules = 0x800;
   }
 
   critical event DoorLockAlarm = 0 {
-    DlAlarmCode alarmCode = 0;
+    AlarmCodeEnum alarmCode = 0;
   }
 
   critical event DoorStateChange = 1 {
-    DlDoorState doorState = 0;
+    DoorStateEnum doorState = 0;
   }
 
   critical event LockOperation = 2 {
-    DlLockOperationType lockOperationType = 0;
-    DlOperationSource operationSource = 1;
+    LockOperationTypeEnum lockOperationType = 0;
+    OperationSourceEnum operationSource = 1;
     nullable INT16U userIndex = 2;
     nullable fabric_idx fabricIndex = 3;
     nullable NODE_ID sourceNode = 4;
-    optional nullable DlCredential credentials[] = 5;
+    optional nullable CredentialStruct credentials[] = 5;
   }
 
   critical event LockOperationError = 3 {
-    DlLockOperationType lockOperationType = 0;
-    DlOperationSource operationSource = 1;
-    DlOperationError operationError = 2;
+    LockOperationTypeEnum lockOperationType = 0;
+    OperationSourceEnum operationSource = 1;
+    OperationErrorEnum operationError = 2;
     nullable INT16U userIndex = 3;
     nullable fabric_idx fabricIndex = 4;
     nullable NODE_ID sourceNode = 5;
-    optional nullable DlCredential credentials[] = 6;
+    optional nullable CredentialStruct credentials[] = 6;
   }
 
   info event LockUserChange = 4 {
-    DlLockDataType lockDataType = 0;
-    DlDataOperationType dataOperationType = 1;
-    DlOperationSource operationSource = 2;
+    LockDataTypeEnum lockDataType = 0;
+    DataOperationTypeEnum dataOperationType = 1;
+    OperationSourceEnum operationSource = 2;
     nullable INT16U userIndex = 3;
     nullable fabric_idx fabricIndex = 4;
     nullable NODE_ID sourceNode = 5;
@@ -1401,7 +1401,7 @@ server cluster DoorLock = 257 {
   readonly attribute int8u maxPINCodeLength = 23;
   readonly attribute int8u minPINCodeLength = 24;
   attribute access(write: manage) int32u autoRelockTime = 35;
-  attribute access(write: manage) DlOperatingMode operatingMode = 37;
+  attribute access(write: manage) OperatingModeEnum operatingMode = 37;
   readonly attribute DlSupportedOperatingModes supportedOperatingModes = 38;
   attribute access(write: administer) int8u wrongCodeEntryLimit = 48;
   attribute access(write: administer) int8u userCodeTemporaryDisableTime = 49;
@@ -1414,11 +1414,11 @@ server cluster DoorLock = 257 {
   readonly attribute int16u clusterRevision = 65533;
 
   request struct LockDoorRequest {
-    optional OCTET_STRING pinCode = 0;
+    optional OCTET_STRING PINCode = 0;
   }
 
   request struct UnlockDoorRequest {
-    optional OCTET_STRING pinCode = 0;
+    optional OCTET_STRING PINCode = 0;
   }
 
   timed command LockDoor(LockDoorRequest): DefaultSuccess = 0;
diff --git a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.zap b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.zap
index 4d611c986f6d19..762194fd8ad6a1 100644
--- a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.zap
+++ b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.zap
@@ -4265,7 +4265,7 @@
               "code": 0,
               "mfgCode": null,
               "side": "server",
-              "type": "PHYRate",
+              "type": "PHYRateEnum",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -4489,7 +4489,7 @@
           ]
         },
         {
-          "name": "AdministratorCommissioning",
+          "name": "Administrator Commissioning",
           "code": 60,
           "mfgCode": null,
           "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
@@ -4541,7 +4541,7 @@
           ]
         },
         {
-          "name": "AdministratorCommissioning",
+          "name": "Administrator Commissioning",
           "code": 60,
           "mfgCode": null,
           "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
@@ -4553,7 +4553,7 @@
               "code": 0,
               "mfgCode": null,
               "side": "server",
-              "type": "CommissioningWindowStatus",
+              "type": "CommissioningWindowStatusEnum",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -7067,7 +7067,7 @@
               "code": 3,
               "mfgCode": null,
               "side": "server",
-              "type": "DlDoorState",
+              "type": "DoorStateEnum",
               "included": 0,
               "storageOption": "RAM",
               "singleton": 0,
@@ -7371,7 +7371,7 @@
               "code": 37,
               "mfgCode": null,
               "side": "server",
-              "type": "DlOperatingMode",
+              "type": "OperatingModeEnum",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
diff --git a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter
index 235539e4fdd249..29a4b8ca37a86c 100644
--- a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter
+++ b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter
@@ -790,7 +790,7 @@ server cluster GeneralDiagnostics = 51 {
     kSoftwareReset = 6;
   }
 
-  enum HardwareFault : ENUM8 {
+  enum HardwareFaultEnum : ENUM8 {
     kUnspecified = 0;
     kRadio = 1;
     kSensor = 2;
@@ -804,7 +804,7 @@ server cluster GeneralDiagnostics = 51 {
     kTamperDetected = 10;
   }
 
-  enum InterfaceType : ENUM8 {
+  enum InterfaceTypeEnum : ENUM8 {
     kUnspecified = 0;
     kWiFi = 1;
     kEthernet = 2;
@@ -812,14 +812,14 @@ server cluster GeneralDiagnostics = 51 {
     kThread = 4;
   }
 
-  enum NetworkFaultType : ENUM8 {
+  enum NetworkFaultEnum : ENUM8 {
     kUnspecified = 0;
     kHardwareFailure = 1;
     kNetworkJammed = 2;
     kConnectionFailed = 3;
   }
 
-  enum RadioFault : ENUM8 {
+  enum RadioFaultEnum : ENUM8 {
     kUnspecified = 0;
     kWiFiFault = 1;
     kCellularFault = 2;
@@ -837,22 +837,22 @@ server cluster GeneralDiagnostics = 51 {
     octet_string<8> hardwareAddress = 4;
     octet_string IPv4Addresses[] = 5;
     octet_string IPv6Addresses[] = 6;
-    InterfaceType type = 7;
+    InterfaceTypeEnum type = 7;
   }
 
   critical event HardwareFaultChange = 0 {
-    HardwareFault current[] = 0;
-    HardwareFault previous[] = 1;
+    HardwareFaultEnum current[] = 0;
+    HardwareFaultEnum previous[] = 1;
   }
 
   critical event RadioFaultChange = 1 {
-    RadioFault current[] = 0;
-    RadioFault previous[] = 1;
+    RadioFaultEnum current[] = 0;
+    RadioFaultEnum previous[] = 1;
   }
 
   critical event NetworkFaultChange = 2 {
-    NetworkFaultType current[] = 0;
-    NetworkFaultType previous[] = 1;
+    NetworkFaultEnum current[] = 0;
+    NetworkFaultEnum previous[] = 1;
   }
 
   critical event BootReason = 3 {
@@ -864,9 +864,9 @@ server cluster GeneralDiagnostics = 51 {
   readonly attribute int64u upTime = 2;
   readonly attribute int32u totalOperationalHours = 3;
   readonly attribute BootReasonEnum bootReason = 4;
-  readonly attribute HardwareFault activeHardwareFaults[] = 5;
-  readonly attribute RadioFault activeRadioFaults[] = 6;
-  readonly attribute NetworkFaultType activeNetworkFaults[] = 7;
+  readonly attribute HardwareFaultEnum activeHardwareFaults[] = 5;
+  readonly attribute RadioFaultEnum activeRadioFaults[] = 6;
+  readonly attribute NetworkFaultEnum activeNetworkFaults[] = 7;
   readonly attribute boolean testEventTriggersEnabled = 8;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
@@ -952,7 +952,7 @@ server cluster Switch = 59 {
 }
 
 server cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatus : ENUM8 {
+  enum CommissioningWindowStatusEnum : ENUM8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
     kBasicWindowOpen = 2;
@@ -964,7 +964,7 @@ server cluster AdministratorCommissioning = 60 {
     kWindowNotOpen = 4;
   }
 
-  readonly attribute CommissioningWindowStatus windowStatus = 0;
+  readonly attribute CommissioningWindowStatusEnum windowStatus = 0;
   readonly attribute nullable fabric_idx adminFabricIndex = 1;
   readonly attribute nullable int16u adminVendorId = 2;
   readonly attribute bitmap32 featureMap = 65532;
@@ -1349,7 +1349,7 @@ server cluster ColorControl = 768 {
   }
 
   request struct MoveToColorTemperatureRequest {
-    INT16U colorTemperature = 0;
+    INT16U colorTemperatureMireds = 0;
     INT16U transitionTime = 1;
     BITMAP8 optionsMask = 2;
     BITMAP8 optionsOverride = 3;
diff --git a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.zap b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.zap
index 6caf3ec8138b6b..1262c4cc74ad3b 100644
--- a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.zap
+++ b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.zap
@@ -4265,7 +4265,7 @@
               "code": 0,
               "mfgCode": null,
               "side": "server",
-              "type": "PHYRate",
+              "type": "PHYRateEnum",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -4489,7 +4489,7 @@
           ]
         },
         {
-          "name": "AdministratorCommissioning",
+          "name": "Administrator Commissioning",
           "code": 60,
           "mfgCode": null,
           "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
@@ -4541,7 +4541,7 @@
           ]
         },
         {
-          "name": "AdministratorCommissioning",
+          "name": "Administrator Commissioning",
           "code": 60,
           "mfgCode": null,
           "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
@@ -4553,7 +4553,7 @@
               "code": 0,
               "mfgCode": null,
               "side": "server",
-              "type": "CommissioningWindowStatus",
+              "type": "CommissioningWindowStatusEnum",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
diff --git a/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter b/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter
index 9020bec3f2ec1b..e49282666e54ac 100644
--- a/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter
+++ b/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter
@@ -643,7 +643,7 @@ server cluster GeneralDiagnostics = 51 {
     kSoftwareReset = 6;
   }
 
-  enum HardwareFault : ENUM8 {
+  enum HardwareFaultEnum : ENUM8 {
     kUnspecified = 0;
     kRadio = 1;
     kSensor = 2;
@@ -657,7 +657,7 @@ server cluster GeneralDiagnostics = 51 {
     kTamperDetected = 10;
   }
 
-  enum InterfaceType : ENUM8 {
+  enum InterfaceTypeEnum : ENUM8 {
     kUnspecified = 0;
     kWiFi = 1;
     kEthernet = 2;
@@ -665,14 +665,14 @@ server cluster GeneralDiagnostics = 51 {
     kThread = 4;
   }
 
-  enum NetworkFaultType : ENUM8 {
+  enum NetworkFaultEnum : ENUM8 {
     kUnspecified = 0;
     kHardwareFailure = 1;
     kNetworkJammed = 2;
     kConnectionFailed = 3;
   }
 
-  enum RadioFault : ENUM8 {
+  enum RadioFaultEnum : ENUM8 {
     kUnspecified = 0;
     kWiFiFault = 1;
     kCellularFault = 2;
@@ -690,22 +690,22 @@ server cluster GeneralDiagnostics = 51 {
     octet_string<8> hardwareAddress = 4;
     octet_string IPv4Addresses[] = 5;
     octet_string IPv6Addresses[] = 6;
-    InterfaceType type = 7;
+    InterfaceTypeEnum type = 7;
   }
 
   critical event HardwareFaultChange = 0 {
-    HardwareFault current[] = 0;
-    HardwareFault previous[] = 1;
+    HardwareFaultEnum current[] = 0;
+    HardwareFaultEnum previous[] = 1;
   }
 
   critical event RadioFaultChange = 1 {
-    RadioFault current[] = 0;
-    RadioFault previous[] = 1;
+    RadioFaultEnum current[] = 0;
+    RadioFaultEnum previous[] = 1;
   }
 
   critical event NetworkFaultChange = 2 {
-    NetworkFaultType current[] = 0;
-    NetworkFaultType previous[] = 1;
+    NetworkFaultEnum current[] = 0;
+    NetworkFaultEnum previous[] = 1;
   }
 
   critical event BootReason = 3 {
@@ -717,9 +717,9 @@ server cluster GeneralDiagnostics = 51 {
   readonly attribute int64u upTime = 2;
   readonly attribute int32u totalOperationalHours = 3;
   readonly attribute BootReasonEnum bootReason = 4;
-  readonly attribute HardwareFault activeHardwareFaults[] = 5;
-  readonly attribute RadioFault activeRadioFaults[] = 6;
-  readonly attribute NetworkFaultType activeNetworkFaults[] = 7;
+  readonly attribute HardwareFaultEnum activeHardwareFaults[] = 5;
+  readonly attribute RadioFaultEnum activeRadioFaults[] = 6;
+  readonly attribute NetworkFaultEnum activeNetworkFaults[] = 7;
   readonly attribute boolean testEventTriggersEnabled = 8;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
@@ -807,7 +807,7 @@ server cluster Switch = 59 {
 }
 
 server cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatus : ENUM8 {
+  enum CommissioningWindowStatusEnum : ENUM8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
     kBasicWindowOpen = 2;
@@ -819,7 +819,7 @@ server cluster AdministratorCommissioning = 60 {
     kWindowNotOpen = 4;
   }
 
-  readonly attribute CommissioningWindowStatus windowStatus = 0;
+  readonly attribute CommissioningWindowStatusEnum windowStatus = 0;
   readonly attribute nullable fabric_idx adminFabricIndex = 1;
   readonly attribute nullable int16u adminVendorId = 2;
   readonly attribute bitmap32 featureMap = 65532;
diff --git a/examples/chef/devices/rootnode_fan_7N2TobIlOX.zap b/examples/chef/devices/rootnode_fan_7N2TobIlOX.zap
index 18f92fc60a8cdd..606234eb628c0b 100644
--- a/examples/chef/devices/rootnode_fan_7N2TobIlOX.zap
+++ b/examples/chef/devices/rootnode_fan_7N2TobIlOX.zap
@@ -4409,7 +4409,7 @@
               "code": 0,
               "mfgCode": null,
               "side": "server",
-              "type": "PHYRate",
+              "type": "PHYRateEnum",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -4665,7 +4665,7 @@
           ]
         },
         {
-          "name": "AdministratorCommissioning",
+          "name": "Administrator Commissioning",
           "code": 60,
           "mfgCode": null,
           "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
@@ -4717,7 +4717,7 @@
           ]
         },
         {
-          "name": "AdministratorCommissioning",
+          "name": "Administrator Commissioning",
           "code": 60,
           "mfgCode": null,
           "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
@@ -4729,7 +4729,7 @@
               "code": 0,
               "mfgCode": null,
               "side": "server",
-              "type": "CommissioningWindowStatus",
+              "type": "CommissioningWindowStatusEnum",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
diff --git a/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter b/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter
index 62c4c0b5bd6e7c..15c106ea23462e 100644
--- a/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter
+++ b/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter
@@ -654,7 +654,7 @@ server cluster GeneralDiagnostics = 51 {
     kSoftwareReset = 6;
   }
 
-  enum HardwareFault : ENUM8 {
+  enum HardwareFaultEnum : ENUM8 {
     kUnspecified = 0;
     kRadio = 1;
     kSensor = 2;
@@ -668,7 +668,7 @@ server cluster GeneralDiagnostics = 51 {
     kTamperDetected = 10;
   }
 
-  enum InterfaceType : ENUM8 {
+  enum InterfaceTypeEnum : ENUM8 {
     kUnspecified = 0;
     kWiFi = 1;
     kEthernet = 2;
@@ -676,14 +676,14 @@ server cluster GeneralDiagnostics = 51 {
     kThread = 4;
   }
 
-  enum NetworkFaultType : ENUM8 {
+  enum NetworkFaultEnum : ENUM8 {
     kUnspecified = 0;
     kHardwareFailure = 1;
     kNetworkJammed = 2;
     kConnectionFailed = 3;
   }
 
-  enum RadioFault : ENUM8 {
+  enum RadioFaultEnum : ENUM8 {
     kUnspecified = 0;
     kWiFiFault = 1;
     kCellularFault = 2;
@@ -701,22 +701,22 @@ server cluster GeneralDiagnostics = 51 {
     octet_string<8> hardwareAddress = 4;
     octet_string IPv4Addresses[] = 5;
     octet_string IPv6Addresses[] = 6;
-    InterfaceType type = 7;
+    InterfaceTypeEnum type = 7;
   }
 
   critical event HardwareFaultChange = 0 {
-    HardwareFault current[] = 0;
-    HardwareFault previous[] = 1;
+    HardwareFaultEnum current[] = 0;
+    HardwareFaultEnum previous[] = 1;
   }
 
   critical event RadioFaultChange = 1 {
-    RadioFault current[] = 0;
-    RadioFault previous[] = 1;
+    RadioFaultEnum current[] = 0;
+    RadioFaultEnum previous[] = 1;
   }
 
   critical event NetworkFaultChange = 2 {
-    NetworkFaultType current[] = 0;
-    NetworkFaultType previous[] = 1;
+    NetworkFaultEnum current[] = 0;
+    NetworkFaultEnum previous[] = 1;
   }
 
   critical event BootReason = 3 {
@@ -728,9 +728,9 @@ server cluster GeneralDiagnostics = 51 {
   readonly attribute int64u upTime = 2;
   readonly attribute int32u totalOperationalHours = 3;
   readonly attribute BootReasonEnum bootReason = 4;
-  readonly attribute HardwareFault activeHardwareFaults[] = 5;
-  readonly attribute RadioFault activeRadioFaults[] = 6;
-  readonly attribute NetworkFaultType activeNetworkFaults[] = 7;
+  readonly attribute HardwareFaultEnum activeHardwareFaults[] = 5;
+  readonly attribute RadioFaultEnum activeRadioFaults[] = 6;
+  readonly attribute NetworkFaultEnum activeNetworkFaults[] = 7;
   readonly attribute boolean testEventTriggersEnabled = 8;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
@@ -816,7 +816,7 @@ server cluster Switch = 59 {
 }
 
 server cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatus : ENUM8 {
+  enum CommissioningWindowStatusEnum : ENUM8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
     kBasicWindowOpen = 2;
@@ -828,7 +828,7 @@ server cluster AdministratorCommissioning = 60 {
     kWindowNotOpen = 4;
   }
 
-  readonly attribute CommissioningWindowStatus windowStatus = 0;
+  readonly attribute CommissioningWindowStatusEnum windowStatus = 0;
   readonly attribute nullable fabric_idx adminFabricIndex = 1;
   readonly attribute nullable int16u adminVendorId = 2;
   readonly attribute bitmap32 featureMap = 65532;
diff --git a/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.zap b/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.zap
index d644fe72e57caf..a906e41246cf76 100644
--- a/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.zap
+++ b/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.zap
@@ -4265,7 +4265,7 @@
               "code": 0,
               "mfgCode": null,
               "side": "server",
-              "type": "PHYRate",
+              "type": "PHYRateEnum",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -4489,7 +4489,7 @@
           ]
         },
         {
-          "name": "AdministratorCommissioning",
+          "name": "Administrator Commissioning",
           "code": 60,
           "mfgCode": null,
           "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
@@ -4541,7 +4541,7 @@
           ]
         },
         {
-          "name": "AdministratorCommissioning",
+          "name": "Administrator Commissioning",
           "code": 60,
           "mfgCode": null,
           "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
@@ -4553,7 +4553,7 @@
               "code": 0,
               "mfgCode": null,
               "side": "server",
-              "type": "CommissioningWindowStatus",
+              "type": "CommissioningWindowStatusEnum",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
diff --git a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter
index eb919dbf3f616a..b97b9c5f6ba28a 100644
--- a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter
+++ b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter
@@ -783,7 +783,7 @@ server cluster GeneralDiagnostics = 51 {
     kSoftwareReset = 6;
   }
 
-  enum HardwareFault : ENUM8 {
+  enum HardwareFaultEnum : ENUM8 {
     kUnspecified = 0;
     kRadio = 1;
     kSensor = 2;
@@ -797,7 +797,7 @@ server cluster GeneralDiagnostics = 51 {
     kTamperDetected = 10;
   }
 
-  enum InterfaceType : ENUM8 {
+  enum InterfaceTypeEnum : ENUM8 {
     kUnspecified = 0;
     kWiFi = 1;
     kEthernet = 2;
@@ -805,14 +805,14 @@ server cluster GeneralDiagnostics = 51 {
     kThread = 4;
   }
 
-  enum NetworkFaultType : ENUM8 {
+  enum NetworkFaultEnum : ENUM8 {
     kUnspecified = 0;
     kHardwareFailure = 1;
     kNetworkJammed = 2;
     kConnectionFailed = 3;
   }
 
-  enum RadioFault : ENUM8 {
+  enum RadioFaultEnum : ENUM8 {
     kUnspecified = 0;
     kWiFiFault = 1;
     kCellularFault = 2;
@@ -830,22 +830,22 @@ server cluster GeneralDiagnostics = 51 {
     octet_string<8> hardwareAddress = 4;
     octet_string IPv4Addresses[] = 5;
     octet_string IPv6Addresses[] = 6;
-    InterfaceType type = 7;
+    InterfaceTypeEnum type = 7;
   }
 
   critical event HardwareFaultChange = 0 {
-    HardwareFault current[] = 0;
-    HardwareFault previous[] = 1;
+    HardwareFaultEnum current[] = 0;
+    HardwareFaultEnum previous[] = 1;
   }
 
   critical event RadioFaultChange = 1 {
-    RadioFault current[] = 0;
-    RadioFault previous[] = 1;
+    RadioFaultEnum current[] = 0;
+    RadioFaultEnum previous[] = 1;
   }
 
   critical event NetworkFaultChange = 2 {
-    NetworkFaultType current[] = 0;
-    NetworkFaultType previous[] = 1;
+    NetworkFaultEnum current[] = 0;
+    NetworkFaultEnum previous[] = 1;
   }
 
   critical event BootReason = 3 {
@@ -857,9 +857,9 @@ server cluster GeneralDiagnostics = 51 {
   readonly attribute int64u upTime = 2;
   readonly attribute int32u totalOperationalHours = 3;
   readonly attribute BootReasonEnum bootReason = 4;
-  readonly attribute HardwareFault activeHardwareFaults[] = 5;
-  readonly attribute RadioFault activeRadioFaults[] = 6;
-  readonly attribute NetworkFaultType activeNetworkFaults[] = 7;
+  readonly attribute HardwareFaultEnum activeHardwareFaults[] = 5;
+  readonly attribute RadioFaultEnum activeRadioFaults[] = 6;
+  readonly attribute NetworkFaultEnum activeNetworkFaults[] = 7;
   readonly attribute boolean testEventTriggersEnabled = 8;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
@@ -945,7 +945,7 @@ server cluster Switch = 59 {
 }
 
 server cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatus : ENUM8 {
+  enum CommissioningWindowStatusEnum : ENUM8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
     kBasicWindowOpen = 2;
@@ -957,7 +957,7 @@ server cluster AdministratorCommissioning = 60 {
     kWindowNotOpen = 4;
   }
 
-  readonly attribute CommissioningWindowStatus windowStatus = 0;
+  readonly attribute CommissioningWindowStatusEnum windowStatus = 0;
   readonly attribute nullable fabric_idx adminFabricIndex = 1;
   readonly attribute nullable int16u adminVendorId = 2;
   readonly attribute bitmap32 featureMap = 65532;
diff --git a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.zap b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.zap
index 389dfb13326814..84283fedb10e2c 100644
--- a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.zap
+++ b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.zap
@@ -4265,7 +4265,7 @@
               "code": 0,
               "mfgCode": null,
               "side": "server",
-              "type": "PHYRate",
+              "type": "PHYRateEnum",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -4489,7 +4489,7 @@
           ]
         },
         {
-          "name": "AdministratorCommissioning",
+          "name": "Administrator Commissioning",
           "code": 60,
           "mfgCode": null,
           "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
@@ -4541,7 +4541,7 @@
           ]
         },
         {
-          "name": "AdministratorCommissioning",
+          "name": "Administrator Commissioning",
           "code": 60,
           "mfgCode": null,
           "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
@@ -4553,7 +4553,7 @@
               "code": 0,
               "mfgCode": null,
               "side": "server",
-              "type": "CommissioningWindowStatus",
+              "type": "CommissioningWindowStatusEnum",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
diff --git a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter
index 0385a52b5eea69..1fea3cd56bb2f9 100644
--- a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter
+++ b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter
@@ -654,7 +654,7 @@ server cluster GeneralDiagnostics = 51 {
     kSoftwareReset = 6;
   }
 
-  enum HardwareFault : ENUM8 {
+  enum HardwareFaultEnum : ENUM8 {
     kUnspecified = 0;
     kRadio = 1;
     kSensor = 2;
@@ -668,7 +668,7 @@ server cluster GeneralDiagnostics = 51 {
     kTamperDetected = 10;
   }
 
-  enum InterfaceType : ENUM8 {
+  enum InterfaceTypeEnum : ENUM8 {
     kUnspecified = 0;
     kWiFi = 1;
     kEthernet = 2;
@@ -676,14 +676,14 @@ server cluster GeneralDiagnostics = 51 {
     kThread = 4;
   }
 
-  enum NetworkFaultType : ENUM8 {
+  enum NetworkFaultEnum : ENUM8 {
     kUnspecified = 0;
     kHardwareFailure = 1;
     kNetworkJammed = 2;
     kConnectionFailed = 3;
   }
 
-  enum RadioFault : ENUM8 {
+  enum RadioFaultEnum : ENUM8 {
     kUnspecified = 0;
     kWiFiFault = 1;
     kCellularFault = 2;
@@ -701,22 +701,22 @@ server cluster GeneralDiagnostics = 51 {
     octet_string<8> hardwareAddress = 4;
     octet_string IPv4Addresses[] = 5;
     octet_string IPv6Addresses[] = 6;
-    InterfaceType type = 7;
+    InterfaceTypeEnum type = 7;
   }
 
   critical event HardwareFaultChange = 0 {
-    HardwareFault current[] = 0;
-    HardwareFault previous[] = 1;
+    HardwareFaultEnum current[] = 0;
+    HardwareFaultEnum previous[] = 1;
   }
 
   critical event RadioFaultChange = 1 {
-    RadioFault current[] = 0;
-    RadioFault previous[] = 1;
+    RadioFaultEnum current[] = 0;
+    RadioFaultEnum previous[] = 1;
   }
 
   critical event NetworkFaultChange = 2 {
-    NetworkFaultType current[] = 0;
-    NetworkFaultType previous[] = 1;
+    NetworkFaultEnum current[] = 0;
+    NetworkFaultEnum previous[] = 1;
   }
 
   critical event BootReason = 3 {
@@ -728,9 +728,9 @@ server cluster GeneralDiagnostics = 51 {
   readonly attribute int64u upTime = 2;
   readonly attribute int32u totalOperationalHours = 3;
   readonly attribute BootReasonEnum bootReason = 4;
-  readonly attribute HardwareFault activeHardwareFaults[] = 5;
-  readonly attribute RadioFault activeRadioFaults[] = 6;
-  readonly attribute NetworkFaultType activeNetworkFaults[] = 7;
+  readonly attribute HardwareFaultEnum activeHardwareFaults[] = 5;
+  readonly attribute RadioFaultEnum activeRadioFaults[] = 6;
+  readonly attribute NetworkFaultEnum activeNetworkFaults[] = 7;
   readonly attribute boolean testEventTriggersEnabled = 8;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
@@ -816,7 +816,7 @@ server cluster Switch = 59 {
 }
 
 server cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatus : ENUM8 {
+  enum CommissioningWindowStatusEnum : ENUM8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
     kBasicWindowOpen = 2;
@@ -828,7 +828,7 @@ server cluster AdministratorCommissioning = 60 {
     kWindowNotOpen = 4;
   }
 
-  readonly attribute CommissioningWindowStatus windowStatus = 0;
+  readonly attribute CommissioningWindowStatusEnum windowStatus = 0;
   readonly attribute nullable fabric_idx adminFabricIndex = 1;
   readonly attribute nullable int16u adminVendorId = 2;
   readonly attribute bitmap32 featureMap = 65532;
diff --git a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.zap b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.zap
index b0ea2523a99ffc..cc514f48c8e117 100644
--- a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.zap
+++ b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.zap
@@ -4265,7 +4265,7 @@
               "code": 0,
               "mfgCode": null,
               "side": "server",
-              "type": "PHYRate",
+              "type": "PHYRateEnum",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -4489,7 +4489,7 @@
           ]
         },
         {
-          "name": "AdministratorCommissioning",
+          "name": "Administrator Commissioning",
           "code": 60,
           "mfgCode": null,
           "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
@@ -4541,7 +4541,7 @@
           ]
         },
         {
-          "name": "AdministratorCommissioning",
+          "name": "Administrator Commissioning",
           "code": 60,
           "mfgCode": null,
           "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
@@ -4553,7 +4553,7 @@
               "code": 0,
               "mfgCode": null,
               "side": "server",
-              "type": "CommissioningWindowStatus",
+              "type": "CommissioningWindowStatusEnum",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
diff --git a/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter b/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter
index 4679c7372cc051..4bc590e377fdcf 100644
--- a/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter
+++ b/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter
@@ -654,7 +654,7 @@ server cluster GeneralDiagnostics = 51 {
     kSoftwareReset = 6;
   }
 
-  enum HardwareFault : ENUM8 {
+  enum HardwareFaultEnum : ENUM8 {
     kUnspecified = 0;
     kRadio = 1;
     kSensor = 2;
@@ -668,7 +668,7 @@ server cluster GeneralDiagnostics = 51 {
     kTamperDetected = 10;
   }
 
-  enum InterfaceType : ENUM8 {
+  enum InterfaceTypeEnum : ENUM8 {
     kUnspecified = 0;
     kWiFi = 1;
     kEthernet = 2;
@@ -676,14 +676,14 @@ server cluster GeneralDiagnostics = 51 {
     kThread = 4;
   }
 
-  enum NetworkFaultType : ENUM8 {
+  enum NetworkFaultEnum : ENUM8 {
     kUnspecified = 0;
     kHardwareFailure = 1;
     kNetworkJammed = 2;
     kConnectionFailed = 3;
   }
 
-  enum RadioFault : ENUM8 {
+  enum RadioFaultEnum : ENUM8 {
     kUnspecified = 0;
     kWiFiFault = 1;
     kCellularFault = 2;
@@ -701,22 +701,22 @@ server cluster GeneralDiagnostics = 51 {
     octet_string<8> hardwareAddress = 4;
     octet_string IPv4Addresses[] = 5;
     octet_string IPv6Addresses[] = 6;
-    InterfaceType type = 7;
+    InterfaceTypeEnum type = 7;
   }
 
   critical event HardwareFaultChange = 0 {
-    HardwareFault current[] = 0;
-    HardwareFault previous[] = 1;
+    HardwareFaultEnum current[] = 0;
+    HardwareFaultEnum previous[] = 1;
   }
 
   critical event RadioFaultChange = 1 {
-    RadioFault current[] = 0;
-    RadioFault previous[] = 1;
+    RadioFaultEnum current[] = 0;
+    RadioFaultEnum previous[] = 1;
   }
 
   critical event NetworkFaultChange = 2 {
-    NetworkFaultType current[] = 0;
-    NetworkFaultType previous[] = 1;
+    NetworkFaultEnum current[] = 0;
+    NetworkFaultEnum previous[] = 1;
   }
 
   critical event BootReason = 3 {
@@ -728,9 +728,9 @@ server cluster GeneralDiagnostics = 51 {
   readonly attribute int64u upTime = 2;
   readonly attribute int32u totalOperationalHours = 3;
   readonly attribute BootReasonEnum bootReason = 4;
-  readonly attribute HardwareFault activeHardwareFaults[] = 5;
-  readonly attribute RadioFault activeRadioFaults[] = 6;
-  readonly attribute NetworkFaultType activeNetworkFaults[] = 7;
+  readonly attribute HardwareFaultEnum activeHardwareFaults[] = 5;
+  readonly attribute RadioFaultEnum activeRadioFaults[] = 6;
+  readonly attribute NetworkFaultEnum activeNetworkFaults[] = 7;
   readonly attribute boolean testEventTriggersEnabled = 8;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
@@ -816,7 +816,7 @@ server cluster Switch = 59 {
 }
 
 server cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatus : ENUM8 {
+  enum CommissioningWindowStatusEnum : ENUM8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
     kBasicWindowOpen = 2;
@@ -828,7 +828,7 @@ server cluster AdministratorCommissioning = 60 {
     kWindowNotOpen = 4;
   }
 
-  readonly attribute CommissioningWindowStatus windowStatus = 0;
+  readonly attribute CommissioningWindowStatusEnum windowStatus = 0;
   readonly attribute nullable fabric_idx adminFabricIndex = 1;
   readonly attribute nullable int16u adminVendorId = 2;
   readonly attribute bitmap32 featureMap = 65532;
diff --git a/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.zap b/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.zap
index 82b2db2b128214..5695311d5c863d 100644
--- a/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.zap
+++ b/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.zap
@@ -4265,7 +4265,7 @@
               "code": 0,
               "mfgCode": null,
               "side": "server",
-              "type": "PHYRate",
+              "type": "PHYRateEnum",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -4489,7 +4489,7 @@
           ]
         },
         {
-          "name": "AdministratorCommissioning",
+          "name": "Administrator Commissioning",
           "code": 60,
           "mfgCode": null,
           "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
@@ -4541,7 +4541,7 @@
           ]
         },
         {
-          "name": "AdministratorCommissioning",
+          "name": "Administrator Commissioning",
           "code": 60,
           "mfgCode": null,
           "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
@@ -4553,7 +4553,7 @@
               "code": 0,
               "mfgCode": null,
               "side": "server",
-              "type": "CommissioningWindowStatus",
+              "type": "CommissioningWindowStatusEnum",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
diff --git a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter
index 8e0f664bbfb80a..16d07dec7c877d 100644
--- a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter
+++ b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter
@@ -654,7 +654,7 @@ server cluster GeneralDiagnostics = 51 {
     kSoftwareReset = 6;
   }
 
-  enum HardwareFault : ENUM8 {
+  enum HardwareFaultEnum : ENUM8 {
     kUnspecified = 0;
     kRadio = 1;
     kSensor = 2;
@@ -668,7 +668,7 @@ server cluster GeneralDiagnostics = 51 {
     kTamperDetected = 10;
   }
 
-  enum InterfaceType : ENUM8 {
+  enum InterfaceTypeEnum : ENUM8 {
     kUnspecified = 0;
     kWiFi = 1;
     kEthernet = 2;
@@ -676,14 +676,14 @@ server cluster GeneralDiagnostics = 51 {
     kThread = 4;
   }
 
-  enum NetworkFaultType : ENUM8 {
+  enum NetworkFaultEnum : ENUM8 {
     kUnspecified = 0;
     kHardwareFailure = 1;
     kNetworkJammed = 2;
     kConnectionFailed = 3;
   }
 
-  enum RadioFault : ENUM8 {
+  enum RadioFaultEnum : ENUM8 {
     kUnspecified = 0;
     kWiFiFault = 1;
     kCellularFault = 2;
@@ -701,22 +701,22 @@ server cluster GeneralDiagnostics = 51 {
     octet_string<8> hardwareAddress = 4;
     octet_string IPv4Addresses[] = 5;
     octet_string IPv6Addresses[] = 6;
-    InterfaceType type = 7;
+    InterfaceTypeEnum type = 7;
   }
 
   critical event HardwareFaultChange = 0 {
-    HardwareFault current[] = 0;
-    HardwareFault previous[] = 1;
+    HardwareFaultEnum current[] = 0;
+    HardwareFaultEnum previous[] = 1;
   }
 
   critical event RadioFaultChange = 1 {
-    RadioFault current[] = 0;
-    RadioFault previous[] = 1;
+    RadioFaultEnum current[] = 0;
+    RadioFaultEnum previous[] = 1;
   }
 
   critical event NetworkFaultChange = 2 {
-    NetworkFaultType current[] = 0;
-    NetworkFaultType previous[] = 1;
+    NetworkFaultEnum current[] = 0;
+    NetworkFaultEnum previous[] = 1;
   }
 
   critical event BootReason = 3 {
@@ -728,9 +728,9 @@ server cluster GeneralDiagnostics = 51 {
   readonly attribute int64u upTime = 2;
   readonly attribute int32u totalOperationalHours = 3;
   readonly attribute BootReasonEnum bootReason = 4;
-  readonly attribute HardwareFault activeHardwareFaults[] = 5;
-  readonly attribute RadioFault activeRadioFaults[] = 6;
-  readonly attribute NetworkFaultType activeNetworkFaults[] = 7;
+  readonly attribute HardwareFaultEnum activeHardwareFaults[] = 5;
+  readonly attribute RadioFaultEnum activeRadioFaults[] = 6;
+  readonly attribute NetworkFaultEnum activeNetworkFaults[] = 7;
   readonly attribute boolean testEventTriggersEnabled = 8;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
@@ -816,7 +816,7 @@ server cluster Switch = 59 {
 }
 
 server cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatus : ENUM8 {
+  enum CommissioningWindowStatusEnum : ENUM8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
     kBasicWindowOpen = 2;
@@ -828,7 +828,7 @@ server cluster AdministratorCommissioning = 60 {
     kWindowNotOpen = 4;
   }
 
-  readonly attribute CommissioningWindowStatus windowStatus = 0;
+  readonly attribute CommissioningWindowStatusEnum windowStatus = 0;
   readonly attribute nullable fabric_idx adminFabricIndex = 1;
   readonly attribute nullable int16u adminVendorId = 2;
   readonly attribute bitmap32 featureMap = 65532;
diff --git a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.zap b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.zap
index bc858df7aea404..3c9434f8a96a12 100644
--- a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.zap
+++ b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.zap
@@ -4265,7 +4265,7 @@
               "code": 0,
               "mfgCode": null,
               "side": "server",
-              "type": "PHYRate",
+              "type": "PHYRateEnum",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -4489,7 +4489,7 @@
           ]
         },
         {
-          "name": "AdministratorCommissioning",
+          "name": "Administrator Commissioning",
           "code": 60,
           "mfgCode": null,
           "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
@@ -4541,7 +4541,7 @@
           ]
         },
         {
-          "name": "AdministratorCommissioning",
+          "name": "Administrator Commissioning",
           "code": 60,
           "mfgCode": null,
           "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
@@ -4553,7 +4553,7 @@
               "code": 0,
               "mfgCode": null,
               "side": "server",
-              "type": "CommissioningWindowStatus",
+              "type": "CommissioningWindowStatusEnum",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
diff --git a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter
index 6487d8282734da..580ace00aef332 100644
--- a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter
+++ b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter
@@ -790,7 +790,7 @@ server cluster GeneralDiagnostics = 51 {
     kSoftwareReset = 6;
   }
 
-  enum HardwareFault : ENUM8 {
+  enum HardwareFaultEnum : ENUM8 {
     kUnspecified = 0;
     kRadio = 1;
     kSensor = 2;
@@ -804,7 +804,7 @@ server cluster GeneralDiagnostics = 51 {
     kTamperDetected = 10;
   }
 
-  enum InterfaceType : ENUM8 {
+  enum InterfaceTypeEnum : ENUM8 {
     kUnspecified = 0;
     kWiFi = 1;
     kEthernet = 2;
@@ -812,14 +812,14 @@ server cluster GeneralDiagnostics = 51 {
     kThread = 4;
   }
 
-  enum NetworkFaultType : ENUM8 {
+  enum NetworkFaultEnum : ENUM8 {
     kUnspecified = 0;
     kHardwareFailure = 1;
     kNetworkJammed = 2;
     kConnectionFailed = 3;
   }
 
-  enum RadioFault : ENUM8 {
+  enum RadioFaultEnum : ENUM8 {
     kUnspecified = 0;
     kWiFiFault = 1;
     kCellularFault = 2;
@@ -837,22 +837,22 @@ server cluster GeneralDiagnostics = 51 {
     octet_string<8> hardwareAddress = 4;
     octet_string IPv4Addresses[] = 5;
     octet_string IPv6Addresses[] = 6;
-    InterfaceType type = 7;
+    InterfaceTypeEnum type = 7;
   }
 
   critical event HardwareFaultChange = 0 {
-    HardwareFault current[] = 0;
-    HardwareFault previous[] = 1;
+    HardwareFaultEnum current[] = 0;
+    HardwareFaultEnum previous[] = 1;
   }
 
   critical event RadioFaultChange = 1 {
-    RadioFault current[] = 0;
-    RadioFault previous[] = 1;
+    RadioFaultEnum current[] = 0;
+    RadioFaultEnum previous[] = 1;
   }
 
   critical event NetworkFaultChange = 2 {
-    NetworkFaultType current[] = 0;
-    NetworkFaultType previous[] = 1;
+    NetworkFaultEnum current[] = 0;
+    NetworkFaultEnum previous[] = 1;
   }
 
   critical event BootReason = 3 {
@@ -864,9 +864,9 @@ server cluster GeneralDiagnostics = 51 {
   readonly attribute int64u upTime = 2;
   readonly attribute int32u totalOperationalHours = 3;
   readonly attribute BootReasonEnum bootReason = 4;
-  readonly attribute HardwareFault activeHardwareFaults[] = 5;
-  readonly attribute RadioFault activeRadioFaults[] = 6;
-  readonly attribute NetworkFaultType activeNetworkFaults[] = 7;
+  readonly attribute HardwareFaultEnum activeHardwareFaults[] = 5;
+  readonly attribute RadioFaultEnum activeRadioFaults[] = 6;
+  readonly attribute NetworkFaultEnum activeNetworkFaults[] = 7;
   readonly attribute boolean testEventTriggersEnabled = 8;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
@@ -952,7 +952,7 @@ server cluster Switch = 59 {
 }
 
 server cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatus : ENUM8 {
+  enum CommissioningWindowStatusEnum : ENUM8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
     kBasicWindowOpen = 2;
@@ -964,7 +964,7 @@ server cluster AdministratorCommissioning = 60 {
     kWindowNotOpen = 4;
   }
 
-  readonly attribute CommissioningWindowStatus windowStatus = 0;
+  readonly attribute CommissioningWindowStatusEnum windowStatus = 0;
   readonly attribute nullable fabric_idx adminFabricIndex = 1;
   readonly attribute nullable int16u adminVendorId = 2;
   readonly attribute bitmap32 featureMap = 65532;
diff --git a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.zap b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.zap
index a9873893183c6e..853ea2338bcc7b 100644
--- a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.zap
+++ b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.zap
@@ -4265,7 +4265,7 @@
               "code": 0,
               "mfgCode": null,
               "side": "server",
-              "type": "PHYRate",
+              "type": "PHYRateEnum",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -4489,7 +4489,7 @@
           ]
         },
         {
-          "name": "AdministratorCommissioning",
+          "name": "Administrator Commissioning",
           "code": 60,
           "mfgCode": null,
           "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
@@ -4541,7 +4541,7 @@
           ]
         },
         {
-          "name": "AdministratorCommissioning",
+          "name": "Administrator Commissioning",
           "code": 60,
           "mfgCode": null,
           "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
@@ -4553,7 +4553,7 @@
               "code": 0,
               "mfgCode": null,
               "side": "server",
-              "type": "CommissioningWindowStatus",
+              "type": "CommissioningWindowStatusEnum",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
diff --git a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter
index bbdb02e112217c..277af201cfc145 100644
--- a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter
+++ b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter
@@ -733,7 +733,7 @@ server cluster GeneralDiagnostics = 51 {
     kSoftwareReset = 6;
   }
 
-  enum HardwareFault : ENUM8 {
+  enum HardwareFaultEnum : ENUM8 {
     kUnspecified = 0;
     kRadio = 1;
     kSensor = 2;
@@ -747,7 +747,7 @@ server cluster GeneralDiagnostics = 51 {
     kTamperDetected = 10;
   }
 
-  enum InterfaceType : ENUM8 {
+  enum InterfaceTypeEnum : ENUM8 {
     kUnspecified = 0;
     kWiFi = 1;
     kEthernet = 2;
@@ -755,14 +755,14 @@ server cluster GeneralDiagnostics = 51 {
     kThread = 4;
   }
 
-  enum NetworkFaultType : ENUM8 {
+  enum NetworkFaultEnum : ENUM8 {
     kUnspecified = 0;
     kHardwareFailure = 1;
     kNetworkJammed = 2;
     kConnectionFailed = 3;
   }
 
-  enum RadioFault : ENUM8 {
+  enum RadioFaultEnum : ENUM8 {
     kUnspecified = 0;
     kWiFiFault = 1;
     kCellularFault = 2;
@@ -780,22 +780,22 @@ server cluster GeneralDiagnostics = 51 {
     octet_string<8> hardwareAddress = 4;
     octet_string IPv4Addresses[] = 5;
     octet_string IPv6Addresses[] = 6;
-    InterfaceType type = 7;
+    InterfaceTypeEnum type = 7;
   }
 
   critical event HardwareFaultChange = 0 {
-    HardwareFault current[] = 0;
-    HardwareFault previous[] = 1;
+    HardwareFaultEnum current[] = 0;
+    HardwareFaultEnum previous[] = 1;
   }
 
   critical event RadioFaultChange = 1 {
-    RadioFault current[] = 0;
-    RadioFault previous[] = 1;
+    RadioFaultEnum current[] = 0;
+    RadioFaultEnum previous[] = 1;
   }
 
   critical event NetworkFaultChange = 2 {
-    NetworkFaultType current[] = 0;
-    NetworkFaultType previous[] = 1;
+    NetworkFaultEnum current[] = 0;
+    NetworkFaultEnum previous[] = 1;
   }
 
   critical event BootReason = 3 {
@@ -807,9 +807,9 @@ server cluster GeneralDiagnostics = 51 {
   readonly attribute int64u upTime = 2;
   readonly attribute int32u totalOperationalHours = 3;
   readonly attribute BootReasonEnum bootReason = 4;
-  readonly attribute HardwareFault activeHardwareFaults[] = 5;
-  readonly attribute RadioFault activeRadioFaults[] = 6;
-  readonly attribute NetworkFaultType activeNetworkFaults[] = 7;
+  readonly attribute HardwareFaultEnum activeHardwareFaults[] = 5;
+  readonly attribute RadioFaultEnum activeRadioFaults[] = 6;
+  readonly attribute NetworkFaultEnum activeNetworkFaults[] = 7;
   readonly attribute boolean testEventTriggersEnabled = 8;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
@@ -895,7 +895,7 @@ server cluster Switch = 59 {
 }
 
 server cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatus : ENUM8 {
+  enum CommissioningWindowStatusEnum : ENUM8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
     kBasicWindowOpen = 2;
@@ -907,7 +907,7 @@ server cluster AdministratorCommissioning = 60 {
     kWindowNotOpen = 4;
   }
 
-  readonly attribute CommissioningWindowStatus windowStatus = 0;
+  readonly attribute CommissioningWindowStatusEnum windowStatus = 0;
   readonly attribute nullable fabric_idx adminFabricIndex = 1;
   readonly attribute nullable int16u adminVendorId = 2;
   readonly attribute bitmap32 featureMap = 65532;
diff --git a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.zap b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.zap
index 1d3dba4a4e6f43..e13b9fd80ecad1 100644
--- a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.zap
+++ b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.zap
@@ -4265,7 +4265,7 @@
               "code": 0,
               "mfgCode": null,
               "side": "server",
-              "type": "PHYRate",
+              "type": "PHYRateEnum",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -4489,7 +4489,7 @@
           ]
         },
         {
-          "name": "AdministratorCommissioning",
+          "name": "Administrator Commissioning",
           "code": 60,
           "mfgCode": null,
           "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
@@ -4541,7 +4541,7 @@
           ]
         },
         {
-          "name": "AdministratorCommissioning",
+          "name": "Administrator Commissioning",
           "code": 60,
           "mfgCode": null,
           "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
@@ -4553,7 +4553,7 @@
               "code": 0,
               "mfgCode": null,
               "side": "server",
-              "type": "CommissioningWindowStatus",
+              "type": "CommissioningWindowStatusEnum",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
diff --git a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter
index 0d0be004b7917a..22a24464488aa5 100644
--- a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter
+++ b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter
@@ -691,7 +691,7 @@ server cluster GeneralDiagnostics = 51 {
     kSoftwareReset = 6;
   }
 
-  enum HardwareFault : ENUM8 {
+  enum HardwareFaultEnum : ENUM8 {
     kUnspecified = 0;
     kRadio = 1;
     kSensor = 2;
@@ -705,7 +705,7 @@ server cluster GeneralDiagnostics = 51 {
     kTamperDetected = 10;
   }
 
-  enum InterfaceType : ENUM8 {
+  enum InterfaceTypeEnum : ENUM8 {
     kUnspecified = 0;
     kWiFi = 1;
     kEthernet = 2;
@@ -713,14 +713,14 @@ server cluster GeneralDiagnostics = 51 {
     kThread = 4;
   }
 
-  enum NetworkFaultType : ENUM8 {
+  enum NetworkFaultEnum : ENUM8 {
     kUnspecified = 0;
     kHardwareFailure = 1;
     kNetworkJammed = 2;
     kConnectionFailed = 3;
   }
 
-  enum RadioFault : ENUM8 {
+  enum RadioFaultEnum : ENUM8 {
     kUnspecified = 0;
     kWiFiFault = 1;
     kCellularFault = 2;
@@ -738,22 +738,22 @@ server cluster GeneralDiagnostics = 51 {
     octet_string<8> hardwareAddress = 4;
     octet_string IPv4Addresses[] = 5;
     octet_string IPv6Addresses[] = 6;
-    InterfaceType type = 7;
+    InterfaceTypeEnum type = 7;
   }
 
   critical event HardwareFaultChange = 0 {
-    HardwareFault current[] = 0;
-    HardwareFault previous[] = 1;
+    HardwareFaultEnum current[] = 0;
+    HardwareFaultEnum previous[] = 1;
   }
 
   critical event RadioFaultChange = 1 {
-    RadioFault current[] = 0;
-    RadioFault previous[] = 1;
+    RadioFaultEnum current[] = 0;
+    RadioFaultEnum previous[] = 1;
   }
 
   critical event NetworkFaultChange = 2 {
-    NetworkFaultType current[] = 0;
-    NetworkFaultType previous[] = 1;
+    NetworkFaultEnum current[] = 0;
+    NetworkFaultEnum previous[] = 1;
   }
 
   critical event BootReason = 3 {
@@ -765,9 +765,9 @@ server cluster GeneralDiagnostics = 51 {
   readonly attribute int64u upTime = 2;
   readonly attribute int32u totalOperationalHours = 3;
   readonly attribute BootReasonEnum bootReason = 4;
-  readonly attribute HardwareFault activeHardwareFaults[] = 5;
-  readonly attribute RadioFault activeRadioFaults[] = 6;
-  readonly attribute NetworkFaultType activeNetworkFaults[] = 7;
+  readonly attribute HardwareFaultEnum activeHardwareFaults[] = 5;
+  readonly attribute RadioFaultEnum activeRadioFaults[] = 6;
+  readonly attribute NetworkFaultEnum activeNetworkFaults[] = 7;
   readonly attribute boolean testEventTriggersEnabled = 8;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
@@ -853,7 +853,7 @@ server cluster Switch = 59 {
 }
 
 server cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatus : ENUM8 {
+  enum CommissioningWindowStatusEnum : ENUM8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
     kBasicWindowOpen = 2;
@@ -865,7 +865,7 @@ server cluster AdministratorCommissioning = 60 {
     kWindowNotOpen = 4;
   }
 
-  readonly attribute CommissioningWindowStatus windowStatus = 0;
+  readonly attribute CommissioningWindowStatusEnum windowStatus = 0;
   readonly attribute nullable fabric_idx adminFabricIndex = 1;
   readonly attribute nullable int16u adminVendorId = 2;
   readonly attribute bitmap32 featureMap = 65532;
diff --git a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.zap b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.zap
index 030fdd2b4d723a..840c952037046e 100644
--- a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.zap
+++ b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.zap
@@ -4265,7 +4265,7 @@
               "code": 0,
               "mfgCode": null,
               "side": "server",
-              "type": "PHYRate",
+              "type": "PHYRateEnum",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -4489,7 +4489,7 @@
           ]
         },
         {
-          "name": "AdministratorCommissioning",
+          "name": "Administrator Commissioning",
           "code": 60,
           "mfgCode": null,
           "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
@@ -4541,7 +4541,7 @@
           ]
         },
         {
-          "name": "AdministratorCommissioning",
+          "name": "Administrator Commissioning",
           "code": 60,
           "mfgCode": null,
           "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
@@ -4553,7 +4553,7 @@
               "code": 0,
               "mfgCode": null,
               "side": "server",
-              "type": "CommissioningWindowStatus",
+              "type": "CommissioningWindowStatusEnum",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
diff --git a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter
index 92465c448d8b6f..8619eb1664e965 100644
--- a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter
+++ b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter
@@ -659,7 +659,7 @@ server cluster GeneralDiagnostics = 51 {
     kSoftwareReset = 6;
   }
 
-  enum HardwareFault : ENUM8 {
+  enum HardwareFaultEnum : ENUM8 {
     kUnspecified = 0;
     kRadio = 1;
     kSensor = 2;
@@ -673,7 +673,7 @@ server cluster GeneralDiagnostics = 51 {
     kTamperDetected = 10;
   }
 
-  enum InterfaceType : ENUM8 {
+  enum InterfaceTypeEnum : ENUM8 {
     kUnspecified = 0;
     kWiFi = 1;
     kEthernet = 2;
@@ -681,14 +681,14 @@ server cluster GeneralDiagnostics = 51 {
     kThread = 4;
   }
 
-  enum NetworkFaultType : ENUM8 {
+  enum NetworkFaultEnum : ENUM8 {
     kUnspecified = 0;
     kHardwareFailure = 1;
     kNetworkJammed = 2;
     kConnectionFailed = 3;
   }
 
-  enum RadioFault : ENUM8 {
+  enum RadioFaultEnum : ENUM8 {
     kUnspecified = 0;
     kWiFiFault = 1;
     kCellularFault = 2;
@@ -706,22 +706,22 @@ server cluster GeneralDiagnostics = 51 {
     octet_string<8> hardwareAddress = 4;
     octet_string IPv4Addresses[] = 5;
     octet_string IPv6Addresses[] = 6;
-    InterfaceType type = 7;
+    InterfaceTypeEnum type = 7;
   }
 
   critical event HardwareFaultChange = 0 {
-    HardwareFault current[] = 0;
-    HardwareFault previous[] = 1;
+    HardwareFaultEnum current[] = 0;
+    HardwareFaultEnum previous[] = 1;
   }
 
   critical event RadioFaultChange = 1 {
-    RadioFault current[] = 0;
-    RadioFault previous[] = 1;
+    RadioFaultEnum current[] = 0;
+    RadioFaultEnum previous[] = 1;
   }
 
   critical event NetworkFaultChange = 2 {
-    NetworkFaultType current[] = 0;
-    NetworkFaultType previous[] = 1;
+    NetworkFaultEnum current[] = 0;
+    NetworkFaultEnum previous[] = 1;
   }
 
   critical event BootReason = 3 {
@@ -733,9 +733,9 @@ server cluster GeneralDiagnostics = 51 {
   readonly attribute int64u upTime = 2;
   readonly attribute int32u totalOperationalHours = 3;
   readonly attribute BootReasonEnum bootReason = 4;
-  readonly attribute HardwareFault activeHardwareFaults[] = 5;
-  readonly attribute RadioFault activeRadioFaults[] = 6;
-  readonly attribute NetworkFaultType activeNetworkFaults[] = 7;
+  readonly attribute HardwareFaultEnum activeHardwareFaults[] = 5;
+  readonly attribute RadioFaultEnum activeRadioFaults[] = 6;
+  readonly attribute NetworkFaultEnum activeNetworkFaults[] = 7;
   readonly attribute boolean testEventTriggersEnabled = 8;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
@@ -821,7 +821,7 @@ server cluster Switch = 59 {
 }
 
 server cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatus : ENUM8 {
+  enum CommissioningWindowStatusEnum : ENUM8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
     kBasicWindowOpen = 2;
@@ -833,7 +833,7 @@ server cluster AdministratorCommissioning = 60 {
     kWindowNotOpen = 4;
   }
 
-  readonly attribute CommissioningWindowStatus windowStatus = 0;
+  readonly attribute CommissioningWindowStatusEnum windowStatus = 0;
   readonly attribute nullable fabric_idx adminFabricIndex = 1;
   readonly attribute nullable int16u adminVendorId = 2;
   readonly attribute bitmap32 featureMap = 65532;
diff --git a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.zap b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.zap
index e940d9becfa527..1aaea5bc177e86 100644
--- a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.zap
+++ b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.zap
@@ -4265,7 +4265,7 @@
               "code": 0,
               "mfgCode": null,
               "side": "server",
-              "type": "PHYRate",
+              "type": "PHYRateEnum",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -4489,7 +4489,7 @@
           ]
         },
         {
-          "name": "AdministratorCommissioning",
+          "name": "Administrator Commissioning",
           "code": 60,
           "mfgCode": null,
           "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
@@ -4541,7 +4541,7 @@
           ]
         },
         {
-          "name": "AdministratorCommissioning",
+          "name": "Administrator Commissioning",
           "code": 60,
           "mfgCode": null,
           "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
@@ -4553,7 +4553,7 @@
               "code": 0,
               "mfgCode": null,
               "side": "server",
-              "type": "CommissioningWindowStatus",
+              "type": "CommissioningWindowStatusEnum",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
diff --git a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter
index f215a3a2d10768..23b37a6390cf72 100644
--- a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter
+++ b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter
@@ -781,7 +781,7 @@ server cluster GeneralDiagnostics = 51 {
     kSoftwareReset = 6;
   }
 
-  enum HardwareFault : ENUM8 {
+  enum HardwareFaultEnum : ENUM8 {
     kUnspecified = 0;
     kRadio = 1;
     kSensor = 2;
@@ -795,7 +795,7 @@ server cluster GeneralDiagnostics = 51 {
     kTamperDetected = 10;
   }
 
-  enum InterfaceType : ENUM8 {
+  enum InterfaceTypeEnum : ENUM8 {
     kUnspecified = 0;
     kWiFi = 1;
     kEthernet = 2;
@@ -803,14 +803,14 @@ server cluster GeneralDiagnostics = 51 {
     kThread = 4;
   }
 
-  enum NetworkFaultType : ENUM8 {
+  enum NetworkFaultEnum : ENUM8 {
     kUnspecified = 0;
     kHardwareFailure = 1;
     kNetworkJammed = 2;
     kConnectionFailed = 3;
   }
 
-  enum RadioFault : ENUM8 {
+  enum RadioFaultEnum : ENUM8 {
     kUnspecified = 0;
     kWiFiFault = 1;
     kCellularFault = 2;
@@ -828,22 +828,22 @@ server cluster GeneralDiagnostics = 51 {
     octet_string<8> hardwareAddress = 4;
     octet_string IPv4Addresses[] = 5;
     octet_string IPv6Addresses[] = 6;
-    InterfaceType type = 7;
+    InterfaceTypeEnum type = 7;
   }
 
   critical event HardwareFaultChange = 0 {
-    HardwareFault current[] = 0;
-    HardwareFault previous[] = 1;
+    HardwareFaultEnum current[] = 0;
+    HardwareFaultEnum previous[] = 1;
   }
 
   critical event RadioFaultChange = 1 {
-    RadioFault current[] = 0;
-    RadioFault previous[] = 1;
+    RadioFaultEnum current[] = 0;
+    RadioFaultEnum previous[] = 1;
   }
 
   critical event NetworkFaultChange = 2 {
-    NetworkFaultType current[] = 0;
-    NetworkFaultType previous[] = 1;
+    NetworkFaultEnum current[] = 0;
+    NetworkFaultEnum previous[] = 1;
   }
 
   critical event BootReason = 3 {
@@ -855,9 +855,9 @@ server cluster GeneralDiagnostics = 51 {
   readonly attribute int64u upTime = 2;
   readonly attribute int32u totalOperationalHours = 3;
   readonly attribute BootReasonEnum bootReason = 4;
-  readonly attribute HardwareFault activeHardwareFaults[] = 5;
-  readonly attribute RadioFault activeRadioFaults[] = 6;
-  readonly attribute NetworkFaultType activeNetworkFaults[] = 7;
+  readonly attribute HardwareFaultEnum activeHardwareFaults[] = 5;
+  readonly attribute RadioFaultEnum activeRadioFaults[] = 6;
+  readonly attribute NetworkFaultEnum activeNetworkFaults[] = 7;
   readonly attribute boolean testEventTriggersEnabled = 8;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
@@ -943,7 +943,7 @@ server cluster Switch = 59 {
 }
 
 server cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatus : ENUM8 {
+  enum CommissioningWindowStatusEnum : ENUM8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
     kBasicWindowOpen = 2;
@@ -955,7 +955,7 @@ server cluster AdministratorCommissioning = 60 {
     kWindowNotOpen = 4;
   }
 
-  readonly attribute CommissioningWindowStatus windowStatus = 0;
+  readonly attribute CommissioningWindowStatusEnum windowStatus = 0;
   readonly attribute nullable fabric_idx adminFabricIndex = 1;
   readonly attribute nullable int16u adminVendorId = 2;
   readonly attribute bitmap32 featureMap = 65532;
diff --git a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.zap b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.zap
index 8c17b74ebf9486..3a9b8f5f7642f4 100644
--- a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.zap
+++ b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.zap
@@ -4265,7 +4265,7 @@
               "code": 0,
               "mfgCode": null,
               "side": "server",
-              "type": "PHYRate",
+              "type": "PHYRateEnum",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -4489,7 +4489,7 @@
           ]
         },
         {
-          "name": "AdministratorCommissioning",
+          "name": "Administrator Commissioning",
           "code": 60,
           "mfgCode": null,
           "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
@@ -4541,7 +4541,7 @@
           ]
         },
         {
-          "name": "AdministratorCommissioning",
+          "name": "Administrator Commissioning",
           "code": 60,
           "mfgCode": null,
           "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
@@ -4553,7 +4553,7 @@
               "code": 0,
               "mfgCode": null,
               "side": "server",
-              "type": "CommissioningWindowStatus",
+              "type": "CommissioningWindowStatusEnum",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
diff --git a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter
index 66d192505a03cf..64926a1ef16c9c 100644
--- a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter
+++ b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter
@@ -654,7 +654,7 @@ server cluster GeneralDiagnostics = 51 {
     kSoftwareReset = 6;
   }
 
-  enum HardwareFault : ENUM8 {
+  enum HardwareFaultEnum : ENUM8 {
     kUnspecified = 0;
     kRadio = 1;
     kSensor = 2;
@@ -668,7 +668,7 @@ server cluster GeneralDiagnostics = 51 {
     kTamperDetected = 10;
   }
 
-  enum InterfaceType : ENUM8 {
+  enum InterfaceTypeEnum : ENUM8 {
     kUnspecified = 0;
     kWiFi = 1;
     kEthernet = 2;
@@ -676,14 +676,14 @@ server cluster GeneralDiagnostics = 51 {
     kThread = 4;
   }
 
-  enum NetworkFaultType : ENUM8 {
+  enum NetworkFaultEnum : ENUM8 {
     kUnspecified = 0;
     kHardwareFailure = 1;
     kNetworkJammed = 2;
     kConnectionFailed = 3;
   }
 
-  enum RadioFault : ENUM8 {
+  enum RadioFaultEnum : ENUM8 {
     kUnspecified = 0;
     kWiFiFault = 1;
     kCellularFault = 2;
@@ -701,22 +701,22 @@ server cluster GeneralDiagnostics = 51 {
     octet_string<8> hardwareAddress = 4;
     octet_string IPv4Addresses[] = 5;
     octet_string IPv6Addresses[] = 6;
-    InterfaceType type = 7;
+    InterfaceTypeEnum type = 7;
   }
 
   critical event HardwareFaultChange = 0 {
-    HardwareFault current[] = 0;
-    HardwareFault previous[] = 1;
+    HardwareFaultEnum current[] = 0;
+    HardwareFaultEnum previous[] = 1;
   }
 
   critical event RadioFaultChange = 1 {
-    RadioFault current[] = 0;
-    RadioFault previous[] = 1;
+    RadioFaultEnum current[] = 0;
+    RadioFaultEnum previous[] = 1;
   }
 
   critical event NetworkFaultChange = 2 {
-    NetworkFaultType current[] = 0;
-    NetworkFaultType previous[] = 1;
+    NetworkFaultEnum current[] = 0;
+    NetworkFaultEnum previous[] = 1;
   }
 
   critical event BootReason = 3 {
@@ -728,9 +728,9 @@ server cluster GeneralDiagnostics = 51 {
   readonly attribute int64u upTime = 2;
   readonly attribute int32u totalOperationalHours = 3;
   readonly attribute BootReasonEnum bootReason = 4;
-  readonly attribute HardwareFault activeHardwareFaults[] = 5;
-  readonly attribute RadioFault activeRadioFaults[] = 6;
-  readonly attribute NetworkFaultType activeNetworkFaults[] = 7;
+  readonly attribute HardwareFaultEnum activeHardwareFaults[] = 5;
+  readonly attribute RadioFaultEnum activeRadioFaults[] = 6;
+  readonly attribute NetworkFaultEnum activeNetworkFaults[] = 7;
   readonly attribute boolean testEventTriggersEnabled = 8;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
@@ -816,7 +816,7 @@ server cluster Switch = 59 {
 }
 
 server cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatus : ENUM8 {
+  enum CommissioningWindowStatusEnum : ENUM8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
     kBasicWindowOpen = 2;
@@ -828,7 +828,7 @@ server cluster AdministratorCommissioning = 60 {
     kWindowNotOpen = 4;
   }
 
-  readonly attribute CommissioningWindowStatus windowStatus = 0;
+  readonly attribute CommissioningWindowStatusEnum windowStatus = 0;
   readonly attribute nullable fabric_idx adminFabricIndex = 1;
   readonly attribute nullable int16u adminVendorId = 2;
   readonly attribute bitmap32 featureMap = 65532;
diff --git a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.zap b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.zap
index 731d43c63bd333..ce8db3d22c5b91 100644
--- a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.zap
+++ b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.zap
@@ -4265,7 +4265,7 @@
               "code": 0,
               "mfgCode": null,
               "side": "server",
-              "type": "PHYRate",
+              "type": "PHYRateEnum",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -4489,7 +4489,7 @@
           ]
         },
         {
-          "name": "AdministratorCommissioning",
+          "name": "Administrator Commissioning",
           "code": 60,
           "mfgCode": null,
           "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
@@ -4541,7 +4541,7 @@
           ]
         },
         {
-          "name": "AdministratorCommissioning",
+          "name": "Administrator Commissioning",
           "code": 60,
           "mfgCode": null,
           "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
@@ -4553,7 +4553,7 @@
               "code": 0,
               "mfgCode": null,
               "side": "server",
-              "type": "CommissioningWindowStatus",
+              "type": "CommissioningWindowStatusEnum",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
diff --git a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter
index 33153dde9206e8..3ffcc2edca87a6 100644
--- a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter
+++ b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter
@@ -641,7 +641,7 @@ server cluster GeneralDiagnostics = 51 {
     kSoftwareReset = 6;
   }
 
-  enum HardwareFault : ENUM8 {
+  enum HardwareFaultEnum : ENUM8 {
     kUnspecified = 0;
     kRadio = 1;
     kSensor = 2;
@@ -655,7 +655,7 @@ server cluster GeneralDiagnostics = 51 {
     kTamperDetected = 10;
   }
 
-  enum InterfaceType : ENUM8 {
+  enum InterfaceTypeEnum : ENUM8 {
     kUnspecified = 0;
     kWiFi = 1;
     kEthernet = 2;
@@ -663,14 +663,14 @@ server cluster GeneralDiagnostics = 51 {
     kThread = 4;
   }
 
-  enum NetworkFaultType : ENUM8 {
+  enum NetworkFaultEnum : ENUM8 {
     kUnspecified = 0;
     kHardwareFailure = 1;
     kNetworkJammed = 2;
     kConnectionFailed = 3;
   }
 
-  enum RadioFault : ENUM8 {
+  enum RadioFaultEnum : ENUM8 {
     kUnspecified = 0;
     kWiFiFault = 1;
     kCellularFault = 2;
@@ -688,22 +688,22 @@ server cluster GeneralDiagnostics = 51 {
     octet_string<8> hardwareAddress = 4;
     octet_string IPv4Addresses[] = 5;
     octet_string IPv6Addresses[] = 6;
-    InterfaceType type = 7;
+    InterfaceTypeEnum type = 7;
   }
 
   critical event HardwareFaultChange = 0 {
-    HardwareFault current[] = 0;
-    HardwareFault previous[] = 1;
+    HardwareFaultEnum current[] = 0;
+    HardwareFaultEnum previous[] = 1;
   }
 
   critical event RadioFaultChange = 1 {
-    RadioFault current[] = 0;
-    RadioFault previous[] = 1;
+    RadioFaultEnum current[] = 0;
+    RadioFaultEnum previous[] = 1;
   }
 
   critical event NetworkFaultChange = 2 {
-    NetworkFaultType current[] = 0;
-    NetworkFaultType previous[] = 1;
+    NetworkFaultEnum current[] = 0;
+    NetworkFaultEnum previous[] = 1;
   }
 
   critical event BootReason = 3 {
@@ -715,9 +715,9 @@ server cluster GeneralDiagnostics = 51 {
   readonly attribute int64u upTime = 2;
   readonly attribute int32u totalOperationalHours = 3;
   readonly attribute BootReasonEnum bootReason = 4;
-  readonly attribute HardwareFault activeHardwareFaults[] = 5;
-  readonly attribute RadioFault activeRadioFaults[] = 6;
-  readonly attribute NetworkFaultType activeNetworkFaults[] = 7;
+  readonly attribute HardwareFaultEnum activeHardwareFaults[] = 5;
+  readonly attribute RadioFaultEnum activeRadioFaults[] = 6;
+  readonly attribute NetworkFaultEnum activeNetworkFaults[] = 7;
   readonly attribute boolean testEventTriggersEnabled = 8;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
@@ -803,7 +803,7 @@ server cluster Switch = 59 {
 }
 
 server cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatus : ENUM8 {
+  enum CommissioningWindowStatusEnum : ENUM8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
     kBasicWindowOpen = 2;
@@ -815,7 +815,7 @@ server cluster AdministratorCommissioning = 60 {
     kWindowNotOpen = 4;
   }
 
-  readonly attribute CommissioningWindowStatus windowStatus = 0;
+  readonly attribute CommissioningWindowStatusEnum windowStatus = 0;
   readonly attribute nullable fabric_idx adminFabricIndex = 1;
   readonly attribute nullable int16u adminVendorId = 2;
   readonly attribute bitmap32 featureMap = 65532;
diff --git a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.zap b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.zap
index 68ba1f5e73a9db..bfa8a28fa4a94c 100644
--- a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.zap
+++ b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.zap
@@ -4313,7 +4313,7 @@
               "code": 0,
               "mfgCode": null,
               "side": "server",
-              "type": "PHYRate",
+              "type": "PHYRateEnum",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -4537,7 +4537,7 @@
           ]
         },
         {
-          "name": "AdministratorCommissioning",
+          "name": "Administrator Commissioning",
           "code": 60,
           "mfgCode": null,
           "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
@@ -4589,7 +4589,7 @@
           ]
         },
         {
-          "name": "AdministratorCommissioning",
+          "name": "Administrator Commissioning",
           "code": 60,
           "mfgCode": null,
           "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
@@ -4601,7 +4601,7 @@
               "code": 0,
               "mfgCode": null,
               "side": "server",
-              "type": "CommissioningWindowStatus",
+              "type": "CommissioningWindowStatusEnum",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
diff --git a/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter b/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter
index 534b4de8d43e99..185d06293ab795 100644
--- a/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter
+++ b/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter
@@ -641,7 +641,7 @@ server cluster GeneralDiagnostics = 51 {
     kSoftwareReset = 6;
   }
 
-  enum HardwareFault : ENUM8 {
+  enum HardwareFaultEnum : ENUM8 {
     kUnspecified = 0;
     kRadio = 1;
     kSensor = 2;
@@ -655,7 +655,7 @@ server cluster GeneralDiagnostics = 51 {
     kTamperDetected = 10;
   }
 
-  enum InterfaceType : ENUM8 {
+  enum InterfaceTypeEnum : ENUM8 {
     kUnspecified = 0;
     kWiFi = 1;
     kEthernet = 2;
@@ -663,14 +663,14 @@ server cluster GeneralDiagnostics = 51 {
     kThread = 4;
   }
 
-  enum NetworkFaultType : ENUM8 {
+  enum NetworkFaultEnum : ENUM8 {
     kUnspecified = 0;
     kHardwareFailure = 1;
     kNetworkJammed = 2;
     kConnectionFailed = 3;
   }
 
-  enum RadioFault : ENUM8 {
+  enum RadioFaultEnum : ENUM8 {
     kUnspecified = 0;
     kWiFiFault = 1;
     kCellularFault = 2;
@@ -688,22 +688,22 @@ server cluster GeneralDiagnostics = 51 {
     octet_string<8> hardwareAddress = 4;
     octet_string IPv4Addresses[] = 5;
     octet_string IPv6Addresses[] = 6;
-    InterfaceType type = 7;
+    InterfaceTypeEnum type = 7;
   }
 
   critical event HardwareFaultChange = 0 {
-    HardwareFault current[] = 0;
-    HardwareFault previous[] = 1;
+    HardwareFaultEnum current[] = 0;
+    HardwareFaultEnum previous[] = 1;
   }
 
   critical event RadioFaultChange = 1 {
-    RadioFault current[] = 0;
-    RadioFault previous[] = 1;
+    RadioFaultEnum current[] = 0;
+    RadioFaultEnum previous[] = 1;
   }
 
   critical event NetworkFaultChange = 2 {
-    NetworkFaultType current[] = 0;
-    NetworkFaultType previous[] = 1;
+    NetworkFaultEnum current[] = 0;
+    NetworkFaultEnum previous[] = 1;
   }
 
   critical event BootReason = 3 {
@@ -715,9 +715,9 @@ server cluster GeneralDiagnostics = 51 {
   readonly attribute int64u upTime = 2;
   readonly attribute int32u totalOperationalHours = 3;
   readonly attribute BootReasonEnum bootReason = 4;
-  readonly attribute HardwareFault activeHardwareFaults[] = 5;
-  readonly attribute RadioFault activeRadioFaults[] = 6;
-  readonly attribute NetworkFaultType activeNetworkFaults[] = 7;
+  readonly attribute HardwareFaultEnum activeHardwareFaults[] = 5;
+  readonly attribute RadioFaultEnum activeRadioFaults[] = 6;
+  readonly attribute NetworkFaultEnum activeNetworkFaults[] = 7;
   readonly attribute boolean testEventTriggersEnabled = 8;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
@@ -803,7 +803,7 @@ server cluster Switch = 59 {
 }
 
 server cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatus : ENUM8 {
+  enum CommissioningWindowStatusEnum : ENUM8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
     kBasicWindowOpen = 2;
@@ -815,7 +815,7 @@ server cluster AdministratorCommissioning = 60 {
     kWindowNotOpen = 4;
   }
 
-  readonly attribute CommissioningWindowStatus windowStatus = 0;
+  readonly attribute CommissioningWindowStatusEnum windowStatus = 0;
   readonly attribute nullable fabric_idx adminFabricIndex = 1;
   readonly attribute nullable int16u adminVendorId = 2;
   readonly attribute bitmap32 featureMap = 65532;
diff --git a/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.zap b/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.zap
index 7beb18da0550d7..7c5b00a6a08671 100644
--- a/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.zap
+++ b/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.zap
@@ -4265,7 +4265,7 @@
               "code": 0,
               "mfgCode": null,
               "side": "server",
-              "type": "PHYRate",
+              "type": "PHYRateEnum",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -4489,7 +4489,7 @@
           ]
         },
         {
-          "name": "AdministratorCommissioning",
+          "name": "Administrator Commissioning",
           "code": 60,
           "mfgCode": null,
           "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
@@ -4541,7 +4541,7 @@
           ]
         },
         {
-          "name": "AdministratorCommissioning",
+          "name": "Administrator Commissioning",
           "code": 60,
           "mfgCode": null,
           "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
@@ -4553,7 +4553,7 @@
               "code": 0,
               "mfgCode": null,
               "side": "server",
-              "type": "CommissioningWindowStatus",
+              "type": "CommissioningWindowStatusEnum",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
diff --git a/examples/chef/esp32/main/main.cpp b/examples/chef/esp32/main/main.cpp
index 225815f8043b70..bd8ec2660100f4 100644
--- a/examples/chef/esp32/main/main.cpp
+++ b/examples/chef/esp32/main/main.cpp
@@ -42,7 +42,6 @@
 #include <app-common/zap-generated/attribute-type.h>
 #include <app-common/zap-generated/callback.h>
 #include <app-common/zap-generated/cluster-objects.h>
-#include <app-common/zap-generated/command-id.h>
 #include <app/server/Dnssd.h>
 #include <app/util/af-event.h>
 #include <app/util/af.h>
diff --git a/examples/common/pigweed/rpc_services/Device.h b/examples/common/pigweed/rpc_services/Device.h
index 758ecc9c454259..1427d48d391431 100644
--- a/examples/common/pigweed/rpc_services/Device.h
+++ b/examples/common/pigweed/rpc_services/Device.h
@@ -430,7 +430,7 @@ class Device : public pw_rpc::nanopb::Device::Service<Device>
 
         if (Server::GetInstance().GetCommissioningWindowManager().IsCommissioningWindowOpen() &&
             Server::GetInstance().GetCommissioningWindowManager().CommissioningWindowStatusForCluster() !=
-                app::Clusters::AdministratorCommissioning::CommissioningWindowStatus::kEnhancedWindowOpen)
+                app::Clusters::AdministratorCommissioning::CommissioningWindowStatusEnum::kEnhancedWindowOpen)
         {
             // Cache values before closing to restore them after restart.
             app::DataModel::Nullable<VendorId> vendorId = Server::GetInstance().GetCommissioningWindowManager().GetOpenerVendorId();
@@ -444,7 +444,7 @@ class Device : public pw_rpc::nanopb::Device::Service<Device>
             }
             // Let other tasks possibly work since Commissioning window close/open are "heavy"
             if (Server::GetInstance().GetCommissioningWindowManager().CommissioningWindowStatusForCluster() !=
-                    app::Clusters::AdministratorCommissioning::CommissioningWindowStatus::kWindowNotOpen &&
+                    app::Clusters::AdministratorCommissioning::CommissioningWindowStatusEnum::kWindowNotOpen &&
                 !vendorId.IsNull() && !fabricIndex.IsNull())
             {
                 DeviceLayer::StackLock lock;
diff --git a/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.matter b/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.matter
index 75b9d21d0cc5b0..45e8e9e93c221c 100644
--- a/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.matter
+++ b/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.matter
@@ -644,7 +644,7 @@ server cluster GeneralDiagnostics = 51 {
     kSoftwareReset = 6;
   }
 
-  enum HardwareFault : ENUM8 {
+  enum HardwareFaultEnum : ENUM8 {
     kUnspecified = 0;
     kRadio = 1;
     kSensor = 2;
@@ -658,7 +658,7 @@ server cluster GeneralDiagnostics = 51 {
     kTamperDetected = 10;
   }
 
-  enum InterfaceType : ENUM8 {
+  enum InterfaceTypeEnum : ENUM8 {
     kUnspecified = 0;
     kWiFi = 1;
     kEthernet = 2;
@@ -666,14 +666,14 @@ server cluster GeneralDiagnostics = 51 {
     kThread = 4;
   }
 
-  enum NetworkFaultType : ENUM8 {
+  enum NetworkFaultEnum : ENUM8 {
     kUnspecified = 0;
     kHardwareFailure = 1;
     kNetworkJammed = 2;
     kConnectionFailed = 3;
   }
 
-  enum RadioFault : ENUM8 {
+  enum RadioFaultEnum : ENUM8 {
     kUnspecified = 0;
     kWiFiFault = 1;
     kCellularFault = 2;
@@ -691,22 +691,22 @@ server cluster GeneralDiagnostics = 51 {
     octet_string<8> hardwareAddress = 4;
     octet_string IPv4Addresses[] = 5;
     octet_string IPv6Addresses[] = 6;
-    InterfaceType type = 7;
+    InterfaceTypeEnum type = 7;
   }
 
   critical event HardwareFaultChange = 0 {
-    HardwareFault current[] = 0;
-    HardwareFault previous[] = 1;
+    HardwareFaultEnum current[] = 0;
+    HardwareFaultEnum previous[] = 1;
   }
 
   critical event RadioFaultChange = 1 {
-    RadioFault current[] = 0;
-    RadioFault previous[] = 1;
+    RadioFaultEnum current[] = 0;
+    RadioFaultEnum previous[] = 1;
   }
 
   critical event NetworkFaultChange = 2 {
-    NetworkFaultType current[] = 0;
-    NetworkFaultType previous[] = 1;
+    NetworkFaultEnum current[] = 0;
+    NetworkFaultEnum previous[] = 1;
   }
 
   critical event BootReason = 3 {
@@ -718,9 +718,9 @@ server cluster GeneralDiagnostics = 51 {
   readonly attribute int64u upTime = 2;
   readonly attribute int32u totalOperationalHours = 3;
   readonly attribute BootReasonEnum bootReason = 4;
-  readonly attribute HardwareFault activeHardwareFaults[] = 5;
-  readonly attribute RadioFault activeRadioFaults[] = 6;
-  readonly attribute NetworkFaultType activeNetworkFaults[] = 7;
+  readonly attribute HardwareFaultEnum activeHardwareFaults[] = 5;
+  readonly attribute RadioFaultEnum activeRadioFaults[] = 6;
+  readonly attribute NetworkFaultEnum activeNetworkFaults[] = 7;
   readonly attribute boolean testEventTriggersEnabled = 8;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
@@ -984,7 +984,7 @@ server cluster WiFiNetworkDiagnostics = 54 {
 }
 
 server cluster EthernetNetworkDiagnostics = 55 {
-  enum PHYRate : ENUM8 {
+  enum PHYRateEnum : ENUM8 {
     kRate10M = 0;
     kRate100M = 1;
     kRate1G = 2;
@@ -997,7 +997,7 @@ server cluster EthernetNetworkDiagnostics = 55 {
     kRate400G = 9;
   }
 
-  readonly attribute nullable PHYRate PHYRate = 0;
+  readonly attribute nullable PHYRateEnum PHYRate = 0;
   readonly attribute nullable boolean fullDuplex = 1;
   readonly attribute int64u packetRxCount = 2;
   readonly attribute int64u packetTxCount = 3;
@@ -1013,7 +1013,7 @@ server cluster EthernetNetworkDiagnostics = 55 {
 }
 
 server cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatus : ENUM8 {
+  enum CommissioningWindowStatusEnum : ENUM8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
     kBasicWindowOpen = 2;
@@ -1025,7 +1025,7 @@ server cluster AdministratorCommissioning = 60 {
     kWindowNotOpen = 4;
   }
 
-  readonly attribute CommissioningWindowStatus windowStatus = 0;
+  readonly attribute CommissioningWindowStatusEnum windowStatus = 0;
   readonly attribute nullable fabric_idx adminFabricIndex = 1;
   readonly attribute nullable int16u adminVendorId = 2;
   readonly attribute bitmap32 featureMap = 65532;
diff --git a/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.zap b/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.zap
index 5ccf0e70ef7eb3..39c5cc7b1d8852 100644
--- a/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.zap
+++ b/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.zap
@@ -4361,7 +4361,7 @@
               "code": 0,
               "mfgCode": null,
               "side": "server",
-              "type": "PHYRate",
+              "type": "PHYRateEnum",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -4585,7 +4585,7 @@
           ]
         },
         {
-          "name": "AdministratorCommissioning",
+          "name": "Administrator Commissioning",
           "code": 60,
           "mfgCode": null,
           "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
@@ -4637,7 +4637,7 @@
           ]
         },
         {
-          "name": "AdministratorCommissioning",
+          "name": "Administrator Commissioning",
           "code": 60,
           "mfgCode": null,
           "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
@@ -4649,7 +4649,7 @@
               "code": 0,
               "mfgCode": null,
               "side": "server",
-              "type": "CommissioningWindowStatus",
+              "type": "CommissioningWindowStatusEnum",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
diff --git a/examples/dynamic-bridge-app/bridge-common/bridge-app.matter b/examples/dynamic-bridge-app/bridge-common/bridge-app.matter
index 5d5c889277e1ff..9ad049a62dd53c 100644
--- a/examples/dynamic-bridge-app/bridge-common/bridge-app.matter
+++ b/examples/dynamic-bridge-app/bridge-common/bridge-app.matter
@@ -801,7 +801,7 @@ server cluster GeneralDiagnostics = 51 {
     kSoftwareReset = 6;
   }
 
-  enum HardwareFault : ENUM8 {
+  enum HardwareFaultEnum : ENUM8 {
     kUnspecified = 0;
     kRadio = 1;
     kSensor = 2;
@@ -815,7 +815,7 @@ server cluster GeneralDiagnostics = 51 {
     kTamperDetected = 10;
   }
 
-  enum InterfaceType : ENUM8 {
+  enum InterfaceTypeEnum : ENUM8 {
     kUnspecified = 0;
     kWiFi = 1;
     kEthernet = 2;
@@ -823,14 +823,14 @@ server cluster GeneralDiagnostics = 51 {
     kThread = 4;
   }
 
-  enum NetworkFaultType : ENUM8 {
+  enum NetworkFaultEnum : ENUM8 {
     kUnspecified = 0;
     kHardwareFailure = 1;
     kNetworkJammed = 2;
     kConnectionFailed = 3;
   }
 
-  enum RadioFault : ENUM8 {
+  enum RadioFaultEnum : ENUM8 {
     kUnspecified = 0;
     kWiFiFault = 1;
     kCellularFault = 2;
@@ -848,22 +848,22 @@ server cluster GeneralDiagnostics = 51 {
     octet_string<8> hardwareAddress = 4;
     octet_string IPv4Addresses[] = 5;
     octet_string IPv6Addresses[] = 6;
-    InterfaceType type = 7;
+    InterfaceTypeEnum type = 7;
   }
 
   critical event HardwareFaultChange = 0 {
-    HardwareFault current[] = 0;
-    HardwareFault previous[] = 1;
+    HardwareFaultEnum current[] = 0;
+    HardwareFaultEnum previous[] = 1;
   }
 
   critical event RadioFaultChange = 1 {
-    RadioFault current[] = 0;
-    RadioFault previous[] = 1;
+    RadioFaultEnum current[] = 0;
+    RadioFaultEnum previous[] = 1;
   }
 
   critical event NetworkFaultChange = 2 {
-    NetworkFaultType current[] = 0;
-    NetworkFaultType previous[] = 1;
+    NetworkFaultEnum current[] = 0;
+    NetworkFaultEnum previous[] = 1;
   }
 
   critical event BootReason = 3 {
@@ -875,9 +875,9 @@ server cluster GeneralDiagnostics = 51 {
   readonly attribute int64u upTime = 2;
   readonly attribute int32u totalOperationalHours = 3;
   readonly attribute BootReasonEnum bootReason = 4;
-  readonly attribute HardwareFault activeHardwareFaults[] = 5;
-  readonly attribute RadioFault activeRadioFaults[] = 6;
-  readonly attribute NetworkFaultType activeNetworkFaults[] = 7;
+  readonly attribute HardwareFaultEnum activeHardwareFaults[] = 5;
+  readonly attribute RadioFaultEnum activeRadioFaults[] = 6;
+  readonly attribute NetworkFaultEnum activeNetworkFaults[] = 7;
   readonly attribute boolean testEventTriggersEnabled = 8;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -1138,7 +1138,7 @@ server cluster WiFiNetworkDiagnostics = 54 {
 }
 
 server cluster EthernetNetworkDiagnostics = 55 {
-  enum PHYRate : ENUM8 {
+  enum PHYRateEnum : ENUM8 {
     kRate10M = 0;
     kRate100M = 1;
     kRate1G = 2;
@@ -1151,7 +1151,7 @@ server cluster EthernetNetworkDiagnostics = 55 {
     kRate400G = 9;
   }
 
-  readonly attribute nullable PHYRate PHYRate = 0;
+  readonly attribute nullable PHYRateEnum PHYRate = 0;
   readonly attribute nullable boolean fullDuplex = 1;
   readonly attribute int64u packetRxCount = 2;
   readonly attribute int64u packetTxCount = 3;
@@ -1213,7 +1213,7 @@ server cluster Switch = 59 {
 }
 
 server cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatus : ENUM8 {
+  enum CommissioningWindowStatusEnum : ENUM8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
     kBasicWindowOpen = 2;
@@ -1225,7 +1225,7 @@ server cluster AdministratorCommissioning = 60 {
     kWindowNotOpen = 4;
   }
 
-  readonly attribute CommissioningWindowStatus windowStatus = 0;
+  readonly attribute CommissioningWindowStatusEnum windowStatus = 0;
   readonly attribute nullable fabric_idx adminFabricIndex = 1;
   readonly attribute nullable int16u adminVendorId = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
diff --git a/examples/dynamic-bridge-app/bridge-common/bridge-app.zap b/examples/dynamic-bridge-app/bridge-common/bridge-app.zap
index 28c59bdbd6369e..e7ea939cda1709 100644
--- a/examples/dynamic-bridge-app/bridge-common/bridge-app.zap
+++ b/examples/dynamic-bridge-app/bridge-common/bridge-app.zap
@@ -3855,7 +3855,7 @@
               "code": 0,
               "mfgCode": null,
               "side": "server",
-              "type": "PHYRate",
+              "type": "PHYRateEnum",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -4029,7 +4029,7 @@
           ]
         },
         {
-          "name": "AdministratorCommissioning",
+          "name": "Administrator Commissioning",
           "code": 60,
           "mfgCode": null,
           "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
@@ -4097,7 +4097,7 @@
           ]
         },
         {
-          "name": "AdministratorCommissioning",
+          "name": "Administrator Commissioning",
           "code": 60,
           "mfgCode": null,
           "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
@@ -4109,7 +4109,7 @@
               "code": 0,
               "mfgCode": null,
               "side": "server",
-              "type": "CommissioningWindowStatus",
+              "type": "CommissioningWindowStatusEnum",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
diff --git a/examples/dynamic-bridge-app/linux/BUILD.gn b/examples/dynamic-bridge-app/linux/BUILD.gn
index 1ed00756d01bcc..03e3cb4fcee25b 100644
--- a/examples/dynamic-bridge-app/linux/BUILD.gn
+++ b/examples/dynamic-bridge-app/linux/BUILD.gn
@@ -115,6 +115,8 @@ executable("dynamic-chip-bridge-app") {
   }
 
   output_dir = root_out_dir
+
+  configs += ["${chip_root}/src:includes"]
 }
 
 group("linux") {
diff --git a/examples/dynamic-bridge-app/linux/UserInputBackend.cpp b/examples/dynamic-bridge-app/linux/UserInputBackend.cpp
index 9bdf4b8e689710..b609ad9cceffa9 100644
--- a/examples/dynamic-bridge-app/linux/UserInputBackend.cpp
+++ b/examples/dynamic-bridge-app/linux/UserInputBackend.cpp
@@ -120,7 +120,8 @@ void AddCluster(const std::vector<std::string> & tokens)
     auto c = CreateCluster(cluster_name.c_str());
     if (c)
     {
-        g_pending->AddCluster(std::make_unique<DynamicCluster>(std::move(c)));
+        g_pending->AddCluster(
+            std::make_unique<DynamicCluster>(std::move(c), c->GetIncomingCommandList(), c->GetOutgoingCommandList()));
     }
     else
     {
@@ -285,20 +286,20 @@ void ParseValue(std::vector<uint8_t> * data, uint16_t size, const std::string &
     {
     case ZCL_OCTET_STRING_ATTRIBUTE_TYPE:
     case ZCL_CHAR_STRING_ATTRIBUTE_TYPE:
-        wr.PutString(chip::TLV::Tag(), str.data(), (uint32_t) str.size());
+        wr.PutString(chip::TLV::AnonymousTag(), str.data(), (uint32_t) str.size());
         break;
     case ZCL_LONG_OCTET_STRING_ATTRIBUTE_TYPE:
     case ZCL_LONG_CHAR_STRING_ATTRIBUTE_TYPE:
-        wr.PutBytes(chip::TLV::Tag(), (const uint8_t *) str.data(), (uint32_t) str.size());
+        wr.PutBytes(chip::TLV::AnonymousTag(), (const uint8_t *) str.data(), (uint32_t) str.size());
         break;
     case ZCL_STRUCT_ATTRIBUTE_TYPE:
         // Writing structs not supported yet
         break;
     case ZCL_SINGLE_ATTRIBUTE_TYPE:
-        wr.Put(chip::TLV::Tag(), (float) atof(str.c_str()));
+        wr.Put(chip::TLV::AnonymousTag(), (float) atof(str.c_str()));
         break;
     case ZCL_DOUBLE_ATTRIBUTE_TYPE:
-        wr.Put(chip::TLV::Tag(), atof(str.c_str()));
+        wr.Put(chip::TLV::AnonymousTag(), atof(str.c_str()));
         break;
     case ZCL_INT8S_ATTRIBUTE_TYPE:
     case ZCL_INT16S_ATTRIBUTE_TYPE:
@@ -308,7 +309,7 @@ void ParseValue(std::vector<uint8_t> * data, uint16_t size, const std::string &
     case ZCL_INT48S_ATTRIBUTE_TYPE:
     case ZCL_INT56S_ATTRIBUTE_TYPE:
     case ZCL_INT64S_ATTRIBUTE_TYPE:
-        wr.Put(chip::TLV::Tag(), (int64_t) strtoll(str.c_str(), nullptr, 10));
+        wr.Put(chip::TLV::AnonymousTag(), (int64_t) strtoll(str.c_str(), nullptr, 10));
         break;
 
     case ZCL_INT8U_ATTRIBUTE_TYPE:
@@ -319,12 +320,12 @@ void ParseValue(std::vector<uint8_t> * data, uint16_t size, const std::string &
     case ZCL_INT48U_ATTRIBUTE_TYPE:
     case ZCL_INT56U_ATTRIBUTE_TYPE:
     case ZCL_INT64U_ATTRIBUTE_TYPE:
-        wr.Put(chip::TLV::Tag(), (uint64_t) strtoll(str.c_str(), nullptr, 10));
+        wr.Put(chip::TLV::AnonymousTag(), (uint64_t) strtoll(str.c_str(), nullptr, 10));
         break;
 
     default:
         // Assume integer
-        wr.Put(chip::TLV::Tag(), (int64_t) strtoll(str.c_str(), nullptr, 10));
+        wr.Put(chip::TLV::AnonymousTag(), (int64_t) strtoll(str.c_str(), nullptr, 10));
         break;
     }
     wr.Finalize();
diff --git a/examples/dynamic-bridge-app/linux/include/ActionCluster.h b/examples/dynamic-bridge-app/linux/include/ActionCluster.h
index 4253cb1d3244ff..a5a830c044710d 100644
--- a/examples/dynamic-bridge-app/linux/include/ActionCluster.h
+++ b/examples/dynamic-bridge-app/linux/include/ActionCluster.h
@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include <app-common/app-common/zap-generated/cluster-enums.h>
+#include <app-common/zap-generated/cluster-enums.h>
 #include <lib/support/Span.h>
 
 #include <stdbool.h>
diff --git a/examples/dynamic-bridge-app/linux/include/Device.h b/examples/dynamic-bridge-app/linux/include/Device.h
index 9cac09efe6f699..1ecf4d6bac4f2e 100644
--- a/examples/dynamic-bridge-app/linux/include/Device.h
+++ b/examples/dynamic-bridge-app/linux/include/Device.h
@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include <app-common/app-common/zap-generated/cluster-enums.h>
+#include <app-common/zap-generated/cluster-enums.h>
 #include <lib/support/Span.h>
 
 #include <stdbool.h>
diff --git a/examples/dynamic-bridge-app/linux/include/GeneratedClusters.h b/examples/dynamic-bridge-app/linux/include/GeneratedClusters.h
index 9e417814ac04a6..02ad1aaeaf7423 100644
--- a/examples/dynamic-bridge-app/linux/include/GeneratedClusters.h
+++ b/examples/dynamic-bridge-app/linux/include/GeneratedClusters.h
@@ -24,4 +24,16 @@ class GeneratedCluster
     virtual chip::ClusterId GetClusterId() = 0;
     // Gets the list of available attributes for this cluster.
     virtual std::vector<AttributeInterface *> GetAttributes() = 0;
+
+    // Returns a list of client to server commands. Can be nullptr or terminated by 0xFFFF_FFFF.
+    // The returned list mirrors the `acceptedCommandList` field in `EmberAfCluster`
+    // This function is used to pass a command list when creating a `DynamicCluster` and its underlying `EmberAfCluster`. See
+    // `AddCluster` in `UserInputBackend`.
+    virtual const chip::CommandId * GetIncomingCommandList() { return nullptr; }
+
+    // Returns a list of server generated commands (responses to client commands). Can be nullptr or terminated by 0xFFFF_FFFF.
+    // The returned list mirrors the `generatedCommandList` field in `EmberAfCluster`
+    // This function is used to pass a command list when creating a `DynamicCluster` and its underlying `EmberAfCluster`. See
+    // `AddCluster` in `UserInputBackend`.
+    virtual const chip::CommandId * GetOutgoingCommandList() { return nullptr; }
 };
diff --git a/examples/dynamic-bridge-app/linux/include/data-model/Attribute.h b/examples/dynamic-bridge-app/linux/include/data-model/Attribute.h
index 7a7be2a997036c..8a75f811c4b3bc 100644
--- a/examples/dynamic-bridge-app/linux/include/data-model/Attribute.h
+++ b/examples/dynamic-bridge-app/linux/include/data-model/Attribute.h
@@ -27,6 +27,8 @@ class AttributeInterface
 
     // Read the contents of the attribute.
     virtual CHIP_ERROR Read(const chip::app::ConcreteReadAttributePath & aPath, chip::app::AttributeValueEncoder & aEncoder) = 0;
+
+    virtual CHIP_ERROR Read(const chip::app::ConcreteReadAttributePath & aPath, chip::TLV::TLVWriter & writer) = 0;
 };
 
 // This is the base type for implementing an attribute
@@ -52,6 +54,23 @@ struct Attribute : public AttributeInterface
         return chip::app::DataModel::Encode(aPath, aEncoder, mData);
     }
 
+    template <typename T = Type, std::enable_if_t<chip::app::DataModel::IsList<std::decay_t<T>>::value, bool> = true>
+    CHIP_ERROR ReadValue(const chip::app::ConcreteReadAttributePath & aPath, chip::TLV::TLVWriter & writer, Type & value)
+    {
+        return chip::app::DataModel::Encode(aPath, writer, chip::TLV::AnonymousTag(), value);
+    }
+
+    template <typename T = Type, std::enable_if_t<!chip::app::DataModel::IsList<std::decay_t<T>>::value, bool> = true>
+    CHIP_ERROR ReadValue(const chip::app::ConcreteReadAttributePath & aPath, chip::TLV::TLVWriter & writer, Type & value)
+    {
+        return chip::app::DataModel::Encode(writer, chip::TLV::AnonymousTag(), value);
+    }
+
+    CHIP_ERROR Read(const chip::app::ConcreteReadAttributePath & aPath, chip::TLV::TLVWriter & writer) override
+    {
+        return ReadValue(aPath, writer, mData);
+    }
+
     void operator=(const Type & value) { mData = value; }
     const Type & Peek() const { return mData; }
 
diff --git a/examples/dynamic-bridge-app/linux/include/data-model/DataModel.h b/examples/dynamic-bridge-app/linux/include/data-model/DataModel.h
index fde7bf07841f43..6f78787830e3f3 100644
--- a/examples/dynamic-bridge-app/linux/include/data-model/DataModel.h
+++ b/examples/dynamic-bridge-app/linux/include/data-model/DataModel.h
@@ -65,6 +65,7 @@ CHIP_ERROR Encode(const ConcreteReadAttributePath &, AttributeValueEncoder & aEn
 /*
  * @brief
  * Lists that are string-like should be encoded as char/byte spans.
+ * Encode using a given AttributeValueEncoder.
  */
 template <
     typename X,
@@ -74,11 +75,26 @@ CHIP_ERROR Encode(const ConcreteReadAttributePath & aPath, AttributeValueEncoder
     return aEncoder.Encode(Span<std::decay_t<typename X::pointer>>(x.data(), x.size()));
 }
 
+/*
+ * @brief
+ * Lists that are string-like should be encoded as char/byte spans.
+ * Encode using a given TLVWriter.
+ */
+template <
+    typename X,
+    std::enable_if_t<IsList<std::decay_t<X>>::value && sizeof(std::decay_t<typename X::pointer>) == sizeof(char), bool> = true>
+CHIP_ERROR Encode(const ConcreteReadAttributePath & aPath, TLV::TLVWriter & writer, TLV::Tag tag, const X & x)
+{
+    return writer.Put(tag, Span<std::decay_t<typename X::pointer>>(x.data(), x.size()));
+}
+
 /*
  * @brief
  *
  * If an item is requested from a list, encode just that single item, or the entire list otherwise.
  *
+ * Encodes items using a given AttributeValueEncoder.
+ *
  * The object must satisfy the following constraints
  * size() must return an integer
  * begin() must return a type conforming to LegacyRandomAccessIterator
@@ -113,6 +129,46 @@ CHIP_ERROR Encode(const ConcreteReadAttributePath & aPath, AttributeValueEncoder
     });
 }
 
+/*
+ * @brief
+ *
+ * If an item is requested from a list, encode just that single item, or the entire list otherwise.
+ *
+ * Encodes items using a given TLVWriter.
+ *
+ * The object must satisfy the following constraints
+ * size() must return an integer
+ * begin() must return a type conforming to LegacyRandomAccessIterator
+ *
+ * This is const X& instead of X&& because it is "more specialized" and so this overload will
+ * be chosen if possible.
+ */
+template <
+    typename X,
+    std::enable_if_t<IsList<std::decay_t<X>>::value && (sizeof(std::decay_t<typename X::pointer>) > sizeof(char)), bool> = true>
+CHIP_ERROR Encode(const ConcreteReadAttributePath & aPath, TLV::TLVWriter & writer, TLV::Tag tag, const X & x)
+{
+    if (aPath.mListIndex.HasValue())
+    {
+        uint16_t index = aPath.mListIndex.Value();
+        if (index >= x.size())
+            return CHIP_ERROR_INVALID_ARGUMENT;
+
+        auto it = x.begin();
+        std::advance(it, index);
+        return Encode(writer, tag, *it);
+    }
+    TLV::TLVType type;
+
+    ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Array, type));
+    for (auto & item : x)
+    {
+        ReturnErrorOnFailure(Encode(writer, tag, item));
+    }
+    ReturnErrorOnFailure(writer.EndContainer(type));
+    return CHIP_NO_ERROR;
+}
+
 /*
  * @brief
  * Set of overloaded encode methods that can be called from AttributeAccessInterface::Read
diff --git a/examples/dynamic-bridge-app/linux/include/main.h b/examples/dynamic-bridge-app/linux/include/main.h
index 30df5ae0248f9c..d11982d85fbc55 100644
--- a/examples/dynamic-bridge-app/linux/include/main.h
+++ b/examples/dynamic-bridge-app/linux/include/main.h
@@ -62,3 +62,5 @@ chip::Span<Action *> GetActionListInfo(chip::EndpointId parentId);
 chip::Optional<chip::ClusterId> LookupClusterByName(const char * name);
 std::unique_ptr<GeneratedCluster> CreateCluster(const char * name);
 std::unique_ptr<GeneratedCluster> CreateCluster(chip::ClusterId id);
+EmberAfStatus HandleReadOnOffAttribute(Attribute<bool> * attribute, uint8_t * buffer, uint16_t maxReadLength);
+EmberAfStatus HandleWriteOnOffAttribute(Attribute<bool> * attribute, uint8_t * buffer);
diff --git a/examples/dynamic-bridge-app/linux/main.cpp b/examples/dynamic-bridge-app/linux/main.cpp
index 1c6ed2300771c7..f71f120e3bdd38 100644
--- a/examples/dynamic-bridge-app/linux/main.cpp
+++ b/examples/dynamic-bridge-app/linux/main.cpp
@@ -85,6 +85,8 @@ struct CommonAttributeAccessInterface : public chip::app::AttributeAccessInterfa
     CHIP_ERROR Read(const chip::app::ConcreteReadAttributePath & aPath, chip::app::AttributeValueEncoder & aEncoder) override;
     CHIP_ERROR Write(const chip::app::ConcreteDataAttributePath & aPath, chip::app::AttributeValueDecoder & aDecoder) override;
 
+    CHIP_ERROR Read(const chip::app::ConcreteReadAttributePath & aPath, TLV::TLVWriter & writer);
+
     void OnListWriteBegin(const chip::app::ConcreteAttributePath & aPath) override;
     void OnListWriteEnd(const chip::app::ConcreteAttributePath & aPath, bool aWriteWasSuccessful) override;
 };
@@ -97,7 +99,9 @@ CommonCluster * CommonAttributeAccessInterface::FindCluster(const chip::app::Con
         for (auto c : dev->clusters())
         {
             if (c->GetClusterId() == path.mClusterId)
+            {
                 return static_cast<CommonCluster *>(c);
+            }
         }
     }
     return nullptr;
@@ -108,10 +112,14 @@ CHIP_ERROR CommonAttributeAccessInterface::Read(const chip::app::ConcreteReadAtt
 {
     CommonCluster * c = FindCluster(aPath);
     if (!c)
-        return CHIP_ERROR_NOT_IMPLEMENTED;
+    {
+        return CHIP_ERROR_NOT_FOUND;
+    }
     AttributeInterface * a = c->FindAttribute(aPath.mAttributeId);
     if (!a)
-        return CHIP_ERROR_NOT_IMPLEMENTED;
+    {
+        return CHIP_ERROR_NOT_FOUND;
+    }
     return a->Read(aPath, aEncoder);
 }
 
@@ -120,10 +128,27 @@ CHIP_ERROR CommonAttributeAccessInterface::Write(const chip::app::ConcreteDataAt
 {
     CommonCluster * c = FindCluster(aPath);
     if (!c)
-        return CHIP_ERROR_NOT_IMPLEMENTED;
+    {
+        return CHIP_ERROR_NOT_FOUND;
+    }
     return c->ForwardWriteToBridge(aPath, aDecoder);
 }
 
+CHIP_ERROR CommonAttributeAccessInterface::Read(const chip::app::ConcreteReadAttributePath & aPath, chip::TLV::TLVWriter & writer)
+{
+    CommonCluster * c = FindCluster(aPath);
+    if (!c)
+    {
+        return CHIP_ERROR_NOT_FOUND;
+    }
+    AttributeInterface * a = c->FindAttribute(aPath.mAttributeId);
+    if (!a)
+    {
+        return CHIP_ERROR_NOT_FOUND;
+    }
+    return a->Read(aPath, writer);
+}
+
 void CommonAttributeAccessInterface::OnListWriteBegin(const chip::app::ConcreteAttributePath & aPath)
 {
     CommonCluster * c = FindCluster(aPath);
@@ -131,7 +156,9 @@ void CommonAttributeAccessInterface::OnListWriteBegin(const chip::app::ConcreteA
     {
         AttributeInterface * a = c->FindAttribute(aPath.mAttributeId);
         if (a)
+        {
             a->ListWriteBegin(aPath);
+        }
     }
 }
 
@@ -142,7 +169,9 @@ void CommonAttributeAccessInterface::OnListWriteEnd(const chip::app::ConcreteAtt
     {
         AttributeInterface * a = c->FindAttribute(aPath.mAttributeId);
         if (a)
+        {
             a->ListWriteEnd(aPath, aWriteWasSuccessful);
+        }
     }
 }
 
@@ -176,6 +205,134 @@ std::unique_ptr<GeneratedCluster> CreateCluster(chip::ClusterId id)
     return nullptr;
 }
 
+CHIP_ERROR TLVWriteValue(chip::TLV::TLVWriter & wr, const Span<const char> & v)
+{
+    return wr.PutString(chip::TLV::AnonymousTag(), v);
+}
+
+CHIP_ERROR TLVWriteValue(chip::TLV::TLVWriter & wr, const bool & v)
+{
+    return wr.PutBoolean(chip::TLV::AnonymousTag(), v);
+}
+
+template <typename T>
+CHIP_ERROR TLVWriteValue(chip::TLV::TLVWriter & wr, const T & v)
+{
+    return wr.Put(chip::TLV::AnonymousTag(), v);
+}
+
+CHIP_ERROR WriteValueToBuffer(const bool & value, chip::Span<uint8_t> buffer)
+{
+    if (buffer.size() != 1)
+    {
+        return CHIP_ERROR_INVALID_ARGUMENT;
+    }
+    *(buffer.data()) = value ? 1 : 0;
+    return CHIP_NO_ERROR;
+}
+
+template <typename T>
+CHIP_ERROR WriteValueToBuffer(const T & value, chip::Span<uint8_t> buffer)
+{
+    size_t value_size = sizeof(value);
+    if (buffer.size() != value_size)
+    {
+        return CHIP_ERROR_INVALID_ARGUMENT;
+    }
+    memcpy(buffer.data(), &value, value_size);
+    return CHIP_NO_ERROR;
+}
+
+template <typename T>
+CHIP_ERROR WriteValueToBuffer(chip::TLV::TLVReader & reader, chip::Span<uint8_t> buffer)
+{
+    T v;
+    ReturnErrorOnFailure(chip::app::DataModel::Decode(reader, v));
+    return WriteValueToBuffer(v, buffer);
+}
+
+// Describes a conversion direction between:
+// - A binary buffer (passed from ember internals)
+// - A TLV data buffer (used by TLVWriter and TLVReader)
+enum ConversionDirection
+{
+    BUFFER_TO_TLV,
+    TLV_TO_BUFFER
+};
+
+template <typename T>
+CHIP_ERROR PerformTLVBufferConversion(std::vector<uint8_t> * tlvData, chip::Span<uint8_t> buffer,
+                                      ConversionDirection convert_direction)
+{
+    CHIP_ERROR err;
+    if (convert_direction == BUFFER_TO_TLV)
+    {
+        // buffer.size() is ignored here, because it was called from the external write ember callback,
+        // which does not provide a buffer size
+        chip::TLV::TLVWriter wr;
+        wr.Init(tlvData->data(), tlvData->size());
+        T value;
+        memcpy(&value, buffer.data(), sizeof(T));
+        err = TLVWriteValue(wr, value);
+        wr.Finalize();
+        tlvData->resize(wr.GetLengthWritten());
+    }
+    else
+    {
+        chip::TLV::TLVReader rd;
+        rd.Init(tlvData->data(), tlvData->size());
+        rd.Next();
+        err = WriteValueToBuffer<T>(rd, buffer);
+    }
+    return err;
+}
+
+CHIP_ERROR PerformTLVBufferConversionForType(std::vector<uint8_t> * tlvData, chip::Span<uint8_t> buffer, EmberAfAttributeType type,
+                                             ConversionDirection convert_direction)
+{
+    switch (type)
+    {
+    case ZCL_OCTET_STRING_ATTRIBUTE_TYPE:
+    case ZCL_CHAR_STRING_ATTRIBUTE_TYPE:
+        return PerformTLVBufferConversion<Span<const char>>(tlvData, buffer, convert_direction);
+    case ZCL_LONG_OCTET_STRING_ATTRIBUTE_TYPE:
+    case ZCL_LONG_CHAR_STRING_ATTRIBUTE_TYPE:
+        return PerformTLVBufferConversion<ByteSpan>(tlvData, buffer, convert_direction);
+    case ZCL_STRUCT_ATTRIBUTE_TYPE:
+        // structs not supported yet
+        return CHIP_ERROR_NOT_IMPLEMENTED;
+    case ZCL_SINGLE_ATTRIBUTE_TYPE:
+        return PerformTLVBufferConversion<float>(tlvData, buffer, convert_direction);
+    case ZCL_DOUBLE_ATTRIBUTE_TYPE:
+        return PerformTLVBufferConversion<double>(tlvData, buffer, convert_direction);
+    case ZCL_INT8S_ATTRIBUTE_TYPE:
+    case ZCL_INT16S_ATTRIBUTE_TYPE:
+    case ZCL_INT24S_ATTRIBUTE_TYPE:
+    case ZCL_INT32S_ATTRIBUTE_TYPE:
+    case ZCL_INT40S_ATTRIBUTE_TYPE:
+    case ZCL_INT48S_ATTRIBUTE_TYPE:
+    case ZCL_INT56S_ATTRIBUTE_TYPE:
+    case ZCL_INT64S_ATTRIBUTE_TYPE:
+        return PerformTLVBufferConversion<int64_t>(tlvData, buffer, convert_direction);
+    case ZCL_INT8U_ATTRIBUTE_TYPE:
+    case ZCL_INT16U_ATTRIBUTE_TYPE:
+    case ZCL_INT24U_ATTRIBUTE_TYPE:
+    case ZCL_INT32U_ATTRIBUTE_TYPE:
+    case ZCL_INT40U_ATTRIBUTE_TYPE:
+    case ZCL_INT48U_ATTRIBUTE_TYPE:
+    case ZCL_INT56U_ATTRIBUTE_TYPE:
+    case ZCL_INT64U_ATTRIBUTE_TYPE:
+        return PerformTLVBufferConversion<uint64_t>(tlvData, buffer, convert_direction);
+    case ZCL_BOOLEAN_ATTRIBUTE_TYPE:
+        return PerformTLVBufferConversion<bool>(tlvData, buffer, convert_direction);
+    case ZCL_BITMAP32_ATTRIBUTE_TYPE:
+        return PerformTLVBufferConversion<uint32_t>(tlvData, buffer, convert_direction);
+    default:
+        // Assume integer
+        return PerformTLVBufferConversion<int64_t>(tlvData, buffer, convert_direction);
+    }
+}
+
 bool emberAfActionsClusterInstantActionCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath,
                                                 const Actions::Commands::InstantAction::DecodableType & commandData)
 {
@@ -184,12 +341,126 @@ bool emberAfActionsClusterInstantActionCallback(app::CommandHandler * commandObj
     return true;
 }
 
+EmberAfStatus emberAfExternalAttributeReadCallback(EndpointId endpoint, ClusterId clusterId,
+                                                   const EmberAfAttributeMetadata * attributeMetadata, uint8_t * buffer,
+                                                   uint16_t maxReadLength)
+{
+    uint16_t endpointIndex = emberAfGetDynamicIndexFromEndpoint(endpoint);
+
+    if ((endpointIndex >= CHIP_DEVICE_CONFIG_DYNAMIC_ENDPOINT_COUNT) || (gDevices[endpointIndex] == nullptr))
+    {
+        ChipLogError(DeviceLayer, "Could not find dynamic endpoint: %d", endpoint);
+        return EMBER_ZCL_STATUS_UNSUPPORTED_ENDPOINT;
+    }
+
+    chip::app::AttributeAccessInterface * accessInterface = chip::app::GetAttributeAccessOverride(endpoint, clusterId);
+
+    if (accessInterface == nullptr)
+    {
+        ChipLogError(DeviceLayer, "Cluster %d has no attribute access override", clusterId);
+        return EMBER_ZCL_STATUS_FAILURE;
+    }
+
+    // adding 64 bytes as padding to include the staging buffer used by
+    // TLVReader and TLVWriter, which is 17 bytes
+    std::vector<uint8_t> tlvData(attributeMetadata->size + 64);
+
+    // read the attribute and write it to `data`
+    chip::TLV::TLVWriter writer;
+    writer.Init(tlvData.data(), tlvData.size());
+
+    // this cast is safe because all the registered attribute accessors are of type `CommonAttributeAccessInterface`. See `main()`
+    CHIP_ERROR err = static_cast<CommonAttributeAccessInterface *>(accessInterface)
+                         ->Read(chip::app::ConcreteDataAttributePath(endpoint, clusterId, attributeMetadata->attributeId), writer);
+    if (err != CHIP_NO_ERROR)
+    {
+        ChipLogError(DeviceLayer, "%" CHIP_ERROR_FORMAT, err.Format());
+        ChipLogError(DeviceLayer, "Attribute access interface failed to read attribute %d, for endpoint %d cluster %d",
+                     attributeMetadata->attributeId, endpoint, clusterId);
+        return EMBER_ZCL_STATUS_FAILURE;
+    }
+    writer.Finalize();
+    tlvData.resize(writer.GetLengthWritten());
+
+    // read from `data` and write to `buffer`
+
+    // maxReadLength here is the maximum number of bytes to read from the attribute value and to write into the buffer.
+    err = PerformTLVBufferConversionForType(&tlvData, chip::Span<uint8_t>(buffer, maxReadLength), attributeMetadata->attributeType,
+                                            TLV_TO_BUFFER);
+    if (err != CHIP_NO_ERROR)
+    {
+        ChipLogError(DeviceLayer, "%" CHIP_ERROR_FORMAT, err.Format());
+        ChipLogError(DeviceLayer, "Failed to write attribute to buffer. Endpoint %d, Cluster %d, Attribute %d", endpoint, clusterId,
+                     attributeMetadata->attributeId);
+        return EMBER_ZCL_STATUS_FAILURE;
+    }
+
+    return EMBER_ZCL_STATUS_SUCCESS;
+}
+
+EmberAfStatus emberAfExternalAttributeWriteCallback(EndpointId endpoint, ClusterId clusterId,
+                                                    const EmberAfAttributeMetadata * attributeMetadata, uint8_t * buffer)
+{
+    uint16_t endpointIndex = emberAfGetDynamicIndexFromEndpoint(endpoint);
+
+    if ((endpointIndex >= CHIP_DEVICE_CONFIG_DYNAMIC_ENDPOINT_COUNT) || (gDevices[endpointIndex] == nullptr))
+    {
+        ChipLogError(DeviceLayer, "Could not find dynamic endpoint: %d", endpoint);
+        return EMBER_ZCL_STATUS_FAILURE;
+    }
+
+    chip::app::AttributeAccessInterface * accessInterface = chip::app::GetAttributeAccessOverride(endpoint, clusterId);
+
+    if (accessInterface == nullptr)
+    {
+        ChipLogError(DeviceLayer, "Cluster %d has no attribute access override", clusterId);
+        return EMBER_ZCL_STATUS_FAILURE;
+    }
+
+    // adding 64 bytes as padding to include the staging buffer used by
+    // TLVReader and TLVWriter, which is 17 bytes
+    std::vector<uint8_t> tlvData(attributeMetadata->size + 64);
+
+    // read from `buffer` and write to `data`
+
+    // buffer size will not be used in this code path, so we set it to 0. See `PerformTLVBufferConversion`
+    CHIP_ERROR err = PerformTLVBufferConversionForType(&tlvData, chip::Span<uint8_t>(buffer, 0), attributeMetadata->attributeType,
+                                                       BUFFER_TO_TLV);
+    if (err != CHIP_NO_ERROR)
+    {
+        ChipLogError(DeviceLayer, "%" CHIP_ERROR_FORMAT, err.Format());
+        ChipLogError(DeviceLayer, "Failed to read value from buffer: Endpoint %d, Cluster %d, Attribute %d", endpoint, clusterId,
+                     attributeMetadata->attributeId);
+        return EMBER_ZCL_STATUS_FAILURE;
+    }
+
+    // read from `data` and write to attribute
+    chip::TLV::TLVReader reader;
+    reader.Init(tlvData.data(), tlvData.size());
+    reader.Next();
+    chip::app::AttributeValueDecoder decoder(reader, chip::Access::SubjectDescriptor());
+    err =
+        accessInterface->Write(chip::app::ConcreteReadAttributePath(endpoint, clusterId, attributeMetadata->attributeId), decoder);
+    if (err != CHIP_NO_ERROR)
+    {
+        ChipLogError(DeviceLayer, "%" CHIP_ERROR_FORMAT, err.Format());
+        ChipLogError(DeviceLayer,
+                     "Attribute access interface failed to write attribute value. Endpoint %d, Cluster %d, Attribute %d", endpoint,
+                     clusterId, attributeMetadata->attributeId);
+        return EMBER_ZCL_STATUS_FAILURE;
+    }
+
+    return EMBER_ZCL_STATUS_SUCCESS;
+}
+
 Device * FindDeviceEndpoint(chip::EndpointId id)
 {
     for (auto dev : gDevices)
     {
         if (dev && dev->GetEndpointId() == id)
+        {
             return dev;
+        }
     }
     return nullptr;
 }
@@ -261,7 +532,9 @@ Room * FindRoom(const std::string & name)
     for (auto & room : gRooms)
     {
         if (room.GetName() == name)
+        {
             return &room;
+        }
     }
     return nullptr;
 }
diff --git a/examples/light-switch-app/light-switch-common/light-switch-app.matter b/examples/light-switch-app/light-switch-common/light-switch-app.matter
index c021fa8d36b790..5809b1a6b1ca41 100644
--- a/examples/light-switch-app/light-switch-common/light-switch-app.matter
+++ b/examples/light-switch-app/light-switch-common/light-switch-app.matter
@@ -846,7 +846,7 @@ server cluster GeneralDiagnostics = 51 {
     kSoftwareReset = 6;
   }
 
-  enum HardwareFault : ENUM8 {
+  enum HardwareFaultEnum : ENUM8 {
     kUnspecified = 0;
     kRadio = 1;
     kSensor = 2;
@@ -860,7 +860,7 @@ server cluster GeneralDiagnostics = 51 {
     kTamperDetected = 10;
   }
 
-  enum InterfaceType : ENUM8 {
+  enum InterfaceTypeEnum : ENUM8 {
     kUnspecified = 0;
     kWiFi = 1;
     kEthernet = 2;
@@ -868,14 +868,14 @@ server cluster GeneralDiagnostics = 51 {
     kThread = 4;
   }
 
-  enum NetworkFaultType : ENUM8 {
+  enum NetworkFaultEnum : ENUM8 {
     kUnspecified = 0;
     kHardwareFailure = 1;
     kNetworkJammed = 2;
     kConnectionFailed = 3;
   }
 
-  enum RadioFault : ENUM8 {
+  enum RadioFaultEnum : ENUM8 {
     kUnspecified = 0;
     kWiFiFault = 1;
     kCellularFault = 2;
@@ -893,22 +893,22 @@ server cluster GeneralDiagnostics = 51 {
     octet_string<8> hardwareAddress = 4;
     octet_string IPv4Addresses[] = 5;
     octet_string IPv6Addresses[] = 6;
-    InterfaceType type = 7;
+    InterfaceTypeEnum type = 7;
   }
 
   critical event HardwareFaultChange = 0 {
-    HardwareFault current[] = 0;
-    HardwareFault previous[] = 1;
+    HardwareFaultEnum current[] = 0;
+    HardwareFaultEnum previous[] = 1;
   }
 
   critical event RadioFaultChange = 1 {
-    RadioFault current[] = 0;
-    RadioFault previous[] = 1;
+    RadioFaultEnum current[] = 0;
+    RadioFaultEnum previous[] = 1;
   }
 
   critical event NetworkFaultChange = 2 {
-    NetworkFaultType current[] = 0;
-    NetworkFaultType previous[] = 1;
+    NetworkFaultEnum current[] = 0;
+    NetworkFaultEnum previous[] = 1;
   }
 
   critical event BootReason = 3 {
@@ -920,9 +920,9 @@ server cluster GeneralDiagnostics = 51 {
   readonly attribute int64u upTime = 2;
   readonly attribute int32u totalOperationalHours = 3;
   readonly attribute BootReasonEnum bootReason = 4;
-  readonly attribute HardwareFault activeHardwareFaults[] = 5;
-  readonly attribute RadioFault activeRadioFaults[] = 6;
-  readonly attribute NetworkFaultType activeNetworkFaults[] = 7;
+  readonly attribute HardwareFaultEnum activeHardwareFaults[] = 5;
+  readonly attribute RadioFaultEnum activeRadioFaults[] = 6;
+  readonly attribute NetworkFaultEnum activeNetworkFaults[] = 7;
   readonly attribute boolean testEventTriggersEnabled = 8;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
@@ -1186,7 +1186,7 @@ server cluster WiFiNetworkDiagnostics = 54 {
 }
 
 server cluster EthernetNetworkDiagnostics = 55 {
-  enum PHYRate : ENUM8 {
+  enum PHYRateEnum : ENUM8 {
     kRate10M = 0;
     kRate100M = 1;
     kRate1G = 2;
@@ -1199,7 +1199,7 @@ server cluster EthernetNetworkDiagnostics = 55 {
     kRate400G = 9;
   }
 
-  readonly attribute nullable PHYRate PHYRate = 0;
+  readonly attribute nullable PHYRateEnum PHYRate = 0;
   readonly attribute nullable boolean fullDuplex = 1;
   readonly attribute int64u packetRxCount = 2;
   readonly attribute int64u packetTxCount = 3;
@@ -1263,7 +1263,7 @@ server cluster Switch = 59 {
 }
 
 server cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatus : ENUM8 {
+  enum CommissioningWindowStatusEnum : ENUM8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
     kBasicWindowOpen = 2;
@@ -1275,7 +1275,7 @@ server cluster AdministratorCommissioning = 60 {
     kWindowNotOpen = 4;
   }
 
-  readonly attribute CommissioningWindowStatus windowStatus = 0;
+  readonly attribute CommissioningWindowStatusEnum windowStatus = 0;
   readonly attribute nullable fabric_idx adminFabricIndex = 1;
   readonly attribute nullable int16u adminVendorId = 2;
   readonly attribute bitmap32 featureMap = 65532;
@@ -1658,7 +1658,7 @@ client cluster ColorControl = 768 {
   }
 
   request struct MoveToColorTemperatureRequest {
-    INT16U colorTemperature = 0;
+    INT16U colorTemperatureMireds = 0;
     INT16U transitionTime = 1;
     BITMAP8 optionsMask = 2;
     BITMAP8 optionsOverride = 3;
diff --git a/examples/light-switch-app/light-switch-common/light-switch-app.zap b/examples/light-switch-app/light-switch-common/light-switch-app.zap
index 27d8862196715b..f4d7acc82b03be 100644
--- a/examples/light-switch-app/light-switch-common/light-switch-app.zap
+++ b/examples/light-switch-app/light-switch-common/light-switch-app.zap
@@ -4343,7 +4343,7 @@
               "code": 0,
               "mfgCode": null,
               "side": "server",
-              "type": "PHYRate",
+              "type": "PHYRateEnum",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -4567,7 +4567,7 @@
           ]
         },
         {
-          "name": "AdministratorCommissioning",
+          "name": "Administrator Commissioning",
           "code": 60,
           "mfgCode": null,
           "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
@@ -4619,7 +4619,7 @@
           ]
         },
         {
-          "name": "AdministratorCommissioning",
+          "name": "Administrator Commissioning",
           "code": 60,
           "mfgCode": null,
           "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
@@ -4631,7 +4631,7 @@
               "code": 0,
               "mfgCode": null,
               "side": "server",
-              "type": "CommissioningWindowStatus",
+              "type": "CommissioningWindowStatusEnum",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
diff --git a/examples/light-switch-app/silabs/efr32/README.md b/examples/light-switch-app/silabs/efr32/README.md
index 41ee783d4239cf..7d1eceee613bcf 100644
--- a/examples/light-switch-app/silabs/efr32/README.md
+++ b/examples/light-switch-app/silabs/efr32/README.md
@@ -103,31 +103,6 @@ Silicon Labs platform.
     -   BRD4187A / SLWSTK6006A / Wireless Starter Kit / 2.4GHz@20dBm
     -   BRD4187C / SLWSTK6006A / Wireless Starter Kit / 2.4GHz@20dBm
 
-    MG12 boards:
-
-    -   BRD4161A / SLWSTK6000B / Wireless Starter Kit / 2.4GHz@19dBm
-    -   BRD4162A / SLWSTK6000B / Wireless Starter Kit / 2.4GHz@10dBm
-    -   BRD4163A / SLWSTK6000B / Wireless Starter Kit / 2.4GHz@10dBm,
-        868MHz@19dBm
-    -   BRD4164A / SLWSTK6000B / Wireless Starter Kit / 2.4GHz@19dBm
-    -   BRD4166A / SLTB004A / Thunderboard Sense 2 / 2.4GHz@10dBm
-    -   BRD4170A / SLWSTK6000B / Multiband Wireless Starter Kit / 2.4GHz@19dBm,
-        915MHz@19dBm
-    -   BRD4304A / SLWSTK6000B / MGM12P Module / 2.4GHz@19dBm
-
-    MG21 boards: Currently not supported due to RAM limitation.
-
-    -   BRD4180A / SLWSTK6006A / Wireless Starter Kit / 2.4GHz@20dBm
-
-    MG24 boards :
-
-    -   BRD2601B / SLWSTK6000B / Wireless Starter Kit / 2.4GHz@10dBm
-    -   BRD2703A / SLWSTK6000B / Wireless Starter Kit / 2.4GHz@10dBm
-    -   BRD4186A / SLWSTK6006A / Wireless Starter Kit / 2.4GHz@10dBm
-    -   BRD4186C / SLWSTK6006A / Wireless Starter Kit / 2.4GHz@10dBm
-    -   BRD4187A / SLWSTK6006A / Wireless Starter Kit / 2.4GHz@20dBm
-    -   BRD4187C / SLWSTK6006A / Wireless Starter Kit / 2.4GHz@20dBm
-
 *   Build the example application:
 
           cd ~/connectedhomeip
diff --git a/examples/lighting-app/ameba/main/CHIPDeviceManager.cpp b/examples/lighting-app/ameba/main/CHIPDeviceManager.cpp
index 951b4033e33077..abc4968054bb76 100644
--- a/examples/lighting-app/ameba/main/CHIPDeviceManager.cpp
+++ b/examples/lighting-app/ameba/main/CHIPDeviceManager.cpp
@@ -35,7 +35,6 @@
 
 #include <app-common/zap-generated/attribute-id.h>
 #include <app-common/zap-generated/attributes/Accessors.h>
-#include <app-common/zap-generated/command-id.h>
 #include <app-common/zap-generated/ids/Clusters.h>
 #include <app/util/af-types.h>
 #include <app/util/attribute-storage.h>
diff --git a/examples/lighting-app/bouffalolab/common/AppTask.cpp b/examples/lighting-app/bouffalolab/common/AppTask.cpp
index 2fe2a403357717..d18f38a3e7371e 100644
--- a/examples/lighting-app/bouffalolab/common/AppTask.cpp
+++ b/examples/lighting-app/bouffalolab/common/AppTask.cpp
@@ -144,9 +144,6 @@ void PlatformManagerImpl::PlatformInit(void)
     chip::DeviceLayer::ConnectivityMgr().SetBLEDeviceName("MatterLight");
 
 #if CHIP_ENABLE_OPENTHREAD
-#if CONFIG_ENABLE_CHIP_SHELL
-    cmd_otcli_init();
-#endif
 
     ChipLogProgress(NotSpecified, "Initializing OpenThread stack");
     ret = ThreadStackMgr().InitThreadStack();
@@ -166,6 +163,11 @@ void PlatformManagerImpl::PlatformInit(void)
         ChipLogError(NotSpecified, "ConnectivityMgr().SetThreadDeviceType() failed");
         appError(ret);
     }
+
+#if CONFIG_ENABLE_CHIP_SHELL
+    cmd_otcli_init();
+#endif
+
 #elif CHIP_DEVICE_CONFIG_ENABLE_WIFI
 
     ret = sWiFiNetworkCommissioningInstance.Init();
diff --git a/examples/lighting-app/lighting-common/lighting-app.matter b/examples/lighting-app/lighting-common/lighting-app.matter
index 2269e907057c48..08d65c1210d1bd 100644
--- a/examples/lighting-app/lighting-common/lighting-app.matter
+++ b/examples/lighting-app/lighting-common/lighting-app.matter
@@ -802,7 +802,7 @@ server cluster GeneralDiagnostics = 51 {
     kSoftwareReset = 6;
   }
 
-  enum HardwareFault : ENUM8 {
+  enum HardwareFaultEnum : ENUM8 {
     kUnspecified = 0;
     kRadio = 1;
     kSensor = 2;
@@ -816,7 +816,7 @@ server cluster GeneralDiagnostics = 51 {
     kTamperDetected = 10;
   }
 
-  enum InterfaceType : ENUM8 {
+  enum InterfaceTypeEnum : ENUM8 {
     kUnspecified = 0;
     kWiFi = 1;
     kEthernet = 2;
@@ -824,14 +824,14 @@ server cluster GeneralDiagnostics = 51 {
     kThread = 4;
   }
 
-  enum NetworkFaultType : ENUM8 {
+  enum NetworkFaultEnum : ENUM8 {
     kUnspecified = 0;
     kHardwareFailure = 1;
     kNetworkJammed = 2;
     kConnectionFailed = 3;
   }
 
-  enum RadioFault : ENUM8 {
+  enum RadioFaultEnum : ENUM8 {
     kUnspecified = 0;
     kWiFiFault = 1;
     kCellularFault = 2;
@@ -849,22 +849,22 @@ server cluster GeneralDiagnostics = 51 {
     octet_string<8> hardwareAddress = 4;
     octet_string IPv4Addresses[] = 5;
     octet_string IPv6Addresses[] = 6;
-    InterfaceType type = 7;
+    InterfaceTypeEnum type = 7;
   }
 
   critical event HardwareFaultChange = 0 {
-    HardwareFault current[] = 0;
-    HardwareFault previous[] = 1;
+    HardwareFaultEnum current[] = 0;
+    HardwareFaultEnum previous[] = 1;
   }
 
   critical event RadioFaultChange = 1 {
-    RadioFault current[] = 0;
-    RadioFault previous[] = 1;
+    RadioFaultEnum current[] = 0;
+    RadioFaultEnum previous[] = 1;
   }
 
   critical event NetworkFaultChange = 2 {
-    NetworkFaultType current[] = 0;
-    NetworkFaultType previous[] = 1;
+    NetworkFaultEnum current[] = 0;
+    NetworkFaultEnum previous[] = 1;
   }
 
   critical event BootReason = 3 {
@@ -876,9 +876,9 @@ server cluster GeneralDiagnostics = 51 {
   readonly attribute int64u upTime = 2;
   readonly attribute int32u totalOperationalHours = 3;
   readonly attribute BootReasonEnum bootReason = 4;
-  readonly attribute HardwareFault activeHardwareFaults[] = 5;
-  readonly attribute RadioFault activeRadioFaults[] = 6;
-  readonly attribute NetworkFaultType activeNetworkFaults[] = 7;
+  readonly attribute HardwareFaultEnum activeHardwareFaults[] = 5;
+  readonly attribute RadioFaultEnum activeRadioFaults[] = 6;
+  readonly attribute NetworkFaultEnum activeNetworkFaults[] = 7;
   readonly attribute boolean testEventTriggersEnabled = 8;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
@@ -1142,7 +1142,7 @@ server cluster WiFiNetworkDiagnostics = 54 {
 }
 
 server cluster EthernetNetworkDiagnostics = 55 {
-  enum PHYRate : ENUM8 {
+  enum PHYRateEnum : ENUM8 {
     kRate10M = 0;
     kRate100M = 1;
     kRate1G = 2;
@@ -1155,7 +1155,7 @@ server cluster EthernetNetworkDiagnostics = 55 {
     kRate400G = 9;
   }
 
-  readonly attribute nullable PHYRate PHYRate = 0;
+  readonly attribute nullable PHYRateEnum PHYRate = 0;
   readonly attribute nullable boolean fullDuplex = 1;
   readonly attribute int64u packetRxCount = 2;
   readonly attribute int64u packetTxCount = 3;
@@ -1214,7 +1214,7 @@ server cluster Switch = 59 {
 }
 
 server cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatus : ENUM8 {
+  enum CommissioningWindowStatusEnum : ENUM8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
     kBasicWindowOpen = 2;
@@ -1226,7 +1226,7 @@ server cluster AdministratorCommissioning = 60 {
     kWindowNotOpen = 4;
   }
 
-  readonly attribute CommissioningWindowStatus windowStatus = 0;
+  readonly attribute CommissioningWindowStatusEnum windowStatus = 0;
   readonly attribute nullable fabric_idx adminFabricIndex = 1;
   readonly attribute nullable int16u adminVendorId = 2;
   readonly attribute bitmap32 featureMap = 65532;
@@ -1610,7 +1610,7 @@ server cluster ColorControl = 768 {
   }
 
   request struct MoveToColorTemperatureRequest {
-    INT16U colorTemperature = 0;
+    INT16U colorTemperatureMireds = 0;
     INT16U transitionTime = 1;
     BITMAP8 optionsMask = 2;
     BITMAP8 optionsOverride = 3;
diff --git a/examples/lighting-app/lighting-common/lighting-app.zap b/examples/lighting-app/lighting-common/lighting-app.zap
index 4b5e6e47a31804..5c9c15454a060b 100644
--- a/examples/lighting-app/lighting-common/lighting-app.zap
+++ b/examples/lighting-app/lighting-common/lighting-app.zap
@@ -4361,7 +4361,7 @@
               "code": 0,
               "mfgCode": null,
               "side": "server",
-              "type": "PHYRate",
+              "type": "PHYRateEnum",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -4585,7 +4585,7 @@
           ]
         },
         {
-          "name": "AdministratorCommissioning",
+          "name": "Administrator Commissioning",
           "code": 60,
           "mfgCode": null,
           "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
@@ -4637,7 +4637,7 @@
           ]
         },
         {
-          "name": "AdministratorCommissioning",
+          "name": "Administrator Commissioning",
           "code": 60,
           "mfgCode": null,
           "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
@@ -4649,7 +4649,7 @@
               "code": 0,
               "mfgCode": null,
               "side": "server",
-              "type": "CommissioningWindowStatus",
+              "type": "CommissioningWindowStatusEnum",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
diff --git a/examples/lighting-app/nxp/zap/lighting-on-off.matter b/examples/lighting-app/nxp/zap/lighting-on-off.matter
index fe090551eaa8d6..9cb8188a05df26 100644
--- a/examples/lighting-app/nxp/zap/lighting-on-off.matter
+++ b/examples/lighting-app/nxp/zap/lighting-on-off.matter
@@ -717,7 +717,7 @@ server cluster GeneralDiagnostics = 51 {
     kSoftwareReset = 6;
   }
 
-  enum HardwareFault : ENUM8 {
+  enum HardwareFaultEnum : ENUM8 {
     kUnspecified = 0;
     kRadio = 1;
     kSensor = 2;
@@ -731,7 +731,7 @@ server cluster GeneralDiagnostics = 51 {
     kTamperDetected = 10;
   }
 
-  enum InterfaceType : ENUM8 {
+  enum InterfaceTypeEnum : ENUM8 {
     kUnspecified = 0;
     kWiFi = 1;
     kEthernet = 2;
@@ -739,14 +739,14 @@ server cluster GeneralDiagnostics = 51 {
     kThread = 4;
   }
 
-  enum NetworkFaultType : ENUM8 {
+  enum NetworkFaultEnum : ENUM8 {
     kUnspecified = 0;
     kHardwareFailure = 1;
     kNetworkJammed = 2;
     kConnectionFailed = 3;
   }
 
-  enum RadioFault : ENUM8 {
+  enum RadioFaultEnum : ENUM8 {
     kUnspecified = 0;
     kWiFiFault = 1;
     kCellularFault = 2;
@@ -764,22 +764,22 @@ server cluster GeneralDiagnostics = 51 {
     octet_string<8> hardwareAddress = 4;
     octet_string IPv4Addresses[] = 5;
     octet_string IPv6Addresses[] = 6;
-    InterfaceType type = 7;
+    InterfaceTypeEnum type = 7;
   }
 
   critical event HardwareFaultChange = 0 {
-    HardwareFault current[] = 0;
-    HardwareFault previous[] = 1;
+    HardwareFaultEnum current[] = 0;
+    HardwareFaultEnum previous[] = 1;
   }
 
   critical event RadioFaultChange = 1 {
-    RadioFault current[] = 0;
-    RadioFault previous[] = 1;
+    RadioFaultEnum current[] = 0;
+    RadioFaultEnum previous[] = 1;
   }
 
   critical event NetworkFaultChange = 2 {
-    NetworkFaultType current[] = 0;
-    NetworkFaultType previous[] = 1;
+    NetworkFaultEnum current[] = 0;
+    NetworkFaultEnum previous[] = 1;
   }
 
   critical event BootReason = 3 {
@@ -985,7 +985,7 @@ server cluster ThreadNetworkDiagnostics = 53 {
 }
 
 server cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatus : ENUM8 {
+  enum CommissioningWindowStatusEnum : ENUM8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
     kBasicWindowOpen = 2;
@@ -997,7 +997,7 @@ server cluster AdministratorCommissioning = 60 {
     kWindowNotOpen = 4;
   }
 
-  readonly attribute CommissioningWindowStatus windowStatus = 0;
+  readonly attribute CommissioningWindowStatusEnum windowStatus = 0;
   readonly attribute nullable fabric_idx adminFabricIndex = 1;
   readonly attribute nullable int16u adminVendorId = 2;
   readonly attribute bitmap32 featureMap = 65532;
diff --git a/examples/lighting-app/nxp/zap/lighting-on-off.zap b/examples/lighting-app/nxp/zap/lighting-on-off.zap
index a119c01d8b0f11..50ec3edd100560 100644
--- a/examples/lighting-app/nxp/zap/lighting-on-off.zap
+++ b/examples/lighting-app/nxp/zap/lighting-on-off.zap
@@ -4556,7 +4556,7 @@
               "code": 0,
               "mfgCode": null,
               "side": "server",
-              "type": "PHYRate",
+              "type": "PHYRateEnum",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -4780,7 +4780,7 @@
           ]
         },
         {
-          "name": "AdministratorCommissioning",
+          "name": "Administrator Commissioning",
           "code": 60,
           "mfgCode": null,
           "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
@@ -4832,7 +4832,7 @@
           ]
         },
         {
-          "name": "AdministratorCommissioning",
+          "name": "Administrator Commissioning",
           "code": 60,
           "mfgCode": null,
           "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
@@ -4844,7 +4844,7 @@
               "code": 0,
               "mfgCode": null,
               "side": "server",
-              "type": "CommissioningWindowStatus",
+              "type": "CommissioningWindowStatusEnum",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
diff --git a/examples/lighting-app/silabs/efr32/README.md b/examples/lighting-app/silabs/efr32/README.md
index b9c12c534606c5..92aeb9f5d1897d 100644
--- a/examples/lighting-app/silabs/efr32/README.md
+++ b/examples/lighting-app/silabs/efr32/README.md
@@ -97,31 +97,6 @@ Silicon Labs platform.
     -   BRD4187A / SLWSTK6006A / Wireless Starter Kit / 2.4GHz@20dBm
     -   BRD4187C / SLWSTK6006A / Wireless Starter Kit / 2.4GHz@20dBm
 
-    MG12 boards:
-
-    -   BRD4161A / SLWSTK6000B / Wireless Starter Kit / 2.4GHz@19dBm
-    -   BRD4162A / SLWSTK6000B / Wireless Starter Kit / 2.4GHz@10dBm
-    -   BRD4163A / SLWSTK6000B / Wireless Starter Kit / 2.4GHz@10dBm,
-        868MHz@19dBm
-    -   BRD4164A / SLWSTK6000B / Wireless Starter Kit / 2.4GHz@19dBm
-    -   BRD4166A / SLTB004A / Thunderboard Sense 2 / 2.4GHz@10dBm
-    -   BRD4170A / SLWSTK6000B / Multiband Wireless Starter Kit / 2.4GHz@19dBm,
-        915MHz@19dBm
-    -   BRD4304A / SLWSTK6000B / MGM12P Module / 2.4GHz@19dBm
-
-    MG21 boards: Currently not supported due to RAM limitation.
-
-    -   BRD4180A / SLWSTK6006A / Wireless Starter Kit / 2.4GHz@20dBm
-
-    MG24 boards :
-
-    -   BRD2601B / SLWSTK6000B / Wireless Starter Kit / 2.4GHz@10dBm
-    -   BRD2703A / SLWSTK6000B / Wireless Starter Kit / 2.4GHz@10dBm
-    -   BRD4186A / SLWSTK6006A / Wireless Starter Kit / 2.4GHz@10dBm
-    -   BRD4186C / SLWSTK6006A / Wireless Starter Kit / 2.4GHz@10dBm
-    -   BRD4187A / SLWSTK6006A / Wireless Starter Kit / 2.4GHz@20dBm
-    -   BRD4187C / SLWSTK6006A / Wireless Starter Kit / 2.4GHz@20dBm
-
 *   Build the example application:
 
           cd ~/connectedhomeip
diff --git a/examples/lock-app/genio/include/LockManager.h b/examples/lock-app/genio/include/LockManager.h
old mode 100755
new mode 100644
index 084b77a029884d..6361706e11a5e8
--- a/examples/lock-app/genio/include/LockManager.h
+++ b/examples/lock-app/genio/include/LockManager.h
@@ -146,25 +146,26 @@ class LockManager
     typedef void (*Callback_fn_completed)(Action_t);
     void SetCallbacks(Callback_fn_initiated aActionInitiated_CB, Callback_fn_completed aActionCompleted_CB);
 
-    bool Lock(chip::EndpointId endpointId, const Optional<chip::ByteSpan> & pin, DlOperationError & err);
-    bool Unlock(chip::EndpointId endpointId, const Optional<chip::ByteSpan> & pin, DlOperationError & err);
+    bool Lock(chip::EndpointId endpointId, const Optional<chip::ByteSpan> & pin, OperationErrorEnum & err);
+    bool Unlock(chip::EndpointId endpointId, const Optional<chip::ByteSpan> & pin, OperationErrorEnum & err);
 
     bool GetUser(chip::EndpointId endpointId, uint16_t userIndex, EmberAfPluginDoorLockUserInfo & user);
     bool SetUser(chip::EndpointId endpointId, uint16_t userIndex, chip::FabricIndex creator, chip::FabricIndex modifier,
-                 const chip::CharSpan & userName, uint32_t uniqueId, DlUserStatus userStatus, DlUserType usertype,
-                 DlCredentialRule credentialRule, const DlCredential * credentials, size_t totalCredentials);
+                 const chip::CharSpan & userName, uint32_t uniqueId, UserStatusEnum userStatus, UserTypeEnum usertype,
+                 CredentialRuleEnum credentialRule, const CredentialStruct * credentials, size_t totalCredentials);
 
-    bool GetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, DlCredentialType credentialType,
+    bool GetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, CredentialTypeEnum credentialType,
                        EmberAfPluginDoorLockCredentialInfo & credential);
 
     bool SetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, chip::FabricIndex creator, chip::FabricIndex modifier,
-                       DlCredentialStatus credentialStatus, DlCredentialType credentialType, const chip::ByteSpan & credentialData);
+                       DlCredentialStatus credentialStatus, CredentialTypeEnum credentialType,
+                       const chip::ByteSpan & credentialData);
 
     DlStatus GetWeekdaySchedule(chip::EndpointId endpointId, uint8_t weekdayIndex, uint16_t userIndex,
                                 EmberAfPluginDoorLockWeekDaySchedule & schedule);
 
     DlStatus SetWeekdaySchedule(chip::EndpointId endpointId, uint8_t weekdayIndex, uint16_t userIndex, DlScheduleStatus status,
-                                DlDaysMaskMap daysMask, uint8_t startHour, uint8_t startMinute, uint8_t endHour, uint8_t endMinute);
+                                DaysMaskMap daysMask, uint8_t startHour, uint8_t startMinute, uint8_t endHour, uint8_t endMinute);
 
     DlStatus GetYeardaySchedule(chip::EndpointId endpointId, uint8_t yearDayIndex, uint16_t userIndex,
                                 EmberAfPluginDoorLockYearDaySchedule & schedule);
@@ -175,16 +176,16 @@ class LockManager
     DlStatus GetHolidaySchedule(chip::EndpointId endpointId, uint8_t holidayIndex, EmberAfPluginDoorLockHolidaySchedule & schedule);
 
     DlStatus SetHolidaySchedule(chip::EndpointId endpointId, uint8_t holidayIndex, DlScheduleStatus status, uint32_t localStartTime,
-                                uint32_t localEndTime, DlOperatingMode operatingMode);
+                                uint32_t localEndTime, OperatingModeEnum operatingMode);
 
     bool IsValidUserIndex(uint16_t userIndex);
-    bool IsValidCredentialIndex(uint16_t credentialIndex, DlCredentialType type);
+    bool IsValidCredentialIndex(uint16_t credentialIndex, CredentialTypeEnum type);
     bool IsValidWeekdayScheduleIndex(uint8_t scheduleIndex);
     bool IsValidYeardayScheduleIndex(uint8_t scheduleIndex);
     bool IsValidHolidayScheduleIndex(uint8_t scheduleIndex);
 
     bool setLockState(chip::EndpointId endpointId, DlLockState lockState, const Optional<chip::ByteSpan> & pin,
-                      DlOperationError & err);
+                      OperationErrorEnum & err);
     const char * lockStateToString(DlLockState lockState) const;
 
     bool ReadConfigValues();
@@ -212,7 +213,7 @@ class LockManager
 
     char mUserNames[ArraySize(mLockUsers)][DOOR_LOCK_MAX_USER_NAME_SIZE];
     uint8_t mCredentialData[kMaxCredentials][kMaxCredentialSize];
-    DlCredential mCredentials[kMaxUsers][kMaxCredentialsPerUser];
+    CredentialStruct mCredentials[kMaxUsers][kMaxCredentialsPerUser];
 
     static LockManager sLock;
     MT793XDoorLock::LockInitParams::LockParam LockParams;
diff --git a/examples/lock-app/genio/src/AppTask.cpp b/examples/lock-app/genio/src/AppTask.cpp
index 05455f579ad1d3..929013fbb717b3 100644
--- a/examples/lock-app/genio/src/AppTask.cpp
+++ b/examples/lock-app/genio/src/AppTask.cpp
@@ -96,8 +96,8 @@ chip::app::Clusters::NetworkCommissioning::Instance sWiFiNetworkCommissioningIns
 } // namespace
 
 using chip::app::Clusters::DoorLock::DlLockState;
-using chip::app::Clusters::DoorLock::DlOperationError;
-using chip::app::Clusters::DoorLock::DlOperationSource;
+using chip::app::Clusters::DoorLock::OperationErrorEnum;
+using chip::app::Clusters::DoorLock::OperationSourceEnum;
 
 using namespace chip;
 using namespace ::chip::DeviceLayer;
@@ -596,7 +596,7 @@ void AppTask::UpdateClusterState(intptr_t context)
     bool unlocked        = LockMgr().NextState();
     DlLockState newState = unlocked ? DlLockState::kUnlocked : DlLockState::kLocked;
 
-    DlOperationSource source = DlOperationSource::kUnspecified;
+    OperationSourceEnum source = OperationSourceEnum::kUnspecified;
 
     // write the new lock value
     EmberAfStatus status =
diff --git a/examples/lock-app/genio/src/LockManager.cpp b/examples/lock-app/genio/src/LockManager.cpp
index 9ae7e4288695ea..66e394bd00c744 100644
--- a/examples/lock-app/genio/src/LockManager.cpp
+++ b/examples/lock-app/genio/src/LockManager.cpp
@@ -104,9 +104,9 @@ bool LockManager::IsValidUserIndex(uint16_t userIndex)
     return (userIndex < kMaxUsers);
 }
 
-bool LockManager::IsValidCredentialIndex(uint16_t credentialIndex, DlCredentialType type)
+bool LockManager::IsValidCredentialIndex(uint16_t credentialIndex, CredentialTypeEnum type)
 {
-    if (DlCredentialType::kProgrammingPIN == type)
+    if (CredentialTypeEnum::kProgrammingPIN == type)
     {
         return (0 == credentialIndex); // 0 is required index for Programming PIN
     }
@@ -144,7 +144,7 @@ bool LockManager::ReadConfigValues()
                                      sizeof(mCredentialData), outLen);
 
     MT793XConfig::ReadConfigValueBin(MT793XConfig::kConfigKey_UserCredentials, reinterpret_cast<uint8_t *>(mCredentials),
-                                     sizeof(DlCredential) * LockParams.numberOfUsers * LockParams.numberOfCredentialsPerUser,
+                                     sizeof(CredentialStruct) * LockParams.numberOfUsers * LockParams.numberOfCredentialsPerUser,
                                      outLen);
 
     MT793XConfig::ReadConfigValueBin(MT793XConfig::kConfigKey_WeekDaySchedules, reinterpret_cast<uint8_t *>(mWeekdaySchedule),
@@ -283,12 +283,12 @@ void LockManager::ActuatorMovementTimerEventHandler(AppEvent * aEvent)
     }
 }
 
-bool LockManager::Lock(chip::EndpointId endpointId, const Optional<chip::ByteSpan> & pin, DlOperationError & err)
+bool LockManager::Lock(chip::EndpointId endpointId, const Optional<chip::ByteSpan> & pin, OperationErrorEnum & err)
 {
     return setLockState(endpointId, DlLockState::kLocked, pin, err);
 }
 
-bool LockManager::Unlock(chip::EndpointId endpointId, const Optional<chip::ByteSpan> & pin, DlOperationError & err)
+bool LockManager::Unlock(chip::EndpointId endpointId, const Optional<chip::ByteSpan> & pin, OperationErrorEnum & err)
 {
     return setLockState(endpointId, DlLockState::kUnlocked, pin, err);
 }
@@ -306,14 +306,14 @@ bool LockManager::GetUser(chip::EndpointId endpointId, uint16_t userIndex, Ember
     const auto & userInDb = mLockUsers[userIndex];
 
     user.userStatus = userInDb.userStatus;
-    if (DlUserStatus::kAvailable == user.userStatus)
+    if (UserStatusEnum::kAvailable == user.userStatus)
     {
         ChipLogDetail(Zcl, "Found unoccupied user [endpoint=%d]", endpointId);
         return true;
     }
 
     user.userName       = chip::CharSpan(userInDb.userName.data(), userInDb.userName.size());
-    user.credentials    = chip::Span<const DlCredential>(mCredentials[userIndex], userInDb.credentials.size());
+    user.credentials    = chip::Span<const CredentialStruct>(mCredentials[userIndex], userInDb.credentials.size());
     user.userUniqueId   = userInDb.userUniqueId;
     user.userType       = userInDb.userType;
     user.credentialRule = userInDb.credentialRule;
@@ -336,8 +336,8 @@ bool LockManager::GetUser(chip::EndpointId endpointId, uint16_t userIndex, Ember
 }
 
 bool LockManager::SetUser(chip::EndpointId endpointId, uint16_t userIndex, chip::FabricIndex creator, chip::FabricIndex modifier,
-                          const chip::CharSpan & userName, uint32_t uniqueId, DlUserStatus userStatus, DlUserType usertype,
-                          DlCredentialRule credentialRule, const DlCredential * credentials, size_t totalCredentials)
+                          const chip::CharSpan & userName, uint32_t uniqueId, UserStatusEnum userStatus, UserTypeEnum usertype,
+                          CredentialRuleEnum credentialRule, const CredentialStruct * credentials, size_t totalCredentials)
 {
     ChipLogProgress(Zcl,
                     "Door Lock App: LockManager::SetUser "
@@ -381,14 +381,14 @@ bool LockManager::SetUser(chip::EndpointId endpointId, uint16_t userIndex, chip:
         mCredentials[userIndex][i] = credentials[i];
     }
 
-    userInStorage.credentials = chip::Span<const DlCredential>(mCredentials[userIndex], totalCredentials);
+    userInStorage.credentials = chip::Span<const CredentialStruct>(mCredentials[userIndex], totalCredentials);
 
     // Save user information in NVM flash
     MT793XConfig::WriteConfigValueBin(MT793XConfig::kConfigKey_LockUser, reinterpret_cast<const uint8_t *>(&mLockUsers),
                                       sizeof(EmberAfPluginDoorLockUserInfo) * LockParams.numberOfUsers);
 
     MT793XConfig::WriteConfigValueBin(MT793XConfig::kConfigKey_UserCredentials, reinterpret_cast<const uint8_t *>(mCredentials),
-                                      sizeof(DlCredential) * LockParams.numberOfUsers * LockParams.numberOfCredentialsPerUser);
+                                      sizeof(CredentialStruct) * LockParams.numberOfUsers * LockParams.numberOfCredentialsPerUser);
 
     MT793XConfig::WriteConfigValueBin(MT793XConfig::kConfigKey_LockUserName, reinterpret_cast<const uint8_t *>(mUserNames),
                                       sizeof(mUserNames));
@@ -398,11 +398,11 @@ bool LockManager::SetUser(chip::EndpointId endpointId, uint16_t userIndex, chip:
     return true;
 }
 
-bool LockManager::GetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, DlCredentialType credentialType,
+bool LockManager::GetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, CredentialTypeEnum credentialType,
                                 EmberAfPluginDoorLockCredentialInfo & credential)
 {
 
-    if (DlCredentialType::kProgrammingPIN == credentialType)
+    if (CredentialTypeEnum::kProgrammingPIN == credentialType)
     {
         VerifyOrReturnValue(IsValidCredentialIndex(credentialIndex, credentialType),
                             false); // programming pin index is only index allowed to contain 0
@@ -441,11 +441,11 @@ bool LockManager::GetCredential(chip::EndpointId endpointId, uint16_t credential
 }
 
 bool LockManager::SetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, chip::FabricIndex creator,
-                                chip::FabricIndex modifier, DlCredentialStatus credentialStatus, DlCredentialType credentialType,
+                                chip::FabricIndex modifier, DlCredentialStatus credentialStatus, CredentialTypeEnum credentialType,
                                 const chip::ByteSpan & credentialData)
 {
 
-    if (DlCredentialType::kProgrammingPIN == credentialType)
+    if (CredentialTypeEnum::kProgrammingPIN == credentialType)
     {
         VerifyOrReturnValue(IsValidCredentialIndex(credentialIndex, credentialType),
                             false); // programming pin index is only index allowed to contain 0
@@ -507,7 +507,7 @@ DlStatus LockManager::GetWeekdaySchedule(chip::EndpointId endpointId, uint8_t we
 }
 
 DlStatus LockManager::SetWeekdaySchedule(chip::EndpointId endpointId, uint8_t weekdayIndex, uint16_t userIndex,
-                                         DlScheduleStatus status, DlDaysMaskMap daysMask, uint8_t startHour, uint8_t startMinute,
+                                         DlScheduleStatus status, DaysMaskMap daysMask, uint8_t startHour, uint8_t startMinute,
                                          uint8_t endHour, uint8_t endMinute)
 {
 
@@ -607,7 +607,7 @@ DlStatus LockManager::GetHolidaySchedule(chip::EndpointId endpointId, uint8_t ho
 }
 
 DlStatus LockManager::SetHolidaySchedule(chip::EndpointId endpointId, uint8_t holidayIndex, DlScheduleStatus status,
-                                         uint32_t localStartTime, uint32_t localEndTime, DlOperatingMode operatingMode)
+                                         uint32_t localStartTime, uint32_t localEndTime, OperatingModeEnum operatingMode)
 {
     VerifyOrReturnValue(holidayIndex > 0, DlStatus::kFailure); // indices are one-indexed
 
@@ -648,7 +648,7 @@ const char * LockManager::lockStateToString(DlLockState lockState) const
 }
 
 bool LockManager::setLockState(chip::EndpointId endpointId, DlLockState lockState, const Optional<chip::ByteSpan> & pin,
-                               DlOperationError & err)
+                               OperationErrorEnum & err)
 {
 
     // Assume pin is required until told otherwise
@@ -678,14 +678,14 @@ bool LockManager::setLockState(chip::EndpointId endpointId, DlLockState lockStat
     {
         for (uint8_t j = 0; j < kMaxCredentialsPerUser; j++)
         {
-            if (mLockCredentials[mCredentials[i][j].CredentialIndex - 1].credentialType != DlCredentialType::kPin ||
+            if (mLockCredentials[mCredentials[i][j].CredentialIndex - 1].credentialType != CredentialTypeEnum::kPin ||
                 mLockCredentials[mCredentials[i][j].CredentialIndex - 1].status == DlCredentialStatus::kAvailable)
             {
                 continue;
             }
 
             if (mLockCredentials[mCredentials[i][j].CredentialIndex - 1].credentialData.data_equal(pin.Value()) &&
-                mLockUsers[i].userStatus != DlUserStatus::kOccupiedDisabled)
+                mLockUsers[i].userStatus != UserStatusEnum::kOccupiedDisabled)
             {
                 ChipLogDetail(
                     Zcl, "Lock App: specified PIN code was found in the database, setting lock state to \"%s\" [endpointId=%d]",
@@ -702,6 +702,6 @@ bool LockManager::setLockState(chip::EndpointId endpointId, DlLockState lockStat
                   "[endpointId=%d]",
                   lockStateToString(lockState), mEndpointId);
 
-    err = DlOperationError::kInvalidCredential;
+    err = OperationErrorEnum::kInvalidCredential;
     return false;
 }
diff --git a/examples/lock-app/genio/src/ZclCallbacks.cpp b/examples/lock-app/genio/src/ZclCallbacks.cpp
index cca3ef947c9d86..91a867bc38c25e 100644
--- a/examples/lock-app/genio/src/ZclCallbacks.cpp
+++ b/examples/lock-app/genio/src/ZclCallbacks.cpp
@@ -92,7 +92,7 @@ void emberAfDoorLockClusterInitCallback(EndpointId endpoint)
 
     // Note: Due to current logic of credential, do not enable PIN and RFID
     // at the same time.
-    // Set FeatureMap to (kUsersManagement|kPINCredentials)
+    // Set FeatureMap to (kUser|kPinCredential)
     status = DoorLock::Attributes::FeatureMap::Set(endpoint, 0x101);
     if (status != EMBER_ZCL_STATUS_SUCCESS)
     {
@@ -100,7 +100,8 @@ void emberAfDoorLockClusterInitCallback(EndpointId endpoint)
     }
 }
 
-bool emberAfPluginDoorLockOnDoorLockCommand(chip::EndpointId endpointId, const Optional<ByteSpan> & pinCode, DlOperationError & err)
+bool emberAfPluginDoorLockOnDoorLockCommand(chip::EndpointId endpointId, const Optional<ByteSpan> & pinCode,
+                                            OperationErrorEnum & err)
 {
     ChipLogProgress(Zcl, "Door Lock App: Lock Command endpoint=%d", endpointId);
     bool status = LockMgr().Lock(endpointId, pinCode, err);
@@ -112,7 +113,7 @@ bool emberAfPluginDoorLockOnDoorLockCommand(chip::EndpointId endpointId, const O
 }
 
 bool emberAfPluginDoorLockOnDoorUnlockCommand(chip::EndpointId endpointId, const Optional<ByteSpan> & pinCode,
-                                              DlOperationError & err)
+                                              OperationErrorEnum & err)
 {
     ChipLogProgress(Zcl, "Door Lock App: Unlock Command endpoint=%d", endpointId);
     bool status = LockMgr().Unlock(endpointId, pinCode, err);
@@ -124,7 +125,7 @@ bool emberAfPluginDoorLockOnDoorUnlockCommand(chip::EndpointId endpointId, const
     return status;
 }
 
-bool emberAfPluginDoorLockGetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, DlCredentialType credentialType,
+bool emberAfPluginDoorLockGetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, CredentialTypeEnum credentialType,
                                         EmberAfPluginDoorLockCredentialInfo & credential)
 {
     return LockMgr().GetCredential(endpointId, credentialIndex, credentialType, credential);
@@ -132,7 +133,7 @@ bool emberAfPluginDoorLockGetCredential(chip::EndpointId endpointId, uint16_t cr
 
 bool emberAfPluginDoorLockSetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, chip::FabricIndex creator,
                                         chip::FabricIndex modifier, DlCredentialStatus credentialStatus,
-                                        DlCredentialType credentialType, const chip::ByteSpan & credentialData)
+                                        CredentialTypeEnum credentialType, const chip::ByteSpan & credentialData)
 {
     return LockMgr().SetCredential(endpointId, credentialIndex, creator, modifier, credentialStatus, credentialType,
                                    credentialData);
@@ -145,8 +146,8 @@ bool emberAfPluginDoorLockGetUser(chip::EndpointId endpointId, uint16_t userInde
 
 bool emberAfPluginDoorLockSetUser(chip::EndpointId endpointId, uint16_t userIndex, chip::FabricIndex creator,
                                   chip::FabricIndex modifier, const chip::CharSpan & userName, uint32_t uniqueId,
-                                  DlUserStatus userStatus, DlUserType usertype, DlCredentialRule credentialRule,
-                                  const DlCredential * credentials, size_t totalCredentials)
+                                  UserStatusEnum userStatus, UserTypeEnum usertype, CredentialRuleEnum credentialRule,
+                                  const CredentialStruct * credentials, size_t totalCredentials)
 {
 
     return LockMgr().SetUser(endpointId, userIndex, creator, modifier, userName, uniqueId, userStatus, usertype, credentialRule,
@@ -172,7 +173,7 @@ DlStatus emberAfPluginDoorLockGetSchedule(chip::EndpointId endpointId, uint8_t h
 }
 
 DlStatus emberAfPluginDoorLockSetSchedule(chip::EndpointId endpointId, uint8_t weekdayIndex, uint16_t userIndex,
-                                          DlScheduleStatus status, DlDaysMaskMap daysMask, uint8_t startHour, uint8_t startMinute,
+                                          DlScheduleStatus status, DaysMaskMap daysMask, uint8_t startHour, uint8_t startMinute,
                                           uint8_t endHour, uint8_t endMinute)
 {
     return LockMgr().SetWeekdaySchedule(endpointId, weekdayIndex, userIndex, status, daysMask, startHour, startMinute, endHour,
@@ -186,7 +187,7 @@ DlStatus emberAfPluginDoorLockSetSchedule(chip::EndpointId endpointId, uint8_t y
 }
 
 DlStatus emberAfPluginDoorLockSetSchedule(chip::EndpointId endpointId, uint8_t holidayIndex, DlScheduleStatus status,
-                                          uint32_t localStartTime, uint32_t localEndTime, DlOperatingMode operatingMode)
+                                          uint32_t localStartTime, uint32_t localEndTime, OperatingModeEnum operatingMode)
 {
     return LockMgr().SetHolidaySchedule(endpointId, holidayIndex, status, localStartTime, localEndTime, operatingMode);
 }
diff --git a/examples/lock-app/infineon/cyw30739/include/LockManager.h b/examples/lock-app/infineon/cyw30739/include/LockManager.h
index 8f4cdf658d7375..19a336bb094fa9 100644
--- a/examples/lock-app/infineon/cyw30739/include/LockManager.h
+++ b/examples/lock-app/infineon/cyw30739/include/LockManager.h
@@ -142,29 +142,30 @@ class LockManager
     typedef void (*Callback_fn_completed)(Action_t);
     void SetCallbacks(Callback_fn_initiated aActionInitiated_CB, Callback_fn_completed aActionCompleted_CB);
 
-    bool Lock(chip::EndpointId endpointId, const Optional<chip::ByteSpan> & pin, DlOperationError & err);
-    bool Unlock(chip::EndpointId endpointId, const Optional<chip::ByteSpan> & pin, DlOperationError & err);
+    bool Lock(chip::EndpointId endpointId, const Optional<chip::ByteSpan> & pin, OperationErrorEnum & err);
+    bool Unlock(chip::EndpointId endpointId, const Optional<chip::ByteSpan> & pin, OperationErrorEnum & err);
 
     bool GetUser(chip::EndpointId endpointId, uint16_t userIndex, EmberAfPluginDoorLockUserInfo & user);
     bool SetUser(chip::EndpointId endpointId, uint16_t userIndex, chip::FabricIndex creator, chip::FabricIndex modifier,
-                 const chip::CharSpan & userName, uint32_t uniqueId, DlUserStatus userStatus, DlUserType usertype,
-                 DlCredentialRule credentialRule, const DlCredential * credentials, size_t totalCredentials);
+                 const chip::CharSpan & userName, uint32_t uniqueId, UserStatusEnum userStatus, UserTypeEnum usertype,
+                 CredentialRuleEnum credentialRule, const CredentialStruct * credentials, size_t totalCredentials);
 
-    bool SetDoorState(chip::EndpointId endpointId, DlDoorState newState);
+    bool SetDoorState(chip::EndpointId endpointId, DoorStateEnum newState);
 
-    DlDoorState GetDoorState() const;
+    DoorStateEnum GetDoorState() const;
 
-    bool GetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, DlCredentialType credentialType,
+    bool GetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, CredentialTypeEnum credentialType,
                        EmberAfPluginDoorLockCredentialInfo & credential);
 
     bool SetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, chip::FabricIndex creator, chip::FabricIndex modifier,
-                       DlCredentialStatus credentialStatus, DlCredentialType credentialType, const chip::ByteSpan & credentialData);
+                       DlCredentialStatus credentialStatus, CredentialTypeEnum credentialType,
+                       const chip::ByteSpan & credentialData);
 
     DlStatus GetWeekdaySchedule(chip::EndpointId endpointId, uint8_t weekdayIndex, uint16_t userIndex,
                                 EmberAfPluginDoorLockWeekDaySchedule & schedule);
 
     DlStatus SetWeekdaySchedule(chip::EndpointId endpointId, uint8_t weekdayIndex, uint16_t userIndex, DlScheduleStatus status,
-                                DlDaysMaskMap daysMask, uint8_t startHour, uint8_t startMinute, uint8_t endHour, uint8_t endMinute);
+                                DaysMaskMap daysMask, uint8_t startHour, uint8_t startMinute, uint8_t endHour, uint8_t endMinute);
 
     DlStatus GetYeardaySchedule(chip::EndpointId endpointId, uint8_t yearDayIndex, uint16_t userIndex,
                                 EmberAfPluginDoorLockYearDaySchedule & schedule);
@@ -175,16 +176,16 @@ class LockManager
     DlStatus GetHolidaySchedule(chip::EndpointId endpointId, uint8_t holidayIndex, EmberAfPluginDoorLockHolidaySchedule & schedule);
 
     DlStatus SetHolidaySchedule(chip::EndpointId endpointId, uint8_t holidayIndex, DlScheduleStatus status, uint32_t localStartTime,
-                                uint32_t localEndTime, DlOperatingMode operatingMode);
+                                uint32_t localEndTime, OperatingModeEnum operatingMode);
 
     bool IsValidUserIndex(uint16_t userIndex);
-    bool IsValidCredentialIndex(uint16_t credentialIndex, DlCredentialType type);
+    bool IsValidCredentialIndex(uint16_t credentialIndex, CredentialTypeEnum type);
     bool IsValidWeekdayScheduleIndex(uint8_t scheduleIndex);
     bool IsValidYeardayScheduleIndex(uint8_t scheduleIndex);
     bool IsValidHolidayScheduleIndex(uint8_t scheduleIndex);
 
     bool setLockState(chip::EndpointId endpointId, DlLockState lockState, const Optional<chip::ByteSpan> & pin,
-                      DlOperationError & err);
+                      OperationErrorEnum & err);
 
     const char * lockStateToString(DlLockState lockState) const;
 
@@ -194,7 +195,7 @@ class LockManager
     friend LockManager & LockMgr();
     chip::EndpointId mEndpointId;
     State_t mState;
-    DlDoorState mDoorState;
+    DoorStateEnum mDoorState;
 
     Callback_fn_initiated mActionInitiated_CB;
     Callback_fn_completed mActionCompleted_CB;
@@ -212,7 +213,7 @@ class LockManager
     HolidayScheduleInfo mHolidaySchedule[kMaxHolidaySchedules];
     char mUserNames[ArraySize(mLockUsers)][DOOR_LOCK_MAX_USER_NAME_SIZE];
     uint8_t mCredentialData[kMaxCredentials][kMaxCredentialSize];
-    DlCredential mCredentials[kMaxUsers][kMaxCredentialsPerUser];
+    CredentialStruct mCredentials[kMaxUsers][kMaxCredentialsPerUser];
 
     static LockManager sLock;
     CYW30739DoorLock::LockInitParams::LockParam LockParams;
diff --git a/examples/lock-app/infineon/cyw30739/src/AppShellCommands.cpp b/examples/lock-app/infineon/cyw30739/src/AppShellCommands.cpp
index bd5e301259e81d..3161272d070a17 100644
--- a/examples/lock-app/infineon/cyw30739/src/AppShellCommands.cpp
+++ b/examples/lock-app/infineon/cyw30739/src/AppShellCommands.cpp
@@ -90,12 +90,12 @@ CHIP_ERROR AppCommandLockHandler(int argc, char * argv[])
     else if (strcmp(argv[0], "open") == 0)
     {
         streamer_printf(streamer_get(), "open ...\n");
-        LockMgr().SetDoorState(endpointId, DlDoorState::kDoorOpen);
+        LockMgr().SetDoorState(endpointId, DoorStateEnum::kDoorOpen);
     }
     else if (strcmp(argv[0], "close") == 0)
     {
         streamer_printf(streamer_get(), "close ...\n");
-        LockMgr().SetDoorState(endpointId, DlDoorState::kDoorClosed);
+        LockMgr().SetDoorState(endpointId, DoorStateEnum::kDoorClosed);
     }
     else
     {
diff --git a/examples/lock-app/infineon/cyw30739/src/LockManager.cpp b/examples/lock-app/infineon/cyw30739/src/LockManager.cpp
index 598e454f2e4d1a..bc11e6128291a2 100644
--- a/examples/lock-app/infineon/cyw30739/src/LockManager.cpp
+++ b/examples/lock-app/infineon/cyw30739/src/LockManager.cpp
@@ -98,10 +98,10 @@ bool LockManager::IsValidUserIndex(uint16_t userIndex)
     return (userIndex < kMaxUsers);
 }
 
-bool LockManager::IsValidCredentialIndex(uint16_t credentialIndex, DlCredentialType type)
+bool LockManager::IsValidCredentialIndex(uint16_t credentialIndex, CredentialTypeEnum type)
 {
     // appclusters, 5.2.6.3.1: 0 is allowed index for Programming PIN credential only
-    if (DlCredentialType::kProgrammingPIN == type)
+    if (CredentialTypeEnum::kProgrammingPIN == type)
     {
         return (0 == credentialIndex);
     }
@@ -140,7 +140,7 @@ bool LockManager::ReadConfigValues()
                                        sizeof(mCredentialData), outLen);
 
     CYW30739Config::ReadConfigValueBin(CYW30739Config::kConfigKey_UserCredentials, reinterpret_cast<uint8_t *>(mCredentials),
-                                       sizeof(DlCredential) * LockParams.numberOfUsers * LockParams.numberOfCredentialsPerUser,
+                                       sizeof(CredentialStruct) * LockParams.numberOfUsers * LockParams.numberOfCredentialsPerUser,
                                        outLen);
 
     CYW30739Config::ReadConfigValueBin(CYW30739Config::kConfigKey_WeekDaySchedules, reinterpret_cast<uint8_t *>(mWeekdaySchedule),
@@ -186,7 +186,7 @@ bool LockManager::InitiateAction(int32_t aActor, Action_t aAction)
         ChipLogProgress(Zcl, "Sending a lock jammed event");
 
         /* Generating Door Lock Jammed event */
-        DoorLockServer::Instance().SendLockAlarmEvent(1, DlAlarmCode::kLockJammed);
+        DoorLockServer::Instance().SendLockAlarmEvent(1, AlarmCodeEnum::kLockJammed);
         return true;
     }
 
@@ -288,12 +288,12 @@ int LockManager::ActuatorMovementTimerEventHandler(void * data)
     return 0;
 }
 
-bool LockManager::Lock(chip::EndpointId endpointId, const Optional<chip::ByteSpan> & pin, DlOperationError & err)
+bool LockManager::Lock(chip::EndpointId endpointId, const Optional<chip::ByteSpan> & pin, OperationErrorEnum & err)
 {
     return setLockState(endpointId, DlLockState::kLocked, pin, err);
 }
 
-bool LockManager::Unlock(chip::EndpointId endpointId, const Optional<chip::ByteSpan> & pin, DlOperationError & err)
+bool LockManager::Unlock(chip::EndpointId endpointId, const Optional<chip::ByteSpan> & pin, OperationErrorEnum & err)
 {
     return setLockState(endpointId, DlLockState::kUnlocked, pin, err);
 }
@@ -311,14 +311,14 @@ bool LockManager::GetUser(chip::EndpointId endpointId, uint16_t userIndex, Ember
     const auto & userInDb = mLockUsers[userIndex];
 
     user.userStatus = userInDb.userStatus;
-    if (DlUserStatus::kAvailable == user.userStatus)
+    if (UserStatusEnum::kAvailable == user.userStatus)
     {
         ChipLogDetail(Zcl, "Found unoccupied user [endpoint=%d]", endpointId);
         return true;
     }
 
     user.userName       = chip::CharSpan(userInDb.userName.data(), userInDb.userName.size());
-    user.credentials    = chip::Span<const DlCredential>(mCredentials[userIndex], userInDb.credentials.size());
+    user.credentials    = chip::Span<const CredentialStruct>(mCredentials[userIndex], userInDb.credentials.size());
     user.userUniqueId   = userInDb.userUniqueId;
     user.userType       = userInDb.userType;
     user.credentialRule = userInDb.credentialRule;
@@ -341,8 +341,8 @@ bool LockManager::GetUser(chip::EndpointId endpointId, uint16_t userIndex, Ember
 }
 
 bool LockManager::SetUser(chip::EndpointId endpointId, uint16_t userIndex, chip::FabricIndex creator, chip::FabricIndex modifier,
-                          const chip::CharSpan & userName, uint32_t uniqueId, DlUserStatus userStatus, DlUserType usertype,
-                          DlCredentialRule credentialRule, const DlCredential * credentials, size_t totalCredentials)
+                          const chip::CharSpan & userName, uint32_t uniqueId, UserStatusEnum userStatus, UserTypeEnum usertype,
+                          CredentialRuleEnum credentialRule, const CredentialStruct * credentials, size_t totalCredentials)
 {
     ChipLogProgress(Zcl,
                     "Door Lock App: LockManager::SetUser "
@@ -388,14 +388,15 @@ bool LockManager::SetUser(chip::EndpointId endpointId, uint16_t userIndex, chip:
         mCredentials[userIndex][i].CredentialIndex = i + 1;
     }
 
-    userInStorage.credentials = chip::Span<const DlCredential>(mCredentials[userIndex], totalCredentials);
+    userInStorage.credentials = chip::Span<const CredentialStruct>(mCredentials[userIndex], totalCredentials);
 
     // Save user information in NVM flash
     CYW30739Config::WriteConfigValueBin(CYW30739Config::kConfigKey_LockUser, reinterpret_cast<const uint8_t *>(&mLockUsers),
                                         sizeof(EmberAfPluginDoorLockUserInfo) * LockParams.numberOfUsers);
 
     CYW30739Config::WriteConfigValueBin(CYW30739Config::kConfigKey_UserCredentials, reinterpret_cast<const uint8_t *>(mCredentials),
-                                        sizeof(DlCredential) * LockParams.numberOfUsers * LockParams.numberOfCredentialsPerUser);
+                                        sizeof(CredentialStruct) * LockParams.numberOfUsers *
+                                            LockParams.numberOfCredentialsPerUser);
 
     CYW30739Config::WriteConfigValueBin(CYW30739Config::kConfigKey_LockUserName, reinterpret_cast<const uint8_t *>(mUserNames),
                                         sizeof(mUserNames));
@@ -405,7 +406,7 @@ bool LockManager::SetUser(chip::EndpointId endpointId, uint16_t userIndex, chip:
     return true;
 }
 
-bool LockManager::GetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, DlCredentialType credentialType,
+bool LockManager::GetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, CredentialTypeEnum credentialType,
                                 EmberAfPluginDoorLockCredentialInfo & credential)
 {
 
@@ -418,7 +419,7 @@ bool LockManager::GetCredential(chip::EndpointId endpointId, uint16_t credential
     ChipLogProgress(Zcl, "Lock App: LockManager::GetCredential [credentialType=%u], credentialIndex=%d",
                     to_underlying(credentialType), credentialIndex);
 
-    if (credentialType == DlCredentialType::kProgrammingPIN)
+    if (credentialType == CredentialTypeEnum::kProgrammingPIN)
     {
         ChipLogError(Zcl, "Programming user not supported [credentialType=%u], credentialIndex=%d", to_underlying(credentialType),
                      credentialIndex);
@@ -452,7 +453,7 @@ bool LockManager::GetCredential(chip::EndpointId endpointId, uint16_t credential
 }
 
 bool LockManager::SetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, chip::FabricIndex creator,
-                                chip::FabricIndex modifier, DlCredentialStatus credentialStatus, DlCredentialType credentialType,
+                                chip::FabricIndex modifier, DlCredentialStatus credentialStatus, CredentialTypeEnum credentialType,
                                 const chip::ByteSpan & credentialData)
 {
     VerifyOrReturnValue(credentialIndex > 0, false); // indices are one-indexed
@@ -513,7 +514,7 @@ DlStatus LockManager::GetWeekdaySchedule(chip::EndpointId endpointId, uint8_t we
 }
 
 DlStatus LockManager::SetWeekdaySchedule(chip::EndpointId endpointId, uint8_t weekdayIndex, uint16_t userIndex,
-                                         DlScheduleStatus status, DlDaysMaskMap daysMask, uint8_t startHour, uint8_t startMinute,
+                                         DlScheduleStatus status, DaysMaskMap daysMask, uint8_t startHour, uint8_t startMinute,
                                          uint8_t endHour, uint8_t endMinute)
 {
 
@@ -613,7 +614,7 @@ DlStatus LockManager::GetHolidaySchedule(chip::EndpointId endpointId, uint8_t ho
 }
 
 DlStatus LockManager::SetHolidaySchedule(chip::EndpointId endpointId, uint8_t holidayIndex, DlScheduleStatus status,
-                                         uint32_t localStartTime, uint32_t localEndTime, DlOperatingMode operatingMode)
+                                         uint32_t localStartTime, uint32_t localEndTime, OperatingModeEnum operatingMode)
 {
     VerifyOrReturnValue(holidayIndex > 0, DlStatus::kFailure); // indices are one-indexed
 
@@ -654,7 +655,7 @@ const char * LockManager::lockStateToString(DlLockState lockState) const
 }
 
 bool LockManager::setLockState(chip::EndpointId endpointId, DlLockState lockState, const Optional<chip::ByteSpan> & pin,
-                               DlOperationError & err)
+                               OperationErrorEnum & err)
 {
     // Assume pin is required until told otherwise
     bool requirePin = true;
@@ -684,7 +685,7 @@ bool LockManager::setLockState(chip::EndpointId endpointId, DlLockState lockStat
     // Check the PIN code
     for (uint8_t i = 0; i < kMaxCredentials; i++)
     {
-        if (mLockCredentials[i].credentialType != DlCredentialType::kPin ||
+        if (mLockCredentials[i].credentialType != CredentialTypeEnum::kPin ||
             mLockCredentials[i].status == DlCredentialStatus::kAvailable)
         {
             continue;
@@ -707,11 +708,11 @@ bool LockManager::setLockState(chip::EndpointId endpointId, DlLockState lockStat
                   "[endpointId=%d]",
                   lockStateToString(lockState), endpointId);
 
-    err = DlOperationError::kInvalidCredential;
+    err = OperationErrorEnum::kInvalidCredential;
     return false;
 }
 
-bool LockManager::SetDoorState(chip::EndpointId endpointId, DlDoorState newState)
+bool LockManager::SetDoorState(chip::EndpointId endpointId, DoorStateEnum newState)
 {
     if (mDoorState != newState)
     {
diff --git a/examples/lock-app/infineon/cyw30739/src/ZclCallbacks.cpp b/examples/lock-app/infineon/cyw30739/src/ZclCallbacks.cpp
index 1607c9e053ec91..d1efc819761bf4 100644
--- a/examples/lock-app/infineon/cyw30739/src/ZclCallbacks.cpp
+++ b/examples/lock-app/infineon/cyw30739/src/ZclCallbacks.cpp
@@ -54,7 +54,8 @@ void MatterPostAttributeChangeCallback(const chip::app::ConcreteAttributePath &
     }
 }
 
-bool emberAfPluginDoorLockOnDoorLockCommand(chip::EndpointId endpointId, const Optional<ByteSpan> & pinCode, DlOperationError & err)
+bool emberAfPluginDoorLockOnDoorLockCommand(chip::EndpointId endpointId, const Optional<ByteSpan> & pinCode,
+                                            OperationErrorEnum & err)
 {
     ChipLogProgress(Zcl, "Door Lock App: Lock Command endpoint=%d", endpointId);
     bool status = LockMgr().Lock(endpointId, pinCode, err);
@@ -66,7 +67,7 @@ bool emberAfPluginDoorLockOnDoorLockCommand(chip::EndpointId endpointId, const O
 }
 
 bool emberAfPluginDoorLockOnDoorUnlockCommand(chip::EndpointId endpointId, const Optional<ByteSpan> & pinCode,
-                                              DlOperationError & err)
+                                              OperationErrorEnum & err)
 {
     ChipLogProgress(Zcl, "Door Lock App: Unlock Command endpoint=%d", endpointId);
     bool status = LockMgr().Unlock(endpointId, pinCode, err);
@@ -78,7 +79,7 @@ bool emberAfPluginDoorLockOnDoorUnlockCommand(chip::EndpointId endpointId, const
     return status;
 }
 
-bool emberAfPluginDoorLockGetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, DlCredentialType credentialType,
+bool emberAfPluginDoorLockGetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, CredentialTypeEnum credentialType,
                                         EmberAfPluginDoorLockCredentialInfo & credential)
 {
     return LockMgr().GetCredential(endpointId, credentialIndex, credentialType, credential);
@@ -86,7 +87,7 @@ bool emberAfPluginDoorLockGetCredential(chip::EndpointId endpointId, uint16_t cr
 
 bool emberAfPluginDoorLockSetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, chip::FabricIndex creator,
                                         chip::FabricIndex modifier, DlCredentialStatus credentialStatus,
-                                        DlCredentialType credentialType, const chip::ByteSpan & credentialData)
+                                        CredentialTypeEnum credentialType, const chip::ByteSpan & credentialData)
 {
     return LockMgr().SetCredential(endpointId, credentialIndex, creator, modifier, credentialStatus, credentialType,
                                    credentialData);
@@ -99,8 +100,8 @@ bool emberAfPluginDoorLockGetUser(chip::EndpointId endpointId, uint16_t userInde
 
 bool emberAfPluginDoorLockSetUser(chip::EndpointId endpointId, uint16_t userIndex, chip::FabricIndex creator,
                                   chip::FabricIndex modifier, const chip::CharSpan & userName, uint32_t uniqueId,
-                                  DlUserStatus userStatus, DlUserType usertype, DlCredentialRule credentialRule,
-                                  const DlCredential * credentials, size_t totalCredentials)
+                                  UserStatusEnum userStatus, UserTypeEnum usertype, CredentialRuleEnum credentialRule,
+                                  const CredentialStruct * credentials, size_t totalCredentials)
 {
 
     return LockMgr().SetUser(endpointId, userIndex, creator, modifier, userName, uniqueId, userStatus, usertype, credentialRule,
@@ -126,7 +127,7 @@ DlStatus emberAfPluginDoorLockGetSchedule(chip::EndpointId endpointId, uint8_t h
 }
 
 DlStatus emberAfPluginDoorLockSetSchedule(chip::EndpointId endpointId, uint8_t weekdayIndex, uint16_t userIndex,
-                                          DlScheduleStatus status, DlDaysMaskMap daysMask, uint8_t startHour, uint8_t startMinute,
+                                          DlScheduleStatus status, DaysMaskMap daysMask, uint8_t startHour, uint8_t startMinute,
                                           uint8_t endHour, uint8_t endMinute)
 {
     return LockMgr().SetWeekdaySchedule(endpointId, weekdayIndex, userIndex, status, daysMask, startHour, startMinute, endHour,
@@ -140,7 +141,7 @@ DlStatus emberAfPluginDoorLockSetSchedule(chip::EndpointId endpointId, uint8_t y
 }
 
 DlStatus emberAfPluginDoorLockSetSchedule(chip::EndpointId endpointId, uint8_t holidayIndex, DlScheduleStatus status,
-                                          uint32_t localStartTime, uint32_t localEndTime, DlOperatingMode operatingMode)
+                                          uint32_t localStartTime, uint32_t localEndTime, OperatingModeEnum operatingMode)
 {
     return LockMgr().SetHolidaySchedule(endpointId, holidayIndex, status, localStartTime, localEndTime, operatingMode);
 }
diff --git a/examples/lock-app/infineon/cyw30739/src/main.cpp b/examples/lock-app/infineon/cyw30739/src/main.cpp
index 7483536fa4fe15..be32b550205bf4 100644
--- a/examples/lock-app/infineon/cyw30739/src/main.cpp
+++ b/examples/lock-app/infineon/cyw30739/src/main.cpp
@@ -47,8 +47,8 @@
 #include <wiced_platform.h>
 
 using chip::app::Clusters::DoorLock::DlLockState;
-using chip::app::Clusters::DoorLock::DlOperationError;
-using chip::app::Clusters::DoorLock::DlOperationSource;
+using chip::app::Clusters::DoorLock::OperationErrorEnum;
+using chip::app::Clusters::DoorLock::OperationSourceEnum;
 
 using namespace chip;
 using namespace ::chip::DeviceLayer::Internal;
@@ -308,7 +308,7 @@ void UpdateClusterState(intptr_t context)
     bool unlocked        = LockMgr().NextState();
     DlLockState newState = unlocked ? DlLockState::kUnlocked : DlLockState::kLocked;
 
-    DlOperationSource source = DlOperationSource::kUnspecified;
+    OperationSourceEnum source = OperationSourceEnum::kUnspecified;
 
     // write the new lock value
     EmberAfStatus status =
diff --git a/examples/lock-app/infineon/psoc6/include/LockManager.h b/examples/lock-app/infineon/psoc6/include/LockManager.h
index 1dbdf58d85487e..ab3eb96c0a92c6 100644
--- a/examples/lock-app/infineon/psoc6/include/LockManager.h
+++ b/examples/lock-app/infineon/psoc6/include/LockManager.h
@@ -145,25 +145,26 @@ class LockManager
     typedef void (*Callback_fn_completed)(Action_t);
     void SetCallbacks(Callback_fn_initiated aActionInitiated_CB, Callback_fn_completed aActionCompleted_CB);
 
-    bool Lock(chip::EndpointId endpointId, const Optional<chip::ByteSpan> & pin, DlOperationError & err);
-    bool Unlock(chip::EndpointId endpointId, const Optional<chip::ByteSpan> & pin, DlOperationError & err);
+    bool Lock(chip::EndpointId endpointId, const Optional<chip::ByteSpan> & pin, OperationErrorEnum & err);
+    bool Unlock(chip::EndpointId endpointId, const Optional<chip::ByteSpan> & pin, OperationErrorEnum & err);
 
     bool GetUser(chip::EndpointId endpointId, uint16_t userIndex, EmberAfPluginDoorLockUserInfo & user);
     bool SetUser(chip::EndpointId endpointId, uint16_t userIndex, chip::FabricIndex creator, chip::FabricIndex modifier,
-                 const chip::CharSpan & userName, uint32_t uniqueId, DlUserStatus userStatus, DlUserType usertype,
-                 DlCredentialRule credentialRule, const DlCredential * credentials, size_t totalCredentials);
+                 const chip::CharSpan & userName, uint32_t uniqueId, UserStatusEnum userStatus, UserTypeEnum usertype,
+                 CredentialRuleEnum credentialRule, const CredentialStruct * credentials, size_t totalCredentials);
 
-    bool GetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, DlCredentialType credentialType,
+    bool GetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, CredentialTypeEnum credentialType,
                        EmberAfPluginDoorLockCredentialInfo & credential);
 
     bool SetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, chip::FabricIndex creator, chip::FabricIndex modifier,
-                       DlCredentialStatus credentialStatus, DlCredentialType credentialType, const chip::ByteSpan & credentialData);
+                       DlCredentialStatus credentialStatus, CredentialTypeEnum credentialType,
+                       const chip::ByteSpan & credentialData);
 
     DlStatus GetWeekdaySchedule(chip::EndpointId endpointId, uint8_t weekdayIndex, uint16_t userIndex,
                                 EmberAfPluginDoorLockWeekDaySchedule & schedule);
 
     DlStatus SetWeekdaySchedule(chip::EndpointId endpointId, uint8_t weekdayIndex, uint16_t userIndex, DlScheduleStatus status,
-                                DlDaysMaskMap daysMask, uint8_t startHour, uint8_t startMinute, uint8_t endHour, uint8_t endMinute);
+                                DaysMaskMap daysMask, uint8_t startHour, uint8_t startMinute, uint8_t endHour, uint8_t endMinute);
 
     DlStatus GetYeardaySchedule(chip::EndpointId endpointId, uint8_t yearDayIndex, uint16_t userIndex,
                                 EmberAfPluginDoorLockYearDaySchedule & schedule);
@@ -174,16 +175,16 @@ class LockManager
     DlStatus GetHolidaySchedule(chip::EndpointId endpointId, uint8_t holidayIndex, EmberAfPluginDoorLockHolidaySchedule & schedule);
 
     DlStatus SetHolidaySchedule(chip::EndpointId endpointId, uint8_t holidayIndex, DlScheduleStatus status, uint32_t localStartTime,
-                                uint32_t localEndTime, DlOperatingMode operatingMode);
+                                uint32_t localEndTime, OperatingModeEnum operatingMode);
 
     bool IsValidUserIndex(uint16_t userIndex);
-    bool IsValidCredentialIndex(uint16_t credentialIndex, DlCredentialType type);
+    bool IsValidCredentialIndex(uint16_t credentialIndex, CredentialTypeEnum type);
     bool IsValidWeekdayScheduleIndex(uint8_t scheduleIndex);
     bool IsValidYeardayScheduleIndex(uint8_t scheduleIndex);
     bool IsValidHolidayScheduleIndex(uint8_t scheduleIndex);
 
     bool setLockState(chip::EndpointId endpointId, DlLockState lockState, const Optional<chip::ByteSpan> & pin,
-                      DlOperationError & err);
+                      OperationErrorEnum & err);
     const char * lockStateToString(DlLockState lockState) const;
 
     bool ReadConfigValues();
@@ -211,7 +212,7 @@ class LockManager
 
     char mUserNames[ArraySize(mLockUsers)][DOOR_LOCK_MAX_USER_NAME_SIZE];
     uint8_t mCredentialData[kMaxCredentials][kMaxCredentialSize];
-    DlCredential mCredentials[kMaxUsers][kMaxCredentialsPerUser];
+    CredentialStruct mCredentials[kMaxUsers][kMaxCredentialsPerUser];
 
     static LockManager sLock;
     P6DoorLock::LockInitParams::LockParam LockParams;
diff --git a/examples/lock-app/infineon/psoc6/src/AppTask.cpp b/examples/lock-app/infineon/psoc6/src/AppTask.cpp
index a06f1ca687dca0..39e04aa48303d6 100644
--- a/examples/lock-app/infineon/psoc6/src/AppTask.cpp
+++ b/examples/lock-app/infineon/psoc6/src/AppTask.cpp
@@ -80,8 +80,8 @@ using namespace ::chip::System;
 #define APP_EVENT_QUEUE_SIZE 10
 
 using chip::app::Clusters::DoorLock::DlLockState;
-using chip::app::Clusters::DoorLock::DlOperationError;
-using chip::app::Clusters::DoorLock::DlOperationSource;
+using chip::app::Clusters::DoorLock::OperationErrorEnum;
+using chip::app::Clusters::DoorLock::OperationSourceEnum;
 namespace {
 
 TimerHandle_t sFunctionTimer; // FreeRTOS app sw timer.
@@ -407,7 +407,7 @@ void AppTask::LockActionEventHandler(AppEvent * event)
             P6_LOG("Sending a lock jammed event");
 
             /* Generating Door Lock Jammed event */
-            DoorLockServer::Instance().SendLockAlarmEvent(1 /* Endpoint Id */, DlAlarmCode::kLockJammed);
+            DoorLockServer::Instance().SendLockAlarmEvent(1 /* Endpoint Id */, AlarmCodeEnum::kLockJammed);
 
             return;
         }
@@ -663,7 +663,7 @@ void AppTask::UpdateCluster(intptr_t context)
     bool unlocked        = LockMgr().NextState();
     DlLockState newState = unlocked ? DlLockState::kUnlocked : DlLockState::kLocked;
 
-    DlOperationSource source = DlOperationSource::kUnspecified;
+    OperationSourceEnum source = OperationSourceEnum::kUnspecified;
 
     // write the new lock value
     EmberAfStatus status =
diff --git a/examples/lock-app/infineon/psoc6/src/LockManager.cpp b/examples/lock-app/infineon/psoc6/src/LockManager.cpp
index 05db9aec0d5098..6d218073cc97be 100644
--- a/examples/lock-app/infineon/psoc6/src/LockManager.cpp
+++ b/examples/lock-app/infineon/psoc6/src/LockManager.cpp
@@ -107,10 +107,10 @@ bool LockManager::IsValidUserIndex(uint16_t userIndex)
     return (userIndex < kMaxUsers);
 }
 
-bool LockManager::IsValidCredentialIndex(uint16_t credentialIndex, DlCredentialType type)
+bool LockManager::IsValidCredentialIndex(uint16_t credentialIndex, CredentialTypeEnum type)
 {
     // appclusters, 5.2.6.3.1: 0 is allowed index for Programming PIN credential only
-    if (DlCredentialType::kProgrammingPIN == type)
+    if (CredentialTypeEnum::kProgrammingPIN == type)
     {
         return (0 == credentialIndex);
     }
@@ -149,7 +149,8 @@ bool LockManager::ReadConfigValues()
                                  sizeof(mCredentialData), outLen);
 
     P6Config::ReadConfigValueBin(P6Config::kConfigKey_UserCredentials, reinterpret_cast<uint8_t *>(mCredentials),
-                                 sizeof(DlCredential) * LockParams.numberOfUsers * LockParams.numberOfCredentialsPerUser, outLen);
+                                 sizeof(CredentialStruct) * LockParams.numberOfUsers * LockParams.numberOfCredentialsPerUser,
+                                 outLen);
 
     P6Config::ReadConfigValueBin(P6Config::kConfigKey_WeekDaySchedules, reinterpret_cast<uint8_t *>(mWeekdaySchedule),
                                  sizeof(EmberAfPluginDoorLockWeekDaySchedule) * LockParams.numberOfWeekdaySchedulesPerUser *
@@ -287,12 +288,12 @@ void LockManager::ActuatorMovementTimerEventHandler(AppEvent * aEvent)
     }
 }
 
-bool LockManager::Lock(chip::EndpointId endpointId, const Optional<chip::ByteSpan> & pin, DlOperationError & err)
+bool LockManager::Lock(chip::EndpointId endpointId, const Optional<chip::ByteSpan> & pin, OperationErrorEnum & err)
 {
     return setLockState(endpointId, DlLockState::kLocked, pin, err);
 }
 
-bool LockManager::Unlock(chip::EndpointId endpointId, const Optional<chip::ByteSpan> & pin, DlOperationError & err)
+bool LockManager::Unlock(chip::EndpointId endpointId, const Optional<chip::ByteSpan> & pin, OperationErrorEnum & err)
 {
     return setLockState(endpointId, DlLockState::kUnlocked, pin, err);
 }
@@ -310,14 +311,14 @@ bool LockManager::GetUser(chip::EndpointId endpointId, uint16_t userIndex, Ember
     const auto & userInDb = mLockUsers[userIndex];
 
     user.userStatus = userInDb.userStatus;
-    if (DlUserStatus::kAvailable == user.userStatus)
+    if (UserStatusEnum::kAvailable == user.userStatus)
     {
         ChipLogDetail(Zcl, "Found unoccupied user [endpoint=%d]", mEndpointId);
         return true;
     }
 
     user.userName       = chip::CharSpan(userInDb.userName.data(), userInDb.userName.size());
-    user.credentials    = chip::Span<const DlCredential>(mCredentials[userIndex], userInDb.credentials.size());
+    user.credentials    = chip::Span<const CredentialStruct>(mCredentials[userIndex], userInDb.credentials.size());
     user.userUniqueId   = userInDb.userUniqueId;
     user.userType       = userInDb.userType;
     user.credentialRule = userInDb.credentialRule;
@@ -340,8 +341,8 @@ bool LockManager::GetUser(chip::EndpointId endpointId, uint16_t userIndex, Ember
 }
 
 bool LockManager::SetUser(chip::EndpointId endpointId, uint16_t userIndex, chip::FabricIndex creator, chip::FabricIndex modifier,
-                          const chip::CharSpan & userName, uint32_t uniqueId, DlUserStatus userStatus, DlUserType usertype,
-                          DlCredentialRule credentialRule, const DlCredential * credentials, size_t totalCredentials)
+                          const chip::CharSpan & userName, uint32_t uniqueId, UserStatusEnum userStatus, UserTypeEnum usertype,
+                          CredentialRuleEnum credentialRule, const CredentialStruct * credentials, size_t totalCredentials)
 {
     ChipLogProgress(Zcl,
                     "Door Lock App: LockManager::SetUser "
@@ -387,14 +388,14 @@ bool LockManager::SetUser(chip::EndpointId endpointId, uint16_t userIndex, chip:
         mCredentials[userIndex][i].CredentialIndex = i + 1;
     }
 
-    userInStorage.credentials = chip::Span<const DlCredential>(mCredentials[userIndex], totalCredentials);
+    userInStorage.credentials = chip::Span<const CredentialStruct>(mCredentials[userIndex], totalCredentials);
 
     // Save user information in NVM flash
     P6Config::WriteConfigValueBin(P6Config::kConfigKey_LockUser, reinterpret_cast<const uint8_t *>(&mLockUsers),
                                   sizeof(EmberAfPluginDoorLockUserInfo) * LockParams.numberOfUsers);
 
     P6Config::WriteConfigValueBin(P6Config::kConfigKey_UserCredentials, reinterpret_cast<const uint8_t *>(mCredentials),
-                                  sizeof(DlCredential) * LockParams.numberOfUsers * LockParams.numberOfCredentialsPerUser);
+                                  sizeof(CredentialStruct) * LockParams.numberOfUsers * LockParams.numberOfCredentialsPerUser);
 
     P6Config::WriteConfigValueBin(P6Config::kConfigKey_LockUserName, reinterpret_cast<const uint8_t *>(mUserNames),
                                   sizeof(mUserNames));
@@ -404,7 +405,7 @@ bool LockManager::SetUser(chip::EndpointId endpointId, uint16_t userIndex, chip:
     return true;
 }
 
-bool LockManager::GetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, DlCredentialType credentialType,
+bool LockManager::GetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, CredentialTypeEnum credentialType,
                                 EmberAfPluginDoorLockCredentialInfo & credential)
 {
 
@@ -417,7 +418,7 @@ bool LockManager::GetCredential(chip::EndpointId endpointId, uint16_t credential
     ChipLogProgress(Zcl, "Lock App: LockManager::GetCredential [credentialType=%u], credentialIndex=%d",
                     to_underlying(credentialType), credentialIndex);
 
-    if (credentialType == DlCredentialType::kProgrammingPIN)
+    if (credentialType == CredentialTypeEnum::kProgrammingPIN)
     {
         ChipLogError(Zcl, "Programming user not supported [credentialType=%u], credentialIndex=%d", to_underlying(credentialType),
                      credentialIndex);
@@ -451,7 +452,7 @@ bool LockManager::GetCredential(chip::EndpointId endpointId, uint16_t credential
 }
 
 bool LockManager::SetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, chip::FabricIndex creator,
-                                chip::FabricIndex modifier, DlCredentialStatus credentialStatus, DlCredentialType credentialType,
+                                chip::FabricIndex modifier, DlCredentialStatus credentialStatus, CredentialTypeEnum credentialType,
                                 const chip::ByteSpan & credentialData)
 {
 
@@ -513,7 +514,7 @@ DlStatus LockManager::GetWeekdaySchedule(chip::EndpointId endpointId, uint8_t we
 }
 
 DlStatus LockManager::SetWeekdaySchedule(chip::EndpointId endpointId, uint8_t weekdayIndex, uint16_t userIndex,
-                                         DlScheduleStatus status, DlDaysMaskMap daysMask, uint8_t startHour, uint8_t startMinute,
+                                         DlScheduleStatus status, DaysMaskMap daysMask, uint8_t startHour, uint8_t startMinute,
                                          uint8_t endHour, uint8_t endMinute)
 {
 
@@ -613,7 +614,7 @@ DlStatus LockManager::GetHolidaySchedule(chip::EndpointId endpointId, uint8_t ho
 }
 
 DlStatus LockManager::SetHolidaySchedule(chip::EndpointId endpointId, uint8_t holidayIndex, DlScheduleStatus status,
-                                         uint32_t localStartTime, uint32_t localEndTime, DlOperatingMode operatingMode)
+                                         uint32_t localStartTime, uint32_t localEndTime, OperatingModeEnum operatingMode)
 {
     VerifyOrReturnValue(holidayIndex > 0, DlStatus::kFailure); // indices are one-indexed
 
@@ -653,7 +654,7 @@ const char * LockManager::lockStateToString(DlLockState lockState) const
 }
 
 bool LockManager::setLockState(chip::EndpointId endpointId, DlLockState lockState, const Optional<chip::ByteSpan> & pin,
-                               DlOperationError & err)
+                               OperationErrorEnum & err)
 {
 
     // Assume pin is required until told otherwise
@@ -684,7 +685,7 @@ bool LockManager::setLockState(chip::EndpointId endpointId, DlLockState lockStat
     // Check the PIN code
     for (uint8_t i = 0; i < kMaxCredentials; i++)
     {
-        if (mLockCredentials[i].credentialType != DlCredentialType::kPin ||
+        if (mLockCredentials[i].credentialType != CredentialTypeEnum::kPin ||
             mLockCredentials[i].status == DlCredentialStatus::kAvailable)
         {
             continue;
@@ -707,6 +708,6 @@ bool LockManager::setLockState(chip::EndpointId endpointId, DlLockState lockStat
                   "[endpointId=%d]",
                   lockStateToString(lockState), endpointId);
 
-    err = DlOperationError::kInvalidCredential;
+    err = OperationErrorEnum::kInvalidCredential;
     return false;
 }
diff --git a/examples/lock-app/infineon/psoc6/src/ZclCallbacks.cpp b/examples/lock-app/infineon/psoc6/src/ZclCallbacks.cpp
index cdfd3a8d27e883..91936419d458a6 100644
--- a/examples/lock-app/infineon/psoc6/src/ZclCallbacks.cpp
+++ b/examples/lock-app/infineon/psoc6/src/ZclCallbacks.cpp
@@ -58,7 +58,8 @@ void MatterPostAttributeChangeCallback(const chip::app::ConcreteAttributePath &
  */
 void emberAfOnOffClusterInitCallback(EndpointId endpoint) {}
 
-bool emberAfPluginDoorLockOnDoorLockCommand(chip::EndpointId endpointId, const Optional<ByteSpan> & pinCode, DlOperationError & err)
+bool emberAfPluginDoorLockOnDoorLockCommand(chip::EndpointId endpointId, const Optional<ByteSpan> & pinCode,
+                                            OperationErrorEnum & err)
 {
     ChipLogProgress(Zcl, "Door Lock App: Lock Command endpoint=%d", endpointId);
     bool status = LockMgr().Lock(endpointId, pinCode, err);
@@ -70,7 +71,7 @@ bool emberAfPluginDoorLockOnDoorLockCommand(chip::EndpointId endpointId, const O
 }
 
 bool emberAfPluginDoorLockOnDoorUnlockCommand(chip::EndpointId endpointId, const Optional<ByteSpan> & pinCode,
-                                              DlOperationError & err)
+                                              OperationErrorEnum & err)
 {
     ChipLogProgress(Zcl, "Door Lock App: Unlock Command endpoint=%d", endpointId);
     bool status = LockMgr().Unlock(endpointId, pinCode, err);
@@ -82,7 +83,7 @@ bool emberAfPluginDoorLockOnDoorUnlockCommand(chip::EndpointId endpointId, const
     return status;
 }
 
-bool emberAfPluginDoorLockGetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, DlCredentialType credentialType,
+bool emberAfPluginDoorLockGetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, CredentialTypeEnum credentialType,
                                         EmberAfPluginDoorLockCredentialInfo & credential)
 {
     return LockMgr().GetCredential(endpointId, credentialIndex, credentialType, credential);
@@ -90,7 +91,7 @@ bool emberAfPluginDoorLockGetCredential(chip::EndpointId endpointId, uint16_t cr
 
 bool emberAfPluginDoorLockSetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, chip::FabricIndex creator,
                                         chip::FabricIndex modifier, DlCredentialStatus credentialStatus,
-                                        DlCredentialType credentialType, const chip::ByteSpan & credentialData)
+                                        CredentialTypeEnum credentialType, const chip::ByteSpan & credentialData)
 {
     return LockMgr().SetCredential(endpointId, credentialIndex, creator, modifier, credentialStatus, credentialType,
                                    credentialData);
@@ -103,8 +104,8 @@ bool emberAfPluginDoorLockGetUser(chip::EndpointId endpointId, uint16_t userInde
 
 bool emberAfPluginDoorLockSetUser(chip::EndpointId endpointId, uint16_t userIndex, chip::FabricIndex creator,
                                   chip::FabricIndex modifier, const chip::CharSpan & userName, uint32_t uniqueId,
-                                  DlUserStatus userStatus, DlUserType usertype, DlCredentialRule credentialRule,
-                                  const DlCredential * credentials, size_t totalCredentials)
+                                  UserStatusEnum userStatus, UserTypeEnum usertype, CredentialRuleEnum credentialRule,
+                                  const CredentialStruct * credentials, size_t totalCredentials)
 {
 
     return LockMgr().SetUser(endpointId, userIndex, creator, modifier, userName, uniqueId, userStatus, usertype, credentialRule,
@@ -127,7 +128,7 @@ DlStatus emberAfPluginDoorLockGetSchedule(chip::EndpointId endpointId, uint8_t y
 }
 
 DlStatus emberAfPluginDoorLockSetSchedule(chip::EndpointId endpointId, uint8_t weekdayIndex, uint16_t userIndex,
-                                          DlScheduleStatus status, DlDaysMaskMap daysMask, uint8_t startHour, uint8_t startMinute,
+                                          DlScheduleStatus status, DaysMaskMap daysMask, uint8_t startHour, uint8_t startMinute,
                                           uint8_t endHour, uint8_t endMinute)
 {
     return LockMgr().SetWeekdaySchedule(endpointId, weekdayIndex, userIndex, status, daysMask, startHour, startMinute, endHour,
@@ -150,7 +151,7 @@ DlStatus emberAfPluginDoorLockGetSchedule(chip::EndpointId endpointId, uint8_t h
 }
 
 DlStatus emberAfPluginDoorLockSetSchedule(chip::EndpointId endpointId, uint8_t holidayIndex, DlScheduleStatus status,
-                                          uint32_t localStartTime, uint32_t localEndTime, DlOperatingMode operatingMode)
+                                          uint32_t localStartTime, uint32_t localEndTime, OperatingModeEnum operatingMode)
 {
     return LockMgr().SetHolidaySchedule(endpointId, holidayIndex, status, localStartTime, localEndTime, operatingMode);
     // return DlStatus::kFailure;
diff --git a/examples/lock-app/linux/include/LockEndpoint.h b/examples/lock-app/linux/include/LockEndpoint.h
index 91a4b4f71b727d..0e0b32fd3b775b 100644
--- a/examples/lock-app/linux/include/LockEndpoint.h
+++ b/examples/lock-app/linux/include/LockEndpoint.h
@@ -25,10 +25,10 @@ struct LockUserInfo
 {
     char userName[DOOR_LOCK_USER_NAME_BUFFER_SIZE];
     uint32_t userUniqueId;
-    DlUserStatus userStatus;
-    DlUserType userType;
-    DlCredentialRule credentialRule;
-    std::vector<DlCredential> credentials;
+    UserStatusEnum userStatus;
+    UserTypeEnum userType;
+    CredentialRuleEnum credentialRule;
+    std::vector<CredentialStruct> credentials;
     chip::FabricIndex createdBy;
     chip::FabricIndex lastModifiedBy;
 };
@@ -47,7 +47,7 @@ class LockEndpoint
                  uint8_t weekDaySchedulesPerUser, uint8_t yearDaySchedulesPerUser, uint8_t numberOfCredentialsPerUser,
                  uint8_t numberOfHolidaySchedules) :
         mEndpointId{ endpointId },
-        mLockState{ DlLockState::kLocked }, mDoorState{ DlDoorState::kDoorClosed }, mLockUsers(numberOfLockUsersSupported),
+        mLockState{ DlLockState::kLocked }, mDoorState{ DoorStateEnum::kDoorClosed }, mLockUsers(numberOfLockUsersSupported),
         mLockCredentials(numberOfCredentialsSupported + 1),
         mWeekDaySchedules(numberOfLockUsersSupported, std::vector<WeekDaysScheduleInfo>(weekDaySchedulesPerUser)),
         mYearDaySchedules(numberOfLockUsersSupported, std::vector<YearDayScheduleInfo>(yearDaySchedulesPerUser)),
@@ -63,39 +63,40 @@ class LockEndpoint
 
     inline chip::EndpointId GetEndpointId() const { return mEndpointId; }
 
-    bool Lock(const Optional<chip::ByteSpan> & pin, DlOperationError & err);
-    bool Unlock(const Optional<chip::ByteSpan> & pin, DlOperationError & err);
+    bool Lock(const Optional<chip::ByteSpan> & pin, OperationErrorEnum & err);
+    bool Unlock(const Optional<chip::ByteSpan> & pin, OperationErrorEnum & err);
 
     bool GetUser(uint16_t userIndex, EmberAfPluginDoorLockUserInfo & user) const;
     bool SetUser(uint16_t userIndex, chip::FabricIndex creator, chip::FabricIndex modifier, const chip::CharSpan & userName,
-                 uint32_t uniqueId, DlUserStatus userStatus, DlUserType usertype, DlCredentialRule credentialRule,
-                 const DlCredential * credentials, size_t totalCredentials);
+                 uint32_t uniqueId, UserStatusEnum userStatus, UserTypeEnum usertype, CredentialRuleEnum credentialRule,
+                 const CredentialStruct * credentials, size_t totalCredentials);
 
-    bool SetDoorState(DlDoorState newState);
+    bool SetDoorState(DoorStateEnum newState);
 
-    DlDoorState GetDoorState() const;
+    DoorStateEnum GetDoorState() const;
 
-    bool SendLockAlarm(DlAlarmCode alarmCode) const;
+    bool SendLockAlarm(AlarmCodeEnum alarmCode) const;
 
-    bool GetCredential(uint16_t credentialIndex, DlCredentialType credentialType,
+    bool GetCredential(uint16_t credentialIndex, CredentialTypeEnum credentialType,
                        EmberAfPluginDoorLockCredentialInfo & credential) const;
 
     bool SetCredential(uint16_t credentialIndex, chip::FabricIndex creator, chip::FabricIndex modifier,
-                       DlCredentialStatus credentialStatus, DlCredentialType credentialType, const chip::ByteSpan & credentialData);
+                       DlCredentialStatus credentialStatus, CredentialTypeEnum credentialType,
+                       const chip::ByteSpan & credentialData);
 
     DlStatus GetSchedule(uint8_t weekDayIndex, uint16_t userIndex, EmberAfPluginDoorLockWeekDaySchedule & schedule);
     DlStatus GetSchedule(uint8_t yearDayIndex, uint16_t userIndex, EmberAfPluginDoorLockYearDaySchedule & schedule);
     DlStatus GetSchedule(uint8_t holidayIndex, EmberAfPluginDoorLockHolidaySchedule & schedule);
 
-    DlStatus SetSchedule(uint8_t weekDayIndex, uint16_t userIndex, DlScheduleStatus status, DlDaysMaskMap daysMask,
-                         uint8_t startHour, uint8_t startMinute, uint8_t endHour, uint8_t endMinute);
+    DlStatus SetSchedule(uint8_t weekDayIndex, uint16_t userIndex, DlScheduleStatus status, DaysMaskMap daysMask, uint8_t startHour,
+                         uint8_t startMinute, uint8_t endHour, uint8_t endMinute);
     DlStatus SetSchedule(uint8_t yearDayIndex, uint16_t userIndex, DlScheduleStatus status, uint32_t localStartTime,
                          uint32_t localEndTime);
     DlStatus SetSchedule(uint8_t holidayIndex, DlScheduleStatus status, uint32_t localStartTime, uint32_t localEndTime,
-                         DlOperatingMode operatingMode);
+                         OperatingModeEnum operatingMode);
 
 private:
-    bool setLockState(DlLockState lockState, const Optional<chip::ByteSpan> & pin, DlOperationError & err);
+    bool setLockState(DlLockState lockState, const Optional<chip::ByteSpan> & pin, OperationErrorEnum & err);
     const char * lockStateToString(DlLockState lockState) const;
 
     bool weekDayScheduleInAction(uint16_t userIndex) const;
@@ -103,7 +104,7 @@ class LockEndpoint
 
     chip::EndpointId mEndpointId;
     DlLockState mLockState;
-    DlDoorState mDoorState;
+    DoorStateEnum mDoorState;
 
     // This is very naive implementation of users/credentials/schedules database and by no means the best practice. Proper storage
     // of those items is out of scope of this example.
@@ -117,7 +118,7 @@ class LockEndpoint
 struct LockCredentialInfo
 {
     DlCredentialStatus status;
-    DlCredentialType credentialType;
+    CredentialTypeEnum credentialType;
     chip::FabricIndex createdBy;
     chip::FabricIndex modifiedBy;
     uint8_t credentialData[DOOR_LOCK_CREDENTIAL_INFO_MAX_DATA_SIZE];
diff --git a/examples/lock-app/linux/include/LockManager.h b/examples/lock-app/linux/include/LockManager.h
index a517e07580af3a..07123df607bf46 100644
--- a/examples/lock-app/linux/include/LockManager.h
+++ b/examples/lock-app/linux/include/LockManager.h
@@ -31,23 +31,24 @@ class LockManager
 
     bool InitEndpoint(chip::EndpointId endpointId);
 
-    bool SetDoorState(chip::EndpointId endpointId, DlDoorState doorState);
+    bool SetDoorState(chip::EndpointId endpointId, DoorStateEnum doorState);
 
-    bool SendLockAlarm(chip::EndpointId endpointId, DlAlarmCode alarmCode);
+    bool SendLockAlarm(chip::EndpointId endpointId, AlarmCodeEnum alarmCode);
 
-    bool Lock(chip::EndpointId endpointId, const Optional<chip::ByteSpan> & pin, DlOperationError & err);
-    bool Unlock(chip::EndpointId endpointId, const Optional<chip::ByteSpan> & pin, DlOperationError & err);
+    bool Lock(chip::EndpointId endpointId, const Optional<chip::ByteSpan> & pin, OperationErrorEnum & err);
+    bool Unlock(chip::EndpointId endpointId, const Optional<chip::ByteSpan> & pin, OperationErrorEnum & err);
 
     bool GetUser(chip::EndpointId endpointId, uint16_t userIndex, EmberAfPluginDoorLockUserInfo & user);
     bool SetUser(chip::EndpointId endpointId, uint16_t userIndex, chip::FabricIndex creator, chip::FabricIndex modifier,
-                 const chip::CharSpan & userName, uint32_t uniqueId, DlUserStatus userStatus, DlUserType usertype,
-                 DlCredentialRule credentialRule, const DlCredential * credentials, size_t totalCredentials);
+                 const chip::CharSpan & userName, uint32_t uniqueId, UserStatusEnum userStatus, UserTypeEnum usertype,
+                 CredentialRuleEnum credentialRule, const CredentialStruct * credentials, size_t totalCredentials);
 
-    bool GetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, DlCredentialType credentialType,
+    bool GetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, CredentialTypeEnum credentialType,
                        EmberAfPluginDoorLockCredentialInfo & credential);
 
     bool SetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, chip::FabricIndex creator, chip::FabricIndex modifier,
-                       DlCredentialStatus credentialStatus, DlCredentialType credentialType, const chip::ByteSpan & credentialData);
+                       DlCredentialStatus credentialStatus, CredentialTypeEnum credentialType,
+                       const chip::ByteSpan & credentialData);
 
     DlStatus GetSchedule(chip::EndpointId endpointId, uint8_t weekDayIndex, uint16_t userIndex,
                          EmberAfPluginDoorLockWeekDaySchedule & schedule);
@@ -56,11 +57,11 @@ class LockManager
     DlStatus GetSchedule(chip::EndpointId endpointId, uint8_t holidayIndex, EmberAfPluginDoorLockHolidaySchedule & schedule);
 
     DlStatus SetSchedule(chip::EndpointId endpointId, uint8_t weekDayIndex, uint16_t userIndex, DlScheduleStatus status,
-                         DlDaysMaskMap daysMask, uint8_t startHour, uint8_t startMinute, uint8_t endHour, uint8_t endMinute);
+                         DaysMaskMap daysMask, uint8_t startHour, uint8_t startMinute, uint8_t endHour, uint8_t endMinute);
     DlStatus SetSchedule(chip::EndpointId endpointId, uint8_t yearDayIndex, uint16_t userIndex, DlScheduleStatus status,
                          uint32_t localStartTime, uint32_t localEndTime);
     DlStatus SetSchedule(chip::EndpointId endpointId, uint8_t holidayIndex, DlScheduleStatus status, uint32_t localStartTime,
-                         uint32_t localEndTime, DlOperatingMode operatingMode);
+                         uint32_t localEndTime, OperatingModeEnum operatingMode);
 
     static LockManager & Instance();
 
diff --git a/examples/lock-app/linux/src/LockAppCommandDelegate.cpp b/examples/lock-app/linux/src/LockAppCommandDelegate.cpp
index 9268d37f4e9c3f..92602a70c022c2 100644
--- a/examples/lock-app/linux/src/LockAppCommandDelegate.cpp
+++ b/examples/lock-app/linux/src/LockAppCommandDelegate.cpp
@@ -107,11 +107,11 @@ void LockAppCommandHandler::HandleCommand(intptr_t context)
             ChipLogError(NotSpecified, "Lock App: Unable to execute command to set the door state: invalid type for DoorState"));
 
         auto doorState = params["DoorState"].asUInt();
-        VerifyOrExit(doorState < to_underlying(DlDoorState::kUnknownEnumValue),
+        VerifyOrExit(doorState < to_underlying(DoorStateEnum::kUnknownEnumValue),
                      ChipLogError(NotSpecified,
                                   "Lock App: Unable to execute command to set door state: DoorState is out of range [doorState=%u]",
                                   doorState));
-        LockManager::Instance().SetDoorState(endpointId, static_cast<DlDoorState>(doorState));
+        LockManager::Instance().SetDoorState(endpointId, static_cast<DoorStateEnum>(doorState));
     }
     else if (self->mCommandName == "SendDoorLockAlarm")
     {
@@ -125,11 +125,11 @@ void LockAppCommandHandler::HandleCommand(intptr_t context)
 
         auto alarmCode = params["AlarmCode"].asUInt();
         VerifyOrExit(
-            alarmCode < to_underlying(DlAlarmCode::kUnknownEnumValue),
+            alarmCode < to_underlying(AlarmCodeEnum::kUnknownEnumValue),
             ChipLogError(NotSpecified,
                          "Lock App: Unable to execute command to send lock alarm: AlarmCode is out of range [alarmCode=%u]",
                          alarmCode));
-        LockManager::Instance().SendLockAlarm(endpointId, static_cast<DlAlarmCode>(alarmCode));
+        LockManager::Instance().SendLockAlarm(endpointId, static_cast<AlarmCodeEnum>(alarmCode));
     }
     else
     {
diff --git a/examples/lock-app/linux/src/LockEndpoint.cpp b/examples/lock-app/linux/src/LockEndpoint.cpp
index c3d52c69a08603..6ed9592df0c0f9 100644
--- a/examples/lock-app/linux/src/LockEndpoint.cpp
+++ b/examples/lock-app/linux/src/LockEndpoint.cpp
@@ -21,12 +21,12 @@
 
 using chip::to_underlying;
 
-bool LockEndpoint::Lock(const Optional<chip::ByteSpan> & pin, DlOperationError & err)
+bool LockEndpoint::Lock(const Optional<chip::ByteSpan> & pin, OperationErrorEnum & err)
 {
     return setLockState(DlLockState::kLocked, pin, err);
 }
 
-bool LockEndpoint::Unlock(const Optional<chip::ByteSpan> & pin, DlOperationError & err)
+bool LockEndpoint::Unlock(const Optional<chip::ByteSpan> & pin, OperationErrorEnum & err)
 {
     return setLockState(DlLockState::kUnlocked, pin, err);
 }
@@ -45,14 +45,14 @@ bool LockEndpoint::GetUser(uint16_t userIndex, EmberAfPluginDoorLockUserInfo & u
 
     const auto & userInDb = mLockUsers[adjustedUserIndex];
     user.userStatus       = userInDb.userStatus;
-    if (DlUserStatus::kAvailable == user.userStatus)
+    if (UserStatusEnum::kAvailable == user.userStatus)
     {
         ChipLogDetail(Zcl, "Found unoccupied user [endpoint=%d,adjustedIndex=%hu]", mEndpointId, adjustedUserIndex);
         return true;
     }
 
     user.userName       = chip::CharSpan(userInDb.userName, strlen(userInDb.userName));
-    user.credentials    = chip::Span<const DlCredential>(userInDb.credentials.data(), userInDb.credentials.size());
+    user.credentials    = chip::Span<const CredentialStruct>(userInDb.credentials.data(), userInDb.credentials.size());
     user.userUniqueId   = userInDb.userUniqueId;
     user.userType       = userInDb.userType;
     user.credentialRule = userInDb.credentialRule;
@@ -75,8 +75,8 @@ bool LockEndpoint::GetUser(uint16_t userIndex, EmberAfPluginDoorLockUserInfo & u
 }
 
 bool LockEndpoint::SetUser(uint16_t userIndex, chip::FabricIndex creator, chip::FabricIndex modifier,
-                           const chip::CharSpan & userName, uint32_t uniqueId, DlUserStatus userStatus, DlUserType usertype,
-                           DlCredentialRule credentialRule, const DlCredential * credentials, size_t totalCredentials)
+                           const chip::CharSpan & userName, uint32_t uniqueId, UserStatusEnum userStatus, UserTypeEnum usertype,
+                           CredentialRuleEnum credentialRule, const CredentialStruct * credentials, size_t totalCredentials)
 {
     ChipLogProgress(Zcl,
                     "Lock App: LockEndpoint::SetUser "
@@ -134,12 +134,12 @@ bool LockEndpoint::SetUser(uint16_t userIndex, chip::FabricIndex creator, chip::
     return true;
 }
 
-DlDoorState LockEndpoint::GetDoorState() const
+DoorStateEnum LockEndpoint::GetDoorState() const
 {
     return mDoorState;
 }
 
-bool LockEndpoint::SetDoorState(DlDoorState newState)
+bool LockEndpoint::SetDoorState(DoorStateEnum newState)
 {
     if (mDoorState != newState)
     {
@@ -152,19 +152,20 @@ bool LockEndpoint::SetDoorState(DlDoorState newState)
     return true;
 }
 
-bool LockEndpoint::SendLockAlarm(DlAlarmCode alarmCode) const
+bool LockEndpoint::SendLockAlarm(AlarmCodeEnum alarmCode) const
 {
     ChipLogProgress(Zcl, "Sending the LockAlarm event [endpointId=%d,alarmCode=%u]", mEndpointId, to_underlying(alarmCode));
     return DoorLockServer::Instance().SendLockAlarmEvent(mEndpointId, alarmCode);
 }
 
-bool LockEndpoint::GetCredential(uint16_t credentialIndex, DlCredentialType credentialType,
+bool LockEndpoint::GetCredential(uint16_t credentialIndex, CredentialTypeEnum credentialType,
                                  EmberAfPluginDoorLockCredentialInfo & credential) const
 {
     ChipLogProgress(Zcl, "Lock App: LockEndpoint::GetCredential [endpoint=%d,credentialIndex=%u,credentialType=%u]", mEndpointId,
                     credentialIndex, to_underlying(credentialType));
 
-    if (credentialIndex >= mLockCredentials.size() || (0 == credentialIndex && DlCredentialType::kProgrammingPIN != credentialType))
+    if (credentialIndex >= mLockCredentials.size() ||
+        (0 == credentialIndex && CredentialTypeEnum::kProgrammingPIN != credentialType))
     {
         ChipLogError(Zcl, "Cannot get the credential - index out of range [endpoint=%d,index=%d]", mEndpointId, credentialIndex);
         return false;
@@ -195,7 +196,7 @@ bool LockEndpoint::GetCredential(uint16_t credentialIndex, DlCredentialType cred
 }
 
 bool LockEndpoint::SetCredential(uint16_t credentialIndex, chip::FabricIndex creator, chip::FabricIndex modifier,
-                                 DlCredentialStatus credentialStatus, DlCredentialType credentialType,
+                                 DlCredentialStatus credentialStatus, CredentialTypeEnum credentialType,
                                  const chip::ByteSpan & credentialData)
 {
     ChipLogProgress(
@@ -205,7 +206,8 @@ bool LockEndpoint::SetCredential(uint16_t credentialIndex, chip::FabricIndex cre
         mEndpointId, credentialIndex, to_underlying(credentialStatus), to_underlying(credentialType),
         static_cast<unsigned int>(credentialData.size()), creator, modifier);
 
-    if (credentialIndex >= mLockCredentials.size() || (0 == credentialIndex && DlCredentialType::kProgrammingPIN != credentialType))
+    if (credentialIndex >= mLockCredentials.size() ||
+        (0 == credentialIndex && CredentialTypeEnum::kProgrammingPIN != credentialType))
     {
         ChipLogError(Zcl, "Cannot set the credential - index out of range [endpoint=%d,index=%d]", mEndpointId, credentialIndex);
         return false;
@@ -258,7 +260,7 @@ DlStatus LockEndpoint::GetSchedule(uint8_t weekDayIndex, uint16_t userIndex, Emb
     return DlStatus::kSuccess;
 }
 
-DlStatus LockEndpoint::SetSchedule(uint8_t weekDayIndex, uint16_t userIndex, DlScheduleStatus status, DlDaysMaskMap daysMask,
+DlStatus LockEndpoint::SetSchedule(uint8_t weekDayIndex, uint16_t userIndex, DlScheduleStatus status, DaysMaskMap daysMask,
                                    uint8_t startHour, uint8_t startMinute, uint8_t endHour, uint8_t endMinute)
 {
     if (0 == userIndex || userIndex > mWeekDaySchedules.size())
@@ -345,7 +347,7 @@ DlStatus LockEndpoint::GetSchedule(uint8_t holidayIndex, EmberAfPluginDoorLockHo
 }
 
 DlStatus LockEndpoint::SetSchedule(uint8_t holidayIndex, DlScheduleStatus status, uint32_t localStartTime, uint32_t localEndTime,
-                                   DlOperatingMode operatingMode)
+                                   OperatingModeEnum operatingMode)
 {
     if (0 == holidayIndex || holidayIndex > mHolidaySchedules.size())
     {
@@ -361,7 +363,7 @@ DlStatus LockEndpoint::SetSchedule(uint8_t holidayIndex, DlScheduleStatus status
     return DlStatus::kSuccess;
 }
 
-bool LockEndpoint::setLockState(DlLockState lockState, const Optional<chip::ByteSpan> & pin, DlOperationError & err)
+bool LockEndpoint::setLockState(DlLockState lockState, const Optional<chip::ByteSpan> & pin, OperationErrorEnum & err)
 {
     // Assume pin is required until told otherwise
     bool requirePin = true;
@@ -390,7 +392,7 @@ bool LockEndpoint::setLockState(DlLockState lockState, const Optional<chip::Byte
 
     // Find the credential so we can make sure it is not absent right away
     auto credential = std::find_if(mLockCredentials.begin(), mLockCredentials.end(), [&pin](const LockCredentialInfo & c) {
-        return (c.credentialType == DlCredentialType::kPin && c.status != DlCredentialStatus::kAvailable) &&
+        return (c.credentialType == CredentialTypeEnum::kPin && c.status != DlCredentialStatus::kAvailable) &&
             chip::ByteSpan{ c.credentialData, c.credentialDataSize }.data_equal(pin.Value());
     });
     if (credential == mLockCredentials.end())
@@ -400,14 +402,14 @@ bool LockEndpoint::setLockState(DlLockState lockState, const Optional<chip::Byte
                       "[endpointId=%d]",
                       lockStateToString(lockState), mEndpointId);
 
-        err = DlOperationError::kInvalidCredential;
+        err = OperationErrorEnum::kInvalidCredential;
         return false;
     }
 
     // Find a user that correspond to this credential
     auto credentialIndex = static_cast<unsigned>(credential - mLockCredentials.begin());
     auto user = std::find_if(mLockUsers.begin(), mLockUsers.end(), [credential, credentialIndex](const LockUserInfo & u) {
-        return std::any_of(u.credentials.begin(), u.credentials.end(), [&credential, credentialIndex](const DlCredential & c) {
+        return std::any_of(u.credentials.begin(), u.credentials.end(), [&credential, credentialIndex](const CredentialStruct & c) {
             return c.CredentialIndex == credentialIndex && c.CredentialType == to_underlying(credential->credentialType);
         });
     });
@@ -422,17 +424,17 @@ bool LockEndpoint::setLockState(DlLockState lockState, const Optional<chip::Byte
     auto userIndex = static_cast<uint8_t>(user - mLockUsers.begin());
 
     // Check if schedules affect the user
-    if ((user->userType == DlUserType::kScheduleRestrictedUser || user->userType == DlUserType::kWeekDayScheduleUser) &&
+    if ((user->userType == UserTypeEnum::kScheduleRestrictedUser || user->userType == UserTypeEnum::kWeekDayScheduleUser) &&
         !weekDayScheduleInAction(userIndex))
     {
-        if ((user->userType == DlUserType::kScheduleRestrictedUser || user->userType == DlUserType::kYearDayScheduleUser) &&
+        if ((user->userType == UserTypeEnum::kScheduleRestrictedUser || user->userType == UserTypeEnum::kYearDayScheduleUser) &&
             !yearDayScheduleInAction(userIndex))
         {
             ChipLogDetail(Zcl,
                           "Lock App: associated user is not allowed to operate the lock due to schedules"
                           "[endpointId=%d,userIndex=%u]",
                           mEndpointId, userIndex);
-            err = DlOperationError::kRestricted;
+            err = OperationErrorEnum::kRestricted;
             return false;
         }
     }
@@ -450,7 +452,7 @@ bool LockEndpoint::setLockState(DlLockState lockState, const Optional<chip::Byte
 bool LockEndpoint::weekDayScheduleInAction(uint16_t userIndex) const
 {
     const auto & user = mLockUsers[userIndex];
-    if (user.userType != DlUserType::kScheduleRestrictedUser && user.userType != DlUserType::kWeekDayScheduleUser)
+    if (user.userType != UserTypeEnum::kScheduleRestrictedUser && user.userType != UserTypeEnum::kWeekDayScheduleUser)
     {
         return true;
     }
@@ -485,7 +487,7 @@ bool LockEndpoint::weekDayScheduleInAction(uint16_t userIndex) const
 bool LockEndpoint::yearDayScheduleInAction(uint16_t userIndex) const
 {
     const auto & user = mLockUsers[userIndex];
-    if (user.userType != DlUserType::kScheduleRestrictedUser && user.userType != DlUserType::kYearDayScheduleUser)
+    if (user.userType != UserTypeEnum::kScheduleRestrictedUser && user.userType != UserTypeEnum::kYearDayScheduleUser)
     {
         return true;
     }
diff --git a/examples/lock-app/linux/src/LockManager.cpp b/examples/lock-app/linux/src/LockManager.cpp
index 6531be018df53a..e4bb4cc9406344 100644
--- a/examples/lock-app/linux/src/LockManager.cpp
+++ b/examples/lock-app/linux/src/LockManager.cpp
@@ -111,7 +111,7 @@ bool LockManager::InitEndpoint(chip::EndpointId endpointId)
     return true;
 }
 
-bool LockManager::SetDoorState(chip::EndpointId endpointId, DlDoorState doorState)
+bool LockManager::SetDoorState(chip::EndpointId endpointId, DoorStateEnum doorState)
 {
     auto lockEndpoint = getEndpoint(endpointId);
     if (nullptr == lockEndpoint)
@@ -123,7 +123,7 @@ bool LockManager::SetDoorState(chip::EndpointId endpointId, DlDoorState doorStat
     return lockEndpoint->SetDoorState(doorState);
 }
 
-bool LockManager::SendLockAlarm(chip::EndpointId endpointId, DlAlarmCode alarmCode)
+bool LockManager::SendLockAlarm(chip::EndpointId endpointId, AlarmCodeEnum alarmCode)
 {
     auto lockEndpoint = getEndpoint(endpointId);
     if (nullptr == lockEndpoint)
@@ -134,7 +134,7 @@ bool LockManager::SendLockAlarm(chip::EndpointId endpointId, DlAlarmCode alarmCo
     return lockEndpoint->SendLockAlarm(alarmCode);
 }
 
-bool LockManager::Lock(chip::EndpointId endpointId, const Optional<chip::ByteSpan> & pin, DlOperationError & err)
+bool LockManager::Lock(chip::EndpointId endpointId, const Optional<chip::ByteSpan> & pin, OperationErrorEnum & err)
 {
     auto lockEndpoint = getEndpoint(endpointId);
     if (nullptr == lockEndpoint)
@@ -145,7 +145,7 @@ bool LockManager::Lock(chip::EndpointId endpointId, const Optional<chip::ByteSpa
     return lockEndpoint->Lock(pin, err);
 }
 
-bool LockManager::Unlock(chip::EndpointId endpointId, const Optional<chip::ByteSpan> & pin, DlOperationError & err)
+bool LockManager::Unlock(chip::EndpointId endpointId, const Optional<chip::ByteSpan> & pin, OperationErrorEnum & err)
 {
     auto lockEndpoint = getEndpoint(endpointId);
     if (nullptr == lockEndpoint)
@@ -168,8 +168,8 @@ bool LockManager::GetUser(chip::EndpointId endpointId, uint16_t userIndex, Ember
 }
 
 bool LockManager::SetUser(chip::EndpointId endpointId, uint16_t userIndex, chip::FabricIndex creator, chip::FabricIndex modifier,
-                          const chip::CharSpan & userName, uint32_t uniqueId, DlUserStatus userStatus, DlUserType usertype,
-                          DlCredentialRule credentialRule, const DlCredential * credentials, size_t totalCredentials)
+                          const chip::CharSpan & userName, uint32_t uniqueId, UserStatusEnum userStatus, UserTypeEnum usertype,
+                          CredentialRuleEnum credentialRule, const CredentialStruct * credentials, size_t totalCredentials)
 {
     auto lockEndpoint = getEndpoint(endpointId);
     if (nullptr == lockEndpoint)
@@ -181,7 +181,7 @@ bool LockManager::SetUser(chip::EndpointId endpointId, uint16_t userIndex, chip:
                                  credentials, totalCredentials);
 }
 
-bool LockManager::GetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, DlCredentialType credentialType,
+bool LockManager::GetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, CredentialTypeEnum credentialType,
                                 EmberAfPluginDoorLockCredentialInfo & credential)
 {
     auto lockEndpoint = getEndpoint(endpointId);
@@ -194,7 +194,7 @@ bool LockManager::GetCredential(chip::EndpointId endpointId, uint16_t credential
 }
 
 bool LockManager::SetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, chip::FabricIndex creator,
-                                chip::FabricIndex modifier, DlCredentialStatus credentialStatus, DlCredentialType credentialType,
+                                chip::FabricIndex modifier, DlCredentialStatus credentialStatus, CredentialTypeEnum credentialType,
                                 const chip::ByteSpan & credentialData)
 {
     auto lockEndpoint = getEndpoint(endpointId);
@@ -220,8 +220,7 @@ DlStatus LockManager::GetSchedule(chip::EndpointId endpointId, uint8_t weekDayIn
 }
 
 DlStatus LockManager::SetSchedule(chip::EndpointId endpointId, uint8_t weekDayIndex, uint16_t userIndex, DlScheduleStatus status,
-                                  DlDaysMaskMap daysMask, uint8_t startHour, uint8_t startMinute, uint8_t endHour,
-                                  uint8_t endMinute)
+                                  DaysMaskMap daysMask, uint8_t startHour, uint8_t startMinute, uint8_t endHour, uint8_t endMinute)
 {
     auto lockEndpoint = getEndpoint(endpointId);
     if (nullptr == lockEndpoint)
@@ -273,7 +272,7 @@ DlStatus LockManager::GetSchedule(chip::EndpointId endpointId, uint8_t holidayIn
 }
 
 DlStatus LockManager::SetSchedule(chip::EndpointId endpointId, uint8_t holidayIndex, DlScheduleStatus status,
-                                  uint32_t localStartTime, uint32_t localEndTime, DlOperatingMode operatingMode)
+                                  uint32_t localStartTime, uint32_t localEndTime, OperatingModeEnum operatingMode)
 {
     auto lockEndpoint = getEndpoint(endpointId);
     if (nullptr == lockEndpoint)
diff --git a/examples/lock-app/linux/src/ZCLDoorLockCallbacks.cpp b/examples/lock-app/linux/src/ZCLDoorLockCallbacks.cpp
index fa7cc2dff164cf..a0670f2abf7f0c 100644
--- a/examples/lock-app/linux/src/ZCLDoorLockCallbacks.cpp
+++ b/examples/lock-app/linux/src/ZCLDoorLockCallbacks.cpp
@@ -10,13 +10,14 @@ using namespace chip::app::Clusters::DoorLock;
 // should wait for door to be locked on lock command and return success) but
 // door lock server should check pin before even calling the lock-door
 // callback.
-bool emberAfPluginDoorLockOnDoorLockCommand(chip::EndpointId endpointId, const Optional<ByteSpan> & pinCode, DlOperationError & err)
+bool emberAfPluginDoorLockOnDoorLockCommand(chip::EndpointId endpointId, const Optional<ByteSpan> & pinCode,
+                                            OperationErrorEnum & err)
 {
     return LockManager::Instance().Lock(endpointId, pinCode, err);
 }
 
 bool emberAfPluginDoorLockOnDoorUnlockCommand(chip::EndpointId endpointId, const Optional<ByteSpan> & pinCode,
-                                              DlOperationError & err)
+                                              OperationErrorEnum & err)
 {
     return LockManager::Instance().Unlock(endpointId, pinCode, err);
 }
@@ -28,15 +29,15 @@ bool emberAfPluginDoorLockGetUser(chip::EndpointId endpointId, uint16_t userInde
 
 bool emberAfPluginDoorLockSetUser(chip::EndpointId endpointId, uint16_t userIndex, chip::FabricIndex creator,
                                   chip::FabricIndex modifier, const chip::CharSpan & userName, uint32_t uniqueId,
-                                  DlUserStatus userStatus, DlUserType usertype, DlCredentialRule credentialRule,
-                                  const DlCredential * credentials, size_t totalCredentials)
+                                  UserStatusEnum userStatus, UserTypeEnum usertype, CredentialRuleEnum credentialRule,
+                                  const CredentialStruct * credentials, size_t totalCredentials)
 {
 
     return LockManager::Instance().SetUser(endpointId, userIndex, creator, modifier, userName, uniqueId, userStatus, usertype,
                                            credentialRule, credentials, totalCredentials);
 }
 
-bool emberAfPluginDoorLockGetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, DlCredentialType credentialType,
+bool emberAfPluginDoorLockGetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, CredentialTypeEnum credentialType,
                                         EmberAfPluginDoorLockCredentialInfo & credential)
 {
     return LockManager::Instance().GetCredential(endpointId, credentialIndex, credentialType, credential);
@@ -44,7 +45,7 @@ bool emberAfPluginDoorLockGetCredential(chip::EndpointId endpointId, uint16_t cr
 
 bool emberAfPluginDoorLockSetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, chip::FabricIndex creator,
                                         chip::FabricIndex modifier, DlCredentialStatus credentialStatus,
-                                        DlCredentialType credentialType, const chip::ByteSpan & credentialData)
+                                        CredentialTypeEnum credentialType, const chip::ByteSpan & credentialData)
 {
     return LockManager::Instance().SetCredential(endpointId, credentialIndex, creator, modifier, credentialStatus, credentialType,
                                                  credentialData);
@@ -63,7 +64,7 @@ DlStatus emberAfPluginDoorLockGetSchedule(chip::EndpointId endpointId, uint8_t h
 }
 
 DlStatus emberAfPluginDoorLockSetSchedule(chip::EndpointId endpointId, uint8_t weekdayIndex, uint16_t userIndex,
-                                          DlScheduleStatus status, DlDaysMaskMap daysMask, uint8_t startHour, uint8_t startMinute,
+                                          DlScheduleStatus status, DaysMaskMap daysMask, uint8_t startHour, uint8_t startMinute,
                                           uint8_t endHour, uint8_t endMinute)
 {
     return LockManager::Instance().SetSchedule(endpointId, weekdayIndex, userIndex, status, daysMask, startHour, startMinute,
@@ -83,7 +84,7 @@ DlStatus emberAfPluginDoorLockGetSchedule(chip::EndpointId endpointId, uint8_t y
 }
 
 DlStatus emberAfPluginDoorLockSetSchedule(chip::EndpointId endpointId, uint8_t holidayIndex, DlScheduleStatus status,
-                                          uint32_t localStartTime, uint32_t localEndTime, DlOperatingMode operatingMode)
+                                          uint32_t localStartTime, uint32_t localEndTime, OperatingModeEnum operatingMode)
 {
     return LockManager::Instance().SetSchedule(endpointId, holidayIndex, status, localStartTime, localEndTime, operatingMode);
 }
diff --git a/examples/lock-app/lock-common/lock-app.matter b/examples/lock-app/lock-common/lock-app.matter
index 1ccc584e38085a..236536d36f27ff 100644
--- a/examples/lock-app/lock-common/lock-app.matter
+++ b/examples/lock-app/lock-common/lock-app.matter
@@ -718,7 +718,7 @@ server cluster GeneralDiagnostics = 51 {
     kSoftwareReset = 6;
   }
 
-  enum HardwareFault : ENUM8 {
+  enum HardwareFaultEnum : ENUM8 {
     kUnspecified = 0;
     kRadio = 1;
     kSensor = 2;
@@ -732,7 +732,7 @@ server cluster GeneralDiagnostics = 51 {
     kTamperDetected = 10;
   }
 
-  enum InterfaceType : ENUM8 {
+  enum InterfaceTypeEnum : ENUM8 {
     kUnspecified = 0;
     kWiFi = 1;
     kEthernet = 2;
@@ -740,14 +740,14 @@ server cluster GeneralDiagnostics = 51 {
     kThread = 4;
   }
 
-  enum NetworkFaultType : ENUM8 {
+  enum NetworkFaultEnum : ENUM8 {
     kUnspecified = 0;
     kHardwareFailure = 1;
     kNetworkJammed = 2;
     kConnectionFailed = 3;
   }
 
-  enum RadioFault : ENUM8 {
+  enum RadioFaultEnum : ENUM8 {
     kUnspecified = 0;
     kWiFiFault = 1;
     kCellularFault = 2;
@@ -765,22 +765,22 @@ server cluster GeneralDiagnostics = 51 {
     octet_string<8> hardwareAddress = 4;
     octet_string IPv4Addresses[] = 5;
     octet_string IPv6Addresses[] = 6;
-    InterfaceType type = 7;
+    InterfaceTypeEnum type = 7;
   }
 
   critical event HardwareFaultChange = 0 {
-    HardwareFault current[] = 0;
-    HardwareFault previous[] = 1;
+    HardwareFaultEnum current[] = 0;
+    HardwareFaultEnum previous[] = 1;
   }
 
   critical event RadioFaultChange = 1 {
-    RadioFault current[] = 0;
-    RadioFault previous[] = 1;
+    RadioFaultEnum current[] = 0;
+    RadioFaultEnum previous[] = 1;
   }
 
   critical event NetworkFaultChange = 2 {
-    NetworkFaultType current[] = 0;
-    NetworkFaultType previous[] = 1;
+    NetworkFaultEnum current[] = 0;
+    NetworkFaultEnum previous[] = 1;
   }
 
   critical event BootReason = 3 {
@@ -792,9 +792,9 @@ server cluster GeneralDiagnostics = 51 {
   readonly attribute int64u upTime = 2;
   readonly attribute int32u totalOperationalHours = 3;
   readonly attribute BootReasonEnum bootReason = 4;
-  readonly attribute HardwareFault activeHardwareFaults[] = 5;
-  readonly attribute RadioFault activeRadioFaults[] = 6;
-  readonly attribute NetworkFaultType activeNetworkFaults[] = 7;
+  readonly attribute HardwareFaultEnum activeHardwareFaults[] = 5;
+  readonly attribute RadioFaultEnum activeRadioFaults[] = 6;
+  readonly attribute NetworkFaultEnum activeNetworkFaults[] = 7;
   readonly attribute boolean testEventTriggersEnabled = 8;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
@@ -1058,7 +1058,7 @@ server cluster WiFiNetworkDiagnostics = 54 {
 }
 
 server cluster EthernetNetworkDiagnostics = 55 {
-  enum PHYRate : ENUM8 {
+  enum PHYRateEnum : ENUM8 {
     kRate10M = 0;
     kRate100M = 1;
     kRate1G = 2;
@@ -1071,7 +1071,7 @@ server cluster EthernetNetworkDiagnostics = 55 {
     kRate400G = 9;
   }
 
-  readonly attribute nullable PHYRate PHYRate = 0;
+  readonly attribute nullable PHYRateEnum PHYRate = 0;
   readonly attribute nullable boolean fullDuplex = 1;
   readonly attribute int64u packetRxCount = 2;
   readonly attribute int64u packetTxCount = 3;
@@ -1087,7 +1087,7 @@ server cluster EthernetNetworkDiagnostics = 55 {
 }
 
 server cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatus : ENUM8 {
+  enum CommissioningWindowStatusEnum : ENUM8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
     kBasicWindowOpen = 2;
@@ -1099,7 +1099,7 @@ server cluster AdministratorCommissioning = 60 {
     kWindowNotOpen = 4;
   }
 
-  readonly attribute CommissioningWindowStatus windowStatus = 0;
+  readonly attribute CommissioningWindowStatusEnum windowStatus = 0;
   readonly attribute nullable fabric_idx adminFabricIndex = 1;
   readonly attribute nullable int16u adminVendorId = 2;
   readonly attribute bitmap32 featureMap = 65532;
@@ -1313,7 +1313,7 @@ server cluster UserLabel = 65 {
 }
 
 server cluster DoorLock = 257 {
-  enum DlAlarmCode : ENUM8 {
+  enum AlarmCodeEnum : ENUM8 {
     kLockJammed = 0;
     kLockFactoryReset = 1;
     kLockRadioPowerCycled = 3;
@@ -1324,13 +1324,13 @@ server cluster DoorLock = 257 {
     kForcedUser = 8;
   }
 
-  enum DlCredentialRule : ENUM8 {
+  enum CredentialRuleEnum : ENUM8 {
     kSingle = 0;
-    kDouble = 1;
+    kDual = 1;
     kTri = 2;
   }
 
-  enum DlCredentialType : ENUM8 {
+  enum CredentialTypeEnum : ENUM8 {
     kProgrammingPIN = 0;
     kPin = 1;
     kRfid = 2;
@@ -1339,40 +1339,12 @@ server cluster DoorLock = 257 {
     kFace = 5;
   }
 
-  enum DlDataOperationType : ENUM8 {
+  enum DataOperationTypeEnum : ENUM8 {
     kAdd = 0;
     kClear = 1;
     kModify = 2;
   }
 
-  enum DlDoorState : ENUM8 {
-    kDoorOpen = 0;
-    kDoorClosed = 1;
-    kDoorJammed = 2;
-    kDoorForcedOpen = 3;
-    kDoorUnspecifiedError = 4;
-    kDoorAjar = 5;
-  }
-
-  enum DlLockDataType : ENUM8 {
-    kUnspecified = 0;
-    kProgrammingCode = 1;
-    kUserIndex = 2;
-    kWeekDaySchedule = 3;
-    kYearDaySchedule = 4;
-    kHolidaySchedule = 5;
-    kPin = 6;
-    kRfid = 7;
-    kFingerprint = 8;
-  }
-
-  enum DlLockOperationType : ENUM8 {
-    kLock = 0;
-    kUnlock = 1;
-    kNonAccessUserEvent = 2;
-    kForcedUserEvent = 3;
-  }
-
   enum DlLockState : ENUM8 {
     kNotFullyLocked = 0;
     kLocked = 1;
@@ -1393,35 +1365,6 @@ server cluster DoorLock = 257 {
     kDoorFurniture = 10;
   }
 
-  enum DlOperatingMode : ENUM8 {
-    kNormal = 0;
-    kVacation = 1;
-    kPrivacy = 2;
-    kNoRemoteLockUnlock = 3;
-    kPassage = 4;
-  }
-
-  enum DlOperationError : ENUM8 {
-    kUnspecified = 0;
-    kInvalidCredential = 1;
-    kDisabledUserDenied = 2;
-    kRestricted = 3;
-    kInsufficientBattery = 4;
-  }
-
-  enum DlOperationSource : ENUM8 {
-    kUnspecified = 0;
-    kManual = 1;
-    kProprietaryRemote = 2;
-    kKeypad = 3;
-    kAuto = 4;
-    kButton = 5;
-    kSchedule = 6;
-    kRemote = 7;
-    kRfid = 8;
-    kBiometric = 9;
-  }
-
   enum DlStatus : ENUM8 {
     kSuccess = 0;
     kFailure = 1;
@@ -1432,25 +1375,6 @@ server cluster DoorLock = 257 {
     kNotFound = 139;
   }
 
-  enum DlUserStatus : ENUM8 {
-    kAvailable = 0;
-    kOccupiedEnabled = 1;
-    kOccupiedDisabled = 3;
-  }
-
-  enum DlUserType : ENUM8 {
-    kUnrestrictedUser = 0;
-    kYearDayScheduleUser = 1;
-    kWeekDayScheduleUser = 2;
-    kProgrammingUser = 3;
-    kNonAccessUser = 4;
-    kForcedUser = 5;
-    kDisposableUser = 6;
-    kExpiringUser = 7;
-    kScheduleRestrictedUser = 8;
-    kRemoteOnlyUser = 9;
-  }
-
   enum DoorLockOperationEventCode : ENUM8 {
     kUnknownOrMfgSpecific = 0;
     kLock = 1;
@@ -1502,19 +1426,83 @@ server cluster DoorLock = 257 {
     kNotSupported = 255;
   }
 
-  bitmap DlCredentialRuleMask : BITMAP8 {
-    kSingle = 0x1;
-    kDual = 0x2;
-    kTri = 0x4;
+  enum DoorStateEnum : ENUM8 {
+    kDoorOpen = 0;
+    kDoorClosed = 1;
+    kDoorJammed = 2;
+    kDoorForcedOpen = 3;
+    kDoorUnspecifiedError = 4;
+    kDoorAjar = 5;
   }
 
-  bitmap DlCredentialRulesSupport : BITMAP8 {
-    kSingle = 0x1;
-    kDual = 0x2;
-    kTri = 0x4;
+  enum LockDataTypeEnum : ENUM8 {
+    kUnspecified = 0;
+    kProgrammingCode = 1;
+    kUserIndex = 2;
+    kWeekDaySchedule = 3;
+    kYearDaySchedule = 4;
+    kHolidaySchedule = 5;
+    kPin = 6;
+    kRfid = 7;
+    kFingerprint = 8;
+  }
+
+  enum LockOperationTypeEnum : ENUM8 {
+    kLock = 0;
+    kUnlock = 1;
+    kNonAccessUserEvent = 2;
+    kForcedUserEvent = 3;
+  }
+
+  enum OperatingModeEnum : ENUM8 {
+    kNormal = 0;
+    kVacation = 1;
+    kPrivacy = 2;
+    kNoRemoteLockUnlock = 3;
+    kPassage = 4;
+  }
+
+  enum OperationErrorEnum : ENUM8 {
+    kUnspecified = 0;
+    kInvalidCredential = 1;
+    kDisabledUserDenied = 2;
+    kRestricted = 3;
+    kInsufficientBattery = 4;
+  }
+
+  enum OperationSourceEnum : ENUM8 {
+    kUnspecified = 0;
+    kManual = 1;
+    kProprietaryRemote = 2;
+    kKeypad = 3;
+    kAuto = 4;
+    kButton = 5;
+    kSchedule = 6;
+    kRemote = 7;
+    kRfid = 8;
+    kBiometric = 9;
+  }
+
+  enum UserStatusEnum : ENUM8 {
+    kAvailable = 0;
+    kOccupiedEnabled = 1;
+    kOccupiedDisabled = 3;
+  }
+
+  enum UserTypeEnum : ENUM8 {
+    kUnrestrictedUser = 0;
+    kYearDayScheduleUser = 1;
+    kWeekDayScheduleUser = 2;
+    kProgrammingUser = 3;
+    kNonAccessUser = 4;
+    kForcedUser = 5;
+    kDisposableUser = 6;
+    kExpiringUser = 7;
+    kScheduleRestrictedUser = 8;
+    kRemoteOnlyUser = 9;
   }
 
-  bitmap DlDaysMaskMap : BITMAP8 {
+  bitmap DaysMaskMap : BITMAP8 {
     kSunday = 0x1;
     kMonday = 0x2;
     kTuesday = 0x4;
@@ -1524,6 +1512,18 @@ server cluster DoorLock = 257 {
     kSaturday = 0x40;
   }
 
+  bitmap DlCredentialRuleMask : BITMAP8 {
+    kSingle = 0x1;
+    kDual = 0x2;
+    kTri = 0x4;
+  }
+
+  bitmap DlCredentialRulesSupport : BITMAP8 {
+    kSingle = 0x1;
+    kDual = 0x2;
+    kTri = 0x4;
+  }
+
   bitmap DlDefaultConfigurationRegister : BITMAP16 {
     kEnableLocalProgrammingEnabled = 0x1;
     kKeypadInterfaceDefaultAccessEnabled = 0x2;
@@ -1628,56 +1628,56 @@ server cluster DoorLock = 257 {
   }
 
   bitmap DoorLockFeature : BITMAP32 {
-    kPINCredentials = 0x1;
-    kRFIDCredentials = 0x2;
+    kPinCredential = 0x1;
+    kRfidCredential = 0x2;
     kFingerCredentials = 0x4;
     kLogging = 0x8;
-    kWeekDaySchedules = 0x10;
+    kWeekDayAccessSchedules = 0x10;
     kDoorPositionSensor = 0x20;
     kFaceCredentials = 0x40;
-    kCredentialsOTA = 0x80;
-    kUsersManagement = 0x100;
-    kNotifications = 0x200;
-    kYearDaySchedules = 0x400;
+    kCredentialsOverTheAirAccess = 0x80;
+    kUser = 0x100;
+    kNotification = 0x200;
+    kYearDayAccessSchedules = 0x400;
     kHolidaySchedules = 0x800;
   }
 
-  struct DlCredential {
-    DlCredentialType credentialType = 0;
+  struct CredentialStruct {
+    CredentialTypeEnum credentialType = 0;
     int16u credentialIndex = 1;
   }
 
   critical event DoorLockAlarm = 0 {
-    DlAlarmCode alarmCode = 0;
+    AlarmCodeEnum alarmCode = 0;
   }
 
   critical event DoorStateChange = 1 {
-    DlDoorState doorState = 0;
+    DoorStateEnum doorState = 0;
   }
 
   critical event LockOperation = 2 {
-    DlLockOperationType lockOperationType = 0;
-    DlOperationSource operationSource = 1;
+    LockOperationTypeEnum lockOperationType = 0;
+    OperationSourceEnum operationSource = 1;
     nullable INT16U userIndex = 2;
     nullable fabric_idx fabricIndex = 3;
     nullable NODE_ID sourceNode = 4;
-    optional nullable DlCredential credentials[] = 5;
+    optional nullable CredentialStruct credentials[] = 5;
   }
 
   critical event LockOperationError = 3 {
-    DlLockOperationType lockOperationType = 0;
-    DlOperationSource operationSource = 1;
-    DlOperationError operationError = 2;
+    LockOperationTypeEnum lockOperationType = 0;
+    OperationSourceEnum operationSource = 1;
+    OperationErrorEnum operationError = 2;
     nullable INT16U userIndex = 3;
     nullable fabric_idx fabricIndex = 4;
     nullable NODE_ID sourceNode = 5;
-    optional nullable DlCredential credentials[] = 6;
+    optional nullable CredentialStruct credentials[] = 6;
   }
 
   info event LockUserChange = 4 {
-    DlLockDataType lockDataType = 0;
-    DlDataOperationType dataOperationType = 1;
-    DlOperationSource operationSource = 2;
+    LockDataTypeEnum lockDataType = 0;
+    DataOperationTypeEnum dataOperationType = 1;
+    OperationSourceEnum operationSource = 2;
     nullable INT16U userIndex = 3;
     nullable fabric_idx fabricIndex = 4;
     nullable NODE_ID sourceNode = 5;
@@ -1687,7 +1687,7 @@ server cluster DoorLock = 257 {
   readonly attribute nullable DlLockState lockState = 0;
   readonly attribute DlLockType lockType = 1;
   readonly attribute boolean actuatorEnabled = 2;
-  readonly attribute nullable DlDoorState doorState = 3;
+  readonly attribute nullable DoorStateEnum doorState = 3;
   readonly attribute int16u numberOfTotalUsersSupported = 17;
   readonly attribute int16u numberOfPINUsersSupported = 18;
   readonly attribute int16u numberOfRFIDUsersSupported = 19;
@@ -1703,7 +1703,7 @@ server cluster DoorLock = 257 {
   attribute access(write: manage) char_string<3> language = 33;
   attribute access(write: manage) int32u autoRelockTime = 35;
   attribute access(write: manage) int8u soundVolume = 36;
-  attribute access(write: manage) DlOperatingMode operatingMode = 37;
+  attribute access(write: manage) OperatingModeEnum operatingMode = 37;
   readonly attribute DlSupportedOperatingModes supportedOperatingModes = 38;
   attribute access(write: manage) boolean enableOneTouchLocking = 41;
   attribute access(write: manage) boolean enablePrivacyModeButton = 43;
@@ -1714,22 +1714,22 @@ server cluster DoorLock = 257 {
   readonly attribute int16u clusterRevision = 65533;
 
   request struct LockDoorRequest {
-    optional OCTET_STRING pinCode = 0;
+    optional OCTET_STRING PINCode = 0;
   }
 
   request struct UnlockDoorRequest {
-    optional OCTET_STRING pinCode = 0;
+    optional OCTET_STRING PINCode = 0;
   }
 
   request struct UnlockWithTimeoutRequest {
     INT16U timeout = 0;
-    optional OCTET_STRING pinCode = 1;
+    optional OCTET_STRING PINCode = 1;
   }
 
   request struct SetWeekDayScheduleRequest {
     INT8U weekDayIndex = 0;
     INT16U userIndex = 1;
-    DlDaysMaskMap daysMask = 2;
+    DaysMaskMap daysMask = 2;
     INT8U startHour = 3;
     INT8U startMinute = 4;
     INT8U endHour = 5;
@@ -1767,7 +1767,7 @@ server cluster DoorLock = 257 {
     INT8U holidayIndex = 0;
     epoch_s localStartTime = 1;
     epoch_s localEndTime = 2;
-    DlOperatingMode operatingMode = 3;
+    OperatingModeEnum operatingMode = 3;
   }
 
   request struct GetHolidayScheduleRequest {
@@ -1779,13 +1779,13 @@ server cluster DoorLock = 257 {
   }
 
   request struct SetUserRequest {
-    DlDataOperationType operationType = 0;
+    DataOperationTypeEnum operationType = 0;
     INT16U userIndex = 1;
     nullable CHAR_STRING userName = 2;
-    nullable INT32U userUniqueId = 3;
-    nullable DlUserStatus userStatus = 4;
-    nullable DlUserType userType = 5;
-    nullable DlCredentialRule credentialRule = 6;
+    nullable INT32U userUniqueID = 3;
+    nullable UserStatusEnum userStatus = 4;
+    nullable UserTypeEnum userType = 5;
+    nullable CredentialRuleEnum credentialRule = 6;
   }
 
   request struct GetUserRequest {
@@ -1797,27 +1797,27 @@ server cluster DoorLock = 257 {
   }
 
   request struct SetCredentialRequest {
-    DlDataOperationType operationType = 0;
-    DlCredential credential = 1;
+    DataOperationTypeEnum operationType = 0;
+    CredentialStruct credential = 1;
     LONG_OCTET_STRING credentialData = 2;
     nullable INT16U userIndex = 3;
-    nullable DlUserStatus userStatus = 4;
-    nullable DlUserType userType = 5;
+    nullable UserStatusEnum userStatus = 4;
+    nullable UserTypeEnum userType = 5;
   }
 
   request struct GetCredentialStatusRequest {
-    DlCredential credential = 0;
+    CredentialStruct credential = 0;
   }
 
   request struct ClearCredentialRequest {
-    nullable DlCredential credential = 0;
+    nullable CredentialStruct credential = 0;
   }
 
   response struct GetWeekDayScheduleResponse = 12 {
     INT8U weekDayIndex = 0;
     INT16U userIndex = 1;
     DlStatus status = 2;
-    optional DlDaysMaskMap daysMask = 3;
+    optional DaysMaskMap daysMask = 3;
     optional INT8U startHour = 4;
     optional INT8U startMinute = 5;
     optional INT8U endHour = 6;
@@ -1837,17 +1837,17 @@ server cluster DoorLock = 257 {
     DlStatus status = 1;
     optional epoch_s localStartTime = 2;
     optional epoch_s localEndTime = 3;
-    optional DlOperatingMode operatingMode = 4;
+    optional OperatingModeEnum operatingMode = 4;
   }
 
   response struct GetUserResponse = 28 {
     INT16U userIndex = 0;
     nullable CHAR_STRING userName = 1;
-    nullable INT32U userUniqueId = 2;
-    nullable DlUserStatus userStatus = 3;
-    nullable DlUserType userType = 4;
-    nullable DlCredentialRule credentialRule = 5;
-    nullable DlCredential credentials[] = 6;
+    nullable INT32U userUniqueID = 2;
+    nullable UserStatusEnum userStatus = 3;
+    nullable UserTypeEnum userType = 4;
+    nullable CredentialRuleEnum credentialRule = 5;
+    nullable CredentialStruct credentials[] = 6;
     nullable fabric_idx creatorFabricIndex = 7;
     nullable fabric_idx lastModifiedFabricIndex = 8;
     nullable INT16U nextUserIndex = 9;
diff --git a/examples/lock-app/lock-common/lock-app.zap b/examples/lock-app/lock-common/lock-app.zap
index 549de105754d23..3dfa96fbb0e221 100644
--- a/examples/lock-app/lock-common/lock-app.zap
+++ b/examples/lock-app/lock-common/lock-app.zap
@@ -4289,7 +4289,7 @@
               "code": 0,
               "mfgCode": null,
               "side": "server",
-              "type": "PHYRate",
+              "type": "PHYRateEnum",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -4463,7 +4463,7 @@
           ]
         },
         {
-          "name": "AdministratorCommissioning",
+          "name": "Administrator Commissioning",
           "code": 60,
           "mfgCode": null,
           "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
@@ -4515,7 +4515,7 @@
           ]
         },
         {
-          "name": "AdministratorCommissioning",
+          "name": "Administrator Commissioning",
           "code": 60,
           "mfgCode": null,
           "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
@@ -4527,7 +4527,7 @@
               "code": 0,
               "mfgCode": null,
               "side": "server",
-              "type": "CommissioningWindowStatus",
+              "type": "CommissioningWindowStatusEnum",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -7031,7 +7031,7 @@
               "code": 3,
               "mfgCode": null,
               "side": "server",
-              "type": "DlDoorState",
+              "type": "DoorStateEnum",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -7351,7 +7351,7 @@
               "code": 37,
               "mfgCode": null,
               "side": "server",
-              "type": "DlOperatingMode",
+              "type": "OperatingModeEnum",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
diff --git a/examples/lock-app/nrfconnect/main/BoltLockManager.cpp b/examples/lock-app/nrfconnect/main/BoltLockManager.cpp
index 9f82f856063aa6..fc3d30bbbf93ef 100644
--- a/examples/lock-app/nrfconnect/main/BoltLockManager.cpp
+++ b/examples/lock-app/nrfconnect/main/BoltLockManager.cpp
@@ -41,14 +41,14 @@ bool BoltLockManager::GetUser(uint16_t userIndex, EmberAfPluginDoorLockUserInfo
     user = mUsers[userIndex - 1];
 
     ChipLogProgress(Zcl, "Getting lock user %u: %s", static_cast<unsigned>(userIndex),
-                    user.userStatus == DlUserStatus::kAvailable ? "available" : "occupied");
+                    user.userStatus == UserStatusEnum::kAvailable ? "available" : "occupied");
 
     return true;
 }
 
 bool BoltLockManager::SetUser(uint16_t userIndex, FabricIndex creator, FabricIndex modifier, const CharSpan & userName,
-                              uint32_t uniqueId, DlUserStatus userStatus, DlUserType userType, DlCredentialRule credentialRule,
-                              const DlCredential * credentials, size_t totalCredentials)
+                              uint32_t uniqueId, UserStatusEnum userStatus, UserTypeEnum userType,
+                              CredentialRuleEnum credentialRule, const CredentialStruct * credentials, size_t totalCredentials)
 {
     // userIndex is guaranteed by the caller to be between 1 and CONFIG_LOCK_NUM_USERS
     UserData & userData = mUserData[userIndex - 1];
@@ -58,10 +58,10 @@ bool BoltLockManager::SetUser(uint16_t userIndex, FabricIndex creator, FabricInd
     VerifyOrReturnError(totalCredentials <= CONFIG_LOCK_NUM_CREDENTIALS_PER_USER, false);
 
     Platform::CopyString(userData.mName, userName);
-    memcpy(userData.mCredentials, credentials, totalCredentials * sizeof(DlCredential));
+    memcpy(userData.mCredentials, credentials, totalCredentials * sizeof(CredentialStruct));
 
     user.userName           = CharSpan(userData.mName, userName.size());
-    user.credentials        = Span<const DlCredential>(userData.mCredentials, totalCredentials);
+    user.credentials        = Span<const CredentialStruct>(userData.mCredentials, totalCredentials);
     user.userUniqueId       = uniqueId;
     user.userStatus         = userStatus;
     user.userType           = userType;
@@ -72,12 +72,12 @@ bool BoltLockManager::SetUser(uint16_t userIndex, FabricIndex creator, FabricInd
     user.lastModifiedBy     = modifier;
 
     ChipLogProgress(Zcl, "Setting lock user %u: %s", static_cast<unsigned>(userIndex),
-                    userStatus == DlUserStatus::kAvailable ? "available" : "occupied");
+                    userStatus == UserStatusEnum::kAvailable ? "available" : "occupied");
 
     return true;
 }
 
-bool BoltLockManager::GetCredential(uint16_t credentialIndex, DlCredentialType credentialType,
+bool BoltLockManager::GetCredential(uint16_t credentialIndex, CredentialTypeEnum credentialType,
                                     EmberAfPluginDoorLockCredentialInfo & credential) const
 {
     VerifyOrReturnError(credentialIndex > 0 && credentialIndex <= CONFIG_LOCK_NUM_CREDENTIALS, false);
@@ -91,7 +91,7 @@ bool BoltLockManager::GetCredential(uint16_t credentialIndex, DlCredentialType c
 }
 
 bool BoltLockManager::SetCredential(uint16_t credentialIndex, FabricIndex creator, FabricIndex modifier,
-                                    DlCredentialStatus credentialStatus, DlCredentialType credentialType, const ByteSpan & secret)
+                                    DlCredentialStatus credentialStatus, CredentialTypeEnum credentialType, const ByteSpan & secret)
 {
     VerifyOrReturnError(credentialIndex > 0 && credentialIndex <= CONFIG_LOCK_NUM_CREDENTIALS, false);
     VerifyOrReturnError(secret.size() <= kMaxCredentialLength, false);
@@ -118,7 +118,7 @@ bool BoltLockManager::SetCredential(uint16_t credentialIndex, FabricIndex creato
     return true;
 }
 
-bool BoltLockManager::ValidatePIN(const Optional<ByteSpan> & pinCode, DlOperationError & err) const
+bool BoltLockManager::ValidatePIN(const Optional<ByteSpan> & pinCode, OperationErrorEnum & err) const
 {
     // Optionality of the PIN code is validated by the caller, so assume it is OK not to provide the PIN code.
     if (!pinCode.HasValue())
@@ -129,7 +129,7 @@ bool BoltLockManager::ValidatePIN(const Optional<ByteSpan> & pinCode, DlOperatio
     // Check the PIN code
     for (const auto & credential : mCredentials)
     {
-        if (credential.status == DlCredentialStatus::kAvailable || credential.credentialType != DlCredentialType::kPin)
+        if (credential.status == DlCredentialStatus::kAvailable || credential.credentialType != CredentialTypeEnum::kPin)
         {
             continue;
         }
@@ -142,7 +142,7 @@ bool BoltLockManager::ValidatePIN(const Optional<ByteSpan> & pinCode, DlOperatio
     }
 
     ChipLogDetail(Zcl, "Invalid lock PIN code provided");
-    err = DlOperationError::kInvalidCredential;
+    err = OperationErrorEnum::kInvalidCredential;
 
     return false;
 }
diff --git a/examples/lock-app/nrfconnect/main/ZclCallbacks.cpp b/examples/lock-app/nrfconnect/main/ZclCallbacks.cpp
index 48ab16bb839b7d..49cdbfb84e754a 100644
--- a/examples/lock-app/nrfconnect/main/ZclCallbacks.cpp
+++ b/examples/lock-app/nrfconnect/main/ZclCallbacks.cpp
@@ -55,27 +55,27 @@ bool emberAfPluginDoorLockGetUser(EndpointId endpointId, uint16_t userIndex, Emb
 }
 
 bool emberAfPluginDoorLockSetUser(EndpointId endpointId, uint16_t userIndex, FabricIndex creator, FabricIndex modifier,
-                                  const CharSpan & userName, uint32_t uniqueId, DlUserStatus userStatus, DlUserType userType,
-                                  DlCredentialRule credentialRule, const DlCredential * credentials, size_t totalCredentials)
+                                  const CharSpan & userName, uint32_t uniqueId, UserStatusEnum userStatus, UserTypeEnum userType,
+                                  CredentialRuleEnum credentialRule, const CredentialStruct * credentials, size_t totalCredentials)
 {
     return BoltLockMgr().SetUser(userIndex, creator, modifier, userName, uniqueId, userStatus, userType, credentialRule,
                                  credentials, totalCredentials);
 }
 
-bool emberAfPluginDoorLockGetCredential(EndpointId endpointId, uint16_t credentialIndex, DlCredentialType credentialType,
+bool emberAfPluginDoorLockGetCredential(EndpointId endpointId, uint16_t credentialIndex, CredentialTypeEnum credentialType,
                                         EmberAfPluginDoorLockCredentialInfo & credential)
 {
     return BoltLockMgr().GetCredential(credentialIndex, credentialType, credential);
 }
 
 bool emberAfPluginDoorLockSetCredential(EndpointId endpointId, uint16_t credentialIndex, FabricIndex creator, FabricIndex modifier,
-                                        DlCredentialStatus credentialStatus, DlCredentialType credentialType,
+                                        DlCredentialStatus credentialStatus, CredentialTypeEnum credentialType,
                                         const ByteSpan & secret)
 {
     return BoltLockMgr().SetCredential(credentialIndex, creator, modifier, credentialStatus, credentialType, secret);
 }
 
-bool emberAfPluginDoorLockOnDoorLockCommand(EndpointId endpointId, const Optional<ByteSpan> & pinCode, DlOperationError & err)
+bool emberAfPluginDoorLockOnDoorLockCommand(EndpointId endpointId, const Optional<ByteSpan> & pinCode, OperationErrorEnum & err)
 {
     bool result = BoltLockMgr().ValidatePIN(pinCode, err);
 
@@ -88,7 +88,7 @@ bool emberAfPluginDoorLockOnDoorLockCommand(EndpointId endpointId, const Optiona
     return result;
 }
 
-bool emberAfPluginDoorLockOnDoorUnlockCommand(EndpointId endpointId, const Optional<ByteSpan> & pinCode, DlOperationError & err)
+bool emberAfPluginDoorLockOnDoorUnlockCommand(EndpointId endpointId, const Optional<ByteSpan> & pinCode, OperationErrorEnum & err)
 {
     bool result = BoltLockMgr().ValidatePIN(pinCode, err);
 
@@ -119,8 +119,8 @@ void emberAfDoorLockClusterInitCallback(EndpointId endpoint)
     logOnFailure(DoorLock::Attributes::NumberOfCredentialsSupportedPerUser::Set(endpoint, CONFIG_LOCK_NUM_CREDENTIALS_PER_USER),
                  "number of credentials per user");
 
-    // Set FeatureMap to (kUsersManagement|kPINCredentials), default is:
-    // (kUsersManagement|kAccessSchedules|kRFIDCredentials|kPINCredentials) 0x113
+    // Set FeatureMap to (kUser|kPinCredential), default is:
+    // (kUser|kAccessSchedules|kRfidCredential|kPinCredential) 0x113
     logOnFailure(DoorLock::Attributes::FeatureMap::Set(endpoint, 0x101), "feature map");
 
     AppTask::Instance().UpdateClusterState(BoltLockMgr().GetState(), BoltLockManager::OperationSource::kUnspecified);
diff --git a/examples/lock-app/nrfconnect/main/include/BoltLockManager.h b/examples/lock-app/nrfconnect/main/include/BoltLockManager.h
index b5b5b66b9b1aef..bd107f7f77626f 100644
--- a/examples/lock-app/nrfconnect/main/include/BoltLockManager.h
+++ b/examples/lock-app/nrfconnect/main/include/BoltLockManager.h
@@ -45,7 +45,7 @@ class BoltLockManager
     struct UserData
     {
         char mName[DOOR_LOCK_USER_NAME_BUFFER_SIZE];
-        DlCredential mCredentials[CONFIG_LOCK_NUM_CREDENTIALS_PER_USER];
+        CredentialStruct mCredentials[CONFIG_LOCK_NUM_CREDENTIALS_PER_USER];
     };
 
     struct CredentialData
@@ -53,7 +53,7 @@ class BoltLockManager
         chip::Platform::ScopedMemoryBuffer<uint8_t> mSecret;
     };
 
-    using OperationSource     = chip::app::Clusters::DoorLock::DlOperationSource;
+    using OperationSource     = chip::app::Clusters::DoorLock::OperationSourceEnum;
     using StateChangeCallback = void (*)(State, OperationSource);
 
     static constexpr uint32_t kActuatorMovementTimeMs = 2000;
@@ -65,15 +65,15 @@ class BoltLockManager
 
     bool GetUser(uint16_t userIndex, EmberAfPluginDoorLockUserInfo & user) const;
     bool SetUser(uint16_t userIndex, chip::FabricIndex creator, chip::FabricIndex modifier, const chip::CharSpan & userName,
-                 uint32_t uniqueId, DlUserStatus userStatus, DlUserType userType, DlCredentialRule credentialRule,
-                 const DlCredential * credentials, size_t totalCredentials);
+                 uint32_t uniqueId, UserStatusEnum userStatus, UserTypeEnum userType, CredentialRuleEnum credentialRule,
+                 const CredentialStruct * credentials, size_t totalCredentials);
 
-    bool GetCredential(uint16_t credentialIndex, DlCredentialType credentialType,
+    bool GetCredential(uint16_t credentialIndex, CredentialTypeEnum credentialType,
                        EmberAfPluginDoorLockCredentialInfo & credential) const;
     bool SetCredential(uint16_t credentialIndex, chip::FabricIndex creator, chip::FabricIndex modifier,
-                       DlCredentialStatus credentialStatus, DlCredentialType credentialType, const chip::ByteSpan & secret);
+                       DlCredentialStatus credentialStatus, CredentialTypeEnum credentialType, const chip::ByteSpan & secret);
 
-    bool ValidatePIN(const Optional<chip::ByteSpan> & pinCode, DlOperationError & err) const;
+    bool ValidatePIN(const Optional<chip::ByteSpan> & pinCode, OperationErrorEnum & err) const;
 
     void Lock(OperationSource source);
     void Unlock(OperationSource source);
diff --git a/examples/lock-app/openiotsdk/main/LockEndpoint.cpp b/examples/lock-app/openiotsdk/main/LockEndpoint.cpp
index 82e91a53aceb23..453520c6470cca 100644
--- a/examples/lock-app/openiotsdk/main/LockEndpoint.cpp
+++ b/examples/lock-app/openiotsdk/main/LockEndpoint.cpp
@@ -21,12 +21,12 @@
 
 using chip::to_underlying;
 
-bool LockEndpoint::Lock(const Optional<chip::ByteSpan> & pin, DlOperationError & err)
+bool LockEndpoint::Lock(const Optional<chip::ByteSpan> & pin, OperationErrorEnum & err)
 {
     return setLockState(DlLockState::kLocked, pin, err);
 }
 
-bool LockEndpoint::Unlock(const Optional<chip::ByteSpan> & pin, DlOperationError & err)
+bool LockEndpoint::Unlock(const Optional<chip::ByteSpan> & pin, OperationErrorEnum & err)
 {
     return setLockState(DlLockState::kUnlocked, pin, err);
 }
@@ -45,14 +45,14 @@ bool LockEndpoint::GetUser(uint16_t userIndex, EmberAfPluginDoorLockUserInfo & u
 
     const auto & userInDb = mLockUsers[adjustedUserIndex];
     user.userStatus       = userInDb.userStatus;
-    if (DlUserStatus::kAvailable == user.userStatus)
+    if (UserStatusEnum::kAvailable == user.userStatus)
     {
         ChipLogDetail(Zcl, "Found unoccupied user [endpoint=%d,adjustedIndex=%hu]", mEndpointId, adjustedUserIndex);
         return true;
     }
 
     user.userName       = chip::CharSpan(userInDb.userName, strlen(userInDb.userName));
-    user.credentials    = chip::Span<const DlCredential>(userInDb.credentials.data(), userInDb.credentials.size());
+    user.credentials    = chip::Span<const CredentialStruct>(userInDb.credentials.data(), userInDb.credentials.size());
     user.userUniqueId   = userInDb.userUniqueId;
     user.userType       = userInDb.userType;
     user.credentialRule = userInDb.credentialRule;
@@ -71,8 +71,8 @@ bool LockEndpoint::GetUser(uint16_t userIndex, EmberAfPluginDoorLockUserInfo & u
 }
 
 bool LockEndpoint::SetUser(uint16_t userIndex, chip::FabricIndex creator, chip::FabricIndex modifier,
-                           const chip::CharSpan & userName, uint32_t uniqueId, DlUserStatus userStatus, DlUserType usertype,
-                           DlCredentialRule credentialRule, const DlCredential * credentials, size_t totalCredentials)
+                           const chip::CharSpan & userName, uint32_t uniqueId, UserStatusEnum userStatus, UserTypeEnum usertype,
+                           CredentialRuleEnum credentialRule, const CredentialStruct * credentials, size_t totalCredentials)
 {
     ChipLogProgress(Zcl,
                     "SetUser "
@@ -130,13 +130,14 @@ bool LockEndpoint::SetUser(uint16_t userIndex, chip::FabricIndex creator, chip::
     return true;
 }
 
-bool LockEndpoint::GetCredential(uint16_t credentialIndex, DlCredentialType credentialType,
+bool LockEndpoint::GetCredential(uint16_t credentialIndex, CredentialTypeEnum credentialType,
                                  EmberAfPluginDoorLockCredentialInfo & credential) const
 {
     ChipLogDetail(Zcl, "GetCredential [endpoint=%d,credentialIndex=%u,credentialType=%u]", mEndpointId, credentialIndex,
                   to_underlying(credentialType));
 
-    if (credentialIndex >= mLockCredentials.size() || (0 == credentialIndex && DlCredentialType::kProgrammingPIN != credentialType))
+    if (credentialIndex >= mLockCredentials.size() ||
+        (0 == credentialIndex && CredentialTypeEnum::kProgrammingPIN != credentialType))
     {
         ChipLogError(Zcl, "Cannot get the credential - index out of range [endpoint=%d,index=%d]", mEndpointId, credentialIndex);
         return false;
@@ -163,7 +164,7 @@ bool LockEndpoint::GetCredential(uint16_t credentialIndex, DlCredentialType cred
 }
 
 bool LockEndpoint::SetCredential(uint16_t credentialIndex, chip::FabricIndex creator, chip::FabricIndex modifier,
-                                 DlCredentialStatus credentialStatus, DlCredentialType credentialType,
+                                 DlCredentialStatus credentialStatus, CredentialTypeEnum credentialType,
                                  const chip::ByteSpan & credentialData)
 {
     ChipLogDetail(
@@ -173,7 +174,8 @@ bool LockEndpoint::SetCredential(uint16_t credentialIndex, chip::FabricIndex cre
         mEndpointId, credentialIndex, to_underlying(credentialStatus), to_underlying(credentialType),
         static_cast<unsigned int>(credentialData.size()), creator, modifier);
 
-    if (credentialIndex >= mLockCredentials.size() || (0 == credentialIndex && DlCredentialType::kProgrammingPIN != credentialType))
+    if (credentialIndex >= mLockCredentials.size() ||
+        (0 == credentialIndex && CredentialTypeEnum::kProgrammingPIN != credentialType))
     {
         ChipLogError(Zcl, "Cannot set the credential - index out of range [endpoint=%d,index=%d]", mEndpointId, credentialIndex);
         return false;
@@ -226,7 +228,7 @@ DlStatus LockEndpoint::GetSchedule(uint8_t weekDayIndex, uint16_t userIndex, Emb
     return DlStatus::kSuccess;
 }
 
-DlStatus LockEndpoint::SetSchedule(uint8_t weekDayIndex, uint16_t userIndex, DlScheduleStatus status, DlDaysMaskMap daysMask,
+DlStatus LockEndpoint::SetSchedule(uint8_t weekDayIndex, uint16_t userIndex, DlScheduleStatus status, DaysMaskMap daysMask,
                                    uint8_t startHour, uint8_t startMinute, uint8_t endHour, uint8_t endMinute)
 {
     if (0 == userIndex || userIndex > mWeekDaySchedules.size())
@@ -295,7 +297,7 @@ DlStatus LockEndpoint::SetSchedule(uint8_t yearDayIndex, uint16_t userIndex, DlS
     return DlStatus::kSuccess;
 }
 
-bool LockEndpoint::setLockState(DlLockState lockState, const Optional<chip::ByteSpan> & pin, DlOperationError & err)
+bool LockEndpoint::setLockState(DlLockState lockState, const Optional<chip::ByteSpan> & pin, OperationErrorEnum & err)
 {
     if (!pin.HasValue())
     {
@@ -308,7 +310,7 @@ bool LockEndpoint::setLockState(DlLockState lockState, const Optional<chip::Byte
     // Check the PIN code
     for (const auto & pinCredential : mLockCredentials)
     {
-        if (pinCredential.credentialType != DlCredentialType::kPin || pinCredential.status == DlCredentialStatus::kAvailable)
+        if (pinCredential.credentialType != CredentialTypeEnum::kPin || pinCredential.status == DlCredentialStatus::kAvailable)
         {
             continue;
         }
@@ -328,7 +330,7 @@ bool LockEndpoint::setLockState(DlLockState lockState, const Optional<chip::Byte
                   "[endpointId=%d]",
                   lockStateToString(lockState), mEndpointId);
 
-    err = DlOperationError::kInvalidCredential;
+    err = OperationErrorEnum::kInvalidCredential;
     return false;
 }
 
diff --git a/examples/lock-app/openiotsdk/main/LockManager.cpp b/examples/lock-app/openiotsdk/main/LockManager.cpp
index 33397bbf3113df..68318b2d497b98 100644
--- a/examples/lock-app/openiotsdk/main/LockManager.cpp
+++ b/examples/lock-app/openiotsdk/main/LockManager.cpp
@@ -104,7 +104,7 @@ bool LockManager::InitEndpoint(chip::EndpointId endpointId)
     return true;
 }
 
-bool LockManager::Lock(chip::EndpointId endpointId, const Optional<chip::ByteSpan> & pin, DlOperationError & err)
+bool LockManager::Lock(chip::EndpointId endpointId, const Optional<chip::ByteSpan> & pin, OperationErrorEnum & err)
 {
     auto lockEndpoint = getEndpoint(endpointId);
     if (nullptr == lockEndpoint)
@@ -118,7 +118,7 @@ bool LockManager::Lock(chip::EndpointId endpointId, const Optional<chip::ByteSpa
     return DoorLockServer::Instance().SetLockState(endpointId, DlLockState::kLocked);
 }
 
-bool LockManager::Unlock(chip::EndpointId endpointId, const Optional<chip::ByteSpan> & pin, DlOperationError & err)
+bool LockManager::Unlock(chip::EndpointId endpointId, const Optional<chip::ByteSpan> & pin, OperationErrorEnum & err)
 {
     auto lockEndpoint = getEndpoint(endpointId);
     if (nullptr == lockEndpoint)
@@ -144,8 +144,8 @@ bool LockManager::GetUser(chip::EndpointId endpointId, uint16_t userIndex, Ember
 }
 
 bool LockManager::SetUser(chip::EndpointId endpointId, uint16_t userIndex, chip::FabricIndex creator, chip::FabricIndex modifier,
-                          const chip::CharSpan & userName, uint32_t uniqueId, DlUserStatus userStatus, DlUserType usertype,
-                          DlCredentialRule credentialRule, const DlCredential * credentials, size_t totalCredentials)
+                          const chip::CharSpan & userName, uint32_t uniqueId, UserStatusEnum userStatus, UserTypeEnum usertype,
+                          CredentialRuleEnum credentialRule, const CredentialStruct * credentials, size_t totalCredentials)
 {
     auto lockEndpoint = getEndpoint(endpointId);
     if (nullptr == lockEndpoint)
@@ -157,7 +157,7 @@ bool LockManager::SetUser(chip::EndpointId endpointId, uint16_t userIndex, chip:
                                  credentials, totalCredentials);
 }
 
-bool LockManager::GetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, DlCredentialType credentialType,
+bool LockManager::GetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, CredentialTypeEnum credentialType,
                                 EmberAfPluginDoorLockCredentialInfo & credential)
 {
     auto lockEndpoint = getEndpoint(endpointId);
@@ -170,7 +170,7 @@ bool LockManager::GetCredential(chip::EndpointId endpointId, uint16_t credential
 }
 
 bool LockManager::SetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, chip::FabricIndex creator,
-                                chip::FabricIndex modifier, DlCredentialStatus credentialStatus, DlCredentialType credentialType,
+                                chip::FabricIndex modifier, DlCredentialStatus credentialStatus, CredentialTypeEnum credentialType,
                                 const chip::ByteSpan & credentialData)
 {
     auto lockEndpoint = getEndpoint(endpointId);
@@ -196,8 +196,7 @@ DlStatus LockManager::GetSchedule(chip::EndpointId endpointId, uint8_t weekDayIn
 }
 
 DlStatus LockManager::SetSchedule(chip::EndpointId endpointId, uint8_t weekDayIndex, uint16_t userIndex, DlScheduleStatus status,
-                                  DlDaysMaskMap daysMask, uint8_t startHour, uint8_t startMinute, uint8_t endHour,
-                                  uint8_t endMinute)
+                                  DaysMaskMap daysMask, uint8_t startHour, uint8_t startMinute, uint8_t endHour, uint8_t endMinute)
 {
     auto lockEndpoint = getEndpoint(endpointId);
     if (nullptr == lockEndpoint)
diff --git a/examples/lock-app/openiotsdk/main/ZclCallbacks.cpp b/examples/lock-app/openiotsdk/main/ZclCallbacks.cpp
index f383377cfd77f7..0ebcf686bbebcc 100644
--- a/examples/lock-app/openiotsdk/main/ZclCallbacks.cpp
+++ b/examples/lock-app/openiotsdk/main/ZclCallbacks.cpp
@@ -25,13 +25,14 @@ using namespace chip;
 using namespace chip::app::Clusters;
 using namespace chip::app::Clusters::DoorLock;
 
-bool emberAfPluginDoorLockOnDoorLockCommand(chip::EndpointId endpointId, const Optional<ByteSpan> & pinCode, DlOperationError & err)
+bool emberAfPluginDoorLockOnDoorLockCommand(chip::EndpointId endpointId, const Optional<ByteSpan> & pinCode,
+                                            OperationErrorEnum & err)
 {
     return LockManager::Instance().Lock(endpointId, pinCode, err);
 }
 
 bool emberAfPluginDoorLockOnDoorUnlockCommand(chip::EndpointId endpointId, const Optional<ByteSpan> & pinCode,
-                                              DlOperationError & err)
+                                              OperationErrorEnum & err)
 {
     return LockManager::Instance().Unlock(endpointId, pinCode, err);
 }
@@ -43,15 +44,15 @@ bool emberAfPluginDoorLockGetUser(chip::EndpointId endpointId, uint16_t userInde
 
 bool emberAfPluginDoorLockSetUser(chip::EndpointId endpointId, uint16_t userIndex, chip::FabricIndex creator,
                                   chip::FabricIndex modifier, const chip::CharSpan & userName, uint32_t uniqueId,
-                                  DlUserStatus userStatus, DlUserType usertype, DlCredentialRule credentialRule,
-                                  const DlCredential * credentials, size_t totalCredentials)
+                                  UserStatusEnum userStatus, UserTypeEnum usertype, CredentialRuleEnum credentialRule,
+                                  const CredentialStruct * credentials, size_t totalCredentials)
 {
 
     return LockManager::Instance().SetUser(endpointId, userIndex, creator, modifier, userName, uniqueId, userStatus, usertype,
                                            credentialRule, credentials, totalCredentials);
 }
 
-bool emberAfPluginDoorLockGetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, DlCredentialType credentialType,
+bool emberAfPluginDoorLockGetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, CredentialTypeEnum credentialType,
                                         EmberAfPluginDoorLockCredentialInfo & credential)
 {
     return LockManager::Instance().GetCredential(endpointId, credentialIndex, credentialType, credential);
@@ -59,7 +60,7 @@ bool emberAfPluginDoorLockGetCredential(chip::EndpointId endpointId, uint16_t cr
 
 bool emberAfPluginDoorLockSetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, chip::FabricIndex creator,
                                         chip::FabricIndex modifier, DlCredentialStatus credentialStatus,
-                                        DlCredentialType credentialType, const chip::ByteSpan & credentialData)
+                                        CredentialTypeEnum credentialType, const chip::ByteSpan & credentialData)
 {
     return LockManager::Instance().SetCredential(endpointId, credentialIndex, creator, modifier, credentialStatus, credentialType,
                                                  credentialData);
@@ -72,7 +73,7 @@ DlStatus emberAfPluginDoorLockGetSchedule(chip::EndpointId endpointId, uint8_t w
 }
 
 DlStatus emberAfPluginDoorLockSetSchedule(chip::EndpointId endpointId, uint8_t weekdayIndex, uint16_t userIndex,
-                                          DlScheduleStatus status, DlDaysMaskMap daysMask, uint8_t startHour, uint8_t startMinute,
+                                          DlScheduleStatus status, DaysMaskMap daysMask, uint8_t startHour, uint8_t startMinute,
                                           uint8_t endHour, uint8_t endMinute)
 {
     return LockManager::Instance().SetSchedule(endpointId, weekdayIndex, userIndex, status, daysMask, startHour, startMinute,
diff --git a/examples/lock-app/openiotsdk/main/include/LockEndpoint.h b/examples/lock-app/openiotsdk/main/include/LockEndpoint.h
index bee91e7265239f..069ab270707f1f 100644
--- a/examples/lock-app/openiotsdk/main/include/LockEndpoint.h
+++ b/examples/lock-app/openiotsdk/main/include/LockEndpoint.h
@@ -25,10 +25,10 @@ struct LockUserInfo
 {
     char userName[DOOR_LOCK_USER_NAME_BUFFER_SIZE];
     uint32_t userUniqueId;
-    DlUserStatus userStatus;
-    DlUserType userType;
-    DlCredentialRule credentialRule;
-    std::vector<DlCredential> credentials;
+    UserStatusEnum userStatus;
+    UserTypeEnum userType;
+    CredentialRuleEnum credentialRule;
+    std::vector<CredentialStruct> credentials;
     chip::FabricIndex createdBy;
     chip::FabricIndex lastModifiedBy;
 };
@@ -58,29 +58,30 @@ class LockEndpoint
 
     inline chip::EndpointId GetEndpointId() const { return mEndpointId; }
 
-    bool Lock(const Optional<chip::ByteSpan> & pin, DlOperationError & err);
-    bool Unlock(const Optional<chip::ByteSpan> & pin, DlOperationError & err);
+    bool Lock(const Optional<chip::ByteSpan> & pin, OperationErrorEnum & err);
+    bool Unlock(const Optional<chip::ByteSpan> & pin, OperationErrorEnum & err);
 
     bool GetUser(uint16_t userIndex, EmberAfPluginDoorLockUserInfo & user) const;
     bool SetUser(uint16_t userIndex, chip::FabricIndex creator, chip::FabricIndex modifier, const chip::CharSpan & userName,
-                 uint32_t uniqueId, DlUserStatus userStatus, DlUserType usertype, DlCredentialRule credentialRule,
-                 const DlCredential * credentials, size_t totalCredentials);
+                 uint32_t uniqueId, UserStatusEnum userStatus, UserTypeEnum usertype, CredentialRuleEnum credentialRule,
+                 const CredentialStruct * credentials, size_t totalCredentials);
 
-    bool GetCredential(uint16_t credentialIndex, DlCredentialType credentialType,
+    bool GetCredential(uint16_t credentialIndex, CredentialTypeEnum credentialType,
                        EmberAfPluginDoorLockCredentialInfo & credential) const;
 
     bool SetCredential(uint16_t credentialIndex, chip::FabricIndex creator, chip::FabricIndex modifier,
-                       DlCredentialStatus credentialStatus, DlCredentialType credentialType, const chip::ByteSpan & credentialData);
+                       DlCredentialStatus credentialStatus, CredentialTypeEnum credentialType,
+                       const chip::ByteSpan & credentialData);
 
     DlStatus GetSchedule(uint8_t weekDayIndex, uint16_t userIndex, EmberAfPluginDoorLockWeekDaySchedule & schedule);
     DlStatus GetSchedule(uint8_t yearDayIndex, uint16_t userIndex, EmberAfPluginDoorLockYearDaySchedule & schedule);
-    DlStatus SetSchedule(uint8_t weekDayIndex, uint16_t userIndex, DlScheduleStatus status, DlDaysMaskMap daysMask,
-                         uint8_t startHour, uint8_t startMinute, uint8_t endHour, uint8_t endMinute);
+    DlStatus SetSchedule(uint8_t weekDayIndex, uint16_t userIndex, DlScheduleStatus status, DaysMaskMap daysMask, uint8_t startHour,
+                         uint8_t startMinute, uint8_t endHour, uint8_t endMinute);
     DlStatus SetSchedule(uint8_t yearDayIndex, uint16_t userIndex, DlScheduleStatus status, uint32_t localStartTime,
                          uint32_t localEndTime);
 
 private:
-    bool setLockState(DlLockState lockState, const Optional<chip::ByteSpan> & pin, DlOperationError & err);
+    bool setLockState(DlLockState lockState, const Optional<chip::ByteSpan> & pin, OperationErrorEnum & err);
     const char * lockStateToString(DlLockState lockState) const;
 
     chip::EndpointId mEndpointId;
@@ -97,7 +98,7 @@ class LockEndpoint
 struct LockCredentialInfo
 {
     DlCredentialStatus status;
-    DlCredentialType credentialType;
+    CredentialTypeEnum credentialType;
     chip::FabricIndex createdBy;
     chip::FabricIndex modifiedBy;
     uint8_t credentialData[DOOR_LOCK_CREDENTIAL_INFO_MAX_DATA_SIZE];
diff --git a/examples/lock-app/openiotsdk/main/include/LockManager.h b/examples/lock-app/openiotsdk/main/include/LockManager.h
index 2fccdc9745f7a7..349fee22adee8a 100644
--- a/examples/lock-app/openiotsdk/main/include/LockManager.h
+++ b/examples/lock-app/openiotsdk/main/include/LockManager.h
@@ -31,26 +31,27 @@ class LockManager
 
     bool InitEndpoint(chip::EndpointId endpointId);
 
-    bool Lock(chip::EndpointId endpointId, const Optional<chip::ByteSpan> & pin, DlOperationError & err);
-    bool Unlock(chip::EndpointId endpointId, const Optional<chip::ByteSpan> & pin, DlOperationError & err);
+    bool Lock(chip::EndpointId endpointId, const Optional<chip::ByteSpan> & pin, OperationErrorEnum & err);
+    bool Unlock(chip::EndpointId endpointId, const Optional<chip::ByteSpan> & pin, OperationErrorEnum & err);
 
     bool GetUser(chip::EndpointId endpointId, uint16_t userIndex, EmberAfPluginDoorLockUserInfo & user);
     bool SetUser(chip::EndpointId endpointId, uint16_t userIndex, chip::FabricIndex creator, chip::FabricIndex modifier,
-                 const chip::CharSpan & userName, uint32_t uniqueId, DlUserStatus userStatus, DlUserType usertype,
-                 DlCredentialRule credentialRule, const DlCredential * credentials, size_t totalCredentials);
+                 const chip::CharSpan & userName, uint32_t uniqueId, UserStatusEnum userStatus, UserTypeEnum usertype,
+                 CredentialRuleEnum credentialRule, const CredentialStruct * credentials, size_t totalCredentials);
 
-    bool GetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, DlCredentialType credentialType,
+    bool GetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, CredentialTypeEnum credentialType,
                        EmberAfPluginDoorLockCredentialInfo & credential);
 
     bool SetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, chip::FabricIndex creator, chip::FabricIndex modifier,
-                       DlCredentialStatus credentialStatus, DlCredentialType credentialType, const chip::ByteSpan & credentialData);
+                       DlCredentialStatus credentialStatus, CredentialTypeEnum credentialType,
+                       const chip::ByteSpan & credentialData);
 
     DlStatus GetSchedule(chip::EndpointId endpointId, uint8_t weekDayIndex, uint16_t userIndex,
                          EmberAfPluginDoorLockWeekDaySchedule & schedule);
     DlStatus GetSchedule(chip::EndpointId endpointId, uint8_t yearDayIndex, uint16_t userIndex,
                          EmberAfPluginDoorLockYearDaySchedule & schedule);
     DlStatus SetSchedule(chip::EndpointId endpointId, uint8_t weekDayIndex, uint16_t userIndex, DlScheduleStatus status,
-                         DlDaysMaskMap daysMask, uint8_t startHour, uint8_t startMinute, uint8_t endHour, uint8_t endMinute);
+                         DaysMaskMap daysMask, uint8_t startHour, uint8_t startMinute, uint8_t endHour, uint8_t endMinute);
     DlStatus SetSchedule(chip::EndpointId endpointId, uint8_t yearDayIndex, uint16_t userIndex, DlScheduleStatus status,
                          uint32_t localStartTime, uint32_t localEndTime);
 
diff --git a/examples/lock-app/qpg/include/BoltLockManager.h b/examples/lock-app/qpg/include/BoltLockManager.h
index 005dd8711b5161..c80e3555fc8d3d 100644
--- a/examples/lock-app/qpg/include/BoltLockManager.h
+++ b/examples/lock-app/qpg/include/BoltLockManager.h
@@ -55,7 +55,7 @@ class BoltLockManager
     struct UserData
     {
         char mName[DOOR_LOCK_USER_NAME_BUFFER_SIZE];
-        DlCredential mCredentials[CONFIG_LOCK_NUM_CREDENTIALS_PER_USER];
+        CredentialStruct mCredentials[CONFIG_LOCK_NUM_CREDENTIALS_PER_USER];
     };
 
     struct CredentialData
@@ -75,15 +75,15 @@ class BoltLockManager
     void SetCallbacks(Callback_fn_initiated aActionInitiated_CB, Callback_fn_completed aActionCompleted_CB);
     bool GetUser(uint16_t userIndex, EmberAfPluginDoorLockUserInfo & user) const;
     bool SetUser(uint16_t userIndex, chip::FabricIndex creator, chip::FabricIndex modifier, const chip::CharSpan & userName,
-                 uint32_t uniqueId, DlUserStatus userStatus, DlUserType userType, DlCredentialRule credentialRule,
-                 const DlCredential * credentials, size_t totalCredentials);
+                 uint32_t uniqueId, UserStatusEnum userStatus, UserTypeEnum userType, CredentialRuleEnum credentialRule,
+                 const CredentialStruct * credentials, size_t totalCredentials);
 
-    bool GetCredential(uint16_t credentialIndex, DlCredentialType credentialType,
+    bool GetCredential(uint16_t credentialIndex, CredentialTypeEnum credentialType,
                        EmberAfPluginDoorLockCredentialInfo & credential) const;
     bool SetCredential(uint16_t credentialIndex, chip::FabricIndex creator, chip::FabricIndex modifier,
-                       DlCredentialStatus credentialStatus, DlCredentialType credentialType, const chip::ByteSpan & secret);
+                       DlCredentialStatus credentialStatus, CredentialTypeEnum credentialType, const chip::ByteSpan & secret);
 
-    bool ValidatePIN(const Optional<chip::ByteSpan> & pinCode, DlOperationError & err) const;
+    bool ValidatePIN(const Optional<chip::ByteSpan> & pinCode, OperationErrorEnum & err) const;
 
 private:
     friend BoltLockManager & BoltLockMgr(void);
diff --git a/examples/lock-app/qpg/src/BoltLockManager.cpp b/examples/lock-app/qpg/src/BoltLockManager.cpp
index f407648b4166a9..44bb81abaebdc8 100644
--- a/examples/lock-app/qpg/src/BoltLockManager.cpp
+++ b/examples/lock-app/qpg/src/BoltLockManager.cpp
@@ -97,14 +97,14 @@ bool BoltLockManager::GetUser(uint16_t userIndex, EmberAfPluginDoorLockUserInfo
     user = mUsers[userIndex - 1];
 
     ChipLogProgress(Zcl, "Getting lock user %u: %s", static_cast<unsigned>(userIndex),
-                    user.userStatus == DlUserStatus::kAvailable ? "available" : "occupied");
+                    user.userStatus == UserStatusEnum::kAvailable ? "available" : "occupied");
 
     return true;
 }
 
 bool BoltLockManager::SetUser(uint16_t userIndex, FabricIndex creator, FabricIndex modifier, const CharSpan & userName,
-                              uint32_t uniqueId, DlUserStatus userStatus, DlUserType userType, DlCredentialRule credentialRule,
-                              const DlCredential * credentials, size_t totalCredentials)
+                              uint32_t uniqueId, UserStatusEnum userStatus, UserTypeEnum userType,
+                              CredentialRuleEnum credentialRule, const CredentialStruct * credentials, size_t totalCredentials)
 {
     UserData & userData = mUserData[userIndex - 1];
     auto & user         = mUsers[userIndex - 1];
@@ -113,10 +113,10 @@ bool BoltLockManager::SetUser(uint16_t userIndex, FabricIndex creator, FabricInd
     VerifyOrReturnError(totalCredentials <= CONFIG_LOCK_NUM_CREDENTIALS_PER_USER, false);
 
     Platform::CopyString(userData.mName, userName);
-    memcpy(userData.mCredentials, credentials, totalCredentials * sizeof(DlCredential));
+    memcpy(userData.mCredentials, credentials, totalCredentials * sizeof(CredentialStruct));
 
     user.userName           = CharSpan(userData.mName, userName.size());
-    user.credentials        = Span<const DlCredential>(userData.mCredentials, totalCredentials);
+    user.credentials        = Span<const CredentialStruct>(userData.mCredentials, totalCredentials);
     user.userUniqueId       = uniqueId;
     user.userStatus         = userStatus;
     user.userType           = userType;
@@ -127,12 +127,12 @@ bool BoltLockManager::SetUser(uint16_t userIndex, FabricIndex creator, FabricInd
     user.lastModifiedBy     = modifier;
 
     ChipLogProgress(Zcl, "Setting lock user %u: %s", static_cast<unsigned>(userIndex),
-                    userStatus == DlUserStatus::kAvailable ? "available" : "occupied");
+                    userStatus == UserStatusEnum::kAvailable ? "available" : "occupied");
 
     return true;
 }
 
-bool BoltLockManager::GetCredential(uint16_t credentialIndex, DlCredentialType credentialType,
+bool BoltLockManager::GetCredential(uint16_t credentialIndex, CredentialTypeEnum credentialType,
                                     EmberAfPluginDoorLockCredentialInfo & credential) const
 {
     VerifyOrReturnError(credentialIndex > 0 && credentialIndex <= CONFIG_LOCK_NUM_CREDENTIALS, false);
@@ -146,7 +146,7 @@ bool BoltLockManager::GetCredential(uint16_t credentialIndex, DlCredentialType c
 }
 
 bool BoltLockManager::SetCredential(uint16_t credentialIndex, FabricIndex creator, FabricIndex modifier,
-                                    DlCredentialStatus credentialStatus, DlCredentialType credentialType, const ByteSpan & secret)
+                                    DlCredentialStatus credentialStatus, CredentialTypeEnum credentialType, const ByteSpan & secret)
 {
     VerifyOrReturnError(credentialIndex > 0 && credentialIndex <= CONFIG_LOCK_NUM_CREDENTIALS, false);
     VerifyOrReturnError(secret.size() <= kMaxCredentialLength, false);
@@ -173,7 +173,7 @@ bool BoltLockManager::SetCredential(uint16_t credentialIndex, FabricIndex creato
     return true;
 }
 
-bool BoltLockManager::ValidatePIN(const Optional<ByteSpan> & pinCode, DlOperationError & err) const
+bool BoltLockManager::ValidatePIN(const Optional<ByteSpan> & pinCode, OperationErrorEnum & err) const
 {
     // Optionality of the PIN code is validated by the caller, so assume it is OK not to provide the PIN code.
     if (!pinCode.HasValue())
@@ -185,7 +185,7 @@ bool BoltLockManager::ValidatePIN(const Optional<ByteSpan> & pinCode, DlOperatio
     // Check the PIN code
     for (const auto & credential : mCredentials)
     {
-        if (credential.status == DlCredentialStatus::kAvailable || credential.credentialType != DlCredentialType::kPin)
+        if (credential.status == DlCredentialStatus::kAvailable || credential.credentialType != CredentialTypeEnum::kPin)
         {
             continue;
         }
@@ -198,7 +198,7 @@ bool BoltLockManager::ValidatePIN(const Optional<ByteSpan> & pinCode, DlOperatio
     }
 
     ChipLogDetail(Zcl, "Invalid lock PIN code provided");
-    err = DlOperationError::kInvalidCredential;
+    err = OperationErrorEnum::kInvalidCredential;
 
     return false;
 }
diff --git a/examples/lock-app/qpg/src/ZclCallbacks.cpp b/examples/lock-app/qpg/src/ZclCallbacks.cpp
index bc175fbab81ffe..698c04b017d5a3 100644
--- a/examples/lock-app/qpg/src/ZclCallbacks.cpp
+++ b/examples/lock-app/qpg/src/ZclCallbacks.cpp
@@ -53,27 +53,28 @@ bool emberAfPluginDoorLockGetUser(EndpointId endpointId, uint16_t userIndex, Emb
 }
 
 bool emberAfPluginDoorLockSetUser(EndpointId endpointId, uint16_t userIndex, FabricIndex creator, FabricIndex modifier,
-                                  const CharSpan & userName, uint32_t uniqueId, DlUserStatus userStatus, DlUserType userType,
-                                  DlCredentialRule credentialRule, const DlCredential * credentials, size_t totalCredentials)
+                                  const CharSpan & userName, uint32_t uniqueId, UserStatusEnum userStatus, UserTypeEnum userType,
+                                  CredentialRuleEnum credentialRule, const CredentialStruct * credentials, size_t totalCredentials)
 {
     return BoltLockMgr().SetUser(userIndex, creator, modifier, userName, uniqueId, userStatus, userType, credentialRule,
                                  credentials, totalCredentials);
 }
 
-bool emberAfPluginDoorLockGetCredential(EndpointId endpointId, uint16_t credentialIndex, DlCredentialType credentialType,
+bool emberAfPluginDoorLockGetCredential(EndpointId endpointId, uint16_t credentialIndex, CredentialTypeEnum credentialType,
                                         EmberAfPluginDoorLockCredentialInfo & credential)
 {
     return BoltLockMgr().GetCredential(credentialIndex, credentialType, credential);
 }
 
 bool emberAfPluginDoorLockSetCredential(EndpointId endpointId, uint16_t credentialIndex, FabricIndex creator, FabricIndex modifier,
-                                        DlCredentialStatus credentialStatus, DlCredentialType credentialType,
+                                        DlCredentialStatus credentialStatus, CredentialTypeEnum credentialType,
                                         const ByteSpan & secret)
 {
     return BoltLockMgr().SetCredential(credentialIndex, creator, modifier, credentialStatus, credentialType, secret);
 }
 
-bool emberAfPluginDoorLockOnDoorLockCommand(chip::EndpointId endpointId, const Optional<ByteSpan> & pinCode, DlOperationError & err)
+bool emberAfPluginDoorLockOnDoorLockCommand(chip::EndpointId endpointId, const Optional<ByteSpan> & pinCode,
+                                            OperationErrorEnum & err)
 {
     bool returnValue = false;
 
@@ -86,7 +87,7 @@ bool emberAfPluginDoorLockOnDoorLockCommand(chip::EndpointId endpointId, const O
 }
 
 bool emberAfPluginDoorLockOnDoorUnlockCommand(chip::EndpointId endpointId, const Optional<ByteSpan> & pinCode,
-                                              DlOperationError & err)
+                                              OperationErrorEnum & err)
 {
     bool returnValue = false;
 
@@ -116,7 +117,7 @@ void emberAfDoorLockClusterInitCallback(EndpointId endpoint)
     logOnFailure(DoorLock::Attributes::NumberOfCredentialsSupportedPerUser::Set(endpoint, CONFIG_LOCK_NUM_CREDENTIALS_PER_USER),
                  "number of credentials per user");
 
-    // Set FeatureMap to (kUsersManagement|kPINCredentials), default is:
-    // (kUsersManagement|kAccessSchedules|kRFIDCredentials|kPINCredentials) 0x113
+    // Set FeatureMap to (kUser|kPinCredential), default is:
+    // (kUser|kAccessSchedules|kRfidCredential|kPinCredential) 0x113
     logOnFailure(DoorLock::Attributes::FeatureMap::Set(endpoint, 0x101), "feature map");
 }
diff --git a/examples/lock-app/silabs/efr32/README.md b/examples/lock-app/silabs/efr32/README.md
index cd13d11da1eb5a..e3c7b86367573c 100644
--- a/examples/lock-app/silabs/efr32/README.md
+++ b/examples/lock-app/silabs/efr32/README.md
@@ -98,32 +98,6 @@ Mac OS X
     -   BRD4187A / SLWSTK6006A / Wireless Starter Kit / 2.4GHz@20dBm
     -   BRD4187C / SLWSTK6006A / Wireless Starter Kit / 2.4GHz@20dBm
 
-    MG12 boards:
-
-    -   BRD4161A / SLWSTK6000B / Wireless Starter Kit / 2.4GHz@19dBm
-    -   BRD4162A / SLWSTK6000B / Wireless Starter Kit / 2.4GHz@10dBm
-    -   BRD4163A / SLWSTK6000B / Wireless Starter Kit / 2.4GHz@10dBm,
-        868MHz@19dBm
-    -   BRD4164A / SLWSTK6000B / Wireless Starter Kit / 2.4GHz@19dBm
-    -   BRD4166A / SLTB004A / Thunderboard Sense 2 / 2.4GHz@10dBm
-    -   BRD4170A / SLWSTK6000B / Multiband Wireless Starter Kit / 2.4GHz@19dBm,
-        915MHz@19dBm
-    -   BRD4304A / SLWSTK6000B / MGM12P Module / 2.4GHz@19dBm
-
-    MG21 boards: Currently not supported due to RAM limitation.
-
-    -   BRD4180A / SLWSTK6006A / Wireless Starter Kit / 2.4GHz@20dBm
-
-    MG24 boards :
-
-    -   BRD4162A / SLWSTK6000B / Wireless Starter Kit / 2.4GHz@10dBm
-    -   BRD4163A / SLWSTK6000B / Wireless Starter Kit / 2.4GHz@10dBm,
-        868MHz@19dBm
-    -   BRD4186A / SLWSTK6006A / Wireless Starter Kit / 2.4GHz@10dBm
-    -   BRD4186C / SLWSTK6006A / Wireless Starter Kit / 2.4GHz@10dBm
-    -   BRD4187A / SLWSTK6006A / Wireless Starter Kit / 2.4GHz@20dBm
-    -   BRD4187C / SLWSTK6006A / Wireless Starter Kit / 2.4GHz@20dBm
-
 *   Build the example application:
 
           ```
diff --git a/examples/lock-app/silabs/efr32/include/EventHandlerLibShell.h b/examples/lock-app/silabs/efr32/include/EventHandlerLibShell.h
index 3ad9f11cbf2fdc..e915e472750da4 100644
--- a/examples/lock-app/silabs/efr32/include/EventHandlerLibShell.h
+++ b/examples/lock-app/silabs/efr32/include/EventHandlerLibShell.h
@@ -27,13 +27,13 @@ class EventData
 class AlarmEventData : public EventData
 {
 public:
-    DlAlarmCode alarmCode;
+    AlarmCodeEnum alarmCode;
 };
 
 class DoorStateEventData : public EventData
 {
 public:
-    DlDoorState doorState;
+    DoorStateEnum doorState;
 };
 
 CHIP_ERROR RegisterLockEvents();
diff --git a/examples/lock-app/silabs/efr32/include/LockManager.h b/examples/lock-app/silabs/efr32/include/LockManager.h
index e2a6b7f586978d..018a9ff72c767f 100644
--- a/examples/lock-app/silabs/efr32/include/LockManager.h
+++ b/examples/lock-app/silabs/efr32/include/LockManager.h
@@ -141,25 +141,26 @@ class LockManager
     typedef void (*Callback_fn_completed)(Action_t);
     void SetCallbacks(Callback_fn_initiated aActionInitiated_CB, Callback_fn_completed aActionCompleted_CB);
 
-    bool Lock(chip::EndpointId endpointId, const Optional<chip::ByteSpan> & pin, DlOperationError & err);
-    bool Unlock(chip::EndpointId endpointId, const Optional<chip::ByteSpan> & pin, DlOperationError & err);
+    bool Lock(chip::EndpointId endpointId, const Optional<chip::ByteSpan> & pin, OperationErrorEnum & err);
+    bool Unlock(chip::EndpointId endpointId, const Optional<chip::ByteSpan> & pin, OperationErrorEnum & err);
 
     bool GetUser(chip::EndpointId endpointId, uint16_t userIndex, EmberAfPluginDoorLockUserInfo & user);
     bool SetUser(chip::EndpointId endpointId, uint16_t userIndex, chip::FabricIndex creator, chip::FabricIndex modifier,
-                 const chip::CharSpan & userName, uint32_t uniqueId, DlUserStatus userStatus, DlUserType usertype,
-                 DlCredentialRule credentialRule, const DlCredential * credentials, size_t totalCredentials);
+                 const chip::CharSpan & userName, uint32_t uniqueId, UserStatusEnum userStatus, UserTypeEnum usertype,
+                 CredentialRuleEnum credentialRule, const CredentialStruct * credentials, size_t totalCredentials);
 
-    bool GetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, DlCredentialType credentialType,
+    bool GetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, CredentialTypeEnum credentialType,
                        EmberAfPluginDoorLockCredentialInfo & credential);
 
     bool SetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, chip::FabricIndex creator, chip::FabricIndex modifier,
-                       DlCredentialStatus credentialStatus, DlCredentialType credentialType, const chip::ByteSpan & credentialData);
+                       DlCredentialStatus credentialStatus, CredentialTypeEnum credentialType,
+                       const chip::ByteSpan & credentialData);
 
     DlStatus GetWeekdaySchedule(chip::EndpointId endpointId, uint8_t weekdayIndex, uint16_t userIndex,
                                 EmberAfPluginDoorLockWeekDaySchedule & schedule);
 
     DlStatus SetWeekdaySchedule(chip::EndpointId endpointId, uint8_t weekdayIndex, uint16_t userIndex, DlScheduleStatus status,
-                                DlDaysMaskMap daysMask, uint8_t startHour, uint8_t startMinute, uint8_t endHour, uint8_t endMinute);
+                                DaysMaskMap daysMask, uint8_t startHour, uint8_t startMinute, uint8_t endHour, uint8_t endMinute);
 
     DlStatus GetYeardaySchedule(chip::EndpointId endpointId, uint8_t yearDayIndex, uint16_t userIndex,
                                 EmberAfPluginDoorLockYearDaySchedule & schedule);
@@ -170,16 +171,16 @@ class LockManager
     DlStatus GetHolidaySchedule(chip::EndpointId endpointId, uint8_t holidayIndex, EmberAfPluginDoorLockHolidaySchedule & schedule);
 
     DlStatus SetHolidaySchedule(chip::EndpointId endpointId, uint8_t holidayIndex, DlScheduleStatus status, uint32_t localStartTime,
-                                uint32_t localEndTime, DlOperatingMode operatingMode);
+                                uint32_t localEndTime, OperatingModeEnum operatingMode);
 
     bool IsValidUserIndex(uint16_t userIndex);
-    bool IsValidCredentialIndex(uint16_t credentialIndex, DlCredentialType type);
+    bool IsValidCredentialIndex(uint16_t credentialIndex, CredentialTypeEnum type);
     bool IsValidWeekdayScheduleIndex(uint8_t scheduleIndex);
     bool IsValidYeardayScheduleIndex(uint8_t scheduleIndex);
     bool IsValidHolidayScheduleIndex(uint8_t scheduleIndex);
 
     bool setLockState(chip::EndpointId endpointId, DlLockState lockState, const Optional<chip::ByteSpan> & pin,
-                      DlOperationError & err);
+                      OperationErrorEnum & err);
     const char * lockStateToString(DlLockState lockState) const;
 
     bool ReadConfigValues();
@@ -206,7 +207,7 @@ class LockManager
 
     char mUserNames[ArraySize(mLockUsers)][DOOR_LOCK_MAX_USER_NAME_SIZE];
     uint8_t mCredentialData[kMaxCredentials][kMaxCredentialSize];
-    DlCredential mCredentials[kMaxUsers][kMaxCredentialsPerUser];
+    CredentialStruct mCredentials[kMaxUsers][kMaxCredentialsPerUser];
 
     static LockManager sLock;
     EFR32DoorLock::LockInitParams::LockParam LockParams;
diff --git a/examples/lock-app/silabs/efr32/src/AppTask.cpp b/examples/lock-app/silabs/efr32/src/AppTask.cpp
index 8cd16f2a5a52cd..241c49319fa01b 100644
--- a/examples/lock-app/silabs/efr32/src/AppTask.cpp
+++ b/examples/lock-app/silabs/efr32/src/AppTask.cpp
@@ -66,8 +66,8 @@
 #define APP_LOCK_SWITCH &sl_button_btn1
 
 using chip::app::Clusters::DoorLock::DlLockState;
-using chip::app::Clusters::DoorLock::DlOperationError;
-using chip::app::Clusters::DoorLock::DlOperationSource;
+using chip::app::Clusters::DoorLock::OperationErrorEnum;
+using chip::app::Clusters::DoorLock::OperationSourceEnum;
 
 using namespace chip;
 using namespace ::chip::DeviceLayer;
@@ -434,7 +434,7 @@ void AppTask::UpdateClusterState(intptr_t context)
     bool unlocked        = LockMgr().NextState();
     DlLockState newState = unlocked ? DlLockState::kUnlocked : DlLockState::kLocked;
 
-    DlOperationSource source = DlOperationSource::kUnspecified;
+    OperationSourceEnum source = OperationSourceEnum::kUnspecified;
 
     // write the new lock value
     EmberAfStatus status =
diff --git a/examples/lock-app/silabs/efr32/src/EventHandlerLibShell.cpp b/examples/lock-app/silabs/efr32/src/EventHandlerLibShell.cpp
index 02979f56238a23..ef79290bd1961f 100644
--- a/examples/lock-app/silabs/efr32/src/EventHandlerLibShell.cpp
+++ b/examples/lock-app/silabs/efr32/src/EventHandlerLibShell.cpp
@@ -104,7 +104,7 @@ CHIP_ERROR AlarmEventHandler(int argc, char ** argv)
 
     AlarmEventData * data = Platform::New<AlarmEventData>();
     data->eventId         = Events::DoorLockAlarm::Id;
-    data->alarmCode       = static_cast<DlAlarmCode>(atoi(argv[0]));
+    data->alarmCode       = static_cast<AlarmCodeEnum>(atoi(argv[0]));
 
     DeviceLayer::PlatformMgr().ScheduleWork(EventWorkerFunction, reinterpret_cast<intptr_t>(data));
 
@@ -136,7 +136,7 @@ CHIP_ERROR DoorStateEventHandler(int argc, char ** argv)
 
     DoorStateEventData * data = Platform::New<DoorStateEventData>();
     data->eventId             = Events::DoorStateChange::Id;
-    data->doorState           = static_cast<DlDoorState>(atoi(argv[0]));
+    data->doorState           = static_cast<DoorStateEnum>(atoi(argv[0]));
 
     DeviceLayer::PlatformMgr().ScheduleWork(EventWorkerFunction, reinterpret_cast<intptr_t>(data));
 
diff --git a/examples/lock-app/silabs/efr32/src/LockManager.cpp b/examples/lock-app/silabs/efr32/src/LockManager.cpp
index abc7b4513e2f71..54bd876147d1c3 100644
--- a/examples/lock-app/silabs/efr32/src/LockManager.cpp
+++ b/examples/lock-app/silabs/efr32/src/LockManager.cpp
@@ -104,9 +104,9 @@ bool LockManager::IsValidUserIndex(uint16_t userIndex)
     return (userIndex < kMaxUsers);
 }
 
-bool LockManager::IsValidCredentialIndex(uint16_t credentialIndex, DlCredentialType type)
+bool LockManager::IsValidCredentialIndex(uint16_t credentialIndex, CredentialTypeEnum type)
 {
-    if (DlCredentialType::kProgrammingPIN == type)
+    if (CredentialTypeEnum::kProgrammingPIN == type)
     {
         return (0 == credentialIndex); // 0 is required index for Programming PIN
     }
@@ -144,7 +144,7 @@ bool LockManager::ReadConfigValues()
                                      sizeof(mCredentialData), outLen);
 
     SILABSConfig::ReadConfigValueBin(SILABSConfig::kConfigKey_UserCredentials, reinterpret_cast<uint8_t *>(mCredentials),
-                                     sizeof(DlCredential) * LockParams.numberOfUsers * LockParams.numberOfCredentialsPerUser,
+                                     sizeof(CredentialStruct) * LockParams.numberOfUsers * LockParams.numberOfCredentialsPerUser,
                                      outLen);
 
     SILABSConfig::ReadConfigValueBin(SILABSConfig::kConfigKey_WeekDaySchedules, reinterpret_cast<uint8_t *>(mWeekdaySchedule),
@@ -283,12 +283,12 @@ void LockManager::ActuatorMovementTimerEventHandler(AppEvent * aEvent)
     }
 }
 
-bool LockManager::Lock(chip::EndpointId endpointId, const Optional<chip::ByteSpan> & pin, DlOperationError & err)
+bool LockManager::Lock(chip::EndpointId endpointId, const Optional<chip::ByteSpan> & pin, OperationErrorEnum & err)
 {
     return setLockState(endpointId, DlLockState::kLocked, pin, err);
 }
 
-bool LockManager::Unlock(chip::EndpointId endpointId, const Optional<chip::ByteSpan> & pin, DlOperationError & err)
+bool LockManager::Unlock(chip::EndpointId endpointId, const Optional<chip::ByteSpan> & pin, OperationErrorEnum & err)
 {
     return setLockState(endpointId, DlLockState::kUnlocked, pin, err);
 }
@@ -306,14 +306,14 @@ bool LockManager::GetUser(chip::EndpointId endpointId, uint16_t userIndex, Ember
     const auto & userInDb = mLockUsers[userIndex];
 
     user.userStatus = userInDb.userStatus;
-    if (DlUserStatus::kAvailable == user.userStatus)
+    if (UserStatusEnum::kAvailable == user.userStatus)
     {
         ChipLogDetail(Zcl, "Found unoccupied user [endpoint=%d]", endpointId);
         return true;
     }
 
     user.userName       = chip::CharSpan(userInDb.userName.data(), userInDb.userName.size());
-    user.credentials    = chip::Span<const DlCredential>(mCredentials[userIndex], userInDb.credentials.size());
+    user.credentials    = chip::Span<const CredentialStruct>(mCredentials[userIndex], userInDb.credentials.size());
     user.userUniqueId   = userInDb.userUniqueId;
     user.userType       = userInDb.userType;
     user.credentialRule = userInDb.credentialRule;
@@ -336,8 +336,8 @@ bool LockManager::GetUser(chip::EndpointId endpointId, uint16_t userIndex, Ember
 }
 
 bool LockManager::SetUser(chip::EndpointId endpointId, uint16_t userIndex, chip::FabricIndex creator, chip::FabricIndex modifier,
-                          const chip::CharSpan & userName, uint32_t uniqueId, DlUserStatus userStatus, DlUserType usertype,
-                          DlCredentialRule credentialRule, const DlCredential * credentials, size_t totalCredentials)
+                          const chip::CharSpan & userName, uint32_t uniqueId, UserStatusEnum userStatus, UserTypeEnum usertype,
+                          CredentialRuleEnum credentialRule, const CredentialStruct * credentials, size_t totalCredentials)
 {
     ChipLogProgress(Zcl,
                     "Door Lock App: LockManager::SetUser "
@@ -383,14 +383,14 @@ bool LockManager::SetUser(chip::EndpointId endpointId, uint16_t userIndex, chip:
         mCredentials[userIndex][i].CredentialIndex = i + 1;
     }
 
-    userInStorage.credentials = chip::Span<const DlCredential>(mCredentials[userIndex], totalCredentials);
+    userInStorage.credentials = chip::Span<const CredentialStruct>(mCredentials[userIndex], totalCredentials);
 
     // Save user information in NVM flash
     SILABSConfig::WriteConfigValueBin(SILABSConfig::kConfigKey_LockUser, reinterpret_cast<const uint8_t *>(&mLockUsers),
                                       sizeof(EmberAfPluginDoorLockUserInfo) * LockParams.numberOfUsers);
 
     SILABSConfig::WriteConfigValueBin(SILABSConfig::kConfigKey_UserCredentials, reinterpret_cast<const uint8_t *>(mCredentials),
-                                      sizeof(DlCredential) * LockParams.numberOfUsers * LockParams.numberOfCredentialsPerUser);
+                                      sizeof(CredentialStruct) * LockParams.numberOfUsers * LockParams.numberOfCredentialsPerUser);
 
     SILABSConfig::WriteConfigValueBin(SILABSConfig::kConfigKey_LockUserName, reinterpret_cast<const uint8_t *>(mUserNames),
                                       sizeof(mUserNames));
@@ -400,11 +400,11 @@ bool LockManager::SetUser(chip::EndpointId endpointId, uint16_t userIndex, chip:
     return true;
 }
 
-bool LockManager::GetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, DlCredentialType credentialType,
+bool LockManager::GetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, CredentialTypeEnum credentialType,
                                 EmberAfPluginDoorLockCredentialInfo & credential)
 {
 
-    if (DlCredentialType::kProgrammingPIN == credentialType)
+    if (CredentialTypeEnum::kProgrammingPIN == credentialType)
     {
         VerifyOrReturnValue(IsValidCredentialIndex(credentialIndex, credentialType),
                             false); // programming pin index is only index allowed to contain 0
@@ -443,11 +443,11 @@ bool LockManager::GetCredential(chip::EndpointId endpointId, uint16_t credential
 }
 
 bool LockManager::SetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, chip::FabricIndex creator,
-                                chip::FabricIndex modifier, DlCredentialStatus credentialStatus, DlCredentialType credentialType,
+                                chip::FabricIndex modifier, DlCredentialStatus credentialStatus, CredentialTypeEnum credentialType,
                                 const chip::ByteSpan & credentialData)
 {
 
-    if (DlCredentialType::kProgrammingPIN == credentialType)
+    if (CredentialTypeEnum::kProgrammingPIN == credentialType)
     {
         VerifyOrReturnValue(IsValidCredentialIndex(credentialIndex, credentialType),
                             false); // programming pin index is only index allowed to contain 0
@@ -509,7 +509,7 @@ DlStatus LockManager::GetWeekdaySchedule(chip::EndpointId endpointId, uint8_t we
 }
 
 DlStatus LockManager::SetWeekdaySchedule(chip::EndpointId endpointId, uint8_t weekdayIndex, uint16_t userIndex,
-                                         DlScheduleStatus status, DlDaysMaskMap daysMask, uint8_t startHour, uint8_t startMinute,
+                                         DlScheduleStatus status, DaysMaskMap daysMask, uint8_t startHour, uint8_t startMinute,
                                          uint8_t endHour, uint8_t endMinute)
 {
 
@@ -609,7 +609,7 @@ DlStatus LockManager::GetHolidaySchedule(chip::EndpointId endpointId, uint8_t ho
 }
 
 DlStatus LockManager::SetHolidaySchedule(chip::EndpointId endpointId, uint8_t holidayIndex, DlScheduleStatus status,
-                                         uint32_t localStartTime, uint32_t localEndTime, DlOperatingMode operatingMode)
+                                         uint32_t localStartTime, uint32_t localEndTime, OperatingModeEnum operatingMode)
 {
     VerifyOrReturnValue(holidayIndex > 0, DlStatus::kFailure); // indices are one-indexed
 
@@ -650,7 +650,7 @@ const char * LockManager::lockStateToString(DlLockState lockState) const
 }
 
 bool LockManager::setLockState(chip::EndpointId endpointId, DlLockState lockState, const Optional<chip::ByteSpan> & pin,
-                               DlOperationError & err)
+                               OperationErrorEnum & err)
 {
 
     // Assume pin is required until told otherwise
@@ -681,7 +681,7 @@ bool LockManager::setLockState(chip::EndpointId endpointId, DlLockState lockStat
     // Check the PIN code
     for (uint8_t i = 0; i < kMaxCredentials; i++)
     {
-        if (mLockCredentials[i].credentialType != DlCredentialType::kPin ||
+        if (mLockCredentials[i].credentialType != CredentialTypeEnum::kPin ||
             mLockCredentials[i].status == DlCredentialStatus::kAvailable)
         {
             continue;
@@ -704,6 +704,6 @@ bool LockManager::setLockState(chip::EndpointId endpointId, DlLockState lockStat
                   "[endpointId=%d]",
                   lockStateToString(lockState), endpointId);
 
-    err = DlOperationError::kInvalidCredential;
+    err = OperationErrorEnum::kInvalidCredential;
     return false;
 }
diff --git a/examples/lock-app/silabs/efr32/src/ZclCallbacks.cpp b/examples/lock-app/silabs/efr32/src/ZclCallbacks.cpp
index 9c1812a90c0a04..778637e250a5a5 100644
--- a/examples/lock-app/silabs/efr32/src/ZclCallbacks.cpp
+++ b/examples/lock-app/silabs/efr32/src/ZclCallbacks.cpp
@@ -58,7 +58,8 @@ void MatterPostAttributeChangeCallback(const chip::app::ConcreteAttributePath &
  */
 void emberAfDoorLockClusterInitCallback(EndpointId endpoint) {}
 
-bool emberAfPluginDoorLockOnDoorLockCommand(chip::EndpointId endpointId, const Optional<ByteSpan> & pinCode, DlOperationError & err)
+bool emberAfPluginDoorLockOnDoorLockCommand(chip::EndpointId endpointId, const Optional<ByteSpan> & pinCode,
+                                            OperationErrorEnum & err)
 {
     ChipLogProgress(Zcl, "Door Lock App: Lock Command endpoint=%d", endpointId);
     bool status = LockMgr().Lock(endpointId, pinCode, err);
@@ -70,7 +71,7 @@ bool emberAfPluginDoorLockOnDoorLockCommand(chip::EndpointId endpointId, const O
 }
 
 bool emberAfPluginDoorLockOnDoorUnlockCommand(chip::EndpointId endpointId, const Optional<ByteSpan> & pinCode,
-                                              DlOperationError & err)
+                                              OperationErrorEnum & err)
 {
     ChipLogProgress(Zcl, "Door Lock App: Unlock Command endpoint=%d", endpointId);
     bool status = LockMgr().Unlock(endpointId, pinCode, err);
@@ -82,7 +83,7 @@ bool emberAfPluginDoorLockOnDoorUnlockCommand(chip::EndpointId endpointId, const
     return status;
 }
 
-bool emberAfPluginDoorLockGetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, DlCredentialType credentialType,
+bool emberAfPluginDoorLockGetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, CredentialTypeEnum credentialType,
                                         EmberAfPluginDoorLockCredentialInfo & credential)
 {
     return LockMgr().GetCredential(endpointId, credentialIndex, credentialType, credential);
@@ -90,7 +91,7 @@ bool emberAfPluginDoorLockGetCredential(chip::EndpointId endpointId, uint16_t cr
 
 bool emberAfPluginDoorLockSetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, chip::FabricIndex creator,
                                         chip::FabricIndex modifier, DlCredentialStatus credentialStatus,
-                                        DlCredentialType credentialType, const chip::ByteSpan & credentialData)
+                                        CredentialTypeEnum credentialType, const chip::ByteSpan & credentialData)
 {
     return LockMgr().SetCredential(endpointId, credentialIndex, creator, modifier, credentialStatus, credentialType,
                                    credentialData);
@@ -103,8 +104,8 @@ bool emberAfPluginDoorLockGetUser(chip::EndpointId endpointId, uint16_t userInde
 
 bool emberAfPluginDoorLockSetUser(chip::EndpointId endpointId, uint16_t userIndex, chip::FabricIndex creator,
                                   chip::FabricIndex modifier, const chip::CharSpan & userName, uint32_t uniqueId,
-                                  DlUserStatus userStatus, DlUserType usertype, DlCredentialRule credentialRule,
-                                  const DlCredential * credentials, size_t totalCredentials)
+                                  UserStatusEnum userStatus, UserTypeEnum usertype, CredentialRuleEnum credentialRule,
+                                  const CredentialStruct * credentials, size_t totalCredentials)
 {
 
     return LockMgr().SetUser(endpointId, userIndex, creator, modifier, userName, uniqueId, userStatus, usertype, credentialRule,
@@ -130,7 +131,7 @@ DlStatus emberAfPluginDoorLockGetSchedule(chip::EndpointId endpointId, uint8_t h
 }
 
 DlStatus emberAfPluginDoorLockSetSchedule(chip::EndpointId endpointId, uint8_t weekdayIndex, uint16_t userIndex,
-                                          DlScheduleStatus status, DlDaysMaskMap daysMask, uint8_t startHour, uint8_t startMinute,
+                                          DlScheduleStatus status, DaysMaskMap daysMask, uint8_t startHour, uint8_t startMinute,
                                           uint8_t endHour, uint8_t endMinute)
 {
     return LockMgr().SetWeekdaySchedule(endpointId, weekdayIndex, userIndex, status, daysMask, startHour, startMinute, endHour,
@@ -144,7 +145,7 @@ DlStatus emberAfPluginDoorLockSetSchedule(chip::EndpointId endpointId, uint8_t y
 }
 
 DlStatus emberAfPluginDoorLockSetSchedule(chip::EndpointId endpointId, uint8_t holidayIndex, DlScheduleStatus status,
-                                          uint32_t localStartTime, uint32_t localEndTime, DlOperatingMode operatingMode)
+                                          uint32_t localStartTime, uint32_t localEndTime, OperatingModeEnum operatingMode)
 {
     return LockMgr().SetHolidaySchedule(endpointId, holidayIndex, status, localStartTime, localEndTime, operatingMode);
 }
diff --git a/examples/log-source-app/log-source-common/log-source-app.zap b/examples/log-source-app/log-source-common/log-source-app.zap
index 36521f83142409..0d1093307c1ba9 100644
--- a/examples/log-source-app/log-source-common/log-source-app.zap
+++ b/examples/log-source-app/log-source-common/log-source-app.zap
@@ -2045,7 +2045,7 @@
               "code": 3,
               "mfgCode": null,
               "side": "server",
-              "type": "DlDoorState",
+              "type": "DoorStateEnum",
               "included": 0,
               "storageOption": "RAM",
               "singleton": 0,
@@ -2125,7 +2125,7 @@
               "code": 37,
               "mfgCode": null,
               "side": "server",
-              "type": "DlOperatingMode",
+              "type": "OperatingModeEnum",
               "included": 0,
               "storageOption": "RAM",
               "singleton": 0,
diff --git a/examples/ota-provider-app/ota-provider-common/ota-provider-app.matter b/examples/ota-provider-app/ota-provider-common/ota-provider-app.matter
index 59666de41b3671..5c0bbe963b89db 100644
--- a/examples/ota-provider-app/ota-provider-common/ota-provider-app.matter
+++ b/examples/ota-provider-app/ota-provider-common/ota-provider-app.matter
@@ -505,7 +505,7 @@ server cluster GeneralDiagnostics = 51 {
     kSoftwareReset = 6;
   }
 
-  enum HardwareFault : ENUM8 {
+  enum HardwareFaultEnum : ENUM8 {
     kUnspecified = 0;
     kRadio = 1;
     kSensor = 2;
@@ -519,7 +519,7 @@ server cluster GeneralDiagnostics = 51 {
     kTamperDetected = 10;
   }
 
-  enum InterfaceType : ENUM8 {
+  enum InterfaceTypeEnum : ENUM8 {
     kUnspecified = 0;
     kWiFi = 1;
     kEthernet = 2;
@@ -527,14 +527,14 @@ server cluster GeneralDiagnostics = 51 {
     kThread = 4;
   }
 
-  enum NetworkFaultType : ENUM8 {
+  enum NetworkFaultEnum : ENUM8 {
     kUnspecified = 0;
     kHardwareFailure = 1;
     kNetworkJammed = 2;
     kConnectionFailed = 3;
   }
 
-  enum RadioFault : ENUM8 {
+  enum RadioFaultEnum : ENUM8 {
     kUnspecified = 0;
     kWiFiFault = 1;
     kCellularFault = 2;
@@ -552,22 +552,22 @@ server cluster GeneralDiagnostics = 51 {
     octet_string<8> hardwareAddress = 4;
     octet_string IPv4Addresses[] = 5;
     octet_string IPv6Addresses[] = 6;
-    InterfaceType type = 7;
+    InterfaceTypeEnum type = 7;
   }
 
   critical event HardwareFaultChange = 0 {
-    HardwareFault current[] = 0;
-    HardwareFault previous[] = 1;
+    HardwareFaultEnum current[] = 0;
+    HardwareFaultEnum previous[] = 1;
   }
 
   critical event RadioFaultChange = 1 {
-    RadioFault current[] = 0;
-    RadioFault previous[] = 1;
+    RadioFaultEnum current[] = 0;
+    RadioFaultEnum previous[] = 1;
   }
 
   critical event NetworkFaultChange = 2 {
-    NetworkFaultType current[] = 0;
-    NetworkFaultType previous[] = 1;
+    NetworkFaultEnum current[] = 0;
+    NetworkFaultEnum previous[] = 1;
   }
 
   critical event BootReason = 3 {
@@ -579,9 +579,9 @@ server cluster GeneralDiagnostics = 51 {
   readonly attribute int64u upTime = 2;
   readonly attribute int32u totalOperationalHours = 3;
   readonly attribute BootReasonEnum bootReason = 4;
-  readonly attribute HardwareFault activeHardwareFaults[] = 5;
-  readonly attribute RadioFault activeRadioFaults[] = 6;
-  readonly attribute NetworkFaultType activeNetworkFaults[] = 7;
+  readonly attribute HardwareFaultEnum activeHardwareFaults[] = 5;
+  readonly attribute RadioFaultEnum activeRadioFaults[] = 6;
+  readonly attribute NetworkFaultEnum activeNetworkFaults[] = 7;
   readonly attribute boolean testEventTriggersEnabled = 8;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
@@ -595,7 +595,7 @@ server cluster GeneralDiagnostics = 51 {
 }
 
 server cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatus : ENUM8 {
+  enum CommissioningWindowStatusEnum : ENUM8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
     kBasicWindowOpen = 2;
@@ -607,7 +607,7 @@ server cluster AdministratorCommissioning = 60 {
     kWindowNotOpen = 4;
   }
 
-  readonly attribute CommissioningWindowStatus windowStatus = 0;
+  readonly attribute CommissioningWindowStatusEnum windowStatus = 0;
   readonly attribute nullable fabric_idx adminFabricIndex = 1;
   readonly attribute nullable int16u adminVendorId = 2;
   readonly attribute bitmap32 featureMap = 65532;
diff --git a/examples/ota-provider-app/ota-provider-common/ota-provider-app.zap b/examples/ota-provider-app/ota-provider-common/ota-provider-app.zap
index 56d5935f595c42..8df05c3acbd561 100644
--- a/examples/ota-provider-app/ota-provider-common/ota-provider-app.zap
+++ b/examples/ota-provider-app/ota-provider-common/ota-provider-app.zap
@@ -2589,7 +2589,7 @@
           ]
         },
         {
-          "name": "AdministratorCommissioning",
+          "name": "Administrator Commissioning",
           "code": 60,
           "mfgCode": null,
           "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
@@ -2623,7 +2623,7 @@
           ]
         },
         {
-          "name": "AdministratorCommissioning",
+          "name": "Administrator Commissioning",
           "code": 60,
           "mfgCode": null,
           "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
@@ -2635,7 +2635,7 @@
               "code": 0,
               "mfgCode": null,
               "side": "server",
-              "type": "CommissioningWindowStatus",
+              "type": "CommissioningWindowStatusEnum",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -3477,7 +3477,7 @@
               "code": 3,
               "mfgCode": null,
               "side": "server",
-              "type": "DlDoorState",
+              "type": "DoorStateEnum",
               "included": 0,
               "storageOption": "RAM",
               "singleton": 0,
@@ -3557,7 +3557,7 @@
               "code": 37,
               "mfgCode": null,
               "side": "server",
-              "type": "DlOperatingMode",
+              "type": "OperatingModeEnum",
               "included": 0,
               "storageOption": "RAM",
               "singleton": 0,
diff --git a/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter b/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter
index b4291c96c2ef8d..03ad652e3d1638 100644
--- a/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter
+++ b/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter
@@ -670,7 +670,7 @@ server cluster GeneralDiagnostics = 51 {
     kSoftwareReset = 6;
   }
 
-  enum HardwareFault : ENUM8 {
+  enum HardwareFaultEnum : ENUM8 {
     kUnspecified = 0;
     kRadio = 1;
     kSensor = 2;
@@ -684,7 +684,7 @@ server cluster GeneralDiagnostics = 51 {
     kTamperDetected = 10;
   }
 
-  enum InterfaceType : ENUM8 {
+  enum InterfaceTypeEnum : ENUM8 {
     kUnspecified = 0;
     kWiFi = 1;
     kEthernet = 2;
@@ -692,14 +692,14 @@ server cluster GeneralDiagnostics = 51 {
     kThread = 4;
   }
 
-  enum NetworkFaultType : ENUM8 {
+  enum NetworkFaultEnum : ENUM8 {
     kUnspecified = 0;
     kHardwareFailure = 1;
     kNetworkJammed = 2;
     kConnectionFailed = 3;
   }
 
-  enum RadioFault : ENUM8 {
+  enum RadioFaultEnum : ENUM8 {
     kUnspecified = 0;
     kWiFiFault = 1;
     kCellularFault = 2;
@@ -717,22 +717,22 @@ server cluster GeneralDiagnostics = 51 {
     octet_string<8> hardwareAddress = 4;
     octet_string IPv4Addresses[] = 5;
     octet_string IPv6Addresses[] = 6;
-    InterfaceType type = 7;
+    InterfaceTypeEnum type = 7;
   }
 
   critical event HardwareFaultChange = 0 {
-    HardwareFault current[] = 0;
-    HardwareFault previous[] = 1;
+    HardwareFaultEnum current[] = 0;
+    HardwareFaultEnum previous[] = 1;
   }
 
   critical event RadioFaultChange = 1 {
-    RadioFault current[] = 0;
-    RadioFault previous[] = 1;
+    RadioFaultEnum current[] = 0;
+    RadioFaultEnum previous[] = 1;
   }
 
   critical event NetworkFaultChange = 2 {
-    NetworkFaultType current[] = 0;
-    NetworkFaultType previous[] = 1;
+    NetworkFaultEnum current[] = 0;
+    NetworkFaultEnum previous[] = 1;
   }
 
   critical event BootReason = 3 {
@@ -744,9 +744,9 @@ server cluster GeneralDiagnostics = 51 {
   readonly attribute int64u upTime = 2;
   readonly attribute int32u totalOperationalHours = 3;
   readonly attribute BootReasonEnum bootReason = 4;
-  readonly attribute HardwareFault activeHardwareFaults[] = 5;
-  readonly attribute RadioFault activeRadioFaults[] = 6;
-  readonly attribute NetworkFaultType activeNetworkFaults[] = 7;
+  readonly attribute HardwareFaultEnum activeHardwareFaults[] = 5;
+  readonly attribute RadioFaultEnum activeRadioFaults[] = 6;
+  readonly attribute NetworkFaultEnum activeNetworkFaults[] = 7;
   readonly attribute boolean testEventTriggersEnabled = 8;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
@@ -760,7 +760,7 @@ server cluster GeneralDiagnostics = 51 {
 }
 
 server cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatus : ENUM8 {
+  enum CommissioningWindowStatusEnum : ENUM8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
     kBasicWindowOpen = 2;
@@ -772,7 +772,7 @@ server cluster AdministratorCommissioning = 60 {
     kWindowNotOpen = 4;
   }
 
-  readonly attribute CommissioningWindowStatus windowStatus = 0;
+  readonly attribute CommissioningWindowStatusEnum windowStatus = 0;
   readonly attribute nullable fabric_idx adminFabricIndex = 1;
   readonly attribute nullable int16u adminVendorId = 2;
   readonly attribute bitmap32 featureMap = 65532;
diff --git a/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.zap b/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.zap
index 826f48046abf0f..5397deced00235 100644
--- a/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.zap
+++ b/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.zap
@@ -2643,7 +2643,7 @@
           ]
         },
         {
-          "name": "AdministratorCommissioning",
+          "name": "Administrator Commissioning",
           "code": 60,
           "mfgCode": null,
           "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
@@ -2677,7 +2677,7 @@
           ]
         },
         {
-          "name": "AdministratorCommissioning",
+          "name": "Administrator Commissioning",
           "code": 60,
           "mfgCode": null,
           "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
@@ -2689,7 +2689,7 @@
               "code": 0,
               "mfgCode": null,
               "side": "server",
-              "type": "CommissioningWindowStatus",
+              "type": "CommissioningWindowStatusEnum",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -3531,7 +3531,7 @@
               "code": 3,
               "mfgCode": null,
               "side": "server",
-              "type": "DlDoorState",
+              "type": "DoorStateEnum",
               "included": 0,
               "storageOption": "RAM",
               "singleton": 0,
@@ -3611,7 +3611,7 @@
               "code": 37,
               "mfgCode": null,
               "side": "server",
-              "type": "DlOperatingMode",
+              "type": "OperatingModeEnum",
               "included": 0,
               "storageOption": "RAM",
               "singleton": 0,
diff --git a/examples/placeholder/linux/apps/app1/config.matter b/examples/placeholder/linux/apps/app1/config.matter
index b77b029c92ee6b..cec23e204157a8 100644
--- a/examples/placeholder/linux/apps/app1/config.matter
+++ b/examples/placeholder/linux/apps/app1/config.matter
@@ -982,7 +982,7 @@ server cluster GeneralDiagnostics = 51 {
     kSoftwareReset = 6;
   }
 
-  enum HardwareFault : ENUM8 {
+  enum HardwareFaultEnum : ENUM8 {
     kUnspecified = 0;
     kRadio = 1;
     kSensor = 2;
@@ -996,7 +996,7 @@ server cluster GeneralDiagnostics = 51 {
     kTamperDetected = 10;
   }
 
-  enum InterfaceType : ENUM8 {
+  enum InterfaceTypeEnum : ENUM8 {
     kUnspecified = 0;
     kWiFi = 1;
     kEthernet = 2;
@@ -1004,14 +1004,14 @@ server cluster GeneralDiagnostics = 51 {
     kThread = 4;
   }
 
-  enum NetworkFaultType : ENUM8 {
+  enum NetworkFaultEnum : ENUM8 {
     kUnspecified = 0;
     kHardwareFailure = 1;
     kNetworkJammed = 2;
     kConnectionFailed = 3;
   }
 
-  enum RadioFault : ENUM8 {
+  enum RadioFaultEnum : ENUM8 {
     kUnspecified = 0;
     kWiFiFault = 1;
     kCellularFault = 2;
@@ -1029,22 +1029,22 @@ server cluster GeneralDiagnostics = 51 {
     octet_string<8> hardwareAddress = 4;
     octet_string IPv4Addresses[] = 5;
     octet_string IPv6Addresses[] = 6;
-    InterfaceType type = 7;
+    InterfaceTypeEnum type = 7;
   }
 
   critical event HardwareFaultChange = 0 {
-    HardwareFault current[] = 0;
-    HardwareFault previous[] = 1;
+    HardwareFaultEnum current[] = 0;
+    HardwareFaultEnum previous[] = 1;
   }
 
   critical event RadioFaultChange = 1 {
-    RadioFault current[] = 0;
-    RadioFault previous[] = 1;
+    RadioFaultEnum current[] = 0;
+    RadioFaultEnum previous[] = 1;
   }
 
   critical event NetworkFaultChange = 2 {
-    NetworkFaultType current[] = 0;
-    NetworkFaultType previous[] = 1;
+    NetworkFaultEnum current[] = 0;
+    NetworkFaultEnum previous[] = 1;
   }
 
   critical event BootReason = 3 {
@@ -1056,9 +1056,9 @@ server cluster GeneralDiagnostics = 51 {
   readonly attribute int64u upTime = 2;
   readonly attribute int32u totalOperationalHours = 3;
   readonly attribute BootReasonEnum bootReason = 4;
-  readonly attribute HardwareFault activeHardwareFaults[] = 5;
-  readonly attribute RadioFault activeRadioFaults[] = 6;
-  readonly attribute NetworkFaultType activeNetworkFaults[] = 7;
+  readonly attribute HardwareFaultEnum activeHardwareFaults[] = 5;
+  readonly attribute RadioFaultEnum activeRadioFaults[] = 6;
+  readonly attribute NetworkFaultEnum activeNetworkFaults[] = 7;
   readonly attribute boolean testEventTriggersEnabled = 8;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
@@ -1164,7 +1164,7 @@ server cluster WiFiNetworkDiagnostics = 54 {
 }
 
 server cluster EthernetNetworkDiagnostics = 55 {
-  enum PHYRate : ENUM8 {
+  enum PHYRateEnum : ENUM8 {
     kRate10M = 0;
     kRate100M = 1;
     kRate1G = 2;
@@ -1177,7 +1177,7 @@ server cluster EthernetNetworkDiagnostics = 55 {
     kRate400G = 9;
   }
 
-  readonly attribute nullable PHYRate PHYRate = 0;
+  readonly attribute nullable PHYRateEnum PHYRate = 0;
   readonly attribute nullable boolean fullDuplex = 1;
   readonly attribute int64u packetRxCount = 2;
   readonly attribute int64u packetTxCount = 3;
@@ -1291,7 +1291,7 @@ server cluster Switch = 59 {
 }
 
 server cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatus : ENUM8 {
+  enum CommissioningWindowStatusEnum : ENUM8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
     kBasicWindowOpen = 2;
@@ -1303,7 +1303,7 @@ server cluster AdministratorCommissioning = 60 {
     kWindowNotOpen = 4;
   }
 
-  readonly attribute CommissioningWindowStatus windowStatus = 0;
+  readonly attribute CommissioningWindowStatusEnum windowStatus = 0;
   readonly attribute nullable fabric_idx adminFabricIndex = 1;
   readonly attribute nullable int16u adminVendorId = 2;
   readonly attribute bitmap32 featureMap = 65532;
@@ -1760,6 +1760,16 @@ server cluster PumpConfigurationAndControl = 512 {
     kLocal = 3;
   }
 
+  bitmap PumpFeature : BITMAP32 {
+    kConstantPressure = 0x1;
+    kCompensatedPressure = 0x2;
+    kConstantFlow = 0x4;
+    kConstantSpeed = 0x8;
+    kConstantTemperature = 0x10;
+    kAutomatic = 0x20;
+    kLocal = 0x40;
+  }
+
   bitmap PumpStatus : BITMAP16 {
     kDeviceFault = 0x1;
     kSupplyfault = 0x2;
diff --git a/examples/placeholder/linux/apps/app1/config.zap b/examples/placeholder/linux/apps/app1/config.zap
index e8a4d5706d34e5..4f3b0745b90fb6 100644
--- a/examples/placeholder/linux/apps/app1/config.zap
+++ b/examples/placeholder/linux/apps/app1/config.zap
@@ -2785,7 +2785,7 @@
               "code": 0,
               "mfgCode": null,
               "side": "server",
-              "type": "PHYRate",
+              "type": "PHYRateEnum",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -3139,7 +3139,7 @@
           ]
         },
         {
-          "name": "AdministratorCommissioning",
+          "name": "Administrator Commissioning",
           "code": 60,
           "mfgCode": null,
           "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
@@ -3191,7 +3191,7 @@
           ]
         },
         {
-          "name": "AdministratorCommissioning",
+          "name": "Administrator Commissioning",
           "code": 60,
           "mfgCode": null,
           "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
@@ -3203,7 +3203,7 @@
               "code": 0,
               "mfgCode": null,
               "side": "server",
-              "type": "CommissioningWindowStatus",
+              "type": "CommissioningWindowStatusEnum",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
diff --git a/examples/placeholder/linux/apps/app2/config.matter b/examples/placeholder/linux/apps/app2/config.matter
index 4aa5878cbcffce..dfe8fa1df176a1 100644
--- a/examples/placeholder/linux/apps/app2/config.matter
+++ b/examples/placeholder/linux/apps/app2/config.matter
@@ -959,7 +959,7 @@ server cluster GeneralDiagnostics = 51 {
     kSoftwareReset = 6;
   }
 
-  enum HardwareFault : ENUM8 {
+  enum HardwareFaultEnum : ENUM8 {
     kUnspecified = 0;
     kRadio = 1;
     kSensor = 2;
@@ -973,7 +973,7 @@ server cluster GeneralDiagnostics = 51 {
     kTamperDetected = 10;
   }
 
-  enum InterfaceType : ENUM8 {
+  enum InterfaceTypeEnum : ENUM8 {
     kUnspecified = 0;
     kWiFi = 1;
     kEthernet = 2;
@@ -981,14 +981,14 @@ server cluster GeneralDiagnostics = 51 {
     kThread = 4;
   }
 
-  enum NetworkFaultType : ENUM8 {
+  enum NetworkFaultEnum : ENUM8 {
     kUnspecified = 0;
     kHardwareFailure = 1;
     kNetworkJammed = 2;
     kConnectionFailed = 3;
   }
 
-  enum RadioFault : ENUM8 {
+  enum RadioFaultEnum : ENUM8 {
     kUnspecified = 0;
     kWiFiFault = 1;
     kCellularFault = 2;
@@ -1006,22 +1006,22 @@ server cluster GeneralDiagnostics = 51 {
     octet_string<8> hardwareAddress = 4;
     octet_string IPv4Addresses[] = 5;
     octet_string IPv6Addresses[] = 6;
-    InterfaceType type = 7;
+    InterfaceTypeEnum type = 7;
   }
 
   critical event HardwareFaultChange = 0 {
-    HardwareFault current[] = 0;
-    HardwareFault previous[] = 1;
+    HardwareFaultEnum current[] = 0;
+    HardwareFaultEnum previous[] = 1;
   }
 
   critical event RadioFaultChange = 1 {
-    RadioFault current[] = 0;
-    RadioFault previous[] = 1;
+    RadioFaultEnum current[] = 0;
+    RadioFaultEnum previous[] = 1;
   }
 
   critical event NetworkFaultChange = 2 {
-    NetworkFaultType current[] = 0;
-    NetworkFaultType previous[] = 1;
+    NetworkFaultEnum current[] = 0;
+    NetworkFaultEnum previous[] = 1;
   }
 
   critical event BootReason = 3 {
@@ -1033,9 +1033,9 @@ server cluster GeneralDiagnostics = 51 {
   readonly attribute int64u upTime = 2;
   readonly attribute int32u totalOperationalHours = 3;
   readonly attribute BootReasonEnum bootReason = 4;
-  readonly attribute HardwareFault activeHardwareFaults[] = 5;
-  readonly attribute RadioFault activeRadioFaults[] = 6;
-  readonly attribute NetworkFaultType activeNetworkFaults[] = 7;
+  readonly attribute HardwareFaultEnum activeHardwareFaults[] = 5;
+  readonly attribute RadioFaultEnum activeRadioFaults[] = 6;
+  readonly attribute NetworkFaultEnum activeNetworkFaults[] = 7;
   readonly attribute boolean testEventTriggersEnabled = 8;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
@@ -1141,7 +1141,7 @@ server cluster WiFiNetworkDiagnostics = 54 {
 }
 
 server cluster EthernetNetworkDiagnostics = 55 {
-  enum PHYRate : ENUM8 {
+  enum PHYRateEnum : ENUM8 {
     kRate10M = 0;
     kRate100M = 1;
     kRate1G = 2;
@@ -1154,7 +1154,7 @@ server cluster EthernetNetworkDiagnostics = 55 {
     kRate400G = 9;
   }
 
-  readonly attribute nullable PHYRate PHYRate = 0;
+  readonly attribute nullable PHYRateEnum PHYRate = 0;
   readonly attribute nullable boolean fullDuplex = 1;
   readonly attribute int64u packetRxCount = 2;
   readonly attribute int64u packetTxCount = 3;
@@ -1268,7 +1268,7 @@ server cluster Switch = 59 {
 }
 
 server cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatus : ENUM8 {
+  enum CommissioningWindowStatusEnum : ENUM8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
     kBasicWindowOpen = 2;
@@ -1280,7 +1280,7 @@ server cluster AdministratorCommissioning = 60 {
     kWindowNotOpen = 4;
   }
 
-  readonly attribute CommissioningWindowStatus windowStatus = 0;
+  readonly attribute CommissioningWindowStatusEnum windowStatus = 0;
   readonly attribute nullable fabric_idx adminFabricIndex = 1;
   readonly attribute nullable int16u adminVendorId = 2;
   readonly attribute bitmap32 featureMap = 65532;
@@ -1737,6 +1737,16 @@ server cluster PumpConfigurationAndControl = 512 {
     kLocal = 3;
   }
 
+  bitmap PumpFeature : BITMAP32 {
+    kConstantPressure = 0x1;
+    kCompensatedPressure = 0x2;
+    kConstantFlow = 0x4;
+    kConstantSpeed = 0x8;
+    kConstantTemperature = 0x10;
+    kAutomatic = 0x20;
+    kLocal = 0x40;
+  }
+
   bitmap PumpStatus : BITMAP16 {
     kDeviceFault = 0x1;
     kSupplyfault = 0x2;
diff --git a/examples/placeholder/linux/apps/app2/config.zap b/examples/placeholder/linux/apps/app2/config.zap
index 101cddf5f3ed59..56cd5c6239ea6a 100644
--- a/examples/placeholder/linux/apps/app2/config.zap
+++ b/examples/placeholder/linux/apps/app2/config.zap
@@ -2985,7 +2985,7 @@
               "code": 0,
               "mfgCode": null,
               "side": "server",
-              "type": "PHYRate",
+              "type": "PHYRateEnum",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -3339,7 +3339,7 @@
           ]
         },
         {
-          "name": "AdministratorCommissioning",
+          "name": "Administrator Commissioning",
           "code": 60,
           "mfgCode": null,
           "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
@@ -3391,7 +3391,7 @@
           ]
         },
         {
-          "name": "AdministratorCommissioning",
+          "name": "Administrator Commissioning",
           "code": 60,
           "mfgCode": null,
           "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
@@ -3403,7 +3403,7 @@
               "code": 0,
               "mfgCode": null,
               "side": "server",
-              "type": "CommissioningWindowStatus",
+              "type": "CommissioningWindowStatusEnum",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
diff --git a/examples/platform/bouffalolab/bl602/FreeRTOSConfig.h b/examples/platform/bouffalolab/bl602/FreeRTOSConfig.h
index 96379643d791e3..b0241d60539624 100644
--- a/examples/platform/bouffalolab/bl602/FreeRTOSConfig.h
+++ b/examples/platform/bouffalolab/bl602/FreeRTOSConfig.h
@@ -166,9 +166,9 @@
 
 /* Software timer definitions. */
 #define configUSE_TIMERS 1
-#define configTIMER_TASK_PRIORITY (configMAX_PRIORITIES - 1)
-#define configTIMER_QUEUE_LENGTH 4
-#define configTIMER_TASK_STACK_DEPTH (400)
+#define configTIMER_TASK_PRIORITY (configMAX_PRIORITIES - 2)
+#define configTIMER_QUEUE_LENGTH 10
+#define configTIMER_TASK_STACK_DEPTH (configMINIMAL_STACK_SIZE * 4)
 
 /* Task priorities.  Allow these to be overridden. */
 #ifndef uartPRIMARY_PRIORITY
@@ -200,7 +200,11 @@ Like all task stack sizes, the value is the number of words, not bytes. */
 #define genqGENERIC_QUEUE_TEST_TASK_STACK_SIZE 100
 #define recmuRECURSIVE_MUTEX_TEST_TASK_STACK_SIZE 90
 
+#ifdef __cplusplus
+extern "C" void vAssertCalled(void);
+#else
 extern void vAssertCalled(void);
+#endif
 /* Stop if an assertion fails. */
 #define configASSERT(x)                                                                                                            \
     if ((x) == 0)                                                                                                                  \
@@ -208,7 +212,11 @@ extern void vAssertCalled(void);
 
 #if (configUSE_TICKLESS_IDLE != 0)
 #include "portmacro.h"
+#ifdef __cplusplus
+extern "C" void vApplicationSleep(TickType_t xExpectedIdleTime);
+#else
 extern void vApplicationSleep(TickType_t xExpectedIdleTime);
+#endif
 #define portSUPPRESS_TICKS_AND_SLEEP(xExpectedIdleTime) vApplicationSleep(xExpectedIdleTime)
 #endif
 
diff --git a/examples/platform/bouffalolab/bl702/FreeRTOSConfig.h b/examples/platform/bouffalolab/bl702/FreeRTOSConfig.h
index 1ef8270183de74..aad73b32e656d8 100644
--- a/examples/platform/bouffalolab/bl702/FreeRTOSConfig.h
+++ b/examples/platform/bouffalolab/bl702/FreeRTOSConfig.h
@@ -134,7 +134,7 @@
 #define configUSE_TIMERS 1
 #define configTIMER_TASK_PRIORITY (configMAX_PRIORITIES - 1)
 #define configTIMER_QUEUE_LENGTH 4
-#define configTIMER_TASK_STACK_DEPTH (400)
+#define configTIMER_TASK_STACK_DEPTH (configMINIMAL_STACK_SIZE * 2)
 
 /* Task priorities.  Allow these to be overridden. */
 #ifndef uartPRIMARY_PRIORITY
@@ -159,7 +159,11 @@ to exclude the API function. */
 
 /* Normal assert() semantics without relying on the provision of an assert.h
 header file. */
+#ifdef __cplusplus
+extern "C" void vAssertCalled(void);
+#else
 extern void vAssertCalled(void);
+#endif
 #define configASSERT(x)                                                                                                            \
     if ((x) == 0)                                                                                                                  \
     vAssertCalled()
@@ -179,7 +183,11 @@ Like all task stack sizes, the value is the number of words, not bytes. */
 
 #if (configUSE_TICKLESS_IDLE != 0)
 #include "portmacro.h"
+#ifdef __cplusplus
+extern "C" void vApplicationSleep(TickType_t xExpectedIdleTime);
+#else
 extern void vApplicationSleep(TickType_t xExpectedIdleTime);
+#endif
 #define portSUPPRESS_TICKS_AND_SLEEP(xExpectedIdleTime) vApplicationSleep(xExpectedIdleTime)
 #endif
 
diff --git a/examples/platform/bouffalolab/bl702/ldscripts/psram_flash.ld b/examples/platform/bouffalolab/bl702/ldscripts/psram_flash.ld
index a1129242f6c8e1..e8c166222364ca 100644
--- a/examples/platform/bouffalolab/bl702/ldscripts/psram_flash.ld
+++ b/examples/platform/bouffalolab/bl702/ldscripts/psram_flash.ld
@@ -143,12 +143,8 @@ SECTIONS
     *(.ble_rsvd_mem)
 
     KEEP(*AppTask.cpp.o(.bss.*appStack*))
-    KEEP(*main.cpp.o(.bss.*IdleTaskStack*))
     KEEP(*main.cpp.o(.bss.*TimerTaskStack*))
     
-    /*KEEP(*MemMonitoring.cpp.o(.bss.*monitoringStack*))*/
-    /*KEEP(*out.uart.c.o(.bss.chipUart_var*))*/
-    
   } >hbnram
 
   .tcmcode : ALIGN(4)
diff --git a/examples/platform/bouffalolab/common/plat/main.cpp b/examples/platform/bouffalolab/common/plat/main.cpp
index 8dad0e2a958877..690315082458fe 100644
--- a/examples/platform/bouffalolab/common/plat/main.cpp
+++ b/examples/platform/bouffalolab/common/plat/main.cpp
@@ -154,7 +154,7 @@ extern "C" void vApplicationGetTimerTaskMemory(StaticTask_t ** ppxTimerTaskTCBBu
     function then they must be declared static - otherwise they will be allocated on
     the stack and so not exists after this function exits. */
     static StaticTask_t xTimerTaskTCB;
-    static StackType_t uxTimerTaskStack[configMINIMAL_STACK_SIZE * 3 / 2];
+    static StackType_t uxTimerTaskStack[configTIMER_TASK_STACK_DEPTH];
 
     /* Pass out a pointer to the StaticTask_t structure in which the Timer
     task's state will be stored. */
@@ -166,17 +166,17 @@ extern "C" void vApplicationGetTimerTaskMemory(StaticTask_t ** ppxTimerTaskTCBBu
     /* Pass out the size of the array pointed to by *ppxTimerTaskStackBuffer.
     Note that, as the array is necessarily of type StackType_t,
     configTIMER_TASK_STACK_DEPTH is specified in words, not bytes. */
-    *pulTimerTaskStackSize = configMINIMAL_STACK_SIZE * 3 / 2;
+    *pulTimerTaskStackSize = configTIMER_TASK_STACK_DEPTH;
 }
 
 #if (configUSE_TICK_HOOK != 0)
 extern "C" void vApplicationTickHook(void) {}
 #endif
 
-extern "C" void vApplicationSleep(TickType_t xExpectedIdleTime) {}
+void vApplicationSleep(TickType_t xExpectedIdleTime) {}
 
 extern "C" void user_vAssertCalled(void) __attribute__((weak, alias("vAssertCalled")));
-extern "C" void vAssertCalled(void)
+void vAssertCalled(void)
 {
     void * ra = (void *) __builtin_return_address(0);
 
diff --git a/examples/pump-app/pump-common/pump-app.matter b/examples/pump-app/pump-common/pump-app.matter
index 0037ecdd5a6f51..a115a3f11bbabe 100644
--- a/examples/pump-app/pump-common/pump-app.matter
+++ b/examples/pump-app/pump-common/pump-app.matter
@@ -669,7 +669,7 @@ server cluster GeneralDiagnostics = 51 {
     kSoftwareReset = 6;
   }
 
-  enum HardwareFault : ENUM8 {
+  enum HardwareFaultEnum : ENUM8 {
     kUnspecified = 0;
     kRadio = 1;
     kSensor = 2;
@@ -683,7 +683,7 @@ server cluster GeneralDiagnostics = 51 {
     kTamperDetected = 10;
   }
 
-  enum InterfaceType : ENUM8 {
+  enum InterfaceTypeEnum : ENUM8 {
     kUnspecified = 0;
     kWiFi = 1;
     kEthernet = 2;
@@ -691,14 +691,14 @@ server cluster GeneralDiagnostics = 51 {
     kThread = 4;
   }
 
-  enum NetworkFaultType : ENUM8 {
+  enum NetworkFaultEnum : ENUM8 {
     kUnspecified = 0;
     kHardwareFailure = 1;
     kNetworkJammed = 2;
     kConnectionFailed = 3;
   }
 
-  enum RadioFault : ENUM8 {
+  enum RadioFaultEnum : ENUM8 {
     kUnspecified = 0;
     kWiFiFault = 1;
     kCellularFault = 2;
@@ -716,22 +716,22 @@ server cluster GeneralDiagnostics = 51 {
     octet_string<8> hardwareAddress = 4;
     octet_string IPv4Addresses[] = 5;
     octet_string IPv6Addresses[] = 6;
-    InterfaceType type = 7;
+    InterfaceTypeEnum type = 7;
   }
 
   critical event HardwareFaultChange = 0 {
-    HardwareFault current[] = 0;
-    HardwareFault previous[] = 1;
+    HardwareFaultEnum current[] = 0;
+    HardwareFaultEnum previous[] = 1;
   }
 
   critical event RadioFaultChange = 1 {
-    RadioFault current[] = 0;
-    RadioFault previous[] = 1;
+    RadioFaultEnum current[] = 0;
+    RadioFaultEnum previous[] = 1;
   }
 
   critical event NetworkFaultChange = 2 {
-    NetworkFaultType current[] = 0;
-    NetworkFaultType previous[] = 1;
+    NetworkFaultEnum current[] = 0;
+    NetworkFaultEnum previous[] = 1;
   }
 
   critical event BootReason = 3 {
@@ -871,7 +871,7 @@ server cluster ThreadNetworkDiagnostics = 53 {
 }
 
 server cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatus : ENUM8 {
+  enum CommissioningWindowStatusEnum : ENUM8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
     kBasicWindowOpen = 2;
@@ -883,7 +883,7 @@ server cluster AdministratorCommissioning = 60 {
     kWindowNotOpen = 4;
   }
 
-  readonly attribute CommissioningWindowStatus windowStatus = 0;
+  readonly attribute CommissioningWindowStatusEnum windowStatus = 0;
   readonly attribute nullable fabric_idx adminFabricIndex = 1;
   readonly attribute nullable int16u adminVendorId = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
@@ -1110,6 +1110,16 @@ server cluster PumpConfigurationAndControl = 512 {
     kLocal = 3;
   }
 
+  bitmap PumpFeature : BITMAP32 {
+    kConstantPressure = 0x1;
+    kCompensatedPressure = 0x2;
+    kConstantFlow = 0x4;
+    kConstantSpeed = 0x8;
+    kConstantTemperature = 0x10;
+    kAutomatic = 0x20;
+    kLocal = 0x40;
+  }
+
   bitmap PumpStatus : BITMAP16 {
     kDeviceFault = 0x1;
     kSupplyfault = 0x2;
@@ -1503,8 +1513,8 @@ endpoint 1 {
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute attributeList;
-    ram      attribute featureMap;
-    ram      attribute clusterRevision default = 3;
+    ram      attribute featureMap default = 31;
+    ram      attribute clusterRevision default = 4;
   }
 
   server cluster TemperatureMeasurement {
diff --git a/examples/pump-app/pump-common/pump-app.zap b/examples/pump-app/pump-common/pump-app.zap
index d546d1333f1074..17b63f8886062e 100644
--- a/examples/pump-app/pump-common/pump-app.zap
+++ b/examples/pump-app/pump-common/pump-app.zap
@@ -4587,7 +4587,7 @@
           ]
         },
         {
-          "name": "AdministratorCommissioning",
+          "name": "Administrator Commissioning",
           "code": 60,
           "mfgCode": null,
           "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
@@ -4655,7 +4655,7 @@
           ]
         },
         {
-          "name": "AdministratorCommissioning",
+          "name": "Administrator Commissioning",
           "code": 60,
           "mfgCode": null,
           "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
@@ -4667,7 +4667,7 @@
               "code": 0,
               "mfgCode": null,
               "side": "server",
-              "type": "CommissioningWindowStatus",
+              "type": "CommissioningWindowStatusEnum",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -7150,7 +7150,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "0",
+              "defaultValue": "31",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
@@ -7166,7 +7166,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "3",
+              "defaultValue": "4",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -7914,5 +7914,6 @@
       "endpointVersion": 1,
       "deviceIdentifier": 771
     }
-  ]
+  ],
+  "log": []
 }
\ No newline at end of file
diff --git a/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter b/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter
index 8a9a3ff1b82778..3465b3d2f2531e 100644
--- a/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter
+++ b/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter
@@ -568,7 +568,7 @@ server cluster GeneralDiagnostics = 51 {
     kSoftwareReset = 6;
   }
 
-  enum HardwareFault : ENUM8 {
+  enum HardwareFaultEnum : ENUM8 {
     kUnspecified = 0;
     kRadio = 1;
     kSensor = 2;
@@ -582,7 +582,7 @@ server cluster GeneralDiagnostics = 51 {
     kTamperDetected = 10;
   }
 
-  enum InterfaceType : ENUM8 {
+  enum InterfaceTypeEnum : ENUM8 {
     kUnspecified = 0;
     kWiFi = 1;
     kEthernet = 2;
@@ -590,14 +590,14 @@ server cluster GeneralDiagnostics = 51 {
     kThread = 4;
   }
 
-  enum NetworkFaultType : ENUM8 {
+  enum NetworkFaultEnum : ENUM8 {
     kUnspecified = 0;
     kHardwareFailure = 1;
     kNetworkJammed = 2;
     kConnectionFailed = 3;
   }
 
-  enum RadioFault : ENUM8 {
+  enum RadioFaultEnum : ENUM8 {
     kUnspecified = 0;
     kWiFiFault = 1;
     kCellularFault = 2;
@@ -615,22 +615,22 @@ server cluster GeneralDiagnostics = 51 {
     octet_string<8> hardwareAddress = 4;
     octet_string IPv4Addresses[] = 5;
     octet_string IPv6Addresses[] = 6;
-    InterfaceType type = 7;
+    InterfaceTypeEnum type = 7;
   }
 
   critical event HardwareFaultChange = 0 {
-    HardwareFault current[] = 0;
-    HardwareFault previous[] = 1;
+    HardwareFaultEnum current[] = 0;
+    HardwareFaultEnum previous[] = 1;
   }
 
   critical event RadioFaultChange = 1 {
-    RadioFault current[] = 0;
-    RadioFault previous[] = 1;
+    RadioFaultEnum current[] = 0;
+    RadioFaultEnum previous[] = 1;
   }
 
   critical event NetworkFaultChange = 2 {
-    NetworkFaultType current[] = 0;
-    NetworkFaultType previous[] = 1;
+    NetworkFaultEnum current[] = 0;
+    NetworkFaultEnum previous[] = 1;
   }
 
   critical event BootReason = 3 {
@@ -770,7 +770,7 @@ server cluster ThreadNetworkDiagnostics = 53 {
 }
 
 server cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatus : ENUM8 {
+  enum CommissioningWindowStatusEnum : ENUM8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
     kBasicWindowOpen = 2;
@@ -782,7 +782,7 @@ server cluster AdministratorCommissioning = 60 {
     kWindowNotOpen = 4;
   }
 
-  readonly attribute CommissioningWindowStatus windowStatus = 0;
+  readonly attribute CommissioningWindowStatusEnum windowStatus = 0;
   readonly attribute nullable fabric_idx adminFabricIndex = 1;
   readonly attribute nullable int16u adminVendorId = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
@@ -1009,6 +1009,16 @@ client cluster PumpConfigurationAndControl = 512 {
     kLocal = 3;
   }
 
+  bitmap PumpFeature : BITMAP32 {
+    kConstantPressure = 0x1;
+    kCompensatedPressure = 0x2;
+    kConstantFlow = 0x4;
+    kConstantSpeed = 0x8;
+    kConstantTemperature = 0x10;
+    kAutomatic = 0x20;
+    kLocal = 0x40;
+  }
+
   bitmap PumpStatus : BITMAP16 {
     kDeviceFault = 0x1;
     kSupplyfault = 0x2;
diff --git a/examples/pump-controller-app/pump-controller-common/pump-controller-app.zap b/examples/pump-controller-app/pump-controller-common/pump-controller-app.zap
index 0421cbf39d8f25..4b1963432df5a8 100644
--- a/examples/pump-controller-app/pump-controller-common/pump-controller-app.zap
+++ b/examples/pump-controller-app/pump-controller-common/pump-controller-app.zap
@@ -4535,7 +4535,7 @@
           ]
         },
         {
-          "name": "AdministratorCommissioning",
+          "name": "Administrator Commissioning",
           "code": 60,
           "mfgCode": null,
           "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
@@ -4603,7 +4603,7 @@
           ]
         },
         {
-          "name": "AdministratorCommissioning",
+          "name": "Administrator Commissioning",
           "code": 60,
           "mfgCode": null,
           "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
@@ -4615,7 +4615,7 @@
               "code": 0,
               "mfgCode": null,
               "side": "server",
-              "type": "CommissioningWindowStatus",
+              "type": "CommissioningWindowStatusEnum",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
diff --git a/examples/temperature-measurement-app/esp32/main/temperature-measurement.matter b/examples/temperature-measurement-app/esp32/main/temperature-measurement.matter
index b5add914dd72da..0fba7eaa4062b1 100644
--- a/examples/temperature-measurement-app/esp32/main/temperature-measurement.matter
+++ b/examples/temperature-measurement-app/esp32/main/temperature-measurement.matter
@@ -412,7 +412,7 @@ server cluster GeneralDiagnostics = 51 {
     kSoftwareReset = 6;
   }
 
-  enum HardwareFault : ENUM8 {
+  enum HardwareFaultEnum : ENUM8 {
     kUnspecified = 0;
     kRadio = 1;
     kSensor = 2;
@@ -426,7 +426,7 @@ server cluster GeneralDiagnostics = 51 {
     kTamperDetected = 10;
   }
 
-  enum InterfaceType : ENUM8 {
+  enum InterfaceTypeEnum : ENUM8 {
     kUnspecified = 0;
     kWiFi = 1;
     kEthernet = 2;
@@ -434,14 +434,14 @@ server cluster GeneralDiagnostics = 51 {
     kThread = 4;
   }
 
-  enum NetworkFaultType : ENUM8 {
+  enum NetworkFaultEnum : ENUM8 {
     kUnspecified = 0;
     kHardwareFailure = 1;
     kNetworkJammed = 2;
     kConnectionFailed = 3;
   }
 
-  enum RadioFault : ENUM8 {
+  enum RadioFaultEnum : ENUM8 {
     kUnspecified = 0;
     kWiFiFault = 1;
     kCellularFault = 2;
@@ -459,22 +459,22 @@ server cluster GeneralDiagnostics = 51 {
     octet_string<8> hardwareAddress = 4;
     octet_string IPv4Addresses[] = 5;
     octet_string IPv6Addresses[] = 6;
-    InterfaceType type = 7;
+    InterfaceTypeEnum type = 7;
   }
 
   critical event HardwareFaultChange = 0 {
-    HardwareFault current[] = 0;
-    HardwareFault previous[] = 1;
+    HardwareFaultEnum current[] = 0;
+    HardwareFaultEnum previous[] = 1;
   }
 
   critical event RadioFaultChange = 1 {
-    RadioFault current[] = 0;
-    RadioFault previous[] = 1;
+    RadioFaultEnum current[] = 0;
+    RadioFaultEnum previous[] = 1;
   }
 
   critical event NetworkFaultChange = 2 {
-    NetworkFaultType current[] = 0;
-    NetworkFaultType previous[] = 1;
+    NetworkFaultEnum current[] = 0;
+    NetworkFaultEnum previous[] = 1;
   }
 
   critical event BootReason = 3 {
@@ -486,9 +486,9 @@ server cluster GeneralDiagnostics = 51 {
   readonly attribute int64u upTime = 2;
   readonly attribute int32u totalOperationalHours = 3;
   readonly attribute BootReasonEnum bootReason = 4;
-  readonly attribute HardwareFault activeHardwareFaults[] = 5;
-  readonly attribute RadioFault activeRadioFaults[] = 6;
-  readonly attribute NetworkFaultType activeNetworkFaults[] = 7;
+  readonly attribute HardwareFaultEnum activeHardwareFaults[] = 5;
+  readonly attribute RadioFaultEnum activeRadioFaults[] = 6;
+  readonly attribute NetworkFaultEnum activeNetworkFaults[] = 7;
   readonly attribute boolean testEventTriggersEnabled = 8;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
@@ -579,7 +579,7 @@ server cluster WiFiNetworkDiagnostics = 54 {
 }
 
 server cluster EthernetNetworkDiagnostics = 55 {
-  enum PHYRate : ENUM8 {
+  enum PHYRateEnum : ENUM8 {
     kRate10M = 0;
     kRate100M = 1;
     kRate1G = 2;
@@ -592,7 +592,7 @@ server cluster EthernetNetworkDiagnostics = 55 {
     kRate400G = 9;
   }
 
-  readonly attribute nullable PHYRate PHYRate = 0;
+  readonly attribute nullable PHYRateEnum PHYRate = 0;
   readonly attribute nullable boolean fullDuplex = 1;
   readonly attribute int64u packetRxCount = 2;
   readonly attribute int64u packetTxCount = 3;
@@ -608,7 +608,7 @@ server cluster EthernetNetworkDiagnostics = 55 {
 }
 
 server cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatus : ENUM8 {
+  enum CommissioningWindowStatusEnum : ENUM8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
     kBasicWindowOpen = 2;
@@ -620,7 +620,7 @@ server cluster AdministratorCommissioning = 60 {
     kWindowNotOpen = 4;
   }
 
-  readonly attribute CommissioningWindowStatus windowStatus = 0;
+  readonly attribute CommissioningWindowStatusEnum windowStatus = 0;
   readonly attribute nullable fabric_idx adminFabricIndex = 1;
   readonly attribute nullable int16u adminVendorId = 2;
   readonly attribute bitmap32 featureMap = 65532;
diff --git a/examples/temperature-measurement-app/esp32/main/temperature-measurement.zap b/examples/temperature-measurement-app/esp32/main/temperature-measurement.zap
index 6ce5457550e0bf..3078500156336f 100644
--- a/examples/temperature-measurement-app/esp32/main/temperature-measurement.zap
+++ b/examples/temperature-measurement-app/esp32/main/temperature-measurement.zap
@@ -2345,7 +2345,7 @@
               "code": 0,
               "mfgCode": null,
               "side": "server",
-              "type": "PHYRate",
+              "type": "PHYRateEnum",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -2519,7 +2519,7 @@
           ]
         },
         {
-          "name": "AdministratorCommissioning",
+          "name": "Administrator Commissioning",
           "code": 60,
           "mfgCode": null,
           "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
@@ -2571,7 +2571,7 @@
           ]
         },
         {
-          "name": "AdministratorCommissioning",
+          "name": "Administrator Commissioning",
           "code": 60,
           "mfgCode": null,
           "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
@@ -2583,7 +2583,7 @@
               "code": 0,
               "mfgCode": null,
               "side": "server",
-              "type": "CommissioningWindowStatus",
+              "type": "CommissioningWindowStatusEnum",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
diff --git a/examples/thermostat/silabs/efr32/README.md b/examples/thermostat/silabs/efr32/README.md
index 8d8148523ce592..78da8934d12e28 100644
--- a/examples/thermostat/silabs/efr32/README.md
+++ b/examples/thermostat/silabs/efr32/README.md
@@ -103,31 +103,6 @@ Silicon Labs platform.
     -   BRD4187A / SLWSTK6006A / Wireless Starter Kit / 2.4GHz@20dBm
     -   BRD4187C / SLWSTK6006A / Wireless Starter Kit / 2.4GHz@20dBm
 
-    MG12 boards:
-
-    -   BRD4161A / SLWSTK6000B / Wireless Starter Kit / 2.4GHz@19dBm
-    -   BRD4162A / SLWSTK6000B / Wireless Starter Kit / 2.4GHz@10dBm
-    -   BRD4163A / SLWSTK6000B / Wireless Starter Kit / 2.4GHz@10dBm,
-        868MHz@19dBm
-    -   BRD4164A / SLWSTK6000B / Wireless Starter Kit / 2.4GHz@19dBm
-    -   BRD4166A / SLTB004A / Thunderboard Sense 2 / 2.4GHz@10dBm
-    -   BRD4170A / SLWSTK6000B / Multiband Wireless Starter Kit / 2.4GHz@19dBm,
-        915MHz@19dBm
-    -   BRD4304A / SLWSTK6000B / MGM12P Module / 2.4GHz@19dBm
-
-    MG21 boards: Currently not supported due to RAM limitation.
-
-    -   BRD4180A / SLWSTK6006A / Wireless Starter Kit / 2.4GHz@20dBm
-
-    MG24 boards :
-
-    -   BRD2601B / SLWSTK6000B / Wireless Starter Kit / 2.4GHz@10dBm
-    -   BRD2703A / SLWSTK6000B / Wireless Starter Kit / 2.4GHz@10dBm
-    -   BRD4186A / SLWSTK6006A / Wireless Starter Kit / 2.4GHz@10dBm
-    -   BRD4186C / SLWSTK6006A / Wireless Starter Kit / 2.4GHz@10dBm
-    -   BRD4187A / SLWSTK6006A / Wireless Starter Kit / 2.4GHz@20dBm
-    -   BRD4187C / SLWSTK6006A / Wireless Starter Kit / 2.4GHz@20dBm
-
 *   Build the example application:
 
           cd ~/connectedhomeip
diff --git a/examples/thermostat/silabs/efr32/src/AppTask.cpp b/examples/thermostat/silabs/efr32/src/AppTask.cpp
index 40418341d8b697..ec6fa525d6db32 100644
--- a/examples/thermostat/silabs/efr32/src/AppTask.cpp
+++ b/examples/thermostat/silabs/efr32/src/AppTask.cpp
@@ -43,7 +43,6 @@
 #include <app-common/zap-generated/attributes/Accessors.h>
 #include <app-common/zap-generated/callback.h>
 #include <app-common/zap-generated/cluster-objects.h>
-#include <app-common/zap-generated/command-id.h>
 #include <app-common/zap-generated/enums.h>
 #include <app-common/zap-generated/ids/Attributes.h>
 #include <app/server/OnboardingCodesUtil.h>
diff --git a/examples/thermostat/thermostat-common/thermostat.matter b/examples/thermostat/thermostat-common/thermostat.matter
index 978cdba96d9f53..63e5edf61ce54e 100644
--- a/examples/thermostat/thermostat-common/thermostat.matter
+++ b/examples/thermostat/thermostat-common/thermostat.matter
@@ -806,7 +806,7 @@ server cluster GeneralDiagnostics = 51 {
     kSoftwareReset = 6;
   }
 
-  enum HardwareFault : ENUM8 {
+  enum HardwareFaultEnum : ENUM8 {
     kUnspecified = 0;
     kRadio = 1;
     kSensor = 2;
@@ -820,7 +820,7 @@ server cluster GeneralDiagnostics = 51 {
     kTamperDetected = 10;
   }
 
-  enum InterfaceType : ENUM8 {
+  enum InterfaceTypeEnum : ENUM8 {
     kUnspecified = 0;
     kWiFi = 1;
     kEthernet = 2;
@@ -828,14 +828,14 @@ server cluster GeneralDiagnostics = 51 {
     kThread = 4;
   }
 
-  enum NetworkFaultType : ENUM8 {
+  enum NetworkFaultEnum : ENUM8 {
     kUnspecified = 0;
     kHardwareFailure = 1;
     kNetworkJammed = 2;
     kConnectionFailed = 3;
   }
 
-  enum RadioFault : ENUM8 {
+  enum RadioFaultEnum : ENUM8 {
     kUnspecified = 0;
     kWiFiFault = 1;
     kCellularFault = 2;
@@ -853,22 +853,22 @@ server cluster GeneralDiagnostics = 51 {
     octet_string<8> hardwareAddress = 4;
     octet_string IPv4Addresses[] = 5;
     octet_string IPv6Addresses[] = 6;
-    InterfaceType type = 7;
+    InterfaceTypeEnum type = 7;
   }
 
   critical event HardwareFaultChange = 0 {
-    HardwareFault current[] = 0;
-    HardwareFault previous[] = 1;
+    HardwareFaultEnum current[] = 0;
+    HardwareFaultEnum previous[] = 1;
   }
 
   critical event RadioFaultChange = 1 {
-    RadioFault current[] = 0;
-    RadioFault previous[] = 1;
+    RadioFaultEnum current[] = 0;
+    RadioFaultEnum previous[] = 1;
   }
 
   critical event NetworkFaultChange = 2 {
-    NetworkFaultType current[] = 0;
-    NetworkFaultType previous[] = 1;
+    NetworkFaultEnum current[] = 0;
+    NetworkFaultEnum previous[] = 1;
   }
 
   critical event BootReason = 3 {
@@ -880,9 +880,9 @@ server cluster GeneralDiagnostics = 51 {
   readonly attribute int64u upTime = 2;
   readonly attribute int32u totalOperationalHours = 3;
   readonly attribute BootReasonEnum bootReason = 4;
-  readonly attribute HardwareFault activeHardwareFaults[] = 5;
-  readonly attribute RadioFault activeRadioFaults[] = 6;
-  readonly attribute NetworkFaultType activeNetworkFaults[] = 7;
+  readonly attribute HardwareFaultEnum activeHardwareFaults[] = 5;
+  readonly attribute RadioFaultEnum activeRadioFaults[] = 6;
+  readonly attribute NetworkFaultEnum activeNetworkFaults[] = 7;
   readonly attribute boolean testEventTriggersEnabled = 8;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
@@ -1140,7 +1140,7 @@ server cluster WiFiNetworkDiagnostics = 54 {
 }
 
 server cluster EthernetNetworkDiagnostics = 55 {
-  enum PHYRate : ENUM8 {
+  enum PHYRateEnum : ENUM8 {
     kRate10M = 0;
     kRate100M = 1;
     kRate1G = 2;
@@ -1153,7 +1153,7 @@ server cluster EthernetNetworkDiagnostics = 55 {
     kRate400G = 9;
   }
 
-  readonly attribute nullable PHYRate PHYRate = 0;
+  readonly attribute nullable PHYRateEnum PHYRate = 0;
   readonly attribute nullable boolean fullDuplex = 1;
   readonly attribute int64u packetRxCount = 2;
   readonly attribute int64u packetTxCount = 3;
@@ -1167,7 +1167,7 @@ server cluster EthernetNetworkDiagnostics = 55 {
 }
 
 server cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatus : ENUM8 {
+  enum CommissioningWindowStatusEnum : ENUM8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
     kBasicWindowOpen = 2;
@@ -1179,7 +1179,7 @@ server cluster AdministratorCommissioning = 60 {
     kWindowNotOpen = 4;
   }
 
-  readonly attribute CommissioningWindowStatus windowStatus = 0;
+  readonly attribute CommissioningWindowStatusEnum windowStatus = 0;
   readonly attribute nullable fabric_idx adminFabricIndex = 1;
   readonly attribute nullable int16u adminVendorId = 2;
   readonly attribute bitmap32 featureMap = 65532;
diff --git a/examples/thermostat/thermostat-common/thermostat.zap b/examples/thermostat/thermostat-common/thermostat.zap
index bd0646ff98e5b0..fb1b971e9c8919 100644
--- a/examples/thermostat/thermostat-common/thermostat.zap
+++ b/examples/thermostat/thermostat-common/thermostat.zap
@@ -4329,7 +4329,7 @@
               "code": 0,
               "mfgCode": null,
               "side": "server",
-              "type": "PHYRate",
+              "type": "PHYRateEnum",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -4603,7 +4603,7 @@
           ]
         },
         {
-          "name": "AdministratorCommissioning",
+          "name": "Administrator Commissioning",
           "code": 60,
           "mfgCode": null,
           "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
@@ -4655,7 +4655,7 @@
           ]
         },
         {
-          "name": "AdministratorCommissioning",
+          "name": "Administrator Commissioning",
           "code": 60,
           "mfgCode": null,
           "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
@@ -4667,7 +4667,7 @@
               "code": 0,
               "mfgCode": null,
               "side": "server",
-              "type": "CommissioningWindowStatus",
+              "type": "CommissioningWindowStatusEnum",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -5509,7 +5509,7 @@
               "code": 3,
               "mfgCode": null,
               "side": "server",
-              "type": "DlDoorState",
+              "type": "DoorStateEnum",
               "included": 0,
               "storageOption": "RAM",
               "singleton": 0,
@@ -5589,7 +5589,7 @@
               "code": 37,
               "mfgCode": null,
               "side": "server",
-              "type": "DlOperatingMode",
+              "type": "OperatingModeEnum",
               "included": 0,
               "storageOption": "RAM",
               "singleton": 0,
@@ -10057,7 +10057,7 @@
               "code": 3,
               "mfgCode": null,
               "side": "server",
-              "type": "DlDoorState",
+              "type": "DoorStateEnum",
               "included": 0,
               "storageOption": "RAM",
               "singleton": 0,
@@ -10137,7 +10137,7 @@
               "code": 37,
               "mfgCode": null,
               "side": "server",
-              "type": "DlOperatingMode",
+              "type": "OperatingModeEnum",
               "included": 0,
               "storageOption": "RAM",
               "singleton": 0,
diff --git a/examples/tv-app/linux/include/level-control/LevelControl.cpp b/examples/tv-app/linux/include/level-control/LevelControl.cpp
index 3147396e008b53..dd919ca342f46b 100644
--- a/examples/tv-app/linux/include/level-control/LevelControl.cpp
+++ b/examples/tv-app/linux/include/level-control/LevelControl.cpp
@@ -21,8 +21,8 @@
 #include <app-common/zap-generated/af-structs.h>
 #include <app-common/zap-generated/attribute-id.h>
 #include <app-common/zap-generated/attribute-type.h>
-#include <app-common/zap-generated/command-id.h>
 #include <app-common/zap-generated/ids/Clusters.h>
+#include <app-common/zap-generated/ids/Commands.h>
 
 using namespace chip;
 using namespace chip::app::Clusters;
@@ -128,7 +128,7 @@ bool emberAfLevelControlClusterStepCallback(uint8_t stepMode, uint8_t stepSize,
                                             BitMask<LevelControl::LevelControlOptions> optionMask,
                                             BitMask<LevelControl::LevelControlOptions> optionOverride)
 {
-    stepHandler(ZCL_STEP_COMMAND_ID, stepMode, stepSize, transitionTime, optionMask, optionOverride);
+    stepHandler(LevelControl::Commands::Step : Id, stepMode, stepSize, transitionTime, optionMask, optionOverride);
     return true;
 }
 
diff --git a/examples/tv-app/tv-common/tv-app.matter b/examples/tv-app/tv-common/tv-app.matter
index c673b4da718947..ee392b654ecb63 100644
--- a/examples/tv-app/tv-common/tv-app.matter
+++ b/examples/tv-app/tv-common/tv-app.matter
@@ -851,7 +851,7 @@ server cluster GeneralDiagnostics = 51 {
     kSoftwareReset = 6;
   }
 
-  enum HardwareFault : ENUM8 {
+  enum HardwareFaultEnum : ENUM8 {
     kUnspecified = 0;
     kRadio = 1;
     kSensor = 2;
@@ -865,7 +865,7 @@ server cluster GeneralDiagnostics = 51 {
     kTamperDetected = 10;
   }
 
-  enum InterfaceType : ENUM8 {
+  enum InterfaceTypeEnum : ENUM8 {
     kUnspecified = 0;
     kWiFi = 1;
     kEthernet = 2;
@@ -873,14 +873,14 @@ server cluster GeneralDiagnostics = 51 {
     kThread = 4;
   }
 
-  enum NetworkFaultType : ENUM8 {
+  enum NetworkFaultEnum : ENUM8 {
     kUnspecified = 0;
     kHardwareFailure = 1;
     kNetworkJammed = 2;
     kConnectionFailed = 3;
   }
 
-  enum RadioFault : ENUM8 {
+  enum RadioFaultEnum : ENUM8 {
     kUnspecified = 0;
     kWiFiFault = 1;
     kCellularFault = 2;
@@ -898,22 +898,22 @@ server cluster GeneralDiagnostics = 51 {
     octet_string<8> hardwareAddress = 4;
     octet_string IPv4Addresses[] = 5;
     octet_string IPv6Addresses[] = 6;
-    InterfaceType type = 7;
+    InterfaceTypeEnum type = 7;
   }
 
   critical event HardwareFaultChange = 0 {
-    HardwareFault current[] = 0;
-    HardwareFault previous[] = 1;
+    HardwareFaultEnum current[] = 0;
+    HardwareFaultEnum previous[] = 1;
   }
 
   critical event RadioFaultChange = 1 {
-    RadioFault current[] = 0;
-    RadioFault previous[] = 1;
+    RadioFaultEnum current[] = 0;
+    RadioFaultEnum previous[] = 1;
   }
 
   critical event NetworkFaultChange = 2 {
-    NetworkFaultType current[] = 0;
-    NetworkFaultType previous[] = 1;
+    NetworkFaultEnum current[] = 0;
+    NetworkFaultEnum previous[] = 1;
   }
 
   critical event BootReason = 3 {
@@ -925,9 +925,9 @@ server cluster GeneralDiagnostics = 51 {
   readonly attribute int64u upTime = 2;
   readonly attribute int32u totalOperationalHours = 3;
   readonly attribute BootReasonEnum bootReason = 4;
-  readonly attribute HardwareFault activeHardwareFaults[] = 5;
-  readonly attribute RadioFault activeRadioFaults[] = 6;
-  readonly attribute NetworkFaultType activeNetworkFaults[] = 7;
+  readonly attribute HardwareFaultEnum activeHardwareFaults[] = 5;
+  readonly attribute RadioFaultEnum activeRadioFaults[] = 6;
+  readonly attribute NetworkFaultEnum activeNetworkFaults[] = 7;
   readonly attribute boolean testEventTriggersEnabled = 8;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
@@ -1185,7 +1185,7 @@ server cluster WiFiNetworkDiagnostics = 54 {
 }
 
 server cluster EthernetNetworkDiagnostics = 55 {
-  enum PHYRate : ENUM8 {
+  enum PHYRateEnum : ENUM8 {
     kRate10M = 0;
     kRate100M = 1;
     kRate1G = 2;
@@ -1198,7 +1198,7 @@ server cluster EthernetNetworkDiagnostics = 55 {
     kRate400G = 9;
   }
 
-  readonly attribute nullable PHYRate PHYRate = 0;
+  readonly attribute nullable PHYRateEnum PHYRate = 0;
   readonly attribute nullable boolean fullDuplex = 1;
   readonly attribute int64u packetRxCount = 2;
   readonly attribute int64u packetTxCount = 3;
@@ -1214,7 +1214,7 @@ server cluster EthernetNetworkDiagnostics = 55 {
 }
 
 server cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatus : ENUM8 {
+  enum CommissioningWindowStatusEnum : ENUM8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
     kBasicWindowOpen = 2;
@@ -1226,7 +1226,7 @@ server cluster AdministratorCommissioning = 60 {
     kWindowNotOpen = 4;
   }
 
-  readonly attribute CommissioningWindowStatus windowStatus = 0;
+  readonly attribute CommissioningWindowStatusEnum windowStatus = 0;
   readonly attribute nullable fabric_idx adminFabricIndex = 1;
   readonly attribute nullable int16u adminVendorId = 2;
   readonly attribute bitmap32 featureMap = 65532;
diff --git a/examples/tv-app/tv-common/tv-app.zap b/examples/tv-app/tv-common/tv-app.zap
index 96d083b9f4281a..465cfb35fc98e9 100644
--- a/examples/tv-app/tv-common/tv-app.zap
+++ b/examples/tv-app/tv-common/tv-app.zap
@@ -4139,7 +4139,7 @@
               "code": 0,
               "mfgCode": null,
               "side": "server",
-              "type": "PHYRate",
+              "type": "PHYRateEnum",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -4413,7 +4413,7 @@
           ]
         },
         {
-          "name": "AdministratorCommissioning",
+          "name": "Administrator Commissioning",
           "code": 60,
           "mfgCode": null,
           "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
@@ -4465,7 +4465,7 @@
           ]
         },
         {
-          "name": "AdministratorCommissioning",
+          "name": "Administrator Commissioning",
           "code": 60,
           "mfgCode": null,
           "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
@@ -4477,7 +4477,7 @@
               "code": 0,
               "mfgCode": null,
               "side": "server",
-              "type": "CommissioningWindowStatus",
+              "type": "CommissioningWindowStatusEnum",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -5319,7 +5319,7 @@
               "code": 3,
               "mfgCode": null,
               "side": "server",
-              "type": "DlDoorState",
+              "type": "DoorStateEnum",
               "included": 0,
               "storageOption": "RAM",
               "singleton": 0,
@@ -5399,7 +5399,7 @@
               "code": 37,
               "mfgCode": null,
               "side": "server",
-              "type": "DlOperatingMode",
+              "type": "OperatingModeEnum",
               "included": 0,
               "storageOption": "RAM",
               "singleton": 0,
diff --git a/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter b/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter
index 1e5f03c0b9f8b8..290552732b7a68 100644
--- a/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter
+++ b/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter
@@ -1023,7 +1023,7 @@ server cluster GeneralDiagnostics = 51 {
     kSoftwareReset = 6;
   }
 
-  enum HardwareFault : ENUM8 {
+  enum HardwareFaultEnum : ENUM8 {
     kUnspecified = 0;
     kRadio = 1;
     kSensor = 2;
@@ -1037,7 +1037,7 @@ server cluster GeneralDiagnostics = 51 {
     kTamperDetected = 10;
   }
 
-  enum InterfaceType : ENUM8 {
+  enum InterfaceTypeEnum : ENUM8 {
     kUnspecified = 0;
     kWiFi = 1;
     kEthernet = 2;
@@ -1045,14 +1045,14 @@ server cluster GeneralDiagnostics = 51 {
     kThread = 4;
   }
 
-  enum NetworkFaultType : ENUM8 {
+  enum NetworkFaultEnum : ENUM8 {
     kUnspecified = 0;
     kHardwareFailure = 1;
     kNetworkJammed = 2;
     kConnectionFailed = 3;
   }
 
-  enum RadioFault : ENUM8 {
+  enum RadioFaultEnum : ENUM8 {
     kUnspecified = 0;
     kWiFiFault = 1;
     kCellularFault = 2;
@@ -1070,22 +1070,22 @@ server cluster GeneralDiagnostics = 51 {
     octet_string<8> hardwareAddress = 4;
     octet_string IPv4Addresses[] = 5;
     octet_string IPv6Addresses[] = 6;
-    InterfaceType type = 7;
+    InterfaceTypeEnum type = 7;
   }
 
   critical event HardwareFaultChange = 0 {
-    HardwareFault current[] = 0;
-    HardwareFault previous[] = 1;
+    HardwareFaultEnum current[] = 0;
+    HardwareFaultEnum previous[] = 1;
   }
 
   critical event RadioFaultChange = 1 {
-    RadioFault current[] = 0;
-    RadioFault previous[] = 1;
+    RadioFaultEnum current[] = 0;
+    RadioFaultEnum previous[] = 1;
   }
 
   critical event NetworkFaultChange = 2 {
-    NetworkFaultType current[] = 0;
-    NetworkFaultType previous[] = 1;
+    NetworkFaultEnum current[] = 0;
+    NetworkFaultEnum previous[] = 1;
   }
 
   critical event BootReason = 3 {
@@ -1097,9 +1097,9 @@ server cluster GeneralDiagnostics = 51 {
   readonly attribute int64u upTime = 2;
   readonly attribute int32u totalOperationalHours = 3;
   readonly attribute BootReasonEnum bootReason = 4;
-  readonly attribute HardwareFault activeHardwareFaults[] = 5;
-  readonly attribute RadioFault activeRadioFaults[] = 6;
-  readonly attribute NetworkFaultType activeNetworkFaults[] = 7;
+  readonly attribute HardwareFaultEnum activeHardwareFaults[] = 5;
+  readonly attribute RadioFaultEnum activeRadioFaults[] = 6;
+  readonly attribute NetworkFaultEnum activeNetworkFaults[] = 7;
   readonly attribute boolean testEventTriggersEnabled = 8;
   readonly attribute bitmap32 featureMap = 65532;
   readonly attribute int16u clusterRevision = 65533;
@@ -1357,7 +1357,7 @@ server cluster WiFiNetworkDiagnostics = 54 {
 }
 
 server cluster EthernetNetworkDiagnostics = 55 {
-  enum PHYRate : ENUM8 {
+  enum PHYRateEnum : ENUM8 {
     kRate10M = 0;
     kRate100M = 1;
     kRate1G = 2;
@@ -1370,7 +1370,7 @@ server cluster EthernetNetworkDiagnostics = 55 {
     kRate400G = 9;
   }
 
-  readonly attribute nullable PHYRate PHYRate = 0;
+  readonly attribute nullable PHYRateEnum PHYRate = 0;
   readonly attribute nullable boolean fullDuplex = 1;
   readonly attribute int64u packetRxCount = 2;
   readonly attribute int64u packetTxCount = 3;
@@ -1431,7 +1431,7 @@ server cluster Switch = 59 {
 }
 
 server cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatus : ENUM8 {
+  enum CommissioningWindowStatusEnum : ENUM8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
     kBasicWindowOpen = 2;
@@ -1443,7 +1443,7 @@ server cluster AdministratorCommissioning = 60 {
     kWindowNotOpen = 4;
   }
 
-  readonly attribute CommissioningWindowStatus windowStatus = 0;
+  readonly attribute CommissioningWindowStatusEnum windowStatus = 0;
   readonly attribute nullable fabric_idx adminFabricIndex = 1;
   readonly attribute nullable int16u adminVendorId = 2;
   readonly attribute bitmap32 featureMap = 65532;
diff --git a/examples/tv-casting-app/tv-casting-common/tv-casting-app.zap b/examples/tv-casting-app/tv-casting-common/tv-casting-app.zap
index 3ab34dcfdfcd3b..565fb7921fe529 100644
--- a/examples/tv-casting-app/tv-casting-common/tv-casting-app.zap
+++ b/examples/tv-casting-app/tv-casting-common/tv-casting-app.zap
@@ -4089,7 +4089,7 @@
               "code": 0,
               "mfgCode": null,
               "side": "server",
-              "type": "PHYRate",
+              "type": "PHYRateEnum",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -4363,7 +4363,7 @@
           ]
         },
         {
-          "name": "AdministratorCommissioning",
+          "name": "Administrator Commissioning",
           "code": 60,
           "mfgCode": null,
           "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
@@ -4415,7 +4415,7 @@
           ]
         },
         {
-          "name": "AdministratorCommissioning",
+          "name": "Administrator Commissioning",
           "code": 60,
           "mfgCode": null,
           "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
@@ -4427,7 +4427,7 @@
               "code": 0,
               "mfgCode": null,
               "side": "server",
-              "type": "CommissioningWindowStatus",
+              "type": "CommissioningWindowStatusEnum",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -5171,7 +5171,7 @@
               "code": 3,
               "mfgCode": null,
               "side": "server",
-              "type": "DlDoorState",
+              "type": "DoorStateEnum",
               "included": 0,
               "storageOption": "RAM",
               "singleton": 0,
@@ -5251,7 +5251,7 @@
               "code": 37,
               "mfgCode": null,
               "side": "server",
-              "type": "DlOperatingMode",
+              "type": "OperatingModeEnum",
               "included": 0,
               "storageOption": "RAM",
               "singleton": 0,
@@ -9385,7 +9385,7 @@
               "code": 3,
               "mfgCode": null,
               "side": "server",
-              "type": "DlDoorState",
+              "type": "DoorStateEnum",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -9625,7 +9625,7 @@
               "code": 37,
               "mfgCode": null,
               "side": "server",
-              "type": "DlOperatingMode",
+              "type": "OperatingModeEnum",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -14821,7 +14821,7 @@
               "code": 3,
               "mfgCode": null,
               "side": "server",
-              "type": "DlDoorState",
+              "type": "DoorStateEnum",
               "included": 0,
               "storageOption": "RAM",
               "singleton": 0,
@@ -14901,7 +14901,7 @@
               "code": 37,
               "mfgCode": null,
               "side": "server",
-              "type": "DlOperatingMode",
+              "type": "OperatingModeEnum",
               "included": 0,
               "storageOption": "RAM",
               "singleton": 0,
diff --git a/examples/window-app/common/window-app.matter b/examples/window-app/common/window-app.matter
index 847f0bce021fa5..c3ec3827ddc565 100644
--- a/examples/window-app/common/window-app.matter
+++ b/examples/window-app/common/window-app.matter
@@ -855,7 +855,7 @@ server cluster GeneralDiagnostics = 51 {
     kSoftwareReset = 6;
   }
 
-  enum HardwareFault : ENUM8 {
+  enum HardwareFaultEnum : ENUM8 {
     kUnspecified = 0;
     kRadio = 1;
     kSensor = 2;
@@ -869,7 +869,7 @@ server cluster GeneralDiagnostics = 51 {
     kTamperDetected = 10;
   }
 
-  enum InterfaceType : ENUM8 {
+  enum InterfaceTypeEnum : ENUM8 {
     kUnspecified = 0;
     kWiFi = 1;
     kEthernet = 2;
@@ -877,14 +877,14 @@ server cluster GeneralDiagnostics = 51 {
     kThread = 4;
   }
 
-  enum NetworkFaultType : ENUM8 {
+  enum NetworkFaultEnum : ENUM8 {
     kUnspecified = 0;
     kHardwareFailure = 1;
     kNetworkJammed = 2;
     kConnectionFailed = 3;
   }
 
-  enum RadioFault : ENUM8 {
+  enum RadioFaultEnum : ENUM8 {
     kUnspecified = 0;
     kWiFiFault = 1;
     kCellularFault = 2;
@@ -902,22 +902,22 @@ server cluster GeneralDiagnostics = 51 {
     octet_string<8> hardwareAddress = 4;
     octet_string IPv4Addresses[] = 5;
     octet_string IPv6Addresses[] = 6;
-    InterfaceType type = 7;
+    InterfaceTypeEnum type = 7;
   }
 
   critical event HardwareFaultChange = 0 {
-    HardwareFault current[] = 0;
-    HardwareFault previous[] = 1;
+    HardwareFaultEnum current[] = 0;
+    HardwareFaultEnum previous[] = 1;
   }
 
   critical event RadioFaultChange = 1 {
-    RadioFault current[] = 0;
-    RadioFault previous[] = 1;
+    RadioFaultEnum current[] = 0;
+    RadioFaultEnum previous[] = 1;
   }
 
   critical event NetworkFaultChange = 2 {
-    NetworkFaultType current[] = 0;
-    NetworkFaultType previous[] = 1;
+    NetworkFaultEnum current[] = 0;
+    NetworkFaultEnum previous[] = 1;
   }
 
   critical event BootReason = 3 {
@@ -929,9 +929,9 @@ server cluster GeneralDiagnostics = 51 {
   readonly attribute int64u upTime = 2;
   readonly attribute int32u totalOperationalHours = 3;
   readonly attribute BootReasonEnum bootReason = 4;
-  readonly attribute HardwareFault activeHardwareFaults[] = 5;
-  readonly attribute RadioFault activeRadioFaults[] = 6;
-  readonly attribute NetworkFaultType activeNetworkFaults[] = 7;
+  readonly attribute HardwareFaultEnum activeHardwareFaults[] = 5;
+  readonly attribute RadioFaultEnum activeRadioFaults[] = 6;
+  readonly attribute NetworkFaultEnum activeNetworkFaults[] = 7;
   readonly attribute boolean testEventTriggersEnabled = 8;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -1196,7 +1196,7 @@ server cluster WiFiNetworkDiagnostics = 54 {
 }
 
 server cluster EthernetNetworkDiagnostics = 55 {
-  enum PHYRate : ENUM8 {
+  enum PHYRateEnum : ENUM8 {
     kRate10M = 0;
     kRate100M = 1;
     kRate1G = 2;
@@ -1209,7 +1209,7 @@ server cluster EthernetNetworkDiagnostics = 55 {
     kRate400G = 9;
   }
 
-  readonly attribute nullable PHYRate PHYRate = 0;
+  readonly attribute nullable PHYRateEnum PHYRate = 0;
   readonly attribute nullable boolean fullDuplex = 1;
   readonly attribute int64u packetRxCount = 2;
   readonly attribute int64u packetTxCount = 3;
@@ -1223,7 +1223,7 @@ server cluster EthernetNetworkDiagnostics = 55 {
 }
 
 server cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatus : ENUM8 {
+  enum CommissioningWindowStatusEnum : ENUM8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
     kBasicWindowOpen = 2;
@@ -1235,7 +1235,7 @@ server cluster AdministratorCommissioning = 60 {
     kWindowNotOpen = 4;
   }
 
-  readonly attribute CommissioningWindowStatus windowStatus = 0;
+  readonly attribute CommissioningWindowStatusEnum windowStatus = 0;
   readonly attribute nullable fabric_idx adminFabricIndex = 1;
   readonly attribute nullable int16u adminVendorId = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
diff --git a/examples/window-app/common/window-app.zap b/examples/window-app/common/window-app.zap
index 8767798b25b2d8..c6f8927b377e11 100644
--- a/examples/window-app/common/window-app.zap
+++ b/examples/window-app/common/window-app.zap
@@ -5051,7 +5051,7 @@
               "code": 0,
               "mfgCode": null,
               "side": "server",
-              "type": "PHYRate",
+              "type": "PHYRateEnum",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -5225,7 +5225,7 @@
           ]
         },
         {
-          "name": "AdministratorCommissioning",
+          "name": "Administrator Commissioning",
           "code": 60,
           "mfgCode": null,
           "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
@@ -5293,7 +5293,7 @@
           ]
         },
         {
-          "name": "AdministratorCommissioning",
+          "name": "Administrator Commissioning",
           "code": 60,
           "mfgCode": null,
           "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
@@ -5305,7 +5305,7 @@
               "code": 0,
               "mfgCode": null,
               "side": "server",
-              "type": "CommissioningWindowStatus",
+              "type": "CommissioningWindowStatusEnum",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
diff --git a/integrations/docker/images/chip-build/Dockerfile b/integrations/docker/images/chip-build/Dockerfile
index eb47a434e3c37c..e0ce5af7c24ac2 100644
--- a/integrations/docker/images/chip-build/Dockerfile
+++ b/integrations/docker/images/chip-build/Dockerfile
@@ -183,7 +183,7 @@ RUN set -x \
 #       for a uniform update, a separate update script exists:
 #
 #       scripts/tools/zap/version_update.py
-ENV ZAP_VERSION=v2023.01.09-nightly
+ENV ZAP_VERSION=v2023.01.18-nightly
 RUN set -x \
     && mkdir -p /opt/zap-${ZAP_VERSION} \
     && cd /opt/zap-${ZAP_VERSION} \
diff --git a/integrations/docker/images/chip-build/version b/integrations/docker/images/chip-build/version
index 03fbc0d690dd48..73d06a8b75554c 100644
--- a/integrations/docker/images/chip-build/version
+++ b/integrations/docker/images/chip-build/version
@@ -1 +1 @@
-0.6.31 Version bump reason: Updating ZAP to v2023.01.09-nightly
+0.6.32 Version bump reason: Updating ZAP to v2023.01.18-nightly
diff --git a/scripts/py_matter_idl/matter_idl/generators/bridge/BridgeClustersCpp.jinja b/scripts/py_matter_idl/matter_idl/generators/bridge/BridgeClustersCpp.jinja
index 62c1f41e77ac26..14a6aca640b0ad 100644
--- a/scripts/py_matter_idl/matter_idl/generators/bridge/BridgeClustersCpp.jinja
+++ b/scripts/py_matter_idl/matter_idl/generators/bridge/BridgeClustersCpp.jinja
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "BridgeGlobalStructs.h"
-#include "third_party/connectedhomeip/examples/dynamic-bridge-app/linux/include/GeneratedClusters.h"
+#include "GeneratedClusters.h"
 
 namespace clusters {
 struct {{cluster.name}}Cluster : public GeneratedCluster
@@ -42,7 +42,7 @@ struct {{cluster.name}}Cluster : public GeneratedCluster
 
   {{cluster.name}}Cluster() :
   {%-  for attr in cluster.attributes %}
-      m{{attr.definition.name | capitalcase}}(chip::CharSpan("{{attr.definition.name}}"), {{attr.definition.code}}, {{attr | getMask(cluster, idl)}}, {{attr | getRawSizeAndType(cluster, idl)}}{{attr | getInit(cluster, idl)}}){{"," if not loop.last}}
+      m{{attr.definition.name | capitalcase}}(chip::CharSpan("{{attr.definition.name}}"), {{attr.definition.code}}, {{attr | getMask(cluster, idl)}} | ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), {{attr | getRawSizeAndType(cluster, idl)}}{{attr | getInit(cluster, idl)}}){{"," if not loop.last}}
   {%-  endfor  %}
   {
   }
@@ -62,6 +62,26 @@ struct {{cluster.name}}Cluster : public GeneratedCluster
 {%  for attr in cluster.attributes %}
   {{"List" if attr.definition.is_list}}Attribute<{{attr | getType(cluster, idl)}}> m{{attr.definition.name | capitalcase}};
 {%-  endfor  %}
+
+{%- if cluster.commands | length > 0 %}
+  static const chip::CommandId mIncomingCommandList[];
+  const chip::CommandId * GetIncomingCommandList() override
+  {
+    return mIncomingCommandList;
+  }
+{%- endif %}
+};
+
+{%- if cluster.commands | length > 0 %}
+#ifndef {{cluster.name | constcase}}_CLUSTER_INCOMING_COMMANDS
+#define {{cluster.name | constcase}}_CLUSTER_INCOMING_COMMANDS
+const chip::CommandId {{cluster.name}}Cluster::mIncomingCommandList[] = {
+{%- for command in cluster.commands %}
+  {{command.code}},
+{%- endfor %}
+  chip::kInvalidCommandId
 };
+#endif
+{%- endif %}
 
 }
diff --git a/scripts/py_matter_idl/matter_idl/tests/available_tests.yaml b/scripts/py_matter_idl/matter_idl/tests/available_tests.yaml
index bd5311ab050c48..a4e2c6778b5f95 100644
--- a/scripts/py_matter_idl/matter_idl/tests/available_tests.yaml
+++ b/scripts/py_matter_idl/matter_idl/tests/available_tests.yaml
@@ -59,6 +59,11 @@ bridge:
         bridge/ThirdServer.h: outputs/several_clusters/bridge/ThirdServer.h
         bridge/Third.h: outputs/several_clusters/bridge/Third.h
 
+    inputs/cluster_with_commands.matter:
+        bridge/BridgeClustersImpl.h: outputs/cluster_with_commands/bridge/BridgeClustersImpl.h
+        bridge/BridgeGlobalStructs.h: outputs/cluster_with_commands/bridge/BridgeGlobalStructs.h
+        bridge/OnOff.h: outputs/cluster_with_commands/bridge/OnOff.h
+
 cpp-app:
     inputs/several_clusters.matter:
         app/PluginApplicationCallbacks.h: outputs/several_clusters/cpp-app/PluginApplicationCallbacks.h
diff --git a/scripts/py_matter_idl/matter_idl/tests/inputs/cluster_with_commands.matter b/scripts/py_matter_idl/matter_idl/tests/inputs/cluster_with_commands.matter
new file mode 100644
index 00000000000000..c6128be7ffd870
--- /dev/null
+++ b/scripts/py_matter_idl/matter_idl/tests/inputs/cluster_with_commands.matter
@@ -0,0 +1,44 @@
+
+server cluster OnOff = 6 {
+  enum OnOffDelayedAllOffEffectVariant : ENUM8 {
+    kFadeToOffIn0p8Seconds = 0;
+    kNoFade = 1;
+    k50PercentDimDownIn0p8SecondsThenFadeToOffIn12Seconds = 2;
+  }
+
+  enum OnOffDyingLightEffectVariant : ENUM8 {
+    k20PercenterDimUpIn0p5SecondsThenFadeToOffIn1Second = 0;
+  }
+
+  enum OnOffEffectIdentifier : ENUM8 {
+    kDelayedAllOff = 0;
+    kDyingLight = 1;
+  }
+
+  enum OnOffStartUpOnOff : ENUM8 {
+    kOff = 0;
+    kOn = 1;
+    kTogglePreviousOnOff = 2;
+  }
+
+  bitmap OnOffControl : BITMAP8 {
+    kAcceptOnlyWhenOn = 0x1;
+  }
+
+  bitmap OnOffFeature : BITMAP32 {
+    kLighting = 0x1;
+  }
+
+  bitmap SceneFeatures : BITMAP32 {
+    kSceneNames = 0x1;
+  }
+
+  readonly attribute boolean onOff = 0;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  command Off(): DefaultSuccess = 0;
+  command On(): DefaultSuccess = 1;
+  command Toggle(): DefaultSuccess = 2;
+}
+
diff --git a/scripts/py_matter_idl/matter_idl/tests/outputs/cluster_struct_attribute/bridge/DemoClusterServer.h b/scripts/py_matter_idl/matter_idl/tests/outputs/cluster_struct_attribute/bridge/DemoClusterServer.h
index bdf2488396763a..eac0b0aeca0d1c 100644
--- a/scripts/py_matter_idl/matter_idl/tests/outputs/cluster_struct_attribute/bridge/DemoClusterServer.h
+++ b/scripts/py_matter_idl/matter_idl/tests/outputs/cluster_struct_attribute/bridge/DemoClusterServer.h
@@ -1,15 +1,15 @@
 #pragma once
 
 #include "BridgeGlobalStructs.h"
-#include "third_party/connectedhomeip/examples/dynamic-bridge-app/linux/include/GeneratedClusters.h"
+#include "GeneratedClusters.h"
 
 namespace clusters {
 struct DemoClusterCluster : public GeneratedCluster
 {
 
   DemoClusterCluster() :
-      mSingleFailSafe(chip::CharSpan("singleFailSafe"), 5, ATTRIBUTE_MASK_WRITABLE, ZCL_STRUCT_ATTRIBUTE_TYPE, sizeof(ArmFailSafeRequest)),
-      mArmFailsafes(chip::CharSpan("armFailsafes"), 100, ATTRIBUTE_MASK_WRITABLE, ZCL_ARRAY_ATTRIBUTE_TYPE, sizeof(ArmFailSafeRequest))
+      mSingleFailSafe(chip::CharSpan("singleFailSafe"), 5, ATTRIBUTE_MASK_WRITABLE | ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZCL_STRUCT_ATTRIBUTE_TYPE, sizeof(ArmFailSafeRequest)),
+      mArmFailsafes(chip::CharSpan("armFailsafes"), 100, ATTRIBUTE_MASK_WRITABLE | ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZCL_ARRAY_ATTRIBUTE_TYPE, sizeof(ArmFailSafeRequest))
   {
   }
 
diff --git a/scripts/py_matter_idl/matter_idl/tests/outputs/cluster_with_commands/bridge/BridgeClustersImpl.h b/scripts/py_matter_idl/matter_idl/tests/outputs/cluster_with_commands/bridge/BridgeClustersImpl.h
new file mode 100644
index 00000000000000..0484909c914739
--- /dev/null
+++ b/scripts/py_matter_idl/matter_idl/tests/outputs/cluster_with_commands/bridge/BridgeClustersImpl.h
@@ -0,0 +1,26 @@
+#pragma once
+
+#include <new>
+#include "bridge/OnOff.h"
+
+namespace clusters {
+
+struct ClusterInfo
+{
+  chip::ClusterId id;
+  const char *name;
+  uint16_t size;
+  GeneratedCluster* (*ctor)(void*);
+} static const kKnownClusters[] = {
+
+  {
+    6,
+    "OnOff",
+    sizeof(OnOffCluster),
+    [](void *mem) -> GeneratedCluster* {
+      return new(mem) OnOffCluster();
+    },
+  },
+};
+
+}
diff --git a/scripts/py_matter_idl/matter_idl/tests/outputs/cluster_with_commands/bridge/BridgeGlobalStructs.h b/scripts/py_matter_idl/matter_idl/tests/outputs/cluster_with_commands/bridge/BridgeGlobalStructs.h
new file mode 100644
index 00000000000000..3b56a6f868b109
--- /dev/null
+++ b/scripts/py_matter_idl/matter_idl/tests/outputs/cluster_with_commands/bridge/BridgeGlobalStructs.h
@@ -0,0 +1,13 @@
+#pragma once
+
+#include <app-common/zap-generated/attribute-id.h>
+#include <app/data-model/Nullable.h>
+
+#include <string>
+#include <vector>
+
+namespace clusters {
+
+
+
+}
diff --git a/scripts/py_matter_idl/matter_idl/tests/outputs/cluster_with_commands/bridge/OnOff.h b/scripts/py_matter_idl/matter_idl/tests/outputs/cluster_with_commands/bridge/OnOff.h
new file mode 100644
index 00000000000000..1e34c2c7953418
--- /dev/null
+++ b/scripts/py_matter_idl/matter_idl/tests/outputs/cluster_with_commands/bridge/OnOff.h
@@ -0,0 +1,49 @@
+#pragma once
+
+#include "BridgeGlobalStructs.h"
+#include "GeneratedClusters.h"
+
+namespace clusters {
+struct OnOffCluster : public GeneratedCluster
+{
+
+  OnOffCluster() :
+      mOnOff(chip::CharSpan("onOff"), 0, 0 | ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZCL_BOOLEAN_ATTRIBUTE_TYPE, 1),
+      mFeatureMap(chip::CharSpan("featureMap"), 65532, 0 | ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZCL_BITMAP32_ATTRIBUTE_TYPE, 4),
+      mClusterRevision(chip::CharSpan("clusterRevision"), 65533, 0 | ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZCL_INT16U_ATTRIBUTE_TYPE, 2, ZCL_ON_OFF_CLUSTER_REVISION)
+  {
+  }
+
+  static constexpr uint32_t kClusterId =6;
+  chip::ClusterId GetClusterId() override { return kClusterId; }
+
+  std::vector<AttributeInterface*> GetAttributes() override
+  {
+    return std::vector<AttributeInterface*>({
+      static_cast<AttributeInterface*>(&mOnOff),
+      static_cast<AttributeInterface*>(&mFeatureMap),
+      static_cast<AttributeInterface*>(&mClusterRevision),
+    });
+  }
+
+
+  Attribute<bool> mOnOff;
+  Attribute<uint32_t> mFeatureMap;
+  Attribute<uint16_t> mClusterRevision;
+  static const chip::CommandId mIncomingCommandList[];
+  const chip::CommandId * GetIncomingCommandList() override
+  {
+    return mIncomingCommandList;
+  }
+};
+#ifndef ON_OFF_CLUSTER_INCOMING_COMMANDS
+#define ON_OFF_CLUSTER_INCOMING_COMMANDS
+const chip::CommandId OnOffCluster::mIncomingCommandList[] = {
+  0,
+  1,
+  2,
+  chip::kInvalidCommandId
+};
+#endif
+
+}
diff --git a/scripts/py_matter_idl/matter_idl/tests/outputs/global_struct_attribute/bridge/DemoClusterServer.h b/scripts/py_matter_idl/matter_idl/tests/outputs/global_struct_attribute/bridge/DemoClusterServer.h
index 78f7e89c33aaf9..3c6feeb5a3baba 100644
--- a/scripts/py_matter_idl/matter_idl/tests/outputs/global_struct_attribute/bridge/DemoClusterServer.h
+++ b/scripts/py_matter_idl/matter_idl/tests/outputs/global_struct_attribute/bridge/DemoClusterServer.h
@@ -1,15 +1,15 @@
 #pragma once
 
 #include "BridgeGlobalStructs.h"
-#include "third_party/connectedhomeip/examples/dynamic-bridge-app/linux/include/GeneratedClusters.h"
+#include "GeneratedClusters.h"
 
 namespace clusters {
 struct DemoClusterCluster : public GeneratedCluster
 {
 
   DemoClusterCluster() :
-      mSingleLabel(chip::CharSpan("singleLabel"), 32, ATTRIBUTE_MASK_WRITABLE, ZCL_STRUCT_ATTRIBUTE_TYPE, sizeof(LabelStruct)),
-      mSomeLabels(chip::CharSpan("someLabels"), 33, ATTRIBUTE_MASK_WRITABLE, ZCL_ARRAY_ATTRIBUTE_TYPE, sizeof(LabelStruct))
+      mSingleLabel(chip::CharSpan("singleLabel"), 32, ATTRIBUTE_MASK_WRITABLE | ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZCL_STRUCT_ATTRIBUTE_TYPE, sizeof(LabelStruct)),
+      mSomeLabels(chip::CharSpan("someLabels"), 33, ATTRIBUTE_MASK_WRITABLE | ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZCL_ARRAY_ATTRIBUTE_TYPE, sizeof(LabelStruct))
   {
   }
 
diff --git a/scripts/py_matter_idl/matter_idl/tests/outputs/several_clusters/bridge/FirstServer.h b/scripts/py_matter_idl/matter_idl/tests/outputs/several_clusters/bridge/FirstServer.h
index c5d0ede099ddec..2786817c0dc8a5 100644
--- a/scripts/py_matter_idl/matter_idl/tests/outputs/several_clusters/bridge/FirstServer.h
+++ b/scripts/py_matter_idl/matter_idl/tests/outputs/several_clusters/bridge/FirstServer.h
@@ -1,14 +1,14 @@
 #pragma once
 
 #include "BridgeGlobalStructs.h"
-#include "third_party/connectedhomeip/examples/dynamic-bridge-app/linux/include/GeneratedClusters.h"
+#include "GeneratedClusters.h"
 
 namespace clusters {
 struct FirstCluster : public GeneratedCluster
 {
 
   FirstCluster() :
-      mSomeInteger(chip::CharSpan("someInteger"), 1, ATTRIBUTE_MASK_WRITABLE, ZCL_INT16U_ATTRIBUTE_TYPE, 2)
+      mSomeInteger(chip::CharSpan("someInteger"), 1, ATTRIBUTE_MASK_WRITABLE | ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZCL_INT16U_ATTRIBUTE_TYPE, 2)
   {
   }
 
diff --git a/scripts/py_matter_idl/matter_idl/tests/outputs/several_clusters/bridge/SecondServer.h b/scripts/py_matter_idl/matter_idl/tests/outputs/several_clusters/bridge/SecondServer.h
index e80573cf55b5cc..71905bf252bd60 100644
--- a/scripts/py_matter_idl/matter_idl/tests/outputs/several_clusters/bridge/SecondServer.h
+++ b/scripts/py_matter_idl/matter_idl/tests/outputs/several_clusters/bridge/SecondServer.h
@@ -1,14 +1,14 @@
 #pragma once
 
 #include "BridgeGlobalStructs.h"
-#include "third_party/connectedhomeip/examples/dynamic-bridge-app/linux/include/GeneratedClusters.h"
+#include "GeneratedClusters.h"
 
 namespace clusters {
 struct SecondCluster : public GeneratedCluster
 {
 
   SecondCluster() :
-      mSomeBytes(chip::CharSpan("someBytes"), 123, 0, ZCL_OCTET_STRING_ATTRIBUTE_TYPE, 32)
+      mSomeBytes(chip::CharSpan("someBytes"), 123, 0 | ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZCL_OCTET_STRING_ATTRIBUTE_TYPE, 32)
   {
   }
 
diff --git a/scripts/py_matter_idl/matter_idl/tests/outputs/several_clusters/bridge/Third.h b/scripts/py_matter_idl/matter_idl/tests/outputs/several_clusters/bridge/Third.h
index 48e8c4537e4799..3b15195c0af9e4 100644
--- a/scripts/py_matter_idl/matter_idl/tests/outputs/several_clusters/bridge/Third.h
+++ b/scripts/py_matter_idl/matter_idl/tests/outputs/several_clusters/bridge/Third.h
@@ -1,15 +1,15 @@
 #pragma once
 
 #include "BridgeGlobalStructs.h"
-#include "third_party/connectedhomeip/examples/dynamic-bridge-app/linux/include/GeneratedClusters.h"
+#include "GeneratedClusters.h"
 
 namespace clusters {
 struct ThirdCluster : public GeneratedCluster
 {
 
   ThirdCluster() :
-      mSomeEnum(chip::CharSpan("someEnum"), 10, ATTRIBUTE_MASK_WRITABLE, ZCL_ENUM8_ATTRIBUTE_TYPE, 1),
-      mClusterRevision(chip::CharSpan("clusterRevision"), 65533, 0, ZCL_INT16U_ATTRIBUTE_TYPE, 2, ZCL_THIRD_CLUSTER_REVISION)
+      mSomeEnum(chip::CharSpan("someEnum"), 10, ATTRIBUTE_MASK_WRITABLE | ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZCL_ENUM8_ATTRIBUTE_TYPE, 1),
+      mClusterRevision(chip::CharSpan("clusterRevision"), 65533, 0 | ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZCL_INT16U_ATTRIBUTE_TYPE, 2, ZCL_THIRD_CLUSTER_REVISION)
   {
   }
 
diff --git a/scripts/py_matter_idl/matter_idl/tests/outputs/several_clusters/bridge/ThirdServer.h b/scripts/py_matter_idl/matter_idl/tests/outputs/several_clusters/bridge/ThirdServer.h
index 6f52806e477a89..d2f8bccb12d648 100644
--- a/scripts/py_matter_idl/matter_idl/tests/outputs/several_clusters/bridge/ThirdServer.h
+++ b/scripts/py_matter_idl/matter_idl/tests/outputs/several_clusters/bridge/ThirdServer.h
@@ -1,15 +1,15 @@
 #pragma once
 
 #include "BridgeGlobalStructs.h"
-#include "third_party/connectedhomeip/examples/dynamic-bridge-app/linux/include/GeneratedClusters.h"
+#include "GeneratedClusters.h"
 
 namespace clusters {
 struct ThirdCluster : public GeneratedCluster
 {
 
   ThirdCluster() :
-      mSomeEnum(chip::CharSpan("someEnum"), 10, ATTRIBUTE_MASK_WRITABLE, ZCL_ENUM8_ATTRIBUTE_TYPE, 1),
-      mOptions(chip::CharSpan("options"), 20, ATTRIBUTE_MASK_WRITABLE, ZCL_BITMAP8_ATTRIBUTE_TYPE, 1)
+      mSomeEnum(chip::CharSpan("someEnum"), 10, ATTRIBUTE_MASK_WRITABLE | ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZCL_ENUM8_ATTRIBUTE_TYPE, 1),
+      mOptions(chip::CharSpan("options"), 20, ATTRIBUTE_MASK_WRITABLE | ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZCL_BITMAP8_ATTRIBUTE_TYPE, 1)
   {
   }
 
diff --git a/scripts/py_matter_idl/matter_idl/tests/outputs/simple_attribute/bridge/MyClusterServer.h b/scripts/py_matter_idl/matter_idl/tests/outputs/simple_attribute/bridge/MyClusterServer.h
index 96c233b1a356de..831b39de9cfca4 100644
--- a/scripts/py_matter_idl/matter_idl/tests/outputs/simple_attribute/bridge/MyClusterServer.h
+++ b/scripts/py_matter_idl/matter_idl/tests/outputs/simple_attribute/bridge/MyClusterServer.h
@@ -1,14 +1,14 @@
 #pragma once
 
 #include "BridgeGlobalStructs.h"
-#include "third_party/connectedhomeip/examples/dynamic-bridge-app/linux/include/GeneratedClusters.h"
+#include "GeneratedClusters.h"
 
 namespace clusters {
 struct MyClusterCluster : public GeneratedCluster
 {
 
   MyClusterCluster() :
-      mClusterAttr(chip::CharSpan("clusterAttr"), 1, ATTRIBUTE_MASK_WRITABLE, ZCL_INT16U_ATTRIBUTE_TYPE, 2)
+      mClusterAttr(chip::CharSpan("clusterAttr"), 1, ATTRIBUTE_MASK_WRITABLE | ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZCL_INT16U_ATTRIBUTE_TYPE, 2)
   {
   }
 
diff --git a/scripts/tests/chiptest/yamltest_with_chip_repl_tester.py b/scripts/tests/chiptest/yamltest_with_chip_repl_tester.py
index 740c797493f97d..ce1db0330d18d8 100644
--- a/scripts/tests/chiptest/yamltest_with_chip_repl_tester.py
+++ b/scripts/tests/chiptest/yamltest_with_chip_repl_tester.py
@@ -72,7 +72,7 @@ def main(setup_code, yaml_path, node_id):
         chip.native.Init()
         chip_stack = ChipStack(chip_stack_storage.name)
         certificate_authority_manager = chip.CertificateAuthority.CertificateAuthorityManager(
-            chip_stack, chipStack.GetStorageManager())
+            chip_stack, chip_stack.GetStorageManager())
         certificate_authority_manager.LoadAuthoritiesFromStorage()
 
         if len(certificate_authority_manager.activeCaList) == 0:
@@ -96,7 +96,7 @@ def main(setup_code, yaml_path, node_id):
 
         # Parsing YAML test and setting up chip-repl yamltests runner.
         yaml = TestParser(yaml_path, None, clusters_definitions)
-        runner = ReplTestRunner(clusters_definitions, certificate_authority_manager)
+        runner = ReplTestRunner(clusters_definitions, certificate_authority_manager, dev_ctrl)
 
         # Executing and validating test
         for test_step in yaml.tests:
@@ -107,8 +107,9 @@ def main(setup_code, yaml_path, node_id):
                 decoded_response = runner.decode(response)
                 post_processing_result = test_step.post_process_response(decoded_response)
                 if not post_processing_result.is_success():
-                    # TODO figure out how we error out here
-                    pass
+                    exit(-2)
+            else:
+                exit(-2)
 
         runner.shutdown()
         # Tearing down chip stack. If not done in the correct order test will fail.
diff --git a/scripts/tools/generate_esp32_chip_factory_bin.py b/scripts/tools/generate_esp32_chip_factory_bin.py
index 997d95848a65ce..69ee282cf83aa9 100755
--- a/scripts/tools/generate_esp32_chip_factory_bin.py
+++ b/scripts/tools/generate_esp32_chip_factory_bin.py
@@ -41,7 +41,7 @@
                                     'nvs_partition_generator'))
     import nvs_partition_gen
 else:
-    log.error("Please set the IDF_PATH environment variable.")
+    sys.stderr.write("Please set the IDF_PATH environment variable.")
     exit(0)
 
 INVALID_PASSCODES = [00000000, 11111111, 22222222, 33333333, 44444444, 55555555,
@@ -236,7 +236,7 @@ def check_str_range(s, min_len, max_len, name):
 
 
 def check_int_range(value, min_value, max_value, name):
-    if value and ((value < min_value) or (value > max_value)):
+    if (value is not None) and ((value < min_value) or (value > max_value)):
         logging.error('%s is out of range, should be in range [%d, %d]', name, min_value, max_value)
         sys.exit(1)
 
@@ -277,40 +277,48 @@ def gen_spake2p_params(passcode):
 
 
 def populate_factory_data(args, spake2p_params):
-    FACTORY_DATA['discriminator']['value'] = args.discriminator
-    FACTORY_DATA['iteration-count']['value'] = spake2p_params['Iteration Count']
-    FACTORY_DATA['salt']['value'] = spake2p_params['Salt']
-    FACTORY_DATA['verifier']['value'] = spake2p_params['Verifier']
-    FACTORY_DATA['dac-cert']['value'] = os.path.abspath(args.dac_cert)
-    FACTORY_DATA['pai-cert']['value'] = os.path.abspath(args.pai_cert)
-    FACTORY_DATA['cert-dclrn']['value'] = os.path.abspath(args.cd)
-    FACTORY_DATA['dac-key']['value'] = os.path.abspath('dac_raw_privkey.bin')
-    FACTORY_DATA['dac-pub-key']['value'] = os.path.abspath('dac_raw_pubkey.bin')
-
-    if args.serial_num is not None:
+    if args.discriminator is not None:
+        FACTORY_DATA['discriminator']['value'] = args.discriminator
+
+    if spake2p_params:
+        FACTORY_DATA['iteration-count']['value'] = spake2p_params['Iteration Count']
+        FACTORY_DATA['salt']['value'] = spake2p_params['Salt']
+        FACTORY_DATA['verifier']['value'] = spake2p_params['Verifier']
+
+    if args.dac_cert:
+        FACTORY_DATA['dac-cert']['value'] = os.path.abspath(args.dac_cert)
+    if args.pai_cert:
+        FACTORY_DATA['pai-cert']['value'] = os.path.abspath(args.pai_cert)
+    if args.cd:
+        FACTORY_DATA['cert-dclrn']['value'] = os.path.abspath(args.cd)
+    if args.dac_key:
+        FACTORY_DATA['dac-key']['value'] = os.path.abspath('dac_raw_privkey.bin')
+        FACTORY_DATA['dac-pub-key']['value'] = os.path.abspath('dac_raw_pubkey.bin')
+
+    if args.serial_num:
         FACTORY_DATA['serial-num']['value'] = args.serial_num
-    if args.rd_id_uid is not None:
+    if args.rd_id_uid:
         FACTORY_DATA['rd-id-uid']['value'] = args.rd_id_uid
-    if args.mfg_date is not None:
+    if args.mfg_date:
         FACTORY_DATA['mfg-date']['value'] = args.mfg_date
     if args.vendor_id is not None:
         FACTORY_DATA['vendor-id']['value'] = args.vendor_id
-    if args.vendor_name is not None:
+    if args.vendor_name:
         FACTORY_DATA['vendor-name']['value'] = args.vendor_name
     if args.product_id is not None:
         FACTORY_DATA['product-id']['value'] = args.product_id
-    if args.product_name is not None:
+    if args.product_name:
         FACTORY_DATA['product-name']['value'] = args.product_name
     if args.hw_ver is not None:
         FACTORY_DATA['hardware-ver']['value'] = args.hw_ver
-    if (args.hw_ver_str is not None):
+    if args.hw_ver_str:
         FACTORY_DATA['hw-ver-str']['value'] = args.hw_ver_str
 
-    if (args.calendar_types is not None):
+    if args.calendar_types:
         FACTORY_DATA['cal-types']['value'] = calendar_types_to_uint32(args.calendar_types)
 
     # Supported locale is stored as multiple entries, key format: "locale/<index>, example key: "locale/0"
-    if (args.locales is not None):
+    if args.locales:
         FACTORY_DATA['locale-sz']['value'] = len(args.locales)
 
         for i in range(len(args.locales)):
@@ -325,7 +333,7 @@ def populate_factory_data(args, spake2p_params):
     #  - fl-sz/<index>     : number of fixed labels for the endpoint
     #  - fl-k/<ep>/<index> : fixed label key for the endpoint and index
     #  - fl-v/<ep>/<index> : fixed label value for the endpoint and index
-    if (args.fixed_labels is not None):
+    if args.fixed_labels:
         dict = get_fixed_label_dict(args.fixed_labels)
         for key in dict.keys():
             _sz = {
@@ -378,7 +386,7 @@ def gen_raw_ec_keypair_from_der(key_file, pubkey_raw_file, privkey_raw_file):
         f.write(public_number_y.to_bytes(32, byteorder='big'))
 
 
-def generate_nvs_bin(args):
+def generate_nvs_csv(out_csv_filename):
     csv_content = 'key,type,encoding,value\n'
     csv_content += 'chip-factory,namespace,,\n'
 
@@ -387,31 +395,35 @@ def generate_nvs_bin(args):
             continue
         csv_content += f"{k},{v['type']},{v['encoding']},{v['value']}\n"
 
-    with open(FACTORY_PARTITION_CSV, 'w') as f:
+    with open(out_csv_filename, 'w') as f:
         f.write(csv_content)
 
-    if args.encrypt:
+    logging.info('Generated the factory partition csv file : {}'.format(os.path.abspath(out_csv_filename)))
+
+
+def generate_nvs_bin(encrypt, size, csv_filename, bin_filename):
+    if encrypt:
         nvs_args = SimpleNamespace(version=2,
                                    keygen=True,
                                    keyfile=NVS_KEY_PARTITION_BIN,
                                    inputkey=None,
                                    outdir=os.getcwd(),
-                                   input=FACTORY_PARTITION_CSV,
-                                   output=FACTORY_PARTITION_BIN,
-                                   size=hex(args.size))
+                                   input=csv_filename,
+                                   output=bin_filename,
+                                   size=hex(size))
         nvs_partition_gen.encrypt(nvs_args)
     else:
-        nvs_args = SimpleNamespace(input=FACTORY_PARTITION_CSV,
-                                   output=FACTORY_PARTITION_BIN,
-                                   size=hex(args.size),
+        nvs_args = SimpleNamespace(input=csv_filename,
+                                   output=bin_filename,
+                                   size=hex(size),
                                    outdir=os.getcwd(),
                                    version=2)
         nvs_partition_gen.generate(nvs_args)
 
 
-def print_flashing_help(encrypt):
-    logging.info('Run below command to flash {}'.format(FACTORY_PARTITION_BIN))
-    logging.info('esptool.py -p (PORT) write_flash (FACTORY_PARTITION_ADDR) {}'.format(os.path.join(os.getcwd(), FACTORY_PARTITION_BIN)))
+def print_flashing_help(encrypt, bin_filename):
+    logging.info('Run below command to flash {}'.format(bin_filename))
+    logging.info('esptool.py -p (PORT) write_flash (FACTORY_PARTITION_ADDR) {}'.format(os.path.join(os.getcwd(), bin_filename)))
     if (encrypt):
         logging.info('Run below command to flash {}'.format(NVS_KEY_PARTITION_BIN))
         logging.info('esptool.py -p (PORT) write_flash --encrypt (NVS_KEY_PARTITION_ADDR) {}'.format(
@@ -419,9 +431,10 @@ def print_flashing_help(encrypt):
 
 
 def clean_up():
-    os.remove(FACTORY_PARTITION_CSV)
-    os.remove(FACTORY_DATA['dac-pub-key']['value'])
-    os.remove(FACTORY_DATA['dac-key']['value'])
+    if FACTORY_DATA['dac-pub-key']['value']:
+        os.remove(FACTORY_DATA['dac-pub-key']['value'])
+    if FACTORY_DATA['dac-key']['value']:
+        os.remove(FACTORY_DATA['dac-key']['value'])
 
 
 def main():
@@ -430,53 +443,61 @@ def any_base_int(s): return int(s, 0)
     parser = argparse.ArgumentParser(description='Chip Factory NVS binary generator tool')
 
     # These will be used by CommissionalbeDataProvider
-    parser.add_argument('-p', '--passcode', type=any_base_int, required=True,
+    parser.add_argument('-p', '--passcode', type=any_base_int,
                         help='The setup passcode for pairing, range: 0x01-0x5F5E0FE')
-    parser.add_argument('-d', '--discriminator', type=any_base_int, required=True,
+    parser.add_argument('-d', '--discriminator', type=any_base_int,
                         help='The discriminator for pairing, range: 0x00-0x0FFF')
 
     # These will be used by DeviceAttestationCredentialsProvider
-    parser.add_argument('--dac-cert', type=str, required=True,
-                        help='The path to the DAC certificate in der format')
-    parser.add_argument('--dac-key', type=str, required=True,
-                        help='The path to the DAC private key in der format')
-    parser.add_argument('--pai-cert', type=str, required=True,
-                        help='The path to the PAI certificate in der format')
-    parser.add_argument('--cd', type=str, required=True,
-                        help='The path to the certificate declaration der format')
+    parser.add_argument('--dac-cert', help='The path to the DAC certificate in der format')
+    parser.add_argument('--dac-key', help='The path to the DAC private key in der format')
+    parser.add_argument('--pai-cert', help='The path to the PAI certificate in der format')
+    parser.add_argument('--cd', help='The path to the certificate declaration der format')
 
     # These will be used by DeviceInstanceInfoProvider
-    parser.add_argument('--vendor-id', type=any_base_int, required=False, help='Vendor id')
-    parser.add_argument('--vendor-name', type=str, required=False, help='Vendor name')
-    parser.add_argument('--product-id', type=any_base_int, required=False, help='Product id')
-    parser.add_argument('--product-name', type=str, required=False, help='Product name')
-    parser.add_argument('--hw-ver', type=any_base_int, required=False, help='Hardware version')
-    parser.add_argument('--hw-ver-str', type=str, required=False, help='Hardware version string')
-    parser.add_argument('--mfg-date', type=str, required=False, help='Manufacturing date in format YYYY-MM-DD')
-    parser.add_argument('--serial-num', type=str, required=False, help='Serial number')
-    parser.add_argument('--rd-id-uid', type=str, required=False,
+    parser.add_argument('--vendor-id', type=any_base_int, help='Vendor id')
+    parser.add_argument('--vendor-name', help='Vendor name')
+    parser.add_argument('--product-id', type=any_base_int, help='Product id')
+    parser.add_argument('--product-name', help='Product name')
+    parser.add_argument('--hw-ver', type=any_base_int, help='Hardware version')
+    parser.add_argument('--hw-ver-str', help='Hardware version string')
+    parser.add_argument('--mfg-date', help='Manufacturing date in format YYYY-MM-DD')
+    parser.add_argument('--serial-num', help='Serial number')
+    parser.add_argument('--rd-id-uid',
                         help='128-bit unique identifier for generating rotating device identifier, provide 32-byte hex string, e.g. "1234567890abcdef1234567890abcdef"')
 
     # These will be used by DeviceInfoProvider
-    parser.add_argument('--calendar-types', type=str, nargs='+', required=False,
+    parser.add_argument('--calendar-types', nargs='+',
                         help='List of supported calendar types.\nSupported Calendar Types: Buddhist, Chinese, Coptic, Ethiopian, Gregorian, Hebrew, Indian, Islamic, Japanese, Korean, Persian, Taiwanese')
-    parser.add_argument('--locales', type=str, nargs='+', required=False,
-                        help='List of supported locales, Language Tag as defined by BCP47, eg. en-US en-GB')
-    parser.add_argument('--fixed-labels', type=str, nargs='+', required=False,
+    parser.add_argument('--locales', nargs='+', help='List of supported locales, Language Tag as defined by BCP47, eg. en-US en-GB')
+    parser.add_argument('--fixed-labels', nargs='+',
                         help='List of fixed labels, eg: "0/orientation/up" "1/orientation/down" "2/orientation/down"')
 
-    parser.add_argument('-s', '--size', type=any_base_int, required=False, default=0x6000,
+    parser.add_argument('-s', '--size', type=any_base_int, default=0x6000,
                         help='The size of the partition.bin, default: 0x6000')
-    parser.add_argument('-e', '--encrypt', action='store_true', required=False,
+    parser.add_argument('-e', '--encrypt', action='store_true',
                         help='Encrypt the factory parititon NVS binary')
+    parser.add_argument('--no-bin', action='store_false', dest='generate_bin',
+                        help='Do not generate the factory partition binary')
+    parser.set_defaults(generate_bin=True)
 
     args = parser.parse_args()
     validate_args(args)
-    spake2p_params = gen_spake2p_params(args.passcode)
+
+    if args.passcode is not None:
+        spake2p_params = gen_spake2p_params(args.passcode)
+
     populate_factory_data(args, spake2p_params)
-    gen_raw_ec_keypair_from_der(args.dac_key, FACTORY_DATA['dac-pub-key']['value'], FACTORY_DATA['dac-key']['value'])
-    generate_nvs_bin(args)
-    print_flashing_help(args.encrypt)
+
+    if args.dac_key:
+        gen_raw_ec_keypair_from_der(args.dac_key, FACTORY_DATA['dac-pub-key']['value'], FACTORY_DATA['dac-key']['value'])
+
+    generate_nvs_csv(FACTORY_PARTITION_CSV)
+
+    if args.generate_bin:
+        generate_nvs_bin(args.encrypt, args.size, FACTORY_PARTITION_CSV, FACTORY_PARTITION_BIN)
+        print_flashing_help(args.encrypt, FACTORY_PARTITION_BIN)
+
     clean_up()
 
 
diff --git a/scripts/tools/zap/generate.py b/scripts/tools/zap/generate.py
index 288a2e7f726ee2..e2aa324f65c7bb 100755
--- a/scripts/tools/zap/generate.py
+++ b/scripts/tools/zap/generate.py
@@ -16,6 +16,7 @@
 #
 
 import argparse
+import fcntl
 import json
 import os
 import subprocess
@@ -148,7 +149,13 @@ def runArgumentsParser() -> CmdLineArgs:
     templates_file = getFilePath(args.templates)
     output_dir = getDirPath(output_dir)
 
-    return CmdLineArgs(zap_file, zcl_file, templates_file, output_dir, args.run_bootstrap)
+    return CmdLineArgs(
+        zap_file, zcl_file, templates_file, output_dir, args.run_bootstrap,
+        parallel=args.parallel,
+        prettify_output=args.prettify_output,
+        version_check=args.version_check,
+        lock_file=args.lock_file,
+    )
 
 
 def extractGeneratedIdl(output_dir, zap_config_path):
@@ -276,7 +283,7 @@ def __exit__(self, *args):
             return
 
         fcntl.lockf(self.lock_file, fcntl.LOCK_UN)
-        close(self.lock_file)
+        self.lock_file.close()
         self.lock_file = None
 
 
diff --git a/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/access.h b/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/access.h
index 9650bc4712ad06..56437352d10126 100644
--- a/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/access.h
+++ b/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/access.h
@@ -404,9 +404,9 @@
     0x00000031, /* Cluster: Network Commissioning, Command: ConnectNetwork, Privilege: administer */ \
     0x00000031, /* Cluster: Network Commissioning, Command: ReorderNetwork, Privilege: administer */ \
     0x00000033, /* Cluster: General Diagnostics, Command: TestEventTrigger, Privilege: manage */ \
-    0x0000003C, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
-    0x0000003C, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
-    0x0000003C, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
+    0x0000003C, /* Cluster: Administrator Commissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
+    0x0000003C, /* Cluster: Administrator Commissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
+    0x0000003C, /* Cluster: Administrator Commissioning, Command: RevokeCommissioning, Privilege: administer */ \
     0x0000003E, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \
     0x0000003E, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \
     0x0000003E, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \
@@ -456,9 +456,9 @@
     0x00000006, /* Cluster: Network Commissioning, Command: ConnectNetwork, Privilege: administer */ \
     0x00000008, /* Cluster: Network Commissioning, Command: ReorderNetwork, Privilege: administer */ \
     0x00000000, /* Cluster: General Diagnostics, Command: TestEventTrigger, Privilege: manage */ \
-    0x00000000, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
-    0x00000001, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
-    0x00000002, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
+    0x00000000, /* Cluster: Administrator Commissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
+    0x00000001, /* Cluster: Administrator Commissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
+    0x00000002, /* Cluster: Administrator Commissioning, Command: RevokeCommissioning, Privilege: administer */ \
     0x00000000, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \
     0x00000002, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \
     0x00000004, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \
@@ -508,9 +508,9 @@
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: ConnectNetwork, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: ReorderNetwork, Privilege: administer */ \
     kMatterAccessPrivilegeManage, /* Cluster: General Diagnostics, Command: TestEventTrigger, Privilege: manage */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Administrator Commissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Administrator Commissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Administrator Commissioning, Command: RevokeCommissioning, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \
diff --git a/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/endpoint_config.h b/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/endpoint_config.h
index 471b9cad3665c2..b3770733b83476 100644
--- a/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/endpoint_config.h
+++ b/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/endpoint_config.h
@@ -709,7 +709,7 @@
             { ZAP_SIMPLE_DEFAULT(3), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 },                                /* FeatureMap */       \
             { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },                                  /* ClusterRevision */  \
                                                                                                                                    \
-            /* Endpoint: 0, Cluster: AdministratorCommissioning (server) */                                                        \
+            /* Endpoint: 0, Cluster: Administrator Commissioning (server) */                                                       \
             { ZAP_EMPTY_DEFAULT(), 0x00000000, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* WindowStatus */      \
             { ZAP_EMPTY_DEFAULT(), 0x00000001, 1, ZAP_TYPE(FABRIC_IDX),                                                            \
               ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* AdminFabricIndex */                        \
@@ -1629,7 +1629,7 @@
   /*   AcceptedCommandList (index=48) */ \
   0x00000000 /* ResetCounts */, \
   chip::kInvalidCommandId /* end of list */, \
-  /* Endpoint: 0, Cluster: AdministratorCommissioning (server) */\
+  /* Endpoint: 0, Cluster: Administrator Commissioning (server) */\
   /*   AcceptedCommandList (index=50) */ \
   0x00000000 /* OpenCommissioningWindow */, \
   0x00000001 /* OpenBasicCommissioningWindow */, \
@@ -2128,7 +2128,7 @@
       .generatedCommandList = nullptr ,\
     },\
   { \
-      /* Endpoint: 0, Cluster: AdministratorCommissioning (server) */ \
+      /* Endpoint: 0, Cluster: Administrator Commissioning (server) */ \
       .clusterId = 0x0000003C,  \
       .attributes = ZAP_ATTRIBUTE_INDEX(201), \
       .attributeCount = 5, \
diff --git a/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/gen_config.h b/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/gen_config.h
index b608d4fe5dbf93..15aee97c4f20aa 100644
--- a/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/gen_config.h
+++ b/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/gen_config.h
@@ -251,7 +251,7 @@
 #define EMBER_AF_PLUGIN_SWITCH_SERVER
 #define EMBER_AF_PLUGIN_SWITCH
 
-// Use this macro to check if the server side of the AdministratorCommissioning cluster is included
+// Use this macro to check if the server side of the Administrator Commissioning cluster is included
 #define ZCL_USING_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING_SERVER
 #define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING
diff --git a/scripts/tools/zap/tests/outputs/lighting-app/app-templates/access.h b/scripts/tools/zap/tests/outputs/lighting-app/app-templates/access.h
index 4901b15475745f..b9946f3ca9162d 100644
--- a/scripts/tools/zap/tests/outputs/lighting-app/app-templates/access.h
+++ b/scripts/tools/zap/tests/outputs/lighting-app/app-templates/access.h
@@ -172,9 +172,9 @@
     0x00000031, /* Cluster: Network Commissioning, Command: ConnectNetwork, Privilege: administer */ \
     0x00000031, /* Cluster: Network Commissioning, Command: ReorderNetwork, Privilege: administer */ \
     0x00000033, /* Cluster: General Diagnostics, Command: TestEventTrigger, Privilege: manage */ \
-    0x0000003C, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
-    0x0000003C, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
-    0x0000003C, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
+    0x0000003C, /* Cluster: Administrator Commissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
+    0x0000003C, /* Cluster: Administrator Commissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
+    0x0000003C, /* Cluster: Administrator Commissioning, Command: RevokeCommissioning, Privilege: administer */ \
     0x0000003E, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \
     0x0000003E, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \
     0x0000003E, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \
@@ -207,9 +207,9 @@
     0x00000006, /* Cluster: Network Commissioning, Command: ConnectNetwork, Privilege: administer */ \
     0x00000008, /* Cluster: Network Commissioning, Command: ReorderNetwork, Privilege: administer */ \
     0x00000000, /* Cluster: General Diagnostics, Command: TestEventTrigger, Privilege: manage */ \
-    0x00000000, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
-    0x00000001, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
-    0x00000002, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
+    0x00000000, /* Cluster: Administrator Commissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
+    0x00000001, /* Cluster: Administrator Commissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
+    0x00000002, /* Cluster: Administrator Commissioning, Command: RevokeCommissioning, Privilege: administer */ \
     0x00000000, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \
     0x00000002, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \
     0x00000004, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \
@@ -242,9 +242,9 @@
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: ConnectNetwork, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: ReorderNetwork, Privilege: administer */ \
     kMatterAccessPrivilegeManage, /* Cluster: General Diagnostics, Command: TestEventTrigger, Privilege: manage */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
-    kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Administrator Commissioning, Command: OpenCommissioningWindow, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Administrator Commissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \
+    kMatterAccessPrivilegeAdminister, /* Cluster: Administrator Commissioning, Command: RevokeCommissioning, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \
     kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \
diff --git a/scripts/tools/zap/tests/outputs/lighting-app/app-templates/endpoint_config.h b/scripts/tools/zap/tests/outputs/lighting-app/app-templates/endpoint_config.h
index c65f1edfd2ee7b..2b26cf124fbd63 100644
--- a/scripts/tools/zap/tests/outputs/lighting-app/app-templates/endpoint_config.h
+++ b/scripts/tools/zap/tests/outputs/lighting-app/app-templates/endpoint_config.h
@@ -407,7 +407,7 @@
             { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */                                      \
             { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 },   /* ClusterRevision */                                 \
                                                                                                                                    \
-            /* Endpoint: 0, Cluster: AdministratorCommissioning (server) */                                                        \
+            /* Endpoint: 0, Cluster: Administrator Commissioning (server) */                                                       \
             { ZAP_EMPTY_DEFAULT(), 0x00000000, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* WindowStatus */      \
             { ZAP_EMPTY_DEFAULT(), 0x00000001, 1, ZAP_TYPE(FABRIC_IDX),                                                            \
               ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* AdminFabricIndex */                        \
@@ -651,7 +651,7 @@
   /*   AcceptedCommandList (index=45) */ \
   0x00000000 /* ResetCounts */, \
   chip::kInvalidCommandId /* end of list */, \
-  /* Endpoint: 0, Cluster: AdministratorCommissioning (server) */\
+  /* Endpoint: 0, Cluster: Administrator Commissioning (server) */\
   /*   AcceptedCommandList (index=47) */ \
   0x00000000 /* OpenCommissioningWindow */, \
   0x00000001 /* OpenBasicCommissioningWindow */, \
@@ -944,7 +944,7 @@
       .generatedCommandList = nullptr ,\
     },\
   { \
-      /* Endpoint: 0, Cluster: AdministratorCommissioning (server) */ \
+      /* Endpoint: 0, Cluster: Administrator Commissioning (server) */ \
       .clusterId = 0x0000003C,  \
       .attributes = ZAP_ATTRIBUTE_INDEX(182), \
       .attributeCount = 5, \
diff --git a/scripts/tools/zap/tests/outputs/lighting-app/app-templates/gen_config.h b/scripts/tools/zap/tests/outputs/lighting-app/app-templates/gen_config.h
index 65903e9971cc7c..dc78b319e23cb1 100644
--- a/scripts/tools/zap/tests/outputs/lighting-app/app-templates/gen_config.h
+++ b/scripts/tools/zap/tests/outputs/lighting-app/app-templates/gen_config.h
@@ -162,7 +162,7 @@
 #define EMBER_AF_PLUGIN_SWITCH_SERVER
 #define EMBER_AF_PLUGIN_SWITCH
 
-// Use this macro to check if the server side of the AdministratorCommissioning cluster is included
+// Use this macro to check if the server side of the Administrator Commissioning cluster is included
 #define ZCL_USING_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER
 #define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING_SERVER
 #define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING
diff --git a/scripts/tools/zap/version_update.py b/scripts/tools/zap/version_update.py
index 9f51c5629ecfd8..152db957d492dc 100755
--- a/scripts/tools/zap/version_update.py
+++ b/scripts/tools/zap/version_update.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # Copyright (c) 2023 Project CHIP Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/scripts/tools/zap/zap_execution.py b/scripts/tools/zap/zap_execution.py
index a5eefe157c16a3..cd88d07158c240 100644
--- a/scripts/tools/zap/zap_execution.py
+++ b/scripts/tools/zap/zap_execution.py
@@ -18,9 +18,7 @@
 import sys
 from typing import Tuple
 
-# The version MUST be of the form `YYYY.MM.YY'
-# Since this is ordered as such, alphabetical sorting will be used to check
-# validity
+# The version MUST be of the form `YYYY.M.D'
 #
 # Use scripts/tools/zap/version_update.py to manage ZAP versioning as many
 # files may need updating for versions
@@ -97,7 +95,10 @@ def version_check(self, min_version=None):
             print('*'*80)
             sys.exit(1)
 
-        if version < MIN_ZAP_VERSION:
+        def parse_version_string(str):
+            return list(map(lambda component: int(component), str.split('.')))
+
+        if parse_version_string(version) < parse_version_string(MIN_ZAP_VERSION):
             print(f"Checking ZAP from {self.zap_start}:")
             print(
                 f"  !!! Version validation failed: required at least {MIN_ZAP_VERSION}, got {version} instead")
diff --git a/src/app/clusters/bindings/BindingManager.cpp b/src/app/clusters/bindings/BindingManager.cpp
index ef657300accecc..35ebecda2b3be4 100644
--- a/src/app/clusters/bindings/BindingManager.cpp
+++ b/src/app/clusters/bindings/BindingManager.cpp
@@ -83,13 +83,19 @@ CHIP_ERROR BindingManager::Init(const BindingManagerInitParams & params)
     }
     else
     {
-        for (const EmberBindingTableEntry & entry : BindingTable::GetInstance())
+        // In case the application does not want the BindingManager to establish a CASE session
+        // to the available bindings, it can be disabled by setting mEstablishConnectionOnInit
+        // to false.
+        if (params.mEstablishConnectionOnInit)
         {
-            if (entry.type == EMBER_UNICAST_BINDING)
+            for (const EmberBindingTableEntry & entry : BindingTable::GetInstance())
             {
-                // The CASE connection can also fail if the unicast peer is offline.
-                // There is recovery mechanism to retry connection on-demand so ignore error.
-                (void) UnicastBindingCreated(entry.fabricIndex, entry.nodeId);
+                if (entry.type == EMBER_UNICAST_BINDING)
+                {
+                    // The CASE connection can also fail if the unicast peer is offline.
+                    // There is recovery mechanism to retry connection on-demand so ignore error.
+                    (void) UnicastBindingCreated(entry.fabricIndex, entry.nodeId);
+                }
             }
         }
     }
diff --git a/src/app/clusters/bindings/BindingManager.h b/src/app/clusters/bindings/BindingManager.h
index 5dab4772506555..c5828b42ac30a6 100644
--- a/src/app/clusters/bindings/BindingManager.h
+++ b/src/app/clusters/bindings/BindingManager.h
@@ -53,6 +53,7 @@ struct BindingManagerInitParams
     FabricTable * mFabricTable               = nullptr;
     CASESessionManager * mCASESessionManager = nullptr;
     PersistentStorageDelegate * mStorage     = nullptr;
+    bool mEstablishConnectionOnInit          = true;
 };
 
 /**
@@ -61,6 +62,7 @@ struct BindingManagerInitParams
  * when a binding is ready to be communicated with.
  *
  * A CASE connection will be triggered when:
+ *  - During init of the BindingManager, unless the application actively disables this using mEstablishConnectionOnInit
  *  - The binding cluster adds a unicast entry to the binding table.
  *  - A watched cluster changes with a unicast binding but we cannot find an active connection to the peer.
  *
diff --git a/src/app/clusters/bindings/bindings.cpp b/src/app/clusters/bindings/bindings.cpp
index a3b10c27f39bd5..65d2c90a8d65c7 100644
--- a/src/app/clusters/bindings/bindings.cpp
+++ b/src/app/clusters/bindings/bindings.cpp
@@ -26,6 +26,7 @@
 #include <app/CommandHandler.h>
 #include <app/ConcreteAttributePath.h>
 #include <app/clusters/bindings/bindings.h>
+#include <app/util/af.h>
 #include <app/util/attribute-storage.h>
 #include <lib/support/logging/CHIPLogging.h>
 using namespace chip;
@@ -45,6 +46,7 @@ class BindingTableAccess : public AttributeAccessInterface
 
     CHIP_ERROR Read(const ConcreteReadAttributePath & path, AttributeValueEncoder & encoder) override;
     CHIP_ERROR Write(const ConcreteDataAttributePath & path, AttributeValueDecoder & decoder) override;
+    void OnListWriteEnd(const app::ConcreteAttributePath & aPath, bool aWriteWasSuccessful) override;
 
 private:
     CHIP_ERROR ReadBindingTable(EndpointId endpoint, AttributeValueEncoder & encoder);
@@ -55,19 +57,45 @@ class BindingTableAccess : public AttributeAccessInterface
 
 BindingTableAccess gAttrAccess;
 
-bool IsValidBinding(const TargetStructType & entry)
+bool IsValidBinding(const EndpointId localEndpoint, const TargetStructType & entry)
 {
-    return (!entry.group.HasValue() && entry.endpoint.HasValue() && entry.node.HasValue()) ||
-        (!entry.endpoint.HasValue() && !entry.node.HasValue() && entry.group.HasValue());
+    bool isValid = false;
+
+    // Entry has endpoint, node id and no group id
+    if (!entry.group.HasValue() && entry.endpoint.HasValue() && entry.node.HasValue())
+    {
+        if (entry.cluster.HasValue())
+        {
+            if (emberAfContainsClient(localEndpoint, entry.cluster.Value()))
+            {
+                // Valid node/endpoint/cluster binding
+                isValid = true;
+            }
+        }
+        else
+        {
+            // Valid node/endpoint (no cluster id) binding
+            isValid = true;
+        }
+    }
+    // Entry has group id and no endpoint and node id
+    else if (!entry.endpoint.HasValue() && !entry.node.HasValue() && entry.group.HasValue())
+    {
+        // Valid group binding
+        isValid = true;
+    }
+
+    return isValid;
 }
 
-CHIP_ERROR CheckValidBindingList(const DecodableBindingListType & bindingList, FabricIndex accessingFabricIndex)
+CHIP_ERROR CheckValidBindingList(const EndpointId localEndpoint, const DecodableBindingListType & bindingList,
+                                 FabricIndex accessingFabricIndex)
 {
     size_t listSize = 0;
     auto iter       = bindingList.begin();
     while (iter.Next())
     {
-        VerifyOrReturnError(IsValidBinding(iter.GetValue()), CHIP_IM_GLOBAL_STATUS(ConstraintError));
+        VerifyOrReturnError(IsValidBinding(localEndpoint, iter.GetValue()), CHIP_IM_GLOBAL_STATUS(ConstraintError));
         listSize++;
     }
     ReturnErrorOnFailure(iter.GetStatus());
@@ -159,6 +187,12 @@ CHIP_ERROR BindingTableAccess::Write(const ConcreteDataAttributePath & path, Att
     return CHIP_NO_ERROR;
 }
 
+void BindingTableAccess::OnListWriteEnd(const app::ConcreteAttributePath & aPath, bool aWriteWasSuccessful)
+{
+    // Notify binding table has changed
+    LogErrorOnFailure(NotifyBindingsChanged());
+}
+
 CHIP_ERROR BindingTableAccess::WriteBindingTable(const ConcreteDataAttributePath & path, AttributeValueDecoder & decoder)
 {
     FabricIndex accessingFabricIndex = decoder.AccessingFabricIndex();
@@ -167,7 +201,7 @@ CHIP_ERROR BindingTableAccess::WriteBindingTable(const ConcreteDataAttributePath
         DecodableBindingListType newBindingList;
 
         ReturnErrorOnFailure(decoder.Decode(newBindingList));
-        ReturnErrorOnFailure(CheckValidBindingList(newBindingList, accessingFabricIndex));
+        ReturnErrorOnFailure(CheckValidBindingList(path.mEndpointId, newBindingList, accessingFabricIndex));
 
         // Clear all entries for the current accessing fabric and endpoint
         auto bindingTableIter = BindingTable::GetInstance().begin();
@@ -193,19 +227,25 @@ CHIP_ERROR BindingTableAccess::WriteBindingTable(const ConcreteDataAttributePath
         {
             CreateBindingEntry(iter.GetValue(), path.mEndpointId);
         }
-        LogErrorOnFailure(NotifyBindingsChanged());
+
+        // If this was not caused by a list operation, OnListWriteEnd is not going to be triggered
+        // so a notification is sent here.
+        if (!path.IsListOperation())
+        {
+            // Notify binding table has changed
+            LogErrorOnFailure(NotifyBindingsChanged());
+        }
         return CHIP_NO_ERROR;
     }
     if (path.mListOp == ConcreteDataAttributePath::ListOperation::AppendItem)
     {
         TargetStructType target;
         ReturnErrorOnFailure(decoder.Decode(target));
-        if (!IsValidBinding(target))
+        if (!IsValidBinding(path.mEndpointId, target))
         {
             return CHIP_IM_GLOBAL_STATUS(ConstraintError);
         }
         CreateBindingEntry(target, path.mEndpointId);
-        LogErrorOnFailure(NotifyBindingsChanged());
         return CHIP_NO_ERROR;
     }
     return CHIP_IM_GLOBAL_STATUS(UnsupportedWrite);
diff --git a/src/app/clusters/color-control-server/color-control-server.cpp b/src/app/clusters/color-control-server/color-control-server.cpp
index 8d6230e6ede743..593fcb64ffaee5 100644
--- a/src/app/clusters/color-control-server/color-control-server.cpp
+++ b/src/app/clusters/color-control-server/color-control-server.cpp
@@ -2270,7 +2270,7 @@ bool ColorControlServer::moveColorTempCommand(const app::ConcreteCommandPath & c
 bool ColorControlServer::moveToColorTempCommand(const app::ConcreteCommandPath & commandPath,
                                                 const Commands::MoveToColorTemperature::DecodableType & commandData)
 {
-    uint16_t colorTemperature = commandData.colorTemperature;
+    uint16_t colorTemperature = commandData.colorTemperatureMireds;
     uint16_t transitionTime   = commandData.transitionTime;
     uint8_t optionsMask       = commandData.optionsMask;
     uint8_t optionsOverride   = commandData.optionsOverride;
diff --git a/src/app/clusters/door-lock-server/door-lock-server-callback.cpp b/src/app/clusters/door-lock-server/door-lock-server-callback.cpp
index 77c38d1f9d5d9f..0259f6100516b4 100644
--- a/src/app/clusters/door-lock-server/door-lock-server-callback.cpp
+++ b/src/app/clusters/door-lock-server/door-lock-server-callback.cpp
@@ -24,7 +24,6 @@
 #include "door-lock-server.h"
 #include <app-common/zap-generated/attributes/Accessors.h>
 #include <app-common/zap-generated/callback.h>
-#include <app-common/zap-generated/command-id.h>
 #include <app/EventLogging.h>
 #include <app/server/Server.h>
 #include <app/util/af-event.h>
@@ -47,16 +46,16 @@ using namespace chip::app::Clusters::DoorLock;
 // =============================================================================
 
 bool __attribute__((weak))
-emberAfPluginDoorLockOnDoorLockCommand(chip::EndpointId endpointId, const Optional<ByteSpan> & pinCode, DlOperationError & err)
+emberAfPluginDoorLockOnDoorLockCommand(chip::EndpointId endpointId, const Optional<ByteSpan> & pinCode, OperationErrorEnum & err)
 {
-    err = DlOperationError::kUnspecified;
+    err = OperationErrorEnum::kUnspecified;
     return false;
 }
 
 bool __attribute__((weak))
-emberAfPluginDoorLockOnDoorUnlockCommand(chip::EndpointId endpointId, const Optional<ByteSpan> & pinCode, DlOperationError & err)
+emberAfPluginDoorLockOnDoorUnlockCommand(chip::EndpointId endpointId, const Optional<ByteSpan> & pinCode, OperationErrorEnum & err)
 {
-    err = DlOperationError::kUnspecified;
+    err = OperationErrorEnum::kUnspecified;
     return false;
 }
 
@@ -133,14 +132,14 @@ emberAfPluginDoorLockGetUser(chip::EndpointId endpointId, uint16_t userIndex, Em
 
 bool __attribute__((weak))
 emberAfPluginDoorLockSetUser(chip::EndpointId endpointId, uint16_t userIndex, chip::FabricIndex creator, chip::FabricIndex modifier,
-                             const chip::CharSpan & userName, uint32_t uniqueId, DlUserStatus userStatus, DlUserType usertype,
-                             DlCredentialRule credentialRule, const DlCredential * credentials, size_t totalCredentials)
+                             const chip::CharSpan & userName, uint32_t uniqueId, UserStatusEnum userStatus, UserTypeEnum usertype,
+                             CredentialRuleEnum credentialRule, const CredentialStruct * credentials, size_t totalCredentials)
 {
     return false;
 }
 
 bool __attribute__((weak))
-emberAfPluginDoorLockGetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, DlCredentialType credentialType,
+emberAfPluginDoorLockGetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, CredentialTypeEnum credentialType,
                                    EmberAfPluginDoorLockCredentialInfo & credential)
 {
     return false;
@@ -148,8 +147,8 @@ emberAfPluginDoorLockGetCredential(chip::EndpointId endpointId, uint16_t credent
 
 bool __attribute__((weak))
 emberAfPluginDoorLockSetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, chip::FabricIndex creator,
-                                   chip::FabricIndex modifier, DlCredentialStatus credentialStatus, DlCredentialType credentialType,
-                                   const chip::ByteSpan & credentialData)
+                                   chip::FabricIndex modifier, DlCredentialStatus credentialStatus,
+                                   CredentialTypeEnum credentialType, const chip::ByteSpan & credentialData)
 {
     return false;
 }
@@ -174,7 +173,7 @@ emberAfPluginDoorLockGetSchedule(chip::EndpointId endpointId, uint8_t holidayInd
 
 DlStatus __attribute__((weak))
 emberAfPluginDoorLockSetSchedule(chip::EndpointId endpointId, uint8_t weekdayIndex, uint16_t userIndex, DlScheduleStatus status,
-                                 DlDaysMaskMap daysMask, uint8_t startHour, uint8_t startMinute, uint8_t endHour, uint8_t endMinute)
+                                 DaysMaskMap daysMask, uint8_t startHour, uint8_t startMinute, uint8_t endHour, uint8_t endMinute)
 {
     return DlStatus::kFailure;
 }
@@ -188,7 +187,7 @@ emberAfPluginDoorLockSetSchedule(chip::EndpointId endpointId, uint8_t yearDayInd
 
 DlStatus __attribute__((weak))
 emberAfPluginDoorLockSetSchedule(chip::EndpointId endpointId, uint8_t holidayIndex, DlScheduleStatus status,
-                                 uint32_t localStartTime, uint32_t localEndTime, DlOperatingMode operatingMode)
+                                 uint32_t localStartTime, uint32_t localEndTime, OperatingModeEnum operatingMode)
 {
     return DlStatus::kFailure;
 }
diff --git a/src/app/clusters/door-lock-server/door-lock-server.cpp b/src/app/clusters/door-lock-server/door-lock-server.cpp
index 86f6b10fe7b7d4..35fc3c954dc40d 100644
--- a/src/app/clusters/door-lock-server/door-lock-server.cpp
+++ b/src/app/clusters/door-lock-server/door-lock-server.cpp
@@ -106,12 +106,12 @@ bool DoorLockServer::SetLockState(chip::EndpointId endpointId, DlLockState newLo
     return SetAttribute(endpointId, Attributes::LockState::Id, Attributes::LockState::Set, newLockState);
 }
 
-bool DoorLockServer::SetLockState(chip::EndpointId endpointId, DlLockState newLockState, DlOperationSource opSource)
+bool DoorLockServer::SetLockState(chip::EndpointId endpointId, DlLockState newLockState, OperationSourceEnum opSource)
 {
     bool success = SetLockState(endpointId, newLockState);
 
     // Remote operations are handled separately as they use more data unavailable here
-    VerifyOrReturnError(DlOperationSource::kRemote != opSource, success);
+    VerifyOrReturnError(OperationSourceEnum::kRemote != opSource, success);
 
     // DlLockState::kNotFullyLocked has no appropriate event to send. Also it is unclear whether
     // it should schedule auto-relocking. So skip it here. Check for supported states explicitly
@@ -119,13 +119,13 @@ bool DoorLockServer::SetLockState(chip::EndpointId endpointId, DlLockState newLo
     VerifyOrReturnError(DlLockState::kLocked == newLockState || DlLockState::kUnlocked == newLockState, success);
 
     // Send LockOperation event
-    auto opType = (DlLockState::kLocked == newLockState) ? DlLockOperationType::kLock : DlLockOperationType::kUnlock;
+    auto opType = (DlLockState::kLocked == newLockState) ? LockOperationTypeEnum::kLock : LockOperationTypeEnum::kUnlock;
 
-    SendLockOperationEvent(endpointId, opType, opSource, DlOperationError::kUnspecified, Nullable<uint16_t>(),
+    SendLockOperationEvent(endpointId, opType, opSource, OperationErrorEnum::kUnspecified, Nullable<uint16_t>(),
                            Nullable<chip::FabricIndex>(), Nullable<chip::NodeId>(), nullptr, 0, success);
 
     // Schedule auto-relocking
-    if (success && DlLockOperationType::kUnlock == opType)
+    if (success && LockOperationTypeEnum::kUnlock == opType)
     {
         // appclusters.pdf 5.3.3.25:
         // The number of seconds to wait after unlocking a lock before it automatically locks again. 0=disabled. If set, unlock
@@ -145,7 +145,7 @@ bool DoorLockServer::SetActuatorEnabled(chip::EndpointId endpointId, bool newAct
     return SetAttribute(endpointId, Attributes::ActuatorEnabled::Id, Attributes::ActuatorEnabled::Set, newActuatorState);
 }
 
-bool DoorLockServer::SetDoorState(chip::EndpointId endpointId, DlDoorState newDoorState)
+bool DoorLockServer::SetDoorState(chip::EndpointId endpointId, DoorStateEnum newDoorState)
 {
     bool success = SetAttribute(endpointId, Attributes::DoorState::Id, Attributes::DoorState::Set, newDoorState);
 
@@ -294,7 +294,7 @@ bool DoorLockServer::GetNumberOfHolidaySchedulesSupported(chip::EndpointId endpo
                         Attributes::NumberOfHolidaySchedulesSupported::Get, numberOfHolidaySchedules);
 }
 
-bool DoorLockServer::SendLockAlarmEvent(chip::EndpointId endpointId, DlAlarmCode alarmCode)
+bool DoorLockServer::SendLockAlarmEvent(chip::EndpointId endpointId, AlarmCodeEnum alarmCode)
 {
     Events::DoorLockAlarm::Type event{ alarmCode };
     SendEvent(endpointId, event);
@@ -305,10 +305,10 @@ bool DoorLockServer::SendLockAlarmEvent(chip::EndpointId endpointId, DlAlarmCode
 namespace {
 // Check whether this is valid UserStatus for a SetUser or SetCredential
 // command.
-bool IsValidUserStatusForSet(const Nullable<DlUserStatus> & userStatus)
+bool IsValidUserStatusForSet(const Nullable<UserStatusEnum> & userStatus)
 {
-    return userStatus.IsNull() || (userStatus.Value() == DlUserStatus::kOccupiedEnabled) ||
-        (userStatus.Value() == DlUserStatus::kOccupiedDisabled);
+    return userStatus.IsNull() || (userStatus.Value() == UserStatusEnum::kOccupiedEnabled) ||
+        (userStatus.Value() == UserStatusEnum::kOccupiedDisabled);
 }
 } // anonymous namespace
 
@@ -346,7 +346,7 @@ void DoorLockServer::setUserCommandHandler(chip::app::CommandHandler * commandOb
 
     auto & operationType  = commandData.operationType;
     auto & userName       = commandData.userName;
-    auto & userUniqueId   = commandData.userUniqueId;
+    auto & userUniqueId   = commandData.userUniqueID;
     auto & userStatus     = commandData.userStatus;
     auto & userType       = commandData.userType;
     auto & credentialRule = commandData.credentialRule;
@@ -380,7 +380,8 @@ void DoorLockServer::setUserCommandHandler(chip::app::CommandHandler * commandOb
         return;
     }
 
-    if (!userType.IsNull() && (userType.Value() < DlUserType::kUnrestrictedUser || userType.Value() > DlUserType::kRemoteOnlyUser))
+    if (!userType.IsNull() &&
+        (userType.Value() < UserTypeEnum::kUnrestrictedUser || userType.Value() > UserTypeEnum::kRemoteOnlyUser))
     {
         emberAfDoorLockClusterPrintln(
             "[SetUser] Unable to set the user: user type is out of range [endpointId=%d,userIndex=%d,userType=%u]",
@@ -393,15 +394,15 @@ void DoorLockServer::setUserCommandHandler(chip::app::CommandHandler * commandOb
     EmberAfStatus status = EMBER_ZCL_STATUS_SUCCESS;
     switch (operationType)
     {
-    case DlDataOperationType::kAdd:
+    case DataOperationTypeEnum::kAdd:
         status = createUser(commandPath.mEndpointId, fabricIdx, sourceNodeId, userIndex, userName, userUniqueId, userStatus,
                             userType, credentialRule);
         break;
-    case DlDataOperationType::kModify:
+    case DataOperationTypeEnum::kModify:
         status = modifyUser(commandPath.mEndpointId, fabricIdx, sourceNodeId, userIndex, userName, userUniqueId, userStatus,
                             userType, credentialRule);
         break;
-    case DlDataOperationType::kClear:
+    case DataOperationTypeEnum::kClear:
     default:
         // appclusters, 5.2.4.34: SetUser command allow only kAdd/kModify, we should respond with INVALID_COMMAND if we got kClear
         // or anything else
@@ -449,7 +450,7 @@ void DoorLockServer::getUserCommandHandler(chip::app::CommandHandler * commandOb
         using ResponseFields = Commands::GetUserResponse::Fields;
 
         // appclusters, 5.2.4.36: we should not add user-specific field if the user status is set to Available
-        if (DlUserStatus::kAvailable != user.userStatus)
+        if (UserStatusEnum::kAvailable != user.userStatus)
         {
             emberAfDoorLockClusterPrintln("Found user in storage: "
                                           "[userIndex=%d,userName=\"%.*s\",userStatus=%u,userType=%u"
@@ -461,7 +462,7 @@ void DoorLockServer::getUserCommandHandler(chip::app::CommandHandler * commandOb
             SuccessOrExit(err = writer->PutString(TLV::ContextTag(to_underlying(ResponseFields::kUserName)), user.userName));
             if (0xFFFFFFFFU != user.userUniqueId)
             {
-                SuccessOrExit(err = writer->Put(TLV::ContextTag(to_underlying(ResponseFields::kUserUniqueId)), user.userUniqueId));
+                SuccessOrExit(err = writer->Put(TLV::ContextTag(to_underlying(ResponseFields::kUserUniqueID)), user.userUniqueId));
             }
             SuccessOrExit(err = writer->Put(TLV::ContextTag(to_underlying(ResponseFields::kUserStatus)), user.userStatus));
             SuccessOrExit(err = writer->Put(TLV::ContextTag(to_underlying(ResponseFields::kUserType)), user.userType));
@@ -473,9 +474,9 @@ void DoorLockServer::getUserCommandHandler(chip::app::CommandHandler * commandOb
                                                            TLV::kTLVType_Array, credentialsContainer));
                 for (size_t i = 0; i < user.credentials.size(); ++i)
                 {
-                    Structs::DlCredential::Type credential;
+                    Structs::CredentialStruct::Type credential;
                     credential.credentialIndex = user.credentials.data()[i].CredentialIndex;
-                    credential.credentialType  = static_cast<DlCredentialType>(user.credentials.data()[i].CredentialType);
+                    credential.credentialType  = static_cast<CredentialTypeEnum>(user.credentials.data()[i].CredentialType);
                     SuccessOrExit(err = credential.Encode(*writer, TLV::AnonymousTag()));
                 }
                 SuccessOrExit(err = writer->EndContainer(credentialsContainer));
@@ -581,7 +582,7 @@ void DoorLockServer::clearUserCommandHandler(chip::app::CommandHandler * command
     }
     emberAfDoorLockClusterPrintln("[ClearUser] Removed all users from storage [users=%d]", maxNumberOfUsers);
 
-    sendRemoteLockUserChange(commandPath.mEndpointId, DlLockDataType::kUserIndex, DlDataOperationType::kClear, sourceNodeId,
+    sendRemoteLockUserChange(commandPath.mEndpointId, LockDataTypeEnum::kUserIndex, DataOperationTypeEnum::kClear, sourceNodeId,
                              fabricIdx, 0xFFFE, 0xFFFE);
 
     emberAfSendImmediateDefaultResponse(EMBER_ZCL_STATUS_SUCCESS);
@@ -649,7 +650,7 @@ void DoorLockServer::setCredentialCommandHandler(
     }
 
     // appclusters, 5.2.4.41.1: we should return DUPLICATE in the response if we're trying to create duplicated credential entry
-    for (uint16_t i = 1; DlCredentialType::kProgrammingPIN != credentialType && (i <= maxNumberOfCredentials); ++i)
+    for (uint16_t i = 1; CredentialTypeEnum::kProgrammingPIN != credentialType && (i <= maxNumberOfCredentials); ++i)
     {
         EmberAfPluginDoorLockCredentialInfo currentCredential;
         if (!emberAfPluginDoorLockGetCredential(commandPath.mEndpointId, i, credentialType, currentCredential))
@@ -693,7 +694,8 @@ void DoorLockServer::setCredentialCommandHandler(
         return;
     }
 
-    if (!userType.IsNull() && (userType.Value() < DlUserType::kUnrestrictedUser || userType.Value() > DlUserType::kRemoteOnlyUser))
+    if (!userType.IsNull() &&
+        (userType.Value() < UserTypeEnum::kUnrestrictedUser || userType.Value() > UserTypeEnum::kRemoteOnlyUser))
     {
         emberAfDoorLockClusterPrintln("[SetCredential] Unable to set the credential: user type is out of range "
                                       "[endpointId=%d,credentialIndex=%d,userType=%u]",
@@ -704,7 +706,7 @@ void DoorLockServer::setCredentialCommandHandler(
 
     switch (operationType)
     {
-    case DlDataOperationType::kAdd: {
+    case DataOperationTypeEnum::kAdd: {
         uint16_t createdUserIndex = 0;
 
         status = createCredential(commandPath.mEndpointId, fabricIdx, sourceNodeId, credentialIndex, credentialType,
@@ -713,7 +715,7 @@ void DoorLockServer::setCredentialCommandHandler(
         sendSetCredentialResponse(commandObj, commandPath, status, createdUserIndex, nextAvailableCredentialSlot);
         return;
     }
-    case DlDataOperationType::kModify: {
+    case DataOperationTypeEnum::kModify: {
         // appclusters, 5.2.4.41.1: should send the INVALID_COMMAND in the response when the credential is in use
         if (DlCredentialStatus::kAvailable == existingCredential.status)
         {
@@ -739,7 +741,7 @@ void DoorLockServer::setCredentialCommandHandler(
         sendSetCredentialResponse(commandObj, commandPath, status, 0, nextAvailableCredentialSlot);
         return;
     }
-    case DlDataOperationType::kClear:
+    case DataOperationTypeEnum::kClear:
     default:
         // appclusters, 5.2.4.40: set credential command supports only Add and Modify operational type.
         sendSetCredentialResponse(commandObj, commandPath, DlStatus::kInvalidField, 0, nextAvailableCredentialSlot);
@@ -748,7 +750,7 @@ void DoorLockServer::setCredentialCommandHandler(
 
 void DoorLockServer::getCredentialStatusCommandHandler(chip::app::CommandHandler * commandObj,
                                                        const chip::app::ConcreteCommandPath & commandPath,
-                                                       DlCredentialType credentialType, uint16_t credentialIndex)
+                                                       CredentialTypeEnum credentialType, uint16_t credentialIndex)
 {
     emberAfDoorLockClusterPrintln("[GetCredentialStatus] Incoming command [endpointId=%d]", commandPath.mEndpointId);
 
@@ -801,8 +803,9 @@ void DoorLockServer::getCredentialStatusCommandHandler(chip::app::CommandHandler
 }
 
 void DoorLockServer::sendGetCredentialResponse(chip::app::CommandHandler * commandObj,
-                                               const chip::app::ConcreteCommandPath & commandPath, DlCredentialType credentialType,
-                                               uint16_t credentialIndex, uint16_t userIndexWithCredential,
+                                               const chip::app::ConcreteCommandPath & commandPath,
+                                               CredentialTypeEnum credentialType, uint16_t credentialIndex,
+                                               uint16_t userIndexWithCredential,
                                                EmberAfPluginDoorLockCredentialInfo * credentialInfo, bool credentialExists)
 {
     Commands::GetCredentialStatusResponse::Type response{ .credentialExists = credentialExists };
@@ -882,7 +885,7 @@ void DoorLockServer::clearCredentialCommandHandler(
 
 void DoorLockServer::setWeekDayScheduleCommandHandler(chip::app::CommandHandler * commandObj,
                                                       const chip::app::ConcreteCommandPath & commandPath, uint8_t weekDayIndex,
-                                                      uint16_t userIndex, const chip::BitMask<DlDaysMaskMap> & daysMask,
+                                                      uint16_t userIndex, const chip::BitMask<DaysMaskMap> & daysMask,
                                                       uint8_t startHour, uint8_t startMinute, uint8_t endHour, uint8_t endMinute)
 {
     auto endpointId = commandPath.mEndpointId;
@@ -983,7 +986,7 @@ void DoorLockServer::setWeekDayScheduleCommandHandler(chip::app::CommandHandler
                                   "[endpointId=%d,weekDayIndex=%d,userIndex=%d,daysMask=%d,startTime=\"%d:%d\",endTime=\"%d:%d\"]",
                                   endpointId, weekDayIndex, userIndex, daysMask.Raw(), startHour, startMinute, endHour, endMinute);
 
-    sendRemoteLockUserChange(endpointId, DlLockDataType::kWeekDaySchedule, DlDataOperationType::kAdd, sourceNodeId, fabricIdx,
+    sendRemoteLockUserChange(endpointId, LockDataTypeEnum::kWeekDaySchedule, DataOperationTypeEnum::kAdd, sourceNodeId, fabricIdx,
                              userIndex, static_cast<uint16_t>(weekDayIndex));
 
     emberAfSendImmediateDefaultResponse(EMBER_ZCL_STATUS_SUCCESS);
@@ -1103,7 +1106,7 @@ void DoorLockServer::clearWeekDayScheduleCommandHandler(chip::app::CommandHandle
         return;
     }
 
-    sendRemoteLockUserChange(endpointId, DlLockDataType::kWeekDaySchedule, DlDataOperationType::kClear, sourceNodeId, fabricIdx,
+    sendRemoteLockUserChange(endpointId, LockDataTypeEnum::kWeekDaySchedule, DataOperationTypeEnum::kClear, sourceNodeId, fabricIdx,
                              userIndex, static_cast<uint16_t>(weekDayIndex));
 
     emberAfSendImmediateDefaultResponse(EMBER_ZCL_STATUS_SUCCESS);
@@ -1183,7 +1186,7 @@ void DoorLockServer::setYearDayScheduleCommandHandler(chip::app::CommandHandler
                                   "[endpointId=%d,yearDayIndex=%d,userIndex=%d,localStartTime=%" PRIu32 ",endTime=%" PRIu32 "]",
                                   endpointId, yearDayIndex, userIndex, localStartTime, localEndTime);
 
-    sendRemoteLockUserChange(endpointId, DlLockDataType::kYearDaySchedule, DlDataOperationType::kAdd, sourceNodeId, fabricIdx,
+    sendRemoteLockUserChange(endpointId, LockDataTypeEnum::kYearDaySchedule, DataOperationTypeEnum::kAdd, sourceNodeId, fabricIdx,
                              userIndex, static_cast<uint16_t>(yearDayIndex));
 
     emberAfSendImmediateDefaultResponse(EMBER_ZCL_STATUS_SUCCESS);
@@ -1301,7 +1304,7 @@ void DoorLockServer::clearYearDayScheduleCommandHandler(chip::app::CommandHandle
         return;
     }
 
-    sendRemoteLockUserChange(endpointId, DlLockDataType::kYearDaySchedule, DlDataOperationType::kClear, sourceNodeId, fabricIdx,
+    sendRemoteLockUserChange(endpointId, LockDataTypeEnum::kYearDaySchedule, DataOperationTypeEnum::kClear, sourceNodeId, fabricIdx,
                              userIndex, static_cast<uint16_t>(yearDayIndex));
 
     emberAfSendImmediateDefaultResponse(EMBER_ZCL_STATUS_SUCCESS);
@@ -1406,16 +1409,16 @@ bool DoorLockServer::userExists(chip::EndpointId endpointId, uint16_t userIndex)
                      userIndex);
         return false;
     }
-    return DlUserStatus::kAvailable != user.userStatus;
+    return UserStatusEnum::kAvailable != user.userStatus;
 }
 
-bool DoorLockServer::credentialIndexValid(chip::EndpointId endpointId, DlCredentialType type, uint16_t credentialIndex)
+bool DoorLockServer::credentialIndexValid(chip::EndpointId endpointId, CredentialTypeEnum type, uint16_t credentialIndex)
 {
     uint16_t maxCredentials = 0;
     return credentialIndexValid(endpointId, type, credentialIndex, maxCredentials);
 }
 
-bool DoorLockServer::credentialIndexValid(chip::EndpointId endpointId, DlCredentialType type, uint16_t credentialIndex,
+bool DoorLockServer::credentialIndexValid(chip::EndpointId endpointId, CredentialTypeEnum type, uint16_t credentialIndex,
                                           uint16_t & maxNumberOfCredentials)
 {
     if (!getMaxNumberOfCredentials(endpointId, type, maxNumberOfCredentials))
@@ -1424,7 +1427,7 @@ bool DoorLockServer::credentialIndexValid(chip::EndpointId endpointId, DlCredent
     }
 
     // appclusters, 5.2.6.3.1: 0 is allowed index for Programming PIN credential only
-    if (DlCredentialType::kProgrammingPIN == type)
+    if (CredentialTypeEnum::kProgrammingPIN == type)
     {
         return (0 == credentialIndex);
     }
@@ -1437,7 +1440,7 @@ bool DoorLockServer::credentialIndexValid(chip::EndpointId endpointId, DlCredent
     return true;
 }
 
-DlStatus DoorLockServer::credentialLengthWithinRange(chip::EndpointId endpointId, DlCredentialType type,
+DlStatus DoorLockServer::credentialLengthWithinRange(chip::EndpointId endpointId, CredentialTypeEnum type,
                                                      const chip::ByteSpan & credentialData)
 {
     bool statusMin = true, statusMax = true;
@@ -1445,12 +1448,12 @@ DlStatus DoorLockServer::credentialLengthWithinRange(chip::EndpointId endpointId
 
     switch (type)
     {
-    case DlCredentialType::kProgrammingPIN:
-    case DlCredentialType::kPin:
+    case CredentialTypeEnum::kProgrammingPIN:
+    case CredentialTypeEnum::kPin:
         statusMin = GetAttribute(endpointId, Attributes::MinPINCodeLength::Id, Attributes::MinPINCodeLength::Get, minLen);
         statusMax = GetAttribute(endpointId, Attributes::MaxPINCodeLength::Id, Attributes::MaxPINCodeLength::Get, maxLen);
         break;
-    case DlCredentialType::kRfid:
+    case CredentialTypeEnum::kRfid:
         statusMin = GetAttribute(endpointId, Attributes::MinRFIDCodeLength::Id, Attributes::MinRFIDCodeLength::Get, minLen);
         statusMax = GetAttribute(endpointId, Attributes::MaxRFIDCodeLength::Id, Attributes::MaxRFIDCodeLength::Get, maxLen);
         break;
@@ -1477,20 +1480,20 @@ DlStatus DoorLockServer::credentialLengthWithinRange(chip::EndpointId endpointId
     return DlStatus::kSuccess;
 }
 
-bool DoorLockServer::getMaxNumberOfCredentials(chip::EndpointId endpointId, DlCredentialType credentialType,
+bool DoorLockServer::getMaxNumberOfCredentials(chip::EndpointId endpointId, CredentialTypeEnum credentialType,
                                                uint16_t & maxNumberOfCredentials)
 {
     maxNumberOfCredentials = 0;
     bool status            = false;
     switch (credentialType)
     {
-    case DlCredentialType::kProgrammingPIN:
+    case CredentialTypeEnum::kProgrammingPIN:
         maxNumberOfCredentials = 1;
         return true;
-    case DlCredentialType::kPin:
+    case CredentialTypeEnum::kPin:
         status = GetNumberOfPINCredentialsSupported(endpointId, maxNumberOfCredentials);
         break;
-    case DlCredentialType::kRfid:
+    case CredentialTypeEnum::kRfid:
         status = GetNumberOfRFIDCredentialsSupported(endpointId, maxNumberOfCredentials);
         break;
     default:
@@ -1517,7 +1520,7 @@ bool DoorLockServer::findOccupiedUserSlot(chip::EndpointId endpointId, uint16_t
             return false;
         }
 
-        if (DlUserStatus::kAvailable != user.userStatus)
+        if (UserStatusEnum::kAvailable != user.userStatus)
         {
             userIndex = i;
             return true;
@@ -1548,7 +1551,7 @@ bool DoorLockServer::findUnoccupiedUserSlot(chip::EndpointId endpointId, uint16_
             return false;
         }
 
-        if (DlUserStatus::kAvailable == user.userStatus)
+        if (UserStatusEnum::kAvailable == user.userStatus)
         {
             userIndex = i;
             return true;
@@ -1557,7 +1560,7 @@ bool DoorLockServer::findUnoccupiedUserSlot(chip::EndpointId endpointId, uint16_
     return false;
 }
 
-bool DoorLockServer::findOccupiedCredentialSlot(chip::EndpointId endpointId, DlCredentialType credentialType, uint16_t startIndex,
+bool DoorLockServer::findOccupiedCredentialSlot(chip::EndpointId endpointId, CredentialTypeEnum credentialType, uint16_t startIndex,
                                                 uint16_t & credentialIndex)
 {
     uint16_t maxNumberOfCredentials = 0;
@@ -1568,7 +1571,7 @@ bool DoorLockServer::findOccupiedCredentialSlot(chip::EndpointId endpointId, DlC
 
     // Programming PIN index starts with 0, and it is assumed that it is unique. Therefore different bounds checking for that
     // credential type
-    if (DlCredentialType::kProgrammingPIN == credentialType)
+    if (CredentialTypeEnum::kProgrammingPIN == credentialType)
     {
         maxNumberOfCredentials--;
     }
@@ -1593,8 +1596,8 @@ bool DoorLockServer::findOccupiedCredentialSlot(chip::EndpointId endpointId, DlC
     return false;
 }
 
-bool DoorLockServer::findUnoccupiedCredentialSlot(chip::EndpointId endpointId, DlCredentialType credentialType, uint16_t startIndex,
-                                                  uint16_t & credentialIndex)
+bool DoorLockServer::findUnoccupiedCredentialSlot(chip::EndpointId endpointId, CredentialTypeEnum credentialType,
+                                                  uint16_t startIndex, uint16_t & credentialIndex)
 {
     uint16_t maxNumberOfCredentials = 0;
     if (!getMaxNumberOfCredentials(endpointId, credentialType, maxNumberOfCredentials))
@@ -1604,7 +1607,7 @@ bool DoorLockServer::findUnoccupiedCredentialSlot(chip::EndpointId endpointId, D
 
     // Programming PIN index starts with 0, and it is assumed that it is unique. Therefor different bounds checking for that
     // credential type
-    if (DlCredentialType::kProgrammingPIN == credentialType)
+    if (CredentialTypeEnum::kProgrammingPIN == credentialType)
     {
         maxNumberOfCredentials--;
     }
@@ -1629,7 +1632,7 @@ bool DoorLockServer::findUnoccupiedCredentialSlot(chip::EndpointId endpointId, D
     return false;
 }
 
-bool DoorLockServer::findUserIndexByCredential(chip::EndpointId endpointId, DlCredentialType credentialType,
+bool DoorLockServer::findUserIndexByCredential(chip::EndpointId endpointId, CredentialTypeEnum credentialType,
                                                uint16_t credentialIndex, uint16_t & userIndex)
 {
     uint16_t maxNumberOfUsers = 0;
@@ -1648,7 +1651,7 @@ bool DoorLockServer::findUserIndexByCredential(chip::EndpointId endpointId, DlCr
         }
 
         // Go through occupied users only
-        if (DlUserStatus::kAvailable == user.userStatus)
+        if (UserStatusEnum::kAvailable == user.userStatus)
         {
             continue;
         }
@@ -1667,7 +1670,7 @@ bool DoorLockServer::findUserIndexByCredential(chip::EndpointId endpointId, DlCr
     return false;
 }
 
-bool DoorLockServer::findUserIndexByCredential(chip::EndpointId endpointId, DlCredentialType credentialType,
+bool DoorLockServer::findUserIndexByCredential(chip::EndpointId endpointId, CredentialTypeEnum credentialType,
                                                chip::ByteSpan credentialData, uint16_t & userIndex, uint16_t & credentialIndex,
                                                EmberAfPluginDoorLockUserInfo & userInfo)
 {
@@ -1687,7 +1690,7 @@ bool DoorLockServer::findUserIndexByCredential(chip::EndpointId endpointId, DlCr
         }
 
         // Go through occupied users only
-        if (DlUserStatus::kAvailable == user.userStatus)
+        if (UserStatusEnum::kAvailable == user.userStatus)
         {
             continue;
         }
@@ -1736,9 +1739,10 @@ bool DoorLockServer::findUserIndexByCredential(chip::EndpointId endpointId, DlCr
 
 EmberAfStatus DoorLockServer::createUser(chip::EndpointId endpointId, chip::FabricIndex creatorFabricIdx, chip::NodeId sourceNodeId,
                                          uint16_t userIndex, const Nullable<chip::CharSpan> & userName,
-                                         const Nullable<uint32_t> & userUniqueId, const Nullable<DlUserStatus> & userStatus,
-                                         const Nullable<DlUserType> & userType, const Nullable<DlCredentialRule> & credentialRule,
-                                         const Nullable<DlCredential> & credential)
+                                         const Nullable<uint32_t> & userUniqueId, const Nullable<UserStatusEnum> & userStatus,
+                                         const Nullable<UserTypeEnum> & userType,
+                                         const Nullable<CredentialRuleEnum> & credentialRule,
+                                         const Nullable<CredentialStruct> & credential)
 {
     EmberAfPluginDoorLockUserInfo user;
     if (!emberAfPluginDoorLockGetUser(endpointId, userIndex, user))
@@ -1748,20 +1752,20 @@ EmberAfStatus DoorLockServer::createUser(chip::EndpointId endpointId, chip::Fabr
     }
 
     // appclusters, 5.2.4.34: to modify user its status should be set to Available. If it is we should return OCCUPIED.
-    if (DlUserStatus::kAvailable != user.userStatus)
+    if (UserStatusEnum::kAvailable != user.userStatus)
     {
         emberAfDoorLockClusterPrintln("[createUser] Unable to overwrite existing user [endpointId=%d,userIndex=%d]", endpointId,
                                       userIndex);
         return static_cast<EmberAfStatus>(DlStatus::kOccupied);
     }
 
-    const auto & newUserName            = !userName.IsNull() ? userName.Value() : chip::CharSpan::fromCharString("");
-    auto newUserUniqueId                = userUniqueId.IsNull() ? 0xFFFFFFFF : userUniqueId.Value();
-    auto newUserStatus                  = userStatus.IsNull() ? DlUserStatus::kOccupiedEnabled : userStatus.Value();
-    auto newUserType                    = userType.IsNull() ? DlUserType::kUnrestrictedUser : userType.Value();
-    auto newCredentialRule              = credentialRule.IsNull() ? DlCredentialRule::kSingle : credentialRule.Value();
-    const DlCredential * newCredentials = nullptr;
-    size_t newTotalCredentials          = 0;
+    const auto & newUserName                = !userName.IsNull() ? userName.Value() : chip::CharSpan::fromCharString("");
+    auto newUserUniqueId                    = userUniqueId.IsNull() ? 0xFFFFFFFF : userUniqueId.Value();
+    auto newUserStatus                      = userStatus.IsNull() ? UserStatusEnum::kOccupiedEnabled : userStatus.Value();
+    auto newUserType                        = userType.IsNull() ? UserTypeEnum::kUnrestrictedUser : userType.Value();
+    auto newCredentialRule                  = credentialRule.IsNull() ? CredentialRuleEnum::kSingle : credentialRule.Value();
+    const CredentialStruct * newCredentials = nullptr;
+    size_t newTotalCredentials              = 0;
     if (!credential.IsNull())
     {
         newCredentials      = &credential.Value();
@@ -1789,7 +1793,7 @@ EmberAfStatus DoorLockServer::createUser(chip::EndpointId endpointId, chip::Fabr
                                   newUserUniqueId, to_underlying(newUserStatus), to_underlying(newUserType),
                                   to_underlying(newCredentialRule), static_cast<unsigned int>(newTotalCredentials));
 
-    sendRemoteLockUserChange(endpointId, DlLockDataType::kUserIndex, DlDataOperationType::kAdd, sourceNodeId, creatorFabricIdx,
+    sendRemoteLockUserChange(endpointId, LockDataTypeEnum::kUserIndex, DataOperationTypeEnum::kAdd, sourceNodeId, creatorFabricIdx,
                              userIndex, userIndex);
 
     return EMBER_ZCL_STATUS_SUCCESS;
@@ -1797,8 +1801,9 @@ EmberAfStatus DoorLockServer::createUser(chip::EndpointId endpointId, chip::Fabr
 
 EmberAfStatus DoorLockServer::modifyUser(chip::EndpointId endpointId, chip::FabricIndex modifierFabricIndex,
                                          chip::NodeId sourceNodeId, uint16_t userIndex, const Nullable<chip::CharSpan> & userName,
-                                         const Nullable<uint32_t> & userUniqueId, const Nullable<DlUserStatus> & userStatus,
-                                         const Nullable<DlUserType> & userType, const Nullable<DlCredentialRule> & credentialRule)
+                                         const Nullable<uint32_t> & userUniqueId, const Nullable<UserStatusEnum> & userStatus,
+                                         const Nullable<UserTypeEnum> & userType,
+                                         const Nullable<CredentialRuleEnum> & credentialRule)
 {
     // We should get the user by that index first
     EmberAfPluginDoorLockUserInfo user;
@@ -1809,7 +1814,7 @@ EmberAfStatus DoorLockServer::modifyUser(chip::EndpointId endpointId, chip::Fabr
     }
 
     // appclusters, 5.2.4.34: to modify user its status should NOT be set to Available. If it is we should return INVALID_COMMAND.
-    if (DlUserStatus::kAvailable == user.userStatus)
+    if (UserStatusEnum::kAvailable == user.userStatus)
     {
         emberAfDoorLockClusterPrintln("[modifyUser] Unable to modify non-existing user [endpointId=%d,userIndex=%d]", endpointId,
                                       userIndex);
@@ -1860,7 +1865,7 @@ EmberAfStatus DoorLockServer::modifyUser(chip::EndpointId endpointId, chip::Fabr
                                   newUserName.data(), newUserUniqueId, to_underlying(newUserStatus), to_underlying(newUserType),
                                   to_underlying(newCredentialRule));
 
-    sendRemoteLockUserChange(endpointId, DlLockDataType::kUserIndex, DlDataOperationType::kModify, sourceNodeId,
+    sendRemoteLockUserChange(endpointId, LockDataTypeEnum::kUserIndex, DataOperationTypeEnum::kModify, sourceNodeId,
                              modifierFabricIndex, userIndex, userIndex);
 
     return EMBER_ZCL_STATUS_SUCCESS;
@@ -1890,7 +1895,7 @@ EmberAfStatus DoorLockServer::clearUser(chip::EndpointId endpointId, chip::Fabri
 
         if (!emberAfPluginDoorLockSetCredential(endpointId, credential.CredentialIndex, kUndefinedFabricIndex,
                                                 kUndefinedFabricIndex, DlCredentialStatus::kAvailable,
-                                                static_cast<DlCredentialType>(credential.CredentialType), chip::ByteSpan()))
+                                                static_cast<CredentialTypeEnum>(credential.CredentialType), chip::ByteSpan()))
         {
             ChipLogError(Zcl,
                          "[ClearUser] Unable to remove credentials associated with user - internal error "
@@ -1910,15 +1915,15 @@ EmberAfStatus DoorLockServer::clearUser(chip::EndpointId endpointId, chip::Fabri
 
     // Remove the user entry
     if (!emberAfPluginDoorLockSetUser(endpointId, userIndex, kUndefinedFabricIndex, kUndefinedFabricIndex, chip::CharSpan(""), 0,
-                                      DlUserStatus::kAvailable, DlUserType::kUnrestrictedUser, DlCredentialRule::kSingle, nullptr,
-                                      0))
+                                      UserStatusEnum::kAvailable, UserTypeEnum::kUnrestrictedUser, CredentialRuleEnum::kSingle,
+                                      nullptr, 0))
     {
         return EMBER_ZCL_STATUS_FAILURE;
     }
 
     if (sendUserChangeEvent)
     {
-        sendRemoteLockUserChange(endpointId, DlLockDataType::kUserIndex, DlDataOperationType::kClear, sourceNodeId,
+        sendRemoteLockUserChange(endpointId, LockDataTypeEnum::kUserIndex, DataOperationTypeEnum::kClear, sourceNodeId,
                                  modifierFabricId, userIndex, userIndex);
     }
     return EMBER_ZCL_STATUS_SUCCESS;
@@ -1943,7 +1948,7 @@ bool DoorLockServer::clearFabricFromUsers(chip::EndpointId endpointId, chip::Fab
         }
 
         // Filter out unoccupied slots and users that don't have corresponding fabricIndex in the created/modified fields
-        if (DlUserStatus::kAvailable == user.userStatus || (fabricIndex != user.createdBy && fabricIndex != user.lastModifiedBy))
+        if (UserStatusEnum::kAvailable == user.userStatus || (fabricIndex != user.createdBy && fabricIndex != user.lastModifiedBy))
         {
             continue;
         }
@@ -1972,8 +1977,8 @@ bool DoorLockServer::clearFabricFromUsers(chip::EndpointId endpointId, chip::Fab
 }
 
 DlStatus DoorLockServer::createNewCredentialAndUser(chip::EndpointId endpointId, chip::FabricIndex creatorFabricIdx,
-                                                    chip::NodeId sourceNodeId, const Nullable<DlUserStatus> & userStatus,
-                                                    const Nullable<DlUserType> & userType, const DlCredential & credential,
+                                                    chip::NodeId sourceNodeId, const Nullable<UserStatusEnum> & userStatus,
+                                                    const Nullable<UserTypeEnum> & userType, const CredentialStruct & credential,
                                                     const chip::ByteSpan & credentialData, uint16_t & createdUserIndex)
 {
     uint16_t availableUserIndex = 0;
@@ -1987,7 +1992,7 @@ DlStatus DoorLockServer::createNewCredentialAndUser(chip::EndpointId endpointId,
 
     auto status =
         createUser(endpointId, creatorFabricIdx, sourceNodeId, availableUserIndex, Nullable<CharSpan>(), Nullable<uint32_t>(),
-                   userStatus, userType, Nullable<DlCredentialRule>(), Nullable<DlCredential>(credential));
+                   userStatus, userType, Nullable<CredentialRuleEnum>(), Nullable<CredentialStruct>(credential));
     if (EMBER_ZCL_STATUS_SUCCESS != status)
     {
         emberAfDoorLockClusterPrintln("[SetCredential] Unable to create new user for credential: internal error "
@@ -1997,8 +2002,8 @@ DlStatus DoorLockServer::createNewCredentialAndUser(chip::EndpointId endpointId,
     }
 
     if (!emberAfPluginDoorLockSetCredential(endpointId, credential.CredentialIndex, creatorFabricIdx, creatorFabricIdx,
-                                            DlCredentialStatus::kOccupied, static_cast<DlCredentialType>(credential.CredentialType),
-                                            credentialData))
+                                            DlCredentialStatus::kOccupied,
+                                            static_cast<CredentialTypeEnum>(credential.CredentialType), credentialData))
     {
         emberAfDoorLockClusterPrintln("[SetCredential] Unable to set the credential: app error "
                                       "[endpointId=%d,credentialIndex=%d,credentialType=%u,dataLength=%u]",
@@ -2017,7 +2022,7 @@ DlStatus DoorLockServer::createNewCredentialAndUser(chip::EndpointId endpointId,
 }
 
 DlStatus DoorLockServer::createNewCredentialAndAddItToUser(chip::EndpointId endpointId, chip::FabricIndex modifierFabricIdx,
-                                                           uint16_t userIndex, const DlCredential & credential,
+                                                           uint16_t userIndex, const CredentialStruct & credential,
                                                            const chip::ByteSpan & credentialData)
 {
     if (!userIndexValid(endpointId, userIndex))
@@ -2039,7 +2044,7 @@ DlStatus DoorLockServer::createNewCredentialAndAddItToUser(chip::EndpointId endp
     }
 
     // Not in the spec, but common sense: I don't think we need to modify the credential if user slot is not occupied
-    if (user.userStatus == DlUserStatus::kAvailable)
+    if (user.userStatus == UserStatusEnum::kAvailable)
     {
         emberAfDoorLockClusterPrintln("[SetCredential] Unable to add credential to user: user slot is empty "
                                       "[endpointId=%d,credentialIndex=%d,userIndex=%d]",
@@ -2058,8 +2063,8 @@ DlStatus DoorLockServer::createNewCredentialAndAddItToUser(chip::EndpointId endp
     }
 
     if (!emberAfPluginDoorLockSetCredential(endpointId, credential.CredentialIndex, modifierFabricIdx, modifierFabricIdx,
-                                            DlCredentialStatus::kOccupied, static_cast<DlCredentialType>(credential.CredentialType),
-                                            credentialData))
+                                            DlCredentialStatus::kOccupied,
+                                            static_cast<CredentialTypeEnum>(credential.CredentialType), credentialData))
     {
         emberAfDoorLockClusterPrintln("[SetCredential] Unable to set the credential: app error "
                                       "[endpointId=%d,credentialIndex=%d,credentialType=%u,dataLength=%u]",
@@ -2072,7 +2077,7 @@ DlStatus DoorLockServer::createNewCredentialAndAddItToUser(chip::EndpointId endp
 }
 
 DlStatus DoorLockServer::addCredentialToUser(chip::EndpointId endpointId, chip::FabricIndex modifierFabricIdx, uint16_t userIndex,
-                                             const DlCredential & credential)
+                                             const CredentialStruct & credential)
 {
     // We should get the user by that index first
     EmberAfPluginDoorLockUserInfo user;
@@ -2118,7 +2123,7 @@ DlStatus DoorLockServer::addCredentialToUser(chip::EndpointId endpointId, chip::
         return DlStatus::kResourceExhausted;
     }
 
-    chip::Platform::ScopedMemoryBuffer<DlCredential> newCredentials;
+    chip::Platform::ScopedMemoryBuffer<CredentialStruct> newCredentials;
     if (!newCredentials.Alloc(user.credentials.size() + 1))
     {
         ChipLogError(Zcl,
@@ -2128,7 +2133,7 @@ DlStatus DoorLockServer::addCredentialToUser(chip::EndpointId endpointId, chip::
         return DlStatus::kFailure;
     }
 
-    memcpy(newCredentials.Get(), user.credentials.data(), sizeof(DlCredential) * user.credentials.size());
+    memcpy(newCredentials.Get(), user.credentials.data(), sizeof(CredentialStruct) * user.credentials.size());
     newCredentials[user.credentials.size()] = credential;
 
     if (!emberAfPluginDoorLockSetUser(endpointId, userIndex, user.createdBy, modifierFabricIdx, user.userName, user.userUniqueId,
@@ -2152,7 +2157,7 @@ DlStatus DoorLockServer::addCredentialToUser(chip::EndpointId endpointId, chip::
 }
 
 DlStatus DoorLockServer::modifyCredentialForUser(chip::EndpointId endpointId, chip::FabricIndex modifierFabricIdx,
-                                                 uint16_t userIndex, const DlCredential & credential)
+                                                 uint16_t userIndex, const CredentialStruct & credential)
 {
     // We should get the user by that index first
     EmberAfPluginDoorLockUserInfo user;
@@ -2168,7 +2173,7 @@ DlStatus DoorLockServer::modifyCredentialForUser(chip::EndpointId endpointId, ch
         // appclusters, 5.2.4.40: user should already be associated with given credentialIndex
         if (user.credentials.data()[i].CredentialIndex == credential.CredentialIndex)
         {
-            chip::Platform::ScopedMemoryBuffer<DlCredential> newCredentials;
+            chip::Platform::ScopedMemoryBuffer<CredentialStruct> newCredentials;
             if (!newCredentials.Alloc(user.credentials.size()))
             {
                 ChipLogError(Zcl,
@@ -2178,7 +2183,7 @@ DlStatus DoorLockServer::modifyCredentialForUser(chip::EndpointId endpointId, ch
                              credential.CredentialIndex);
                 return DlStatus::kFailure;
             }
-            memcpy(newCredentials.Get(), user.credentials.data(), sizeof(DlCredential) * user.credentials.size());
+            memcpy(newCredentials.Get(), user.credentials.data(), sizeof(CredentialStruct) * user.credentials.size());
             newCredentials[i] = credential;
 
             emberAfDoorLockClusterPrintln(
@@ -2218,10 +2223,10 @@ DlStatus DoorLockServer::modifyCredentialForUser(chip::EndpointId endpointId, ch
 }
 
 DlStatus DoorLockServer::createCredential(chip::EndpointId endpointId, chip::FabricIndex creatorFabricIdx,
-                                          chip::NodeId sourceNodeId, uint16_t credentialIndex, DlCredentialType credentialType,
+                                          chip::NodeId sourceNodeId, uint16_t credentialIndex, CredentialTypeEnum credentialType,
                                           const EmberAfPluginDoorLockCredentialInfo & existingCredential,
                                           const chip::ByteSpan & credentialData, Nullable<uint16_t> userIndex,
-                                          const Nullable<DlUserStatus> & userStatus, Nullable<DlUserType> userType,
+                                          const Nullable<UserStatusEnum> & userStatus, Nullable<UserTypeEnum> userType,
                                           uint16_t & createdUserIndex)
 {
     // appclusters, 5.2.4.41.1: should send the OCCUPIED in the response when the credential is in use
@@ -2234,7 +2239,7 @@ DlStatus DoorLockServer::createCredential(chip::EndpointId endpointId, chip::Fab
         return DlStatus::kOccupied;
     }
 
-    if (!userType.IsNull() && DlUserType::kProgrammingUser == userType.Value())
+    if (!userType.IsNull() && UserTypeEnum::kProgrammingUser == userType.Value())
     {
         emberAfDoorLockClusterPrintln("[SetCredential] Unable to set the credential: user type is invalid "
                                       "[endpointId=%d,credentialIndex=%d,userType=%u]",
@@ -2243,7 +2248,7 @@ DlStatus DoorLockServer::createCredential(chip::EndpointId endpointId, chip::Fab
         return DlStatus::kInvalidField;
     }
 
-    DlCredential credential{ to_underlying(credentialType), credentialIndex };
+    CredentialStruct credential{ to_underlying(credentialType), credentialIndex };
     // appclusters, 5.2.4.40: if userIndex is not provided we should create new user
     DlStatus status = DlStatus::kSuccess;
     if (userIndex.IsNull())
@@ -2262,19 +2267,21 @@ DlStatus DoorLockServer::createCredential(chip::EndpointId endpointId, chip::Fab
 
     if (DlStatus::kSuccess == status)
     {
-        sendRemoteLockUserChange(endpointId, credentialTypeToLockDataType(credentialType), DlDataOperationType::kAdd, sourceNodeId,
-                                 creatorFabricIdx, createdUserIndex == 0 ? userIndex.Value() : createdUserIndex, credentialIndex);
+        sendRemoteLockUserChange(endpointId, credentialTypeToLockDataType(credentialType), DataOperationTypeEnum::kAdd,
+                                 sourceNodeId, creatorFabricIdx, createdUserIndex == 0 ? userIndex.Value() : createdUserIndex,
+                                 credentialIndex);
     }
 
     return status;
 }
 
 DlStatus DoorLockServer::modifyProgrammingPIN(chip::EndpointId endpointId, chip::FabricIndex modifierFabricIndex,
-                                              chip::NodeId sourceNodeId, uint16_t credentialIndex, DlCredentialType credentialType,
+                                              chip::NodeId sourceNodeId, uint16_t credentialIndex,
+                                              CredentialTypeEnum credentialType,
                                               const EmberAfPluginDoorLockCredentialInfo & existingCredential,
                                               const chip::ByteSpan & credentialData)
 {
-    if (DlCredentialType::kProgrammingPIN != credentialType || 0 != credentialIndex)
+    if (CredentialTypeEnum::kProgrammingPIN != credentialType || 0 != credentialIndex)
     {
         emberAfDoorLockClusterPrintln(
             "[SetCredential] Unable to modify programming PIN: invalid argument [endpointId=%d,credentialIndex=%d]", endpointId,
@@ -2287,7 +2294,7 @@ DlStatus DoorLockServer::modifyProgrammingPIN(chip::EndpointId endpointId, chip:
                                   credentialIndex);
 
     uint16_t relatedUserIndex = 0;
-    if (!findUserIndexByCredential(endpointId, DlCredentialType::kProgrammingPIN, 0, relatedUserIndex))
+    if (!findUserIndexByCredential(endpointId, CredentialTypeEnum::kProgrammingPIN, 0, relatedUserIndex))
     {
         ChipLogError(Zcl, "[SetCredential] Unable to modify PIN - related user not found (internal error) [endpointId=%d]",
                      endpointId);
@@ -2309,21 +2316,21 @@ DlStatus DoorLockServer::modifyProgrammingPIN(chip::EndpointId endpointId, chip:
                                   endpointId, credentialIndex, to_underlying(credentialType),
                                   static_cast<unsigned int>(credentialData.size()));
 
-    sendRemoteLockUserChange(endpointId, credentialTypeToLockDataType(credentialType), DlDataOperationType::kModify, sourceNodeId,
+    sendRemoteLockUserChange(endpointId, credentialTypeToLockDataType(credentialType), DataOperationTypeEnum::kModify, sourceNodeId,
                              modifierFabricIndex, relatedUserIndex, credentialIndex);
 
     return DlStatus::kSuccess;
 }
 
 DlStatus DoorLockServer::modifyCredential(chip::EndpointId endpointId, chip::FabricIndex modifierFabricIndex,
-                                          chip::NodeId sourceNodeId, uint16_t credentialIndex, DlCredentialType credentialType,
+                                          chip::NodeId sourceNodeId, uint16_t credentialIndex, CredentialTypeEnum credentialType,
                                           const EmberAfPluginDoorLockCredentialInfo & existingCredential,
                                           const chip::ByteSpan & credentialData, uint16_t userIndex,
-                                          const Nullable<DlUserStatus> & userStatus, Nullable<DlUserType> userType)
+                                          const Nullable<UserStatusEnum> & userStatus, Nullable<UserTypeEnum> userType)
 {
 
     // appclusters, 5.2.4.40: when modifying a credential, userStatus and userType shall both be NULL.
-    if (!userStatus.IsNull() || (!userType.IsNull() && DlUserType::kProgrammingUser != userType.Value()))
+    if (!userStatus.IsNull() || (!userType.IsNull() && UserTypeEnum::kProgrammingUser != userType.Value()))
     {
         emberAfDoorLockClusterPrintln("[SetCredential] Unable to modify the credential: invalid arguments "
                                       "[endpointId=%d,credentialIndex=%d,credentialType=%u]",
@@ -2331,7 +2338,7 @@ DlStatus DoorLockServer::modifyCredential(chip::EndpointId endpointId, chip::Fab
         return DlStatus::kInvalidField;
     }
 
-    DlCredential credential{ to_underlying(credentialType), credentialIndex };
+    CredentialStruct credential{ to_underlying(credentialType), credentialIndex };
     auto status = modifyCredentialForUser(endpointId, modifierFabricIndex, userIndex, credential);
 
     if (DlStatus::kSuccess == status)
@@ -2352,7 +2359,7 @@ DlStatus DoorLockServer::modifyCredential(chip::EndpointId endpointId, chip::Fab
                                       endpointId, credentialIndex, to_underlying(credentialType),
                                       static_cast<unsigned int>(credentialData.size()));
 
-        sendRemoteLockUserChange(endpointId, credentialTypeToLockDataType(credentialType), DlDataOperationType::kModify,
+        sendRemoteLockUserChange(endpointId, credentialTypeToLockDataType(credentialType), DataOperationTypeEnum::kModify,
                                  sourceNodeId, modifierFabricIndex, userIndex, credentialIndex);
     }
     return status;
@@ -2375,14 +2382,14 @@ void DoorLockServer::sendSetCredentialResponse(chip::app::CommandHandler * comma
     commandObj->AddResponse(commandPath, command);
 }
 
-bool DoorLockServer::credentialTypeSupported(chip::EndpointId endpointId, DlCredentialType type)
+bool DoorLockServer::credentialTypeSupported(chip::EndpointId endpointId, CredentialTypeEnum type)
 {
     switch (type)
     {
-    case DlCredentialType::kProgrammingPIN:
-    case DlCredentialType::kPin:
+    case CredentialTypeEnum::kProgrammingPIN:
+    case CredentialTypeEnum::kPin:
         return SupportsPIN(endpointId);
-    case DlCredentialType::kRfid:
+    case CredentialTypeEnum::kRfid:
         return SupportsRFID(endpointId);
     default:
         return false;
@@ -2409,7 +2416,7 @@ bool DoorLockServer::weekDayIndexValid(chip::EndpointId endpointId, uint8_t week
 DlStatus DoorLockServer::clearWeekDaySchedule(chip::EndpointId endpointId, uint16_t userIndex, uint8_t weekDayIndex)
 {
     auto status = emberAfPluginDoorLockSetSchedule(endpointId, weekDayIndex, userIndex, DlScheduleStatus::kAvailable,
-                                                   DlDaysMaskMap(0), 0, 0, 0, 0);
+                                                   DaysMaskMap(0), 0, 0, 0, 0);
     if (DlStatus::kSuccess != status && DlStatus::kNotFound != status)
     {
         ChipLogError(Zcl,
@@ -2468,7 +2475,7 @@ DlStatus DoorLockServer::clearSchedules(chip::EndpointId endpointId, uint16_t us
 
 void DoorLockServer::sendGetWeekDayScheduleResponse(chip::app::CommandHandler * commandObj,
                                                     const chip::app::ConcreteCommandPath & commandPath, uint8_t weekdayIndex,
-                                                    uint16_t userIndex, DlStatus status, DlDaysMaskMap daysMask, uint8_t startHour,
+                                                    uint16_t userIndex, DlStatus status, DaysMaskMap daysMask, uint8_t startHour,
                                                     uint8_t startMinute, uint8_t endHour, uint8_t endMinute)
 {
     VerifyOrDie(nullptr != commandObj);
@@ -2479,7 +2486,7 @@ void DoorLockServer::sendGetWeekDayScheduleResponse(chip::app::CommandHandler *
     response.status       = status;
     if (DlStatus::kSuccess == status)
     {
-        response.daysMask    = Optional<chip::BitMask<DlDaysMaskMap>>(daysMask);
+        response.daysMask    = Optional<chip::BitMask<DaysMaskMap>>(daysMask);
         response.startHour   = Optional<uint8_t>(startHour);
         response.startMinute = Optional<uint8_t>(startMinute);
         response.endHour     = Optional<uint8_t>(endHour);
@@ -2577,7 +2584,7 @@ bool DoorLockServer::holidayIndexValid(chip::EndpointId endpointId, uint8_t holi
 DlStatus DoorLockServer::clearHolidaySchedule(chip::EndpointId endpointId, uint8_t holidayIndex)
 {
     auto status =
-        emberAfPluginDoorLockSetSchedule(endpointId, holidayIndex, DlScheduleStatus::kAvailable, 0, 0, DlOperatingMode::kNormal);
+        emberAfPluginDoorLockSetSchedule(endpointId, holidayIndex, DlScheduleStatus::kAvailable, 0, 0, OperatingModeEnum::kNormal);
     if (DlStatus::kSuccess != status && DlStatus::kNotFound != status)
     {
         ChipLogError(
@@ -2610,7 +2617,7 @@ DlStatus DoorLockServer::clearHolidaySchedules(chip::EndpointId endpointId)
 void DoorLockServer::sendHolidayScheduleResponse(chip::app::CommandHandler * commandObj,
                                                  const chip::app::ConcreteCommandPath & commandPath, uint8_t holidayIndex,
                                                  DlStatus status, uint32_t localStartTime, uint32_t localEndTime,
-                                                 DlOperatingMode operatingMode)
+                                                 OperatingModeEnum operatingMode)
 {
     VerifyOrDie(nullptr != commandObj);
 
@@ -2619,15 +2626,15 @@ void DoorLockServer::sendHolidayScheduleResponse(chip::app::CommandHandler * com
     {
         response.localStartTime = Optional<uint32_t>(localStartTime);
         response.localEndTime   = Optional<uint32_t>(localEndTime);
-        response.operatingMode  = Optional<DlOperatingMode>(operatingMode);
+        response.operatingMode  = Optional<OperatingModeEnum>(operatingMode);
     }
     commandObj->AddResponse(commandPath, response);
 }
 
 EmberAfStatus DoorLockServer::clearCredential(chip::EndpointId endpointId, chip::FabricIndex modifier, chip::NodeId sourceNodeId,
-                                              DlCredentialType credentialType, uint16_t credentialIndex, bool sendUserChangeEvent)
+                                              CredentialTypeEnum credentialType, uint16_t credentialIndex, bool sendUserChangeEvent)
 {
-    if (DlCredentialType::kProgrammingPIN == credentialType)
+    if (CredentialTypeEnum::kProgrammingPIN == credentialType)
     {
         emberAfDoorLockClusterPrintln("[clearCredential] Cannot clear programming PIN credentials "
                                       "[endpointId=%d,credentialType=%u,credentialIndex=%d,modifier=%d]",
@@ -2746,7 +2753,7 @@ EmberAfStatus DoorLockServer::clearCredential(chip::EndpointId endpointId, chip:
         return EMBER_ZCL_STATUS_FAILURE;
     }
 
-    chip::Platform::ScopedMemoryBuffer<DlCredential> newCredentials;
+    chip::Platform::ScopedMemoryBuffer<CredentialStruct> newCredentials;
     if (!newCredentials.Alloc(relatedUser.credentials.size()))
     {
         ChipLogError(Zcl,
@@ -2760,7 +2767,7 @@ EmberAfStatus DoorLockServer::clearCredential(chip::EndpointId endpointId, chip:
     size_t newCredentialsCount = 0;
     for (const auto & c : relatedUser.credentials)
     {
-        if (static_cast<DlCredentialType>(c.CredentialType) == credentialType && c.CredentialIndex == credentialIndex)
+        if (static_cast<CredentialTypeEnum>(c.CredentialType) == credentialType && c.CredentialIndex == credentialIndex)
         {
             continue;
         }
@@ -2788,7 +2795,7 @@ EmberAfStatus DoorLockServer::clearCredential(chip::EndpointId endpointId, chip:
 
     if (sendUserChangeEvent)
     {
-        sendRemoteLockUserChange(endpointId, credentialTypeToLockDataType(credentialType), DlDataOperationType::kClear,
+        sendRemoteLockUserChange(endpointId, credentialTypeToLockDataType(credentialType), DataOperationTypeEnum::kClear,
                                  sourceNodeId, modifier, relatedUserIndex, credentialIndex);
     }
 
@@ -2799,7 +2806,7 @@ EmberAfStatus DoorLockServer::clearCredentials(chip::EndpointId endpointId, chip
 {
     if (SupportsPIN(endpointId))
     {
-        auto status = clearCredentials(endpointId, modifier, sourceNodeId, DlCredentialType::kPin);
+        auto status = clearCredentials(endpointId, modifier, sourceNodeId, CredentialTypeEnum::kPin);
         if (EMBER_ZCL_STATUS_SUCCESS != status)
         {
             ChipLogError(Zcl, "[clearCredentials] Unable to clear all PIN credentials [endpointId=%d,status=%d]", endpointId,
@@ -2812,7 +2819,7 @@ EmberAfStatus DoorLockServer::clearCredentials(chip::EndpointId endpointId, chip
 
     if (SupportsRFID(endpointId))
     {
-        auto status = clearCredentials(endpointId, modifier, sourceNodeId, DlCredentialType::kRfid);
+        auto status = clearCredentials(endpointId, modifier, sourceNodeId, CredentialTypeEnum::kRfid);
         if (EMBER_ZCL_STATUS_SUCCESS != status)
         {
             ChipLogError(Zcl, "[clearCredentials] Unable to clear all RFID credentials [endpointId=%d,status=%d]", endpointId,
@@ -2824,7 +2831,7 @@ EmberAfStatus DoorLockServer::clearCredentials(chip::EndpointId endpointId, chip
 
     if (SupportsFingers(endpointId))
     {
-        auto status = clearCredentials(endpointId, modifier, sourceNodeId, DlCredentialType::kFingerprint);
+        auto status = clearCredentials(endpointId, modifier, sourceNodeId, CredentialTypeEnum::kFingerprint);
         if (EMBER_ZCL_STATUS_SUCCESS != status)
         {
             ChipLogError(Zcl, "[clearCredentials] Unable to clear all Fingerprint credentials [endpointId=%d,status=%d]",
@@ -2832,7 +2839,7 @@ EmberAfStatus DoorLockServer::clearCredentials(chip::EndpointId endpointId, chip
             return status;
         }
 
-        status = clearCredentials(endpointId, modifier, sourceNodeId, DlCredentialType::kFingerVein);
+        status = clearCredentials(endpointId, modifier, sourceNodeId, CredentialTypeEnum::kFingerVein);
         if (EMBER_ZCL_STATUS_SUCCESS != status)
         {
             ChipLogError(Zcl, "[clearCredentials] Unable to clear all Finger Vein credentials [endpointId=%d,status=%d]",
@@ -2845,7 +2852,7 @@ EmberAfStatus DoorLockServer::clearCredentials(chip::EndpointId endpointId, chip
 
     if (SupportsFace(endpointId))
     {
-        auto status = clearCredentials(endpointId, modifier, sourceNodeId, DlCredentialType::kFace);
+        auto status = clearCredentials(endpointId, modifier, sourceNodeId, CredentialTypeEnum::kFace);
         if (EMBER_ZCL_STATUS_SUCCESS != status)
         {
             ChipLogError(Zcl, "[clearCredentials] Unable to clear all face credentials [endpointId=%d,status=%d]", endpointId,
@@ -2859,7 +2866,7 @@ EmberAfStatus DoorLockServer::clearCredentials(chip::EndpointId endpointId, chip
 }
 
 EmberAfStatus DoorLockServer::clearCredentials(chip::EndpointId endpointId, chip::FabricIndex modifier, chip::NodeId sourceNodeId,
-                                               DlCredentialType credentialType)
+                                               CredentialTypeEnum credentialType)
 {
     uint16_t maxNumberOfCredentials = 0;
     if (!getMaxNumberOfCredentials(endpointId, credentialType, maxNumberOfCredentials))
@@ -2884,13 +2891,13 @@ EmberAfStatus DoorLockServer::clearCredentials(chip::EndpointId endpointId, chip
         }
     }
 
-    sendRemoteLockUserChange(endpointId, credentialTypeToLockDataType(credentialType), DlDataOperationType::kClear, sourceNodeId,
+    sendRemoteLockUserChange(endpointId, credentialTypeToLockDataType(credentialType), DataOperationTypeEnum::kClear, sourceNodeId,
                              modifier, 0xFFFE, 0xFFFE);
 
     return EMBER_ZCL_STATUS_SUCCESS;
 }
 
-bool DoorLockServer::clearFabricFromCredentials(chip::EndpointId endpointId, DlCredentialType credentialType,
+bool DoorLockServer::clearFabricFromCredentials(chip::EndpointId endpointId, CredentialTypeEnum credentialType,
                                                 chip::FabricIndex fabricToRemove)
 {
     uint16_t maxNumberOfCredentials = 0;
@@ -2906,7 +2913,7 @@ bool DoorLockServer::clearFabricFromCredentials(chip::EndpointId endpointId, DlC
 
     uint16_t startIndex = 1;
     // Programming PIN is a special case -- it is unique and its index assumed to be 0.
-    if (DlCredentialType::kProgrammingPIN == credentialType)
+    if (CredentialTypeEnum::kProgrammingPIN == credentialType)
     {
         startIndex = 0;
         maxNumberOfCredentials--;
@@ -2961,38 +2968,38 @@ bool DoorLockServer::clearFabricFromCredentials(chip::EndpointId endpointId, chi
 {
     if (SupportsRFID(endpointId))
     {
-        clearFabricFromCredentials(endpointId, DlCredentialType::kRfid, fabricToRemove);
+        clearFabricFromCredentials(endpointId, CredentialTypeEnum::kRfid, fabricToRemove);
     }
 
     if (SupportsPIN(endpointId))
     {
-        clearFabricFromCredentials(endpointId, DlCredentialType::kPin, fabricToRemove);
+        clearFabricFromCredentials(endpointId, CredentialTypeEnum::kPin, fabricToRemove);
     }
 
     if (SupportsFingers(endpointId))
     {
-        clearFabricFromCredentials(endpointId, DlCredentialType::kFingerprint, fabricToRemove);
-        clearFabricFromCredentials(endpointId, DlCredentialType::kFingerVein, fabricToRemove);
+        clearFabricFromCredentials(endpointId, CredentialTypeEnum::kFingerprint, fabricToRemove);
+        clearFabricFromCredentials(endpointId, CredentialTypeEnum::kFingerVein, fabricToRemove);
     }
 
     if (SupportsFace(endpointId))
     {
-        clearFabricFromCredentials(endpointId, DlCredentialType::kFace, fabricToRemove);
+        clearFabricFromCredentials(endpointId, CredentialTypeEnum::kFace, fabricToRemove);
     }
 
-    clearFabricFromCredentials(endpointId, DlCredentialType::kProgrammingPIN, fabricToRemove);
+    clearFabricFromCredentials(endpointId, CredentialTypeEnum::kProgrammingPIN, fabricToRemove);
 
     return true;
 }
 
-bool DoorLockServer::sendRemoteLockUserChange(chip::EndpointId endpointId, DlLockDataType dataType, DlDataOperationType operation,
-                                              chip::NodeId nodeId, chip::FabricIndex fabricIndex, uint16_t userIndex,
-                                              uint16_t dataIndex)
+bool DoorLockServer::sendRemoteLockUserChange(chip::EndpointId endpointId, LockDataTypeEnum dataType,
+                                              DataOperationTypeEnum operation, chip::NodeId nodeId, chip::FabricIndex fabricIndex,
+                                              uint16_t userIndex, uint16_t dataIndex)
 {
     Events::LockUserChange::Type event;
     event.lockDataType      = dataType;
     event.dataOperationType = operation;
-    event.operationSource   = DlOperationSource::kRemote;
+    event.operationSource   = OperationSourceEnum::kRemote;
     if (0 != userIndex)
     {
         event.userIndex.SetNonNull(userIndex);
@@ -3019,28 +3026,28 @@ bool DoorLockServer::sendRemoteLockUserChange(chip::EndpointId endpointId, DlLoc
     return true;
 }
 
-DlLockDataType DoorLockServer::credentialTypeToLockDataType(DlCredentialType credentialType)
+LockDataTypeEnum DoorLockServer::credentialTypeToLockDataType(CredentialTypeEnum credentialType)
 {
     switch (credentialType)
     {
-    case DlCredentialType::kProgrammingPIN:
-        return DlLockDataType::kProgrammingCode;
-    case DlCredentialType::kPin:
-        return DlLockDataType::kPin;
-    case DlCredentialType::kRfid:
-        return DlLockDataType::kRfid;
-    case DlCredentialType::kFingerprint:
-        return DlLockDataType::kFingerprint;
-    case DlCredentialType::kFingerVein:
-        return DlLockDataType::kFingerprint;
-    case DlCredentialType::kFace:
+    case CredentialTypeEnum::kProgrammingPIN:
+        return LockDataTypeEnum::kProgrammingCode;
+    case CredentialTypeEnum::kPin:
+        return LockDataTypeEnum::kPin;
+    case CredentialTypeEnum::kRfid:
+        return LockDataTypeEnum::kRfid;
+    case CredentialTypeEnum::kFingerprint:
+        return LockDataTypeEnum::kFingerprint;
+    case CredentialTypeEnum::kFingerVein:
+        return LockDataTypeEnum::kFingerprint;
+    case CredentialTypeEnum::kFace:
         // So far there's no distinct data type for face credentials
-        return DlLockDataType::kUnspecified;
-    case DlCredentialType::kUnknownEnumValue:
-        return DlLockDataType::kUnspecified;
+        return LockDataTypeEnum::kUnspecified;
+    case CredentialTypeEnum::kUnknownEnumValue:
+        return LockDataTypeEnum::kUnspecified;
     }
 
-    return DlLockDataType::kUnspecified;
+    return LockDataTypeEnum::kUnspecified;
 }
 
 bool DoorLockServer::isUserScheduleRestricted(chip::EndpointId endpointId, const EmberAfPluginDoorLockUserInfo & user)
@@ -3050,7 +3057,8 @@ bool DoorLockServer::isUserScheduleRestricted(chip::EndpointId endpointId, const
 
 void DoorLockServer::setHolidayScheduleCommandHandler(chip::app::CommandHandler * commandObj,
                                                       const chip::app::ConcreteCommandPath & commandPath, uint8_t holidayIndex,
-                                                      uint32_t localStartTime, uint32_t localEndTime, DlOperatingMode operatingMode)
+                                                      uint32_t localStartTime, uint32_t localEndTime,
+                                                      OperatingModeEnum operatingMode)
 {
     VerifyOrDie(nullptr != commandObj);
 
@@ -3082,7 +3090,7 @@ void DoorLockServer::setHolidayScheduleCommandHandler(chip::app::CommandHandler
         return;
     }
 
-    if (operatingMode > DlOperatingMode::kPassage || operatingMode < DlOperatingMode::kNormal)
+    if (operatingMode > OperatingModeEnum::kPassage || operatingMode < OperatingModeEnum::kNormal)
     {
         emberAfDoorLockClusterPrintln("[SetHolidaySchedule] Unable to add schedule - operating mode is out of range"
                                       "[endpointId=%d,scheduleIndex=%d,localStarTime=%" PRIu32 ",localEndTime=%" PRIu32
@@ -3193,10 +3201,10 @@ void DoorLockServer::clearHolidayScheduleCommandHandler(chip::app::CommandHandle
 
 bool DoorLockServer::RemoteOperationEnabled(chip::EndpointId endpointId) const
 {
-    DlOperatingMode mode;
+    OperatingModeEnum mode;
 
     return GetAttribute(endpointId, Attributes::OperatingMode::Id, Attributes::OperatingMode::Get, mode) &&
-        mode != DlOperatingMode::kPrivacy && mode != DlOperatingMode::kNoRemoteLockUnlock;
+        mode != OperatingModeEnum::kPrivacy && mode != OperatingModeEnum::kNoRemoteLockUnlock;
 }
 
 CHIP_ERROR DoorLockServer::sendClusterResponse(chip::app::CommandHandler * commandObj,
@@ -3229,14 +3237,14 @@ EmberAfDoorLockEndpointContext * DoorLockServer::getContext(chip::EndpointId end
 }
 
 bool DoorLockServer::HandleRemoteLockOperation(chip::app::CommandHandler * commandObj,
-                                               const chip::app::ConcreteCommandPath & commandPath, DlLockOperationType opType,
+                                               const chip::app::ConcreteCommandPath & commandPath, LockOperationTypeEnum opType,
                                                RemoteLockOpHandler opHandler, const Optional<ByteSpan> & pinCode)
 {
-    VerifyOrDie(DlLockOperationType::kLock == opType || DlLockOperationType::kUnlock == opType);
+    VerifyOrDie(LockOperationTypeEnum::kLock == opType || LockOperationTypeEnum::kUnlock == opType);
     VerifyOrDie(nullptr != opHandler);
 
-    EndpointId endpoint     = commandPath.mEndpointId;
-    DlOperationError reason = DlOperationError::kUnspecified;
+    EndpointId endpoint       = commandPath.mEndpointId;
+    OperationErrorEnum reason = OperationErrorEnum::kUnspecified;
     Nullable<uint16_t> pinUserIdx; // Will get set to non-null if we find a user for the PIN.
     Optional<uint16_t> pinCredIdx; // Will get set to a value if the PIN is one we know about.
     bool success   = false;
@@ -3246,7 +3254,7 @@ bool DoorLockServer::HandleRemoteLockOperation(chip::app::CommandHandler * comma
 
     EmberAfDoorLockEndpointContext * endpointContext;
 
-    VerifyOrExit(RemoteOperationEnabled(endpoint), reason = DlOperationError::kUnspecified);
+    VerifyOrExit(RemoteOperationEnabled(endpoint), reason = OperationErrorEnum::kUnspecified);
 
     // appclusters.pdf 5.3.4.1:
     // When the PINCode field is provided an invalid PIN will count towards the WrongCodeEntryLimit and the
@@ -3277,7 +3285,7 @@ bool DoorLockServer::HandleRemoteLockOperation(chip::app::CommandHandler * comma
         EmberAfPluginDoorLockUserInfo user;
         uint16_t userIdx;
         uint16_t credIdx;
-        if (findUserIndexByCredential(endpoint, DlCredentialType::kPin, pinCode.Value(), userIdx, credIdx, user))
+        if (findUserIndexByCredential(endpoint, CredentialTypeEnum::kPin, pinCode.Value(), userIdx, credIdx, user))
         {
             pinUserIdx.SetNonNull(userIdx);
             pinCredIdx.Emplace(credIdx);
@@ -3286,13 +3294,13 @@ bool DoorLockServer::HandleRemoteLockOperation(chip::app::CommandHandler * comma
         {
             emberAfDoorLockClusterPrintln("Rejecting lock operation: unknown PIN provided [endpoint=%d, lock_op=%d]", endpoint,
                                           to_underlying(opType));
-            reason = DlOperationError::kInvalidCredential;
+            reason = OperationErrorEnum::kInvalidCredential;
             goto exit;
         }
 
         // If the user status is OccupiedDisabled we should deny the access and send out the appropriate event
-        VerifyOrExit(user.userStatus != DlUserStatus::kOccupiedDisabled, {
-            reason = DlOperationError::kDisabledUserDenied;
+        VerifyOrExit(user.userStatus != UserStatusEnum::kOccupiedDisabled, {
+            reason = OperationErrorEnum::kDisabledUserDenied;
             emberAfDoorLockClusterPrintln(
                 "Unable to perform remote lock operation: user is disabled [endpoint=%d, lock_op=%d, userIndex=%d]", endpoint,
                 to_underlying(opType), userIdx);
@@ -3315,7 +3323,7 @@ bool DoorLockServer::HandleRemoteLockOperation(chip::app::CommandHandler * comma
         }
         // If the PIN is required but not provided we should exit
         VerifyOrExit(!requirePin, {
-            reason = DlOperationError::kInvalidCredential;
+            reason = OperationErrorEnum::kInvalidCredential;
             emberAfDoorLockClusterPrintln("Checking credentials failed: PIN is not provided when it is required");
         });
     }
@@ -3324,7 +3332,7 @@ bool DoorLockServer::HandleRemoteLockOperation(chip::app::CommandHandler * comma
     success = opHandler(endpoint, pinCode, reason);
     // The app should trigger the lock state change as it may take a while before the lock actually locks/unlocks
 exit:
-    if (!success && reason == DlOperationError::kInvalidCredential)
+    if (!success && reason == OperationErrorEnum::kInvalidCredential)
     {
         TrackWrongCodeEntry(endpoint);
     }
@@ -3340,7 +3348,7 @@ bool DoorLockServer::HandleRemoteLockOperation(chip::app::CommandHandler * comma
 
     // Send LockOperation/LockOperationError event.  The credential index in
     // foundCred will be filled in if we actually have a value to fill in.
-    LockOpCredentials foundCred[] = { { DlCredentialType::kPin, UINT16_MAX } };
+    LockOpCredentials foundCred[] = { { CredentialTypeEnum::kPin, UINT16_MAX } };
     LockOpCredentials * credList  = nullptr;
     size_t credListSize           = 0;
 
@@ -3353,18 +3361,18 @@ bool DoorLockServer::HandleRemoteLockOperation(chip::app::CommandHandler * comma
         credListSize                 = 1;
     }
 
-    SendLockOperationEvent(endpoint, opType, DlOperationSource::kRemote, reason, pinUserIdx,
+    SendLockOperationEvent(endpoint, opType, OperationSourceEnum::kRemote, reason, pinUserIdx,
                            Nullable<chip::FabricIndex>(getFabricIndex(commandObj)), Nullable<chip::NodeId>(getNodeId(commandObj)),
                            credList, credListSize, success);
     return success;
 }
 
-void DoorLockServer::SendLockOperationEvent(chip::EndpointId endpointId, DlLockOperationType opType, DlOperationSource opSource,
-                                            DlOperationError opErr, const Nullable<uint16_t> & userId,
+void DoorLockServer::SendLockOperationEvent(chip::EndpointId endpointId, LockOperationTypeEnum opType, OperationSourceEnum opSource,
+                                            OperationErrorEnum opErr, const Nullable<uint16_t> & userId,
                                             const Nullable<chip::FabricIndex> & fabricIdx, const Nullable<chip::NodeId> & nodeId,
                                             LockOpCredentials * credList, size_t credListSize, bool opSuccess)
 {
-    Nullable<List<const Structs::DlCredential::Type>> credentials{};
+    Nullable<List<const Structs::CredentialStruct::Type>> credentials{};
 
     // appclusters.pdf 5.3.5.3, 5.3.5.4:
     // The list of credentials used in performing the lock operation. This SHALL be null if no credentials were involved.
@@ -3374,7 +3382,7 @@ void DoorLockServer::SendLockOperationEvent(chip::EndpointId endpointId, DlLockO
     }
     else
     {
-        credentials.SetNonNull(List<const Structs::DlCredential::Type>(credList, credListSize));
+        credentials.SetNonNull(List<const Structs::CredentialStruct::Type>(credList, credListSize));
     }
 
     // TODO: if [USR] feature is not supported then credentials should be omitted (Optional.HasValue()==false)?
@@ -3460,8 +3468,8 @@ bool emberAfDoorLockClusterLockDoorCallback(chip::app::CommandHandler * commandO
                                             const chip::app::Clusters::DoorLock::Commands::LockDoor::DecodableType & commandData)
 {
     emberAfDoorLockClusterPrintln("Received command: LockDoor");
-    DoorLockServer::Instance().HandleRemoteLockOperation(commandObj, commandPath, DlLockOperationType::kLock,
-                                                         emberAfPluginDoorLockOnDoorLockCommand, commandData.pinCode);
+    DoorLockServer::Instance().HandleRemoteLockOperation(commandObj, commandPath, LockOperationTypeEnum::kLock,
+                                                         emberAfPluginDoorLockOnDoorLockCommand, commandData.PINCode);
     return true;
 }
 
@@ -3471,8 +3479,8 @@ bool emberAfDoorLockClusterUnlockDoorCallback(
 {
     emberAfDoorLockClusterPrintln("Received command: UnlockDoor");
 
-    if (DoorLockServer::Instance().HandleRemoteLockOperation(commandObj, commandPath, DlLockOperationType::kUnlock,
-                                                             emberAfPluginDoorLockOnDoorUnlockCommand, commandData.pinCode))
+    if (DoorLockServer::Instance().HandleRemoteLockOperation(commandObj, commandPath, LockOperationTypeEnum::kUnlock,
+                                                             emberAfPluginDoorLockOnDoorUnlockCommand, commandData.PINCode))
     {
         // appclusters.pdf 5.3.3.25:
         // The number of seconds to wait after unlocking a lock before it automatically locks again. 0=disabled. If set, unlock
@@ -3493,8 +3501,8 @@ bool emberAfDoorLockClusterUnlockWithTimeoutCallback(
 {
     emberAfDoorLockClusterPrintln("Received command: UnlockWithTimeout");
 
-    if (DoorLockServer::Instance().HandleRemoteLockOperation(commandObj, commandPath, DlLockOperationType::kUnlock,
-                                                             emberAfPluginDoorLockOnDoorUnlockCommand, commandData.pinCode))
+    if (DoorLockServer::Instance().HandleRemoteLockOperation(commandObj, commandPath, LockOperationTypeEnum::kUnlock,
+                                                             emberAfPluginDoorLockOnDoorUnlockCommand, commandData.PINCode))
     {
         // appclusters.pdf 5.3.4.3:
         // This command causes the lock device to unlock the door with a timeout parameter. After the time in seconds specified in
@@ -3772,6 +3780,6 @@ void DoorLockServer::DoorLockOnAutoRelockCallback(chip::EndpointId endpointId)
 {
     emberAfDoorLockClusterPrintln("Door Auto relock timer expired. Locking...");
     emberEventControlSetInactive(&DoorLockServer::Instance().AutolockEvent);
-    DoorLockServer::Instance().SetLockState(endpointId, DlLockState::kLocked, DlOperationSource::kAuto);
+    DoorLockServer::Instance().SetLockState(endpointId, DlLockState::kLocked, OperationSourceEnum::kAuto);
     emberAfPluginDoorLockOnAutoRelock(endpointId);
 }
diff --git a/src/app/clusters/door-lock-server/door-lock-server.h b/src/app/clusters/door-lock-server/door-lock-server.h
index 67314c63a158f6..edf6a439e7042a 100644
--- a/src/app/clusters/door-lock-server/door-lock-server.h
+++ b/src/app/clusters/door-lock-server/door-lock-server.h
@@ -36,28 +36,29 @@
 #endif
 
 using chip::Optional;
-using chip::app::Clusters::DoorLock::DlAlarmCode;
-using chip::app::Clusters::DoorLock::DlCredentialRule;
-using chip::app::Clusters::DoorLock::DlCredentialType;
-using chip::app::Clusters::DoorLock::DlDataOperationType;
-using chip::app::Clusters::DoorLock::DlDaysMaskMap;
-using chip::app::Clusters::DoorLock::DlDoorState;
-using chip::app::Clusters::DoorLock::DlLockDataType;
-using chip::app::Clusters::DoorLock::DlLockOperationType;
+using chip::app::Clusters::DoorLock::AlarmCodeEnum;
+using chip::app::Clusters::DoorLock::CredentialRuleEnum;
+using chip::app::Clusters::DoorLock::CredentialTypeEnum;
+using chip::app::Clusters::DoorLock::DataOperationTypeEnum;
+using chip::app::Clusters::DoorLock::DaysMaskMap;
 using chip::app::Clusters::DoorLock::DlLockState;
-using chip::app::Clusters::DoorLock::DlOperatingMode;
-using chip::app::Clusters::DoorLock::DlOperationError;
-using chip::app::Clusters::DoorLock::DlOperationSource;
 using chip::app::Clusters::DoorLock::DlStatus;
-using chip::app::Clusters::DoorLock::DlUserStatus;
-using chip::app::Clusters::DoorLock::DlUserType;
 using chip::app::Clusters::DoorLock::DoorLockFeature;
+using chip::app::Clusters::DoorLock::DoorStateEnum;
+using chip::app::Clusters::DoorLock::LockDataTypeEnum;
+using chip::app::Clusters::DoorLock::LockOperationTypeEnum;
+using chip::app::Clusters::DoorLock::OperatingModeEnum;
+using chip::app::Clusters::DoorLock::OperationErrorEnum;
+using chip::app::Clusters::DoorLock::OperationSourceEnum;
+using chip::app::Clusters::DoorLock::UserStatusEnum;
+using chip::app::Clusters::DoorLock::UserTypeEnum;
 using chip::app::DataModel::List;
 using chip::app::DataModel::Nullable;
 
-using LockOpCredentials = chip::app::Clusters::DoorLock::Structs::DlCredential::Type;
+using LockOpCredentials = chip::app::Clusters::DoorLock::Structs::CredentialStruct::Type;
 
-typedef bool (*RemoteLockOpHandler)(chip::EndpointId endpointId, const Optional<chip::ByteSpan> & pinCode, DlOperationError & err);
+typedef bool (*RemoteLockOpHandler)(chip::EndpointId endpointId, const Optional<chip::ByteSpan> & pinCode,
+                                    OperationErrorEnum & err);
 
 static constexpr size_t DOOR_LOCK_MAX_USER_NAME_SIZE = 10; /**< Maximum size of the user name (in characters). */
 static constexpr size_t DOOR_LOCK_USER_NAME_BUFFER_SIZE =
@@ -93,7 +94,7 @@ class DoorLockServer
      *
      * @return true on success, false on failure.
      */
-    bool SetLockState(chip::EndpointId endpointId, DlLockState newLockState, DlOperationSource opSource);
+    bool SetLockState(chip::EndpointId endpointId, DlLockState newLockState, OperationSourceEnum opSource);
 
     /**
      * Updates the LockState attribute with new value.
@@ -107,7 +108,7 @@ class DoorLockServer
      */
     bool SetLockState(chip::EndpointId endpointId, DlLockState newLockState);
     bool SetActuatorEnabled(chip::EndpointId endpointId, bool newActuatorState);
-    bool SetDoorState(chip::EndpointId endpointId, DlDoorState newDoorState);
+    bool SetDoorState(chip::EndpointId endpointId, DoorStateEnum newDoorState);
 
     bool SetLanguage(chip::EndpointId endpointId, chip::CharSpan newLanguage);
     bool SetAutoRelockTime(chip::EndpointId endpointId, uint32_t newAutoRelockTimeSec);
@@ -127,13 +128,13 @@ class DoorLockServer
     bool GetNumberOfCredentialsSupportedPerUser(chip::EndpointId endpointId, uint8_t & numberOfCredentialsSupportedPerUser);
     bool GetNumberOfHolidaySchedulesSupported(chip::EndpointId endpointId, uint8_t & numberOfHolidaySchedules);
 
-    bool SendLockAlarmEvent(chip::EndpointId endpointId, DlAlarmCode alarmCode);
+    bool SendLockAlarmEvent(chip::EndpointId endpointId, AlarmCodeEnum alarmCode);
 
     chip::BitFlags<DoorLockFeature> GetFeatures(chip::EndpointId endpointId);
 
-    inline bool SupportsPIN(chip::EndpointId endpointId) { return GetFeatures(endpointId).Has(DoorLockFeature::kPINCredentials); }
+    inline bool SupportsPIN(chip::EndpointId endpointId) { return GetFeatures(endpointId).Has(DoorLockFeature::kPinCredential); }
 
-    inline bool SupportsRFID(chip::EndpointId endpointId) { return GetFeatures(endpointId).Has(DoorLockFeature::kRFIDCredentials); }
+    inline bool SupportsRFID(chip::EndpointId endpointId) { return GetFeatures(endpointId).Has(DoorLockFeature::kRfidCredential); }
 
     inline bool SupportsFingers(chip::EndpointId endpointId)
     {
@@ -144,12 +145,12 @@ class DoorLockServer
 
     inline bool SupportsWeekDaySchedules(chip::EndpointId endpointId)
     {
-        return GetFeatures(endpointId).Has(DoorLockFeature::kWeekDaySchedules);
+        return GetFeatures(endpointId).Has(DoorLockFeature::kWeekDayAccessSchedules);
     }
 
     inline bool SupportsYearDaySchedules(chip::EndpointId endpointId)
     {
-        return GetFeatures(endpointId).Has(DoorLockFeature::kYearDaySchedules);
+        return GetFeatures(endpointId).Has(DoorLockFeature::kYearDayAccessSchedules);
     }
 
     inline bool SupportsHolidaySchedules(chip::EndpointId endpointId)
@@ -160,19 +161,19 @@ class DoorLockServer
     inline bool SupportsAnyCredential(chip::EndpointId endpointId)
     {
         return GetFeatures(endpointId)
-            .HasAny(DoorLockFeature::kPINCredentials, DoorLockFeature::kRFIDCredentials, DoorLockFeature::kFingerCredentials,
+            .HasAny(DoorLockFeature::kPinCredential, DoorLockFeature::kRfidCredential, DoorLockFeature::kFingerCredentials,
                     DoorLockFeature::kFaceCredentials);
     }
 
     inline bool SupportsCredentialsOTA(chip::EndpointId endpointId)
     {
-        return GetFeatures(endpointId).Has(DoorLockFeature::kCredentialsOTA);
+        return GetFeatures(endpointId).Has(DoorLockFeature::kCredentialsOverTheAirAccess);
     }
 
     inline bool SupportsUSR(chip::EndpointId endpointId)
     {
         // appclusters, 5.2.2: USR feature has conformance [PIN | RID | FGP | FACE]
-        return GetFeatures(endpointId).Has(DoorLockFeature::kUsersManagement) && SupportsAnyCredential(endpointId);
+        return GetFeatures(endpointId).Has(DoorLockFeature::kUser) && SupportsAnyCredential(endpointId);
     }
 
     bool OnFabricRemoved(chip::EndpointId endpointId, chip::FabricIndex fabricIndex);
@@ -185,37 +186,39 @@ class DoorLockServer
     bool userIndexValid(chip::EndpointId endpointId, uint16_t userIndex, uint16_t & maxNumberOfUser);
     bool userExists(chip::EndpointId endpointId, uint16_t userIndex);
 
-    bool credentialIndexValid(chip::EndpointId endpointId, DlCredentialType type, uint16_t credentialIndex);
-    bool credentialIndexValid(chip::EndpointId endpointId, DlCredentialType type, uint16_t credentialIndex,
+    bool credentialIndexValid(chip::EndpointId endpointId, CredentialTypeEnum type, uint16_t credentialIndex);
+    bool credentialIndexValid(chip::EndpointId endpointId, CredentialTypeEnum type, uint16_t credentialIndex,
                               uint16_t & maxNumberOfCredentials);
-    DlStatus credentialLengthWithinRange(chip::EndpointId endpointId, DlCredentialType type, const chip::ByteSpan & credentialData);
-    bool getMaxNumberOfCredentials(chip::EndpointId endpointId, DlCredentialType credentialType, uint16_t & maxNumberOfCredentials);
+    DlStatus credentialLengthWithinRange(chip::EndpointId endpointId, CredentialTypeEnum type,
+                                         const chip::ByteSpan & credentialData);
+    bool getMaxNumberOfCredentials(chip::EndpointId endpointId, CredentialTypeEnum credentialType,
+                                   uint16_t & maxNumberOfCredentials);
 
     bool findOccupiedUserSlot(chip::EndpointId endpointId, uint16_t startIndex, uint16_t & userIndex);
 
     bool findUnoccupiedUserSlot(chip::EndpointId endpointId, uint16_t & userIndex);
     bool findUnoccupiedUserSlot(chip::EndpointId endpointId, uint16_t startIndex, uint16_t & userIndex);
 
-    bool findOccupiedCredentialSlot(chip::EndpointId endpointId, DlCredentialType credentialType, uint16_t startIndex,
+    bool findOccupiedCredentialSlot(chip::EndpointId endpointId, CredentialTypeEnum credentialType, uint16_t startIndex,
                                     uint16_t & credentialIndex);
-    bool findUnoccupiedCredentialSlot(chip::EndpointId endpointId, DlCredentialType credentialType, uint16_t startIndex,
+    bool findUnoccupiedCredentialSlot(chip::EndpointId endpointId, CredentialTypeEnum credentialType, uint16_t startIndex,
                                       uint16_t & credentialIndex);
 
-    bool findUserIndexByCredential(chip::EndpointId endpointId, DlCredentialType credentialType, uint16_t credentialIndex,
+    bool findUserIndexByCredential(chip::EndpointId endpointId, CredentialTypeEnum credentialType, uint16_t credentialIndex,
                                    uint16_t & userIndex);
 
-    bool findUserIndexByCredential(chip::EndpointId endpointId, DlCredentialType credentialType, chip::ByteSpan credentialData,
+    bool findUserIndexByCredential(chip::EndpointId endpointId, CredentialTypeEnum credentialType, chip::ByteSpan credentialData,
                                    uint16_t & userIndex, uint16_t & credentialIndex, EmberAfPluginDoorLockUserInfo & userInfo);
 
     EmberAfStatus createUser(chip::EndpointId endpointId, chip::FabricIndex creatorFabricIdx, chip::NodeId sourceNodeId,
                              uint16_t userIndex, const Nullable<chip::CharSpan> & userName, const Nullable<uint32_t> & userUniqueId,
-                             const Nullable<DlUserStatus> & userStatus, const Nullable<DlUserType> & userType,
-                             const Nullable<DlCredentialRule> & credentialRule,
-                             const Nullable<DlCredential> & credential = Nullable<DlCredential>());
+                             const Nullable<UserStatusEnum> & userStatus, const Nullable<UserTypeEnum> & userType,
+                             const Nullable<CredentialRuleEnum> & credentialRule,
+                             const Nullable<CredentialStruct> & credential = Nullable<CredentialStruct>());
     EmberAfStatus modifyUser(chip::EndpointId endpointId, chip::FabricIndex modifierFabricIndex, chip::NodeId sourceNodeId,
                              uint16_t userIndex, const Nullable<chip::CharSpan> & userName, const Nullable<uint32_t> & userUniqueId,
-                             const Nullable<DlUserStatus> & userStatus, const Nullable<DlUserType> & userType,
-                             const Nullable<DlCredentialRule> & credentialRule);
+                             const Nullable<UserStatusEnum> & userStatus, const Nullable<UserTypeEnum> & userType,
+                             const Nullable<CredentialRuleEnum> & credentialRule);
     EmberAfStatus clearUser(chip::EndpointId endpointId, chip::FabricIndex modifierFabricId, chip::NodeId sourceNodeId,
                             uint16_t userIndex, bool sendUserChangeEvent);
     EmberAfStatus clearUser(chip::EndpointId endpointId, chip::FabricIndex modifierFabricId, chip::NodeId sourceNodeId,
@@ -224,38 +227,39 @@ class DoorLockServer
     bool clearFabricFromUsers(chip::EndpointId endpointId, chip::FabricIndex fabricIndex);
 
     DlStatus createNewCredentialAndUser(chip::EndpointId endpointId, chip::FabricIndex creatorFabricIdx, chip::NodeId sourceNodeId,
-                                        const Nullable<DlUserStatus> & userStatus, const Nullable<DlUserType> & userType,
-                                        const DlCredential & credential, const chip::ByteSpan & credentialData,
+                                        const Nullable<UserStatusEnum> & userStatus, const Nullable<UserTypeEnum> & userType,
+                                        const CredentialStruct & credential, const chip::ByteSpan & credentialData,
                                         uint16_t & createdUserIndex);
     DlStatus createNewCredentialAndAddItToUser(chip::EndpointId endpointId, chip::FabricIndex modifierFabricIdx, uint16_t userIndex,
-                                               const DlCredential & credential, const chip::ByteSpan & credentialData);
+                                               const CredentialStruct & credential, const chip::ByteSpan & credentialData);
 
     DlStatus addCredentialToUser(chip::EndpointId endpointId, chip::FabricIndex modifierFabricIdx, uint16_t userIndex,
-                                 const DlCredential & credential);
+                                 const CredentialStruct & credential);
     DlStatus modifyCredentialForUser(chip::EndpointId endpointId, chip::FabricIndex modifierFabricIdx, uint16_t userIndex,
-                                     const DlCredential & credential);
+                                     const CredentialStruct & credential);
 
     DlStatus createCredential(chip::EndpointId endpointId, chip::FabricIndex creatorFabricIdx, chip::NodeId sourceNodeId,
-                              uint16_t credentialIndex, DlCredentialType credentialType,
+                              uint16_t credentialIndex, CredentialTypeEnum credentialType,
                               const EmberAfPluginDoorLockCredentialInfo & existingCredential, const chip::ByteSpan & credentialData,
-                              Nullable<uint16_t> userIndex, const Nullable<DlUserStatus> & userStatus,
-                              Nullable<DlUserType> userType, uint16_t & createdUserIndex);
+                              Nullable<uint16_t> userIndex, const Nullable<UserStatusEnum> & userStatus,
+                              Nullable<UserTypeEnum> userType, uint16_t & createdUserIndex);
     DlStatus modifyProgrammingPIN(chip::EndpointId endpointId, chip::FabricIndex modifierFabricIndex, chip::NodeId sourceNodeId,
-                                  uint16_t credentialIndex, DlCredentialType credentialType,
+                                  uint16_t credentialIndex, CredentialTypeEnum credentialType,
                                   const EmberAfPluginDoorLockCredentialInfo & existingCredential,
                                   const chip::ByteSpan & credentialData);
     DlStatus modifyCredential(chip::EndpointId endpointId, chip::FabricIndex modifierFabricIndex, chip::NodeId sourceNodeId,
-                              uint16_t credentialIndex, DlCredentialType credentialType,
+                              uint16_t credentialIndex, CredentialTypeEnum credentialType,
                               const EmberAfPluginDoorLockCredentialInfo & existingCredential, const chip::ByteSpan & credentialData,
-                              uint16_t userIndex, const Nullable<DlUserStatus> & userStatus, Nullable<DlUserType> userType);
+                              uint16_t userIndex, const Nullable<UserStatusEnum> & userStatus, Nullable<UserTypeEnum> userType);
 
     EmberAfStatus clearCredential(chip::EndpointId endpointId, chip::FabricIndex modifier, chip::NodeId sourceNodeId,
-                                  DlCredentialType credentialType, uint16_t credentialIndex, bool sendUserChangeEvent);
+                                  CredentialTypeEnum credentialType, uint16_t credentialIndex, bool sendUserChangeEvent);
     EmberAfStatus clearCredentials(chip::EndpointId endpointId, chip::FabricIndex modifier, chip::NodeId sourceNodeId);
     EmberAfStatus clearCredentials(chip::EndpointId endpointId, chip::FabricIndex modifier, chip::NodeId sourceNodeId,
-                                   DlCredentialType credentialType);
+                                   CredentialTypeEnum credentialType);
 
-    bool clearFabricFromCredentials(chip::EndpointId endpointId, DlCredentialType credentialType, chip::FabricIndex fabricToRemove);
+    bool clearFabricFromCredentials(chip::EndpointId endpointId, CredentialTypeEnum credentialType,
+                                    chip::FabricIndex fabricToRemove);
     bool clearFabricFromCredentials(chip::EndpointId endpointId, chip::FabricIndex fabricToRemove);
 
     void sendSetCredentialResponse(chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
@@ -264,7 +268,7 @@ class DoorLockServer
     // TODO: Maybe use CHIP_APPLICATION_ERROR instead of boolean in class methods?
     // OPTIMIZE: there are a lot of methods such as this that could be made static which could help reduce the stack footprint
     // in case of multiple lock endpoints
-    bool credentialTypeSupported(chip::EndpointId endpointId, DlCredentialType type);
+    bool credentialTypeSupported(chip::EndpointId endpointId, CredentialTypeEnum type);
 
     bool weekDayIndexValid(chip::EndpointId endpointId, uint8_t weekDayIndex);
 
@@ -274,7 +278,7 @@ class DoorLockServer
 
     void sendGetWeekDayScheduleResponse(chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
                                         uint8_t weekdayIndex, uint16_t userIndex, DlStatus status,
-                                        DlDaysMaskMap daysMask = DlDaysMaskMap(0), uint8_t startHour = 0, uint8_t startMinute = 0,
+                                        DaysMaskMap daysMask = DaysMaskMap(0), uint8_t startHour = 0, uint8_t startMinute = 0,
                                         uint8_t endHour = 0, uint8_t endMinute = 0);
 
     bool yearDayIndexValid(chip::EndpointId endpointId, uint8_t yearDayIndex);
@@ -293,13 +297,13 @@ class DoorLockServer
 
     void sendHolidayScheduleResponse(chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
                                      uint8_t holidayIndex, DlStatus status, uint32_t localStartTime = 0, uint32_t localEndTime = 0,
-                                     DlOperatingMode operatingMode = DlOperatingMode::kNormal);
+                                     OperatingModeEnum operatingMode = OperatingModeEnum::kNormal);
 
-    bool sendRemoteLockUserChange(chip::EndpointId endpointId, DlLockDataType dataType, DlDataOperationType operation,
+    bool sendRemoteLockUserChange(chip::EndpointId endpointId, LockDataTypeEnum dataType, DataOperationTypeEnum operation,
                                   chip::NodeId nodeId, chip::FabricIndex fabricIndex, uint16_t userIndex = 0,
                                   uint16_t dataIndex = 0);
 
-    DlLockDataType credentialTypeToLockDataType(DlCredentialType credentialType);
+    LockDataTypeEnum credentialTypeToLockDataType(CredentialTypeEnum credentialType);
 
     bool isUserScheduleRestricted(chip::EndpointId endpointId, const EmberAfPluginDoorLockUserInfo & user);
 
@@ -316,11 +320,11 @@ class DoorLockServer
                                      const chip::app::Clusters::DoorLock::Commands::SetCredential::DecodableType & commandData);
 
     void getCredentialStatusCommandHandler(chip::app::CommandHandler * commandObj,
-                                           const chip::app::ConcreteCommandPath & commandPath, DlCredentialType credentialType,
+                                           const chip::app::ConcreteCommandPath & commandPath, CredentialTypeEnum credentialType,
                                            uint16_t credentialIndex);
 
     void sendGetCredentialResponse(chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
-                                   DlCredentialType credentialType, uint16_t credentialIndex, uint16_t userIndexWithCredential,
+                                   CredentialTypeEnum credentialType, uint16_t credentialIndex, uint16_t userIndexWithCredential,
                                    EmberAfPluginDoorLockCredentialInfo * credentialInfo, bool credentialExists);
 
     void clearCredentialCommandHandler(chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
@@ -328,7 +332,7 @@ class DoorLockServer
 
     void setWeekDayScheduleCommandHandler(chip::app::CommandHandler * commandObj,
                                           const chip::app::ConcreteCommandPath & commandPath, uint8_t weekDayIndex,
-                                          uint16_t userIndex, const chip::BitMask<DlDaysMaskMap> & daysMask, uint8_t startHour,
+                                          uint16_t userIndex, const chip::BitMask<DaysMaskMap> & daysMask, uint8_t startHour,
                                           uint8_t startMinute, uint8_t endHour, uint8_t endMinute);
 
     void getWeekDayScheduleCommandHandler(chip::app::CommandHandler * commandObj,
@@ -351,7 +355,7 @@ class DoorLockServer
 
     void setHolidayScheduleCommandHandler(chip::app::CommandHandler * commandObj,
                                           const chip::app::ConcreteCommandPath & commandPath, uint8_t holidayIndex,
-                                          uint32_t localStartTime, uint32_t localEndTime, DlOperatingMode operatingMode);
+                                          uint32_t localStartTime, uint32_t localEndTime, OperatingModeEnum operatingMode);
 
     void getHolidayScheduleCommandHandler(chip::app::CommandHandler * commandObj,
                                           const chip::app::ConcreteCommandPath & commandPath, uint8_t holidayIndex);
@@ -380,7 +384,7 @@ class DoorLockServer
      * @return false        if error happened during lock/unlock
      */
     bool HandleRemoteLockOperation(chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
-                                   DlLockOperationType opType, RemoteLockOpHandler opHandler,
+                                   LockOperationTypeEnum opType, RemoteLockOpHandler opHandler,
                                    const chip::Optional<chip::ByteSpan> & pinCode);
 
     /**
@@ -397,8 +401,8 @@ class DoorLockServer
      * @param credListSize  size of credentials list (if 0, then no credentials were used)
      * @param opSuccess     flags if operation was successful or not
      */
-    void SendLockOperationEvent(chip::EndpointId endpointId, DlLockOperationType opType, DlOperationSource opSource,
-                                DlOperationError opErr, const Nullable<uint16_t> & userId,
+    void SendLockOperationEvent(chip::EndpointId endpointId, LockOperationTypeEnum opType, OperationSourceEnum opSource,
+                                OperationErrorEnum opErr, const Nullable<uint16_t> & userId,
                                 const Nullable<chip::FabricIndex> & fabricIdx, const Nullable<chip::NodeId> & nodeId,
                                 LockOpCredentials * credList, size_t credListSize, bool opSuccess = true);
 
@@ -555,9 +559,9 @@ enum class DlAssetSource : uint8_t
  */
 struct EmberAfPluginDoorLockCredentialInfo
 {
-    DlCredentialStatus status;       /**< Indicates if credential slot is occupied or not. */
-    DlCredentialType credentialType; /**< Specifies the type of the credential (PIN, RFID, etc.). */
-    chip::ByteSpan credentialData;   /**< Credential data bytes. */
+    DlCredentialStatus status;         /**< Indicates if credential slot is occupied or not. */
+    CredentialTypeEnum credentialType; /**< Specifies the type of the credential (PIN, RFID, etc.). */
+    chip::ByteSpan credentialData;     /**< Credential data bytes. */
 
     DlAssetSource creationSource;
     chip::FabricIndex createdBy; /**< Index of the fabric that created the user. */
@@ -571,12 +575,12 @@ struct EmberAfPluginDoorLockCredentialInfo
  */
 struct EmberAfPluginDoorLockUserInfo
 {
-    chip::CharSpan userName;                            /**< Name of the user. */
-    chip::Span<const DlCredential> credentials;         /**< Credentials that are associated with user (without data).*/
-    uint32_t userUniqueId;                              /**< Unique user identifier. */
-    DlUserStatus userStatus = DlUserStatus::kAvailable; /**< Status of the user slot (available/occupied). */
-    DlUserType userType;                                /**< Type of the user. */
-    DlCredentialRule credentialRule;                    /**< Number of supported credentials. */
+    chip::CharSpan userName;                                /**< Name of the user. */
+    chip::Span<const CredentialStruct> credentials;         /**< Credentials that are associated with user (without data).*/
+    uint32_t userUniqueId;                                  /**< Unique user identifier. */
+    UserStatusEnum userStatus = UserStatusEnum::kAvailable; /**< Status of the user slot (available/occupied). */
+    UserTypeEnum userType;                                  /**< Type of the user. */
+    CredentialRuleEnum credentialRule;                      /**< Number of supported credentials. */
 
     DlAssetSource creationSource;
     chip::FabricIndex createdBy; /**< ID of the fabric that created the user. */
@@ -599,11 +603,11 @@ enum class DlScheduleStatus : uint8_t
  */
 struct EmberAfPluginDoorLockWeekDaySchedule
 {
-    DlDaysMaskMap daysMask; /** Indicates the days of the week the Week Day schedule applies for. */
-    uint8_t startHour;      /** Starting hour for the Week Day schedule. */
-    uint8_t startMinute;    /** Starting minute for the Week Day schedule. */
-    uint8_t endHour;        /** Ending hour for the Week Day schedule. */
-    uint8_t endMinute;      /** Ending minute for the Week Day schedule. */
+    DaysMaskMap daysMask; /** Indicates the days of the week the Week Day schedule applies for. */
+    uint8_t startHour;    /** Starting hour for the Week Day schedule. */
+    uint8_t startMinute;  /** Starting minute for the Week Day schedule. */
+    uint8_t endHour;      /** Ending hour for the Week Day schedule. */
+    uint8_t endMinute;    /** Ending minute for the Week Day schedule. */
 };
 
 /**
@@ -626,7 +630,7 @@ struct EmberAfPluginDoorLockHolidaySchedule
                             on the local timezone and DST offset on the day represented by the value. */
     uint32_t localEndTime;   /** The ending time for the Holiday schedule in Epoch Time in Seconds with local time offset based on
                               * the local timezone and DST offset on the day represented by the value. */
-    DlOperatingMode operatingMode; /** Operating mode during the schedule. */
+    OperatingModeEnum operatingMode; /** Operating mode during the schedule. */
 };
 
 /**
@@ -700,7 +704,7 @@ DlStatus emberAfPluginDoorLockGetSchedule(chip::EndpointId endpointId, uint8_t h
  * @retval DlStatus::kFailure in case of any other failure
  */
 DlStatus emberAfPluginDoorLockSetSchedule(chip::EndpointId endpointId, uint8_t weekdayIndex, uint16_t userIndex,
-                                          DlScheduleStatus status, DlDaysMaskMap daysMask, uint8_t startHour, uint8_t startMinute,
+                                          DlScheduleStatus status, DaysMaskMap daysMask, uint8_t startHour, uint8_t startMinute,
                                           uint8_t endHour, uint8_t endMinute);
 /**
  * @brief This callback is called when Door Lock cluster needs to create, modify or clear the year day schedule in schedules
@@ -747,7 +751,7 @@ DlStatus emberAfPluginDoorLockSetSchedule(chip::EndpointId endpointId, uint8_t y
  * @retval DlStatus::kFailure in case of any other failure
  */
 DlStatus emberAfPluginDoorLockSetSchedule(chip::EndpointId endpointId, uint8_t holidayIndex, DlScheduleStatus status,
-                                          uint32_t localStartTime, uint32_t localEndTime, DlOperatingMode operatingMode);
+                                          uint32_t localStartTime, uint32_t localEndTime, OperatingModeEnum operatingMode);
 
 // =============================================================================
 // Pre-change callbacks for cluster attributes
@@ -872,7 +876,7 @@ emberAfPluginDoorLockOnUnhandledAttributeChange(chip::EndpointId EndpointId, con
  * @retval false if error happenned (err should be set to appropriate error code)
  */
 bool emberAfPluginDoorLockOnDoorLockCommand(chip::EndpointId endpointId, const Optional<chip::ByteSpan> & pinCode,
-                                            DlOperationError & err);
+                                            OperationErrorEnum & err);
 
 /**
  * @brief User handler for UnlockDoor command (server)
@@ -885,7 +889,7 @@ bool emberAfPluginDoorLockOnDoorLockCommand(chip::EndpointId endpointId, const O
  * @retval false if error happenned (err should be set to appropriate error code)
  */
 bool emberAfPluginDoorLockOnDoorUnlockCommand(chip::EndpointId endpointId, const Optional<chip::ByteSpan> & pinCode,
-                                              DlOperationError & err);
+                                              OperationErrorEnum & err);
 
 /**
  * @brief This callback is called when the AutoRelock timer is expired.
@@ -933,8 +937,8 @@ bool emberAfPluginDoorLockGetUser(chip::EndpointId endpointId, uint16_t userInde
  */
 bool emberAfPluginDoorLockSetUser(chip::EndpointId endpointId, uint16_t userIndex, chip::FabricIndex creator,
                                   chip::FabricIndex modifier, const chip::CharSpan & userName, uint32_t uniqueId,
-                                  DlUserStatus userStatus, DlUserType usertype, DlCredentialRule credentialRule,
-                                  const DlCredential * credentials, size_t totalCredentials);
+                                  UserStatusEnum userStatus, UserTypeEnum usertype, CredentialRuleEnum credentialRule,
+                                  const CredentialStruct * credentials, size_t totalCredentials);
 
 /**
  * @brief This callback is called when Door Lock cluster needs to access the credential in credentials database.
@@ -953,7 +957,7 @@ bool emberAfPluginDoorLockSetUser(chip::EndpointId endpointId, uint16_t userInde
  * @retval true, if the credential pointed by \p credentialIndex was found and \p credential parameter was written with valid data.
  * @retval false, if error occurred.
  */
-bool emberAfPluginDoorLockGetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, DlCredentialType credentialType,
+bool emberAfPluginDoorLockGetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, CredentialTypeEnum credentialType,
                                         EmberAfPluginDoorLockCredentialInfo & credential);
 
 /**
@@ -979,7 +983,7 @@ bool emberAfPluginDoorLockGetCredential(chip::EndpointId endpointId, uint16_t cr
  */
 bool emberAfPluginDoorLockSetCredential(chip::EndpointId endpointId, uint16_t credentialIndex, chip::FabricIndex creator,
                                         chip::FabricIndex modifier, DlCredentialStatus credentialStatus,
-                                        DlCredentialType credentialType, const chip::ByteSpan & credentialData);
+                                        CredentialTypeEnum credentialType, const chip::ByteSpan & credentialData);
 
 /**
  * @brief This callback is called when the Door Lock server starts the lockout so the app could be notified about it.
diff --git a/src/app/clusters/ethernet-network-diagnostics-server/ethernet-network-diagnostics-server.cpp b/src/app/clusters/ethernet-network-diagnostics-server/ethernet-network-diagnostics-server.cpp
index 87eee5dd46630e..c978a56704397e 100644
--- a/src/app/clusters/ethernet-network-diagnostics-server/ethernet-network-diagnostics-server.cpp
+++ b/src/app/clusters/ethernet-network-diagnostics-server/ethernet-network-diagnostics-server.cpp
@@ -74,7 +74,7 @@ CHIP_ERROR EthernetDiagosticsAttrAccess::ReadIfSupported(CHIP_ERROR (DiagnosticD
 CHIP_ERROR EthernetDiagosticsAttrAccess::ReadPHYRate(AttributeValueEncoder & aEncoder)
 {
     Attributes::PHYRate::TypeInfo::Type pHYRate;
-    auto value = EmberAfPHYRate::EMBER_ZCL_PHY_RATE_RATE10_M;
+    auto value = EmberAfPHYRateEnum::EMBER_ZCL_PHY_RATE_ENUM_RATE10_M;
 
     if (DeviceLayer::GetDiagnosticDataProvider().GetEthPHYRate(value) == CHIP_NO_ERROR)
     {
diff --git a/src/app/clusters/general-diagnostics-server/GenericFaultTestEventTriggerDelegate.cpp b/src/app/clusters/general-diagnostics-server/GenericFaultTestEventTriggerDelegate.cpp
index e0a1ddc3c06bc1..f1fa7488fd9e88 100644
--- a/src/app/clusters/general-diagnostics-server/GenericFaultTestEventTriggerDelegate.cpp
+++ b/src/app/clusters/general-diagnostics-server/GenericFaultTestEventTriggerDelegate.cpp
@@ -38,13 +38,13 @@ CHIP_ERROR GenericFaultTestEventTriggerDelegate::HandleEventTrigger(uint64_t eve
         // Fault injection
         GeneralFaults<kMaxHardwareFaults> hwFaultsPrevious;
         GeneralFaults<kMaxHardwareFaults> hwFaultsCurrent;
-        ReturnErrorOnFailure(hwFaultsPrevious.add(EMBER_ZCL_HARDWARE_FAULT_RADIO));
-        ReturnErrorOnFailure(hwFaultsPrevious.add(EMBER_ZCL_HARDWARE_FAULT_POWER_SOURCE));
+        ReturnErrorOnFailure(hwFaultsPrevious.add(EMBER_ZCL_HARDWARE_FAULT_ENUM_RADIO));
+        ReturnErrorOnFailure(hwFaultsPrevious.add(EMBER_ZCL_HARDWARE_FAULT_ENUM_POWER_SOURCE));
 
-        ReturnErrorOnFailure(hwFaultsCurrent.add(EMBER_ZCL_HARDWARE_FAULT_RADIO));
-        ReturnErrorOnFailure(hwFaultsCurrent.add(EMBER_ZCL_HARDWARE_FAULT_SENSOR));
-        ReturnErrorOnFailure(hwFaultsCurrent.add(EMBER_ZCL_HARDWARE_FAULT_POWER_SOURCE));
-        ReturnErrorOnFailure(hwFaultsCurrent.add(EMBER_ZCL_HARDWARE_FAULT_USER_INTERFACE_FAULT));
+        ReturnErrorOnFailure(hwFaultsCurrent.add(EMBER_ZCL_HARDWARE_FAULT_ENUM_RADIO));
+        ReturnErrorOnFailure(hwFaultsCurrent.add(EMBER_ZCL_HARDWARE_FAULT_ENUM_SENSOR));
+        ReturnErrorOnFailure(hwFaultsCurrent.add(EMBER_ZCL_HARDWARE_FAULT_ENUM_POWER_SOURCE));
+        ReturnErrorOnFailure(hwFaultsCurrent.add(EMBER_ZCL_HARDWARE_FAULT_ENUM_USER_INTERFACE_FAULT));
 
         app::Clusters::GeneralDiagnosticsServer::Instance().OnHardwareFaultsDetect(hwFaultsPrevious, hwFaultsCurrent);
 
@@ -52,13 +52,13 @@ CHIP_ERROR GenericFaultTestEventTriggerDelegate::HandleEventTrigger(uint64_t eve
         GeneralFaults<kMaxRadioFaults> radioFaultsPrevious;
         GeneralFaults<kMaxRadioFaults> radioFaultsCurrent;
 
-        ReturnErrorOnFailure(radioFaultsPrevious.add(EMBER_ZCL_RADIO_FAULT_WI_FI_FAULT));
-        ReturnErrorOnFailure(radioFaultsPrevious.add(EMBER_ZCL_RADIO_FAULT_THREAD_FAULT));
+        ReturnErrorOnFailure(radioFaultsPrevious.add(EMBER_ZCL_RADIO_FAULT_ENUM_WI_FI_FAULT));
+        ReturnErrorOnFailure(radioFaultsPrevious.add(EMBER_ZCL_RADIO_FAULT_ENUM_THREAD_FAULT));
 
-        ReturnErrorOnFailure(radioFaultsCurrent.add(EMBER_ZCL_RADIO_FAULT_WI_FI_FAULT));
-        ReturnErrorOnFailure(radioFaultsCurrent.add(EMBER_ZCL_RADIO_FAULT_CELLULAR_FAULT));
-        ReturnErrorOnFailure(radioFaultsCurrent.add(EMBER_ZCL_RADIO_FAULT_THREAD_FAULT));
-        ReturnErrorOnFailure(radioFaultsCurrent.add(EMBER_ZCL_RADIO_FAULT_NFC_FAULT));
+        ReturnErrorOnFailure(radioFaultsCurrent.add(EMBER_ZCL_RADIO_FAULT_ENUM_WI_FI_FAULT));
+        ReturnErrorOnFailure(radioFaultsCurrent.add(EMBER_ZCL_RADIO_FAULT_ENUM_CELLULAR_FAULT));
+        ReturnErrorOnFailure(radioFaultsCurrent.add(EMBER_ZCL_RADIO_FAULT_ENUM_THREAD_FAULT));
+        ReturnErrorOnFailure(radioFaultsCurrent.add(EMBER_ZCL_RADIO_FAULT_ENUM_NFC_FAULT));
 
         app::Clusters::GeneralDiagnosticsServer::Instance().OnRadioFaultsDetect(radioFaultsPrevious, radioFaultsCurrent);
 
@@ -66,12 +66,12 @@ CHIP_ERROR GenericFaultTestEventTriggerDelegate::HandleEventTrigger(uint64_t eve
         GeneralFaults<kMaxNetworkFaults> networkFaultsCurrent;
 
         // Network faults injections
-        ReturnErrorOnFailure(networkFaultsPrevious.add(EMBER_ZCL_NETWORK_FAULT_TYPE_HARDWARE_FAILURE));
-        ReturnErrorOnFailure(networkFaultsPrevious.add(EMBER_ZCL_NETWORK_FAULT_TYPE_NETWORK_JAMMED));
+        ReturnErrorOnFailure(networkFaultsPrevious.add(EMBER_ZCL_NETWORK_FAULT_ENUM_HARDWARE_FAILURE));
+        ReturnErrorOnFailure(networkFaultsPrevious.add(EMBER_ZCL_NETWORK_FAULT_ENUM_NETWORK_JAMMED));
 
-        ReturnErrorOnFailure(networkFaultsCurrent.add(EMBER_ZCL_NETWORK_FAULT_TYPE_HARDWARE_FAILURE));
-        ReturnErrorOnFailure(networkFaultsCurrent.add(EMBER_ZCL_NETWORK_FAULT_TYPE_NETWORK_JAMMED));
-        ReturnErrorOnFailure(networkFaultsCurrent.add(EMBER_ZCL_NETWORK_FAULT_TYPE_CONNECTION_FAILED));
+        ReturnErrorOnFailure(networkFaultsCurrent.add(EMBER_ZCL_NETWORK_FAULT_ENUM_HARDWARE_FAILURE));
+        ReturnErrorOnFailure(networkFaultsCurrent.add(EMBER_ZCL_NETWORK_FAULT_ENUM_NETWORK_JAMMED));
+        ReturnErrorOnFailure(networkFaultsCurrent.add(EMBER_ZCL_NETWORK_FAULT_ENUM_CONNECTION_FAILED));
 
         app::Clusters::GeneralDiagnosticsServer::Instance().OnNetworkFaultsDetect(networkFaultsPrevious, networkFaultsCurrent);
     }
diff --git a/src/app/clusters/general-diagnostics-server/general-diagnostics-server.cpp b/src/app/clusters/general-diagnostics-server/general-diagnostics-server.cpp
index ccb9fd4a0f9239..6fb013b0ff0282 100644
--- a/src/app/clusters/general-diagnostics-server/general-diagnostics-server.cpp
+++ b/src/app/clusters/general-diagnostics-server/general-diagnostics-server.cpp
@@ -276,9 +276,10 @@ void GeneralDiagnosticsServer::OnHardwareFaultsDetect(const GeneralFaults<kMaxHa
 
         // Record HardwareFault event
         EventNumber eventNumber;
-        DataModel::List<const HardwareFault> currentList(reinterpret_cast<const HardwareFault *>(current.data()), current.size());
-        DataModel::List<const HardwareFault> previousList(reinterpret_cast<const HardwareFault *>(previous.data()),
-                                                          previous.size());
+        DataModel::List<const HardwareFaultEnum> currentList(reinterpret_cast<const HardwareFaultEnum *>(current.data()),
+                                                             current.size());
+        DataModel::List<const HardwareFaultEnum> previousList(reinterpret_cast<const HardwareFaultEnum *>(previous.data()),
+                                                              previous.size());
         Events::HardwareFaultChange::Type event{ currentList, previousList };
 
         if (CHIP_NO_ERROR != LogEvent(event, endpointId, eventNumber))
@@ -302,8 +303,9 @@ void GeneralDiagnosticsServer::OnRadioFaultsDetect(const GeneralFaults<kMaxRadio
 
         // Record RadioFault event
         EventNumber eventNumber;
-        DataModel::List<const RadioFault> currentList(reinterpret_cast<const RadioFault *>(current.data()), current.size());
-        DataModel::List<const RadioFault> previousList(reinterpret_cast<const RadioFault *>(previous.data()), previous.size());
+        DataModel::List<const RadioFaultEnum> currentList(reinterpret_cast<const RadioFaultEnum *>(current.data()), current.size());
+        DataModel::List<const RadioFaultEnum> previousList(reinterpret_cast<const RadioFaultEnum *>(previous.data()),
+                                                           previous.size());
         Events::RadioFaultChange::Type event{ currentList, previousList };
 
         if (CHIP_NO_ERROR != LogEvent(event, endpointId, eventNumber))
@@ -327,9 +329,9 @@ void GeneralDiagnosticsServer::OnNetworkFaultsDetect(const GeneralFaults<kMaxNet
 
         // Record NetworkFault event
         EventNumber eventNumber;
-        DataModel::List<const NetworkFaultType> currentList(reinterpret_cast<const NetworkFaultType *>(current.data()),
+        DataModel::List<const NetworkFaultEnum> currentList(reinterpret_cast<const NetworkFaultEnum *>(current.data()),
                                                             current.size());
-        DataModel::List<const NetworkFaultType> previousList(reinterpret_cast<const NetworkFaultType *>(previous.data()),
+        DataModel::List<const NetworkFaultEnum> previousList(reinterpret_cast<const NetworkFaultEnum *>(previous.data()),
                                                              previous.size());
         Events::NetworkFaultChange::Type event{ currentList, previousList };
 
diff --git a/src/app/clusters/group-key-mgmt-server/group-key-mgmt-server.cpp b/src/app/clusters/group-key-mgmt-server/group-key-mgmt-server.cpp
index 6d35ea2512a1bd..fa6e46e8f40fdb 100644
--- a/src/app/clusters/group-key-mgmt-server/group-key-mgmt-server.cpp
+++ b/src/app/clusters/group-key-mgmt-server/group-key-mgmt-server.cpp
@@ -20,7 +20,6 @@
 #include <app-common/zap-generated/attribute-type.h>
 #include <app-common/zap-generated/attributes/Accessors.h>
 #include <app-common/zap-generated/cluster-objects.h>
-#include <app-common/zap-generated/command-id.h>
 #include <app/AttributeAccessInterface.h>
 #include <app/CommandHandler.h>
 #include <app/server/Server.h>
diff --git a/src/app/clusters/groups-server/groups-server.cpp b/src/app/clusters/groups-server/groups-server.cpp
index 815687605193f4..92788177cee06d 100644
--- a/src/app/clusters/groups-server/groups-server.cpp
+++ b/src/app/clusters/groups-server/groups-server.cpp
@@ -22,7 +22,6 @@
 #include <app-common/zap-generated/attribute-type.h>
 #include <app-common/zap-generated/attributes/Accessors.h>
 #include <app-common/zap-generated/cluster-objects.h>
-#include <app-common/zap-generated/command-id.h>
 #include <app-common/zap-generated/ids/Clusters.h>
 #include <app/CommandHandler.h>
 #include <app/util/af.h>
diff --git a/src/app/clusters/ias-zone-client/ias-zone-client.cpp b/src/app/clusters/ias-zone-client/ias-zone-client.cpp
index 7619a983986fb6..11f1b6de3fd0cc 100644
--- a/src/app/clusters/ias-zone-client/ias-zone-client.cpp
+++ b/src/app/clusters/ias-zone-client/ias-zone-client.cpp
@@ -17,10 +17,12 @@
 
 #include "ias-zone-client.h"
 #include <app-common/zap-generated/ids/Clusters.h>
+#include <app-common/zap-generated/ids/Commands.h>
 #include <app/CommandHandler.h>
 #include <app/util/af.h>
 
 using namespace chip;
+using namespace chip::app::Clusters::IasZone::Commands;
 
 //-----------------------------------------------------------------------------
 // Globals
@@ -282,7 +284,7 @@ bool emberAfIasZoneClusterZoneEnrollRequestCallback(app::CommandHandler * comman
         setServerZoneId(serverIndex, zoneId);
     }
     emberAfFillExternalBuffer((ZCL_CLUSTER_SPECIFIC_COMMAND | ZCL_FRAME_CONTROL_CLIENT_TO_SERVER), app::Clusters::IasZone::Id,
-                              ZCL_ZONE_ENROLL_RESPONSE_COMMAND_ID, "uu", responseCode, zoneId);
+                              ZoneEnrollResponse::Id, "uu", responseCode, zoneId);
     // Need to send this command with our source EUI because the server will
     // check our EUI64 against his CIE Address to see if we're his CIE.
     emberAfGetCommandApsFrame()->options |= EMBER_APS_OPTION_SOURCE_EUI64;
diff --git a/src/app/clusters/ias-zone-server/ias-zone-server.cpp b/src/app/clusters/ias-zone-server/ias-zone-server.cpp
index 3b08d92d45d977..e64f0f00fe5f45 100644
--- a/src/app/clusters/ias-zone-server/ias-zone-server.cpp
+++ b/src/app/clusters/ias-zone-server/ias-zone-server.cpp
@@ -21,8 +21,8 @@
 #include <app-common/zap-generated/attribute-type.h>
 #include <app-common/zap-generated/callback.h>
 #include <app-common/zap-generated/cluster-objects.h>
-#include <app-common/zap-generated/command-id.h>
 #include <app-common/zap-generated/ids/Clusters.h>
+#include <app-common/zap-generated/ids/Commands.h>
 #include <app/CommandHandler.h>
 #include <app/ConcreteCommandPath.h>
 #include <app/util/af-event.h>
@@ -34,6 +34,7 @@
 using namespace chip;
 using namespace chip::app::Clusters;
 using namespace chip::app::Clusters::IasZone;
+using namespace chip::app::Clusters::IasZone::Commands;
 
 #define UNDEFINED_ZONE_ID 0xFF
 #define DELAY_TIMER_MS (1 * MILLISECOND_TICKS_PER_SECOND)
@@ -171,8 +172,7 @@ static void enrollWithClient(EndpointId endpoint)
 {
     EmberStatus status;
     emberAfFillExternalBuffer((ZCL_CLUSTER_SPECIFIC_COMMAND | ZCL_FRAME_CONTROL_SERVER_TO_CLIENT), IasZone::Id,
-                              ZCL_ZONE_ENROLL_REQUEST_COMMAND_ID, "vv", EMBER_AF_PLUGIN_IAS_ZONE_SERVER_ZONE_TYPE,
-                              EMBER_AF_MANUFACTURER_CODE);
+                              ZoneEnrollRequest::Id, "vv", EMBER_AF_PLUGIN_IAS_ZONE_SERVER_ZONE_TYPE, EMBER_AF_MANUFACTURER_CODE);
     status = sendToClient(endpoint);
     if (status == EMBER_SUCCESS)
     {
@@ -354,8 +354,8 @@ static EmberStatus sendZoneUpdate(uint16_t zoneStatus, uint16_t timeSinceStatusO
         return EMBER_INVALID_CALL;
     }
     emberAfFillExternalBuffer((ZCL_CLUSTER_SPECIFIC_COMMAND | ZCL_FRAME_CONTROL_SERVER_TO_CLIENT), IasZone::Id,
-                              ZCL_ZONE_STATUS_CHANGE_NOTIFICATION_COMMAND_ID, "vuuv", zoneStatus,
-                              0 /*extended status, must be zero per spec*/, emberAfPluginIasZoneServerGetZoneId(endpoint),
+                              ZoneStatusChangeNotification::Id, "vuuv", zoneStatus, 0 /*extended status, must be zero per spec*/,
+                              emberAfPluginIasZoneServerGetZoneId(endpoint),
                               timeSinceStatusOccurredQs /* called "delay" in the spec */);
     status = sendToClient(endpoint);
 
@@ -728,7 +728,7 @@ void emberAfIasZoneClusterServerMessageSentCallback(const MessageSendDestination
     }
 
     commandId = message[IAS_ZONE_SERVER_PAYLOAD_COMMAND_IDX];
-    if (commandId != ZCL_ZONE_STATUS_CHANGE_NOTIFICATION_COMMAND_ID)
+    if (commandId != ZoneStatusChangeNotification::Id)
     {
         return;
     }
diff --git a/src/app/clusters/identify-server/identify-server.cpp b/src/app/clusters/identify-server/identify-server.cpp
index 5d749c951a7a85..5dfe3a0aeba3bf 100644
--- a/src/app/clusters/identify-server/identify-server.cpp
+++ b/src/app/clusters/identify-server/identify-server.cpp
@@ -22,7 +22,6 @@
 #include <app-common/zap-generated/attributes/Accessors.h>
 #include <app-common/zap-generated/callback.h>
 #include <app-common/zap-generated/cluster-objects.h>
-#include <app-common/zap-generated/command-id.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>
diff --git a/src/app/clusters/pump-configuration-and-control-server/pump-configuration-and-control-server.cpp b/src/app/clusters/pump-configuration-and-control-server/pump-configuration-and-control-server.cpp
index ae3552eaef68dc..b06d5105aa6bd6 100644
--- a/src/app/clusters/pump-configuration-and-control-server/pump-configuration-and-control-server.cpp
+++ b/src/app/clusters/pump-configuration-and-control-server/pump-configuration-and-control-server.cpp
@@ -21,7 +21,6 @@
 #include <app-common/zap-generated/attributes/Accessors.h>
 #include <app-common/zap-generated/cluster-enums.h>
 #include <app-common/zap-generated/ids/Attributes.h>
-#include <app/AttributeAccessInterface.h>
 #include <app/ConcreteAttributePath.h>
 #include <app/ConcreteCommandPath.h>
 #include <app/InteractionModelEngine.h>
@@ -33,23 +32,10 @@ using namespace chip::app;
 using namespace chip::app::Clusters;
 using namespace chip::app::Clusters::PumpConfigurationAndControl;
 
-namespace {
-
-class PumpConfigurationAndControlAttrAccess : public AttributeAccessInterface
-{
-public:
-    // Register for the Pump Configuration And Control cluster on all endpoints.
-    PumpConfigurationAndControlAttrAccess() :
-        AttributeAccessInterface(Optional<EndpointId>::Missing(), PumpConfigurationAndControl::Id)
-    {}
-
-    CHIP_ERROR Read(const ConcreteReadAttributePath & aPath, AttributeValueEncoder & aEncoder) override;
-    CHIP_ERROR Write(const ConcreteDataAttributePath & aPath, AttributeValueDecoder & aDecoder) override;
-
-private:
-};
-
-PumpConfigurationAndControlAttrAccess gAttrAccess;
+namespace chip {
+namespace app {
+namespace Clusters {
+namespace PumpConfigurationAndControl {
 
 // Enum for RemoteSensorType
 enum class RemoteSensorType : uint8_t
@@ -68,7 +54,7 @@ static RemoteSensorType detectRemoteSensorConnected()
     return RemoteSensorType::kNoSensor;
 }
 
-static void updateAttributeLinks(EndpointId endpoint)
+static void setEffectiveModes(EndpointId endpoint)
 {
     PumpControlMode controlMode;
     PumpOperationMode operationMode;
@@ -242,109 +228,25 @@ static void updateAttributeLinks(EndpointId endpoint)
     }
 }
 
-CHIP_ERROR PumpConfigurationAndControlAttrAccess::Read(const ConcreteReadAttributePath & aPath, AttributeValueEncoder & aEncoder)
+bool HasFeature(EndpointId endpoint, PumpFeature feature)
 {
-    emberAfDebugPrintln("Reading from PCC");
+    bool hasFeature;
+    uint32_t featureMap;
+    hasFeature = (Attributes::FeatureMap::Get(endpoint, &featureMap) == EMBER_ZCL_STATUS_SUCCESS);
 
-    VerifyOrDie(aPath.mClusterId == PumpConfigurationAndControl::Id);
-
-    switch (aPath.mAttributeId)
-    {
-    default:
-        break;
-    }
-    return CHIP_NO_ERROR;
+    return hasFeature ? ((featureMap & to_underlying(feature)) != 0) : false;
 }
 
-CHIP_ERROR PumpConfigurationAndControlAttrAccess::Write(const ConcreteDataAttributePath & aPath, AttributeValueDecoder & aDecoder)
-{
-    emberAfDebugPrintln("Writing to PCC");
-
-    VerifyOrDie(aPath.mClusterId == PumpConfigurationAndControl::Id);
-
-    switch (aPath.mAttributeId)
-    {
-    default:
-        break;
-    }
-    return CHIP_NO_ERROR;
-}
-} // namespace
+} // namespace PumpConfigurationAndControl
+} // namespace Clusters
+} // namespace app
+} // namespace chip
 
 // SDK Callbacks
 
-template <typename T1, typename T2>
-bool IsFeatureSupported(EndpointId endpoint, EmberAfStatus (*getFn1)(chip::EndpointId endpointId, T1 & value),
-                        EmberAfStatus (*getFn2)(chip::EndpointId endpointId, T2 & value))
-{
-    EmberAfStatus status;
-
-    T1 value1;
-    T2 value2;
-
-    status = getFn1(endpoint, value1);
-    if (status == EMBER_ZCL_STATUS_SUCCESS)
-    {
-        if (!value1.IsNull())
-        {
-            status = getFn2(endpoint, value2);
-            if (status == EMBER_ZCL_STATUS_SUCCESS)
-            {
-                if (!value2.IsNull())
-                {
-                    return true;
-                }
-            }
-        }
-    }
-
-    return false;
-}
-
-template <typename T1, typename T2>
-const char * FeatureSupportedDebugString(EndpointId endpoint, EmberAfStatus (*getFn1)(chip::EndpointId endpointId, T1 & value),
-                                         EmberAfStatus (*getFn2)(chip::EndpointId endpointId, T2 & value))
-{
-    return IsFeatureSupported(endpoint, getFn1, getFn2) ? "Supported" : "Not Supported";
-}
-
 void emberAfPumpConfigurationAndControlClusterServerInitCallback(EndpointId endpoint)
 {
     emberAfDebugPrintln("Initialize PCC Server Cluster [EP:%d]", endpoint);
-
-    // Determine the internal feature set of the pump, depending on the pump
-    // specific attributes available, and their values. This is a temporary
-    // implementation to get a kind of "pseudo-FeatureMap" until we get a real
-    // FeatureMap implementation in the PCC cluster. If an attribute is
-    // present/available, then there is a possibility for the associated
-    // feature being present as well. But we will have to distinguis between
-    // the attributes being available and null also. At this point (init)
-    // we can only examine the list of attributes available, and then detect
-    // if they each have a NonNull value. Later on, when the pump application
-    // has finished its init process, it might setup these attributevalues
-    // to something NonNull, and then we must re-calcualte the feature set.
-
-    emberAfDebugPrintln(
-        "Constant Pressure %s",
-        FeatureSupportedDebugString(endpoint, Attributes::MinConstPressure::Get, Attributes::MaxConstPressure::Get));
-    emberAfDebugPrintln("PCC Server: Constant Proportional Pressure %s",
-                        FeatureSupportedDebugString(endpoint, Attributes::MinCompPressure::Get, Attributes::MaxCompPressure::Get));
-    emberAfDebugPrintln("PCC Server: Constant Flow %s",
-                        FeatureSupportedDebugString(endpoint, Attributes::MinConstFlow::Get, Attributes::MaxConstFlow::Get));
-    emberAfDebugPrintln("PCC Server: Constant Temperature %s",
-                        FeatureSupportedDebugString(endpoint, Attributes::MinConstTemp::Get, Attributes::MaxConstTemp::Get));
-    emberAfDebugPrintln("PCC Server: Constant Speed %s",
-                        FeatureSupportedDebugString(endpoint, Attributes::MinConstSpeed::Get, Attributes::MaxConstSpeed::Get));
-
-    if (!emberAfContainsAttribute(endpoint, PumpConfigurationAndControl::Id, Attributes::ControlMode::Id))
-    {
-        emberAfDebugPrintln("PCC Server: ControlMode attribute not available");
-    }
-
-    if (!emberAfContainsAttribute(endpoint, PumpConfigurationAndControl::Id, Attributes::PumpStatus::Id))
-    {
-        emberAfDebugPrintln("PCC Server: PumpStatus attribute not available");
-    }
 }
 
 chip::Protocols::InteractionModel::Status MatterPumpConfigurationAndControlClusterServerPreAttributeChangedCallback(
@@ -365,38 +267,40 @@ chip::Protocols::InteractionModel::Status MatterPumpConfigurationAndControlClust
         switch (controlMode)
         {
         case PumpControlMode::kConstantFlow:
-            if (!IsFeatureSupported(attributePath.mEndpointId, Attributes::MinConstFlow::Get, Attributes::MaxConstFlow::Get))
+            if (!HasFeature(attributePath.mEndpointId, PumpFeature::kConstantFlow))
             {
                 status = Protocols::InteractionModel::Status::ConstraintError;
             }
             break;
         case PumpControlMode::kConstantPressure:
-            if (!IsFeatureSupported(attributePath.mEndpointId, Attributes::MinConstPressure::Get,
-                                    Attributes::MaxConstPressure::Get))
+            if (!HasFeature(attributePath.mEndpointId, PumpFeature::kConstantPressure))
             {
                 status = Protocols::InteractionModel::Status::ConstraintError;
             }
             break;
         case PumpControlMode::kConstantSpeed:
-            if (!IsFeatureSupported(attributePath.mEndpointId, Attributes::MinConstSpeed::Get, Attributes::MaxConstSpeed::Get))
+            if (!HasFeature(attributePath.mEndpointId, PumpFeature::kConstantSpeed))
             {
                 status = Protocols::InteractionModel::Status::ConstraintError;
             }
             break;
         case PumpControlMode::kConstantTemperature:
-            if (!IsFeatureSupported(attributePath.mEndpointId, Attributes::MinConstTemp::Get, Attributes::MaxConstTemp::Get))
+            if (!HasFeature(attributePath.mEndpointId, PumpFeature::kConstantTemperature))
             {
                 status = Protocols::InteractionModel::Status::ConstraintError;
             }
             break;
         case PumpControlMode::kProportionalPressure:
-            if (!IsFeatureSupported(attributePath.mEndpointId, Attributes::MinCompPressure::Get, Attributes::MaxCompPressure::Get))
+            if (!HasFeature(attributePath.mEndpointId, PumpFeature::kCompensatedPressure))
             {
                 status = Protocols::InteractionModel::Status::ConstraintError;
             }
             break;
         case PumpControlMode::kAutomatic:
-            status = Protocols::InteractionModel::Status::Success;
+            if (!HasFeature(attributePath.mEndpointId, PumpFeature::kAutomatic))
+            {
+                status = Protocols::InteractionModel::Status::ConstraintError;
+            }
             break;
         case PumpControlMode::kUnknownEnumValue:
             status = Protocols::InteractionModel::Status::ConstraintError;
@@ -414,18 +318,23 @@ chip::Protocols::InteractionModel::Status MatterPumpConfigurationAndControlClust
         switch (operationMode)
         {
         case PumpOperationMode::kMinimum:
-            if (!IsFeatureSupported(attributePath.mEndpointId, Attributes::MinConstSpeed::Get, Attributes::MaxConstSpeed::Get))
+            if (!HasFeature(attributePath.mEndpointId, PumpFeature::kConstantSpeed))
             {
                 status = Protocols::InteractionModel::Status::ConstraintError;
             }
             break;
         case PumpOperationMode::kMaximum:
-            if (!IsFeatureSupported(attributePath.mEndpointId, Attributes::MinConstSpeed::Get, Attributes::MaxConstSpeed::Get))
+            if (!HasFeature(attributePath.mEndpointId, PumpFeature::kConstantSpeed))
             {
                 status = Protocols::InteractionModel::Status::ConstraintError;
             }
             break;
         case PumpOperationMode::kLocal:
+            if (!HasFeature(attributePath.mEndpointId, PumpFeature::kLocal))
+            {
+                status = Protocols::InteractionModel::Status::ConstraintError;
+            }
+            break;
         case PumpOperationMode::kNormal:
             status = Protocols::InteractionModel::Status::Success;
             break;
@@ -449,22 +358,13 @@ void MatterPumpConfigurationAndControlClusterServerAttributeChangedCallback(cons
 
     switch (attributePath.mAttributeId)
     {
-    case Attributes::ControlMode::Id: {
-        updateAttributeLinks(attributePath.mEndpointId);
-    }
-    break;
-    case Attributes::OperationMode::Id: {
-        updateAttributeLinks(attributePath.mEndpointId);
-    }
-    break;
+    case Attributes::ControlMode::Id:
+    case Attributes::OperationMode::Id:
+        setEffectiveModes(attributePath.mEndpointId);
+        break;
     default:
         emberAfDebugPrintln("PCC Server: unhandled attribute ID");
     }
 }
 
-void MatterPumpConfigurationAndControlPluginServerInitCallback()
-{
-    emberAfDebugPrintln("Initialize PCC Plugin Server Cluster.");
-
-    registerAttributeAccessOverride(&gAttrAccess);
-}
+void MatterPumpConfigurationAndControlPluginServerInitCallback() {}
diff --git a/src/app/clusters/scenes-client/scenes-client.cpp b/src/app/clusters/scenes-client/scenes-client.cpp
index 2c1b69e4777c43..de4c8954d9b0b1 100644
--- a/src/app/clusters/scenes-client/scenes-client.cpp
+++ b/src/app/clusters/scenes-client/scenes-client.cpp
@@ -19,9 +19,10 @@
 #include <app/CommandHandler.h>
 #include <app/util/af.h>
 
-#include <app-common/zap-generated/command-id.h>
+#include <app-common/zap-generated/ids/Commands.h>
 
 using namespace chip;
+using namespace chip::app::Clusters::Scenes::Commands;
 
 bool emberAfScenesClusterAddSceneResponseCallback(app::CommandHandler * commandObj, uint8_t status, GroupId groupId,
                                                   uint8_t sceneId)
@@ -85,7 +86,7 @@ bool emberAfScenesClusterGetSceneMembershipResponseCallback(app::CommandHandler
 bool emberAfPluginScenesClientParseAddSceneResponse(const EmberAfClusterCommand * cmd, uint8_t status, GroupId groupId,
                                                     uint8_t sceneId)
 {
-    bool enhanced = (cmd->commandId == ZCL_ENHANCED_ADD_SCENE_COMMAND_ID);
+    bool enhanced = (cmd->commandId == EnhancedAddScene::Id);
     emberAfScenesClusterPrintln("RX: %pAddSceneResponse 0x%x, 0x%2x, 0x%x", (enhanced ? "Enhanced" : ""), status, groupId, sceneId);
     emberAfSendDefaultResponse(cmd, EMBER_ZCL_STATUS_SUCCESS);
     return true;
@@ -95,7 +96,7 @@ bool emberAfPluginScenesClientParseViewSceneResponse(const EmberAfClusterCommand
                                                      uint8_t sceneId, uint16_t transitionTime, const uint8_t * sceneName,
                                                      const uint8_t * extensionFieldSets)
 {
-    bool enhanced = (cmd->commandId == ZCL_ENHANCED_VIEW_SCENE_COMMAND_ID);
+    bool enhanced = (cmd->commandId == EnhancedViewScene::Id);
 
     emberAfScenesClusterPrint("RX: %pViewSceneResponse 0x%x, 0x%2x, 0x%x", (enhanced ? "Enhanced" : ""), status, groupId, sceneId);
 
diff --git a/src/app/clusters/scenes/scenes.cpp b/src/app/clusters/scenes/scenes.cpp
index ed039229b4e57a..b17e12c8fbc92d 100644
--- a/src/app/clusters/scenes/scenes.cpp
+++ b/src/app/clusters/scenes/scenes.cpp
@@ -20,8 +20,8 @@
 #include <app-common/zap-generated/attribute-id.h>
 #include <app-common/zap-generated/attribute-type.h>
 #include <app-common/zap-generated/cluster-objects.h>
-#include <app-common/zap-generated/command-id.h>
 #include <app-common/zap-generated/ids/Clusters.h>
+#include <app-common/zap-generated/ids/Commands.h>
 #include <app/CommandHandler.h>
 #include <app/ConcreteCommandPath.h>
 #include <app/util/af.h>
@@ -37,6 +37,7 @@
 using namespace chip;
 using namespace chip::app::Clusters;
 using namespace chip::app::Clusters::Scenes;
+using namespace chip::app::Clusters::Scenes::Commands;
 
 uint8_t emberAfPluginScenesServerEntriesInUse = 0;
 #if !defined(EMBER_AF_PLUGIN_SCENES_USE_TOKENS) || defined(EZSP_HOST)
@@ -260,7 +261,7 @@ bool emberAfScenesClusterRemoveSceneCallback(app::CommandHandler * commandObj, c
     if (emberAfCurrentCommand()->type == EMBER_INCOMING_UNICAST || emberAfCurrentCommand()->type == EMBER_INCOMING_UNICAST_REPLY)
     {
         {
-            app::ConcreteCommandPath path = { emberAfCurrentEndpoint(), Scenes::Id, ZCL_REMOVE_SCENE_RESPONSE_COMMAND_ID };
+            app::ConcreteCommandPath path = { emberAfCurrentEndpoint(), Scenes::Id, RemoveSceneResponse::Id };
             TLV::TLVWriter * writer       = nullptr;
             SuccessOrExit(err = commandObj->PrepareCommand(path));
             VerifyOrExit((writer = commandObj->GetCommandDataIBTLVWriter()) != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
@@ -312,7 +313,7 @@ bool emberAfScenesClusterRemoveAllScenesCallback(app::CommandHandler * commandOb
     if (emberAfCurrentCommand()->type == EMBER_INCOMING_UNICAST || emberAfCurrentCommand()->type == EMBER_INCOMING_UNICAST_REPLY)
     {
         {
-            app::ConcreteCommandPath path = { emberAfCurrentEndpoint(), Scenes::Id, ZCL_REMOVE_ALL_SCENES_RESPONSE_COMMAND_ID };
+            app::ConcreteCommandPath path = { emberAfCurrentEndpoint(), Scenes::Id, RemoveAllScenesResponse::Id };
             TLV::TLVWriter * writer       = nullptr;
             SuccessOrExit(err = commandObj->PrepareCommand(path));
             VerifyOrExit((writer = commandObj->GetCommandDataIBTLVWriter()) != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
@@ -346,7 +347,7 @@ bool emberAfScenesClusterStoreSceneCallback(app::CommandHandler * commandObj, co
     if (emberAfCurrentCommand()->type == EMBER_INCOMING_UNICAST || emberAfCurrentCommand()->type == EMBER_INCOMING_UNICAST_REPLY)
     {
         {
-            app::ConcreteCommandPath path = { emberAfCurrentEndpoint(), Scenes::Id, ZCL_STORE_SCENE_RESPONSE_COMMAND_ID };
+            app::ConcreteCommandPath path = { emberAfCurrentEndpoint(), Scenes::Id, StoreSceneResponse::Id };
             TLV::TLVWriter * writer       = nullptr;
             SuccessOrExit(err = commandObj->PrepareCommand(path));
             VerifyOrExit((writer = commandObj->GetCommandDataIBTLVWriter()) != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
@@ -441,7 +442,7 @@ bool emberAfScenesClusterGetSceneMembershipCallback(app::CommandHandler * comman
     }
 
     {
-        app::ConcreteCommandPath path = { emberAfCurrentEndpoint(), Scenes::Id, ZCL_GET_SCENE_MEMBERSHIP_RESPONSE_COMMAND_ID };
+        app::ConcreteCommandPath path = { emberAfCurrentEndpoint(), Scenes::Id, GetSceneMembershipResponse::Id };
         TLV::TLVWriter * writer       = nullptr;
         SuccessOrExit(err = commandObj->PrepareCommand(path));
         VerifyOrExit((writer = commandObj->GetCommandDataIBTLVWriter()) != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
@@ -724,7 +725,7 @@ bool emberAfPluginScenesServerParseAddScene(
     CHIP_ERROR err = CHIP_NO_ERROR;
     EmberAfSceneTableEntry entry;
     EmberAfStatus status;
-    bool enhanced       = (cmd->commandId == ZCL_ENHANCED_ADD_SCENE_COMMAND_ID);
+    bool enhanced       = (cmd->commandId == EnhancedAddScene::Id);
     auto fabricIndex    = commandObj->GetAccessingFabricIndex();
     EndpointId endpoint = cmd->apsFrame->destinationEndpoint;
     uint8_t i, index = EMBER_AF_SCENE_TABLE_NULL_INDEX;
@@ -1033,10 +1034,10 @@ bool emberAfPluginScenesServerParseAddScene(
         return true;
     }
     {
-        app::ConcreteCommandPath path = { emberAfCurrentEndpoint(), Scenes::Id, ZCL_ADD_SCENE_RESPONSE_COMMAND_ID };
+        app::ConcreteCommandPath path = { emberAfCurrentEndpoint(), Scenes::Id, AddSceneResponse::Id };
         if (enhanced)
         {
-            path = { emberAfCurrentEndpoint(), Scenes::Id, ZCL_ENHANCED_ADD_SCENE_RESPONSE_COMMAND_ID };
+            path = { emberAfCurrentEndpoint(), Scenes::Id, EnhancedAddSceneResponse::Id };
         }
         TLV::TLVWriter * writer = nullptr;
         SuccessOrExit(err = commandObj->PrepareCommand(path));
@@ -1061,7 +1062,7 @@ bool emberAfPluginScenesServerParseViewScene(app::CommandHandler * commandObj, c
     CHIP_ERROR err               = CHIP_NO_ERROR;
     EmberAfSceneTableEntry entry = {};
     EmberAfStatus status         = EMBER_ZCL_STATUS_NOT_FOUND;
-    bool enhanced                = (cmd->commandId == ZCL_ENHANCED_VIEW_SCENE_COMMAND_ID);
+    bool enhanced                = (cmd->commandId == EnhancedViewScene::Id);
     FabricIndex fabricIndex      = commandObj->GetAccessingFabricIndex();
     EndpointId endpoint          = cmd->apsFrame->destinationEndpoint;
 
@@ -1089,10 +1090,10 @@ bool emberAfPluginScenesServerParseViewScene(app::CommandHandler * commandObj, c
     // The status, group id, and scene id are always included in the response, but
     // the transition time, name, and extension fields are only included if the
     // scene was found.
-    app::ConcreteCommandPath path = { emberAfCurrentEndpoint(), Scenes::Id, ZCL_VIEW_SCENE_RESPONSE_COMMAND_ID };
+    app::ConcreteCommandPath path = { emberAfCurrentEndpoint(), Scenes::Id, ViewSceneResponse::Id };
     if (enhanced)
     {
-        path = { emberAfCurrentEndpoint(), Scenes::Id, ZCL_ENHANCED_VIEW_SCENE_RESPONSE_COMMAND_ID };
+        path = { emberAfCurrentEndpoint(), Scenes::Id, EnhancedViewSceneResponse::Id };
     }
     TLV::TLVWriter * writer = nullptr;
     SuccessOrExit(err = commandObj->PrepareCommand(path));
diff --git a/src/app/clusters/thermostat-server/thermostat-server.cpp b/src/app/clusters/thermostat-server/thermostat-server.cpp
index fdb65b21c33fe0..96da514d59b1c2 100644
--- a/src/app/clusters/thermostat-server/thermostat-server.cpp
+++ b/src/app/clusters/thermostat-server/thermostat-server.cpp
@@ -25,7 +25,6 @@
 #include <app-common/zap-generated/attributes/Accessors.h>
 #include <app-common/zap-generated/callback.h>
 #include <app-common/zap-generated/cluster-objects.h>
-#include <app-common/zap-generated/command-id.h>
 #include <app-common/zap-generated/enums.h>
 #include <app-common/zap-generated/ids/Attributes.h>
 #include <app/CommandHandler.h>
diff --git a/src/app/clusters/thermostat-user-interface-configuration-server/thermostat-user-interface-configuration-server.cpp b/src/app/clusters/thermostat-user-interface-configuration-server/thermostat-user-interface-configuration-server.cpp
index b737888cc3e73d..957990dbac4a86 100644
--- a/src/app/clusters/thermostat-user-interface-configuration-server/thermostat-user-interface-configuration-server.cpp
+++ b/src/app/clusters/thermostat-user-interface-configuration-server/thermostat-user-interface-configuration-server.cpp
@@ -8,7 +8,6 @@
 #include <app-common/zap-generated/attributes/Accessors.h>
 #include <app-common/zap-generated/callback.h>
 #include <app-common/zap-generated/cluster-objects.h>
-#include <app-common/zap-generated/command-id.h>
 #include <app-common/zap-generated/enums.h>
 #include <app-common/zap-generated/ids/Attributes.h>
 #include <app/CommandHandler.h>
diff --git a/src/app/clusters/window-covering-server/window-covering-server.cpp b/src/app/clusters/window-covering-server/window-covering-server.cpp
index 5955a6bb24ed12..8b3358ff897e28 100644
--- a/src/app/clusters/window-covering-server/window-covering-server.cpp
+++ b/src/app/clusters/window-covering-server/window-covering-server.cpp
@@ -20,7 +20,6 @@
 #include <app-common/zap-generated/attribute-id.h>
 #include <app-common/zap-generated/attributes/Accessors.h>
 #include <app-common/zap-generated/cluster-objects.h>
-#include <app-common/zap-generated/command-id.h>
 #include <app/CommandHandler.h>
 #include <app/ConcreteCommandPath.h>
 #include <app/reporting/reporting.h>
diff --git a/src/app/common/templates/legacy-struct-list.yaml b/src/app/common/templates/legacy-struct-list.yaml
index 974298a68d61be..9ad0cfec369a94 100644
--- a/src/app/common/templates/legacy-struct-list.yaml
+++ b/src/app/common/templates/legacy-struct-list.yaml
@@ -1,4 +1,4 @@
 # List of structs for which we output a legacy definition in af-structs.h
 # Ideally this list should become empty.
-- DlCredential
+- CredentialStruct
 - ApplicationBasicApplication
diff --git a/src/app/common/templates/templates.json b/src/app/common/templates/templates.json
index a4081365ebb99a..af56353de4c8c1 100644
--- a/src/app/common/templates/templates.json
+++ b/src/app/common/templates/templates.json
@@ -62,11 +62,6 @@
             "name": "ZCL callback header",
             "output": "callback.h"
         },
-        {
-            "path": "../../zap-templates/templates/app/command-id.zapt",
-            "name": "ZCL command-id header",
-            "output": "command-id.h"
-        },
         {
             "path": "../../zap-templates/templates/app/enums.zapt",
             "name": "ZCL enums header",
diff --git a/src/app/common/templates/weak-enum-list.yaml b/src/app/common/templates/weak-enum-list.yaml
index aa4bee14441513..d9b4dc74e9517b 100644
--- a/src/app/common/templates/weak-enum-list.yaml
+++ b/src/app/common/templates/weak-enum-list.yaml
@@ -10,23 +10,23 @@
 - ContentLaunchStatus
 - ContentLaunchStreamingType
 - EnhancedColorMode
-- HardwareFault
+- HardwareFaultEnum
 - HueDirection
 - HueMoveMode
 - HueStepMode
 - IdentifyEffectIdentifier
 - IdentifyEffectVariant
 - IdentifyIdentifyType
-- InterfaceType
+- InterfaceTypeEnum
 - KeypadLockout
 - LevelControlOptions
 - MoveMode
-- NetworkFaultType
+- NetworkFaultEnum
 - OnOffDelayedAllOffEffectVariant
 - OnOffDyingLightEffectVariant
 - OnOffEffectIdentifier
-- PHYRate
-- RadioFault
+- PHYRateEnum
+- RadioFaultEnum
 - RoutingRole
 - SaturationMoveMode
 - SaturationStepMode
diff --git a/src/app/server/AppDelegate.h b/src/app/server/AppDelegate.h
index 49937c62d7168e..dbd1d42c7a4828 100644
--- a/src/app/server/AppDelegate.h
+++ b/src/app/server/AppDelegate.h
@@ -33,7 +33,9 @@ class AppDelegate
      * This is called anytime a basic or enhanced commissioning window is opened.
      *
      * The type of the window can be retrieved by calling
-     * CommissioningWindowManager::CommissioningWindowStatus()
+     * CommissioningWindowManager::CommissioningWindowStatusForCluster(), but
+     * being careful about how to handle the None status when a window is in
+     * fact open.
      */
     virtual void OnCommissioningWindowOpened() {}
     virtual void OnCommissioningWindowClosed() {}
diff --git a/src/app/server/CommissioningWindowManager.cpp b/src/app/server/CommissioningWindowManager.cpp
index 6ce32d01bbbfa2..a899179c85e545 100644
--- a/src/app/server/CommissioningWindowManager.cpp
+++ b/src/app/server/CommissioningWindowManager.cpp
@@ -28,7 +28,7 @@
 using namespace chip::app::Clusters;
 using namespace chip::System::Clock;
 
-using AdministratorCommissioning::CommissioningWindowStatus;
+using AdministratorCommissioning::CommissioningWindowStatusEnum;
 using chip::app::DataModel::MakeNullable;
 using chip::app::DataModel::Nullable;
 using chip::app::DataModel::NullNullable;
@@ -106,7 +106,7 @@ void CommissioningWindowManager::ResetState()
     }
 #endif
 
-    UpdateWindowStatus(CommissioningWindowStatus::kWindowNotOpen);
+    UpdateWindowStatus(CommissioningWindowStatusEnum::kWindowNotOpen);
 
     UpdateOpenerFabricIndex(NullNullable);
     UpdateOpenerVendorId(NullNullable);
@@ -368,7 +368,7 @@ void CommissioningWindowManager::CloseCommissioningWindow()
     }
 }
 
-CommissioningWindowStatus CommissioningWindowManager::CommissioningWindowStatusForCluster() const
+CommissioningWindowStatusEnum CommissioningWindowManager::CommissioningWindowStatusForCluster() const
 {
     // If the condition we use to determine whether we were opened via the
     // cluster ever changes, make sure whatever code affects that condition
@@ -377,7 +377,7 @@ CommissioningWindowStatus CommissioningWindowManager::CommissioningWindowStatusF
     if (mOpenerVendorId.IsNull())
     {
         // Not opened via the cluster.
-        return CommissioningWindowStatus::kWindowNotOpen;
+        return CommissioningWindowStatusEnum::kWindowNotOpen;
     }
 
     return mWindowStatus;
@@ -385,7 +385,7 @@ CommissioningWindowStatus CommissioningWindowManager::CommissioningWindowStatusF
 
 bool CommissioningWindowManager::IsCommissioningWindowOpen() const
 {
-    return mWindowStatus != CommissioningWindowStatus::kWindowNotOpen;
+    return mWindowStatus != CommissioningWindowStatusEnum::kWindowNotOpen;
 }
 
 void CommissioningWindowManager::OnFabricRemoved(FabricIndex removedIndex)
@@ -409,9 +409,9 @@ Dnssd::CommissioningMode CommissioningWindowManager::GetCommissioningMode() cons
 
     switch (mWindowStatus)
     {
-    case CommissioningWindowStatus::kEnhancedWindowOpen:
+    case CommissioningWindowStatusEnum::kEnhancedWindowOpen:
         return Dnssd::CommissioningMode::kEnabledEnhanced;
-    case CommissioningWindowStatus::kBasicWindowOpen:
+    case CommissioningWindowStatusEnum::kBasicWindowOpen:
         return Dnssd::CommissioningMode::kEnabledBasic;
     default:
         return Dnssd::CommissioningMode::kDisabled;
@@ -442,11 +442,11 @@ CHIP_ERROR CommissioningWindowManager::StartAdvertisement()
 
     if (mUseECM)
     {
-        UpdateWindowStatus(CommissioningWindowStatus::kEnhancedWindowOpen);
+        UpdateWindowStatus(CommissioningWindowStatusEnum::kEnhancedWindowOpen);
     }
     else
     {
-        UpdateWindowStatus(CommissioningWindowStatus::kBasicWindowOpen);
+        UpdateWindowStatus(CommissioningWindowStatusEnum::kBasicWindowOpen);
     }
 
     if (mAppDelegate != nullptr)
@@ -537,10 +537,10 @@ void CommissioningWindowManager::ExpireFailSafeIfArmed()
     }
 }
 
-void CommissioningWindowManager::UpdateWindowStatus(CommissioningWindowStatus aNewStatus)
+void CommissioningWindowManager::UpdateWindowStatus(CommissioningWindowStatusEnum aNewStatus)
 {
-    CommissioningWindowStatus oldClusterStatus = CommissioningWindowStatusForCluster();
-    mWindowStatus                              = aNewStatus;
+    CommissioningWindowStatusEnum oldClusterStatus = CommissioningWindowStatusForCluster();
+    mWindowStatus                                  = aNewStatus;
     if (CommissioningWindowStatusForCluster() != oldClusterStatus)
     {
         // The Administrator Commissioning cluster is always on the root endpoint.
@@ -553,7 +553,7 @@ void CommissioningWindowManager::UpdateOpenerVendorId(Nullable<VendorId> aNewOpe
 {
     // Changing the opener vendor id affects what
     // CommissioningWindowStatusForCluster() returns.
-    CommissioningWindowStatus oldClusterStatus = CommissioningWindowStatusForCluster();
+    CommissioningWindowStatusEnum oldClusterStatus = CommissioningWindowStatusForCluster();
 
     if (mOpenerVendorId != aNewOpenerVendorId)
     {
diff --git a/src/app/server/CommissioningWindowManager.h b/src/app/server/CommissioningWindowManager.h
index 4222830ad5def1..cfd13eecb06c11 100644
--- a/src/app/server/CommissioningWindowManager.h
+++ b/src/app/server/CommissioningWindowManager.h
@@ -91,7 +91,7 @@ class CommissioningWindowManager : public SessionEstablishmentDelegate,
 
     void CloseCommissioningWindow();
 
-    app::Clusters::AdministratorCommissioning::CommissioningWindowStatus CommissioningWindowStatusForCluster() const;
+    app::Clusters::AdministratorCommissioning::CommissioningWindowStatusEnum CommissioningWindowStatusForCluster() const;
 
     bool IsCommissioningWindowOpen() const;
 
@@ -175,15 +175,15 @@ class CommissioningWindowManager : public SessionEstablishmentDelegate,
      * Helpers to ensure the right attribute reporting happens when our state is
      * updated.
      */
-    void UpdateWindowStatus(app::Clusters::AdministratorCommissioning::CommissioningWindowStatus aNewStatus);
+    void UpdateWindowStatus(app::Clusters::AdministratorCommissioning::CommissioningWindowStatusEnum aNewStatus);
     void UpdateOpenerVendorId(app::DataModel::Nullable<VendorId> aNewOpenerVendorId);
     void UpdateOpenerFabricIndex(app::DataModel::Nullable<FabricIndex> aNewOpenerFabricIndex);
 
     AppDelegate * mAppDelegate = nullptr;
     Server * mServer           = nullptr;
 
-    app::Clusters::AdministratorCommissioning::CommissioningWindowStatus mWindowStatus =
-        app::Clusters::AdministratorCommissioning::CommissioningWindowStatus::kWindowNotOpen;
+    app::Clusters::AdministratorCommissioning::CommissioningWindowStatusEnum mWindowStatus =
+        app::Clusters::AdministratorCommissioning::CommissioningWindowStatusEnum::kWindowNotOpen;
 
     bool mIsBLE = true;
 
diff --git a/src/app/tests/TestCommissionManager.cpp b/src/app/tests/TestCommissionManager.cpp
index 7a05cbdeea7d4b..a1f5243e3bed8d 100644
--- a/src/app/tests/TestCommissionManager.cpp
+++ b/src/app/tests/TestCommissionManager.cpp
@@ -136,7 +136,7 @@ void CheckCommissioningWindowManagerBasicWindowOpenCloseTask(intptr_t context)
     NL_TEST_ASSERT(suite, commissionMgr.IsCommissioningWindowOpen());
     NL_TEST_ASSERT(suite,
                    commissionMgr.CommissioningWindowStatusForCluster() ==
-                       chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatus::kWindowNotOpen);
+                       chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatusEnum::kWindowNotOpen);
     NL_TEST_ASSERT(suite, commissionMgr.GetOpenerFabricIndex().IsNull());
     NL_TEST_ASSERT(suite, commissionMgr.GetOpenerVendorId().IsNull());
     NL_TEST_ASSERT(suite, !chip::DeviceLayer::ConnectivityMgr().IsBLEAdvertisingEnabled());
@@ -174,7 +174,7 @@ void CheckCommissioningWindowManagerBasicWindowOpenCloseFromClusterTask(intptr_t
     NL_TEST_ASSERT(suite, commissionMgr.IsCommissioningWindowOpen());
     NL_TEST_ASSERT(suite,
                    commissionMgr.CommissioningWindowStatusForCluster() ==
-                       chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatus::kBasicWindowOpen);
+                       chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatusEnum::kBasicWindowOpen);
     NL_TEST_ASSERT(suite, !commissionMgr.GetOpenerFabricIndex().IsNull());
     NL_TEST_ASSERT(suite, commissionMgr.GetOpenerFabricIndex().Value() == fabricIndex);
     NL_TEST_ASSERT(suite, !commissionMgr.GetOpenerVendorId().IsNull());
@@ -214,7 +214,7 @@ void CheckCommissioningWindowManagerWindowClosedTask(chip::System::Layer *, void
     NL_TEST_ASSERT(suite, !commissionMgr.IsCommissioningWindowOpen());
     NL_TEST_ASSERT(suite,
                    commissionMgr.CommissioningWindowStatusForCluster() ==
-                       chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatus::kWindowNotOpen);
+                       chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatusEnum::kWindowNotOpen);
     NL_TEST_ASSERT(suite, !sWindowStatusDirty);
     NL_TEST_ASSERT(suite, !sAdminFabricIndexDirty);
     NL_TEST_ASSERT(suite, !sAdminVendorIdDirty);
@@ -237,7 +237,7 @@ void CheckCommissioningWindowManagerWindowTimeoutTask(intptr_t context)
     NL_TEST_ASSERT(suite, commissionMgr.IsCommissioningWindowOpen());
     NL_TEST_ASSERT(suite,
                    commissionMgr.CommissioningWindowStatusForCluster() ==
-                       chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatus::kWindowNotOpen);
+                       chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatusEnum::kWindowNotOpen);
     NL_TEST_ASSERT(suite, !chip::DeviceLayer::ConnectivityMgr().IsBLEAdvertisingEnabled());
     NL_TEST_ASSERT(suite, !sWindowStatusDirty);
     NL_TEST_ASSERT(suite, !sAdminFabricIndexDirty);
@@ -261,7 +261,7 @@ void SimulateFailedSessionEstablishmentTask(chip::System::Layer *, void * contex
     NL_TEST_ASSERT(suite, commissionMgr.IsCommissioningWindowOpen());
     NL_TEST_ASSERT(suite,
                    commissionMgr.CommissioningWindowStatusForCluster() ==
-                       chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatus::kWindowNotOpen);
+                       chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatusEnum::kWindowNotOpen);
     NL_TEST_ASSERT(suite, !sWindowStatusDirty);
     NL_TEST_ASSERT(suite, !sAdminFabricIndexDirty);
     NL_TEST_ASSERT(suite, !sAdminVendorIdDirty);
@@ -271,7 +271,7 @@ void SimulateFailedSessionEstablishmentTask(chip::System::Layer *, void * contex
     NL_TEST_ASSERT(suite, commissionMgr.IsCommissioningWindowOpen());
     NL_TEST_ASSERT(suite,
                    commissionMgr.CommissioningWindowStatusForCluster() ==
-                       chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatus::kWindowNotOpen);
+                       chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatusEnum::kWindowNotOpen);
     NL_TEST_ASSERT(suite, !sWindowStatusDirty);
     NL_TEST_ASSERT(suite, !sAdminFabricIndexDirty);
     NL_TEST_ASSERT(suite, !sAdminVendorIdDirty);
@@ -293,7 +293,7 @@ void CheckCommissioningWindowManagerWindowTimeoutWithSessionEstablishmentErrorsT
     NL_TEST_ASSERT(suite, commissionMgr.IsCommissioningWindowOpen());
     NL_TEST_ASSERT(suite,
                    commissionMgr.CommissioningWindowStatusForCluster() ==
-                       chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatus::kWindowNotOpen);
+                       chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatusEnum::kWindowNotOpen);
     NL_TEST_ASSERT(suite, !chip::DeviceLayer::ConnectivityMgr().IsBLEAdvertisingEnabled());
     NL_TEST_ASSERT(suite, !sWindowStatusDirty);
     NL_TEST_ASSERT(suite, !sAdminFabricIndexDirty);
@@ -339,7 +339,7 @@ void CheckCommissioningWindowManagerEnhancedWindowTask(intptr_t context)
     NL_TEST_ASSERT(suite, commissionMgr.IsCommissioningWindowOpen());
     NL_TEST_ASSERT(suite,
                    commissionMgr.CommissioningWindowStatusForCluster() ==
-                       chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatus::kEnhancedWindowOpen);
+                       chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatusEnum::kEnhancedWindowOpen);
     NL_TEST_ASSERT(suite, !chip::DeviceLayer::ConnectivityMgr().IsBLEAdvertisingEnabled());
     NL_TEST_ASSERT(suite, !commissionMgr.GetOpenerFabricIndex().IsNull());
     NL_TEST_ASSERT(suite, commissionMgr.GetOpenerFabricIndex().Value() == fabricIndex);
@@ -358,7 +358,7 @@ void CheckCommissioningWindowManagerEnhancedWindowTask(intptr_t context)
     NL_TEST_ASSERT(suite, !commissionMgr.IsCommissioningWindowOpen());
     NL_TEST_ASSERT(suite,
                    commissionMgr.CommissioningWindowStatusForCluster() ==
-                       chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatus::kWindowNotOpen);
+                       chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatusEnum::kWindowNotOpen);
     NL_TEST_ASSERT(suite, commissionMgr.GetOpenerFabricIndex().IsNull());
     NL_TEST_ASSERT(suite, commissionMgr.GetOpenerVendorId().IsNull());
     NL_TEST_ASSERT(suite, sWindowStatusDirty);
diff --git a/src/app/tests/suites/TestClusterMultiFabric.yaml b/src/app/tests/suites/TestClusterMultiFabric.yaml
index d11f5f1d4715ed..852e9e51a9f5be 100644
--- a/src/app/tests/suites/TestClusterMultiFabric.yaml
+++ b/src/app/tests/suites/TestClusterMultiFabric.yaml
@@ -35,7 +35,7 @@ tests:
 
     - label: "Open Commissioning Window from alpha"
       endpoint: 0
-      cluster: "AdministratorCommissioning"
+      cluster: "Administrator Commissioning"
       command: "OpenBasicCommissioningWindow"
       timedInteractionTimeoutMs: 10000
       arguments:
diff --git a/src/app/tests/suites/TestCommissionerNodeId.yaml b/src/app/tests/suites/TestCommissionerNodeId.yaml
index 0b805c384ce8e3..39e1103d72007d 100644
--- a/src/app/tests/suites/TestCommissionerNodeId.yaml
+++ b/src/app/tests/suites/TestCommissionerNodeId.yaml
@@ -32,7 +32,7 @@ tests:
                 value: nodeId
 
     - label: "Open Commissioning Window from alpha"
-      cluster: "AdministratorCommissioning"
+      cluster: "Administrator Commissioning"
       command: "OpenBasicCommissioningWindow"
       timedInteractionTimeoutMs: 10000
       arguments:
@@ -61,7 +61,7 @@ tests:
                 value: nodeId
 
     - label: "Open Commissioning Window from alpha"
-      cluster: "AdministratorCommissioning"
+      cluster: "Administrator Commissioning"
       command: "OpenBasicCommissioningWindow"
       timedInteractionTimeoutMs: 10000
       arguments:
diff --git a/src/app/tests/suites/TestCommissioningWindow.yaml b/src/app/tests/suites/TestCommissioningWindow.yaml
index 5ec5bc46f422e5..b28359081f65d0 100644
--- a/src/app/tests/suites/TestCommissioningWindow.yaml
+++ b/src/app/tests/suites/TestCommissioningWindow.yaml
@@ -20,7 +20,7 @@ config:
         type: node_id
         defaultValue: 0xCAFE
     endpoint: 0
-    cluster: "AdministratorCommissioning"
+    cluster: "Administrator Commissioning"
     discriminator:
         type: int16u
         defaultValue: 3840
diff --git a/src/app/tests/suites/TestDiscovery.yaml b/src/app/tests/suites/TestDiscovery.yaml
index febff676e13b64..fc01f5c1cfef8b 100644
--- a/src/app/tests/suites/TestDiscovery.yaml
+++ b/src/app/tests/suites/TestDiscovery.yaml
@@ -54,7 +54,7 @@ tests:
                 value: nodeId
 
     - label: "Open Commissioning Window with too-short timeout"
-      cluster: "AdministratorCommissioning"
+      cluster: "Administrator Commissioning"
       command: "OpenBasicCommissioningWindow"
       timedInteractionTimeoutMs: 10000
       arguments:
@@ -65,7 +65,7 @@ tests:
           error: INVALID_COMMAND
 
     - label: "Open Commissioning Window with too-long timeout"
-      cluster: "AdministratorCommissioning"
+      cluster: "Administrator Commissioning"
       command: "OpenBasicCommissioningWindow"
       timedInteractionTimeoutMs: 10000
       arguments:
@@ -76,7 +76,7 @@ tests:
           error: INVALID_COMMAND
 
     - label: "Open Commissioning Window"
-      cluster: "AdministratorCommissioning"
+      cluster: "Administrator Commissioning"
       command: "OpenBasicCommissioningWindow"
       timedInteractionTimeoutMs: 10000
       arguments:
@@ -320,7 +320,7 @@ tests:
                 value: nodeId
 
     - label: "Open Commissioning Window"
-      cluster: "AdministratorCommissioning"
+      cluster: "Administrator Commissioning"
       command: "OpenBasicCommissioningWindow"
       timedInteractionTimeoutMs: 10000
       arguments:
diff --git a/src/app/tests/suites/TestFabricRemovalWhileSubscribed.yaml b/src/app/tests/suites/TestFabricRemovalWhileSubscribed.yaml
index cdd8fded717805..e8a8342d36ae64 100644
--- a/src/app/tests/suites/TestFabricRemovalWhileSubscribed.yaml
+++ b/src/app/tests/suites/TestFabricRemovalWhileSubscribed.yaml
@@ -56,7 +56,7 @@ tests:
               minValue: 1
 
     - label: "Open commissioning window from alpha"
-      cluster: "AdministratorCommissioning"
+      cluster: "Administrator Commissioning"
       command: "OpenBasicCommissioningWindow"
       timedInteractionTimeoutMs: 10000
       arguments:
diff --git a/src/app/tests/suites/TestGeneralCommissioning.yaml b/src/app/tests/suites/TestGeneralCommissioning.yaml
index b42e6cb263e98e..01345d9dbe85d6 100644
--- a/src/app/tests/suites/TestGeneralCommissioning.yaml
+++ b/src/app/tests/suites/TestGeneralCommissioning.yaml
@@ -102,7 +102,7 @@ tests:
           value: 1
 
     - label: "Open Commissioning Window from alpha"
-      cluster: "AdministratorCommissioning"
+      cluster: "Administrator Commissioning"
       command: "OpenBasicCommissioningWindow"
       timedInteractionTimeoutMs: 10000
       arguments:
diff --git a/src/app/tests/suites/TestGroupMessaging.yaml b/src/app/tests/suites/TestGroupMessaging.yaml
index f13d2d0f65f706..b4806bedd3e5f3 100644
--- a/src/app/tests/suites/TestGroupMessaging.yaml
+++ b/src/app/tests/suites/TestGroupMessaging.yaml
@@ -259,7 +259,7 @@ tests:
               ]
 
     - label: "Open Commissioning Window from alpha"
-      cluster: "AdministratorCommissioning"
+      cluster: "Administrator Commissioning"
       command: "OpenBasicCommissioningWindow"
       timedInteractionTimeoutMs: 10000
       arguments:
diff --git a/src/app/tests/suites/TestMultiAdmin.yaml b/src/app/tests/suites/TestMultiAdmin.yaml
index 4603834b5d4915..3f8c135c83a915 100644
--- a/src/app/tests/suites/TestMultiAdmin.yaml
+++ b/src/app/tests/suites/TestMultiAdmin.yaml
@@ -70,7 +70,7 @@ tests:
           error: FAILURE
 
     - label: "Open Commissioning Window from alpha"
-      cluster: "AdministratorCommissioning"
+      cluster: "Administrator Commissioning"
       command: "OpenBasicCommissioningWindow"
       timedInteractionTimeoutMs: 10000
       arguments:
@@ -101,12 +101,12 @@ tests:
           value: [{ "NodeID": nodeId }]
 
     - label: "Close Commissioning Window after failed commissioning"
-      cluster: "AdministratorCommissioning"
+      cluster: "Administrator Commissioning"
       command: "RevokeCommissioning"
       timedInteractionTimeoutMs: 10000
 
     - label: "Open Commissioning Window from alpha again"
-      cluster: "AdministratorCommissioning"
+      cluster: "Administrator Commissioning"
       command: "OpenBasicCommissioningWindow"
       timedInteractionTimeoutMs: 10000
       arguments:
@@ -136,7 +136,7 @@ tests:
 
     - label: "Open Commissioning Window from beta"
       identity: "beta"
-      cluster: "AdministratorCommissioning"
+      cluster: "Administrator Commissioning"
       command: "OpenBasicCommissioningWindow"
       timedInteractionTimeoutMs: 10000
       arguments:
diff --git a/src/app/tests/suites/TestSubscribe_AdministratorCommissioning.yaml b/src/app/tests/suites/TestSubscribe_AdministratorCommissioning.yaml
index ecda538f57fd55..86c850d922bca3 100644
--- a/src/app/tests/suites/TestSubscribe_AdministratorCommissioning.yaml
+++ b/src/app/tests/suites/TestSubscribe_AdministratorCommissioning.yaml
@@ -16,7 +16,7 @@ name: Subscribe Tests - Administrator Commissioning Cluster
 
 config:
     nodeId: 0x12344321
-    cluster: "AdministratorCommissioning"
+    cluster: "Administrator Commissioning"
     endpoint: 0
     ourVendorId:
         type: int16u
diff --git a/src/app/tests/suites/certification/PICS.yaml b/src/app/tests/suites/certification/PICS.yaml
index 67d5ea70a77b02..c68e8915b65014 100644
--- a/src/app/tests/suites/certification/PICS.yaml
+++ b/src/app/tests/suites/certification/PICS.yaml
@@ -2807,6 +2807,27 @@ PICS:
       id: FLW.M.FlowChange
 
     # Pump Configuration and Control cluster
+    - label: "Supports operating in constant pressure mode"
+      id: PCC.S.F00
+
+    - label: "Supports operating in compensated pressure mode"
+      id: PCC.S.F01
+
+    - label: "Supports operating in constant flow mode"
+      id: PCC.S.F02
+
+    - label: "Supports operating in constant speed mode"
+      id: PCC.S.F03
+
+    - label: "Supports operating in constant temperature mode"
+      id: PCC.S.F04
+
+    - label: "Supports operating in automatic mode"
+      id: PCC.S.F05
+
+    - label: "Supports operating using local settings"
+      id: PCC.S.F06
+
     - label: "Does the device implement the MaxPressure attribute?"
       id: PCC.S.A0000
 
@@ -2876,24 +2897,6 @@ PICS:
     - label: "Does the device implement the LifetimeEnergyConsumed attribute?"
       id: PCC.S.A0021
 
-    - label: "Does the device implement the ConstantSpeed control mode?"
-      id: PCC.M.ControlModeConstSpeed
-
-    - label: "Does the device implement the ConstantPressure control mode?"
-      id: PCC.M.ControlModeConstPressure
-
-    - label: "Does the device implement the ProportionalPressure control mode?"
-      id: PCC.M.ControlModeCompPressure
-
-    - label: "Does the device implement the ConstantFlow control mode?"
-      id: PCC.M.ControlModeConstFlow
-
-    - label: "Does the device implement the ConstantTemperature control mode?"
-      id: PCC.M.ControlModeConstTemp
-
-    - label: "Does the device implement the Automatic control mode?"
-      id: PCC.M.ControlModeAuto
-
     #Power Source Cluster
     - label: "Does the device implement the Status attribute?"
       id: PS.S.A0000
diff --git a/src/app/tests/suites/certification/Test_TC_ACL_2_7.yaml b/src/app/tests/suites/certification/Test_TC_ACL_2_7.yaml
index 59e09a8dd7010f..10388d8833bda9 100644
--- a/src/app/tests/suites/certification/Test_TC_ACL_2_7.yaml
+++ b/src/app/tests/suites/certification/Test_TC_ACL_2_7.yaml
@@ -62,7 +62,7 @@ tests:
     - label:
           "Step 3:TH1 puts DUT into commissioning mode, TH2 commissions DUT
           using admin node ID N2"
-      cluster: "AdministratorCommissioning"
+      cluster: "Administrator Commissioning"
       command: "OpenBasicCommissioningWindow"
       timedInteractionTimeoutMs: 10000
       arguments:
diff --git a/src/app/tests/suites/certification/Test_TC_CADMIN_1_10.yaml b/src/app/tests/suites/certification/Test_TC_CADMIN_1_10.yaml
index dfa1dbcf72fcc1..a76bdfabd4278e 100644
--- a/src/app/tests/suites/certification/Test_TC_CADMIN_1_10.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CADMIN_1_10.yaml
@@ -72,7 +72,7 @@ tests:
                 value: nodeId
 
     - label: "TH_CR1 opens a commissioning window on DUT_CE"
-      cluster: "AdministratorCommissioning"
+      cluster: "Administrator Commissioning"
       command: "OpenBasicCommissioningWindow"
       PICS: CADMIN.S.C01.Rsp
       timedInteractionTimeoutMs: 10000
diff --git a/src/app/tests/suites/certification/Test_TC_CADMIN_1_11.yaml b/src/app/tests/suites/certification/Test_TC_CADMIN_1_11.yaml
index 886481db376132..eb4342ee8f8b19 100644
--- a/src/app/tests/suites/certification/Test_TC_CADMIN_1_11.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CADMIN_1_11.yaml
@@ -70,7 +70,7 @@ tests:
 
     - label: "TH_CR1 opens a commissioning window on DUT_CE using ECM"
       PICS: CADMIN.S.C00.Rsp
-      cluster: "AdministratorCommissioning"
+      cluster: "Administrator Commissioning"
       command: "OpenCommissioningWindow"
       timedInteractionTimeoutMs: 10000
       arguments:
@@ -139,7 +139,7 @@ tests:
 
     - label: "TH_CR1 opens a commissioning window on DUT_CE using ECM"
       PICS: CADMIN.S.C00.Rsp
-      cluster: "AdministratorCommissioning"
+      cluster: "Administrator Commissioning"
       command: "OpenCommissioningWindow"
       timedInteractionTimeoutMs: 10000
       arguments:
@@ -179,7 +179,7 @@ tests:
 
     - label: "TH_CR1 opens a commissioning window on DUT_CE using ECM"
       PICS: CADMIN.S.C00.Rsp
-      cluster: "AdministratorCommissioning"
+      cluster: "Administrator Commissioning"
       command: "OpenCommissioningWindow"
       timedInteractionTimeoutMs: 10000
       arguments:
@@ -200,7 +200,7 @@ tests:
           set in step 5, TH_CR1 opens a 2nd commissioning window on DUT_CE using
           a commissioning timeout of PIXIT.CADMIN.CwDuration seconds using ECM"
       PICS: CADMIN.S.C00.Rsp
-      cluster: "AdministratorCommissioning"
+      cluster: "Administrator Commissioning"
       command: "OpenCommissioningWindow"
       timedInteractionTimeoutMs: 10000
       arguments:
@@ -249,7 +249,7 @@ tests:
           "TH_CR1 re-opens a commissioning window on DUT_CE using a
           commissioning timeout of PIXIT.CADMIN.CwDuration seconds using BCM"
       PICS: CADMIN.S.C01.Rsp
-      cluster: "AdministratorCommissioning"
+      cluster: "Administrator Commissioning"
       command: "OpenBasicCommissioningWindow"
       timedInteractionTimeoutMs: 10000
       arguments:
@@ -285,7 +285,7 @@ tests:
           commissioning timeout of PIXIT.CADMIN.CwDuration seconds using BCM"
       PICS: CADMIN.S.C01.Rsp
       identity: "gamma"
-      cluster: "AdministratorCommissioning"
+      cluster: "Administrator Commissioning"
       command: "OpenBasicCommissioningWindow"
       timedInteractionTimeoutMs: 10000
       arguments:
@@ -324,7 +324,7 @@ tests:
 
     - label: "TH_CR1 opens a commissioning window on DUT_CE using BCM"
       PICS: CADMIN.S.C01.Rsp
-      cluster: "AdministratorCommissioning"
+      cluster: "Administrator Commissioning"
       command: "OpenBasicCommissioningWindow"
       timedInteractionTimeoutMs: 10000
       arguments:
@@ -338,7 +338,7 @@ tests:
           a commissioning timeout of PIXIT.CADMIN.CwDuration seconds using BCM"
       PICS: CADMIN.S.C01.Rsp
       identity: "beta"
-      cluster: "AdministratorCommissioning"
+      cluster: "Administrator Commissioning"
       command: "OpenBasicCommissioningWindow"
       timedInteractionTimeoutMs: 10000
       arguments:
diff --git a/src/app/tests/suites/certification/Test_TC_CADMIN_1_13.yaml b/src/app/tests/suites/certification/Test_TC_CADMIN_1_13.yaml
index d7be6a30a4324e..2e460bf02af872 100644
--- a/src/app/tests/suites/certification/Test_TC_CADMIN_1_13.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CADMIN_1_13.yaml
@@ -75,7 +75,7 @@ tests:
 
     - label: "TH_CR1 opens a commissioning window on DUT_CE"
       identity: "alpha"
-      cluster: "AdministratorCommissioning"
+      cluster: "Administrator Commissioning"
       command: "OpenBasicCommissioningWindow"
       timedInteractionTimeoutMs: 10000
       PICS: CADMIN.S.C01.Rsp
@@ -85,7 +85,7 @@ tests:
                 value: 180
 
     - label: "TH_CR1 reads WindowStatus attribute from DUT_CE"
-      cluster: "AdministratorCommissioning"
+      cluster: "Administrator Commissioning"
       command: "readAttribute"
       attribute: "WindowStatus"
       PICS: CADMIN.S.A0000
@@ -228,7 +228,7 @@ tests:
 
     - label: "TH_CR1 opens a commissioning window on DUT_CE"
       identity: "alpha"
-      cluster: "AdministratorCommissioning"
+      cluster: "Administrator Commissioning"
       command: "OpenBasicCommissioningWindow"
       timedInteractionTimeoutMs: 10000
       PICS: CADMIN.S.C01.Rsp
@@ -259,7 +259,7 @@ tests:
 
     - label: "TH_CR1 opens a commissioning window on DUT_CE"
       identity: "alpha"
-      cluster: "AdministratorCommissioning"
+      cluster: "Administrator Commissioning"
       command: "OpenBasicCommissioningWindow"
       timedInteractionTimeoutMs: 10000
       PICS: CADMIN.S.C01.Rsp
@@ -270,7 +270,7 @@ tests:
 
     - label: "TH_CR1 opens a 2nd commissioning window on DUT_CE"
       identity: "alpha"
-      cluster: "AdministratorCommissioning"
+      cluster: "Administrator Commissioning"
       command: "OpenCommissioningWindow"
       timedInteractionTimeoutMs: 10000
       PICS: CADMIN.S.C00.Rsp
@@ -317,7 +317,7 @@ tests:
 
     - label: "TH_CR1 re-opens new commissioning window on DUT_CE using ECM"
       identity: "alpha"
-      cluster: "AdministratorCommissioning"
+      cluster: "Administrator Commissioning"
       command: "OpenCommissioningWindow"
       timedInteractionTimeoutMs: 10000
       PICS: CADMIN.S.C00.Rsp
@@ -335,7 +335,7 @@ tests:
                 value: "SPAKE2P Key Salt"
 
     - label: "TH_CR1 reads WindowStatus attribute from DUT_CE"
-      cluster: "AdministratorCommissioning"
+      cluster: "Administrator Commissioning"
       command: "readAttribute"
       attribute: "WindowStatus"
       PICS: CADMIN.S.A0000
@@ -372,7 +372,7 @@ tests:
 
     - label: "TH_CR3 opens a 2nd commissioning window on DUT_CE"
       identity: "gamma"
-      cluster: "AdministratorCommissioning"
+      cluster: "Administrator Commissioning"
       command: "OpenCommissioningWindow"
       timedInteractionTimeoutMs: 10000
       PICS: CADMIN.S.C00.Rsp
@@ -419,7 +419,7 @@ tests:
 
     - label: "TH_CR1 opens a new commissioning window on DUT_CE"
       identity: "alpha"
-      cluster: "AdministratorCommissioning"
+      cluster: "Administrator Commissioning"
       command: "OpenCommissioningWindow"
       timedInteractionTimeoutMs: 10000
       PICS: CADMIN.S.C00.Rsp
@@ -438,7 +438,7 @@ tests:
 
     - label: "TH_CR2 opens a 2nd commissioning window on DUT_CE using ECM"
       identity: "beta"
-      cluster: "AdministratorCommissioning"
+      cluster: "Administrator Commissioning"
       command: "OpenCommissioningWindow"
       timedInteractionTimeoutMs: 10000
       PICS: CADMIN.S.C00.Rsp
@@ -467,7 +467,7 @@ tests:
                 value: 180000
 
     - label: "TH_CR1 reads WindowStatus attribute from DUT_CE"
-      cluster: "AdministratorCommissioning"
+      cluster: "Administrator Commissioning"
       command: "readAttribute"
       attribute: "WindowStatus"
       PICS: CADMIN.S.A0000
@@ -475,7 +475,7 @@ tests:
           value: 0
 
     - label: "TH_CR1 reads AdminFabricIndex attribute from DUT_CE"
-      cluster: "AdministratorCommissioning"
+      cluster: "Administrator Commissioning"
       command: "readAttribute"
       attribute: "AdminFabricIndex"
       PICS: CADMIN.S.A0001
@@ -483,7 +483,7 @@ tests:
           value: null
 
     - label: "TH_CR1 reads AdminVendorId attribute from DUT_CE"
-      cluster: "AdministratorCommissioning"
+      cluster: "Administrator Commissioning"
       command: "readAttribute"
       attribute: "AdminVendorId"
       PICS: CADMIN.S.A0002
diff --git a/src/app/tests/suites/certification/Test_TC_CADMIN_1_15.yaml b/src/app/tests/suites/certification/Test_TC_CADMIN_1_15.yaml
index 9bf61682fbf04a..8988e74ce12330 100644
--- a/src/app/tests/suites/certification/Test_TC_CADMIN_1_15.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CADMIN_1_15.yaml
@@ -70,7 +70,7 @@ tests:
     - label: "TH_CR1 opens a commissioning window on DUT_CE using ECM"
       identity: "alpha"
       PICS: CADMIN.S.C00.Rsp
-      cluster: "AdministratorCommissioning"
+      cluster: "Administrator Commissioning"
       command: "OpenCommissioningWindow"
       timedInteractionTimeoutMs: 10000
       arguments:
@@ -111,7 +111,7 @@ tests:
     - label: "TH_CR1 opens a commissioning window on DUT_CE using ECM"
       identity: "alpha"
       PICS: CADMIN.S.C00.Rsp
-      cluster: "AdministratorCommissioning"
+      cluster: "Administrator Commissioning"
       command: "OpenCommissioningWindow"
       timedInteractionTimeoutMs: 10000
       arguments:
@@ -261,7 +261,7 @@ tests:
     - label: "TH_CR1 opens a commissioning window on DUT_CE using ECM"
       identity: "alpha"
       PICS: CADMIN.S.C00.Rsp
-      cluster: "AdministratorCommissioning"
+      cluster: "Administrator Commissioning"
       command: "OpenCommissioningWindow"
       timedInteractionTimeoutMs: 10000
       arguments:
diff --git a/src/app/tests/suites/certification/Test_TC_CADMIN_1_16.yaml b/src/app/tests/suites/certification/Test_TC_CADMIN_1_16.yaml
index 67ba737a677130..b394dac2b2b550 100644
--- a/src/app/tests/suites/certification/Test_TC_CADMIN_1_16.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CADMIN_1_16.yaml
@@ -67,7 +67,7 @@ tests:
 
     - label: "TH_CR1 opens a commissioning window on DUT_CE"
       identity: "alpha"
-      cluster: "AdministratorCommissioning"
+      cluster: "Administrator Commissioning"
       command: "OpenBasicCommissioningWindow"
       timedInteractionTimeoutMs: 10000
       PICS: CADMIN.S.C01.Rsp
@@ -100,7 +100,7 @@ tests:
 
     - label: "TH_CR1 opens a commissioning window on DUT_CE"
       identity: "alpha"
-      cluster: "AdministratorCommissioning"
+      cluster: "Administrator Commissioning"
       command: "OpenBasicCommissioningWindow"
       timedInteractionTimeoutMs: 10000
       PICS: CADMIN.S.C01.Rsp
@@ -213,7 +213,7 @@ tests:
     - label: "TH_CR1 opens a commissioning window on DUT_CE using BCM"
       identity: "alpha"
       PICS: CADMIN.S.C01.Rsp
-      cluster: "AdministratorCommissioning"
+      cluster: "Administrator Commissioning"
       command: "OpenBasicCommissioningWindow"
       timedInteractionTimeoutMs: 10000
       arguments:
diff --git a/src/app/tests/suites/certification/Test_TC_CADMIN_1_21.yaml b/src/app/tests/suites/certification/Test_TC_CADMIN_1_21.yaml
index bf406e89eef9b5..daf266f2e8dc63 100644
--- a/src/app/tests/suites/certification/Test_TC_CADMIN_1_21.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CADMIN_1_21.yaml
@@ -58,7 +58,7 @@ tests:
                 value: nodeId
 
     - label: "TH_CR1 opens a commissioning window on DUT_CE using BCM"
-      cluster: "AdministratorCommissioning"
+      cluster: "Administrator Commissioning"
       command: "OpenBasicCommissioningWindow"
       timedInteractionTimeoutMs: 10000
       PICS: CADMIN.S.C01.Rsp
@@ -77,7 +77,7 @@ tests:
 
     - label:
           "TH_CR1 reads the window status to verify the DUT_CE window is closed"
-      cluster: "AdministratorCommissioning"
+      cluster: "Administrator Commissioning"
       command: "readAttribute"
       attribute: "WindowStatus"
       PICS: CADMIN.S.A0000
@@ -85,7 +85,7 @@ tests:
           value: 0
 
     - label: "TH_CR1 opens a commissioning window on DUT_CE"
-      cluster: "AdministratorCommissioning"
+      cluster: "Administrator Commissioning"
       command: "OpenBasicCommissioningWindow"
       PICS: CADMIN.S.C01.Rsp
       timedInteractionTimeoutMs: 10000
@@ -98,7 +98,7 @@ tests:
 
     - label:
           "TH_CR1 reads the window status to verify the DUT_CE window is closed"
-      cluster: "AdministratorCommissioning"
+      cluster: "Administrator Commissioning"
       command: "readAttribute"
       attribute: "WindowStatus"
       PICS: CADMIN.S.A0000
diff --git a/src/app/tests/suites/certification/Test_TC_CADMIN_1_22.yaml b/src/app/tests/suites/certification/Test_TC_CADMIN_1_22.yaml
index bf49318f426879..3ee200f35f5454 100644
--- a/src/app/tests/suites/certification/Test_TC_CADMIN_1_22.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CADMIN_1_22.yaml
@@ -60,7 +60,7 @@ tests:
                 value: nodeId
 
     - label: "TH_CR1 opens a commissioning window on DUT_CE"
-      cluster: "AdministratorCommissioning"
+      cluster: "Administrator Commissioning"
       command: "OpenCommissioningWindow"
       PICS: CADMIN.S.C00.Rsp
       timedInteractionTimeoutMs: 10000
@@ -87,7 +87,7 @@ tests:
 
     - label:
           "TH_CR1 reads the window status to verify the DUT_CE window is closed"
-      cluster: "AdministratorCommissioning"
+      cluster: "Administrator Commissioning"
       command: "readAttribute"
       attribute: "WindowStatus"
       PICS: CADMIN.S.A0000
@@ -95,7 +95,7 @@ tests:
           value: 0
 
     - label: "TH_CR1 opens a commissioning window on DUT_CE"
-      cluster: "AdministratorCommissioning"
+      cluster: "Administrator Commissioning"
       command: "OpenCommissioningWindow"
       PICS: CADMIN.S.C00.Rsp
       timedInteractionTimeoutMs: 10000
@@ -116,7 +116,7 @@ tests:
 
     - label:
           "TH_CR1 reads the window status to verify the DUT_CE window is closed"
-      cluster: "AdministratorCommissioning"
+      cluster: "Administrator Commissioning"
       command: "readAttribute"
       attribute: "WindowStatus"
       PICS: CADMIN.S.A0000
diff --git a/src/app/tests/suites/certification/Test_TC_CADMIN_1_23.yaml b/src/app/tests/suites/certification/Test_TC_CADMIN_1_23.yaml
index af87d1682cadd6..331e7f07921cd3 100644
--- a/src/app/tests/suites/certification/Test_TC_CADMIN_1_23.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CADMIN_1_23.yaml
@@ -58,7 +58,7 @@ tests:
                 value: nodeId
 
     - label: "TH_CR1 opens a commissioning window on DUT_CE"
-      cluster: "AdministratorCommissioning"
+      cluster: "Administrator Commissioning"
       command: "OpenBasicCommissioningWindow"
       PICS: CADMIN.S.C01.Rsp
       timedInteractionTimeoutMs: 10000
@@ -77,7 +77,7 @@ tests:
 
     - label:
           "TH_CR1 reads the window status to verify the DUT_CE window is closed"
-      cluster: "AdministratorCommissioning"
+      cluster: "Administrator Commissioning"
       command: "readAttribute"
       attribute: "WindowStatus"
       PICS: CADMIN.S.A0000
@@ -85,7 +85,7 @@ tests:
           value: 0
 
     - label: "TH_CR1 opens a commissioning window on DUT_CE"
-      cluster: "AdministratorCommissioning"
+      cluster: "Administrator Commissioning"
       command: "OpenBasicCommissioningWindow"
       PICS: CADMIN.S.C01.Rsp
       timedInteractionTimeoutMs: 10000
@@ -98,7 +98,7 @@ tests:
 
     - label:
           "TH_CR1 reads the window status to verify the DUT_CE window is closed"
-      cluster: "AdministratorCommissioning"
+      cluster: "Administrator Commissioning"
       command: "readAttribute"
       attribute: "WindowStatus"
       PICS: CADMIN.S.A0000
diff --git a/src/app/tests/suites/certification/Test_TC_CADMIN_1_24.yaml b/src/app/tests/suites/certification/Test_TC_CADMIN_1_24.yaml
index 6fea52d25582a4..4074198ae56331 100644
--- a/src/app/tests/suites/certification/Test_TC_CADMIN_1_24.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CADMIN_1_24.yaml
@@ -60,7 +60,7 @@ tests:
                 value: nodeId
 
     - label: "TH_CR1 opens a commissioning window on DUT_CE"
-      cluster: "AdministratorCommissioning"
+      cluster: "Administrator Commissioning"
       command: "OpenCommissioningWindow"
       PICS: CADMIN.S.C00.Rsp
       timedInteractionTimeoutMs: 10000
@@ -87,7 +87,7 @@ tests:
 
     - label:
           "TH_CR1 reads the window status to verify the DUT_CE window is closed"
-      cluster: "AdministratorCommissioning"
+      cluster: "Administrator Commissioning"
       command: "readAttribute"
       attribute: "WindowStatus"
       PICS: CADMIN.S.A0000
@@ -95,7 +95,7 @@ tests:
           value: 0
 
     - label: "TH_CR1 opens a commissioning window on DUT_CE"
-      cluster: "AdministratorCommissioning"
+      cluster: "Administrator Commissioning"
       command: "OpenCommissioningWindow"
       PICS: CADMIN.S.C00.Rsp
       timedInteractionTimeoutMs: 10000
@@ -116,7 +116,7 @@ tests:
 
     - label:
           "TH_CR1 reads the window status to verify the DUT_CE window is closed"
-      cluster: "AdministratorCommissioning"
+      cluster: "Administrator Commissioning"
       command: "readAttribute"
       attribute: "WindowStatus"
       PICS: CADMIN.S.A0000
diff --git a/src/app/tests/suites/certification/Test_TC_CADMIN_1_3.yaml b/src/app/tests/suites/certification/Test_TC_CADMIN_1_3.yaml
index ef066738f9ff4b..cfc054736ef1b2 100644
--- a/src/app/tests/suites/certification/Test_TC_CADMIN_1_3.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CADMIN_1_3.yaml
@@ -63,7 +63,7 @@ tests:
                 value: nodeId
 
     - label: "TH_CR1 opens a commissioning window on DUT_CE"
-      cluster: "AdministratorCommissioning"
+      cluster: "Administrator Commissioning"
       command: "OpenCommissioningWindow"
       PICS: CADMIN.S.C00.Rsp
       timedInteractionTimeoutMs: 10000
@@ -252,7 +252,7 @@ tests:
               maxLength: 32
 
     - label: "TH_CR2 opens a commissioning window on DUT_CE using ECM"
-      cluster: "AdministratorCommissioning"
+      cluster: "Administrator Commissioning"
       command: "OpenCommissioningWindow"
       PICS: CADMIN.S.C00.Rsp
       identity: "beta"
@@ -280,7 +280,7 @@ tests:
 
     - label:
           "TH_CR2 reads the window status to verify the DUT_CE window is closed"
-      cluster: "AdministratorCommissioning"
+      cluster: "Administrator Commissioning"
       PICS: CADMIN.S.A0000
       command: "readAttribute"
       attribute: "WindowStatus"
@@ -288,7 +288,7 @@ tests:
           value: 0
 
     - label: "TH_CR2 opens a commissioning window on DUT_CE using ECM"
-      cluster: "AdministratorCommissioning"
+      cluster: "Administrator Commissioning"
       command: "OpenCommissioningWindow"
       PICS: CADMIN.S.C00.Rsp
       identity: "beta"
diff --git a/src/app/tests/suites/certification/Test_TC_CADMIN_1_4.yaml b/src/app/tests/suites/certification/Test_TC_CADMIN_1_4.yaml
index 8b47aa85724201..411c0b85faccf6 100644
--- a/src/app/tests/suites/certification/Test_TC_CADMIN_1_4.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CADMIN_1_4.yaml
@@ -61,7 +61,7 @@ tests:
                 value: nodeId
 
     - label: "TH_CR1 opens a commissioning window on DUT_CE using BCM"
-      cluster: "AdministratorCommissioning"
+      cluster: "Administrator Commissioning"
       command: "OpenBasicCommissioningWindow"
       PICS: CADMIN.S.C01.Rsp
       timedInteractionTimeoutMs: 10000
@@ -239,7 +239,7 @@ tests:
               maxLength: 32
 
     - label: "TH_CR2 opens a commissioning window on DUT_CE using BCM"
-      cluster: "AdministratorCommissioning"
+      cluster: "Administrator Commissioning"
       command: "OpenBasicCommissioningWindow"
       identity: "beta"
       PICS: CADMIN.S.C01.Rsp
@@ -259,7 +259,7 @@ tests:
 
     - label:
           "TH_CR2 reads the window status to verify the DUT_CE window is closed"
-      cluster: "AdministratorCommissioning"
+      cluster: "Administrator Commissioning"
       PICS: CADMIN.S.A0000
       command: "readAttribute"
       attribute: "WindowStatus"
@@ -267,7 +267,7 @@ tests:
           value: 0
 
     - label: "TH_CR2 opens a commissioning window on DUT_CE using BCM"
-      cluster: "AdministratorCommissioning"
+      cluster: "Administrator Commissioning"
       command: "OpenBasicCommissioningWindow"
       identity: "beta"
       PICS: CADMIN.S.C01.Rsp
diff --git a/src/app/tests/suites/certification/Test_TC_CADMIN_1_5.yaml b/src/app/tests/suites/certification/Test_TC_CADMIN_1_5.yaml
index d875e904cd0754..ffca897082c8ea 100644
--- a/src/app/tests/suites/certification/Test_TC_CADMIN_1_5.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CADMIN_1_5.yaml
@@ -74,7 +74,7 @@ tests:
                 value: nodeId
 
     - label: "TH_CR1 opens a new commissioning window on DUT_CE using ECM"
-      cluster: "AdministratorCommissioning"
+      cluster: "Administrator Commissioning"
       command: "OpenCommissioningWindow"
       PICS: CADMIN.S.C00.Rsp
       timedInteractionTimeoutMs: 10000
@@ -136,7 +136,7 @@ tests:
           error: FAILURE
 
     - label: "TH_CR1 opens a new commissioning window on DUT_CE using ECM"
-      cluster: "AdministratorCommissioning"
+      cluster: "Administrator Commissioning"
       command: "OpenCommissioningWindow"
       PICS: CADMIN.S.C00.Rsp
       timedInteractionTimeoutMs: 10000
@@ -154,7 +154,7 @@ tests:
                 value: "SPAKE2P Key Salt"
 
     - label: "TH_CR1 revokes the commissioning window on DUT_CE"
-      cluster: "AdministratorCommissioning"
+      cluster: "Administrator Commissioning"
       command: "RevokeCommissioning"
       PICS: CADMIN.S.C02.Rsp
       timedInteractionTimeoutMs: 10000
@@ -174,7 +174,7 @@ tests:
           error: FAILURE
 
     - label: "TH_CR1 revokes the commissioning window on DUT_CE"
-      cluster: "AdministratorCommissioning"
+      cluster: "Administrator Commissioning"
       command: "RevokeCommissioning"
       PICS: CADMIN.S.C02.Rsp
       timedInteractionTimeoutMs: 10000
@@ -200,7 +200,7 @@ tests:
     - label:
           "TH_CR1 opens a new commissioning window on DUT_CE using wrong
           PakeVerifier value using ECM"
-      cluster: "AdministratorCommissioning"
+      cluster: "Administrator Commissioning"
       command: "OpenCommissioningWindow"
       PICS: CADMIN.S.C00.Rsp
       timedInteractionTimeoutMs: 10000
@@ -221,7 +221,7 @@ tests:
           clusterError: 3
 
     - label: "TH_CR1 opens a new commissioning window on DUT_CE using ECM"
-      cluster: "AdministratorCommissioning"
+      cluster: "Administrator Commissioning"
       command: "OpenCommissioningWindow"
       PICS: CADMIN.S.C00.Rsp
       timedInteractionTimeoutMs: 10000
@@ -239,7 +239,7 @@ tests:
                 value: "SPAKE2P Key Salt"
 
     - label: "TH_CR1 opens another commissioning window on DUT_CE using ECM"
-      cluster: "AdministratorCommissioning"
+      cluster: "Administrator Commissioning"
       command: "OpenCommissioningWindow"
       PICS: CADMIN.S.C00.Rsp
       timedInteractionTimeoutMs: 10000
@@ -284,7 +284,7 @@ tests:
     - label:
           "TH_CR1 tries to revoke the commissioning window on DUT_CE using
           RevokeCommissioning command"
-      cluster: "AdministratorCommissioning"
+      cluster: "Administrator Commissioning"
       command: "RevokeCommissioning"
       PICS: CADMIN.S.C02.Rsp
       timedInteractionTimeoutMs: 10000
diff --git a/src/app/tests/suites/certification/Test_TC_CADMIN_1_6.yaml b/src/app/tests/suites/certification/Test_TC_CADMIN_1_6.yaml
index d0b35b4ab4988c..ac2783fb867155 100644
--- a/src/app/tests/suites/certification/Test_TC_CADMIN_1_6.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CADMIN_1_6.yaml
@@ -70,7 +70,7 @@ tests:
 
     - label: "TH_CR1 opens a commissioning window on DUT_CE"
       identity: "alpha"
-      cluster: "AdministratorCommissioning"
+      cluster: "Administrator Commissioning"
       command: "OpenBasicCommissioningWindow"
       timedInteractionTimeoutMs: 10000
       PICS: CADMIN.S.C01.Rsp
@@ -130,7 +130,7 @@ tests:
           error: FAILURE
 
     - label: "TH_CR1 opens a commissioning window on DUT_CE"
-      cluster: "AdministratorCommissioning"
+      cluster: "Administrator Commissioning"
       command: "OpenBasicCommissioningWindow"
       timedInteractionTimeoutMs: 10000
       PICS: CADMIN.S.C01.Rsp
@@ -140,7 +140,7 @@ tests:
                 value: 180
 
     - label: "TH_CR1 revokes the commissioning window on DUT_CE"
-      cluster: "AdministratorCommissioning"
+      cluster: "Administrator Commissioning"
       command: "RevokeCommissioning"
       PICS: CADMIN.S.C02.Rsp
       timedInteractionTimeoutMs: 10000
@@ -159,7 +159,7 @@ tests:
           error: FAILURE
 
     - label: "TH_CR1 revokes the commissioning window on DUT_CE"
-      cluster: "AdministratorCommissioning"
+      cluster: "Administrator Commissioning"
       command: "RevokeCommissioning"
       timedInteractionTimeoutMs: 10000
       PICS: CADMIN.S.C02.Rsp
@@ -186,7 +186,7 @@ tests:
 
     - label: "TH_CR1 opens a commissioning window on DUT_CE"
       identity: "alpha"
-      cluster: "AdministratorCommissioning"
+      cluster: "Administrator Commissioning"
       command: "OpenBasicCommissioningWindow"
       timedInteractionTimeoutMs: 10000
       PICS: CADMIN.S.C01.Rsp
@@ -197,7 +197,7 @@ tests:
 
     - label: "TH_CR1 opens another commissioning window on DUT_CE"
       identity: "alpha"
-      cluster: "AdministratorCommissioning"
+      cluster: "Administrator Commissioning"
       command: "OpenBasicCommissioningWindow"
       timedInteractionTimeoutMs: 10000
       PICS: CADMIN.S.C01.Rsp
@@ -233,7 +233,7 @@ tests:
     - label:
           "TH_CR1 tries to revoke the commissioning window on DUT_CE using
           RevokeCommissioning command"
-      cluster: "AdministratorCommissioning"
+      cluster: "Administrator Commissioning"
       command: "RevokeCommissioning"
       PICS: CADMIN.S.C02.Rsp
       timedInteractionTimeoutMs: 10000
diff --git a/src/app/tests/suites/certification/Test_TC_CADMIN_1_9.yaml b/src/app/tests/suites/certification/Test_TC_CADMIN_1_9.yaml
index 271bff73b81104..61c352e1920877 100644
--- a/src/app/tests/suites/certification/Test_TC_CADMIN_1_9.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CADMIN_1_9.yaml
@@ -74,7 +74,7 @@ tests:
                 value: nodeId
 
     - label: "TH_CR1 opens a new commissioning window on DUT_CE"
-      cluster: "AdministratorCommissioning"
+      cluster: "Administrator Commissioning"
       command: "OpenCommissioningWindow"
       timedInteractionTimeoutMs: 10000
       PICS: CADMIN.S.C00.Rsp
diff --git a/src/app/tests/suites/certification/Test_TC_CC_6_1.yaml b/src/app/tests/suites/certification/Test_TC_CC_6_1.yaml
index bb045fc360dd6c..730112ab920c47 100644
--- a/src/app/tests/suites/certification/Test_TC_CC_6_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CC_6_1.yaml
@@ -84,7 +84,7 @@ tests:
       command: "MoveToColorTemperature"
       arguments:
           values:
-              - name: "ColorTemperature"
+              - name: "ColorTemperatureMireds"
                 value: 310
               - name: "TransitionTime"
                 value: 0
@@ -102,13 +102,13 @@ tests:
                 value: 100
 
     - label:
-          "TH sends MoveToColorTemperatur command to DUT with
+          "TH sends MoveToColorTemperature command to DUT with
           ColorTemperatureMireds=250 and TransitionTime=300 (30s)."
       PICS: CC.S.F04 && CC.S.C0a.Rsp
       command: "MoveToColorTemperature"
       arguments:
           values:
-              - name: "ColorTemperature"
+              - name: "ColorTemperatureMireds"
                 value: 250
               - name: "TransitionTime"
                 value: 300
diff --git a/src/app/tests/suites/certification/Test_TC_CC_6_2.yaml b/src/app/tests/suites/certification/Test_TC_CC_6_2.yaml
index db6c72d1aa83ee..0fb63d95dbf7d8 100644
--- a/src/app/tests/suites/certification/Test_TC_CC_6_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CC_6_2.yaml
@@ -84,7 +84,7 @@ tests:
       command: "MoveToColorTemperature"
       arguments:
           values:
-              - name: "ColorTemperature"
+              - name: "ColorTemperatureMireds"
                 value:
                     ( ColorTempPhysicalMinMiredsValue +
                     ColorTempPhysicalMaxMiredsValue ) / 2
diff --git a/src/app/tests/suites/certification/Test_TC_CC_6_3.yaml b/src/app/tests/suites/certification/Test_TC_CC_6_3.yaml
index aebdf0a271b0ff..d4706f17f7542f 100644
--- a/src/app/tests/suites/certification/Test_TC_CC_6_3.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CC_6_3.yaml
@@ -84,7 +84,7 @@ tests:
       command: "MoveToColorTemperature"
       arguments:
           values:
-              - name: "ColorTemperature"
+              - name: "ColorTemperatureMireds"
                 value:
                     ( ColorTempPhysicalMinMiredsValue +
                     ColorTempPhysicalMaxMiredsValue ) / 2
diff --git a/src/app/tests/suites/certification/Test_TC_CC_8_1.yaml b/src/app/tests/suites/certification/Test_TC_CC_8_1.yaml
index 508845b17599ef..51b3f1c6e32ef6 100644
--- a/src/app/tests/suites/certification/Test_TC_CC_8_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CC_8_1.yaml
@@ -243,7 +243,7 @@ tests:
       command: "MoveToColorTemperature"
       arguments:
           values:
-              - name: "ColorTemperature"
+              - name: "ColorTemperatureMireds"
                 value:
                     ( ColorTempPhysicalMinMireds + ColorTempPhysicalMaxMireds )
                     / 2
diff --git a/src/app/tests/suites/certification/Test_TC_DGTHREAD_1_1.yaml b/src/app/tests/suites/certification/Test_TC_DGTHREAD_1_1.yaml
index e6d2e2a0ba58e9..34e54d331e9628 100644
--- a/src/app/tests/suites/certification/Test_TC_DGTHREAD_1_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_DGTHREAD_1_1.yaml
@@ -138,402 +138,63 @@ tests:
               type: list
               contains: [6]
 
-    - label: "TH reads optional attribute (DetachedRoleCount) in AttributeList"
-      PICS: DGTHREAD.S.A000e
-      command: "readAttribute"
-      attribute: "AttributeList"
-      response:
-          constraints:
-              type: list
-              contains: [14]
-
-    - label: "TH reads optional attribute (ChildRoleCount) AttributeList"
-      PICS: DGTHREAD.S.A001f
-      command: "readAttribute"
-      attribute: "AttributeList"
-      response:
-          constraints:
-              type: list
-              contains: [15]
-
-    - label: "TH reads optional attribute (RouterRoleCount) in AttributeList"
-      PICS: DGTHREAD.S.A0010
-      command: "readAttribute"
-      attribute: "AttributeList"
-      response:
-          constraints:
-              type: list
-              contains: [16]
-
-    - label: "TH reads optional attribute (LeaderRoleCount) in AttributeList"
-      PICS: DGTHREAD.S.A0011
-      command: "readAttribute"
-      attribute: "AttributeList"
-      response:
-          constraints:
-              type: list
-              contains: [17]
-
-    - label: "TH reads optional attribute (AttachAttemptCount) in AttributeList"
-      PICS: DGTHREAD.S.A0012
-      command: "readAttribute"
-      attribute: "AttributeList"
-      response:
-          constraints:
-              type: list
-              contains: [18]
-
-    - label:
-          "TH reads optional attribute (PartitionIdChangeCount) in AttributeList"
-      PICS: DGTHREAD.S.A0013
-      command: "readAttribute"
-      attribute: "AttributeList"
-      response:
-          constraints:
-              type: list
-              contains: [19]
-
-    - label:
-          "TH reads optional attribute (BetterPartitionAttachAttemptCount) in
-          AttributeList"
-      PICS: DGTHREAD.S.A0014
-      command: "readAttribute"
-      attribute: "AttributeList"
-      response:
-          constraints:
-              type: list
-              contains: [20]
-
-    - label: "TH reads optional attribute (ParentChangeCount) in AttributeList"
-      PICS: DGTHREAD.S.A0015
-      command: "readAttribute"
-      attribute: "AttributeList"
-      response:
-          constraints:
-              type: list
-              contains: [21]
-
-    - label: "TH reads optional attribute (TxTotalCount) in AttributeList"
-      PICS: DGTHREAD.S.A0016
-      command: "readAttribute"
-      attribute: "AttributeList"
-      response:
-          constraints:
-              type: list
-              contains: [22]
-
-    - label: "TH reads optional attribute (TxUnicastCount) in AttributeList"
-      PICS: DGTHREAD.S.A0017
-      command: "readAttribute"
-      attribute: "AttributeList"
-      response:
-          constraints:
-              type: list
-              contains: [23]
-
-    - label: "TH reads optional attribute (TxBroadcastCount) in AttributeList"
-      PICS: DGTHREAD.S.A0018
-      command: "readAttribute"
-      attribute: "AttributeList"
-      response:
-          constraints:
-              type: list
-              contains: [24]
-
-    - label:
-          "TH reads optional attribute (TxAckRequestedCount) in AttributeList"
-      PICS: DGTHREAD.S.A0019
-      command: "readAttribute"
-      attribute: "AttributeList"
-      response:
-          constraints:
-              type: list
-              contains: [25]
-
-    - label: "TH reads optional attribute (TxAckedCount) in AttributeList"
-      PICS: DGTHREAD.S.A001a
-      command: "readAttribute"
-      attribute: "AttributeList"
-      response:
-          constraints:
-              type: list
-              contains: [26]
-
-    - label:
-          "TH reads optional attribute (TxNoAckRequestedCount) in AttributeList"
-      PICS: DGTHREAD.S.A001b
-      command: "readAttribute"
-      attribute: "AttributeList"
-      response:
-          constraints:
-              type: list
-              contains: [27]
-
-    - label: "TH reads optional attributes (TxDataCount) in AttributeList"
-      PICS: DGTHREAD.S.A001c
-      command: "readAttribute"
-      attribute: "AttributeList"
-      response:
-          constraints:
-              type: list
-              contains: [28]
-
-    - label: "TH reads optional attribute (TxDataPollCount) in AttributeList"
-      PICS: DGTHREAD.S.A001d
-      command: "readAttribute"
-      attribute: "AttributeList"
-      response:
-          constraints:
-              type: list
-              contains: [29]
-
-    - label: "TH reads optional attribute (TxBeaconCount) in AttributeList"
-      PICS: DGTHREAD.S.A001e
-      command: "readAttribute"
-      attribute: "AttributeList"
-      response:
-          constraints:
-              type: list
-              contains: [30]
-
-    - label:
-          "TH reads optional attribute (TxBeaconRequestCount) in AttributeList"
-      PICS: DGTHREAD.S.A001f
-      command: "readAttribute"
-      attribute: "AttributeList"
-      response:
-          constraints:
-              type: list
-              contains: [31]
-
-    - label: "TH reads optional attribute (TxOtherCount) in AttributeList"
-      PICS: DGTHREAD.S.A0020
-      command: "readAttribute"
-      attribute: "AttributeList"
-      response:
-          constraints:
-              type: list
-              contains: [32]
-
-    - label: "TH reads optional attribute (TxRetryCount) in AttributeList"
-      PICS: DGTHREAD.S.A0021
-      command: "readAttribute"
-      attribute: "AttributeList"
-      response:
-          constraints:
-              type: list
-              contains: [33]
-
-    - label:
-          "TH reads optional attribute (TxDirectMaxRetryExpiryCount) in
-          AttributeList"
-      PICS: DGTHREAD.S.A0022
-      command: "readAttribute"
-      attribute: "AttributeList"
-      response:
-          constraints:
-              type: list
-              contains: [34]
-
-    - label:
-          "TH reads optional attribute (TxIndirectMaxRetryExpiryCount) in
-          AttributeList"
-      PICS: DGTHREAD.S.A0023
-      command: "readAttribute"
-      attribute: "AttributeList"
-      response:
-          constraints:
-              type: list
-              contains: [35]
-
-    - label: "TH reads optional attribute (TxErrCcaCount) in AttributeList"
-      PICS: DGTHREAD.S.A0024
-      command: "readAttribute"
-      attribute: "AttributeList"
-      response:
-          constraints:
-              type: list
-              contains: [36]
-
-    - label: "TH reads optional attribute (TxErrAbortCount) in AttributeList"
-      PICS: DGTHREAD.S.A0025
-      command: "readAttribute"
-      attribute: "AttributeList"
-      response:
-          constraints:
-              type: list
-              contains: [37]
-
-    - label:
-          "TH reads optional attribute (TxErrBusyChannelCount) in AttributeList"
-      PICS: DGTHREAD.S.A0026
-      command: "readAttribute"
-      attribute: "AttributeList"
-      response:
-          constraints:
-              type: list
-              contains: [38]
-
-    - label: "TH reads optional attribute (RxTotalCount) in AttributeList"
-      PICS: DGTHREAD.S.A0027
-      command: "readAttribute"
-      attribute: "AttributeList"
-      response:
-          constraints:
-              type: list
-              contains: [39]
-
-    - label: "TH reads optional attribute (RxUnicastCount) in AttributeList"
-      PICS: DGTHREAD.S.A0028
-      command: "readAttribute"
-      attribute: "AttributeList"
-      response:
-          constraints:
-              type: list
-              contains: [40]
-
-    - label: "TH reads optional attribute (RxBroadcastCount) in AttributeList"
-      PICS: DGTHREAD.S.A0029
-      command: "readAttribute"
-      attribute: "AttributeList"
-      response:
-          constraints:
-              type: list
-              contains: [41]
-
-    - label: "TH reads optional attribute (RxDataCount) in AttributeList"
-      PICS: DGTHREAD.S.A002a
-      command: "readAttribute"
-      attribute: "AttributeList"
-      response:
-          constraints:
-              type: list
-              contains: [42]
-
-    - label: "TH reads optional attribute (RxDataPollCount) in AttributeList"
-      PICS: DGTHREAD.S.A002b
-      command: "readAttribute"
-      attribute: "AttributeList"
-      response:
-          constraints:
-              type: list
-              contains: [43]
-
-    - label: "TH reads optional attribute (RxBeaconCount) in AttributeList"
-      PICS: DGTHREAD.S.A002c
-      command: "readAttribute"
-      attribute: "AttributeList"
-      response:
-          constraints:
-              type: list
-              contains: [44]
-
     - label:
-          "TH reads optional attribute (RxBeaconRequestCount) in AttributeList"
-      PICS: DGTHREAD.S.A002d
-      command: "readAttribute"
-      attribute: "AttributeList"
-      response:
-          constraints:
-              type: list
-              contains: [45]
-
-    - label: "TH reads optional attribute (RxOtherCount) in AttributeList"
-      PICS: DGTHREAD.S.A002e
-      command: "readAttribute"
-      attribute: "AttributeList"
-      response:
-          constraints:
-              type: list
-              contains: [46]
-
-    - label:
-          "TH reads optional attribute (RxAddressFilteredCount) in AttributeList"
-      PICS: DGTHREAD.S.A002f
-      command: "readAttribute"
-      attribute: "AttributeList"
-      response:
-          constraints:
-              type: list
-              contains: [47]
-
-    - label:
-          "TH reads optional attribute (RxDestAddrFilteredCount) in
-          AttributeList"
-      PICS: DGTHREAD.S.A0030
-      command: "readAttribute"
-      attribute: "AttributeList"
-      response:
-          constraints:
-              type: list
-              contains: [48]
-
-    - label: "TH reads optional attribute (RxDuplicatedCount) in AttributeList"
-      PICS: DGTHREAD.S.A0031
-      command: "readAttribute"
-      attribute: "AttributeList"
-      response:
-          constraints:
-              type: list
-              contains: [49]
-
-    - label: "TH reads optional attribute (RxErrNoFrameCount) in AttributeList"
-      PICS: DGTHREAD.S.A0032
-      command: "readAttribute"
-      attribute: "AttributeList"
-      response:
-          constraints:
-              type: list
-              contains: [50]
-
-    - label:
-          "TH reads optional attribute (RxErrUnknownNeighborCount) in
-          AttributeList"
-      PICS: DGTHREAD.S.A0033
+          "TH reads Feature dependent attribute (DGTHREAD.S.F02(MLECNT)) in
+          attributeList"
+      PICS: DGTHREAD.S.F02
       command: "readAttribute"
       attribute: "AttributeList"
       response:
           constraints:
               type: list
-              contains: [51]
+              contains: [14, 15, 16, 17, 18, 19, 20, 21]
 
     - label:
-          "TH reads optional attribute (RxErrInvalidScrAddrCount) in
-          AttributeList"
-      PICS: DGTHREAD.S.A0034
-      command: "readAttribute"
-      attribute: "AttributeList"
-      response:
-          constraints:
-              type: list
-              contains: [52]
-
-    - label: "TH reads optional attribute (RxErrSecCount) in AttributeList"
-      PICS: DGTHREAD.S.A0035
-      command: "readAttribute"
-      attribute: "AttributeList"
-      response:
-          constraints:
-              type: list
-              contains: [53]
-
-    - label: "TH reads optional attribute (RxErrFcsCount) in AttributeList"
-      PICS: DGTHREAD.S.A0036
-      command: "readAttribute"
-      attribute: "AttributeList"
-      response:
-          constraints:
-              type: list
-              contains: [54]
-
-    - label: "TH reads optional attribute (RxErrOtherCount) in AttributeList"
-      PICS: DGTHREAD.S.A0037
+          "TH reads Feature dependent attribute (DGTHREAD.S.F03(MACCNT)) in
+          attributeList"
+      PICS: DGTHREAD.S.F03
       command: "readAttribute"
       attribute: "AttributeList"
       response:
           constraints:
               type: list
-              contains: [55]
+              contains:
+                  [
+                      22,
+                      23,
+                      24,
+                      25,
+                      26,
+                      27,
+                      28,
+                      29,
+                      30,
+                      31,
+                      32,
+                      33,
+                      34,
+                      35,
+                      36,
+                      37,
+                      38,
+                      39,
+                      40,
+                      41,
+                      42,
+                      43,
+                      44,
+                      45,
+                      46,
+                      47,
+                      48,
+                      49,
+                      50,
+                      51,
+                      52,
+                      53,
+                      54,
+                      55,
+                  ]
 
     - label: "Read the optional attribute (ActiveTimestamp) in AttributeList"
       PICS: DGTHREAD.S.A0038
diff --git a/src/app/tests/suites/certification/Test_TC_PCC_1_1.yaml b/src/app/tests/suites/certification/Test_TC_PCC_1_1.yaml
index dd3d65fd00c92f..d8805c991eee8c 100644
--- a/src/app/tests/suites/certification/Test_TC_PCC_1_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_PCC_1_1.yaml
@@ -35,11 +35,14 @@ tests:
       command: "readAttribute"
       attribute: "ClusterRevision"
       response:
-          value: 3
+          value: 4
           constraints:
               type: int16u
 
     - label: "TH reads the FeatureMap attribute from the DUT"
+      PICS:
+          " !PCC.S.F00 && !PCC.S.F01 && !PCC.S.F02 && !PCC.S.F03 && !PCC.S.F04
+          && !PCC.S.F05 && !PCC.S.F06 "
       command: "readAttribute"
       attribute: "FeatureMap"
       response:
@@ -47,6 +50,71 @@ tests:
           constraints:
               type: bitmap32
 
+    - label:
+          "Given PCC.S.F00(PRSCONST) ensure featuremap has the correct bit set"
+      PICS: PCC.S.F00
+      command: "readAttribute"
+      attribute: "FeatureMap"
+      response:
+          constraints:
+              type: bitmap32
+              hasMasksSet: [0x1]
+
+    - label:
+          "Given PCC.S.F01(PRSCOMP) ensure featuremap has the correct bit set"
+      PICS: PCC.S.F01
+      command: "readAttribute"
+      attribute: "FeatureMap"
+      response:
+          constraints:
+              type: bitmap32
+              hasMasksSet: [0x2]
+
+    - label: "Given PCC.S.F02(FLW) ensure featuremap has the correct bit set"
+      PICS: PCC.S.F02
+      command: "readAttribute"
+      attribute: "FeatureMap"
+      response:
+          constraints:
+              type: bitmap32
+              hasMasksSet: [0x4]
+
+    - label: "Given PCC.S.F03(SPD) ensure featuremap has the correct bit set"
+      PICS: PCC.S.F03
+      command: "readAttribute"
+      attribute: "FeatureMap"
+      response:
+          constraints:
+              type: bitmap32
+              hasMasksSet: [0x8]
+
+    - label: "Given PCC.S.F04(TEMP) ensure featuremap has the correct bit set"
+      PICS: PCC.S.F04
+      command: "readAttribute"
+      attribute: "FeatureMap"
+      response:
+          constraints:
+              type: bitmap32
+              hasMasksSet: [0x10]
+
+    - label: "Given PCC.S.F05(AUTO) ensure featuremap has the correct bit set"
+      PICS: PCC.S.F05
+      command: "readAttribute"
+      attribute: "FeatureMap"
+      response:
+          constraints:
+              type: bitmap32
+              hasMasksSet: [0x20]
+
+    - label: "Given PCC.S.F06(LOCAL) ensure featuremap has the correct bit set"
+      PICS: PCC.S.F06
+      command: "readAttribute"
+      attribute: "FeatureMap"
+      response:
+          constraints:
+              type: bitmap32
+              hasMasksSet: [0x40]
+
     - label: "TH reads the AttributeList attribute from the DUT"
       command: "readAttribute"
       attribute: "AttributeList"
diff --git a/src/app/tests/suites/certification/Test_TC_PCC_2_2.yaml b/src/app/tests/suites/certification/Test_TC_PCC_2_2.yaml
index 1019d114098154..0d02638d029fe6 100644
--- a/src/app/tests/suites/certification/Test_TC_PCC_2_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_PCC_2_2.yaml
@@ -48,14 +48,14 @@ tests:
     - label: "TH write 1 (Minimum) to the OperationMode attribute to DUT"
       command: "writeAttribute"
       attribute: "OperationMode"
-      PICS: PCC.S.A0020 && PCC.M.ControlModeConstSpeed
+      PICS: PCC.S.F03 && PCC.S.A0020
       arguments:
           value: 1
 
     - label: "TH reads from the DUT the EffectiveOperationMode attribute"
       command: "readAttribute"
       attribute: "EffectiveOperationMode"
-      PICS: PCC.S.A0011 && PCC.M.ControlModeConstSpeed
+      PICS: PCC.S.F03 && PCC.S.A0011
       response:
           value: 1
 
@@ -64,27 +64,27 @@ tests:
           time."
       command: "writeAttribute"
       attribute: "OperationMode"
-      PICS: PCC.S.A0020 && PCC.M.ControlModeConstSpeed
+      PICS: PCC.S.F03 && PCC.S.A0020
       arguments:
           value: 2
 
     - label: "TH reads from the DUT the EffectiveOperationMode attribute"
       command: "readAttribute"
       attribute: "EffectiveOperationMode"
-      PICS: PCC.S.A0011 && PCC.M.ControlModeConstSpeed
+      PICS: PCC.S.F03 && PCC.S.A0011
       response:
           value: 2
 
     - label: "TH write 3 (Local) to the OperationMode attribute to DUT"
       command: "writeAttribute"
       attribute: "OperationMode"
-      PICS: PCC.S.A0020
+      PICS: PCC.S.F06 && PCC.S.A0020
       arguments:
           value: 3
 
     - label: "TH reads from the DUT the EffectiveOperationMode attribute"
       command: "readAttribute"
       attribute: "EffectiveOperationMode"
-      PICS: PCC.S.A0011
+      PICS: PCC.S.F06 && PCC.S.A0011
       response:
           value: 3
diff --git a/src/app/tests/suites/certification/Test_TC_PCC_2_3.yaml b/src/app/tests/suites/certification/Test_TC_PCC_2_3.yaml
index fbf880d3668745..75f7789392027d 100644
--- a/src/app/tests/suites/certification/Test_TC_PCC_2_3.yaml
+++ b/src/app/tests/suites/certification/Test_TC_PCC_2_3.yaml
@@ -48,83 +48,83 @@ tests:
     - label: "Write 0 to the ControlMode attribute to DUT"
       command: "writeAttribute"
       attribute: "ControlMode"
-      PICS: PCC.S.A0021 && PCC.M.ControlModeConstSpeed
+      PICS: PCC.S.F03 && PCC.S.A0021
       arguments:
           value: 0
 
     - label: "Reads the attribute: EffectiveControlMode"
       command: "readAttribute"
       attribute: "EffectiveControlMode"
-      PICS: PCC.S.A0012 && PCC.M.ControlModeConstSpeed
+      PICS: PCC.S.F03 && PCC.S.A0012
       response:
           value: 0
 
     - label: "Write 1 to the ControlMode attribute to DUT"
       command: "writeAttribute"
       attribute: "ControlMode"
-      PICS: PCC.S.A0021 && PCC.M.ControlModeConstPressure
+      PICS: PCC.S.F00 && PCC.S.A0021
       arguments:
           value: 1
 
     - label: "Reads the attribute: EffectiveControlMode"
       command: "readAttribute"
       attribute: "EffectiveControlMode"
-      PICS: PCC.S.A0012 && PCC.M.ControlModeConstPressure
+      PICS: PCC.S.F00 && PCC.S.A0012
       response:
           value: 1
 
     - label: "Write 2 to the ControlMode attribute to DUT"
       command: "writeAttribute"
       attribute: "ControlMode"
-      PICS: PCC.S.A0021 && PCC.M.ControlModeCompPressure
+      PICS: PCC.S.F01 && PCC.S.A0021
       arguments:
           value: 2
 
     - label: "Reads the attribute: EffectiveControlMode"
       command: "readAttribute"
       attribute: "EffectiveControlMode"
-      PICS: PCC.S.A0012 && PCC.M.ControlModeCompPressure
+      PICS: PCC.S.F01 && PCC.S.A0012
       response:
           value: 2
 
     - label: "Write 3 to the ControlMode attribute to DUT"
       command: "writeAttribute"
       attribute: "ControlMode"
-      PICS: PCC.S.A0021 && PCC.M.ControlModeConstFlow
+      PICS: PCC.S.F02 && PCC.S.A0021
       arguments:
           value: 3
 
     - label: "Reads the attribute: EffectiveControlMode"
       command: "readAttribute"
       attribute: "EffectiveControlMode"
-      PICS: PCC.S.A0012 && PCC.M.ControlModeConstFlow
+      PICS: PCC.S.F02 && PCC.S.A0012
       response:
           value: 3
 
     - label: "Write 5 to the ControlMode attribute to DUT"
       command: "writeAttribute"
       attribute: "ControlMode"
-      PICS: PCC.S.A0021 && PCC.M.ControlModeConstTemp
+      PICS: PCC.S.F04 && PCC.S.A0021
       arguments:
           value: 5
 
     - label: "Reads the attribute: EffectiveControlMode"
       command: "readAttribute"
       attribute: "EffectiveControlMode"
-      PICS: PCC.S.A0012 && PCC.M.ControlModeConstTemp
+      PICS: PCC.S.F04 && PCC.S.A0012
       response:
           value: 5
 
     - label: "Write 7 to the ControlMode attribute to DUT"
       command: "writeAttribute"
       attribute: "ControlMode"
-      PICS: PCC.S.A0021 && PCC.M.ControlModeAuto
+      PICS: PCC.S.F05 && PCC.S.A0021
       arguments:
           value: 7
 
     - label: "Reads the attribute: EffectiveControlMode"
       command: "readAttribute"
       attribute: "EffectiveControlMode"
-      PICS: PCC.S.A0012 && PCC.M.ControlModeAuto
+      PICS: PCC.S.F02 && PCC.S.A0012
       response:
           value: 7
diff --git a/src/app/tests/suites/certification/ci-pics-values b/src/app/tests/suites/certification/ci-pics-values
index 077b01e51c37bf..e5d27bdef66a39 100644
--- a/src/app/tests/suites/certification/ci-pics-values
+++ b/src/app/tests/suites/certification/ci-pics-values
@@ -730,6 +730,13 @@ FLW.S.A0003=1
 FLW.M.FlowChange=1
 
 #Pump Configuration and Control
+PCC.S.F00=1
+PCC.S.F01=0
+PCC.S.F02=0
+PCC.S.F03=0
+PCC.S.F04=0
+PCC.S.F05=0
+PCC.S.F06=0
 PCC.S.A0000=1
 PCC.S.A0001=1
 PCC.S.A0002=1
@@ -753,12 +760,6 @@ PCC.S.A0016=1
 PCC.S.A0017=1
 PCC.S.A0020=1
 PCC.S.A0021=1
-PCC.M.ControlModeConstSpeed=1
-PCC.M.ControlModeConstPressure=1
-PCC.M.ControlModeCompPressure=1
-PCC.M.ControlModeConstFlow=1
-PCC.M.ControlModeConstTemp=1
-PCC.M.ControlModeAuto=1
 
 #Power Source Cluster
 PS.S.A0000=1
diff --git a/src/app/util/af.h b/src/app/util/af.h
index 9c9bad4b3f1345..9bc5dbca599bda 100644
--- a/src/app/util/af.h
+++ b/src/app/util/af.h
@@ -80,6 +80,14 @@ bool emberAfContainsServer(chip::EndpointId endpoint, chip::ClusterId clusterId)
  */
 bool emberAfContainsServerFromIndex(uint16_t index, chip::ClusterId clusterId);
 
+/**
+ * @brief Returns true if endpoint contains the ZCL client with specified id.
+ *
+ * This function returns true if
+ * the endpoint contains client of a given cluster.
+ */
+bool emberAfContainsClient(chip::EndpointId endpoint, chip::ClusterId clusterId);
+
 /**
  * @brief write an attribute, performing all the checks.
  *
diff --git a/src/app/util/attribute-storage.cpp b/src/app/util/attribute-storage.cpp
index e30b990546b62d..db55e2bd6e1d7e 100644
--- a/src/app/util/attribute-storage.cpp
+++ b/src/app/util/attribute-storage.cpp
@@ -675,6 +675,18 @@ bool emberAfContainsServer(EndpointId endpoint, ClusterId clusterId)
     return (emberAfFindServerCluster(endpoint, clusterId) != nullptr);
 }
 
+// Returns whether the given endpoint has the client of the given cluster on it.
+bool emberAfContainsClient(EndpointId endpoint, ClusterId clusterId)
+{
+    uint16_t ep = emberAfIndexFromEndpoint(endpoint);
+    if (ep == kEmberInvalidEndpointIndex)
+    {
+        return false;
+    }
+
+    return (emberAfFindClusterInType(emAfEndpoints[ep].endpointType, clusterId, CLUSTER_MASK_CLIENT) != nullptr);
+}
+
 // This will find the first server that has the clusterId given from the index of endpoint.
 bool emberAfContainsServerFromIndex(uint16_t index, ClusterId clusterId)
 {
diff --git a/src/app/util/util.cpp b/src/app/util/util.cpp
index 155b07e0a360ab..dbac3013de8419 100644
--- a/src/app/util/util.cpp
+++ b/src/app/util/util.cpp
@@ -18,7 +18,6 @@
 #include "app/util/common.h"
 #include <app-common/zap-generated/attribute-id.h>
 #include <app-common/zap-generated/attribute-type.h>
-#include <app-common/zap-generated/command-id.h>
 #include <app-common/zap-generated/ids/Clusters.h>
 #include <app-common/zap-generated/print-cluster.h>
 #include <app/util/af-event.h>
diff --git a/src/app/zap-templates/partials/idl/command_request_response.zapt b/src/app/zap-templates/partials/idl/command_request_response.zapt
index 3f6babd4a40863..fed6c421c2c581 100644
--- a/src/app/zap-templates/partials/idl/command_request_response.zapt
+++ b/src/app/zap-templates/partials/idl/command_request_response.zapt
@@ -18,7 +18,7 @@
      {{~/first~}}
     {{~/zcl_command_arguments~}}
   ): {{#if responseName~}}
-    {{responseName}}
+    {{asUpperCamelCase responseName}}
 {{~else~}}
     DefaultSuccess
 {{~/if~}}
diff --git a/src/app/zap-templates/templates/app/cluster-id.zapt b/src/app/zap-templates/templates/app/cluster-id.zapt
deleted file mode 100644
index 96805fa4ea7c3e..00000000000000
--- a/src/app/zap-templates/templates/app/cluster-id.zapt
+++ /dev/null
@@ -1,13 +0,0 @@
-{{> header}}
-
-// Prevent multiple inclusion
-#pragma once
-
-#include <app/util/basic-types.h>
-
-{{#zcl_clusters}}
-
-// Definitions for cluster: {{label}}
-static constexpr chip::ClusterId ZCL_{{asDelimitedMacro define}}_ID = {{asHex code 4}};
-
-{{/zcl_clusters}}
diff --git a/src/app/zap-templates/templates/app/cluster-objects.zapt b/src/app/zap-templates/templates/app/cluster-objects.zapt
index f88a85f578974b..660a3178878f0f 100644
--- a/src/app/zap-templates/templates/app/cluster-objects.zapt
+++ b/src/app/zap-templates/templates/app/cluster-objects.zapt
@@ -105,7 +105,7 @@ public:
 
     using ResponseType =
     {{~#if responseName}}
-      Clusters::{{asUpperCamelCase parent.name}}::Commands::{{responseName}}::DecodableType;
+      Clusters::{{asUpperCamelCase parent.name}}::Commands::{{asUpperCamelCase responseName}}::DecodableType;
     {{else}}
       DataModel::NullObjectType;
     {{/if}}
diff --git a/src/app/zap-templates/templates/app/command-id.zapt b/src/app/zap-templates/templates/app/command-id.zapt
deleted file mode 100644
index 9b6045feeac130..00000000000000
--- a/src/app/zap-templates/templates/app/command-id.zapt
+++ /dev/null
@@ -1,19 +0,0 @@
-{{> header}}
-
-// Prevent multiple inclusion
-#pragma once
-
-// Global, non-cluster-specific commands
-{{#zcl_global_commands}}
-#define ZCL_{{asDelimitedMacro label}}_COMMAND_ID ({{asHex code 2}})
-{{/zcl_global_commands}}
-
-{{#zcl_clusters}}
-
-{{#zcl_commands}}
-{{#first}}
-// Commands for cluster: {{parent.label}}
-{{/first}}
-#define ZCL_{{asDelimitedMacro label}}_COMMAND_ID ({{asHex code 2}})
-{{/zcl_commands}}
-{{/zcl_clusters}}
diff --git a/src/app/zap-templates/zcl/data-model/chip/administrator-commissioning-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/administrator-commissioning-cluster.xml
index ede89c9600affe..aa34ca9828508d 100644
--- a/src/app/zap-templates/zcl/data-model/chip/administrator-commissioning-cluster.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/administrator-commissioning-cluster.xml
@@ -24,7 +24,7 @@ limitations under the License.
      <item name="WindowNotOpen" value="0x04"/>
   </enum>
 
-  <enum name="CommissioningWindowStatus" type="ENUM8">
+  <enum name="CommissioningWindowStatusEnum" type="ENUM8">
     <cluster code="0x003c"/>
      <item name="WindowNotOpen" value="0x00"/>
      <item name="EnhancedWindowOpen" value="0x01"/>
@@ -32,13 +32,13 @@ limitations under the License.
   </enum>
 
   <cluster>
-    <name>AdministratorCommissioning</name>
+    <name>Administrator Commissioning</name>
     <domain>General</domain>
     <code>0x003c</code>
     <define>ADMINISTRATOR_COMMISSIONING_CLUSTER</define>
     <description>Commands to trigger a Node to allow a new Administrator to commission it.</description>
 
-    <attribute side="server" code="0x0000" define="WINDOW_STATUS" type="CommissioningWindowStatus" writable="false" optional="false">WindowStatus</attribute>
+    <attribute side="server" code="0x0000" define="WINDOW_STATUS" type="CommissioningWindowStatusEnum" writable="false" optional="false">WindowStatus</attribute>
     <attribute side="server" code="0x0001" define="ADMIN_FABRIC_INDEX" type="fabric_idx" writable="false" isNullable="true" optional="false">AdminFabricIndex</attribute>
     <attribute side="server" code="0x0002" define="ADMIN_VENDOR_ID" type="INT16U" writable="false" isNullable="true" optional="false">AdminVendorId</attribute>
 
diff --git a/src/app/zap-templates/zcl/data-model/chip/door-lock-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/door-lock-cluster.xml
index b14ebd36e33317..bfae76e66edf89 100644
--- a/src/app/zap-templates/zcl/data-model/chip/door-lock-cluster.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/door-lock-cluster.xml
@@ -71,7 +71,7 @@ limitations under the License.
         <attribute side="server" code="1" define="LOCK_TYPE" type="DlLockType" min="0" max="10" writable="false">LockType</attribute>
         <attribute side="server" code="2" define="ACTUATOR_ENABLED" type="boolean" writable="false">ActuatorEnabled</attribute>
         <!-- Conformance feature DPS - for now optional -->
-        <attribute side="server" code="3" define="DOOR_STATE" type="DlDoorState" min="0" max="5" isNullable="true" reportable="true" optional="true">DoorState</attribute>
+        <attribute side="server" code="3" define="DOOR_STATE" type="DoorStateEnum" min="0" max="5" isNullable="true" reportable="true" optional="true">DoorState</attribute>
         <!-- Conformance feature [DPS] - for now optional -->
         <attribute side="server" code="4" define="DOOR_OPEN_EVENTS" type="INT32U" writable="true" optional="true">
             <description>DoorOpenEvents</description>
@@ -134,7 +134,7 @@ limitations under the License.
             <access op="read" role="view" />
             <access op="write" role="manage" />
         </attribute>
-        <attribute side="server" code="37" define="OPERATING_MODE" type="DlOperatingMode" min="0" max="4" reportable="true" writable="true">
+        <attribute side="server" code="37" define="OPERATING_MODE" type="OperatingModeEnum" min="0" max="4" reportable="true" writable="true">
             <description>OperatingMode</description>
             <access op="read" role="view" />
             <access op="write" role="manage" />
@@ -202,241 +202,241 @@ limitations under the License.
         <command source="client" code="0" name="LockDoor" mustUseTimedInvoke="true">
             <description>This command causes the lock device to lock the door.</description>
             <!-- Conformance feature [COTA & PIN] - for now optional -->
-            <arg name="pinCode" type="OCTET_STRING" optional="true" />
+            <arg name="PINCode" type="OCTET_STRING" optional="true" />
         </command>
         <command source="client" code="1" name="UnlockDoor" mustUseTimedInvoke="true">
             <description>This command causes the lock device to unlock the door.</description>
             <!-- Conformance feature [COTA & PIN] - for now optional -->
-            <arg name="pinCode" type="OCTET_STRING" optional="true" />
+            <arg name="PINCode" type="OCTET_STRING" optional="true" />
         </command>
         <!-- Command Toggle with ID 2 is deprecated/disallowed -->
         <command source="client" code="3" name="UnlockWithTimeout" mustUseTimedInvoke="true" optional="true">
             <description>This command causes the lock device to unlock the door with a timeout parameter.</description>
-            <arg name="timeout" type="INT16U" />
+            <arg name="Timeout" type="INT16U" />
             <!-- Conformance feature [COTA & PIN] - for now optional -->
-            <arg name="pinCode" type="OCTET_STRING" optional="true" />
+            <arg name="PINCode" type="OCTET_STRING" optional="true" />
         </command>
         <!-- Conformance feature WDSCH - for now optional -->
         <command source="client" code="11" name="SetWeekDaySchedule" optional="true">
             <description>Set a weekly repeating schedule for a specified user.</description>
             <access op="invoke" role="administer" />
-            <arg name="weekDayIndex" type="INT8U" />
-            <arg name="userIndex" type="INT16U" />
-            <arg name="daysMask" type="DlDaysMaskMap" />
-            <arg name="startHour" type="INT8U" />
-            <arg name="startMinute" type="INT8U" />
-            <arg name="endHour" type="INT8U" />
-            <arg name="endMinute" type="INT8U" />
+            <arg name="WeekDayIndex" type="INT8U" />
+            <arg name="UserIndex" type="INT16U" />
+            <arg name="DaysMask" type="DaysMaskMap" />
+            <arg name="StartHour" type="INT8U" />
+            <arg name="StartMinute" type="INT8U" />
+            <arg name="EndHour" type="INT8U" />
+            <arg name="EndMinute" type="INT8U" />
         </command>
         <!-- Conformance feature WDSCH - for now optional -->
         <command source="client" code="12" name="GetWeekDaySchedule" response="GetWeekDayScheduleResponse" optional="true">
             <description>Retrieve the specific weekly schedule for the specific user.</description>
             <access op="invoke" role="administer" />
-            <arg name="weekDayIndex" type="INT8U" />
-            <arg name="userIndex" type="INT16U" />
+            <arg name="WeekDayIndex" type="INT8U" />
+            <arg name="UserIndex" type="INT16U" />
         </command>
         <!-- Conformance feature WDSCH - for now optional -->
         <command source="server" code="12" name="GetWeekDayScheduleResponse" disableDefaultResponse="true" optional="true">
             <description>Returns the weekly repeating schedule data for the specified schedule index.</description>
             <access op="invoke" role="administer" />
-            <arg name="weekDayIndex" type="INT8U" />
-            <arg name="userIndex" type="INT16U" />
-            <arg name="status" type="DlStatus" />
-            <arg name="daysMask" type="DlDaysMaskMap" optional="true" />
-            <arg name="startHour" type="INT8U" optional="true" />
-            <arg name="startMinute" type="INT8U" optional="true" />
-            <arg name="endHour" type="INT8U" optional="true" />
-            <arg name="endMinute" type="INT8U" optional="true" />
+            <arg name="WeekDayIndex" type="INT8U" />
+            <arg name="UserIndex" type="INT16U" />
+            <arg name="Status" type="DlStatus" />
+            <arg name="DaysMask" type="DaysMaskMap" optional="true" />
+            <arg name="StartHour" type="INT8U" optional="true" />
+            <arg name="StartMinute" type="INT8U" optional="true" />
+            <arg name="EndHour" type="INT8U" optional="true" />
+            <arg name="EndMinute" type="INT8U" optional="true" />
         </command>
         <!-- Conformance feature WDSCH - for now optional -->
         <command source="client" code="13" name="ClearWeekDaySchedule" optional="true">
             <description>Clear the specific weekly schedule or all weekly schedules for the specific user.</description>
             <access op="invoke" role="administer" />
-            <arg name="weekDayIndex" type="INT8U" />
-            <arg name="userIndex" type="INT16U" />
+            <arg name="WeekDayIndex" type="INT8U" />
+            <arg name="UserIndex" type="INT16U" />
         </command>
         <!-- Conformance feature YDSCH - for now optional -->
         <command source="client" code="14" name="SetYearDaySchedule" optional="true">
             <description>Set a time-specific schedule ID for a specified user.</description>
             <access op="invoke" role="administer" />
-            <arg name="yearDayIndex" type="INT8U" />
-            <arg name="userIndex" type="INT16U" />
-            <arg name="localStartTime" type="epoch_s" />
-            <arg name="localEndTime" type="epoch_s" />
+            <arg name="YearDayIndex" type="INT8U" />
+            <arg name="UserIndex" type="INT16U" />
+            <arg name="LocalStartTime" type="epoch_s" />
+            <arg name="LocalEndTime" type="epoch_s" />
         </command>
         <!-- Conformance feature YDSCH - for now optional -->
         <command source="client" code="15" name="GetYearDaySchedule" response="GetYearDayScheduleResponse" optional="true">
             <description>Returns the year day schedule data for the specified schedule and user indexes.</description>
             <access op="invoke" role="administer" />
-            <arg name="yearDayIndex" type="INT8U" />
-            <arg name="userIndex" type="INT16U" />
+            <arg name="YearDayIndex" type="INT8U" />
+            <arg name="UserIndex" type="INT16U" />
         </command>
         <!-- Conformance feature YDSCH - for now optional -->
         <command source="server" code="15" name="GetYearDayScheduleResponse" disableDefaultResponse="true" optional="true">
             <description>Returns the year day schedule data for the specified schedule and user indexes.</description>
             <access op="invoke" role="administer" />
-            <arg name="yearDayIndex" type="INT8U" />
-            <arg name="userIndex" type="INT16U" />
-            <arg name="status" type="DlStatus" />
-            <arg name="localStartTime" type="epoch_s" optional="true" />
-            <arg name="localEndTime" type="epoch_s" optional="true" />
+            <arg name="YearDayIndex" type="INT8U" />
+            <arg name="UserIndex" type="INT16U" />
+            <arg name="Status" type="DlStatus" />
+            <arg name="LocalStartTime" type="epoch_s" optional="true" />
+            <arg name="LocalEndTime" type="epoch_s" optional="true" />
         </command>
         <!-- Conformance feature YDSCH - for now optional -->
         <command source="client" code="16" name="ClearYearDaySchedule" optional="true">
             <description>Clears the specific year day schedule or all year day schedules for the specific user.</description>
             <access op="invoke" role="administer" />
-            <arg name="yearDayIndex" type="INT8U" />
-            <arg name="userIndex" type="INT16U" />
+            <arg name="YearDayIndex" type="INT8U" />
+            <arg name="UserIndex" type="INT16U" />
         </command>
         <!-- Conformance feature HDSCH - for now optional -->
         <command source="client" code="17" name="SetHolidaySchedule" optional="true">
             <description>Set the holiday Schedule by specifying local start time and local end time with respect to any Lock Operating Mode.</description>
             <access op="invoke" role="administer" />
-            <arg name="holidayIndex" type="INT8U" />
-            <arg name="localStartTime" type="epoch_s" />
-            <arg name="localEndTime" type="epoch_s" />
-            <arg name="operatingMode" type="DlOperatingMode" />
+            <arg name="HolidayIndex" type="INT8U" />
+            <arg name="LocalStartTime" type="epoch_s" />
+            <arg name="LocalEndTime" type="epoch_s" />
+            <arg name="OperatingMode" type="OperatingModeEnum" />
         </command>
         <!-- Conformance feature HDSCH - for now optional -->
         <command source="client" code="18" name="GetHolidaySchedule" response="GetHolidayScheduleResponse" optional="true">
             <description>Get the holiday schedule for the specified index.</description>
             <access op="invoke" role="administer" />
-            <arg name="holidayIndex" type="INT8U" />
+            <arg name="HolidayIndex" type="INT8U" />
         </command>
         <!-- Conformance feature HDSCH - for now optional -->
         <command source="server" code="18" name="GetHolidayScheduleResponse" disableDefaultResponse="true" optional="true">
             <description>Returns the Holiday Schedule Entry for the specified Holiday ID.</description>
             <access op="invoke" role="administer" />
-            <arg name="holidayIndex" type="INT8U" />
-            <arg name="status" type="DlStatus" />
-            <arg name="localStartTime" type="epoch_s" optional="true" />
-            <arg name="localEndTime" type="epoch_s" optional="true" />
-            <arg name="operatingMode" type="DlOperatingMode" optional="true" />
+            <arg name="HolidayIndex" type="INT8U" />
+            <arg name="Status" type="DlStatus" />
+            <arg name="LocalStartTime" type="epoch_s" optional="true" />
+            <arg name="LocalEndTime" type="epoch_s" optional="true" />
+            <arg name="OperatingMode" type="OperatingModeEnum" optional="true" />
         </command>
         <!-- Conformance feature HDSCH - for now optional -->
         <command source="client" code="19" name="ClearHolidaySchedule" optional="true">
             <description>Clears the holiday schedule or all holiday schedules.</description>
             <access op="invoke" role="administer" />
-            <arg name="holidayIndex" type="INT8U" />
+            <arg name="HolidayIndex" type="INT8U" />
         </command>
         <!-- Conformance feature USR - for now optional -->
         <command source="client" code="26" name="SetUser" mustUseTimedInvoke="true" optional="true">
             <description>Set User into the lock.</description>
             <access op="invoke" role="administer" />
-            <arg name="operationType" type="DlDataOperationType" />
-            <arg name="userIndex" type="INT16U" />
-            <arg name="userName" type="CHAR_STRING" isNullable="true" />
-            <arg name="userUniqueId" type="INT32U" isNullable="true" />
-            <arg name="userStatus" type="DlUserStatus" isNullable="true" />
-            <arg name="userType" type="DlUserType" isNullable="true" />
-            <arg name="credentialRule" type="DlCredentialRule" isNullable="true" />
+            <arg name="OperationType" type="DataOperationTypeEnum" />
+            <arg name="UserIndex" type="INT16U" />
+            <arg name="UserName" type="CHAR_STRING" isNullable="true" />
+            <arg name="UserUniqueID" type="INT32U" isNullable="true" />
+            <arg name="UserStatus" type="UserStatusEnum" isNullable="true" />
+            <arg name="UserType" type="UserTypeEnum" isNullable="true" />
+            <arg name="CredentialRule" type="CredentialRuleEnum" isNullable="true" />
         </command>
         <!-- Conformance feature USR - for now optional -->
         <command source="client" code="27" name="GetUser" response="GetUserResponse" optional="true">
             <description>Retrieve User.</description>
             <access op="invoke" role="administer" />
-            <arg name="userIndex" type="INT16U" />
+            <arg name="UserIndex" type="INT16U" />
         </command>
         <!-- Conformance feature USR - for now optional -->
         <command source="server" code="28" name="GetUserResponse" disableDefaultResponse="true" optional="true">
             <description>Returns the User for the specified UserIndex.</description>
             <access op="invoke" role="administer" />
-            <arg name="userIndex" type="INT16U" />
-            <arg name="userName" type="CHAR_STRING" isNullable="true" />
-            <arg name="userUniqueId" type="INT32U" isNullable="true" />
-            <arg name="userStatus" type="DlUserStatus" isNullable="true" />
-            <arg name="userType" type="DlUserType" isNullable="true" />
-            <arg name="credentialRule" type="DlCredentialRule" isNullable="true" />
-            <arg name="credentials" type="DlCredential" array="true" isNullable="true" />
-            <arg name="creatorFabricIndex" type="fabric_idx" isNullable="true" />
-            <arg name="lastModifiedFabricIndex" type="fabric_idx" isNullable="true" />
-            <arg name="nextUserIndex" type="INT16U" isNullable="true" />
+            <arg name="UserIndex" type="INT16U" />
+            <arg name="UserName" type="CHAR_STRING" isNullable="true" />
+            <arg name="UserUniqueID" type="INT32U" isNullable="true" />
+            <arg name="UserStatus" type="UserStatusEnum" isNullable="true" />
+            <arg name="UserType" type="UserTypeEnum" isNullable="true" />
+            <arg name="CredentialRule" type="CredentialRuleEnum" isNullable="true" />
+            <arg name="Credentials" type="CredentialStruct" array="true" isNullable="true" />
+            <arg name="CreatorFabricIndex" type="fabric_idx" isNullable="true" />
+            <arg name="LastModifiedFabricIndex" type="fabric_idx" isNullable="true" />
+            <arg name="NextUserIndex" type="INT16U" isNullable="true" />
         </command>
         <!-- Conformance feature USR - for now optional -->
         <command source="client" code="29" name="ClearUser" mustUseTimedInvoke="true" optional="true">
             <description>Clears a User or all Users.</description>
             <access op="invoke" role="administer" />
-            <arg name="userIndex" type="INT16U" />
+            <arg name="UserIndex" type="INT16U" />
         </command>
         <!-- Conformance feature USR - for now optional -->
         <command source="client" code="34" name="SetCredential" response="SetCredentialResponse" mustUseTimedInvoke="true" optional="true">
             <description>Set a credential (e.g. PIN, RFID, Fingerprint, etc.) into the lock for a new user, existing user, or ProgrammingUser.</description>
             <access op="invoke" role="administer" />
-            <arg name="operationType" type="DlDataOperationType" />
-            <arg name="credential" type="DlCredential" />
-            <arg name="credentialData" type="LONG_OCTET_STRING" />
-            <arg name="userIndex" type="INT16U" isNullable="true" />
-            <arg name="userStatus" type="DlUserStatus" isNullable="true" />
-            <arg name="userType" type="DlUserType" isNullable="true" />
+            <arg name="OperationType" type="DataOperationTypeEnum" />
+            <arg name="Credential" type="CredentialStruct" />
+            <arg name="CredentialData" type="LONG_OCTET_STRING" />
+            <arg name="UserIndex" type="INT16U" isNullable="true" />
+            <arg name="UserStatus" type="UserStatusEnum" isNullable="true" />
+            <arg name="UserType" type="UserTypeEnum" isNullable="true" />
         </command>
         <!-- Conformance feature USR - for now optional -->
         <command source="server" code="35" name="SetCredentialResponse" disableDefaultResponse="true" optional="true">
             <description>Returns the status for setting the specified credential.</description>
             <access op="invoke" role="administer" />
-            <arg name="status" type="DlStatus" />
-            <arg name="userIndex" type="INT16U" isNullable="true" />
-            <arg name="nextCredentialIndex" type="INT16U" isNullable="true" />
+            <arg name="Status" type="DlStatus" />
+            <arg name="UserIndex" type="INT16U" isNullable="true" />
+            <arg name="NextCredentialIndex" type="INT16U" isNullable="true" />
         </command>
         <!-- Conformance feature USR - for now optional -->
         <command source="client" code="36" name="GetCredentialStatus" response="GetCredentialStatusResponse" optional="true">
             <description>Retrieve the status of a particular credential (e.g. PIN, RFID, Fingerprint, etc.) by index.</description>
             <access op="invoke" role="administer" />
-            <arg name="credential" type="DlCredential" />
+            <arg name="Credential" type="CredentialStruct" />
         </command>
         <!-- Conformance feature USR - for now optional -->
         <command source="server" code="37" name="GetCredentialStatusResponse" disableDefaultResponse="true" optional="true">
             <description>Returns the status for the specified credential.</description>
             <access op="invoke" role="administer" />
-            <arg name="credentialExists" type="boolean" />
-            <arg name="userIndex" type="INT16U" isNullable="true" />
-            <arg name="creatorFabricIndex" type="fabric_idx" isNullable="true" />
-            <arg name="lastModifiedFabricIndex" type="fabric_idx" isNullable="true" />
-            <arg name="nextCredentialIndex" type="INT16U" isNullable="true" />
+            <arg name="CredentialExists" type="boolean" />
+            <arg name="UserIndex" type="INT16U" isNullable="true" />
+            <arg name="CreatorFabricIndex" type="fabric_idx" isNullable="true" />
+            <arg name="LastModifiedFabricIndex" type="fabric_idx" isNullable="true" />
+            <arg name="NextCredentialIndex" type="INT16U" isNullable="true" />
         </command>
         <!-- Conformance feature USR - for now optional -->
         <command source="client" code="38" name="ClearCredential" mustUseTimedInvoke="true" optional="true">
             <description>Clear one, one type, or all credentials except ProgrammingPIN credential.</description>
             <access op="invoke" role="administer" />
-            <arg name="credential" type="DlCredential" isNullable="true"/>
+            <arg name="Credential" type="CredentialStruct" isNullable="true"/>
         </command>
 
 
         <!-- Events -->
         <event side="server" code="0" name="DoorLockAlarm" priority="critical">
             <description>The door lock cluster provides several alarms which can be sent when there is a critical state on the door lock.</description>
-            <field id="0" name="AlarmCode" type="DlAlarmCode" />
+            <field id="0" name="AlarmCode" type="AlarmCodeEnum" />
         </event>
         <!-- Conformance feature DPS - for now optional -->
         <event side="server" code="1" name="DoorStateChange" priority="critical" optional="true">
             <description>The door lock server sends out a DoorStateChange event when the door lock door state changes.</description>
-            <field id="0" name="DoorState" type="DlDoorState" />
+            <field id="0" name="DoorState" type="DoorStateEnum" />
         </event>
         <event side="server" code="2" name="LockOperation" priority="critical">
             <description>The door lock server sends out a LockOperation event when the event is triggered by the various lock operation sources.</description>
-            <field id="0" name="LockOperationType" type="DlLockOperationType" />
-            <field id="1" name="OperationSource" type="DlOperationSource" />
+            <field id="0" name="LockOperationType" type="LockOperationTypeEnum" />
+            <field id="1" name="OperationSource" type="OperationSourceEnum" />
             <field id="2" name="UserIndex" type="INT16U" isNullable="true" />
             <field id="3" name="FabricIndex" type="fabric_idx" isNullable="true" />
             <field id="4" name="SourceNode" type="NODE_ID" isNullable="true" />
             <!-- Conformance feature [USR] - for now optional -->
-            <field id="5" name="Credentials" type="DlCredential" array="true" isNullable="true" optional="true" />
+            <field id="5" name="Credentials" type="CredentialStruct" array="true" isNullable="true" optional="true" />
         </event>
         <event side="server" code="3" name="LockOperationError" priority="critical">
             <description>The door lock server sends out a LockOperationError event when a lock operation fails for various reasons.</description>
-            <field id="0" name="LockOperationType" type="DlLockOperationType" />
-            <field id="1" name="OperationSource" type="DlOperationSource" />
-            <field id="2" name="OperationError" type="DlOperationError" />
+            <field id="0" name="LockOperationType" type="LockOperationTypeEnum" />
+            <field id="1" name="OperationSource" type="OperationSourceEnum" />
+            <field id="2" name="OperationError" type="OperationErrorEnum" />
             <field id="3" name="UserIndex" type="INT16U" isNullable="true" />
             <field id="4" name="FabricIndex" type="fabric_idx" isNullable="true" />
             <field id="5" name="SourceNode" type="NODE_ID" isNullable="true" />
             <!-- Conformance feature [USR] - for now optional -->
-            <field id="6" name="Credentials" type="DlCredential" array="true" isNullable="true" optional="true" />
+            <field id="6" name="Credentials" type="CredentialStruct" array="true" isNullable="true" optional="true" />
         </event>
         <event side="server" code="4" name="LockUserChange" priority="info">
             <description>The door lock server sends out a LockUserChange event when a lock user, schedule, or credential change has occurred.</description>
-            <field id="0" name="LockDataType" type="DlLockDataType" />
-            <field id="1" name="DataOperationType" type="DlDataOperationType" />
-            <field id="2" name="OperationSource" type="DlOperationSource" />
+            <field id="0" name="LockDataType" type="LockDataTypeEnum" />
+            <field id="1" name="DataOperationType" type="DataOperationTypeEnum" />
+            <field id="2" name="OperationSource" type="OperationSourceEnum" />
             <field id="3" name="UserIndex" type="INT16U" isNullable="true" />
             <field id="4" name="FabricIndex" type="fabric_idx" isNullable="true" />
             <field id="5" name="SourceNode" type="NODE_ID" isNullable="true" />
@@ -446,7 +446,7 @@ limitations under the License.
 
 
     <!-- Cluster data types -->
-    <enum name="DlAlarmCode" type="ENUM8">
+    <enum name="AlarmCodeEnum" type="ENUM8">
         <cluster code="0x0101" />
         <item value="0" name="LockJammed" />
         <item value="1" name="LockFactoryReset" />
@@ -458,10 +458,10 @@ limitations under the License.
         <item value="8" name="ForcedUser" />
     </enum>
 
-    <enum name="DlCredentialRule" type="ENUM8">
+    <enum name="CredentialRuleEnum" type="ENUM8">
         <cluster code="0x0101" />
         <item value="0" name="Single" />
-        <item value="1" name="Double" />
+        <item value="1" name="Dual" />
         <item value="2" name="Tri" />
     </enum>
 
@@ -472,13 +472,13 @@ limitations under the License.
         <field mask="0x04" name="Tri" />
     </bitmap> 
 
-    <struct name="DlCredential">
+    <struct name="CredentialStruct">
         <cluster code="0x0101" />
-        <item name="CredentialType" type="DlCredentialType" />
+        <item name="CredentialType" type="CredentialTypeEnum" />
         <item name="CredentialIndex" type="INT16U" />
     </struct>
 
-    <enum name="DlCredentialType" type="ENUM8">
+    <enum name="CredentialTypeEnum" type="ENUM8">
         <cluster code="0x0101" />
         <item value="0" name="ProgrammingPIN" />
         <item value="1" name="PIN" />
@@ -488,14 +488,14 @@ limitations under the License.
         <item value="5" name="Face" />
     </enum>
 
-    <enum name="DlDataOperationType" type="ENUM8">
+    <enum name="DataOperationTypeEnum" type="ENUM8">
         <cluster code="0x0101" />
         <item value="0" name="Add" />
         <item value="1" name="Clear" />
         <item value="2" name="Modify" />
     </enum>
 
-    <bitmap name="DlDaysMaskMap" type="BITMAP8">
+    <bitmap name="DaysMaskMap" type="BITMAP8">
         <cluster code="0x0101" />
         <field mask="0x01" name="Sunday" />
         <field mask="0x02" name="Monday" />
@@ -506,7 +506,7 @@ limitations under the License.
         <field mask="0x40" name="Saturday" />
     </bitmap>
 
-    <enum name="DlDoorState" type="ENUM8">
+    <enum name="DoorStateEnum" type="ENUM8">
         <cluster code="0x0101" />
         <item value="0" name="DoorOpen" />
         <item value="1" name="DoorClosed" />
@@ -516,7 +516,7 @@ limitations under the License.
         <item value="5" name="DoorAjar" />
     </enum>
 
-    <enum name="DlLockDataType" type="ENUM8">
+    <enum name="LockDataTypeEnum" type="ENUM8">
         <cluster code="0x0101" />
         <item value="0" name="Unspecified" />
         <item value="1" name="ProgrammingCode" />
@@ -529,7 +529,7 @@ limitations under the License.
         <item value="8" name="Fingerprint" />
     </enum>
 
-    <enum name="DlLockOperationType" type="ENUM8">
+    <enum name="LockOperationTypeEnum" type="ENUM8">
         <cluster code="0x0101" />
         <item value="0" name="Lock" />
         <item value="1" name="Unlock" />
@@ -537,7 +537,7 @@ limitations under the License.
         <item value="3" name="ForcedUserEvent" />
     </enum>
 
-    <enum name="DlOperationError" type="ENUM8">
+    <enum name="OperationErrorEnum" type="ENUM8">
         <cluster code="0x0101" />
         <item value="0" name="Unspecified" />
         <item value="1" name="InvalidCredential" />
@@ -546,7 +546,7 @@ limitations under the License.
         <item value="4" name="InsufficientBattery" />
     </enum>
 
-    <enum name="DlOperatingMode" type="ENUM8">
+    <enum name="OperatingModeEnum" type="ENUM8">
         <cluster code="0x0101" />
         <item value="0" name="Normal" />
         <item value="1" name="Vacation" />
@@ -555,7 +555,7 @@ limitations under the License.
         <item value="4" name="Passage" />
     </enum>
 
-    <enum name="DlOperationSource" type="ENUM8">
+    <enum name="OperationSourceEnum" type="ENUM8">
         <cluster code="0x0101" />
         <item value="0" name="Unspecified" />
         <item value="1" name="Manual" />
@@ -569,14 +569,14 @@ limitations under the License.
         <item value="9" name="Biometric" />
     </enum>
 
-    <enum name="DlUserStatus" type="ENUM8">
+    <enum name="UserStatusEnum" type="ENUM8">
         <cluster code="0x0101" />
         <item value="0" name="Available" />
         <item value="1" name="OccupiedEnabled" />
         <item value="3" name="OccupiedDisabled" />
     </enum>
 
-    <enum name="DlUserType" type="ENUM8">
+    <enum name="UserTypeEnum" type="ENUM8">
         <cluster code="0x0101" />
         <item value="0" name="UnrestrictedUser" />
         <item value="1" name="YearDayScheduleUser" />
@@ -595,7 +595,7 @@ limitations under the License.
     <!-- LockState Attribute Values -->
     <enum name="DlLockState" type="ENUM8">
         <cluster code="0x0101" />
-        <item value="0" name="NotFullyLocked" />
+        <item value="0" name="Not Fully Locked" />
         <item value="1" name="Locked" />
         <item value="2" name="Unlocked" />
     </enum>
@@ -603,15 +603,15 @@ limitations under the License.
     <!-- LockType Attribute Values -->
     <enum name="DlLockType" type="ENUM8">
         <cluster code="0x0101" />
-        <item value="0" name="DeadBolt" />
+        <item value="0" name="Dead bolt" />
         <item value="1" name="Magnetic" />
         <item value="2" name="Other" />
         <item value="3" name="Mortise" />
         <item value="4" name="Rim" />
-        <item value="5" name="LatchBolt" />
-        <item value="6" name="CylindricalLock" />
-        <item value="7" name="TubularLock" />
-        <item value="8" name="InterconnectedLock" />
+        <item value="5" name="Latch Bolt" />
+        <item value="6" name="Cylindrical Lock" />
+        <item value="7" name="Tubular Lock" />
+        <item value="8" name="Interconnected Lock" />
         <item value="9" name="Dead Latch" />
         <item value="10" name="Door Furniture" />
     </enum>
@@ -750,17 +750,17 @@ limitations under the License.
 
     <bitmap name="DoorLockFeature" type="BITMAP32">
         <cluster code="0x0101" />
-        <field name="PINCredentials" mask="0x01" />
-        <field name="RFIDCredentials" mask="0x02" />
-        <field name="FingerCredentials" mask="0x04" />
+        <field name="PIN Credential" mask="0x01" />
+        <field name="RFID Credential" mask="0x02" />
+        <field name="Finger Credentials" mask="0x04" />
         <field name="Logging" mask="0x08" />
-        <field name="WeekDaySchedules" mask="0x10" />
-        <field name="DoorPositionSensor" mask="0x20" />
-        <field name="FaceCredentials" mask="0x40" />
-        <field name="CredentialsOTA" mask="0x80" />
-        <field name="UsersManagement" mask="0x100" />
-        <field name="Notifications" mask="0x200" />
-        <field name="YearDaySchedules" mask="0x400" />
-        <field name="HolidaySchedules" mask="0x800" />
+        <field name="Week Day Access Schedules" mask="0x10" />
+        <field name="Door Position Sensor" mask="0x20" />
+        <field name="Face Credentials" mask="0x40" />
+        <field name="Credentials Over-the-Air Access" mask="0x80" />
+        <field name="User" mask="0x100" />
+        <field name="Notification" mask="0x200" />
+        <field name="Year Day Access Schedules" mask="0x400" />
+        <field name="Holiday Schedules" mask="0x800" />
     </bitmap>
 </configurator>
diff --git a/src/app/zap-templates/zcl/data-model/chip/ethernet-network-diagnostics-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/ethernet-network-diagnostics-cluster.xml
index ff3e64b279884b..5958f7cdb4ccd3 100644
--- a/src/app/zap-templates/zcl/data-model/chip/ethernet-network-diagnostics-cluster.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/ethernet-network-diagnostics-cluster.xml
@@ -16,7 +16,7 @@ limitations under the License.
 -->
 <configurator>
   <domain name="CHIP"/>
-  <enum name="PHYRate" type="ENUM8">
+  <enum name="PHYRateEnum" type="ENUM8">
     <cluster code="0x0037"/>
     <item name="Rate10M" value="0x00"/>
     <item name="Rate100M" value="0x01"/>
@@ -35,7 +35,7 @@ limitations under the License.
     <code>0x0037</code>
     <define>ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER</define>
     <description>The Ethernet Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems.</description>
-    <attribute side="server" code="0x00" define="PHY_RATE" type="PHYRate" writable="false" isNullable="true" optional="true">PHYRate</attribute>
+    <attribute side="server" code="0x00" define="PHY_RATE" type="PHYRateEnum" writable="false" isNullable="true" optional="true">PHYRate</attribute>
     <attribute side="server" code="0x01" define="FULL_DUPLEX" type="BOOLEAN" min="0x00" max="0x01" writable="false" isNullable="true" optional="true">FullDuplex</attribute>
     <attribute side="server" code="0x02" define="PACKET_RX_COUNT" type="INT64U" min="0x0000000000000000" max="0xFFFFFFFFFFFFFFFF" writable="false" default="0x0000000000000000" optional="true">PacketRxCount</attribute>
     <attribute side="server" code="0x03" define="PACKET_TX_COUNT" type="INT64U" min="0x0000000000000000" max="0xFFFFFFFFFFFFFFFF" writable="false" default="0x0000000000000000" optional="true">PacketTxCount</attribute>
diff --git a/src/app/zap-templates/zcl/data-model/chip/general-diagnostics-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/general-diagnostics-cluster.xml
index d643585c80162c..9eb0036b3ee6f8 100644
--- a/src/app/zap-templates/zcl/data-model/chip/general-diagnostics-cluster.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/general-diagnostics-cluster.xml
@@ -16,7 +16,7 @@ limitations under the License.
 -->
 <configurator>
   <domain name="CHIP"/>
-  <enum name="HardwareFault" type="ENUM8">
+  <enum name="HardwareFaultEnum" type="ENUM8">
     <cluster code="0x0033"/>
     <item name="Unspecified" value="0x00"/>
     <item name="Radio" value="0x01"/>
@@ -30,7 +30,7 @@ limitations under the License.
     <item name="NonVolatileMemoryError" value="0x09"/>
     <item name="TamperDetected" value="0x0A"/>
   </enum>
-  <enum name="RadioFault" type="ENUM8">
+  <enum name="RadioFaultEnum" type="ENUM8">
     <cluster code="0x0033"/>
     <item name="Unspecified" value="0x00"/>
     <item name="WiFiFault" value="0x01"/>
@@ -40,7 +40,7 @@ limitations under the License.
     <item name="BLEFault" value="0x05"/>
     <item name="EthernetFault" value="0x06"/>    
   </enum>
-  <enum name="NetworkFaultType" type="ENUM8">
+  <enum name="NetworkFaultEnum" type="ENUM8">
     <cluster code="0x0033"/>
     <item name="Unspecified" value="0x00"/>
     <item name="HardwareFailure" value="0x01"/>
@@ -57,7 +57,7 @@ limitations under the License.
     <item name="SoftwareUpdateCompleted" value="0x05"/>
     <item name="SoftwareReset" value="0x06"/>
   </enum>  
-  <enum name="InterfaceType" type="ENUM8">
+  <enum name="InterfaceTypeEnum" type="ENUM8">
     <cluster code="0x0033"/>
     <item name="Unspecified" value="0x00"/>
     <item name="WiFi" value="0x01"/>
@@ -75,7 +75,7 @@ limitations under the License.
     <item name="HardwareAddress" type="OCTET_STRING" length="8"/>
     <item name="IPv4Addresses" type="OCTET_STRING" array="true"/>
     <item name="IPv6Addresses" type="OCTET_STRING" array="true"/>
-    <item name="Type" type="InterfaceType"/>
+    <item name="Type" type="InterfaceTypeEnum"/>
   </struct>
   <cluster>
     <domain>General</domain>
@@ -88,9 +88,9 @@ limitations under the License.
     <attribute side="server" code="0x02" define="UP_TIME" type="INT64U" min="0x0000000000000000" max="0xFFFFFFFFFFFFFFFF" writable="false" default="0x0000000000000000" optional="true">UpTime</attribute>
     <attribute side="server" code="0x03" define="TOTAL_OPERATIONAL_HOURS" type="INT32U" min="0x00000000" max="0xFFFFFFFF" writable="false" default="0x00000000" optional="true">TotalOperationalHours</attribute>
     <attribute side="server" code="0x04" define="BOOT_REASONS" type="BootReasonEnum" writable="false" optional="true">BootReason</attribute>
-    <attribute side="server" code="0x05" define="ACTIVE_HARDWARE_FAULTS" type="ARRAY" entryType="HardwareFault" writable="false" optional="true">ActiveHardwareFaults</attribute>
-    <attribute side="server" code="0x06" define="ACTIVE_RADIO_FAULTS" type="ARRAY" entryType="RadioFault" writable="false" optional="true">ActiveRadioFaults</attribute>
-    <attribute side="server" code="0x07" define="ACTIVE_NETWORK_FAULTS" type="ARRAY" entryType="NetworkFaultType" writable="false" optional="true">ActiveNetworkFaults</attribute>
+    <attribute side="server" code="0x05" define="ACTIVE_HARDWARE_FAULTS" type="ARRAY" entryType="HardwareFaultEnum" writable="false" optional="true">ActiveHardwareFaults</attribute>
+    <attribute side="server" code="0x06" define="ACTIVE_RADIO_FAULTS" type="ARRAY" entryType="RadioFaultEnum" writable="false" optional="true">ActiveRadioFaults</attribute>
+    <attribute side="server" code="0x07" define="ACTIVE_NETWORK_FAULTS" type="ARRAY" entryType="NetworkFaultEnum" writable="false" optional="true">ActiveNetworkFaults</attribute>
     <attribute side="server" code="0x08" define="TEST_EVENT_TRIGGERS_ENABLED" type="BOOLEAN" writable="false" optional="false">TestEventTriggersEnabled</attribute>
 
     <command source="client" code="0x00" name="TestEventTrigger" optional="false">
@@ -102,22 +102,22 @@ limitations under the License.
 
     <event side="server" code="0x00" name="HardwareFaultChange" priority="critical" optional="true">
       <description>Indicate a change in the set of hardware faults currently detected by the Node.</description>
-      <field id="0" name="Current" type="HardwareFault" array="true"/>
-      <field id="1" name="Previous" type="HardwareFault" array="true"/>
+      <field id="0" name="Current" type="HardwareFaultEnum" array="true"/>
+      <field id="1" name="Previous" type="HardwareFaultEnum" array="true"/>
     </event>
     <event side="server" code="0x01" name="RadioFaultChange" priority="critical" optional="true">
       <description>Indicate a change in the set of radio faults currently detected by the Node.</description>
-      <field id="0" name="Current" type="RadioFault" array="true"/>
-      <field id="1" name="Previous" type="RadioFault" array="true"/>
+      <field id="0" name="Current" type="RadioFaultEnum" array="true"/>
+      <field id="1" name="Previous" type="RadioFaultEnum" array="true"/>
     </event>
     <event side="server" code="0x02" name="NetworkFaultChange" priority="critical" optional="true">
       <description>Indicate a change in the set of network faults currently detected by the Node.</description>
-      <field id="0" name="Current" type="NetworkFaultType" array="true"/>
-      <field id="1" name="Previous" type="NetworkFaultType" array="true"/>
+      <field id="0" name="Current" type="NetworkFaultEnum" array="true"/>
+      <field id="1" name="Previous" type="NetworkFaultEnum" array="true"/>
     </event>
     <event side="server" code="0x03" name="BootReason" priority="critical" optional="false">
       <description>Indicate the reason that caused the device to start-up.</description>
       <field id="0" name="BootReason" type="BootReasonEnum"/>
-    </event>               
+    </event>
   </cluster>
 </configurator>
diff --git a/src/app/zap-templates/zcl/data-model/chip/pump-configuration-and-control-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/pump-configuration-and-control-cluster.xml
index 0d00dc829a7385..112f30fc8b1e46 100644
--- a/src/app/zap-templates/zcl/data-model/chip/pump-configuration-and-control-cluster.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/pump-configuration-and-control-cluster.xml
@@ -149,4 +149,15 @@ limitations under the License.
     <item name="Automatic" value="0x7"/>
   </enum>
 
+  <bitmap name="PumpFeature" type="BITMAP32">
+    <cluster code="0x0200"/>
+    <field mask="0x01" name="ConstantPressure" />
+    <field mask="0x02" name="CompensatedPressure" />
+    <field mask="0x04" name="ConstantFlow"/>
+    <field mask="0x08" name="ConstantSpeed"/>
+    <field mask="0x10" name="ConstantTemperature"/>
+    <field mask="0x20" name="Automatic"/>
+    <field mask="0x40" name="Local"/>
+  </bitmap>
+
 </configurator>
diff --git a/src/app/zap-templates/zcl/data-model/silabs/ha.xml b/src/app/zap-templates/zcl/data-model/silabs/ha.xml
index e5e830a847337d..e85208e9a6d4e8 100644
--- a/src/app/zap-templates/zcl/data-model/silabs/ha.xml
+++ b/src/app/zap-templates/zcl/data-model/silabs/ha.xml
@@ -349,7 +349,7 @@ limitations under the License.
       <description>
         Move to a specific color temperature.
       </description>
-      <arg name="ColorTemperature" type="INT16U"/>
+      <arg name="ColorTemperatureMireds" type="INT16U"/>
       <arg name="TransitionTime" type="INT16U"/>
       <arg name="OptionsMask" type="BITMAP8"/>
       <arg name="OptionsOverride" type="BITMAP8"/>
diff --git a/src/app/zap-templates/zcl/data-model/silabs/types.xml b/src/app/zap-templates/zcl/data-model/silabs/types.xml
index c7e67ffe5d16ad..4293b31d489dd1 100644
--- a/src/app/zap-templates/zcl/data-model/silabs/types.xml
+++ b/src/app/zap-templates/zcl/data-model/silabs/types.xml
@@ -216,7 +216,7 @@ limitations under the License.
   </enum>
   <enum name="HueMoveMode" type="ENUM8">
     <cluster code="0x0300"/>
-    <item name="stop" value="0x0"/>
+    <item name="Stop" value="0x0"/>
     <item name="Up" value="0x1"/>
     <item name="Down" value="0x3"/>
   </enum>
@@ -227,7 +227,7 @@ limitations under the License.
   </enum>
   <enum name="SaturationMoveMode" type="ENUM8">
     <cluster code="0x0300"/>
-    <item name="stop" value="0x0"/>
+    <item name="Stop" value="0x0"/>
     <item name="Up" value="0x1"/>
     <item name="Down" value="0x3"/>
   </enum>
diff --git a/src/app/zap-templates/zcl/zcl-with-test-extensions.json b/src/app/zap-templates/zcl/zcl-with-test-extensions.json
index e265c5f9a00222..5d2b71245f2d31 100644
--- a/src/app/zap-templates/zcl/zcl-with-test-extensions.json
+++ b/src/app/zap-templates/zcl/zcl-with-test-extensions.json
@@ -108,7 +108,7 @@
             "TargetsPerAccessControlEntry",
             "AccessControlEntriesPerFabric"
         ],
-        "AdministratorCommissioning": [
+        "Administrator Commissioning": [
             "WindowStatus",
             "AdminFabricIndex",
             "AdminVendorId"
diff --git a/src/app/zap-templates/zcl/zcl.json b/src/app/zap-templates/zcl/zcl.json
index 2f106b8eab2fa5..2208625738e146 100644
--- a/src/app/zap-templates/zcl/zcl.json
+++ b/src/app/zap-templates/zcl/zcl.json
@@ -102,7 +102,7 @@
             "TargetsPerAccessControlEntry",
             "AccessControlEntriesPerFabric"
         ],
-        "AdministratorCommissioning": [
+        "Administrator Commissioning": [
             "WindowStatus",
             "AdminFabricIndex",
             "AdminVendorId"
diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter
index f6a67bc58d9a60..803653bdcd569e 100644
--- a/src/controller/data_model/controller-clusters.matter
+++ b/src/controller/data_model/controller-clusters.matter
@@ -1299,7 +1299,7 @@ client cluster GeneralDiagnostics = 51 {
     kSoftwareReset = 6;
   }
 
-  enum HardwareFault : ENUM8 {
+  enum HardwareFaultEnum : ENUM8 {
     kUnspecified = 0;
     kRadio = 1;
     kSensor = 2;
@@ -1313,7 +1313,7 @@ client cluster GeneralDiagnostics = 51 {
     kTamperDetected = 10;
   }
 
-  enum InterfaceType : ENUM8 {
+  enum InterfaceTypeEnum : ENUM8 {
     kUnspecified = 0;
     kWiFi = 1;
     kEthernet = 2;
@@ -1321,14 +1321,14 @@ client cluster GeneralDiagnostics = 51 {
     kThread = 4;
   }
 
-  enum NetworkFaultType : ENUM8 {
+  enum NetworkFaultEnum : ENUM8 {
     kUnspecified = 0;
     kHardwareFailure = 1;
     kNetworkJammed = 2;
     kConnectionFailed = 3;
   }
 
-  enum RadioFault : ENUM8 {
+  enum RadioFaultEnum : ENUM8 {
     kUnspecified = 0;
     kWiFiFault = 1;
     kCellularFault = 2;
@@ -1346,22 +1346,22 @@ client cluster GeneralDiagnostics = 51 {
     octet_string<8> hardwareAddress = 4;
     octet_string IPv4Addresses[] = 5;
     octet_string IPv6Addresses[] = 6;
-    InterfaceType type = 7;
+    InterfaceTypeEnum type = 7;
   }
 
   critical event HardwareFaultChange = 0 {
-    HardwareFault current[] = 0;
-    HardwareFault previous[] = 1;
+    HardwareFaultEnum current[] = 0;
+    HardwareFaultEnum previous[] = 1;
   }
 
   critical event RadioFaultChange = 1 {
-    RadioFault current[] = 0;
-    RadioFault previous[] = 1;
+    RadioFaultEnum current[] = 0;
+    RadioFaultEnum previous[] = 1;
   }
 
   critical event NetworkFaultChange = 2 {
-    NetworkFaultType current[] = 0;
-    NetworkFaultType previous[] = 1;
+    NetworkFaultEnum current[] = 0;
+    NetworkFaultEnum previous[] = 1;
   }
 
   critical event BootReason = 3 {
@@ -1373,9 +1373,9 @@ client cluster GeneralDiagnostics = 51 {
   readonly attribute int64u upTime = 2;
   readonly attribute int32u totalOperationalHours = 3;
   readonly attribute BootReasonEnum bootReason = 4;
-  readonly attribute HardwareFault activeHardwareFaults[] = 5;
-  readonly attribute RadioFault activeRadioFaults[] = 6;
-  readonly attribute NetworkFaultType activeNetworkFaults[] = 7;
+  readonly attribute HardwareFaultEnum activeHardwareFaults[] = 5;
+  readonly attribute RadioFaultEnum activeRadioFaults[] = 6;
+  readonly attribute NetworkFaultEnum activeNetworkFaults[] = 7;
   readonly attribute boolean testEventTriggersEnabled = 8;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
@@ -1651,7 +1651,7 @@ client cluster WiFiNetworkDiagnostics = 54 {
 }
 
 client cluster EthernetNetworkDiagnostics = 55 {
-  enum PHYRate : ENUM8 {
+  enum PHYRateEnum : ENUM8 {
     kRate10M = 0;
     kRate100M = 1;
     kRate1G = 2;
@@ -1664,7 +1664,7 @@ client cluster EthernetNetworkDiagnostics = 55 {
     kRate400G = 9;
   }
 
-  readonly attribute nullable PHYRate PHYRate = 0;
+  readonly attribute nullable PHYRateEnum PHYRate = 0;
   readonly attribute nullable boolean fullDuplex = 1;
   readonly attribute int64u packetRxCount = 2;
   readonly attribute int64u packetTxCount = 3;
@@ -1769,7 +1769,7 @@ client cluster Switch = 59 {
 }
 
 client cluster AdministratorCommissioning = 60 {
-  enum CommissioningWindowStatus : ENUM8 {
+  enum CommissioningWindowStatusEnum : ENUM8 {
     kWindowNotOpen = 0;
     kEnhancedWindowOpen = 1;
     kBasicWindowOpen = 2;
@@ -1781,7 +1781,7 @@ client cluster AdministratorCommissioning = 60 {
     kWindowNotOpen = 4;
   }
 
-  readonly attribute CommissioningWindowStatus windowStatus = 0;
+  readonly attribute CommissioningWindowStatusEnum windowStatus = 0;
   readonly attribute nullable fabric_idx adminFabricIndex = 1;
   readonly attribute nullable int16u adminVendorId = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
@@ -2057,7 +2057,7 @@ client cluster ModeSelect = 80 {
 }
 
 client cluster DoorLock = 257 {
-  enum DlAlarmCode : ENUM8 {
+  enum AlarmCodeEnum : ENUM8 {
     kLockJammed = 0;
     kLockFactoryReset = 1;
     kLockRadioPowerCycled = 3;
@@ -2068,13 +2068,13 @@ client cluster DoorLock = 257 {
     kForcedUser = 8;
   }
 
-  enum DlCredentialRule : ENUM8 {
+  enum CredentialRuleEnum : ENUM8 {
     kSingle = 0;
-    kDouble = 1;
+    kDual = 1;
     kTri = 2;
   }
 
-  enum DlCredentialType : ENUM8 {
+  enum CredentialTypeEnum : ENUM8 {
     kProgrammingPIN = 0;
     kPin = 1;
     kRfid = 2;
@@ -2083,40 +2083,12 @@ client cluster DoorLock = 257 {
     kFace = 5;
   }
 
-  enum DlDataOperationType : ENUM8 {
+  enum DataOperationTypeEnum : ENUM8 {
     kAdd = 0;
     kClear = 1;
     kModify = 2;
   }
 
-  enum DlDoorState : ENUM8 {
-    kDoorOpen = 0;
-    kDoorClosed = 1;
-    kDoorJammed = 2;
-    kDoorForcedOpen = 3;
-    kDoorUnspecifiedError = 4;
-    kDoorAjar = 5;
-  }
-
-  enum DlLockDataType : ENUM8 {
-    kUnspecified = 0;
-    kProgrammingCode = 1;
-    kUserIndex = 2;
-    kWeekDaySchedule = 3;
-    kYearDaySchedule = 4;
-    kHolidaySchedule = 5;
-    kPin = 6;
-    kRfid = 7;
-    kFingerprint = 8;
-  }
-
-  enum DlLockOperationType : ENUM8 {
-    kLock = 0;
-    kUnlock = 1;
-    kNonAccessUserEvent = 2;
-    kForcedUserEvent = 3;
-  }
-
   enum DlLockState : ENUM8 {
     kNotFullyLocked = 0;
     kLocked = 1;
@@ -2137,35 +2109,6 @@ client cluster DoorLock = 257 {
     kDoorFurniture = 10;
   }
 
-  enum DlOperatingMode : ENUM8 {
-    kNormal = 0;
-    kVacation = 1;
-    kPrivacy = 2;
-    kNoRemoteLockUnlock = 3;
-    kPassage = 4;
-  }
-
-  enum DlOperationError : ENUM8 {
-    kUnspecified = 0;
-    kInvalidCredential = 1;
-    kDisabledUserDenied = 2;
-    kRestricted = 3;
-    kInsufficientBattery = 4;
-  }
-
-  enum DlOperationSource : ENUM8 {
-    kUnspecified = 0;
-    kManual = 1;
-    kProprietaryRemote = 2;
-    kKeypad = 3;
-    kAuto = 4;
-    kButton = 5;
-    kSchedule = 6;
-    kRemote = 7;
-    kRfid = 8;
-    kBiometric = 9;
-  }
-
   enum DlStatus : ENUM8 {
     kSuccess = 0;
     kFailure = 1;
@@ -2176,25 +2119,6 @@ client cluster DoorLock = 257 {
     kNotFound = 139;
   }
 
-  enum DlUserStatus : ENUM8 {
-    kAvailable = 0;
-    kOccupiedEnabled = 1;
-    kOccupiedDisabled = 3;
-  }
-
-  enum DlUserType : ENUM8 {
-    kUnrestrictedUser = 0;
-    kYearDayScheduleUser = 1;
-    kWeekDayScheduleUser = 2;
-    kProgrammingUser = 3;
-    kNonAccessUser = 4;
-    kForcedUser = 5;
-    kDisposableUser = 6;
-    kExpiringUser = 7;
-    kScheduleRestrictedUser = 8;
-    kRemoteOnlyUser = 9;
-  }
-
   enum DoorLockOperationEventCode : ENUM8 {
     kUnknownOrMfgSpecific = 0;
     kLock = 1;
@@ -2246,19 +2170,83 @@ client cluster DoorLock = 257 {
     kNotSupported = 255;
   }
 
-  bitmap DlCredentialRuleMask : BITMAP8 {
-    kSingle = 0x1;
-    kDual = 0x2;
-    kTri = 0x4;
+  enum DoorStateEnum : ENUM8 {
+    kDoorOpen = 0;
+    kDoorClosed = 1;
+    kDoorJammed = 2;
+    kDoorForcedOpen = 3;
+    kDoorUnspecifiedError = 4;
+    kDoorAjar = 5;
   }
 
-  bitmap DlCredentialRulesSupport : BITMAP8 {
-    kSingle = 0x1;
-    kDual = 0x2;
-    kTri = 0x4;
+  enum LockDataTypeEnum : ENUM8 {
+    kUnspecified = 0;
+    kProgrammingCode = 1;
+    kUserIndex = 2;
+    kWeekDaySchedule = 3;
+    kYearDaySchedule = 4;
+    kHolidaySchedule = 5;
+    kPin = 6;
+    kRfid = 7;
+    kFingerprint = 8;
+  }
+
+  enum LockOperationTypeEnum : ENUM8 {
+    kLock = 0;
+    kUnlock = 1;
+    kNonAccessUserEvent = 2;
+    kForcedUserEvent = 3;
   }
 
-  bitmap DlDaysMaskMap : BITMAP8 {
+  enum OperatingModeEnum : ENUM8 {
+    kNormal = 0;
+    kVacation = 1;
+    kPrivacy = 2;
+    kNoRemoteLockUnlock = 3;
+    kPassage = 4;
+  }
+
+  enum OperationErrorEnum : ENUM8 {
+    kUnspecified = 0;
+    kInvalidCredential = 1;
+    kDisabledUserDenied = 2;
+    kRestricted = 3;
+    kInsufficientBattery = 4;
+  }
+
+  enum OperationSourceEnum : ENUM8 {
+    kUnspecified = 0;
+    kManual = 1;
+    kProprietaryRemote = 2;
+    kKeypad = 3;
+    kAuto = 4;
+    kButton = 5;
+    kSchedule = 6;
+    kRemote = 7;
+    kRfid = 8;
+    kBiometric = 9;
+  }
+
+  enum UserStatusEnum : ENUM8 {
+    kAvailable = 0;
+    kOccupiedEnabled = 1;
+    kOccupiedDisabled = 3;
+  }
+
+  enum UserTypeEnum : ENUM8 {
+    kUnrestrictedUser = 0;
+    kYearDayScheduleUser = 1;
+    kWeekDayScheduleUser = 2;
+    kProgrammingUser = 3;
+    kNonAccessUser = 4;
+    kForcedUser = 5;
+    kDisposableUser = 6;
+    kExpiringUser = 7;
+    kScheduleRestrictedUser = 8;
+    kRemoteOnlyUser = 9;
+  }
+
+  bitmap DaysMaskMap : BITMAP8 {
     kSunday = 0x1;
     kMonday = 0x2;
     kTuesday = 0x4;
@@ -2268,6 +2256,18 @@ client cluster DoorLock = 257 {
     kSaturday = 0x40;
   }
 
+  bitmap DlCredentialRuleMask : BITMAP8 {
+    kSingle = 0x1;
+    kDual = 0x2;
+    kTri = 0x4;
+  }
+
+  bitmap DlCredentialRulesSupport : BITMAP8 {
+    kSingle = 0x1;
+    kDual = 0x2;
+    kTri = 0x4;
+  }
+
   bitmap DlDefaultConfigurationRegister : BITMAP16 {
     kEnableLocalProgrammingEnabled = 0x1;
     kKeypadInterfaceDefaultAccessEnabled = 0x2;
@@ -2372,56 +2372,56 @@ client cluster DoorLock = 257 {
   }
 
   bitmap DoorLockFeature : BITMAP32 {
-    kPINCredentials = 0x1;
-    kRFIDCredentials = 0x2;
+    kPinCredential = 0x1;
+    kRfidCredential = 0x2;
     kFingerCredentials = 0x4;
     kLogging = 0x8;
-    kWeekDaySchedules = 0x10;
+    kWeekDayAccessSchedules = 0x10;
     kDoorPositionSensor = 0x20;
     kFaceCredentials = 0x40;
-    kCredentialsOTA = 0x80;
-    kUsersManagement = 0x100;
-    kNotifications = 0x200;
-    kYearDaySchedules = 0x400;
+    kCredentialsOverTheAirAccess = 0x80;
+    kUser = 0x100;
+    kNotification = 0x200;
+    kYearDayAccessSchedules = 0x400;
     kHolidaySchedules = 0x800;
   }
 
-  struct DlCredential {
-    DlCredentialType credentialType = 0;
+  struct CredentialStruct {
+    CredentialTypeEnum credentialType = 0;
     int16u credentialIndex = 1;
   }
 
   critical event DoorLockAlarm = 0 {
-    DlAlarmCode alarmCode = 0;
+    AlarmCodeEnum alarmCode = 0;
   }
 
   critical event DoorStateChange = 1 {
-    DlDoorState doorState = 0;
+    DoorStateEnum doorState = 0;
   }
 
   critical event LockOperation = 2 {
-    DlLockOperationType lockOperationType = 0;
-    DlOperationSource operationSource = 1;
+    LockOperationTypeEnum lockOperationType = 0;
+    OperationSourceEnum operationSource = 1;
     nullable INT16U userIndex = 2;
     nullable fabric_idx fabricIndex = 3;
     nullable NODE_ID sourceNode = 4;
-    optional nullable DlCredential credentials[] = 5;
+    optional nullable CredentialStruct credentials[] = 5;
   }
 
   critical event LockOperationError = 3 {
-    DlLockOperationType lockOperationType = 0;
-    DlOperationSource operationSource = 1;
-    DlOperationError operationError = 2;
+    LockOperationTypeEnum lockOperationType = 0;
+    OperationSourceEnum operationSource = 1;
+    OperationErrorEnum operationError = 2;
     nullable INT16U userIndex = 3;
     nullable fabric_idx fabricIndex = 4;
     nullable NODE_ID sourceNode = 5;
-    optional nullable DlCredential credentials[] = 6;
+    optional nullable CredentialStruct credentials[] = 6;
   }
 
   info event LockUserChange = 4 {
-    DlLockDataType lockDataType = 0;
-    DlDataOperationType dataOperationType = 1;
-    DlOperationSource operationSource = 2;
+    LockDataTypeEnum lockDataType = 0;
+    DataOperationTypeEnum dataOperationType = 1;
+    OperationSourceEnum operationSource = 2;
     nullable INT16U userIndex = 3;
     nullable fabric_idx fabricIndex = 4;
     nullable NODE_ID sourceNode = 5;
@@ -2431,7 +2431,7 @@ client cluster DoorLock = 257 {
   readonly attribute nullable DlLockState lockState = 0;
   readonly attribute DlLockType lockType = 1;
   readonly attribute boolean actuatorEnabled = 2;
-  readonly attribute nullable DlDoorState doorState = 3;
+  readonly attribute nullable DoorStateEnum doorState = 3;
   readonly attribute int16u numberOfTotalUsersSupported = 17;
   readonly attribute int16u numberOfPINUsersSupported = 18;
   readonly attribute int16u numberOfRFIDUsersSupported = 19;
@@ -2446,7 +2446,7 @@ client cluster DoorLock = 257 {
   attribute access(write: manage) char_string<3> language = 33;
   attribute access(write: manage) int32u autoRelockTime = 35;
   attribute access(write: manage) int8u soundVolume = 36;
-  attribute access(write: manage) DlOperatingMode operatingMode = 37;
+  attribute access(write: manage) OperatingModeEnum operatingMode = 37;
   readonly attribute DlSupportedOperatingModes supportedOperatingModes = 38;
   attribute access(write: manage) boolean enableOneTouchLocking = 41;
   attribute access(write: manage) boolean enablePrivacyModeButton = 43;
@@ -2460,22 +2460,22 @@ client cluster DoorLock = 257 {
   readonly attribute int16u clusterRevision = 65533;
 
   request struct LockDoorRequest {
-    optional OCTET_STRING pinCode = 0;
+    optional OCTET_STRING PINCode = 0;
   }
 
   request struct UnlockDoorRequest {
-    optional OCTET_STRING pinCode = 0;
+    optional OCTET_STRING PINCode = 0;
   }
 
   request struct UnlockWithTimeoutRequest {
     INT16U timeout = 0;
-    optional OCTET_STRING pinCode = 1;
+    optional OCTET_STRING PINCode = 1;
   }
 
   request struct SetWeekDayScheduleRequest {
     INT8U weekDayIndex = 0;
     INT16U userIndex = 1;
-    DlDaysMaskMap daysMask = 2;
+    DaysMaskMap daysMask = 2;
     INT8U startHour = 3;
     INT8U startMinute = 4;
     INT8U endHour = 5;
@@ -2513,7 +2513,7 @@ client cluster DoorLock = 257 {
     INT8U holidayIndex = 0;
     epoch_s localStartTime = 1;
     epoch_s localEndTime = 2;
-    DlOperatingMode operatingMode = 3;
+    OperatingModeEnum operatingMode = 3;
   }
 
   request struct GetHolidayScheduleRequest {
@@ -2525,13 +2525,13 @@ client cluster DoorLock = 257 {
   }
 
   request struct SetUserRequest {
-    DlDataOperationType operationType = 0;
+    DataOperationTypeEnum operationType = 0;
     INT16U userIndex = 1;
     nullable CHAR_STRING userName = 2;
-    nullable INT32U userUniqueId = 3;
-    nullable DlUserStatus userStatus = 4;
-    nullable DlUserType userType = 5;
-    nullable DlCredentialRule credentialRule = 6;
+    nullable INT32U userUniqueID = 3;
+    nullable UserStatusEnum userStatus = 4;
+    nullable UserTypeEnum userType = 5;
+    nullable CredentialRuleEnum credentialRule = 6;
   }
 
   request struct GetUserRequest {
@@ -2543,27 +2543,27 @@ client cluster DoorLock = 257 {
   }
 
   request struct SetCredentialRequest {
-    DlDataOperationType operationType = 0;
-    DlCredential credential = 1;
+    DataOperationTypeEnum operationType = 0;
+    CredentialStruct credential = 1;
     LONG_OCTET_STRING credentialData = 2;
     nullable INT16U userIndex = 3;
-    nullable DlUserStatus userStatus = 4;
-    nullable DlUserType userType = 5;
+    nullable UserStatusEnum userStatus = 4;
+    nullable UserTypeEnum userType = 5;
   }
 
   request struct GetCredentialStatusRequest {
-    DlCredential credential = 0;
+    CredentialStruct credential = 0;
   }
 
   request struct ClearCredentialRequest {
-    nullable DlCredential credential = 0;
+    nullable CredentialStruct credential = 0;
   }
 
   response struct GetWeekDayScheduleResponse = 12 {
     INT8U weekDayIndex = 0;
     INT16U userIndex = 1;
     DlStatus status = 2;
-    optional DlDaysMaskMap daysMask = 3;
+    optional DaysMaskMap daysMask = 3;
     optional INT8U startHour = 4;
     optional INT8U startMinute = 5;
     optional INT8U endHour = 6;
@@ -2583,17 +2583,17 @@ client cluster DoorLock = 257 {
     DlStatus status = 1;
     optional epoch_s localStartTime = 2;
     optional epoch_s localEndTime = 3;
-    optional DlOperatingMode operatingMode = 4;
+    optional OperatingModeEnum operatingMode = 4;
   }
 
   response struct GetUserResponse = 28 {
     INT16U userIndex = 0;
     nullable CHAR_STRING userName = 1;
-    nullable INT32U userUniqueId = 2;
-    nullable DlUserStatus userStatus = 3;
-    nullable DlUserType userType = 4;
-    nullable DlCredentialRule credentialRule = 5;
-    nullable DlCredential credentials[] = 6;
+    nullable INT32U userUniqueID = 2;
+    nullable UserStatusEnum userStatus = 3;
+    nullable UserTypeEnum userType = 4;
+    nullable CredentialRuleEnum credentialRule = 5;
+    nullable CredentialStruct credentials[] = 6;
     nullable fabric_idx creatorFabricIndex = 7;
     nullable fabric_idx lastModifiedFabricIndex = 8;
     nullable INT16U nextUserIndex = 9;
@@ -2811,6 +2811,16 @@ client cluster PumpConfigurationAndControl = 512 {
     kLocal = 3;
   }
 
+  bitmap PumpFeature : BITMAP32 {
+    kConstantPressure = 0x1;
+    kCompensatedPressure = 0x2;
+    kConstantFlow = 0x4;
+    kConstantSpeed = 0x8;
+    kConstantTemperature = 0x10;
+    kAutomatic = 0x20;
+    kLocal = 0x40;
+  }
+
   bitmap PumpStatus : BITMAP16 {
     kDeviceFault = 0x1;
     kSupplyfault = 0x2;
@@ -3295,7 +3305,7 @@ client cluster ColorControl = 768 {
   }
 
   request struct MoveToColorTemperatureRequest {
-    INT16U colorTemperature = 0;
+    INT16U colorTemperatureMireds = 0;
     INT16U transitionTime = 1;
     BITMAP8 optionsMask = 2;
     BITMAP8 optionsOverride = 3;
diff --git a/src/controller/data_model/controller-clusters.zap b/src/controller/data_model/controller-clusters.zap
index 0a53bb511f3699..a7bae8bd29abf7 100644
--- a/src/controller/data_model/controller-clusters.zap
+++ b/src/controller/data_model/controller-clusters.zap
@@ -7217,7 +7217,7 @@
               "code": 0,
               "mfgCode": null,
               "side": "server",
-              "type": "PHYRate",
+              "type": "PHYRateEnum",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -7959,7 +7959,7 @@
           ]
         },
         {
-          "name": "AdministratorCommissioning",
+          "name": "Administrator Commissioning",
           "code": 60,
           "mfgCode": null,
           "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
@@ -8011,7 +8011,7 @@
           ]
         },
         {
-          "name": "AdministratorCommissioning",
+          "name": "Administrator Commissioning",
           "code": 60,
           "mfgCode": null,
           "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER",
@@ -8023,7 +8023,7 @@
               "code": 0,
               "mfgCode": null,
               "side": "server",
-              "type": "CommissioningWindowStatus",
+              "type": "CommissioningWindowStatusEnum",
               "included": 1,
               "storageOption": "External",
               "singleton": 0,
@@ -9607,7 +9607,7 @@
               "code": 3,
               "mfgCode": null,
               "side": "server",
-              "type": "DlDoorState",
+              "type": "DoorStateEnum",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
@@ -9927,7 +9927,7 @@
               "code": 37,
               "mfgCode": null,
               "side": "server",
-              "type": "DlOperatingMode",
+              "type": "OperatingModeEnum",
               "included": 1,
               "storageOption": "RAM",
               "singleton": 0,
diff --git a/src/controller/java/zap-generated/CHIPEventTLVValueDecoder.cpp b/src/controller/java/zap-generated/CHIPEventTLVValueDecoder.cpp
index 3c9086d31ef738..ab27364d930ee3 100644
--- a/src/controller/java/zap-generated/CHIPEventTLVValueDecoder.cpp
+++ b/src/controller/java/zap-generated/CHIPEventTLVValueDecoder.cpp
@@ -2368,23 +2368,24 @@ jobject DecodeEventValue(const app::ConcreteEventPath & aPath, TLV::TLVReader &
                             newElement_2_credentialIndexClassName.c_str(), newElement_2_credentialIndexCtorSignature.c_str(),
                             entry_2.credentialIndex, newElement_2_credentialIndex);
 
-                        jclass dlCredentialStructClass_3;
+                        jclass credentialStructStructClass_3;
                         err = chip::JniReferences::GetInstance().GetClassRef(
-                            env, "chip/devicecontroller/ChipStructs$DoorLockClusterDlCredential", dlCredentialStructClass_3);
+                            env, "chip/devicecontroller/ChipStructs$DoorLockClusterCredentialStruct",
+                            credentialStructStructClass_3);
                         if (err != CHIP_NO_ERROR)
                         {
-                            ChipLogError(Zcl, "Could not find class ChipStructs$DoorLockClusterDlCredential");
+                            ChipLogError(Zcl, "Could not find class ChipStructs$DoorLockClusterCredentialStruct");
                             return nullptr;
                         }
-                        jmethodID dlCredentialStructCtor_3 =
-                            env->GetMethodID(dlCredentialStructClass_3, "<init>", "(Ljava/lang/Integer;Ljava/lang/Integer;)V");
-                        if (dlCredentialStructCtor_3 == nullptr)
+                        jmethodID credentialStructStructCtor_3 =
+                            env->GetMethodID(credentialStructStructClass_3, "<init>", "(Ljava/lang/Integer;Ljava/lang/Integer;)V");
+                        if (credentialStructStructCtor_3 == nullptr)
                         {
-                            ChipLogError(Zcl, "Could not find ChipStructs$DoorLockClusterDlCredential constructor");
+                            ChipLogError(Zcl, "Could not find ChipStructs$DoorLockClusterCredentialStruct constructor");
                             return nullptr;
                         }
 
-                        newElement_2 = env->NewObject(dlCredentialStructClass_3, dlCredentialStructCtor_3,
+                        newElement_2 = env->NewObject(credentialStructStructClass_3, credentialStructStructCtor_3,
                                                       newElement_2_credentialType, newElement_2_credentialIndex);
                         chip::JniReferences::GetInstance().AddToList(value_credentialsInsideOptional, newElement_2);
                     }
@@ -2519,23 +2520,24 @@ jobject DecodeEventValue(const app::ConcreteEventPath & aPath, TLV::TLVReader &
                             newElement_2_credentialIndexClassName.c_str(), newElement_2_credentialIndexCtorSignature.c_str(),
                             entry_2.credentialIndex, newElement_2_credentialIndex);
 
-                        jclass dlCredentialStructClass_3;
+                        jclass credentialStructStructClass_3;
                         err = chip::JniReferences::GetInstance().GetClassRef(
-                            env, "chip/devicecontroller/ChipStructs$DoorLockClusterDlCredential", dlCredentialStructClass_3);
+                            env, "chip/devicecontroller/ChipStructs$DoorLockClusterCredentialStruct",
+                            credentialStructStructClass_3);
                         if (err != CHIP_NO_ERROR)
                         {
-                            ChipLogError(Zcl, "Could not find class ChipStructs$DoorLockClusterDlCredential");
+                            ChipLogError(Zcl, "Could not find class ChipStructs$DoorLockClusterCredentialStruct");
                             return nullptr;
                         }
-                        jmethodID dlCredentialStructCtor_3 =
-                            env->GetMethodID(dlCredentialStructClass_3, "<init>", "(Ljava/lang/Integer;Ljava/lang/Integer;)V");
-                        if (dlCredentialStructCtor_3 == nullptr)
+                        jmethodID credentialStructStructCtor_3 =
+                            env->GetMethodID(credentialStructStructClass_3, "<init>", "(Ljava/lang/Integer;Ljava/lang/Integer;)V");
+                        if (credentialStructStructCtor_3 == nullptr)
                         {
-                            ChipLogError(Zcl, "Could not find ChipStructs$DoorLockClusterDlCredential constructor");
+                            ChipLogError(Zcl, "Could not find ChipStructs$DoorLockClusterCredentialStruct constructor");
                             return nullptr;
                         }
 
-                        newElement_2 = env->NewObject(dlCredentialStructClass_3, dlCredentialStructCtor_3,
+                        newElement_2 = env->NewObject(credentialStructStructClass_3, credentialStructStructCtor_3,
                                                       newElement_2_credentialType, newElement_2_credentialIndex);
                         chip::JniReferences::GetInstance().AddToList(value_credentialsInsideOptional, newElement_2);
                     }
diff --git a/src/controller/java/zap-generated/CHIPInvokeCallbacks.cpp b/src/controller/java/zap-generated/CHIPInvokeCallbacks.cpp
index 0da0bfa0ab2f95..bd7e31c87047ac 100644
--- a/src/controller/java/zap-generated/CHIPInvokeCallbacks.cpp
+++ b/src/controller/java/zap-generated/CHIPInvokeCallbacks.cpp
@@ -2393,99 +2393,99 @@ void CHIPDoorLockClusterGetWeekDayScheduleResponseCallback::CallbackFn(
         &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error invoking Java callback: %s", ErrorStr(err)));
 
-    jobject weekDayIndex;
-    std::string weekDayIndexClassName     = "java/lang/Integer";
-    std::string weekDayIndexCtorSignature = "(I)V";
-    chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(weekDayIndexClassName.c_str(), weekDayIndexCtorSignature.c_str(),
-                                                                  dataResponse.weekDayIndex, weekDayIndex);
-    jobject userIndex;
-    std::string userIndexClassName     = "java/lang/Integer";
-    std::string userIndexCtorSignature = "(I)V";
-    chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(userIndexClassName.c_str(), userIndexCtorSignature.c_str(),
-                                                                   dataResponse.userIndex, userIndex);
-    jobject status;
-    std::string statusClassName     = "java/lang/Integer";
-    std::string statusCtorSignature = "(I)V";
-    chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(statusClassName.c_str(), statusCtorSignature.c_str(),
-                                                                  static_cast<uint8_t>(dataResponse.status), status);
-    jobject daysMask;
+    jobject WeekDayIndex;
+    std::string WeekDayIndexClassName     = "java/lang/Integer";
+    std::string WeekDayIndexCtorSignature = "(I)V";
+    chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(WeekDayIndexClassName.c_str(), WeekDayIndexCtorSignature.c_str(),
+                                                                  dataResponse.weekDayIndex, WeekDayIndex);
+    jobject UserIndex;
+    std::string UserIndexClassName     = "java/lang/Integer";
+    std::string UserIndexCtorSignature = "(I)V";
+    chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(UserIndexClassName.c_str(), UserIndexCtorSignature.c_str(),
+                                                                   dataResponse.userIndex, UserIndex);
+    jobject Status;
+    std::string StatusClassName     = "java/lang/Integer";
+    std::string StatusCtorSignature = "(I)V";
+    chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(StatusClassName.c_str(), StatusCtorSignature.c_str(),
+                                                                  static_cast<uint8_t>(dataResponse.status), Status);
+    jobject DaysMask;
     if (!dataResponse.daysMask.HasValue())
     {
-        chip::JniReferences::GetInstance().CreateOptional(nullptr, daysMask);
+        chip::JniReferences::GetInstance().CreateOptional(nullptr, DaysMask);
     }
     else
     {
-        jobject daysMaskInsideOptional;
-        std::string daysMaskInsideOptionalClassName     = "java/lang/Integer";
-        std::string daysMaskInsideOptionalCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(daysMaskInsideOptionalClassName.c_str(),
-                                                                      daysMaskInsideOptionalCtorSignature.c_str(),
-                                                                      dataResponse.daysMask.Value().Raw(), daysMaskInsideOptional);
-        chip::JniReferences::GetInstance().CreateOptional(daysMaskInsideOptional, daysMask);
+        jobject DaysMaskInsideOptional;
+        std::string DaysMaskInsideOptionalClassName     = "java/lang/Integer";
+        std::string DaysMaskInsideOptionalCtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(DaysMaskInsideOptionalClassName.c_str(),
+                                                                      DaysMaskInsideOptionalCtorSignature.c_str(),
+                                                                      dataResponse.daysMask.Value().Raw(), DaysMaskInsideOptional);
+        chip::JniReferences::GetInstance().CreateOptional(DaysMaskInsideOptional, DaysMask);
     }
-    jobject startHour;
+    jobject StartHour;
     if (!dataResponse.startHour.HasValue())
     {
-        chip::JniReferences::GetInstance().CreateOptional(nullptr, startHour);
+        chip::JniReferences::GetInstance().CreateOptional(nullptr, StartHour);
     }
     else
     {
-        jobject startHourInsideOptional;
-        std::string startHourInsideOptionalClassName     = "java/lang/Integer";
-        std::string startHourInsideOptionalCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(startHourInsideOptionalClassName.c_str(),
-                                                                      startHourInsideOptionalCtorSignature.c_str(),
-                                                                      dataResponse.startHour.Value(), startHourInsideOptional);
-        chip::JniReferences::GetInstance().CreateOptional(startHourInsideOptional, startHour);
+        jobject StartHourInsideOptional;
+        std::string StartHourInsideOptionalClassName     = "java/lang/Integer";
+        std::string StartHourInsideOptionalCtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(StartHourInsideOptionalClassName.c_str(),
+                                                                      StartHourInsideOptionalCtorSignature.c_str(),
+                                                                      dataResponse.startHour.Value(), StartHourInsideOptional);
+        chip::JniReferences::GetInstance().CreateOptional(StartHourInsideOptional, StartHour);
     }
-    jobject startMinute;
+    jobject StartMinute;
     if (!dataResponse.startMinute.HasValue())
     {
-        chip::JniReferences::GetInstance().CreateOptional(nullptr, startMinute);
+        chip::JniReferences::GetInstance().CreateOptional(nullptr, StartMinute);
     }
     else
     {
-        jobject startMinuteInsideOptional;
-        std::string startMinuteInsideOptionalClassName     = "java/lang/Integer";
-        std::string startMinuteInsideOptionalCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(startMinuteInsideOptionalClassName.c_str(),
-                                                                      startMinuteInsideOptionalCtorSignature.c_str(),
-                                                                      dataResponse.startMinute.Value(), startMinuteInsideOptional);
-        chip::JniReferences::GetInstance().CreateOptional(startMinuteInsideOptional, startMinute);
+        jobject StartMinuteInsideOptional;
+        std::string StartMinuteInsideOptionalClassName     = "java/lang/Integer";
+        std::string StartMinuteInsideOptionalCtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(StartMinuteInsideOptionalClassName.c_str(),
+                                                                      StartMinuteInsideOptionalCtorSignature.c_str(),
+                                                                      dataResponse.startMinute.Value(), StartMinuteInsideOptional);
+        chip::JniReferences::GetInstance().CreateOptional(StartMinuteInsideOptional, StartMinute);
     }
-    jobject endHour;
+    jobject EndHour;
     if (!dataResponse.endHour.HasValue())
     {
-        chip::JniReferences::GetInstance().CreateOptional(nullptr, endHour);
+        chip::JniReferences::GetInstance().CreateOptional(nullptr, EndHour);
     }
     else
     {
-        jobject endHourInsideOptional;
-        std::string endHourInsideOptionalClassName     = "java/lang/Integer";
-        std::string endHourInsideOptionalCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(endHourInsideOptionalClassName.c_str(),
-                                                                      endHourInsideOptionalCtorSignature.c_str(),
-                                                                      dataResponse.endHour.Value(), endHourInsideOptional);
-        chip::JniReferences::GetInstance().CreateOptional(endHourInsideOptional, endHour);
+        jobject EndHourInsideOptional;
+        std::string EndHourInsideOptionalClassName     = "java/lang/Integer";
+        std::string EndHourInsideOptionalCtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(EndHourInsideOptionalClassName.c_str(),
+                                                                      EndHourInsideOptionalCtorSignature.c_str(),
+                                                                      dataResponse.endHour.Value(), EndHourInsideOptional);
+        chip::JniReferences::GetInstance().CreateOptional(EndHourInsideOptional, EndHour);
     }
-    jobject endMinute;
+    jobject EndMinute;
     if (!dataResponse.endMinute.HasValue())
     {
-        chip::JniReferences::GetInstance().CreateOptional(nullptr, endMinute);
+        chip::JniReferences::GetInstance().CreateOptional(nullptr, EndMinute);
     }
     else
     {
-        jobject endMinuteInsideOptional;
-        std::string endMinuteInsideOptionalClassName     = "java/lang/Integer";
-        std::string endMinuteInsideOptionalCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(endMinuteInsideOptionalClassName.c_str(),
-                                                                      endMinuteInsideOptionalCtorSignature.c_str(),
-                                                                      dataResponse.endMinute.Value(), endMinuteInsideOptional);
-        chip::JniReferences::GetInstance().CreateOptional(endMinuteInsideOptional, endMinute);
+        jobject EndMinuteInsideOptional;
+        std::string EndMinuteInsideOptionalClassName     = "java/lang/Integer";
+        std::string EndMinuteInsideOptionalCtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(EndMinuteInsideOptionalClassName.c_str(),
+                                                                      EndMinuteInsideOptionalCtorSignature.c_str(),
+                                                                      dataResponse.endMinute.Value(), EndMinuteInsideOptional);
+        chip::JniReferences::GetInstance().CreateOptional(EndMinuteInsideOptional, EndMinute);
     }
 
-    env->CallVoidMethod(javaCallbackRef, javaMethod, weekDayIndex, userIndex, status, daysMask, startHour, startMinute, endHour,
-                        endMinute);
+    env->CallVoidMethod(javaCallbackRef, javaMethod, WeekDayIndex, UserIndex, Status, DaysMask, StartHour, StartMinute, EndHour,
+                        EndMinute);
 }
 CHIPDoorLockClusterGetYearDayScheduleResponseCallback::CHIPDoorLockClusterGetYearDayScheduleResponseCallback(jobject javaCallback) :
     Callback::Callback<CHIPDoorLockClusterGetYearDayScheduleResponseCallbackType>(CallbackFn, this)
@@ -2541,53 +2541,53 @@ void CHIPDoorLockClusterGetYearDayScheduleResponseCallback::CallbackFn(
         "(Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/util/Optional;Ljava/util/Optional;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error invoking Java callback: %s", ErrorStr(err)));
 
-    jobject yearDayIndex;
-    std::string yearDayIndexClassName     = "java/lang/Integer";
-    std::string yearDayIndexCtorSignature = "(I)V";
-    chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(yearDayIndexClassName.c_str(), yearDayIndexCtorSignature.c_str(),
-                                                                  dataResponse.yearDayIndex, yearDayIndex);
-    jobject userIndex;
-    std::string userIndexClassName     = "java/lang/Integer";
-    std::string userIndexCtorSignature = "(I)V";
-    chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(userIndexClassName.c_str(), userIndexCtorSignature.c_str(),
-                                                                   dataResponse.userIndex, userIndex);
-    jobject status;
-    std::string statusClassName     = "java/lang/Integer";
-    std::string statusCtorSignature = "(I)V";
-    chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(statusClassName.c_str(), statusCtorSignature.c_str(),
-                                                                  static_cast<uint8_t>(dataResponse.status), status);
-    jobject localStartTime;
+    jobject YearDayIndex;
+    std::string YearDayIndexClassName     = "java/lang/Integer";
+    std::string YearDayIndexCtorSignature = "(I)V";
+    chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(YearDayIndexClassName.c_str(), YearDayIndexCtorSignature.c_str(),
+                                                                  dataResponse.yearDayIndex, YearDayIndex);
+    jobject UserIndex;
+    std::string UserIndexClassName     = "java/lang/Integer";
+    std::string UserIndexCtorSignature = "(I)V";
+    chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(UserIndexClassName.c_str(), UserIndexCtorSignature.c_str(),
+                                                                   dataResponse.userIndex, UserIndex);
+    jobject Status;
+    std::string StatusClassName     = "java/lang/Integer";
+    std::string StatusCtorSignature = "(I)V";
+    chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(StatusClassName.c_str(), StatusCtorSignature.c_str(),
+                                                                  static_cast<uint8_t>(dataResponse.status), Status);
+    jobject LocalStartTime;
     if (!dataResponse.localStartTime.HasValue())
     {
-        chip::JniReferences::GetInstance().CreateOptional(nullptr, localStartTime);
+        chip::JniReferences::GetInstance().CreateOptional(nullptr, LocalStartTime);
     }
     else
     {
-        jobject localStartTimeInsideOptional;
-        std::string localStartTimeInsideOptionalClassName     = "java/lang/Long";
-        std::string localStartTimeInsideOptionalCtorSignature = "(J)V";
+        jobject LocalStartTimeInsideOptional;
+        std::string LocalStartTimeInsideOptionalClassName     = "java/lang/Long";
+        std::string LocalStartTimeInsideOptionalCtorSignature = "(J)V";
         chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
-            localStartTimeInsideOptionalClassName.c_str(), localStartTimeInsideOptionalCtorSignature.c_str(),
-            dataResponse.localStartTime.Value(), localStartTimeInsideOptional);
-        chip::JniReferences::GetInstance().CreateOptional(localStartTimeInsideOptional, localStartTime);
+            LocalStartTimeInsideOptionalClassName.c_str(), LocalStartTimeInsideOptionalCtorSignature.c_str(),
+            dataResponse.localStartTime.Value(), LocalStartTimeInsideOptional);
+        chip::JniReferences::GetInstance().CreateOptional(LocalStartTimeInsideOptional, LocalStartTime);
     }
-    jobject localEndTime;
+    jobject LocalEndTime;
     if (!dataResponse.localEndTime.HasValue())
     {
-        chip::JniReferences::GetInstance().CreateOptional(nullptr, localEndTime);
+        chip::JniReferences::GetInstance().CreateOptional(nullptr, LocalEndTime);
     }
     else
     {
-        jobject localEndTimeInsideOptional;
-        std::string localEndTimeInsideOptionalClassName     = "java/lang/Long";
-        std::string localEndTimeInsideOptionalCtorSignature = "(J)V";
+        jobject LocalEndTimeInsideOptional;
+        std::string LocalEndTimeInsideOptionalClassName     = "java/lang/Long";
+        std::string LocalEndTimeInsideOptionalCtorSignature = "(J)V";
         chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
-            localEndTimeInsideOptionalClassName.c_str(), localEndTimeInsideOptionalCtorSignature.c_str(),
-            dataResponse.localEndTime.Value(), localEndTimeInsideOptional);
-        chip::JniReferences::GetInstance().CreateOptional(localEndTimeInsideOptional, localEndTime);
+            LocalEndTimeInsideOptionalClassName.c_str(), LocalEndTimeInsideOptionalCtorSignature.c_str(),
+            dataResponse.localEndTime.Value(), LocalEndTimeInsideOptional);
+        chip::JniReferences::GetInstance().CreateOptional(LocalEndTimeInsideOptional, LocalEndTime);
     }
 
-    env->CallVoidMethod(javaCallbackRef, javaMethod, yearDayIndex, userIndex, status, localStartTime, localEndTime);
+    env->CallVoidMethod(javaCallbackRef, javaMethod, YearDayIndex, UserIndex, Status, LocalStartTime, LocalEndTime);
 }
 CHIPDoorLockClusterGetHolidayScheduleResponseCallback::CHIPDoorLockClusterGetHolidayScheduleResponseCallback(jobject javaCallback) :
     Callback::Callback<CHIPDoorLockClusterGetHolidayScheduleResponseCallbackType>(CallbackFn, this)
@@ -2643,63 +2643,63 @@ void CHIPDoorLockClusterGetHolidayScheduleResponseCallback::CallbackFn(
         "(Ljava/lang/Integer;Ljava/lang/Integer;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error invoking Java callback: %s", ErrorStr(err)));
 
-    jobject holidayIndex;
-    std::string holidayIndexClassName     = "java/lang/Integer";
-    std::string holidayIndexCtorSignature = "(I)V";
-    chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(holidayIndexClassName.c_str(), holidayIndexCtorSignature.c_str(),
-                                                                  dataResponse.holidayIndex, holidayIndex);
-    jobject status;
-    std::string statusClassName     = "java/lang/Integer";
-    std::string statusCtorSignature = "(I)V";
-    chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(statusClassName.c_str(), statusCtorSignature.c_str(),
-                                                                  static_cast<uint8_t>(dataResponse.status), status);
-    jobject localStartTime;
+    jobject HolidayIndex;
+    std::string HolidayIndexClassName     = "java/lang/Integer";
+    std::string HolidayIndexCtorSignature = "(I)V";
+    chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(HolidayIndexClassName.c_str(), HolidayIndexCtorSignature.c_str(),
+                                                                  dataResponse.holidayIndex, HolidayIndex);
+    jobject Status;
+    std::string StatusClassName     = "java/lang/Integer";
+    std::string StatusCtorSignature = "(I)V";
+    chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(StatusClassName.c_str(), StatusCtorSignature.c_str(),
+                                                                  static_cast<uint8_t>(dataResponse.status), Status);
+    jobject LocalStartTime;
     if (!dataResponse.localStartTime.HasValue())
     {
-        chip::JniReferences::GetInstance().CreateOptional(nullptr, localStartTime);
+        chip::JniReferences::GetInstance().CreateOptional(nullptr, LocalStartTime);
     }
     else
     {
-        jobject localStartTimeInsideOptional;
-        std::string localStartTimeInsideOptionalClassName     = "java/lang/Long";
-        std::string localStartTimeInsideOptionalCtorSignature = "(J)V";
+        jobject LocalStartTimeInsideOptional;
+        std::string LocalStartTimeInsideOptionalClassName     = "java/lang/Long";
+        std::string LocalStartTimeInsideOptionalCtorSignature = "(J)V";
         chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
-            localStartTimeInsideOptionalClassName.c_str(), localStartTimeInsideOptionalCtorSignature.c_str(),
-            dataResponse.localStartTime.Value(), localStartTimeInsideOptional);
-        chip::JniReferences::GetInstance().CreateOptional(localStartTimeInsideOptional, localStartTime);
+            LocalStartTimeInsideOptionalClassName.c_str(), LocalStartTimeInsideOptionalCtorSignature.c_str(),
+            dataResponse.localStartTime.Value(), LocalStartTimeInsideOptional);
+        chip::JniReferences::GetInstance().CreateOptional(LocalStartTimeInsideOptional, LocalStartTime);
     }
-    jobject localEndTime;
+    jobject LocalEndTime;
     if (!dataResponse.localEndTime.HasValue())
     {
-        chip::JniReferences::GetInstance().CreateOptional(nullptr, localEndTime);
+        chip::JniReferences::GetInstance().CreateOptional(nullptr, LocalEndTime);
     }
     else
     {
-        jobject localEndTimeInsideOptional;
-        std::string localEndTimeInsideOptionalClassName     = "java/lang/Long";
-        std::string localEndTimeInsideOptionalCtorSignature = "(J)V";
+        jobject LocalEndTimeInsideOptional;
+        std::string LocalEndTimeInsideOptionalClassName     = "java/lang/Long";
+        std::string LocalEndTimeInsideOptionalCtorSignature = "(J)V";
         chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
-            localEndTimeInsideOptionalClassName.c_str(), localEndTimeInsideOptionalCtorSignature.c_str(),
-            dataResponse.localEndTime.Value(), localEndTimeInsideOptional);
-        chip::JniReferences::GetInstance().CreateOptional(localEndTimeInsideOptional, localEndTime);
+            LocalEndTimeInsideOptionalClassName.c_str(), LocalEndTimeInsideOptionalCtorSignature.c_str(),
+            dataResponse.localEndTime.Value(), LocalEndTimeInsideOptional);
+        chip::JniReferences::GetInstance().CreateOptional(LocalEndTimeInsideOptional, LocalEndTime);
     }
-    jobject operatingMode;
+    jobject OperatingMode;
     if (!dataResponse.operatingMode.HasValue())
     {
-        chip::JniReferences::GetInstance().CreateOptional(nullptr, operatingMode);
+        chip::JniReferences::GetInstance().CreateOptional(nullptr, OperatingMode);
     }
     else
     {
-        jobject operatingModeInsideOptional;
-        std::string operatingModeInsideOptionalClassName     = "java/lang/Integer";
-        std::string operatingModeInsideOptionalCtorSignature = "(I)V";
+        jobject OperatingModeInsideOptional;
+        std::string OperatingModeInsideOptionalClassName     = "java/lang/Integer";
+        std::string OperatingModeInsideOptionalCtorSignature = "(I)V";
         chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
-            operatingModeInsideOptionalClassName.c_str(), operatingModeInsideOptionalCtorSignature.c_str(),
-            static_cast<uint8_t>(dataResponse.operatingMode.Value()), operatingModeInsideOptional);
-        chip::JniReferences::GetInstance().CreateOptional(operatingModeInsideOptional, operatingMode);
+            OperatingModeInsideOptionalClassName.c_str(), OperatingModeInsideOptionalCtorSignature.c_str(),
+            static_cast<uint8_t>(dataResponse.operatingMode.Value()), OperatingModeInsideOptional);
+        chip::JniReferences::GetInstance().CreateOptional(OperatingModeInsideOptional, OperatingMode);
     }
 
-    env->CallVoidMethod(javaCallbackRef, javaMethod, holidayIndex, status, localStartTime, localEndTime, operatingMode);
+    env->CallVoidMethod(javaCallbackRef, javaMethod, HolidayIndex, Status, LocalStartTime, LocalEndTime, OperatingMode);
 }
 CHIPDoorLockClusterGetUserResponseCallback::CHIPDoorLockClusterGetUserResponseCallback(jobject javaCallback) :
     Callback::Callback<CHIPDoorLockClusterGetUserResponseCallbackType>(CallbackFn, this)
@@ -2756,85 +2756,85 @@ void CHIPDoorLockClusterGetUserResponseCallback::CallbackFn(
         &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error invoking Java callback: %s", ErrorStr(err)));
 
-    jobject userIndex;
-    std::string userIndexClassName     = "java/lang/Integer";
-    std::string userIndexCtorSignature = "(I)V";
-    chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(userIndexClassName.c_str(), userIndexCtorSignature.c_str(),
-                                                                   dataResponse.userIndex, userIndex);
-    jobject userName;
+    jobject UserIndex;
+    std::string UserIndexClassName     = "java/lang/Integer";
+    std::string UserIndexCtorSignature = "(I)V";
+    chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(UserIndexClassName.c_str(), UserIndexCtorSignature.c_str(),
+                                                                   dataResponse.userIndex, UserIndex);
+    jobject UserName;
     if (dataResponse.userName.IsNull())
     {
-        userName = nullptr;
+        UserName = nullptr;
     }
     else
     {
-        userName =
+        UserName =
             env->NewStringUTF(std::string(dataResponse.userName.Value().data(), dataResponse.userName.Value().size()).c_str());
     }
-    jobject userUniqueId;
-    if (dataResponse.userUniqueId.IsNull())
+    jobject UserUniqueID;
+    if (dataResponse.userUniqueID.IsNull())
     {
-        userUniqueId = nullptr;
+        UserUniqueID = nullptr;
     }
     else
     {
-        std::string userUniqueIdClassName     = "java/lang/Long";
-        std::string userUniqueIdCtorSignature = "(J)V";
+        std::string UserUniqueIDClassName     = "java/lang/Long";
+        std::string UserUniqueIDCtorSignature = "(J)V";
         chip::JniReferences::GetInstance().CreateBoxedObject<uint32_t>(
-            userUniqueIdClassName.c_str(), userUniqueIdCtorSignature.c_str(), dataResponse.userUniqueId.Value(), userUniqueId);
+            UserUniqueIDClassName.c_str(), UserUniqueIDCtorSignature.c_str(), dataResponse.userUniqueID.Value(), UserUniqueID);
     }
-    jobject userStatus;
+    jobject UserStatus;
     if (dataResponse.userStatus.IsNull())
     {
-        userStatus = nullptr;
+        UserStatus = nullptr;
     }
     else
     {
-        std::string userStatusClassName     = "java/lang/Integer";
-        std::string userStatusCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(userStatusClassName.c_str(), userStatusCtorSignature.c_str(),
+        std::string UserStatusClassName     = "java/lang/Integer";
+        std::string UserStatusCtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(UserStatusClassName.c_str(), UserStatusCtorSignature.c_str(),
                                                                       static_cast<uint8_t>(dataResponse.userStatus.Value()),
-                                                                      userStatus);
+                                                                      UserStatus);
     }
-    jobject userType;
+    jobject UserType;
     if (dataResponse.userType.IsNull())
     {
-        userType = nullptr;
+        UserType = nullptr;
     }
     else
     {
-        std::string userTypeClassName     = "java/lang/Integer";
-        std::string userTypeCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(userTypeClassName.c_str(), userTypeCtorSignature.c_str(),
+        std::string UserTypeClassName     = "java/lang/Integer";
+        std::string UserTypeCtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(UserTypeClassName.c_str(), UserTypeCtorSignature.c_str(),
                                                                       static_cast<uint8_t>(dataResponse.userType.Value()),
-                                                                      userType);
+                                                                      UserType);
     }
-    jobject credentialRule;
+    jobject CredentialRule;
     if (dataResponse.credentialRule.IsNull())
     {
-        credentialRule = nullptr;
+        CredentialRule = nullptr;
     }
     else
     {
-        std::string credentialRuleClassName     = "java/lang/Integer";
-        std::string credentialRuleCtorSignature = "(I)V";
+        std::string CredentialRuleClassName     = "java/lang/Integer";
+        std::string CredentialRuleCtorSignature = "(I)V";
         chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
-            credentialRuleClassName.c_str(), credentialRuleCtorSignature.c_str(),
-            static_cast<uint8_t>(dataResponse.credentialRule.Value()), credentialRule);
+            CredentialRuleClassName.c_str(), CredentialRuleCtorSignature.c_str(),
+            static_cast<uint8_t>(dataResponse.credentialRule.Value()), CredentialRule);
     }
-    jobject credentials;
+    jobject Credentials;
     if (dataResponse.credentials.IsNull())
     {
-        credentials = nullptr;
+        Credentials = nullptr;
     }
     else
     {
-        chip::JniReferences::GetInstance().CreateArrayList(credentials);
+        chip::JniReferences::GetInstance().CreateArrayList(Credentials);
 
-        auto iter_credentials_1 = dataResponse.credentials.Value().begin();
-        while (iter_credentials_1.Next())
+        auto iter_Credentials_1 = dataResponse.credentials.Value().begin();
+        while (iter_Credentials_1.Next())
         {
-            auto & entry_1 = iter_credentials_1.GetValue();
+            auto & entry_1 = iter_Credentials_1.GetValue();
             jobject newElement_1;
             jobject newElement_1_credentialType;
             std::string newElement_1_credentialTypeClassName     = "java/lang/Integer";
@@ -2849,68 +2849,68 @@ void CHIPDoorLockClusterGetUserResponseCallback::CallbackFn(
                                                                            newElement_1_credentialIndexCtorSignature.c_str(),
                                                                            entry_1.credentialIndex, newElement_1_credentialIndex);
 
-            jclass dlCredentialStructClass_2;
+            jclass credentialStructStructClass_2;
             err = chip::JniReferences::GetInstance().GetClassRef(
-                env, "chip/devicecontroller/ChipStructs$DoorLockClusterDlCredential", dlCredentialStructClass_2);
+                env, "chip/devicecontroller/ChipStructs$DoorLockClusterCredentialStruct", credentialStructStructClass_2);
             if (err != CHIP_NO_ERROR)
             {
-                ChipLogError(Zcl, "Could not find class ChipStructs$DoorLockClusterDlCredential");
+                ChipLogError(Zcl, "Could not find class ChipStructs$DoorLockClusterCredentialStruct");
                 return;
             }
-            jmethodID dlCredentialStructCtor_2 =
-                env->GetMethodID(dlCredentialStructClass_2, "<init>", "(Ljava/lang/Integer;Ljava/lang/Integer;)V");
-            if (dlCredentialStructCtor_2 == nullptr)
+            jmethodID credentialStructStructCtor_2 =
+                env->GetMethodID(credentialStructStructClass_2, "<init>", "(Ljava/lang/Integer;Ljava/lang/Integer;)V");
+            if (credentialStructStructCtor_2 == nullptr)
             {
-                ChipLogError(Zcl, "Could not find ChipStructs$DoorLockClusterDlCredential constructor");
+                ChipLogError(Zcl, "Could not find ChipStructs$DoorLockClusterCredentialStruct constructor");
                 return;
             }
 
-            newElement_1 = env->NewObject(dlCredentialStructClass_2, dlCredentialStructCtor_2, newElement_1_credentialType,
+            newElement_1 = env->NewObject(credentialStructStructClass_2, credentialStructStructCtor_2, newElement_1_credentialType,
                                           newElement_1_credentialIndex);
-            chip::JniReferences::GetInstance().AddToList(credentials, newElement_1);
+            chip::JniReferences::GetInstance().AddToList(Credentials, newElement_1);
         }
     }
-    jobject creatorFabricIndex;
+    jobject CreatorFabricIndex;
     if (dataResponse.creatorFabricIndex.IsNull())
     {
-        creatorFabricIndex = nullptr;
+        CreatorFabricIndex = nullptr;
     }
     else
     {
-        std::string creatorFabricIndexClassName     = "java/lang/Integer";
-        std::string creatorFabricIndexCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(creatorFabricIndexClassName.c_str(),
-                                                                      creatorFabricIndexCtorSignature.c_str(),
-                                                                      dataResponse.creatorFabricIndex.Value(), creatorFabricIndex);
+        std::string CreatorFabricIndexClassName     = "java/lang/Integer";
+        std::string CreatorFabricIndexCtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(CreatorFabricIndexClassName.c_str(),
+                                                                      CreatorFabricIndexCtorSignature.c_str(),
+                                                                      dataResponse.creatorFabricIndex.Value(), CreatorFabricIndex);
     }
-    jobject lastModifiedFabricIndex;
+    jobject LastModifiedFabricIndex;
     if (dataResponse.lastModifiedFabricIndex.IsNull())
     {
-        lastModifiedFabricIndex = nullptr;
+        LastModifiedFabricIndex = nullptr;
     }
     else
     {
-        std::string lastModifiedFabricIndexClassName     = "java/lang/Integer";
-        std::string lastModifiedFabricIndexCtorSignature = "(I)V";
+        std::string LastModifiedFabricIndexClassName     = "java/lang/Integer";
+        std::string LastModifiedFabricIndexCtorSignature = "(I)V";
         chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
-            lastModifiedFabricIndexClassName.c_str(), lastModifiedFabricIndexCtorSignature.c_str(),
-            dataResponse.lastModifiedFabricIndex.Value(), lastModifiedFabricIndex);
+            LastModifiedFabricIndexClassName.c_str(), LastModifiedFabricIndexCtorSignature.c_str(),
+            dataResponse.lastModifiedFabricIndex.Value(), LastModifiedFabricIndex);
     }
-    jobject nextUserIndex;
+    jobject NextUserIndex;
     if (dataResponse.nextUserIndex.IsNull())
     {
-        nextUserIndex = nullptr;
+        NextUserIndex = nullptr;
     }
     else
     {
-        std::string nextUserIndexClassName     = "java/lang/Integer";
-        std::string nextUserIndexCtorSignature = "(I)V";
+        std::string NextUserIndexClassName     = "java/lang/Integer";
+        std::string NextUserIndexCtorSignature = "(I)V";
         chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(
-            nextUserIndexClassName.c_str(), nextUserIndexCtorSignature.c_str(), dataResponse.nextUserIndex.Value(), nextUserIndex);
+            NextUserIndexClassName.c_str(), NextUserIndexCtorSignature.c_str(), dataResponse.nextUserIndex.Value(), NextUserIndex);
     }
 
-    env->CallVoidMethod(javaCallbackRef, javaMethod, userIndex, userName, userUniqueId, userStatus, userType, credentialRule,
-                        credentials, creatorFabricIndex, lastModifiedFabricIndex, nextUserIndex);
+    env->CallVoidMethod(javaCallbackRef, javaMethod, UserIndex, UserName, UserUniqueID, UserStatus, UserType, CredentialRule,
+                        Credentials, CreatorFabricIndex, LastModifiedFabricIndex, NextUserIndex);
 }
 CHIPDoorLockClusterSetCredentialResponseCallback::CHIPDoorLockClusterSetCredentialResponseCallback(jobject javaCallback) :
     Callback::Callback<CHIPDoorLockClusterSetCredentialResponseCallbackType>(CallbackFn, this)
@@ -2964,38 +2964,38 @@ void CHIPDoorLockClusterSetCredentialResponseCallback::CallbackFn(
                                                   "(Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error invoking Java callback: %s", ErrorStr(err)));
 
-    jobject status;
-    std::string statusClassName     = "java/lang/Integer";
-    std::string statusCtorSignature = "(I)V";
-    chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(statusClassName.c_str(), statusCtorSignature.c_str(),
-                                                                  static_cast<uint8_t>(dataResponse.status), status);
-    jobject userIndex;
+    jobject Status;
+    std::string StatusClassName     = "java/lang/Integer";
+    std::string StatusCtorSignature = "(I)V";
+    chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(StatusClassName.c_str(), StatusCtorSignature.c_str(),
+                                                                  static_cast<uint8_t>(dataResponse.status), Status);
+    jobject UserIndex;
     if (dataResponse.userIndex.IsNull())
     {
-        userIndex = nullptr;
+        UserIndex = nullptr;
     }
     else
     {
-        std::string userIndexClassName     = "java/lang/Integer";
-        std::string userIndexCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(userIndexClassName.c_str(), userIndexCtorSignature.c_str(),
-                                                                       dataResponse.userIndex.Value(), userIndex);
+        std::string UserIndexClassName     = "java/lang/Integer";
+        std::string UserIndexCtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(UserIndexClassName.c_str(), UserIndexCtorSignature.c_str(),
+                                                                       dataResponse.userIndex.Value(), UserIndex);
     }
-    jobject nextCredentialIndex;
+    jobject NextCredentialIndex;
     if (dataResponse.nextCredentialIndex.IsNull())
     {
-        nextCredentialIndex = nullptr;
+        NextCredentialIndex = nullptr;
     }
     else
     {
-        std::string nextCredentialIndexClassName     = "java/lang/Integer";
-        std::string nextCredentialIndexCtorSignature = "(I)V";
+        std::string NextCredentialIndexClassName     = "java/lang/Integer";
+        std::string NextCredentialIndexCtorSignature = "(I)V";
         chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(
-            nextCredentialIndexClassName.c_str(), nextCredentialIndexCtorSignature.c_str(),
-            dataResponse.nextCredentialIndex.Value(), nextCredentialIndex);
+            NextCredentialIndexClassName.c_str(), NextCredentialIndexCtorSignature.c_str(),
+            dataResponse.nextCredentialIndex.Value(), NextCredentialIndex);
     }
 
-    env->CallVoidMethod(javaCallbackRef, javaMethod, status, userIndex, nextCredentialIndex);
+    env->CallVoidMethod(javaCallbackRef, javaMethod, Status, UserIndex, NextCredentialIndex);
 }
 CHIPDoorLockClusterGetCredentialStatusResponseCallback::CHIPDoorLockClusterGetCredentialStatusResponseCallback(
     jobject javaCallback) :
@@ -3052,65 +3052,65 @@ void CHIPDoorLockClusterGetCredentialStatusResponseCallback::CallbackFn(
         "(Ljava/lang/Boolean;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error invoking Java callback: %s", ErrorStr(err)));
 
-    jobject credentialExists;
-    std::string credentialExistsClassName     = "java/lang/Boolean";
-    std::string credentialExistsCtorSignature = "(Z)V";
+    jobject CredentialExists;
+    std::string CredentialExistsClassName     = "java/lang/Boolean";
+    std::string CredentialExistsCtorSignature = "(Z)V";
     chip::JniReferences::GetInstance().CreateBoxedObject<bool>(
-        credentialExistsClassName.c_str(), credentialExistsCtorSignature.c_str(), dataResponse.credentialExists, credentialExists);
-    jobject userIndex;
+        CredentialExistsClassName.c_str(), CredentialExistsCtorSignature.c_str(), dataResponse.credentialExists, CredentialExists);
+    jobject UserIndex;
     if (dataResponse.userIndex.IsNull())
     {
-        userIndex = nullptr;
+        UserIndex = nullptr;
     }
     else
     {
-        std::string userIndexClassName     = "java/lang/Integer";
-        std::string userIndexCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(userIndexClassName.c_str(), userIndexCtorSignature.c_str(),
-                                                                       dataResponse.userIndex.Value(), userIndex);
+        std::string UserIndexClassName     = "java/lang/Integer";
+        std::string UserIndexCtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(UserIndexClassName.c_str(), UserIndexCtorSignature.c_str(),
+                                                                       dataResponse.userIndex.Value(), UserIndex);
     }
-    jobject creatorFabricIndex;
+    jobject CreatorFabricIndex;
     if (dataResponse.creatorFabricIndex.IsNull())
     {
-        creatorFabricIndex = nullptr;
+        CreatorFabricIndex = nullptr;
     }
     else
     {
-        std::string creatorFabricIndexClassName     = "java/lang/Integer";
-        std::string creatorFabricIndexCtorSignature = "(I)V";
-        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(creatorFabricIndexClassName.c_str(),
-                                                                      creatorFabricIndexCtorSignature.c_str(),
-                                                                      dataResponse.creatorFabricIndex.Value(), creatorFabricIndex);
+        std::string CreatorFabricIndexClassName     = "java/lang/Integer";
+        std::string CreatorFabricIndexCtorSignature = "(I)V";
+        chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(CreatorFabricIndexClassName.c_str(),
+                                                                      CreatorFabricIndexCtorSignature.c_str(),
+                                                                      dataResponse.creatorFabricIndex.Value(), CreatorFabricIndex);
     }
-    jobject lastModifiedFabricIndex;
+    jobject LastModifiedFabricIndex;
     if (dataResponse.lastModifiedFabricIndex.IsNull())
     {
-        lastModifiedFabricIndex = nullptr;
+        LastModifiedFabricIndex = nullptr;
     }
     else
     {
-        std::string lastModifiedFabricIndexClassName     = "java/lang/Integer";
-        std::string lastModifiedFabricIndexCtorSignature = "(I)V";
+        std::string LastModifiedFabricIndexClassName     = "java/lang/Integer";
+        std::string LastModifiedFabricIndexCtorSignature = "(I)V";
         chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(
-            lastModifiedFabricIndexClassName.c_str(), lastModifiedFabricIndexCtorSignature.c_str(),
-            dataResponse.lastModifiedFabricIndex.Value(), lastModifiedFabricIndex);
+            LastModifiedFabricIndexClassName.c_str(), LastModifiedFabricIndexCtorSignature.c_str(),
+            dataResponse.lastModifiedFabricIndex.Value(), LastModifiedFabricIndex);
     }
-    jobject nextCredentialIndex;
+    jobject NextCredentialIndex;
     if (dataResponse.nextCredentialIndex.IsNull())
     {
-        nextCredentialIndex = nullptr;
+        NextCredentialIndex = nullptr;
     }
     else
     {
-        std::string nextCredentialIndexClassName     = "java/lang/Integer";
-        std::string nextCredentialIndexCtorSignature = "(I)V";
+        std::string NextCredentialIndexClassName     = "java/lang/Integer";
+        std::string NextCredentialIndexCtorSignature = "(I)V";
         chip::JniReferences::GetInstance().CreateBoxedObject<uint16_t>(
-            nextCredentialIndexClassName.c_str(), nextCredentialIndexCtorSignature.c_str(),
-            dataResponse.nextCredentialIndex.Value(), nextCredentialIndex);
+            NextCredentialIndexClassName.c_str(), NextCredentialIndexCtorSignature.c_str(),
+            dataResponse.nextCredentialIndex.Value(), NextCredentialIndex);
     }
 
-    env->CallVoidMethod(javaCallbackRef, javaMethod, credentialExists, userIndex, creatorFabricIndex, lastModifiedFabricIndex,
-                        nextCredentialIndex);
+    env->CallVoidMethod(javaCallbackRef, javaMethod, CredentialExists, UserIndex, CreatorFabricIndex, LastModifiedFabricIndex,
+                        NextCredentialIndex);
 }
 CHIPThermostatClusterGetWeeklyScheduleResponseCallback::CHIPThermostatClusterGetWeeklyScheduleResponseCallback(
     jobject javaCallback) :
diff --git a/src/controller/java/zap-generated/CHIPReadCallbacks.cpp b/src/controller/java/zap-generated/CHIPReadCallbacks.cpp
index 9a5ba6344a369a..f0e8b360ad82a2 100644
--- a/src/controller/java/zap-generated/CHIPReadCallbacks.cpp
+++ b/src/controller/java/zap-generated/CHIPReadCallbacks.cpp
@@ -7906,7 +7906,7 @@ CHIPGeneralDiagnosticsActiveHardwareFaultsAttributeCallback::~CHIPGeneralDiagnos
 }
 
 void CHIPGeneralDiagnosticsActiveHardwareFaultsAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::app::Clusters::GeneralDiagnostics::HardwareFault> & list)
+    void * context, const chip::app::DataModel::DecodableList<chip::app::Clusters::GeneralDiagnostics::HardwareFaultEnum> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -7977,7 +7977,7 @@ CHIPGeneralDiagnosticsActiveRadioFaultsAttributeCallback::~CHIPGeneralDiagnostic
 }
 
 void CHIPGeneralDiagnosticsActiveRadioFaultsAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::app::Clusters::GeneralDiagnostics::RadioFault> & list)
+    void * context, const chip::app::DataModel::DecodableList<chip::app::Clusters::GeneralDiagnostics::RadioFaultEnum> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -8048,7 +8048,7 @@ CHIPGeneralDiagnosticsActiveNetworkFaultsAttributeCallback::~CHIPGeneralDiagnost
 }
 
 void CHIPGeneralDiagnosticsActiveNetworkFaultsAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::app::Clusters::GeneralDiagnostics::NetworkFaultType> & list)
+    void * context, const chip::app::DataModel::DecodableList<chip::app::Clusters::GeneralDiagnostics::NetworkFaultEnum> & list)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -11413,7 +11413,7 @@ CHIPEthernetNetworkDiagnosticsPHYRateAttributeCallback::~CHIPEthernetNetworkDiag
 }
 
 void CHIPEthernetNetworkDiagnosticsPHYRateAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::Nullable<chip::app::Clusters::EthernetNetworkDiagnostics::PHYRate> & value)
+    void * context, const chip::app::DataModel::Nullable<chip::app::Clusters::EthernetNetworkDiagnostics::PHYRateEnum> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -14968,7 +14968,7 @@ CHIPDoorLockDoorStateAttributeCallback::~CHIPDoorLockDoorStateAttributeCallback(
 }
 
 void CHIPDoorLockDoorStateAttributeCallback::CallbackFn(
-    void * context, const chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::DlDoorState> & value)
+    void * context, const chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::DoorStateEnum> & value)
 {
     chip::DeviceLayer::StackUnlock unlock;
     CHIP_ERROR err = CHIP_NO_ERROR;
diff --git a/src/controller/java/zap-generated/CHIPReadCallbacks.h b/src/controller/java/zap-generated/CHIPReadCallbacks.h
index a82af3a768ddcc..43fc82e6d4d600 100644
--- a/src/controller/java/zap-generated/CHIPReadCallbacks.h
+++ b/src/controller/java/zap-generated/CHIPReadCallbacks.h
@@ -3310,7 +3310,7 @@ class CHIPGeneralDiagnosticsActiveHardwareFaultsAttributeCallback
 
     static void
     CallbackFn(void * context,
-               const chip::app::DataModel::DecodableList<chip::app::Clusters::GeneralDiagnostics::HardwareFault> & list);
+               const chip::app::DataModel::DecodableList<chip::app::Clusters::GeneralDiagnostics::HardwareFaultEnum> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
@@ -3340,8 +3340,9 @@ class CHIPGeneralDiagnosticsActiveRadioFaultsAttributeCallback
         }
     }
 
-    static void CallbackFn(void * context,
-                           const chip::app::DataModel::DecodableList<chip::app::Clusters::GeneralDiagnostics::RadioFault> & list);
+    static void
+    CallbackFn(void * context,
+               const chip::app::DataModel::DecodableList<chip::app::Clusters::GeneralDiagnostics::RadioFaultEnum> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
@@ -3373,7 +3374,7 @@ class CHIPGeneralDiagnosticsActiveNetworkFaultsAttributeCallback
 
     static void
     CallbackFn(void * context,
-               const chip::app::DataModel::DecodableList<chip::app::Clusters::GeneralDiagnostics::NetworkFaultType> & list);
+               const chip::app::DataModel::DecodableList<chip::app::Clusters::GeneralDiagnostics::NetworkFaultEnum> & list);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
@@ -4736,8 +4737,9 @@ class CHIPEthernetNetworkDiagnosticsPHYRateAttributeCallback
         }
     }
 
-    static void CallbackFn(void * context,
-                           const chip::app::DataModel::Nullable<chip::app::Clusters::EthernetNetworkDiagnostics::PHYRate> & value);
+    static void
+    CallbackFn(void * context,
+               const chip::app::DataModel::Nullable<chip::app::Clusters::EthernetNetworkDiagnostics::PHYRateEnum> & value);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
@@ -6161,7 +6163,7 @@ class CHIPDoorLockDoorStateAttributeCallback : public chip::Callback::Callback<C
     }
 
     static void CallbackFn(void * context,
-                           const chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::DlDoorState> & value);
+                           const chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::DoorStateEnum> & value);
     static void OnSubscriptionEstablished(void * context)
     {
         CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java b/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java
index 03e29e55e417cb..845e3597365f0b 100644
--- a/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java
+++ b/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java
@@ -11391,21 +11391,21 @@ public DoorLockCluster(long devicePtr, int endpointId) {
     public native long initWithDevice(long devicePtr, int endpointId);
 
     public void lockDoor(
-        DefaultClusterCallback callback, Optional<byte[]> pinCode, int timedInvokeTimeoutMs) {
-      lockDoor(chipClusterPtr, callback, pinCode, timedInvokeTimeoutMs);
+        DefaultClusterCallback callback, Optional<byte[]> PINCode, int timedInvokeTimeoutMs) {
+      lockDoor(chipClusterPtr, callback, PINCode, timedInvokeTimeoutMs);
     }
 
     public void unlockDoor(
-        DefaultClusterCallback callback, Optional<byte[]> pinCode, int timedInvokeTimeoutMs) {
-      unlockDoor(chipClusterPtr, callback, pinCode, timedInvokeTimeoutMs);
+        DefaultClusterCallback callback, Optional<byte[]> PINCode, int timedInvokeTimeoutMs) {
+      unlockDoor(chipClusterPtr, callback, PINCode, timedInvokeTimeoutMs);
     }
 
     public void unlockWithTimeout(
         DefaultClusterCallback callback,
         Integer timeout,
-        Optional<byte[]> pinCode,
+        Optional<byte[]> PINCode,
         int timedInvokeTimeoutMs) {
-      unlockWithTimeout(chipClusterPtr, callback, timeout, pinCode, timedInvokeTimeoutMs);
+      unlockWithTimeout(chipClusterPtr, callback, timeout, PINCode, timedInvokeTimeoutMs);
     }
 
     public void setWeekDaySchedule(
@@ -11591,7 +11591,7 @@ public void setUser(
         Integer operationType,
         Integer userIndex,
         @Nullable String userName,
-        @Nullable Long userUniqueId,
+        @Nullable Long userUniqueID,
         @Nullable Integer userStatus,
         @Nullable Integer userType,
         @Nullable Integer credentialRule,
@@ -11602,7 +11602,7 @@ public void setUser(
           operationType,
           userIndex,
           userName,
-          userUniqueId,
+          userUniqueID,
           userStatus,
           userType,
           credentialRule,
@@ -11626,7 +11626,7 @@ public void clearUser(
     public void setCredential(
         SetCredentialResponseCallback callback,
         Integer operationType,
-        ChipStructs.DoorLockClusterDlCredential credential,
+        ChipStructs.DoorLockClusterCredentialStruct credential,
         byte[] credentialData,
         @Nullable Integer userIndex,
         @Nullable Integer userStatus,
@@ -11646,20 +11646,20 @@ public void setCredential(
 
     public void getCredentialStatus(
         GetCredentialStatusResponseCallback callback,
-        ChipStructs.DoorLockClusterDlCredential credential) {
+        ChipStructs.DoorLockClusterCredentialStruct credential) {
       getCredentialStatus(chipClusterPtr, callback, credential, null);
     }
 
     public void getCredentialStatus(
         GetCredentialStatusResponseCallback callback,
-        ChipStructs.DoorLockClusterDlCredential credential,
+        ChipStructs.DoorLockClusterCredentialStruct credential,
         int timedInvokeTimeoutMs) {
       getCredentialStatus(chipClusterPtr, callback, credential, timedInvokeTimeoutMs);
     }
 
     public void clearCredential(
         DefaultClusterCallback callback,
-        @Nullable ChipStructs.DoorLockClusterDlCredential credential,
+        @Nullable ChipStructs.DoorLockClusterCredentialStruct credential,
         int timedInvokeTimeoutMs) {
       clearCredential(chipClusterPtr, callback, credential, timedInvokeTimeoutMs);
     }
@@ -11667,20 +11667,20 @@ public void clearCredential(
     private native void lockDoor(
         long chipClusterPtr,
         DefaultClusterCallback Callback,
-        Optional<byte[]> pinCode,
+        Optional<byte[]> PINCode,
         @Nullable Integer timedInvokeTimeoutMs);
 
     private native void unlockDoor(
         long chipClusterPtr,
         DefaultClusterCallback Callback,
-        Optional<byte[]> pinCode,
+        Optional<byte[]> PINCode,
         @Nullable Integer timedInvokeTimeoutMs);
 
     private native void unlockWithTimeout(
         long chipClusterPtr,
         DefaultClusterCallback Callback,
         Integer timeout,
-        Optional<byte[]> pinCode,
+        Optional<byte[]> PINCode,
         @Nullable Integer timedInvokeTimeoutMs);
 
     private native void setWeekDaySchedule(
@@ -11759,7 +11759,7 @@ private native void setUser(
         Integer operationType,
         Integer userIndex,
         @Nullable String userName,
-        @Nullable Long userUniqueId,
+        @Nullable Long userUniqueID,
         @Nullable Integer userStatus,
         @Nullable Integer userType,
         @Nullable Integer credentialRule,
@@ -11781,7 +11781,7 @@ private native void setCredential(
         long chipClusterPtr,
         SetCredentialResponseCallback Callback,
         Integer operationType,
-        ChipStructs.DoorLockClusterDlCredential credential,
+        ChipStructs.DoorLockClusterCredentialStruct credential,
         byte[] credentialData,
         @Nullable Integer userIndex,
         @Nullable Integer userStatus,
@@ -11791,13 +11791,13 @@ private native void setCredential(
     private native void getCredentialStatus(
         long chipClusterPtr,
         GetCredentialStatusResponseCallback Callback,
-        ChipStructs.DoorLockClusterDlCredential credential,
+        ChipStructs.DoorLockClusterCredentialStruct credential,
         @Nullable Integer timedInvokeTimeoutMs);
 
     private native void clearCredential(
         long chipClusterPtr,
         DefaultClusterCallback Callback,
-        @Nullable ChipStructs.DoorLockClusterDlCredential credential,
+        @Nullable ChipStructs.DoorLockClusterCredentialStruct credential,
         @Nullable Integer timedInvokeTimeoutMs);
 
     public interface GetWeekDayScheduleResponseCallback {
@@ -11840,11 +11840,11 @@ public interface GetUserResponseCallback {
       void onSuccess(
           Integer userIndex,
           @Nullable String userName,
-          @Nullable Long userUniqueId,
+          @Nullable Long userUniqueID,
           @Nullable Integer userStatus,
           @Nullable Integer userType,
           @Nullable Integer credentialRule,
-          @Nullable ArrayList<ChipStructs.DoorLockClusterDlCredential> credentials,
+          @Nullable ArrayList<ChipStructs.DoorLockClusterCredentialStruct> credentials,
           @Nullable Integer creatorFabricIndex,
           @Nullable Integer lastModifiedFabricIndex,
           @Nullable Integer nextUserIndex);
@@ -15632,14 +15632,14 @@ public void stepColor(
 
     public void moveToColorTemperature(
         DefaultClusterCallback callback,
-        Integer colorTemperature,
+        Integer colorTemperatureMireds,
         Integer transitionTime,
         Integer optionsMask,
         Integer optionsOverride) {
       moveToColorTemperature(
           chipClusterPtr,
           callback,
-          colorTemperature,
+          colorTemperatureMireds,
           transitionTime,
           optionsMask,
           optionsOverride,
@@ -15648,7 +15648,7 @@ public void moveToColorTemperature(
 
     public void moveToColorTemperature(
         DefaultClusterCallback callback,
-        Integer colorTemperature,
+        Integer colorTemperatureMireds,
         Integer transitionTime,
         Integer optionsMask,
         Integer optionsOverride,
@@ -15656,7 +15656,7 @@ public void moveToColorTemperature(
       moveToColorTemperature(
           chipClusterPtr,
           callback,
-          colorTemperature,
+          colorTemperatureMireds,
           transitionTime,
           optionsMask,
           optionsOverride,
@@ -16043,7 +16043,7 @@ private native void stepColor(
     private native void moveToColorTemperature(
         long chipClusterPtr,
         DefaultClusterCallback Callback,
-        Integer colorTemperature,
+        Integer colorTemperatureMireds,
         Integer transitionTime,
         Integer optionsMask,
         Integer optionsOverride,
diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ChipEventStructs.java b/src/controller/java/zap-generated/chip/devicecontroller/ChipEventStructs.java
index 9db564c1e04f45..9f079111c14841 100644
--- a/src/controller/java/zap-generated/chip/devicecontroller/ChipEventStructs.java
+++ b/src/controller/java/zap-generated/chip/devicecontroller/ChipEventStructs.java
@@ -925,7 +925,7 @@ public static class DoorLockClusterLockOperationEvent {
     public @Nullable Integer userIndex;
     public @Nullable Integer fabricIndex;
     public @Nullable Long sourceNode;
-    public @Nullable Optional<ArrayList<ChipStructs.DoorLockClusterDlCredential>> credentials;
+    public @Nullable Optional<ArrayList<ChipStructs.DoorLockClusterCredentialStruct>> credentials;
 
     public DoorLockClusterLockOperationEvent(
         Integer lockOperationType,
@@ -933,7 +933,7 @@ public DoorLockClusterLockOperationEvent(
         @Nullable Integer userIndex,
         @Nullable Integer fabricIndex,
         @Nullable Long sourceNode,
-        @Nullable Optional<ArrayList<ChipStructs.DoorLockClusterDlCredential>> credentials) {
+        @Nullable Optional<ArrayList<ChipStructs.DoorLockClusterCredentialStruct>> credentials) {
       this.lockOperationType = lockOperationType;
       this.operationSource = operationSource;
       this.userIndex = userIndex;
@@ -976,7 +976,7 @@ public static class DoorLockClusterLockOperationErrorEvent {
     public @Nullable Integer userIndex;
     public @Nullable Integer fabricIndex;
     public @Nullable Long sourceNode;
-    public @Nullable Optional<ArrayList<ChipStructs.DoorLockClusterDlCredential>> credentials;
+    public @Nullable Optional<ArrayList<ChipStructs.DoorLockClusterCredentialStruct>> credentials;
 
     public DoorLockClusterLockOperationErrorEvent(
         Integer lockOperationType,
@@ -985,7 +985,7 @@ public DoorLockClusterLockOperationErrorEvent(
         @Nullable Integer userIndex,
         @Nullable Integer fabricIndex,
         @Nullable Long sourceNode,
-        @Nullable Optional<ArrayList<ChipStructs.DoorLockClusterDlCredential>> credentials) {
+        @Nullable Optional<ArrayList<ChipStructs.DoorLockClusterCredentialStruct>> credentials) {
       this.lockOperationType = lockOperationType;
       this.operationSource = operationSource;
       this.operationError = operationError;
diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ChipStructs.java b/src/controller/java/zap-generated/chip/devicecontroller/ChipStructs.java
index b6fc1d33b30102..45db65c348cfbd 100644
--- a/src/controller/java/zap-generated/chip/devicecontroller/ChipStructs.java
+++ b/src/controller/java/zap-generated/chip/devicecontroller/ChipStructs.java
@@ -1318,11 +1318,11 @@ public String toString() {
     }
   }
 
-  public static class DoorLockClusterDlCredential {
+  public static class DoorLockClusterCredentialStruct {
     public Integer credentialType;
     public Integer credentialIndex;
 
-    public DoorLockClusterDlCredential(Integer credentialType, Integer credentialIndex) {
+    public DoorLockClusterCredentialStruct(Integer credentialType, Integer credentialIndex) {
       this.credentialType = credentialType;
       this.credentialIndex = credentialIndex;
     }
@@ -1330,7 +1330,7 @@ public DoorLockClusterDlCredential(Integer credentialType, Integer credentialInd
     @Override
     public String toString() {
       StringBuilder output = new StringBuilder();
-      output.append("DoorLockClusterDlCredential {\n");
+      output.append("DoorLockClusterCredentialStruct {\n");
       output.append("\tcredentialType: ");
       output.append(credentialType);
       output.append("\n");
diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java b/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java
index 4a30a6afdeca7a..31dd1d8eef2dae 100644
--- a/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java
+++ b/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java
@@ -4180,37 +4180,37 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
 
     @Override
     public void onSuccess(
-        Integer weekDayIndex,
-        Integer userIndex,
-        Integer status,
-        Optional<Integer> daysMask,
-        Optional<Integer> startHour,
-        Optional<Integer> startMinute,
-        Optional<Integer> endHour,
-        Optional<Integer> endMinute) {
-      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo weekDayIndexResponseValue =
-          new CommandResponseInfo("weekDayIndex", "Integer");
-      responseValues.put(weekDayIndexResponseValue, weekDayIndex);
-      CommandResponseInfo userIndexResponseValue = new CommandResponseInfo("userIndex", "Integer");
-      responseValues.put(userIndexResponseValue, userIndex);
-      CommandResponseInfo statusResponseValue = new CommandResponseInfo("status", "Integer");
-      responseValues.put(statusResponseValue, status);
-      CommandResponseInfo daysMaskResponseValue =
-          new CommandResponseInfo("daysMask", "Optional<Integer>");
-      responseValues.put(daysMaskResponseValue, daysMask);
-      CommandResponseInfo startHourResponseValue =
-          new CommandResponseInfo("startHour", "Optional<Integer>");
-      responseValues.put(startHourResponseValue, startHour);
-      CommandResponseInfo startMinuteResponseValue =
-          new CommandResponseInfo("startMinute", "Optional<Integer>");
-      responseValues.put(startMinuteResponseValue, startMinute);
-      CommandResponseInfo endHourResponseValue =
-          new CommandResponseInfo("endHour", "Optional<Integer>");
-      responseValues.put(endHourResponseValue, endHour);
-      CommandResponseInfo endMinuteResponseValue =
-          new CommandResponseInfo("endMinute", "Optional<Integer>");
-      responseValues.put(endMinuteResponseValue, endMinute);
+        Integer WeekDayIndex,
+        Integer UserIndex,
+        Integer Status,
+        Optional<Integer> DaysMask,
+        Optional<Integer> StartHour,
+        Optional<Integer> StartMinute,
+        Optional<Integer> EndHour,
+        Optional<Integer> EndMinute) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo WeekDayIndexResponseValue =
+          new CommandResponseInfo("WeekDayIndex", "Integer");
+      responseValues.put(WeekDayIndexResponseValue, WeekDayIndex);
+      CommandResponseInfo UserIndexResponseValue = new CommandResponseInfo("UserIndex", "Integer");
+      responseValues.put(UserIndexResponseValue, UserIndex);
+      CommandResponseInfo StatusResponseValue = new CommandResponseInfo("Status", "Integer");
+      responseValues.put(StatusResponseValue, Status);
+      CommandResponseInfo DaysMaskResponseValue =
+          new CommandResponseInfo("DaysMask", "Optional<Integer>");
+      responseValues.put(DaysMaskResponseValue, DaysMask);
+      CommandResponseInfo StartHourResponseValue =
+          new CommandResponseInfo("StartHour", "Optional<Integer>");
+      responseValues.put(StartHourResponseValue, StartHour);
+      CommandResponseInfo StartMinuteResponseValue =
+          new CommandResponseInfo("StartMinute", "Optional<Integer>");
+      responseValues.put(StartMinuteResponseValue, StartMinute);
+      CommandResponseInfo EndHourResponseValue =
+          new CommandResponseInfo("EndHour", "Optional<Integer>");
+      responseValues.put(EndHourResponseValue, EndHour);
+      CommandResponseInfo EndMinuteResponseValue =
+          new CommandResponseInfo("EndMinute", "Optional<Integer>");
+      responseValues.put(EndMinuteResponseValue, EndMinute);
       callback.onSuccess(responseValues);
     }
 
@@ -4232,25 +4232,25 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
 
     @Override
     public void onSuccess(
-        Integer yearDayIndex,
-        Integer userIndex,
-        Integer status,
-        Optional<Long> localStartTime,
-        Optional<Long> localEndTime) {
-      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo yearDayIndexResponseValue =
-          new CommandResponseInfo("yearDayIndex", "Integer");
-      responseValues.put(yearDayIndexResponseValue, yearDayIndex);
-      CommandResponseInfo userIndexResponseValue = new CommandResponseInfo("userIndex", "Integer");
-      responseValues.put(userIndexResponseValue, userIndex);
-      CommandResponseInfo statusResponseValue = new CommandResponseInfo("status", "Integer");
-      responseValues.put(statusResponseValue, status);
-      CommandResponseInfo localStartTimeResponseValue =
-          new CommandResponseInfo("localStartTime", "Optional<Long>");
-      responseValues.put(localStartTimeResponseValue, localStartTime);
-      CommandResponseInfo localEndTimeResponseValue =
-          new CommandResponseInfo("localEndTime", "Optional<Long>");
-      responseValues.put(localEndTimeResponseValue, localEndTime);
+        Integer YearDayIndex,
+        Integer UserIndex,
+        Integer Status,
+        Optional<Long> LocalStartTime,
+        Optional<Long> LocalEndTime) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo YearDayIndexResponseValue =
+          new CommandResponseInfo("YearDayIndex", "Integer");
+      responseValues.put(YearDayIndexResponseValue, YearDayIndex);
+      CommandResponseInfo UserIndexResponseValue = new CommandResponseInfo("UserIndex", "Integer");
+      responseValues.put(UserIndexResponseValue, UserIndex);
+      CommandResponseInfo StatusResponseValue = new CommandResponseInfo("Status", "Integer");
+      responseValues.put(StatusResponseValue, Status);
+      CommandResponseInfo LocalStartTimeResponseValue =
+          new CommandResponseInfo("LocalStartTime", "Optional<Long>");
+      responseValues.put(LocalStartTimeResponseValue, LocalStartTime);
+      CommandResponseInfo LocalEndTimeResponseValue =
+          new CommandResponseInfo("LocalEndTime", "Optional<Long>");
+      responseValues.put(LocalEndTimeResponseValue, LocalEndTime);
       callback.onSuccess(responseValues);
     }
 
@@ -4272,26 +4272,26 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
 
     @Override
     public void onSuccess(
-        Integer holidayIndex,
-        Integer status,
-        Optional<Long> localStartTime,
-        Optional<Long> localEndTime,
-        Optional<Integer> operatingMode) {
-      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo holidayIndexResponseValue =
-          new CommandResponseInfo("holidayIndex", "Integer");
-      responseValues.put(holidayIndexResponseValue, holidayIndex);
-      CommandResponseInfo statusResponseValue = new CommandResponseInfo("status", "Integer");
-      responseValues.put(statusResponseValue, status);
-      CommandResponseInfo localStartTimeResponseValue =
-          new CommandResponseInfo("localStartTime", "Optional<Long>");
-      responseValues.put(localStartTimeResponseValue, localStartTime);
-      CommandResponseInfo localEndTimeResponseValue =
-          new CommandResponseInfo("localEndTime", "Optional<Long>");
-      responseValues.put(localEndTimeResponseValue, localEndTime);
-      CommandResponseInfo operatingModeResponseValue =
-          new CommandResponseInfo("operatingMode", "Optional<Integer>");
-      responseValues.put(operatingModeResponseValue, operatingMode);
+        Integer HolidayIndex,
+        Integer Status,
+        Optional<Long> LocalStartTime,
+        Optional<Long> LocalEndTime,
+        Optional<Integer> OperatingMode) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo HolidayIndexResponseValue =
+          new CommandResponseInfo("HolidayIndex", "Integer");
+      responseValues.put(HolidayIndexResponseValue, HolidayIndex);
+      CommandResponseInfo StatusResponseValue = new CommandResponseInfo("Status", "Integer");
+      responseValues.put(StatusResponseValue, Status);
+      CommandResponseInfo LocalStartTimeResponseValue =
+          new CommandResponseInfo("LocalStartTime", "Optional<Long>");
+      responseValues.put(LocalStartTimeResponseValue, LocalStartTime);
+      CommandResponseInfo LocalEndTimeResponseValue =
+          new CommandResponseInfo("LocalEndTime", "Optional<Long>");
+      responseValues.put(LocalEndTimeResponseValue, LocalEndTime);
+      CommandResponseInfo OperatingModeResponseValue =
+          new CommandResponseInfo("OperatingMode", "Optional<Integer>");
+      responseValues.put(OperatingModeResponseValue, OperatingMode);
       callback.onSuccess(responseValues);
     }
 
@@ -4312,43 +4312,43 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
 
     @Override
     public void onSuccess(
-        Integer userIndex,
-        @Nullable String userName,
-        @Nullable Long userUniqueId,
-        @Nullable Integer userStatus,
-        @Nullable Integer userType,
-        @Nullable Integer credentialRule,
-        @Nullable ArrayList<ChipStructs.DoorLockClusterDlCredential> credentials,
-        @Nullable Integer creatorFabricIndex,
-        @Nullable Integer lastModifiedFabricIndex,
-        @Nullable Integer nextUserIndex) {
-      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo userIndexResponseValue = new CommandResponseInfo("userIndex", "Integer");
-      responseValues.put(userIndexResponseValue, userIndex);
-      CommandResponseInfo userNameResponseValue = new CommandResponseInfo("userName", "String");
-      responseValues.put(userNameResponseValue, userName);
-      CommandResponseInfo userUniqueIdResponseValue =
-          new CommandResponseInfo("userUniqueId", "Long");
-      responseValues.put(userUniqueIdResponseValue, userUniqueId);
-      CommandResponseInfo userStatusResponseValue =
-          new CommandResponseInfo("userStatus", "Integer");
-      responseValues.put(userStatusResponseValue, userStatus);
-      CommandResponseInfo userTypeResponseValue = new CommandResponseInfo("userType", "Integer");
-      responseValues.put(userTypeResponseValue, userType);
-      CommandResponseInfo credentialRuleResponseValue =
-          new CommandResponseInfo("credentialRule", "Integer");
-      responseValues.put(credentialRuleResponseValue, credentialRule);
-      // credentials: /* TYPE WARNING: array array defaults to */ uint8_t *
+        Integer UserIndex,
+        @Nullable String UserName,
+        @Nullable Long UserUniqueID,
+        @Nullable Integer UserStatus,
+        @Nullable Integer UserType,
+        @Nullable Integer CredentialRule,
+        @Nullable ArrayList<ChipStructs.DoorLockClusterCredentialStruct> Credentials,
+        @Nullable Integer CreatorFabricIndex,
+        @Nullable Integer LastModifiedFabricIndex,
+        @Nullable Integer NextUserIndex) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo UserIndexResponseValue = new CommandResponseInfo("UserIndex", "Integer");
+      responseValues.put(UserIndexResponseValue, UserIndex);
+      CommandResponseInfo UserNameResponseValue = new CommandResponseInfo("UserName", "String");
+      responseValues.put(UserNameResponseValue, UserName);
+      CommandResponseInfo UserUniqueIDResponseValue =
+          new CommandResponseInfo("UserUniqueID", "Long");
+      responseValues.put(UserUniqueIDResponseValue, UserUniqueID);
+      CommandResponseInfo UserStatusResponseValue =
+          new CommandResponseInfo("UserStatus", "Integer");
+      responseValues.put(UserStatusResponseValue, UserStatus);
+      CommandResponseInfo UserTypeResponseValue = new CommandResponseInfo("UserType", "Integer");
+      responseValues.put(UserTypeResponseValue, UserType);
+      CommandResponseInfo CredentialRuleResponseValue =
+          new CommandResponseInfo("CredentialRule", "Integer");
+      responseValues.put(CredentialRuleResponseValue, CredentialRule);
+      // Credentials: /* TYPE WARNING: array array defaults to */ uint8_t *
       // Conversion from this type to Java is not properly implemented yet
-      CommandResponseInfo creatorFabricIndexResponseValue =
-          new CommandResponseInfo("creatorFabricIndex", "Integer");
-      responseValues.put(creatorFabricIndexResponseValue, creatorFabricIndex);
-      CommandResponseInfo lastModifiedFabricIndexResponseValue =
-          new CommandResponseInfo("lastModifiedFabricIndex", "Integer");
-      responseValues.put(lastModifiedFabricIndexResponseValue, lastModifiedFabricIndex);
-      CommandResponseInfo nextUserIndexResponseValue =
-          new CommandResponseInfo("nextUserIndex", "Integer");
-      responseValues.put(nextUserIndexResponseValue, nextUserIndex);
+      CommandResponseInfo CreatorFabricIndexResponseValue =
+          new CommandResponseInfo("CreatorFabricIndex", "Integer");
+      responseValues.put(CreatorFabricIndexResponseValue, CreatorFabricIndex);
+      CommandResponseInfo LastModifiedFabricIndexResponseValue =
+          new CommandResponseInfo("LastModifiedFabricIndex", "Integer");
+      responseValues.put(LastModifiedFabricIndexResponseValue, LastModifiedFabricIndex);
+      CommandResponseInfo NextUserIndexResponseValue =
+          new CommandResponseInfo("NextUserIndex", "Integer");
+      responseValues.put(NextUserIndexResponseValue, NextUserIndex);
       callback.onSuccess(responseValues);
     }
 
@@ -4370,15 +4370,15 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
 
     @Override
     public void onSuccess(
-        Integer status, @Nullable Integer userIndex, @Nullable Integer nextCredentialIndex) {
+        Integer Status, @Nullable Integer UserIndex, @Nullable Integer NextCredentialIndex) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo statusResponseValue = new CommandResponseInfo("status", "Integer");
-      responseValues.put(statusResponseValue, status);
-      CommandResponseInfo userIndexResponseValue = new CommandResponseInfo("userIndex", "Integer");
-      responseValues.put(userIndexResponseValue, userIndex);
-      CommandResponseInfo nextCredentialIndexResponseValue =
-          new CommandResponseInfo("nextCredentialIndex", "Integer");
-      responseValues.put(nextCredentialIndexResponseValue, nextCredentialIndex);
+      CommandResponseInfo StatusResponseValue = new CommandResponseInfo("Status", "Integer");
+      responseValues.put(StatusResponseValue, Status);
+      CommandResponseInfo UserIndexResponseValue = new CommandResponseInfo("UserIndex", "Integer");
+      responseValues.put(UserIndexResponseValue, UserIndex);
+      CommandResponseInfo NextCredentialIndexResponseValue =
+          new CommandResponseInfo("NextCredentialIndex", "Integer");
+      responseValues.put(NextCredentialIndexResponseValue, NextCredentialIndex);
       callback.onSuccess(responseValues);
     }
 
@@ -4400,26 +4400,26 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
 
     @Override
     public void onSuccess(
-        Boolean credentialExists,
-        @Nullable Integer userIndex,
-        @Nullable Integer creatorFabricIndex,
-        @Nullable Integer lastModifiedFabricIndex,
-        @Nullable Integer nextCredentialIndex) {
-      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo credentialExistsResponseValue =
-          new CommandResponseInfo("credentialExists", "Boolean");
-      responseValues.put(credentialExistsResponseValue, credentialExists);
-      CommandResponseInfo userIndexResponseValue = new CommandResponseInfo("userIndex", "Integer");
-      responseValues.put(userIndexResponseValue, userIndex);
-      CommandResponseInfo creatorFabricIndexResponseValue =
-          new CommandResponseInfo("creatorFabricIndex", "Integer");
-      responseValues.put(creatorFabricIndexResponseValue, creatorFabricIndex);
-      CommandResponseInfo lastModifiedFabricIndexResponseValue =
-          new CommandResponseInfo("lastModifiedFabricIndex", "Integer");
-      responseValues.put(lastModifiedFabricIndexResponseValue, lastModifiedFabricIndex);
-      CommandResponseInfo nextCredentialIndexResponseValue =
-          new CommandResponseInfo("nextCredentialIndex", "Integer");
-      responseValues.put(nextCredentialIndexResponseValue, nextCredentialIndex);
+        Boolean CredentialExists,
+        @Nullable Integer UserIndex,
+        @Nullable Integer CreatorFabricIndex,
+        @Nullable Integer LastModifiedFabricIndex,
+        @Nullable Integer NextCredentialIndex) {
+      Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
+      CommandResponseInfo CredentialExistsResponseValue =
+          new CommandResponseInfo("CredentialExists", "Boolean");
+      responseValues.put(CredentialExistsResponseValue, CredentialExists);
+      CommandResponseInfo UserIndexResponseValue = new CommandResponseInfo("UserIndex", "Integer");
+      responseValues.put(UserIndexResponseValue, UserIndex);
+      CommandResponseInfo CreatorFabricIndexResponseValue =
+          new CommandResponseInfo("CreatorFabricIndex", "Integer");
+      responseValues.put(CreatorFabricIndexResponseValue, CreatorFabricIndex);
+      CommandResponseInfo LastModifiedFabricIndexResponseValue =
+          new CommandResponseInfo("LastModifiedFabricIndex", "Integer");
+      responseValues.put(LastModifiedFabricIndexResponseValue, LastModifiedFabricIndex);
+      CommandResponseInfo NextCredentialIndexResponseValue =
+          new CommandResponseInfo("NextCredentialIndex", "Integer");
+      responseValues.put(NextCredentialIndexResponseValue, NextCredentialIndex);
       callback.onSuccess(responseValues);
     }
 
@@ -9692,9 +9692,9 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     Map<String, InteractionInfo> doorLockClusterInteractionInfoMap = new LinkedHashMap<>();
     Map<String, CommandParameterInfo> doorLocklockDoorCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo doorLocklockDoorpinCodeCommandParameterInfo =
-        new CommandParameterInfo("pinCode", Optional.class, byte[].class);
-    doorLocklockDoorCommandParams.put("pinCode", doorLocklockDoorpinCodeCommandParameterInfo);
+    CommandParameterInfo doorLocklockDoorPINCodeCommandParameterInfo =
+        new CommandParameterInfo("PINCode", Optional.class, byte[].class);
+    doorLocklockDoorCommandParams.put("PINCode", doorLocklockDoorPINCodeCommandParameterInfo);
 
     InteractionInfo doorLocklockDoorInteractionInfo =
         new InteractionInfo(
@@ -9702,7 +9702,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
               ((ChipClusters.DoorLockCluster) cluster)
                   .lockDoor(
                       (DefaultClusterCallback) callback,
-                      (Optional<byte[]>) commandArguments.get("pinCode"),
+                      (Optional<byte[]>) commandArguments.get("PINCode"),
                       10000);
             },
             () -> new DelegatedDefaultClusterCallback(),
@@ -9710,9 +9710,9 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     doorLockClusterInteractionInfoMap.put("lockDoor", doorLocklockDoorInteractionInfo);
     Map<String, CommandParameterInfo> doorLockunlockDoorCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo doorLockunlockDoorpinCodeCommandParameterInfo =
-        new CommandParameterInfo("pinCode", Optional.class, byte[].class);
-    doorLockunlockDoorCommandParams.put("pinCode", doorLockunlockDoorpinCodeCommandParameterInfo);
+    CommandParameterInfo doorLockunlockDoorPINCodeCommandParameterInfo =
+        new CommandParameterInfo("PINCode", Optional.class, byte[].class);
+    doorLockunlockDoorCommandParams.put("PINCode", doorLockunlockDoorPINCodeCommandParameterInfo);
 
     InteractionInfo doorLockunlockDoorInteractionInfo =
         new InteractionInfo(
@@ -9720,7 +9720,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
               ((ChipClusters.DoorLockCluster) cluster)
                   .unlockDoor(
                       (DefaultClusterCallback) callback,
-                      (Optional<byte[]>) commandArguments.get("pinCode"),
+                      (Optional<byte[]>) commandArguments.get("PINCode"),
                       10000);
             },
             () -> new DelegatedDefaultClusterCallback(),
@@ -9733,10 +9733,10 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     doorLockunlockWithTimeoutCommandParams.put(
         "timeout", doorLockunlockWithTimeouttimeoutCommandParameterInfo);
 
-    CommandParameterInfo doorLockunlockWithTimeoutpinCodeCommandParameterInfo =
-        new CommandParameterInfo("pinCode", Optional.class, byte[].class);
+    CommandParameterInfo doorLockunlockWithTimeoutPINCodeCommandParameterInfo =
+        new CommandParameterInfo("PINCode", Optional.class, byte[].class);
     doorLockunlockWithTimeoutCommandParams.put(
-        "pinCode", doorLockunlockWithTimeoutpinCodeCommandParameterInfo);
+        "PINCode", doorLockunlockWithTimeoutPINCodeCommandParameterInfo);
 
     InteractionInfo doorLockunlockWithTimeoutInteractionInfo =
         new InteractionInfo(
@@ -9745,7 +9745,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
                   .unlockWithTimeout(
                       (DefaultClusterCallback) callback,
                       (Integer) commandArguments.get("timeout"),
-                      (Optional<byte[]>) commandArguments.get("pinCode"),
+                      (Optional<byte[]>) commandArguments.get("PINCode"),
                       10000);
             },
             () -> new DelegatedDefaultClusterCallback(),
@@ -10034,10 +10034,10 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
         new CommandParameterInfo("userName", String.class, String.class);
     doorLocksetUserCommandParams.put("userName", doorLocksetUseruserNameCommandParameterInfo);
 
-    CommandParameterInfo doorLocksetUseruserUniqueIdCommandParameterInfo =
-        new CommandParameterInfo("userUniqueId", Long.class, Long.class);
+    CommandParameterInfo doorLocksetUseruserUniqueIDCommandParameterInfo =
+        new CommandParameterInfo("userUniqueID", Long.class, Long.class);
     doorLocksetUserCommandParams.put(
-        "userUniqueId", doorLocksetUseruserUniqueIdCommandParameterInfo);
+        "userUniqueID", doorLocksetUseruserUniqueIDCommandParameterInfo);
 
     CommandParameterInfo doorLocksetUseruserStatusCommandParameterInfo =
         new CommandParameterInfo("userStatus", Integer.class, Integer.class);
@@ -10061,7 +10061,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
                       (Integer) commandArguments.get("operationType"),
                       (Integer) commandArguments.get("userIndex"),
                       (String) commandArguments.get("userName"),
-                      (Long) commandArguments.get("userUniqueId"),
+                      (Long) commandArguments.get("userUniqueID"),
                       (Integer) commandArguments.get("userStatus"),
                       (Integer) commandArguments.get("userType"),
                       (Integer) commandArguments.get("credentialRule"),
@@ -10139,7 +10139,8 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
                   .setCredential(
                       (ChipClusters.DoorLockCluster.SetCredentialResponseCallback) callback,
                       (Integer) commandArguments.get("operationType"),
-                      (ChipStructs.DoorLockClusterDlCredential) commandArguments.get("credential"),
+                      (ChipStructs.DoorLockClusterCredentialStruct)
+                          commandArguments.get("credential"),
                       (byte[]) commandArguments.get("credentialData"),
                       (Integer) commandArguments.get("userIndex"),
                       (Integer) commandArguments.get("userStatus"),
@@ -10157,7 +10158,8 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
               ((ChipClusters.DoorLockCluster) cluster)
                   .getCredentialStatus(
                       (ChipClusters.DoorLockCluster.GetCredentialStatusResponseCallback) callback,
-                      (ChipStructs.DoorLockClusterDlCredential) commandArguments.get("credential"));
+                      (ChipStructs.DoorLockClusterCredentialStruct)
+                          commandArguments.get("credential"));
             },
             () -> new DelegatedGetCredentialStatusResponseCallback(),
             doorLockgetCredentialStatusCommandParams);
@@ -10171,7 +10173,8 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
               ((ChipClusters.DoorLockCluster) cluster)
                   .clearCredential(
                       (DefaultClusterCallback) callback,
-                      (ChipStructs.DoorLockClusterDlCredential) commandArguments.get("credential"),
+                      (ChipStructs.DoorLockClusterCredentialStruct)
+                          commandArguments.get("credential"),
                       10000);
             },
             () -> new DelegatedDefaultClusterCallback(),
@@ -10839,10 +10842,12 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
     colorControlClusterInteractionInfoMap.put("stepColor", colorControlstepColorInteractionInfo);
     Map<String, CommandParameterInfo> colorControlmoveToColorTemperatureCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    CommandParameterInfo colorControlmoveToColorTemperaturecolorTemperatureCommandParameterInfo =
-        new CommandParameterInfo("colorTemperature", Integer.class, Integer.class);
+    CommandParameterInfo
+        colorControlmoveToColorTemperaturecolorTemperatureMiredsCommandParameterInfo =
+            new CommandParameterInfo("colorTemperatureMireds", Integer.class, Integer.class);
     colorControlmoveToColorTemperatureCommandParams.put(
-        "colorTemperature", colorControlmoveToColorTemperaturecolorTemperatureCommandParameterInfo);
+        "colorTemperatureMireds",
+        colorControlmoveToColorTemperaturecolorTemperatureMiredsCommandParameterInfo);
 
     CommandParameterInfo colorControlmoveToColorTemperaturetransitionTimeCommandParameterInfo =
         new CommandParameterInfo("transitionTime", Integer.class, Integer.class);
@@ -10865,7 +10870,7 @@ public Map<String, Map<String, InteractionInfo>> getCommandMap() {
               ((ChipClusters.ColorControlCluster) cluster)
                   .moveToColorTemperature(
                       (DefaultClusterCallback) callback,
-                      (Integer) commandArguments.get("colorTemperature"),
+                      (Integer) commandArguments.get("colorTemperatureMireds"),
                       (Integer) commandArguments.get("transitionTime"),
                       (Integer) commandArguments.get("optionsMask"),
                       (Integer) commandArguments.get("optionsOverride"));
diff --git a/src/controller/python/chip/clusters/CHIPClusters.py b/src/controller/python/chip/clusters/CHIPClusters.py
index 01388eb8a17d47..0154b9730c8257 100644
--- a/src/controller/python/chip/clusters/CHIPClusters.py
+++ b/src/controller/python/chip/clusters/CHIPClusters.py
@@ -3543,14 +3543,14 @@ class ChipClusters:
                     "commandId": 0x00000000,
                     "commandName": "LockDoor",
                     "args": {
-                        "pinCode": "bytes",
+                        "PINCode": "bytes",
                     },
                 },
             0x00000001: {
                     "commandId": 0x00000001,
                     "commandName": "UnlockDoor",
                     "args": {
-                        "pinCode": "bytes",
+                        "PINCode": "bytes",
                     },
                 },
             0x00000003: {
@@ -3558,7 +3558,7 @@ class ChipClusters:
                     "commandName": "UnlockWithTimeout",
                     "args": {
                         "timeout": "int",
-                        "pinCode": "bytes",
+                        "PINCode": "bytes",
                     },
                 },
             0x0000000B: {
@@ -3647,7 +3647,7 @@ class ChipClusters:
                         "operationType": "int",
                         "userIndex": "int",
                         "userName": "str",
-                        "userUniqueId": "int",
+                        "userUniqueID": "int",
                         "userStatus": "int",
                         "userType": "int",
                         "credentialRule": "int",
@@ -4814,7 +4814,7 @@ class ChipClusters:
                     "commandId": 0x0000000A,
                     "commandName": "MoveToColorTemperature",
                     "args": {
-                        "colorTemperature": "int",
+                        "colorTemperatureMireds": "int",
                         "transitionTime": "int",
                         "optionsMask": "int",
                         "optionsOverride": "int",
diff --git a/src/controller/python/chip/clusters/Objects.py b/src/controller/python/chip/clusters/Objects.py
index 214713eecc848d..6107527a334060 100644
--- a/src/controller/python/chip/clusters/Objects.py
+++ b/src/controller/python/chip/clusters/Objects.py
@@ -27,6 +27,7 @@
 import typing
 from dataclasses import dataclass, field
 from enum import IntEnum
+from enum import IntFlag
 
 from chip import ChipUtility
 from chip.tlv import float32, uint
@@ -83,11 +84,12 @@ class IdentifyIdentifyType(IntEnum):
 
 
 
+
     class Commands:
         @dataclass
         class Identify(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0003
-            command_id: typing.ClassVar[int] = 0x0000
+            command_id: typing.ClassVar[int] = 0x00000000
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = None
 
@@ -103,7 +105,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class TriggerEffect(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0003
-            command_id: typing.ClassVar[int] = 0x0040
+            command_id: typing.ClassVar[int] = 0x00000040
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = None
 
@@ -258,12 +260,17 @@ def descriptor(cls) -> ClusterObjectDescriptor:
     clusterRevision: 'uint' = None
 
 
+    class Bitmaps:
+        class GroupClusterFeature(IntFlag):
+            kGroupNames = 0x1
+
+
 
     class Commands:
         @dataclass
         class AddGroup(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0004
-            command_id: typing.ClassVar[int] = 0x0000
+            command_id: typing.ClassVar[int] = 0x00000000
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = 'AddGroupResponse'
 
@@ -281,7 +288,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class AddGroupResponse(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0004
-            command_id: typing.ClassVar[int] = 0x0000
+            command_id: typing.ClassVar[int] = 0x00000000
             is_client: typing.ClassVar[bool] = False
             response_type: typing.ClassVar[str] = None
 
@@ -299,7 +306,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class ViewGroup(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0004
-            command_id: typing.ClassVar[int] = 0x0001
+            command_id: typing.ClassVar[int] = 0x00000001
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = 'ViewGroupResponse'
 
@@ -315,7 +322,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class ViewGroupResponse(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0004
-            command_id: typing.ClassVar[int] = 0x0001
+            command_id: typing.ClassVar[int] = 0x00000001
             is_client: typing.ClassVar[bool] = False
             response_type: typing.ClassVar[str] = None
 
@@ -335,7 +342,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class GetGroupMembership(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0004
-            command_id: typing.ClassVar[int] = 0x0002
+            command_id: typing.ClassVar[int] = 0x00000002
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = 'GetGroupMembershipResponse'
 
@@ -351,7 +358,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class GetGroupMembershipResponse(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0004
-            command_id: typing.ClassVar[int] = 0x0002
+            command_id: typing.ClassVar[int] = 0x00000002
             is_client: typing.ClassVar[bool] = False
             response_type: typing.ClassVar[str] = None
 
@@ -369,7 +376,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class RemoveGroup(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0004
-            command_id: typing.ClassVar[int] = 0x0003
+            command_id: typing.ClassVar[int] = 0x00000003
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = 'RemoveGroupResponse'
 
@@ -385,7 +392,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class RemoveGroupResponse(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0004
-            command_id: typing.ClassVar[int] = 0x0003
+            command_id: typing.ClassVar[int] = 0x00000003
             is_client: typing.ClassVar[bool] = False
             response_type: typing.ClassVar[str] = None
 
@@ -403,7 +410,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class RemoveAllGroups(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0004
-            command_id: typing.ClassVar[int] = 0x0004
+            command_id: typing.ClassVar[int] = 0x00000004
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = None
 
@@ -417,7 +424,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class AddGroupIfIdentifying(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0004
-            command_id: typing.ClassVar[int] = 0x0005
+            command_id: typing.ClassVar[int] = 0x00000005
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = None
 
@@ -566,6 +573,11 @@ def descriptor(cls) -> ClusterObjectDescriptor:
     clusterRevision: 'uint' = None
 
 
+    class Bitmaps:
+        class ScenesCopyMode(IntFlag):
+            kCopyAllScenes = 0x1
+
+
     class Structs:
         @dataclass
         class AttributeValuePair(ClusterObject):
@@ -599,7 +611,7 @@ class Commands:
         @dataclass
         class AddScene(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0005
-            command_id: typing.ClassVar[int] = 0x0000
+            command_id: typing.ClassVar[int] = 0x00000000
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = 'AddSceneResponse'
 
@@ -623,7 +635,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class AddSceneResponse(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0005
-            command_id: typing.ClassVar[int] = 0x0000
+            command_id: typing.ClassVar[int] = 0x00000000
             is_client: typing.ClassVar[bool] = False
             response_type: typing.ClassVar[str] = None
 
@@ -643,7 +655,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class ViewScene(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0005
-            command_id: typing.ClassVar[int] = 0x0001
+            command_id: typing.ClassVar[int] = 0x00000001
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = 'ViewSceneResponse'
 
@@ -661,7 +673,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class ViewSceneResponse(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0005
-            command_id: typing.ClassVar[int] = 0x0001
+            command_id: typing.ClassVar[int] = 0x00000001
             is_client: typing.ClassVar[bool] = False
             response_type: typing.ClassVar[str] = None
 
@@ -687,7 +699,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class RemoveScene(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0005
-            command_id: typing.ClassVar[int] = 0x0002
+            command_id: typing.ClassVar[int] = 0x00000002
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = 'RemoveSceneResponse'
 
@@ -705,7 +717,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class RemoveSceneResponse(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0005
-            command_id: typing.ClassVar[int] = 0x0002
+            command_id: typing.ClassVar[int] = 0x00000002
             is_client: typing.ClassVar[bool] = False
             response_type: typing.ClassVar[str] = None
 
@@ -725,7 +737,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class RemoveAllScenes(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0005
-            command_id: typing.ClassVar[int] = 0x0003
+            command_id: typing.ClassVar[int] = 0x00000003
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = 'RemoveAllScenesResponse'
 
@@ -741,7 +753,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class RemoveAllScenesResponse(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0005
-            command_id: typing.ClassVar[int] = 0x0003
+            command_id: typing.ClassVar[int] = 0x00000003
             is_client: typing.ClassVar[bool] = False
             response_type: typing.ClassVar[str] = None
 
@@ -759,7 +771,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class StoreScene(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0005
-            command_id: typing.ClassVar[int] = 0x0004
+            command_id: typing.ClassVar[int] = 0x00000004
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = 'StoreSceneResponse'
 
@@ -777,7 +789,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class StoreSceneResponse(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0005
-            command_id: typing.ClassVar[int] = 0x0004
+            command_id: typing.ClassVar[int] = 0x00000004
             is_client: typing.ClassVar[bool] = False
             response_type: typing.ClassVar[str] = None
 
@@ -797,7 +809,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class RecallScene(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0005
-            command_id: typing.ClassVar[int] = 0x0005
+            command_id: typing.ClassVar[int] = 0x00000005
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = None
 
@@ -817,7 +829,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class GetSceneMembership(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0005
-            command_id: typing.ClassVar[int] = 0x0006
+            command_id: typing.ClassVar[int] = 0x00000006
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = 'GetSceneMembershipResponse'
 
@@ -833,7 +845,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class GetSceneMembershipResponse(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0005
-            command_id: typing.ClassVar[int] = 0x0006
+            command_id: typing.ClassVar[int] = 0x00000006
             is_client: typing.ClassVar[bool] = False
             response_type: typing.ClassVar[str] = None
 
@@ -855,7 +867,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class EnhancedAddScene(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0005
-            command_id: typing.ClassVar[int] = 0x0040
+            command_id: typing.ClassVar[int] = 0x00000040
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = 'EnhancedAddSceneResponse'
 
@@ -879,7 +891,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class EnhancedAddSceneResponse(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0005
-            command_id: typing.ClassVar[int] = 0x0040
+            command_id: typing.ClassVar[int] = 0x00000040
             is_client: typing.ClassVar[bool] = False
             response_type: typing.ClassVar[str] = None
 
@@ -899,7 +911,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class EnhancedViewScene(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0005
-            command_id: typing.ClassVar[int] = 0x0041
+            command_id: typing.ClassVar[int] = 0x00000041
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = 'EnhancedViewSceneResponse'
 
@@ -917,7 +929,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class EnhancedViewSceneResponse(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0005
-            command_id: typing.ClassVar[int] = 0x0041
+            command_id: typing.ClassVar[int] = 0x00000041
             is_client: typing.ClassVar[bool] = False
             response_type: typing.ClassVar[str] = None
 
@@ -943,7 +955,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class CopyScene(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0005
-            command_id: typing.ClassVar[int] = 0x0042
+            command_id: typing.ClassVar[int] = 0x00000042
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = 'CopySceneResponse'
 
@@ -967,7 +979,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class CopySceneResponse(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0005
-            command_id: typing.ClassVar[int] = 0x0042
+            command_id: typing.ClassVar[int] = 0x00000042
             is_client: typing.ClassVar[bool] = False
             response_type: typing.ClassVar[str] = None
 
@@ -1214,12 +1226,23 @@ class OnOffStartUpOnOff(IntEnum):
             kTogglePreviousOnOff = 0x02
 
 
+    class Bitmaps:
+        class OnOffControl(IntFlag):
+            kAcceptOnlyWhenOn = 0x1
+
+        class OnOffFeature(IntFlag):
+            kLighting = 0x1
+
+        class SceneFeatures(IntFlag):
+            kSceneNames = 0x1
+
+
 
     class Commands:
         @dataclass
         class Off(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0006
-            command_id: typing.ClassVar[int] = 0x0000
+            command_id: typing.ClassVar[int] = 0x00000000
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = None
 
@@ -1233,7 +1256,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class On(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0006
-            command_id: typing.ClassVar[int] = 0x0001
+            command_id: typing.ClassVar[int] = 0x00000001
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = None
 
@@ -1247,7 +1270,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class Toggle(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0006
-            command_id: typing.ClassVar[int] = 0x0002
+            command_id: typing.ClassVar[int] = 0x00000002
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = None
 
@@ -1261,7 +1284,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class OffWithEffect(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0006
-            command_id: typing.ClassVar[int] = 0x0040
+            command_id: typing.ClassVar[int] = 0x00000040
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = None
 
@@ -1279,7 +1302,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class OnWithRecallGlobalScene(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0006
-            command_id: typing.ClassVar[int] = 0x0041
+            command_id: typing.ClassVar[int] = 0x00000041
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = None
 
@@ -1293,7 +1316,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class OnWithTimedOff(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0006
-            command_id: typing.ClassVar[int] = 0x0042
+            command_id: typing.ClassVar[int] = 0x00000042
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = None
 
@@ -1502,6 +1525,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
 
 
 
+
     class Attributes:
         @dataclass
         class SwitchType(ClusterAttributeDescriptor):
@@ -1676,12 +1700,23 @@ class StepMode(IntEnum):
             kDown = 0x01
 
 
+    class Bitmaps:
+        class LevelControlFeature(IntFlag):
+            kOnOff = 0x1
+            kLighting = 0x2
+            kFrequency = 0x4
+
+        class LevelControlOptions(IntFlag):
+            kExecuteIfOff = 0x1
+            kCoupleColorTempToLevel = 0x2
+
+
 
     class Commands:
         @dataclass
         class MoveToLevel(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0008
-            command_id: typing.ClassVar[int] = 0x0000
+            command_id: typing.ClassVar[int] = 0x00000000
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = None
 
@@ -1703,7 +1738,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class Move(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0008
-            command_id: typing.ClassVar[int] = 0x0001
+            command_id: typing.ClassVar[int] = 0x00000001
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = None
 
@@ -1725,7 +1760,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class Step(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0008
-            command_id: typing.ClassVar[int] = 0x0002
+            command_id: typing.ClassVar[int] = 0x00000002
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = None
 
@@ -1749,7 +1784,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class Stop(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0008
-            command_id: typing.ClassVar[int] = 0x0003
+            command_id: typing.ClassVar[int] = 0x00000003
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = None
 
@@ -1767,7 +1802,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class MoveToLevelWithOnOff(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0008
-            command_id: typing.ClassVar[int] = 0x0004
+            command_id: typing.ClassVar[int] = 0x00000004
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = None
 
@@ -1789,7 +1824,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class MoveWithOnOff(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0008
-            command_id: typing.ClassVar[int] = 0x0005
+            command_id: typing.ClassVar[int] = 0x00000005
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = None
 
@@ -1811,7 +1846,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class StepWithOnOff(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0008
-            command_id: typing.ClassVar[int] = 0x0006
+            command_id: typing.ClassVar[int] = 0x00000006
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = None
 
@@ -1835,7 +1870,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class StopWithOnOff(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0008
-            command_id: typing.ClassVar[int] = 0x0007
+            command_id: typing.ClassVar[int] = 0x00000007
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = None
 
@@ -1853,7 +1888,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class MoveToClosestFrequency(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0008
-            command_id: typing.ClassVar[int] = 0x0008
+            command_id: typing.ClassVar[int] = 0x00000008
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = None
 
@@ -2216,6 +2251,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
 
 
 
+
     class Attributes:
         @dataclass
         class ActiveText(ClusterAttributeDescriptor):
@@ -2467,6 +2503,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
 
 
 
+
     class Attributes:
         @dataclass
         class GeneratedCommandList(ClusterAttributeDescriptor):
@@ -2580,6 +2617,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
     clusterRevision: 'uint' = None
 
 
+
     class Structs:
         @dataclass
         class DeviceTypeStruct(ClusterObject):
@@ -2768,6 +2806,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
     clusterRevision: 'uint' = None
 
 
+
     class Structs:
         @dataclass
         class TargetStruct(ClusterObject):
@@ -2940,6 +2979,7 @@ class ChangeTypeEnum(IntEnum):
             kRemoved = 0x02
 
 
+
     class Structs:
         @dataclass
         class Target(ClusterObject):
@@ -3262,6 +3302,22 @@ class EndpointListTypeEnum(IntEnum):
             kZone = 0x02
 
 
+    class Bitmaps:
+        class CommandBits(IntFlag):
+            kInstantAction = 0x1
+            kInstantActionWithTransition = 0x2
+            kStartAction = 0x4
+            kStartActionWithDuration = 0x8
+            kStopAction = 0x10
+            kPauseAction = 0x20
+            kPauseActionWithDuration = 0x40
+            kResumeAction = 0x80
+            kEnableAction = 0x100
+            kEnableActionWithDuration = 0x200
+            kDisableAction = 0x400
+            kDisableActionWithDuration = 0x800
+
+
     class Structs:
         @dataclass
         class ActionStruct(ClusterObject):
@@ -3307,7 +3363,7 @@ class Commands:
         @dataclass
         class InstantAction(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0025
-            command_id: typing.ClassVar[int] = 0x0000
+            command_id: typing.ClassVar[int] = 0x00000000
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = None
 
@@ -3325,7 +3381,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class InstantActionWithTransition(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0025
-            command_id: typing.ClassVar[int] = 0x0001
+            command_id: typing.ClassVar[int] = 0x00000001
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = None
 
@@ -3345,7 +3401,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class StartAction(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0025
-            command_id: typing.ClassVar[int] = 0x0002
+            command_id: typing.ClassVar[int] = 0x00000002
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = None
 
@@ -3363,7 +3419,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class StartActionWithDuration(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0025
-            command_id: typing.ClassVar[int] = 0x0003
+            command_id: typing.ClassVar[int] = 0x00000003
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = None
 
@@ -3383,7 +3439,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class StopAction(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0025
-            command_id: typing.ClassVar[int] = 0x0004
+            command_id: typing.ClassVar[int] = 0x00000004
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = None
 
@@ -3401,7 +3457,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class PauseAction(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0025
-            command_id: typing.ClassVar[int] = 0x0005
+            command_id: typing.ClassVar[int] = 0x00000005
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = None
 
@@ -3419,7 +3475,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class PauseActionWithDuration(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0025
-            command_id: typing.ClassVar[int] = 0x0006
+            command_id: typing.ClassVar[int] = 0x00000006
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = None
 
@@ -3439,7 +3495,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class ResumeAction(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0025
-            command_id: typing.ClassVar[int] = 0x0007
+            command_id: typing.ClassVar[int] = 0x00000007
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = None
 
@@ -3457,7 +3513,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class EnableAction(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0025
-            command_id: typing.ClassVar[int] = 0x0008
+            command_id: typing.ClassVar[int] = 0x00000008
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = None
 
@@ -3475,7 +3531,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class EnableActionWithDuration(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0025
-            command_id: typing.ClassVar[int] = 0x0009
+            command_id: typing.ClassVar[int] = 0x00000009
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = None
 
@@ -3495,7 +3551,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class DisableAction(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0025
-            command_id: typing.ClassVar[int] = 0x000A
+            command_id: typing.ClassVar[int] = 0x0000000A
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = None
 
@@ -3513,7 +3569,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class DisableActionWithDuration(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0025
-            command_id: typing.ClassVar[int] = 0x000B
+            command_id: typing.ClassVar[int] = 0x0000000B
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = None
 
@@ -3773,6 +3829,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
     clusterRevision: 'uint' = None
 
 
+
     class Structs:
         @dataclass
         class CapabilityMinimaStruct(ClusterObject):
@@ -3793,7 +3850,7 @@ class Commands:
         @dataclass
         class MfgSpecificPing(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0028
-            command_id: typing.ClassVar[int] = 0x0000
+            command_id: typing.ClassVar[int] = 0x10020000
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = None
 
@@ -4324,11 +4381,12 @@ class OTAQueryStatus(IntEnum):
 
 
 
+
     class Commands:
         @dataclass
         class QueryImage(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0029
-            command_id: typing.ClassVar[int] = 0x0000
+            command_id: typing.ClassVar[int] = 0x00000000
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = 'QueryImageResponse'
 
@@ -4358,7 +4416,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class QueryImageResponse(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0029
-            command_id: typing.ClassVar[int] = 0x0001
+            command_id: typing.ClassVar[int] = 0x00000001
             is_client: typing.ClassVar[bool] = False
             response_type: typing.ClassVar[str] = None
 
@@ -4388,7 +4446,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class ApplyUpdateRequest(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0029
-            command_id: typing.ClassVar[int] = 0x0002
+            command_id: typing.ClassVar[int] = 0x00000002
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = 'ApplyUpdateResponse'
 
@@ -4406,7 +4464,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class ApplyUpdateResponse(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0029
-            command_id: typing.ClassVar[int] = 0x0003
+            command_id: typing.ClassVar[int] = 0x00000003
             is_client: typing.ClassVar[bool] = False
             response_type: typing.ClassVar[str] = None
 
@@ -4424,7 +4482,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class NotifyUpdateApplied(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0029
-            command_id: typing.ClassVar[int] = 0x0004
+            command_id: typing.ClassVar[int] = 0x00000004
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = None
 
@@ -4577,6 +4635,7 @@ class OTAUpdateStateEnum(IntEnum):
             kDelayedOnUserConsent = 0x08
 
 
+
     class Structs:
         @dataclass
         class ProviderLocation(ClusterObject):
@@ -4599,7 +4658,7 @@ class Commands:
         @dataclass
         class AnnounceOTAProvider(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x002A
-            command_id: typing.ClassVar[int] = 0x0000
+            command_id: typing.ClassVar[int] = 0x00000000
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = None
 
@@ -4868,6 +4927,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
 
 
 
+
     class Attributes:
         @dataclass
         class ActiveLocale(ClusterAttributeDescriptor):
@@ -5032,6 +5092,7 @@ class HourFormat(IntEnum):
 
 
 
+
     class Attributes:
         @dataclass
         class HourFormat(ClusterAttributeDescriptor):
@@ -5193,6 +5254,11 @@ class TempUnit(IntEnum):
             kKelvin = 0x02
 
 
+    class Bitmaps:
+        class UnitLocalizationFeature(IntFlag):
+            kTemperatureUnit = 0x1
+
+
 
 
     class Attributes:
@@ -5320,6 +5386,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
 
 
 
+
     class Attributes:
         @dataclass
         class Sources(ClusterAttributeDescriptor):
@@ -5554,6 +5621,14 @@ class WiredFault(IntEnum):
             kUnderVoltage = 0x02
 
 
+    class Bitmaps:
+        class PowerSourceFeature(IntFlag):
+            kWired = 0x1
+            kBattery = 0x2
+            kRechargeable = 0x4
+            kReplaceable = 0x8
+
+
     class Structs:
         @dataclass
         class BatChargeFaultChangeType(ClusterObject):
@@ -6285,6 +6360,7 @@ class RegulatoryLocationType(IntEnum):
             kIndoorOutdoor = 0x02
 
 
+
     class Structs:
         @dataclass
         class BasicCommissioningInfo(ClusterObject):
@@ -6305,7 +6381,7 @@ class Commands:
         @dataclass
         class ArmFailSafe(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0030
-            command_id: typing.ClassVar[int] = 0x0000
+            command_id: typing.ClassVar[int] = 0x00000000
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = 'ArmFailSafeResponse'
 
@@ -6323,7 +6399,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class ArmFailSafeResponse(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0030
-            command_id: typing.ClassVar[int] = 0x0001
+            command_id: typing.ClassVar[int] = 0x00000001
             is_client: typing.ClassVar[bool] = False
             response_type: typing.ClassVar[str] = None
 
@@ -6341,7 +6417,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class SetRegulatoryConfig(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0030
-            command_id: typing.ClassVar[int] = 0x0002
+            command_id: typing.ClassVar[int] = 0x00000002
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = 'SetRegulatoryConfigResponse'
 
@@ -6361,7 +6437,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class SetRegulatoryConfigResponse(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0030
-            command_id: typing.ClassVar[int] = 0x0003
+            command_id: typing.ClassVar[int] = 0x00000003
             is_client: typing.ClassVar[bool] = False
             response_type: typing.ClassVar[str] = None
 
@@ -6379,7 +6455,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class CommissioningComplete(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0030
-            command_id: typing.ClassVar[int] = 0x0004
+            command_id: typing.ClassVar[int] = 0x00000004
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = 'CommissioningCompleteResponse'
 
@@ -6393,7 +6469,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class CommissioningCompleteResponse(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0030
-            command_id: typing.ClassVar[int] = 0x0005
+            command_id: typing.ClassVar[int] = 0x00000005
             is_client: typing.ClassVar[bool] = False
             response_type: typing.ClassVar[str] = None
 
@@ -6633,6 +6709,20 @@ class WiFiBand(IntEnum):
             k60g = 0x04
 
 
+    class Bitmaps:
+        class NetworkCommissioningFeature(IntFlag):
+            kWiFiNetworkInterface = 0x1
+            kThreadNetworkInterface = 0x2
+            kEthernetNetworkInterface = 0x4
+
+        class WiFiSecurity(IntFlag):
+            kUnencrypted = 0x1
+            kWep = 0x2
+            kWpaPersonal = 0x4
+            kWpa2Personal = 0x8
+            kWpa3Personal = 0x10
+
+
     class Structs:
         @dataclass
         class NetworkInfo(ClusterObject):
@@ -6699,7 +6789,7 @@ class Commands:
         @dataclass
         class ScanNetworks(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0031
-            command_id: typing.ClassVar[int] = 0x0000
+            command_id: typing.ClassVar[int] = 0x00000000
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = 'ScanNetworksResponse'
 
@@ -6717,7 +6807,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class ScanNetworksResponse(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0031
-            command_id: typing.ClassVar[int] = 0x0001
+            command_id: typing.ClassVar[int] = 0x00000001
             is_client: typing.ClassVar[bool] = False
             response_type: typing.ClassVar[str] = None
 
@@ -6739,7 +6829,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class AddOrUpdateWiFiNetwork(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0031
-            command_id: typing.ClassVar[int] = 0x0002
+            command_id: typing.ClassVar[int] = 0x00000002
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = 'NetworkConfigResponse'
 
@@ -6759,7 +6849,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class AddOrUpdateThreadNetwork(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0031
-            command_id: typing.ClassVar[int] = 0x0003
+            command_id: typing.ClassVar[int] = 0x00000003
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = 'NetworkConfigResponse'
 
@@ -6777,7 +6867,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class RemoveNetwork(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0031
-            command_id: typing.ClassVar[int] = 0x0004
+            command_id: typing.ClassVar[int] = 0x00000004
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = 'NetworkConfigResponse'
 
@@ -6795,7 +6885,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class NetworkConfigResponse(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0031
-            command_id: typing.ClassVar[int] = 0x0005
+            command_id: typing.ClassVar[int] = 0x00000005
             is_client: typing.ClassVar[bool] = False
             response_type: typing.ClassVar[str] = None
 
@@ -6815,7 +6905,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class ConnectNetwork(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0031
-            command_id: typing.ClassVar[int] = 0x0006
+            command_id: typing.ClassVar[int] = 0x00000006
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = 'ConnectNetworkResponse'
 
@@ -6833,7 +6923,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class ConnectNetworkResponse(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0031
-            command_id: typing.ClassVar[int] = 0x0007
+            command_id: typing.ClassVar[int] = 0x00000007
             is_client: typing.ClassVar[bool] = False
             response_type: typing.ClassVar[str] = None
 
@@ -6853,7 +6943,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class ReorderNetwork(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0031
-            command_id: typing.ClassVar[int] = 0x0008
+            command_id: typing.ClassVar[int] = 0x00000008
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = 'NetworkConfigResponse'
 
@@ -7122,11 +7212,12 @@ class LogsTransferProtocol(IntEnum):
 
 
 
+
     class Commands:
         @dataclass
         class RetrieveLogsRequest(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0032
-            command_id: typing.ClassVar[int] = 0x0000
+            command_id: typing.ClassVar[int] = 0x00000000
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = 'RetrieveLogsResponse'
 
@@ -7146,7 +7237,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class RetrieveLogsResponse(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0032
-            command_id: typing.ClassVar[int] = 0x0001
+            command_id: typing.ClassVar[int] = 0x00000001
             is_client: typing.ClassVar[bool] = False
             response_type: typing.ClassVar[str] = None
 
@@ -7262,9 +7353,9 @@ def descriptor(cls) -> ClusterObjectDescriptor:
                 ClusterObjectFieldDescriptor(Label="upTime", Tag=0x00000002, Type=typing.Optional[uint]),
                 ClusterObjectFieldDescriptor(Label="totalOperationalHours", Tag=0x00000003, Type=typing.Optional[uint]),
                 ClusterObjectFieldDescriptor(Label="bootReason", Tag=0x00000004, Type=typing.Optional[GeneralDiagnostics.Enums.BootReasonEnum]),
-                ClusterObjectFieldDescriptor(Label="activeHardwareFaults", Tag=0x00000005, Type=typing.Optional[typing.List[GeneralDiagnostics.Enums.HardwareFault]]),
-                ClusterObjectFieldDescriptor(Label="activeRadioFaults", Tag=0x00000006, Type=typing.Optional[typing.List[GeneralDiagnostics.Enums.RadioFault]]),
-                ClusterObjectFieldDescriptor(Label="activeNetworkFaults", Tag=0x00000007, Type=typing.Optional[typing.List[GeneralDiagnostics.Enums.NetworkFaultType]]),
+                ClusterObjectFieldDescriptor(Label="activeHardwareFaults", Tag=0x00000005, Type=typing.Optional[typing.List[GeneralDiagnostics.Enums.HardwareFaultEnum]]),
+                ClusterObjectFieldDescriptor(Label="activeRadioFaults", Tag=0x00000006, Type=typing.Optional[typing.List[GeneralDiagnostics.Enums.RadioFaultEnum]]),
+                ClusterObjectFieldDescriptor(Label="activeNetworkFaults", Tag=0x00000007, Type=typing.Optional[typing.List[GeneralDiagnostics.Enums.NetworkFaultEnum]]),
                 ClusterObjectFieldDescriptor(Label="testEventTriggersEnabled", Tag=0x00000008, Type=bool),
                 ClusterObjectFieldDescriptor(Label="generatedCommandList", Tag=0x0000FFF8, Type=typing.List[uint]),
                 ClusterObjectFieldDescriptor(Label="acceptedCommandList", Tag=0x0000FFF9, Type=typing.List[uint]),
@@ -7278,9 +7369,9 @@ def descriptor(cls) -> ClusterObjectDescriptor:
     upTime: 'typing.Optional[uint]' = None
     totalOperationalHours: 'typing.Optional[uint]' = None
     bootReason: 'typing.Optional[GeneralDiagnostics.Enums.BootReasonEnum]' = None
-    activeHardwareFaults: 'typing.Optional[typing.List[GeneralDiagnostics.Enums.HardwareFault]]' = None
-    activeRadioFaults: 'typing.Optional[typing.List[GeneralDiagnostics.Enums.RadioFault]]' = None
-    activeNetworkFaults: 'typing.Optional[typing.List[GeneralDiagnostics.Enums.NetworkFaultType]]' = None
+    activeHardwareFaults: 'typing.Optional[typing.List[GeneralDiagnostics.Enums.HardwareFaultEnum]]' = None
+    activeRadioFaults: 'typing.Optional[typing.List[GeneralDiagnostics.Enums.RadioFaultEnum]]' = None
+    activeNetworkFaults: 'typing.Optional[typing.List[GeneralDiagnostics.Enums.NetworkFaultEnum]]' = None
     testEventTriggersEnabled: 'bool' = None
     generatedCommandList: 'typing.List[uint]' = None
     acceptedCommandList: 'typing.List[uint]' = None
@@ -7298,7 +7389,7 @@ class BootReasonEnum(IntEnum):
             kSoftwareUpdateCompleted = 0x05
             kSoftwareReset = 0x06
 
-        class HardwareFault(IntEnum):
+        class HardwareFaultEnum(IntEnum):
             kUnspecified = 0x00
             kRadio = 0x01
             kSensor = 0x02
@@ -7311,20 +7402,20 @@ class HardwareFault(IntEnum):
             kNonVolatileMemoryError = 0x09
             kTamperDetected = 0x0A
 
-        class InterfaceType(IntEnum):
+        class InterfaceTypeEnum(IntEnum):
             kUnspecified = 0x00
             kWiFi = 0x01
             kEthernet = 0x02
             kCellular = 0x03
             kThread = 0x04
 
-        class NetworkFaultType(IntEnum):
+        class NetworkFaultEnum(IntEnum):
             kUnspecified = 0x00
             kHardwareFailure = 0x01
             kNetworkJammed = 0x02
             kConnectionFailed = 0x03
 
-        class RadioFault(IntEnum):
+        class RadioFaultEnum(IntEnum):
             kUnspecified = 0x00
             kWiFiFault = 0x01
             kCellularFault = 0x02
@@ -7334,6 +7425,7 @@ class RadioFault(IntEnum):
             kEthernetFault = 0x06
 
 
+
     class Structs:
         @dataclass
         class NetworkInterface(ClusterObject):
@@ -7348,7 +7440,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
                             ClusterObjectFieldDescriptor(Label="hardwareAddress", Tag=4, Type=bytes),
                             ClusterObjectFieldDescriptor(Label="IPv4Addresses", Tag=5, Type=typing.List[bytes]),
                             ClusterObjectFieldDescriptor(Label="IPv6Addresses", Tag=6, Type=typing.List[bytes]),
-                            ClusterObjectFieldDescriptor(Label="type", Tag=7, Type=GeneralDiagnostics.Enums.InterfaceType),
+                            ClusterObjectFieldDescriptor(Label="type", Tag=7, Type=GeneralDiagnostics.Enums.InterfaceTypeEnum),
                     ])
 
             name: 'str' = ""
@@ -7358,7 +7450,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
             hardwareAddress: 'bytes' = b""
             IPv4Addresses: 'typing.List[bytes]' = field(default_factory=lambda: [])
             IPv6Addresses: 'typing.List[bytes]' = field(default_factory=lambda: [])
-            type: 'GeneralDiagnostics.Enums.InterfaceType' = 0
+            type: 'GeneralDiagnostics.Enums.InterfaceTypeEnum' = 0
 
 
 
@@ -7366,7 +7458,7 @@ class Commands:
         @dataclass
         class TestEventTrigger(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0033
-            command_id: typing.ClassVar[int] = 0x0000
+            command_id: typing.ClassVar[int] = 0x00000000
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = None
 
@@ -7475,9 +7567,9 @@ def attribute_id(cls) -> int:
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[typing.List[GeneralDiagnostics.Enums.HardwareFault]])
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[typing.List[GeneralDiagnostics.Enums.HardwareFaultEnum]])
 
-            value: 'typing.Optional[typing.List[GeneralDiagnostics.Enums.HardwareFault]]' = None
+            value: 'typing.Optional[typing.List[GeneralDiagnostics.Enums.HardwareFaultEnum]]' = None
 
         @dataclass
         class ActiveRadioFaults(ClusterAttributeDescriptor):
@@ -7491,9 +7583,9 @@ def attribute_id(cls) -> int:
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[typing.List[GeneralDiagnostics.Enums.RadioFault]])
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[typing.List[GeneralDiagnostics.Enums.RadioFaultEnum]])
 
-            value: 'typing.Optional[typing.List[GeneralDiagnostics.Enums.RadioFault]]' = None
+            value: 'typing.Optional[typing.List[GeneralDiagnostics.Enums.RadioFaultEnum]]' = None
 
         @dataclass
         class ActiveNetworkFaults(ClusterAttributeDescriptor):
@@ -7507,9 +7599,9 @@ def attribute_id(cls) -> int:
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Optional[typing.List[GeneralDiagnostics.Enums.NetworkFaultType]])
+                return ClusterObjectFieldDescriptor(Type=typing.Optional[typing.List[GeneralDiagnostics.Enums.NetworkFaultEnum]])
 
-            value: 'typing.Optional[typing.List[GeneralDiagnostics.Enums.NetworkFaultType]]' = None
+            value: 'typing.Optional[typing.List[GeneralDiagnostics.Enums.NetworkFaultEnum]]' = None
 
         @dataclass
         class TestEventTriggersEnabled(ClusterAttributeDescriptor):
@@ -7623,12 +7715,12 @@ def event_id(cls) -> int:
             def descriptor(cls) -> ClusterObjectDescriptor:
                 return ClusterObjectDescriptor(
                     Fields = [
-                            ClusterObjectFieldDescriptor(Label="current", Tag=0, Type=typing.List[GeneralDiagnostics.Enums.HardwareFault]),
-                            ClusterObjectFieldDescriptor(Label="previous", Tag=1, Type=typing.List[GeneralDiagnostics.Enums.HardwareFault]),
+                            ClusterObjectFieldDescriptor(Label="current", Tag=0, Type=typing.List[GeneralDiagnostics.Enums.HardwareFaultEnum]),
+                            ClusterObjectFieldDescriptor(Label="previous", Tag=1, Type=typing.List[GeneralDiagnostics.Enums.HardwareFaultEnum]),
                     ])
 
-            current: 'typing.List[GeneralDiagnostics.Enums.HardwareFault]' = field(default_factory=lambda: [])
-            previous: 'typing.List[GeneralDiagnostics.Enums.HardwareFault]' = field(default_factory=lambda: [])
+            current: 'typing.List[GeneralDiagnostics.Enums.HardwareFaultEnum]' = field(default_factory=lambda: [])
+            previous: 'typing.List[GeneralDiagnostics.Enums.HardwareFaultEnum]' = field(default_factory=lambda: [])
 
         @dataclass
         class RadioFaultChange(ClusterEvent):
@@ -7644,12 +7736,12 @@ def event_id(cls) -> int:
             def descriptor(cls) -> ClusterObjectDescriptor:
                 return ClusterObjectDescriptor(
                     Fields = [
-                            ClusterObjectFieldDescriptor(Label="current", Tag=0, Type=typing.List[GeneralDiagnostics.Enums.RadioFault]),
-                            ClusterObjectFieldDescriptor(Label="previous", Tag=1, Type=typing.List[GeneralDiagnostics.Enums.RadioFault]),
+                            ClusterObjectFieldDescriptor(Label="current", Tag=0, Type=typing.List[GeneralDiagnostics.Enums.RadioFaultEnum]),
+                            ClusterObjectFieldDescriptor(Label="previous", Tag=1, Type=typing.List[GeneralDiagnostics.Enums.RadioFaultEnum]),
                     ])
 
-            current: 'typing.List[GeneralDiagnostics.Enums.RadioFault]' = field(default_factory=lambda: [])
-            previous: 'typing.List[GeneralDiagnostics.Enums.RadioFault]' = field(default_factory=lambda: [])
+            current: 'typing.List[GeneralDiagnostics.Enums.RadioFaultEnum]' = field(default_factory=lambda: [])
+            previous: 'typing.List[GeneralDiagnostics.Enums.RadioFaultEnum]' = field(default_factory=lambda: [])
 
         @dataclass
         class NetworkFaultChange(ClusterEvent):
@@ -7665,12 +7757,12 @@ def event_id(cls) -> int:
             def descriptor(cls) -> ClusterObjectDescriptor:
                 return ClusterObjectDescriptor(
                     Fields = [
-                            ClusterObjectFieldDescriptor(Label="current", Tag=0, Type=typing.List[GeneralDiagnostics.Enums.NetworkFaultType]),
-                            ClusterObjectFieldDescriptor(Label="previous", Tag=1, Type=typing.List[GeneralDiagnostics.Enums.NetworkFaultType]),
+                            ClusterObjectFieldDescriptor(Label="current", Tag=0, Type=typing.List[GeneralDiagnostics.Enums.NetworkFaultEnum]),
+                            ClusterObjectFieldDescriptor(Label="previous", Tag=1, Type=typing.List[GeneralDiagnostics.Enums.NetworkFaultEnum]),
                     ])
 
-            current: 'typing.List[GeneralDiagnostics.Enums.NetworkFaultType]' = field(default_factory=lambda: [])
-            previous: 'typing.List[GeneralDiagnostics.Enums.NetworkFaultType]' = field(default_factory=lambda: [])
+            current: 'typing.List[GeneralDiagnostics.Enums.NetworkFaultEnum]' = field(default_factory=lambda: [])
+            previous: 'typing.List[GeneralDiagnostics.Enums.NetworkFaultEnum]' = field(default_factory=lambda: [])
 
         @dataclass
         class BootReason(ClusterEvent):
@@ -7722,6 +7814,11 @@ def descriptor(cls) -> ClusterObjectDescriptor:
     clusterRevision: 'uint' = None
 
 
+    class Bitmaps:
+        class SoftwareDiagnosticsFeature(IntFlag):
+            kWaterMarks = 0x1
+
+
     class Structs:
         @dataclass
         class ThreadMetricsStruct(ClusterObject):
@@ -7748,7 +7845,7 @@ class Commands:
         @dataclass
         class ResetWatermarks(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0034
-            command_id: typing.ClassVar[int] = 0x0000
+            command_id: typing.ClassVar[int] = 0x00000000
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = None
 
@@ -8099,6 +8196,14 @@ class RoutingRole(IntEnum):
             kLeader = 0x06
 
 
+    class Bitmaps:
+        class ThreadNetworkDiagnosticsFeature(IntFlag):
+            kPacketCounts = 0x1
+            kErrorCounts = 0x2
+            kMLECounts = 0x4
+            kMACCounts = 0x8
+
+
     class Structs:
         @dataclass
         class NeighborTable(ClusterObject):
@@ -8218,7 +8323,7 @@ class Commands:
         @dataclass
         class ResetCounts(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0035
-            command_id: typing.ClassVar[int] = 0x0000
+            command_id: typing.ClassVar[int] = 0x00000000
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = None
 
@@ -9438,11 +9543,12 @@ class WiFiVersionType(IntEnum):
 
 
 
+
     class Commands:
         @dataclass
         class ResetCounts(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0036
-            command_id: typing.ClassVar[int] = 0x0000
+            command_id: typing.ClassVar[int] = 0x00000000
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = None
 
@@ -9813,7 +9919,7 @@ class EthernetNetworkDiagnostics(Cluster):
     def descriptor(cls) -> ClusterObjectDescriptor:
         return ClusterObjectDescriptor(
             Fields = [
-                ClusterObjectFieldDescriptor(Label="PHYRate", Tag=0x00000000, Type=typing.Union[None, Nullable, EthernetNetworkDiagnostics.Enums.PHYRate]),
+                ClusterObjectFieldDescriptor(Label="PHYRate", Tag=0x00000000, Type=typing.Union[None, Nullable, EthernetNetworkDiagnostics.Enums.PHYRateEnum]),
                 ClusterObjectFieldDescriptor(Label="fullDuplex", Tag=0x00000001, Type=typing.Union[None, Nullable, bool]),
                 ClusterObjectFieldDescriptor(Label="packetRxCount", Tag=0x00000002, Type=typing.Optional[uint]),
                 ClusterObjectFieldDescriptor(Label="packetTxCount", Tag=0x00000003, Type=typing.Optional[uint]),
@@ -9829,7 +9935,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
                 ClusterObjectFieldDescriptor(Label="clusterRevision", Tag=0x0000FFFD, Type=uint),
             ])
 
-    PHYRate: 'typing.Union[None, Nullable, EthernetNetworkDiagnostics.Enums.PHYRate]' = None
+    PHYRate: 'typing.Union[None, Nullable, EthernetNetworkDiagnostics.Enums.PHYRateEnum]' = None
     fullDuplex: 'typing.Union[None, Nullable, bool]' = None
     packetRxCount: 'typing.Optional[uint]' = None
     packetTxCount: 'typing.Optional[uint]' = None
@@ -9845,7 +9951,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
     clusterRevision: 'uint' = None
 
     class Enums:
-        class PHYRate(IntEnum):
+        class PHYRateEnum(IntEnum):
             kRate10M = 0x00
             kRate100M = 0x01
             kRate1G = 0x02
@@ -9859,11 +9965,12 @@ class PHYRate(IntEnum):
 
 
 
+
     class Commands:
         @dataclass
         class ResetCounts(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0037
-            command_id: typing.ClassVar[int] = 0x0000
+            command_id: typing.ClassVar[int] = 0x00000000
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = None
 
@@ -9888,9 +9995,9 @@ def attribute_id(cls) -> int:
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Union[None, Nullable, EthernetNetworkDiagnostics.Enums.PHYRate])
+                return ClusterObjectFieldDescriptor(Type=typing.Union[None, Nullable, EthernetNetworkDiagnostics.Enums.PHYRateEnum])
 
-            value: 'typing.Union[None, Nullable, EthernetNetworkDiagnostics.Enums.PHYRate]' = None
+            value: 'typing.Union[None, Nullable, EthernetNetworkDiagnostics.Enums.PHYRateEnum]' = None
 
         @dataclass
         class FullDuplex(ClusterAttributeDescriptor):
@@ -10171,6 +10278,7 @@ class TimeSourceEnum(IntEnum):
             kGnss = 0x10
 
 
+
     class Structs:
         @dataclass
         class DstOffsetType(ClusterObject):
@@ -10208,7 +10316,7 @@ class Commands:
         @dataclass
         class SetUtcTime(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0038
-            command_id: typing.ClassVar[int] = 0x0000
+            command_id: typing.ClassVar[int] = 0x00000000
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = None
 
@@ -10523,6 +10631,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
 
 
 
+
     class Attributes:
         @dataclass
         class VendorName(ClusterAttributeDescriptor):
@@ -10947,6 +11056,15 @@ def descriptor(cls) -> ClusterObjectDescriptor:
     clusterRevision: 'uint' = None
 
 
+    class Bitmaps:
+        class SwitchFeature(IntFlag):
+            kLatchingSwitch = 0x1
+            kMomentarySwitch = 0x2
+            kMomentarySwitchRelease = 0x4
+            kMomentarySwitchLongPress = 0x8
+            kMomentarySwitchMultiPress = 0x10
+
+
 
 
     class Attributes:
@@ -11226,7 +11344,7 @@ class AdministratorCommissioning(Cluster):
     def descriptor(cls) -> ClusterObjectDescriptor:
         return ClusterObjectDescriptor(
             Fields = [
-                ClusterObjectFieldDescriptor(Label="windowStatus", Tag=0x00000000, Type=AdministratorCommissioning.Enums.CommissioningWindowStatus),
+                ClusterObjectFieldDescriptor(Label="windowStatus", Tag=0x00000000, Type=AdministratorCommissioning.Enums.CommissioningWindowStatusEnum),
                 ClusterObjectFieldDescriptor(Label="adminFabricIndex", Tag=0x00000001, Type=typing.Union[Nullable, uint]),
                 ClusterObjectFieldDescriptor(Label="adminVendorId", Tag=0x00000002, Type=typing.Union[Nullable, uint]),
                 ClusterObjectFieldDescriptor(Label="generatedCommandList", Tag=0x0000FFF8, Type=typing.List[uint]),
@@ -11236,7 +11354,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
                 ClusterObjectFieldDescriptor(Label="clusterRevision", Tag=0x0000FFFD, Type=uint),
             ])
 
-    windowStatus: 'AdministratorCommissioning.Enums.CommissioningWindowStatus' = None
+    windowStatus: 'AdministratorCommissioning.Enums.CommissioningWindowStatusEnum' = None
     adminFabricIndex: 'typing.Union[Nullable, uint]' = None
     adminVendorId: 'typing.Union[Nullable, uint]' = None
     generatedCommandList: 'typing.List[uint]' = None
@@ -11246,7 +11364,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
     clusterRevision: 'uint' = None
 
     class Enums:
-        class CommissioningWindowStatus(IntEnum):
+        class CommissioningWindowStatusEnum(IntEnum):
             kWindowNotOpen = 0x00
             kEnhancedWindowOpen = 0x01
             kBasicWindowOpen = 0x02
@@ -11258,11 +11376,12 @@ class StatusCode(IntEnum):
 
 
 
+
     class Commands:
         @dataclass
         class OpenCommissioningWindow(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x003C
-            command_id: typing.ClassVar[int] = 0x0000
+            command_id: typing.ClassVar[int] = 0x00000000
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = None
 
@@ -11290,7 +11409,7 @@ def must_use_timed_invoke(cls) -> bool:
         @dataclass
         class OpenBasicCommissioningWindow(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x003C
-            command_id: typing.ClassVar[int] = 0x0001
+            command_id: typing.ClassVar[int] = 0x00000001
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = None
 
@@ -11310,7 +11429,7 @@ def must_use_timed_invoke(cls) -> bool:
         @dataclass
         class RevokeCommissioning(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x003C
-            command_id: typing.ClassVar[int] = 0x0002
+            command_id: typing.ClassVar[int] = 0x00000002
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = None
 
@@ -11339,9 +11458,9 @@ def attribute_id(cls) -> int:
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=AdministratorCommissioning.Enums.CommissioningWindowStatus)
+                return ClusterObjectFieldDescriptor(Type=AdministratorCommissioning.Enums.CommissioningWindowStatusEnum)
 
-            value: 'AdministratorCommissioning.Enums.CommissioningWindowStatus' = 0
+            value: 'AdministratorCommissioning.Enums.CommissioningWindowStatusEnum' = 0
 
         @dataclass
         class AdminFabricIndex(ClusterAttributeDescriptor):
@@ -11508,6 +11627,7 @@ class NodeOperationalCertStatusEnum(IntEnum):
             kInvalidFabricIndex = 0x0B
 
 
+
     class Structs:
         @dataclass
         class FabricDescriptorStruct(ClusterObject):
@@ -11551,7 +11671,7 @@ class Commands:
         @dataclass
         class AttestationRequest(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x003E
-            command_id: typing.ClassVar[int] = 0x0000
+            command_id: typing.ClassVar[int] = 0x00000000
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = 'AttestationResponse'
 
@@ -11567,7 +11687,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class AttestationResponse(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x003E
-            command_id: typing.ClassVar[int] = 0x0001
+            command_id: typing.ClassVar[int] = 0x00000001
             is_client: typing.ClassVar[bool] = False
             response_type: typing.ClassVar[str] = None
 
@@ -11585,7 +11705,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class CertificateChainRequest(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x003E
-            command_id: typing.ClassVar[int] = 0x0002
+            command_id: typing.ClassVar[int] = 0x00000002
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = 'CertificateChainResponse'
 
@@ -11601,7 +11721,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class CertificateChainResponse(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x003E
-            command_id: typing.ClassVar[int] = 0x0003
+            command_id: typing.ClassVar[int] = 0x00000003
             is_client: typing.ClassVar[bool] = False
             response_type: typing.ClassVar[str] = None
 
@@ -11617,7 +11737,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class CSRRequest(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x003E
-            command_id: typing.ClassVar[int] = 0x0004
+            command_id: typing.ClassVar[int] = 0x00000004
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = 'CSRResponse'
 
@@ -11635,7 +11755,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class CSRResponse(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x003E
-            command_id: typing.ClassVar[int] = 0x0005
+            command_id: typing.ClassVar[int] = 0x00000005
             is_client: typing.ClassVar[bool] = False
             response_type: typing.ClassVar[str] = None
 
@@ -11653,7 +11773,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class AddNOC(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x003E
-            command_id: typing.ClassVar[int] = 0x0006
+            command_id: typing.ClassVar[int] = 0x00000006
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = 'NOCResponse'
 
@@ -11677,7 +11797,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class UpdateNOC(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x003E
-            command_id: typing.ClassVar[int] = 0x0007
+            command_id: typing.ClassVar[int] = 0x00000007
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = 'NOCResponse'
 
@@ -11695,7 +11815,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class NOCResponse(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x003E
-            command_id: typing.ClassVar[int] = 0x0008
+            command_id: typing.ClassVar[int] = 0x00000008
             is_client: typing.ClassVar[bool] = False
             response_type: typing.ClassVar[str] = None
 
@@ -11715,7 +11835,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class UpdateFabricLabel(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x003E
-            command_id: typing.ClassVar[int] = 0x0009
+            command_id: typing.ClassVar[int] = 0x00000009
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = 'NOCResponse'
 
@@ -11731,7 +11851,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class RemoveFabric(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x003E
-            command_id: typing.ClassVar[int] = 0x000A
+            command_id: typing.ClassVar[int] = 0x0000000A
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = 'NOCResponse'
 
@@ -11747,7 +11867,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class AddTrustedRootCertificate(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x003E
-            command_id: typing.ClassVar[int] = 0x000B
+            command_id: typing.ClassVar[int] = 0x0000000B
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = None
 
@@ -11975,6 +12095,7 @@ class GroupKeySecurityPolicy(IntEnum):
             kCacheAndSync = 0x01
 
 
+
     class Structs:
         @dataclass
         class GroupInfoMapStruct(ClusterObject):
@@ -12039,7 +12160,7 @@ class Commands:
         @dataclass
         class KeySetWrite(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x003F
-            command_id: typing.ClassVar[int] = 0x0000
+            command_id: typing.ClassVar[int] = 0x00000000
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = None
 
@@ -12055,7 +12176,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class KeySetRead(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x003F
-            command_id: typing.ClassVar[int] = 0x0001
+            command_id: typing.ClassVar[int] = 0x00000001
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = 'KeySetReadResponse'
 
@@ -12071,7 +12192,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class KeySetReadResponse(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x003F
-            command_id: typing.ClassVar[int] = 0x0002
+            command_id: typing.ClassVar[int] = 0x00000002
             is_client: typing.ClassVar[bool] = False
             response_type: typing.ClassVar[str] = None
 
@@ -12087,7 +12208,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class KeySetRemove(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x003F
-            command_id: typing.ClassVar[int] = 0x0003
+            command_id: typing.ClassVar[int] = 0x00000003
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = None
 
@@ -12103,7 +12224,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class KeySetReadAllIndices(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x003F
-            command_id: typing.ClassVar[int] = 0x0004
+            command_id: typing.ClassVar[int] = 0x00000004
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = 'KeySetReadAllIndicesResponse'
 
@@ -12119,7 +12240,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class KeySetReadAllIndicesResponse(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x003F
-            command_id: typing.ClassVar[int] = 0x0005
+            command_id: typing.ClassVar[int] = 0x00000005
             is_client: typing.ClassVar[bool] = False
             response_type: typing.ClassVar[str] = None
 
@@ -12304,6 +12425,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
     clusterRevision: 'uint' = None
 
 
+
     class Structs:
         @dataclass
         class LabelStruct(ClusterObject):
@@ -12444,6 +12566,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
     clusterRevision: 'uint' = None
 
 
+
     class Structs:
         @dataclass
         class LabelStruct(ClusterObject):
@@ -12584,6 +12707,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
 
 
 
+
     class Attributes:
         @dataclass
         class GeneratedCommandList(ClusterAttributeDescriptor):
@@ -12691,6 +12815,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
 
 
 
+
     class Attributes:
         @dataclass
         class GeneratedCommandList(ClusterAttributeDescriptor):
@@ -12798,6 +12923,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
 
 
 
+
     class Attributes:
         @dataclass
         class GeneratedCommandList(ClusterAttributeDescriptor):
@@ -12907,6 +13033,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
 
 
 
+
     class Attributes:
         @dataclass
         class StateValue(ClusterAttributeDescriptor):
@@ -13060,6 +13187,11 @@ def descriptor(cls) -> ClusterObjectDescriptor:
     clusterRevision: 'uint' = None
 
 
+    class Bitmaps:
+        class ModeSelectFeature(IntFlag):
+            kDeponoff = 0x1
+
+
     class Structs:
         @dataclass
         class SemanticTagStruct(ClusterObject):
@@ -13095,7 +13227,7 @@ class Commands:
         @dataclass
         class ChangeToMode(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0050
-            command_id: typing.ClassVar[int] = 0x0000
+            command_id: typing.ClassVar[int] = 0x00000000
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = None
 
@@ -13299,7 +13431,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
                 ClusterObjectFieldDescriptor(Label="lockState", Tag=0x00000000, Type=typing.Union[Nullable, DoorLock.Enums.DlLockState]),
                 ClusterObjectFieldDescriptor(Label="lockType", Tag=0x00000001, Type=DoorLock.Enums.DlLockType),
                 ClusterObjectFieldDescriptor(Label="actuatorEnabled", Tag=0x00000002, Type=bool),
-                ClusterObjectFieldDescriptor(Label="doorState", Tag=0x00000003, Type=typing.Union[None, Nullable, DoorLock.Enums.DlDoorState]),
+                ClusterObjectFieldDescriptor(Label="doorState", Tag=0x00000003, Type=typing.Union[None, Nullable, DoorLock.Enums.DoorStateEnum]),
                 ClusterObjectFieldDescriptor(Label="doorOpenEvents", Tag=0x00000004, Type=typing.Optional[uint]),
                 ClusterObjectFieldDescriptor(Label="doorClosedEvents", Tag=0x00000005, Type=typing.Optional[uint]),
                 ClusterObjectFieldDescriptor(Label="openPeriod", Tag=0x00000006, Type=typing.Optional[uint]),
@@ -13319,7 +13451,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
                 ClusterObjectFieldDescriptor(Label="LEDSettings", Tag=0x00000022, Type=typing.Optional[uint]),
                 ClusterObjectFieldDescriptor(Label="autoRelockTime", Tag=0x00000023, Type=uint),
                 ClusterObjectFieldDescriptor(Label="soundVolume", Tag=0x00000024, Type=typing.Optional[uint]),
-                ClusterObjectFieldDescriptor(Label="operatingMode", Tag=0x00000025, Type=DoorLock.Enums.DlOperatingMode),
+                ClusterObjectFieldDescriptor(Label="operatingMode", Tag=0x00000025, Type=DoorLock.Enums.OperatingModeEnum),
                 ClusterObjectFieldDescriptor(Label="supportedOperatingModes", Tag=0x00000026, Type=uint),
                 ClusterObjectFieldDescriptor(Label="defaultConfigurationRegister", Tag=0x00000027, Type=typing.Optional[uint]),
                 ClusterObjectFieldDescriptor(Label="enableLocalProgramming", Tag=0x00000028, Type=typing.Optional[bool]),
@@ -13342,7 +13474,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
     lockState: 'typing.Union[Nullable, DoorLock.Enums.DlLockState]' = None
     lockType: 'DoorLock.Enums.DlLockType' = None
     actuatorEnabled: 'bool' = None
-    doorState: 'typing.Union[None, Nullable, DoorLock.Enums.DlDoorState]' = None
+    doorState: 'typing.Union[None, Nullable, DoorLock.Enums.DoorStateEnum]' = None
     doorOpenEvents: 'typing.Optional[uint]' = None
     doorClosedEvents: 'typing.Optional[uint]' = None
     openPeriod: 'typing.Optional[uint]' = None
@@ -13362,7 +13494,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
     LEDSettings: 'typing.Optional[uint]' = None
     autoRelockTime: 'uint' = None
     soundVolume: 'typing.Optional[uint]' = None
-    operatingMode: 'DoorLock.Enums.DlOperatingMode' = None
+    operatingMode: 'DoorLock.Enums.OperatingModeEnum' = None
     supportedOperatingModes: 'uint' = None
     defaultConfigurationRegister: 'typing.Optional[uint]' = None
     enableLocalProgramming: 'typing.Optional[bool]' = None
@@ -13382,7 +13514,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
     clusterRevision: 'uint' = None
 
     class Enums:
-        class DlAlarmCode(IntEnum):
+        class AlarmCodeEnum(IntEnum):
             kLockJammed = 0x00
             kLockFactoryReset = 0x01
             kLockRadioPowerCycled = 0x03
@@ -13392,12 +13524,12 @@ class DlAlarmCode(IntEnum):
             kDoorAjar = 0x07
             kForcedUser = 0x08
 
-        class DlCredentialRule(IntEnum):
+        class CredentialRuleEnum(IntEnum):
             kSingle = 0x00
-            kDouble = 0x01
+            kDual = 0x01
             kTri = 0x02
 
-        class DlCredentialType(IntEnum):
+        class CredentialTypeEnum(IntEnum):
             kProgrammingPIN = 0x00
             kPin = 0x01
             kRfid = 0x02
@@ -13405,36 +13537,11 @@ class DlCredentialType(IntEnum):
             kFingerVein = 0x04
             kFace = 0x05
 
-        class DlDataOperationType(IntEnum):
+        class DataOperationTypeEnum(IntEnum):
             kAdd = 0x00
             kClear = 0x01
             kModify = 0x02
 
-        class DlDoorState(IntEnum):
-            kDoorOpen = 0x00
-            kDoorClosed = 0x01
-            kDoorJammed = 0x02
-            kDoorForcedOpen = 0x03
-            kDoorUnspecifiedError = 0x04
-            kDoorAjar = 0x05
-
-        class DlLockDataType(IntEnum):
-            kUnspecified = 0x00
-            kProgrammingCode = 0x01
-            kUserIndex = 0x02
-            kWeekDaySchedule = 0x03
-            kYearDaySchedule = 0x04
-            kHolidaySchedule = 0x05
-            kPin = 0x06
-            kRfid = 0x07
-            kFingerprint = 0x08
-
-        class DlLockOperationType(IntEnum):
-            kLock = 0x00
-            kUnlock = 0x01
-            kNonAccessUserEvent = 0x02
-            kForcedUserEvent = 0x03
-
         class DlLockState(IntEnum):
             kNotFullyLocked = 0x00
             kLocked = 0x01
@@ -13453,32 +13560,6 @@ class DlLockType(IntEnum):
             kDeadLatch = 0x09
             kDoorFurniture = 0x0A
 
-        class DlOperatingMode(IntEnum):
-            kNormal = 0x00
-            kVacation = 0x01
-            kPrivacy = 0x02
-            kNoRemoteLockUnlock = 0x03
-            kPassage = 0x04
-
-        class DlOperationError(IntEnum):
-            kUnspecified = 0x00
-            kInvalidCredential = 0x01
-            kDisabledUserDenied = 0x02
-            kRestricted = 0x03
-            kInsufficientBattery = 0x04
-
-        class DlOperationSource(IntEnum):
-            kUnspecified = 0x00
-            kManual = 0x01
-            kProprietaryRemote = 0x02
-            kKeypad = 0x03
-            kAuto = 0x04
-            kButton = 0x05
-            kSchedule = 0x06
-            kRemote = 0x07
-            kRfid = 0x08
-            kBiometric = 0x09
-
         class DlStatus(IntEnum):
             kSuccess = 0x00
             kFailure = 0x01
@@ -13488,23 +13569,6 @@ class DlStatus(IntEnum):
             kResourceExhausted = 0x89
             kNotFound = 0x8B
 
-        class DlUserStatus(IntEnum):
-            kAvailable = 0x00
-            kOccupiedEnabled = 0x01
-            kOccupiedDisabled = 0x03
-
-        class DlUserType(IntEnum):
-            kUnrestrictedUser = 0x00
-            kYearDayScheduleUser = 0x01
-            kWeekDayScheduleUser = 0x02
-            kProgrammingUser = 0x03
-            kNonAccessUser = 0x04
-            kForcedUser = 0x05
-            kDisposableUser = 0x06
-            kExpiringUser = 0x07
-            kScheduleRestrictedUser = 0x08
-            kRemoteOnlyUser = 0x09
-
         class DoorLockOperationEventCode(IntEnum):
             kUnknownOrMfgSpecific = 0x00
             kLock = 0x01
@@ -13551,19 +13615,214 @@ class DoorLockUserType(IntEnum):
             kNonAccessUser = 0x04
             kNotSupported = 0xFF
 
+        class DoorStateEnum(IntEnum):
+            kDoorOpen = 0x00
+            kDoorClosed = 0x01
+            kDoorJammed = 0x02
+            kDoorForcedOpen = 0x03
+            kDoorUnspecifiedError = 0x04
+            kDoorAjar = 0x05
+
+        class LockDataTypeEnum(IntEnum):
+            kUnspecified = 0x00
+            kProgrammingCode = 0x01
+            kUserIndex = 0x02
+            kWeekDaySchedule = 0x03
+            kYearDaySchedule = 0x04
+            kHolidaySchedule = 0x05
+            kPin = 0x06
+            kRfid = 0x07
+            kFingerprint = 0x08
+
+        class LockOperationTypeEnum(IntEnum):
+            kLock = 0x00
+            kUnlock = 0x01
+            kNonAccessUserEvent = 0x02
+            kForcedUserEvent = 0x03
+
+        class OperatingModeEnum(IntEnum):
+            kNormal = 0x00
+            kVacation = 0x01
+            kPrivacy = 0x02
+            kNoRemoteLockUnlock = 0x03
+            kPassage = 0x04
+
+        class OperationErrorEnum(IntEnum):
+            kUnspecified = 0x00
+            kInvalidCredential = 0x01
+            kDisabledUserDenied = 0x02
+            kRestricted = 0x03
+            kInsufficientBattery = 0x04
+
+        class OperationSourceEnum(IntEnum):
+            kUnspecified = 0x00
+            kManual = 0x01
+            kProprietaryRemote = 0x02
+            kKeypad = 0x03
+            kAuto = 0x04
+            kButton = 0x05
+            kSchedule = 0x06
+            kRemote = 0x07
+            kRfid = 0x08
+            kBiometric = 0x09
+
+        class UserStatusEnum(IntEnum):
+            kAvailable = 0x00
+            kOccupiedEnabled = 0x01
+            kOccupiedDisabled = 0x03
+
+        class UserTypeEnum(IntEnum):
+            kUnrestrictedUser = 0x00
+            kYearDayScheduleUser = 0x01
+            kWeekDayScheduleUser = 0x02
+            kProgrammingUser = 0x03
+            kNonAccessUser = 0x04
+            kForcedUser = 0x05
+            kDisposableUser = 0x06
+            kExpiringUser = 0x07
+            kScheduleRestrictedUser = 0x08
+            kRemoteOnlyUser = 0x09
+
+
+    class Bitmaps:
+        class DaysMaskMap(IntFlag):
+            kSunday = 0x1
+            kMonday = 0x2
+            kTuesday = 0x4
+            kWednesday = 0x8
+            kThursday = 0x10
+            kFriday = 0x20
+            kSaturday = 0x40
+
+        class DlCredentialRuleMask(IntFlag):
+            kSingle = 0x1
+            kDual = 0x2
+            kTri = 0x4
+
+        class DlCredentialRulesSupport(IntFlag):
+            kSingle = 0x1
+            kDual = 0x2
+            kTri = 0x4
+
+        class DlDefaultConfigurationRegister(IntFlag):
+            kEnableLocalProgrammingEnabled = 0x1
+            kKeypadInterfaceDefaultAccessEnabled = 0x2
+            kRemoteInterfaceDefaultAccessIsEnabled = 0x4
+            kSoundEnabled = 0x20
+            kAutoRelockTimeSet = 0x40
+            kLEDSettingsSet = 0x80
+
+        class DlKeypadOperationEventMask(IntFlag):
+            kUnknown = 0x1
+            kLock = 0x2
+            kUnlock = 0x4
+            kLockInvalidPIN = 0x8
+            kLockInvalidSchedule = 0x10
+            kUnlockInvalidCode = 0x20
+            kUnlockInvalidSchedule = 0x40
+            kNonAccessUserOpEvent = 0x80
+
+        class DlKeypadProgrammingEventMask(IntFlag):
+            kUnknown = 0x1
+            kProgrammingPINChanged = 0x2
+            kPINAdded = 0x4
+            kPINCleared = 0x8
+            kPINChanged = 0x10
+
+        class DlLocalProgrammingFeatures(IntFlag):
+            kAddUsersCredentialsSchedulesLocally = 0x1
+            kModifyUsersCredentialsSchedulesLocally = 0x2
+            kClearUsersCredentialsSchedulesLocally = 0x4
+            kAdjustLockSettingsLocally = 0x8
+
+        class DlManualOperationEventMask(IntFlag):
+            kUnknown = 0x1
+            kThumbturnLock = 0x2
+            kThumbturnUnlock = 0x4
+            kOneTouchLock = 0x8
+            kKeyLock = 0x10
+            kKeyUnlock = 0x20
+            kAutoLock = 0x40
+            kScheduleLock = 0x80
+            kScheduleUnlock = 0x100
+            kManualLock = 0x200
+            kManualUnlock = 0x400
+
+        class DlRFIDOperationEventMask(IntFlag):
+            kUnknown = 0x1
+            kLock = 0x2
+            kUnlock = 0x4
+            kLockInvalidRFID = 0x8
+            kLockInvalidSchedule = 0x10
+            kUnlockInvalidRFID = 0x20
+            kUnlockInvalidSchedule = 0x40
+
+        class DlRFIDProgrammingEventMask(IntFlag):
+            kUnknown = 0x1
+            kRFIDCodeAdded = 0x20
+            kRFIDCodeCleared = 0x40
+
+        class DlRemoteOperationEventMask(IntFlag):
+            kUnknown = 0x1
+            kLock = 0x2
+            kUnlock = 0x4
+            kLockInvalidCode = 0x8
+            kLockInvalidSchedule = 0x10
+            kUnlockInvalidCode = 0x20
+            kUnlockInvalidSchedule = 0x40
+
+        class DlRemoteProgrammingEventMask(IntFlag):
+            kUnknown = 0x1
+            kProgrammingPINChanged = 0x2
+            kPINAdded = 0x4
+            kPINCleared = 0x8
+            kPINChanged = 0x10
+            kRFIDCodeAdded = 0x20
+            kRFIDCodeCleared = 0x40
+
+        class DlSupportedOperatingModes(IntFlag):
+            kNormal = 0x1
+            kVacation = 0x2
+            kPrivacy = 0x4
+            kNoRemoteLockUnlock = 0x8
+            kPassage = 0x10
+
+        class DoorLockDayOfWeek(IntFlag):
+            kSunday = 0x1
+            kMonday = 0x2
+            kTuesday = 0x4
+            kWednesday = 0x8
+            kThursday = 0x10
+            kFriday = 0x20
+            kSaturday = 0x40
+
+        class DoorLockFeature(IntFlag):
+            kPinCredential = 0x1
+            kRfidCredential = 0x2
+            kFingerCredentials = 0x4
+            kLogging = 0x8
+            kWeekDayAccessSchedules = 0x10
+            kDoorPositionSensor = 0x20
+            kFaceCredentials = 0x40
+            kCredentialsOverTheAirAccess = 0x80
+            kUser = 0x100
+            kNotification = 0x200
+            kYearDayAccessSchedules = 0x400
+            kHolidaySchedules = 0x800
+
 
     class Structs:
         @dataclass
-        class DlCredential(ClusterObject):
+        class CredentialStruct(ClusterObject):
             @ChipUtility.classproperty
             def descriptor(cls) -> ClusterObjectDescriptor:
                 return ClusterObjectDescriptor(
                     Fields = [
-                            ClusterObjectFieldDescriptor(Label="credentialType", Tag=0, Type=DoorLock.Enums.DlCredentialType),
+                            ClusterObjectFieldDescriptor(Label="credentialType", Tag=0, Type=DoorLock.Enums.CredentialTypeEnum),
                             ClusterObjectFieldDescriptor(Label="credentialIndex", Tag=1, Type=uint),
                     ])
 
-            credentialType: 'DoorLock.Enums.DlCredentialType' = 0
+            credentialType: 'DoorLock.Enums.CredentialTypeEnum' = 0
             credentialIndex: 'uint' = 0
 
 
@@ -13572,7 +13831,7 @@ class Commands:
         @dataclass
         class LockDoor(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0101
-            command_id: typing.ClassVar[int] = 0x0000
+            command_id: typing.ClassVar[int] = 0x00000000
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = None
 
@@ -13580,19 +13839,19 @@ class LockDoor(ClusterCommand):
             def descriptor(cls) -> ClusterObjectDescriptor:
                 return ClusterObjectDescriptor(
                     Fields = [
-                            ClusterObjectFieldDescriptor(Label="pinCode", Tag=0, Type=typing.Optional[bytes]),
+                            ClusterObjectFieldDescriptor(Label="PINCode", Tag=0, Type=typing.Optional[bytes]),
                     ])
 
             @ChipUtility.classproperty
             def must_use_timed_invoke(cls) -> bool:
                 return True
 
-            pinCode: 'typing.Optional[bytes]' = None
+            PINCode: 'typing.Optional[bytes]' = None
 
         @dataclass
         class UnlockDoor(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0101
-            command_id: typing.ClassVar[int] = 0x0001
+            command_id: typing.ClassVar[int] = 0x00000001
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = None
 
@@ -13600,19 +13859,19 @@ class UnlockDoor(ClusterCommand):
             def descriptor(cls) -> ClusterObjectDescriptor:
                 return ClusterObjectDescriptor(
                     Fields = [
-                            ClusterObjectFieldDescriptor(Label="pinCode", Tag=0, Type=typing.Optional[bytes]),
+                            ClusterObjectFieldDescriptor(Label="PINCode", Tag=0, Type=typing.Optional[bytes]),
                     ])
 
             @ChipUtility.classproperty
             def must_use_timed_invoke(cls) -> bool:
                 return True
 
-            pinCode: 'typing.Optional[bytes]' = None
+            PINCode: 'typing.Optional[bytes]' = None
 
         @dataclass
         class UnlockWithTimeout(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0101
-            command_id: typing.ClassVar[int] = 0x0003
+            command_id: typing.ClassVar[int] = 0x00000003
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = None
 
@@ -13621,7 +13880,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
                 return ClusterObjectDescriptor(
                     Fields = [
                             ClusterObjectFieldDescriptor(Label="timeout", Tag=0, Type=uint),
-                            ClusterObjectFieldDescriptor(Label="pinCode", Tag=1, Type=typing.Optional[bytes]),
+                            ClusterObjectFieldDescriptor(Label="PINCode", Tag=1, Type=typing.Optional[bytes]),
                     ])
 
             @ChipUtility.classproperty
@@ -13629,12 +13888,12 @@ def must_use_timed_invoke(cls) -> bool:
                 return True
 
             timeout: 'uint' = 0
-            pinCode: 'typing.Optional[bytes]' = None
+            PINCode: 'typing.Optional[bytes]' = None
 
         @dataclass
         class SetWeekDaySchedule(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0101
-            command_id: typing.ClassVar[int] = 0x000B
+            command_id: typing.ClassVar[int] = 0x0000000B
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = None
 
@@ -13662,7 +13921,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class GetWeekDaySchedule(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0101
-            command_id: typing.ClassVar[int] = 0x000C
+            command_id: typing.ClassVar[int] = 0x0000000C
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = 'GetWeekDayScheduleResponse'
 
@@ -13680,7 +13939,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class GetWeekDayScheduleResponse(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0101
-            command_id: typing.ClassVar[int] = 0x000C
+            command_id: typing.ClassVar[int] = 0x0000000C
             is_client: typing.ClassVar[bool] = False
             response_type: typing.ClassVar[str] = None
 
@@ -13710,7 +13969,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class ClearWeekDaySchedule(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0101
-            command_id: typing.ClassVar[int] = 0x000D
+            command_id: typing.ClassVar[int] = 0x0000000D
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = None
 
@@ -13728,7 +13987,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class SetYearDaySchedule(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0101
-            command_id: typing.ClassVar[int] = 0x000E
+            command_id: typing.ClassVar[int] = 0x0000000E
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = None
 
@@ -13750,7 +14009,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class GetYearDaySchedule(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0101
-            command_id: typing.ClassVar[int] = 0x000F
+            command_id: typing.ClassVar[int] = 0x0000000F
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = 'GetYearDayScheduleResponse'
 
@@ -13768,7 +14027,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class GetYearDayScheduleResponse(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0101
-            command_id: typing.ClassVar[int] = 0x000F
+            command_id: typing.ClassVar[int] = 0x0000000F
             is_client: typing.ClassVar[bool] = False
             response_type: typing.ClassVar[str] = None
 
@@ -13792,7 +14051,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class ClearYearDaySchedule(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0101
-            command_id: typing.ClassVar[int] = 0x0010
+            command_id: typing.ClassVar[int] = 0x00000010
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = None
 
@@ -13810,7 +14069,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class SetHolidaySchedule(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0101
-            command_id: typing.ClassVar[int] = 0x0011
+            command_id: typing.ClassVar[int] = 0x00000011
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = None
 
@@ -13821,18 +14080,18 @@ def descriptor(cls) -> ClusterObjectDescriptor:
                             ClusterObjectFieldDescriptor(Label="holidayIndex", Tag=0, Type=uint),
                             ClusterObjectFieldDescriptor(Label="localStartTime", Tag=1, Type=uint),
                             ClusterObjectFieldDescriptor(Label="localEndTime", Tag=2, Type=uint),
-                            ClusterObjectFieldDescriptor(Label="operatingMode", Tag=3, Type=DoorLock.Enums.DlOperatingMode),
+                            ClusterObjectFieldDescriptor(Label="operatingMode", Tag=3, Type=DoorLock.Enums.OperatingModeEnum),
                     ])
 
             holidayIndex: 'uint' = 0
             localStartTime: 'uint' = 0
             localEndTime: 'uint' = 0
-            operatingMode: 'DoorLock.Enums.DlOperatingMode' = 0
+            operatingMode: 'DoorLock.Enums.OperatingModeEnum' = 0
 
         @dataclass
         class GetHolidaySchedule(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0101
-            command_id: typing.ClassVar[int] = 0x0012
+            command_id: typing.ClassVar[int] = 0x00000012
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = 'GetHolidayScheduleResponse'
 
@@ -13848,7 +14107,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class GetHolidayScheduleResponse(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0101
-            command_id: typing.ClassVar[int] = 0x0012
+            command_id: typing.ClassVar[int] = 0x00000012
             is_client: typing.ClassVar[bool] = False
             response_type: typing.ClassVar[str] = None
 
@@ -13860,19 +14119,19 @@ def descriptor(cls) -> ClusterObjectDescriptor:
                             ClusterObjectFieldDescriptor(Label="status", Tag=1, Type=DoorLock.Enums.DlStatus),
                             ClusterObjectFieldDescriptor(Label="localStartTime", Tag=2, Type=typing.Optional[uint]),
                             ClusterObjectFieldDescriptor(Label="localEndTime", Tag=3, Type=typing.Optional[uint]),
-                            ClusterObjectFieldDescriptor(Label="operatingMode", Tag=4, Type=typing.Optional[DoorLock.Enums.DlOperatingMode]),
+                            ClusterObjectFieldDescriptor(Label="operatingMode", Tag=4, Type=typing.Optional[DoorLock.Enums.OperatingModeEnum]),
                     ])
 
             holidayIndex: 'uint' = 0
             status: 'DoorLock.Enums.DlStatus' = 0
             localStartTime: 'typing.Optional[uint]' = None
             localEndTime: 'typing.Optional[uint]' = None
-            operatingMode: 'typing.Optional[DoorLock.Enums.DlOperatingMode]' = None
+            operatingMode: 'typing.Optional[DoorLock.Enums.OperatingModeEnum]' = None
 
         @dataclass
         class ClearHolidaySchedule(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0101
-            command_id: typing.ClassVar[int] = 0x0013
+            command_id: typing.ClassVar[int] = 0x00000013
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = None
 
@@ -13888,7 +14147,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class SetUser(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0101
-            command_id: typing.ClassVar[int] = 0x001A
+            command_id: typing.ClassVar[int] = 0x0000001A
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = None
 
@@ -13896,31 +14155,31 @@ class SetUser(ClusterCommand):
             def descriptor(cls) -> ClusterObjectDescriptor:
                 return ClusterObjectDescriptor(
                     Fields = [
-                            ClusterObjectFieldDescriptor(Label="operationType", Tag=0, Type=DoorLock.Enums.DlDataOperationType),
+                            ClusterObjectFieldDescriptor(Label="operationType", Tag=0, Type=DoorLock.Enums.DataOperationTypeEnum),
                             ClusterObjectFieldDescriptor(Label="userIndex", Tag=1, Type=uint),
                             ClusterObjectFieldDescriptor(Label="userName", Tag=2, Type=typing.Union[Nullable, str]),
-                            ClusterObjectFieldDescriptor(Label="userUniqueId", Tag=3, Type=typing.Union[Nullable, uint]),
-                            ClusterObjectFieldDescriptor(Label="userStatus", Tag=4, Type=typing.Union[Nullable, DoorLock.Enums.DlUserStatus]),
-                            ClusterObjectFieldDescriptor(Label="userType", Tag=5, Type=typing.Union[Nullable, DoorLock.Enums.DlUserType]),
-                            ClusterObjectFieldDescriptor(Label="credentialRule", Tag=6, Type=typing.Union[Nullable, DoorLock.Enums.DlCredentialRule]),
+                            ClusterObjectFieldDescriptor(Label="userUniqueID", Tag=3, Type=typing.Union[Nullable, uint]),
+                            ClusterObjectFieldDescriptor(Label="userStatus", Tag=4, Type=typing.Union[Nullable, DoorLock.Enums.UserStatusEnum]),
+                            ClusterObjectFieldDescriptor(Label="userType", Tag=5, Type=typing.Union[Nullable, DoorLock.Enums.UserTypeEnum]),
+                            ClusterObjectFieldDescriptor(Label="credentialRule", Tag=6, Type=typing.Union[Nullable, DoorLock.Enums.CredentialRuleEnum]),
                     ])
 
             @ChipUtility.classproperty
             def must_use_timed_invoke(cls) -> bool:
                 return True
 
-            operationType: 'DoorLock.Enums.DlDataOperationType' = 0
+            operationType: 'DoorLock.Enums.DataOperationTypeEnum' = 0
             userIndex: 'uint' = 0
             userName: 'typing.Union[Nullable, str]' = NullValue
-            userUniqueId: 'typing.Union[Nullable, uint]' = NullValue
-            userStatus: 'typing.Union[Nullable, DoorLock.Enums.DlUserStatus]' = NullValue
-            userType: 'typing.Union[Nullable, DoorLock.Enums.DlUserType]' = NullValue
-            credentialRule: 'typing.Union[Nullable, DoorLock.Enums.DlCredentialRule]' = NullValue
+            userUniqueID: 'typing.Union[Nullable, uint]' = NullValue
+            userStatus: 'typing.Union[Nullable, DoorLock.Enums.UserStatusEnum]' = NullValue
+            userType: 'typing.Union[Nullable, DoorLock.Enums.UserTypeEnum]' = NullValue
+            credentialRule: 'typing.Union[Nullable, DoorLock.Enums.CredentialRuleEnum]' = NullValue
 
         @dataclass
         class GetUser(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0101
-            command_id: typing.ClassVar[int] = 0x001B
+            command_id: typing.ClassVar[int] = 0x0000001B
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = 'GetUserResponse'
 
@@ -13936,7 +14195,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class GetUserResponse(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0101
-            command_id: typing.ClassVar[int] = 0x001C
+            command_id: typing.ClassVar[int] = 0x0000001C
             is_client: typing.ClassVar[bool] = False
             response_type: typing.ClassVar[str] = None
 
@@ -13946,11 +14205,11 @@ def descriptor(cls) -> ClusterObjectDescriptor:
                     Fields = [
                             ClusterObjectFieldDescriptor(Label="userIndex", Tag=0, Type=uint),
                             ClusterObjectFieldDescriptor(Label="userName", Tag=1, Type=typing.Union[Nullable, str]),
-                            ClusterObjectFieldDescriptor(Label="userUniqueId", Tag=2, Type=typing.Union[Nullable, uint]),
-                            ClusterObjectFieldDescriptor(Label="userStatus", Tag=3, Type=typing.Union[Nullable, DoorLock.Enums.DlUserStatus]),
-                            ClusterObjectFieldDescriptor(Label="userType", Tag=4, Type=typing.Union[Nullable, DoorLock.Enums.DlUserType]),
-                            ClusterObjectFieldDescriptor(Label="credentialRule", Tag=5, Type=typing.Union[Nullable, DoorLock.Enums.DlCredentialRule]),
-                            ClusterObjectFieldDescriptor(Label="credentials", Tag=6, Type=typing.Union[Nullable, typing.List[DoorLock.Structs.DlCredential]]),
+                            ClusterObjectFieldDescriptor(Label="userUniqueID", Tag=2, Type=typing.Union[Nullable, uint]),
+                            ClusterObjectFieldDescriptor(Label="userStatus", Tag=3, Type=typing.Union[Nullable, DoorLock.Enums.UserStatusEnum]),
+                            ClusterObjectFieldDescriptor(Label="userType", Tag=4, Type=typing.Union[Nullable, DoorLock.Enums.UserTypeEnum]),
+                            ClusterObjectFieldDescriptor(Label="credentialRule", Tag=5, Type=typing.Union[Nullable, DoorLock.Enums.CredentialRuleEnum]),
+                            ClusterObjectFieldDescriptor(Label="credentials", Tag=6, Type=typing.Union[Nullable, typing.List[DoorLock.Structs.CredentialStruct]]),
                             ClusterObjectFieldDescriptor(Label="creatorFabricIndex", Tag=7, Type=typing.Union[Nullable, uint]),
                             ClusterObjectFieldDescriptor(Label="lastModifiedFabricIndex", Tag=8, Type=typing.Union[Nullable, uint]),
                             ClusterObjectFieldDescriptor(Label="nextUserIndex", Tag=9, Type=typing.Union[Nullable, uint]),
@@ -13958,11 +14217,11 @@ def descriptor(cls) -> ClusterObjectDescriptor:
 
             userIndex: 'uint' = 0
             userName: 'typing.Union[Nullable, str]' = NullValue
-            userUniqueId: 'typing.Union[Nullable, uint]' = NullValue
-            userStatus: 'typing.Union[Nullable, DoorLock.Enums.DlUserStatus]' = NullValue
-            userType: 'typing.Union[Nullable, DoorLock.Enums.DlUserType]' = NullValue
-            credentialRule: 'typing.Union[Nullable, DoorLock.Enums.DlCredentialRule]' = NullValue
-            credentials: 'typing.Union[Nullable, typing.List[DoorLock.Structs.DlCredential]]' = NullValue
+            userUniqueID: 'typing.Union[Nullable, uint]' = NullValue
+            userStatus: 'typing.Union[Nullable, DoorLock.Enums.UserStatusEnum]' = NullValue
+            userType: 'typing.Union[Nullable, DoorLock.Enums.UserTypeEnum]' = NullValue
+            credentialRule: 'typing.Union[Nullable, DoorLock.Enums.CredentialRuleEnum]' = NullValue
+            credentials: 'typing.Union[Nullable, typing.List[DoorLock.Structs.CredentialStruct]]' = NullValue
             creatorFabricIndex: 'typing.Union[Nullable, uint]' = NullValue
             lastModifiedFabricIndex: 'typing.Union[Nullable, uint]' = NullValue
             nextUserIndex: 'typing.Union[Nullable, uint]' = NullValue
@@ -13970,7 +14229,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class ClearUser(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0101
-            command_id: typing.ClassVar[int] = 0x001D
+            command_id: typing.ClassVar[int] = 0x0000001D
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = None
 
@@ -13990,7 +14249,7 @@ def must_use_timed_invoke(cls) -> bool:
         @dataclass
         class SetCredential(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0101
-            command_id: typing.ClassVar[int] = 0x0022
+            command_id: typing.ClassVar[int] = 0x00000022
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = 'SetCredentialResponse'
 
@@ -13998,29 +14257,29 @@ class SetCredential(ClusterCommand):
             def descriptor(cls) -> ClusterObjectDescriptor:
                 return ClusterObjectDescriptor(
                     Fields = [
-                            ClusterObjectFieldDescriptor(Label="operationType", Tag=0, Type=DoorLock.Enums.DlDataOperationType),
-                            ClusterObjectFieldDescriptor(Label="credential", Tag=1, Type=DoorLock.Structs.DlCredential),
+                            ClusterObjectFieldDescriptor(Label="operationType", Tag=0, Type=DoorLock.Enums.DataOperationTypeEnum),
+                            ClusterObjectFieldDescriptor(Label="credential", Tag=1, Type=DoorLock.Structs.CredentialStruct),
                             ClusterObjectFieldDescriptor(Label="credentialData", Tag=2, Type=bytes),
                             ClusterObjectFieldDescriptor(Label="userIndex", Tag=3, Type=typing.Union[Nullable, uint]),
-                            ClusterObjectFieldDescriptor(Label="userStatus", Tag=4, Type=typing.Union[Nullable, DoorLock.Enums.DlUserStatus]),
-                            ClusterObjectFieldDescriptor(Label="userType", Tag=5, Type=typing.Union[Nullable, DoorLock.Enums.DlUserType]),
+                            ClusterObjectFieldDescriptor(Label="userStatus", Tag=4, Type=typing.Union[Nullable, DoorLock.Enums.UserStatusEnum]),
+                            ClusterObjectFieldDescriptor(Label="userType", Tag=5, Type=typing.Union[Nullable, DoorLock.Enums.UserTypeEnum]),
                     ])
 
             @ChipUtility.classproperty
             def must_use_timed_invoke(cls) -> bool:
                 return True
 
-            operationType: 'DoorLock.Enums.DlDataOperationType' = 0
-            credential: 'DoorLock.Structs.DlCredential' = field(default_factory=lambda: DoorLock.Structs.DlCredential())
+            operationType: 'DoorLock.Enums.DataOperationTypeEnum' = 0
+            credential: 'DoorLock.Structs.CredentialStruct' = field(default_factory=lambda: DoorLock.Structs.CredentialStruct())
             credentialData: 'bytes' = b""
             userIndex: 'typing.Union[Nullable, uint]' = NullValue
-            userStatus: 'typing.Union[Nullable, DoorLock.Enums.DlUserStatus]' = NullValue
-            userType: 'typing.Union[Nullable, DoorLock.Enums.DlUserType]' = NullValue
+            userStatus: 'typing.Union[Nullable, DoorLock.Enums.UserStatusEnum]' = NullValue
+            userType: 'typing.Union[Nullable, DoorLock.Enums.UserTypeEnum]' = NullValue
 
         @dataclass
         class SetCredentialResponse(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0101
-            command_id: typing.ClassVar[int] = 0x0023
+            command_id: typing.ClassVar[int] = 0x00000023
             is_client: typing.ClassVar[bool] = False
             response_type: typing.ClassVar[str] = None
 
@@ -14040,7 +14299,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class GetCredentialStatus(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0101
-            command_id: typing.ClassVar[int] = 0x0024
+            command_id: typing.ClassVar[int] = 0x00000024
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = 'GetCredentialStatusResponse'
 
@@ -14048,15 +14307,15 @@ class GetCredentialStatus(ClusterCommand):
             def descriptor(cls) -> ClusterObjectDescriptor:
                 return ClusterObjectDescriptor(
                     Fields = [
-                            ClusterObjectFieldDescriptor(Label="credential", Tag=0, Type=DoorLock.Structs.DlCredential),
+                            ClusterObjectFieldDescriptor(Label="credential", Tag=0, Type=DoorLock.Structs.CredentialStruct),
                     ])
 
-            credential: 'DoorLock.Structs.DlCredential' = field(default_factory=lambda: DoorLock.Structs.DlCredential())
+            credential: 'DoorLock.Structs.CredentialStruct' = field(default_factory=lambda: DoorLock.Structs.CredentialStruct())
 
         @dataclass
         class GetCredentialStatusResponse(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0101
-            command_id: typing.ClassVar[int] = 0x0025
+            command_id: typing.ClassVar[int] = 0x00000025
             is_client: typing.ClassVar[bool] = False
             response_type: typing.ClassVar[str] = None
 
@@ -14080,7 +14339,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class ClearCredential(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0101
-            command_id: typing.ClassVar[int] = 0x0026
+            command_id: typing.ClassVar[int] = 0x00000026
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = None
 
@@ -14088,14 +14347,14 @@ class ClearCredential(ClusterCommand):
             def descriptor(cls) -> ClusterObjectDescriptor:
                 return ClusterObjectDescriptor(
                     Fields = [
-                            ClusterObjectFieldDescriptor(Label="credential", Tag=0, Type=typing.Union[Nullable, DoorLock.Structs.DlCredential]),
+                            ClusterObjectFieldDescriptor(Label="credential", Tag=0, Type=typing.Union[Nullable, DoorLock.Structs.CredentialStruct]),
                     ])
 
             @ChipUtility.classproperty
             def must_use_timed_invoke(cls) -> bool:
                 return True
 
-            credential: 'typing.Union[Nullable, DoorLock.Structs.DlCredential]' = NullValue
+            credential: 'typing.Union[Nullable, DoorLock.Structs.CredentialStruct]' = NullValue
 
 
     class Attributes:
@@ -14159,9 +14418,9 @@ def attribute_id(cls) -> int:
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=typing.Union[None, Nullable, DoorLock.Enums.DlDoorState])
+                return ClusterObjectFieldDescriptor(Type=typing.Union[None, Nullable, DoorLock.Enums.DoorStateEnum])
 
-            value: 'typing.Union[None, Nullable, DoorLock.Enums.DlDoorState]' = None
+            value: 'typing.Union[None, Nullable, DoorLock.Enums.DoorStateEnum]' = None
 
         @dataclass
         class DoorOpenEvents(ClusterAttributeDescriptor):
@@ -14479,9 +14738,9 @@ def attribute_id(cls) -> int:
 
             @ChipUtility.classproperty
             def attribute_type(cls) -> ClusterObjectFieldDescriptor:
-                return ClusterObjectFieldDescriptor(Type=DoorLock.Enums.DlOperatingMode)
+                return ClusterObjectFieldDescriptor(Type=DoorLock.Enums.OperatingModeEnum)
 
-            value: 'DoorLock.Enums.DlOperatingMode' = 0
+            value: 'DoorLock.Enums.OperatingModeEnum' = 0
 
         @dataclass
         class SupportedOperatingModes(ClusterAttributeDescriptor):
@@ -14771,10 +15030,10 @@ def event_id(cls) -> int:
             def descriptor(cls) -> ClusterObjectDescriptor:
                 return ClusterObjectDescriptor(
                     Fields = [
-                            ClusterObjectFieldDescriptor(Label="alarmCode", Tag=0, Type=DoorLock.Enums.DlAlarmCode),
+                            ClusterObjectFieldDescriptor(Label="alarmCode", Tag=0, Type=DoorLock.Enums.AlarmCodeEnum),
                     ])
 
-            alarmCode: 'DoorLock.Enums.DlAlarmCode' = 0
+            alarmCode: 'DoorLock.Enums.AlarmCodeEnum' = 0
 
         @dataclass
         class DoorStateChange(ClusterEvent):
@@ -14790,10 +15049,10 @@ def event_id(cls) -> int:
             def descriptor(cls) -> ClusterObjectDescriptor:
                 return ClusterObjectDescriptor(
                     Fields = [
-                            ClusterObjectFieldDescriptor(Label="doorState", Tag=0, Type=DoorLock.Enums.DlDoorState),
+                            ClusterObjectFieldDescriptor(Label="doorState", Tag=0, Type=DoorLock.Enums.DoorStateEnum),
                     ])
 
-            doorState: 'DoorLock.Enums.DlDoorState' = 0
+            doorState: 'DoorLock.Enums.DoorStateEnum' = 0
 
         @dataclass
         class LockOperation(ClusterEvent):
@@ -14809,20 +15068,20 @@ def event_id(cls) -> int:
             def descriptor(cls) -> ClusterObjectDescriptor:
                 return ClusterObjectDescriptor(
                     Fields = [
-                            ClusterObjectFieldDescriptor(Label="lockOperationType", Tag=0, Type=DoorLock.Enums.DlLockOperationType),
-                            ClusterObjectFieldDescriptor(Label="operationSource", Tag=1, Type=DoorLock.Enums.DlOperationSource),
+                            ClusterObjectFieldDescriptor(Label="lockOperationType", Tag=0, Type=DoorLock.Enums.LockOperationTypeEnum),
+                            ClusterObjectFieldDescriptor(Label="operationSource", Tag=1, Type=DoorLock.Enums.OperationSourceEnum),
                             ClusterObjectFieldDescriptor(Label="userIndex", Tag=2, Type=typing.Union[Nullable, uint]),
                             ClusterObjectFieldDescriptor(Label="fabricIndex", Tag=3, Type=typing.Union[Nullable, uint]),
                             ClusterObjectFieldDescriptor(Label="sourceNode", Tag=4, Type=typing.Union[Nullable, uint]),
-                            ClusterObjectFieldDescriptor(Label="credentials", Tag=5, Type=typing.Union[None, Nullable, typing.List[DoorLock.Structs.DlCredential]]),
+                            ClusterObjectFieldDescriptor(Label="credentials", Tag=5, Type=typing.Union[None, Nullable, typing.List[DoorLock.Structs.CredentialStruct]]),
                     ])
 
-            lockOperationType: 'DoorLock.Enums.DlLockOperationType' = 0
-            operationSource: 'DoorLock.Enums.DlOperationSource' = 0
+            lockOperationType: 'DoorLock.Enums.LockOperationTypeEnum' = 0
+            operationSource: 'DoorLock.Enums.OperationSourceEnum' = 0
             userIndex: 'typing.Union[Nullable, uint]' = NullValue
             fabricIndex: 'typing.Union[Nullable, uint]' = NullValue
             sourceNode: 'typing.Union[Nullable, uint]' = NullValue
-            credentials: 'typing.Union[None, Nullable, typing.List[DoorLock.Structs.DlCredential]]' = None
+            credentials: 'typing.Union[None, Nullable, typing.List[DoorLock.Structs.CredentialStruct]]' = None
 
         @dataclass
         class LockOperationError(ClusterEvent):
@@ -14838,22 +15097,22 @@ def event_id(cls) -> int:
             def descriptor(cls) -> ClusterObjectDescriptor:
                 return ClusterObjectDescriptor(
                     Fields = [
-                            ClusterObjectFieldDescriptor(Label="lockOperationType", Tag=0, Type=DoorLock.Enums.DlLockOperationType),
-                            ClusterObjectFieldDescriptor(Label="operationSource", Tag=1, Type=DoorLock.Enums.DlOperationSource),
-                            ClusterObjectFieldDescriptor(Label="operationError", Tag=2, Type=DoorLock.Enums.DlOperationError),
+                            ClusterObjectFieldDescriptor(Label="lockOperationType", Tag=0, Type=DoorLock.Enums.LockOperationTypeEnum),
+                            ClusterObjectFieldDescriptor(Label="operationSource", Tag=1, Type=DoorLock.Enums.OperationSourceEnum),
+                            ClusterObjectFieldDescriptor(Label="operationError", Tag=2, Type=DoorLock.Enums.OperationErrorEnum),
                             ClusterObjectFieldDescriptor(Label="userIndex", Tag=3, Type=typing.Union[Nullable, uint]),
                             ClusterObjectFieldDescriptor(Label="fabricIndex", Tag=4, Type=typing.Union[Nullable, uint]),
                             ClusterObjectFieldDescriptor(Label="sourceNode", Tag=5, Type=typing.Union[Nullable, uint]),
-                            ClusterObjectFieldDescriptor(Label="credentials", Tag=6, Type=typing.Union[None, Nullable, typing.List[DoorLock.Structs.DlCredential]]),
+                            ClusterObjectFieldDescriptor(Label="credentials", Tag=6, Type=typing.Union[None, Nullable, typing.List[DoorLock.Structs.CredentialStruct]]),
                     ])
 
-            lockOperationType: 'DoorLock.Enums.DlLockOperationType' = 0
-            operationSource: 'DoorLock.Enums.DlOperationSource' = 0
-            operationError: 'DoorLock.Enums.DlOperationError' = 0
+            lockOperationType: 'DoorLock.Enums.LockOperationTypeEnum' = 0
+            operationSource: 'DoorLock.Enums.OperationSourceEnum' = 0
+            operationError: 'DoorLock.Enums.OperationErrorEnum' = 0
             userIndex: 'typing.Union[Nullable, uint]' = NullValue
             fabricIndex: 'typing.Union[Nullable, uint]' = NullValue
             sourceNode: 'typing.Union[Nullable, uint]' = NullValue
-            credentials: 'typing.Union[None, Nullable, typing.List[DoorLock.Structs.DlCredential]]' = None
+            credentials: 'typing.Union[None, Nullable, typing.List[DoorLock.Structs.CredentialStruct]]' = None
 
         @dataclass
         class LockUserChange(ClusterEvent):
@@ -14869,18 +15128,18 @@ def event_id(cls) -> int:
             def descriptor(cls) -> ClusterObjectDescriptor:
                 return ClusterObjectDescriptor(
                     Fields = [
-                            ClusterObjectFieldDescriptor(Label="lockDataType", Tag=0, Type=DoorLock.Enums.DlLockDataType),
-                            ClusterObjectFieldDescriptor(Label="dataOperationType", Tag=1, Type=DoorLock.Enums.DlDataOperationType),
-                            ClusterObjectFieldDescriptor(Label="operationSource", Tag=2, Type=DoorLock.Enums.DlOperationSource),
+                            ClusterObjectFieldDescriptor(Label="lockDataType", Tag=0, Type=DoorLock.Enums.LockDataTypeEnum),
+                            ClusterObjectFieldDescriptor(Label="dataOperationType", Tag=1, Type=DoorLock.Enums.DataOperationTypeEnum),
+                            ClusterObjectFieldDescriptor(Label="operationSource", Tag=2, Type=DoorLock.Enums.OperationSourceEnum),
                             ClusterObjectFieldDescriptor(Label="userIndex", Tag=3, Type=typing.Union[Nullable, uint]),
                             ClusterObjectFieldDescriptor(Label="fabricIndex", Tag=4, Type=typing.Union[Nullable, uint]),
                             ClusterObjectFieldDescriptor(Label="sourceNode", Tag=5, Type=typing.Union[Nullable, uint]),
                             ClusterObjectFieldDescriptor(Label="dataIndex", Tag=6, Type=typing.Union[Nullable, uint]),
                     ])
 
-            lockDataType: 'DoorLock.Enums.DlLockDataType' = 0
-            dataOperationType: 'DoorLock.Enums.DlDataOperationType' = 0
-            operationSource: 'DoorLock.Enums.DlOperationSource' = 0
+            lockDataType: 'DoorLock.Enums.LockDataTypeEnum' = 0
+            dataOperationType: 'DoorLock.Enums.DataOperationTypeEnum' = 0
+            operationSource: 'DoorLock.Enums.OperationSourceEnum' = 0
             userIndex: 'typing.Union[Nullable, uint]' = NullValue
             fabricIndex: 'typing.Union[Nullable, uint]' = NullValue
             sourceNode: 'typing.Union[Nullable, uint]' = NullValue
@@ -14994,12 +15253,55 @@ class Type(IntEnum):
             kUnknown = 0xFF
 
 
+    class Bitmaps:
+        class ConfigStatus(IntFlag):
+            kOperational = 0x1
+            kOnlineReserved = 0x2
+            kLiftMovementReversed = 0x4
+            kLiftPositionAware = 0x8
+            kTiltPositionAware = 0x10
+            kLiftEncoderControlled = 0x20
+            kTiltEncoderControlled = 0x40
+
+        class Feature(IntFlag):
+            kLift = 0x1
+            kTilt = 0x2
+            kPositionAwareLift = 0x4
+            kAbsolutePosition = 0x8
+            kPositionAwareTilt = 0x10
+
+        class Mode(IntFlag):
+            kMotorDirectionReversed = 0x1
+            kCalibrationMode = 0x2
+            kMaintenanceMode = 0x4
+            kLedFeedback = 0x8
+
+        class OperationalStatus(IntFlag):
+            kGlobal = 0x3
+            kLift = 0xC
+            kTilt = 0x30
+
+        class SafetyStatus(IntFlag):
+            kRemoteLockout = 0x1
+            kTamperDetection = 0x2
+            kFailedCommunication = 0x4
+            kPositionFailure = 0x8
+            kThermalProtection = 0x10
+            kObstacleDetected = 0x20
+            kPower = 0x40
+            kStopInput = 0x80
+            kMotorJammed = 0x100
+            kHardwareFailure = 0x200
+            kManualOperation = 0x400
+            kProtection = 0x800
+
+
 
     class Commands:
         @dataclass
         class UpOrOpen(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0102
-            command_id: typing.ClassVar[int] = 0x0000
+            command_id: typing.ClassVar[int] = 0x00000000
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = None
 
@@ -15013,7 +15315,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class DownOrClose(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0102
-            command_id: typing.ClassVar[int] = 0x0001
+            command_id: typing.ClassVar[int] = 0x00000001
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = None
 
@@ -15027,7 +15329,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class StopMotion(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0102
-            command_id: typing.ClassVar[int] = 0x0002
+            command_id: typing.ClassVar[int] = 0x00000002
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = None
 
@@ -15041,7 +15343,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class GoToLiftValue(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0102
-            command_id: typing.ClassVar[int] = 0x0004
+            command_id: typing.ClassVar[int] = 0x00000004
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = None
 
@@ -15057,7 +15359,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class GoToLiftPercentage(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0102
-            command_id: typing.ClassVar[int] = 0x0005
+            command_id: typing.ClassVar[int] = 0x00000005
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = None
 
@@ -15073,7 +15375,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class GoToTiltValue(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0102
-            command_id: typing.ClassVar[int] = 0x0007
+            command_id: typing.ClassVar[int] = 0x00000007
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = None
 
@@ -15089,7 +15391,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class GoToTiltPercentage(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0102
-            command_id: typing.ClassVar[int] = 0x0008
+            command_id: typing.ClassVar[int] = 0x00000008
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = None
 
@@ -15581,11 +15883,12 @@ def descriptor(cls) -> ClusterObjectDescriptor:
 
 
 
+
     class Commands:
         @dataclass
         class BarrierControlGoToPercent(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0103
-            command_id: typing.ClassVar[int] = 0x0000
+            command_id: typing.ClassVar[int] = 0x00000000
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = None
 
@@ -15601,7 +15904,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class BarrierControlStop(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0103
-            command_id: typing.ClassVar[int] = 0x0001
+            command_id: typing.ClassVar[int] = 0x00000001
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = None
 
@@ -15939,6 +16242,28 @@ class PumpOperationMode(IntEnum):
             kLocal = 0x03
 
 
+    class Bitmaps:
+        class PumpFeature(IntFlag):
+            kConstantPressure = 0x1
+            kCompensatedPressure = 0x2
+            kConstantFlow = 0x4
+            kConstantSpeed = 0x8
+            kConstantTemperature = 0x10
+            kAutomatic = 0x20
+            kLocal = 0x40
+
+        class PumpStatus(IntFlag):
+            kDeviceFault = 0x1
+            kSupplyfault = 0x2
+            kSpeedLow = 0x4
+            kSpeedHigh = 0x8
+            kLocalOverride = 0x10
+            kRunning = 0x20
+            kRemotePressure = 0x40
+            kRemoteFlow = 0x80
+            kRemoteTemperature = 0x100
+
+
 
 
     class Attributes:
@@ -16830,6 +17155,30 @@ class ThermostatSystemMode(IntEnum):
             kFanOnly = 0x07
 
 
+    class Bitmaps:
+        class DayOfWeek(IntFlag):
+            kSunday = 0x1
+            kMonday = 0x2
+            kTuesday = 0x4
+            kWednesday = 0x8
+            kThursday = 0x10
+            kFriday = 0x20
+            kSaturday = 0x40
+            kAwayOrVacation = 0x80
+
+        class ModeForSequence(IntFlag):
+            kHeatSetpointFieldPresent = 0x1
+            kCoolSetpointFieldPresent = 0x2
+
+        class ThermostatFeature(IntFlag):
+            kHeating = 0x1
+            kCooling = 0x2
+            kOccupancy = 0x4
+            kSchedule = 0x8
+            kSetback = 0x10
+            kAutomode = 0x20
+
+
     class Structs:
         @dataclass
         class ThermostatScheduleTransition(ClusterObject):
@@ -16852,7 +17201,7 @@ class Commands:
         @dataclass
         class SetpointRaiseLower(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0201
-            command_id: typing.ClassVar[int] = 0x0000
+            command_id: typing.ClassVar[int] = 0x00000000
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = None
 
@@ -16870,7 +17219,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class GetWeeklyScheduleResponse(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0201
-            command_id: typing.ClassVar[int] = 0x0000
+            command_id: typing.ClassVar[int] = 0x00000000
             is_client: typing.ClassVar[bool] = False
             response_type: typing.ClassVar[str] = None
 
@@ -16892,7 +17241,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class SetWeeklySchedule(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0201
-            command_id: typing.ClassVar[int] = 0x0001
+            command_id: typing.ClassVar[int] = 0x00000001
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = None
 
@@ -16914,7 +17263,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class GetWeeklySchedule(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0201
-            command_id: typing.ClassVar[int] = 0x0002
+            command_id: typing.ClassVar[int] = 0x00000002
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = 'GetWeeklyScheduleResponse'
 
@@ -16932,7 +17281,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class ClearWeeklySchedule(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0201
-            command_id: typing.ClassVar[int] = 0x0003
+            command_id: typing.ClassVar[int] = 0x00000003
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = None
 
@@ -17873,6 +18222,27 @@ class FanModeType(IntEnum):
             kSmart = 0x06
 
 
+    class Bitmaps:
+        class FanControlFeature(IntFlag):
+            kMultiSpeed = 0x1
+            kAuto = 0x2
+            kRocking = 0x4
+            kWind = 0x8
+
+        class RockSupportMask(IntFlag):
+            kRockLeftRight = 0x1
+            kRockUpDown = 0x2
+            kRockRound = 0x4
+
+        class WindSettingMask(IntFlag):
+            kSleepWind = 0x1
+            kNaturalWind = 0x2
+
+        class WindSupportMask(IntFlag):
+            kSleepWind = 0x1
+            kNaturalWind = 0x2
+
+
 
 
     class Attributes:
@@ -18164,6 +18534,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
 
 
 
+
     class Attributes:
         @dataclass
         class TemperatureDisplayMode(ClusterAttributeDescriptor):
@@ -18460,12 +18831,34 @@ class SaturationStepMode(IntEnum):
             kDown = 0x03
 
 
+    class Bitmaps:
+        class ColorCapabilities(IntFlag):
+            kHueSaturationSupported = 0x1
+            kEnhancedHueSupported = 0x2
+            kColorLoopSupported = 0x4
+            kXYAttributesSupported = 0x8
+            kColorTemperatureSupported = 0x10
+
+        class ColorControlFeature(IntFlag):
+            kHueAndSaturation = 0x1
+            kEnhancedHue = 0x2
+            kColorLoop = 0x4
+            kXy = 0x8
+            kColorTemperature = 0x10
+
+        class ColorLoopUpdateFlags(IntFlag):
+            kUpdateAction = 0x1
+            kUpdateDirection = 0x2
+            kUpdateTime = 0x4
+            kUpdateStartHue = 0x8
+
+
 
     class Commands:
         @dataclass
         class MoveToHue(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0300
-            command_id: typing.ClassVar[int] = 0x0000
+            command_id: typing.ClassVar[int] = 0x00000000
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = None
 
@@ -18489,7 +18882,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class MoveHue(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0300
-            command_id: typing.ClassVar[int] = 0x0001
+            command_id: typing.ClassVar[int] = 0x00000001
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = None
 
@@ -18511,7 +18904,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class StepHue(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0300
-            command_id: typing.ClassVar[int] = 0x0002
+            command_id: typing.ClassVar[int] = 0x00000002
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = None
 
@@ -18535,7 +18928,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class MoveToSaturation(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0300
-            command_id: typing.ClassVar[int] = 0x0003
+            command_id: typing.ClassVar[int] = 0x00000003
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = None
 
@@ -18557,7 +18950,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class MoveSaturation(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0300
-            command_id: typing.ClassVar[int] = 0x0004
+            command_id: typing.ClassVar[int] = 0x00000004
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = None
 
@@ -18579,7 +18972,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class StepSaturation(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0300
-            command_id: typing.ClassVar[int] = 0x0005
+            command_id: typing.ClassVar[int] = 0x00000005
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = None
 
@@ -18603,7 +18996,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class MoveToHueAndSaturation(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0300
-            command_id: typing.ClassVar[int] = 0x0006
+            command_id: typing.ClassVar[int] = 0x00000006
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = None
 
@@ -18627,7 +19020,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class MoveToColor(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0300
-            command_id: typing.ClassVar[int] = 0x0007
+            command_id: typing.ClassVar[int] = 0x00000007
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = None
 
@@ -18651,7 +19044,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class MoveColor(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0300
-            command_id: typing.ClassVar[int] = 0x0008
+            command_id: typing.ClassVar[int] = 0x00000008
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = None
 
@@ -18673,7 +19066,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class StepColor(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0300
-            command_id: typing.ClassVar[int] = 0x0009
+            command_id: typing.ClassVar[int] = 0x00000009
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = None
 
@@ -18697,7 +19090,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class MoveToColorTemperature(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0300
-            command_id: typing.ClassVar[int] = 0x000A
+            command_id: typing.ClassVar[int] = 0x0000000A
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = None
 
@@ -18705,13 +19098,13 @@ class MoveToColorTemperature(ClusterCommand):
             def descriptor(cls) -> ClusterObjectDescriptor:
                 return ClusterObjectDescriptor(
                     Fields = [
-                            ClusterObjectFieldDescriptor(Label="colorTemperature", Tag=0, Type=uint),
+                            ClusterObjectFieldDescriptor(Label="colorTemperatureMireds", Tag=0, Type=uint),
                             ClusterObjectFieldDescriptor(Label="transitionTime", Tag=1, Type=uint),
                             ClusterObjectFieldDescriptor(Label="optionsMask", Tag=2, Type=uint),
                             ClusterObjectFieldDescriptor(Label="optionsOverride", Tag=3, Type=uint),
                     ])
 
-            colorTemperature: 'uint' = 0
+            colorTemperatureMireds: 'uint' = 0
             transitionTime: 'uint' = 0
             optionsMask: 'uint' = 0
             optionsOverride: 'uint' = 0
@@ -18719,7 +19112,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class EnhancedMoveToHue(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0300
-            command_id: typing.ClassVar[int] = 0x0040
+            command_id: typing.ClassVar[int] = 0x00000040
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = None
 
@@ -18743,7 +19136,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class EnhancedMoveHue(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0300
-            command_id: typing.ClassVar[int] = 0x0041
+            command_id: typing.ClassVar[int] = 0x00000041
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = None
 
@@ -18765,7 +19158,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class EnhancedStepHue(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0300
-            command_id: typing.ClassVar[int] = 0x0042
+            command_id: typing.ClassVar[int] = 0x00000042
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = None
 
@@ -18789,7 +19182,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class EnhancedMoveToHueAndSaturation(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0300
-            command_id: typing.ClassVar[int] = 0x0043
+            command_id: typing.ClassVar[int] = 0x00000043
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = None
 
@@ -18813,7 +19206,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class ColorLoopSet(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0300
-            command_id: typing.ClassVar[int] = 0x0044
+            command_id: typing.ClassVar[int] = 0x00000044
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = None
 
@@ -18841,7 +19234,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class StopMoveStep(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0300
-            command_id: typing.ClassVar[int] = 0x0047
+            command_id: typing.ClassVar[int] = 0x00000047
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = None
 
@@ -18859,7 +19252,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class MoveColorTemperature(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0300
-            command_id: typing.ClassVar[int] = 0x004B
+            command_id: typing.ClassVar[int] = 0x0000004B
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = None
 
@@ -18885,7 +19278,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class StepColorTemperature(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0300
-            command_id: typing.ClassVar[int] = 0x004C
+            command_id: typing.ClassVar[int] = 0x0000004C
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = None
 
@@ -19878,6 +20271,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
 
 
 
+
     class Attributes:
         @dataclass
         class PhysicalMinLevel(ClusterAttributeDescriptor):
@@ -20224,6 +20618,7 @@ class LightSensorType(IntEnum):
 
 
 
+
     class Attributes:
         @dataclass
         class MeasuredValue(ClusterAttributeDescriptor):
@@ -20419,6 +20814,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
 
 
 
+
     class Attributes:
         @dataclass
         class MeasuredValue(ClusterAttributeDescriptor):
@@ -20606,6 +21002,11 @@ def descriptor(cls) -> ClusterObjectDescriptor:
     clusterRevision: 'uint' = None
 
 
+    class Bitmaps:
+        class PressureFeature(IntFlag):
+            kExtended = 0x1
+
+
 
 
     class Attributes:
@@ -20867,6 +21268,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
 
 
 
+
     class Attributes:
         @dataclass
         class MeasuredValue(ClusterAttributeDescriptor):
@@ -21046,6 +21448,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
 
 
 
+
     class Attributes:
         @dataclass
         class MeasuredValue(ClusterAttributeDescriptor):
@@ -21241,6 +21644,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
 
 
 
+
     class Attributes:
         @dataclass
         class Occupancy(ClusterAttributeDescriptor):
@@ -21542,6 +21946,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
 
 
 
+
     class Attributes:
         @dataclass
         class MACAddress(ClusterAttributeDescriptor):
@@ -21678,6 +22083,12 @@ class LineupInfoTypeEnum(IntEnum):
             kMso = 0x00
 
 
+    class Bitmaps:
+        class ChannelFeature(IntFlag):
+            kChannelList = 0x1
+            kLineupInfo = 0x2
+
+
     class Structs:
         @dataclass
         class ChannelInfo(ClusterObject):
@@ -21721,7 +22132,7 @@ class Commands:
         @dataclass
         class ChangeChannel(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0504
-            command_id: typing.ClassVar[int] = 0x0000
+            command_id: typing.ClassVar[int] = 0x00000000
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = 'ChangeChannelResponse'
 
@@ -21737,7 +22148,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class ChangeChannelResponse(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0504
-            command_id: typing.ClassVar[int] = 0x0001
+            command_id: typing.ClassVar[int] = 0x00000001
             is_client: typing.ClassVar[bool] = False
             response_type: typing.ClassVar[str] = None
 
@@ -21755,7 +22166,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class ChangeChannelByNumber(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0504
-            command_id: typing.ClassVar[int] = 0x0002
+            command_id: typing.ClassVar[int] = 0x00000002
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = None
 
@@ -21773,7 +22184,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class SkipChannel(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0504
-            command_id: typing.ClassVar[int] = 0x0003
+            command_id: typing.ClassVar[int] = 0x00000003
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = None
 
@@ -21950,6 +22361,7 @@ class TargetNavigatorStatusEnum(IntEnum):
             kNotAllowed = 0x02
 
 
+
     class Structs:
         @dataclass
         class TargetInfo(ClusterObject):
@@ -21970,7 +22382,7 @@ class Commands:
         @dataclass
         class NavigateTarget(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0505
-            command_id: typing.ClassVar[int] = 0x0000
+            command_id: typing.ClassVar[int] = 0x00000000
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = 'NavigateTargetResponse'
 
@@ -21988,7 +22400,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class NavigateTargetResponse(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0505
-            command_id: typing.ClassVar[int] = 0x0001
+            command_id: typing.ClassVar[int] = 0x00000001
             is_client: typing.ClassVar[bool] = False
             response_type: typing.ClassVar[str] = None
 
@@ -22170,6 +22582,12 @@ class PlaybackStateEnum(IntEnum):
             kBuffering = 0x03
 
 
+    class Bitmaps:
+        class MediaPlaybackFeature(IntFlag):
+            kAdvancedSeek = 0x1
+            kVariableSpeed = 0x2
+
+
     class Structs:
         @dataclass
         class PlaybackPosition(ClusterObject):
@@ -22190,7 +22608,7 @@ class Commands:
         @dataclass
         class Play(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0506
-            command_id: typing.ClassVar[int] = 0x0000
+            command_id: typing.ClassVar[int] = 0x00000000
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = 'PlaybackResponse'
 
@@ -22204,7 +22622,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class Pause(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0506
-            command_id: typing.ClassVar[int] = 0x0001
+            command_id: typing.ClassVar[int] = 0x00000001
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = 'PlaybackResponse'
 
@@ -22218,7 +22636,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class StopPlayback(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0506
-            command_id: typing.ClassVar[int] = 0x0002
+            command_id: typing.ClassVar[int] = 0x00000002
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = 'PlaybackResponse'
 
@@ -22232,7 +22650,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class StartOver(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0506
-            command_id: typing.ClassVar[int] = 0x0003
+            command_id: typing.ClassVar[int] = 0x00000003
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = 'PlaybackResponse'
 
@@ -22246,7 +22664,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class Previous(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0506
-            command_id: typing.ClassVar[int] = 0x0004
+            command_id: typing.ClassVar[int] = 0x00000004
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = 'PlaybackResponse'
 
@@ -22260,7 +22678,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class Next(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0506
-            command_id: typing.ClassVar[int] = 0x0005
+            command_id: typing.ClassVar[int] = 0x00000005
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = 'PlaybackResponse'
 
@@ -22274,7 +22692,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class Rewind(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0506
-            command_id: typing.ClassVar[int] = 0x0006
+            command_id: typing.ClassVar[int] = 0x00000006
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = 'PlaybackResponse'
 
@@ -22288,7 +22706,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class FastForward(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0506
-            command_id: typing.ClassVar[int] = 0x0007
+            command_id: typing.ClassVar[int] = 0x00000007
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = 'PlaybackResponse'
 
@@ -22302,7 +22720,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class SkipForward(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0506
-            command_id: typing.ClassVar[int] = 0x0008
+            command_id: typing.ClassVar[int] = 0x00000008
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = 'PlaybackResponse'
 
@@ -22318,7 +22736,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class SkipBackward(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0506
-            command_id: typing.ClassVar[int] = 0x0009
+            command_id: typing.ClassVar[int] = 0x00000009
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = 'PlaybackResponse'
 
@@ -22334,7 +22752,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class PlaybackResponse(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0506
-            command_id: typing.ClassVar[int] = 0x000A
+            command_id: typing.ClassVar[int] = 0x0000000A
             is_client: typing.ClassVar[bool] = False
             response_type: typing.ClassVar[str] = None
 
@@ -22352,7 +22770,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class Seek(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0506
-            command_id: typing.ClassVar[int] = 0x000B
+            command_id: typing.ClassVar[int] = 0x0000000B
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = 'PlaybackResponse'
 
@@ -22602,6 +23020,11 @@ class InputTypeEnum(IntEnum):
             kOther = 0x0B
 
 
+    class Bitmaps:
+        class MediaInputFeature(IntFlag):
+            kNameUpdates = 0x1
+
+
     class Structs:
         @dataclass
         class InputInfo(ClusterObject):
@@ -22626,7 +23049,7 @@ class Commands:
         @dataclass
         class SelectInput(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0507
-            command_id: typing.ClassVar[int] = 0x0000
+            command_id: typing.ClassVar[int] = 0x00000000
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = None
 
@@ -22642,7 +23065,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class ShowInputStatus(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0507
-            command_id: typing.ClassVar[int] = 0x0001
+            command_id: typing.ClassVar[int] = 0x00000001
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = None
 
@@ -22656,7 +23079,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class HideInputStatus(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0507
-            command_id: typing.ClassVar[int] = 0x0002
+            command_id: typing.ClassVar[int] = 0x00000002
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = None
 
@@ -22670,7 +23093,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class RenameInput(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0507
-            command_id: typing.ClassVar[int] = 0x0003
+            command_id: typing.ClassVar[int] = 0x00000003
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = None
 
@@ -22824,11 +23247,12 @@ def descriptor(cls) -> ClusterObjectDescriptor:
 
 
 
+
     class Commands:
         @dataclass
         class Sleep(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0508
-            command_id: typing.ClassVar[int] = 0x0000
+            command_id: typing.ClassVar[int] = 0x00000000
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = None
 
@@ -23039,12 +23463,19 @@ class KeypadInputStatusEnum(IntEnum):
             kInvalidKeyInCurrentState = 0x02
 
 
+    class Bitmaps:
+        class KeypadInputFeature(IntFlag):
+            kNavigationKeyCodes = 0x1
+            kLocationKeys = 0x2
+            kNumberKeys = 0x4
+
+
 
     class Commands:
         @dataclass
         class SendKey(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0509
-            command_id: typing.ClassVar[int] = 0x0000
+            command_id: typing.ClassVar[int] = 0x00000000
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = 'SendKeyResponse'
 
@@ -23060,7 +23491,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class SendKeyResponse(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0509
-            command_id: typing.ClassVar[int] = 0x0001
+            command_id: typing.ClassVar[int] = 0x00000001
             is_client: typing.ClassVar[bool] = False
             response_type: typing.ClassVar[str] = None
 
@@ -23208,6 +23639,16 @@ class ParameterEnum(IntEnum):
             kType = 0x0C
 
 
+    class Bitmaps:
+        class ContentLauncherFeature(IntFlag):
+            kContentSearch = 0x1
+            kURLPlayback = 0x2
+
+        class SupportedStreamingProtocol(IntFlag):
+            kDash = 0x1
+            kHls = 0x2
+
+
     class Structs:
         @dataclass
         class Dimension(ClusterObject):
@@ -23305,7 +23746,7 @@ class Commands:
         @dataclass
         class LaunchContent(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x050A
-            command_id: typing.ClassVar[int] = 0x0000
+            command_id: typing.ClassVar[int] = 0x00000000
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = 'LaunchResponse'
 
@@ -23325,7 +23766,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class LaunchURL(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x050A
-            command_id: typing.ClassVar[int] = 0x0001
+            command_id: typing.ClassVar[int] = 0x00000001
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = 'LaunchResponse'
 
@@ -23345,7 +23786,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class LaunchResponse(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x050A
-            command_id: typing.ClassVar[int] = 0x0002
+            command_id: typing.ClassVar[int] = 0x00000002
             is_client: typing.ClassVar[bool] = False
             response_type: typing.ClassVar[str] = None
 
@@ -23511,6 +23952,11 @@ class OutputTypeEnum(IntEnum):
             kOther = 0x05
 
 
+    class Bitmaps:
+        class AudioOutputFeature(IntFlag):
+            kNameUpdates = 0x1
+
+
     class Structs:
         @dataclass
         class OutputInfo(ClusterObject):
@@ -23533,7 +23979,7 @@ class Commands:
         @dataclass
         class SelectOutput(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x050B
-            command_id: typing.ClassVar[int] = 0x0000
+            command_id: typing.ClassVar[int] = 0x00000000
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = None
 
@@ -23549,7 +23995,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class RenameOutput(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x050B
-            command_id: typing.ClassVar[int] = 0x0001
+            command_id: typing.ClassVar[int] = 0x00000001
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = None
 
@@ -23712,6 +24158,11 @@ class ApplicationLauncherStatusEnum(IntEnum):
             kSystemBusy = 0x02
 
 
+    class Bitmaps:
+        class ApplicationLauncherFeature(IntFlag):
+            kApplicationPlatform = 0x1
+
+
     class Structs:
         @dataclass
         class Application(ClusterObject):
@@ -23745,7 +24196,7 @@ class Commands:
         @dataclass
         class LaunchApp(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x050C
-            command_id: typing.ClassVar[int] = 0x0000
+            command_id: typing.ClassVar[int] = 0x00000000
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = 'LauncherResponse'
 
@@ -23763,7 +24214,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class StopApp(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x050C
-            command_id: typing.ClassVar[int] = 0x0001
+            command_id: typing.ClassVar[int] = 0x00000001
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = 'LauncherResponse'
 
@@ -23779,7 +24230,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class HideApp(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x050C
-            command_id: typing.ClassVar[int] = 0x0002
+            command_id: typing.ClassVar[int] = 0x00000002
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = 'LauncherResponse'
 
@@ -23795,7 +24246,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class LauncherResponse(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x050C
-            command_id: typing.ClassVar[int] = 0x0003
+            command_id: typing.ClassVar[int] = 0x00000003
             is_client: typing.ClassVar[bool] = False
             response_type: typing.ClassVar[str] = None
 
@@ -23971,6 +24422,7 @@ class ApplicationStatusEnum(IntEnum):
             kActiveVisibleNotFocus = 0x03
 
 
+
     class Structs:
         @dataclass
         class ApplicationBasicApplication(ClusterObject):
@@ -24222,11 +24674,12 @@ def descriptor(cls) -> ClusterObjectDescriptor:
 
 
 
+
     class Commands:
         @dataclass
         class GetSetupPIN(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x050E
-            command_id: typing.ClassVar[int] = 0x0000
+            command_id: typing.ClassVar[int] = 0x00000000
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = 'GetSetupPINResponse'
 
@@ -24246,7 +24699,7 @@ def must_use_timed_invoke(cls) -> bool:
         @dataclass
         class GetSetupPINResponse(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x050E
-            command_id: typing.ClassVar[int] = 0x0001
+            command_id: typing.ClassVar[int] = 0x00000001
             is_client: typing.ClassVar[bool] = False
             response_type: typing.ClassVar[str] = None
 
@@ -24262,7 +24715,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class Login(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x050E
-            command_id: typing.ClassVar[int] = 0x0002
+            command_id: typing.ClassVar[int] = 0x00000002
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = None
 
@@ -24284,7 +24737,7 @@ def must_use_timed_invoke(cls) -> bool:
         @dataclass
         class Logout(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x050E
-            command_id: typing.ClassVar[int] = 0x0003
+            command_id: typing.ClassVar[int] = 0x00000003
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = None
 
@@ -24662,11 +25115,12 @@ def descriptor(cls) -> ClusterObjectDescriptor:
 
 
 
+
     class Commands:
         @dataclass
         class GetProfileInfoResponseCommand(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0B04
-            command_id: typing.ClassVar[int] = 0x0000
+            command_id: typing.ClassVar[int] = 0x00000000
             is_client: typing.ClassVar[bool] = False
             response_type: typing.ClassVar[str] = None
 
@@ -24688,7 +25142,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class GetProfileInfoCommand(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0B04
-            command_id: typing.ClassVar[int] = 0x0000
+            command_id: typing.ClassVar[int] = 0x00000000
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = None
 
@@ -24702,7 +25156,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class GetMeasurementProfileResponseCommand(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0B04
-            command_id: typing.ClassVar[int] = 0x0001
+            command_id: typing.ClassVar[int] = 0x00000001
             is_client: typing.ClassVar[bool] = False
             response_type: typing.ClassVar[str] = None
 
@@ -24728,7 +25182,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class GetMeasurementProfileCommand(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x0B04
-            command_id: typing.ClassVar[int] = 0x0001
+            command_id: typing.ClassVar[int] = 0x00000001
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = None
 
@@ -26907,6 +27361,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
     clusterRevision: 'uint' = None
 
 
+
     class Structs:
         @dataclass
         class MonitoringRegistration(ClusterObject):
@@ -26929,7 +27384,7 @@ class Commands:
         @dataclass
         class RegisterClientMonitoring(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x1046
-            command_id: typing.ClassVar[int] = 0x0000
+            command_id: typing.ClassVar[int] = 0x00000000
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = None
 
@@ -26947,7 +27402,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class UnregisterClientMonitoring(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x1046
-            command_id: typing.ClassVar[int] = 0x0001
+            command_id: typing.ClassVar[int] = 0x00000001
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = None
 
@@ -26965,7 +27420,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class StayAwakeRequest(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0x1046
-            command_id: typing.ClassVar[int] = 0x0002
+            command_id: typing.ClassVar[int] = 0x00000002
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = None
 
@@ -27317,6 +27772,37 @@ class SimpleEnum(IntEnum):
             kValueC = 0x03
 
 
+    class Bitmaps:
+        class Bitmap16MaskMap(IntFlag):
+            kMaskVal1 = 0x1
+            kMaskVal2 = 0x2
+            kMaskVal3 = 0x4
+            kMaskVal4 = 0x4000
+
+        class Bitmap32MaskMap(IntFlag):
+            kMaskVal1 = 0x1
+            kMaskVal2 = 0x2
+            kMaskVal3 = 0x4
+            kMaskVal4 = 0x40000000
+
+        class Bitmap64MaskMap(IntFlag):
+            kMaskVal1 = 0x1
+            kMaskVal2 = 0x2
+            kMaskVal3 = 0x4
+            kMaskVal4 = 0x4000000000000000
+
+        class Bitmap8MaskMap(IntFlag):
+            kMaskVal1 = 0x1
+            kMaskVal2 = 0x2
+            kMaskVal3 = 0x4
+            kMaskVal4 = 0x40
+
+        class SimpleBitmap(IntFlag):
+            kValueA = 0x1
+            kValueB = 0x2
+            kValueC = 0x4
+
+
     class Structs:
         @dataclass
         class SimpleStruct(ClusterObject):
@@ -27469,7 +27955,7 @@ class Commands:
         @dataclass
         class Test(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0xFFF1FC05
-            command_id: typing.ClassVar[int] = 0x0000
+            command_id: typing.ClassVar[int] = 0x00000000
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = None
 
@@ -27483,7 +27969,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class TestSpecificResponse(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0xFFF1FC05
-            command_id: typing.ClassVar[int] = 0x0000
+            command_id: typing.ClassVar[int] = 0x00000000
             is_client: typing.ClassVar[bool] = False
             response_type: typing.ClassVar[str] = None
 
@@ -27499,7 +27985,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class TestNotHandled(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0xFFF1FC05
-            command_id: typing.ClassVar[int] = 0x0001
+            command_id: typing.ClassVar[int] = 0x00000001
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = None
 
@@ -27513,7 +27999,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class TestAddArgumentsResponse(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0xFFF1FC05
-            command_id: typing.ClassVar[int] = 0x0001
+            command_id: typing.ClassVar[int] = 0x00000001
             is_client: typing.ClassVar[bool] = False
             response_type: typing.ClassVar[str] = None
 
@@ -27529,7 +28015,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class TestSpecific(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0xFFF1FC05
-            command_id: typing.ClassVar[int] = 0x0002
+            command_id: typing.ClassVar[int] = 0x00000002
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = 'TestSpecificResponse'
 
@@ -27543,7 +28029,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class TestSimpleArgumentResponse(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0xFFF1FC05
-            command_id: typing.ClassVar[int] = 0x0002
+            command_id: typing.ClassVar[int] = 0x00000002
             is_client: typing.ClassVar[bool] = False
             response_type: typing.ClassVar[str] = None
 
@@ -27559,7 +28045,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class TestUnknownCommand(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0xFFF1FC05
-            command_id: typing.ClassVar[int] = 0x0003
+            command_id: typing.ClassVar[int] = 0x00000003
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = None
 
@@ -27573,7 +28059,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class TestStructArrayArgumentResponse(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0xFFF1FC05
-            command_id: typing.ClassVar[int] = 0x0003
+            command_id: typing.ClassVar[int] = 0x00000003
             is_client: typing.ClassVar[bool] = False
             response_type: typing.ClassVar[str] = None
 
@@ -27599,7 +28085,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class TestAddArguments(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0xFFF1FC05
-            command_id: typing.ClassVar[int] = 0x0004
+            command_id: typing.ClassVar[int] = 0x00000004
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = 'TestAddArgumentsResponse'
 
@@ -27617,7 +28103,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class TestListInt8UReverseResponse(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0xFFF1FC05
-            command_id: typing.ClassVar[int] = 0x0004
+            command_id: typing.ClassVar[int] = 0x00000004
             is_client: typing.ClassVar[bool] = False
             response_type: typing.ClassVar[str] = None
 
@@ -27633,7 +28119,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class TestSimpleArgumentRequest(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0xFFF1FC05
-            command_id: typing.ClassVar[int] = 0x0005
+            command_id: typing.ClassVar[int] = 0x00000005
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = 'TestSimpleArgumentResponse'
 
@@ -27649,7 +28135,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class TestEnumsResponse(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0xFFF1FC05
-            command_id: typing.ClassVar[int] = 0x0005
+            command_id: typing.ClassVar[int] = 0x00000005
             is_client: typing.ClassVar[bool] = False
             response_type: typing.ClassVar[str] = None
 
@@ -27667,7 +28153,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class TestStructArrayArgumentRequest(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0xFFF1FC05
-            command_id: typing.ClassVar[int] = 0x0006
+            command_id: typing.ClassVar[int] = 0x00000006
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = 'TestStructArrayArgumentResponse'
 
@@ -27693,7 +28179,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class TestNullableOptionalResponse(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0xFFF1FC05
-            command_id: typing.ClassVar[int] = 0x0006
+            command_id: typing.ClassVar[int] = 0x00000006
             is_client: typing.ClassVar[bool] = False
             response_type: typing.ClassVar[str] = None
 
@@ -27715,7 +28201,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class TestStructArgumentRequest(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0xFFF1FC05
-            command_id: typing.ClassVar[int] = 0x0007
+            command_id: typing.ClassVar[int] = 0x00000007
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = 'BooleanResponse'
 
@@ -27731,7 +28217,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class TestComplexNullableOptionalResponse(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0xFFF1FC05
-            command_id: typing.ClassVar[int] = 0x0007
+            command_id: typing.ClassVar[int] = 0x00000007
             is_client: typing.ClassVar[bool] = False
             response_type: typing.ClassVar[str] = None
 
@@ -27801,7 +28287,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class TestNestedStructArgumentRequest(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0xFFF1FC05
-            command_id: typing.ClassVar[int] = 0x0008
+            command_id: typing.ClassVar[int] = 0x00000008
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = 'BooleanResponse'
 
@@ -27817,7 +28303,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class BooleanResponse(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0xFFF1FC05
-            command_id: typing.ClassVar[int] = 0x0008
+            command_id: typing.ClassVar[int] = 0x00000008
             is_client: typing.ClassVar[bool] = False
             response_type: typing.ClassVar[str] = None
 
@@ -27833,7 +28319,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class TestListStructArgumentRequest(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0xFFF1FC05
-            command_id: typing.ClassVar[int] = 0x0009
+            command_id: typing.ClassVar[int] = 0x00000009
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = 'BooleanResponse'
 
@@ -27849,7 +28335,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class SimpleStructResponse(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0xFFF1FC05
-            command_id: typing.ClassVar[int] = 0x0009
+            command_id: typing.ClassVar[int] = 0x00000009
             is_client: typing.ClassVar[bool] = False
             response_type: typing.ClassVar[str] = None
 
@@ -27865,7 +28351,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class TestListInt8UArgumentRequest(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0xFFF1FC05
-            command_id: typing.ClassVar[int] = 0x000A
+            command_id: typing.ClassVar[int] = 0x0000000A
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = 'BooleanResponse'
 
@@ -27881,7 +28367,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class TestEmitTestEventResponse(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0xFFF1FC05
-            command_id: typing.ClassVar[int] = 0x000A
+            command_id: typing.ClassVar[int] = 0x0000000A
             is_client: typing.ClassVar[bool] = False
             response_type: typing.ClassVar[str] = None
 
@@ -27897,7 +28383,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class TestNestedStructListArgumentRequest(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0xFFF1FC05
-            command_id: typing.ClassVar[int] = 0x000B
+            command_id: typing.ClassVar[int] = 0x0000000B
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = 'BooleanResponse'
 
@@ -27913,7 +28399,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class TestEmitTestFabricScopedEventResponse(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0xFFF1FC05
-            command_id: typing.ClassVar[int] = 0x000B
+            command_id: typing.ClassVar[int] = 0x0000000B
             is_client: typing.ClassVar[bool] = False
             response_type: typing.ClassVar[str] = None
 
@@ -27929,7 +28415,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class TestListNestedStructListArgumentRequest(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0xFFF1FC05
-            command_id: typing.ClassVar[int] = 0x000C
+            command_id: typing.ClassVar[int] = 0x0000000C
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = 'BooleanResponse'
 
@@ -27945,7 +28431,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class TestListInt8UReverseRequest(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0xFFF1FC05
-            command_id: typing.ClassVar[int] = 0x000D
+            command_id: typing.ClassVar[int] = 0x0000000D
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = 'TestListInt8UReverseResponse'
 
@@ -27961,7 +28447,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class TestEnumsRequest(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0xFFF1FC05
-            command_id: typing.ClassVar[int] = 0x000E
+            command_id: typing.ClassVar[int] = 0x0000000E
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = 'TestEnumsResponse'
 
@@ -27979,7 +28465,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class TestNullableOptionalRequest(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0xFFF1FC05
-            command_id: typing.ClassVar[int] = 0x000F
+            command_id: typing.ClassVar[int] = 0x0000000F
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = 'TestNullableOptionalResponse'
 
@@ -27995,7 +28481,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class TestComplexNullableOptionalRequest(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0xFFF1FC05
-            command_id: typing.ClassVar[int] = 0x0010
+            command_id: typing.ClassVar[int] = 0x00000010
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = 'TestComplexNullableOptionalResponse'
 
@@ -28033,7 +28519,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class SimpleStructEchoRequest(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0xFFF1FC05
-            command_id: typing.ClassVar[int] = 0x0011
+            command_id: typing.ClassVar[int] = 0x00000011
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = 'SimpleStructResponse'
 
@@ -28049,7 +28535,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class TimedInvokeRequest(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0xFFF1FC05
-            command_id: typing.ClassVar[int] = 0x0012
+            command_id: typing.ClassVar[int] = 0x00000012
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = None
 
@@ -28067,7 +28553,7 @@ def must_use_timed_invoke(cls) -> bool:
         @dataclass
         class TestSimpleOptionalArgumentRequest(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0xFFF1FC05
-            command_id: typing.ClassVar[int] = 0x0013
+            command_id: typing.ClassVar[int] = 0x00000013
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = None
 
@@ -28083,7 +28569,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class TestEmitTestEventRequest(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0xFFF1FC05
-            command_id: typing.ClassVar[int] = 0x0014
+            command_id: typing.ClassVar[int] = 0x00000014
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = 'TestEmitTestEventResponse'
 
@@ -28103,7 +28589,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class TestEmitTestFabricScopedEventRequest(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0xFFF1FC05
-            command_id: typing.ClassVar[int] = 0x0015
+            command_id: typing.ClassVar[int] = 0x00000015
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = 'TestEmitTestFabricScopedEventResponse'
 
@@ -29596,11 +30082,12 @@ class FaultType(IntEnum):
 
 
 
+
     class Commands:
         @dataclass
         class FailAtFault(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0xFFF1FC06
-            command_id: typing.ClassVar[int] = 0x0000
+            command_id: typing.ClassVar[int] = 0x00000000
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = None
 
@@ -29624,7 +30111,7 @@ def descriptor(cls) -> ClusterObjectDescriptor:
         @dataclass
         class FailRandomlyAtFault(ClusterCommand):
             cluster_id: typing.ClassVar[int] = 0xFFF1FC06
-            command_id: typing.ClassVar[int] = 0x0001
+            command_id: typing.ClassVar[int] = 0x00000001
             is_client: typing.ClassVar[bool] = True
             response_type: typing.ClassVar[str] = None
 
diff --git a/src/controller/python/chip/yaml/runner.py b/src/controller/python/chip/yaml/runner.py
index 1fa9d5b90c3feb..7bb59178ad7789 100644
--- a/src/controller/python/chip/yaml/runner.py
+++ b/src/controller/python/chip/yaml/runner.py
@@ -470,15 +470,13 @@ class ReplTestRunner:
     Uses ChipDeviceCtrl from chip-repl to execute parsed YAML TestSteps.
     '''
 
-    def __init__(self, test_spec_definition, certificate_authority_manager):
+    def __init__(self, test_spec_definition, certificate_authority_manager, alpha_dev_ctrl):
         self._test_spec_definition = test_spec_definition
         self._context = _ExecutionContext(data_model_lookup=PreDefinedDataModelLookup())
         self._certificate_authority_manager = certificate_authority_manager
         self._dev_ctrls = {}
 
-        ca_list = certificate_authority_manager.activeCaList
-        dev_ctrl = ca_list[0].adminList[0].NewController()
-        self._dev_ctrls['alpha'] = dev_ctrl
+        self._dev_ctrls['alpha'] = alpha_dev_ctrl
 
     def _invoke_action_factory(self, test_step, cluster: str):
         '''Creates cluster invoke action command from TestStep.
diff --git a/src/controller/python/templates/python-cluster-Objects-py.zapt b/src/controller/python/templates/python-cluster-Objects-py.zapt
index 59cf38258fc15f..ee197a3e302b78 100644
--- a/src/controller/python/templates/python-cluster-Objects-py.zapt
+++ b/src/controller/python/templates/python-cluster-Objects-py.zapt
@@ -10,6 +10,7 @@
 import typing
 from dataclasses import dataclass, field
 from enum import IntEnum
+from enum import IntFlag
 
 from chip import ChipUtility
 from chip.tlv import float32, uint
@@ -56,6 +57,17 @@ class {{asUpperCamelCase name}}(Cluster):
 
 {{/zcl_enums}}
 
+{{#zcl_bitmaps}}
+{{#first}}
+    class Bitmaps:
+{{/first}}
+        class {{asType label}}(IntFlag):
+{{#zcl_bitmap_items}}
+            k{{asUpperCamelCase label}} = {{asHex mask}}
+{{/zcl_bitmap_items}}
+
+{{/zcl_bitmaps}}
+
 {{#zcl_structs}}
 {{#first}}
     class Structs:
@@ -87,7 +99,7 @@ class {{asUpperCamelCase name}}(Cluster):
         @dataclass
         class {{asUpperCamelCase name}}(ClusterCommand):
             cluster_id: typing.ClassVar[int] = {{ asHex parent.code 4 }}
-            command_id: typing.ClassVar[int] = {{ asHex code 4 }}
+            command_id: typing.ClassVar[int] = {{ asMEI manufacturerCode code }}
 {{#if (isServer source)}}
             is_client: typing.ClassVar[bool] = False
 {{else}}
diff --git a/src/darwin/Framework/CHIP/templates/MTRBaseClusters.zapt b/src/darwin/Framework/CHIP/templates/MTRBaseClusters.zapt
index 9a7ccc35a06a17..5948a8664f2c73 100644
--- a/src/darwin/Framework/CHIP/templates/MTRBaseClusters.zapt
+++ b/src/darwin/Framework/CHIP/templates/MTRBaseClusters.zapt
@@ -102,10 +102,16 @@ typedef NS_ENUM({{asUnderlyingZclType name}}, {{objCEnumName clusterName enumNam
    {{/inline}}
    {{> oldNameItemDecl oldItemName=(oldName ../clusterName enum=../enumName enumValue=(asUpperCamelCase label preserveAcronyms=true))}}
    {{/zcl_enum_items}}
+   {{!We had extra "Not Supported" values for DoorLockUserStatus/DoorLockUserType that we have to wedge in here manually for now.}}
+   {{#if (and (isStrEqual clusterName "DoorLock")
+              (or (isStrEqual enumName "UserTypeEnum") (isStrEqual enumName "UserStatusEnum"))
+              (not (wasRemoved clusterName enum=enumName enumValue="NotSupported")))}}
+   {{objCEnumName clusterName enumName}}{{objCEnumItemLabel "NotSupported"}} {{availability clusterName enum=enumName enumValue="NotSupported" deprecationMessage="This value is not part of the specification and will be removed"}} = 0xFF,
+   {{/if}}
 }
 {{/inline}}
 {{#unless (wasRemoved (asUpperCamelCase ../name preserveAcronyms=true) enum=(asUpperCamelCase label preserveAcronyms=true))}}
-{{> enumDef name=name clusterName=(asUpperCamelCase ../name preserveAcronyms=true) enumName=(asUpperCamelCase label preserveAcronyms=true)}} {{availability (asUpperCamelCase ../name preserveAcronyms=true) enum=(asUpperCamelCase label preserveAcronyms=true)}};
+{{> enumDef name=name clusterName=(asUpperCamelCase ../name preserveAcronyms=true) enumName=(asUpperCamelCase label preserveAcronyms=true)}} {{availability (asUpperCamelCase ../name preserveAcronyms=true) enum=(asUpperCamelCase label preserveAcronyms=true) deprecationMessage="This enum is unused and will be removed"}};
 {{/unless}}
 {{! Takes the name of the enum to use as enumName. }}
 {{#*inline "oldNameDecl"}}
diff --git a/src/darwin/Framework/CHIP/templates/availability.yaml b/src/darwin/Framework/CHIP/templates/availability.yaml
index ed46d85c5c2d52..1ea322864385f0 100644
--- a/src/darwin/Framework/CHIP/templates/availability.yaml
+++ b/src/darwin/Framework/CHIP/templates/availability.yaml
@@ -3090,7 +3090,10 @@
           GeneralDiagnostics:
               - BootReasonType
               - HardwareFaultType
-              - InterfaceType
+              # InterfaceTypeEnum was originally just named InterfaceType, but
+              # we generate the same API for both of those names, so the name
+              # can just change here.
+              - InterfaceTypeEnum
               - NetworkFaultType
               - RadioFaultType
           ThreadNetworkDiagnostics:
@@ -3108,7 +3111,10 @@
               - GranularityEnum
               - TimeSourceEnum
           AdministratorCommissioning:
-              - CommissioningWindowStatus
+              # CommissioningWindowStatusEnum was originally just named
+              # CommissioningWindowStatus, but we generate the same API for both
+              # of those names, so the name can just change here.
+              - CommissioningWindowStatusEnum
               - StatusCode
           OperationalCredentials:
               - OperationalCertStatus
@@ -3135,6 +3141,11 @@
               - DoorLockSetPinOrIdStatus
               - DoorLockUserStatus
               - DoorLockUserType
+              # UserTypeEnum and UserStatusEnum use the same generated name as
+              # DoorLockUserStatus and DoorLockUserType, so need to be
+              # considered as introduced at the same time.
+              - UserStatusEnum
+              - UserTypeEnum
           WindowCovering:
               - EndProductType
               - Type
@@ -3430,7 +3441,10 @@
                   - UserInterfaceFault
                   - NonVolatileMemoryError
                   - TamperDetected
-              InterfaceType:
+              # InterfaceTypeEnum was originally just named InterfaceType, but
+              # we generate the same API for both of those names, so the name
+              # can just change here.
+              InterfaceTypeEnum:
                   - Unspecified
                   - WiFi
                   - Ethernet
@@ -3527,7 +3541,10 @@
                   - Ptp
                   - Gnss
           AdministratorCommissioning:
-              CommissioningWindowStatus:
+              # CommissioningWindowStatusEnum was originally just named
+              # CommissioningWindowStatus, but we generate the same API for both
+              # of those names, so the name can just change here.
+              CommissioningWindowStatusEnum:
                   - WindowNotOpen
                   - EnhancedWindowOpen
                   - BasicWindowOpen
@@ -3701,6 +3718,22 @@
                   - MasterUser
                   - NonAccessUser
                   - NotSupported
+              # UserTypeEnum and UserStatusEnum use the same generated name as
+              # DoorLockUserStatus and DoorLockUserType, so need to be
+              # considered as introduced at the same time, with the enum value
+              # names that match DoorLockUserStatus and DoorLockUserType.
+              UserStatusEnum:
+                  - Available
+                  - OccupiedEnabled
+                  - OccupiedDisabled
+                  - NotSupported
+              UserTypeEnum:
+                  - Unrestricted
+                  - YearDayScheduleUser
+                  - WeekDayScheduleUser
+                  - MasterUser
+                  - NonAccessUser
+                  - NotSupported
           WindowCovering:
               EndProductType:
                   - RollerShade
@@ -4983,6 +5016,14 @@
                   - attestationSignature
               AddTrustedRootCertificate:
                   - rootCACertificate
+          DoorLock:
+              SetUser:
+                  - userUniqueID
+              GetUserResponse:
+                  - userUniqueID
+          ColorControl:
+              MoveToColorTemperature:
+                  - colorTemperatureMireds
       structs:
           OTASoftwareUpdateRequestor:
               - ProviderLocation
@@ -5009,6 +5050,8 @@
               - SemanticTagStruct
           OperationalCredentials:
               - FabricDescriptorStruct
+          DoorLock:
+              - CredentialStruct
       struct fields:
           UnitTesting:
               SimpleStruct:
@@ -5120,6 +5163,10 @@
                   - vendorId
                   - fabricId
                   - nodeId
+          DoorLock:
+              CredentialStruct:
+                  - credentialType
+                  - credentialIndex
       events:
           OTASoftwareUpdateRequestor:
               - StateTransition
@@ -5209,14 +5256,26 @@
           ThreadNetworkDiagnostics:
               - ConnectionStatusEnum
           EthernetNetworkDiagnostics:
-              - PHYRate
+              - PHYRateEnum
           GeneralDiagnostics:
-              - HardwareFault
-              - RadioFault
+              - HardwareFaultEnum
+              - RadioFaultEnum
               - BootReasonEnum
+              - NetworkFaultEnum
           OperationalCredentials:
               - NodeOperationalCertStatusEnum
               - CertificateChainTypeEnum
+          DoorLock:
+              - AlarmCodeEnum
+              - CredentialRuleEnum
+              - CredentialTypeEnum
+              - DataOperationTypeEnum
+              - DoorStateEnum
+              - LockDataTypeEnum
+              - LockOperationTypeEnum
+              - OperationErrorEnum
+              - OperatingModeEnum
+              - OperationSourceEnum
       enum values:
           OTASoftwareUpdateProvider:
               OTAApplyUpdateAction:
@@ -5290,7 +5349,7 @@
                   - Ac
                   - Ax
           EthernetNetworkDiagnostics:
-              PHYRate:
+              PHYRateEnum:
                   - Rate10M
                   - Rate100M
                   - Rate1G
@@ -5302,7 +5361,7 @@
                   - Rate200G
                   - Rate400G
           GeneralDiagnostics:
-              HardwareFault:
+              HardwareFaultEnum:
                   - Unspecified
                   - Radio
                   - Sensor
@@ -5314,7 +5373,7 @@
                   - UserInterfaceFault
                   - NonVolatileMemoryError
                   - TamperDetected
-              RadioFault:
+              RadioFaultEnum:
                   - Unspecified
                   - WiFiFault
                   - CellularFault
@@ -5330,6 +5389,11 @@
                   - HardwareWatchdogReset
                   - SoftwareUpdateCompleted
                   - SoftwareReset
+              NetworkFaultEnum:
+                  - Unspecified
+                  - HardwareFailure
+                  - NetworkJammed
+                  - ConnectionFailed
           OperationalCredentials:
               NodeOperationalCertStatusEnum:
                   - OK
@@ -5345,6 +5409,84 @@
               CertificateChainTypeEnum:
                   - DACCertificate
                   - PAICertificate
+          DoorLock:
+              AlarmCodeEnum:
+                  - LockJammed
+                  - LockFactoryReset
+                  - LockRadioPowerCycled
+                  - WrongCodeEntryLimit
+                  - FrontEsceutcheonRemoved
+                  - DoorForcedOpen
+                  - DoorAjar
+                  - ForcedUser
+              CredentialRuleEnum:
+                  - Single
+                  - Dual
+                  - Tri
+              CredentialTypeEnum:
+                  - ProgrammingPIN
+                  - PIN
+                  - RFID
+                  - Fingerprint
+                  - FingerVein
+                  - Face
+              DataOperationTypeEnum:
+                  - Add
+                  - Clear
+                  - Modify
+              DoorStateEnum:
+                  - DoorOpen
+                  - DoorClosed
+                  - DoorJammed
+                  - DoorForcedOpen
+                  - DoorUnspecifiedError
+                  - DoorAjar
+              LockDataTypeEnum:
+                  - Unspecified
+                  - ProgrammingCode
+                  - UserIndex
+                  - WeekDaySchedule
+                  - YearDaySchedule
+                  - HolidaySchedule
+                  - PIN
+                  - RFID
+                  - Fingerprint
+              LockOperationTypeEnum:
+                  - Lock
+                  - Unlock
+                  - NonAccessUserEvent
+                  - ForcedUserEvent
+              OperationErrorEnum:
+                  - Unspecified
+                  - InvalidCredential
+                  - DisabledUserDenied
+                  - Restricted
+                  - InsufficientBattery
+              OperatingModeEnum:
+                  - Normal
+                  - Vacation
+                  - Privacy
+                  - NoRemoteLockUnlock
+                  - Passage
+              OperationSourceEnum:
+                  - Unspecified
+                  - Manual
+                  - ProprietaryRemote
+                  - Keypad
+                  - Auto
+                  - Button
+                  - Schedule
+                  - Remote
+                  - RFID
+                  - Biometric
+              UserTypeEnum:
+                  - UnrestrictedUser
+                  - ProgrammingUser
+                  - ForcedUser
+                  - DisposableUser
+                  - ExpiringUser
+                  - ScheduleRestrictedUser
+                  - RemoteOnlyUser
       bitmaps:
           UnitTesting:
               - Bitmap8MaskMap
@@ -5354,6 +5496,10 @@
               - SimpleBitmap
           LevelControl:
               - LevelControlOptions
+          DoorLock:
+              - DaysMaskMap
+          PumpConfigurationAndControl:
+              - PumpFeature
       bitmap values:
           UnitTesting:
               Bitmap8MaskMap:
@@ -5393,6 +5539,32 @@
           PressureMeasurement:
               PressureFeature:
                   - Extended
+          DoorLock:
+              DaysMaskMap:
+                  - Sunday
+                  - Monday
+                  - Tuesday
+                  - Wednesday
+                  - Thursday
+                  - Friday
+                  - Saturday
+              DoorLockFeature:
+                  - PINCredential
+                  - RFIDCredential
+                  - WeekDayAccessSchedules
+                  - CredentialsOverTheAirAccess
+                  - User
+                  - Notification
+                  - YearDayAccessSchedules
+          PumpConfigurationAndControl:
+              PumpFeature:
+                  - ConstantPressure
+                  - CompensatedPressure
+                  - ConstantFlow
+                  - ConstantSpeed
+                  - ConstantTemperature
+                  - Automatic
+                  - Local
   deprecated:
       clusters:
           - OtaSoftwareUpdateProvider
@@ -5448,6 +5620,14 @@
                   - signature
               AddTrustedRootCertificate:
                   - rootCertificate
+          DoorLock:
+              SetUser:
+                  - userUniqueId
+              GetUserResponse:
+                  - userUniqueId
+          ColorControl:
+              MoveToColorTemperature:
+                  - colorTemperature
       structs:
           Descriptor:
               - DeviceType
@@ -5466,6 +5646,8 @@
               - SemanticTag
           OperationalCredentials:
               - FabricDescriptor
+          DoorLock:
+              - DlCredential
       struct fields:
           Descriptor:
               DeviceTypeStruct:
@@ -5491,8 +5673,36 @@
               - HardwareFaultType
               - RadioFaultType
               - BootReasonType
+              - NetworkFaultType
           OperationalCredentials:
               - OperationalCertStatus
+          DoorLock:
+              - DlAlarmCode
+              - DlCredentialRule
+              - DlCredentialType
+              - DlDataOperationType
+              - DlDoorState
+              - DlLockDataType
+              - DlLockOperationType
+              - DlOperationError
+              - DlOperatingMode
+              - DlOperationSource
+              - DlUserStatus
+              - DlUserType
+              # The enums after this come from the silabs types.xml, not the
+              # door lock cluster XML
+              #
+              # DoorLockUserStatus is not marked deprecated here because the
+              # UserStatusEnum from the spec ends up with the same enum name
+              # (MTRDoorLockUserStatus) but is missing one of the values
+              # compared to DoorLockUserStatus.  So we have to keep
+              # DoorLockUserStatus for now and just deprecate its one extra name.
+              - DoorLockUserStatus
+              - DoorLockUserType
+              - DoorLockDayOfWeek
+              - DoorLockSetPinOrIdStatus
+              - DoorLockOperationEventCode
+              - DoorLockProgrammingEventCode
       enum values:
           GeneralCommissioning:
               CommissioningError:
@@ -5508,6 +5718,16 @@
                   - 80211n
                   - 80211ac
                   - 80211ax
+          DoorLock:
+              UserStatusEnum:
+                  - NotSupported
+              UserTypeEnum:
+                  - NotSupported
+                  - Unrestricted
+                  - MasterUser
+      bitmaps:
+          DoorLock:
+              - DlDaysMaskMap
       bitmap values:
           NetworkCommissioning:
               WiFiSecurity:
@@ -5518,6 +5738,15 @@
           PressureMeasurement:
               PressureFeature:
                   - EXT
+          DoorLock:
+              DoorLockFeature:
+                  - PINCredentials
+                  - RFIDCredentials
+                  - WeekDaySchedules
+                  - CredentialsOTA
+                  - UsersManagement
+                  - Notifications
+                  - YearDaySchedules
       apis:
           - Timed Invoke for server to client commands
           - Deprecated global attribute names
@@ -5528,6 +5757,13 @@
       commands:
           BasicInformation:
               - MfgSpecificPing
+      enums:
+          # DoorLockUserStatus (non-spec) and UserStatusEnum (from the spec) end
+          # up with the same enum name (MTRDoorLockUserStatus), so just remove
+          # the non-spec one.
+          DoorLock:
+              - DoorLockUserStatus
+              - DoorLockUserType
       enum values:
           EthernetNetworkDiagnostics:
               # Both the enum and the values got renamed, so don't output the
@@ -5544,7 +5780,7 @@
                   - Rate100G
                   - Rate200G
                   - Rate400G
-              PHYRate:
+              PHYRateEnum:
                   - 10M
                   - 100M
                   - 1000M
@@ -5563,6 +5799,14 @@
                   - SUCCESS
               OperationalCertStatus:
                   - OK
+          DoorLock:
+              # Both the enum and the values got renamed, so don't output the
+              # new values with the old enum name or the old values with the
+              # new enum name.
+              DlCredentialRule:
+                  - Dual
+              CredentialRuleEnum:
+                  - Double
   renames:
       clusters:
           UnitTesting: TestCluster
@@ -5632,6 +5876,14 @@
                   attestationSignature: signature
               AddTrustedRootCertificate:
                   rootCACertificate: rootCertificate
+          DoorLock:
+              SetUser:
+                  userUniqueID: userUniqueId
+              GetUserResponse:
+                  userUniqueID: userUniqueId
+          ColorControl:
+              MoveToColorTemperature:
+                  colorTemperatureMireds: colorTemperature
       structs:
           AccessControl:
               AccessControlEntryStruct: AccessControlEntry
@@ -5644,6 +5896,8 @@
               SemanticTagStruct: SemanticTag
           OperationalCredentials:
               FabricDescriptorStruct: FabricDescriptor
+          DoorLock:
+              CredentialStruct: DlCredential
       struct fields:
           Descriptor:
               DeviceTypeStruct:
@@ -5664,13 +5918,27 @@
           ThreadNetworkDiagnostics:
               ConnectionStatusEnum: ThreadConnectionStatus
           EthernetNetworkDiagnostics:
-              PHYRate: PHYRateType
+              PHYRateEnum: PHYRateType
           GeneralDiagnostics:
-              HardwareFault: HardwareFaultType
-              RadioFault: RadioFaultType
+              HardwareFaultEnum: HardwareFaultType
+              RadioFaultEnum: RadioFaultType
               BootReasonEnum: BootReasonType
+              NetworkFaultEnum: NetworkFaultType
           OperationalCredentials:
               NodeOperationalCertStatusEnum: OperationalCertStatus
+          DoorLock:
+              AlarmCodeEnum: DlAlarmCode
+              CredentialRuleEnum: DlCredentialRule
+              CredentialTypeEnum: DlCredentialType
+              DataOperationTypeEnum: DlDataOperationType
+              DoorStateEnum: DlDoorState
+              LockDataTypeEnum: DlLockDataType
+              LockOperationTypeEnum: DlLockOperationType
+              OperationErrorEnum: DlOperationError
+              OperatingModeEnum: DlOperatingMode
+              OperationSourceEnum: DlOperationSource
+              UserStatusEnum: DlUserStatus
+              UserTypeEnum: DlUserType
       enum values:
           GeneralCommissioning:
               CommissioningError:
@@ -5687,7 +5955,7 @@
                   Ac: 80211ac
                   Ax: 80211ax
           EthernetNetworkDiagnostics:
-              PHYRate:
+              PHYRateEnum:
                   Rate10M: 10M
                   Rate100M: 100M
                   Rate1G: 1000M
@@ -5714,6 +5982,15 @@
                   OK: SUCCESS
               OperationalCertStatus:
                   OK: SUCCESS
+          DoorLock:
+              CredentialRuleEnum:
+                  Dual: Double
+              UserTypeEnum:
+                  UnrestrictedUser: Unrestricted
+                  ProgrammingUser: MasterUser
+      bitmaps:
+          DoorLock:
+              DaysMaskMap: DlDaysMaskMap
       bitmap values:
           NetworkCommissioning:
               WiFiSecurity:
@@ -5724,3 +6001,12 @@
           PressureMeasurement:
               PressureFeature:
                   Extended: EXT
+          DoorLock:
+              DoorLockFeature:
+                  PINCredential: PINCredentials
+                  RFIDCredential: RFIDCredentials
+                  WeekDayAccessSchedules: WeekDaySchedules
+                  CredentialsOverTheAirAccess: CredentialsOTA
+                  User: UsersManagement
+                  Notification: Notifications
+                  YearDayAccessSchedules: YearDaySchedules
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h
index 456e9a26a002b8..2799912b5ae98e 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h
@@ -5894,7 +5894,7 @@ API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 @end
 
 /**
- * Cluster AdministratorCommissioning
+ * Cluster Administrator Commissioning
  *
  * Commands to trigger a Node to allow a new Administrator to commission it.
  */
@@ -17657,12 +17657,28 @@ typedef NS_ENUM(uint8_t, MTRGeneralDiagnosticsInterfaceType) {
     MTRGeneralDiagnosticsInterfaceTypeThread API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x04,
 } API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
 
+typedef NS_ENUM(uint8_t, MTRGeneralDiagnosticsNetworkFault) {
+    MTRGeneralDiagnosticsNetworkFaultUnspecified MTR_NEWLY_AVAILABLE = 0x00,
+    MTRGeneralDiagnosticsNetworkFaultHardwareFailure MTR_NEWLY_AVAILABLE = 0x01,
+    MTRGeneralDiagnosticsNetworkFaultNetworkJammed MTR_NEWLY_AVAILABLE = 0x02,
+    MTRGeneralDiagnosticsNetworkFaultConnectionFailed MTR_NEWLY_AVAILABLE = 0x03,
+} MTR_NEWLY_AVAILABLE;
+
 typedef NS_ENUM(uint8_t, MTRGeneralDiagnosticsNetworkFaultType) {
-    MTRGeneralDiagnosticsNetworkFaultTypeUnspecified API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x00,
-    MTRGeneralDiagnosticsNetworkFaultTypeHardwareFailure API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x01,
-    MTRGeneralDiagnosticsNetworkFaultTypeNetworkJammed API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x02,
-    MTRGeneralDiagnosticsNetworkFaultTypeConnectionFailed API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x03,
-} API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
+    MTRGeneralDiagnosticsNetworkFaultTypeUnspecified API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRGeneralDiagnosticsNetworkFaultUnspecified")
+    = 0x00,
+    MTRGeneralDiagnosticsNetworkFaultTypeHardwareFailure API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRGeneralDiagnosticsNetworkFaultHardwareFailure")
+    = 0x01,
+    MTRGeneralDiagnosticsNetworkFaultTypeNetworkJammed API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRGeneralDiagnosticsNetworkFaultNetworkJammed")
+    = 0x02,
+    MTRGeneralDiagnosticsNetworkFaultTypeConnectionFailed API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRGeneralDiagnosticsNetworkFaultConnectionFailed")
+    = 0x03,
+} API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+    MTR_NEWLY_DEPRECATED("Please use MTRGeneralDiagnosticsNetworkFault");
 
 typedef NS_ENUM(uint8_t, MTRGeneralDiagnosticsRadioFault) {
     MTRGeneralDiagnosticsRadioFaultUnspecified MTR_NEWLY_AVAILABLE = 0x00,
@@ -17959,65 +17975,106 @@ typedef NS_OPTIONS(uint32_t, MTRModeSelectFeature) {
     MTRModeSelectFeatureDEPONOFF API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x1,
 } API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
 
+typedef NS_ENUM(uint8_t, MTRDoorLockAlarmCode) {
+    MTRDoorLockAlarmCodeLockJammed MTR_NEWLY_AVAILABLE = 0x00,
+    MTRDoorLockAlarmCodeLockFactoryReset MTR_NEWLY_AVAILABLE = 0x01,
+    MTRDoorLockAlarmCodeLockRadioPowerCycled MTR_NEWLY_AVAILABLE = 0x03,
+    MTRDoorLockAlarmCodeWrongCodeEntryLimit MTR_NEWLY_AVAILABLE = 0x04,
+    MTRDoorLockAlarmCodeFrontEsceutcheonRemoved MTR_NEWLY_AVAILABLE = 0x05,
+    MTRDoorLockAlarmCodeDoorForcedOpen MTR_NEWLY_AVAILABLE = 0x06,
+    MTRDoorLockAlarmCodeDoorAjar MTR_NEWLY_AVAILABLE = 0x07,
+    MTRDoorLockAlarmCodeForcedUser MTR_NEWLY_AVAILABLE = 0x08,
+} MTR_NEWLY_AVAILABLE;
+
 typedef NS_ENUM(uint8_t, MTRDoorLockDlAlarmCode) {
-    MTRDoorLockDlAlarmCodeLockJammed API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x00,
-    MTRDoorLockDlAlarmCodeLockFactoryReset API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x01,
-    MTRDoorLockDlAlarmCodeLockRadioPowerCycled API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x03,
-    MTRDoorLockDlAlarmCodeWrongCodeEntryLimit API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x04,
-    MTRDoorLockDlAlarmCodeFrontEsceutcheonRemoved API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x05,
-    MTRDoorLockDlAlarmCodeDoorForcedOpen API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x06,
-    MTRDoorLockDlAlarmCodeDoorAjar API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x07,
-    MTRDoorLockDlAlarmCodeForcedUser API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x08,
-} API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
+    MTRDoorLockDlAlarmCodeLockJammed API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRDoorLockAlarmCodeLockJammed")
+    = 0x00,
+    MTRDoorLockDlAlarmCodeLockFactoryReset API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRDoorLockAlarmCodeLockFactoryReset")
+    = 0x01,
+    MTRDoorLockDlAlarmCodeLockRadioPowerCycled API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRDoorLockAlarmCodeLockRadioPowerCycled")
+    = 0x03,
+    MTRDoorLockDlAlarmCodeWrongCodeEntryLimit API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRDoorLockAlarmCodeWrongCodeEntryLimit")
+    = 0x04,
+    MTRDoorLockDlAlarmCodeFrontEsceutcheonRemoved API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRDoorLockAlarmCodeFrontEsceutcheonRemoved")
+    = 0x05,
+    MTRDoorLockDlAlarmCodeDoorForcedOpen API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRDoorLockAlarmCodeDoorForcedOpen")
+    = 0x06,
+    MTRDoorLockDlAlarmCodeDoorAjar API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRDoorLockAlarmCodeDoorAjar")
+    = 0x07,
+    MTRDoorLockDlAlarmCodeForcedUser API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRDoorLockAlarmCodeForcedUser")
+    = 0x08,
+} API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) MTR_NEWLY_DEPRECATED("Please use MTRDoorLockAlarmCode");
+
+typedef NS_ENUM(uint8_t, MTRDoorLockCredentialRule) {
+    MTRDoorLockCredentialRuleSingle MTR_NEWLY_AVAILABLE = 0x00,
+    MTRDoorLockCredentialRuleDual MTR_NEWLY_AVAILABLE = 0x01,
+    MTRDoorLockCredentialRuleTri MTR_NEWLY_AVAILABLE = 0x02,
+} MTR_NEWLY_AVAILABLE;
 
 typedef NS_ENUM(uint8_t, MTRDoorLockDlCredentialRule) {
-    MTRDoorLockDlCredentialRuleSingle API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x00,
-    MTRDoorLockDlCredentialRuleDouble API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x01,
-    MTRDoorLockDlCredentialRuleTri API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x02,
-} API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
+    MTRDoorLockDlCredentialRuleSingle API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRDoorLockCredentialRuleSingle")
+    = 0x00,
+    MTRDoorLockDlCredentialRuleTri API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRDoorLockCredentialRuleTri")
+    = 0x02,
+} API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) MTR_NEWLY_DEPRECATED("Please use MTRDoorLockCredentialRule");
+
+typedef NS_ENUM(uint8_t, MTRDoorLockCredentialType) {
+    MTRDoorLockCredentialTypeProgrammingPIN MTR_NEWLY_AVAILABLE = 0x00,
+    MTRDoorLockCredentialTypePIN MTR_NEWLY_AVAILABLE = 0x01,
+    MTRDoorLockCredentialTypeRFID MTR_NEWLY_AVAILABLE = 0x02,
+    MTRDoorLockCredentialTypeFingerprint MTR_NEWLY_AVAILABLE = 0x03,
+    MTRDoorLockCredentialTypeFingerVein MTR_NEWLY_AVAILABLE = 0x04,
+    MTRDoorLockCredentialTypeFace MTR_NEWLY_AVAILABLE = 0x05,
+} MTR_NEWLY_AVAILABLE;
 
 typedef NS_ENUM(uint8_t, MTRDoorLockDlCredentialType) {
-    MTRDoorLockDlCredentialTypeProgrammingPIN API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x00,
-    MTRDoorLockDlCredentialTypePIN API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x01,
-    MTRDoorLockDlCredentialTypeRFID API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x02,
-    MTRDoorLockDlCredentialTypeFingerprint API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x03,
-    MTRDoorLockDlCredentialTypeFingerVein API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x04,
-    MTRDoorLockDlCredentialTypeFace API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x05,
-} API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
-
-typedef NS_ENUM(uint8_t, MTRDoorLockDlDataOperationType) {
-    MTRDoorLockDlDataOperationTypeAdd API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x00,
-    MTRDoorLockDlDataOperationTypeClear API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x01,
-    MTRDoorLockDlDataOperationTypeModify API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x02,
-} API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
-
-typedef NS_ENUM(uint8_t, MTRDoorLockDlDoorState) {
-    MTRDoorLockDlDoorStateDoorOpen API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x00,
-    MTRDoorLockDlDoorStateDoorClosed API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x01,
-    MTRDoorLockDlDoorStateDoorJammed API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x02,
-    MTRDoorLockDlDoorStateDoorForcedOpen API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x03,
-    MTRDoorLockDlDoorStateDoorUnspecifiedError API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x04,
-    MTRDoorLockDlDoorStateDoorAjar API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x05,
-} API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
+    MTRDoorLockDlCredentialTypeProgrammingPIN API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRDoorLockCredentialTypeProgrammingPIN")
+    = 0x00,
+    MTRDoorLockDlCredentialTypePIN API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRDoorLockCredentialTypePIN")
+    = 0x01,
+    MTRDoorLockDlCredentialTypeRFID API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRDoorLockCredentialTypeRFID")
+    = 0x02,
+    MTRDoorLockDlCredentialTypeFingerprint API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRDoorLockCredentialTypeFingerprint")
+    = 0x03,
+    MTRDoorLockDlCredentialTypeFingerVein API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRDoorLockCredentialTypeFingerVein")
+    = 0x04,
+    MTRDoorLockDlCredentialTypeFace API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRDoorLockCredentialTypeFace")
+    = 0x05,
+} API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) MTR_NEWLY_DEPRECATED("Please use MTRDoorLockCredentialType");
 
-typedef NS_ENUM(uint8_t, MTRDoorLockDlLockDataType) {
-    MTRDoorLockDlLockDataTypeUnspecified API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x00,
-    MTRDoorLockDlLockDataTypeProgrammingCode API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x01,
-    MTRDoorLockDlLockDataTypeUserIndex API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x02,
-    MTRDoorLockDlLockDataTypeWeekDaySchedule API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x03,
-    MTRDoorLockDlLockDataTypeYearDaySchedule API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x04,
-    MTRDoorLockDlLockDataTypeHolidaySchedule API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x05,
-    MTRDoorLockDlLockDataTypePIN API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x06,
-    MTRDoorLockDlLockDataTypeRFID API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x07,
-    MTRDoorLockDlLockDataTypeFingerprint API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x08,
-} API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
+typedef NS_ENUM(uint8_t, MTRDoorLockDataOperationType) {
+    MTRDoorLockDataOperationTypeAdd MTR_NEWLY_AVAILABLE = 0x00,
+    MTRDoorLockDataOperationTypeClear MTR_NEWLY_AVAILABLE = 0x01,
+    MTRDoorLockDataOperationTypeModify MTR_NEWLY_AVAILABLE = 0x02,
+} MTR_NEWLY_AVAILABLE;
 
-typedef NS_ENUM(uint8_t, MTRDoorLockDlLockOperationType) {
-    MTRDoorLockDlLockOperationTypeLock API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x00,
-    MTRDoorLockDlLockOperationTypeUnlock API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x01,
-    MTRDoorLockDlLockOperationTypeNonAccessUserEvent API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x02,
-    MTRDoorLockDlLockOperationTypeForcedUserEvent API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x03,
-} API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
+typedef NS_ENUM(uint8_t, MTRDoorLockDlDataOperationType) {
+    MTRDoorLockDlDataOperationTypeAdd API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRDoorLockDataOperationTypeAdd")
+    = 0x00,
+    MTRDoorLockDlDataOperationTypeClear API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRDoorLockDataOperationTypeClear")
+    = 0x01,
+    MTRDoorLockDlDataOperationTypeModify API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRDoorLockDataOperationTypeModify")
+    = 0x02,
+} API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) MTR_NEWLY_DEPRECATED("Please use MTRDoorLockDataOperationType");
 
 typedef NS_ENUM(uint8_t, MTRDoorLockDlLockState) {
     MTRDoorLockDlLockStateNotFullyLocked API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x00,
@@ -18039,35 +18096,6 @@ typedef NS_ENUM(uint8_t, MTRDoorLockDlLockType) {
     MTRDoorLockDlLockTypeDoorFurniture API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x0A,
 } API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
 
-typedef NS_ENUM(uint8_t, MTRDoorLockDlOperatingMode) {
-    MTRDoorLockDlOperatingModeNormal API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x00,
-    MTRDoorLockDlOperatingModeVacation API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x01,
-    MTRDoorLockDlOperatingModePrivacy API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x02,
-    MTRDoorLockDlOperatingModeNoRemoteLockUnlock API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x03,
-    MTRDoorLockDlOperatingModePassage API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x04,
-} API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
-
-typedef NS_ENUM(uint8_t, MTRDoorLockDlOperationError) {
-    MTRDoorLockDlOperationErrorUnspecified API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x00,
-    MTRDoorLockDlOperationErrorInvalidCredential API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x01,
-    MTRDoorLockDlOperationErrorDisabledUserDenied API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x02,
-    MTRDoorLockDlOperationErrorRestricted API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x03,
-    MTRDoorLockDlOperationErrorInsufficientBattery API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x04,
-} API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
-
-typedef NS_ENUM(uint8_t, MTRDoorLockDlOperationSource) {
-    MTRDoorLockDlOperationSourceUnspecified API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x00,
-    MTRDoorLockDlOperationSourceManual API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x01,
-    MTRDoorLockDlOperationSourceProprietaryRemote API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x02,
-    MTRDoorLockDlOperationSourceKeypad API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x03,
-    MTRDoorLockDlOperationSourceAuto API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x04,
-    MTRDoorLockDlOperationSourceButton API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x05,
-    MTRDoorLockDlOperationSourceSchedule API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x06,
-    MTRDoorLockDlOperationSourceRemote API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x07,
-    MTRDoorLockDlOperationSourceRFID API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x08,
-    MTRDoorLockDlOperationSourceBiometric API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x09,
-} API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
-
 typedef NS_ENUM(uint8_t, MTRDoorLockDlStatus) {
     MTRDoorLockDlStatusSuccess API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x00,
     MTRDoorLockDlStatusFailure API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x01,
@@ -18078,76 +18106,395 @@ typedef NS_ENUM(uint8_t, MTRDoorLockDlStatus) {
     MTRDoorLockDlStatusNotFound API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x8B,
 } API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
 
-typedef NS_ENUM(uint8_t, MTRDoorLockDlUserStatus) {
-    MTRDoorLockDlUserStatusAvailable API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x00,
-    MTRDoorLockDlUserStatusOccupiedEnabled API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x01,
-    MTRDoorLockDlUserStatusOccupiedDisabled API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x03,
-} API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
-
-typedef NS_ENUM(uint8_t, MTRDoorLockDlUserType) {
-    MTRDoorLockDlUserTypeUnrestrictedUser API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x00,
-    MTRDoorLockDlUserTypeYearDayScheduleUser API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x01,
-    MTRDoorLockDlUserTypeWeekDayScheduleUser API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x02,
-    MTRDoorLockDlUserTypeProgrammingUser API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x03,
-    MTRDoorLockDlUserTypeNonAccessUser API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x04,
-    MTRDoorLockDlUserTypeForcedUser API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x05,
-    MTRDoorLockDlUserTypeDisposableUser API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x06,
-    MTRDoorLockDlUserTypeExpiringUser API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x07,
-    MTRDoorLockDlUserTypeScheduleRestrictedUser API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x08,
-    MTRDoorLockDlUserTypeRemoteOnlyUser API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x09,
-} API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
-
 typedef NS_ENUM(uint8_t, MTRDoorLockOperationEventCode) {
-    MTRDoorLockOperationEventCodeUnknownOrMfgSpecific API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x00,
-    MTRDoorLockOperationEventCodeLock API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x01,
-    MTRDoorLockOperationEventCodeUnlock API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x02,
-    MTRDoorLockOperationEventCodeLockInvalidPinOrId API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x03,
-    MTRDoorLockOperationEventCodeLockInvalidSchedule API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x04,
-    MTRDoorLockOperationEventCodeUnlockInvalidPinOrId API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x05,
-    MTRDoorLockOperationEventCodeUnlockInvalidSchedule API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x06,
-    MTRDoorLockOperationEventCodeOneTouchLock API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x07,
-    MTRDoorLockOperationEventCodeKeyLock API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x08,
-    MTRDoorLockOperationEventCodeKeyUnlock API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x09,
-    MTRDoorLockOperationEventCodeAutoLock API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x0A,
-    MTRDoorLockOperationEventCodeScheduleLock API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x0B,
-    MTRDoorLockOperationEventCodeScheduleUnlock API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x0C,
-    MTRDoorLockOperationEventCodeManualLock API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x0D,
-    MTRDoorLockOperationEventCodeManualUnlock API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x0E,
-} API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
+    MTRDoorLockOperationEventCodeUnknownOrMfgSpecific API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRDoorLockOperationEventCodeUnknownOrMfgSpecific")
+    = 0x00,
+    MTRDoorLockOperationEventCodeLock API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRDoorLockOperationEventCodeLock")
+    = 0x01,
+    MTRDoorLockOperationEventCodeUnlock API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRDoorLockOperationEventCodeUnlock")
+    = 0x02,
+    MTRDoorLockOperationEventCodeLockInvalidPinOrId API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRDoorLockOperationEventCodeLockInvalidPinOrId")
+    = 0x03,
+    MTRDoorLockOperationEventCodeLockInvalidSchedule API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRDoorLockOperationEventCodeLockInvalidSchedule")
+    = 0x04,
+    MTRDoorLockOperationEventCodeUnlockInvalidPinOrId API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRDoorLockOperationEventCodeUnlockInvalidPinOrId")
+    = 0x05,
+    MTRDoorLockOperationEventCodeUnlockInvalidSchedule API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRDoorLockOperationEventCodeUnlockInvalidSchedule")
+    = 0x06,
+    MTRDoorLockOperationEventCodeOneTouchLock API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRDoorLockOperationEventCodeOneTouchLock")
+    = 0x07,
+    MTRDoorLockOperationEventCodeKeyLock API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRDoorLockOperationEventCodeKeyLock")
+    = 0x08,
+    MTRDoorLockOperationEventCodeKeyUnlock API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRDoorLockOperationEventCodeKeyUnlock")
+    = 0x09,
+    MTRDoorLockOperationEventCodeAutoLock API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRDoorLockOperationEventCodeAutoLock")
+    = 0x0A,
+    MTRDoorLockOperationEventCodeScheduleLock API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRDoorLockOperationEventCodeScheduleLock")
+    = 0x0B,
+    MTRDoorLockOperationEventCodeScheduleUnlock API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRDoorLockOperationEventCodeScheduleUnlock")
+    = 0x0C,
+    MTRDoorLockOperationEventCodeManualLock API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRDoorLockOperationEventCodeManualLock")
+    = 0x0D,
+    MTRDoorLockOperationEventCodeManualUnlock API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRDoorLockOperationEventCodeManualUnlock")
+    = 0x0E,
+} API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) MTR_NEWLY_DEPRECATED("This enum is unused and will be removed");
 
 typedef NS_ENUM(uint8_t, MTRDoorLockProgrammingEventCode) {
-    MTRDoorLockProgrammingEventCodeUnknownOrMfgSpecific API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x00,
-    MTRDoorLockProgrammingEventCodeMasterCodeChanged API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x01,
-    MTRDoorLockProgrammingEventCodePinAdded API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x02,
-    MTRDoorLockProgrammingEventCodePinDeleted API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x03,
-    MTRDoorLockProgrammingEventCodePinChanged API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x04,
-    MTRDoorLockProgrammingEventCodeIdAdded API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x05,
-    MTRDoorLockProgrammingEventCodeIdDeleted API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x06,
-} API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
+    MTRDoorLockProgrammingEventCodeUnknownOrMfgSpecific API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRDoorLockProgrammingEventCodeUnknownOrMfgSpecific")
+    = 0x00,
+    MTRDoorLockProgrammingEventCodeMasterCodeChanged API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRDoorLockProgrammingEventCodeMasterCodeChanged")
+    = 0x01,
+    MTRDoorLockProgrammingEventCodePinAdded API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRDoorLockProgrammingEventCodePinAdded")
+    = 0x02,
+    MTRDoorLockProgrammingEventCodePinDeleted API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRDoorLockProgrammingEventCodePinDeleted")
+    = 0x03,
+    MTRDoorLockProgrammingEventCodePinChanged API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRDoorLockProgrammingEventCodePinChanged")
+    = 0x04,
+    MTRDoorLockProgrammingEventCodeIdAdded API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRDoorLockProgrammingEventCodeIdAdded")
+    = 0x05,
+    MTRDoorLockProgrammingEventCodeIdDeleted API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRDoorLockProgrammingEventCodeIdDeleted")
+    = 0x06,
+} API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) MTR_NEWLY_DEPRECATED("This enum is unused and will be removed");
 
 typedef NS_ENUM(uint8_t, MTRDoorLockSetPinOrIdStatus) {
-    MTRDoorLockSetPinOrIdStatusSuccess API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x00,
-    MTRDoorLockSetPinOrIdStatusGeneralFailure API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x01,
-    MTRDoorLockSetPinOrIdStatusMemoryFull API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x02,
-    MTRDoorLockSetPinOrIdStatusDuplicateCodeError API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x03,
-} API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
+    MTRDoorLockSetPinOrIdStatusSuccess API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRDoorLockSetPinOrIdStatusSuccess")
+    = 0x00,
+    MTRDoorLockSetPinOrIdStatusGeneralFailure API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRDoorLockSetPinOrIdStatusGeneralFailure")
+    = 0x01,
+    MTRDoorLockSetPinOrIdStatusMemoryFull API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRDoorLockSetPinOrIdStatusMemoryFull")
+    = 0x02,
+    MTRDoorLockSetPinOrIdStatusDuplicateCodeError API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRDoorLockSetPinOrIdStatusDuplicateCodeError")
+    = 0x03,
+} API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) MTR_NEWLY_DEPRECATED("This enum is unused and will be removed");
+
+typedef NS_ENUM(uint8_t, MTRDoorLockDoorState) {
+    MTRDoorLockDoorStateDoorOpen MTR_NEWLY_AVAILABLE = 0x00,
+    MTRDoorLockDoorStateDoorClosed MTR_NEWLY_AVAILABLE = 0x01,
+    MTRDoorLockDoorStateDoorJammed MTR_NEWLY_AVAILABLE = 0x02,
+    MTRDoorLockDoorStateDoorForcedOpen MTR_NEWLY_AVAILABLE = 0x03,
+    MTRDoorLockDoorStateDoorUnspecifiedError MTR_NEWLY_AVAILABLE = 0x04,
+    MTRDoorLockDoorStateDoorAjar MTR_NEWLY_AVAILABLE = 0x05,
+} MTR_NEWLY_AVAILABLE;
+
+typedef NS_ENUM(uint8_t, MTRDoorLockDlDoorState) {
+    MTRDoorLockDlDoorStateDoorOpen API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRDoorLockDoorStateDoorOpen")
+    = 0x00,
+    MTRDoorLockDlDoorStateDoorClosed API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRDoorLockDoorStateDoorClosed")
+    = 0x01,
+    MTRDoorLockDlDoorStateDoorJammed API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRDoorLockDoorStateDoorJammed")
+    = 0x02,
+    MTRDoorLockDlDoorStateDoorForcedOpen API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRDoorLockDoorStateDoorForcedOpen")
+    = 0x03,
+    MTRDoorLockDlDoorStateDoorUnspecifiedError API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRDoorLockDoorStateDoorUnspecifiedError")
+    = 0x04,
+    MTRDoorLockDlDoorStateDoorAjar API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRDoorLockDoorStateDoorAjar")
+    = 0x05,
+} API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) MTR_NEWLY_DEPRECATED("Please use MTRDoorLockDoorState");
+
+typedef NS_ENUM(uint8_t, MTRDoorLockLockDataType) {
+    MTRDoorLockLockDataTypeUnspecified MTR_NEWLY_AVAILABLE = 0x00,
+    MTRDoorLockLockDataTypeProgrammingCode MTR_NEWLY_AVAILABLE = 0x01,
+    MTRDoorLockLockDataTypeUserIndex MTR_NEWLY_AVAILABLE = 0x02,
+    MTRDoorLockLockDataTypeWeekDaySchedule MTR_NEWLY_AVAILABLE = 0x03,
+    MTRDoorLockLockDataTypeYearDaySchedule MTR_NEWLY_AVAILABLE = 0x04,
+    MTRDoorLockLockDataTypeHolidaySchedule MTR_NEWLY_AVAILABLE = 0x05,
+    MTRDoorLockLockDataTypePIN MTR_NEWLY_AVAILABLE = 0x06,
+    MTRDoorLockLockDataTypeRFID MTR_NEWLY_AVAILABLE = 0x07,
+    MTRDoorLockLockDataTypeFingerprint MTR_NEWLY_AVAILABLE = 0x08,
+} MTR_NEWLY_AVAILABLE;
+
+typedef NS_ENUM(uint8_t, MTRDoorLockDlLockDataType) {
+    MTRDoorLockDlLockDataTypeUnspecified API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRDoorLockLockDataTypeUnspecified")
+    = 0x00,
+    MTRDoorLockDlLockDataTypeProgrammingCode API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRDoorLockLockDataTypeProgrammingCode")
+    = 0x01,
+    MTRDoorLockDlLockDataTypeUserIndex API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRDoorLockLockDataTypeUserIndex")
+    = 0x02,
+    MTRDoorLockDlLockDataTypeWeekDaySchedule API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRDoorLockLockDataTypeWeekDaySchedule")
+    = 0x03,
+    MTRDoorLockDlLockDataTypeYearDaySchedule API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRDoorLockLockDataTypeYearDaySchedule")
+    = 0x04,
+    MTRDoorLockDlLockDataTypeHolidaySchedule API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRDoorLockLockDataTypeHolidaySchedule")
+    = 0x05,
+    MTRDoorLockDlLockDataTypePIN API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRDoorLockLockDataTypePIN")
+    = 0x06,
+    MTRDoorLockDlLockDataTypeRFID API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRDoorLockLockDataTypeRFID")
+    = 0x07,
+    MTRDoorLockDlLockDataTypeFingerprint API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRDoorLockLockDataTypeFingerprint")
+    = 0x08,
+} API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) MTR_NEWLY_DEPRECATED("Please use MTRDoorLockLockDataType");
+
+typedef NS_ENUM(uint8_t, MTRDoorLockLockOperationType) {
+    MTRDoorLockLockOperationTypeLock MTR_NEWLY_AVAILABLE = 0x00,
+    MTRDoorLockLockOperationTypeUnlock MTR_NEWLY_AVAILABLE = 0x01,
+    MTRDoorLockLockOperationTypeNonAccessUserEvent MTR_NEWLY_AVAILABLE = 0x02,
+    MTRDoorLockLockOperationTypeForcedUserEvent MTR_NEWLY_AVAILABLE = 0x03,
+} MTR_NEWLY_AVAILABLE;
+
+typedef NS_ENUM(uint8_t, MTRDoorLockDlLockOperationType) {
+    MTRDoorLockDlLockOperationTypeLock API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRDoorLockLockOperationTypeLock")
+    = 0x00,
+    MTRDoorLockDlLockOperationTypeUnlock API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRDoorLockLockOperationTypeUnlock")
+    = 0x01,
+    MTRDoorLockDlLockOperationTypeNonAccessUserEvent API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRDoorLockLockOperationTypeNonAccessUserEvent")
+    = 0x02,
+    MTRDoorLockDlLockOperationTypeForcedUserEvent API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRDoorLockLockOperationTypeForcedUserEvent")
+    = 0x03,
+} API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) MTR_NEWLY_DEPRECATED("Please use MTRDoorLockLockOperationType");
+
+typedef NS_ENUM(uint8_t, MTRDoorLockOperatingMode) {
+    MTRDoorLockOperatingModeNormal MTR_NEWLY_AVAILABLE = 0x00,
+    MTRDoorLockOperatingModeVacation MTR_NEWLY_AVAILABLE = 0x01,
+    MTRDoorLockOperatingModePrivacy MTR_NEWLY_AVAILABLE = 0x02,
+    MTRDoorLockOperatingModeNoRemoteLockUnlock MTR_NEWLY_AVAILABLE = 0x03,
+    MTRDoorLockOperatingModePassage MTR_NEWLY_AVAILABLE = 0x04,
+} MTR_NEWLY_AVAILABLE;
+
+typedef NS_ENUM(uint8_t, MTRDoorLockDlOperatingMode) {
+    MTRDoorLockDlOperatingModeNormal API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRDoorLockOperatingModeNormal")
+    = 0x00,
+    MTRDoorLockDlOperatingModeVacation API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRDoorLockOperatingModeVacation")
+    = 0x01,
+    MTRDoorLockDlOperatingModePrivacy API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRDoorLockOperatingModePrivacy")
+    = 0x02,
+    MTRDoorLockDlOperatingModeNoRemoteLockUnlock API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRDoorLockOperatingModeNoRemoteLockUnlock")
+    = 0x03,
+    MTRDoorLockDlOperatingModePassage API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRDoorLockOperatingModePassage")
+    = 0x04,
+} API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) MTR_NEWLY_DEPRECATED("Please use MTRDoorLockOperatingMode");
+
+typedef NS_ENUM(uint8_t, MTRDoorLockOperationError) {
+    MTRDoorLockOperationErrorUnspecified MTR_NEWLY_AVAILABLE = 0x00,
+    MTRDoorLockOperationErrorInvalidCredential MTR_NEWLY_AVAILABLE = 0x01,
+    MTRDoorLockOperationErrorDisabledUserDenied MTR_NEWLY_AVAILABLE = 0x02,
+    MTRDoorLockOperationErrorRestricted MTR_NEWLY_AVAILABLE = 0x03,
+    MTRDoorLockOperationErrorInsufficientBattery MTR_NEWLY_AVAILABLE = 0x04,
+} MTR_NEWLY_AVAILABLE;
+
+typedef NS_ENUM(uint8_t, MTRDoorLockDlOperationError) {
+    MTRDoorLockDlOperationErrorUnspecified API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRDoorLockOperationErrorUnspecified")
+    = 0x00,
+    MTRDoorLockDlOperationErrorInvalidCredential API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRDoorLockOperationErrorInvalidCredential")
+    = 0x01,
+    MTRDoorLockDlOperationErrorDisabledUserDenied API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRDoorLockOperationErrorDisabledUserDenied")
+    = 0x02,
+    MTRDoorLockDlOperationErrorRestricted API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRDoorLockOperationErrorRestricted")
+    = 0x03,
+    MTRDoorLockDlOperationErrorInsufficientBattery API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRDoorLockOperationErrorInsufficientBattery")
+    = 0x04,
+} API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) MTR_NEWLY_DEPRECATED("Please use MTRDoorLockOperationError");
+
+typedef NS_ENUM(uint8_t, MTRDoorLockOperationSource) {
+    MTRDoorLockOperationSourceUnspecified MTR_NEWLY_AVAILABLE = 0x00,
+    MTRDoorLockOperationSourceManual MTR_NEWLY_AVAILABLE = 0x01,
+    MTRDoorLockOperationSourceProprietaryRemote MTR_NEWLY_AVAILABLE = 0x02,
+    MTRDoorLockOperationSourceKeypad MTR_NEWLY_AVAILABLE = 0x03,
+    MTRDoorLockOperationSourceAuto MTR_NEWLY_AVAILABLE = 0x04,
+    MTRDoorLockOperationSourceButton MTR_NEWLY_AVAILABLE = 0x05,
+    MTRDoorLockOperationSourceSchedule MTR_NEWLY_AVAILABLE = 0x06,
+    MTRDoorLockOperationSourceRemote MTR_NEWLY_AVAILABLE = 0x07,
+    MTRDoorLockOperationSourceRFID MTR_NEWLY_AVAILABLE = 0x08,
+    MTRDoorLockOperationSourceBiometric MTR_NEWLY_AVAILABLE = 0x09,
+} MTR_NEWLY_AVAILABLE;
+
+typedef NS_ENUM(uint8_t, MTRDoorLockDlOperationSource) {
+    MTRDoorLockDlOperationSourceUnspecified API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRDoorLockOperationSourceUnspecified")
+    = 0x00,
+    MTRDoorLockDlOperationSourceManual API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRDoorLockOperationSourceManual")
+    = 0x01,
+    MTRDoorLockDlOperationSourceProprietaryRemote API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRDoorLockOperationSourceProprietaryRemote")
+    = 0x02,
+    MTRDoorLockDlOperationSourceKeypad API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRDoorLockOperationSourceKeypad")
+    = 0x03,
+    MTRDoorLockDlOperationSourceAuto API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRDoorLockOperationSourceAuto")
+    = 0x04,
+    MTRDoorLockDlOperationSourceButton API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRDoorLockOperationSourceButton")
+    = 0x05,
+    MTRDoorLockDlOperationSourceSchedule API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRDoorLockOperationSourceSchedule")
+    = 0x06,
+    MTRDoorLockDlOperationSourceRemote API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRDoorLockOperationSourceRemote")
+    = 0x07,
+    MTRDoorLockDlOperationSourceRFID API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRDoorLockOperationSourceRFID")
+    = 0x08,
+    MTRDoorLockDlOperationSourceBiometric API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRDoorLockOperationSourceBiometric")
+    = 0x09,
+} API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) MTR_NEWLY_DEPRECATED("Please use MTRDoorLockOperationSource");
 
 typedef NS_ENUM(uint8_t, MTRDoorLockUserStatus) {
     MTRDoorLockUserStatusAvailable API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x00,
     MTRDoorLockUserStatusOccupiedEnabled API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x01,
     MTRDoorLockUserStatusOccupiedDisabled API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x03,
-    MTRDoorLockUserStatusNotSupported API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0xFF,
+    MTRDoorLockUserStatusNotSupported API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("This value is not part of the specification and will be removed")
+    = 0xFF,
 } API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
 
+typedef NS_ENUM(uint8_t, MTRDoorLockDlUserStatus) {
+    MTRDoorLockDlUserStatusAvailable API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRDoorLockUserStatusAvailable")
+    = 0x00,
+    MTRDoorLockDlUserStatusOccupiedEnabled API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRDoorLockUserStatusOccupiedEnabled")
+    = 0x01,
+    MTRDoorLockDlUserStatusOccupiedDisabled API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRDoorLockUserStatusOccupiedDisabled")
+    = 0x03,
+} API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) MTR_NEWLY_DEPRECATED("Please use MTRDoorLockUserStatus");
+
 typedef NS_ENUM(uint8_t, MTRDoorLockUserType) {
-    MTRDoorLockUserTypeUnrestricted API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x00,
+    MTRDoorLockUserTypeUnrestrictedUser MTR_NEWLY_AVAILABLE = 0x00,
+    MTRDoorLockUserTypeUnrestricted API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRDoorLockUserTypeUnrestrictedUser")
+    = 0x00,
     MTRDoorLockUserTypeYearDayScheduleUser API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x01,
     MTRDoorLockUserTypeWeekDayScheduleUser API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x02,
-    MTRDoorLockUserTypeMasterUser API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x03,
+    MTRDoorLockUserTypeProgrammingUser MTR_NEWLY_AVAILABLE = 0x03,
+    MTRDoorLockUserTypeMasterUser API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRDoorLockUserTypeProgrammingUser")
+    = 0x03,
     MTRDoorLockUserTypeNonAccessUser API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x04,
-    MTRDoorLockUserTypeNotSupported API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0xFF,
+    MTRDoorLockUserTypeForcedUser MTR_NEWLY_AVAILABLE = 0x05,
+    MTRDoorLockUserTypeDisposableUser MTR_NEWLY_AVAILABLE = 0x06,
+    MTRDoorLockUserTypeExpiringUser MTR_NEWLY_AVAILABLE = 0x07,
+    MTRDoorLockUserTypeScheduleRestrictedUser MTR_NEWLY_AVAILABLE = 0x08,
+    MTRDoorLockUserTypeRemoteOnlyUser MTR_NEWLY_AVAILABLE = 0x09,
+    MTRDoorLockUserTypeNotSupported API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("This value is not part of the specification and will be removed")
+    = 0xFF,
 } API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
 
+typedef NS_ENUM(uint8_t, MTRDoorLockDlUserType) {
+    MTRDoorLockDlUserTypeUnrestrictedUser API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRDoorLockUserTypeUnrestrictedUser")
+    = 0x00,
+    MTRDoorLockDlUserTypeYearDayScheduleUser API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRDoorLockUserTypeYearDayScheduleUser")
+    = 0x01,
+    MTRDoorLockDlUserTypeWeekDayScheduleUser API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRDoorLockUserTypeWeekDayScheduleUser")
+    = 0x02,
+    MTRDoorLockDlUserTypeProgrammingUser API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRDoorLockUserTypeProgrammingUser")
+    = 0x03,
+    MTRDoorLockDlUserTypeNonAccessUser API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRDoorLockUserTypeNonAccessUser")
+    = 0x04,
+    MTRDoorLockDlUserTypeForcedUser API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRDoorLockUserTypeForcedUser")
+    = 0x05,
+    MTRDoorLockDlUserTypeDisposableUser API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRDoorLockUserTypeDisposableUser")
+    = 0x06,
+    MTRDoorLockDlUserTypeExpiringUser API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRDoorLockUserTypeExpiringUser")
+    = 0x07,
+    MTRDoorLockDlUserTypeScheduleRestrictedUser API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRDoorLockUserTypeScheduleRestrictedUser")
+    = 0x08,
+    MTRDoorLockDlUserTypeRemoteOnlyUser API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRDoorLockUserTypeRemoteOnlyUser")
+    = 0x09,
+} API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) MTR_NEWLY_DEPRECATED("Please use MTRDoorLockUserType");
+
+typedef NS_OPTIONS(uint8_t, MTRDoorLockDaysMaskMap) {
+    MTRDoorLockDaysMaskMapSunday MTR_NEWLY_AVAILABLE = 0x1,
+    MTRDoorLockDaysMaskMapMonday MTR_NEWLY_AVAILABLE = 0x2,
+    MTRDoorLockDaysMaskMapTuesday MTR_NEWLY_AVAILABLE = 0x4,
+    MTRDoorLockDaysMaskMapWednesday MTR_NEWLY_AVAILABLE = 0x8,
+    MTRDoorLockDaysMaskMapThursday MTR_NEWLY_AVAILABLE = 0x10,
+    MTRDoorLockDaysMaskMapFriday MTR_NEWLY_AVAILABLE = 0x20,
+    MTRDoorLockDaysMaskMapSaturday MTR_NEWLY_AVAILABLE = 0x40,
+} MTR_NEWLY_AVAILABLE;
+
+typedef NS_OPTIONS(uint8_t, MTRDoorLockDlDaysMaskMap) {
+    MTRDoorLockDlDaysMaskMapSunday API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRDoorLockDaysMaskMapSunday")
+    = 0x1,
+    MTRDoorLockDlDaysMaskMapMonday API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRDoorLockDaysMaskMapMonday")
+    = 0x2,
+    MTRDoorLockDlDaysMaskMapTuesday API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRDoorLockDaysMaskMapTuesday")
+    = 0x4,
+    MTRDoorLockDlDaysMaskMapWednesday API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRDoorLockDaysMaskMapWednesday")
+    = 0x8,
+    MTRDoorLockDlDaysMaskMapThursday API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRDoorLockDaysMaskMapThursday")
+    = 0x10,
+    MTRDoorLockDlDaysMaskMapFriday API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRDoorLockDaysMaskMapFriday")
+    = 0x20,
+    MTRDoorLockDlDaysMaskMapSaturday API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRDoorLockDaysMaskMapSaturday")
+    = 0x40,
+} API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) MTR_NEWLY_DEPRECATED("Please use MTRDoorLockDaysMaskMap");
+
 typedef NS_OPTIONS(uint8_t, MTRDoorLockDlCredentialRuleMask) {
     MTRDoorLockDlCredentialRuleMaskSingle API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x1,
     MTRDoorLockDlCredentialRuleMaskDual API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x2,
@@ -18160,16 +18507,6 @@ typedef NS_OPTIONS(uint8_t, MTRDoorLockDlCredentialRulesSupport) {
     MTRDoorLockDlCredentialRulesSupportTri API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x4,
 } API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
 
-typedef NS_OPTIONS(uint8_t, MTRDoorLockDlDaysMaskMap) {
-    MTRDoorLockDlDaysMaskMapSunday API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x1,
-    MTRDoorLockDlDaysMaskMapMonday API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x2,
-    MTRDoorLockDlDaysMaskMapTuesday API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x4,
-    MTRDoorLockDlDaysMaskMapWednesday API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x8,
-    MTRDoorLockDlDaysMaskMapThursday API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x10,
-    MTRDoorLockDlDaysMaskMapFriday API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x20,
-    MTRDoorLockDlDaysMaskMapSaturday API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x40,
-} API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
-
 typedef NS_OPTIONS(uint16_t, MTRDoorLockDlDefaultConfigurationRegister) {
     MTRDoorLockDlDefaultConfigurationRegisterEnableLocalProgrammingEnabled API_AVAILABLE(
         ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
@@ -18293,17 +18630,38 @@ typedef NS_OPTIONS(uint8_t, MTRDoorLockDayOfWeek) {
 } API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
 
 typedef NS_OPTIONS(uint32_t, MTRDoorLockFeature) {
-    MTRDoorLockFeaturePINCredentials API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x1,
-    MTRDoorLockFeatureRFIDCredentials API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x2,
+    MTRDoorLockFeaturePINCredential MTR_NEWLY_AVAILABLE = 0x1,
+    MTRDoorLockFeaturePINCredentials API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRDoorLockFeaturePINCredential")
+    = 0x1,
+    MTRDoorLockFeatureRFIDCredential MTR_NEWLY_AVAILABLE = 0x2,
+    MTRDoorLockFeatureRFIDCredentials API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRDoorLockFeatureRFIDCredential")
+    = 0x2,
     MTRDoorLockFeatureFingerCredentials API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x4,
     MTRDoorLockFeatureLogging API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x8,
-    MTRDoorLockFeatureWeekDaySchedules API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x10,
+    MTRDoorLockFeatureWeekDayAccessSchedules MTR_NEWLY_AVAILABLE = 0x10,
+    MTRDoorLockFeatureWeekDaySchedules API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRDoorLockFeatureWeekDayAccessSchedules")
+    = 0x10,
     MTRDoorLockFeatureDoorPositionSensor API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x20,
     MTRDoorLockFeatureFaceCredentials API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x40,
-    MTRDoorLockFeatureCredentialsOTA API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x80,
-    MTRDoorLockFeatureUsersManagement API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x100,
-    MTRDoorLockFeatureNotifications API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x200,
-    MTRDoorLockFeatureYearDaySchedules API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x400,
+    MTRDoorLockFeatureCredentialsOverTheAirAccess MTR_NEWLY_AVAILABLE = 0x80,
+    MTRDoorLockFeatureCredentialsOTA API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRDoorLockFeatureCredentialsOverTheAirAccess")
+    = 0x80,
+    MTRDoorLockFeatureUser MTR_NEWLY_AVAILABLE = 0x100,
+    MTRDoorLockFeatureUsersManagement API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRDoorLockFeatureUser")
+    = 0x100,
+    MTRDoorLockFeatureNotification MTR_NEWLY_AVAILABLE = 0x200,
+    MTRDoorLockFeatureNotifications API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRDoorLockFeatureNotification")
+    = 0x200,
+    MTRDoorLockFeatureYearDayAccessSchedules MTR_NEWLY_AVAILABLE = 0x400,
+    MTRDoorLockFeatureYearDaySchedules API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+        MTR_NEWLY_DEPRECATED("Please use MTRDoorLockFeatureYearDayAccessSchedules")
+    = 0x400,
     MTRDoorLockFeatureHolidaySchedules API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x800,
 } API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
 
@@ -18417,6 +18775,16 @@ typedef NS_ENUM(uint8_t, MTRPumpConfigurationAndControlPumpOperationMode) {
     MTRPumpConfigurationAndControlPumpOperationModeLocal API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x03,
 } API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
 
+typedef NS_OPTIONS(uint32_t, MTRPumpConfigurationAndControlPumpFeature) {
+    MTRPumpConfigurationAndControlPumpFeatureConstantPressure MTR_NEWLY_AVAILABLE = 0x1,
+    MTRPumpConfigurationAndControlPumpFeatureCompensatedPressure MTR_NEWLY_AVAILABLE = 0x2,
+    MTRPumpConfigurationAndControlPumpFeatureConstantFlow MTR_NEWLY_AVAILABLE = 0x4,
+    MTRPumpConfigurationAndControlPumpFeatureConstantSpeed MTR_NEWLY_AVAILABLE = 0x8,
+    MTRPumpConfigurationAndControlPumpFeatureConstantTemperature MTR_NEWLY_AVAILABLE = 0x10,
+    MTRPumpConfigurationAndControlPumpFeatureAutomatic MTR_NEWLY_AVAILABLE = 0x20,
+    MTRPumpConfigurationAndControlPumpFeatureLocal MTR_NEWLY_AVAILABLE = 0x40,
+} MTR_NEWLY_AVAILABLE;
+
 typedef NS_OPTIONS(uint16_t, MTRPumpConfigurationAndControlPumpStatus) {
     MTRPumpConfigurationAndControlPumpStatusDeviceFault API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x1,
     MTRPumpConfigurationAndControlPumpStatusSupplyfault API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x2,
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm
index c522a5f33241d5..40e42897be7eb8 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm
@@ -35614,7 +35614,7 @@ - (void)readAttributePHYRateWithCompletion:(void (^)(NSNumber * _Nullable value,
 {
     MTRReadParams * params = [[MTRReadParams alloc] init];
     using TypeInfo = EthernetNetworkDiagnostics::Attributes::PHYRate::TypeInfo;
-    return MTRReadAttribute<MTRNullableEthernetNetworkDiagnosticsClusterPHYRateAttributeCallbackBridge, NSNumber,
+    return MTRReadAttribute<MTRNullableEthernetNetworkDiagnosticsClusterPHYRateEnumAttributeCallbackBridge, NSNumber,
         TypeInfo::DecodableType>(
         params, completion, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId());
 }
@@ -35624,7 +35624,7 @@ - (void)subscribeAttributePHYRateWithParams:(MTRSubscribeParams * _Nonnull)param
                               reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
     using TypeInfo = EthernetNetworkDiagnostics::Attributes::PHYRate::TypeInfo;
-    MTRSubscribeAttribute<MTRNullableEthernetNetworkDiagnosticsClusterPHYRateAttributeCallbackSubscriptionBridge, NSNumber,
+    MTRSubscribeAttribute<MTRNullableEthernetNetworkDiagnosticsClusterPHYRateEnumAttributeCallbackSubscriptionBridge, NSNumber,
         TypeInfo::DecodableType>(params, subscriptionEstablished, reportHandler, self.callbackQueue, self.device, self->_endpoint,
         TypeInfo::GetClusterId(), TypeInfo::GetAttributeId());
 }
@@ -35634,9 +35634,9 @@ + (void)readAttributePHYRateWithClusterStateCache:(MTRClusterStateCacheContainer
                                             queue:(dispatch_queue_t)queue
                                        completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    auto * bridge = new MTRNullableEthernetNetworkDiagnosticsClusterPHYRateAttributeCallbackBridge(queue, completion);
+    auto * bridge = new MTRNullableEthernetNetworkDiagnosticsClusterPHYRateEnumAttributeCallbackBridge(queue, completion);
     std::move(*bridge).DispatchLocalAction(clusterStateCacheContainer.baseDevice,
-        ^(NullableEthernetNetworkDiagnosticsClusterPHYRateAttributeCallback successCb, MTRErrorCallback failureCb) {
+        ^(NullableEthernetNetworkDiagnosticsClusterPHYRateEnumAttributeCallback successCb, MTRErrorCallback failureCb) {
             if (clusterStateCacheContainer.cppClusterStateCache) {
                 chip::app::ConcreteAttributePath path;
                 using TypeInfo = EthernetNetworkDiagnostics::Attributes::PHYRate::TypeInfo;
@@ -39516,7 +39516,7 @@ - (void)readAttributeWindowStatusWithCompletion:(void (^)(NSNumber * _Nullable v
 {
     MTRReadParams * params = [[MTRReadParams alloc] init];
     using TypeInfo = AdministratorCommissioning::Attributes::WindowStatus::TypeInfo;
-    return MTRReadAttribute<MTRAdministratorCommissioningClusterCommissioningWindowStatusAttributeCallbackBridge, NSNumber,
+    return MTRReadAttribute<MTRAdministratorCommissioningClusterCommissioningWindowStatusEnumAttributeCallbackBridge, NSNumber,
         TypeInfo::DecodableType>(
         params, completion, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId());
 }
@@ -39526,7 +39526,7 @@ - (void)subscribeAttributeWindowStatusWithParams:(MTRSubscribeParams * _Nonnull)
                                    reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
     using TypeInfo = AdministratorCommissioning::Attributes::WindowStatus::TypeInfo;
-    MTRSubscribeAttribute<MTRAdministratorCommissioningClusterCommissioningWindowStatusAttributeCallbackSubscriptionBridge,
+    MTRSubscribeAttribute<MTRAdministratorCommissioningClusterCommissioningWindowStatusEnumAttributeCallbackSubscriptionBridge,
         NSNumber, TypeInfo::DecodableType>(params, subscriptionEstablished, reportHandler, self.callbackQueue, self.device,
         self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId());
 }
@@ -39536,9 +39536,9 @@ + (void)readAttributeWindowStatusWithClusterStateCache:(MTRClusterStateCacheCont
                                                  queue:(dispatch_queue_t)queue
                                             completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    auto * bridge = new MTRAdministratorCommissioningClusterCommissioningWindowStatusAttributeCallbackBridge(queue, completion);
+    auto * bridge = new MTRAdministratorCommissioningClusterCommissioningWindowStatusEnumAttributeCallbackBridge(queue, completion);
     std::move(*bridge).DispatchLocalAction(clusterStateCacheContainer.baseDevice,
-        ^(AdministratorCommissioningClusterCommissioningWindowStatusAttributeCallback successCb, MTRErrorCallback failureCb) {
+        ^(AdministratorCommissioningClusterCommissioningWindowStatusEnumAttributeCallback successCb, MTRErrorCallback failureCb) {
             if (clusterStateCacheContainer.cppClusterStateCache) {
                 chip::app::ConcreteAttributePath path;
                 using TypeInfo = AdministratorCommissioning::Attributes::WindowStatus::TypeInfo;
@@ -45537,7 +45537,7 @@ - (void)lockDoorWithParams:(MTRDoorLockClusterLockDoorParams * _Nullable)params
             }
             if (params != nil) {
                 if (params.pinCode != nil) {
-                    auto & definedValue_0 = request.pinCode.Emplace();
+                    auto & definedValue_0 = request.PINCode.Emplace();
                     definedValue_0 = [self asByteSpan:params.pinCode];
                 }
             }
@@ -45573,7 +45573,7 @@ - (void)unlockDoorWithParams:(MTRDoorLockClusterUnlockDoorParams * _Nullable)par
             }
             if (params != nil) {
                 if (params.pinCode != nil) {
-                    auto & definedValue_0 = request.pinCode.Emplace();
+                    auto & definedValue_0 = request.PINCode.Emplace();
                     definedValue_0 = [self asByteSpan:params.pinCode];
                 }
             }
@@ -45609,7 +45609,7 @@ - (void)unlockWithTimeoutWithParams:(MTRDoorLockClusterUnlockWithTimeoutParams *
             }
             request.timeout = params.timeout.unsignedShortValue;
             if (params.pinCode != nil) {
-                auto & definedValue_0 = request.pinCode.Emplace();
+                auto & definedValue_0 = request.PINCode.Emplace();
                 definedValue_0 = [self asByteSpan:params.pinCode];
             }
 
@@ -45920,11 +45920,11 @@ - (void)setUserWithParams:(MTRDoorLockClusterSetUserParams *)params completion:(
                 auto & nonNullValue_0 = request.userName.SetNonNull();
                 nonNullValue_0 = [self asCharSpan:params.userName];
             }
-            if (params.userUniqueId == nil) {
-                request.userUniqueId.SetNull();
+            if (params.userUniqueID == nil) {
+                request.userUniqueID.SetNull();
             } else {
-                auto & nonNullValue_0 = request.userUniqueId.SetNonNull();
-                nonNullValue_0 = params.userUniqueId.unsignedIntValue;
+                auto & nonNullValue_0 = request.userUniqueID.SetNonNull();
+                nonNullValue_0 = params.userUniqueID.unsignedIntValue;
             }
             if (params.userStatus == nil) {
                 request.userStatus.SetNull();
@@ -46264,7 +46264,7 @@ - (void)readAttributeDoorStateWithCompletion:(void (^)(NSNumber * _Nullable valu
 {
     MTRReadParams * params = [[MTRReadParams alloc] init];
     using TypeInfo = DoorLock::Attributes::DoorState::TypeInfo;
-    return MTRReadAttribute<MTRNullableDoorLockClusterDlDoorStateAttributeCallbackBridge, NSNumber, TypeInfo::DecodableType>(
+    return MTRReadAttribute<MTRNullableDoorLockClusterDoorStateEnumAttributeCallbackBridge, NSNumber, TypeInfo::DecodableType>(
         params, completion, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId());
 }
 
@@ -46273,7 +46273,7 @@ - (void)subscribeAttributeDoorStateWithParams:(MTRSubscribeParams * _Nonnull)par
                                 reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
     using TypeInfo = DoorLock::Attributes::DoorState::TypeInfo;
-    MTRSubscribeAttribute<MTRNullableDoorLockClusterDlDoorStateAttributeCallbackSubscriptionBridge, NSNumber,
+    MTRSubscribeAttribute<MTRNullableDoorLockClusterDoorStateEnumAttributeCallbackSubscriptionBridge, NSNumber,
         TypeInfo::DecodableType>(params, subscriptionEstablished, reportHandler, self.callbackQueue, self.device, self->_endpoint,
         TypeInfo::GetClusterId(), TypeInfo::GetAttributeId());
 }
@@ -46283,9 +46283,9 @@ + (void)readAttributeDoorStateWithClusterStateCache:(MTRClusterStateCacheContain
                                               queue:(dispatch_queue_t)queue
                                          completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    auto * bridge = new MTRNullableDoorLockClusterDlDoorStateAttributeCallbackBridge(queue, completion);
+    auto * bridge = new MTRNullableDoorLockClusterDoorStateEnumAttributeCallbackBridge(queue, completion);
     std::move(*bridge).DispatchLocalAction(clusterStateCacheContainer.baseDevice,
-        ^(NullableDoorLockClusterDlDoorStateAttributeCallback successCb, MTRErrorCallback failureCb) {
+        ^(NullableDoorLockClusterDoorStateEnumAttributeCallback successCb, MTRErrorCallback failureCb) {
             if (clusterStateCacheContainer.cppClusterStateCache) {
                 chip::app::ConcreteAttributePath path;
                 using TypeInfo = DoorLock::Attributes::DoorState::TypeInfo;
@@ -47420,7 +47420,7 @@ - (void)readAttributeOperatingModeWithCompletion:(void (^)(NSNumber * _Nullable
 {
     MTRReadParams * params = [[MTRReadParams alloc] init];
     using TypeInfo = DoorLock::Attributes::OperatingMode::TypeInfo;
-    return MTRReadAttribute<MTRDoorLockClusterDlOperatingModeAttributeCallbackBridge, NSNumber, TypeInfo::DecodableType>(
+    return MTRReadAttribute<MTRDoorLockClusterOperatingModeEnumAttributeCallbackBridge, NSNumber, TypeInfo::DecodableType>(
         params, completion, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId());
 }
 
@@ -47466,9 +47466,9 @@ - (void)subscribeAttributeOperatingModeWithParams:(MTRSubscribeParams * _Nonnull
                                     reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
 {
     using TypeInfo = DoorLock::Attributes::OperatingMode::TypeInfo;
-    MTRSubscribeAttribute<MTRDoorLockClusterDlOperatingModeAttributeCallbackSubscriptionBridge, NSNumber, TypeInfo::DecodableType>(
-        params, subscriptionEstablished, reportHandler, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(),
-        TypeInfo::GetAttributeId());
+    MTRSubscribeAttribute<MTRDoorLockClusterOperatingModeEnumAttributeCallbackSubscriptionBridge, NSNumber,
+        TypeInfo::DecodableType>(params, subscriptionEstablished, reportHandler, self.callbackQueue, self.device, self->_endpoint,
+        TypeInfo::GetClusterId(), TypeInfo::GetAttributeId());
 }
 
 + (void)readAttributeOperatingModeWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer
@@ -47476,9 +47476,9 @@ + (void)readAttributeOperatingModeWithClusterStateCache:(MTRClusterStateCacheCon
                                                   queue:(dispatch_queue_t)queue
                                              completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion
 {
-    auto * bridge = new MTRDoorLockClusterDlOperatingModeAttributeCallbackBridge(queue, completion);
+    auto * bridge = new MTRDoorLockClusterOperatingModeEnumAttributeCallbackBridge(queue, completion);
     std::move(*bridge).DispatchLocalAction(clusterStateCacheContainer.baseDevice,
-        ^(DoorLockClusterDlOperatingModeAttributeCallback successCb, MTRErrorCallback failureCb) {
+        ^(DoorLockClusterOperatingModeEnumAttributeCallback successCb, MTRErrorCallback failureCb) {
             if (clusterStateCacheContainer.cppClusterStateCache) {
                 chip::app::ConcreteAttributePath path;
                 using TypeInfo = DoorLock::Attributes::OperatingMode::TypeInfo;
@@ -67216,7 +67216,7 @@ - (void)moveToColorTemperatureWithParams:(MTRColorControlClusterMoveToColorTempe
                     timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue);
                 }
             }
-            request.colorTemperature = params.colorTemperature.unsignedShortValue;
+            request.colorTemperatureMireds = params.colorTemperatureMireds.unsignedShortValue;
             request.transitionTime = params.transitionTime.unsignedShortValue;
             request.optionsMask = params.optionsMask.unsignedCharValue;
             request.optionsOverride = params.optionsOverride.unsignedCharValue;
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.h b/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.h
index 2f6a522b9d349a..15a1fe8b5b0cc8 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.h
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.h
@@ -279,21 +279,22 @@ typedef void (*GeneralDiagnosticsClusterBootReasonEnumAttributeCallback)(void *,
                                                                          chip::app::Clusters::GeneralDiagnostics::BootReasonEnum);
 typedef void (*NullableGeneralDiagnosticsClusterBootReasonEnumAttributeCallback)(
     void *, const chip::app::DataModel::Nullable<chip::app::Clusters::GeneralDiagnostics::BootReasonEnum> &);
-typedef void (*GeneralDiagnosticsClusterHardwareFaultAttributeCallback)(void *,
-                                                                        chip::app::Clusters::GeneralDiagnostics::HardwareFault);
-typedef void (*NullableGeneralDiagnosticsClusterHardwareFaultAttributeCallback)(
-    void *, const chip::app::DataModel::Nullable<chip::app::Clusters::GeneralDiagnostics::HardwareFault> &);
-typedef void (*GeneralDiagnosticsClusterInterfaceTypeAttributeCallback)(void *,
-                                                                        chip::app::Clusters::GeneralDiagnostics::InterfaceType);
-typedef void (*NullableGeneralDiagnosticsClusterInterfaceTypeAttributeCallback)(
-    void *, const chip::app::DataModel::Nullable<chip::app::Clusters::GeneralDiagnostics::InterfaceType> &);
-typedef void (*GeneralDiagnosticsClusterNetworkFaultTypeAttributeCallback)(
-    void *, chip::app::Clusters::GeneralDiagnostics::NetworkFaultType);
-typedef void (*NullableGeneralDiagnosticsClusterNetworkFaultTypeAttributeCallback)(
-    void *, const chip::app::DataModel::Nullable<chip::app::Clusters::GeneralDiagnostics::NetworkFaultType> &);
-typedef void (*GeneralDiagnosticsClusterRadioFaultAttributeCallback)(void *, chip::app::Clusters::GeneralDiagnostics::RadioFault);
-typedef void (*NullableGeneralDiagnosticsClusterRadioFaultAttributeCallback)(
-    void *, const chip::app::DataModel::Nullable<chip::app::Clusters::GeneralDiagnostics::RadioFault> &);
+typedef void (*GeneralDiagnosticsClusterHardwareFaultEnumAttributeCallback)(
+    void *, chip::app::Clusters::GeneralDiagnostics::HardwareFaultEnum);
+typedef void (*NullableGeneralDiagnosticsClusterHardwareFaultEnumAttributeCallback)(
+    void *, const chip::app::DataModel::Nullable<chip::app::Clusters::GeneralDiagnostics::HardwareFaultEnum> &);
+typedef void (*GeneralDiagnosticsClusterInterfaceTypeEnumAttributeCallback)(
+    void *, chip::app::Clusters::GeneralDiagnostics::InterfaceTypeEnum);
+typedef void (*NullableGeneralDiagnosticsClusterInterfaceTypeEnumAttributeCallback)(
+    void *, const chip::app::DataModel::Nullable<chip::app::Clusters::GeneralDiagnostics::InterfaceTypeEnum> &);
+typedef void (*GeneralDiagnosticsClusterNetworkFaultEnumAttributeCallback)(
+    void *, chip::app::Clusters::GeneralDiagnostics::NetworkFaultEnum);
+typedef void (*NullableGeneralDiagnosticsClusterNetworkFaultEnumAttributeCallback)(
+    void *, const chip::app::DataModel::Nullable<chip::app::Clusters::GeneralDiagnostics::NetworkFaultEnum> &);
+typedef void (*GeneralDiagnosticsClusterRadioFaultEnumAttributeCallback)(void *,
+                                                                         chip::app::Clusters::GeneralDiagnostics::RadioFaultEnum);
+typedef void (*NullableGeneralDiagnosticsClusterRadioFaultEnumAttributeCallback)(
+    void *, const chip::app::DataModel::Nullable<chip::app::Clusters::GeneralDiagnostics::RadioFaultEnum> &);
 typedef void (*ThreadNetworkDiagnosticsClusterConnectionStatusEnumAttributeCallback)(
     void *, chip::app::Clusters::ThreadNetworkDiagnostics::ConnectionStatusEnum);
 typedef void (*NullableThreadNetworkDiagnosticsClusterConnectionStatusEnumAttributeCallback)(
@@ -322,10 +323,10 @@ typedef void (*WiFiNetworkDiagnosticsClusterWiFiVersionTypeAttributeCallback)(
     void *, chip::app::Clusters::WiFiNetworkDiagnostics::WiFiVersionType);
 typedef void (*NullableWiFiNetworkDiagnosticsClusterWiFiVersionTypeAttributeCallback)(
     void *, const chip::app::DataModel::Nullable<chip::app::Clusters::WiFiNetworkDiagnostics::WiFiVersionType> &);
-typedef void (*EthernetNetworkDiagnosticsClusterPHYRateAttributeCallback)(void *,
-                                                                          chip::app::Clusters::EthernetNetworkDiagnostics::PHYRate);
-typedef void (*NullableEthernetNetworkDiagnosticsClusterPHYRateAttributeCallback)(
-    void *, const chip::app::DataModel::Nullable<chip::app::Clusters::EthernetNetworkDiagnostics::PHYRate> &);
+typedef void (*EthernetNetworkDiagnosticsClusterPHYRateEnumAttributeCallback)(
+    void *, chip::app::Clusters::EthernetNetworkDiagnostics::PHYRateEnum);
+typedef void (*NullableEthernetNetworkDiagnosticsClusterPHYRateEnumAttributeCallback)(
+    void *, const chip::app::DataModel::Nullable<chip::app::Clusters::EthernetNetworkDiagnostics::PHYRateEnum> &);
 typedef void (*TimeSynchronizationClusterGranularityEnumAttributeCallback)(
     void *, chip::app::Clusters::TimeSynchronization::GranularityEnum);
 typedef void (*NullableTimeSynchronizationClusterGranularityEnumAttributeCallback)(
@@ -334,10 +335,10 @@ typedef void (*TimeSynchronizationClusterTimeSourceEnumAttributeCallback)(void *
                                                                           chip::app::Clusters::TimeSynchronization::TimeSourceEnum);
 typedef void (*NullableTimeSynchronizationClusterTimeSourceEnumAttributeCallback)(
     void *, const chip::app::DataModel::Nullable<chip::app::Clusters::TimeSynchronization::TimeSourceEnum> &);
-typedef void (*AdministratorCommissioningClusterCommissioningWindowStatusAttributeCallback)(
-    void *, chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatus);
-typedef void (*NullableAdministratorCommissioningClusterCommissioningWindowStatusAttributeCallback)(
-    void *, const chip::app::DataModel::Nullable<chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatus> &);
+typedef void (*AdministratorCommissioningClusterCommissioningWindowStatusEnumAttributeCallback)(
+    void *, chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatusEnum);
+typedef void (*NullableAdministratorCommissioningClusterCommissioningWindowStatusEnumAttributeCallback)(
+    void *, const chip::app::DataModel::Nullable<chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatusEnum> &);
 typedef void (*AdministratorCommissioningClusterStatusCodeAttributeCallback)(
     void *, chip::app::Clusters::AdministratorCommissioning::StatusCode);
 typedef void (*NullableAdministratorCommissioningClusterStatusCodeAttributeCallback)(
@@ -354,51 +355,27 @@ typedef void (*GroupKeyManagementClusterGroupKeySecurityPolicyAttributeCallback)
     void *, chip::app::Clusters::GroupKeyManagement::GroupKeySecurityPolicy);
 typedef void (*NullableGroupKeyManagementClusterGroupKeySecurityPolicyAttributeCallback)(
     void *, const chip::app::DataModel::Nullable<chip::app::Clusters::GroupKeyManagement::GroupKeySecurityPolicy> &);
-typedef void (*DoorLockClusterDlAlarmCodeAttributeCallback)(void *, chip::app::Clusters::DoorLock::DlAlarmCode);
-typedef void (*NullableDoorLockClusterDlAlarmCodeAttributeCallback)(
-    void *, const chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::DlAlarmCode> &);
-typedef void (*DoorLockClusterDlCredentialRuleAttributeCallback)(void *, chip::app::Clusters::DoorLock::DlCredentialRule);
-typedef void (*NullableDoorLockClusterDlCredentialRuleAttributeCallback)(
-    void *, const chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::DlCredentialRule> &);
-typedef void (*DoorLockClusterDlCredentialTypeAttributeCallback)(void *, chip::app::Clusters::DoorLock::DlCredentialType);
-typedef void (*NullableDoorLockClusterDlCredentialTypeAttributeCallback)(
-    void *, const chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::DlCredentialType> &);
-typedef void (*DoorLockClusterDlDataOperationTypeAttributeCallback)(void *, chip::app::Clusters::DoorLock::DlDataOperationType);
-typedef void (*NullableDoorLockClusterDlDataOperationTypeAttributeCallback)(
-    void *, const chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::DlDataOperationType> &);
-typedef void (*DoorLockClusterDlDoorStateAttributeCallback)(void *, chip::app::Clusters::DoorLock::DlDoorState);
-typedef void (*NullableDoorLockClusterDlDoorStateAttributeCallback)(
-    void *, const chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::DlDoorState> &);
-typedef void (*DoorLockClusterDlLockDataTypeAttributeCallback)(void *, chip::app::Clusters::DoorLock::DlLockDataType);
-typedef void (*NullableDoorLockClusterDlLockDataTypeAttributeCallback)(
-    void *, const chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::DlLockDataType> &);
-typedef void (*DoorLockClusterDlLockOperationTypeAttributeCallback)(void *, chip::app::Clusters::DoorLock::DlLockOperationType);
-typedef void (*NullableDoorLockClusterDlLockOperationTypeAttributeCallback)(
-    void *, const chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::DlLockOperationType> &);
+typedef void (*DoorLockClusterAlarmCodeEnumAttributeCallback)(void *, chip::app::Clusters::DoorLock::AlarmCodeEnum);
+typedef void (*NullableDoorLockClusterAlarmCodeEnumAttributeCallback)(
+    void *, const chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::AlarmCodeEnum> &);
+typedef void (*DoorLockClusterCredentialRuleEnumAttributeCallback)(void *, chip::app::Clusters::DoorLock::CredentialRuleEnum);
+typedef void (*NullableDoorLockClusterCredentialRuleEnumAttributeCallback)(
+    void *, const chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::CredentialRuleEnum> &);
+typedef void (*DoorLockClusterCredentialTypeEnumAttributeCallback)(void *, chip::app::Clusters::DoorLock::CredentialTypeEnum);
+typedef void (*NullableDoorLockClusterCredentialTypeEnumAttributeCallback)(
+    void *, const chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::CredentialTypeEnum> &);
+typedef void (*DoorLockClusterDataOperationTypeEnumAttributeCallback)(void *, chip::app::Clusters::DoorLock::DataOperationTypeEnum);
+typedef void (*NullableDoorLockClusterDataOperationTypeEnumAttributeCallback)(
+    void *, const chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::DataOperationTypeEnum> &);
 typedef void (*DoorLockClusterDlLockStateAttributeCallback)(void *, chip::app::Clusters::DoorLock::DlLockState);
 typedef void (*NullableDoorLockClusterDlLockStateAttributeCallback)(
     void *, const chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::DlLockState> &);
 typedef void (*DoorLockClusterDlLockTypeAttributeCallback)(void *, chip::app::Clusters::DoorLock::DlLockType);
 typedef void (*NullableDoorLockClusterDlLockTypeAttributeCallback)(
     void *, const chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::DlLockType> &);
-typedef void (*DoorLockClusterDlOperatingModeAttributeCallback)(void *, chip::app::Clusters::DoorLock::DlOperatingMode);
-typedef void (*NullableDoorLockClusterDlOperatingModeAttributeCallback)(
-    void *, const chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::DlOperatingMode> &);
-typedef void (*DoorLockClusterDlOperationErrorAttributeCallback)(void *, chip::app::Clusters::DoorLock::DlOperationError);
-typedef void (*NullableDoorLockClusterDlOperationErrorAttributeCallback)(
-    void *, const chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::DlOperationError> &);
-typedef void (*DoorLockClusterDlOperationSourceAttributeCallback)(void *, chip::app::Clusters::DoorLock::DlOperationSource);
-typedef void (*NullableDoorLockClusterDlOperationSourceAttributeCallback)(
-    void *, const chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::DlOperationSource> &);
 typedef void (*DoorLockClusterDlStatusAttributeCallback)(void *, chip::app::Clusters::DoorLock::DlStatus);
 typedef void (*NullableDoorLockClusterDlStatusAttributeCallback)(
     void *, const chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::DlStatus> &);
-typedef void (*DoorLockClusterDlUserStatusAttributeCallback)(void *, chip::app::Clusters::DoorLock::DlUserStatus);
-typedef void (*NullableDoorLockClusterDlUserStatusAttributeCallback)(
-    void *, const chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::DlUserStatus> &);
-typedef void (*DoorLockClusterDlUserTypeAttributeCallback)(void *, chip::app::Clusters::DoorLock::DlUserType);
-typedef void (*NullableDoorLockClusterDlUserTypeAttributeCallback)(
-    void *, const chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::DlUserType> &);
 typedef void (*DoorLockClusterDoorLockOperationEventCodeAttributeCallback)(
     void *, chip::app::Clusters::DoorLock::DoorLockOperationEventCode);
 typedef void (*NullableDoorLockClusterDoorLockOperationEventCodeAttributeCallback)(
@@ -411,12 +388,30 @@ typedef void (*DoorLockClusterDoorLockSetPinOrIdStatusAttributeCallback)(void *,
                                                                          chip::app::Clusters::DoorLock::DoorLockSetPinOrIdStatus);
 typedef void (*NullableDoorLockClusterDoorLockSetPinOrIdStatusAttributeCallback)(
     void *, const chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::DoorLockSetPinOrIdStatus> &);
-typedef void (*DoorLockClusterDoorLockUserStatusAttributeCallback)(void *, chip::app::Clusters::DoorLock::DoorLockUserStatus);
-typedef void (*NullableDoorLockClusterDoorLockUserStatusAttributeCallback)(
-    void *, const chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::DoorLockUserStatus> &);
-typedef void (*DoorLockClusterDoorLockUserTypeAttributeCallback)(void *, chip::app::Clusters::DoorLock::DoorLockUserType);
-typedef void (*NullableDoorLockClusterDoorLockUserTypeAttributeCallback)(
-    void *, const chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::DoorLockUserType> &);
+typedef void (*DoorLockClusterDoorStateEnumAttributeCallback)(void *, chip::app::Clusters::DoorLock::DoorStateEnum);
+typedef void (*NullableDoorLockClusterDoorStateEnumAttributeCallback)(
+    void *, const chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::DoorStateEnum> &);
+typedef void (*DoorLockClusterLockDataTypeEnumAttributeCallback)(void *, chip::app::Clusters::DoorLock::LockDataTypeEnum);
+typedef void (*NullableDoorLockClusterLockDataTypeEnumAttributeCallback)(
+    void *, const chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::LockDataTypeEnum> &);
+typedef void (*DoorLockClusterLockOperationTypeEnumAttributeCallback)(void *, chip::app::Clusters::DoorLock::LockOperationTypeEnum);
+typedef void (*NullableDoorLockClusterLockOperationTypeEnumAttributeCallback)(
+    void *, const chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::LockOperationTypeEnum> &);
+typedef void (*DoorLockClusterOperatingModeEnumAttributeCallback)(void *, chip::app::Clusters::DoorLock::OperatingModeEnum);
+typedef void (*NullableDoorLockClusterOperatingModeEnumAttributeCallback)(
+    void *, const chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::OperatingModeEnum> &);
+typedef void (*DoorLockClusterOperationErrorEnumAttributeCallback)(void *, chip::app::Clusters::DoorLock::OperationErrorEnum);
+typedef void (*NullableDoorLockClusterOperationErrorEnumAttributeCallback)(
+    void *, const chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::OperationErrorEnum> &);
+typedef void (*DoorLockClusterOperationSourceEnumAttributeCallback)(void *, chip::app::Clusters::DoorLock::OperationSourceEnum);
+typedef void (*NullableDoorLockClusterOperationSourceEnumAttributeCallback)(
+    void *, const chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::OperationSourceEnum> &);
+typedef void (*DoorLockClusterUserStatusEnumAttributeCallback)(void *, chip::app::Clusters::DoorLock::UserStatusEnum);
+typedef void (*NullableDoorLockClusterUserStatusEnumAttributeCallback)(
+    void *, const chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::UserStatusEnum> &);
+typedef void (*DoorLockClusterUserTypeEnumAttributeCallback)(void *, chip::app::Clusters::DoorLock::UserTypeEnum);
+typedef void (*NullableDoorLockClusterUserTypeEnumAttributeCallback)(
+    void *, const chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::UserTypeEnum> &);
 typedef void (*WindowCoveringClusterEndProductTypeAttributeCallback)(void *, chip::app::Clusters::WindowCovering::EndProductType);
 typedef void (*NullableWindowCoveringClusterEndProductTypeAttributeCallback)(
     void *, const chip::app::DataModel::Nullable<chip::app::Clusters::WindowCovering::EndProductType> &);
@@ -727,11 +722,11 @@ typedef void (*GeneralDiagnosticsNetworkInterfacesListAttributeCallback)(
     const chip::app::DataModel::DecodableList<chip::app::Clusters::GeneralDiagnostics::Structs::NetworkInterface::DecodableType> &
         data);
 typedef void (*GeneralDiagnosticsActiveHardwareFaultsListAttributeCallback)(
-    void * context, const chip::app::DataModel::DecodableList<chip::app::Clusters::GeneralDiagnostics::HardwareFault> & data);
+    void * context, const chip::app::DataModel::DecodableList<chip::app::Clusters::GeneralDiagnostics::HardwareFaultEnum> & data);
 typedef void (*GeneralDiagnosticsActiveRadioFaultsListAttributeCallback)(
-    void * context, const chip::app::DataModel::DecodableList<chip::app::Clusters::GeneralDiagnostics::RadioFault> & data);
+    void * context, const chip::app::DataModel::DecodableList<chip::app::Clusters::GeneralDiagnostics::RadioFaultEnum> & data);
 typedef void (*GeneralDiagnosticsActiveNetworkFaultsListAttributeCallback)(
-    void * context, const chip::app::DataModel::DecodableList<chip::app::Clusters::GeneralDiagnostics::NetworkFaultType> & data);
+    void * context, const chip::app::DataModel::DecodableList<chip::app::Clusters::GeneralDiagnostics::NetworkFaultEnum> & data);
 typedef void (*GeneralDiagnosticsGeneratedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
 typedef void (*GeneralDiagnosticsAcceptedCommandListListAttributeCallback)(
@@ -4822,7 +4817,7 @@ class MTRGeneralDiagnosticsActiveHardwareFaultsListAttributeCallbackBridge
 
     static void
     OnSuccessFn(void * context,
-                const chip::app::DataModel::DecodableList<chip::app::Clusters::GeneralDiagnostics::HardwareFault> & value);
+                const chip::app::DataModel::DecodableList<chip::app::Clusters::GeneralDiagnostics::HardwareFaultEnum> & value);
 };
 
 class MTRGeneralDiagnosticsActiveHardwareFaultsListAttributeCallbackSubscriptionBridge
@@ -4855,8 +4850,9 @@ class MTRGeneralDiagnosticsActiveRadioFaultsListAttributeCallbackBridge
                                                                       MTRActionBlock action) :
         MTRCallbackBridge<GeneralDiagnosticsActiveRadioFaultsListAttributeCallback>(queue, handler, action, OnSuccessFn){};
 
-    static void OnSuccessFn(void * context,
-                            const chip::app::DataModel::DecodableList<chip::app::Clusters::GeneralDiagnostics::RadioFault> & value);
+    static void
+    OnSuccessFn(void * context,
+                const chip::app::DataModel::DecodableList<chip::app::Clusters::GeneralDiagnostics::RadioFaultEnum> & value);
 };
 
 class MTRGeneralDiagnosticsActiveRadioFaultsListAttributeCallbackSubscriptionBridge
@@ -4891,7 +4887,7 @@ class MTRGeneralDiagnosticsActiveNetworkFaultsListAttributeCallbackBridge
 
     static void
     OnSuccessFn(void * context,
-                const chip::app::DataModel::DecodableList<chip::app::Clusters::GeneralDiagnostics::NetworkFaultType> & value);
+                const chip::app::DataModel::DecodableList<chip::app::Clusters::GeneralDiagnostics::NetworkFaultEnum> & value);
 };
 
 class MTRGeneralDiagnosticsActiveNetworkFaultsListAttributeCallbackSubscriptionBridge
@@ -14455,271 +14451,275 @@ class MTRNullableGeneralDiagnosticsClusterBootReasonEnumAttributeCallbackSubscri
     MTRSubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class MTRGeneralDiagnosticsClusterHardwareFaultAttributeCallbackBridge
-    : public MTRCallbackBridge<GeneralDiagnosticsClusterHardwareFaultAttributeCallback>
+class MTRGeneralDiagnosticsClusterHardwareFaultEnumAttributeCallbackBridge
+    : public MTRCallbackBridge<GeneralDiagnosticsClusterHardwareFaultEnumAttributeCallback>
 {
 public:
-    MTRGeneralDiagnosticsClusterHardwareFaultAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) :
-        MTRCallbackBridge<GeneralDiagnosticsClusterHardwareFaultAttributeCallback>(queue, handler, OnSuccessFn){};
+    MTRGeneralDiagnosticsClusterHardwareFaultEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) :
+        MTRCallbackBridge<GeneralDiagnosticsClusterHardwareFaultEnumAttributeCallback>(queue, handler, OnSuccessFn){};
 
-    MTRGeneralDiagnosticsClusterHardwareFaultAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                     MTRActionBlock action) :
-        MTRCallbackBridge<GeneralDiagnosticsClusterHardwareFaultAttributeCallback>(queue, handler, action, OnSuccessFn){};
+    MTRGeneralDiagnosticsClusterHardwareFaultEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                         MTRActionBlock action) :
+        MTRCallbackBridge<GeneralDiagnosticsClusterHardwareFaultEnumAttributeCallback>(queue, handler, action, OnSuccessFn){};
 
-    static void OnSuccessFn(void * context, chip::app::Clusters::GeneralDiagnostics::HardwareFault value);
+    static void OnSuccessFn(void * context, chip::app::Clusters::GeneralDiagnostics::HardwareFaultEnum value);
 };
 
-class MTRGeneralDiagnosticsClusterHardwareFaultAttributeCallbackSubscriptionBridge
-    : public MTRGeneralDiagnosticsClusterHardwareFaultAttributeCallbackBridge
+class MTRGeneralDiagnosticsClusterHardwareFaultEnumAttributeCallbackSubscriptionBridge
+    : public MTRGeneralDiagnosticsClusterHardwareFaultEnumAttributeCallbackBridge
 {
 public:
-    MTRGeneralDiagnosticsClusterHardwareFaultAttributeCallbackSubscriptionBridge(
+    MTRGeneralDiagnosticsClusterHardwareFaultEnumAttributeCallbackSubscriptionBridge(
         dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action,
         MTRSubscriptionEstablishedHandler establishedHandler) :
-        MTRGeneralDiagnosticsClusterHardwareFaultAttributeCallbackBridge(queue, handler, action),
+        MTRGeneralDiagnosticsClusterHardwareFaultEnumAttributeCallbackBridge(queue, handler, action),
         mEstablishedHandler(establishedHandler)
     {}
 
     void OnSubscriptionEstablished();
-    using MTRGeneralDiagnosticsClusterHardwareFaultAttributeCallbackBridge::KeepAliveOnCallback;
-    using MTRGeneralDiagnosticsClusterHardwareFaultAttributeCallbackBridge::OnDone;
+    using MTRGeneralDiagnosticsClusterHardwareFaultEnumAttributeCallbackBridge::KeepAliveOnCallback;
+    using MTRGeneralDiagnosticsClusterHardwareFaultEnumAttributeCallbackBridge::OnDone;
 
 private:
     MTRSubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class MTRNullableGeneralDiagnosticsClusterHardwareFaultAttributeCallbackBridge
-    : public MTRCallbackBridge<NullableGeneralDiagnosticsClusterHardwareFaultAttributeCallback>
+class MTRNullableGeneralDiagnosticsClusterHardwareFaultEnumAttributeCallbackBridge
+    : public MTRCallbackBridge<NullableGeneralDiagnosticsClusterHardwareFaultEnumAttributeCallback>
 {
 public:
-    MTRNullableGeneralDiagnosticsClusterHardwareFaultAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) :
-        MTRCallbackBridge<NullableGeneralDiagnosticsClusterHardwareFaultAttributeCallback>(queue, handler, OnSuccessFn){};
+    MTRNullableGeneralDiagnosticsClusterHardwareFaultEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) :
+        MTRCallbackBridge<NullableGeneralDiagnosticsClusterHardwareFaultEnumAttributeCallback>(queue, handler, OnSuccessFn){};
 
-    MTRNullableGeneralDiagnosticsClusterHardwareFaultAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                             MTRActionBlock action) :
-        MTRCallbackBridge<NullableGeneralDiagnosticsClusterHardwareFaultAttributeCallback>(queue, handler, action, OnSuccessFn){};
+    MTRNullableGeneralDiagnosticsClusterHardwareFaultEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                                 MTRActionBlock action) :
+        MTRCallbackBridge<NullableGeneralDiagnosticsClusterHardwareFaultEnumAttributeCallback>(queue, handler, action,
+                                                                                               OnSuccessFn){};
 
-    static void OnSuccessFn(void * context,
-                            const chip::app::DataModel::Nullable<chip::app::Clusters::GeneralDiagnostics::HardwareFault> & value);
+    static void
+    OnSuccessFn(void * context,
+                const chip::app::DataModel::Nullable<chip::app::Clusters::GeneralDiagnostics::HardwareFaultEnum> & value);
 };
 
-class MTRNullableGeneralDiagnosticsClusterHardwareFaultAttributeCallbackSubscriptionBridge
-    : public MTRNullableGeneralDiagnosticsClusterHardwareFaultAttributeCallbackBridge
+class MTRNullableGeneralDiagnosticsClusterHardwareFaultEnumAttributeCallbackSubscriptionBridge
+    : public MTRNullableGeneralDiagnosticsClusterHardwareFaultEnumAttributeCallbackBridge
 {
 public:
-    MTRNullableGeneralDiagnosticsClusterHardwareFaultAttributeCallbackSubscriptionBridge(
+    MTRNullableGeneralDiagnosticsClusterHardwareFaultEnumAttributeCallbackSubscriptionBridge(
         dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action,
         MTRSubscriptionEstablishedHandler establishedHandler) :
-        MTRNullableGeneralDiagnosticsClusterHardwareFaultAttributeCallbackBridge(queue, handler, action),
+        MTRNullableGeneralDiagnosticsClusterHardwareFaultEnumAttributeCallbackBridge(queue, handler, action),
         mEstablishedHandler(establishedHandler)
     {}
 
     void OnSubscriptionEstablished();
-    using MTRNullableGeneralDiagnosticsClusterHardwareFaultAttributeCallbackBridge::KeepAliveOnCallback;
-    using MTRNullableGeneralDiagnosticsClusterHardwareFaultAttributeCallbackBridge::OnDone;
+    using MTRNullableGeneralDiagnosticsClusterHardwareFaultEnumAttributeCallbackBridge::KeepAliveOnCallback;
+    using MTRNullableGeneralDiagnosticsClusterHardwareFaultEnumAttributeCallbackBridge::OnDone;
 
 private:
     MTRSubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class MTRGeneralDiagnosticsClusterInterfaceTypeAttributeCallbackBridge
-    : public MTRCallbackBridge<GeneralDiagnosticsClusterInterfaceTypeAttributeCallback>
+class MTRGeneralDiagnosticsClusterInterfaceTypeEnumAttributeCallbackBridge
+    : public MTRCallbackBridge<GeneralDiagnosticsClusterInterfaceTypeEnumAttributeCallback>
 {
 public:
-    MTRGeneralDiagnosticsClusterInterfaceTypeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) :
-        MTRCallbackBridge<GeneralDiagnosticsClusterInterfaceTypeAttributeCallback>(queue, handler, OnSuccessFn){};
+    MTRGeneralDiagnosticsClusterInterfaceTypeEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) :
+        MTRCallbackBridge<GeneralDiagnosticsClusterInterfaceTypeEnumAttributeCallback>(queue, handler, OnSuccessFn){};
 
-    MTRGeneralDiagnosticsClusterInterfaceTypeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                     MTRActionBlock action) :
-        MTRCallbackBridge<GeneralDiagnosticsClusterInterfaceTypeAttributeCallback>(queue, handler, action, OnSuccessFn){};
+    MTRGeneralDiagnosticsClusterInterfaceTypeEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                         MTRActionBlock action) :
+        MTRCallbackBridge<GeneralDiagnosticsClusterInterfaceTypeEnumAttributeCallback>(queue, handler, action, OnSuccessFn){};
 
-    static void OnSuccessFn(void * context, chip::app::Clusters::GeneralDiagnostics::InterfaceType value);
+    static void OnSuccessFn(void * context, chip::app::Clusters::GeneralDiagnostics::InterfaceTypeEnum value);
 };
 
-class MTRGeneralDiagnosticsClusterInterfaceTypeAttributeCallbackSubscriptionBridge
-    : public MTRGeneralDiagnosticsClusterInterfaceTypeAttributeCallbackBridge
+class MTRGeneralDiagnosticsClusterInterfaceTypeEnumAttributeCallbackSubscriptionBridge
+    : public MTRGeneralDiagnosticsClusterInterfaceTypeEnumAttributeCallbackBridge
 {
 public:
-    MTRGeneralDiagnosticsClusterInterfaceTypeAttributeCallbackSubscriptionBridge(
+    MTRGeneralDiagnosticsClusterInterfaceTypeEnumAttributeCallbackSubscriptionBridge(
         dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action,
         MTRSubscriptionEstablishedHandler establishedHandler) :
-        MTRGeneralDiagnosticsClusterInterfaceTypeAttributeCallbackBridge(queue, handler, action),
+        MTRGeneralDiagnosticsClusterInterfaceTypeEnumAttributeCallbackBridge(queue, handler, action),
         mEstablishedHandler(establishedHandler)
     {}
 
     void OnSubscriptionEstablished();
-    using MTRGeneralDiagnosticsClusterInterfaceTypeAttributeCallbackBridge::KeepAliveOnCallback;
-    using MTRGeneralDiagnosticsClusterInterfaceTypeAttributeCallbackBridge::OnDone;
+    using MTRGeneralDiagnosticsClusterInterfaceTypeEnumAttributeCallbackBridge::KeepAliveOnCallback;
+    using MTRGeneralDiagnosticsClusterInterfaceTypeEnumAttributeCallbackBridge::OnDone;
 
 private:
     MTRSubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class MTRNullableGeneralDiagnosticsClusterInterfaceTypeAttributeCallbackBridge
-    : public MTRCallbackBridge<NullableGeneralDiagnosticsClusterInterfaceTypeAttributeCallback>
+class MTRNullableGeneralDiagnosticsClusterInterfaceTypeEnumAttributeCallbackBridge
+    : public MTRCallbackBridge<NullableGeneralDiagnosticsClusterInterfaceTypeEnumAttributeCallback>
 {
 public:
-    MTRNullableGeneralDiagnosticsClusterInterfaceTypeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) :
-        MTRCallbackBridge<NullableGeneralDiagnosticsClusterInterfaceTypeAttributeCallback>(queue, handler, OnSuccessFn){};
+    MTRNullableGeneralDiagnosticsClusterInterfaceTypeEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) :
+        MTRCallbackBridge<NullableGeneralDiagnosticsClusterInterfaceTypeEnumAttributeCallback>(queue, handler, OnSuccessFn){};
 
-    MTRNullableGeneralDiagnosticsClusterInterfaceTypeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                             MTRActionBlock action) :
-        MTRCallbackBridge<NullableGeneralDiagnosticsClusterInterfaceTypeAttributeCallback>(queue, handler, action, OnSuccessFn){};
+    MTRNullableGeneralDiagnosticsClusterInterfaceTypeEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                                 MTRActionBlock action) :
+        MTRCallbackBridge<NullableGeneralDiagnosticsClusterInterfaceTypeEnumAttributeCallback>(queue, handler, action,
+                                                                                               OnSuccessFn){};
 
-    static void OnSuccessFn(void * context,
-                            const chip::app::DataModel::Nullable<chip::app::Clusters::GeneralDiagnostics::InterfaceType> & value);
+    static void
+    OnSuccessFn(void * context,
+                const chip::app::DataModel::Nullable<chip::app::Clusters::GeneralDiagnostics::InterfaceTypeEnum> & value);
 };
 
-class MTRNullableGeneralDiagnosticsClusterInterfaceTypeAttributeCallbackSubscriptionBridge
-    : public MTRNullableGeneralDiagnosticsClusterInterfaceTypeAttributeCallbackBridge
+class MTRNullableGeneralDiagnosticsClusterInterfaceTypeEnumAttributeCallbackSubscriptionBridge
+    : public MTRNullableGeneralDiagnosticsClusterInterfaceTypeEnumAttributeCallbackBridge
 {
 public:
-    MTRNullableGeneralDiagnosticsClusterInterfaceTypeAttributeCallbackSubscriptionBridge(
+    MTRNullableGeneralDiagnosticsClusterInterfaceTypeEnumAttributeCallbackSubscriptionBridge(
         dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action,
         MTRSubscriptionEstablishedHandler establishedHandler) :
-        MTRNullableGeneralDiagnosticsClusterInterfaceTypeAttributeCallbackBridge(queue, handler, action),
+        MTRNullableGeneralDiagnosticsClusterInterfaceTypeEnumAttributeCallbackBridge(queue, handler, action),
         mEstablishedHandler(establishedHandler)
     {}
 
     void OnSubscriptionEstablished();
-    using MTRNullableGeneralDiagnosticsClusterInterfaceTypeAttributeCallbackBridge::KeepAliveOnCallback;
-    using MTRNullableGeneralDiagnosticsClusterInterfaceTypeAttributeCallbackBridge::OnDone;
+    using MTRNullableGeneralDiagnosticsClusterInterfaceTypeEnumAttributeCallbackBridge::KeepAliveOnCallback;
+    using MTRNullableGeneralDiagnosticsClusterInterfaceTypeEnumAttributeCallbackBridge::OnDone;
 
 private:
     MTRSubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class MTRGeneralDiagnosticsClusterNetworkFaultTypeAttributeCallbackBridge
-    : public MTRCallbackBridge<GeneralDiagnosticsClusterNetworkFaultTypeAttributeCallback>
+class MTRGeneralDiagnosticsClusterNetworkFaultEnumAttributeCallbackBridge
+    : public MTRCallbackBridge<GeneralDiagnosticsClusterNetworkFaultEnumAttributeCallback>
 {
 public:
-    MTRGeneralDiagnosticsClusterNetworkFaultTypeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) :
-        MTRCallbackBridge<GeneralDiagnosticsClusterNetworkFaultTypeAttributeCallback>(queue, handler, OnSuccessFn){};
+    MTRGeneralDiagnosticsClusterNetworkFaultEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) :
+        MTRCallbackBridge<GeneralDiagnosticsClusterNetworkFaultEnumAttributeCallback>(queue, handler, OnSuccessFn){};
 
-    MTRGeneralDiagnosticsClusterNetworkFaultTypeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+    MTRGeneralDiagnosticsClusterNetworkFaultEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
                                                                         MTRActionBlock action) :
-        MTRCallbackBridge<GeneralDiagnosticsClusterNetworkFaultTypeAttributeCallback>(queue, handler, action, OnSuccessFn){};
+        MTRCallbackBridge<GeneralDiagnosticsClusterNetworkFaultEnumAttributeCallback>(queue, handler, action, OnSuccessFn){};
 
-    static void OnSuccessFn(void * context, chip::app::Clusters::GeneralDiagnostics::NetworkFaultType value);
+    static void OnSuccessFn(void * context, chip::app::Clusters::GeneralDiagnostics::NetworkFaultEnum value);
 };
 
-class MTRGeneralDiagnosticsClusterNetworkFaultTypeAttributeCallbackSubscriptionBridge
-    : public MTRGeneralDiagnosticsClusterNetworkFaultTypeAttributeCallbackBridge
+class MTRGeneralDiagnosticsClusterNetworkFaultEnumAttributeCallbackSubscriptionBridge
+    : public MTRGeneralDiagnosticsClusterNetworkFaultEnumAttributeCallbackBridge
 {
 public:
-    MTRGeneralDiagnosticsClusterNetworkFaultTypeAttributeCallbackSubscriptionBridge(
+    MTRGeneralDiagnosticsClusterNetworkFaultEnumAttributeCallbackSubscriptionBridge(
         dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action,
         MTRSubscriptionEstablishedHandler establishedHandler) :
-        MTRGeneralDiagnosticsClusterNetworkFaultTypeAttributeCallbackBridge(queue, handler, action),
+        MTRGeneralDiagnosticsClusterNetworkFaultEnumAttributeCallbackBridge(queue, handler, action),
         mEstablishedHandler(establishedHandler)
     {}
 
     void OnSubscriptionEstablished();
-    using MTRGeneralDiagnosticsClusterNetworkFaultTypeAttributeCallbackBridge::KeepAliveOnCallback;
-    using MTRGeneralDiagnosticsClusterNetworkFaultTypeAttributeCallbackBridge::OnDone;
+    using MTRGeneralDiagnosticsClusterNetworkFaultEnumAttributeCallbackBridge::KeepAliveOnCallback;
+    using MTRGeneralDiagnosticsClusterNetworkFaultEnumAttributeCallbackBridge::OnDone;
 
 private:
     MTRSubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class MTRNullableGeneralDiagnosticsClusterNetworkFaultTypeAttributeCallbackBridge
-    : public MTRCallbackBridge<NullableGeneralDiagnosticsClusterNetworkFaultTypeAttributeCallback>
+class MTRNullableGeneralDiagnosticsClusterNetworkFaultEnumAttributeCallbackBridge
+    : public MTRCallbackBridge<NullableGeneralDiagnosticsClusterNetworkFaultEnumAttributeCallback>
 {
 public:
-    MTRNullableGeneralDiagnosticsClusterNetworkFaultTypeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) :
-        MTRCallbackBridge<NullableGeneralDiagnosticsClusterNetworkFaultTypeAttributeCallback>(queue, handler, OnSuccessFn){};
+    MTRNullableGeneralDiagnosticsClusterNetworkFaultEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) :
+        MTRCallbackBridge<NullableGeneralDiagnosticsClusterNetworkFaultEnumAttributeCallback>(queue, handler, OnSuccessFn){};
 
-    MTRNullableGeneralDiagnosticsClusterNetworkFaultTypeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+    MTRNullableGeneralDiagnosticsClusterNetworkFaultEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
                                                                                 MTRActionBlock action) :
-        MTRCallbackBridge<NullableGeneralDiagnosticsClusterNetworkFaultTypeAttributeCallback>(queue, handler, action,
+        MTRCallbackBridge<NullableGeneralDiagnosticsClusterNetworkFaultEnumAttributeCallback>(queue, handler, action,
                                                                                               OnSuccessFn){};
 
     static void
     OnSuccessFn(void * context,
-                const chip::app::DataModel::Nullable<chip::app::Clusters::GeneralDiagnostics::NetworkFaultType> & value);
+                const chip::app::DataModel::Nullable<chip::app::Clusters::GeneralDiagnostics::NetworkFaultEnum> & value);
 };
 
-class MTRNullableGeneralDiagnosticsClusterNetworkFaultTypeAttributeCallbackSubscriptionBridge
-    : public MTRNullableGeneralDiagnosticsClusterNetworkFaultTypeAttributeCallbackBridge
+class MTRNullableGeneralDiagnosticsClusterNetworkFaultEnumAttributeCallbackSubscriptionBridge
+    : public MTRNullableGeneralDiagnosticsClusterNetworkFaultEnumAttributeCallbackBridge
 {
 public:
-    MTRNullableGeneralDiagnosticsClusterNetworkFaultTypeAttributeCallbackSubscriptionBridge(
+    MTRNullableGeneralDiagnosticsClusterNetworkFaultEnumAttributeCallbackSubscriptionBridge(
         dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action,
         MTRSubscriptionEstablishedHandler establishedHandler) :
-        MTRNullableGeneralDiagnosticsClusterNetworkFaultTypeAttributeCallbackBridge(queue, handler, action),
+        MTRNullableGeneralDiagnosticsClusterNetworkFaultEnumAttributeCallbackBridge(queue, handler, action),
         mEstablishedHandler(establishedHandler)
     {}
 
     void OnSubscriptionEstablished();
-    using MTRNullableGeneralDiagnosticsClusterNetworkFaultTypeAttributeCallbackBridge::KeepAliveOnCallback;
-    using MTRNullableGeneralDiagnosticsClusterNetworkFaultTypeAttributeCallbackBridge::OnDone;
+    using MTRNullableGeneralDiagnosticsClusterNetworkFaultEnumAttributeCallbackBridge::KeepAliveOnCallback;
+    using MTRNullableGeneralDiagnosticsClusterNetworkFaultEnumAttributeCallbackBridge::OnDone;
 
 private:
     MTRSubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class MTRGeneralDiagnosticsClusterRadioFaultAttributeCallbackBridge
-    : public MTRCallbackBridge<GeneralDiagnosticsClusterRadioFaultAttributeCallback>
+class MTRGeneralDiagnosticsClusterRadioFaultEnumAttributeCallbackBridge
+    : public MTRCallbackBridge<GeneralDiagnosticsClusterRadioFaultEnumAttributeCallback>
 {
 public:
-    MTRGeneralDiagnosticsClusterRadioFaultAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) :
-        MTRCallbackBridge<GeneralDiagnosticsClusterRadioFaultAttributeCallback>(queue, handler, OnSuccessFn){};
+    MTRGeneralDiagnosticsClusterRadioFaultEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) :
+        MTRCallbackBridge<GeneralDiagnosticsClusterRadioFaultEnumAttributeCallback>(queue, handler, OnSuccessFn){};
 
-    MTRGeneralDiagnosticsClusterRadioFaultAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                  MTRActionBlock action) :
-        MTRCallbackBridge<GeneralDiagnosticsClusterRadioFaultAttributeCallback>(queue, handler, action, OnSuccessFn){};
+    MTRGeneralDiagnosticsClusterRadioFaultEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                      MTRActionBlock action) :
+        MTRCallbackBridge<GeneralDiagnosticsClusterRadioFaultEnumAttributeCallback>(queue, handler, action, OnSuccessFn){};
 
-    static void OnSuccessFn(void * context, chip::app::Clusters::GeneralDiagnostics::RadioFault value);
+    static void OnSuccessFn(void * context, chip::app::Clusters::GeneralDiagnostics::RadioFaultEnum value);
 };
 
-class MTRGeneralDiagnosticsClusterRadioFaultAttributeCallbackSubscriptionBridge
-    : public MTRGeneralDiagnosticsClusterRadioFaultAttributeCallbackBridge
+class MTRGeneralDiagnosticsClusterRadioFaultEnumAttributeCallbackSubscriptionBridge
+    : public MTRGeneralDiagnosticsClusterRadioFaultEnumAttributeCallbackBridge
 {
 public:
-    MTRGeneralDiagnosticsClusterRadioFaultAttributeCallbackSubscriptionBridge(
+    MTRGeneralDiagnosticsClusterRadioFaultEnumAttributeCallbackSubscriptionBridge(
         dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action,
         MTRSubscriptionEstablishedHandler establishedHandler) :
-        MTRGeneralDiagnosticsClusterRadioFaultAttributeCallbackBridge(queue, handler, action),
+        MTRGeneralDiagnosticsClusterRadioFaultEnumAttributeCallbackBridge(queue, handler, action),
         mEstablishedHandler(establishedHandler)
     {}
 
     void OnSubscriptionEstablished();
-    using MTRGeneralDiagnosticsClusterRadioFaultAttributeCallbackBridge::KeepAliveOnCallback;
-    using MTRGeneralDiagnosticsClusterRadioFaultAttributeCallbackBridge::OnDone;
+    using MTRGeneralDiagnosticsClusterRadioFaultEnumAttributeCallbackBridge::KeepAliveOnCallback;
+    using MTRGeneralDiagnosticsClusterRadioFaultEnumAttributeCallbackBridge::OnDone;
 
 private:
     MTRSubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class MTRNullableGeneralDiagnosticsClusterRadioFaultAttributeCallbackBridge
-    : public MTRCallbackBridge<NullableGeneralDiagnosticsClusterRadioFaultAttributeCallback>
+class MTRNullableGeneralDiagnosticsClusterRadioFaultEnumAttributeCallbackBridge
+    : public MTRCallbackBridge<NullableGeneralDiagnosticsClusterRadioFaultEnumAttributeCallback>
 {
 public:
-    MTRNullableGeneralDiagnosticsClusterRadioFaultAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) :
-        MTRCallbackBridge<NullableGeneralDiagnosticsClusterRadioFaultAttributeCallback>(queue, handler, OnSuccessFn){};
+    MTRNullableGeneralDiagnosticsClusterRadioFaultEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) :
+        MTRCallbackBridge<NullableGeneralDiagnosticsClusterRadioFaultEnumAttributeCallback>(queue, handler, OnSuccessFn){};
 
-    MTRNullableGeneralDiagnosticsClusterRadioFaultAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                          MTRActionBlock action) :
-        MTRCallbackBridge<NullableGeneralDiagnosticsClusterRadioFaultAttributeCallback>(queue, handler, action, OnSuccessFn){};
+    MTRNullableGeneralDiagnosticsClusterRadioFaultEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                              MTRActionBlock action) :
+        MTRCallbackBridge<NullableGeneralDiagnosticsClusterRadioFaultEnumAttributeCallback>(queue, handler, action, OnSuccessFn){};
 
     static void OnSuccessFn(void * context,
-                            const chip::app::DataModel::Nullable<chip::app::Clusters::GeneralDiagnostics::RadioFault> & value);
+                            const chip::app::DataModel::Nullable<chip::app::Clusters::GeneralDiagnostics::RadioFaultEnum> & value);
 };
 
-class MTRNullableGeneralDiagnosticsClusterRadioFaultAttributeCallbackSubscriptionBridge
-    : public MTRNullableGeneralDiagnosticsClusterRadioFaultAttributeCallbackBridge
+class MTRNullableGeneralDiagnosticsClusterRadioFaultEnumAttributeCallbackSubscriptionBridge
+    : public MTRNullableGeneralDiagnosticsClusterRadioFaultEnumAttributeCallbackBridge
 {
 public:
-    MTRNullableGeneralDiagnosticsClusterRadioFaultAttributeCallbackSubscriptionBridge(
+    MTRNullableGeneralDiagnosticsClusterRadioFaultEnumAttributeCallbackSubscriptionBridge(
         dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action,
         MTRSubscriptionEstablishedHandler establishedHandler) :
-        MTRNullableGeneralDiagnosticsClusterRadioFaultAttributeCallbackBridge(queue, handler, action),
+        MTRNullableGeneralDiagnosticsClusterRadioFaultEnumAttributeCallbackBridge(queue, handler, action),
         mEstablishedHandler(establishedHandler)
     {}
 
     void OnSubscriptionEstablished();
-    using MTRNullableGeneralDiagnosticsClusterRadioFaultAttributeCallbackBridge::KeepAliveOnCallback;
-    using MTRNullableGeneralDiagnosticsClusterRadioFaultAttributeCallbackBridge::OnDone;
+    using MTRNullableGeneralDiagnosticsClusterRadioFaultEnumAttributeCallbackBridge::KeepAliveOnCallback;
+    using MTRNullableGeneralDiagnosticsClusterRadioFaultEnumAttributeCallbackBridge::OnDone;
 
 private:
     MTRSubscriptionEstablishedHandler mEstablishedHandler;
@@ -15222,68 +15222,71 @@ class MTRNullableWiFiNetworkDiagnosticsClusterWiFiVersionTypeAttributeCallbackSu
     MTRSubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class MTREthernetNetworkDiagnosticsClusterPHYRateAttributeCallbackBridge
-    : public MTRCallbackBridge<EthernetNetworkDiagnosticsClusterPHYRateAttributeCallback>
+class MTREthernetNetworkDiagnosticsClusterPHYRateEnumAttributeCallbackBridge
+    : public MTRCallbackBridge<EthernetNetworkDiagnosticsClusterPHYRateEnumAttributeCallback>
 {
 public:
-    MTREthernetNetworkDiagnosticsClusterPHYRateAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) :
-        MTRCallbackBridge<EthernetNetworkDiagnosticsClusterPHYRateAttributeCallback>(queue, handler, OnSuccessFn){};
+    MTREthernetNetworkDiagnosticsClusterPHYRateEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) :
+        MTRCallbackBridge<EthernetNetworkDiagnosticsClusterPHYRateEnumAttributeCallback>(queue, handler, OnSuccessFn){};
 
-    MTREthernetNetworkDiagnosticsClusterPHYRateAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                       MTRActionBlock action) :
-        MTRCallbackBridge<EthernetNetworkDiagnosticsClusterPHYRateAttributeCallback>(queue, handler, action, OnSuccessFn){};
+    MTREthernetNetworkDiagnosticsClusterPHYRateEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                           MTRActionBlock action) :
+        MTRCallbackBridge<EthernetNetworkDiagnosticsClusterPHYRateEnumAttributeCallback>(queue, handler, action, OnSuccessFn){};
 
-    static void OnSuccessFn(void * context, chip::app::Clusters::EthernetNetworkDiagnostics::PHYRate value);
+    static void OnSuccessFn(void * context, chip::app::Clusters::EthernetNetworkDiagnostics::PHYRateEnum value);
 };
 
-class MTREthernetNetworkDiagnosticsClusterPHYRateAttributeCallbackSubscriptionBridge
-    : public MTREthernetNetworkDiagnosticsClusterPHYRateAttributeCallbackBridge
+class MTREthernetNetworkDiagnosticsClusterPHYRateEnumAttributeCallbackSubscriptionBridge
+    : public MTREthernetNetworkDiagnosticsClusterPHYRateEnumAttributeCallbackBridge
 {
 public:
-    MTREthernetNetworkDiagnosticsClusterPHYRateAttributeCallbackSubscriptionBridge(
+    MTREthernetNetworkDiagnosticsClusterPHYRateEnumAttributeCallbackSubscriptionBridge(
         dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action,
         MTRSubscriptionEstablishedHandler establishedHandler) :
-        MTREthernetNetworkDiagnosticsClusterPHYRateAttributeCallbackBridge(queue, handler, action),
+        MTREthernetNetworkDiagnosticsClusterPHYRateEnumAttributeCallbackBridge(queue, handler, action),
         mEstablishedHandler(establishedHandler)
     {}
 
     void OnSubscriptionEstablished();
-    using MTREthernetNetworkDiagnosticsClusterPHYRateAttributeCallbackBridge::KeepAliveOnCallback;
-    using MTREthernetNetworkDiagnosticsClusterPHYRateAttributeCallbackBridge::OnDone;
+    using MTREthernetNetworkDiagnosticsClusterPHYRateEnumAttributeCallbackBridge::KeepAliveOnCallback;
+    using MTREthernetNetworkDiagnosticsClusterPHYRateEnumAttributeCallbackBridge::OnDone;
 
 private:
     MTRSubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class MTRNullableEthernetNetworkDiagnosticsClusterPHYRateAttributeCallbackBridge
-    : public MTRCallbackBridge<NullableEthernetNetworkDiagnosticsClusterPHYRateAttributeCallback>
+class MTRNullableEthernetNetworkDiagnosticsClusterPHYRateEnumAttributeCallbackBridge
+    : public MTRCallbackBridge<NullableEthernetNetworkDiagnosticsClusterPHYRateEnumAttributeCallback>
 {
 public:
-    MTRNullableEthernetNetworkDiagnosticsClusterPHYRateAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) :
-        MTRCallbackBridge<NullableEthernetNetworkDiagnosticsClusterPHYRateAttributeCallback>(queue, handler, OnSuccessFn){};
+    MTRNullableEthernetNetworkDiagnosticsClusterPHYRateEnumAttributeCallbackBridge(dispatch_queue_t queue,
+                                                                                   ResponseHandler handler) :
+        MTRCallbackBridge<NullableEthernetNetworkDiagnosticsClusterPHYRateEnumAttributeCallback>(queue, handler, OnSuccessFn){};
 
-    MTRNullableEthernetNetworkDiagnosticsClusterPHYRateAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                               MTRActionBlock action) :
-        MTRCallbackBridge<NullableEthernetNetworkDiagnosticsClusterPHYRateAttributeCallback>(queue, handler, action, OnSuccessFn){};
+    MTRNullableEthernetNetworkDiagnosticsClusterPHYRateEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                                   MTRActionBlock action) :
+        MTRCallbackBridge<NullableEthernetNetworkDiagnosticsClusterPHYRateEnumAttributeCallback>(queue, handler, action,
+                                                                                                 OnSuccessFn){};
 
-    static void OnSuccessFn(void * context,
-                            const chip::app::DataModel::Nullable<chip::app::Clusters::EthernetNetworkDiagnostics::PHYRate> & value);
+    static void
+    OnSuccessFn(void * context,
+                const chip::app::DataModel::Nullable<chip::app::Clusters::EthernetNetworkDiagnostics::PHYRateEnum> & value);
 };
 
-class MTRNullableEthernetNetworkDiagnosticsClusterPHYRateAttributeCallbackSubscriptionBridge
-    : public MTRNullableEthernetNetworkDiagnosticsClusterPHYRateAttributeCallbackBridge
+class MTRNullableEthernetNetworkDiagnosticsClusterPHYRateEnumAttributeCallbackSubscriptionBridge
+    : public MTRNullableEthernetNetworkDiagnosticsClusterPHYRateEnumAttributeCallbackBridge
 {
 public:
-    MTRNullableEthernetNetworkDiagnosticsClusterPHYRateAttributeCallbackSubscriptionBridge(
+    MTRNullableEthernetNetworkDiagnosticsClusterPHYRateEnumAttributeCallbackSubscriptionBridge(
         dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action,
         MTRSubscriptionEstablishedHandler establishedHandler) :
-        MTRNullableEthernetNetworkDiagnosticsClusterPHYRateAttributeCallbackBridge(queue, handler, action),
+        MTRNullableEthernetNetworkDiagnosticsClusterPHYRateEnumAttributeCallbackBridge(queue, handler, action),
         mEstablishedHandler(establishedHandler)
     {}
 
     void OnSubscriptionEstablished();
-    using MTRNullableEthernetNetworkDiagnosticsClusterPHYRateAttributeCallbackBridge::KeepAliveOnCallback;
-    using MTRNullableEthernetNetworkDiagnosticsClusterPHYRateAttributeCallbackBridge::OnDone;
+    using MTRNullableEthernetNetworkDiagnosticsClusterPHYRateEnumAttributeCallbackBridge::KeepAliveOnCallback;
+    using MTRNullableEthernetNetworkDiagnosticsClusterPHYRateEnumAttributeCallbackBridge::OnDone;
 
 private:
     MTRSubscriptionEstablishedHandler mEstablishedHandler;
@@ -15425,77 +15428,78 @@ class MTRNullableTimeSynchronizationClusterTimeSourceEnumAttributeCallbackSubscr
     MTRSubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class MTRAdministratorCommissioningClusterCommissioningWindowStatusAttributeCallbackBridge
-    : public MTRCallbackBridge<AdministratorCommissioningClusterCommissioningWindowStatusAttributeCallback>
+class MTRAdministratorCommissioningClusterCommissioningWindowStatusEnumAttributeCallbackBridge
+    : public MTRCallbackBridge<AdministratorCommissioningClusterCommissioningWindowStatusEnumAttributeCallback>
 {
 public:
-    MTRAdministratorCommissioningClusterCommissioningWindowStatusAttributeCallbackBridge(dispatch_queue_t queue,
-                                                                                         ResponseHandler handler) :
-        MTRCallbackBridge<AdministratorCommissioningClusterCommissioningWindowStatusAttributeCallback>(queue, handler,
-                                                                                                       OnSuccessFn){};
+    MTRAdministratorCommissioningClusterCommissioningWindowStatusEnumAttributeCallbackBridge(dispatch_queue_t queue,
+                                                                                             ResponseHandler handler) :
+        MTRCallbackBridge<AdministratorCommissioningClusterCommissioningWindowStatusEnumAttributeCallback>(queue, handler,
+                                                                                                           OnSuccessFn){};
 
-    MTRAdministratorCommissioningClusterCommissioningWindowStatusAttributeCallbackBridge(dispatch_queue_t queue,
-                                                                                         ResponseHandler handler,
-                                                                                         MTRActionBlock action) :
-        MTRCallbackBridge<AdministratorCommissioningClusterCommissioningWindowStatusAttributeCallback>(queue, handler, action,
-                                                                                                       OnSuccessFn){};
+    MTRAdministratorCommissioningClusterCommissioningWindowStatusEnumAttributeCallbackBridge(dispatch_queue_t queue,
+                                                                                             ResponseHandler handler,
+                                                                                             MTRActionBlock action) :
+        MTRCallbackBridge<AdministratorCommissioningClusterCommissioningWindowStatusEnumAttributeCallback>(queue, handler, action,
+                                                                                                           OnSuccessFn){};
 
-    static void OnSuccessFn(void * context, chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatus value);
+    static void OnSuccessFn(void * context, chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatusEnum value);
 };
 
-class MTRAdministratorCommissioningClusterCommissioningWindowStatusAttributeCallbackSubscriptionBridge
-    : public MTRAdministratorCommissioningClusterCommissioningWindowStatusAttributeCallbackBridge
+class MTRAdministratorCommissioningClusterCommissioningWindowStatusEnumAttributeCallbackSubscriptionBridge
+    : public MTRAdministratorCommissioningClusterCommissioningWindowStatusEnumAttributeCallbackBridge
 {
 public:
-    MTRAdministratorCommissioningClusterCommissioningWindowStatusAttributeCallbackSubscriptionBridge(
+    MTRAdministratorCommissioningClusterCommissioningWindowStatusEnumAttributeCallbackSubscriptionBridge(
         dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action,
         MTRSubscriptionEstablishedHandler establishedHandler) :
-        MTRAdministratorCommissioningClusterCommissioningWindowStatusAttributeCallbackBridge(queue, handler, action),
+        MTRAdministratorCommissioningClusterCommissioningWindowStatusEnumAttributeCallbackBridge(queue, handler, action),
         mEstablishedHandler(establishedHandler)
     {}
 
     void OnSubscriptionEstablished();
-    using MTRAdministratorCommissioningClusterCommissioningWindowStatusAttributeCallbackBridge::KeepAliveOnCallback;
-    using MTRAdministratorCommissioningClusterCommissioningWindowStatusAttributeCallbackBridge::OnDone;
+    using MTRAdministratorCommissioningClusterCommissioningWindowStatusEnumAttributeCallbackBridge::KeepAliveOnCallback;
+    using MTRAdministratorCommissioningClusterCommissioningWindowStatusEnumAttributeCallbackBridge::OnDone;
 
 private:
     MTRSubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class MTRNullableAdministratorCommissioningClusterCommissioningWindowStatusAttributeCallbackBridge
-    : public MTRCallbackBridge<NullableAdministratorCommissioningClusterCommissioningWindowStatusAttributeCallback>
+class MTRNullableAdministratorCommissioningClusterCommissioningWindowStatusEnumAttributeCallbackBridge
+    : public MTRCallbackBridge<NullableAdministratorCommissioningClusterCommissioningWindowStatusEnumAttributeCallback>
 {
 public:
-    MTRNullableAdministratorCommissioningClusterCommissioningWindowStatusAttributeCallbackBridge(dispatch_queue_t queue,
-                                                                                                 ResponseHandler handler) :
-        MTRCallbackBridge<NullableAdministratorCommissioningClusterCommissioningWindowStatusAttributeCallback>(queue, handler,
-                                                                                                               OnSuccessFn){};
+    MTRNullableAdministratorCommissioningClusterCommissioningWindowStatusEnumAttributeCallbackBridge(dispatch_queue_t queue,
+                                                                                                     ResponseHandler handler) :
+        MTRCallbackBridge<NullableAdministratorCommissioningClusterCommissioningWindowStatusEnumAttributeCallback>(queue, handler,
+                                                                                                                   OnSuccessFn){};
 
-    MTRNullableAdministratorCommissioningClusterCommissioningWindowStatusAttributeCallbackBridge(dispatch_queue_t queue,
-                                                                                                 ResponseHandler handler,
-                                                                                                 MTRActionBlock action) :
-        MTRCallbackBridge<NullableAdministratorCommissioningClusterCommissioningWindowStatusAttributeCallback>(
+    MTRNullableAdministratorCommissioningClusterCommissioningWindowStatusEnumAttributeCallbackBridge(dispatch_queue_t queue,
+                                                                                                     ResponseHandler handler,
+                                                                                                     MTRActionBlock action) :
+        MTRCallbackBridge<NullableAdministratorCommissioningClusterCommissioningWindowStatusEnumAttributeCallback>(
             queue, handler, action, OnSuccessFn){};
 
     static void OnSuccessFn(
         void * context,
-        const chip::app::DataModel::Nullable<chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatus> & value);
+        const chip::app::DataModel::Nullable<chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatusEnum> &
+            value);
 };
 
-class MTRNullableAdministratorCommissioningClusterCommissioningWindowStatusAttributeCallbackSubscriptionBridge
-    : public MTRNullableAdministratorCommissioningClusterCommissioningWindowStatusAttributeCallbackBridge
+class MTRNullableAdministratorCommissioningClusterCommissioningWindowStatusEnumAttributeCallbackSubscriptionBridge
+    : public MTRNullableAdministratorCommissioningClusterCommissioningWindowStatusEnumAttributeCallbackBridge
 {
 public:
-    MTRNullableAdministratorCommissioningClusterCommissioningWindowStatusAttributeCallbackSubscriptionBridge(
+    MTRNullableAdministratorCommissioningClusterCommissioningWindowStatusEnumAttributeCallbackSubscriptionBridge(
         dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action,
         MTRSubscriptionEstablishedHandler establishedHandler) :
-        MTRNullableAdministratorCommissioningClusterCommissioningWindowStatusAttributeCallbackBridge(queue, handler, action),
+        MTRNullableAdministratorCommissioningClusterCommissioningWindowStatusEnumAttributeCallbackBridge(queue, handler, action),
         mEstablishedHandler(establishedHandler)
     {}
 
     void OnSubscriptionEstablished();
-    using MTRNullableAdministratorCommissioningClusterCommissioningWindowStatusAttributeCallbackBridge::KeepAliveOnCallback;
-    using MTRNullableAdministratorCommissioningClusterCommissioningWindowStatusAttributeCallbackBridge::OnDone;
+    using MTRNullableAdministratorCommissioningClusterCommissioningWindowStatusEnumAttributeCallbackBridge::KeepAliveOnCallback;
+    using MTRNullableAdministratorCommissioningClusterCommissioningWindowStatusEnumAttributeCallbackBridge::OnDone;
 
 private:
     MTRSubscriptionEstablishedHandler mEstablishedHandler;
@@ -15791,464 +15795,268 @@ class MTRNullableGroupKeyManagementClusterGroupKeySecurityPolicyAttributeCallbac
     MTRSubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class MTRDoorLockClusterDlAlarmCodeAttributeCallbackBridge : public MTRCallbackBridge<DoorLockClusterDlAlarmCodeAttributeCallback>
-{
-public:
-    MTRDoorLockClusterDlAlarmCodeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) :
-        MTRCallbackBridge<DoorLockClusterDlAlarmCodeAttributeCallback>(queue, handler, OnSuccessFn){};
-
-    MTRDoorLockClusterDlAlarmCodeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action) :
-        MTRCallbackBridge<DoorLockClusterDlAlarmCodeAttributeCallback>(queue, handler, action, OnSuccessFn){};
-
-    static void OnSuccessFn(void * context, chip::app::Clusters::DoorLock::DlAlarmCode value);
-};
-
-class MTRDoorLockClusterDlAlarmCodeAttributeCallbackSubscriptionBridge : public MTRDoorLockClusterDlAlarmCodeAttributeCallbackBridge
-{
-public:
-    MTRDoorLockClusterDlAlarmCodeAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                     MTRActionBlock action,
-                                                                     MTRSubscriptionEstablishedHandler establishedHandler) :
-        MTRDoorLockClusterDlAlarmCodeAttributeCallbackBridge(queue, handler, action),
-        mEstablishedHandler(establishedHandler)
-    {}
-
-    void OnSubscriptionEstablished();
-    using MTRDoorLockClusterDlAlarmCodeAttributeCallbackBridge::KeepAliveOnCallback;
-    using MTRDoorLockClusterDlAlarmCodeAttributeCallbackBridge::OnDone;
-
-private:
-    MTRSubscriptionEstablishedHandler mEstablishedHandler;
-};
-
-class MTRNullableDoorLockClusterDlAlarmCodeAttributeCallbackBridge
-    : public MTRCallbackBridge<NullableDoorLockClusterDlAlarmCodeAttributeCallback>
-{
-public:
-    MTRNullableDoorLockClusterDlAlarmCodeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) :
-        MTRCallbackBridge<NullableDoorLockClusterDlAlarmCodeAttributeCallback>(queue, handler, OnSuccessFn){};
-
-    MTRNullableDoorLockClusterDlAlarmCodeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                 MTRActionBlock action) :
-        MTRCallbackBridge<NullableDoorLockClusterDlAlarmCodeAttributeCallback>(queue, handler, action, OnSuccessFn){};
-
-    static void OnSuccessFn(void * context,
-                            const chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::DlAlarmCode> & value);
-};
-
-class MTRNullableDoorLockClusterDlAlarmCodeAttributeCallbackSubscriptionBridge
-    : public MTRNullableDoorLockClusterDlAlarmCodeAttributeCallbackBridge
-{
-public:
-    MTRNullableDoorLockClusterDlAlarmCodeAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                             MTRActionBlock action,
-                                                                             MTRSubscriptionEstablishedHandler establishedHandler) :
-        MTRNullableDoorLockClusterDlAlarmCodeAttributeCallbackBridge(queue, handler, action),
-        mEstablishedHandler(establishedHandler)
-    {}
-
-    void OnSubscriptionEstablished();
-    using MTRNullableDoorLockClusterDlAlarmCodeAttributeCallbackBridge::KeepAliveOnCallback;
-    using MTRNullableDoorLockClusterDlAlarmCodeAttributeCallbackBridge::OnDone;
-
-private:
-    MTRSubscriptionEstablishedHandler mEstablishedHandler;
-};
-
-class MTRDoorLockClusterDlCredentialRuleAttributeCallbackBridge
-    : public MTRCallbackBridge<DoorLockClusterDlCredentialRuleAttributeCallback>
+class MTRDoorLockClusterAlarmCodeEnumAttributeCallbackBridge
+    : public MTRCallbackBridge<DoorLockClusterAlarmCodeEnumAttributeCallback>
 {
 public:
-    MTRDoorLockClusterDlCredentialRuleAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) :
-        MTRCallbackBridge<DoorLockClusterDlCredentialRuleAttributeCallback>(queue, handler, OnSuccessFn){};
+    MTRDoorLockClusterAlarmCodeEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) :
+        MTRCallbackBridge<DoorLockClusterAlarmCodeEnumAttributeCallback>(queue, handler, OnSuccessFn){};
 
-    MTRDoorLockClusterDlCredentialRuleAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                              MTRActionBlock action) :
-        MTRCallbackBridge<DoorLockClusterDlCredentialRuleAttributeCallback>(queue, handler, action, OnSuccessFn){};
+    MTRDoorLockClusterAlarmCodeEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action) :
+        MTRCallbackBridge<DoorLockClusterAlarmCodeEnumAttributeCallback>(queue, handler, action, OnSuccessFn){};
 
-    static void OnSuccessFn(void * context, chip::app::Clusters::DoorLock::DlCredentialRule value);
+    static void OnSuccessFn(void * context, chip::app::Clusters::DoorLock::AlarmCodeEnum value);
 };
 
-class MTRDoorLockClusterDlCredentialRuleAttributeCallbackSubscriptionBridge
-    : public MTRDoorLockClusterDlCredentialRuleAttributeCallbackBridge
+class MTRDoorLockClusterAlarmCodeEnumAttributeCallbackSubscriptionBridge
+    : public MTRDoorLockClusterAlarmCodeEnumAttributeCallbackBridge
 {
 public:
-    MTRDoorLockClusterDlCredentialRuleAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                          MTRActionBlock action,
-                                                                          MTRSubscriptionEstablishedHandler establishedHandler) :
-        MTRDoorLockClusterDlCredentialRuleAttributeCallbackBridge(queue, handler, action),
+    MTRDoorLockClusterAlarmCodeEnumAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                       MTRActionBlock action,
+                                                                       MTRSubscriptionEstablishedHandler establishedHandler) :
+        MTRDoorLockClusterAlarmCodeEnumAttributeCallbackBridge(queue, handler, action),
         mEstablishedHandler(establishedHandler)
     {}
 
     void OnSubscriptionEstablished();
-    using MTRDoorLockClusterDlCredentialRuleAttributeCallbackBridge::KeepAliveOnCallback;
-    using MTRDoorLockClusterDlCredentialRuleAttributeCallbackBridge::OnDone;
+    using MTRDoorLockClusterAlarmCodeEnumAttributeCallbackBridge::KeepAliveOnCallback;
+    using MTRDoorLockClusterAlarmCodeEnumAttributeCallbackBridge::OnDone;
 
 private:
     MTRSubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class MTRNullableDoorLockClusterDlCredentialRuleAttributeCallbackBridge
-    : public MTRCallbackBridge<NullableDoorLockClusterDlCredentialRuleAttributeCallback>
+class MTRNullableDoorLockClusterAlarmCodeEnumAttributeCallbackBridge
+    : public MTRCallbackBridge<NullableDoorLockClusterAlarmCodeEnumAttributeCallback>
 {
 public:
-    MTRNullableDoorLockClusterDlCredentialRuleAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) :
-        MTRCallbackBridge<NullableDoorLockClusterDlCredentialRuleAttributeCallback>(queue, handler, OnSuccessFn){};
+    MTRNullableDoorLockClusterAlarmCodeEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) :
+        MTRCallbackBridge<NullableDoorLockClusterAlarmCodeEnumAttributeCallback>(queue, handler, OnSuccessFn){};
 
-    MTRNullableDoorLockClusterDlCredentialRuleAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                      MTRActionBlock action) :
-        MTRCallbackBridge<NullableDoorLockClusterDlCredentialRuleAttributeCallback>(queue, handler, action, OnSuccessFn){};
+    MTRNullableDoorLockClusterAlarmCodeEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                   MTRActionBlock action) :
+        MTRCallbackBridge<NullableDoorLockClusterAlarmCodeEnumAttributeCallback>(queue, handler, action, OnSuccessFn){};
 
     static void OnSuccessFn(void * context,
-                            const chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::DlCredentialRule> & value);
+                            const chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::AlarmCodeEnum> & value);
 };
 
-class MTRNullableDoorLockClusterDlCredentialRuleAttributeCallbackSubscriptionBridge
-    : public MTRNullableDoorLockClusterDlCredentialRuleAttributeCallbackBridge
+class MTRNullableDoorLockClusterAlarmCodeEnumAttributeCallbackSubscriptionBridge
+    : public MTRNullableDoorLockClusterAlarmCodeEnumAttributeCallbackBridge
 {
 public:
-    MTRNullableDoorLockClusterDlCredentialRuleAttributeCallbackSubscriptionBridge(
+    MTRNullableDoorLockClusterAlarmCodeEnumAttributeCallbackSubscriptionBridge(
         dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action,
         MTRSubscriptionEstablishedHandler establishedHandler) :
-        MTRNullableDoorLockClusterDlCredentialRuleAttributeCallbackBridge(queue, handler, action),
+        MTRNullableDoorLockClusterAlarmCodeEnumAttributeCallbackBridge(queue, handler, action),
         mEstablishedHandler(establishedHandler)
     {}
 
     void OnSubscriptionEstablished();
-    using MTRNullableDoorLockClusterDlCredentialRuleAttributeCallbackBridge::KeepAliveOnCallback;
-    using MTRNullableDoorLockClusterDlCredentialRuleAttributeCallbackBridge::OnDone;
+    using MTRNullableDoorLockClusterAlarmCodeEnumAttributeCallbackBridge::KeepAliveOnCallback;
+    using MTRNullableDoorLockClusterAlarmCodeEnumAttributeCallbackBridge::OnDone;
 
 private:
     MTRSubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class MTRDoorLockClusterDlCredentialTypeAttributeCallbackBridge
-    : public MTRCallbackBridge<DoorLockClusterDlCredentialTypeAttributeCallback>
+class MTRDoorLockClusterCredentialRuleEnumAttributeCallbackBridge
+    : public MTRCallbackBridge<DoorLockClusterCredentialRuleEnumAttributeCallback>
 {
 public:
-    MTRDoorLockClusterDlCredentialTypeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) :
-        MTRCallbackBridge<DoorLockClusterDlCredentialTypeAttributeCallback>(queue, handler, OnSuccessFn){};
+    MTRDoorLockClusterCredentialRuleEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) :
+        MTRCallbackBridge<DoorLockClusterCredentialRuleEnumAttributeCallback>(queue, handler, OnSuccessFn){};
 
-    MTRDoorLockClusterDlCredentialTypeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                              MTRActionBlock action) :
-        MTRCallbackBridge<DoorLockClusterDlCredentialTypeAttributeCallback>(queue, handler, action, OnSuccessFn){};
+    MTRDoorLockClusterCredentialRuleEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                MTRActionBlock action) :
+        MTRCallbackBridge<DoorLockClusterCredentialRuleEnumAttributeCallback>(queue, handler, action, OnSuccessFn){};
 
-    static void OnSuccessFn(void * context, chip::app::Clusters::DoorLock::DlCredentialType value);
+    static void OnSuccessFn(void * context, chip::app::Clusters::DoorLock::CredentialRuleEnum value);
 };
 
-class MTRDoorLockClusterDlCredentialTypeAttributeCallbackSubscriptionBridge
-    : public MTRDoorLockClusterDlCredentialTypeAttributeCallbackBridge
+class MTRDoorLockClusterCredentialRuleEnumAttributeCallbackSubscriptionBridge
+    : public MTRDoorLockClusterCredentialRuleEnumAttributeCallbackBridge
 {
 public:
-    MTRDoorLockClusterDlCredentialTypeAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                          MTRActionBlock action,
-                                                                          MTRSubscriptionEstablishedHandler establishedHandler) :
-        MTRDoorLockClusterDlCredentialTypeAttributeCallbackBridge(queue, handler, action),
+    MTRDoorLockClusterCredentialRuleEnumAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                            MTRActionBlock action,
+                                                                            MTRSubscriptionEstablishedHandler establishedHandler) :
+        MTRDoorLockClusterCredentialRuleEnumAttributeCallbackBridge(queue, handler, action),
         mEstablishedHandler(establishedHandler)
     {}
 
     void OnSubscriptionEstablished();
-    using MTRDoorLockClusterDlCredentialTypeAttributeCallbackBridge::KeepAliveOnCallback;
-    using MTRDoorLockClusterDlCredentialTypeAttributeCallbackBridge::OnDone;
+    using MTRDoorLockClusterCredentialRuleEnumAttributeCallbackBridge::KeepAliveOnCallback;
+    using MTRDoorLockClusterCredentialRuleEnumAttributeCallbackBridge::OnDone;
 
 private:
     MTRSubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class MTRNullableDoorLockClusterDlCredentialTypeAttributeCallbackBridge
-    : public MTRCallbackBridge<NullableDoorLockClusterDlCredentialTypeAttributeCallback>
+class MTRNullableDoorLockClusterCredentialRuleEnumAttributeCallbackBridge
+    : public MTRCallbackBridge<NullableDoorLockClusterCredentialRuleEnumAttributeCallback>
 {
 public:
-    MTRNullableDoorLockClusterDlCredentialTypeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) :
-        MTRCallbackBridge<NullableDoorLockClusterDlCredentialTypeAttributeCallback>(queue, handler, OnSuccessFn){};
+    MTRNullableDoorLockClusterCredentialRuleEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) :
+        MTRCallbackBridge<NullableDoorLockClusterCredentialRuleEnumAttributeCallback>(queue, handler, OnSuccessFn){};
 
-    MTRNullableDoorLockClusterDlCredentialTypeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                      MTRActionBlock action) :
-        MTRCallbackBridge<NullableDoorLockClusterDlCredentialTypeAttributeCallback>(queue, handler, action, OnSuccessFn){};
+    MTRNullableDoorLockClusterCredentialRuleEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                        MTRActionBlock action) :
+        MTRCallbackBridge<NullableDoorLockClusterCredentialRuleEnumAttributeCallback>(queue, handler, action, OnSuccessFn){};
 
     static void OnSuccessFn(void * context,
-                            const chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::DlCredentialType> & value);
+                            const chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::CredentialRuleEnum> & value);
 };
 
-class MTRNullableDoorLockClusterDlCredentialTypeAttributeCallbackSubscriptionBridge
-    : public MTRNullableDoorLockClusterDlCredentialTypeAttributeCallbackBridge
+class MTRNullableDoorLockClusterCredentialRuleEnumAttributeCallbackSubscriptionBridge
+    : public MTRNullableDoorLockClusterCredentialRuleEnumAttributeCallbackBridge
 {
 public:
-    MTRNullableDoorLockClusterDlCredentialTypeAttributeCallbackSubscriptionBridge(
+    MTRNullableDoorLockClusterCredentialRuleEnumAttributeCallbackSubscriptionBridge(
         dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action,
         MTRSubscriptionEstablishedHandler establishedHandler) :
-        MTRNullableDoorLockClusterDlCredentialTypeAttributeCallbackBridge(queue, handler, action),
+        MTRNullableDoorLockClusterCredentialRuleEnumAttributeCallbackBridge(queue, handler, action),
         mEstablishedHandler(establishedHandler)
     {}
 
     void OnSubscriptionEstablished();
-    using MTRNullableDoorLockClusterDlCredentialTypeAttributeCallbackBridge::KeepAliveOnCallback;
-    using MTRNullableDoorLockClusterDlCredentialTypeAttributeCallbackBridge::OnDone;
+    using MTRNullableDoorLockClusterCredentialRuleEnumAttributeCallbackBridge::KeepAliveOnCallback;
+    using MTRNullableDoorLockClusterCredentialRuleEnumAttributeCallbackBridge::OnDone;
 
 private:
     MTRSubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class MTRDoorLockClusterDlDataOperationTypeAttributeCallbackBridge
-    : public MTRCallbackBridge<DoorLockClusterDlDataOperationTypeAttributeCallback>
+class MTRDoorLockClusterCredentialTypeEnumAttributeCallbackBridge
+    : public MTRCallbackBridge<DoorLockClusterCredentialTypeEnumAttributeCallback>
 {
 public:
-    MTRDoorLockClusterDlDataOperationTypeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) :
-        MTRCallbackBridge<DoorLockClusterDlDataOperationTypeAttributeCallback>(queue, handler, OnSuccessFn){};
+    MTRDoorLockClusterCredentialTypeEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) :
+        MTRCallbackBridge<DoorLockClusterCredentialTypeEnumAttributeCallback>(queue, handler, OnSuccessFn){};
 
-    MTRDoorLockClusterDlDataOperationTypeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                 MTRActionBlock action) :
-        MTRCallbackBridge<DoorLockClusterDlDataOperationTypeAttributeCallback>(queue, handler, action, OnSuccessFn){};
+    MTRDoorLockClusterCredentialTypeEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                MTRActionBlock action) :
+        MTRCallbackBridge<DoorLockClusterCredentialTypeEnumAttributeCallback>(queue, handler, action, OnSuccessFn){};
 
-    static void OnSuccessFn(void * context, chip::app::Clusters::DoorLock::DlDataOperationType value);
+    static void OnSuccessFn(void * context, chip::app::Clusters::DoorLock::CredentialTypeEnum value);
 };
 
-class MTRDoorLockClusterDlDataOperationTypeAttributeCallbackSubscriptionBridge
-    : public MTRDoorLockClusterDlDataOperationTypeAttributeCallbackBridge
+class MTRDoorLockClusterCredentialTypeEnumAttributeCallbackSubscriptionBridge
+    : public MTRDoorLockClusterCredentialTypeEnumAttributeCallbackBridge
 {
 public:
-    MTRDoorLockClusterDlDataOperationTypeAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                             MTRActionBlock action,
-                                                                             MTRSubscriptionEstablishedHandler establishedHandler) :
-        MTRDoorLockClusterDlDataOperationTypeAttributeCallbackBridge(queue, handler, action),
+    MTRDoorLockClusterCredentialTypeEnumAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                            MTRActionBlock action,
+                                                                            MTRSubscriptionEstablishedHandler establishedHandler) :
+        MTRDoorLockClusterCredentialTypeEnumAttributeCallbackBridge(queue, handler, action),
         mEstablishedHandler(establishedHandler)
     {}
 
     void OnSubscriptionEstablished();
-    using MTRDoorLockClusterDlDataOperationTypeAttributeCallbackBridge::KeepAliveOnCallback;
-    using MTRDoorLockClusterDlDataOperationTypeAttributeCallbackBridge::OnDone;
+    using MTRDoorLockClusterCredentialTypeEnumAttributeCallbackBridge::KeepAliveOnCallback;
+    using MTRDoorLockClusterCredentialTypeEnumAttributeCallbackBridge::OnDone;
 
 private:
     MTRSubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class MTRNullableDoorLockClusterDlDataOperationTypeAttributeCallbackBridge
-    : public MTRCallbackBridge<NullableDoorLockClusterDlDataOperationTypeAttributeCallback>
+class MTRNullableDoorLockClusterCredentialTypeEnumAttributeCallbackBridge
+    : public MTRCallbackBridge<NullableDoorLockClusterCredentialTypeEnumAttributeCallback>
 {
 public:
-    MTRNullableDoorLockClusterDlDataOperationTypeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) :
-        MTRCallbackBridge<NullableDoorLockClusterDlDataOperationTypeAttributeCallback>(queue, handler, OnSuccessFn){};
+    MTRNullableDoorLockClusterCredentialTypeEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) :
+        MTRCallbackBridge<NullableDoorLockClusterCredentialTypeEnumAttributeCallback>(queue, handler, OnSuccessFn){};
 
-    MTRNullableDoorLockClusterDlDataOperationTypeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                         MTRActionBlock action) :
-        MTRCallbackBridge<NullableDoorLockClusterDlDataOperationTypeAttributeCallback>(queue, handler, action, OnSuccessFn){};
+    MTRNullableDoorLockClusterCredentialTypeEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                        MTRActionBlock action) :
+        MTRCallbackBridge<NullableDoorLockClusterCredentialTypeEnumAttributeCallback>(queue, handler, action, OnSuccessFn){};
 
     static void OnSuccessFn(void * context,
-                            const chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::DlDataOperationType> & value);
+                            const chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::CredentialTypeEnum> & value);
 };
 
-class MTRNullableDoorLockClusterDlDataOperationTypeAttributeCallbackSubscriptionBridge
-    : public MTRNullableDoorLockClusterDlDataOperationTypeAttributeCallbackBridge
+class MTRNullableDoorLockClusterCredentialTypeEnumAttributeCallbackSubscriptionBridge
+    : public MTRNullableDoorLockClusterCredentialTypeEnumAttributeCallbackBridge
 {
 public:
-    MTRNullableDoorLockClusterDlDataOperationTypeAttributeCallbackSubscriptionBridge(
+    MTRNullableDoorLockClusterCredentialTypeEnumAttributeCallbackSubscriptionBridge(
         dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action,
         MTRSubscriptionEstablishedHandler establishedHandler) :
-        MTRNullableDoorLockClusterDlDataOperationTypeAttributeCallbackBridge(queue, handler, action),
-        mEstablishedHandler(establishedHandler)
-    {}
-
-    void OnSubscriptionEstablished();
-    using MTRNullableDoorLockClusterDlDataOperationTypeAttributeCallbackBridge::KeepAliveOnCallback;
-    using MTRNullableDoorLockClusterDlDataOperationTypeAttributeCallbackBridge::OnDone;
-
-private:
-    MTRSubscriptionEstablishedHandler mEstablishedHandler;
-};
-
-class MTRDoorLockClusterDlDoorStateAttributeCallbackBridge : public MTRCallbackBridge<DoorLockClusterDlDoorStateAttributeCallback>
-{
-public:
-    MTRDoorLockClusterDlDoorStateAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) :
-        MTRCallbackBridge<DoorLockClusterDlDoorStateAttributeCallback>(queue, handler, OnSuccessFn){};
-
-    MTRDoorLockClusterDlDoorStateAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action) :
-        MTRCallbackBridge<DoorLockClusterDlDoorStateAttributeCallback>(queue, handler, action, OnSuccessFn){};
-
-    static void OnSuccessFn(void * context, chip::app::Clusters::DoorLock::DlDoorState value);
-};
-
-class MTRDoorLockClusterDlDoorStateAttributeCallbackSubscriptionBridge : public MTRDoorLockClusterDlDoorStateAttributeCallbackBridge
-{
-public:
-    MTRDoorLockClusterDlDoorStateAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                     MTRActionBlock action,
-                                                                     MTRSubscriptionEstablishedHandler establishedHandler) :
-        MTRDoorLockClusterDlDoorStateAttributeCallbackBridge(queue, handler, action),
-        mEstablishedHandler(establishedHandler)
-    {}
-
-    void OnSubscriptionEstablished();
-    using MTRDoorLockClusterDlDoorStateAttributeCallbackBridge::KeepAliveOnCallback;
-    using MTRDoorLockClusterDlDoorStateAttributeCallbackBridge::OnDone;
-
-private:
-    MTRSubscriptionEstablishedHandler mEstablishedHandler;
-};
-
-class MTRNullableDoorLockClusterDlDoorStateAttributeCallbackBridge
-    : public MTRCallbackBridge<NullableDoorLockClusterDlDoorStateAttributeCallback>
-{
-public:
-    MTRNullableDoorLockClusterDlDoorStateAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) :
-        MTRCallbackBridge<NullableDoorLockClusterDlDoorStateAttributeCallback>(queue, handler, OnSuccessFn){};
-
-    MTRNullableDoorLockClusterDlDoorStateAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                 MTRActionBlock action) :
-        MTRCallbackBridge<NullableDoorLockClusterDlDoorStateAttributeCallback>(queue, handler, action, OnSuccessFn){};
-
-    static void OnSuccessFn(void * context,
-                            const chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::DlDoorState> & value);
-};
-
-class MTRNullableDoorLockClusterDlDoorStateAttributeCallbackSubscriptionBridge
-    : public MTRNullableDoorLockClusterDlDoorStateAttributeCallbackBridge
-{
-public:
-    MTRNullableDoorLockClusterDlDoorStateAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                             MTRActionBlock action,
-                                                                             MTRSubscriptionEstablishedHandler establishedHandler) :
-        MTRNullableDoorLockClusterDlDoorStateAttributeCallbackBridge(queue, handler, action),
-        mEstablishedHandler(establishedHandler)
-    {}
-
-    void OnSubscriptionEstablished();
-    using MTRNullableDoorLockClusterDlDoorStateAttributeCallbackBridge::KeepAliveOnCallback;
-    using MTRNullableDoorLockClusterDlDoorStateAttributeCallbackBridge::OnDone;
-
-private:
-    MTRSubscriptionEstablishedHandler mEstablishedHandler;
-};
-
-class MTRDoorLockClusterDlLockDataTypeAttributeCallbackBridge
-    : public MTRCallbackBridge<DoorLockClusterDlLockDataTypeAttributeCallback>
-{
-public:
-    MTRDoorLockClusterDlLockDataTypeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) :
-        MTRCallbackBridge<DoorLockClusterDlLockDataTypeAttributeCallback>(queue, handler, OnSuccessFn){};
-
-    MTRDoorLockClusterDlLockDataTypeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                            MTRActionBlock action) :
-        MTRCallbackBridge<DoorLockClusterDlLockDataTypeAttributeCallback>(queue, handler, action, OnSuccessFn){};
-
-    static void OnSuccessFn(void * context, chip::app::Clusters::DoorLock::DlLockDataType value);
-};
-
-class MTRDoorLockClusterDlLockDataTypeAttributeCallbackSubscriptionBridge
-    : public MTRDoorLockClusterDlLockDataTypeAttributeCallbackBridge
-{
-public:
-    MTRDoorLockClusterDlLockDataTypeAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                        MTRActionBlock action,
-                                                                        MTRSubscriptionEstablishedHandler establishedHandler) :
-        MTRDoorLockClusterDlLockDataTypeAttributeCallbackBridge(queue, handler, action),
+        MTRNullableDoorLockClusterCredentialTypeEnumAttributeCallbackBridge(queue, handler, action),
         mEstablishedHandler(establishedHandler)
     {}
 
     void OnSubscriptionEstablished();
-    using MTRDoorLockClusterDlLockDataTypeAttributeCallbackBridge::KeepAliveOnCallback;
-    using MTRDoorLockClusterDlLockDataTypeAttributeCallbackBridge::OnDone;
+    using MTRNullableDoorLockClusterCredentialTypeEnumAttributeCallbackBridge::KeepAliveOnCallback;
+    using MTRNullableDoorLockClusterCredentialTypeEnumAttributeCallbackBridge::OnDone;
 
 private:
     MTRSubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class MTRNullableDoorLockClusterDlLockDataTypeAttributeCallbackBridge
-    : public MTRCallbackBridge<NullableDoorLockClusterDlLockDataTypeAttributeCallback>
+class MTRDoorLockClusterDataOperationTypeEnumAttributeCallbackBridge
+    : public MTRCallbackBridge<DoorLockClusterDataOperationTypeEnumAttributeCallback>
 {
 public:
-    MTRNullableDoorLockClusterDlLockDataTypeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) :
-        MTRCallbackBridge<NullableDoorLockClusterDlLockDataTypeAttributeCallback>(queue, handler, OnSuccessFn){};
+    MTRDoorLockClusterDataOperationTypeEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) :
+        MTRCallbackBridge<DoorLockClusterDataOperationTypeEnumAttributeCallback>(queue, handler, OnSuccessFn){};
 
-    MTRNullableDoorLockClusterDlLockDataTypeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                    MTRActionBlock action) :
-        MTRCallbackBridge<NullableDoorLockClusterDlLockDataTypeAttributeCallback>(queue, handler, action, OnSuccessFn){};
+    MTRDoorLockClusterDataOperationTypeEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                   MTRActionBlock action) :
+        MTRCallbackBridge<DoorLockClusterDataOperationTypeEnumAttributeCallback>(queue, handler, action, OnSuccessFn){};
 
-    static void OnSuccessFn(void * context,
-                            const chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::DlLockDataType> & value);
+    static void OnSuccessFn(void * context, chip::app::Clusters::DoorLock::DataOperationTypeEnum value);
 };
 
-class MTRNullableDoorLockClusterDlLockDataTypeAttributeCallbackSubscriptionBridge
-    : public MTRNullableDoorLockClusterDlLockDataTypeAttributeCallbackBridge
+class MTRDoorLockClusterDataOperationTypeEnumAttributeCallbackSubscriptionBridge
+    : public MTRDoorLockClusterDataOperationTypeEnumAttributeCallbackBridge
 {
 public:
-    MTRNullableDoorLockClusterDlLockDataTypeAttributeCallbackSubscriptionBridge(
+    MTRDoorLockClusterDataOperationTypeEnumAttributeCallbackSubscriptionBridge(
         dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action,
         MTRSubscriptionEstablishedHandler establishedHandler) :
-        MTRNullableDoorLockClusterDlLockDataTypeAttributeCallbackBridge(queue, handler, action),
-        mEstablishedHandler(establishedHandler)
-    {}
-
-    void OnSubscriptionEstablished();
-    using MTRNullableDoorLockClusterDlLockDataTypeAttributeCallbackBridge::KeepAliveOnCallback;
-    using MTRNullableDoorLockClusterDlLockDataTypeAttributeCallbackBridge::OnDone;
-
-private:
-    MTRSubscriptionEstablishedHandler mEstablishedHandler;
-};
-
-class MTRDoorLockClusterDlLockOperationTypeAttributeCallbackBridge
-    : public MTRCallbackBridge<DoorLockClusterDlLockOperationTypeAttributeCallback>
-{
-public:
-    MTRDoorLockClusterDlLockOperationTypeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) :
-        MTRCallbackBridge<DoorLockClusterDlLockOperationTypeAttributeCallback>(queue, handler, OnSuccessFn){};
-
-    MTRDoorLockClusterDlLockOperationTypeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                 MTRActionBlock action) :
-        MTRCallbackBridge<DoorLockClusterDlLockOperationTypeAttributeCallback>(queue, handler, action, OnSuccessFn){};
-
-    static void OnSuccessFn(void * context, chip::app::Clusters::DoorLock::DlLockOperationType value);
-};
-
-class MTRDoorLockClusterDlLockOperationTypeAttributeCallbackSubscriptionBridge
-    : public MTRDoorLockClusterDlLockOperationTypeAttributeCallbackBridge
-{
-public:
-    MTRDoorLockClusterDlLockOperationTypeAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                             MTRActionBlock action,
-                                                                             MTRSubscriptionEstablishedHandler establishedHandler) :
-        MTRDoorLockClusterDlLockOperationTypeAttributeCallbackBridge(queue, handler, action),
+        MTRDoorLockClusterDataOperationTypeEnumAttributeCallbackBridge(queue, handler, action),
         mEstablishedHandler(establishedHandler)
     {}
 
     void OnSubscriptionEstablished();
-    using MTRDoorLockClusterDlLockOperationTypeAttributeCallbackBridge::KeepAliveOnCallback;
-    using MTRDoorLockClusterDlLockOperationTypeAttributeCallbackBridge::OnDone;
+    using MTRDoorLockClusterDataOperationTypeEnumAttributeCallbackBridge::KeepAliveOnCallback;
+    using MTRDoorLockClusterDataOperationTypeEnumAttributeCallbackBridge::OnDone;
 
 private:
     MTRSubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class MTRNullableDoorLockClusterDlLockOperationTypeAttributeCallbackBridge
-    : public MTRCallbackBridge<NullableDoorLockClusterDlLockOperationTypeAttributeCallback>
+class MTRNullableDoorLockClusterDataOperationTypeEnumAttributeCallbackBridge
+    : public MTRCallbackBridge<NullableDoorLockClusterDataOperationTypeEnumAttributeCallback>
 {
 public:
-    MTRNullableDoorLockClusterDlLockOperationTypeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) :
-        MTRCallbackBridge<NullableDoorLockClusterDlLockOperationTypeAttributeCallback>(queue, handler, OnSuccessFn){};
+    MTRNullableDoorLockClusterDataOperationTypeEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) :
+        MTRCallbackBridge<NullableDoorLockClusterDataOperationTypeEnumAttributeCallback>(queue, handler, OnSuccessFn){};
 
-    MTRNullableDoorLockClusterDlLockOperationTypeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                         MTRActionBlock action) :
-        MTRCallbackBridge<NullableDoorLockClusterDlLockOperationTypeAttributeCallback>(queue, handler, action, OnSuccessFn){};
+    MTRNullableDoorLockClusterDataOperationTypeEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                           MTRActionBlock action) :
+        MTRCallbackBridge<NullableDoorLockClusterDataOperationTypeEnumAttributeCallback>(queue, handler, action, OnSuccessFn){};
 
     static void OnSuccessFn(void * context,
-                            const chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::DlLockOperationType> & value);
+                            const chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::DataOperationTypeEnum> & value);
 };
 
-class MTRNullableDoorLockClusterDlLockOperationTypeAttributeCallbackSubscriptionBridge
-    : public MTRNullableDoorLockClusterDlLockOperationTypeAttributeCallbackBridge
+class MTRNullableDoorLockClusterDataOperationTypeEnumAttributeCallbackSubscriptionBridge
+    : public MTRNullableDoorLockClusterDataOperationTypeEnumAttributeCallbackBridge
 {
 public:
-    MTRNullableDoorLockClusterDlLockOperationTypeAttributeCallbackSubscriptionBridge(
+    MTRNullableDoorLockClusterDataOperationTypeEnumAttributeCallbackSubscriptionBridge(
         dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action,
         MTRSubscriptionEstablishedHandler establishedHandler) :
-        MTRNullableDoorLockClusterDlLockOperationTypeAttributeCallbackBridge(queue, handler, action),
+        MTRNullableDoorLockClusterDataOperationTypeEnumAttributeCallbackBridge(queue, handler, action),
         mEstablishedHandler(establishedHandler)
     {}
 
     void OnSubscriptionEstablished();
-    using MTRNullableDoorLockClusterDlLockOperationTypeAttributeCallbackBridge::KeepAliveOnCallback;
-    using MTRNullableDoorLockClusterDlLockOperationTypeAttributeCallbackBridge::OnDone;
+    using MTRNullableDoorLockClusterDataOperationTypeEnumAttributeCallbackBridge::KeepAliveOnCallback;
+    using MTRNullableDoorLockClusterDataOperationTypeEnumAttributeCallbackBridge::OnDone;
 
 private:
     MTRSubscriptionEstablishedHandler mEstablishedHandler;
@@ -16382,733 +16190,802 @@ class MTRNullableDoorLockClusterDlLockTypeAttributeCallbackSubscriptionBridge
     MTRSubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class MTRDoorLockClusterDlOperatingModeAttributeCallbackBridge
-    : public MTRCallbackBridge<DoorLockClusterDlOperatingModeAttributeCallback>
+class MTRDoorLockClusterDlStatusAttributeCallbackBridge : public MTRCallbackBridge<DoorLockClusterDlStatusAttributeCallback>
 {
 public:
-    MTRDoorLockClusterDlOperatingModeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) :
-        MTRCallbackBridge<DoorLockClusterDlOperatingModeAttributeCallback>(queue, handler, OnSuccessFn){};
+    MTRDoorLockClusterDlStatusAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) :
+        MTRCallbackBridge<DoorLockClusterDlStatusAttributeCallback>(queue, handler, OnSuccessFn){};
 
-    MTRDoorLockClusterDlOperatingModeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                             MTRActionBlock action) :
-        MTRCallbackBridge<DoorLockClusterDlOperatingModeAttributeCallback>(queue, handler, action, OnSuccessFn){};
+    MTRDoorLockClusterDlStatusAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action) :
+        MTRCallbackBridge<DoorLockClusterDlStatusAttributeCallback>(queue, handler, action, OnSuccessFn){};
 
-    static void OnSuccessFn(void * context, chip::app::Clusters::DoorLock::DlOperatingMode value);
+    static void OnSuccessFn(void * context, chip::app::Clusters::DoorLock::DlStatus value);
 };
 
-class MTRDoorLockClusterDlOperatingModeAttributeCallbackSubscriptionBridge
-    : public MTRDoorLockClusterDlOperatingModeAttributeCallbackBridge
+class MTRDoorLockClusterDlStatusAttributeCallbackSubscriptionBridge : public MTRDoorLockClusterDlStatusAttributeCallbackBridge
 {
 public:
-    MTRDoorLockClusterDlOperatingModeAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                         MTRActionBlock action,
-                                                                         MTRSubscriptionEstablishedHandler establishedHandler) :
-        MTRDoorLockClusterDlOperatingModeAttributeCallbackBridge(queue, handler, action),
+    MTRDoorLockClusterDlStatusAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                  MTRActionBlock action,
+                                                                  MTRSubscriptionEstablishedHandler establishedHandler) :
+        MTRDoorLockClusterDlStatusAttributeCallbackBridge(queue, handler, action),
         mEstablishedHandler(establishedHandler)
     {}
 
     void OnSubscriptionEstablished();
-    using MTRDoorLockClusterDlOperatingModeAttributeCallbackBridge::KeepAliveOnCallback;
-    using MTRDoorLockClusterDlOperatingModeAttributeCallbackBridge::OnDone;
+    using MTRDoorLockClusterDlStatusAttributeCallbackBridge::KeepAliveOnCallback;
+    using MTRDoorLockClusterDlStatusAttributeCallbackBridge::OnDone;
 
 private:
     MTRSubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class MTRNullableDoorLockClusterDlOperatingModeAttributeCallbackBridge
-    : public MTRCallbackBridge<NullableDoorLockClusterDlOperatingModeAttributeCallback>
+class MTRNullableDoorLockClusterDlStatusAttributeCallbackBridge
+    : public MTRCallbackBridge<NullableDoorLockClusterDlStatusAttributeCallback>
 {
 public:
-    MTRNullableDoorLockClusterDlOperatingModeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) :
-        MTRCallbackBridge<NullableDoorLockClusterDlOperatingModeAttributeCallback>(queue, handler, OnSuccessFn){};
+    MTRNullableDoorLockClusterDlStatusAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) :
+        MTRCallbackBridge<NullableDoorLockClusterDlStatusAttributeCallback>(queue, handler, OnSuccessFn){};
 
-    MTRNullableDoorLockClusterDlOperatingModeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                     MTRActionBlock action) :
-        MTRCallbackBridge<NullableDoorLockClusterDlOperatingModeAttributeCallback>(queue, handler, action, OnSuccessFn){};
+    MTRNullableDoorLockClusterDlStatusAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                              MTRActionBlock action) :
+        MTRCallbackBridge<NullableDoorLockClusterDlStatusAttributeCallback>(queue, handler, action, OnSuccessFn){};
 
-    static void OnSuccessFn(void * context,
-                            const chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::DlOperatingMode> & value);
+    static void OnSuccessFn(void * context, const chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::DlStatus> & value);
 };
 
-class MTRNullableDoorLockClusterDlOperatingModeAttributeCallbackSubscriptionBridge
-    : public MTRNullableDoorLockClusterDlOperatingModeAttributeCallbackBridge
+class MTRNullableDoorLockClusterDlStatusAttributeCallbackSubscriptionBridge
+    : public MTRNullableDoorLockClusterDlStatusAttributeCallbackBridge
 {
 public:
-    MTRNullableDoorLockClusterDlOperatingModeAttributeCallbackSubscriptionBridge(
-        dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action,
-        MTRSubscriptionEstablishedHandler establishedHandler) :
-        MTRNullableDoorLockClusterDlOperatingModeAttributeCallbackBridge(queue, handler, action),
+    MTRNullableDoorLockClusterDlStatusAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                          MTRActionBlock action,
+                                                                          MTRSubscriptionEstablishedHandler establishedHandler) :
+        MTRNullableDoorLockClusterDlStatusAttributeCallbackBridge(queue, handler, action),
         mEstablishedHandler(establishedHandler)
     {}
 
     void OnSubscriptionEstablished();
-    using MTRNullableDoorLockClusterDlOperatingModeAttributeCallbackBridge::KeepAliveOnCallback;
-    using MTRNullableDoorLockClusterDlOperatingModeAttributeCallbackBridge::OnDone;
+    using MTRNullableDoorLockClusterDlStatusAttributeCallbackBridge::KeepAliveOnCallback;
+    using MTRNullableDoorLockClusterDlStatusAttributeCallbackBridge::OnDone;
 
 private:
     MTRSubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class MTRDoorLockClusterDlOperationErrorAttributeCallbackBridge
-    : public MTRCallbackBridge<DoorLockClusterDlOperationErrorAttributeCallback>
+class MTRDoorLockClusterDoorLockOperationEventCodeAttributeCallbackBridge
+    : public MTRCallbackBridge<DoorLockClusterDoorLockOperationEventCodeAttributeCallback>
 {
 public:
-    MTRDoorLockClusterDlOperationErrorAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) :
-        MTRCallbackBridge<DoorLockClusterDlOperationErrorAttributeCallback>(queue, handler, OnSuccessFn){};
+    MTRDoorLockClusterDoorLockOperationEventCodeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) :
+        MTRCallbackBridge<DoorLockClusterDoorLockOperationEventCodeAttributeCallback>(queue, handler, OnSuccessFn){};
 
-    MTRDoorLockClusterDlOperationErrorAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                              MTRActionBlock action) :
-        MTRCallbackBridge<DoorLockClusterDlOperationErrorAttributeCallback>(queue, handler, action, OnSuccessFn){};
+    MTRDoorLockClusterDoorLockOperationEventCodeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                        MTRActionBlock action) :
+        MTRCallbackBridge<DoorLockClusterDoorLockOperationEventCodeAttributeCallback>(queue, handler, action, OnSuccessFn){};
 
-    static void OnSuccessFn(void * context, chip::app::Clusters::DoorLock::DlOperationError value);
+    static void OnSuccessFn(void * context, chip::app::Clusters::DoorLock::DoorLockOperationEventCode value);
 };
 
-class MTRDoorLockClusterDlOperationErrorAttributeCallbackSubscriptionBridge
-    : public MTRDoorLockClusterDlOperationErrorAttributeCallbackBridge
+class MTRDoorLockClusterDoorLockOperationEventCodeAttributeCallbackSubscriptionBridge
+    : public MTRDoorLockClusterDoorLockOperationEventCodeAttributeCallbackBridge
 {
 public:
-    MTRDoorLockClusterDlOperationErrorAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                          MTRActionBlock action,
-                                                                          MTRSubscriptionEstablishedHandler establishedHandler) :
-        MTRDoorLockClusterDlOperationErrorAttributeCallbackBridge(queue, handler, action),
+    MTRDoorLockClusterDoorLockOperationEventCodeAttributeCallbackSubscriptionBridge(
+        dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action,
+        MTRSubscriptionEstablishedHandler establishedHandler) :
+        MTRDoorLockClusterDoorLockOperationEventCodeAttributeCallbackBridge(queue, handler, action),
         mEstablishedHandler(establishedHandler)
     {}
 
     void OnSubscriptionEstablished();
-    using MTRDoorLockClusterDlOperationErrorAttributeCallbackBridge::KeepAliveOnCallback;
-    using MTRDoorLockClusterDlOperationErrorAttributeCallbackBridge::OnDone;
+    using MTRDoorLockClusterDoorLockOperationEventCodeAttributeCallbackBridge::KeepAliveOnCallback;
+    using MTRDoorLockClusterDoorLockOperationEventCodeAttributeCallbackBridge::OnDone;
 
 private:
     MTRSubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class MTRNullableDoorLockClusterDlOperationErrorAttributeCallbackBridge
-    : public MTRCallbackBridge<NullableDoorLockClusterDlOperationErrorAttributeCallback>
+class MTRNullableDoorLockClusterDoorLockOperationEventCodeAttributeCallbackBridge
+    : public MTRCallbackBridge<NullableDoorLockClusterDoorLockOperationEventCodeAttributeCallback>
 {
 public:
-    MTRNullableDoorLockClusterDlOperationErrorAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) :
-        MTRCallbackBridge<NullableDoorLockClusterDlOperationErrorAttributeCallback>(queue, handler, OnSuccessFn){};
-
-    MTRNullableDoorLockClusterDlOperationErrorAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                      MTRActionBlock action) :
-        MTRCallbackBridge<NullableDoorLockClusterDlOperationErrorAttributeCallback>(queue, handler, action, OnSuccessFn){};
+    MTRNullableDoorLockClusterDoorLockOperationEventCodeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) :
+        MTRCallbackBridge<NullableDoorLockClusterDoorLockOperationEventCodeAttributeCallback>(queue, handler, OnSuccessFn){};
 
-    static void OnSuccessFn(void * context,
-                            const chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::DlOperationError> & value);
+    MTRNullableDoorLockClusterDoorLockOperationEventCodeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                                MTRActionBlock action) :
+        MTRCallbackBridge<NullableDoorLockClusterDoorLockOperationEventCodeAttributeCallback>(queue, handler, action,
+                                                                                              OnSuccessFn){};
+
+    static void
+    OnSuccessFn(void * context,
+                const chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::DoorLockOperationEventCode> & value);
 };
 
-class MTRNullableDoorLockClusterDlOperationErrorAttributeCallbackSubscriptionBridge
-    : public MTRNullableDoorLockClusterDlOperationErrorAttributeCallbackBridge
+class MTRNullableDoorLockClusterDoorLockOperationEventCodeAttributeCallbackSubscriptionBridge
+    : public MTRNullableDoorLockClusterDoorLockOperationEventCodeAttributeCallbackBridge
 {
 public:
-    MTRNullableDoorLockClusterDlOperationErrorAttributeCallbackSubscriptionBridge(
+    MTRNullableDoorLockClusterDoorLockOperationEventCodeAttributeCallbackSubscriptionBridge(
         dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action,
         MTRSubscriptionEstablishedHandler establishedHandler) :
-        MTRNullableDoorLockClusterDlOperationErrorAttributeCallbackBridge(queue, handler, action),
+        MTRNullableDoorLockClusterDoorLockOperationEventCodeAttributeCallbackBridge(queue, handler, action),
         mEstablishedHandler(establishedHandler)
     {}
 
     void OnSubscriptionEstablished();
-    using MTRNullableDoorLockClusterDlOperationErrorAttributeCallbackBridge::KeepAliveOnCallback;
-    using MTRNullableDoorLockClusterDlOperationErrorAttributeCallbackBridge::OnDone;
+    using MTRNullableDoorLockClusterDoorLockOperationEventCodeAttributeCallbackBridge::KeepAliveOnCallback;
+    using MTRNullableDoorLockClusterDoorLockOperationEventCodeAttributeCallbackBridge::OnDone;
 
 private:
     MTRSubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class MTRDoorLockClusterDlOperationSourceAttributeCallbackBridge
-    : public MTRCallbackBridge<DoorLockClusterDlOperationSourceAttributeCallback>
+class MTRDoorLockClusterDoorLockProgrammingEventCodeAttributeCallbackBridge
+    : public MTRCallbackBridge<DoorLockClusterDoorLockProgrammingEventCodeAttributeCallback>
 {
 public:
-    MTRDoorLockClusterDlOperationSourceAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) :
-        MTRCallbackBridge<DoorLockClusterDlOperationSourceAttributeCallback>(queue, handler, OnSuccessFn){};
+    MTRDoorLockClusterDoorLockProgrammingEventCodeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) :
+        MTRCallbackBridge<DoorLockClusterDoorLockProgrammingEventCodeAttributeCallback>(queue, handler, OnSuccessFn){};
 
-    MTRDoorLockClusterDlOperationSourceAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                               MTRActionBlock action) :
-        MTRCallbackBridge<DoorLockClusterDlOperationSourceAttributeCallback>(queue, handler, action, OnSuccessFn){};
+    MTRDoorLockClusterDoorLockProgrammingEventCodeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                          MTRActionBlock action) :
+        MTRCallbackBridge<DoorLockClusterDoorLockProgrammingEventCodeAttributeCallback>(queue, handler, action, OnSuccessFn){};
 
-    static void OnSuccessFn(void * context, chip::app::Clusters::DoorLock::DlOperationSource value);
+    static void OnSuccessFn(void * context, chip::app::Clusters::DoorLock::DoorLockProgrammingEventCode value);
 };
 
-class MTRDoorLockClusterDlOperationSourceAttributeCallbackSubscriptionBridge
-    : public MTRDoorLockClusterDlOperationSourceAttributeCallbackBridge
+class MTRDoorLockClusterDoorLockProgrammingEventCodeAttributeCallbackSubscriptionBridge
+    : public MTRDoorLockClusterDoorLockProgrammingEventCodeAttributeCallbackBridge
 {
 public:
-    MTRDoorLockClusterDlOperationSourceAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                           MTRActionBlock action,
-                                                                           MTRSubscriptionEstablishedHandler establishedHandler) :
-        MTRDoorLockClusterDlOperationSourceAttributeCallbackBridge(queue, handler, action),
+    MTRDoorLockClusterDoorLockProgrammingEventCodeAttributeCallbackSubscriptionBridge(
+        dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action,
+        MTRSubscriptionEstablishedHandler establishedHandler) :
+        MTRDoorLockClusterDoorLockProgrammingEventCodeAttributeCallbackBridge(queue, handler, action),
         mEstablishedHandler(establishedHandler)
     {}
 
     void OnSubscriptionEstablished();
-    using MTRDoorLockClusterDlOperationSourceAttributeCallbackBridge::KeepAliveOnCallback;
-    using MTRDoorLockClusterDlOperationSourceAttributeCallbackBridge::OnDone;
+    using MTRDoorLockClusterDoorLockProgrammingEventCodeAttributeCallbackBridge::KeepAliveOnCallback;
+    using MTRDoorLockClusterDoorLockProgrammingEventCodeAttributeCallbackBridge::OnDone;
 
 private:
     MTRSubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class MTRNullableDoorLockClusterDlOperationSourceAttributeCallbackBridge
-    : public MTRCallbackBridge<NullableDoorLockClusterDlOperationSourceAttributeCallback>
+class MTRNullableDoorLockClusterDoorLockProgrammingEventCodeAttributeCallbackBridge
+    : public MTRCallbackBridge<NullableDoorLockClusterDoorLockProgrammingEventCodeAttributeCallback>
 {
 public:
-    MTRNullableDoorLockClusterDlOperationSourceAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) :
-        MTRCallbackBridge<NullableDoorLockClusterDlOperationSourceAttributeCallback>(queue, handler, OnSuccessFn){};
+    MTRNullableDoorLockClusterDoorLockProgrammingEventCodeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) :
+        MTRCallbackBridge<NullableDoorLockClusterDoorLockProgrammingEventCodeAttributeCallback>(queue, handler, OnSuccessFn){};
 
-    MTRNullableDoorLockClusterDlOperationSourceAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                       MTRActionBlock action) :
-        MTRCallbackBridge<NullableDoorLockClusterDlOperationSourceAttributeCallback>(queue, handler, action, OnSuccessFn){};
+    MTRNullableDoorLockClusterDoorLockProgrammingEventCodeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                                  MTRActionBlock action) :
+        MTRCallbackBridge<NullableDoorLockClusterDoorLockProgrammingEventCodeAttributeCallback>(queue, handler, action,
+                                                                                                OnSuccessFn){};
 
-    static void OnSuccessFn(void * context,
-                            const chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::DlOperationSource> & value);
+    static void
+    OnSuccessFn(void * context,
+                const chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::DoorLockProgrammingEventCode> & value);
 };
 
-class MTRNullableDoorLockClusterDlOperationSourceAttributeCallbackSubscriptionBridge
-    : public MTRNullableDoorLockClusterDlOperationSourceAttributeCallbackBridge
+class MTRNullableDoorLockClusterDoorLockProgrammingEventCodeAttributeCallbackSubscriptionBridge
+    : public MTRNullableDoorLockClusterDoorLockProgrammingEventCodeAttributeCallbackBridge
 {
 public:
-    MTRNullableDoorLockClusterDlOperationSourceAttributeCallbackSubscriptionBridge(
+    MTRNullableDoorLockClusterDoorLockProgrammingEventCodeAttributeCallbackSubscriptionBridge(
         dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action,
         MTRSubscriptionEstablishedHandler establishedHandler) :
-        MTRNullableDoorLockClusterDlOperationSourceAttributeCallbackBridge(queue, handler, action),
+        MTRNullableDoorLockClusterDoorLockProgrammingEventCodeAttributeCallbackBridge(queue, handler, action),
         mEstablishedHandler(establishedHandler)
     {}
 
     void OnSubscriptionEstablished();
-    using MTRNullableDoorLockClusterDlOperationSourceAttributeCallbackBridge::KeepAliveOnCallback;
-    using MTRNullableDoorLockClusterDlOperationSourceAttributeCallbackBridge::OnDone;
+    using MTRNullableDoorLockClusterDoorLockProgrammingEventCodeAttributeCallbackBridge::KeepAliveOnCallback;
+    using MTRNullableDoorLockClusterDoorLockProgrammingEventCodeAttributeCallbackBridge::OnDone;
 
 private:
     MTRSubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class MTRDoorLockClusterDlStatusAttributeCallbackBridge : public MTRCallbackBridge<DoorLockClusterDlStatusAttributeCallback>
+class MTRDoorLockClusterDoorLockSetPinOrIdStatusAttributeCallbackBridge
+    : public MTRCallbackBridge<DoorLockClusterDoorLockSetPinOrIdStatusAttributeCallback>
 {
 public:
-    MTRDoorLockClusterDlStatusAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) :
-        MTRCallbackBridge<DoorLockClusterDlStatusAttributeCallback>(queue, handler, OnSuccessFn){};
+    MTRDoorLockClusterDoorLockSetPinOrIdStatusAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) :
+        MTRCallbackBridge<DoorLockClusterDoorLockSetPinOrIdStatusAttributeCallback>(queue, handler, OnSuccessFn){};
 
-    MTRDoorLockClusterDlStatusAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action) :
-        MTRCallbackBridge<DoorLockClusterDlStatusAttributeCallback>(queue, handler, action, OnSuccessFn){};
+    MTRDoorLockClusterDoorLockSetPinOrIdStatusAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                      MTRActionBlock action) :
+        MTRCallbackBridge<DoorLockClusterDoorLockSetPinOrIdStatusAttributeCallback>(queue, handler, action, OnSuccessFn){};
 
-    static void OnSuccessFn(void * context, chip::app::Clusters::DoorLock::DlStatus value);
+    static void OnSuccessFn(void * context, chip::app::Clusters::DoorLock::DoorLockSetPinOrIdStatus value);
 };
 
-class MTRDoorLockClusterDlStatusAttributeCallbackSubscriptionBridge : public MTRDoorLockClusterDlStatusAttributeCallbackBridge
+class MTRDoorLockClusterDoorLockSetPinOrIdStatusAttributeCallbackSubscriptionBridge
+    : public MTRDoorLockClusterDoorLockSetPinOrIdStatusAttributeCallbackBridge
 {
 public:
-    MTRDoorLockClusterDlStatusAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                  MTRActionBlock action,
-                                                                  MTRSubscriptionEstablishedHandler establishedHandler) :
-        MTRDoorLockClusterDlStatusAttributeCallbackBridge(queue, handler, action),
+    MTRDoorLockClusterDoorLockSetPinOrIdStatusAttributeCallbackSubscriptionBridge(
+        dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action,
+        MTRSubscriptionEstablishedHandler establishedHandler) :
+        MTRDoorLockClusterDoorLockSetPinOrIdStatusAttributeCallbackBridge(queue, handler, action),
         mEstablishedHandler(establishedHandler)
     {}
 
     void OnSubscriptionEstablished();
-    using MTRDoorLockClusterDlStatusAttributeCallbackBridge::KeepAliveOnCallback;
-    using MTRDoorLockClusterDlStatusAttributeCallbackBridge::OnDone;
+    using MTRDoorLockClusterDoorLockSetPinOrIdStatusAttributeCallbackBridge::KeepAliveOnCallback;
+    using MTRDoorLockClusterDoorLockSetPinOrIdStatusAttributeCallbackBridge::OnDone;
 
 private:
     MTRSubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class MTRNullableDoorLockClusterDlStatusAttributeCallbackBridge
-    : public MTRCallbackBridge<NullableDoorLockClusterDlStatusAttributeCallback>
+class MTRNullableDoorLockClusterDoorLockSetPinOrIdStatusAttributeCallbackBridge
+    : public MTRCallbackBridge<NullableDoorLockClusterDoorLockSetPinOrIdStatusAttributeCallback>
 {
 public:
-    MTRNullableDoorLockClusterDlStatusAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) :
-        MTRCallbackBridge<NullableDoorLockClusterDlStatusAttributeCallback>(queue, handler, OnSuccessFn){};
+    MTRNullableDoorLockClusterDoorLockSetPinOrIdStatusAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) :
+        MTRCallbackBridge<NullableDoorLockClusterDoorLockSetPinOrIdStatusAttributeCallback>(queue, handler, OnSuccessFn){};
 
-    MTRNullableDoorLockClusterDlStatusAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                              MTRActionBlock action) :
-        MTRCallbackBridge<NullableDoorLockClusterDlStatusAttributeCallback>(queue, handler, action, OnSuccessFn){};
+    MTRNullableDoorLockClusterDoorLockSetPinOrIdStatusAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                              MTRActionBlock action) :
+        MTRCallbackBridge<NullableDoorLockClusterDoorLockSetPinOrIdStatusAttributeCallback>(queue, handler, action, OnSuccessFn){};
 
-    static void OnSuccessFn(void * context, const chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::DlStatus> & value);
+    static void OnSuccessFn(void * context,
+                            const chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::DoorLockSetPinOrIdStatus> & value);
 };
 
-class MTRNullableDoorLockClusterDlStatusAttributeCallbackSubscriptionBridge
-    : public MTRNullableDoorLockClusterDlStatusAttributeCallbackBridge
+class MTRNullableDoorLockClusterDoorLockSetPinOrIdStatusAttributeCallbackSubscriptionBridge
+    : public MTRNullableDoorLockClusterDoorLockSetPinOrIdStatusAttributeCallbackBridge
 {
 public:
-    MTRNullableDoorLockClusterDlStatusAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                          MTRActionBlock action,
-                                                                          MTRSubscriptionEstablishedHandler establishedHandler) :
-        MTRNullableDoorLockClusterDlStatusAttributeCallbackBridge(queue, handler, action),
+    MTRNullableDoorLockClusterDoorLockSetPinOrIdStatusAttributeCallbackSubscriptionBridge(
+        dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action,
+        MTRSubscriptionEstablishedHandler establishedHandler) :
+        MTRNullableDoorLockClusterDoorLockSetPinOrIdStatusAttributeCallbackBridge(queue, handler, action),
         mEstablishedHandler(establishedHandler)
     {}
 
     void OnSubscriptionEstablished();
-    using MTRNullableDoorLockClusterDlStatusAttributeCallbackBridge::KeepAliveOnCallback;
-    using MTRNullableDoorLockClusterDlStatusAttributeCallbackBridge::OnDone;
+    using MTRNullableDoorLockClusterDoorLockSetPinOrIdStatusAttributeCallbackBridge::KeepAliveOnCallback;
+    using MTRNullableDoorLockClusterDoorLockSetPinOrIdStatusAttributeCallbackBridge::OnDone;
 
 private:
     MTRSubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class MTRDoorLockClusterDlUserStatusAttributeCallbackBridge : public MTRCallbackBridge<DoorLockClusterDlUserStatusAttributeCallback>
+class MTRDoorLockClusterDoorStateEnumAttributeCallbackBridge
+    : public MTRCallbackBridge<DoorLockClusterDoorStateEnumAttributeCallback>
 {
 public:
-    MTRDoorLockClusterDlUserStatusAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) :
-        MTRCallbackBridge<DoorLockClusterDlUserStatusAttributeCallback>(queue, handler, OnSuccessFn){};
+    MTRDoorLockClusterDoorStateEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) :
+        MTRCallbackBridge<DoorLockClusterDoorStateEnumAttributeCallback>(queue, handler, OnSuccessFn){};
 
-    MTRDoorLockClusterDlUserStatusAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action) :
-        MTRCallbackBridge<DoorLockClusterDlUserStatusAttributeCallback>(queue, handler, action, OnSuccessFn){};
+    MTRDoorLockClusterDoorStateEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action) :
+        MTRCallbackBridge<DoorLockClusterDoorStateEnumAttributeCallback>(queue, handler, action, OnSuccessFn){};
 
-    static void OnSuccessFn(void * context, chip::app::Clusters::DoorLock::DlUserStatus value);
+    static void OnSuccessFn(void * context, chip::app::Clusters::DoorLock::DoorStateEnum value);
 };
 
-class MTRDoorLockClusterDlUserStatusAttributeCallbackSubscriptionBridge
-    : public MTRDoorLockClusterDlUserStatusAttributeCallbackBridge
+class MTRDoorLockClusterDoorStateEnumAttributeCallbackSubscriptionBridge
+    : public MTRDoorLockClusterDoorStateEnumAttributeCallbackBridge
 {
 public:
-    MTRDoorLockClusterDlUserStatusAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                      MTRActionBlock action,
-                                                                      MTRSubscriptionEstablishedHandler establishedHandler) :
-        MTRDoorLockClusterDlUserStatusAttributeCallbackBridge(queue, handler, action),
+    MTRDoorLockClusterDoorStateEnumAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                       MTRActionBlock action,
+                                                                       MTRSubscriptionEstablishedHandler establishedHandler) :
+        MTRDoorLockClusterDoorStateEnumAttributeCallbackBridge(queue, handler, action),
         mEstablishedHandler(establishedHandler)
     {}
 
     void OnSubscriptionEstablished();
-    using MTRDoorLockClusterDlUserStatusAttributeCallbackBridge::KeepAliveOnCallback;
-    using MTRDoorLockClusterDlUserStatusAttributeCallbackBridge::OnDone;
+    using MTRDoorLockClusterDoorStateEnumAttributeCallbackBridge::KeepAliveOnCallback;
+    using MTRDoorLockClusterDoorStateEnumAttributeCallbackBridge::OnDone;
 
 private:
     MTRSubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class MTRNullableDoorLockClusterDlUserStatusAttributeCallbackBridge
-    : public MTRCallbackBridge<NullableDoorLockClusterDlUserStatusAttributeCallback>
+class MTRNullableDoorLockClusterDoorStateEnumAttributeCallbackBridge
+    : public MTRCallbackBridge<NullableDoorLockClusterDoorStateEnumAttributeCallback>
 {
 public:
-    MTRNullableDoorLockClusterDlUserStatusAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) :
-        MTRCallbackBridge<NullableDoorLockClusterDlUserStatusAttributeCallback>(queue, handler, OnSuccessFn){};
+    MTRNullableDoorLockClusterDoorStateEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) :
+        MTRCallbackBridge<NullableDoorLockClusterDoorStateEnumAttributeCallback>(queue, handler, OnSuccessFn){};
 
-    MTRNullableDoorLockClusterDlUserStatusAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                  MTRActionBlock action) :
-        MTRCallbackBridge<NullableDoorLockClusterDlUserStatusAttributeCallback>(queue, handler, action, OnSuccessFn){};
+    MTRNullableDoorLockClusterDoorStateEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                   MTRActionBlock action) :
+        MTRCallbackBridge<NullableDoorLockClusterDoorStateEnumAttributeCallback>(queue, handler, action, OnSuccessFn){};
 
     static void OnSuccessFn(void * context,
-                            const chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::DlUserStatus> & value);
+                            const chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::DoorStateEnum> & value);
 };
 
-class MTRNullableDoorLockClusterDlUserStatusAttributeCallbackSubscriptionBridge
-    : public MTRNullableDoorLockClusterDlUserStatusAttributeCallbackBridge
+class MTRNullableDoorLockClusterDoorStateEnumAttributeCallbackSubscriptionBridge
+    : public MTRNullableDoorLockClusterDoorStateEnumAttributeCallbackBridge
 {
 public:
-    MTRNullableDoorLockClusterDlUserStatusAttributeCallbackSubscriptionBridge(
+    MTRNullableDoorLockClusterDoorStateEnumAttributeCallbackSubscriptionBridge(
         dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action,
         MTRSubscriptionEstablishedHandler establishedHandler) :
-        MTRNullableDoorLockClusterDlUserStatusAttributeCallbackBridge(queue, handler, action),
+        MTRNullableDoorLockClusterDoorStateEnumAttributeCallbackBridge(queue, handler, action),
         mEstablishedHandler(establishedHandler)
     {}
 
     void OnSubscriptionEstablished();
-    using MTRNullableDoorLockClusterDlUserStatusAttributeCallbackBridge::KeepAliveOnCallback;
-    using MTRNullableDoorLockClusterDlUserStatusAttributeCallbackBridge::OnDone;
+    using MTRNullableDoorLockClusterDoorStateEnumAttributeCallbackBridge::KeepAliveOnCallback;
+    using MTRNullableDoorLockClusterDoorStateEnumAttributeCallbackBridge::OnDone;
 
 private:
     MTRSubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class MTRDoorLockClusterDlUserTypeAttributeCallbackBridge : public MTRCallbackBridge<DoorLockClusterDlUserTypeAttributeCallback>
+class MTRDoorLockClusterLockDataTypeEnumAttributeCallbackBridge
+    : public MTRCallbackBridge<DoorLockClusterLockDataTypeEnumAttributeCallback>
 {
 public:
-    MTRDoorLockClusterDlUserTypeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) :
-        MTRCallbackBridge<DoorLockClusterDlUserTypeAttributeCallback>(queue, handler, OnSuccessFn){};
+    MTRDoorLockClusterLockDataTypeEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) :
+        MTRCallbackBridge<DoorLockClusterLockDataTypeEnumAttributeCallback>(queue, handler, OnSuccessFn){};
 
-    MTRDoorLockClusterDlUserTypeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action) :
-        MTRCallbackBridge<DoorLockClusterDlUserTypeAttributeCallback>(queue, handler, action, OnSuccessFn){};
+    MTRDoorLockClusterLockDataTypeEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                              MTRActionBlock action) :
+        MTRCallbackBridge<DoorLockClusterLockDataTypeEnumAttributeCallback>(queue, handler, action, OnSuccessFn){};
 
-    static void OnSuccessFn(void * context, chip::app::Clusters::DoorLock::DlUserType value);
+    static void OnSuccessFn(void * context, chip::app::Clusters::DoorLock::LockDataTypeEnum value);
 };
 
-class MTRDoorLockClusterDlUserTypeAttributeCallbackSubscriptionBridge : public MTRDoorLockClusterDlUserTypeAttributeCallbackBridge
+class MTRDoorLockClusterLockDataTypeEnumAttributeCallbackSubscriptionBridge
+    : public MTRDoorLockClusterLockDataTypeEnumAttributeCallbackBridge
 {
 public:
-    MTRDoorLockClusterDlUserTypeAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                    MTRActionBlock action,
-                                                                    MTRSubscriptionEstablishedHandler establishedHandler) :
-        MTRDoorLockClusterDlUserTypeAttributeCallbackBridge(queue, handler, action),
+    MTRDoorLockClusterLockDataTypeEnumAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                          MTRActionBlock action,
+                                                                          MTRSubscriptionEstablishedHandler establishedHandler) :
+        MTRDoorLockClusterLockDataTypeEnumAttributeCallbackBridge(queue, handler, action),
         mEstablishedHandler(establishedHandler)
     {}
 
     void OnSubscriptionEstablished();
-    using MTRDoorLockClusterDlUserTypeAttributeCallbackBridge::KeepAliveOnCallback;
-    using MTRDoorLockClusterDlUserTypeAttributeCallbackBridge::OnDone;
+    using MTRDoorLockClusterLockDataTypeEnumAttributeCallbackBridge::KeepAliveOnCallback;
+    using MTRDoorLockClusterLockDataTypeEnumAttributeCallbackBridge::OnDone;
 
 private:
     MTRSubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class MTRNullableDoorLockClusterDlUserTypeAttributeCallbackBridge
-    : public MTRCallbackBridge<NullableDoorLockClusterDlUserTypeAttributeCallback>
+class MTRNullableDoorLockClusterLockDataTypeEnumAttributeCallbackBridge
+    : public MTRCallbackBridge<NullableDoorLockClusterLockDataTypeEnumAttributeCallback>
 {
 public:
-    MTRNullableDoorLockClusterDlUserTypeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) :
-        MTRCallbackBridge<NullableDoorLockClusterDlUserTypeAttributeCallback>(queue, handler, OnSuccessFn){};
+    MTRNullableDoorLockClusterLockDataTypeEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) :
+        MTRCallbackBridge<NullableDoorLockClusterLockDataTypeEnumAttributeCallback>(queue, handler, OnSuccessFn){};
 
-    MTRNullableDoorLockClusterDlUserTypeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                MTRActionBlock action) :
-        MTRCallbackBridge<NullableDoorLockClusterDlUserTypeAttributeCallback>(queue, handler, action, OnSuccessFn){};
+    MTRNullableDoorLockClusterLockDataTypeEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                      MTRActionBlock action) :
+        MTRCallbackBridge<NullableDoorLockClusterLockDataTypeEnumAttributeCallback>(queue, handler, action, OnSuccessFn){};
 
     static void OnSuccessFn(void * context,
-                            const chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::DlUserType> & value);
+                            const chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::LockDataTypeEnum> & value);
 };
 
-class MTRNullableDoorLockClusterDlUserTypeAttributeCallbackSubscriptionBridge
-    : public MTRNullableDoorLockClusterDlUserTypeAttributeCallbackBridge
+class MTRNullableDoorLockClusterLockDataTypeEnumAttributeCallbackSubscriptionBridge
+    : public MTRNullableDoorLockClusterLockDataTypeEnumAttributeCallbackBridge
 {
 public:
-    MTRNullableDoorLockClusterDlUserTypeAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                            MTRActionBlock action,
-                                                                            MTRSubscriptionEstablishedHandler establishedHandler) :
-        MTRNullableDoorLockClusterDlUserTypeAttributeCallbackBridge(queue, handler, action),
+    MTRNullableDoorLockClusterLockDataTypeEnumAttributeCallbackSubscriptionBridge(
+        dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action,
+        MTRSubscriptionEstablishedHandler establishedHandler) :
+        MTRNullableDoorLockClusterLockDataTypeEnumAttributeCallbackBridge(queue, handler, action),
         mEstablishedHandler(establishedHandler)
     {}
 
     void OnSubscriptionEstablished();
-    using MTRNullableDoorLockClusterDlUserTypeAttributeCallbackBridge::KeepAliveOnCallback;
-    using MTRNullableDoorLockClusterDlUserTypeAttributeCallbackBridge::OnDone;
+    using MTRNullableDoorLockClusterLockDataTypeEnumAttributeCallbackBridge::KeepAliveOnCallback;
+    using MTRNullableDoorLockClusterLockDataTypeEnumAttributeCallbackBridge::OnDone;
 
 private:
     MTRSubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class MTRDoorLockClusterDoorLockOperationEventCodeAttributeCallbackBridge
-    : public MTRCallbackBridge<DoorLockClusterDoorLockOperationEventCodeAttributeCallback>
+class MTRDoorLockClusterLockOperationTypeEnumAttributeCallbackBridge
+    : public MTRCallbackBridge<DoorLockClusterLockOperationTypeEnumAttributeCallback>
 {
 public:
-    MTRDoorLockClusterDoorLockOperationEventCodeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) :
-        MTRCallbackBridge<DoorLockClusterDoorLockOperationEventCodeAttributeCallback>(queue, handler, OnSuccessFn){};
+    MTRDoorLockClusterLockOperationTypeEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) :
+        MTRCallbackBridge<DoorLockClusterLockOperationTypeEnumAttributeCallback>(queue, handler, OnSuccessFn){};
 
-    MTRDoorLockClusterDoorLockOperationEventCodeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                        MTRActionBlock action) :
-        MTRCallbackBridge<DoorLockClusterDoorLockOperationEventCodeAttributeCallback>(queue, handler, action, OnSuccessFn){};
+    MTRDoorLockClusterLockOperationTypeEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                   MTRActionBlock action) :
+        MTRCallbackBridge<DoorLockClusterLockOperationTypeEnumAttributeCallback>(queue, handler, action, OnSuccessFn){};
 
-    static void OnSuccessFn(void * context, chip::app::Clusters::DoorLock::DoorLockOperationEventCode value);
+    static void OnSuccessFn(void * context, chip::app::Clusters::DoorLock::LockOperationTypeEnum value);
 };
 
-class MTRDoorLockClusterDoorLockOperationEventCodeAttributeCallbackSubscriptionBridge
-    : public MTRDoorLockClusterDoorLockOperationEventCodeAttributeCallbackBridge
+class MTRDoorLockClusterLockOperationTypeEnumAttributeCallbackSubscriptionBridge
+    : public MTRDoorLockClusterLockOperationTypeEnumAttributeCallbackBridge
 {
 public:
-    MTRDoorLockClusterDoorLockOperationEventCodeAttributeCallbackSubscriptionBridge(
+    MTRDoorLockClusterLockOperationTypeEnumAttributeCallbackSubscriptionBridge(
         dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action,
         MTRSubscriptionEstablishedHandler establishedHandler) :
-        MTRDoorLockClusterDoorLockOperationEventCodeAttributeCallbackBridge(queue, handler, action),
+        MTRDoorLockClusterLockOperationTypeEnumAttributeCallbackBridge(queue, handler, action),
         mEstablishedHandler(establishedHandler)
     {}
 
     void OnSubscriptionEstablished();
-    using MTRDoorLockClusterDoorLockOperationEventCodeAttributeCallbackBridge::KeepAliveOnCallback;
-    using MTRDoorLockClusterDoorLockOperationEventCodeAttributeCallbackBridge::OnDone;
+    using MTRDoorLockClusterLockOperationTypeEnumAttributeCallbackBridge::KeepAliveOnCallback;
+    using MTRDoorLockClusterLockOperationTypeEnumAttributeCallbackBridge::OnDone;
 
 private:
     MTRSubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class MTRNullableDoorLockClusterDoorLockOperationEventCodeAttributeCallbackBridge
-    : public MTRCallbackBridge<NullableDoorLockClusterDoorLockOperationEventCodeAttributeCallback>
+class MTRNullableDoorLockClusterLockOperationTypeEnumAttributeCallbackBridge
+    : public MTRCallbackBridge<NullableDoorLockClusterLockOperationTypeEnumAttributeCallback>
 {
 public:
-    MTRNullableDoorLockClusterDoorLockOperationEventCodeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) :
-        MTRCallbackBridge<NullableDoorLockClusterDoorLockOperationEventCodeAttributeCallback>(queue, handler, OnSuccessFn){};
+    MTRNullableDoorLockClusterLockOperationTypeEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) :
+        MTRCallbackBridge<NullableDoorLockClusterLockOperationTypeEnumAttributeCallback>(queue, handler, OnSuccessFn){};
 
-    MTRNullableDoorLockClusterDoorLockOperationEventCodeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                                MTRActionBlock action) :
-        MTRCallbackBridge<NullableDoorLockClusterDoorLockOperationEventCodeAttributeCallback>(queue, handler, action,
-                                                                                              OnSuccessFn){};
+    MTRNullableDoorLockClusterLockOperationTypeEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                           MTRActionBlock action) :
+        MTRCallbackBridge<NullableDoorLockClusterLockOperationTypeEnumAttributeCallback>(queue, handler, action, OnSuccessFn){};
 
-    static void
-    OnSuccessFn(void * context,
-                const chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::DoorLockOperationEventCode> & value);
+    static void OnSuccessFn(void * context,
+                            const chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::LockOperationTypeEnum> & value);
 };
 
-class MTRNullableDoorLockClusterDoorLockOperationEventCodeAttributeCallbackSubscriptionBridge
-    : public MTRNullableDoorLockClusterDoorLockOperationEventCodeAttributeCallbackBridge
+class MTRNullableDoorLockClusterLockOperationTypeEnumAttributeCallbackSubscriptionBridge
+    : public MTRNullableDoorLockClusterLockOperationTypeEnumAttributeCallbackBridge
 {
 public:
-    MTRNullableDoorLockClusterDoorLockOperationEventCodeAttributeCallbackSubscriptionBridge(
+    MTRNullableDoorLockClusterLockOperationTypeEnumAttributeCallbackSubscriptionBridge(
         dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action,
         MTRSubscriptionEstablishedHandler establishedHandler) :
-        MTRNullableDoorLockClusterDoorLockOperationEventCodeAttributeCallbackBridge(queue, handler, action),
+        MTRNullableDoorLockClusterLockOperationTypeEnumAttributeCallbackBridge(queue, handler, action),
         mEstablishedHandler(establishedHandler)
     {}
 
     void OnSubscriptionEstablished();
-    using MTRNullableDoorLockClusterDoorLockOperationEventCodeAttributeCallbackBridge::KeepAliveOnCallback;
-    using MTRNullableDoorLockClusterDoorLockOperationEventCodeAttributeCallbackBridge::OnDone;
+    using MTRNullableDoorLockClusterLockOperationTypeEnumAttributeCallbackBridge::KeepAliveOnCallback;
+    using MTRNullableDoorLockClusterLockOperationTypeEnumAttributeCallbackBridge::OnDone;
 
 private:
     MTRSubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class MTRDoorLockClusterDoorLockProgrammingEventCodeAttributeCallbackBridge
-    : public MTRCallbackBridge<DoorLockClusterDoorLockProgrammingEventCodeAttributeCallback>
+class MTRDoorLockClusterOperatingModeEnumAttributeCallbackBridge
+    : public MTRCallbackBridge<DoorLockClusterOperatingModeEnumAttributeCallback>
 {
 public:
-    MTRDoorLockClusterDoorLockProgrammingEventCodeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) :
-        MTRCallbackBridge<DoorLockClusterDoorLockProgrammingEventCodeAttributeCallback>(queue, handler, OnSuccessFn){};
+    MTRDoorLockClusterOperatingModeEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) :
+        MTRCallbackBridge<DoorLockClusterOperatingModeEnumAttributeCallback>(queue, handler, OnSuccessFn){};
 
-    MTRDoorLockClusterDoorLockProgrammingEventCodeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                          MTRActionBlock action) :
-        MTRCallbackBridge<DoorLockClusterDoorLockProgrammingEventCodeAttributeCallback>(queue, handler, action, OnSuccessFn){};
+    MTRDoorLockClusterOperatingModeEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                               MTRActionBlock action) :
+        MTRCallbackBridge<DoorLockClusterOperatingModeEnumAttributeCallback>(queue, handler, action, OnSuccessFn){};
 
-    static void OnSuccessFn(void * context, chip::app::Clusters::DoorLock::DoorLockProgrammingEventCode value);
+    static void OnSuccessFn(void * context, chip::app::Clusters::DoorLock::OperatingModeEnum value);
 };
 
-class MTRDoorLockClusterDoorLockProgrammingEventCodeAttributeCallbackSubscriptionBridge
-    : public MTRDoorLockClusterDoorLockProgrammingEventCodeAttributeCallbackBridge
+class MTRDoorLockClusterOperatingModeEnumAttributeCallbackSubscriptionBridge
+    : public MTRDoorLockClusterOperatingModeEnumAttributeCallbackBridge
 {
 public:
-    MTRDoorLockClusterDoorLockProgrammingEventCodeAttributeCallbackSubscriptionBridge(
-        dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action,
-        MTRSubscriptionEstablishedHandler establishedHandler) :
-        MTRDoorLockClusterDoorLockProgrammingEventCodeAttributeCallbackBridge(queue, handler, action),
+    MTRDoorLockClusterOperatingModeEnumAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                           MTRActionBlock action,
+                                                                           MTRSubscriptionEstablishedHandler establishedHandler) :
+        MTRDoorLockClusterOperatingModeEnumAttributeCallbackBridge(queue, handler, action),
         mEstablishedHandler(establishedHandler)
     {}
 
     void OnSubscriptionEstablished();
-    using MTRDoorLockClusterDoorLockProgrammingEventCodeAttributeCallbackBridge::KeepAliveOnCallback;
-    using MTRDoorLockClusterDoorLockProgrammingEventCodeAttributeCallbackBridge::OnDone;
+    using MTRDoorLockClusterOperatingModeEnumAttributeCallbackBridge::KeepAliveOnCallback;
+    using MTRDoorLockClusterOperatingModeEnumAttributeCallbackBridge::OnDone;
 
 private:
     MTRSubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class MTRNullableDoorLockClusterDoorLockProgrammingEventCodeAttributeCallbackBridge
-    : public MTRCallbackBridge<NullableDoorLockClusterDoorLockProgrammingEventCodeAttributeCallback>
+class MTRNullableDoorLockClusterOperatingModeEnumAttributeCallbackBridge
+    : public MTRCallbackBridge<NullableDoorLockClusterOperatingModeEnumAttributeCallback>
 {
 public:
-    MTRNullableDoorLockClusterDoorLockProgrammingEventCodeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) :
-        MTRCallbackBridge<NullableDoorLockClusterDoorLockProgrammingEventCodeAttributeCallback>(queue, handler, OnSuccessFn){};
+    MTRNullableDoorLockClusterOperatingModeEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) :
+        MTRCallbackBridge<NullableDoorLockClusterOperatingModeEnumAttributeCallback>(queue, handler, OnSuccessFn){};
 
-    MTRNullableDoorLockClusterDoorLockProgrammingEventCodeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                                  MTRActionBlock action) :
-        MTRCallbackBridge<NullableDoorLockClusterDoorLockProgrammingEventCodeAttributeCallback>(queue, handler, action,
-                                                                                                OnSuccessFn){};
+    MTRNullableDoorLockClusterOperatingModeEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                       MTRActionBlock action) :
+        MTRCallbackBridge<NullableDoorLockClusterOperatingModeEnumAttributeCallback>(queue, handler, action, OnSuccessFn){};
 
-    static void
-    OnSuccessFn(void * context,
-                const chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::DoorLockProgrammingEventCode> & value);
+    static void OnSuccessFn(void * context,
+                            const chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::OperatingModeEnum> & value);
 };
 
-class MTRNullableDoorLockClusterDoorLockProgrammingEventCodeAttributeCallbackSubscriptionBridge
-    : public MTRNullableDoorLockClusterDoorLockProgrammingEventCodeAttributeCallbackBridge
+class MTRNullableDoorLockClusterOperatingModeEnumAttributeCallbackSubscriptionBridge
+    : public MTRNullableDoorLockClusterOperatingModeEnumAttributeCallbackBridge
 {
 public:
-    MTRNullableDoorLockClusterDoorLockProgrammingEventCodeAttributeCallbackSubscriptionBridge(
+    MTRNullableDoorLockClusterOperatingModeEnumAttributeCallbackSubscriptionBridge(
         dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action,
         MTRSubscriptionEstablishedHandler establishedHandler) :
-        MTRNullableDoorLockClusterDoorLockProgrammingEventCodeAttributeCallbackBridge(queue, handler, action),
+        MTRNullableDoorLockClusterOperatingModeEnumAttributeCallbackBridge(queue, handler, action),
         mEstablishedHandler(establishedHandler)
     {}
 
     void OnSubscriptionEstablished();
-    using MTRNullableDoorLockClusterDoorLockProgrammingEventCodeAttributeCallbackBridge::KeepAliveOnCallback;
-    using MTRNullableDoorLockClusterDoorLockProgrammingEventCodeAttributeCallbackBridge::OnDone;
+    using MTRNullableDoorLockClusterOperatingModeEnumAttributeCallbackBridge::KeepAliveOnCallback;
+    using MTRNullableDoorLockClusterOperatingModeEnumAttributeCallbackBridge::OnDone;
 
 private:
     MTRSubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class MTRDoorLockClusterDoorLockSetPinOrIdStatusAttributeCallbackBridge
-    : public MTRCallbackBridge<DoorLockClusterDoorLockSetPinOrIdStatusAttributeCallback>
+class MTRDoorLockClusterOperationErrorEnumAttributeCallbackBridge
+    : public MTRCallbackBridge<DoorLockClusterOperationErrorEnumAttributeCallback>
 {
 public:
-    MTRDoorLockClusterDoorLockSetPinOrIdStatusAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) :
-        MTRCallbackBridge<DoorLockClusterDoorLockSetPinOrIdStatusAttributeCallback>(queue, handler, OnSuccessFn){};
+    MTRDoorLockClusterOperationErrorEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) :
+        MTRCallbackBridge<DoorLockClusterOperationErrorEnumAttributeCallback>(queue, handler, OnSuccessFn){};
 
-    MTRDoorLockClusterDoorLockSetPinOrIdStatusAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                      MTRActionBlock action) :
-        MTRCallbackBridge<DoorLockClusterDoorLockSetPinOrIdStatusAttributeCallback>(queue, handler, action, OnSuccessFn){};
+    MTRDoorLockClusterOperationErrorEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                MTRActionBlock action) :
+        MTRCallbackBridge<DoorLockClusterOperationErrorEnumAttributeCallback>(queue, handler, action, OnSuccessFn){};
 
-    static void OnSuccessFn(void * context, chip::app::Clusters::DoorLock::DoorLockSetPinOrIdStatus value);
+    static void OnSuccessFn(void * context, chip::app::Clusters::DoorLock::OperationErrorEnum value);
 };
 
-class MTRDoorLockClusterDoorLockSetPinOrIdStatusAttributeCallbackSubscriptionBridge
-    : public MTRDoorLockClusterDoorLockSetPinOrIdStatusAttributeCallbackBridge
+class MTRDoorLockClusterOperationErrorEnumAttributeCallbackSubscriptionBridge
+    : public MTRDoorLockClusterOperationErrorEnumAttributeCallbackBridge
 {
 public:
-    MTRDoorLockClusterDoorLockSetPinOrIdStatusAttributeCallbackSubscriptionBridge(
+    MTRDoorLockClusterOperationErrorEnumAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                            MTRActionBlock action,
+                                                                            MTRSubscriptionEstablishedHandler establishedHandler) :
+        MTRDoorLockClusterOperationErrorEnumAttributeCallbackBridge(queue, handler, action),
+        mEstablishedHandler(establishedHandler)
+    {}
+
+    void OnSubscriptionEstablished();
+    using MTRDoorLockClusterOperationErrorEnumAttributeCallbackBridge::KeepAliveOnCallback;
+    using MTRDoorLockClusterOperationErrorEnumAttributeCallbackBridge::OnDone;
+
+private:
+    MTRSubscriptionEstablishedHandler mEstablishedHandler;
+};
+
+class MTRNullableDoorLockClusterOperationErrorEnumAttributeCallbackBridge
+    : public MTRCallbackBridge<NullableDoorLockClusterOperationErrorEnumAttributeCallback>
+{
+public:
+    MTRNullableDoorLockClusterOperationErrorEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) :
+        MTRCallbackBridge<NullableDoorLockClusterOperationErrorEnumAttributeCallback>(queue, handler, OnSuccessFn){};
+
+    MTRNullableDoorLockClusterOperationErrorEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                        MTRActionBlock action) :
+        MTRCallbackBridge<NullableDoorLockClusterOperationErrorEnumAttributeCallback>(queue, handler, action, OnSuccessFn){};
+
+    static void OnSuccessFn(void * context,
+                            const chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::OperationErrorEnum> & value);
+};
+
+class MTRNullableDoorLockClusterOperationErrorEnumAttributeCallbackSubscriptionBridge
+    : public MTRNullableDoorLockClusterOperationErrorEnumAttributeCallbackBridge
+{
+public:
+    MTRNullableDoorLockClusterOperationErrorEnumAttributeCallbackSubscriptionBridge(
         dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action,
         MTRSubscriptionEstablishedHandler establishedHandler) :
-        MTRDoorLockClusterDoorLockSetPinOrIdStatusAttributeCallbackBridge(queue, handler, action),
+        MTRNullableDoorLockClusterOperationErrorEnumAttributeCallbackBridge(queue, handler, action),
         mEstablishedHandler(establishedHandler)
     {}
 
     void OnSubscriptionEstablished();
-    using MTRDoorLockClusterDoorLockSetPinOrIdStatusAttributeCallbackBridge::KeepAliveOnCallback;
-    using MTRDoorLockClusterDoorLockSetPinOrIdStatusAttributeCallbackBridge::OnDone;
+    using MTRNullableDoorLockClusterOperationErrorEnumAttributeCallbackBridge::KeepAliveOnCallback;
+    using MTRNullableDoorLockClusterOperationErrorEnumAttributeCallbackBridge::OnDone;
 
 private:
     MTRSubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class MTRNullableDoorLockClusterDoorLockSetPinOrIdStatusAttributeCallbackBridge
-    : public MTRCallbackBridge<NullableDoorLockClusterDoorLockSetPinOrIdStatusAttributeCallback>
+class MTRDoorLockClusterOperationSourceEnumAttributeCallbackBridge
+    : public MTRCallbackBridge<DoorLockClusterOperationSourceEnumAttributeCallback>
 {
 public:
-    MTRNullableDoorLockClusterDoorLockSetPinOrIdStatusAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) :
-        MTRCallbackBridge<NullableDoorLockClusterDoorLockSetPinOrIdStatusAttributeCallback>(queue, handler, OnSuccessFn){};
+    MTRDoorLockClusterOperationSourceEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) :
+        MTRCallbackBridge<DoorLockClusterOperationSourceEnumAttributeCallback>(queue, handler, OnSuccessFn){};
 
-    MTRNullableDoorLockClusterDoorLockSetPinOrIdStatusAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                              MTRActionBlock action) :
-        MTRCallbackBridge<NullableDoorLockClusterDoorLockSetPinOrIdStatusAttributeCallback>(queue, handler, action, OnSuccessFn){};
+    MTRDoorLockClusterOperationSourceEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                 MTRActionBlock action) :
+        MTRCallbackBridge<DoorLockClusterOperationSourceEnumAttributeCallback>(queue, handler, action, OnSuccessFn){};
+
+    static void OnSuccessFn(void * context, chip::app::Clusters::DoorLock::OperationSourceEnum value);
+};
+
+class MTRDoorLockClusterOperationSourceEnumAttributeCallbackSubscriptionBridge
+    : public MTRDoorLockClusterOperationSourceEnumAttributeCallbackBridge
+{
+public:
+    MTRDoorLockClusterOperationSourceEnumAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                             MTRActionBlock action,
+                                                                             MTRSubscriptionEstablishedHandler establishedHandler) :
+        MTRDoorLockClusterOperationSourceEnumAttributeCallbackBridge(queue, handler, action),
+        mEstablishedHandler(establishedHandler)
+    {}
+
+    void OnSubscriptionEstablished();
+    using MTRDoorLockClusterOperationSourceEnumAttributeCallbackBridge::KeepAliveOnCallback;
+    using MTRDoorLockClusterOperationSourceEnumAttributeCallbackBridge::OnDone;
+
+private:
+    MTRSubscriptionEstablishedHandler mEstablishedHandler;
+};
+
+class MTRNullableDoorLockClusterOperationSourceEnumAttributeCallbackBridge
+    : public MTRCallbackBridge<NullableDoorLockClusterOperationSourceEnumAttributeCallback>
+{
+public:
+    MTRNullableDoorLockClusterOperationSourceEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) :
+        MTRCallbackBridge<NullableDoorLockClusterOperationSourceEnumAttributeCallback>(queue, handler, OnSuccessFn){};
+
+    MTRNullableDoorLockClusterOperationSourceEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                         MTRActionBlock action) :
+        MTRCallbackBridge<NullableDoorLockClusterOperationSourceEnumAttributeCallback>(queue, handler, action, OnSuccessFn){};
 
     static void OnSuccessFn(void * context,
-                            const chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::DoorLockSetPinOrIdStatus> & value);
+                            const chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::OperationSourceEnum> & value);
 };
 
-class MTRNullableDoorLockClusterDoorLockSetPinOrIdStatusAttributeCallbackSubscriptionBridge
-    : public MTRNullableDoorLockClusterDoorLockSetPinOrIdStatusAttributeCallbackBridge
+class MTRNullableDoorLockClusterOperationSourceEnumAttributeCallbackSubscriptionBridge
+    : public MTRNullableDoorLockClusterOperationSourceEnumAttributeCallbackBridge
 {
 public:
-    MTRNullableDoorLockClusterDoorLockSetPinOrIdStatusAttributeCallbackSubscriptionBridge(
+    MTRNullableDoorLockClusterOperationSourceEnumAttributeCallbackSubscriptionBridge(
         dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action,
         MTRSubscriptionEstablishedHandler establishedHandler) :
-        MTRNullableDoorLockClusterDoorLockSetPinOrIdStatusAttributeCallbackBridge(queue, handler, action),
+        MTRNullableDoorLockClusterOperationSourceEnumAttributeCallbackBridge(queue, handler, action),
         mEstablishedHandler(establishedHandler)
     {}
 
     void OnSubscriptionEstablished();
-    using MTRNullableDoorLockClusterDoorLockSetPinOrIdStatusAttributeCallbackBridge::KeepAliveOnCallback;
-    using MTRNullableDoorLockClusterDoorLockSetPinOrIdStatusAttributeCallbackBridge::OnDone;
+    using MTRNullableDoorLockClusterOperationSourceEnumAttributeCallbackBridge::KeepAliveOnCallback;
+    using MTRNullableDoorLockClusterOperationSourceEnumAttributeCallbackBridge::OnDone;
 
 private:
     MTRSubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class MTRDoorLockClusterDoorLockUserStatusAttributeCallbackBridge
-    : public MTRCallbackBridge<DoorLockClusterDoorLockUserStatusAttributeCallback>
+class MTRDoorLockClusterUserStatusEnumAttributeCallbackBridge
+    : public MTRCallbackBridge<DoorLockClusterUserStatusEnumAttributeCallback>
 {
 public:
-    MTRDoorLockClusterDoorLockUserStatusAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) :
-        MTRCallbackBridge<DoorLockClusterDoorLockUserStatusAttributeCallback>(queue, handler, OnSuccessFn){};
+    MTRDoorLockClusterUserStatusEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) :
+        MTRCallbackBridge<DoorLockClusterUserStatusEnumAttributeCallback>(queue, handler, OnSuccessFn){};
 
-    MTRDoorLockClusterDoorLockUserStatusAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                MTRActionBlock action) :
-        MTRCallbackBridge<DoorLockClusterDoorLockUserStatusAttributeCallback>(queue, handler, action, OnSuccessFn){};
+    MTRDoorLockClusterUserStatusEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                            MTRActionBlock action) :
+        MTRCallbackBridge<DoorLockClusterUserStatusEnumAttributeCallback>(queue, handler, action, OnSuccessFn){};
 
-    static void OnSuccessFn(void * context, chip::app::Clusters::DoorLock::DoorLockUserStatus value);
+    static void OnSuccessFn(void * context, chip::app::Clusters::DoorLock::UserStatusEnum value);
 };
 
-class MTRDoorLockClusterDoorLockUserStatusAttributeCallbackSubscriptionBridge
-    : public MTRDoorLockClusterDoorLockUserStatusAttributeCallbackBridge
+class MTRDoorLockClusterUserStatusEnumAttributeCallbackSubscriptionBridge
+    : public MTRDoorLockClusterUserStatusEnumAttributeCallbackBridge
 {
 public:
-    MTRDoorLockClusterDoorLockUserStatusAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                            MTRActionBlock action,
-                                                                            MTRSubscriptionEstablishedHandler establishedHandler) :
-        MTRDoorLockClusterDoorLockUserStatusAttributeCallbackBridge(queue, handler, action),
+    MTRDoorLockClusterUserStatusEnumAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                        MTRActionBlock action,
+                                                                        MTRSubscriptionEstablishedHandler establishedHandler) :
+        MTRDoorLockClusterUserStatusEnumAttributeCallbackBridge(queue, handler, action),
         mEstablishedHandler(establishedHandler)
     {}
 
     void OnSubscriptionEstablished();
-    using MTRDoorLockClusterDoorLockUserStatusAttributeCallbackBridge::KeepAliveOnCallback;
-    using MTRDoorLockClusterDoorLockUserStatusAttributeCallbackBridge::OnDone;
+    using MTRDoorLockClusterUserStatusEnumAttributeCallbackBridge::KeepAliveOnCallback;
+    using MTRDoorLockClusterUserStatusEnumAttributeCallbackBridge::OnDone;
 
 private:
     MTRSubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class MTRNullableDoorLockClusterDoorLockUserStatusAttributeCallbackBridge
-    : public MTRCallbackBridge<NullableDoorLockClusterDoorLockUserStatusAttributeCallback>
+class MTRNullableDoorLockClusterUserStatusEnumAttributeCallbackBridge
+    : public MTRCallbackBridge<NullableDoorLockClusterUserStatusEnumAttributeCallback>
 {
 public:
-    MTRNullableDoorLockClusterDoorLockUserStatusAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) :
-        MTRCallbackBridge<NullableDoorLockClusterDoorLockUserStatusAttributeCallback>(queue, handler, OnSuccessFn){};
+    MTRNullableDoorLockClusterUserStatusEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) :
+        MTRCallbackBridge<NullableDoorLockClusterUserStatusEnumAttributeCallback>(queue, handler, OnSuccessFn){};
 
-    MTRNullableDoorLockClusterDoorLockUserStatusAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                        MTRActionBlock action) :
-        MTRCallbackBridge<NullableDoorLockClusterDoorLockUserStatusAttributeCallback>(queue, handler, action, OnSuccessFn){};
+    MTRNullableDoorLockClusterUserStatusEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                    MTRActionBlock action) :
+        MTRCallbackBridge<NullableDoorLockClusterUserStatusEnumAttributeCallback>(queue, handler, action, OnSuccessFn){};
 
     static void OnSuccessFn(void * context,
-                            const chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::DoorLockUserStatus> & value);
+                            const chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::UserStatusEnum> & value);
 };
 
-class MTRNullableDoorLockClusterDoorLockUserStatusAttributeCallbackSubscriptionBridge
-    : public MTRNullableDoorLockClusterDoorLockUserStatusAttributeCallbackBridge
+class MTRNullableDoorLockClusterUserStatusEnumAttributeCallbackSubscriptionBridge
+    : public MTRNullableDoorLockClusterUserStatusEnumAttributeCallbackBridge
 {
 public:
-    MTRNullableDoorLockClusterDoorLockUserStatusAttributeCallbackSubscriptionBridge(
+    MTRNullableDoorLockClusterUserStatusEnumAttributeCallbackSubscriptionBridge(
         dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action,
         MTRSubscriptionEstablishedHandler establishedHandler) :
-        MTRNullableDoorLockClusterDoorLockUserStatusAttributeCallbackBridge(queue, handler, action),
+        MTRNullableDoorLockClusterUserStatusEnumAttributeCallbackBridge(queue, handler, action),
         mEstablishedHandler(establishedHandler)
     {}
 
     void OnSubscriptionEstablished();
-    using MTRNullableDoorLockClusterDoorLockUserStatusAttributeCallbackBridge::KeepAliveOnCallback;
-    using MTRNullableDoorLockClusterDoorLockUserStatusAttributeCallbackBridge::OnDone;
+    using MTRNullableDoorLockClusterUserStatusEnumAttributeCallbackBridge::KeepAliveOnCallback;
+    using MTRNullableDoorLockClusterUserStatusEnumAttributeCallbackBridge::OnDone;
 
 private:
     MTRSubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class MTRDoorLockClusterDoorLockUserTypeAttributeCallbackBridge
-    : public MTRCallbackBridge<DoorLockClusterDoorLockUserTypeAttributeCallback>
+class MTRDoorLockClusterUserTypeEnumAttributeCallbackBridge : public MTRCallbackBridge<DoorLockClusterUserTypeEnumAttributeCallback>
 {
 public:
-    MTRDoorLockClusterDoorLockUserTypeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) :
-        MTRCallbackBridge<DoorLockClusterDoorLockUserTypeAttributeCallback>(queue, handler, OnSuccessFn){};
+    MTRDoorLockClusterUserTypeEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) :
+        MTRCallbackBridge<DoorLockClusterUserTypeEnumAttributeCallback>(queue, handler, OnSuccessFn){};
 
-    MTRDoorLockClusterDoorLockUserTypeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                              MTRActionBlock action) :
-        MTRCallbackBridge<DoorLockClusterDoorLockUserTypeAttributeCallback>(queue, handler, action, OnSuccessFn){};
+    MTRDoorLockClusterUserTypeEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action) :
+        MTRCallbackBridge<DoorLockClusterUserTypeEnumAttributeCallback>(queue, handler, action, OnSuccessFn){};
 
-    static void OnSuccessFn(void * context, chip::app::Clusters::DoorLock::DoorLockUserType value);
+    static void OnSuccessFn(void * context, chip::app::Clusters::DoorLock::UserTypeEnum value);
 };
 
-class MTRDoorLockClusterDoorLockUserTypeAttributeCallbackSubscriptionBridge
-    : public MTRDoorLockClusterDoorLockUserTypeAttributeCallbackBridge
+class MTRDoorLockClusterUserTypeEnumAttributeCallbackSubscriptionBridge
+    : public MTRDoorLockClusterUserTypeEnumAttributeCallbackBridge
 {
 public:
-    MTRDoorLockClusterDoorLockUserTypeAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                          MTRActionBlock action,
-                                                                          MTRSubscriptionEstablishedHandler establishedHandler) :
-        MTRDoorLockClusterDoorLockUserTypeAttributeCallbackBridge(queue, handler, action),
+    MTRDoorLockClusterUserTypeEnumAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                      MTRActionBlock action,
+                                                                      MTRSubscriptionEstablishedHandler establishedHandler) :
+        MTRDoorLockClusterUserTypeEnumAttributeCallbackBridge(queue, handler, action),
         mEstablishedHandler(establishedHandler)
     {}
 
     void OnSubscriptionEstablished();
-    using MTRDoorLockClusterDoorLockUserTypeAttributeCallbackBridge::KeepAliveOnCallback;
-    using MTRDoorLockClusterDoorLockUserTypeAttributeCallbackBridge::OnDone;
+    using MTRDoorLockClusterUserTypeEnumAttributeCallbackBridge::KeepAliveOnCallback;
+    using MTRDoorLockClusterUserTypeEnumAttributeCallbackBridge::OnDone;
 
 private:
     MTRSubscriptionEstablishedHandler mEstablishedHandler;
 };
 
-class MTRNullableDoorLockClusterDoorLockUserTypeAttributeCallbackBridge
-    : public MTRCallbackBridge<NullableDoorLockClusterDoorLockUserTypeAttributeCallback>
+class MTRNullableDoorLockClusterUserTypeEnumAttributeCallbackBridge
+    : public MTRCallbackBridge<NullableDoorLockClusterUserTypeEnumAttributeCallback>
 {
 public:
-    MTRNullableDoorLockClusterDoorLockUserTypeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) :
-        MTRCallbackBridge<NullableDoorLockClusterDoorLockUserTypeAttributeCallback>(queue, handler, OnSuccessFn){};
+    MTRNullableDoorLockClusterUserTypeEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) :
+        MTRCallbackBridge<NullableDoorLockClusterUserTypeEnumAttributeCallback>(queue, handler, OnSuccessFn){};
 
-    MTRNullableDoorLockClusterDoorLockUserTypeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
-                                                                      MTRActionBlock action) :
-        MTRCallbackBridge<NullableDoorLockClusterDoorLockUserTypeAttributeCallback>(queue, handler, action, OnSuccessFn){};
+    MTRNullableDoorLockClusterUserTypeEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler,
+                                                                  MTRActionBlock action) :
+        MTRCallbackBridge<NullableDoorLockClusterUserTypeEnumAttributeCallback>(queue, handler, action, OnSuccessFn){};
 
     static void OnSuccessFn(void * context,
-                            const chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::DoorLockUserType> & value);
+                            const chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::UserTypeEnum> & value);
 };
 
-class MTRNullableDoorLockClusterDoorLockUserTypeAttributeCallbackSubscriptionBridge
-    : public MTRNullableDoorLockClusterDoorLockUserTypeAttributeCallbackBridge
+class MTRNullableDoorLockClusterUserTypeEnumAttributeCallbackSubscriptionBridge
+    : public MTRNullableDoorLockClusterUserTypeEnumAttributeCallbackBridge
 {
 public:
-    MTRNullableDoorLockClusterDoorLockUserTypeAttributeCallbackSubscriptionBridge(
+    MTRNullableDoorLockClusterUserTypeEnumAttributeCallbackSubscriptionBridge(
         dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action,
         MTRSubscriptionEstablishedHandler establishedHandler) :
-        MTRNullableDoorLockClusterDoorLockUserTypeAttributeCallbackBridge(queue, handler, action),
+        MTRNullableDoorLockClusterUserTypeEnumAttributeCallbackBridge(queue, handler, action),
         mEstablishedHandler(establishedHandler)
     {}
 
     void OnSubscriptionEstablished();
-    using MTRNullableDoorLockClusterDoorLockUserTypeAttributeCallbackBridge::KeepAliveOnCallback;
-    using MTRNullableDoorLockClusterDoorLockUserTypeAttributeCallbackBridge::OnDone;
+    using MTRNullableDoorLockClusterUserTypeEnumAttributeCallbackBridge::KeepAliveOnCallback;
+    using MTRNullableDoorLockClusterUserTypeEnumAttributeCallbackBridge::OnDone;
 
 private:
     MTRSubscriptionEstablishedHandler mEstablishedHandler;
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.mm b/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.mm
index 88a5ec1b9b30e6..0947b5de898af5 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.mm
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.mm
@@ -4142,7 +4142,7 @@
 }
 
 void MTRGeneralDiagnosticsActiveHardwareFaultsListAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::app::Clusters::GeneralDiagnostics::HardwareFault> & value)
+    void * context, const chip::app::DataModel::DecodableList<chip::app::Clusters::GeneralDiagnostics::HardwareFaultEnum> & value)
 {
     NSArray * _Nonnull objCValue;
     { // Scope for our temporary variables
@@ -4180,7 +4180,7 @@
 }
 
 void MTRGeneralDiagnosticsActiveRadioFaultsListAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::app::Clusters::GeneralDiagnostics::RadioFault> & value)
+    void * context, const chip::app::DataModel::DecodableList<chip::app::Clusters::GeneralDiagnostics::RadioFaultEnum> & value)
 {
     NSArray * _Nonnull objCValue;
     { // Scope for our temporary variables
@@ -4218,7 +4218,7 @@
 }
 
 void MTRGeneralDiagnosticsActiveNetworkFaultsListAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::DecodableList<chip::app::Clusters::GeneralDiagnostics::NetworkFaultType> & value)
+    void * context, const chip::app::DataModel::DecodableList<chip::app::Clusters::GeneralDiagnostics::NetworkFaultEnum> & value)
 {
     NSArray * _Nonnull objCValue;
     { // Scope for our temporary variables
@@ -12191,10 +12191,10 @@
         }
     }
     {
-        if (data.userUniqueId.IsNull()) {
-            response.userUniqueId = nil;
+        if (data.userUniqueID.IsNull()) {
+            response.userUniqueID = nil;
         } else {
-            response.userUniqueId = [NSNumber numberWithUnsignedInt:data.userUniqueId.Value()];
+            response.userUniqueID = [NSNumber numberWithUnsignedInt:data.userUniqueID.Value()];
         }
     }
     {
@@ -12227,8 +12227,8 @@
                 auto iter_1 = data.credentials.Value().begin();
                 while (iter_1.Next()) {
                     auto & entry_1 = iter_1.GetValue();
-                    MTRDoorLockClusterDlCredential * newElement_1;
-                    newElement_1 = [MTRDoorLockClusterDlCredential new];
+                    MTRDoorLockClusterCredentialStruct * newElement_1;
+                    newElement_1 = [MTRDoorLockClusterCredentialStruct new];
                     newElement_1.credentialType = [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_1.credentialType)];
                     newElement_1.credentialIndex = [NSNumber numberWithUnsignedShort:entry_1.credentialIndex];
                     [array_1 addObject:newElement_1];
@@ -15110,15 +15110,15 @@
     }
 }
 
-void MTRGeneralDiagnosticsClusterHardwareFaultAttributeCallbackBridge::OnSuccessFn(
-    void * context, chip::app::Clusters::GeneralDiagnostics::HardwareFault value)
+void MTRGeneralDiagnosticsClusterHardwareFaultEnumAttributeCallbackBridge::OnSuccessFn(
+    void * context, chip::app::Clusters::GeneralDiagnostics::HardwareFaultEnum value)
 {
     NSNumber * _Nonnull objCValue;
     objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value)];
     DispatchSuccess(context, objCValue);
 };
 
-void MTRGeneralDiagnosticsClusterHardwareFaultAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished()
+void MTRGeneralDiagnosticsClusterHardwareFaultEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished()
 {
     if (!mQueue) {
         return;
@@ -15133,8 +15133,8 @@
     }
 }
 
-void MTRNullableGeneralDiagnosticsClusterHardwareFaultAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::Nullable<chip::app::Clusters::GeneralDiagnostics::HardwareFault> & value)
+void MTRNullableGeneralDiagnosticsClusterHardwareFaultEnumAttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::DataModel::Nullable<chip::app::Clusters::GeneralDiagnostics::HardwareFaultEnum> & value)
 {
     NSNumber * _Nullable objCValue;
     if (value.IsNull()) {
@@ -15145,7 +15145,7 @@
     DispatchSuccess(context, objCValue);
 };
 
-void MTRNullableGeneralDiagnosticsClusterHardwareFaultAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished()
+void MTRNullableGeneralDiagnosticsClusterHardwareFaultEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished()
 {
     if (!mQueue) {
         return;
@@ -15160,15 +15160,15 @@
     }
 }
 
-void MTRGeneralDiagnosticsClusterInterfaceTypeAttributeCallbackBridge::OnSuccessFn(
-    void * context, chip::app::Clusters::GeneralDiagnostics::InterfaceType value)
+void MTRGeneralDiagnosticsClusterInterfaceTypeEnumAttributeCallbackBridge::OnSuccessFn(
+    void * context, chip::app::Clusters::GeneralDiagnostics::InterfaceTypeEnum value)
 {
     NSNumber * _Nonnull objCValue;
     objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value)];
     DispatchSuccess(context, objCValue);
 };
 
-void MTRGeneralDiagnosticsClusterInterfaceTypeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished()
+void MTRGeneralDiagnosticsClusterInterfaceTypeEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished()
 {
     if (!mQueue) {
         return;
@@ -15183,8 +15183,8 @@
     }
 }
 
-void MTRNullableGeneralDiagnosticsClusterInterfaceTypeAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::Nullable<chip::app::Clusters::GeneralDiagnostics::InterfaceType> & value)
+void MTRNullableGeneralDiagnosticsClusterInterfaceTypeEnumAttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::DataModel::Nullable<chip::app::Clusters::GeneralDiagnostics::InterfaceTypeEnum> & value)
 {
     NSNumber * _Nullable objCValue;
     if (value.IsNull()) {
@@ -15195,7 +15195,7 @@
     DispatchSuccess(context, objCValue);
 };
 
-void MTRNullableGeneralDiagnosticsClusterInterfaceTypeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished()
+void MTRNullableGeneralDiagnosticsClusterInterfaceTypeEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished()
 {
     if (!mQueue) {
         return;
@@ -15210,15 +15210,15 @@
     }
 }
 
-void MTRGeneralDiagnosticsClusterNetworkFaultTypeAttributeCallbackBridge::OnSuccessFn(
-    void * context, chip::app::Clusters::GeneralDiagnostics::NetworkFaultType value)
+void MTRGeneralDiagnosticsClusterNetworkFaultEnumAttributeCallbackBridge::OnSuccessFn(
+    void * context, chip::app::Clusters::GeneralDiagnostics::NetworkFaultEnum value)
 {
     NSNumber * _Nonnull objCValue;
     objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value)];
     DispatchSuccess(context, objCValue);
 };
 
-void MTRGeneralDiagnosticsClusterNetworkFaultTypeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished()
+void MTRGeneralDiagnosticsClusterNetworkFaultEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished()
 {
     if (!mQueue) {
         return;
@@ -15233,8 +15233,8 @@
     }
 }
 
-void MTRNullableGeneralDiagnosticsClusterNetworkFaultTypeAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::Nullable<chip::app::Clusters::GeneralDiagnostics::NetworkFaultType> & value)
+void MTRNullableGeneralDiagnosticsClusterNetworkFaultEnumAttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::DataModel::Nullable<chip::app::Clusters::GeneralDiagnostics::NetworkFaultEnum> & value)
 {
     NSNumber * _Nullable objCValue;
     if (value.IsNull()) {
@@ -15245,7 +15245,7 @@
     DispatchSuccess(context, objCValue);
 };
 
-void MTRNullableGeneralDiagnosticsClusterNetworkFaultTypeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished()
+void MTRNullableGeneralDiagnosticsClusterNetworkFaultEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished()
 {
     if (!mQueue) {
         return;
@@ -15260,15 +15260,15 @@
     }
 }
 
-void MTRGeneralDiagnosticsClusterRadioFaultAttributeCallbackBridge::OnSuccessFn(
-    void * context, chip::app::Clusters::GeneralDiagnostics::RadioFault value)
+void MTRGeneralDiagnosticsClusterRadioFaultEnumAttributeCallbackBridge::OnSuccessFn(
+    void * context, chip::app::Clusters::GeneralDiagnostics::RadioFaultEnum value)
 {
     NSNumber * _Nonnull objCValue;
     objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value)];
     DispatchSuccess(context, objCValue);
 };
 
-void MTRGeneralDiagnosticsClusterRadioFaultAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished()
+void MTRGeneralDiagnosticsClusterRadioFaultEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished()
 {
     if (!mQueue) {
         return;
@@ -15283,8 +15283,8 @@
     }
 }
 
-void MTRNullableGeneralDiagnosticsClusterRadioFaultAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::Nullable<chip::app::Clusters::GeneralDiagnostics::RadioFault> & value)
+void MTRNullableGeneralDiagnosticsClusterRadioFaultEnumAttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::DataModel::Nullable<chip::app::Clusters::GeneralDiagnostics::RadioFaultEnum> & value)
 {
     NSNumber * _Nullable objCValue;
     if (value.IsNull()) {
@@ -15295,7 +15295,7 @@
     DispatchSuccess(context, objCValue);
 };
 
-void MTRNullableGeneralDiagnosticsClusterRadioFaultAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished()
+void MTRNullableGeneralDiagnosticsClusterRadioFaultEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished()
 {
     if (!mQueue) {
         return;
@@ -15660,15 +15660,15 @@
     }
 }
 
-void MTREthernetNetworkDiagnosticsClusterPHYRateAttributeCallbackBridge::OnSuccessFn(
-    void * context, chip::app::Clusters::EthernetNetworkDiagnostics::PHYRate value)
+void MTREthernetNetworkDiagnosticsClusterPHYRateEnumAttributeCallbackBridge::OnSuccessFn(
+    void * context, chip::app::Clusters::EthernetNetworkDiagnostics::PHYRateEnum value)
 {
     NSNumber * _Nonnull objCValue;
     objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value)];
     DispatchSuccess(context, objCValue);
 };
 
-void MTREthernetNetworkDiagnosticsClusterPHYRateAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished()
+void MTREthernetNetworkDiagnosticsClusterPHYRateEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished()
 {
     if (!mQueue) {
         return;
@@ -15683,8 +15683,8 @@
     }
 }
 
-void MTRNullableEthernetNetworkDiagnosticsClusterPHYRateAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::Nullable<chip::app::Clusters::EthernetNetworkDiagnostics::PHYRate> & value)
+void MTRNullableEthernetNetworkDiagnosticsClusterPHYRateEnumAttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::DataModel::Nullable<chip::app::Clusters::EthernetNetworkDiagnostics::PHYRateEnum> & value)
 {
     NSNumber * _Nullable objCValue;
     if (value.IsNull()) {
@@ -15695,7 +15695,7 @@
     DispatchSuccess(context, objCValue);
 };
 
-void MTRNullableEthernetNetworkDiagnosticsClusterPHYRateAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished()
+void MTRNullableEthernetNetworkDiagnosticsClusterPHYRateEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished()
 {
     if (!mQueue) {
         return;
@@ -15810,15 +15810,16 @@
     }
 }
 
-void MTRAdministratorCommissioningClusterCommissioningWindowStatusAttributeCallbackBridge::OnSuccessFn(
-    void * context, chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatus value)
+void MTRAdministratorCommissioningClusterCommissioningWindowStatusEnumAttributeCallbackBridge::OnSuccessFn(
+    void * context, chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatusEnum value)
 {
     NSNumber * _Nonnull objCValue;
     objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value)];
     DispatchSuccess(context, objCValue);
 };
 
-void MTRAdministratorCommissioningClusterCommissioningWindowStatusAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished()
+void MTRAdministratorCommissioningClusterCommissioningWindowStatusEnumAttributeCallbackSubscriptionBridge::
+    OnSubscriptionEstablished()
 {
     if (!mQueue) {
         return;
@@ -15833,8 +15834,8 @@
     }
 }
 
-void MTRNullableAdministratorCommissioningClusterCommissioningWindowStatusAttributeCallbackBridge::OnSuccessFn(void * context,
-    const chip::app::DataModel::Nullable<chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatus> & value)
+void MTRNullableAdministratorCommissioningClusterCommissioningWindowStatusEnumAttributeCallbackBridge::OnSuccessFn(void * context,
+    const chip::app::DataModel::Nullable<chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatusEnum> & value)
 {
     NSNumber * _Nullable objCValue;
     if (value.IsNull()) {
@@ -15845,7 +15846,7 @@
     DispatchSuccess(context, objCValue);
 };
 
-void MTRNullableAdministratorCommissioningClusterCommissioningWindowStatusAttributeCallbackSubscriptionBridge::
+void MTRNullableAdministratorCommissioningClusterCommissioningWindowStatusEnumAttributeCallbackSubscriptionBridge::
     OnSubscriptionEstablished()
 {
     if (!mQueue) {
@@ -16063,65 +16064,15 @@
     }
 }
 
-void MTRDoorLockClusterDlAlarmCodeAttributeCallbackBridge::OnSuccessFn(
-    void * context, chip::app::Clusters::DoorLock::DlAlarmCode value)
-{
-    NSNumber * _Nonnull objCValue;
-    objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value)];
-    DispatchSuccess(context, objCValue);
-};
-
-void MTRDoorLockClusterDlAlarmCodeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished()
-{
-    if (!mQueue) {
-        return;
-    }
-
-    if (mEstablishedHandler != nil) {
-        dispatch_async(mQueue, mEstablishedHandler);
-        // On failure, mEstablishedHandler will be cleaned up by our destructor,
-        // but we can clean it up earlier on successful subscription
-        // establishment.
-        mEstablishedHandler = nil;
-    }
-}
-
-void MTRNullableDoorLockClusterDlAlarmCodeAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::DlAlarmCode> & value)
-{
-    NSNumber * _Nullable objCValue;
-    if (value.IsNull()) {
-        objCValue = nil;
-    } else {
-        objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value.Value())];
-    }
-    DispatchSuccess(context, objCValue);
-};
-
-void MTRNullableDoorLockClusterDlAlarmCodeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished()
-{
-    if (!mQueue) {
-        return;
-    }
-
-    if (mEstablishedHandler != nil) {
-        dispatch_async(mQueue, mEstablishedHandler);
-        // On failure, mEstablishedHandler will be cleaned up by our destructor,
-        // but we can clean it up earlier on successful subscription
-        // establishment.
-        mEstablishedHandler = nil;
-    }
-}
-
-void MTRDoorLockClusterDlCredentialRuleAttributeCallbackBridge::OnSuccessFn(
-    void * context, chip::app::Clusters::DoorLock::DlCredentialRule value)
+void MTRDoorLockClusterAlarmCodeEnumAttributeCallbackBridge::OnSuccessFn(
+    void * context, chip::app::Clusters::DoorLock::AlarmCodeEnum value)
 {
     NSNumber * _Nonnull objCValue;
     objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value)];
     DispatchSuccess(context, objCValue);
 };
 
-void MTRDoorLockClusterDlCredentialRuleAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished()
+void MTRDoorLockClusterAlarmCodeEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished()
 {
     if (!mQueue) {
         return;
@@ -16136,8 +16087,8 @@
     }
 }
 
-void MTRNullableDoorLockClusterDlCredentialRuleAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::DlCredentialRule> & value)
+void MTRNullableDoorLockClusterAlarmCodeEnumAttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::AlarmCodeEnum> & value)
 {
     NSNumber * _Nullable objCValue;
     if (value.IsNull()) {
@@ -16148,7 +16099,7 @@
     DispatchSuccess(context, objCValue);
 };
 
-void MTRNullableDoorLockClusterDlCredentialRuleAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished()
+void MTRNullableDoorLockClusterAlarmCodeEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished()
 {
     if (!mQueue) {
         return;
@@ -16163,15 +16114,15 @@
     }
 }
 
-void MTRDoorLockClusterDlCredentialTypeAttributeCallbackBridge::OnSuccessFn(
-    void * context, chip::app::Clusters::DoorLock::DlCredentialType value)
+void MTRDoorLockClusterCredentialRuleEnumAttributeCallbackBridge::OnSuccessFn(
+    void * context, chip::app::Clusters::DoorLock::CredentialRuleEnum value)
 {
     NSNumber * _Nonnull objCValue;
     objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value)];
     DispatchSuccess(context, objCValue);
 };
 
-void MTRDoorLockClusterDlCredentialTypeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished()
+void MTRDoorLockClusterCredentialRuleEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished()
 {
     if (!mQueue) {
         return;
@@ -16186,8 +16137,8 @@
     }
 }
 
-void MTRNullableDoorLockClusterDlCredentialTypeAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::DlCredentialType> & value)
+void MTRNullableDoorLockClusterCredentialRuleEnumAttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::CredentialRuleEnum> & value)
 {
     NSNumber * _Nullable objCValue;
     if (value.IsNull()) {
@@ -16198,7 +16149,7 @@
     DispatchSuccess(context, objCValue);
 };
 
-void MTRNullableDoorLockClusterDlCredentialTypeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished()
+void MTRNullableDoorLockClusterCredentialRuleEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished()
 {
     if (!mQueue) {
         return;
@@ -16213,15 +16164,15 @@
     }
 }
 
-void MTRDoorLockClusterDlDataOperationTypeAttributeCallbackBridge::OnSuccessFn(
-    void * context, chip::app::Clusters::DoorLock::DlDataOperationType value)
+void MTRDoorLockClusterCredentialTypeEnumAttributeCallbackBridge::OnSuccessFn(
+    void * context, chip::app::Clusters::DoorLock::CredentialTypeEnum value)
 {
     NSNumber * _Nonnull objCValue;
     objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value)];
     DispatchSuccess(context, objCValue);
 };
 
-void MTRDoorLockClusterDlDataOperationTypeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished()
+void MTRDoorLockClusterCredentialTypeEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished()
 {
     if (!mQueue) {
         return;
@@ -16236,8 +16187,8 @@
     }
 }
 
-void MTRNullableDoorLockClusterDlDataOperationTypeAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::DlDataOperationType> & value)
+void MTRNullableDoorLockClusterCredentialTypeEnumAttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::CredentialTypeEnum> & value)
 {
     NSNumber * _Nullable objCValue;
     if (value.IsNull()) {
@@ -16248,7 +16199,7 @@
     DispatchSuccess(context, objCValue);
 };
 
-void MTRNullableDoorLockClusterDlDataOperationTypeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished()
+void MTRNullableDoorLockClusterCredentialTypeEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished()
 {
     if (!mQueue) {
         return;
@@ -16263,15 +16214,15 @@
     }
 }
 
-void MTRDoorLockClusterDlDoorStateAttributeCallbackBridge::OnSuccessFn(
-    void * context, chip::app::Clusters::DoorLock::DlDoorState value)
+void MTRDoorLockClusterDataOperationTypeEnumAttributeCallbackBridge::OnSuccessFn(
+    void * context, chip::app::Clusters::DoorLock::DataOperationTypeEnum value)
 {
     NSNumber * _Nonnull objCValue;
     objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value)];
     DispatchSuccess(context, objCValue);
 };
 
-void MTRDoorLockClusterDlDoorStateAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished()
+void MTRDoorLockClusterDataOperationTypeEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished()
 {
     if (!mQueue) {
         return;
@@ -16286,8 +16237,8 @@
     }
 }
 
-void MTRNullableDoorLockClusterDlDoorStateAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::DlDoorState> & value)
+void MTRNullableDoorLockClusterDataOperationTypeEnumAttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::DataOperationTypeEnum> & value)
 {
     NSNumber * _Nullable objCValue;
     if (value.IsNull()) {
@@ -16298,30 +16249,7 @@
     DispatchSuccess(context, objCValue);
 };
 
-void MTRNullableDoorLockClusterDlDoorStateAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished()
-{
-    if (!mQueue) {
-        return;
-    }
-
-    if (mEstablishedHandler != nil) {
-        dispatch_async(mQueue, mEstablishedHandler);
-        // On failure, mEstablishedHandler will be cleaned up by our destructor,
-        // but we can clean it up earlier on successful subscription
-        // establishment.
-        mEstablishedHandler = nil;
-    }
-}
-
-void MTRDoorLockClusterDlLockDataTypeAttributeCallbackBridge::OnSuccessFn(
-    void * context, chip::app::Clusters::DoorLock::DlLockDataType value)
-{
-    NSNumber * _Nonnull objCValue;
-    objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value)];
-    DispatchSuccess(context, objCValue);
-};
-
-void MTRDoorLockClusterDlLockDataTypeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished()
+void MTRNullableDoorLockClusterDataOperationTypeEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished()
 {
     if (!mQueue) {
         return;
@@ -16336,42 +16264,15 @@
     }
 }
 
-void MTRNullableDoorLockClusterDlLockDataTypeAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::DlLockDataType> & value)
-{
-    NSNumber * _Nullable objCValue;
-    if (value.IsNull()) {
-        objCValue = nil;
-    } else {
-        objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value.Value())];
-    }
-    DispatchSuccess(context, objCValue);
-};
-
-void MTRNullableDoorLockClusterDlLockDataTypeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished()
-{
-    if (!mQueue) {
-        return;
-    }
-
-    if (mEstablishedHandler != nil) {
-        dispatch_async(mQueue, mEstablishedHandler);
-        // On failure, mEstablishedHandler will be cleaned up by our destructor,
-        // but we can clean it up earlier on successful subscription
-        // establishment.
-        mEstablishedHandler = nil;
-    }
-}
-
-void MTRDoorLockClusterDlLockOperationTypeAttributeCallbackBridge::OnSuccessFn(
-    void * context, chip::app::Clusters::DoorLock::DlLockOperationType value)
+void MTRDoorLockClusterDlLockStateAttributeCallbackBridge::OnSuccessFn(
+    void * context, chip::app::Clusters::DoorLock::DlLockState value)
 {
     NSNumber * _Nonnull objCValue;
     objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value)];
     DispatchSuccess(context, objCValue);
 };
 
-void MTRDoorLockClusterDlLockOperationTypeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished()
+void MTRDoorLockClusterDlLockStateAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished()
 {
     if (!mQueue) {
         return;
@@ -16386,8 +16287,8 @@
     }
 }
 
-void MTRNullableDoorLockClusterDlLockOperationTypeAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::DlLockOperationType> & value)
+void MTRNullableDoorLockClusterDlLockStateAttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::DlLockState> & value)
 {
     NSNumber * _Nullable objCValue;
     if (value.IsNull()) {
@@ -16398,7 +16299,7 @@
     DispatchSuccess(context, objCValue);
 };
 
-void MTRNullableDoorLockClusterDlLockOperationTypeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished()
+void MTRNullableDoorLockClusterDlLockStateAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished()
 {
     if (!mQueue) {
         return;
@@ -16413,15 +16314,15 @@
     }
 }
 
-void MTRDoorLockClusterDlLockStateAttributeCallbackBridge::OnSuccessFn(
-    void * context, chip::app::Clusters::DoorLock::DlLockState value)
+void MTRDoorLockClusterDlLockTypeAttributeCallbackBridge::OnSuccessFn(
+    void * context, chip::app::Clusters::DoorLock::DlLockType value)
 {
     NSNumber * _Nonnull objCValue;
     objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value)];
     DispatchSuccess(context, objCValue);
 };
 
-void MTRDoorLockClusterDlLockStateAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished()
+void MTRDoorLockClusterDlLockTypeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished()
 {
     if (!mQueue) {
         return;
@@ -16436,8 +16337,8 @@
     }
 }
 
-void MTRNullableDoorLockClusterDlLockStateAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::DlLockState> & value)
+void MTRNullableDoorLockClusterDlLockTypeAttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::DlLockType> & value)
 {
     NSNumber * _Nullable objCValue;
     if (value.IsNull()) {
@@ -16448,7 +16349,7 @@
     DispatchSuccess(context, objCValue);
 };
 
-void MTRNullableDoorLockClusterDlLockStateAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished()
+void MTRNullableDoorLockClusterDlLockTypeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished()
 {
     if (!mQueue) {
         return;
@@ -16463,15 +16364,14 @@
     }
 }
 
-void MTRDoorLockClusterDlLockTypeAttributeCallbackBridge::OnSuccessFn(
-    void * context, chip::app::Clusters::DoorLock::DlLockType value)
+void MTRDoorLockClusterDlStatusAttributeCallbackBridge::OnSuccessFn(void * context, chip::app::Clusters::DoorLock::DlStatus value)
 {
     NSNumber * _Nonnull objCValue;
     objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value)];
     DispatchSuccess(context, objCValue);
 };
 
-void MTRDoorLockClusterDlLockTypeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished()
+void MTRDoorLockClusterDlStatusAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished()
 {
     if (!mQueue) {
         return;
@@ -16486,8 +16386,8 @@
     }
 }
 
-void MTRNullableDoorLockClusterDlLockTypeAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::DlLockType> & value)
+void MTRNullableDoorLockClusterDlStatusAttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::DlStatus> & value)
 {
     NSNumber * _Nullable objCValue;
     if (value.IsNull()) {
@@ -16498,7 +16398,7 @@
     DispatchSuccess(context, objCValue);
 };
 
-void MTRNullableDoorLockClusterDlLockTypeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished()
+void MTRNullableDoorLockClusterDlStatusAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished()
 {
     if (!mQueue) {
         return;
@@ -16513,15 +16413,15 @@
     }
 }
 
-void MTRDoorLockClusterDlOperatingModeAttributeCallbackBridge::OnSuccessFn(
-    void * context, chip::app::Clusters::DoorLock::DlOperatingMode value)
+void MTRDoorLockClusterDoorLockOperationEventCodeAttributeCallbackBridge::OnSuccessFn(
+    void * context, chip::app::Clusters::DoorLock::DoorLockOperationEventCode value)
 {
     NSNumber * _Nonnull objCValue;
     objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value)];
     DispatchSuccess(context, objCValue);
 };
 
-void MTRDoorLockClusterDlOperatingModeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished()
+void MTRDoorLockClusterDoorLockOperationEventCodeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished()
 {
     if (!mQueue) {
         return;
@@ -16536,8 +16436,8 @@
     }
 }
 
-void MTRNullableDoorLockClusterDlOperatingModeAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::DlOperatingMode> & value)
+void MTRNullableDoorLockClusterDoorLockOperationEventCodeAttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::DoorLockOperationEventCode> & value)
 {
     NSNumber * _Nullable objCValue;
     if (value.IsNull()) {
@@ -16548,7 +16448,7 @@
     DispatchSuccess(context, objCValue);
 };
 
-void MTRNullableDoorLockClusterDlOperatingModeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished()
+void MTRNullableDoorLockClusterDoorLockOperationEventCodeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished()
 {
     if (!mQueue) {
         return;
@@ -16563,15 +16463,15 @@
     }
 }
 
-void MTRDoorLockClusterDlOperationErrorAttributeCallbackBridge::OnSuccessFn(
-    void * context, chip::app::Clusters::DoorLock::DlOperationError value)
+void MTRDoorLockClusterDoorLockProgrammingEventCodeAttributeCallbackBridge::OnSuccessFn(
+    void * context, chip::app::Clusters::DoorLock::DoorLockProgrammingEventCode value)
 {
     NSNumber * _Nonnull objCValue;
     objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value)];
     DispatchSuccess(context, objCValue);
 };
 
-void MTRDoorLockClusterDlOperationErrorAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished()
+void MTRDoorLockClusterDoorLockProgrammingEventCodeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished()
 {
     if (!mQueue) {
         return;
@@ -16586,8 +16486,8 @@
     }
 }
 
-void MTRNullableDoorLockClusterDlOperationErrorAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::DlOperationError> & value)
+void MTRNullableDoorLockClusterDoorLockProgrammingEventCodeAttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::DoorLockProgrammingEventCode> & value)
 {
     NSNumber * _Nullable objCValue;
     if (value.IsNull()) {
@@ -16598,7 +16498,7 @@
     DispatchSuccess(context, objCValue);
 };
 
-void MTRNullableDoorLockClusterDlOperationErrorAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished()
+void MTRNullableDoorLockClusterDoorLockProgrammingEventCodeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished()
 {
     if (!mQueue) {
         return;
@@ -16613,15 +16513,15 @@
     }
 }
 
-void MTRDoorLockClusterDlOperationSourceAttributeCallbackBridge::OnSuccessFn(
-    void * context, chip::app::Clusters::DoorLock::DlOperationSource value)
+void MTRDoorLockClusterDoorLockSetPinOrIdStatusAttributeCallbackBridge::OnSuccessFn(
+    void * context, chip::app::Clusters::DoorLock::DoorLockSetPinOrIdStatus value)
 {
     NSNumber * _Nonnull objCValue;
     objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value)];
     DispatchSuccess(context, objCValue);
 };
 
-void MTRDoorLockClusterDlOperationSourceAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished()
+void MTRDoorLockClusterDoorLockSetPinOrIdStatusAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished()
 {
     if (!mQueue) {
         return;
@@ -16636,8 +16536,8 @@
     }
 }
 
-void MTRNullableDoorLockClusterDlOperationSourceAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::DlOperationSource> & value)
+void MTRNullableDoorLockClusterDoorLockSetPinOrIdStatusAttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::DoorLockSetPinOrIdStatus> & value)
 {
     NSNumber * _Nullable objCValue;
     if (value.IsNull()) {
@@ -16648,7 +16548,7 @@
     DispatchSuccess(context, objCValue);
 };
 
-void MTRNullableDoorLockClusterDlOperationSourceAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished()
+void MTRNullableDoorLockClusterDoorLockSetPinOrIdStatusAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished()
 {
     if (!mQueue) {
         return;
@@ -16663,14 +16563,15 @@
     }
 }
 
-void MTRDoorLockClusterDlStatusAttributeCallbackBridge::OnSuccessFn(void * context, chip::app::Clusters::DoorLock::DlStatus value)
+void MTRDoorLockClusterDoorStateEnumAttributeCallbackBridge::OnSuccessFn(
+    void * context, chip::app::Clusters::DoorLock::DoorStateEnum value)
 {
     NSNumber * _Nonnull objCValue;
     objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value)];
     DispatchSuccess(context, objCValue);
 };
 
-void MTRDoorLockClusterDlStatusAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished()
+void MTRDoorLockClusterDoorStateEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished()
 {
     if (!mQueue) {
         return;
@@ -16685,8 +16586,8 @@
     }
 }
 
-void MTRNullableDoorLockClusterDlStatusAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::DlStatus> & value)
+void MTRNullableDoorLockClusterDoorStateEnumAttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::DoorStateEnum> & value)
 {
     NSNumber * _Nullable objCValue;
     if (value.IsNull()) {
@@ -16697,7 +16598,7 @@
     DispatchSuccess(context, objCValue);
 };
 
-void MTRNullableDoorLockClusterDlStatusAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished()
+void MTRNullableDoorLockClusterDoorStateEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished()
 {
     if (!mQueue) {
         return;
@@ -16712,15 +16613,15 @@
     }
 }
 
-void MTRDoorLockClusterDlUserStatusAttributeCallbackBridge::OnSuccessFn(
-    void * context, chip::app::Clusters::DoorLock::DlUserStatus value)
+void MTRDoorLockClusterLockDataTypeEnumAttributeCallbackBridge::OnSuccessFn(
+    void * context, chip::app::Clusters::DoorLock::LockDataTypeEnum value)
 {
     NSNumber * _Nonnull objCValue;
     objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value)];
     DispatchSuccess(context, objCValue);
 };
 
-void MTRDoorLockClusterDlUserStatusAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished()
+void MTRDoorLockClusterLockDataTypeEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished()
 {
     if (!mQueue) {
         return;
@@ -16735,8 +16636,8 @@
     }
 }
 
-void MTRNullableDoorLockClusterDlUserStatusAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::DlUserStatus> & value)
+void MTRNullableDoorLockClusterLockDataTypeEnumAttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::LockDataTypeEnum> & value)
 {
     NSNumber * _Nullable objCValue;
     if (value.IsNull()) {
@@ -16747,7 +16648,7 @@
     DispatchSuccess(context, objCValue);
 };
 
-void MTRNullableDoorLockClusterDlUserStatusAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished()
+void MTRNullableDoorLockClusterLockDataTypeEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished()
 {
     if (!mQueue) {
         return;
@@ -16762,15 +16663,15 @@
     }
 }
 
-void MTRDoorLockClusterDlUserTypeAttributeCallbackBridge::OnSuccessFn(
-    void * context, chip::app::Clusters::DoorLock::DlUserType value)
+void MTRDoorLockClusterLockOperationTypeEnumAttributeCallbackBridge::OnSuccessFn(
+    void * context, chip::app::Clusters::DoorLock::LockOperationTypeEnum value)
 {
     NSNumber * _Nonnull objCValue;
     objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value)];
     DispatchSuccess(context, objCValue);
 };
 
-void MTRDoorLockClusterDlUserTypeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished()
+void MTRDoorLockClusterLockOperationTypeEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished()
 {
     if (!mQueue) {
         return;
@@ -16785,8 +16686,8 @@
     }
 }
 
-void MTRNullableDoorLockClusterDlUserTypeAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::DlUserType> & value)
+void MTRNullableDoorLockClusterLockOperationTypeEnumAttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::LockOperationTypeEnum> & value)
 {
     NSNumber * _Nullable objCValue;
     if (value.IsNull()) {
@@ -16797,7 +16698,7 @@
     DispatchSuccess(context, objCValue);
 };
 
-void MTRNullableDoorLockClusterDlUserTypeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished()
+void MTRNullableDoorLockClusterLockOperationTypeEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished()
 {
     if (!mQueue) {
         return;
@@ -16812,15 +16713,15 @@
     }
 }
 
-void MTRDoorLockClusterDoorLockOperationEventCodeAttributeCallbackBridge::OnSuccessFn(
-    void * context, chip::app::Clusters::DoorLock::DoorLockOperationEventCode value)
+void MTRDoorLockClusterOperatingModeEnumAttributeCallbackBridge::OnSuccessFn(
+    void * context, chip::app::Clusters::DoorLock::OperatingModeEnum value)
 {
     NSNumber * _Nonnull objCValue;
     objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value)];
     DispatchSuccess(context, objCValue);
 };
 
-void MTRDoorLockClusterDoorLockOperationEventCodeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished()
+void MTRDoorLockClusterOperatingModeEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished()
 {
     if (!mQueue) {
         return;
@@ -16835,8 +16736,8 @@
     }
 }
 
-void MTRNullableDoorLockClusterDoorLockOperationEventCodeAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::DoorLockOperationEventCode> & value)
+void MTRNullableDoorLockClusterOperatingModeEnumAttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::OperatingModeEnum> & value)
 {
     NSNumber * _Nullable objCValue;
     if (value.IsNull()) {
@@ -16847,7 +16748,7 @@
     DispatchSuccess(context, objCValue);
 };
 
-void MTRNullableDoorLockClusterDoorLockOperationEventCodeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished()
+void MTRNullableDoorLockClusterOperatingModeEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished()
 {
     if (!mQueue) {
         return;
@@ -16862,15 +16763,15 @@
     }
 }
 
-void MTRDoorLockClusterDoorLockProgrammingEventCodeAttributeCallbackBridge::OnSuccessFn(
-    void * context, chip::app::Clusters::DoorLock::DoorLockProgrammingEventCode value)
+void MTRDoorLockClusterOperationErrorEnumAttributeCallbackBridge::OnSuccessFn(
+    void * context, chip::app::Clusters::DoorLock::OperationErrorEnum value)
 {
     NSNumber * _Nonnull objCValue;
     objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value)];
     DispatchSuccess(context, objCValue);
 };
 
-void MTRDoorLockClusterDoorLockProgrammingEventCodeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished()
+void MTRDoorLockClusterOperationErrorEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished()
 {
     if (!mQueue) {
         return;
@@ -16885,8 +16786,8 @@
     }
 }
 
-void MTRNullableDoorLockClusterDoorLockProgrammingEventCodeAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::DoorLockProgrammingEventCode> & value)
+void MTRNullableDoorLockClusterOperationErrorEnumAttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::OperationErrorEnum> & value)
 {
     NSNumber * _Nullable objCValue;
     if (value.IsNull()) {
@@ -16897,7 +16798,7 @@
     DispatchSuccess(context, objCValue);
 };
 
-void MTRNullableDoorLockClusterDoorLockProgrammingEventCodeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished()
+void MTRNullableDoorLockClusterOperationErrorEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished()
 {
     if (!mQueue) {
         return;
@@ -16912,15 +16813,15 @@
     }
 }
 
-void MTRDoorLockClusterDoorLockSetPinOrIdStatusAttributeCallbackBridge::OnSuccessFn(
-    void * context, chip::app::Clusters::DoorLock::DoorLockSetPinOrIdStatus value)
+void MTRDoorLockClusterOperationSourceEnumAttributeCallbackBridge::OnSuccessFn(
+    void * context, chip::app::Clusters::DoorLock::OperationSourceEnum value)
 {
     NSNumber * _Nonnull objCValue;
     objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value)];
     DispatchSuccess(context, objCValue);
 };
 
-void MTRDoorLockClusterDoorLockSetPinOrIdStatusAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished()
+void MTRDoorLockClusterOperationSourceEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished()
 {
     if (!mQueue) {
         return;
@@ -16935,8 +16836,8 @@
     }
 }
 
-void MTRNullableDoorLockClusterDoorLockSetPinOrIdStatusAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::DoorLockSetPinOrIdStatus> & value)
+void MTRNullableDoorLockClusterOperationSourceEnumAttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::OperationSourceEnum> & value)
 {
     NSNumber * _Nullable objCValue;
     if (value.IsNull()) {
@@ -16947,7 +16848,7 @@
     DispatchSuccess(context, objCValue);
 };
 
-void MTRNullableDoorLockClusterDoorLockSetPinOrIdStatusAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished()
+void MTRNullableDoorLockClusterOperationSourceEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished()
 {
     if (!mQueue) {
         return;
@@ -16962,15 +16863,15 @@
     }
 }
 
-void MTRDoorLockClusterDoorLockUserStatusAttributeCallbackBridge::OnSuccessFn(
-    void * context, chip::app::Clusters::DoorLock::DoorLockUserStatus value)
+void MTRDoorLockClusterUserStatusEnumAttributeCallbackBridge::OnSuccessFn(
+    void * context, chip::app::Clusters::DoorLock::UserStatusEnum value)
 {
     NSNumber * _Nonnull objCValue;
     objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value)];
     DispatchSuccess(context, objCValue);
 };
 
-void MTRDoorLockClusterDoorLockUserStatusAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished()
+void MTRDoorLockClusterUserStatusEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished()
 {
     if (!mQueue) {
         return;
@@ -16985,8 +16886,8 @@
     }
 }
 
-void MTRNullableDoorLockClusterDoorLockUserStatusAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::DoorLockUserStatus> & value)
+void MTRNullableDoorLockClusterUserStatusEnumAttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::UserStatusEnum> & value)
 {
     NSNumber * _Nullable objCValue;
     if (value.IsNull()) {
@@ -16997,7 +16898,7 @@
     DispatchSuccess(context, objCValue);
 };
 
-void MTRNullableDoorLockClusterDoorLockUserStatusAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished()
+void MTRNullableDoorLockClusterUserStatusEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished()
 {
     if (!mQueue) {
         return;
@@ -17012,15 +16913,15 @@
     }
 }
 
-void MTRDoorLockClusterDoorLockUserTypeAttributeCallbackBridge::OnSuccessFn(
-    void * context, chip::app::Clusters::DoorLock::DoorLockUserType value)
+void MTRDoorLockClusterUserTypeEnumAttributeCallbackBridge::OnSuccessFn(
+    void * context, chip::app::Clusters::DoorLock::UserTypeEnum value)
 {
     NSNumber * _Nonnull objCValue;
     objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value)];
     DispatchSuccess(context, objCValue);
 };
 
-void MTRDoorLockClusterDoorLockUserTypeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished()
+void MTRDoorLockClusterUserTypeEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished()
 {
     if (!mQueue) {
         return;
@@ -17035,8 +16936,8 @@
     }
 }
 
-void MTRNullableDoorLockClusterDoorLockUserTypeAttributeCallbackBridge::OnSuccessFn(
-    void * context, const chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::DoorLockUserType> & value)
+void MTRNullableDoorLockClusterUserTypeEnumAttributeCallbackBridge::OnSuccessFn(
+    void * context, const chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::UserTypeEnum> & value)
 {
     NSNumber * _Nullable objCValue;
     if (value.IsNull()) {
@@ -17047,7 +16948,7 @@
     DispatchSuccess(context, objCValue);
 };
 
-void MTRNullableDoorLockClusterDoorLockUserTypeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished()
+void MTRNullableDoorLockClusterUserTypeEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished()
 {
     if (!mQueue) {
         return;
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.h b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.h
index cfbd8aec4912f1..8339e86709ddd0 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.h
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.h
@@ -2163,7 +2163,7 @@ API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 @end
 
 /**
- * Cluster AdministratorCommissioning
+ * Cluster Administrator Commissioning
  *    Commands to trigger a Node to allow a new Administrator to commission it.
  */
 API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm
index b86061ab336f4b..c5589bcdae0234 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm
@@ -11787,7 +11787,7 @@ - (void)lockDoorWithParams:(MTRDoorLockClusterLockDoorParams * _Nullable)params
                 }
                 if (params != nil) {
                     if (params.pinCode != nil) {
-                        auto & definedValue_0 = request.pinCode.Emplace();
+                        auto & definedValue_0 = request.PINCode.Emplace();
                         definedValue_0 = [self asByteSpan:params.pinCode];
                     }
                 }
@@ -11852,7 +11852,7 @@ - (void)unlockDoorWithParams:(MTRDoorLockClusterUnlockDoorParams * _Nullable)par
                 }
                 if (params != nil) {
                     if (params.pinCode != nil) {
-                        auto & definedValue_0 = request.pinCode.Emplace();
+                        auto & definedValue_0 = request.PINCode.Emplace();
                         definedValue_0 = [self asByteSpan:params.pinCode];
                     }
                 }
@@ -11917,7 +11917,7 @@ - (void)unlockWithTimeoutWithParams:(MTRDoorLockClusterUnlockWithTimeoutParams *
                 }
                 request.timeout = params.timeout.unsignedShortValue;
                 if (params.pinCode != nil) {
-                    auto & definedValue_0 = request.pinCode.Emplace();
+                    auto & definedValue_0 = request.PINCode.Emplace();
                     definedValue_0 = [self asByteSpan:params.pinCode];
                 }
 
@@ -12525,11 +12525,11 @@ - (void)setUserWithParams:(MTRDoorLockClusterSetUserParams *)params
                     auto & nonNullValue_0 = request.userName.SetNonNull();
                     nonNullValue_0 = [self asCharSpan:params.userName];
                 }
-                if (params.userUniqueId == nil) {
-                    request.userUniqueId.SetNull();
+                if (params.userUniqueID == nil) {
+                    request.userUniqueID.SetNull();
                 } else {
-                    auto & nonNullValue_0 = request.userUniqueId.SetNonNull();
-                    nonNullValue_0 = params.userUniqueId.unsignedIntValue;
+                    auto & nonNullValue_0 = request.userUniqueID.SetNonNull();
+                    nonNullValue_0 = params.userUniqueID.unsignedIntValue;
                 }
                 if (params.userStatus == nil) {
                     request.userStatus.SetNull();
@@ -17773,7 +17773,7 @@ - (void)moveToColorTemperatureWithParams:(MTRColorControlClusterMoveToColorTempe
                 if (timedInvokeTimeoutMsParam != nil) {
                     timedInvokeTimeoutMs.SetValue(timedInvokeTimeoutMsParam.unsignedShortValue);
                 }
-                request.colorTemperature = params.colorTemperature.unsignedShortValue;
+                request.colorTemperatureMireds = params.colorTemperatureMireds.unsignedShortValue;
                 request.transitionTime = params.transitionTime.unsignedShortValue;
                 request.optionsMask = params.optionsMask.unsignedCharValue;
                 request.optionsOverride = params.optionsOverride.unsignedCharValue;
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h
index b53ea6f2041389..31885d524ffdbe 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h
@@ -3165,7 +3165,7 @@ API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 
 @property (nonatomic, copy) NSString * _Nullable userName API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
 
-@property (nonatomic, copy) NSNumber * _Nullable userUniqueId API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
+@property (nonatomic, copy) NSNumber * _Nullable userUniqueID MTR_NEWLY_AVAILABLE;
 
 @property (nonatomic, copy) NSNumber * _Nullable userStatus API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
 
@@ -3189,6 +3189,12 @@ API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs;
 @end
 
+@interface MTRDoorLockClusterSetUserParams (Deprecated)
+
+@property (nonatomic, copy) NSNumber * _Nullable userUniqueId API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+    MTR_NEWLY_DEPRECATED("Please use userUniqueID");
+@end
+
 API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 @interface MTRDoorLockClusterGetUserParams : NSObject <NSCopying>
 
@@ -3217,7 +3223,7 @@ API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 
 @property (nonatomic, copy) NSString * _Nullable userName API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
 
-@property (nonatomic, copy) NSNumber * _Nullable userUniqueId API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
+@property (nonatomic, copy) NSNumber * _Nullable userUniqueID MTR_NEWLY_AVAILABLE;
 
 @property (nonatomic, copy) NSNumber * _Nullable userStatus API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
 
@@ -3251,6 +3257,12 @@ API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
     tvos(16.1)) MTR_NEWLY_DEPRECATED("Timed invoke does not make sense for server to client commands");
 @end
 
+@interface MTRDoorLockClusterGetUserResponseParams (Deprecated)
+
+@property (nonatomic, copy) NSNumber * _Nullable userUniqueId API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+    MTR_NEWLY_DEPRECATED("Please use userUniqueID");
+@end
+
 API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 @interface MTRDoorLockClusterClearUserParams : NSObject <NSCopying>
 
@@ -3278,7 +3290,7 @@ API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 @property (nonatomic, copy) NSNumber * _Nonnull operationType API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
 
 @property (nonatomic, copy)
-    MTRDoorLockClusterDlCredential * _Nonnull credential API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
+    MTRDoorLockClusterCredentialStruct * _Nonnull credential API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
 
 @property (nonatomic, copy) NSData * _Nonnull credentialData API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
 
@@ -3335,7 +3347,7 @@ API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 @interface MTRDoorLockClusterGetCredentialStatusParams : NSObject <NSCopying>
 
 @property (nonatomic, copy)
-    MTRDoorLockClusterDlCredential * _Nonnull credential API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
+    MTRDoorLockClusterCredentialStruct * _Nonnull credential API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
 /**
  * Controls whether the command is a timed command (using Timed Invoke).
  *
@@ -3389,7 +3401,7 @@ API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 @interface MTRDoorLockClusterClearCredentialParams : NSObject <NSCopying>
 
 @property (nonatomic, copy)
-    MTRDoorLockClusterDlCredential * _Nullable credential API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
+    MTRDoorLockClusterCredentialStruct * _Nullable credential API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
 /**
  * Controls whether the command is a timed command (using Timed Invoke).
  *
@@ -3999,7 +4011,7 @@ API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 @interface MTRColorControlClusterMoveToColorTemperatureParams : NSObject <NSCopying>
 
-@property (nonatomic, copy) NSNumber * _Nonnull colorTemperature API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
+@property (nonatomic, copy) NSNumber * _Nonnull colorTemperatureMireds MTR_NEWLY_AVAILABLE;
 
 @property (nonatomic, copy) NSNumber * _Nonnull transitionTime API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
 
@@ -4023,6 +4035,12 @@ API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 @property (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs;
 @end
 
+@interface MTRColorControlClusterMoveToColorTemperatureParams (Deprecated)
+
+@property (nonatomic, copy) NSNumber * _Nonnull colorTemperature API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
+    MTR_NEWLY_DEPRECATED("Please use colorTemperatureMireds");
+@end
+
 API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 @interface MTRColorControlClusterEnhancedMoveToHueParams : NSObject <NSCopying>
 
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm
index d27471742050cb..d897cf6be7ca78 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm
@@ -4433,7 +4433,7 @@ - (instancetype)init
 
         _userName = nil;
 
-        _userUniqueId = nil;
+        _userUniqueID = nil;
 
         _userStatus = nil;
 
@@ -4452,7 +4452,7 @@ - (id)copyWithZone:(NSZone * _Nullable)zone;
     other.operationType = self.operationType;
     other.userIndex = self.userIndex;
     other.userName = self.userName;
-    other.userUniqueId = self.userUniqueId;
+    other.userUniqueID = self.userUniqueID;
     other.userStatus = self.userStatus;
     other.userType = self.userType;
     other.credentialRule = self.credentialRule;
@@ -4465,12 +4465,25 @@ - (NSString *)description
 {
     NSString * descriptionString = [NSString
         stringWithFormat:
-            @"<%@: operationType:%@; userIndex:%@; userName:%@; userUniqueId:%@; userStatus:%@; userType:%@; credentialRule:%@; >",
-        NSStringFromClass([self class]), _operationType, _userIndex, _userName, _userUniqueId, _userStatus, _userType,
+            @"<%@: operationType:%@; userIndex:%@; userName:%@; userUniqueID:%@; userStatus:%@; userType:%@; credentialRule:%@; >",
+        NSStringFromClass([self class]), _operationType, _userIndex, _userName, _userUniqueID, _userStatus, _userType,
         _credentialRule];
     return descriptionString;
 }
 
+@end
+
+@implementation MTRDoorLockClusterSetUserParams (Deprecated)
+
+- (void)setUserUniqueId:(NSNumber * _Nullable)userUniqueId
+{
+    self.userUniqueID = userUniqueId;
+}
+
+- (NSNumber * _Nullable)userUniqueId
+{
+    return self.userUniqueID;
+}
 @end
 @implementation MTRDoorLockClusterGetUserParams
 - (instancetype)init
@@ -4509,7 +4522,7 @@ - (instancetype)init
 
         _userName = nil;
 
-        _userUniqueId = nil;
+        _userUniqueID = nil;
 
         _userStatus = nil;
 
@@ -4535,7 +4548,7 @@ - (id)copyWithZone:(NSZone * _Nullable)zone;
 
     other.userIndex = self.userIndex;
     other.userName = self.userName;
-    other.userUniqueId = self.userUniqueId;
+    other.userUniqueID = self.userUniqueID;
     other.userStatus = self.userStatus;
     other.userType = self.userType;
     other.credentialRule = self.credentialRule;
@@ -4551,13 +4564,26 @@ - (id)copyWithZone:(NSZone * _Nullable)zone;
 - (NSString *)description
 {
     NSString * descriptionString = [NSString
-        stringWithFormat:@"<%@: userIndex:%@; userName:%@; userUniqueId:%@; userStatus:%@; userType:%@; credentialRule:%@; "
+        stringWithFormat:@"<%@: userIndex:%@; userName:%@; userUniqueID:%@; userStatus:%@; userType:%@; credentialRule:%@; "
                          @"credentials:%@; creatorFabricIndex:%@; lastModifiedFabricIndex:%@; nextUserIndex:%@; >",
-        NSStringFromClass([self class]), _userIndex, _userName, _userUniqueId, _userStatus, _userType, _credentialRule,
+        NSStringFromClass([self class]), _userIndex, _userName, _userUniqueID, _userStatus, _userType, _credentialRule,
         _credentials, _creatorFabricIndex, _lastModifiedFabricIndex, _nextUserIndex];
     return descriptionString;
 }
 
+@end
+
+@implementation MTRDoorLockClusterGetUserResponseParams (Deprecated)
+
+- (void)setUserUniqueId:(NSNumber * _Nullable)userUniqueId
+{
+    self.userUniqueID = userUniqueId;
+}
+
+- (NSNumber * _Nullable)userUniqueId
+{
+    return self.userUniqueID;
+}
 @end
 @implementation MTRDoorLockClusterClearUserParams
 - (instancetype)init
@@ -4594,7 +4620,7 @@ - (instancetype)init
 
         _operationType = @(0);
 
-        _credential = [MTRDoorLockClusterDlCredential new];
+        _credential = [MTRDoorLockClusterCredentialStruct new];
 
         _credentialData = [NSData data];
 
@@ -4673,7 +4699,7 @@ - (instancetype)init
 {
     if (self = [super init]) {
 
-        _credential = [MTRDoorLockClusterDlCredential new];
+        _credential = [MTRDoorLockClusterCredentialStruct new];
         _timedInvokeTimeoutMs = nil;
     }
     return self;
@@ -5590,7 +5616,7 @@ - (instancetype)init
 {
     if (self = [super init]) {
 
-        _colorTemperature = @(0);
+        _colorTemperatureMireds = @(0);
 
         _transitionTime = @(0);
 
@@ -5606,7 +5632,7 @@ - (id)copyWithZone:(NSZone * _Nullable)zone;
 {
     auto other = [[MTRColorControlClusterMoveToColorTemperatureParams alloc] init];
 
-    other.colorTemperature = self.colorTemperature;
+    other.colorTemperatureMireds = self.colorTemperatureMireds;
     other.transitionTime = self.transitionTime;
     other.optionsMask = self.optionsMask;
     other.optionsOverride = self.optionsOverride;
@@ -5618,11 +5644,24 @@ - (id)copyWithZone:(NSZone * _Nullable)zone;
 - (NSString *)description
 {
     NSString * descriptionString =
-        [NSString stringWithFormat:@"<%@: colorTemperature:%@; transitionTime:%@; optionsMask:%@; optionsOverride:%@; >",
-                  NSStringFromClass([self class]), _colorTemperature, _transitionTime, _optionsMask, _optionsOverride];
+        [NSString stringWithFormat:@"<%@: colorTemperatureMireds:%@; transitionTime:%@; optionsMask:%@; optionsOverride:%@; >",
+                  NSStringFromClass([self class]), _colorTemperatureMireds, _transitionTime, _optionsMask, _optionsOverride];
     return descriptionString;
 }
 
+@end
+
+@implementation MTRColorControlClusterMoveToColorTemperatureParams (Deprecated)
+
+- (void)setColorTemperature:(NSNumber * _Nonnull)colorTemperature
+{
+    self.colorTemperatureMireds = colorTemperature;
+}
+
+- (NSNumber * _Nonnull)colorTemperature
+{
+    return self.colorTemperatureMireds;
+}
 @end
 @implementation MTRColorControlClusterEnhancedMoveToHueParams
 - (instancetype)init
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTREventTLVValueDecoder.mm b/src/darwin/Framework/CHIP/zap-generated/MTREventTLVValueDecoder.mm
index 301203c3f7bced..d36a169791c077 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTREventTLVValueDecoder.mm
+++ b/src/darwin/Framework/CHIP/zap-generated/MTREventTLVValueDecoder.mm
@@ -1602,8 +1602,8 @@ id MTRDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRead
                             auto iter_2 = cppValue.credentials.Value().Value().begin();
                             while (iter_2.Next()) {
                                 auto & entry_2 = iter_2.GetValue();
-                                MTRDoorLockClusterDlCredential * newElement_2;
-                                newElement_2 = [MTRDoorLockClusterDlCredential new];
+                                MTRDoorLockClusterCredentialStruct * newElement_2;
+                                newElement_2 = [MTRDoorLockClusterCredentialStruct new];
                                 newElement_2.credentialType =
                                     [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_2.credentialType)];
                                 newElement_2.credentialIndex = [NSNumber numberWithUnsignedShort:entry_2.credentialIndex];
@@ -1688,8 +1688,8 @@ id MTRDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVReader & aRead
                             auto iter_2 = cppValue.credentials.Value().Value().begin();
                             while (iter_2.Next()) {
                                 auto & entry_2 = iter_2.GetValue();
-                                MTRDoorLockClusterDlCredential * newElement_2;
-                                newElement_2 = [MTRDoorLockClusterDlCredential new];
+                                MTRDoorLockClusterCredentialStruct * newElement_2;
+                                newElement_2 = [MTRDoorLockClusterCredentialStruct new];
                                 newElement_2.credentialType =
                                     [NSNumber numberWithUnsignedChar:chip::to_underlying(entry_2.credentialType)];
                                 newElement_2.credentialIndex = [NSNumber numberWithUnsignedShort:entry_2.credentialIndex];
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h
index 1ba36af8708fd5..1f90dbbb216142 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h
@@ -645,10 +645,15 @@ API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
 @property (nonatomic, copy) NSArray * _Nonnull semanticTags API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
 @end
 
+MTR_NEWLY_AVAILABLE
+@interface MTRDoorLockClusterCredentialStruct : NSObject <NSCopying>
+@property (nonatomic, copy) NSNumber * _Nonnull credentialType MTR_NEWLY_AVAILABLE;
+@property (nonatomic, copy) NSNumber * _Nonnull credentialIndex MTR_NEWLY_AVAILABLE;
+@end
+
 API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
-@interface MTRDoorLockClusterDlCredential : NSObject <NSCopying>
-@property (nonatomic, copy) NSNumber * _Nonnull credentialType API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
-@property (nonatomic, copy) NSNumber * _Nonnull credentialIndex API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1));
+MTR_NEWLY_DEPRECATED("Please use MTRDoorLockClusterCredentialStruct")
+@interface MTRDoorLockClusterDlCredential : MTRDoorLockClusterCredentialStruct
 @end
 
 API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm
index 4c2b13924e43b8..1d00021a616711 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm
@@ -2579,7 +2579,7 @@ - (NSString *)description
 
 @end
 
-@implementation MTRDoorLockClusterDlCredential
+@implementation MTRDoorLockClusterCredentialStruct
 - (instancetype)init
 {
     if (self = [super init]) {
@@ -2593,7 +2593,7 @@ - (instancetype)init
 
 - (id)copyWithZone:(NSZone * _Nullable)zone
 {
-    auto other = [[MTRDoorLockClusterDlCredential alloc] init];
+    auto other = [[MTRDoorLockClusterCredentialStruct alloc] init];
 
     other.credentialType = self.credentialType;
     other.credentialIndex = self.credentialIndex;
@@ -2610,6 +2610,9 @@ - (NSString *)description
 
 @end
 
+@implementation MTRDoorLockClusterDlCredential : MTRDoorLockClusterCredentialStruct
+@end
+
 @implementation MTRDoorLockClusterDoorLockAlarmEvent
 - (instancetype)init
 {
diff --git a/src/include/platform/DiagnosticDataProvider.h b/src/include/platform/DiagnosticDataProvider.h
index 21da2d20115a3b..0165c55c0bc2bb 100644
--- a/src/include/platform/DiagnosticDataProvider.h
+++ b/src/include/platform/DiagnosticDataProvider.h
@@ -142,7 +142,7 @@ class DiagnosticDataProvider
     /**
      * Ethernet network diagnostics methods
      */
-    virtual CHIP_ERROR GetEthPHYRate(app::Clusters::EthernetNetworkDiagnostics::PHYRate & pHYRate);
+    virtual CHIP_ERROR GetEthPHYRate(app::Clusters::EthernetNetworkDiagnostics::PHYRateEnum & pHYRate);
     virtual CHIP_ERROR GetEthFullDuplex(bool & fullDuplex);
     virtual CHIP_ERROR GetEthCarrierDetect(bool & carrierDetect);
     virtual CHIP_ERROR GetEthTimeSinceReset(uint64_t & timeSinceReset);
@@ -278,7 +278,7 @@ inline CHIP_ERROR DiagnosticDataProvider::GetNetworkInterfaces(NetworkInterface
 
 inline void DiagnosticDataProvider::ReleaseNetworkInterfaces(NetworkInterface * netifp) {}
 
-inline CHIP_ERROR DiagnosticDataProvider::GetEthPHYRate(app::Clusters::EthernetNetworkDiagnostics::PHYRate & pHYRate)
+inline CHIP_ERROR DiagnosticDataProvider::GetEthPHYRate(app::Clusters::EthernetNetworkDiagnostics::PHYRateEnum & pHYRate)
 {
     return CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE;
 }
diff --git a/src/platform/Ameba/DiagnosticDataProviderImpl.cpp b/src/platform/Ameba/DiagnosticDataProviderImpl.cpp
index dad583f5e1d084..d0ad922905b85d 100644
--- a/src/platform/Ameba/DiagnosticDataProviderImpl.cpp
+++ b/src/platform/Ameba/DiagnosticDataProviderImpl.cpp
@@ -201,9 +201,9 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetNetworkInterfaces(NetworkInterface **
             ifp->name          = CharSpan::fromCharString(ifp->Name);
             ifp->isOperational = true;
             if ((ifa->flags) & NETIF_FLAG_ETHERNET)
-                ifp->type = EMBER_ZCL_INTERFACE_TYPE_ETHERNET;
+                ifp->type = EMBER_ZCL_INTERFACE_TYPE_ENUM_ETHERNET;
             else
-                ifp->type = EMBER_ZCL_INTERFACE_TYPE_WI_FI;
+                ifp->type = EMBER_ZCL_INTERFACE_TYPE_ENUM_WI_FI;
             ifp->offPremiseServicesReachableIPv4.SetNull();
             ifp->offPremiseServicesReachableIPv6.SetNull();
 
diff --git a/src/platform/Beken/DiagnosticDataProviderImpl.cpp b/src/platform/Beken/DiagnosticDataProviderImpl.cpp
index b2f0be7a48192a..f3077a074950b8 100644
--- a/src/platform/Beken/DiagnosticDataProviderImpl.cpp
+++ b/src/platform/Beken/DiagnosticDataProviderImpl.cpp
@@ -134,7 +134,7 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetNetworkInterfaces(NetworkInterface **
 
     Platform::CopyString(ifp->Name, netif->hostname);
     ifp->name = CharSpan::fromCharString(ifp->Name);
-    ifp->type = EMBER_ZCL_INTERFACE_TYPE_WI_FI;
+    ifp->type = EMBER_ZCL_INTERFACE_TYPE_ENUM_WI_FI;
     ifp->offPremiseServicesReachableIPv4.SetNonNull(false);
     ifp->offPremiseServicesReachableIPv6.SetNonNull(false);
     memcpy(ifp->MacAddress, netif->hwaddr, sizeof(netif->hwaddr));
diff --git a/src/platform/ESP32/DiagnosticDataProviderImpl.cpp b/src/platform/ESP32/DiagnosticDataProviderImpl.cpp
index 6dc68280c6dd71..c21e72e21abc59 100644
--- a/src/platform/ESP32/DiagnosticDataProviderImpl.cpp
+++ b/src/platform/ESP32/DiagnosticDataProviderImpl.cpp
@@ -50,15 +50,15 @@ using namespace ::chip::app::Clusters::GeneralDiagnostics;
 
 namespace {
 
-InterfaceType GetInterfaceType(const char * if_desc)
+InterfaceTypeEnum GetInterfaceType(const char * if_desc)
 {
     if (strncmp(if_desc, "ap", strnlen(if_desc, 2)) == 0 || strncmp(if_desc, "sta", strnlen(if_desc, 3)) == 0)
-        return InterfaceType::EMBER_ZCL_INTERFACE_TYPE_WI_FI;
+        return InterfaceTypeEnum::EMBER_ZCL_INTERFACE_TYPE_ENUM_WI_FI;
     if (strncmp(if_desc, "openthread", strnlen(if_desc, 10)) == 0)
-        return InterfaceType::EMBER_ZCL_INTERFACE_TYPE_THREAD;
+        return InterfaceTypeEnum::EMBER_ZCL_INTERFACE_TYPE_ENUM_THREAD;
     if (strncmp(if_desc, "eth", strnlen(if_desc, 3)) == 0)
-        return InterfaceType::EMBER_ZCL_INTERFACE_TYPE_ETHERNET;
-    return InterfaceType::EMBER_ZCL_INTERFACE_TYPE_UNSPECIFIED;
+        return InterfaceTypeEnum::EMBER_ZCL_INTERFACE_TYPE_ENUM_ETHERNET;
+    return InterfaceTypeEnum::EMBER_ZCL_INTERFACE_TYPE_ENUM_UNSPECIFIED;
 }
 
 #if CHIP_DEVICE_CONFIG_ENABLE_WIFI
diff --git a/src/platform/Infineon/CYW30739/DiagnosticDataProviderImpl.cpp b/src/platform/Infineon/CYW30739/DiagnosticDataProviderImpl.cpp
index 2deec6df8b4646..5b92bc25199ba1 100644
--- a/src/platform/Infineon/CYW30739/DiagnosticDataProviderImpl.cpp
+++ b/src/platform/Infineon/CYW30739/DiagnosticDataProviderImpl.cpp
@@ -107,7 +107,7 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetNetworkInterfaces(NetworkInterface **
     ifp->offPremiseServicesReachableIPv4.SetNull();
     ifp->offPremiseServicesReachableIPv6.SetNull();
     ifp->hardwareAddress = ByteSpan(ifp->MacAddress);
-    ifp->type            = app::Clusters::GeneralDiagnostics::InterfaceType::EMBER_ZCL_INTERFACE_TYPE_THREAD;
+    ifp->type            = app::Clusters::GeneralDiagnostics::InterfaceTypeEnum::EMBER_ZCL_INTERFACE_TYPE_ENUM_THREAD;
 
     static_assert(sizeof(ifp->MacAddress) >= ConfigurationManager::kPrimaryMACAddressLength, "Invalid MacAddress buffer size");
     ConfigurationMgr().GetPrimary802154MACAddress(ifp->MacAddress);
diff --git a/src/platform/Infineon/PSOC6/DiagnosticDataProviderImpl.cpp b/src/platform/Infineon/PSOC6/DiagnosticDataProviderImpl.cpp
index 4413309c1f1857..1c9ccfbf098f5a 100644
--- a/src/platform/Infineon/PSOC6/DiagnosticDataProviderImpl.cpp
+++ b/src/platform/Infineon/PSOC6/DiagnosticDataProviderImpl.cpp
@@ -161,7 +161,7 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetNetworkInterfaces(NetworkInterface **
         /* Update Network Interface list */
         ifp->name                            = CharSpan::fromCharString(net_interface->name);
         ifp->isOperational                   = net_interface->flags & NETIF_FLAG_LINK_UP;
-        ifp->type                            = EMBER_ZCL_INTERFACE_TYPE_WI_FI;
+        ifp->type                            = EMBER_ZCL_INTERFACE_TYPE_ENUM_WI_FI;
         ifp->offPremiseServicesReachableIPv4 = mipv4_offpremise;
         ifp->offPremiseServicesReachableIPv6 = mipv6_offpremise;
         ifp->hardwareAddress                 = ByteSpan(net_interface->hwaddr, net_interface->hwaddr_len);
diff --git a/src/platform/Linux/ConnectivityManagerImpl.cpp b/src/platform/Linux/ConnectivityManagerImpl.cpp
index 4447a1a4a183cb..dfeed0e2db5374 100644
--- a/src/platform/Linux/ConnectivityManagerImpl.cpp
+++ b/src/platform/Linux/ConnectivityManagerImpl.cpp
@@ -1165,7 +1165,8 @@ CHIP_ERROR ConnectivityManagerImpl::GetWiFiBssId(ByteSpan & value)
         // Walk through linked list, maintaining head pointer so we can free list later.
         for (struct ifaddrs * ifa = ifaddr; ifa != nullptr; ifa = ifa->ifa_next)
         {
-            if (ConnectivityUtils::GetInterfaceConnectionType(ifa->ifa_name) == InterfaceType::EMBER_ZCL_INTERFACE_TYPE_WI_FI)
+            if (ConnectivityUtils::GetInterfaceConnectionType(ifa->ifa_name) ==
+                InterfaceTypeEnum::EMBER_ZCL_INTERFACE_TYPE_ENUM_WI_FI)
             {
                 if (ConnectivityUtils::GetInterfaceHardwareAddrs(ifa->ifa_name, macAddress, kMaxHardwareAddrSize) != CHIP_NO_ERROR)
                 {
diff --git a/src/platform/Linux/ConnectivityUtils.cpp b/src/platform/Linux/ConnectivityUtils.cpp
index eda1daaff1cd27..3d85f1cd3c2608 100644
--- a/src/platform/Linux/ConnectivityUtils.cpp
+++ b/src/platform/Linux/ConnectivityUtils.cpp
@@ -243,15 +243,15 @@ double ConnectivityUtils::ConvertFrequenceToFloat(const iw_freq * in)
     return result;
 }
 
-InterfaceType ConnectivityUtils::GetInterfaceConnectionType(const char * ifname)
+InterfaceTypeEnum ConnectivityUtils::GetInterfaceConnectionType(const char * ifname)
 {
-    InterfaceType ret = InterfaceType::EMBER_ZCL_INTERFACE_TYPE_UNSPECIFIED;
-    int sock          = -1;
+    InterfaceTypeEnum ret = InterfaceTypeEnum::EMBER_ZCL_INTERFACE_TYPE_ENUM_UNSPECIFIED;
+    int sock              = -1;
 
     if ((sock = socket(AF_INET, SOCK_STREAM, 0)) == -1)
     {
         ChipLogError(DeviceLayer, "Failed to open socket");
-        return InterfaceType::EMBER_ZCL_INTERFACE_TYPE_UNSPECIFIED;
+        return InterfaceTypeEnum::EMBER_ZCL_INTERFACE_TYPE_ENUM_UNSPECIFIED;
     }
 
     // Test wireless extensions for CONNECTION_WIFI
@@ -260,7 +260,7 @@ InterfaceType ConnectivityUtils::GetInterfaceConnectionType(const char * ifname)
 
     if (ioctl(sock, SIOCGIWNAME, &pwrq) != -1)
     {
-        ret = InterfaceType::EMBER_ZCL_INTERFACE_TYPE_WI_FI;
+        ret = InterfaceTypeEnum::EMBER_ZCL_INTERFACE_TYPE_ENUM_WI_FI;
     }
     else if ((strncmp(ifname, "en", 2) == 0) || (strncmp(ifname, "eth", 3) == 0))
     {
@@ -271,7 +271,7 @@ InterfaceType ConnectivityUtils::GetInterfaceConnectionType(const char * ifname)
         Platform::CopyString(ifr.ifr_name, ifname);
 
         if (ioctl(sock, SIOCETHTOOL, &ifr) != -1)
-            ret = InterfaceType::EMBER_ZCL_INTERFACE_TYPE_ETHERNET;
+            ret = InterfaceTypeEnum::EMBER_ZCL_INTERFACE_TYPE_ENUM_ETHERNET;
     }
 
     close(sock);
@@ -420,7 +420,7 @@ CHIP_ERROR ConnectivityUtils::GetWiFiInterfaceName(char * ifname, size_t bufSize
           can free list later */
         for (ifa = ifaddr; ifa != nullptr; ifa = ifa->ifa_next)
         {
-            if (GetInterfaceConnectionType(ifa->ifa_name) == InterfaceType::EMBER_ZCL_INTERFACE_TYPE_WI_FI)
+            if (GetInterfaceConnectionType(ifa->ifa_name) == InterfaceTypeEnum::EMBER_ZCL_INTERFACE_TYPE_ENUM_WI_FI)
             {
                 Platform::CopyString(ifname, bufSize, ifa->ifa_name);
                 err = CHIP_NO_ERROR;
@@ -614,7 +614,7 @@ CHIP_ERROR ConnectivityUtils::GetEthInterfaceName(char * ifname, size_t bufSize)
           can free list later */
         for (ifa = ifaddr; ifa != nullptr; ifa = ifa->ifa_next)
         {
-            if (GetInterfaceConnectionType(ifa->ifa_name) == InterfaceType::EMBER_ZCL_INTERFACE_TYPE_ETHERNET)
+            if (GetInterfaceConnectionType(ifa->ifa_name) == InterfaceTypeEnum::EMBER_ZCL_INTERFACE_TYPE_ENUM_ETHERNET)
             {
                 Platform::CopyString(ifname, bufSize, ifa->ifa_name);
                 err = CHIP_NO_ERROR;
@@ -628,7 +628,7 @@ CHIP_ERROR ConnectivityUtils::GetEthInterfaceName(char * ifname, size_t bufSize)
     return err;
 }
 
-CHIP_ERROR ConnectivityUtils::GetEthPHYRate(const char * ifname, app::Clusters::EthernetNetworkDiagnostics::PHYRate & pHYRate)
+CHIP_ERROR ConnectivityUtils::GetEthPHYRate(const char * ifname, app::Clusters::EthernetNetworkDiagnostics::PHYRateEnum & pHYRate)
 {
     CHIP_ERROR err = CHIP_NO_ERROR;
 
@@ -658,34 +658,34 @@ CHIP_ERROR ConnectivityUtils::GetEthPHYRate(const char * ifname, app::Clusters::
     switch (speed)
     {
     case 10:
-        pHYRate = EmberAfPHYRate::EMBER_ZCL_PHY_RATE_RATE10_M;
+        pHYRate = EmberAfPHYRateEnum::EMBER_ZCL_PHY_RATE_ENUM_RATE10_M;
         break;
     case 100:
-        pHYRate = EmberAfPHYRate::EMBER_ZCL_PHY_RATE_RATE100_M;
+        pHYRate = EmberAfPHYRateEnum::EMBER_ZCL_PHY_RATE_ENUM_RATE100_M;
         break;
     case 1000:
-        pHYRate = EmberAfPHYRate::EMBER_ZCL_PHY_RATE_RATE1_G;
+        pHYRate = EmberAfPHYRateEnum::EMBER_ZCL_PHY_RATE_ENUM_RATE1_G;
         break;
     case 25000:
-        pHYRate = EmberAfPHYRate::EMBER_ZCL_PHY_RATE_RATE2_5_G;
+        pHYRate = EmberAfPHYRateEnum::EMBER_ZCL_PHY_RATE_ENUM_RATE2_5_G;
         break;
     case 5000:
-        pHYRate = EmberAfPHYRate::EMBER_ZCL_PHY_RATE_RATE5_G;
+        pHYRate = EmberAfPHYRateEnum::EMBER_ZCL_PHY_RATE_ENUM_RATE5_G;
         break;
     case 10000:
-        pHYRate = EmberAfPHYRate::EMBER_ZCL_PHY_RATE_RATE10_G;
+        pHYRate = EmberAfPHYRateEnum::EMBER_ZCL_PHY_RATE_ENUM_RATE10_G;
         break;
     case 40000:
-        pHYRate = EmberAfPHYRate::EMBER_ZCL_PHY_RATE_RATE40_G;
+        pHYRate = EmberAfPHYRateEnum::EMBER_ZCL_PHY_RATE_ENUM_RATE40_G;
         break;
     case 100000:
-        pHYRate = EmberAfPHYRate::EMBER_ZCL_PHY_RATE_RATE100_G;
+        pHYRate = EmberAfPHYRateEnum::EMBER_ZCL_PHY_RATE_ENUM_RATE100_G;
         break;
     case 200000:
-        pHYRate = EmberAfPHYRate::EMBER_ZCL_PHY_RATE_RATE200_G;
+        pHYRate = EmberAfPHYRateEnum::EMBER_ZCL_PHY_RATE_ENUM_RATE200_G;
         break;
     case 400000:
-        pHYRate = EmberAfPHYRate::EMBER_ZCL_PHY_RATE_RATE400_G;
+        pHYRate = EmberAfPHYRateEnum::EMBER_ZCL_PHY_RATE_ENUM_RATE400_G;
         break;
     default:
         ChipLogError(DeviceLayer, "Undefined speed! (%d)\n", speed);
diff --git a/src/platform/Linux/ConnectivityUtils.h b/src/platform/Linux/ConnectivityUtils.h
index bd47460371a206..e4884e935bd875 100644
--- a/src/platform/Linux/ConnectivityUtils.h
+++ b/src/platform/Linux/ConnectivityUtils.h
@@ -43,7 +43,7 @@ class ConnectivityUtils
 public:
     static uint16_t MapChannelToFrequency(const uint16_t inBand, const uint8_t inChannel);
     static uint8_t MapFrequencyToChannel(const uint16_t frequency);
-    static app::Clusters::GeneralDiagnostics::InterfaceType GetInterfaceConnectionType(const char * ifname);
+    static app::Clusters::GeneralDiagnostics::InterfaceTypeEnum GetInterfaceConnectionType(const char * ifname);
     static CHIP_ERROR GetInterfaceHardwareAddrs(const char * ifname, uint8_t * buf, size_t bufSize);
     static CHIP_ERROR GetInterfaceIPv4Addrs(const char * ifname, uint8_t & size, NetworkInterface * ifp);
     static CHIP_ERROR GetInterfaceIPv6Addrs(const char * ifname, uint8_t & size, NetworkInterface * ifp);
@@ -53,7 +53,7 @@ class ConnectivityUtils
     static CHIP_ERROR GetWiFiBeaconLostCount(const char * ifname, uint32_t & beaconLostCount);
     static CHIP_ERROR GetWiFiCurrentMaxRate(const char * ifname, uint64_t & currentMaxRate);
     static CHIP_ERROR GetEthInterfaceName(char * ifname, size_t bufSize);
-    static CHIP_ERROR GetEthPHYRate(const char * ifname, app::Clusters::EthernetNetworkDiagnostics::PHYRate & pHYRate);
+    static CHIP_ERROR GetEthPHYRate(const char * ifname, app::Clusters::EthernetNetworkDiagnostics::PHYRateEnum & pHYRate);
     static CHIP_ERROR GetEthFullDuplex(const char * ifname, bool & fullDuplex);
 
 private:
diff --git a/src/platform/Linux/DiagnosticDataProviderImpl.cpp b/src/platform/Linux/DiagnosticDataProviderImpl.cpp
index bdebdaab8c3274..4a348b89cc2f0c 100644
--- a/src/platform/Linux/DiagnosticDataProviderImpl.cpp
+++ b/src/platform/Linux/DiagnosticDataProviderImpl.cpp
@@ -91,7 +91,8 @@ CHIP_ERROR GetEthernetStatsCount(EthernetStatsCountType type, uint64_t & count)
         // Walk through linked list, maintaining head pointer so we can free list later.
         for (ifa = ifaddr; ifa != nullptr; ifa = ifa->ifa_next)
         {
-            if (ConnectivityUtils::GetInterfaceConnectionType(ifa->ifa_name) == InterfaceType::EMBER_ZCL_INTERFACE_TYPE_ETHERNET)
+            if (ConnectivityUtils::GetInterfaceConnectionType(ifa->ifa_name) ==
+                InterfaceTypeEnum::EMBER_ZCL_INTERFACE_TYPE_ENUM_ETHERNET)
             {
                 ChipLogProgress(DeviceLayer, "Found the primary Ethernet interface:%s", StringOrNullMarker(ifa->ifa_name));
                 break;
@@ -155,7 +156,8 @@ CHIP_ERROR GetWiFiStatsCount(WiFiStatsCountType type, uint64_t & count)
         // Walk through linked list, maintaining head pointer so we can free list later.
         for (ifa = ifaddr; ifa != nullptr; ifa = ifa->ifa_next)
         {
-            if (ConnectivityUtils::GetInterfaceConnectionType(ifa->ifa_name) == InterfaceType::EMBER_ZCL_INTERFACE_TYPE_WI_FI)
+            if (ConnectivityUtils::GetInterfaceConnectionType(ifa->ifa_name) ==
+                InterfaceTypeEnum::EMBER_ZCL_INTERFACE_TYPE_ENUM_WI_FI)
             {
                 ChipLogProgress(DeviceLayer, "Found the primary WiFi interface:%s", StringOrNullMarker(ifa->ifa_name));
                 break;
@@ -398,10 +400,10 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetActiveHardwareFaults(GeneralFaults<kMa
 {
 #if CHIP_CONFIG_TEST
     // On Linux Simulation, set following hardware faults statically.
-    ReturnErrorOnFailure(hardwareFaults.add(EMBER_ZCL_HARDWARE_FAULT_RADIO));
-    ReturnErrorOnFailure(hardwareFaults.add(EMBER_ZCL_HARDWARE_FAULT_SENSOR));
-    ReturnErrorOnFailure(hardwareFaults.add(EMBER_ZCL_HARDWARE_FAULT_POWER_SOURCE));
-    ReturnErrorOnFailure(hardwareFaults.add(EMBER_ZCL_HARDWARE_FAULT_USER_INTERFACE_FAULT));
+    ReturnErrorOnFailure(hardwareFaults.add(EMBER_ZCL_HARDWARE_FAULT_ENUM_RADIO));
+    ReturnErrorOnFailure(hardwareFaults.add(EMBER_ZCL_HARDWARE_FAULT_ENUM_SENSOR));
+    ReturnErrorOnFailure(hardwareFaults.add(EMBER_ZCL_HARDWARE_FAULT_ENUM_POWER_SOURCE));
+    ReturnErrorOnFailure(hardwareFaults.add(EMBER_ZCL_HARDWARE_FAULT_ENUM_USER_INTERFACE_FAULT));
 #endif
 
     return CHIP_NO_ERROR;
@@ -411,10 +413,10 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetActiveRadioFaults(GeneralFaults<kMaxRa
 {
 #if CHIP_CONFIG_TEST
     // On Linux Simulation, set following radio faults statically.
-    ReturnErrorOnFailure(radioFaults.add(EMBER_ZCL_RADIO_FAULT_WI_FI_FAULT));
-    ReturnErrorOnFailure(radioFaults.add(EMBER_ZCL_RADIO_FAULT_CELLULAR_FAULT));
-    ReturnErrorOnFailure(radioFaults.add(EMBER_ZCL_RADIO_FAULT_THREAD_FAULT));
-    ReturnErrorOnFailure(radioFaults.add(EMBER_ZCL_RADIO_FAULT_NFC_FAULT));
+    ReturnErrorOnFailure(radioFaults.add(EMBER_ZCL_RADIO_FAULT_ENUM_WI_FI_FAULT));
+    ReturnErrorOnFailure(radioFaults.add(EMBER_ZCL_RADIO_FAULT_ENUM_CELLULAR_FAULT));
+    ReturnErrorOnFailure(radioFaults.add(EMBER_ZCL_RADIO_FAULT_ENUM_THREAD_FAULT));
+    ReturnErrorOnFailure(radioFaults.add(EMBER_ZCL_RADIO_FAULT_ENUM_NFC_FAULT));
 #endif
 
     return CHIP_NO_ERROR;
@@ -424,9 +426,9 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetActiveNetworkFaults(GeneralFaults<kMax
 {
 #if CHIP_CONFIG_TEST
     // On Linux Simulation, set following radio faults statically.
-    ReturnErrorOnFailure(networkFaults.add(EMBER_ZCL_NETWORK_FAULT_TYPE_HARDWARE_FAILURE));
-    ReturnErrorOnFailure(networkFaults.add(EMBER_ZCL_NETWORK_FAULT_TYPE_NETWORK_JAMMED));
-    ReturnErrorOnFailure(networkFaults.add(EMBER_ZCL_NETWORK_FAULT_TYPE_CONNECTION_FAILED));
+    ReturnErrorOnFailure(networkFaults.add(EMBER_ZCL_NETWORK_FAULT_ENUM_HARDWARE_FAILURE));
+    ReturnErrorOnFailure(networkFaults.add(EMBER_ZCL_NETWORK_FAULT_ENUM_NETWORK_JAMMED));
+    ReturnErrorOnFailure(networkFaults.add(EMBER_ZCL_NETWORK_FAULT_ENUM_CONNECTION_FAILED));
 #endif
 
     return CHIP_NO_ERROR;
@@ -512,7 +514,7 @@ void DiagnosticDataProviderImpl::ReleaseNetworkInterfaces(NetworkInterface * net
     }
 }
 
-CHIP_ERROR DiagnosticDataProviderImpl::GetEthPHYRate(app::Clusters::EthernetNetworkDiagnostics::PHYRate & pHYRate)
+CHIP_ERROR DiagnosticDataProviderImpl::GetEthPHYRate(app::Clusters::EthernetNetworkDiagnostics::PHYRateEnum & pHYRate)
 {
     if (ConnectivityMgrImpl().GetEthernetIfName() == nullptr)
     {
@@ -613,7 +615,8 @@ CHIP_ERROR DiagnosticDataProviderImpl::ResetEthNetworkDiagnosticsCounts()
         // Walk through linked list, maintaining head pointer so we can free list later.
         for (ifa = ifaddr; ifa != nullptr; ifa = ifa->ifa_next)
         {
-            if (ConnectivityUtils::GetInterfaceConnectionType(ifa->ifa_name) == InterfaceType::EMBER_ZCL_INTERFACE_TYPE_ETHERNET)
+            if (ConnectivityUtils::GetInterfaceConnectionType(ifa->ifa_name) ==
+                InterfaceTypeEnum::EMBER_ZCL_INTERFACE_TYPE_ENUM_ETHERNET)
             {
                 ChipLogProgress(DeviceLayer, "Found the primary Ethernet interface:%s", StringOrNullMarker(ifa->ifa_name));
                 break;
@@ -778,7 +781,8 @@ CHIP_ERROR DiagnosticDataProviderImpl::ResetWiFiNetworkDiagnosticsCounts()
         // Walk through linked list, maintaining head pointer so we can free list later.
         for (ifa = ifaddr; ifa != nullptr; ifa = ifa->ifa_next)
         {
-            if (ConnectivityUtils::GetInterfaceConnectionType(ifa->ifa_name) == InterfaceType::EMBER_ZCL_INTERFACE_TYPE_WI_FI)
+            if (ConnectivityUtils::GetInterfaceConnectionType(ifa->ifa_name) ==
+                InterfaceTypeEnum::EMBER_ZCL_INTERFACE_TYPE_ENUM_WI_FI)
             {
                 ChipLogProgress(DeviceLayer, "Found the primary WiFi interface:%s", StringOrNullMarker(ifa->ifa_name));
                 break;
diff --git a/src/platform/Linux/DiagnosticDataProviderImpl.h b/src/platform/Linux/DiagnosticDataProviderImpl.h
index bcbcc1748bc44d..5d09747c90225d 100644
--- a/src/platform/Linux/DiagnosticDataProviderImpl.h
+++ b/src/platform/Linux/DiagnosticDataProviderImpl.h
@@ -59,7 +59,7 @@ class DiagnosticDataProviderImpl : public DiagnosticDataProvider
     CHIP_ERROR GetNetworkInterfaces(NetworkInterface ** netifpp) override;
     void ReleaseNetworkInterfaces(NetworkInterface * netifp) override;
 
-    CHIP_ERROR GetEthPHYRate(app::Clusters::EthernetNetworkDiagnostics::PHYRate & pHYRate) override;
+    CHIP_ERROR GetEthPHYRate(app::Clusters::EthernetNetworkDiagnostics::PHYRateEnum & pHYRate) override;
     CHIP_ERROR GetEthFullDuplex(bool & fullDuplex) override;
     CHIP_ERROR GetEthTimeSinceReset(uint64_t & timeSinceReset) override;
     CHIP_ERROR GetEthPacketRxCount(uint64_t & packetRxCount) override;
diff --git a/src/platform/Tizen/ConnectivityUtils.cpp b/src/platform/Tizen/ConnectivityUtils.cpp
index 5c5d56b8b9bf80..4a1f94e5c7453e 100644
--- a/src/platform/Tizen/ConnectivityUtils.cpp
+++ b/src/platform/Tizen/ConnectivityUtils.cpp
@@ -43,10 +43,10 @@ namespace chip {
 namespace DeviceLayer {
 namespace Internal {
 
-app::Clusters::GeneralDiagnostics::InterfaceType ConnectivityUtils::GetInterfaceConnectionType(const char * ifname)
+app::Clusters::GeneralDiagnostics::InterfaceTypeEnum ConnectivityUtils::GetInterfaceConnectionType(const char * ifname)
 {
-    app::Clusters::GeneralDiagnostics::InterfaceType ret =
-        app::Clusters::GeneralDiagnostics::InterfaceType::EMBER_ZCL_INTERFACE_TYPE_UNSPECIFIED;
+    app::Clusters::GeneralDiagnostics::InterfaceTypeEnum ret =
+        app::Clusters::GeneralDiagnostics::InterfaceTypeEnum::EMBER_ZCL_INTERFACE_TYPE_ENUM_UNSPECIFIED;
     int sock = -1;
 
     if ((sock = socket(AF_INET, SOCK_STREAM, 0)) == -1)
@@ -61,7 +61,7 @@ app::Clusters::GeneralDiagnostics::InterfaceType ConnectivityUtils::GetInterface
 
     if (ioctl(sock, SIOCGIWNAME, &pwrq) != -1)
     {
-        ret = app::Clusters::GeneralDiagnostics::InterfaceType::EMBER_ZCL_INTERFACE_TYPE_WI_FI;
+        ret = app::Clusters::GeneralDiagnostics::InterfaceTypeEnum::EMBER_ZCL_INTERFACE_TYPE_ENUM_WI_FI;
     }
     else if ((strncmp(ifname, "en", 2) == 0) || (strncmp(ifname, "eth", 3) == 0))
     {
@@ -72,7 +72,7 @@ app::Clusters::GeneralDiagnostics::InterfaceType ConnectivityUtils::GetInterface
         Platform::CopyString(ifr.ifr_name, ifname);
 
         if (ioctl(sock, SIOCETHTOOL, &ifr) != -1)
-            ret = app::Clusters::GeneralDiagnostics::InterfaceType::EMBER_ZCL_INTERFACE_TYPE_ETHERNET;
+            ret = app::Clusters::GeneralDiagnostics::InterfaceTypeEnum::EMBER_ZCL_INTERFACE_TYPE_ENUM_ETHERNET;
     }
 
     close(sock);
diff --git a/src/platform/Tizen/ConnectivityUtils.h b/src/platform/Tizen/ConnectivityUtils.h
index 6c8f5c85702d4f..16fb18268d8a79 100644
--- a/src/platform/Tizen/ConnectivityUtils.h
+++ b/src/platform/Tizen/ConnectivityUtils.h
@@ -28,7 +28,7 @@ namespace Internal {
 class ConnectivityUtils
 {
 public:
-    static app::Clusters::GeneralDiagnostics::InterfaceType GetInterfaceConnectionType(const char * ifname);
+    static app::Clusters::GeneralDiagnostics::InterfaceTypeEnum GetInterfaceConnectionType(const char * ifname);
 };
 
 } // namespace Internal
diff --git a/src/platform/Tizen/NetworkCommissioningEthernetDriver.cpp b/src/platform/Tizen/NetworkCommissioningEthernetDriver.cpp
index 6a95f952d77429..8679b442142a5a 100644
--- a/src/platform/Tizen/NetworkCommissioningEthernetDriver.cpp
+++ b/src/platform/Tizen/NetworkCommissioningEthernetDriver.cpp
@@ -43,7 +43,7 @@ TizenEthernetDriver::EthernetNetworkIterator::EthernetNetworkIterator(TizenEther
     for (const auto * ifa = ifaddr; ifa != nullptr; ifa = ifa->ifa_next)
     {
         if (DeviceLayer::Internal::ConnectivityUtils::GetInterfaceConnectionType(ifa->ifa_name) ==
-            app::Clusters::GeneralDiagnostics::InterfaceType::EMBER_ZCL_INTERFACE_TYPE_ETHERNET)
+            app::Clusters::GeneralDiagnostics::InterfaceTypeEnum::EMBER_ZCL_INTERFACE_TYPE_ENUM_ETHERNET)
         {
             mInterfaces.push_back(ifa->ifa_name);
             if (mInterfaces.size() == mDriver->GetMaxNetworks())
diff --git a/src/platform/Zephyr/DiagnosticDataProviderImpl.cpp b/src/platform/Zephyr/DiagnosticDataProviderImpl.cpp
index c1fb842e054e1d..9398359f1cb021 100644
--- a/src/platform/Zephyr/DiagnosticDataProviderImpl.cpp
+++ b/src/platform/Zephyr/DiagnosticDataProviderImpl.cpp
@@ -258,19 +258,19 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetNetworkInterfaces(NetworkInterface **
             switch (interfaceType)
             {
             case Inet::InterfaceType::Unknown:
-                ifp->type = EMBER_ZCL_INTERFACE_TYPE_UNSPECIFIED;
+                ifp->type = EMBER_ZCL_INTERFACE_TYPE_ENUM_UNSPECIFIED;
                 break;
             case Inet::InterfaceType::WiFi:
-                ifp->type = EMBER_ZCL_INTERFACE_TYPE_WI_FI;
+                ifp->type = EMBER_ZCL_INTERFACE_TYPE_ENUM_WI_FI;
                 break;
             case Inet::InterfaceType::Ethernet:
-                ifp->type = EMBER_ZCL_INTERFACE_TYPE_ETHERNET;
+                ifp->type = EMBER_ZCL_INTERFACE_TYPE_ENUM_ETHERNET;
                 break;
             case Inet::InterfaceType::Thread:
-                ifp->type = EMBER_ZCL_INTERFACE_TYPE_THREAD;
+                ifp->type = EMBER_ZCL_INTERFACE_TYPE_ENUM_THREAD;
                 break;
             case Inet::InterfaceType::Cellular:
-                ifp->type = EMBER_ZCL_INTERFACE_TYPE_CELLULAR;
+                ifp->type = EMBER_ZCL_INTERFACE_TYPE_ENUM_CELLULAR;
                 break;
             }
         }
diff --git a/src/platform/android/DiagnosticDataProviderImpl.cpp b/src/platform/android/DiagnosticDataProviderImpl.cpp
index 49a8323ee0e7ce..3b0784a7a079b8 100644
--- a/src/platform/android/DiagnosticDataProviderImpl.cpp
+++ b/src/platform/android/DiagnosticDataProviderImpl.cpp
@@ -169,7 +169,7 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetNetworkInterfaces(NetworkInterface **
             }
 
             jfieldID getTypeField = env->GetFieldID(nifClass, "type", "I");
-            ifp->type             = static_cast<InterfaceType>(env->GetIntField(nifObject, getTypeField));
+            ifp->type             = static_cast<InterfaceTypeEnum>(env->GetIntField(nifObject, getTypeField));
 
             jfieldID ipv4AddressField  = env->GetFieldID(nifClass, "ipv4Address", "[B");
             jbyteArray jIpv4AddressObj = static_cast<jbyteArray>(env->GetObjectField(nifObject, ipv4AddressField));
diff --git a/src/platform/android/java/chip/platform/DiagnosticDataProviderImpl.java b/src/platform/android/java/chip/platform/DiagnosticDataProviderImpl.java
index 4a90a48848aaba..e7f51e5ce855fb 100644
--- a/src/platform/android/java/chip/platform/DiagnosticDataProviderImpl.java
+++ b/src/platform/android/java/chip/platform/DiagnosticDataProviderImpl.java
@@ -65,8 +65,8 @@ public NetworkInterface[] getNetworkInterfaces() {
           anInterface.name = nif.getName();
           anInterface.type =
               name.startsWith("wlan")
-                  ? NetworkInterface.INTERFACE_TYPE_WI_FI
-                  : NetworkInterface.INTERFACE_TYPE_ETHERNET;
+                  ? NetworkInterface.INTERFACE_TYPE_ENUM_WI_FI
+                  : NetworkInterface.INTERFACE_TYPE_ENUM_ETHERNET;
 
           Enumeration<InetAddress> inetAddress = nif.getInetAddresses();
           while (inetAddress.hasMoreElements()) {
diff --git a/src/platform/android/java/chip/platform/NetworkInterface.java b/src/platform/android/java/chip/platform/NetworkInterface.java
index 6898d091e39135..aedcc4b2b253ea 100644
--- a/src/platform/android/java/chip/platform/NetworkInterface.java
+++ b/src/platform/android/java/chip/platform/NetworkInterface.java
@@ -21,11 +21,11 @@
 
 public class NetworkInterface {
 
-  public static final int INTERFACE_TYPE_UNSPECIFIED = 0x00;
-  public static final int INTERFACE_TYPE_WI_FI = 0x01;
-  public static final int INTERFACE_TYPE_ETHERNET = 0x02;
-  public static final int INTERFACE_TYPE_CELLULAR = 0x03;
-  public static final int INTERFACE_TYPE_THREAD = 0x04;
+  public static final int INTERFACE_TYPE_ENUM_UNSPECIFIED = 0x00;
+  public static final int INTERFACE_TYPE_ENUM_WI_FI = 0x01;
+  public static final int INTERFACE_TYPE_ENUM_ETHERNET = 0x02;
+  public static final int INTERFACE_TYPE_ENUM_CELLULAR = 0x03;
+  public static final int INTERFACE_TYPE_ENUM_THREAD = 0x04;
 
   public String name;
   public boolean isOperational;
diff --git a/src/platform/bouffalolab/BL602/DiagnosticDataProviderImpl.cpp b/src/platform/bouffalolab/BL602/DiagnosticDataProviderImpl.cpp
index 9c972071a60631..143492e363078a 100644
--- a/src/platform/bouffalolab/BL602/DiagnosticDataProviderImpl.cpp
+++ b/src/platform/bouffalolab/BL602/DiagnosticDataProviderImpl.cpp
@@ -194,7 +194,7 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetNetworkInterfaces(NetworkInterface **
         Platform::CopyString(ifp->Name, netif->name);
         ifp->name          = CharSpan::fromCharString(ifp->Name);
         ifp->isOperational = true;
-        ifp->type          = EMBER_ZCL_INTERFACE_TYPE_WI_FI;
+        ifp->type          = EMBER_ZCL_INTERFACE_TYPE_ENUM_WI_FI;
         ifp->offPremiseServicesReachableIPv4.SetNull();
         ifp->offPremiseServicesReachableIPv6.SetNull();
         bl_efuse_read_mac(ifp->MacAddress);
diff --git a/src/platform/bouffalolab/BL602/DnssdImpl.cpp b/src/platform/bouffalolab/BL602/DnssdImpl.cpp
deleted file mode 100644
index 681f66aaa33657..00000000000000
--- a/src/platform/bouffalolab/BL602/DnssdImpl.cpp
+++ /dev/null
@@ -1,324 +0,0 @@
-/*
- *
- *    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.
- */
-
-#include "lib/dnssd/platform/Dnssd.h"
-#include <lib/support/CHIPMem.h>
-#include <lib/support/CodeUtils.h>
-#include <lib/support/logging/CHIPLogging.h>
-#include <platform/CHIPDeviceLayer.h>
-
-#include <BL602Config.h>
-#include <lwip/ip4_addr.h>
-#include <lwip/ip6_addr.h>
-#include <lwip/netifapi.h>
-#include <mdns.h>
-#include <mdns_server.h>
-#include <wifi_mgmr_ext.h>
-
-using namespace chip::Dnssd;
-
-using namespace ::chip::DeviceLayer::Internal;
-namespace {
-
-static constexpr uint32_t kTimeoutMilli = 3000;
-static constexpr size_t kMaxResults     = 20;
-} // namespace
-
-namespace chip {
-namespace Dnssd {
-
-#define MDNS_MAX_PACKET_SIZE 64
-typedef struct
-{
-    const char * key;   /*!< item key name */
-    const char * value; /*!< item value string */
-    size_t value_len;
-} mdns_txt_item_t;
-
-typedef struct mdns
-{
-    struct netif * netif;
-    uint8_t slot[10];
-    uint8_t slot_idx;
-    int txt_cnt;
-} mdns_t;
-
-#define MDNS_TXT_MAX_LEN 128
-static mdns_t mdns      = { NULL, 0, 0, 0, 0 };
-mdns_txt_item_t * items = nullptr;
-uint8_t packet[MDNS_TXT_MAX_LEN];
-
-static const DnssdService * glservice;
-
-CHIP_ERROR ChipDnssdInit(DnssdAsyncReturnCallback initCallback, DnssdAsyncReturnCallback errorCallback, void * context)
-{
-    CHIP_ERROR error = CHIP_NO_ERROR;
-
-    mdns_resp_init();
-    mdns.slot_idx = 0;
-    initCallback(context, error);
-
-    glservice = static_cast<DnssdService *>(chip::Platform::MemoryCalloc(1, sizeof(DnssdService)));
-
-    return error;
-}
-
-void ChipDnssdShutdown() {}
-
-static const char * GetProtocolString(DnssdServiceProtocol protocol)
-{
-    return protocol == DnssdServiceProtocol::kDnssdProtocolTcp ? "_tcp" : "_udp";
-}
-
-static inline uint8_t _mdns_append_u8(uint8_t * packet, uint16_t * index, uint8_t value)
-{
-    if (*index >= MDNS_MAX_PACKET_SIZE)
-    {
-        return 0;
-    }
-
-    packet[*index] = value;
-    *index += 1;
-    return 1;
-}
-
-static inline int append_one_txt_record_entry(uint8_t * packet, uint16_t * index, mdns_txt_item_t * txt)
-{
-    if (txt == NULL || txt->key == NULL || packet == NULL)
-    {
-        return -1;
-    }
-
-    size_t key_len = strlen(txt->key);
-    size_t len     = key_len + txt->value_len + (txt->value ? 1 : 0);
-    if ((*index + len + 1) >= MDNS_MAX_PACKET_SIZE)
-    {
-        return 0;
-    }
-
-    _mdns_append_u8(packet, index, len);
-    memcpy(packet + *index, txt->key, key_len);
-    if (txt->value)
-    {
-        packet[*index + key_len] = '=';
-        memcpy(packet + *index + key_len + 1, txt->value, txt->value_len);
-    }
-
-    *index += len;
-
-    return len + 1;
-}
-
-static void dnssd_txt_resolve(uint8_t * packet, mdns_txt_item_t * txt, int count)
-{
-    uint16_t index = 0;
-
-    for (int i = 0; i < count; i++)
-    {
-        append_one_txt_record_entry(packet, &index, &(txt[i]));
-    }
-}
-
-static void srv_txt(struct mdns_service * service, void * txt_userdata)
-{
-    int i, ret;
-    int index = 0;
-
-    for (i = 0; i < mdns.txt_cnt; i++)
-    {
-        ret = mdns_resp_add_service_txtitem(service, &(packet[index + 1]), packet[index]);
-        if (ret)
-        {
-            log_info("send txt failed.\r\n");
-
-            return;
-        }
-
-        index = index + packet[index] + 1;
-    }
-}
-
-static void ota_txt(struct mdns_service * service, void * txt_userdata)
-{
-    int ret = mdns_resp_add_service_txtitem(service, "version=12345678", 16);
-    if (ret)
-    {
-        log_info("send ota txt failed.\r\n");
-    }
-}
-
-static err_t mdns_responder_stop_netifapi_errt_fn(struct netif * netif)
-{
-    return mdns_responder_stop(netif);
-}
-
-int mdns_responder_ops(struct netif * netif)
-{
-    int ret, slot = -1;
-    int protocol        = 0;
-    uint16_t packet_len = 0;
-
-    if (netif == NULL)
-    {
-        log_info("netif is NULL\r\n");
-        return -1;
-    }
-
-    if (!(mdns.netif))
-    {
-        mdns.netif = netif;
-
-        ret = mdns_resp_add_netif(netif, glservice->mHostName, 10);
-        if (ret != 0)
-        {
-            mdns_resp_deinit();
-            log_info("add netif failed:%d\r\n", ret);
-            return -1;
-        }
-    }
-
-    items        = static_cast<mdns_txt_item_t *>(chip::Platform::MemoryCalloc(glservice->mTextEntrySize, sizeof(mdns_txt_item_t)));
-    mdns.txt_cnt = glservice->mTextEntrySize;
-    for (size_t i = 0; i < glservice->mTextEntrySize; i++)
-    {
-        items[i].key       = glservice->mTextEntries[i].mKey;
-        items[i].value     = reinterpret_cast<const char *>(glservice->mTextEntries[i].mData);
-        items[i].value_len = glservice->mTextEntries[i].mDataSize;
-        packet_len         = packet_len + strlen(items[i].key) + items[i].value_len + 1;
-    }
-
-    if (MDNS_TXT_MAX_LEN < packet_len)
-    {
-        return -1;
-    }
-
-    dnssd_txt_resolve(packet, items, glservice->mTextEntrySize);
-    chip::Platform::MemoryFree(items);
-
-    log_info("name = %s nType = %s protocol = %d port = %d \r\n", glservice->mName, glservice->mType, protocol, glservice->mPort);
-    slot = mdns_resp_add_service(netif, glservice->mName, glservice->mType, static_cast<uint8_t>(glservice->mProtocol),
-                                 glservice->mPort, 60, srv_txt, NULL);
-    if (slot < 0)
-    {
-        mdns_resp_remove_netif(netif);
-        mdns_resp_deinit();
-        log_info("add server failed:%d\r\n", slot);
-        return -1;
-    }
-
-    mdns.slot[mdns.slot_idx] = slot;
-    mdns.slot_idx++;
-    mdns_resp_announce(netif);
-
-    return slot;
-}
-
-static err_t mdns_responder_start_netifapi_errt_fn(struct netif * netif)
-{
-    return mdns_responder_ops(netif);
-}
-
-CHIP_ERROR ChipDnssdPublishService(const DnssdService * service, DnssdPublishCallback callback, void * context)
-{
-    CHIP_ERROR error = CHIP_NO_ERROR;
-    struct netif * netif;
-    int slot;
-    bool mdns_flag;
-
-    if (!(chip::DeviceLayer::ConnectivityMgrImpl()._IsWiFiStationConnected()))
-    {
-        return CHIP_ERROR_NOT_IMPLEMENTED;
-    }
-
-    if (service)
-    {
-        memcpy(glservice, service, sizeof(DnssdService));
-    }
-
-    netif = wifi_mgmr_sta_netif_get();
-    if (netif == NULL)
-    {
-        log_info("find failed\r\n");
-        return CHIP_ERROR_INTERNAL;
-    }
-
-    // mdns_responder_ops(netif);
-
-    slot = netifapi_netif_common(netif, NULL, mdns_responder_start_netifapi_errt_fn);
-    if (slot < 0)
-    {
-        log_info("start mdns failed\r\n");
-        return CHIP_ERROR_INTERNAL;
-    }
-
-    return CHIP_NO_ERROR;
-}
-
-CHIP_ERROR ChipDnssdRemoveServices()
-{
-    struct netif * netif;
-    int i = 0;
-
-    netif = wifi_mgmr_sta_netif_get();
-    if (netif == NULL)
-    {
-        log_info("find failed\r\n");
-        return CHIP_ERROR_INTERNAL;
-    }
-
-    for (i = 0; i < mdns.slot_idx; i++)
-    {
-        mdns_resp_del_service(netif, mdns.slot[i]);
-    }
-
-    mdns.slot_idx = 0;
-
-    return CHIP_NO_ERROR;
-}
-
-CHIP_ERROR ChipDnssdFinalizeServiceUpdate()
-{
-    return CHIP_NO_ERROR;
-}
-
-CHIP_ERROR ChipDnssdBrowse(const char * /*type*/, DnssdServiceProtocol /*protocol*/, chip::Inet::IPAddressType addressType,
-                           chip::Inet::InterfaceId /*interface*/, DnssdBrowseCallback /*callback*/, void * /*context*/,
-                           intptr_t * /*browseIdentifier*/)
-{
-    return CHIP_ERROR_NOT_IMPLEMENTED;
-}
-
-CHIP_ERROR ChipDnssdStopBrowse(intptr_t /*browseIdentifier*/)
-{
-    return CHIP_ERROR_NOT_IMPLEMENTED;
-}
-
-CHIP_ERROR ChipDnssdResolve(DnssdService * /*service*/, chip::Inet::InterfaceId /*interface*/, DnssdResolveCallback /*callback*/,
-                            void * /*context*/)
-{
-    return CHIP_ERROR_NOT_IMPLEMENTED;
-}
-
-void ChipDnssdResolveNoLongerNeeded(const char * instanceName) {}
-
-CHIP_ERROR ChipDnssdReconfirmRecord(const char * hostname, chip::Inet::IPAddress address, chip::Inet::InterfaceId interface)
-{
-    return CHIP_ERROR_NOT_IMPLEMENTED;
-}
-
-} // namespace Dnssd
-} // namespace chip
diff --git a/src/platform/bouffalolab/BL602/GroupKeyStoreImpl.cpp b/src/platform/bouffalolab/BL602/GroupKeyStoreImpl.cpp
deleted file mode 100644
index 295e30f68dd3bf..00000000000000
--- a/src/platform/bouffalolab/BL602/GroupKeyStoreImpl.cpp
+++ /dev/null
@@ -1,377 +0,0 @@
-/*
- *
- *    Copyright (c) 2021 Project CHIP Authors
- *    Copyright (c) 2019 Nest Labs, Inc.
- *
- *    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.
- */
-
-/**
- *    @file
- *          Provides an implementation of the CHIP GroupKeyStore interface
- *          for platforms based on the Bouffalolab SDK.
- */
-/* this file behaves like a config.h, comes first */
-#include <platform/internal/CHIPDeviceLayerInternal.h>
-
-#include <platform/bouffalolab/BL602/GroupKeyStoreImpl.h>
-
-using namespace ::chip;
-using namespace ::chip::Profiles::Security::AppKeys;
-
-namespace chip {
-namespace DeviceLayer {
-namespace Internal {
-
-CHIP_ERROR GroupKeyStoreImpl::RetrieveGroupKey(uint32_t keyId, ChipGroupKey & key)
-{
-    CHIP_ERROR err;
-
-    // Iterate over all the GroupKey easyflash records looking for a matching key...
-    err = ForEachRecord(kConfigKey_GroupKeyBase, kConfigKey_GroupKeyMax, false,
-                        [keyId, &key](const Key & efKey, const size_t & length) -> CHIP_ERROR {
-                            CHIP_ERROR err2;
-                            size_t keyLen;
-                            uint8_t buf[kMaxEncodedKeySize]; // (buf length == 45 bytes)
-                            uint32_t curKeyId;
-
-                            // Read the easyflash obj binary data data into the buffer.
-                            err2 = ReadConfigValueBin(efKey, buf, sizeof(buf), keyLen);
-
-                            // Decode the CHIP key id for the current key.
-                            err2 = DecodeGroupKeyId(buf, keyLen, curKeyId);
-                            SuccessOrExit(err2);
-
-                            // If it matches the key we're looking for...
-                            if (curKeyId == keyId)
-                            {
-                                // Decode the associated key data.
-                                err2 = DecodeGroupKey(buf, keyLen, key);
-                                SuccessOrExit(err2);
-
-                                // End the iteration by returning a CHIP_END_OF_INPUT result.
-                                ExitNow(err2 = CHIP_END_OF_INPUT);
-                            }
-
-                        exit:
-                            return err2;
-                        });
-
-    // Modify error code for return.
-    switch (err)
-    {
-    case CHIP_END_OF_INPUT:
-        err = CHIP_NO_ERROR; // Match found.
-        break;
-    case CHIP_NO_ERROR:
-        err = CHIP_ERROR_KEY_NOT_FOUND; // Match not found.
-        break;
-    default:
-        break;
-    }
-
-    return err;
-}
-
-CHIP_ERROR GroupKeyStoreImpl::StoreGroupKey(const ChipGroupKey & key)
-{
-    CHIP_ERROR err;
-
-    // Delete any existing group key with the same id (this may or may not exit).
-    DeleteGroupKey(key.KeyId); // no error checking here.
-
-    // Iterate over all the GroupKey easyflash records looking for the first
-    // empty easyflash key where we can store the data. (Note- use arg addNewrecord=true)
-    err = ForEachRecord(kConfigKey_GroupKeyBase, kConfigKey_GroupKeyMax, true,
-                        [&key](const Key & efKey, const size_t & length) -> CHIP_ERROR {
-                            CHIP_ERROR err2;
-                            size_t keyLen;
-                            uint8_t buf[kMaxEncodedKeySize]; // (buf length == 45 bytes)
-
-                            // Encode the key for storage in an easyflash record.
-                            err2 = EncodeGroupKey(key, buf, sizeof(buf), keyLen);
-                            SuccessOrExit(err2);
-
-                            // Write the encoded binary data into the easyflash object.
-                            err2 = WriteConfigValueBin(efKey, buf, keyLen);
-                            SuccessOrExit(err2);
-
-                            // End the iteration by returning a CHIP_END_OF_INPUT result.
-                            ExitNow(err2 = CHIP_END_OF_INPUT);
-
-                        exit:
-                            return err2;
-                        });
-
-    // Modify error code for return.
-    switch (err)
-    {
-    case CHIP_END_OF_INPUT:
-        err = CHIP_NO_ERROR; // Key entry was stored.
-        break;
-    case CHIP_NO_ERROR:
-        err = CHIP_ERROR_KEY_NOT_FOUND; // Key entry was not stored.
-        break;
-    default:
-        break;
-    }
-
-    if (err == CHIP_NO_ERROR)
-    {
-#if CHIP_PROGRESS_LOGGING
-        {
-            char extraKeyInfo[32];
-            if (ChipKeyId::IsAppEpochKey(key.KeyId))
-            {
-                snprintf(extraKeyInfo, sizeof(extraKeyInfo), ", start time %" PRId32, key.StartTime);
-            }
-            else if (ChipKeyId::IsAppGroupMasterKey(key.KeyId))
-            {
-                snprintf(extraKeyInfo, sizeof(extraKeyInfo), ", global id 0x%08" PRIX32, key.GlobalId);
-            }
-            else
-            {
-                extraKeyInfo[0] = 0;
-            }
-        }
-
-#endif // CHIP_PROGRESS_LOGGING
-    }
-
-    return err;
-}
-
-CHIP_ERROR GroupKeyStoreImpl::DeleteGroupKey(uint32_t keyId)
-{
-    CHIP_ERROR err;
-
-    // Iterate over all the GroupKey easyflash records looking for a matching key...
-    err = ForEachRecord(kConfigKey_GroupKeyBase, kConfigKey_GroupKeyMax, false,
-                        [keyId](const Key & efKey, const size_t & length) -> CHIP_ERROR {
-                            CHIP_ERROR err2;
-                            size_t keyLen;
-                            uint8_t buf[kMaxEncodedKeySize]; // (buf length == 45 bytes)
-                            uint32_t curKeyId;
-
-                            // Read the easyflash obj binary data data into the buffer.
-                            err2 = ReadConfigValueBin(efKey, buf, sizeof(buf), keyLen);
-                            SuccessOrExit(err2);
-
-                            // Decode the CHIP key id for the current group key.
-                            err2 = DecodeGroupKeyId(buf, keyLen, curKeyId);
-                            SuccessOrExit(err2);
-
-                            // If it matches the key we are looking for, delete the easyflash record.
-                            if (curKeyId == keyId)
-                            {
-                                err2 = ClearConfigValue(efKey);
-                                ChipLogProgress(DeviceLayer, "GroupKeyStore: deleting key 0x%08" PRIX32, curKeyId);
-
-                                // End the iteration by returning a CHIP_END_OF_INPUT result.
-                                ExitNow(err2 = CHIP_END_OF_INPUT);
-                            }
-
-                        exit:
-                            return err2;
-                        });
-
-    // Modify error code for return.
-    switch (err)
-    {
-    case CHIP_END_OF_INPUT:
-        err = CHIP_NO_ERROR; // Key entry was deleted.
-        break;
-    case CHIP_NO_ERROR:
-        err = CHIP_ERROR_KEY_NOT_FOUND; // Key entry was not deleted.
-        break;
-    default:
-        break;
-    }
-
-    return err;
-}
-
-CHIP_ERROR GroupKeyStoreImpl::DeleteGroupKeysOfAType(uint32_t keyType)
-{
-    CHIP_ERROR err;
-
-    // Iterate over all the GroupKey easyflash records looking for a matching key...
-    err = ForEachRecord(kConfigKey_GroupKeyBase, kConfigKey_GroupKeyMax, false,
-                        [keyType](const Key & efKey, const size_t & length) -> CHIP_ERROR {
-                            CHIP_ERROR err2;
-                            size_t keyLen;
-                            uint8_t buf[kMaxEncodedKeySize]; // (buf length == 45 bytes)
-                            uint32_t curKeyId;
-
-                            // Read the easyflash obj binary data data into the buffer.
-                            err2 = ReadConfigValueBin(efKey, buf, sizeof(buf), keyLen);
-                            SuccessOrExit(err2);
-
-                            // Decode the CHIP key id for the current group key.
-                            err2 = DecodeGroupKeyId(buf, keyLen, curKeyId);
-                            SuccessOrExit(err2);
-
-                            // If the current key matches the type we are looking for, delete the easyflash record.
-                            if (ChipKeyId::GetType(curKeyId) == keyType)
-                            {
-                                err2 = ClearConfigValue(efKey);
-                                ChipLogProgress(DeviceLayer, "GroupKeyStore: deleting key 0x%08" PRIX32, curKeyId);
-                            }
-
-                        exit:
-                            return err2;
-                        });
-
-    return err;
-}
-
-CHIP_ERROR GroupKeyStoreImpl::EnumerateGroupKeys(uint32_t keyType, uint32_t * keyIds, uint8_t keyIdsArraySize, uint8_t & keyCount)
-{
-    CHIP_ERROR err;
-
-    keyCount = 0;
-
-    // Iterate over all the GroupKey records looking for keys of the specified type...
-    err = ForEachRecord(kConfigKey_GroupKeyBase, kConfigKey_GroupKeyMax, false,
-                        [keyType, keyIds, keyIdsArraySize, &keyCount](const Key & efKey, const size_t & length) -> CHIP_ERROR {
-                            CHIP_ERROR err2;
-                            size_t keyLen;
-                            uint8_t buf[kMaxEncodedKeySize]; // (buf length == 45 bytes)
-                            uint32_t curKeyId;
-
-                            // Read the easyflash obj binary data data into the buffer.
-                            err2 = ReadConfigValueBin(efKey, buf, sizeof(buf), keyLen);
-                            SuccessOrExit(err2);
-
-                            // Decode the CHIP key id for the current group key.
-                            err2 = DecodeGroupKeyId(buf, keyLen, curKeyId);
-                            SuccessOrExit(err2);
-
-                            // If the current key matches the type we're looking for, add it to the keyIds array.
-                            if ((keyType == ChipKeyId::kType_None) || (ChipKeyId::GetType(curKeyId) == keyType))
-                            {
-                                keyIds[keyCount++] = curKeyId;
-
-                                // Stop iterating if there's no more room in the keyIds array.
-                                VerifyOrExit(keyCount < keyIdsArraySize, err2 = CHIP_ERROR_BUFFER_TOO_SMALL);
-                            }
-
-                        exit:
-                            return err2;
-                        });
-
-    // Simply return a truncated list if there are more matching keys than will fit in the array.
-    if (err == CHIP_ERROR_BUFFER_TOO_SMALL)
-    {
-        err = CHIP_NO_ERROR;
-    }
-
-    return err;
-}
-
-CHIP_ERROR GroupKeyStoreImpl::Clear(void)
-{
-    CHIP_ERROR err;
-
-    // Iterate over all the GroupKey easyflash records deleting each one...
-    err = ForEachRecord(kConfigKey_GroupKeyBase, kConfigKey_GroupKeyMax, false,
-                        [](const Key & efKey, const size_t & length) -> CHIP_ERROR {
-                            CHIP_ERROR err2;
-
-                            err2 = ClearConfigValue(efKey);
-                            SuccessOrExit(err2);
-
-                        exit:
-                            return err2;
-                        });
-
-    return err;
-}
-
-CHIP_ERROR GroupKeyStoreImpl::RetrieveLastUsedEpochKeyId(void)
-{
-    CHIP_ERROR err;
-
-    err = ReadConfigValue(kConfigKey_LastUsedEpochKeyId, LastUsedEpochKeyId);
-    if (err == CHIP_DEVICE_ERROR_CONFIG_NOT_FOUND)
-    {
-        LastUsedEpochKeyId = ChipKeyId::kNone;
-        err                = CHIP_NO_ERROR;
-    }
-    return err;
-}
-
-CHIP_ERROR GroupKeyStoreImpl::StoreLastUsedEpochKeyId(void)
-{
-    return WriteConfigValue(kConfigKey_LastUsedEpochKeyId, LastUsedEpochKeyId);
-}
-
-CHIP_ERROR GroupKeyStoreImpl::Init()
-{
-    // Nothing to do
-    return CHIP_NO_ERROR;
-}
-
-CHIP_ERROR GroupKeyStoreImpl::EncodeGroupKey(const ChipGroupKey & key, uint8_t * buf, size_t bufSize, size_t & encodedKeyLen)
-{
-    CHIP_ERROR err = CHIP_NO_ERROR;
-    uint8_t * p    = buf;
-
-    VerifyOrExit(bufSize >= kFixedEncodedKeySize + key.KeyLen, err = CHIP_ERROR_BUFFER_TOO_SMALL);
-
-    Encoding::LittleEndian::Write32(p, key.KeyId);
-    Encoding::LittleEndian::Write32(p, key.StartTime);
-    Encoding::Write8(p, key.KeyLen);
-    memcpy(p, key.Key, key.KeyLen);
-    p += key.KeyLen;
-
-    encodedKeyLen = p - buf;
-
-exit:
-    return err;
-}
-
-CHIP_ERROR GroupKeyStoreImpl::DecodeGroupKeyId(const uint8_t * encodedKey, size_t encodedKeyLen, uint32_t & keyId)
-{
-    CHIP_ERROR err = CHIP_NO_ERROR;
-
-    VerifyOrExit(encodedKeyLen >= kFixedEncodedKeySize, err = CHIP_ERROR_INVALID_ARGUMENT);
-
-    keyId = Encoding::LittleEndian::Get32(encodedKey);
-
-exit:
-    return err;
-}
-
-CHIP_ERROR GroupKeyStoreImpl::DecodeGroupKey(const uint8_t * encodedKey, size_t encodedKeyLen, ChipGroupKey & key)
-{
-    CHIP_ERROR err    = CHIP_NO_ERROR;
-    const uint8_t * p = encodedKey;
-
-    VerifyOrExit(encodedKeyLen >= kFixedEncodedKeySize, err = CHIP_ERROR_INVALID_ARGUMENT);
-
-    key.KeyId     = Encoding::LittleEndian::Read32(p);
-    key.StartTime = Encoding::LittleEndian::Read32(p);
-    key.KeyLen    = Encoding::Read8(p);
-
-    VerifyOrExit(encodedKeyLen >= kFixedEncodedKeySize + key.KeyLen, err = CHIP_ERROR_INVALID_ARGUMENT);
-
-    memcpy(key.Key, p, key.KeyLen);
-
-exit:
-    return err;
-}
-
-} // namespace Internal
-} // namespace DeviceLayer
-} // namespace chip
diff --git a/src/platform/bouffalolab/BL602/GroupKeyStoreImpl.h b/src/platform/bouffalolab/BL602/GroupKeyStoreImpl.h
deleted file mode 100644
index 5831594dc907b5..00000000000000
--- a/src/platform/bouffalolab/BL602/GroupKeyStoreImpl.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- *
- *    Copyright (c) 2021 Project CHIP Authors
- *    Copyright (c) 2019 Nest Labs, Inc.
- *
- *    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.
- */
-
-/**
- *    @file
- *          Provides an implementation of the Chip Group Key Store interface
- *          for platforms based on the Bouffalolab SDK.
- */
-
-#include <Core/CHIPKeyIds.h>
-#include <platform/Profiles/security/ChipApplicationKeys.h>
-#include <platform/bouffalolab/BL602/BL602Config.h>
-#include <platform/internal/CHIPDeviceLayerInternal.h>
-
-namespace chip {
-namespace DeviceLayer {
-namespace Internal {
-
-/**
- * An implementation of the Chip GroupKeyStoreBase API for platforms based
- * on the Bouffalolab SDK.
- */
-class GroupKeyStoreImpl final : public ::chip::Profiles::Security::AppKeys::GroupKeyStoreBase, private BL602Config
-{
-    using ChipGroupKey = ::chip::Profiles::Security::AppKeys::ChipGroupKey;
-
-public:
-    CHIP_ERROR Init();
-
-    CHIP_ERROR RetrieveGroupKey(uint32_t keyId, ChipGroupKey & key) override;
-    CHIP_ERROR StoreGroupKey(const ChipGroupKey & key) override;
-    CHIP_ERROR DeleteGroupKey(uint32_t keyId) override;
-    CHIP_ERROR DeleteGroupKeysOfAType(uint32_t keyType) override;
-    CHIP_ERROR EnumerateGroupKeys(uint32_t keyType, uint32_t * keyIds, uint8_t keyIdsArraySize, uint8_t & keyCount) override;
-    CHIP_ERROR Clear(void) override;
-    CHIP_ERROR RetrieveLastUsedEpochKeyId(void) override;
-    CHIP_ERROR StoreLastUsedEpochKeyId(void) override;
-
-private:
-    static constexpr size_t kFixedEncodedKeySize = 4U + // key id
-        4U +                                            // start time / global id
-        1U;                                             // key data length
-
-    static constexpr size_t kMaxEncodedKeySize = kFixedEncodedKeySize + ChipGroupKey::MaxKeySize;
-
-    /* Not used
-    static constexpr uint16_t kGroupKeyFileId =     GetFileId(kConfigKey_GroupKey);
-    static constexpr uint16_t kGroupKeyRecordKey =  GetRecordKey(kConfigKey_GroupKey);
-    */
-
-    static CHIP_ERROR EncodeGroupKey(const ChipGroupKey & key, uint8_t * buf, size_t bufSize, size_t & encodedKeyLen);
-    static CHIP_ERROR DecodeGroupKey(const uint8_t * encodedKey, size_t encodedKeyLen, ChipGroupKey & key);
-    static CHIP_ERROR DecodeGroupKeyId(const uint8_t * encodedKey, size_t encodedKeyLen, uint32_t & keyId);
-};
-
-} // namespace Internal
-} // namespace DeviceLayer
-} // namespace chip
diff --git a/src/platform/bouffalolab/BL602/NetworkCommissioningWiFiDriver.cpp b/src/platform/bouffalolab/BL602/NetworkCommissioningWiFiDriver.cpp
deleted file mode 100644
index c469c5a90edb01..00000000000000
--- a/src/platform/bouffalolab/BL602/NetworkCommissioningWiFiDriver.cpp
+++ /dev/null
@@ -1,368 +0,0 @@
-/*
- *
- *    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.
- */
-
-#include <aos/yloop.h>
-#include <hal_wifi.h>
-#include <lib/support/CodeUtils.h>
-#include <lib/support/SafeInt.h>
-#include <lwip/tcpip.h>
-#include <platform/CHIPDeviceLayer.h>
-#include <platform/bouffalolab/BL602/NetworkCommissioningDriver.h>
-#include <wifi_mgmr_ext.h>
-
-#include <limits>
-#include <string>
-
-using namespace ::chip;
-// #if CHIP_DEVICE_CONFIG_ENABLE_WIFI
-namespace chip {
-namespace DeviceLayer {
-namespace NetworkCommissioning {
-
-namespace {
-constexpr char kWiFiSSIDKeyName[]        = "wifi-ssid";
-constexpr char kWiFiCredentialsKeyName[] = "wifi-pass";
-
-constexpr char blWiFiSSIDKeyName[]        = "bl-wifi-ssid";
-constexpr char blWiFiCredentialsKeyName[] = "bl-wifi-pass";
-
-static uint8_t WiFiSSIDStr[DeviceLayer::Internal::kMaxWiFiSSIDLength];
-} // namespace
-
-CHIP_ERROR BLWiFiDriver::Init()
-{
-    CHIP_ERROR err;
-    size_t ssidLen        = 0;
-    size_t credentialsLen = 0;
-
-    err = PersistedStorage::KeyValueStoreMgr().Get(kWiFiCredentialsKeyName, mSavedNetwork.credentials,
-                                                   sizeof(mSavedNetwork.credentials), &credentialsLen);
-    if (err == CHIP_ERROR_NOT_FOUND)
-    {
-        return CHIP_NO_ERROR;
-    }
-
-    err = PersistedStorage::KeyValueStoreMgr().Get(kWiFiSSIDKeyName, mSavedNetwork.ssid, sizeof(mSavedNetwork.ssid), &ssidLen);
-    if (err == CHIP_ERROR_NOT_FOUND)
-    {
-        return CHIP_NO_ERROR;
-    }
-    mSavedNetwork.credentialsLen = credentialsLen;
-    mSavedNetwork.ssidLen        = ssidLen;
-
-    mStagingNetwork   = mSavedNetwork;
-    mpScanCallback    = nullptr;
-    mpConnectCallback = nullptr;
-
-    return err;
-}
-
-void BLWiFiDriver::Shutdown() {}
-
-CHIP_ERROR BLWiFiDriver::CommitConfiguration()
-{
-    ReturnErrorOnFailure(PersistedStorage::KeyValueStoreMgr().Put(kWiFiSSIDKeyName, mStagingNetwork.ssid, mStagingNetwork.ssidLen));
-    ReturnErrorOnFailure(PersistedStorage::KeyValueStoreMgr().Put(kWiFiCredentialsKeyName, mStagingNetwork.credentials,
-                                                                  mStagingNetwork.credentialsLen));
-    mSavedNetwork = mStagingNetwork;
-    return CHIP_NO_ERROR;
-}
-
-CHIP_ERROR BLWiFiDriver::SaveConfiguration()
-{
-    if (NULL == mStagingNetwork.ssid || 0 == mStagingNetwork.ssidLen || NULL == mStagingNetwork.credentials ||
-        0 == mStagingNetwork.credentialsLen)
-    {
-        return CHIP_ERROR_KEY_NOT_FOUND;
-    }
-
-    ReturnErrorOnFailure(
-        PersistedStorage::KeyValueStoreMgr().Put(blWiFiSSIDKeyName, mStagingNetwork.ssid, mStagingNetwork.ssidLen));
-    ReturnErrorOnFailure(PersistedStorage::KeyValueStoreMgr().Put(blWiFiCredentialsKeyName, mStagingNetwork.credentials,
-                                                                  mStagingNetwork.credentialsLen));
-    return CHIP_NO_ERROR;
-}
-
-CHIP_ERROR BLWiFiDriver::RevertConfiguration()
-{
-    mStagingNetwork = mSavedNetwork;
-    return CHIP_NO_ERROR;
-}
-
-bool BLWiFiDriver::NetworkMatch(const WiFiNetwork & network, ByteSpan networkId)
-{
-    return networkId.size() == network.ssidLen && memcmp(networkId.data(), network.ssid, network.ssidLen) == 0;
-}
-
-Status BLWiFiDriver::AddOrUpdateNetwork(ByteSpan ssid, ByteSpan credentials)
-{
-    VerifyOrReturnError(mStagingNetwork.ssidLen == 0 || NetworkMatch(mStagingNetwork, ssid), Status::kBoundsExceeded);
-    VerifyOrReturnError(credentials.size() <= sizeof(mStagingNetwork.credentials), Status::kOutOfRange);
-    VerifyOrReturnError(ssid.size() <= sizeof(mStagingNetwork.ssid), Status::kOutOfRange);
-
-    memcpy(mStagingNetwork.credentials, credentials.data(), credentials.size());
-    mStagingNetwork.credentialsLen = static_cast<decltype(mStagingNetwork.credentialsLen)>(credentials.size());
-
-    memcpy(mStagingNetwork.ssid, ssid.data(), ssid.size());
-    mStagingNetwork.ssidLen = static_cast<decltype(mStagingNetwork.ssidLen)>(ssid.size());
-
-    return Status::kSuccess;
-}
-
-Status BLWiFiDriver::RemoveNetwork(ByteSpan networkId)
-{
-    VerifyOrReturnError(NetworkMatch(mStagingNetwork, networkId), Status::kNetworkIDNotFound);
-
-    // Use empty ssid for representing invalid network
-    mStagingNetwork.ssidLen = 0;
-    return Status::kSuccess;
-}
-
-Status BLWiFiDriver::ReorderNetwork(ByteSpan networkId, uint8_t index)
-{
-    // Only one network is supported now
-    VerifyOrReturnError(index == 0, Status::kOutOfRange);
-    VerifyOrReturnError(NetworkMatch(mStagingNetwork, networkId), Status::kNetworkIDNotFound);
-    return Status::kSuccess;
-}
-
-CHIP_ERROR BLWiFiDriver::ConnectWiFiNetwork(const char * ssid, uint8_t ssidLen, const char * key, uint8_t keyLen)
-{
-    // ReturnErrorOnFailure(ConnectivityMgr().SetWiFiStationMode(ConnectivityManager::kWiFiStationMode_Disabled));
-
-    char wifi_ssid[64] = { 0 };
-    char passwd[64]    = { 0 };
-    // Set the wifi configuration
-    memcpy(wifi_ssid, ssid, ssidLen);
-    memcpy(passwd, key, keyLen);
-    wifi_interface_t wifi_interface;
-    wifi_interface = wifi_mgmr_sta_enable();
-    wifi_mgmr_sta_connect(wifi_interface, ssid, passwd, NULL, NULL, 0, 0);
-
-    // Configure the WiFi interface.
-    ReturnErrorOnFailure(ConnectivityMgr().SetWiFiStationMode(ConnectivityManager::kWiFiStationMode_Disabled));
-
-    return ConnectivityMgr().SetWiFiStationMode(ConnectivityManager::kWiFiStationMode_Enabled);
-}
-
-CHIP_ERROR BLWiFiDriver::ReConnectWiFiNetwork(void)
-{
-    char ssid[64]  = { 0 };
-    char psk[64]   = { 0 };
-    size_t ssidLen = 0;
-    size_t pskLen  = 0;
-
-    ReturnErrorOnFailure(
-        PersistedStorage::KeyValueStoreMgr().Get((const char *) blWiFiSSIDKeyName, (void *) ssid, 64, &ssidLen, 0));
-    ReturnErrorOnFailure(
-        PersistedStorage::KeyValueStoreMgr().Get((const char *) blWiFiCredentialsKeyName, (void *) psk, 64, &pskLen, 0));
-
-    ConnectWiFiNetwork(ssid, ssidLen, psk, pskLen);
-
-    return CHIP_NO_ERROR;
-}
-
-void BLWiFiDriver::OnConnectWiFiNetwork()
-{
-    if (mpConnectCallback)
-    {
-        mpConnectCallback->OnResult(Status::kSuccess, CharSpan(), 0);
-        mpConnectCallback = nullptr;
-    }
-}
-
-void BLWiFiDriver::ConnectNetwork(ByteSpan networkId, ConnectCallback * callback)
-{
-    CHIP_ERROR err          = CHIP_NO_ERROR;
-    Status networkingStatus = Status::kSuccess;
-    static int save         = 0;
-
-    // VerifyOrExit(NetworkMatch(mStagingNetwork, networkId), networkingStatus = Status::kNetworkIDNotFound);
-    // VerifyOrExit(mpConnectCallback == nullptr, networkingStatus = Status::kUnknownError);
-    ChipLogProgress(NetworkProvisioning, "BL NetworkCommissioningDelegate: SSID: %.*s", static_cast<int>(networkId.size()),
-                    networkId.data());
-
-    err               = ConnectWiFiNetwork(reinterpret_cast<const char *>(mStagingNetwork.ssid), mStagingNetwork.ssidLen,
-                             reinterpret_cast<const char *>(mStagingNetwork.credentials), mStagingNetwork.credentialsLen);
-    mpConnectCallback = callback;
-
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
-        networkingStatus = Status::kUnknownError;
-    }
-    if (networkingStatus != Status::kSuccess)
-    {
-        ChipLogError(NetworkProvisioning, "Failed to connect to WiFi network:%s", chip::ErrorStr(err));
-        mpConnectCallback = nullptr;
-        callback->OnResult(networkingStatus, CharSpan(), 0);
-    }
-}
-
-#if 0
-CHIP_ERROR ESPWiFiDriver::StartScanWiFiNetworks(ByteSpan ssid)
-{
-    esp_err_t err = ESP_OK;
-    if (!ssid.empty())
-    {
-        wifi_scan_config_t scan_config = { 0 };
-        memset(WiFiSSIDStr, 0, sizeof(WiFiSSIDStr));
-        memcpy(WiFiSSIDStr, ssid.data(), ssid.size());
-        scan_config.ssid = WiFiSSIDStr;
-        err              = esp_wifi_scan_start(&scan_config, false);
-    }
-    else
-    {
-        err = esp_wifi_scan_start(NULL, false);
-    }
-    if (err != ESP_OK)
-    {
-        return chip::DeviceLayer::Internal::ESP32Utils::MapError(err);
-    }
-    return CHIP_NO_ERROR;
-}
-#endif
-
-#if 0
-void ESPWiFiDriver::OnScanWiFiNetworkDone()
-{
-    uint16_t ap_number;
-    esp_wifi_scan_get_ap_num(&ap_number);
-    if (!ap_number)
-    {
-        ChipLogProgress(DeviceLayer, "No AP found");
-        if (mpScanCallback != nullptr)
-        {
-            mpScanCallback->OnFinished(Status::kSuccess, CharSpan(), nullptr);
-            mpScanCallback = nullptr;
-        }
-        return;
-    }
-    std::unique_ptr<wifi_ap_record_t[]> ap_buffer_ptr(new wifi_ap_record_t[ap_number]);
-    if (ap_buffer_ptr == NULL)
-    {
-        ChipLogError(DeviceLayer, "can't malloc memory for ap_list_buffer");
-        if (mpScanCallback)
-        {
-            mpScanCallback->OnFinished(Status::kUnknownError, CharSpan(), nullptr);
-            mpScanCallback = nullptr;
-        }
-        return;
-    }
-    wifi_ap_record_t * ap_list_buffer = ap_buffer_ptr.get();
-    if (esp_wifi_scan_get_ap_records(&ap_number, ap_list_buffer) == ESP_OK)
-    {
-        if (CHIP_NO_ERROR == DeviceLayer::SystemLayer().ScheduleLambda([ap_number, ap_list_buffer]() {
-                std::unique_ptr<wifi_ap_record_t[]> auto_free(ap_list_buffer);
-                ESPScanResponseIterator iter(ap_number, ap_list_buffer);
-                if (GetInstance().mpScanCallback)
-                {
-                    GetInstance().mpScanCallback->OnFinished(Status::kSuccess, CharSpan(), &iter);
-                    GetInstance().mpScanCallback = nullptr;
-                }
-                else
-                {
-                    ChipLogError(DeviceLayer, "can't find the ScanCallback function");
-                }
-            }))
-        {
-            ap_buffer_ptr.release();
-        }
-    }
-    else
-    {
-        ChipLogError(DeviceLayer, "can't get ap_records ");
-        if (mpScanCallback)
-        {
-            mpScanCallback->OnFinished(Status::kUnknownError, CharSpan(), nullptr);
-            mpScanCallback = nullptr;
-        }
-    }
-}
-#endif
-
-void BLWiFiDriver::ScanNetworks(ByteSpan ssid, WiFiDriver::ScanCallback * callback)
-{
-#if 0
-    if (callback != nullptr)
-    {
-        mpScanCallback = callback;
-        if (StartScanWiFiNetworks(ssid) != CHIP_NO_ERROR)
-        {
-            mpScanCallback = nullptr;
-            callback->OnFinished(Status::kUnknownError, CharSpan(), nullptr);
-        }
-    }
-#endif
-}
-
-#if 0
-CHIP_ERROR GetConnectedNetwork(Network & network)
-{
-    wifi_ap_record_t ap_info;
-    esp_err_t err;
-    err = esp_wifi_sta_get_ap_info(&ap_info);
-    if (err != ESP_OK)
-    {
-        return chip::DeviceLayer::Internal::ESP32Utils::MapError(err);
-    }
-    uint8_t length = strnlen(reinterpret_cast<const char *>(ap_info.ssid), DeviceLayer::Internal::kMaxWiFiSSIDLength);
-    if (length > sizeof(network.networkID))
-    {
-        return CHIP_ERROR_INTERNAL;
-    }
-    memcpy(network.networkID, ap_info.ssid, length);
-    network.networkIDLen = length;
-    return CHIP_NO_ERROR;
-}
-#endif
-
-size_t BLWiFiDriver::WiFiNetworkIterator::Count()
-{
-    return mDriver->mStagingNetwork.ssidLen == 0 ? 0 : 1;
-}
-
-bool BLWiFiDriver::WiFiNetworkIterator::Next(Network & item)
-{
-#if 0
-    if (mExhausted || mDriver->mStagingNetwork.ssidLen == 0)
-    {
-        return false;
-    }
-    memcpy(item.networkID, mDriver->mStagingNetwork.ssid, mDriver->mStagingNetwork.ssidLen);
-    item.networkIDLen = mDriver->mStagingNetwork.ssidLen;
-    item.connected    = false;
-    mExhausted        = true;
-
-    Network connectedNetwork;
-    CHIP_ERROR err = GetConnectedNetwork(connectedNetwork);
-    if (err == CHIP_NO_ERROR)
-    {
-        if (connectedNetwork.networkIDLen == item.networkIDLen &&
-            memcmp(connectedNetwork.networkID, item.networkID, item.networkIDLen) == 0)
-        {
-            item.connected = true;
-        }
-    }
-#endif
-    return true;
-}
-
-} // namespace NetworkCommissioning
-} // namespace DeviceLayer
-} // namespace chip
-// #endif // CHIP_DEVICE_CONFIG_ENABLE_WIFI
diff --git a/src/platform/bouffalolab/BL602/PlatformManagerImpl.cpp b/src/platform/bouffalolab/BL602/PlatformManagerImpl.cpp
index 16fad1b9ffcf5f..86b4421eb751f1 100644
--- a/src/platform/bouffalolab/BL602/PlatformManagerImpl.cpp
+++ b/src/platform/bouffalolab/BL602/PlatformManagerImpl.cpp
@@ -77,6 +77,8 @@ static void WifiStaDisconect(void)
         return;
     }
 
+    ChipLogError(DeviceLayer, "WiFi station disconnect, reason %d.", reason);
+
     switch (reason)
     {
     case WLAN_FW_TX_ASSOC_FRAME_ALLOCATE_FAIILURE:
@@ -178,14 +180,22 @@ void OnWiFiPlatformEvent(input_event_t * event, void * private_data)
     case CODE_WIFI_ON_MGMR_DONE: {
     }
     break;
+    case CODE_WIFI_ON_CONNECTED: {
+        ChipLogProgress(DeviceLayer, "WiFi station connected.");
+    }
+    break;
     case CODE_WIFI_ON_SCAN_DONE: {
         chip::DeviceLayer::PlatformMgr().LockChipStack();
         NetworkCommissioning::BLWiFiDriver::GetInstance().OnScanWiFiNetworkDone();
         chip::DeviceLayer::PlatformMgr().UnlockChipStack();
     }
     break;
+    case CODE_WIFI_ON_CONNECTING: {
+        ChipLogProgress(DeviceLayer, "WiFi station starts connecting.");
+    }
+    break;
     case CODE_WIFI_ON_DISCONNECT: {
-        log_info("[APP] [EVT] disconnect %lld, Reason: %s\r\n", aos_now_ms(), wifi_mgmr_status_code_str(event->value));
+        ChipLogProgress(DeviceLayer, "WiFi station disconnect, reason %s.", wifi_mgmr_status_code_str(event->value));
 
         chip::DeviceLayer::PlatformMgr().LockChipStack();
         WifiStaDisconect();
@@ -193,11 +203,12 @@ void OnWiFiPlatformEvent(input_event_t * event, void * private_data)
     }
     break;
     case CODE_WIFI_CMD_RECONNECT: {
-        log_info("[APP] [EVT] Reconnect %lld\r\n", aos_now_ms());
+        ChipLogProgress(DeviceLayer, "WiFi station reconnect.");
     }
     break;
     case CODE_WIFI_ON_GOT_IP: {
-        log_info("[APP] [EVT] GOT IP %lld\r\n", aos_now_ms());
+
+        ChipLogProgress(DeviceLayer, "WiFi station gets IPv4 address.");
 
         chip::DeviceLayer::PlatformMgr().LockChipStack();
         WifiStaConnected();
@@ -205,14 +216,15 @@ void OnWiFiPlatformEvent(input_event_t * event, void * private_data)
     }
     break;
     case CODE_WIFI_ON_GOT_IP6: {
-        log_info("[APP] [EVT] GOT IP6 %lld\r\n", aos_now_ms());
+        ChipLogProgress(DeviceLayer, "WiFi station gets IPv6 address.");
+
         chip::DeviceLayer::PlatformMgr().LockChipStack();
         ConnectivityMgrImpl().OnIPv6AddressAvailable();
         chip::DeviceLayer::PlatformMgr().UnlockChipStack();
     }
     break;
     default: {
-        log_info("[APP] [EVT] Unknown code %u, %lld\r\n", event->code, aos_now_ms());
+        ChipLogProgress(DeviceLayer, "WiFi station gets unknow code %u.", event->code);
         /*nothing*/
     }
     }
@@ -234,7 +246,7 @@ CHIP_ERROR PlatformManagerImpl::_InitChipStack(void)
 
     if (1 == stack_wifi_init)
     {
-        log_error("Wi-Fi already initialized!\r\n");
+        ChipLogError(DeviceLayer, "Wi-Fi already initialized!");
         return CHIP_NO_ERROR;
     }
 
diff --git a/src/platform/bouffalolab/BL602/SoftwareUpdateManagerImpl.cpp b/src/platform/bouffalolab/BL602/SoftwareUpdateManagerImpl.cpp
deleted file mode 100644
index 993a009ea7b890..00000000000000
--- a/src/platform/bouffalolab/BL602/SoftwareUpdateManagerImpl.cpp
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- *
- *    Copyright (c) 2020 Project CHIP Authors
- *    Copyright (c) 2019 Google LLC.
- *
- *    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 behaves like a config.h, comes first */
-#include <platform/internal/CHIPDeviceLayerInternal.h>
-
-#if CHIP_DEVICE_CONFIG_ENABLE_SOFTWARE_UPDATE_MANAGER
-
-#include <platform/internal/GenericSoftwareUpdateManagerImpl.cpp>
-#include <platform/internal/GenericSoftwareUpdateManagerImpl_BDX.cpp>
-
-#include <platform/Profiles/CHIPProfiles.h>
-#include <platform/Profiles/common/CommonProfile.h>
-
-namespace chip {
-namespace DeviceLayer {
-
-SoftwareUpdateManagerImpl SoftwareUpdateManagerImpl::sInstance;
-
-CHIP_ERROR SoftwareUpdateManagerImpl::_Init(void)
-{
-    Internal::GenericSoftwareUpdateManagerImpl_BDX<SoftwareUpdateManagerImpl>::DoInit();
-    Internal::GenericSoftwareUpdateManagerImpl<SoftwareUpdateManagerImpl>::DoInit();
-
-    return CHIP_NO_ERROR;
-}
-
-} // namespace DeviceLayer
-} // namespace chip
-
-#endif // CHIP_DEVICE_CONFIG_ENABLE_SOFTWARE_UPDATE_MANAGER
diff --git a/src/platform/bouffalolab/BL602/SoftwareUpdateManagerImpl.h b/src/platform/bouffalolab/BL602/SoftwareUpdateManagerImpl.h
deleted file mode 100644
index 1d2d366611f8c7..00000000000000
--- a/src/platform/bouffalolab/BL602/SoftwareUpdateManagerImpl.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- *
- *    Copyright (c) 2021 Project CHIP Authors
- *    Copyright (c) 2019 Google LLC.
- *
- *    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.
- */
-
-#pragma once
-
-#if CHIP_DEVICE_CONFIG_ENABLE_SOFTWARE_UPDATE_MANAGER
-
-#include <platform/internal/GenericSoftwareUpdateManagerImpl.h>
-#include <platform/internal/GenericSoftwareUpdateManagerImpl_BDX.h>
-
-namespace chip {
-namespace DeviceLayer {
-
-/**
- * Concrete implementation of the SoftwareUpdateManager singleton object for the
- * Bouffalolab BL602 platforms.
- */
-class SoftwareUpdateManagerImpl final : public SoftwareUpdateManager,
-                                        public Internal::GenericSoftwareUpdateManagerImpl<SoftwareUpdateManagerImpl>,
-                                        public Internal::GenericSoftwareUpdateManagerImpl_BDX<SoftwareUpdateManagerImpl>
-{
-    // Allow the SoftwareUpdateManager interface class to delegate method calls to
-    // the implementation methods provided by this class.
-    friend class SoftwareUpdateManager;
-
-    // Allow the GenericSoftwareUpdateManagerImpl base class to access helper methods
-    // and types defined on this class.
-    friend class Internal::GenericSoftwareUpdateManagerImpl<SoftwareUpdateManagerImpl>;
-
-    // Allow the GenericSoftwareUpdateManagerImpl_BDX base class to access helper methods
-    // and types defined on this class.
-    friend class Internal::GenericSoftwareUpdateManagerImpl_BDX<SoftwareUpdateManagerImpl>;
-
-public:
-    // ===== Members for internal use by the following friends.
-
-    friend ::chip::DeviceLayer::SoftwareUpdateManager & SoftwareUpdateMgr(void);
-    friend SoftwareUpdateManagerImpl & SoftwareUpdateMgrImpl(void);
-
-    static SoftwareUpdateManagerImpl sInstance;
-
-private:
-    // ===== Members that implement the SoftwareUpdateManager abstract interface.
-
-    CHIP_ERROR _Init(void);
-};
-
-/**
- * Returns a reference to the public interface of the SoftwareUpdateManager singleton object.
- *
- * Internal components should use this to access features of the SoftwareUpdateManager object
- * that are common to all platforms.
- */
-inline SoftwareUpdateManager & SoftwareUpdateMgr(void)
-{
-    return SoftwareUpdateManagerImpl::sInstance;
-}
-
-/**
- * Returns the platform-specific implementation of the SoftwareUpdateManager singleton object.
- *
- * Internal components can use this to gain access to features of the SoftwareUpdateManager
- * that are specific to the BL602 platform.
- */
-inline SoftwareUpdateManagerImpl & SoftwareUpdateMgrImpl(void)
-{
-    return SoftwareUpdateManagerImpl::sInstance;
-}
-
-} // namespace DeviceLayer
-} // namespace chip
-
-#endif // CHIP_DEVICE_CONFIG_ENABLE_SOFTWARE_UPDATE_MANAGER
diff --git a/src/platform/bouffalolab/BL602/WarmPlatformConfig.h b/src/platform/bouffalolab/BL602/WarmPlatformConfig.h
deleted file mode 100644
index 05665b04a0229b..00000000000000
--- a/src/platform/bouffalolab/BL602/WarmPlatformConfig.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- *
- *    Copyright (c) 2021 Project CHIP Authors
- *    Copyright (c) 2019 Google LLC.
- *
- *    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.
- */
-
-/**
- *    @file
- *          Platform-specific configuration overrides for the Chip
- *          Addressing and Routing Module (WARM) on BL602 platforms
- *          using the Bouffalolab SDK.
- *
- */
-
-#pragma once
-
-// ==================== Platform Adaptations ====================
-
-#define WARM_CONFIG_SUPPORT_THREAD 1
-#define WARM_CONFIG_SUPPORT_THREAD_ROUTING 0
-#define WARM_CONFIG_SUPPORT_LEGACY6LOWPAN_NETWORK 0
-#define WARM_CONFIG_SUPPORT_WIFI 0
-#define WARM_CONFIG_SUPPORT_CELLULAR 0
-
-// ========== Platform-specific Configuration Overrides =========
-
-/* none so far */
diff --git a/src/platform/bouffalolab/BL602/gatt.xml b/src/platform/bouffalolab/BL602/gatt.xml
deleted file mode 100644
index 4cc1351b399117..00000000000000
--- a/src/platform/bouffalolab/BL602/gatt.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!--
- *
- *    Copyright (c) 2021 Project CHIP Authors
- *    Copyright (c) 2020 Google LLC.
- *
- *    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.
- -->
-
-<!--Custom BLE GATT-->
-<gatt gatt_caching="true" generic_attribute_service="true" header="gatt_db.h" name="Custom BLE GATT" out="gatt_db.c" prefix="gattdb_">
-
-  <!--Generic Access-->
-  <service advertise="false" name="Generic Access" requirement="mandatory" sourceId="org.bluetooth.service.generic_access" type="primary" uuid="1800">
-    <informativeText>Abstract: The generic_access service contains generic information about the device. All available Characteristics are readonly. </informativeText>
-
-    <!--Device Name-->
-    <characteristic id="device_name" name="Device Name" sourceId="org.bluetooth.characteristic.gap.device_name" uuid="2A00">
-      <informativeText/>
-      <value length="13" type="utf-8" variable_length="false">Empty Example</value>
-      <properties read="true" read_requirement="optional" write="true" write_requirement="optional"/>
-    </characteristic>
-
-    <!--Appearance-->
-    <characteristic name="Appearance" sourceId="org.bluetooth.characteristic.gap.appearance" uuid="2A01">
-      <informativeText>Abstract: The external appearance of this device. The values are composed of a category (10-bits) and sub-categories (6-bits). </informativeText>
-      <value length="2" type="hex" variable_length="false">0000</value>
-      <properties const="true" const_requirement="optional" read="true" read_requirement="optional"/>
-    </characteristic>
-  </service>
-
-  <!--Device Information-->
-  <service advertise="false" name="Device Information" requirement="mandatory" sourceId="org.bluetooth.service.device_information" type="primary" uuid="180A">
-    <informativeText>Abstract: The Device Information Service exposes manufacturer and/or vendor information about a device. Summary: This service exposes manufacturer information about a device. The Device Information Service is instantiated as a Primary Service. Only one instance of the Device Information Service is exposed on a device. </informativeText>
-
-    <!--Manufacturer Name String-->
-    <characteristic name="Manufacturer Name String" sourceId="org.bluetooth.characteristic.manufacturer_name_string" uuid="2A29">
-      <informativeText>Abstract: The value of this characteristic is a UTF-8 string representing the name of the manufacturer of the device. </informativeText>
-      <value length="12" type="utf-8" variable_length="false">Bouffalolab</value>
-      <properties const="true" const_requirement="optional" read="true" read_requirement="optional"/>
-    </characteristic>
-
-    <!--Model Number String-->
-    <characteristic name="Model Number String" sourceId="org.bluetooth.characteristic.model_number_string" uuid="2A24">
-      <informativeText>Abstract: The value of this characteristic is a UTF-8 string representing the model number assigned by the device vendor. </informativeText>
-      <value length="10" type="utf-8" variable_length="false">Blue Gecko</value>
-      <properties const="true" const_requirement="optional" read="true" read_requirement="optional"/>
-    </characteristic>
-
-    <!--System ID-->
-    <characteristic name="System ID" sourceId="org.bluetooth.characteristic.system_id" uuid="2A23">
-      <informativeText>Abstract: The SYSTEM ID characteristic consists of a structure with two fields. The first field are the LSOs and the second field contains the MSOs.       This is a 64-bit structure which consists of a 40-bit manufacturer-defined identifier concatenated with a 24 bit unique Organizationally Unique Identifier (OUI). The OUI is issued by the IEEE Registration Authority (http://standards.ieee.org/regauth/index.html) and is required to be used in accordance with IEEE Standard 802-2001.6 while the least significant 40 bits are manufacturer defined.       If System ID generated based on a Bluetooth Device Address, it is required to be done as follows. System ID and the Bluetooth Device Address have a very similar structure: a Bluetooth Device Address is 48 bits in length and consists of a 24 bit Company Assigned Identifier (manufacturer defined identifier) concatenated with a 24 bit Company Identifier (OUI). In order to encapsulate a Bluetooth Device Address as System ID, the Company Identifier is concatenated with 0xFFFE followed by the Company Assigned Identifier of the Bluetooth Address. For more guidelines related to EUI-64, refer to http://standards.ieee.org/develop/regauth/tut/eui64.pdf. Examples: If the system ID is based of a Bluetooth Device Address with a Company Identifier (OUI) is 0x123456 and the Company Assigned Identifier is 0x9ABCDE, then the System Identifier is required to be 0x123456FFFE9ABCDE. </informativeText>
-      <value length="6" type="hex" variable_length="false">000102030405</value>
-      <properties const="true" const_requirement="optional" read="true" read_requirement="optional"/>
-    </characteristic>
-  </service>
-
-  <!--Bouffalolab OTA-->
-  <service advertise="false" name="Bouffalolab OTA" requirement="mandatory" sourceId="com.silabs.service.ota" type="primary" uuid="1D14D6EE-FD63-4FA1-BFA4-8F47B42119F0">
-    <informativeText>Abstract: The Bouffalolab OTA Service enables over-the-air firmware update of the device. </informativeText>
-
-    <!--Bouffalolab OTA Control-->
-    <characteristic id="ota_control" name="Bouffalolab OTA Control" sourceId="com.silabs.characteristic.ota_control" uuid="F7BF3564-FB6D-4E53-88A4-5E37E0326063">
-      <informativeText>Abstract: Bouffalolab OTA Control. </informativeText>
-      <value length="1" type="user" variable_length="false"/>
-      <properties write="true" write_requirement="optional"/>
-    </characteristic>
-  </service>
-
-  <!--CHIPoBLE-->
-  <service advertise="false" name="CHIPoBLE" requirement="mandatory" sourceId="custom.type" type="primary" uuid="fff6">
-    <informativeText>Custom service</informativeText>
-
-    <!--CHIPoBLEChar_Rx-->
-    <characteristic id="CHIPoBLEChar_Rx" name="CHIPoBLEChar_Rx" sourceId="custom.type" uuid="18EE2EF5-263D-4559-959F-4F9C429F9D11">
-      <informativeText>Custom characteristic</informativeText>
-      <value length="247" type="hex" variable_length="true">0x00</value>
-      <properties read="true" read_requirement="optional" write="true" write_requirement="optional"/>
-    </characteristic>
-
-    <!--CHIPoBLEChar_Tx-->
-    <characteristic id="CHIPoBLEChar_Tx" name="CHIPoBLEChar_Tx" sourceId="custom.type" uuid="18EE2EF5-263D-4559-959F-4F9C429F9D12">
-      <informativeText>Custom characteristic</informativeText>
-      <value length="247" type="hex" variable_length="true">0x00</value>
-      <properties indicate="true" indicate_requirement="optional" read="true" read_requirement="optional" write="true" write_no_response="true" write_no_response_requirement="optional" write_requirement="optional"/>
-    </characteristic>
-  </service>
-</gatt>
diff --git a/src/platform/bouffalolab/BL602/gatt_db.c b/src/platform/bouffalolab/BL602/gatt_db.c
deleted file mode 100644
index 6a4d4977a3a8f1..00000000000000
--- a/src/platform/bouffalolab/BL602/gatt_db.c
+++ /dev/null
@@ -1,379 +0,0 @@
-/*
- *
- *    Copyright (c) 2020 Project CHIP Authors
- *    Copyright (c) 2020 Google LLC.
- *
- *    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.
- */
-
-/********************************************************************
- * Autogenerated file, do not edit.
- *******************************************************************/
-
-#include "bg_gattdb_def.h"
-
-#include <stdint.h>
-
-#define GATT_HEADER(F) F
-#define GATT_DATA(F) F
-GATT_DATA(const uint16_t bg_gattdb_data_uuidtable_16_map[]) = {
-    0x2800, 0x2801, 0x2803, 0x1800, 0x2a00, 0x2a01, 0x180a, 0x2a29, 0x2a24, 0x2a23, 0xfff6, 0x1801, 0x2a05, 0x2b2a, 0x2b29, 0x2902,
-};
-
-GATT_DATA(const uint8_t bg_gattdb_data_uuidtable_128_map[]) = {
-    0xf0, 0x19, 0x21, 0xb4, 0x47, 0x8f, 0xa4, 0xbf, 0xa1, 0x4f, 0x63, 0xfd, 0xee, 0xd6, 0x14, 0x1d,
-    0x63, 0x60, 0x32, 0xe0, 0x37, 0x5e, 0xa4, 0x88, 0x53, 0x4e, 0x6d, 0xfb, 0x64, 0x35, 0xbf, 0xf7,
-    0x11, 0x9d, 0x9f, 0x42, 0x9c, 0x4f, 0x9f, 0x95, 0x59, 0x45, 0x3d, 0x26, 0xf5, 0x2e, 0xee, 0x18,
-    0x12, 0x9d, 0x9f, 0x42, 0x9c, 0x4f, 0x9f, 0x95, 0x59, 0x45, 0x3d, 0x26, 0xf5, 0x2e, 0xee, 0x18,
-};
-
-struct bg_gattdb_buffer_with_len
-    bg_gattdb_data_attribute_field_27_data                                             = { .len  = 1,
-                                               .data = {
-                                                   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                                                   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                                                   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                                                   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                                                   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                                                   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                                                   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                                                   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                                                   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                                                   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                                                   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                                                   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                                                   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                                                   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                                                   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                                                   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                                                   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                                                   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                                                   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                                               } };
-GATT_DATA(const struct bg_gattdb_attribute_chrvalue bg_gattdb_data_attribute_field_27) = {
-    .properties  = 0x2e,
-    .index       = 6,
-    .max_len     = 247,
-    .data_varlen = &bg_gattdb_data_attribute_field_27_data,
-};
-
-GATT_DATA(const struct bg_gattdb_buffer_with_len bg_gattdb_data_attribute_field_26) = { .len  = 19,
-                                                                                        .data = {
-                                                                                            0x2e, 0x1c, 0x00, 0x12, 0x9d,
-                                                                                            0x9f, 0x42, 0x9c, 0x4f, 0x9f,
-                                                                                            0x95, 0x59, 0x45, 0x3d, 0x26,
-                                                                                            0xf5, 0x2e, 0xee, 0x18,
-                                                                                        } };
-struct bg_gattdb_buffer_with_len
-    bg_gattdb_data_attribute_field_25_data                                             = { .len  = 1,
-                                               .data = {
-                                                   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                                                   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                                                   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                                                   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                                                   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                                                   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                                                   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                                                   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                                                   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                                                   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                                                   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                                                   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                                                   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                                                   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                                                   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                                                   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                                                   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                                                   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                                                   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                                               } };
-GATT_DATA(const struct bg_gattdb_attribute_chrvalue bg_gattdb_data_attribute_field_25) = {
-    .properties  = 0x0a,
-    .index       = 5,
-    .max_len     = 247,
-    .data_varlen = &bg_gattdb_data_attribute_field_25_data,
-};
-
-GATT_DATA(const struct bg_gattdb_buffer_with_len bg_gattdb_data_attribute_field_24)    = { .len  = 19,
-                                                                                        .data = {
-                                                                                            0x0a, 0x1a, 0x00, 0x11, 0x9d,
-                                                                                            0x9f, 0x42, 0x9c, 0x4f, 0x9f,
-                                                                                            0x95, 0x59, 0x45, 0x3d, 0x26,
-                                                                                            0xf5, 0x2e, 0xee, 0x18,
-                                                                                        } };
-GATT_DATA(const struct bg_gattdb_buffer_with_len bg_gattdb_data_attribute_field_23)    = { .len  = 2,
-                                                                                        .data = {
-                                                                                            0xf6,
-                                                                                            0xff,
-                                                                                        } };
-GATT_DATA(const struct bg_gattdb_attribute_chrvalue bg_gattdb_data_attribute_field_22) = {
-    .properties = 0x08,
-    .index      = 4,
-    .max_len    = 0,
-    .data       = NULL,
-};
-
-GATT_DATA(const struct bg_gattdb_buffer_with_len bg_gattdb_data_attribute_field_21) = { .len  = 19,
-                                                                                        .data = {
-                                                                                            0x08, 0x17, 0x00, 0x63, 0x60,
-                                                                                            0x32, 0xe0, 0x37, 0x5e, 0xa4,
-                                                                                            0x88, 0x53, 0x4e, 0x6d, 0xfb,
-                                                                                            0x64, 0x35, 0xbf, 0xf7,
-                                                                                        } };
-GATT_DATA(const struct bg_gattdb_buffer_with_len bg_gattdb_data_attribute_field_20) = { .len  = 16,
-                                                                                        .data = {
-                                                                                            0xf0,
-                                                                                            0x19,
-                                                                                            0x21,
-                                                                                            0xb4,
-                                                                                            0x47,
-                                                                                            0x8f,
-                                                                                            0xa4,
-                                                                                            0xbf,
-                                                                                            0xa1,
-                                                                                            0x4f,
-                                                                                            0x63,
-                                                                                            0xfd,
-                                                                                            0xee,
-                                                                                            0xd6,
-                                                                                            0x14,
-                                                                                            0x1d,
-                                                                                        } };
-GATT_DATA(const struct bg_gattdb_buffer_with_len bg_gattdb_data_attribute_field_19) = { .len  = 6,
-                                                                                        .data = {
-                                                                                            0x00,
-                                                                                            0x01,
-                                                                                            0x02,
-                                                                                            0x03,
-                                                                                            0x04,
-                                                                                            0x05,
-                                                                                        } };
-GATT_DATA(const struct bg_gattdb_buffer_with_len bg_gattdb_data_attribute_field_18) = { .len  = 5,
-                                                                                        .data = {
-                                                                                            0x02,
-                                                                                            0x14,
-                                                                                            0x00,
-                                                                                            0x23,
-                                                                                            0x2a,
-                                                                                        } };
-GATT_DATA(const struct bg_gattdb_buffer_with_len bg_gattdb_data_attribute_field_17) = { .len  = 10,
-                                                                                        .data = {
-                                                                                            0x42,
-                                                                                            0x6c,
-                                                                                            0x75,
-                                                                                            0x65,
-                                                                                            0x20,
-                                                                                            0x47,
-                                                                                            0x65,
-                                                                                            0x63,
-                                                                                            0x6b,
-                                                                                            0x6f,
-                                                                                        } };
-GATT_DATA(const struct bg_gattdb_buffer_with_len bg_gattdb_data_attribute_field_16) = { .len  = 5,
-                                                                                        .data = {
-                                                                                            0x02,
-                                                                                            0x12,
-                                                                                            0x00,
-                                                                                            0x24,
-                                                                                            0x2a,
-                                                                                        } };
-GATT_DATA(const struct bg_gattdb_buffer_with_len bg_gattdb_data_attribute_field_15) = { .len  = 12,
-                                                                                        .data = {
-                                                                                            0x53,
-                                                                                            0x69,
-                                                                                            0x6c,
-                                                                                            0x69,
-                                                                                            0x63,
-                                                                                            0x6f,
-                                                                                            0x6e,
-                                                                                            0x20,
-                                                                                            0x4c,
-                                                                                            0x61,
-                                                                                            0x62,
-                                                                                            0x73,
-                                                                                        } };
-GATT_DATA(const struct bg_gattdb_buffer_with_len bg_gattdb_data_attribute_field_14) = { .len  = 5,
-                                                                                        .data = {
-                                                                                            0x02,
-                                                                                            0x10,
-                                                                                            0x00,
-                                                                                            0x29,
-                                                                                            0x2a,
-                                                                                        } };
-GATT_DATA(const struct bg_gattdb_buffer_with_len bg_gattdb_data_attribute_field_13) = { .len  = 2,
-                                                                                        .data = {
-                                                                                            0x0a,
-                                                                                            0x18,
-                                                                                        } };
-GATT_DATA(const struct bg_gattdb_buffer_with_len bg_gattdb_data_attribute_field_12) = { .len  = 2,
-                                                                                        .data = {
-                                                                                            0x00,
-                                                                                            0x00,
-                                                                                        } };
-GATT_DATA(const struct bg_gattdb_buffer_with_len bg_gattdb_data_attribute_field_11) = { .len  = 5,
-                                                                                        .data = {
-                                                                                            0x02,
-                                                                                            0x0d,
-                                                                                            0x00,
-                                                                                            0x01,
-                                                                                            0x2a,
-                                                                                        } };
-uint8_t bg_gattdb_data_attribute_field_10_data[13]                                  = {
-    0x45, 0x6d, 0x70, 0x74, 0x79, 0x20, 0x45, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65,
-};
-GATT_DATA(const struct bg_gattdb_attribute_chrvalue bg_gattdb_data_attribute_field_10) = {
-    .properties = 0x0a,
-    .index      = 3,
-    .max_len    = 13,
-    .data       = bg_gattdb_data_attribute_field_10_data,
-};
-
-GATT_DATA(const struct bg_gattdb_buffer_with_len bg_gattdb_data_attribute_field_9) = { .len  = 5,
-                                                                                       .data = {
-                                                                                           0x0a,
-                                                                                           0x0b,
-                                                                                           0x00,
-                                                                                           0x00,
-                                                                                           0x2a,
-                                                                                       } };
-GATT_DATA(const struct bg_gattdb_buffer_with_len bg_gattdb_data_attribute_field_8) = { .len  = 2,
-                                                                                       .data = {
-                                                                                           0x00,
-                                                                                           0x18,
-                                                                                       } };
-uint8_t bg_gattdb_data_attribute_field_7_data[1]                                   = {
-    0x00,
-};
-GATT_DATA(const struct bg_gattdb_attribute_chrvalue bg_gattdb_data_attribute_field_7) = {
-    .properties = 0x0a,
-    .index      = 2,
-    .max_len    = 1,
-    .data       = bg_gattdb_data_attribute_field_7_data,
-};
-
-GATT_DATA(const struct bg_gattdb_buffer_with_len bg_gattdb_data_attribute_field_6) = { .len  = 5,
-                                                                                       .data = {
-                                                                                           0x0a,
-                                                                                           0x08,
-                                                                                           0x00,
-                                                                                           0x29,
-                                                                                           0x2b,
-                                                                                       } };
-uint8_t bg_gattdb_data_attribute_field_5_data[16]                                  = {
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-};
-GATT_DATA(const struct bg_gattdb_attribute_chrvalue bg_gattdb_data_attribute_field_5) = {
-    .properties = 0x02,
-    .index      = 1,
-    .max_len    = 16,
-    .data       = bg_gattdb_data_attribute_field_5_data,
-};
-
-GATT_DATA(const struct bg_gattdb_buffer_with_len bg_gattdb_data_attribute_field_4) = { .len  = 5,
-                                                                                       .data = {
-                                                                                           0x02,
-                                                                                           0x06,
-                                                                                           0x00,
-                                                                                           0x2a,
-                                                                                           0x2b,
-                                                                                       } };
-uint8_t bg_gattdb_data_attribute_field_2_data[4]                                   = {
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-};
-GATT_DATA(const struct bg_gattdb_attribute_chrvalue bg_gattdb_data_attribute_field_2) = {
-    .properties = 0x20,
-    .index      = 0,
-    .max_len    = 4,
-    .data       = bg_gattdb_data_attribute_field_2_data,
-};
-
-GATT_DATA(const struct bg_gattdb_buffer_with_len bg_gattdb_data_attribute_field_1) = { .len  = 5,
-                                                                                       .data = {
-                                                                                           0x20,
-                                                                                           0x03,
-                                                                                           0x00,
-                                                                                           0x05,
-                                                                                           0x2a,
-                                                                                       } };
-GATT_DATA(const struct bg_gattdb_buffer_with_len bg_gattdb_data_attribute_field_0) = { .len  = 2,
-                                                                                       .data = {
-                                                                                           0x01,
-                                                                                           0x18,
-                                                                                       } };
-GATT_DATA(const struct bg_gattdb_attribute bg_gattdb_data_attributes_map[])        = {
-    { .uuid = 0x0000, .permissions = 0x801, .caps = 0xffff, .datatype = 0x00, .constdata = &bg_gattdb_data_attribute_field_0 },
-    { .uuid = 0x0002, .permissions = 0x801, .caps = 0xffff, .datatype = 0x00, .constdata = &bg_gattdb_data_attribute_field_1 },
-    { .uuid = 0x000c, .permissions = 0x800, .caps = 0xffff, .datatype = 0x01, .dynamicdata = &bg_gattdb_data_attribute_field_2 },
-    { .uuid        = 0x000f,
-      .permissions = 0x807,
-      .caps        = 0xffff,
-      .datatype    = 0x03,
-      .configdata  = { .flags = 0x02, .index = 0x00, .clientconfig_index = 0x00 } },
-    { .uuid = 0x0002, .permissions = 0x801, .caps = 0xffff, .datatype = 0x00, .constdata = &bg_gattdb_data_attribute_field_4 },
-    { .uuid = 0x000d, .permissions = 0x801, .caps = 0xffff, .datatype = 0x01, .dynamicdata = &bg_gattdb_data_attribute_field_5 },
-    { .uuid = 0x0002, .permissions = 0x801, .caps = 0xffff, .datatype = 0x00, .constdata = &bg_gattdb_data_attribute_field_6 },
-    { .uuid = 0x000e, .permissions = 0x803, .caps = 0xffff, .datatype = 0x01, .dynamicdata = &bg_gattdb_data_attribute_field_7 },
-    { .uuid = 0x0000, .permissions = 0x801, .caps = 0xffff, .datatype = 0x00, .constdata = &bg_gattdb_data_attribute_field_8 },
-    { .uuid = 0x0002, .permissions = 0x801, .caps = 0xffff, .datatype = 0x00, .constdata = &bg_gattdb_data_attribute_field_9 },
-    { .uuid = 0x0004, .permissions = 0x803, .caps = 0xffff, .datatype = 0x01, .dynamicdata = &bg_gattdb_data_attribute_field_10 },
-    { .uuid = 0x0002, .permissions = 0x801, .caps = 0xffff, .datatype = 0x00, .constdata = &bg_gattdb_data_attribute_field_11 },
-    { .uuid = 0x0005, .permissions = 0x801, .caps = 0xffff, .datatype = 0x00, .constdata = &bg_gattdb_data_attribute_field_12 },
-    { .uuid = 0x0000, .permissions = 0x801, .caps = 0xffff, .datatype = 0x00, .constdata = &bg_gattdb_data_attribute_field_13 },
-    { .uuid = 0x0002, .permissions = 0x801, .caps = 0xffff, .datatype = 0x00, .constdata = &bg_gattdb_data_attribute_field_14 },
-    { .uuid = 0x0007, .permissions = 0x801, .caps = 0xffff, .datatype = 0x00, .constdata = &bg_gattdb_data_attribute_field_15 },
-    { .uuid = 0x0002, .permissions = 0x801, .caps = 0xffff, .datatype = 0x00, .constdata = &bg_gattdb_data_attribute_field_16 },
-    { .uuid = 0x0008, .permissions = 0x801, .caps = 0xffff, .datatype = 0x00, .constdata = &bg_gattdb_data_attribute_field_17 },
-    { .uuid = 0x0002, .permissions = 0x801, .caps = 0xffff, .datatype = 0x00, .constdata = &bg_gattdb_data_attribute_field_18 },
-    { .uuid = 0x0009, .permissions = 0x801, .caps = 0xffff, .datatype = 0x00, .constdata = &bg_gattdb_data_attribute_field_19 },
-    { .uuid = 0x0000, .permissions = 0x801, .caps = 0xffff, .datatype = 0x00, .constdata = &bg_gattdb_data_attribute_field_20 },
-    { .uuid = 0x0002, .permissions = 0x801, .caps = 0xffff, .datatype = 0x00, .constdata = &bg_gattdb_data_attribute_field_21 },
-    { .uuid = 0x8001, .permissions = 0x802, .caps = 0xffff, .datatype = 0x07, .dynamicdata = &bg_gattdb_data_attribute_field_22 },
-    { .uuid = 0x0000, .permissions = 0x801, .caps = 0xffff, .datatype = 0x00, .constdata = &bg_gattdb_data_attribute_field_23 },
-    { .uuid = 0x0002, .permissions = 0x801, .caps = 0xffff, .datatype = 0x00, .constdata = &bg_gattdb_data_attribute_field_24 },
-    { .uuid = 0x8002, .permissions = 0x803, .caps = 0xffff, .datatype = 0x02, .dynamicdata = &bg_gattdb_data_attribute_field_25 },
-    { .uuid = 0x0002, .permissions = 0x801, .caps = 0xffff, .datatype = 0x00, .constdata = &bg_gattdb_data_attribute_field_26 },
-    { .uuid = 0x8003, .permissions = 0x807, .caps = 0xffff, .datatype = 0x02, .dynamicdata = &bg_gattdb_data_attribute_field_27 },
-    { .uuid        = 0x000f,
-      .permissions = 0x807,
-      .caps        = 0xffff,
-      .datatype    = 0x03,
-      .configdata  = { .flags = 0x02, .index = 0x06, .clientconfig_index = 0x01 } },
-};
-
-GATT_DATA(const uint16_t bg_gattdb_data_attributes_dynamic_mapping_map[]) = {
-    0x0003, 0x0006, 0x0008, 0x000b, 0x0017, 0x001a, 0x001c,
-};
-
-GATT_DATA(const uint8_t bg_gattdb_data_adv_uuid16_map[])  = { 0x0 };
-GATT_DATA(const uint8_t bg_gattdb_data_adv_uuid128_map[]) = { 0x0 };
-GATT_HEADER(const struct bg_gattdb_def bg_gattdb_data)    = {
-    .attributes                 = bg_gattdb_data_attributes_map,
-    .attributes_max             = 29,
-    .uuidtable_16_size          = 16,
-    .uuidtable_16               = bg_gattdb_data_uuidtable_16_map,
-    .uuidtable_128_size         = 4,
-    .uuidtable_128              = bg_gattdb_data_uuidtable_128_map,
-    .attributes_dynamic_max     = 7,
-    .attributes_dynamic_mapping = bg_gattdb_data_attributes_dynamic_mapping_map,
-    .adv_uuid16                 = bg_gattdb_data_adv_uuid16_map,
-    .adv_uuid16_num             = 0,
-    .adv_uuid128                = bg_gattdb_data_adv_uuid128_map,
-    .adv_uuid128_num            = 0,
-    .caps_mask                  = 0xffff,
-    .enabled_caps               = 0xffff,
-};
-
-const struct bg_gattdb_def * bg_gattdb = &bg_gattdb_data;
diff --git a/src/platform/bouffalolab/BL602/gatt_db.h b/src/platform/bouffalolab/BL602/gatt_db.h
deleted file mode 100644
index 1007bbe901fc3a..00000000000000
--- a/src/platform/bouffalolab/BL602/gatt_db.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- *
- *    Copyright (c) 2020 Project CHIP Authors
- *    Copyright (c) 2020 Google LLC.
- *
- *    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.
- */
-
-#ifndef __GATT_DB_H
-#define __GATT_DB_H
-
-#if __cplusplus
-extern "C" {
-#endif
-
-#include "bg_gattdb_def.h"
-
-extern const struct bg_gattdb_def bg_gattdb_data;
-
-#define gattdb_service_changed_char 3
-#define gattdb_database_hash 6
-#define gattdb_client_support_features 8
-#define gattdb_device_name 11
-#define gattdb_ota_control 23
-#define gattdb_CHIPoBLEChar_Rx 26
-#define gattdb_CHIPoBLEChar_Tx 28
-
-#if __cplusplus
-}
-#endif
-
-#endif
diff --git a/src/platform/bouffalolab/BL702/ConfigurationManagerImpl.cpp b/src/platform/bouffalolab/BL702/ConfigurationManagerImpl.cpp
index a6be2c40158d58..d884d752ea5d34 100644
--- a/src/platform/bouffalolab/BL702/ConfigurationManagerImpl.cpp
+++ b/src/platform/bouffalolab/BL702/ConfigurationManagerImpl.cpp
@@ -48,7 +48,7 @@ CHIP_ERROR ConfigurationManagerImpl::Init()
 {
     CHIP_ERROR err;
     bool failSafeArmed;
-    uint32_t bootCount = 0;
+    uint32_t rebootCount = 0;
 
     err = Internal::GenericConfigurationManagerImpl<BL702Config>::Init();
 
@@ -76,11 +76,11 @@ CHIP_ERROR ConfigurationManagerImpl::Init()
 
     if (BL_RST_HBN != bootCause)
     {
-        if (CHIP_NO_ERROR == ReadConfigValue(BL702Config::kCounterKey_BootCount, bootCount))
+        if (CHIP_NO_ERROR == ReadConfigValue(BL702Config::kCounterKey_RebootCount, rebootCount))
         {
-            bootCount += 1;
+            rebootCount += 1;
         }
-        WriteConfigValue(BL702Config::kCounterKey_BootCount, bootCount + 1);
+        WriteConfigValue(BL702Config::kCounterKey_RebootCount, rebootCount + 1);
     }
 
     // If the fail-safe was armed when the device last shutdown, initiate a factory reset.
@@ -130,12 +130,12 @@ CHIP_ERROR ConfigurationManagerImpl::WritePersistedStorageValue(::chip::Platform
 
 CHIP_ERROR ConfigurationManagerImpl::GetRebootCount(uint32_t & rebootCount)
 {
-    return ReadConfigValue(BL702Config::kCounterKey_BootCount, rebootCount);
+    return ReadConfigValue(BL702Config::kCounterKey_RebootCount, rebootCount);
 }
 
 CHIP_ERROR ConfigurationManagerImpl::StoreRebootCount(uint32_t rebootCount)
 {
-    return WriteConfigValue(BL702Config::kCounterKey_BootCount, rebootCount);
+    return WriteConfigValue(BL702Config::kCounterKey_RebootCount, rebootCount);
 }
 
 CHIP_ERROR ConfigurationManagerImpl::GetTotalOperationalHours(uint32_t & totalOperationalHours)
diff --git a/src/platform/bouffalolab/BL702/DiagnosticDataProviderImpl.cpp b/src/platform/bouffalolab/BL702/DiagnosticDataProviderImpl.cpp
index d5e90db552b9b5..5cc8f9137f5a8f 100644
--- a/src/platform/bouffalolab/BL702/DiagnosticDataProviderImpl.cpp
+++ b/src/platform/bouffalolab/BL702/DiagnosticDataProviderImpl.cpp
@@ -212,10 +212,10 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetTotalOperationalHours(uint32_t & total
 CHIP_ERROR DiagnosticDataProviderImpl::GetActiveHardwareFaults(GeneralFaults<kMaxHardwareFaults> & hardwareFaults)
 {
 #if CHIP_CONFIG_TEST
-    ReturnErrorOnFailure(hardwareFaults.add(EMBER_ZCL_HARDWARE_FAULT_RADIO));
-    ReturnErrorOnFailure(hardwareFaults.add(EMBER_ZCL_HARDWARE_FAULT_SENSOR));
-    ReturnErrorOnFailure(hardwareFaults.add(EMBER_ZCL_HARDWARE_FAULT_POWER_SOURCE));
-    ReturnErrorOnFailure(hardwareFaults.add(EMBER_ZCL_HARDWARE_FAULT_USER_INTERFACE_FAULT));
+    ReturnErrorOnFailure(hardwareFaults.add(EMBER_ZCL_HARDWARE_FAULT_ENUM_RADIO));
+    ReturnErrorOnFailure(hardwareFaults.add(EMBER_ZCL_HARDWARE_FAULT_ENUM_SENSOR));
+    ReturnErrorOnFailure(hardwareFaults.add(EMBER_ZCL_HARDWARE_FAULT_ENUM_POWER_SOURCE));
+    ReturnErrorOnFailure(hardwareFaults.add(EMBER_ZCL_HARDWARE_FAULT_ENUM_USER_INTERFACE_FAULT));
 #endif
 
     return CHIP_NO_ERROR;
@@ -224,8 +224,8 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetActiveHardwareFaults(GeneralFaults<kMa
 CHIP_ERROR DiagnosticDataProviderImpl::GetActiveRadioFaults(GeneralFaults<kMaxRadioFaults> & radioFaults)
 {
 #if CHIP_CONFIG_TEST
-    ReturnErrorOnFailure(radioFaults.add(EMBER_ZCL_RADIO_FAULT_THREAD_FAULT));
-    ReturnErrorOnFailure(radioFaults.add(EMBER_ZCL_RADIO_FAULT_BLE_FAULT));
+    ReturnErrorOnFailure(radioFaults.add(EMBER_ZCL_RADIO_FAULT_ENUM_THREAD_FAULT));
+    ReturnErrorOnFailure(radioFaults.add(EMBER_ZCL_RADIO_FAULT_ENUM_BLE_FAULT));
 #endif
 
     return CHIP_NO_ERROR;
@@ -234,9 +234,9 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetActiveRadioFaults(GeneralFaults<kMaxRa
 CHIP_ERROR DiagnosticDataProviderImpl::GetActiveNetworkFaults(GeneralFaults<kMaxNetworkFaults> & networkFaults)
 {
 #if CHIP_CONFIG_TEST
-    ReturnErrorOnFailure(networkFaults.add(EMBER_ZCL_NETWORK_FAULT_TYPE_HARDWARE_FAILURE));
-    ReturnErrorOnFailure(networkFaults.add(EMBER_ZCL_NETWORK_FAULT_TYPE_NETWORK_JAMMED));
-    ReturnErrorOnFailure(networkFaults.add(EMBER_ZCL_NETWORK_FAULT_TYPE_CONNECTION_FAILED));
+    ReturnErrorOnFailure(networkFaults.add(EMBER_ZCL_NETWORK_FAULT_ENUM_HARDWARE_FAILURE));
+    ReturnErrorOnFailure(networkFaults.add(EMBER_ZCL_NETWORK_FAULT_ENUM_NETWORK_JAMMED));
+    ReturnErrorOnFailure(networkFaults.add(EMBER_ZCL_NETWORK_FAULT_ENUM_CONNECTION_FAILED));
 #endif
 
     return CHIP_NO_ERROR;
@@ -253,7 +253,7 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetNetworkInterfaces(NetworkInterface **
     ifp->isOperational             = true;
     ifp->offPremiseServicesReachableIPv4.SetNull();
     ifp->offPremiseServicesReachableIPv6.SetNull();
-    ifp->type = InterfaceType::EMBER_ZCL_INTERFACE_TYPE_THREAD;
+    ifp->type = InterfaceTypeEnum::EMBER_ZCL_INTERFACE_TYPE_ENUM_THREAD;
     uint8_t macBuffer[ConfigurationManager::kPrimaryMACAddressLength];
     ConfigurationMgr().GetPrimary802154MACAddress(macBuffer);
     ifp->hardwareAddress = ByteSpan(macBuffer, ConfigurationManager::kPrimaryMACAddressLength);
diff --git a/src/platform/bouffalolab/BL702/PlatformManagerImpl.cpp b/src/platform/bouffalolab/BL702/PlatformManagerImpl.cpp
index c76b6b688f8a0f..cf770004a27f41 100644
--- a/src/platform/bouffalolab/BL702/PlatformManagerImpl.cpp
+++ b/src/platform/bouffalolab/BL702/PlatformManagerImpl.cpp
@@ -26,7 +26,9 @@
 
 #include <lwip/tcpip.h>
 
+extern "C" {
 #include <bl_sec.h>
+}
 
 namespace chip {
 namespace DeviceLayer {
diff --git a/src/platform/bouffalolab/BL702/ThreadStackManagerImpl.cpp b/src/platform/bouffalolab/BL702/ThreadStackManagerImpl.cpp
index 0fb93c75826058..a89896aa510930 100644
--- a/src/platform/bouffalolab/BL702/ThreadStackManagerImpl.cpp
+++ b/src/platform/bouffalolab/BL702/ThreadStackManagerImpl.cpp
@@ -47,15 +47,13 @@ CHIP_ERROR ThreadStackManagerImpl::_InitThreadStack(void)
 CHIP_ERROR ThreadStackManagerImpl::InitThreadStack(otInstance * otInst)
 {
     CHIP_ERROR err = CHIP_NO_ERROR;
+    otRadio_opt_t opt;
+
+    opt.byte            = 0;
+    opt.bf.isCoexEnable = true;
 
     ot_alarmInit();
-#ifdef OT_THREAD_PORT_1_3
-    otRadio_opt_t opt;
-    opt.byte = 0;
     ot_radioInit(opt);
-#else
-    ot_radioInit();
-#endif
     // Initialize the generic implementation base classes.
     err = GenericThreadStackManagerImpl_FreeRTOS<ThreadStackManagerImpl>::DoInit();
     SuccessOrExit(err);
@@ -82,12 +80,7 @@ ot_system_event_t ot_system_event_var = OT_SYSTEM_EVENT_NONE;
 
 void otSysProcessDrivers(otInstance * aInstance)
 {
-#ifdef OT_THREAD_PORT_1_3
     ot_system_event_t sevent = otrGetNotifyEvent();
-#else
-    ot_system_event_t sevent = OT_SYSTEM_EVENT_NONE;
-    OT_GET_NOTIFY(sevent);
-#endif
 
     ot_alarmTask(sevent);
     ot_radioTask(sevent);
@@ -126,7 +119,6 @@ extern "C" void otPlatFree(void * aPtr)
     free(aPtr);
 }
 
-#ifdef OT_THREAD_PORT_1_3
 extern "C" uint32_t otrEnterCrit(void)
 {
     if (xPortIsInsideInterrupt())
@@ -172,4 +164,3 @@ extern "C" void otrNotifyEvent(ot_system_event_t sevent)
 
     otSysEventSignalPending();
 }
-#endif
diff --git a/src/platform/bouffalolab/BL702/bl702Config.h b/src/platform/bouffalolab/BL702/bl702Config.h
index dc9450f4986c61..af40b430964a3c 100644
--- a/src/platform/bouffalolab/BL702/bl702Config.h
+++ b/src/platform/bouffalolab/BL702/bl702Config.h
@@ -53,25 +53,29 @@ class BL702Config
     static constexpr const char * kConfigKey_UniqueId              = ("unique-id");
 
     /** Config keys, which should be droped after a factory reset */
-    static constexpr const char * kConfigKey_FabricId           = ("fabric-id");
-    static constexpr const char * kConfigKey_ServiceConfig      = ("service-config");
-    static constexpr const char * kConfigKey_PairedAccountId    = ("account-id");
-    static constexpr const char * kConfigKey_ServiceId          = ("service-id");
-    static constexpr const char * kConfigKey_FabricSecret       = ("fabric-secret");
-    static constexpr const char * kConfigKey_HardwareVersion    = ("hardware-rev");
-    static constexpr const char * kConfigKey_LastUsedEpochKeyId = ("last-ek-id");
-    static constexpr const char * kConfigKey_FailSafeArmed      = ("fail-safe-armed");
-    static constexpr const char * kConfigKey_WiFiStationSecType = ("sta-sec-type");
-    static constexpr const char * kConfigKey_RegulatoryLocation = ("regulatory-location");
-    static constexpr const char * kConfigKey_CountryCode        = ("country-code");
-    static constexpr const char * kConfigKey_ActiveLocale       = ("active-locale");
-    static constexpr const char * kConfigKey_Breadcrumb         = ("breadcrumb");
-    static constexpr const char * kConfigKey_GroupKeyIndex      = ("group-key-index");
-    static constexpr const char * kBLConfigKey_wifissid         = ("blConfig_wifi-ssid");
-    static constexpr const char * kBLConfigKey_wifipassword     = ("blConfig_wifi-pwd");
+    static constexpr const char * kConfigKey_FabricId                    = ("fabric-id");
+    static constexpr const char * kConfigKey_ServiceConfig               = ("service-config");
+    static constexpr const char * kConfigKey_PairedAccountId             = ("account-id");
+    static constexpr const char * kConfigKey_ServiceId                   = ("service-id");
+    static constexpr const char * kConfigKey_FabricSecret                = ("fabric-secret");
+    static constexpr const char * kConfigKey_HardwareVersion             = ("hardware-ver");
+    static constexpr const char * kConfigKey_LastUsedEpochKeyId          = ("last-ek-id");
+    static constexpr const char * kConfigKey_FailSafeArmed               = ("fail-safe-armed");
+    static constexpr const char * kConfigKey_WiFiStationSecType          = ("sta-sec-type");
+    static constexpr const char * kConfigKey_OperationalDeviceId         = ("op-device-id");
+    static constexpr const char * kConfigKey_OperationalDeviceCert       = ("op-device-cert");
+    static constexpr const char * kConfigKey_OperationalDeviceICACerts   = ("op-device-ca-certs");
+    static constexpr const char * kConfigKey_OperationalDevicePrivateKey = ("op-device-key");
+    static constexpr const char * kConfigKey_RegulatoryLocation          = ("regulatory-location");
+    static constexpr const char * kConfigKey_CountryCode                 = ("country-code");
+    static constexpr const char * kConfigKey_ActiveLocale                = ("active-locale");
+    static constexpr const char * kConfigKey_Breadcrumb                  = ("breadcrumb");
+    static constexpr const char * kConfigKey_GroupKeyIndex               = ("group-key-index");
+    static constexpr const char * kBLConfigKey_wifissid                  = ("blConfig_wifi-ssid");
+    static constexpr const char * kBLConfigKey_wifipassword              = ("blConfig_wifi-pwd");
 
     /** Counter Keys, diagnostic information  */
-    static constexpr const char * kCounterKey_BootCount             = ("boot-count");
+    static constexpr const char * kCounterKey_RebootCount           = ("reboot-count");
     static constexpr const char * kCounterKey_TotalOperationalHours = ("total-hours");
     static constexpr const char * kCounterKey_UpTime                = ("up-time");
 
diff --git a/src/platform/cc13x2_26x2/DiagnosticDataProviderImpl.cpp b/src/platform/cc13x2_26x2/DiagnosticDataProviderImpl.cpp
index 17d8a980abe408..78042b70073313 100644
--- a/src/platform/cc13x2_26x2/DiagnosticDataProviderImpl.cpp
+++ b/src/platform/cc13x2_26x2/DiagnosticDataProviderImpl.cpp
@@ -205,10 +205,10 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetTotalOperationalHours(uint32_t & total
 CHIP_ERROR DiagnosticDataProviderImpl::GetActiveHardwareFaults(GeneralFaults<kMaxHardwareFaults> & hardwareFaults)
 {
 #if CHIP_CONFIG_TEST
-    ReturnErrorOnFailure(hardwareFaults.add(EMBER_ZCL_HARDWARE_FAULT_RADIO));
-    ReturnErrorOnFailure(hardwareFaults.add(EMBER_ZCL_HARDWARE_FAULT_SENSOR));
-    ReturnErrorOnFailure(hardwareFaults.add(EMBER_ZCL_HARDWARE_FAULT_POWER_SOURCE));
-    ReturnErrorOnFailure(hardwareFaults.add(EMBER_ZCL_HARDWARE_FAULT_USER_INTERFACE_FAULT));
+    ReturnErrorOnFailure(hardwareFaults.add(EMBER_ZCL_HARDWARE_FAULT_ENUM_RADIO));
+    ReturnErrorOnFailure(hardwareFaults.add(EMBER_ZCL_HARDWARE_FAULT_ENUM_SENSOR));
+    ReturnErrorOnFailure(hardwareFaults.add(EMBER_ZCL_HARDWARE_FAULT_ENUM_POWER_SOURCE));
+    ReturnErrorOnFailure(hardwareFaults.add(EMBER_ZCL_HARDWARE_FAULT_ENUM_USER_INTERFACE_FAULT));
 #endif
 
     return CHIP_NO_ERROR;
@@ -217,8 +217,8 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetActiveHardwareFaults(GeneralFaults<kMa
 CHIP_ERROR DiagnosticDataProviderImpl::GetActiveRadioFaults(GeneralFaults<kMaxRadioFaults> & radioFaults)
 {
 #if CHIP_CONFIG_TEST
-    ReturnErrorOnFailure(radioFaults.add(EMBER_ZCL_RADIO_FAULT_THREAD_FAULT));
-    ReturnErrorOnFailure(radioFaults.add(EMBER_ZCL_RADIO_FAULT_BLE_FAULT));
+    ReturnErrorOnFailure(radioFaults.add(EMBER_ZCL_RADIO_FAULT_ENUM_THREAD_FAULT));
+    ReturnErrorOnFailure(radioFaults.add(EMBER_ZCL_RADIO_FAULT_ENUM_BLE_FAULT));
 #endif
 
     return CHIP_NO_ERROR;
@@ -227,9 +227,9 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetActiveRadioFaults(GeneralFaults<kMaxRa
 CHIP_ERROR DiagnosticDataProviderImpl::GetActiveNetworkFaults(GeneralFaults<kMaxNetworkFaults> & networkFaults)
 {
 #if CHIP_CONFIG_TEST
-    ReturnErrorOnFailure(networkFaults.add(EMBER_ZCL_NETWORK_FAULT_TYPE_HARDWARE_FAILURE));
-    ReturnErrorOnFailure(networkFaults.add(EMBER_ZCL_NETWORK_FAULT_TYPE_NETWORK_JAMMED));
-    ReturnErrorOnFailure(networkFaults.add(EMBER_ZCL_NETWORK_FAULT_TYPE_CONNECTION_FAILED));
+    ReturnErrorOnFailure(networkFaults.add(EMBER_ZCL_NETWORK_FAULT_ENUM_HARDWARE_FAILURE));
+    ReturnErrorOnFailure(networkFaults.add(EMBER_ZCL_NETWORK_FAULT_ENUM_NETWORK_JAMMED));
+    ReturnErrorOnFailure(networkFaults.add(EMBER_ZCL_NETWORK_FAULT_ENUM_CONNECTION_FAILED));
 #endif
 
     return CHIP_NO_ERROR;
@@ -244,7 +244,7 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetNetworkInterfaces(NetworkInterface **
     ifp->isOperational             = true;
     ifp->offPremiseServicesReachableIPv4.SetNull();
     ifp->offPremiseServicesReachableIPv6.SetNull();
-    ifp->type = EMBER_ZCL_INTERFACE_TYPE_THREAD;
+    ifp->type = EMBER_ZCL_INTERFACE_TYPE_ENUM_THREAD;
 
     otExtAddress extAddr;
     ThreadStackMgrImpl().GetExtAddress(extAddr);
diff --git a/src/platform/mt793x/DiagnosticDataProviderImpl.cpp b/src/platform/mt793x/DiagnosticDataProviderImpl.cpp
index 036044ac2b6aea..ba91779bed0047 100644
--- a/src/platform/mt793x/DiagnosticDataProviderImpl.cpp
+++ b/src/platform/mt793x/DiagnosticDataProviderImpl.cpp
@@ -170,10 +170,10 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetTotalOperationalHours(uint32_t & total
 CHIP_ERROR DiagnosticDataProviderImpl::GetActiveHardwareFaults(GeneralFaults<kMaxHardwareFaults> & hardwareFaults)
 {
 #if CHIP_CONFIG_TEST
-    ReturnErrorOnFailure(hardwareFaults.add(EMBER_ZCL_HARDWARE_FAULT_RADIO));
-    ReturnErrorOnFailure(hardwareFaults.add(EMBER_ZCL_HARDWARE_FAULT_SENSOR));
-    ReturnErrorOnFailure(hardwareFaults.add(EMBER_ZCL_HARDWARE_FAULT_POWER_SOURCE));
-    ReturnErrorOnFailure(hardwareFaults.add(EMBER_ZCL_HARDWARE_FAULT_USER_INTERFACE_FAULT));
+    ReturnErrorOnFailure(hardwareFaults.add(EMBER_ZCL_HARDWARE_FAULT_ENUM_RADIO));
+    ReturnErrorOnFailure(hardwareFaults.add(EMBER_ZCL_HARDWARE_FAULT_ENUM_SENSOR));
+    ReturnErrorOnFailure(hardwareFaults.add(EMBER_ZCL_HARDWARE_FAULT_ENUM_POWER_SOURCE));
+    ReturnErrorOnFailure(hardwareFaults.add(EMBER_ZCL_HARDWARE_FAULT_ENUM_USER_INTERFACE_FAULT));
 #endif
 
     return CHIP_NO_ERROR;
@@ -182,8 +182,8 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetActiveHardwareFaults(GeneralFaults<kMa
 CHIP_ERROR DiagnosticDataProviderImpl::GetActiveRadioFaults(GeneralFaults<kMaxRadioFaults> & radioFaults)
 {
 #if CHIP_CONFIG_TEST
-    ReturnErrorOnFailure(radioFaults.add(EMBER_ZCL_RADIO_FAULT_THREAD_FAULT));
-    ReturnErrorOnFailure(radioFaults.add(EMBER_ZCL_RADIO_FAULT_BLE_FAULT));
+    ReturnErrorOnFailure(radioFaults.add(EMBER_ZCL_RADIO_FAULT_ENUM_THREAD_FAULT));
+    ReturnErrorOnFailure(radioFaults.add(EMBER_ZCL_RADIO_FAULT_ENUM_BLE_FAULT));
 #endif
 
     return CHIP_NO_ERROR;
@@ -192,9 +192,9 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetActiveRadioFaults(GeneralFaults<kMaxRa
 CHIP_ERROR DiagnosticDataProviderImpl::GetActiveNetworkFaults(GeneralFaults<kMaxNetworkFaults> & networkFaults)
 {
 #if CHIP_CONFIG_TEST
-    ReturnErrorOnFailure(networkFaults.add(EMBER_ZCL_NETWORK_FAULT_TYPE_HARDWARE_FAILURE));
-    ReturnErrorOnFailure(networkFaults.add(EMBER_ZCL_NETWORK_FAULT_TYPE_NETWORK_JAMMED));
-    ReturnErrorOnFailure(networkFaults.add(EMBER_ZCL_NETWORK_FAULT_TYPE_CONNECTION_FAILED));
+    ReturnErrorOnFailure(networkFaults.add(EMBER_ZCL_NETWORK_FAULT_ENUM_HARDWARE_FAILURE));
+    ReturnErrorOnFailure(networkFaults.add(EMBER_ZCL_NETWORK_FAULT_ENUM_NETWORK_JAMMED));
+    ReturnErrorOnFailure(networkFaults.add(EMBER_ZCL_NETWORK_FAULT_ENUM_CONNECTION_FAILED));
 #endif
 
     return CHIP_NO_ERROR;
@@ -210,7 +210,7 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetNetworkInterfaces(NetworkInterface **
     ifp->fabricConnected           = true;
     ifp->offPremiseServicesReachableIPv4.SetNonNull(false);
     ifp->offPremiseServicesReachableIPv6.SetNonNull(false);
-    ifp->type = InterfaceType::EMBER_ZCL_INTERFACE_TYPE_THREAD;
+    ifp->type = InterfaceTypeEnum::EMBER_ZCL_INTERFACE_TYPE_ENUM_THREAD;
 #else
     /* TODO */
 #endif
diff --git a/src/platform/nxp/k32w/k32w0/DiagnosticDataProviderImpl.cpp b/src/platform/nxp/k32w/k32w0/DiagnosticDataProviderImpl.cpp
index bb16488e6e4c7d..5d0f48b010680a 100644
--- a/src/platform/nxp/k32w/k32w0/DiagnosticDataProviderImpl.cpp
+++ b/src/platform/nxp/k32w/k32w0/DiagnosticDataProviderImpl.cpp
@@ -219,7 +219,7 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetNetworkInterfaces(NetworkInterface **
     ifp->isOperational             = true;
     ifp->offPremiseServicesReachableIPv4.SetNull();
     ifp->offPremiseServicesReachableIPv6.SetNull();
-    ifp->type = InterfaceType::EMBER_ZCL_INTERFACE_TYPE_THREAD;
+    ifp->type = InterfaceTypeEnum::EMBER_ZCL_INTERFACE_TYPE_ENUM_THREAD;
     uint8_t macBuffer[ConfigurationManager::kPrimaryMACAddressLength];
     ConfigurationMgr().GetPrimary802154MACAddress(macBuffer);
     ifp->hardwareAddress = ByteSpan(macBuffer, ConfigurationManager::kPrimaryMACAddressLength);
diff --git a/src/platform/nxp/mw320/ConnectivityUtils.cpp b/src/platform/nxp/mw320/ConnectivityUtils.cpp
index c6ca3a175c64e1..956fba57fa232c 100644
--- a/src/platform/nxp/mw320/ConnectivityUtils.cpp
+++ b/src/platform/nxp/mw320/ConnectivityUtils.cpp
@@ -240,10 +240,10 @@ double ConnectivityUtils::ConvertFrequenceToFloat(const iw_freq * in)
     return result;
 }
 */
-InterfaceType ConnectivityUtils::GetInterfaceConnectionType(const char * ifname)
+InterfaceTypeEnum ConnectivityUtils::GetInterfaceConnectionType(const char * ifname)
 {
     // MW320 only has the wifi interface
-    InterfaceType ret = InterfaceType::EMBER_ZCL_INTERFACE_TYPE_WI_FI;
+    InterfaceTypeEnum ret = InterfaceTypeEnum::EMBER_ZCL_INTERFACE_TYPE_ENUM_WI_FI;
     return ret;
 }
 
diff --git a/src/platform/nxp/mw320/ConnectivityUtils.h b/src/platform/nxp/mw320/ConnectivityUtils.h
index bdfb67533a42f1..ddf5039ebed72d 100644
--- a/src/platform/nxp/mw320/ConnectivityUtils.h
+++ b/src/platform/nxp/mw320/ConnectivityUtils.h
@@ -43,7 +43,7 @@ class ConnectivityUtils
 public:
     static uint16_t MapChannelToFrequency(const uint16_t inBand, const uint8_t inChannel);
     static uint8_t MapFrequencyToChannel(const uint16_t frequency);
-    static app::Clusters::GeneralDiagnostics::InterfaceType GetInterfaceConnectionType(const char * ifname);
+    static app::Clusters::GeneralDiagnostics::InterfaceTypeEnum GetInterfaceConnectionType(const char * ifname);
     static CHIP_ERROR GetInterfaceHardwareAddrs(const char * ifname, uint8_t * buf, size_t bufSize);
     static CHIP_ERROR GetInterfaceIPv4Addrs(const char * ifname, uint8_t & size, NetworkInterface * ifp);
     static CHIP_ERROR GetInterfaceIPv6Addrs(const char * ifname, uint8_t & size, NetworkInterface * ifp);
@@ -54,7 +54,7 @@ class ConnectivityUtils
     static CHIP_ERROR GetWiFiBeaconLostCount(const char * ifname, uint32_t & beaconLostCount);
     static CHIP_ERROR GetWiFiCurrentMaxRate(const char * ifname, uint64_t & currentMaxRate);
     static CHIP_ERROR GetEthInterfaceName(char * ifname, size_t bufSize);
-    //    static CHIP_ERROR GetEthPHYRate(const char * ifname, app::Clusters::EthernetNetworkDiagnostics::PHYRate & pHYRate);
+    //    static CHIP_ERROR GetEthPHYRate(const char * ifname, app::Clusters::EthernetNetworkDiagnostics::PHYRateEnum & pHYRate);
     //    static CHIP_ERROR GetEthFullDuplex(const char * ifname, bool & fullDuplex);
 
 private:
diff --git a/src/platform/nxp/mw320/DiagnosticDataProviderImpl.cpp b/src/platform/nxp/mw320/DiagnosticDataProviderImpl.cpp
index 01d348567c2a2e..244cd30fde1cfc 100644
--- a/src/platform/nxp/mw320/DiagnosticDataProviderImpl.cpp
+++ b/src/platform/nxp/mw320/DiagnosticDataProviderImpl.cpp
@@ -163,7 +163,7 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetNetworkInterfaces(NetworkInterface **
     ifp->Name[Inet::InterfaceId::kMaxIfNameLength - 1] = '\0';
     ifp->name                                          = CharSpan::fromCharString(ifp->Name);
     ifp->isOperational                                 = true;
-    ifp->type                                          = EMBER_ZCL_INTERFACE_TYPE_WI_FI;
+    ifp->type                                          = EMBER_ZCL_INTERFACE_TYPE_ENUM_WI_FI;
     ifp->offPremiseServicesReachableIPv4.SetNull();
     ifp->offPremiseServicesReachableIPv6.SetNull();
     if (ConnectivityUtils::GetInterfaceIPv4Addrs("", size, ifp) == CHIP_NO_ERROR)
diff --git a/src/platform/qpg/DiagnosticDataProviderImpl.cpp b/src/platform/qpg/DiagnosticDataProviderImpl.cpp
index aff2056914fc3f..18c3f60efa18bb 100644
--- a/src/platform/qpg/DiagnosticDataProviderImpl.cpp
+++ b/src/platform/qpg/DiagnosticDataProviderImpl.cpp
@@ -145,10 +145,10 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetActiveHardwareFaults(GeneralFaults<kMa
     ChipLogProgress(DeviceLayer, "GetActiveHardwareFaults");
 
 #if CHIP_CONFIG_TEST
-    ReturnErrorOnFailure(hardwareFaults.add(EMBER_ZCL_HARDWARE_FAULT_RADIO));
-    ReturnErrorOnFailure(hardwareFaults.add(EMBER_ZCL_HARDWARE_FAULT_SENSOR));
-    ReturnErrorOnFailure(hardwareFaults.add(EMBER_ZCL_HARDWARE_FAULT_POWER_SOURCE));
-    ReturnErrorOnFailure(hardwareFaults.add(EMBER_ZCL_HARDWARE_FAULT_USER_INTERFACE_FAULT));
+    ReturnErrorOnFailure(hardwareFaults.add(EMBER_ZCL_HARDWARE_FAULT_ENUM_RADIO));
+    ReturnErrorOnFailure(hardwareFaults.add(EMBER_ZCL_HARDWARE_FAULT_ENUM_SENSOR));
+    ReturnErrorOnFailure(hardwareFaults.add(EMBER_ZCL_HARDWARE_FAULT_ENUM_POWER_SOURCE));
+    ReturnErrorOnFailure(hardwareFaults.add(EMBER_ZCL_HARDWARE_FAULT_ENUM_USER_INTERFACE_FAULT));
 #endif
 
     return CHIP_NO_ERROR;
@@ -158,8 +158,8 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetActiveRadioFaults(GeneralFaults<kMaxRa
 {
     ChipLogProgress(DeviceLayer, "GetActiveRadioFaults");
 #if CHIP_CONFIG_TEST
-    ReturnErrorOnFailure(radioFaults.add(EMBER_ZCL_RADIO_FAULT_THREAD_FAULT));
-    ReturnErrorOnFailure(radioFaults.add(EMBER_ZCL_RADIO_FAULT_BLE_FAULT));
+    ReturnErrorOnFailure(radioFaults.add(EMBER_ZCL_RADIO_FAULT_ENUM_THREAD_FAULT));
+    ReturnErrorOnFailure(radioFaults.add(EMBER_ZCL_RADIO_FAULT_ENUM_BLE_FAULT));
 #endif
 
     return CHIP_NO_ERROR;
@@ -169,9 +169,9 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetActiveNetworkFaults(GeneralFaults<kMax
 {
     ChipLogProgress(DeviceLayer, "GetActiveNetworkFaults");
 #if CHIP_CONFIG_TEST
-    ReturnErrorOnFailure(networkFaults.add(EMBER_ZCL_NETWORK_FAULT_TYPE_HARDWARE_FAILURE));
-    ReturnErrorOnFailure(networkFaults.add(EMBER_ZCL_NETWORK_FAULT_TYPE_NETWORK_JAMMED));
-    ReturnErrorOnFailure(networkFaults.add(EMBER_ZCL_NETWORK_FAULT_TYPE_CONNECTION_FAILED));
+    ReturnErrorOnFailure(networkFaults.add(EMBER_ZCL_NETWORK_FAULT_ENUM_HARDWARE_FAILURE));
+    ReturnErrorOnFailure(networkFaults.add(EMBER_ZCL_NETWORK_FAULT_ENUM_NETWORK_JAMMED));
+    ReturnErrorOnFailure(networkFaults.add(EMBER_ZCL_NETWORK_FAULT_ENUM_CONNECTION_FAILED));
 #endif
 
     return CHIP_NO_ERROR;
diff --git a/src/platform/silabs/DiagnosticDataProviderImpl.cpp b/src/platform/silabs/DiagnosticDataProviderImpl.cpp
index c379f418a09d7b..033886de027027 100644
--- a/src/platform/silabs/DiagnosticDataProviderImpl.cpp
+++ b/src/platform/silabs/DiagnosticDataProviderImpl.cpp
@@ -212,10 +212,10 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetTotalOperationalHours(uint32_t & total
 CHIP_ERROR DiagnosticDataProviderImpl::GetActiveHardwareFaults(GeneralFaults<kMaxHardwareFaults> & hardwareFaults)
 {
 #if CHIP_CONFIG_TEST
-    ReturnErrorOnFailure(hardwareFaults.add(EMBER_ZCL_HARDWARE_FAULT_RADIO));
-    ReturnErrorOnFailure(hardwareFaults.add(EMBER_ZCL_HARDWARE_FAULT_SENSOR));
-    ReturnErrorOnFailure(hardwareFaults.add(EMBER_ZCL_HARDWARE_FAULT_POWER_SOURCE));
-    ReturnErrorOnFailure(hardwareFaults.add(EMBER_ZCL_HARDWARE_FAULT_USER_INTERFACE_FAULT));
+    ReturnErrorOnFailure(hardwareFaults.add(EMBER_ZCL_HARDWARE_FAULT_ENUM_RADIO));
+    ReturnErrorOnFailure(hardwareFaults.add(EMBER_ZCL_HARDWARE_FAULT_ENUM_SENSOR));
+    ReturnErrorOnFailure(hardwareFaults.add(EMBER_ZCL_HARDWARE_FAULT_ENUM_POWER_SOURCE));
+    ReturnErrorOnFailure(hardwareFaults.add(EMBER_ZCL_HARDWARE_FAULT_ENUM_USER_INTERFACE_FAULT));
 #endif
 
     return CHIP_NO_ERROR;
@@ -224,8 +224,8 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetActiveHardwareFaults(GeneralFaults<kMa
 CHIP_ERROR DiagnosticDataProviderImpl::GetActiveRadioFaults(GeneralFaults<kMaxRadioFaults> & radioFaults)
 {
 #if CHIP_CONFIG_TEST
-    ReturnErrorOnFailure(radioFaults.add(EMBER_ZCL_RADIO_FAULT_THREAD_FAULT));
-    ReturnErrorOnFailure(radioFaults.add(EMBER_ZCL_RADIO_FAULT_BLE_FAULT));
+    ReturnErrorOnFailure(radioFaults.add(EMBER_ZCL_RADIO_FAULT_ENUM_THREAD_FAULT));
+    ReturnErrorOnFailure(radioFaults.add(EMBER_ZCL_RADIO_FAULT_ENUM_BLE_FAULT));
 #endif
 
     return CHIP_NO_ERROR;
@@ -234,9 +234,9 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetActiveRadioFaults(GeneralFaults<kMaxRa
 CHIP_ERROR DiagnosticDataProviderImpl::GetActiveNetworkFaults(GeneralFaults<kMaxNetworkFaults> & networkFaults)
 {
 #if CHIP_CONFIG_TEST
-    ReturnErrorOnFailure(networkFaults.add(EMBER_ZCL_NETWORK_FAULT_TYPE_HARDWARE_FAILURE));
-    ReturnErrorOnFailure(networkFaults.add(EMBER_ZCL_NETWORK_FAULT_TYPE_NETWORK_JAMMED));
-    ReturnErrorOnFailure(networkFaults.add(EMBER_ZCL_NETWORK_FAULT_TYPE_CONNECTION_FAILED));
+    ReturnErrorOnFailure(networkFaults.add(EMBER_ZCL_NETWORK_FAULT_ENUM_HARDWARE_FAILURE));
+    ReturnErrorOnFailure(networkFaults.add(EMBER_ZCL_NETWORK_FAULT_ENUM_NETWORK_JAMMED));
+    ReturnErrorOnFailure(networkFaults.add(EMBER_ZCL_NETWORK_FAULT_ENUM_CONNECTION_FAILED));
 #endif
 
     return CHIP_NO_ERROR;
@@ -252,7 +252,7 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetNetworkInterfaces(NetworkInterface **
     ifp->isOperational             = true;
     ifp->offPremiseServicesReachableIPv4.SetNull();
     ifp->offPremiseServicesReachableIPv6.SetNull();
-    ifp->type = InterfaceType::EMBER_ZCL_INTERFACE_TYPE_THREAD;
+    ifp->type = InterfaceTypeEnum::EMBER_ZCL_INTERFACE_TYPE_ENUM_THREAD;
     uint8_t macBuffer[ConfigurationManager::kPrimaryMACAddressLength];
     ConfigurationMgr().GetPrimary802154MACAddress(macBuffer);
     ifp->hardwareAddress = ByteSpan(macBuffer, ConfigurationManager::kPrimaryMACAddressLength);
@@ -270,22 +270,22 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetNetworkInterfaces(NetworkInterface **
             switch (interfaceType)
             {
             case Inet::InterfaceType::Unknown:
-                ifp->type = EMBER_ZCL_INTERFACE_TYPE_UNSPECIFIED;
+                ifp->type = EMBER_ZCL_INTERFACE_TYPE_ENUM_UNSPECIFIED;
                 break;
             case Inet::InterfaceType::WiFi:
-                ifp->type = EMBER_ZCL_INTERFACE_TYPE_WI_FI;
+                ifp->type = EMBER_ZCL_INTERFACE_TYPE_ENUM_WI_FI;
                 break;
             case Inet::InterfaceType::Ethernet:
-                ifp->type = EMBER_ZCL_INTERFACE_TYPE_ETHERNET;
+                ifp->type = EMBER_ZCL_INTERFACE_TYPE_ENUM_ETHERNET;
                 break;
             case Inet::InterfaceType::Thread:
-                ifp->type = EMBER_ZCL_INTERFACE_TYPE_THREAD;
+                ifp->type = EMBER_ZCL_INTERFACE_TYPE_ENUM_THREAD;
                 break;
             case Inet::InterfaceType::Cellular:
-                ifp->type = EMBER_ZCL_INTERFACE_TYPE_CELLULAR;
+                ifp->type = EMBER_ZCL_INTERFACE_TYPE_ENUM_CELLULAR;
                 break;
             default:
-                ifp->type = EMBER_ZCL_INTERFACE_TYPE_WI_FI;
+                ifp->type = EMBER_ZCL_INTERFACE_TYPE_ENUM_WI_FI;
                 break;
             }
         }
diff --git a/src/platform/silabs/EFR32/efr32-mbedtls-psa-crypto-config.h b/src/platform/silabs/EFR32/psa_crypto_config.h
similarity index 100%
rename from src/platform/silabs/EFR32/efr32-mbedtls-psa-crypto-config.h
rename to src/platform/silabs/EFR32/psa_crypto_config.h
diff --git a/src/platform/webos/ConnectivityManagerImpl.cpp b/src/platform/webos/ConnectivityManagerImpl.cpp
index 014dd5260d04a3..9a2cf9f2038640 100644
--- a/src/platform/webos/ConnectivityManagerImpl.cpp
+++ b/src/platform/webos/ConnectivityManagerImpl.cpp
@@ -1127,7 +1127,8 @@ CHIP_ERROR ConnectivityManagerImpl::GetWiFiBssId(ByteSpan & value)
         // Walk through linked list, maintaining head pointer so we can free list later.
         for (struct ifaddrs * ifa = ifaddr; ifa != nullptr; ifa = ifa->ifa_next)
         {
-            if (ConnectivityUtils::GetInterfaceConnectionType(ifa->ifa_name) == InterfaceType::EMBER_ZCL_INTERFACE_TYPE_WI_FI)
+            if (ConnectivityUtils::GetInterfaceConnectionType(ifa->ifa_name) ==
+                InterfaceTypeEnum::EMBER_ZCL_INTERFACE_TYPE_ENUM_WI_FI)
             {
                 if (ConnectivityUtils::GetInterfaceHardwareAddrs(ifa->ifa_name, macAddress, kMaxHardwareAddrSize) != CHIP_NO_ERROR)
                 {
diff --git a/src/platform/webos/ConnectivityUtils.cpp b/src/platform/webos/ConnectivityUtils.cpp
index 9104d20c0bcf4e..9e3121755badbf 100644
--- a/src/platform/webos/ConnectivityUtils.cpp
+++ b/src/platform/webos/ConnectivityUtils.cpp
@@ -243,15 +243,15 @@ double ConnectivityUtils::ConvertFrequenceToFloat(const iw_freq * in)
     return result;
 }
 
-InterfaceType ConnectivityUtils::GetInterfaceConnectionType(const char * ifname)
+InterfaceTypeEnum ConnectivityUtils::GetInterfaceConnectionType(const char * ifname)
 {
-    InterfaceType ret = InterfaceType::EMBER_ZCL_INTERFACE_TYPE_UNSPECIFIED;
-    int sock          = -1;
+    InterfaceTypeEnum ret = InterfaceTypeEnum::EMBER_ZCL_INTERFACE_TYPE_ENUM_UNSPECIFIED;
+    int sock              = -1;
 
     if ((sock = socket(AF_INET, SOCK_STREAM, 0)) == -1)
     {
         ChipLogError(DeviceLayer, "Failed to open socket");
-        return InterfaceType::EMBER_ZCL_INTERFACE_TYPE_UNSPECIFIED;
+        return InterfaceTypeEnum::EMBER_ZCL_INTERFACE_TYPE_ENUM_UNSPECIFIED;
     }
 
     // Test wireless extensions for CONNECTION_WIFI
@@ -260,7 +260,7 @@ InterfaceType ConnectivityUtils::GetInterfaceConnectionType(const char * ifname)
 
     if (ioctl(sock, SIOCGIWNAME, &pwrq) != -1)
     {
-        ret = InterfaceType::EMBER_ZCL_INTERFACE_TYPE_WI_FI;
+        ret = InterfaceTypeEnum::EMBER_ZCL_INTERFACE_TYPE_ENUM_WI_FI;
     }
     else if ((strncmp(ifname, "en", 2) == 0) || (strncmp(ifname, "eth", 3) == 0))
     {
@@ -271,7 +271,7 @@ InterfaceType ConnectivityUtils::GetInterfaceConnectionType(const char * ifname)
         Platform::CopyString(ifr.ifr_name, ifname);
 
         if (ioctl(sock, SIOCETHTOOL, &ifr) != -1)
-            ret = InterfaceType::EMBER_ZCL_INTERFACE_TYPE_ETHERNET;
+            ret = InterfaceTypeEnum::EMBER_ZCL_INTERFACE_TYPE_ENUM_ETHERNET;
     }
 
     close(sock);
@@ -328,7 +328,7 @@ CHIP_ERROR ConnectivityUtils::GetWiFiInterfaceName(char * ifname, size_t bufSize
           can free list later */
         for (ifa = ifaddr; ifa != nullptr; ifa = ifa->ifa_next)
         {
-            if (GetInterfaceConnectionType(ifa->ifa_name) == InterfaceType::EMBER_ZCL_INTERFACE_TYPE_WI_FI)
+            if (GetInterfaceConnectionType(ifa->ifa_name) == InterfaceTypeEnum::EMBER_ZCL_INTERFACE_TYPE_ENUM_WI_FI)
             {
                 Platform::CopyString(ifname, bufSize, ifa->ifa_name);
                 err = CHIP_NO_ERROR;
@@ -522,7 +522,7 @@ CHIP_ERROR ConnectivityUtils::GetEthInterfaceName(char * ifname, size_t bufSize)
           can free list later */
         for (ifa = ifaddr; ifa != nullptr; ifa = ifa->ifa_next)
         {
-            if (GetInterfaceConnectionType(ifa->ifa_name) == InterfaceType::EMBER_ZCL_INTERFACE_TYPE_ETHERNET)
+            if (GetInterfaceConnectionType(ifa->ifa_name) == InterfaceTypeEnum::EMBER_ZCL_INTERFACE_TYPE_ENUM_ETHERNET)
             {
                 Platform::CopyString(ifname, bufSize, ifa->ifa_name);
                 err = CHIP_NO_ERROR;
@@ -536,7 +536,7 @@ CHIP_ERROR ConnectivityUtils::GetEthInterfaceName(char * ifname, size_t bufSize)
     return err;
 }
 
-CHIP_ERROR ConnectivityUtils::GetEthPHYRate(const char * ifname, app::Clusters::EthernetNetworkDiagnostics::PHYRate & pHYRate)
+CHIP_ERROR ConnectivityUtils::GetEthPHYRate(const char * ifname, app::Clusters::EthernetNetworkDiagnostics::PHYRateEnum & pHYRate)
 {
     CHIP_ERROR err = CHIP_NO_ERROR;
 
@@ -566,34 +566,34 @@ CHIP_ERROR ConnectivityUtils::GetEthPHYRate(const char * ifname, app::Clusters::
     switch (speed)
     {
     case 10:
-        pHYRate = EmberAfPHYRate::EMBER_ZCL_PHY_RATE_RATE10_M;
+        pHYRate = EmberAfPHYRateEnum::EMBER_ZCL_PHY_RATE_ENUM_RATE10_M;
         break;
     case 100:
-        pHYRate = EmberAfPHYRate::EMBER_ZCL_PHY_RATE_RATE100_M;
+        pHYRate = EmberAfPHYRateEnum::EMBER_ZCL_PHY_RATE_ENUM_RATE100_M;
         break;
     case 1000:
-        pHYRate = EmberAfPHYRate::EMBER_ZCL_PHY_RATE_RATE1_G;
+        pHYRate = EmberAfPHYRateEnum::EMBER_ZCL_PHY_RATE_ENUM_RATE1_G;
         break;
     case 25000:
-        pHYRate = EmberAfPHYRate::EMBER_ZCL_PHY_RATE_RATE2_5_G;
+        pHYRate = EmberAfPHYRateEnum::EMBER_ZCL_PHY_RATE_ENUM_RATE2_5_G;
         break;
     case 5000:
-        pHYRate = EmberAfPHYRate::EMBER_ZCL_PHY_RATE_RATE5_G;
+        pHYRate = EmberAfPHYRateEnum::EMBER_ZCL_PHY_RATE_ENUM_RATE5_G;
         break;
     case 10000:
-        pHYRate = EmberAfPHYRate::EMBER_ZCL_PHY_RATE_RATE10_G;
+        pHYRate = EmberAfPHYRateEnum::EMBER_ZCL_PHY_RATE_ENUM_RATE10_G;
         break;
     case 40000:
-        pHYRate = EmberAfPHYRate::EMBER_ZCL_PHY_RATE_RATE40_G;
+        pHYRate = EmberAfPHYRateEnum::EMBER_ZCL_PHY_RATE_ENUM_RATE40_G;
         break;
     case 100000:
-        pHYRate = EmberAfPHYRate::EMBER_ZCL_PHY_RATE_RATE100_G;
+        pHYRate = EmberAfPHYRateEnum::EMBER_ZCL_PHY_RATE_ENUM_RATE100_G;
         break;
     case 200000:
-        pHYRate = EmberAfPHYRate::EMBER_ZCL_PHY_RATE_RATE200_G;
+        pHYRate = EmberAfPHYRateEnum::EMBER_ZCL_PHY_RATE_ENUM_RATE200_G;
         break;
     case 400000:
-        pHYRate = EmberAfPHYRate::EMBER_ZCL_PHY_RATE_RATE400_G;
+        pHYRate = EmberAfPHYRateEnum::EMBER_ZCL_PHY_RATE_ENUM_RATE400_G;
         break;
     default:
         ChipLogError(DeviceLayer, "Undefined speed! (%d)\n", speed);
diff --git a/src/platform/webos/ConnectivityUtils.h b/src/platform/webos/ConnectivityUtils.h
index 0df7926cacf803..7670c814b0ebaa 100644
--- a/src/platform/webos/ConnectivityUtils.h
+++ b/src/platform/webos/ConnectivityUtils.h
@@ -42,7 +42,7 @@ class ConnectivityUtils
 public:
     static uint16_t MapChannelToFrequency(const uint16_t inBand, const uint8_t inChannel);
     static uint8_t MapFrequencyToChannel(const uint16_t frequency);
-    static app::Clusters::GeneralDiagnostics::InterfaceType GetInterfaceConnectionType(const char * ifname);
+    static app::Clusters::GeneralDiagnostics::InterfaceTypeEnum GetInterfaceConnectionType(const char * ifname);
     static CHIP_ERROR GetInterfaceHardwareAddrs(const char * ifname, uint8_t * buf, size_t bufSize);
     static CHIP_ERROR GetWiFiInterfaceName(char * ifname, size_t bufSize);
     static CHIP_ERROR GetWiFiChannelNumber(const char * ifname, uint16_t & channelNumber);
@@ -50,7 +50,7 @@ class ConnectivityUtils
     static CHIP_ERROR GetWiFiBeaconLostCount(const char * ifname, uint32_t & beaconLostCount);
     static CHIP_ERROR GetWiFiCurrentMaxRate(const char * ifname, uint64_t & currentMaxRate);
     static CHIP_ERROR GetEthInterfaceName(char * ifname, size_t bufSize);
-    static CHIP_ERROR GetEthPHYRate(const char * ifname, app::Clusters::EthernetNetworkDiagnostics::PHYRate & pHYRate);
+    static CHIP_ERROR GetEthPHYRate(const char * ifname, app::Clusters::EthernetNetworkDiagnostics::PHYRateEnum & pHYRate);
     static CHIP_ERROR GetEthFullDuplex(const char * ifname, bool & fullDuplex);
 
 private:
diff --git a/src/platform/webos/DiagnosticDataProviderImpl.cpp b/src/platform/webos/DiagnosticDataProviderImpl.cpp
index 2a597319973c80..4035e2400e0bf3 100644
--- a/src/platform/webos/DiagnosticDataProviderImpl.cpp
+++ b/src/platform/webos/DiagnosticDataProviderImpl.cpp
@@ -88,7 +88,8 @@ CHIP_ERROR GetEthernetStatsCount(EthernetStatsCountType type, uint64_t & count)
         // Walk through linked list, maintaining head pointer so we can free list later.
         for (ifa = ifaddr; ifa != nullptr; ifa = ifa->ifa_next)
         {
-            if (ConnectivityUtils::GetInterfaceConnectionType(ifa->ifa_name) == InterfaceType::EMBER_ZCL_INTERFACE_TYPE_ETHERNET)
+            if (ConnectivityUtils::GetInterfaceConnectionType(ifa->ifa_name) ==
+                InterfaceTypeEnum::EMBER_ZCL_INTERFACE_TYPE_ENUM_ETHERNET)
             {
                 ChipLogProgress(DeviceLayer, "Found the primary Ethernet interface:%s", StringOrNullMarker(ifa->ifa_name));
                 break;
@@ -152,7 +153,8 @@ CHIP_ERROR GetWiFiStatsCount(WiFiStatsCountType type, uint64_t & count)
         // Walk through linked list, maintaining head pointer so we can free list later.
         for (ifa = ifaddr; ifa != nullptr; ifa = ifa->ifa_next)
         {
-            if (ConnectivityUtils::GetInterfaceConnectionType(ifa->ifa_name) == InterfaceType::EMBER_ZCL_INTERFACE_TYPE_WI_FI)
+            if (ConnectivityUtils::GetInterfaceConnectionType(ifa->ifa_name) ==
+                InterfaceTypeEnum::EMBER_ZCL_INTERFACE_TYPE_ENUM_WI_FI)
             {
                 ChipLogProgress(DeviceLayer, "Found the primary WiFi interface:%s", StringOrNullMarker(ifa->ifa_name));
                 break;
@@ -384,10 +386,10 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetActiveHardwareFaults(GeneralFaults<kMa
 {
 #if CHIP_CONFIG_TEST
     // On Linux Simulation, set following hardware faults statically.
-    ReturnErrorOnFailure(hardwareFaults.add(EMBER_ZCL_HARDWARE_FAULT_RADIO));
-    ReturnErrorOnFailure(hardwareFaults.add(EMBER_ZCL_HARDWARE_FAULT_SENSOR));
-    ReturnErrorOnFailure(hardwareFaults.add(EMBER_ZCL_HARDWARE_FAULT_POWER_SOURCE));
-    ReturnErrorOnFailure(hardwareFaults.add(EMBER_ZCL_HARDWARE_FAULT_USER_INTERFACE_FAULT));
+    ReturnErrorOnFailure(hardwareFaults.add(EMBER_ZCL_HARDWARE_FAULT_ENUM_RADIO));
+    ReturnErrorOnFailure(hardwareFaults.add(EMBER_ZCL_HARDWARE_FAULT_ENUM_SENSOR));
+    ReturnErrorOnFailure(hardwareFaults.add(EMBER_ZCL_HARDWARE_FAULT_ENUM_POWER_SOURCE));
+    ReturnErrorOnFailure(hardwareFaults.add(EMBER_ZCL_HARDWARE_FAULT_ENUM_USER_INTERFACE_FAULT));
 #endif
 
     return CHIP_NO_ERROR;
@@ -397,10 +399,10 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetActiveRadioFaults(GeneralFaults<kMaxRa
 {
 #if CHIP_CONFIG_TEST
     // On Linux Simulation, set following radio faults statically.
-    ReturnErrorOnFailure(radioFaults.add(EMBER_ZCL_RADIO_FAULT_WI_FI_FAULT));
-    ReturnErrorOnFailure(radioFaults.add(EMBER_ZCL_RADIO_FAULT_CELLULAR_FAULT));
-    ReturnErrorOnFailure(radioFaults.add(EMBER_ZCL_RADIO_FAULT_THREAD_FAULT));
-    ReturnErrorOnFailure(radioFaults.add(EMBER_ZCL_RADIO_FAULT_NFC_FAULT));
+    ReturnErrorOnFailure(radioFaults.add(EMBER_ZCL_RADIO_FAULT_ENUM_WI_FI_FAULT));
+    ReturnErrorOnFailure(radioFaults.add(EMBER_ZCL_RADIO_FAULT_ENUM_CELLULAR_FAULT));
+    ReturnErrorOnFailure(radioFaults.add(EMBER_ZCL_RADIO_FAULT_ENUM_THREAD_FAULT));
+    ReturnErrorOnFailure(radioFaults.add(EMBER_ZCL_RADIO_FAULT_ENUM_NFC_FAULT));
 #endif
 
     return CHIP_NO_ERROR;
@@ -410,9 +412,9 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetActiveNetworkFaults(GeneralFaults<kMax
 {
 #if CHIP_CONFIG_TEST
     // On Linux Simulation, set following radio faults statically.
-    ReturnErrorOnFailure(networkFaults.add(EMBER_ZCL_NETWORK_FAULT_TYPE_HARDWARE_FAILURE));
-    ReturnErrorOnFailure(networkFaults.add(EMBER_ZCL_NETWORK_FAULT_TYPE_NETWORK_JAMMED));
-    ReturnErrorOnFailure(networkFaults.add(EMBER_ZCL_NETWORK_FAULT_TYPE_CONNECTION_FAILED));
+    ReturnErrorOnFailure(networkFaults.add(EMBER_ZCL_NETWORK_FAULT_ENUM_HARDWARE_FAILURE));
+    ReturnErrorOnFailure(networkFaults.add(EMBER_ZCL_NETWORK_FAULT_ENUM_NETWORK_JAMMED));
+    ReturnErrorOnFailure(networkFaults.add(EMBER_ZCL_NETWORK_FAULT_ENUM_CONNECTION_FAILED));
 #endif
 
     return CHIP_NO_ERROR;
@@ -481,7 +483,7 @@ void DiagnosticDataProviderImpl::ReleaseNetworkInterfaces(NetworkInterface * net
     }
 }
 
-CHIP_ERROR DiagnosticDataProviderImpl::GetEthPHYRate(app::Clusters::EthernetNetworkDiagnostics::PHYRate & pHYRate)
+CHIP_ERROR DiagnosticDataProviderImpl::GetEthPHYRate(app::Clusters::EthernetNetworkDiagnostics::PHYRateEnum & pHYRate)
 {
     if (ConnectivityMgrImpl().GetEthernetIfName() == nullptr)
     {
@@ -582,7 +584,8 @@ CHIP_ERROR DiagnosticDataProviderImpl::ResetEthNetworkDiagnosticsCounts()
         // Walk through linked list, maintaining head pointer so we can free list later.
         for (ifa = ifaddr; ifa != nullptr; ifa = ifa->ifa_next)
         {
-            if (ConnectivityUtils::GetInterfaceConnectionType(ifa->ifa_name) == InterfaceType::EMBER_ZCL_INTERFACE_TYPE_ETHERNET)
+            if (ConnectivityUtils::GetInterfaceConnectionType(ifa->ifa_name) ==
+                InterfaceTypeEnum::EMBER_ZCL_INTERFACE_TYPE_ENUM_ETHERNET)
             {
                 ChipLogProgress(DeviceLayer, "Found the primary Ethernet interface:%s", StringOrNullMarker(ifa->ifa_name));
                 break;
@@ -747,7 +750,8 @@ CHIP_ERROR DiagnosticDataProviderImpl::ResetWiFiNetworkDiagnosticsCounts()
         // Walk through linked list, maintaining head pointer so we can free list later.
         for (ifa = ifaddr; ifa != nullptr; ifa = ifa->ifa_next)
         {
-            if (ConnectivityUtils::GetInterfaceConnectionType(ifa->ifa_name) == InterfaceType::EMBER_ZCL_INTERFACE_TYPE_WI_FI)
+            if (ConnectivityUtils::GetInterfaceConnectionType(ifa->ifa_name) ==
+                InterfaceTypeEnum::EMBER_ZCL_INTERFACE_TYPE_ENUM_WI_FI)
             {
                 ChipLogProgress(DeviceLayer, "Found the primary WiFi interface:%s", StringOrNullMarker(ifa->ifa_name));
                 break;
diff --git a/src/platform/webos/DiagnosticDataProviderImpl.h b/src/platform/webos/DiagnosticDataProviderImpl.h
index 7baa700910604c..a16a6673404e5b 100644
--- a/src/platform/webos/DiagnosticDataProviderImpl.h
+++ b/src/platform/webos/DiagnosticDataProviderImpl.h
@@ -57,7 +57,7 @@ class DiagnosticDataProviderImpl : public DiagnosticDataProvider
     CHIP_ERROR GetNetworkInterfaces(NetworkInterface ** netifpp) override;
     void ReleaseNetworkInterfaces(NetworkInterface * netifp) override;
 
-    CHIP_ERROR GetEthPHYRate(app::Clusters::EthernetNetworkDiagnostics::PHYRate & pHYRate) override;
+    CHIP_ERROR GetEthPHYRate(app::Clusters::EthernetNetworkDiagnostics::PHYRateEnum & pHYRate) override;
     CHIP_ERROR GetEthFullDuplex(bool & fullDuplex) override;
     CHIP_ERROR GetEthTimeSinceReset(uint64_t & timeSinceReset) override;
     CHIP_ERROR GetEthPacketRxCount(uint64_t & packetRxCount) override;
diff --git a/src/test_driver/openiotsdk/integration-tests/lock-app/test_app.py b/src/test_driver/openiotsdk/integration-tests/lock-app/test_app.py
index cadd7eab4b116d..2895deebb532ff 100644
--- a/src/test_driver/openiotsdk/integration-tests/lock-app/test_app.py
+++ b/src/test_driver/openiotsdk/integration-tests/lock-app/test_app.py
@@ -113,7 +113,7 @@ def test_lock_ctrl(device, controller):
     assert err == 0
     assert res.userIndex == LOCK_CTRL_TEST_USER_INDEX
     assert res.userName == LOCK_CTRL_TEST_USER_NAME
-    assert res.userUniqueId == LOCK_CTRL_TEST_USER_INDEX
+    assert res.userUniqueID == LOCK_CTRL_TEST_USER_INDEX
     assert res.userStatus == DoorLock.Enums.DlUserStatus.kOccupiedEnabled
     assert res.userType == DoorLock.Enums.DlUserType.kUnrestrictedUser
     assert res.credentialRule == DoorLock.Enums.DlCredentialRule.kSingle
diff --git a/third_party/bouffalolab/bl602/bl_iot_sdk.gni b/third_party/bouffalolab/bl602/bl_iot_sdk.gni
index 6c684a24a9006a..168731384fb644 100644
--- a/third_party/bouffalolab/bl602/bl_iot_sdk.gni
+++ b/third_party/bouffalolab/bl602/bl_iot_sdk.gni
@@ -56,12 +56,14 @@ template("bl_iot_sdk") {
       defines += invoker.defines
     }
 
-    if (defined(invoker.freertos_config)) {
-      cflags_c = [
-        "-include",
-        rebase_path("${invoker.freertos_config}", root_build_dir),
-      ]
-    }
+    cflags_c = [
+      "-include",
+      rebase_path("${invoker.freertos_config}", root_build_dir),
+    ]
+    cflags_cc = [
+      "-include",
+      rebase_path("${invoker.freertos_config}", root_build_dir),
+    ]
   }
 
   source_set("${sdk_target_name}_soc") {
@@ -259,6 +261,7 @@ template("bl_iot_sdk") {
       "-Wno-old-style-declaration",
       "-Wno-stringop-overflow",
       "-Wno-format-truncation",
+      "-Wno-unused-variable",
     ]
     configs += [
       ":${sdk_target_name}_config_wifi",
@@ -567,9 +570,10 @@ template("bl_iot_sdk") {
 
     include_dirs = [
       "${bl_iot_sdk_root}/components/network/ble/blestack/src/common",
+      "${bl_iot_sdk_root}/components/network/ble/blestack/src/common/include",
+      "${bl_iot_sdk_root}/components/network/ble/blestack/src/common/include/misc",
       "${bl_iot_sdk_root}/components/network/ble/blestack/src/bl_hci_wrapper",
       "${bl_iot_sdk_root}/components/network/ble/blestack/src/common/tinycrypt/include/tinycrypt",
-      "${bl_iot_sdk_root}/components/network/ble/blestack/src/common/include/misc",
     ]
 
     sources = [
@@ -613,6 +617,7 @@ template("bl_iot_sdk") {
       "-Wno-unused-function",
       "-Wno-incompatible-pointer-types",
       "-Wno-discarded-qualifiers",
+      "-Wno-unused-variable",
     ]
   }
 
@@ -660,6 +665,7 @@ template("bl_iot_sdk") {
       "BL_CHIP_NAME=\"BL602\"",
       "TD_DIAGNOSIS_STA",
       "OS_USING_FREERTOS",
+      "CFG_VIRT_DEV_MAX=1",
     ]
     include_dirs = [
       "${bl_iot_sdk_root}/components/os/bl_os_adapter/bl_os_adapter/include",
@@ -904,6 +910,10 @@ template("bl_iot_sdk") {
     sources +=
         [ "${bl_iot_sdk_root}/components/network/lwip_dhcpd/dhcp_server_raw.c" ]
 
+    cflags_c = [
+      "-Wno-incompatible-pointer-types",
+      "-Wno-sign-compare",
+    ]
     configs += [ ":${sdk_target_name}_config_freertos" ]
     public_configs = [
       ":${sdk_target_name}_config",
diff --git a/third_party/bouffalolab/bl702/bl_iot_sdk.gni b/third_party/bouffalolab/bl702/bl_iot_sdk.gni
index 9e96105373928a..402eec511e7f27 100644
--- a/third_party/bouffalolab/bl702/bl_iot_sdk.gni
+++ b/third_party/bouffalolab/bl702/bl_iot_sdk.gni
@@ -24,8 +24,6 @@ declare_args() {
   bl_iot_sdk_root = "${chip_root}/third_party/bouffalolab/repo"
 
   enable_cdc_module = false
-
-  thread_port_1_3 = false
 }
 
 assert(bl_iot_sdk_root != "", "bl_iot_sdk_root must be specified")
@@ -64,12 +62,14 @@ template("bl_iot_sdk") {
       defines += invoker.defines
     }
 
-    if (defined(invoker.freertos_config)) {
-      cflags_c = [
-        "-include",
-        rebase_path("${invoker.freertos_config}", root_build_dir),
-      ]
-    }
+    cflags_c = [
+      "-include",
+      rebase_path("${invoker.freertos_config}", root_build_dir),
+    ]
+    cflags_cc = [
+      "-include",
+      rebase_path("${invoker.freertos_config}", root_build_dir),
+    ]
   }
 
   config("${sdk_target_name}_config_soc") {
@@ -239,7 +239,6 @@ template("bl_iot_sdk") {
       "${bl_iot_sdk_root}/components/platform/hosal/bl702_hal/bl_adc.c",
       "${bl_iot_sdk_root}/components/platform/hosal/bl702_hal/bl_boot2.c",
       "${bl_iot_sdk_root}/components/platform/hosal/bl702_hal/bl_chip.c",
-      "${bl_iot_sdk_root}/components/platform/hosal/bl702_hal/bl_cks.c",
       "${bl_iot_sdk_root}/components/platform/hosal/bl702_hal/bl_dma.c",
       "${bl_iot_sdk_root}/components/platform/hosal/bl702_hal/bl_efuse.c",
       "${bl_iot_sdk_root}/components/platform/hosal/bl702_hal/bl_emac.c",
@@ -284,9 +283,7 @@ template("bl_iot_sdk") {
       "${bl_iot_sdk_root}/components/platform/hosal/sec_common/bl_sec_aes.c",
       "${bl_iot_sdk_root}/components/platform/hosal/sec_common/bl_sec_common.c",
       "${bl_iot_sdk_root}/components/platform/hosal/sec_common/bl_sec_pka.c",
-
-      # need update bl_sec_sha.c to fix compile error
-      # "${bl_iot_sdk_root}/components/platform/hosal/sec_common/bl_sec_sha.c",
+      "${bl_iot_sdk_root}/components/platform/hosal/sec_common/bl_sec_sha.c",
     ]
 
     cflags_c = [
@@ -296,6 +293,7 @@ template("bl_iot_sdk") {
       "-Wno-old-style-declaration",
       "-Wno-stringop-overflow",
       "-Wno-format-truncation",
+      "-Wno-shadow",
     ]
     configs += [
       ":${sdk_target_name}_config_soc",
@@ -522,13 +520,14 @@ template("bl_iot_sdk") {
       "CONFIG_BT_SETTINGS_USE_PRINTK",
     ]
 
-    libs = [ "${bl_iot_sdk_root}/components/network/ble/blecontroller_702_std/lib/libblecontroller_702_std.a" ]
+    libs = [ "${bl_iot_sdk_root}/components/network/ble/blecontroller_702_m1s1/lib/libblecontroller_702_m1s1.a" ]
 
     include_dirs = [
       "${bl_iot_sdk_root}/components/network/ble/blestack/src/common",
+      "${bl_iot_sdk_root}/components/network/ble/blestack/src/common/include",
+      "${bl_iot_sdk_root}/components/network/ble/blestack/src/common/include/misc",
       "${bl_iot_sdk_root}/components/network/ble/blestack/src/bl_hci_wrapper",
       "${bl_iot_sdk_root}/components/network/ble/blestack/src/common/tinycrypt/include/tinycrypt",
-      "${bl_iot_sdk_root}/components/network/ble/blestack/src/common/include/misc",
     ]
 
     sources = [
@@ -577,9 +576,6 @@ template("bl_iot_sdk") {
 
   config("${sdk_target_name}_config_openthread_port") {
     defines = [ "OT_FREERTOS_ENABLE=1" ]
-    if (thread_port_1_3) {
-      defines += [ "OT_THREAD_PORT_1_3" ]
-    }
 
     include_dirs = [
       "${chip_root}/platform/bl702",
@@ -588,14 +584,12 @@ template("bl_iot_sdk") {
       "${bl_iot_sdk_root}/components/network/thread/openthread_port/include",
     ]
 
-    if (thread_port_1_3) {
-      include_dirs += [
-        "${bl_iot_sdk_root}/components/network/thread/openthread_utils/include",
-      ]
-    }
+    include_dirs += [
+      "${bl_iot_sdk_root}/components/network/thread/openthread_utils/include",
+    ]
   }
 
-  source_set("${sdk_target_name}_openthread") {
+  source_set("${sdk_target_name}_openthread_port") {
     import("//build_overrides/openthread.gni")
 
     include_dirs = [
@@ -609,18 +603,17 @@ template("bl_iot_sdk") {
       "${bl_iot_sdk_root}/components/network/thread/openthread_port/ot_alarm.c",
       "${bl_iot_sdk_root}/components/network/thread/openthread_port/ot_diag.c",
       "${bl_iot_sdk_root}/components/network/thread/openthread_port/ot_entropy.c",
+      "${bl_iot_sdk_root}/components/network/thread/openthread_port/ot_linkmetric.c",
       "${bl_iot_sdk_root}/components/network/thread/openthread_port/ot_logging.c",
       "${bl_iot_sdk_root}/components/network/thread/openthread_port/ot_misc.c",
       "${bl_iot_sdk_root}/components/network/thread/openthread_port/ot_radio.c",
       "${bl_iot_sdk_root}/components/network/thread/openthread_port/ot_settings.c",
     ]
 
-    libs = [ "${bl_iot_sdk_root}/components/network/lmac154/lib/liblmac154.a" ]
-
-    if (thread_port_1_3) {
-      sources += [ "${bl_iot_sdk_root}/components/network/thread/openthread_port/ot_linkmetric.c" ]
-      libs += [ "${bl_iot_sdk_root}/components/network/thread/openthread_utils/lib/libopenthread_utils.a" ]
-    }
+    libs = [
+      "${bl_iot_sdk_root}/components/network/lmac154/lib/liblmac154.a",
+      "${bl_iot_sdk_root}/components/network/thread/openthread_utils_bl702/lib/libopenthread_utils_bl702.a",
+    ]
 
     configs += [
       ":${sdk_target_name}_config_BSP_Driver",
@@ -811,7 +804,7 @@ template("bl_iot_sdk") {
     ]
 
     if (chip_enable_openthread) {
-      public_deps += [ ":${sdk_target_name}_openthread" ]
+      public_deps += [ ":${sdk_target_name}_openthread_port" ]
     }
 
     if (chip_enable_wifi) {
diff --git a/third_party/bouffalolab/repo b/third_party/bouffalolab/repo
index abf04dcdc4ce5f..890577da8b6b1d 160000
--- a/third_party/bouffalolab/repo
+++ b/third_party/bouffalolab/repo
@@ -1 +1 @@
-Subproject commit abf04dcdc4ce5f94c57b6150d6ba52a22b700880
+Subproject commit 890577da8b6b1d7f1078382e4e320a1e60cc5f60
diff --git a/third_party/silabs/efr32_sdk.gni b/third_party/silabs/efr32_sdk.gni
index c6aa9d95a4fdb0..1583b7eee1e248 100644
--- a/third_party/silabs/efr32_sdk.gni
+++ b/third_party/silabs/efr32_sdk.gni
@@ -139,26 +139,28 @@ template("efr32_sdk") {
       "${efr32_sdk_root}/platform/service/token_manager/test/stack/config",
       "${efr32_sdk_root}/platform/service/token_manager/test/stack/include",
       "${efr32_sdk_root}/platform/middleware/glib",
+      "${efr32_sdk_root}/platform/middleware/glib/config",
       "${efr32_sdk_root}/platform/middleware/glib/glib",
       "${efr32_sdk_root}/platform/middleware/glib/dmd",
       "${efr32_sdk_root}/platform/base/hal/plugin/psstore",
       "${efr32_sdk_root}/platform/base/hal/plugin/antenna",
       "${efr32_sdk_root}/protocol/bluetooth/inc/",
       "${efr32_sdk_root}/app/bluetooth/common/in_place_ota_dfu/",
+      "${efr32_sdk_root}/app/bluetooth/common/in_place_ota_dfu/config/",
       "${efr32_sdk_root}/util/plugin/plugin-common/fem-control",
       "${efr32_sdk_root}/util/silicon_labs/silabs_core/graphics",
       "${efr32_sdk_root}/util/silicon_labs/silabs_core/memory_manager",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/include",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/include/psa",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library",
-      "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_alt/include",
-      "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_protocol_crypto/src",
-      "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_mbedtls_support/inc",
-      "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_mbedtls_support/config/",
-      "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_psa_driver/inc",
-      "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_psa_driver/inc/public",
-      "${efr32_sdk_root}/util/third_party/crypto/sl_component/se_manager/inc",
-      "${efr32_sdk_root}/util/third_party/crypto/sl_component/se_manager/src/",
+      "${efr32_sdk_root}/util/third_party/mbedtls/include",
+      "${efr32_sdk_root}/util/third_party/mbedtls/include/psa",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library",
+      "${efr32_sdk_root}/platform/security/sl_component/sl_alt/include",
+      "${efr32_sdk_root}/platform/security/sl_component/sl_protocol_crypto/src",
+      "${efr32_sdk_root}/platform/security/sl_component/sl_mbedtls_support/inc",
+      "${efr32_sdk_root}/platform/security/sl_component/sl_mbedtls_support/config/",
+      "${efr32_sdk_root}/platform/security/sl_component/sl_psa_driver/inc",
+      "${efr32_sdk_root}/platform/security/sl_component/sl_psa_driver/inc/public",
+      "${efr32_sdk_root}/platform/security/sl_component/se_manager/inc",
+      "${efr32_sdk_root}/platform/security/sl_component/se_manager/src/",
       "${efr32_sdk_root}/util/third_party/freertos/cmsis/Include",
       "${efr32_sdk_root}/util/third_party/freertos/kernel/include",
       "${sdk_support_root}/matter/efr32/${silabs_family}/${silabs_board}/config",
@@ -172,7 +174,7 @@ template("efr32_sdk") {
     # declared in efr32_mbedtls_config further down this file.
     defines = [
       "MBEDTLS_CONFIG_FILE=\"efr32-chip-mbedtls-config.h\"",
-      "MBEDTLS_PSA_CRYPTO_CONFIG_FILE=\"efr32-mbedtls-psa-crypto-config.h\"",
+      "MBEDTLS_PSA_CRYPTO_CONFIG_FILE=\"psa_crypto_config.h\"",
       "__STARTUP_CLEAR_BSS",
       "HARD_FAULT_LOG_ENABLE",
       "CORTEXM3_EFM32_MICRO",
@@ -401,7 +403,7 @@ template("efr32_sdk") {
     # edited.
     sources = [
       "${chip_root}/src/platform/silabs/EFR32/efr32-chip-mbedtls-config.h",
-      "${chip_root}/src/platform/silabs/EFR32/efr32-mbedtls-psa-crypto-config.h",
+      "${chip_root}/src/platform/silabs/EFR32/psa_crypto_config.h",
     ]
 
     public_deps = [ "${chip_root}/src/crypto:crypto_buildconfig" ]
@@ -443,6 +445,32 @@ template("efr32_sdk") {
       "${efr32_sdk_root}/platform/radio/rail_lib/hal/efr32/hal_efr.c",
       "${efr32_sdk_root}/platform/radio/rail_lib/plugin/pa-conversions/pa_conversions_efr32.c",
       "${efr32_sdk_root}/platform/radio/rail_lib/plugin/rail_util_pti/sl_rail_util_pti.c",
+      "${efr32_sdk_root}/platform/security/sl_component/sl_mbedtls_support/src/aes_aes.c",
+      "${efr32_sdk_root}/platform/security/sl_component/sl_mbedtls_support/src/crypto_aes.c",
+      "${efr32_sdk_root}/platform/security/sl_component/sl_mbedtls_support/src/crypto_ecp.c",
+      "${efr32_sdk_root}/platform/security/sl_component/sl_mbedtls_support/src/error.c",
+      "${efr32_sdk_root}/platform/security/sl_component/sl_mbedtls_support/src/mbedtls_ccm.c",
+      "${efr32_sdk_root}/platform/security/sl_component/sl_mbedtls_support/src/mbedtls_cmac.c",
+      "${efr32_sdk_root}/platform/security/sl_component/sl_mbedtls_support/src/mbedtls_ecdsa_ecdh.c",
+      "${efr32_sdk_root}/platform/security/sl_component/sl_mbedtls_support/src/mbedtls_sha.c",
+      "${efr32_sdk_root}/platform/security/sl_component/sl_mbedtls_support/src/sl_entropy_hardware.c",
+      "${efr32_sdk_root}/platform/security/sl_component/sl_mbedtls_support/src/sl_mbedtls.c",
+      "${efr32_sdk_root}/platform/security/sl_component/sl_mbedtls_support/src/sli_psa_crypto.c",
+      "${efr32_sdk_root}/platform/security/sl_component/sl_mbedtls_support/src/version_features.c",
+      "${efr32_sdk_root}/platform/security/sl_component/sl_protocol_crypto/src/sli_protocol_crypto_crypto.c",
+      "${efr32_sdk_root}/platform/security/sl_component/sl_protocol_crypto/src/sli_protocol_crypto_radioaes.c",
+      "${efr32_sdk_root}/platform/security/sl_component/sl_psa_driver/src/crypto_management.c",
+      "${efr32_sdk_root}/platform/security/sl_component/sl_psa_driver/src/sl_psa_its_nvm3.c",
+      "${efr32_sdk_root}/platform/security/sl_component/sl_psa_driver/src/sli_crypto_transparent_driver_aead.c",
+      "${efr32_sdk_root}/platform/security/sl_component/sl_psa_driver/src/sli_crypto_transparent_driver_cipher.c",
+      "${efr32_sdk_root}/platform/security/sl_component/sl_psa_driver/src/sli_crypto_transparent_driver_hash.c",
+      "${efr32_sdk_root}/platform/security/sl_component/sl_psa_driver/src/sli_crypto_transparent_driver_mac.c",
+      "${efr32_sdk_root}/platform/security/sl_component/sl_psa_driver/src/sli_crypto_trng_driver.c",
+      "${efr32_sdk_root}/platform/security/sl_component/sl_psa_driver/src/sli_psa_driver_common.c",
+      "${efr32_sdk_root}/platform/security/sl_component/sl_psa_driver/src/sli_psa_driver_init.c",
+      "${efr32_sdk_root}/platform/security/sl_component/sl_psa_driver/src/sli_psa_trng.c",
+      "${efr32_sdk_root}/platform/security/sl_component/sl_psa_driver/src/sli_se_driver_builtin_keys.c",
+      "${efr32_sdk_root}/platform/security/sl_component/sl_psa_driver/src/sli_se_driver_signature.c",
       "${efr32_sdk_root}/platform/service/device_init/src/sl_device_init_lfrco.c",
       "${efr32_sdk_root}/platform/service/device_init/src/sl_device_init_nvic.c",
       "${efr32_sdk_root}/platform/service/hfxo_manager/src/sl_hfxo_manager.c",
@@ -469,109 +497,6 @@ template("efr32_sdk") {
       "${efr32_sdk_root}/protocol/bluetooth/src/sli_bt_advertiser_config.c",
       "${efr32_sdk_root}/protocol/bluetooth/src/sli_bt_connection_config.c",
       "${efr32_sdk_root}/util/silicon_labs/silabs_core/memory_manager/sl_malloc.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/aes.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/aesni.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/asn1parse.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/asn1write.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/base64.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/bignum.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/camellia.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/ccm.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/chacha20.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/chachapoly.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/cipher.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/cipher_wrap.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/cmac.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/constant_time.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/ctr_drbg.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/debug.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/des.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/dhm.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/ecdh.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/ecdsa.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/ecjpake.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/ecp.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/ecp_curves.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/entropy.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/entropy_poll.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/gcm.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/hkdf.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/hmac_drbg.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/md.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/md5.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/oid.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/pem.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/pk.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/pk_wrap.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/pkcs12.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/pkcs5.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/pkparse.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/pkwrite.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/platform.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/platform_util.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/poly1305.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/psa_crypto.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/psa_crypto_aead.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/psa_crypto_cipher.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/psa_crypto_client.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/psa_crypto_driver_wrappers.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/psa_crypto_ecp.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/psa_crypto_hash.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/psa_crypto_mac.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/psa_crypto_rsa.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/psa_crypto_se.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/psa_crypto_slot_management.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/psa_crypto_storage.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/psa_its_file.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/ripemd160.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/rsa.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/sha1.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/sha256.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/sha512.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/ssl_cache.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/ssl_ciphersuites.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/ssl_cli.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/ssl_cookie.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/ssl_msg.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/ssl_srv.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/ssl_ticket.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/ssl_tls.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/ssl_tls13_keys.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/threading.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/timing.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/version.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/x509.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/x509_create.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/x509_crl.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/x509_crt.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/x509_csr.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/x509write_crt.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/x509write_csr.c",
-      "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_mbedtls_support/src/aes_aes.c",
-      "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_mbedtls_support/src/crypto_aes.c",
-      "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_mbedtls_support/src/crypto_ecp.c",
-      "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_mbedtls_support/src/error.c",
-      "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_mbedtls_support/src/mbedtls_ccm.c",
-      "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_mbedtls_support/src/mbedtls_cmac.c",
-      "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_mbedtls_support/src/mbedtls_ecdsa_ecdh.c",
-      "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_mbedtls_support/src/mbedtls_sha.c",
-      "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_mbedtls_support/src/sl_entropy_hardware.c",
-      "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_mbedtls_support/src/sl_mbedtls.c",
-      "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_mbedtls_support/src/version_features.c",
-      "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_protocol_crypto/src/sli_protocol_crypto_crypto.c",
-      "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_protocol_crypto/src/sli_protocol_crypto_radioaes.c",
-      "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_psa_driver/src/crypto_management.c",
-      "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_psa_driver/src/sl_psa_its_nvm3.c",
-      "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_psa_driver/src/sli_crypto_transparent_driver_aead.c",
-      "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_psa_driver/src/sli_crypto_transparent_driver_cipher.c",
-      "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_psa_driver/src/sli_crypto_transparent_driver_hash.c",
-      "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_psa_driver/src/sli_crypto_transparent_driver_mac.c",
-      "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_psa_driver/src/sli_crypto_trng_driver.c",
-      "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_psa_driver/src/sli_psa_driver_common.c",
-      "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_psa_driver/src/sli_psa_driver_init.c",
-      "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_psa_driver/src/sli_psa_trng.c",
-      "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_psa_driver/src/sli_se_driver_builtin_keys.c",
-      "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_psa_driver/src/sli_se_driver_signature.c",
       "${efr32_sdk_root}/util/third_party/freertos/cmsis/Source/cmsis_os2.c",
       "${efr32_sdk_root}/util/third_party/freertos/kernel/croutine.c",
       "${efr32_sdk_root}/util/third_party/freertos/kernel/event_groups.c",
@@ -580,6 +505,86 @@ template("efr32_sdk") {
       "${efr32_sdk_root}/util/third_party/freertos/kernel/stream_buffer.c",
       "${efr32_sdk_root}/util/third_party/freertos/kernel/tasks.c",
       "${efr32_sdk_root}/util/third_party/freertos/kernel/timers.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/aes.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/aesni.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/asn1parse.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/asn1write.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/base64.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/bignum.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/camellia.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/ccm.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/chacha20.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/chachapoly.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/cipher.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/cipher_wrap.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/cmac.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/constant_time.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/ctr_drbg.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/debug.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/des.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/dhm.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/ecdh.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/ecdsa.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/ecjpake.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/ecp.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/ecp_curves.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/entropy.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/entropy_poll.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/gcm.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/hkdf.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/hmac_drbg.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/md.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/md5.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/oid.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/pem.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/pk.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/pk_wrap.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/pkcs12.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/pkcs5.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/pkparse.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/pkwrite.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/platform.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/platform_util.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/poly1305.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/psa_crypto.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/psa_crypto_aead.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/psa_crypto_cipher.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/psa_crypto_client.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/psa_crypto_driver_wrappers.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/psa_crypto_ecp.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/psa_crypto_hash.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/psa_crypto_mac.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/psa_crypto_rsa.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/psa_crypto_se.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/psa_crypto_slot_management.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/psa_crypto_storage.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/psa_its_file.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/ripemd160.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/rsa.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/sha1.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/sha256.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/sha512.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/ssl_cache.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/ssl_ciphersuites.c",
+
+      # "${efr32_sdk_root}/util/third_party/mbedtls/library/ssl_cli.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/ssl_cookie.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/ssl_msg.c",
+
+      # "${efr32_sdk_root}/util/third_party/mbedtls/library/ssl_srv.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/ssl_ticket.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/ssl_tls.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/ssl_tls13_keys.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/threading.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/timing.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/version.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/x509.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/x509_create.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/x509_crl.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/x509_crt.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/x509_csr.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/x509write_crt.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/x509write_csr.c",
       "${sdk_support_root}/matter/efr32/${silabs_family}/${silabs_board}/autogen/gatt_db.c",
       "${sdk_support_root}/matter/efr32/${silabs_family}/${silabs_board}/autogen/sl_bluetooth.c",
       "${sdk_support_root}/matter/efr32/${silabs_family}/${silabs_board}/autogen/sl_board_default_init.c",
@@ -653,13 +658,13 @@ template("efr32_sdk") {
         "${efr32_sdk_root}/hardware/driver/memlcd/src/sl_memlcd.c",
         "${efr32_sdk_root}/hardware/driver/memlcd/src/sl_memlcd_display.c",
         "${efr32_sdk_root}/platform/middleware/glib/dmd/display/dmd_memlcd.c",
+        "${efr32_sdk_root}/platform/middleware/glib/fonts/glib_font_narrow_6x8.c",
+        "${efr32_sdk_root}/platform/middleware/glib/fonts/glib_font_normal_8x8.c",
+        "${efr32_sdk_root}/platform/middleware/glib/fonts/glib_font_number_16x20.c",
         "${efr32_sdk_root}/platform/middleware/glib/glib/bmp.c",
         "${efr32_sdk_root}/platform/middleware/glib/glib/glib.c",
         "${efr32_sdk_root}/platform/middleware/glib/glib/glib_bitmap.c",
         "${efr32_sdk_root}/platform/middleware/glib/glib/glib_circle.c",
-        "${efr32_sdk_root}/platform/middleware/glib/glib/glib_font_narrow_6x8.c",
-        "${efr32_sdk_root}/platform/middleware/glib/glib/glib_font_normal_8x8.c",
-        "${efr32_sdk_root}/platform/middleware/glib/glib/glib_font_number_16x20.c",
         "${efr32_sdk_root}/platform/middleware/glib/glib/glib_line.c",
         "${efr32_sdk_root}/platform/middleware/glib/glib/glib_polygon.c",
         "${efr32_sdk_root}/platform/middleware/glib/glib/glib_rectangle.c",
@@ -692,37 +697,37 @@ template("efr32_sdk") {
         "${efr32_sdk_root}/platform/Device/SiliconLabs/EFR32MG21/Source/startup_efr32mg21.c",
         "${efr32_sdk_root}/platform/Device/SiliconLabs/EFR32MG21/Source/system_efr32mg21.c",
         "${efr32_sdk_root}/platform/radio/rail_lib/plugin/rail_util_rf_path/sl_rail_util_rf_path.c",
+        "${efr32_sdk_root}/platform/security/sl_component/se_manager/src/sl_se_manager.c",
+        "${efr32_sdk_root}/platform/security/sl_component/se_manager/src/sl_se_manager_cipher.c",
+        "${efr32_sdk_root}/platform/security/sl_component/se_manager/src/sl_se_manager_entropy.c",
+        "${efr32_sdk_root}/platform/security/sl_component/se_manager/src/sl_se_manager_hash.c",
+        "${efr32_sdk_root}/platform/security/sl_component/se_manager/src/sl_se_manager_key_derivation.c",
+        "${efr32_sdk_root}/platform/security/sl_component/se_manager/src/sl_se_manager_key_handling.c",
+        "${efr32_sdk_root}/platform/security/sl_component/se_manager/src/sl_se_manager_signature.c",
+        "${efr32_sdk_root}/platform/security/sl_component/se_manager/src/sl_se_manager_util.c",
+        "${efr32_sdk_root}/platform/security/sl_component/sl_alt/source/sl_se_management.c",
+        "${efr32_sdk_root}/platform/security/sl_component/sl_mbedtls_support/src/se_aes.c",
+        "${efr32_sdk_root}/platform/security/sl_component/sl_mbedtls_support/src/se_gcm.c",
+        "${efr32_sdk_root}/platform/security/sl_component/sl_mbedtls_support/src/se_jpake.c",
+        "${efr32_sdk_root}/platform/security/sl_component/sl_protocol_crypto/src/sli_radioaes_management.c",
+        "${efr32_sdk_root}/platform/security/sl_component/sl_psa_driver/src/sli_se_driver_aead.c",
+        "${efr32_sdk_root}/platform/security/sl_component/sl_psa_driver/src/sli_se_driver_cipher.c",
+        "${efr32_sdk_root}/platform/security/sl_component/sl_psa_driver/src/sli_se_driver_key_derivation.c",
+        "${efr32_sdk_root}/platform/security/sl_component/sl_psa_driver/src/sli_se_driver_key_management.c",
+        "${efr32_sdk_root}/platform/security/sl_component/sl_psa_driver/src/sli_se_driver_mac.c",
+        "${efr32_sdk_root}/platform/security/sl_component/sl_psa_driver/src/sli_se_opaque_driver_aead.c",
+        "${efr32_sdk_root}/platform/security/sl_component/sl_psa_driver/src/sli_se_opaque_driver_cipher.c",
+        "${efr32_sdk_root}/platform/security/sl_component/sl_psa_driver/src/sli_se_opaque_driver_mac.c",
+        "${efr32_sdk_root}/platform/security/sl_component/sl_psa_driver/src/sli_se_opaque_key_derivation.c",
+        "${efr32_sdk_root}/platform/security/sl_component/sl_psa_driver/src/sli_se_transparent_driver_cipher.c",
+        "${efr32_sdk_root}/platform/security/sl_component/sl_psa_driver/src/sli_se_transparent_driver_hash.c",
+        "${efr32_sdk_root}/platform/security/sl_component/sl_psa_driver/src/sli_se_transparent_driver_mac.c",
+        "${efr32_sdk_root}/platform/security/sl_component/sl_psa_driver/src/sli_se_transparent_key_derivation.c",
         "${efr32_sdk_root}/platform/service/device_init/src/sl_device_init_emu_s2.c",
         "${efr32_sdk_root}/platform/service/device_init/src/sl_device_init_hfrco.c",
         "${efr32_sdk_root}/platform/service/device_init/src/sl_device_init_hfxo_s2.c",
         "${efr32_sdk_root}/platform/service/device_init/src/sl_device_init_lfxo_s2.c",
         "${efr32_sdk_root}/platform/service/hfxo_manager/src/sl_hfxo_manager_hal_s2.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/se_manager/src/sl_se_manager.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/se_manager/src/sl_se_manager_cipher.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/se_manager/src/sl_se_manager_entropy.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/se_manager/src/sl_se_manager_hash.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/se_manager/src/sl_se_manager_key_derivation.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/se_manager/src/sl_se_manager_key_handling.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/se_manager/src/sl_se_manager_signature.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/se_manager/src/sl_se_manager_util.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_alt/source/sl_se_management.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_mbedtls_support/src/se_aes.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_mbedtls_support/src/se_gcm.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_mbedtls_support/src/se_jpake.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_protocol_crypto/src/sli_radioaes_management.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_psa_driver/src/sli_se_driver_aead.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_psa_driver/src/sli_se_driver_cipher.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_psa_driver/src/sli_se_driver_key_derivation.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_psa_driver/src/sli_se_driver_key_management.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_psa_driver/src/sli_se_driver_mac.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_psa_driver/src/sli_se_opaque_driver_aead.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_psa_driver/src/sli_se_opaque_driver_cipher.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_psa_driver/src/sli_se_opaque_driver_mac.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_psa_driver/src/sli_se_opaque_key_derivation.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_psa_driver/src/sli_se_transparent_driver_cipher.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_psa_driver/src/sli_se_transparent_driver_hash.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_psa_driver/src/sli_se_transparent_driver_mac.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_psa_driver/src/sli_se_transparent_key_derivation.c",
         "${efr32_sdk_root}/util/third_party/freertos/kernel/portable/GCC/ARM_CM33_NTZ/non_secure/port.c",
         "${efr32_sdk_root}/util/third_party/freertos/kernel/portable/GCC/ARM_CM33_NTZ/non_secure/portasm.c",
       ]
@@ -731,38 +736,38 @@ template("efr32_sdk") {
         "${efr32_sdk_root}/platform/Device/SiliconLabs/EFR32MG24/Source/startup_efr32mg24.c",
         "${efr32_sdk_root}/platform/Device/SiliconLabs/EFR32MG24/Source/system_efr32mg24.c",
         "${efr32_sdk_root}/platform/radio/rail_lib/plugin/pa-conversions/pa_curves_efr32.c",
+        "${efr32_sdk_root}/platform/security/sl_component/se_manager/src/sl_se_manager.c",
+        "${efr32_sdk_root}/platform/security/sl_component/se_manager/src/sl_se_manager_attestation.c",
+        "${efr32_sdk_root}/platform/security/sl_component/se_manager/src/sl_se_manager_cipher.c",
+        "${efr32_sdk_root}/platform/security/sl_component/se_manager/src/sl_se_manager_entropy.c",
+        "${efr32_sdk_root}/platform/security/sl_component/se_manager/src/sl_se_manager_hash.c",
+        "${efr32_sdk_root}/platform/security/sl_component/se_manager/src/sl_se_manager_key_derivation.c",
+        "${efr32_sdk_root}/platform/security/sl_component/se_manager/src/sl_se_manager_key_handling.c",
+        "${efr32_sdk_root}/platform/security/sl_component/se_manager/src/sl_se_manager_signature.c",
+        "${efr32_sdk_root}/platform/security/sl_component/se_manager/src/sl_se_manager_util.c",
+        "${efr32_sdk_root}/platform/security/sl_component/sl_mbedtls_support/src/se_aes.c",
+        "${efr32_sdk_root}/platform/security/sl_component/sl_mbedtls_support/src/se_jpake.c",
+        "${efr32_sdk_root}/platform/security/sl_component/sl_protocol_crypto/src/sli_radioaes_management.c",
+        "${efr32_sdk_root}/platform/security/sl_component/sl_psa_driver/src/sli_se_driver_aead.c",
+        "${efr32_sdk_root}/platform/security/sl_component/sl_psa_driver/src/sli_se_driver_cipher.c",
+        "${efr32_sdk_root}/platform/security/sl_component/sl_psa_driver/src/sli_se_driver_key_derivation.c",
+        "${efr32_sdk_root}/platform/security/sl_component/sl_psa_driver/src/sli_se_driver_key_management.c",
+        "${efr32_sdk_root}/platform/security/sl_component/sl_psa_driver/src/sli_se_driver_mac.c",
+        "${efr32_sdk_root}/platform/security/sl_component/sl_psa_driver/src/sli_se_opaque_driver_aead.c",
+        "${efr32_sdk_root}/platform/security/sl_component/sl_psa_driver/src/sli_se_opaque_driver_cipher.c",
+        "${efr32_sdk_root}/platform/security/sl_component/sl_psa_driver/src/sli_se_opaque_driver_mac.c",
+        "${efr32_sdk_root}/platform/security/sl_component/sl_psa_driver/src/sli_se_opaque_key_derivation.c",
+        "${efr32_sdk_root}/platform/security/sl_component/sl_psa_driver/src/sli_se_transparent_driver_aead.c",
+        "${efr32_sdk_root}/platform/security/sl_component/sl_psa_driver/src/sli_se_transparent_driver_cipher.c",
+        "${efr32_sdk_root}/platform/security/sl_component/sl_psa_driver/src/sli_se_transparent_driver_hash.c",
+        "${efr32_sdk_root}/platform/security/sl_component/sl_psa_driver/src/sli_se_transparent_driver_mac.c",
+        "${efr32_sdk_root}/platform/security/sl_component/sl_psa_driver/src/sli_se_transparent_key_derivation.c",
         "${efr32_sdk_root}/platform/service/device_init/src/sl_device_init_dcdc_s2.c",
         "${efr32_sdk_root}/platform/service/device_init/src/sl_device_init_emu_s2.c",
         "${efr32_sdk_root}/platform/service/device_init/src/sl_device_init_hfxo_s2.c",
         "${efr32_sdk_root}/platform/service/device_init/src/sl_device_init_lfxo_s2.c",
         "${efr32_sdk_root}/platform/service/hfxo_manager/src/sl_hfxo_manager_hal_s2.c",
         "${efr32_sdk_root}/protocol/bluetooth/src/sl_apploader_util_s2.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/se_manager/src/sl_se_manager.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/se_manager/src/sl_se_manager_attestation.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/se_manager/src/sl_se_manager_cipher.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/se_manager/src/sl_se_manager_entropy.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/se_manager/src/sl_se_manager_hash.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/se_manager/src/sl_se_manager_key_derivation.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/se_manager/src/sl_se_manager_key_handling.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/se_manager/src/sl_se_manager_signature.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/se_manager/src/sl_se_manager_util.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_mbedtls_support/src/se_aes.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_mbedtls_support/src/se_jpake.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_protocol_crypto/src/sli_radioaes_management.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_psa_driver/src/sli_se_driver_aead.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_psa_driver/src/sli_se_driver_cipher.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_psa_driver/src/sli_se_driver_key_derivation.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_psa_driver/src/sli_se_driver_key_management.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_psa_driver/src/sli_se_driver_mac.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_psa_driver/src/sli_se_opaque_driver_aead.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_psa_driver/src/sli_se_opaque_driver_cipher.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_psa_driver/src/sli_se_opaque_driver_mac.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_psa_driver/src/sli_se_opaque_key_derivation.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_psa_driver/src/sli_se_transparent_driver_aead.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_psa_driver/src/sli_se_transparent_driver_cipher.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_psa_driver/src/sli_se_transparent_driver_hash.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_psa_driver/src/sli_se_transparent_driver_mac.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_psa_driver/src/sli_se_transparent_key_derivation.c",
         "${efr32_sdk_root}/util/third_party/freertos/kernel/portable/GCC/ARM_CM33_NTZ/non_secure/port.c",
         "${efr32_sdk_root}/util/third_party/freertos/kernel/portable/GCC/ARM_CM33_NTZ/non_secure/portasm.c",
       ]
@@ -771,38 +776,38 @@ template("efr32_sdk") {
         "${efr32_sdk_root}/platform/Device/SiliconLabs/MGM24/Source/startup_mgm24.c",
         "${efr32_sdk_root}/platform/Device/SiliconLabs/MGM24/Source/system_mgm24.c",
         "${efr32_sdk_root}/platform/radio/rail_lib/plugin/pa-conversions/pa_curves_efr32.c",
+        "${efr32_sdk_root}/platform/security/sl_component/se_manager/src/sl_se_manager.c",
+        "${efr32_sdk_root}/platform/security/sl_component/se_manager/src/sl_se_manager_attestation.c",
+        "${efr32_sdk_root}/platform/security/sl_component/se_manager/src/sl_se_manager_cipher.c",
+        "${efr32_sdk_root}/platform/security/sl_component/se_manager/src/sl_se_manager_entropy.c",
+        "${efr32_sdk_root}/platform/security/sl_component/se_manager/src/sl_se_manager_hash.c",
+        "${efr32_sdk_root}/platform/security/sl_component/se_manager/src/sl_se_manager_key_derivation.c",
+        "${efr32_sdk_root}/platform/security/sl_component/se_manager/src/sl_se_manager_key_handling.c",
+        "${efr32_sdk_root}/platform/security/sl_component/se_manager/src/sl_se_manager_signature.c",
+        "${efr32_sdk_root}/platform/security/sl_component/se_manager/src/sl_se_manager_util.c",
+        "${efr32_sdk_root}/platform/security/sl_component/sl_mbedtls_support/src/se_aes.c",
+        "${efr32_sdk_root}/platform/security/sl_component/sl_mbedtls_support/src/se_jpake.c",
+        "${efr32_sdk_root}/platform/security/sl_component/sl_protocol_crypto/src/sli_radioaes_management.c",
+        "${efr32_sdk_root}/platform/security/sl_component/sl_psa_driver/src/sli_se_driver_aead.c",
+        "${efr32_sdk_root}/platform/security/sl_component/sl_psa_driver/src/sli_se_driver_cipher.c",
+        "${efr32_sdk_root}/platform/security/sl_component/sl_psa_driver/src/sli_se_driver_key_derivation.c",
+        "${efr32_sdk_root}/platform/security/sl_component/sl_psa_driver/src/sli_se_driver_key_management.c",
+        "${efr32_sdk_root}/platform/security/sl_component/sl_psa_driver/src/sli_se_driver_mac.c",
+        "${efr32_sdk_root}/platform/security/sl_component/sl_psa_driver/src/sli_se_opaque_driver_aead.c",
+        "${efr32_sdk_root}/platform/security/sl_component/sl_psa_driver/src/sli_se_opaque_driver_cipher.c",
+        "${efr32_sdk_root}/platform/security/sl_component/sl_psa_driver/src/sli_se_opaque_driver_mac.c",
+        "${efr32_sdk_root}/platform/security/sl_component/sl_psa_driver/src/sli_se_opaque_key_derivation.c",
+        "${efr32_sdk_root}/platform/security/sl_component/sl_psa_driver/src/sli_se_transparent_driver_aead.c",
+        "${efr32_sdk_root}/platform/security/sl_component/sl_psa_driver/src/sli_se_transparent_driver_cipher.c",
+        "${efr32_sdk_root}/platform/security/sl_component/sl_psa_driver/src/sli_se_transparent_driver_hash.c",
+        "${efr32_sdk_root}/platform/security/sl_component/sl_psa_driver/src/sli_se_transparent_driver_mac.c",
+        "${efr32_sdk_root}/platform/security/sl_component/sl_psa_driver/src/sli_se_transparent_key_derivation.c",
         "${efr32_sdk_root}/platform/service/device_init/src/sl_device_init_dcdc_s2.c",
         "${efr32_sdk_root}/platform/service/device_init/src/sl_device_init_emu_s2.c",
         "${efr32_sdk_root}/platform/service/device_init/src/sl_device_init_hfxo_mgm24.c",
         "${efr32_sdk_root}/platform/service/device_init/src/sl_device_init_lfxo_s2.c",
         "${efr32_sdk_root}/platform/service/hfxo_manager/src/sl_hfxo_manager_hal_s2.c",
         "${efr32_sdk_root}/protocol/bluetooth/src/sl_apploader_util_s2.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/se_manager/src/sl_se_manager.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/se_manager/src/sl_se_manager_attestation.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/se_manager/src/sl_se_manager_cipher.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/se_manager/src/sl_se_manager_entropy.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/se_manager/src/sl_se_manager_hash.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/se_manager/src/sl_se_manager_key_derivation.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/se_manager/src/sl_se_manager_key_handling.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/se_manager/src/sl_se_manager_signature.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/se_manager/src/sl_se_manager_util.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_mbedtls_support/src/se_aes.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_mbedtls_support/src/se_jpake.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_protocol_crypto/src/sli_radioaes_management.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_psa_driver/src/sli_se_driver_aead.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_psa_driver/src/sli_se_driver_cipher.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_psa_driver/src/sli_se_driver_key_derivation.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_psa_driver/src/sli_se_driver_key_management.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_psa_driver/src/sli_se_driver_mac.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_psa_driver/src/sli_se_opaque_driver_aead.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_psa_driver/src/sli_se_opaque_driver_cipher.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_psa_driver/src/sli_se_opaque_driver_mac.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_psa_driver/src/sli_se_opaque_key_derivation.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_psa_driver/src/sli_se_transparent_driver_aead.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_psa_driver/src/sli_se_transparent_driver_cipher.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_psa_driver/src/sli_se_transparent_driver_hash.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_psa_driver/src/sli_se_transparent_driver_mac.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_psa_driver/src/sli_se_transparent_key_derivation.c",
         "${efr32_sdk_root}/util/third_party/freertos/kernel/portable/GCC/ARM_CM33_NTZ/non_secure/port.c",
         "${efr32_sdk_root}/util/third_party/freertos/kernel/portable/GCC/ARM_CM33_NTZ/non_secure/portasm.c",
       ]
diff --git a/third_party/silabs/gecko_sdk b/third_party/silabs/gecko_sdk
index 799200bb678893..d4854d2ff06a82 160000
--- a/third_party/silabs/gecko_sdk
+++ b/third_party/silabs/gecko_sdk
@@ -1 +1 @@
-Subproject commit 799200bb6788939aa0fef97d7fc4ee9aca57148d
+Subproject commit d4854d2ff06a828161d7032efb1736d0deda40b1
diff --git a/third_party/silabs/matter_support b/third_party/silabs/matter_support
index da8827efde529d..cfc9d78c7565c8 160000
--- a/third_party/silabs/matter_support
+++ b/third_party/silabs/matter_support
@@ -1 +1 @@
-Subproject commit da8827efde529d79e6d7f29277721ba460efbca7
+Subproject commit cfc9d78c7565c867948435c823b07aefc5835a81
diff --git a/zzz_generated/app-common/app-common/zap-generated/af-structs.h b/zzz_generated/app-common/app-common/zap-generated/af-structs.h
index 7beca18ed91d05..5bc0a86b450639 100644
--- a/zzz_generated/app-common/app-common/zap-generated/af-structs.h
+++ b/zzz_generated/app-common/app-common/zap-generated/af-structs.h
@@ -37,9 +37,9 @@ typedef struct _ApplicationBasicApplication
     chip::CharSpan applicationId;
 } ApplicationBasicApplication;
 
-// Struct for DlCredential
-typedef struct _DlCredential
+// Struct for CredentialStruct
+typedef struct _CredentialStruct
 {
     uint8_t CredentialType;
     uint16_t CredentialIndex;
-} DlCredential;
+} CredentialStruct;
diff --git a/zzz_generated/app-common/app-common/zap-generated/attribute-id.h b/zzz_generated/app-common/app-common/zap-generated/attribute-id.h
index 2c74408c647fe6..a0523bc6f43433 100644
--- a/zzz_generated/app-common/app-common/zap-generated/attribute-id.h
+++ b/zzz_generated/app-common/app-common/zap-generated/attribute-id.h
@@ -468,7 +468,7 @@
 #define ZCL_CURRENT_POSITION_ATTRIBUTE_ID (0x0001)
 #define ZCL_MULTI_PRESS_MAX_ATTRIBUTE_ID (0x0002)
 
-// Attribute ids for cluster: AdministratorCommissioning
+// Attribute ids for cluster: Administrator Commissioning
 
 // Client attributes
 
diff --git a/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp b/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp
index 83948299abd3b1..eb90412e93e6ac 100644
--- a/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp
+++ b/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp
@@ -8723,9 +8723,10 @@ namespace Attributes {
 
 namespace PHYRate {
 
-EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<chip::app::Clusters::EthernetNetworkDiagnostics::PHYRate> & value)
+EmberAfStatus Get(chip::EndpointId endpoint,
+                  DataModel::Nullable<chip::app::Clusters::EthernetNetworkDiagnostics::PHYRateEnum> & value)
 {
-    using Traits = NumericAttributeTraits<chip::app::Clusters::EthernetNetworkDiagnostics::PHYRate>;
+    using Traits = NumericAttributeTraits<chip::app::Clusters::EthernetNetworkDiagnostics::PHYRateEnum>;
     Traits::StorageType temp;
     uint8_t * readable = Traits::ToAttributeStoreRepresentation(temp);
     EmberAfStatus status =
@@ -8741,9 +8742,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<chip::app::Clus
     }
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, chip::app::Clusters::EthernetNetworkDiagnostics::PHYRate value)
+EmberAfStatus Set(chip::EndpointId endpoint, chip::app::Clusters::EthernetNetworkDiagnostics::PHYRateEnum value)
 {
-    using Traits = NumericAttributeTraits<chip::app::Clusters::EthernetNetworkDiagnostics::PHYRate>;
+    using Traits = NumericAttributeTraits<chip::app::Clusters::EthernetNetworkDiagnostics::PHYRateEnum>;
     if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -8756,7 +8757,7 @@ EmberAfStatus Set(chip::EndpointId endpoint, chip::app::Clusters::EthernetNetwor
 
 EmberAfStatus SetNull(chip::EndpointId endpoint)
 {
-    using Traits = NumericAttributeTraits<chip::app::Clusters::EthernetNetworkDiagnostics::PHYRate>;
+    using Traits = NumericAttributeTraits<chip::app::Clusters::EthernetNetworkDiagnostics::PHYRateEnum>;
     Traits::StorageType value;
     Traits::SetNull(value);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
@@ -8764,7 +8765,7 @@ EmberAfStatus SetNull(chip::EndpointId endpoint)
 }
 
 EmberAfStatus Set(chip::EndpointId endpoint,
-                  const chip::app::DataModel::Nullable<chip::app::Clusters::EthernetNetworkDiagnostics::PHYRate> & value)
+                  const chip::app::DataModel::Nullable<chip::app::Clusters::EthernetNetworkDiagnostics::PHYRateEnum> & value)
 {
     if (value.IsNull())
     {
@@ -10292,9 +10293,9 @@ namespace Attributes {
 
 namespace WindowStatus {
 
-EmberAfStatus Get(chip::EndpointId endpoint, chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatus * value)
+EmberAfStatus Get(chip::EndpointId endpoint, chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatusEnum * value)
 {
-    using Traits = NumericAttributeTraits<chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatus>;
+    using Traits = NumericAttributeTraits<chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatusEnum>;
     Traits::StorageType temp;
     uint8_t * readable = Traits::ToAttributeStoreRepresentation(temp);
     EmberAfStatus status =
@@ -10307,9 +10308,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, chip::app::Clusters::AdministratorC
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatus value)
+EmberAfStatus Set(chip::EndpointId endpoint, chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatusEnum value)
 {
-    using Traits = NumericAttributeTraits<chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatus>;
+    using Traits = NumericAttributeTraits<chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatusEnum>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -11639,9 +11640,9 @@ EmberAfStatus Set(chip::EndpointId endpoint, bool value)
 
 namespace DoorState {
 
-EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<chip::app::Clusters::DoorLock::DlDoorState> & value)
+EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<chip::app::Clusters::DoorLock::DoorStateEnum> & value)
 {
-    using Traits = NumericAttributeTraits<chip::app::Clusters::DoorLock::DlDoorState>;
+    using Traits = NumericAttributeTraits<chip::app::Clusters::DoorLock::DoorStateEnum>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
     EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::DoorLock::Id, Id, readable, sizeof(temp));
@@ -11656,9 +11657,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable<chip::app::Clus
     }
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, chip::app::Clusters::DoorLock::DlDoorState value)
+EmberAfStatus Set(chip::EndpointId endpoint, chip::app::Clusters::DoorLock::DoorStateEnum value)
 {
-    using Traits = NumericAttributeTraits<chip::app::Clusters::DoorLock::DlDoorState>;
+    using Traits = NumericAttributeTraits<chip::app::Clusters::DoorLock::DoorStateEnum>;
     if (!Traits::CanRepresentValue(/* isNullable = */ true, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
@@ -11671,7 +11672,7 @@ EmberAfStatus Set(chip::EndpointId endpoint, chip::app::Clusters::DoorLock::DlDo
 
 EmberAfStatus SetNull(chip::EndpointId endpoint)
 {
-    using Traits = NumericAttributeTraits<chip::app::Clusters::DoorLock::DlDoorState>;
+    using Traits = NumericAttributeTraits<chip::app::Clusters::DoorLock::DoorStateEnum>;
     Traits::StorageType value;
     Traits::SetNull(value);
     uint8_t * writable = Traits::ToAttributeStoreRepresentation(value);
@@ -11679,7 +11680,7 @@ EmberAfStatus SetNull(chip::EndpointId endpoint)
 }
 
 EmberAfStatus Set(chip::EndpointId endpoint,
-                  const chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::DlDoorState> & value)
+                  const chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::DoorStateEnum> & value)
 {
     if (value.IsNull())
     {
@@ -12281,9 +12282,9 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value)
 
 namespace OperatingMode {
 
-EmberAfStatus Get(chip::EndpointId endpoint, chip::app::Clusters::DoorLock::DlOperatingMode * value)
+EmberAfStatus Get(chip::EndpointId endpoint, chip::app::Clusters::DoorLock::OperatingModeEnum * value)
 {
-    using Traits = NumericAttributeTraits<chip::app::Clusters::DoorLock::DlOperatingMode>;
+    using Traits = NumericAttributeTraits<chip::app::Clusters::DoorLock::OperatingModeEnum>;
     Traits::StorageType temp;
     uint8_t * readable   = Traits::ToAttributeStoreRepresentation(temp);
     EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::DoorLock::Id, Id, readable, sizeof(temp));
@@ -12295,9 +12296,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, chip::app::Clusters::DoorLock::DlOp
     *value = Traits::StorageToWorking(temp);
     return status;
 }
-EmberAfStatus Set(chip::EndpointId endpoint, chip::app::Clusters::DoorLock::DlOperatingMode value)
+EmberAfStatus Set(chip::EndpointId endpoint, chip::app::Clusters::DoorLock::OperatingModeEnum value)
 {
-    using Traits = NumericAttributeTraits<chip::app::Clusters::DoorLock::DlOperatingMode>;
+    using Traits = NumericAttributeTraits<chip::app::Clusters::DoorLock::OperatingModeEnum>;
     if (!Traits::CanRepresentValue(/* isNullable = */ false, value))
     {
         return EMBER_ZCL_STATUS_CONSTRAINT_ERROR;
diff --git a/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.h b/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.h
index 68d57f9b60d78e..e79261c6aca364 100644
--- a/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.h
+++ b/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.h
@@ -1517,11 +1517,11 @@ namespace Attributes {
 
 namespace PHYRate {
 EmberAfStatus Get(chip::EndpointId endpoint,
-                  DataModel::Nullable<chip::app::Clusters::EthernetNetworkDiagnostics::PHYRate> & value); // PHYRate
-EmberAfStatus Set(chip::EndpointId endpoint, chip::app::Clusters::EthernetNetworkDiagnostics::PHYRate value);
+                  DataModel::Nullable<chip::app::Clusters::EthernetNetworkDiagnostics::PHYRateEnum> & value); // PHYRateEnum
+EmberAfStatus Set(chip::EndpointId endpoint, chip::app::Clusters::EthernetNetworkDiagnostics::PHYRateEnum value);
 EmberAfStatus SetNull(chip::EndpointId endpoint);
 EmberAfStatus Set(chip::EndpointId endpoint,
-                  const chip::app::DataModel::Nullable<chip::app::Clusters::EthernetNetworkDiagnostics::PHYRate> & value);
+                  const chip::app::DataModel::Nullable<chip::app::Clusters::EthernetNetworkDiagnostics::PHYRateEnum> & value);
 } // namespace PHYRate
 
 namespace FullDuplex {
@@ -1773,9 +1773,10 @@ namespace AdministratorCommissioning {
 namespace Attributes {
 
 namespace WindowStatus {
-EmberAfStatus Get(chip::EndpointId endpoint,
-                  chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatus * value); // CommissioningWindowStatus
-EmberAfStatus Set(chip::EndpointId endpoint, chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatus value);
+EmberAfStatus
+Get(chip::EndpointId endpoint,
+    chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatusEnum * value); // CommissioningWindowStatusEnum
+EmberAfStatus Set(chip::EndpointId endpoint, chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatusEnum value);
 } // namespace WindowStatus
 
 namespace AdminFabricIndex {
@@ -2034,11 +2035,11 @@ EmberAfStatus Set(chip::EndpointId endpoint, bool value);
 
 namespace DoorState {
 EmberAfStatus Get(chip::EndpointId endpoint,
-                  DataModel::Nullable<chip::app::Clusters::DoorLock::DlDoorState> & value); // DlDoorState
-EmberAfStatus Set(chip::EndpointId endpoint, chip::app::Clusters::DoorLock::DlDoorState value);
+                  DataModel::Nullable<chip::app::Clusters::DoorLock::DoorStateEnum> & value); // DoorStateEnum
+EmberAfStatus Set(chip::EndpointId endpoint, chip::app::Clusters::DoorLock::DoorStateEnum value);
 EmberAfStatus SetNull(chip::EndpointId endpoint);
 EmberAfStatus Set(chip::EndpointId endpoint,
-                  const chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::DlDoorState> & value);
+                  const chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::DoorStateEnum> & value);
 } // namespace DoorState
 
 namespace DoorOpenEvents {
@@ -2138,8 +2139,8 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value);
 } // namespace SoundVolume
 
 namespace OperatingMode {
-EmberAfStatus Get(chip::EndpointId endpoint, chip::app::Clusters::DoorLock::DlOperatingMode * value); // DlOperatingMode
-EmberAfStatus Set(chip::EndpointId endpoint, chip::app::Clusters::DoorLock::DlOperatingMode value);
+EmberAfStatus Get(chip::EndpointId endpoint, chip::app::Clusters::DoorLock::OperatingModeEnum * value); // OperatingModeEnum
+EmberAfStatus Set(chip::EndpointId endpoint, chip::app::Clusters::DoorLock::OperatingModeEnum value);
 } // namespace OperatingMode
 
 namespace SupportedOperatingModes {
diff --git a/zzz_generated/app-common/app-common/zap-generated/callback.h b/zzz_generated/app-common/app-common/zap-generated/callback.h
index f1c14e78474450..e29537c05b2441 100644
--- a/zzz_generated/app-common/app-common/zap-generated/callback.h
+++ b/zzz_generated/app-common/app-common/zap-generated/callback.h
@@ -282,7 +282,7 @@ void emberAfBridgedDeviceBasicInformationClusterInitCallback(chip::EndpointId en
  */
 void emberAfSwitchClusterInitCallback(chip::EndpointId endpoint);
 
-/** @brief AdministratorCommissioning Cluster Init
+/** @brief Administrator Commissioning Cluster Init
  *
  * Cluster Init
  *
@@ -3600,10 +3600,10 @@ void emberAfSwitchClusterServerTickCallback(chip::EndpointId endpoint);
 void emberAfSwitchClusterClientTickCallback(chip::EndpointId endpoint);
 
 //
-// AdministratorCommissioning Cluster
+// Administrator Commissioning Cluster
 //
 
-/** @brief AdministratorCommissioning Cluster Server Init
+/** @brief Administrator Commissioning Cluster Server Init
  *
  * Server Init
  *
@@ -3611,7 +3611,7 @@ void emberAfSwitchClusterClientTickCallback(chip::EndpointId endpoint);
  */
 void emberAfAdministratorCommissioningClusterServerInitCallback(chip::EndpointId endpoint);
 
-/** @brief AdministratorCommissioning Cluster Client Init
+/** @brief Administrator Commissioning Cluster Client Init
  *
  * Client Init
  *
@@ -3619,7 +3619,7 @@ void emberAfAdministratorCommissioningClusterServerInitCallback(chip::EndpointId
  */
 void emberAfAdministratorCommissioningClusterClientInitCallback(chip::EndpointId endpoint);
 
-/** @brief AdministratorCommissioning Cluster Server Attribute Changed
+/** @brief Administrator Commissioning Cluster Server Attribute Changed
  *
  * Server Attribute Changed
  *
@@ -3627,7 +3627,7 @@ void emberAfAdministratorCommissioningClusterClientInitCallback(chip::EndpointId
  */
 void MatterAdministratorCommissioningClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath);
 
-/** @brief AdministratorCommissioning Cluster Server Message Sent
+/** @brief Administrator Commissioning Cluster Server Message Sent
  *
  * Server Message Sent
  *
@@ -3641,7 +3641,7 @@ void emberAfAdministratorCommissioningClusterServerMessageSentCallback(const chi
                                                                        EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message,
                                                                        EmberStatus status);
 
-/** @brief AdministratorCommissioning Cluster Client Message Sent
+/** @brief Administrator Commissioning Cluster Client Message Sent
  *
  * Client Message Sent
  *
@@ -3655,7 +3655,7 @@ void emberAfAdministratorCommissioningClusterClientMessageSentCallback(const chi
                                                                        EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message,
                                                                        EmberStatus status);
 
-/** @brief AdministratorCommissioning Cluster Server Pre Attribute Changed
+/** @brief Administrator Commissioning Cluster Server Pre Attribute Changed
  *
  * Server Pre Attribute Changed
  *
@@ -3667,7 +3667,7 @@ void emberAfAdministratorCommissioningClusterClientMessageSentCallback(const chi
 chip::Protocols::InteractionModel::Status MatterAdministratorCommissioningClusterServerPreAttributeChangedCallback(
     const chip::app::ConcreteAttributePath & attributePath, EmberAfAttributeType attributeType, uint16_t size, uint8_t * value);
 
-/** @brief AdministratorCommissioning Cluster Client Pre Attribute Changed
+/** @brief Administrator Commissioning Cluster Client Pre Attribute Changed
  *
  * Client Pre Attribute Changed
  *
@@ -3679,7 +3679,7 @@ chip::Protocols::InteractionModel::Status MatterAdministratorCommissioningCluste
 chip::Protocols::InteractionModel::Status MatterAdministratorCommissioningClusterClientPreAttributeChangedCallback(
     const chip::app::ConcreteAttributePath & attributePath, EmberAfAttributeType attributeType, uint16_t size, uint8_t * value);
 
-/** @brief AdministratorCommissioning Cluster Server Tick
+/** @brief Administrator Commissioning Cluster Server Tick
  *
  * Server Tick
  *
@@ -3687,7 +3687,7 @@ chip::Protocols::InteractionModel::Status MatterAdministratorCommissioningCluste
  */
 void emberAfAdministratorCommissioningClusterServerTickCallback(chip::EndpointId endpoint);
 
-/** @brief AdministratorCommissioning Cluster Client Tick
+/** @brief Administrator Commissioning Cluster Client Tick
  *
  * Client Tick
  *
@@ -8081,19 +8081,19 @@ bool emberAfTimeSynchronizationClusterSetUtcTimeCallback(
     chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
     const chip::app::Clusters::TimeSynchronization::Commands::SetUtcTime::DecodableType & commandData);
 /**
- * @brief AdministratorCommissioning Cluster OpenCommissioningWindow Command callback (from client)
+ * @brief Administrator Commissioning Cluster OpenCommissioningWindow Command callback (from client)
  */
 bool emberAfAdministratorCommissioningClusterOpenCommissioningWindowCallback(
     chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
     const chip::app::Clusters::AdministratorCommissioning::Commands::OpenCommissioningWindow::DecodableType & commandData);
 /**
- * @brief AdministratorCommissioning Cluster OpenBasicCommissioningWindow Command callback (from client)
+ * @brief Administrator Commissioning Cluster OpenBasicCommissioningWindow Command callback (from client)
  */
 bool emberAfAdministratorCommissioningClusterOpenBasicCommissioningWindowCallback(
     chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
     const chip::app::Clusters::AdministratorCommissioning::Commands::OpenBasicCommissioningWindow::DecodableType & commandData);
 /**
- * @brief AdministratorCommissioning Cluster RevokeCommissioning Command callback (from client)
+ * @brief Administrator Commissioning Cluster RevokeCommissioning Command callback (from client)
  */
 bool emberAfAdministratorCommissioningClusterRevokeCommissioningCallback(
     chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath,
@@ -8246,9 +8246,9 @@ bool emberAfDoorLockClusterGetWeekDayScheduleCallback(
  * @brief Door Lock Cluster GetWeekDayScheduleResponse Command callback (from server)
  */
 bool emberAfDoorLockClusterGetWeekDayScheduleResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj,
-                                                              uint8_t weekDayIndex, uint16_t userIndex, uint8_t status,
-                                                              uint8_t daysMask, uint8_t startHour, uint8_t startMinute,
-                                                              uint8_t endHour, uint8_t endMinute);
+                                                              uint8_t WeekDayIndex, uint16_t UserIndex, uint8_t Status,
+                                                              uint8_t DaysMask, uint8_t StartHour, uint8_t StartMinute,
+                                                              uint8_t EndHour, uint8_t EndMinute);
 /**
  * @brief Door Lock Cluster ClearWeekDaySchedule Command callback (from client)
  */
@@ -8271,8 +8271,8 @@ bool emberAfDoorLockClusterGetYearDayScheduleCallback(
  * @brief Door Lock Cluster GetYearDayScheduleResponse Command callback (from server)
  */
 bool emberAfDoorLockClusterGetYearDayScheduleResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj,
-                                                              uint8_t yearDayIndex, uint16_t userIndex, uint8_t status,
-                                                              uint32_t localStartTime, uint32_t localEndTime);
+                                                              uint8_t YearDayIndex, uint16_t UserIndex, uint8_t Status,
+                                                              uint32_t LocalStartTime, uint32_t LocalEndTime);
 /**
  * @brief Door Lock Cluster ClearYearDaySchedule Command callback (from client)
  */
@@ -8295,8 +8295,8 @@ bool emberAfDoorLockClusterGetHolidayScheduleCallback(
  * @brief Door Lock Cluster GetHolidayScheduleResponse Command callback (from server)
  */
 bool emberAfDoorLockClusterGetHolidayScheduleResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj,
-                                                              uint8_t holidayIndex, uint8_t status, uint32_t localStartTime,
-                                                              uint32_t localEndTime, uint8_t operatingMode);
+                                                              uint8_t HolidayIndex, uint8_t Status, uint32_t LocalStartTime,
+                                                              uint32_t LocalEndTime, uint8_t OperatingMode);
 /**
  * @brief Door Lock Cluster ClearHolidaySchedule Command callback (from client)
  */
@@ -8319,11 +8319,11 @@ bool emberAfDoorLockClusterGetUserCallback(chip::app::CommandHandler * commandOb
  * @brief Door Lock Cluster GetUserResponse Command callback (from server)
  */
 bool emberAfDoorLockClusterGetUserResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj,
-                                                   uint16_t userIndex, chip::CharSpan userName, uint32_t userUniqueId,
-                                                   uint8_t userStatus, uint8_t userType, uint8_t credentialRule,
-                                                   /* TYPE WARNING: array array defaults to */ uint8_t * credentials,
-                                                   chip::FabricIndex creatorFabricIndex, chip::FabricIndex lastModifiedFabricIndex,
-                                                   uint16_t nextUserIndex);
+                                                   uint16_t UserIndex, chip::CharSpan UserName, uint32_t UserUniqueID,
+                                                   uint8_t UserStatus, uint8_t UserType, uint8_t CredentialRule,
+                                                   /* TYPE WARNING: array array defaults to */ uint8_t * Credentials,
+                                                   chip::FabricIndex CreatorFabricIndex, chip::FabricIndex LastModifiedFabricIndex,
+                                                   uint16_t NextUserIndex);
 /**
  * @brief Door Lock Cluster ClearUser Command callback (from client)
  */
@@ -8340,7 +8340,7 @@ bool emberAfDoorLockClusterSetCredentialCallback(
  * @brief Door Lock Cluster SetCredentialResponse Command callback (from server)
  */
 bool emberAfDoorLockClusterSetCredentialResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj,
-                                                         uint8_t status, uint16_t userIndex, uint16_t nextCredentialIndex);
+                                                         uint8_t Status, uint16_t UserIndex, uint16_t NextCredentialIndex);
 /**
  * @brief Door Lock Cluster GetCredentialStatus Command callback (from client)
  */
@@ -8351,10 +8351,10 @@ bool emberAfDoorLockClusterGetCredentialStatusCallback(
  * @brief Door Lock Cluster GetCredentialStatusResponse Command callback (from server)
  */
 bool emberAfDoorLockClusterGetCredentialStatusResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj,
-                                                               bool credentialExists, uint16_t userIndex,
-                                                               chip::FabricIndex creatorFabricIndex,
-                                                               chip::FabricIndex lastModifiedFabricIndex,
-                                                               uint16_t nextCredentialIndex);
+                                                               bool CredentialExists, uint16_t UserIndex,
+                                                               chip::FabricIndex CreatorFabricIndex,
+                                                               chip::FabricIndex LastModifiedFabricIndex,
+                                                               uint16_t NextCredentialIndex);
 /**
  * @brief Door Lock Cluster ClearCredential Command callback (from client)
  */
diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-enums-check.h b/zzz_generated/app-common/app-common/zap-generated/cluster-enums-check.h
index 39d93c9339f60f..961a9a172331ad 100644
--- a/zzz_generated/app-common/app-common/zap-generated/cluster-enums-check.h
+++ b/zzz_generated/app-common/app-common/zap-generated/cluster-enums-check.h
@@ -685,9 +685,9 @@ static auto __attribute__((unused)) EnsureKnownEnumValue(GeneralDiagnostics::Boo
         return static_cast<EnumType>(7);
     }
 }
-static auto __attribute__((unused)) EnsureKnownEnumValue(GeneralDiagnostics::HardwareFault val)
+static auto __attribute__((unused)) EnsureKnownEnumValue(GeneralDiagnostics::HardwareFaultEnum val)
 {
-    using EnumType = GeneralDiagnostics::HardwareFault;
+    using EnumType = GeneralDiagnostics::HardwareFaultEnum;
     switch (val)
     {
 // Need to convert consumers to using the new enum classes, so we
@@ -705,26 +705,26 @@ static auto __attribute__((unused)) EnsureKnownEnumValue(GeneralDiagnostics::Har
     case EnumType::kNonVolatileMemoryError:
     case EnumType::kTamperDetected:
 #else  // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
-    case EMBER_ZCL_HARDWARE_FAULT_UNSPECIFIED:
-    case EMBER_ZCL_HARDWARE_FAULT_RADIO:
-    case EMBER_ZCL_HARDWARE_FAULT_SENSOR:
-    case EMBER_ZCL_HARDWARE_FAULT_RESETTABLE_OVER_TEMP:
-    case EMBER_ZCL_HARDWARE_FAULT_NON_RESETTABLE_OVER_TEMP:
-    case EMBER_ZCL_HARDWARE_FAULT_POWER_SOURCE:
-    case EMBER_ZCL_HARDWARE_FAULT_VISUAL_DISPLAY_FAULT:
-    case EMBER_ZCL_HARDWARE_FAULT_AUDIO_OUTPUT_FAULT:
-    case EMBER_ZCL_HARDWARE_FAULT_USER_INTERFACE_FAULT:
-    case EMBER_ZCL_HARDWARE_FAULT_NON_VOLATILE_MEMORY_ERROR:
-    case EMBER_ZCL_HARDWARE_FAULT_TAMPER_DETECTED:
+    case EMBER_ZCL_HARDWARE_FAULT_ENUM_UNSPECIFIED:
+    case EMBER_ZCL_HARDWARE_FAULT_ENUM_RADIO:
+    case EMBER_ZCL_HARDWARE_FAULT_ENUM_SENSOR:
+    case EMBER_ZCL_HARDWARE_FAULT_ENUM_RESETTABLE_OVER_TEMP:
+    case EMBER_ZCL_HARDWARE_FAULT_ENUM_NON_RESETTABLE_OVER_TEMP:
+    case EMBER_ZCL_HARDWARE_FAULT_ENUM_POWER_SOURCE:
+    case EMBER_ZCL_HARDWARE_FAULT_ENUM_VISUAL_DISPLAY_FAULT:
+    case EMBER_ZCL_HARDWARE_FAULT_ENUM_AUDIO_OUTPUT_FAULT:
+    case EMBER_ZCL_HARDWARE_FAULT_ENUM_USER_INTERFACE_FAULT:
+    case EMBER_ZCL_HARDWARE_FAULT_ENUM_NON_VOLATILE_MEMORY_ERROR:
+    case EMBER_ZCL_HARDWARE_FAULT_ENUM_TAMPER_DETECTED:
 #endif // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
         return val;
     default:
         return static_cast<EnumType>(11);
     }
 }
-static auto __attribute__((unused)) EnsureKnownEnumValue(GeneralDiagnostics::InterfaceType val)
+static auto __attribute__((unused)) EnsureKnownEnumValue(GeneralDiagnostics::InterfaceTypeEnum val)
 {
-    using EnumType = GeneralDiagnostics::InterfaceType;
+    using EnumType = GeneralDiagnostics::InterfaceTypeEnum;
     switch (val)
     {
 // Need to convert consumers to using the new enum classes, so we
@@ -736,20 +736,20 @@ static auto __attribute__((unused)) EnsureKnownEnumValue(GeneralDiagnostics::Int
     case EnumType::kCellular:
     case EnumType::kThread:
 #else  // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
-    case EMBER_ZCL_INTERFACE_TYPE_UNSPECIFIED:
-    case EMBER_ZCL_INTERFACE_TYPE_WI_FI:
-    case EMBER_ZCL_INTERFACE_TYPE_ETHERNET:
-    case EMBER_ZCL_INTERFACE_TYPE_CELLULAR:
-    case EMBER_ZCL_INTERFACE_TYPE_THREAD:
+    case EMBER_ZCL_INTERFACE_TYPE_ENUM_UNSPECIFIED:
+    case EMBER_ZCL_INTERFACE_TYPE_ENUM_WI_FI:
+    case EMBER_ZCL_INTERFACE_TYPE_ENUM_ETHERNET:
+    case EMBER_ZCL_INTERFACE_TYPE_ENUM_CELLULAR:
+    case EMBER_ZCL_INTERFACE_TYPE_ENUM_THREAD:
 #endif // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
         return val;
     default:
         return static_cast<EnumType>(5);
     }
 }
-static auto __attribute__((unused)) EnsureKnownEnumValue(GeneralDiagnostics::NetworkFaultType val)
+static auto __attribute__((unused)) EnsureKnownEnumValue(GeneralDiagnostics::NetworkFaultEnum val)
 {
-    using EnumType = GeneralDiagnostics::NetworkFaultType;
+    using EnumType = GeneralDiagnostics::NetworkFaultEnum;
     switch (val)
     {
 // Need to convert consumers to using the new enum classes, so we
@@ -760,19 +760,19 @@ static auto __attribute__((unused)) EnsureKnownEnumValue(GeneralDiagnostics::Net
     case EnumType::kNetworkJammed:
     case EnumType::kConnectionFailed:
 #else  // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
-    case EMBER_ZCL_NETWORK_FAULT_TYPE_UNSPECIFIED:
-    case EMBER_ZCL_NETWORK_FAULT_TYPE_HARDWARE_FAILURE:
-    case EMBER_ZCL_NETWORK_FAULT_TYPE_NETWORK_JAMMED:
-    case EMBER_ZCL_NETWORK_FAULT_TYPE_CONNECTION_FAILED:
+    case EMBER_ZCL_NETWORK_FAULT_ENUM_UNSPECIFIED:
+    case EMBER_ZCL_NETWORK_FAULT_ENUM_HARDWARE_FAILURE:
+    case EMBER_ZCL_NETWORK_FAULT_ENUM_NETWORK_JAMMED:
+    case EMBER_ZCL_NETWORK_FAULT_ENUM_CONNECTION_FAILED:
 #endif // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
         return val;
     default:
         return static_cast<EnumType>(4);
     }
 }
-static auto __attribute__((unused)) EnsureKnownEnumValue(GeneralDiagnostics::RadioFault val)
+static auto __attribute__((unused)) EnsureKnownEnumValue(GeneralDiagnostics::RadioFaultEnum val)
 {
-    using EnumType = GeneralDiagnostics::RadioFault;
+    using EnumType = GeneralDiagnostics::RadioFaultEnum;
     switch (val)
     {
 // Need to convert consumers to using the new enum classes, so we
@@ -786,13 +786,13 @@ static auto __attribute__((unused)) EnsureKnownEnumValue(GeneralDiagnostics::Rad
     case EnumType::kBLEFault:
     case EnumType::kEthernetFault:
 #else  // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
-    case EMBER_ZCL_RADIO_FAULT_UNSPECIFIED:
-    case EMBER_ZCL_RADIO_FAULT_WI_FI_FAULT:
-    case EMBER_ZCL_RADIO_FAULT_CELLULAR_FAULT:
-    case EMBER_ZCL_RADIO_FAULT_THREAD_FAULT:
-    case EMBER_ZCL_RADIO_FAULT_NFC_FAULT:
-    case EMBER_ZCL_RADIO_FAULT_BLE_FAULT:
-    case EMBER_ZCL_RADIO_FAULT_ETHERNET_FAULT:
+    case EMBER_ZCL_RADIO_FAULT_ENUM_UNSPECIFIED:
+    case EMBER_ZCL_RADIO_FAULT_ENUM_WI_FI_FAULT:
+    case EMBER_ZCL_RADIO_FAULT_ENUM_CELLULAR_FAULT:
+    case EMBER_ZCL_RADIO_FAULT_ENUM_THREAD_FAULT:
+    case EMBER_ZCL_RADIO_FAULT_ENUM_NFC_FAULT:
+    case EMBER_ZCL_RADIO_FAULT_ENUM_BLE_FAULT:
+    case EMBER_ZCL_RADIO_FAULT_ENUM_ETHERNET_FAULT:
 #endif // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
         return val;
     default:
@@ -937,9 +937,9 @@ static auto __attribute__((unused)) EnsureKnownEnumValue(WiFiNetworkDiagnostics:
     }
 }
 
-static auto __attribute__((unused)) EnsureKnownEnumValue(EthernetNetworkDiagnostics::PHYRate val)
+static auto __attribute__((unused)) EnsureKnownEnumValue(EthernetNetworkDiagnostics::PHYRateEnum val)
 {
-    using EnumType = EthernetNetworkDiagnostics::PHYRate;
+    using EnumType = EthernetNetworkDiagnostics::PHYRateEnum;
     switch (val)
     {
 // Need to convert consumers to using the new enum classes, so we
@@ -956,16 +956,16 @@ static auto __attribute__((unused)) EnsureKnownEnumValue(EthernetNetworkDiagnost
     case EnumType::kRate200G:
     case EnumType::kRate400G:
 #else  // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
-    case EMBER_ZCL_PHY_RATE_RATE10_M:
-    case EMBER_ZCL_PHY_RATE_RATE100_M:
-    case EMBER_ZCL_PHY_RATE_RATE1_G:
-    case EMBER_ZCL_PHY_RATE_RATE2_5_G:
-    case EMBER_ZCL_PHY_RATE_RATE5_G:
-    case EMBER_ZCL_PHY_RATE_RATE10_G:
-    case EMBER_ZCL_PHY_RATE_RATE40_G:
-    case EMBER_ZCL_PHY_RATE_RATE100_G:
-    case EMBER_ZCL_PHY_RATE_RATE200_G:
-    case EMBER_ZCL_PHY_RATE_RATE400_G:
+    case EMBER_ZCL_PHY_RATE_ENUM_RATE10_M:
+    case EMBER_ZCL_PHY_RATE_ENUM_RATE100_M:
+    case EMBER_ZCL_PHY_RATE_ENUM_RATE1_G:
+    case EMBER_ZCL_PHY_RATE_ENUM_RATE2_5_G:
+    case EMBER_ZCL_PHY_RATE_ENUM_RATE5_G:
+    case EMBER_ZCL_PHY_RATE_ENUM_RATE10_G:
+    case EMBER_ZCL_PHY_RATE_ENUM_RATE40_G:
+    case EMBER_ZCL_PHY_RATE_ENUM_RATE100_G:
+    case EMBER_ZCL_PHY_RATE_ENUM_RATE200_G:
+    case EMBER_ZCL_PHY_RATE_ENUM_RATE400_G:
 #endif // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
         return val;
     default:
@@ -1016,9 +1016,9 @@ static auto __attribute__((unused)) EnsureKnownEnumValue(TimeSynchronization::Ti
     }
 }
 
-static auto __attribute__((unused)) EnsureKnownEnumValue(AdministratorCommissioning::CommissioningWindowStatus val)
+static auto __attribute__((unused)) EnsureKnownEnumValue(AdministratorCommissioning::CommissioningWindowStatusEnum val)
 {
-    using EnumType = AdministratorCommissioning::CommissioningWindowStatus;
+    using EnumType = AdministratorCommissioning::CommissioningWindowStatusEnum;
     switch (val)
     {
     case EnumType::kWindowNotOpen:
@@ -1097,9 +1097,9 @@ static auto __attribute__((unused)) EnsureKnownEnumValue(GroupKeyManagement::Gro
     }
 }
 
-static auto __attribute__((unused)) EnsureKnownEnumValue(DoorLock::DlAlarmCode val)
+static auto __attribute__((unused)) EnsureKnownEnumValue(DoorLock::AlarmCodeEnum val)
 {
-    using EnumType = DoorLock::DlAlarmCode;
+    using EnumType = DoorLock::AlarmCodeEnum;
     switch (val)
     {
     case EnumType::kLockJammed:
@@ -1115,22 +1115,22 @@ static auto __attribute__((unused)) EnsureKnownEnumValue(DoorLock::DlAlarmCode v
         return static_cast<EnumType>(2);
     }
 }
-static auto __attribute__((unused)) EnsureKnownEnumValue(DoorLock::DlCredentialRule val)
+static auto __attribute__((unused)) EnsureKnownEnumValue(DoorLock::CredentialRuleEnum val)
 {
-    using EnumType = DoorLock::DlCredentialRule;
+    using EnumType = DoorLock::CredentialRuleEnum;
     switch (val)
     {
     case EnumType::kSingle:
-    case EnumType::kDouble:
+    case EnumType::kDual:
     case EnumType::kTri:
         return val;
     default:
         return static_cast<EnumType>(3);
     }
 }
-static auto __attribute__((unused)) EnsureKnownEnumValue(DoorLock::DlCredentialType val)
+static auto __attribute__((unused)) EnsureKnownEnumValue(DoorLock::CredentialTypeEnum val)
 {
-    using EnumType = DoorLock::DlCredentialType;
+    using EnumType = DoorLock::CredentialTypeEnum;
     switch (val)
     {
     case EnumType::kProgrammingPIN:
@@ -1144,9 +1144,9 @@ static auto __attribute__((unused)) EnsureKnownEnumValue(DoorLock::DlCredentialT
         return static_cast<EnumType>(6);
     }
 }
-static auto __attribute__((unused)) EnsureKnownEnumValue(DoorLock::DlDataOperationType val)
+static auto __attribute__((unused)) EnsureKnownEnumValue(DoorLock::DataOperationTypeEnum val)
 {
-    using EnumType = DoorLock::DlDataOperationType;
+    using EnumType = DoorLock::DataOperationTypeEnum;
     switch (val)
     {
     case EnumType::kAdd:
@@ -1157,55 +1157,6 @@ static auto __attribute__((unused)) EnsureKnownEnumValue(DoorLock::DlDataOperati
         return static_cast<EnumType>(3);
     }
 }
-static auto __attribute__((unused)) EnsureKnownEnumValue(DoorLock::DlDoorState val)
-{
-    using EnumType = DoorLock::DlDoorState;
-    switch (val)
-    {
-    case EnumType::kDoorOpen:
-    case EnumType::kDoorClosed:
-    case EnumType::kDoorJammed:
-    case EnumType::kDoorForcedOpen:
-    case EnumType::kDoorUnspecifiedError:
-    case EnumType::kDoorAjar:
-        return val;
-    default:
-        return static_cast<EnumType>(6);
-    }
-}
-static auto __attribute__((unused)) EnsureKnownEnumValue(DoorLock::DlLockDataType val)
-{
-    using EnumType = DoorLock::DlLockDataType;
-    switch (val)
-    {
-    case EnumType::kUnspecified:
-    case EnumType::kProgrammingCode:
-    case EnumType::kUserIndex:
-    case EnumType::kWeekDaySchedule:
-    case EnumType::kYearDaySchedule:
-    case EnumType::kHolidaySchedule:
-    case EnumType::kPin:
-    case EnumType::kRfid:
-    case EnumType::kFingerprint:
-        return val;
-    default:
-        return static_cast<EnumType>(9);
-    }
-}
-static auto __attribute__((unused)) EnsureKnownEnumValue(DoorLock::DlLockOperationType val)
-{
-    using EnumType = DoorLock::DlLockOperationType;
-    switch (val)
-    {
-    case EnumType::kLock:
-    case EnumType::kUnlock:
-    case EnumType::kNonAccessUserEvent:
-    case EnumType::kForcedUserEvent:
-        return val;
-    default:
-        return static_cast<EnumType>(4);
-    }
-}
 static auto __attribute__((unused)) EnsureKnownEnumValue(DoorLock::DlLockState val)
 {
     using EnumType = DoorLock::DlLockState;
@@ -1240,56 +1191,6 @@ static auto __attribute__((unused)) EnsureKnownEnumValue(DoorLock::DlLockType va
         return static_cast<EnumType>(11);
     }
 }
-static auto __attribute__((unused)) EnsureKnownEnumValue(DoorLock::DlOperatingMode val)
-{
-    using EnumType = DoorLock::DlOperatingMode;
-    switch (val)
-    {
-    case EnumType::kNormal:
-    case EnumType::kVacation:
-    case EnumType::kPrivacy:
-    case EnumType::kNoRemoteLockUnlock:
-    case EnumType::kPassage:
-        return val;
-    default:
-        return static_cast<EnumType>(5);
-    }
-}
-static auto __attribute__((unused)) EnsureKnownEnumValue(DoorLock::DlOperationError val)
-{
-    using EnumType = DoorLock::DlOperationError;
-    switch (val)
-    {
-    case EnumType::kUnspecified:
-    case EnumType::kInvalidCredential:
-    case EnumType::kDisabledUserDenied:
-    case EnumType::kRestricted:
-    case EnumType::kInsufficientBattery:
-        return val;
-    default:
-        return static_cast<EnumType>(5);
-    }
-}
-static auto __attribute__((unused)) EnsureKnownEnumValue(DoorLock::DlOperationSource val)
-{
-    using EnumType = DoorLock::DlOperationSource;
-    switch (val)
-    {
-    case EnumType::kUnspecified:
-    case EnumType::kManual:
-    case EnumType::kProprietaryRemote:
-    case EnumType::kKeypad:
-    case EnumType::kAuto:
-    case EnumType::kButton:
-    case EnumType::kSchedule:
-    case EnumType::kRemote:
-    case EnumType::kRfid:
-    case EnumType::kBiometric:
-        return val;
-    default:
-        return static_cast<EnumType>(10);
-    }
-}
 static auto __attribute__((unused)) EnsureKnownEnumValue(DoorLock::DlStatus val)
 {
     using EnumType = DoorLock::DlStatus;
@@ -1307,39 +1208,6 @@ static auto __attribute__((unused)) EnsureKnownEnumValue(DoorLock::DlStatus val)
         return static_cast<EnumType>(4);
     }
 }
-static auto __attribute__((unused)) EnsureKnownEnumValue(DoorLock::DlUserStatus val)
-{
-    using EnumType = DoorLock::DlUserStatus;
-    switch (val)
-    {
-    case EnumType::kAvailable:
-    case EnumType::kOccupiedEnabled:
-    case EnumType::kOccupiedDisabled:
-        return val;
-    default:
-        return static_cast<EnumType>(2);
-    }
-}
-static auto __attribute__((unused)) EnsureKnownEnumValue(DoorLock::DlUserType val)
-{
-    using EnumType = DoorLock::DlUserType;
-    switch (val)
-    {
-    case EnumType::kUnrestrictedUser:
-    case EnumType::kYearDayScheduleUser:
-    case EnumType::kWeekDayScheduleUser:
-    case EnumType::kProgrammingUser:
-    case EnumType::kNonAccessUser:
-    case EnumType::kForcedUser:
-    case EnumType::kDisposableUser:
-    case EnumType::kExpiringUser:
-    case EnumType::kScheduleRestrictedUser:
-    case EnumType::kRemoteOnlyUser:
-        return val;
-    default:
-        return static_cast<EnumType>(10);
-    }
-}
 static auto __attribute__((unused)) EnsureKnownEnumValue(DoorLock::DoorLockOperationEventCode val)
 {
     using EnumType = DoorLock::DoorLockOperationEventCode;
@@ -1426,6 +1294,138 @@ static auto __attribute__((unused)) EnsureKnownEnumValue(DoorLock::DoorLockUserT
         return static_cast<EnumType>(5);
     }
 }
+static auto __attribute__((unused)) EnsureKnownEnumValue(DoorLock::DoorStateEnum val)
+{
+    using EnumType = DoorLock::DoorStateEnum;
+    switch (val)
+    {
+    case EnumType::kDoorOpen:
+    case EnumType::kDoorClosed:
+    case EnumType::kDoorJammed:
+    case EnumType::kDoorForcedOpen:
+    case EnumType::kDoorUnspecifiedError:
+    case EnumType::kDoorAjar:
+        return val;
+    default:
+        return static_cast<EnumType>(6);
+    }
+}
+static auto __attribute__((unused)) EnsureKnownEnumValue(DoorLock::LockDataTypeEnum val)
+{
+    using EnumType = DoorLock::LockDataTypeEnum;
+    switch (val)
+    {
+    case EnumType::kUnspecified:
+    case EnumType::kProgrammingCode:
+    case EnumType::kUserIndex:
+    case EnumType::kWeekDaySchedule:
+    case EnumType::kYearDaySchedule:
+    case EnumType::kHolidaySchedule:
+    case EnumType::kPin:
+    case EnumType::kRfid:
+    case EnumType::kFingerprint:
+        return val;
+    default:
+        return static_cast<EnumType>(9);
+    }
+}
+static auto __attribute__((unused)) EnsureKnownEnumValue(DoorLock::LockOperationTypeEnum val)
+{
+    using EnumType = DoorLock::LockOperationTypeEnum;
+    switch (val)
+    {
+    case EnumType::kLock:
+    case EnumType::kUnlock:
+    case EnumType::kNonAccessUserEvent:
+    case EnumType::kForcedUserEvent:
+        return val;
+    default:
+        return static_cast<EnumType>(4);
+    }
+}
+static auto __attribute__((unused)) EnsureKnownEnumValue(DoorLock::OperatingModeEnum val)
+{
+    using EnumType = DoorLock::OperatingModeEnum;
+    switch (val)
+    {
+    case EnumType::kNormal:
+    case EnumType::kVacation:
+    case EnumType::kPrivacy:
+    case EnumType::kNoRemoteLockUnlock:
+    case EnumType::kPassage:
+        return val;
+    default:
+        return static_cast<EnumType>(5);
+    }
+}
+static auto __attribute__((unused)) EnsureKnownEnumValue(DoorLock::OperationErrorEnum val)
+{
+    using EnumType = DoorLock::OperationErrorEnum;
+    switch (val)
+    {
+    case EnumType::kUnspecified:
+    case EnumType::kInvalidCredential:
+    case EnumType::kDisabledUserDenied:
+    case EnumType::kRestricted:
+    case EnumType::kInsufficientBattery:
+        return val;
+    default:
+        return static_cast<EnumType>(5);
+    }
+}
+static auto __attribute__((unused)) EnsureKnownEnumValue(DoorLock::OperationSourceEnum val)
+{
+    using EnumType = DoorLock::OperationSourceEnum;
+    switch (val)
+    {
+    case EnumType::kUnspecified:
+    case EnumType::kManual:
+    case EnumType::kProprietaryRemote:
+    case EnumType::kKeypad:
+    case EnumType::kAuto:
+    case EnumType::kButton:
+    case EnumType::kSchedule:
+    case EnumType::kRemote:
+    case EnumType::kRfid:
+    case EnumType::kBiometric:
+        return val;
+    default:
+        return static_cast<EnumType>(10);
+    }
+}
+static auto __attribute__((unused)) EnsureKnownEnumValue(DoorLock::UserStatusEnum val)
+{
+    using EnumType = DoorLock::UserStatusEnum;
+    switch (val)
+    {
+    case EnumType::kAvailable:
+    case EnumType::kOccupiedEnabled:
+    case EnumType::kOccupiedDisabled:
+        return val;
+    default:
+        return static_cast<EnumType>(2);
+    }
+}
+static auto __attribute__((unused)) EnsureKnownEnumValue(DoorLock::UserTypeEnum val)
+{
+    using EnumType = DoorLock::UserTypeEnum;
+    switch (val)
+    {
+    case EnumType::kUnrestrictedUser:
+    case EnumType::kYearDayScheduleUser:
+    case EnumType::kWeekDayScheduleUser:
+    case EnumType::kProgrammingUser:
+    case EnumType::kNonAccessUser:
+    case EnumType::kForcedUser:
+    case EnumType::kDisposableUser:
+    case EnumType::kExpiringUser:
+    case EnumType::kScheduleRestrictedUser:
+    case EnumType::kRemoteOnlyUser:
+        return val;
+    default:
+        return static_cast<EnumType>(10);
+    }
+}
 
 static auto __attribute__((unused)) EnsureKnownEnumValue(WindowCovering::EndProductType val)
 {
diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h b/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h
index 3b6da269e54300..d63e9a37c032be 100644
--- a/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h
+++ b/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h
@@ -670,8 +670,8 @@ enum class BootReasonEnum : uint8_t
 // Need to convert consumers to using the new enum classes, so we
 // don't just have casts all over.
 #ifdef CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
-// Enum for HardwareFault
-enum class HardwareFault : uint8_t
+// Enum for HardwareFaultEnum
+enum class HardwareFaultEnum : uint8_t
 {
     kUnspecified            = 0x00,
     kRadio                  = 0x01,
@@ -687,15 +687,15 @@ enum class HardwareFault : uint8_t
     kUnknownEnumValue       = 11,
 };
 #else  // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
-using HardwareFault                                                                    = EmberAfHardwareFault;
-static HardwareFault __attribute__((unused)) kHardwareFaultkUnknownEnumValue           = static_cast<HardwareFault>(11);
+using HardwareFaultEnum                                                                = EmberAfHardwareFaultEnum;
+static HardwareFaultEnum __attribute__((unused)) kHardwareFaultEnumkUnknownEnumValue   = static_cast<HardwareFaultEnum>(11);
 #endif // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
 
 // Need to convert consumers to using the new enum classes, so we
 // don't just have casts all over.
 #ifdef CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
-// Enum for InterfaceType
-enum class InterfaceType : uint8_t
+// Enum for InterfaceTypeEnum
+enum class InterfaceTypeEnum : uint8_t
 {
     kUnspecified      = 0x00,
     kWiFi             = 0x01,
@@ -705,15 +705,15 @@ enum class InterfaceType : uint8_t
     kUnknownEnumValue = 5,
 };
 #else  // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
-using InterfaceType                                                                    = EmberAfInterfaceType;
-static InterfaceType __attribute__((unused)) kInterfaceTypekUnknownEnumValue           = static_cast<InterfaceType>(5);
+using InterfaceTypeEnum                                                                = EmberAfInterfaceTypeEnum;
+static InterfaceTypeEnum __attribute__((unused)) kInterfaceTypeEnumkUnknownEnumValue   = static_cast<InterfaceTypeEnum>(5);
 #endif // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
 
 // Need to convert consumers to using the new enum classes, so we
 // don't just have casts all over.
 #ifdef CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
-// Enum for NetworkFaultType
-enum class NetworkFaultType : uint8_t
+// Enum for NetworkFaultEnum
+enum class NetworkFaultEnum : uint8_t
 {
     kUnspecified      = 0x00,
     kHardwareFailure  = 0x01,
@@ -722,15 +722,15 @@ enum class NetworkFaultType : uint8_t
     kUnknownEnumValue = 4,
 };
 #else  // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
-using NetworkFaultType                                                                 = EmberAfNetworkFaultType;
-static NetworkFaultType __attribute__((unused)) kNetworkFaultTypekUnknownEnumValue     = static_cast<NetworkFaultType>(4);
+using NetworkFaultEnum                                                                 = EmberAfNetworkFaultEnum;
+static NetworkFaultEnum __attribute__((unused)) kNetworkFaultEnumkUnknownEnumValue     = static_cast<NetworkFaultEnum>(4);
 #endif // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
 
 // Need to convert consumers to using the new enum classes, so we
 // don't just have casts all over.
 #ifdef CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
-// Enum for RadioFault
-enum class RadioFault : uint8_t
+// Enum for RadioFaultEnum
+enum class RadioFaultEnum : uint8_t
 {
     kUnspecified      = 0x00,
     kWiFiFault        = 0x01,
@@ -742,8 +742,8 @@ enum class RadioFault : uint8_t
     kUnknownEnumValue = 7,
 };
 #else  // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
-using RadioFault                                                                       = EmberAfRadioFault;
-static RadioFault __attribute__((unused)) kRadioFaultkUnknownEnumValue                 = static_cast<RadioFault>(7);
+using RadioFaultEnum                                                                   = EmberAfRadioFaultEnum;
+static RadioFaultEnum __attribute__((unused)) kRadioFaultEnumkUnknownEnumValue         = static_cast<RadioFaultEnum>(7);
 #endif // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
 } // namespace GeneralDiagnostics
 
@@ -870,8 +870,8 @@ namespace EthernetNetworkDiagnostics {
 // Need to convert consumers to using the new enum classes, so we
 // don't just have casts all over.
 #ifdef CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
-// Enum for PHYRate
-enum class PHYRate : uint8_t
+// Enum for PHYRateEnum
+enum class PHYRateEnum : uint8_t
 {
     kRate10M          = 0x00,
     kRate100M         = 0x01,
@@ -886,8 +886,8 @@ enum class PHYRate : uint8_t
     kUnknownEnumValue = 10,
 };
 #else  // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
-using PHYRate                                                                          = EmberAfPHYRate;
-static PHYRate __attribute__((unused)) kPHYRatekUnknownEnumValue                       = static_cast<PHYRate>(10);
+using PHYRateEnum                                                                      = EmberAfPHYRateEnum;
+static PHYRateEnum __attribute__((unused)) kPHYRateEnumkUnknownEnumValue               = static_cast<PHYRateEnum>(10);
 #endif // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM
 } // namespace EthernetNetworkDiagnostics
 
@@ -945,8 +945,8 @@ enum class SwitchFeature : uint32_t
 
 namespace AdministratorCommissioning {
 
-// Enum for CommissioningWindowStatus
-enum class CommissioningWindowStatus : uint8_t
+// Enum for CommissioningWindowStatusEnum
+enum class CommissioningWindowStatusEnum : uint8_t
 {
     kWindowNotOpen      = 0x00,
     kEnhancedWindowOpen = 0x01,
@@ -1032,8 +1032,8 @@ enum class ModeSelectFeature : uint32_t
 
 namespace DoorLock {
 
-// Enum for DlAlarmCode
-enum class DlAlarmCode : uint8_t
+// Enum for AlarmCodeEnum
+enum class AlarmCodeEnum : uint8_t
 {
     kLockJammed              = 0x00,
     kLockFactoryReset        = 0x01,
@@ -1046,17 +1046,17 @@ enum class DlAlarmCode : uint8_t
     kUnknownEnumValue        = 2,
 };
 
-// Enum for DlCredentialRule
-enum class DlCredentialRule : uint8_t
+// Enum for CredentialRuleEnum
+enum class CredentialRuleEnum : uint8_t
 {
     kSingle           = 0x00,
-    kDouble           = 0x01,
+    kDual             = 0x01,
     kTri              = 0x02,
     kUnknownEnumValue = 3,
 };
 
-// Enum for DlCredentialType
-enum class DlCredentialType : uint8_t
+// Enum for CredentialTypeEnum
+enum class CredentialTypeEnum : uint8_t
 {
     kProgrammingPIN   = 0x00,
     kPin              = 0x01,
@@ -1067,8 +1067,8 @@ enum class DlCredentialType : uint8_t
     kUnknownEnumValue = 6,
 };
 
-// Enum for DlDataOperationType
-enum class DlDataOperationType : uint8_t
+// Enum for DataOperationTypeEnum
+enum class DataOperationTypeEnum : uint8_t
 {
     kAdd              = 0x00,
     kClear            = 0x01,
@@ -1076,43 +1076,6 @@ enum class DlDataOperationType : uint8_t
     kUnknownEnumValue = 3,
 };
 
-// Enum for DlDoorState
-enum class DlDoorState : uint8_t
-{
-    kDoorOpen             = 0x00,
-    kDoorClosed           = 0x01,
-    kDoorJammed           = 0x02,
-    kDoorForcedOpen       = 0x03,
-    kDoorUnspecifiedError = 0x04,
-    kDoorAjar             = 0x05,
-    kUnknownEnumValue     = 6,
-};
-
-// Enum for DlLockDataType
-enum class DlLockDataType : uint8_t
-{
-    kUnspecified      = 0x00,
-    kProgrammingCode  = 0x01,
-    kUserIndex        = 0x02,
-    kWeekDaySchedule  = 0x03,
-    kYearDaySchedule  = 0x04,
-    kHolidaySchedule  = 0x05,
-    kPin              = 0x06,
-    kRfid             = 0x07,
-    kFingerprint      = 0x08,
-    kUnknownEnumValue = 9,
-};
-
-// Enum for DlLockOperationType
-enum class DlLockOperationType : uint8_t
-{
-    kLock               = 0x00,
-    kUnlock             = 0x01,
-    kNonAccessUserEvent = 0x02,
-    kForcedUserEvent    = 0x03,
-    kUnknownEnumValue   = 4,
-};
-
 // Enum for DlLockState
 enum class DlLockState : uint8_t
 {
@@ -1139,44 +1102,6 @@ enum class DlLockType : uint8_t
     kUnknownEnumValue   = 11,
 };
 
-// Enum for DlOperatingMode
-enum class DlOperatingMode : uint8_t
-{
-    kNormal             = 0x00,
-    kVacation           = 0x01,
-    kPrivacy            = 0x02,
-    kNoRemoteLockUnlock = 0x03,
-    kPassage            = 0x04,
-    kUnknownEnumValue   = 5,
-};
-
-// Enum for DlOperationError
-enum class DlOperationError : uint8_t
-{
-    kUnspecified         = 0x00,
-    kInvalidCredential   = 0x01,
-    kDisabledUserDenied  = 0x02,
-    kRestricted          = 0x03,
-    kInsufficientBattery = 0x04,
-    kUnknownEnumValue    = 5,
-};
-
-// Enum for DlOperationSource
-enum class DlOperationSource : uint8_t
-{
-    kUnspecified       = 0x00,
-    kManual            = 0x01,
-    kProprietaryRemote = 0x02,
-    kKeypad            = 0x03,
-    kAuto              = 0x04,
-    kButton            = 0x05,
-    kSchedule          = 0x06,
-    kRemote            = 0x07,
-    kRfid              = 0x08,
-    kBiometric         = 0x09,
-    kUnknownEnumValue  = 10,
-};
-
 // Enum for DlStatus
 enum class DlStatus : uint8_t
 {
@@ -1190,31 +1115,6 @@ enum class DlStatus : uint8_t
     kUnknownEnumValue  = 4,
 };
 
-// Enum for DlUserStatus
-enum class DlUserStatus : uint8_t
-{
-    kAvailable        = 0x00,
-    kOccupiedEnabled  = 0x01,
-    kOccupiedDisabled = 0x03,
-    kUnknownEnumValue = 2,
-};
-
-// Enum for DlUserType
-enum class DlUserType : uint8_t
-{
-    kUnrestrictedUser       = 0x00,
-    kYearDayScheduleUser    = 0x01,
-    kWeekDayScheduleUser    = 0x02,
-    kProgrammingUser        = 0x03,
-    kNonAccessUser          = 0x04,
-    kForcedUser             = 0x05,
-    kDisposableUser         = 0x06,
-    kExpiringUser           = 0x07,
-    kScheduleRestrictedUser = 0x08,
-    kRemoteOnlyUser         = 0x09,
-    kUnknownEnumValue       = 10,
-};
-
 // Enum for DoorLockOperationEventCode
 enum class DoorLockOperationEventCode : uint8_t
 {
@@ -1281,24 +1181,108 @@ enum class DoorLockUserType : uint8_t
     kUnknownEnumValue    = 5,
 };
 
-// Bitmap for DlCredentialRuleMask
-enum class DlCredentialRuleMask : uint8_t
+// Enum for DoorStateEnum
+enum class DoorStateEnum : uint8_t
 {
-    kSingle = 0x1,
-    kDual   = 0x2,
-    kTri    = 0x4,
+    kDoorOpen             = 0x00,
+    kDoorClosed           = 0x01,
+    kDoorJammed           = 0x02,
+    kDoorForcedOpen       = 0x03,
+    kDoorUnspecifiedError = 0x04,
+    kDoorAjar             = 0x05,
+    kUnknownEnumValue     = 6,
 };
 
-// Bitmap for DlCredentialRulesSupport
-enum class DlCredentialRulesSupport : uint8_t
+// Enum for LockDataTypeEnum
+enum class LockDataTypeEnum : uint8_t
 {
-    kSingle = 0x1,
-    kDual   = 0x2,
-    kTri    = 0x4,
+    kUnspecified      = 0x00,
+    kProgrammingCode  = 0x01,
+    kUserIndex        = 0x02,
+    kWeekDaySchedule  = 0x03,
+    kYearDaySchedule  = 0x04,
+    kHolidaySchedule  = 0x05,
+    kPin              = 0x06,
+    kRfid             = 0x07,
+    kFingerprint      = 0x08,
+    kUnknownEnumValue = 9,
+};
+
+// Enum for LockOperationTypeEnum
+enum class LockOperationTypeEnum : uint8_t
+{
+    kLock               = 0x00,
+    kUnlock             = 0x01,
+    kNonAccessUserEvent = 0x02,
+    kForcedUserEvent    = 0x03,
+    kUnknownEnumValue   = 4,
+};
+
+// Enum for OperatingModeEnum
+enum class OperatingModeEnum : uint8_t
+{
+    kNormal             = 0x00,
+    kVacation           = 0x01,
+    kPrivacy            = 0x02,
+    kNoRemoteLockUnlock = 0x03,
+    kPassage            = 0x04,
+    kUnknownEnumValue   = 5,
+};
+
+// Enum for OperationErrorEnum
+enum class OperationErrorEnum : uint8_t
+{
+    kUnspecified         = 0x00,
+    kInvalidCredential   = 0x01,
+    kDisabledUserDenied  = 0x02,
+    kRestricted          = 0x03,
+    kInsufficientBattery = 0x04,
+    kUnknownEnumValue    = 5,
 };
 
-// Bitmap for DlDaysMaskMap
-enum class DlDaysMaskMap : uint8_t
+// Enum for OperationSourceEnum
+enum class OperationSourceEnum : uint8_t
+{
+    kUnspecified       = 0x00,
+    kManual            = 0x01,
+    kProprietaryRemote = 0x02,
+    kKeypad            = 0x03,
+    kAuto              = 0x04,
+    kButton            = 0x05,
+    kSchedule          = 0x06,
+    kRemote            = 0x07,
+    kRfid              = 0x08,
+    kBiometric         = 0x09,
+    kUnknownEnumValue  = 10,
+};
+
+// Enum for UserStatusEnum
+enum class UserStatusEnum : uint8_t
+{
+    kAvailable        = 0x00,
+    kOccupiedEnabled  = 0x01,
+    kOccupiedDisabled = 0x03,
+    kUnknownEnumValue = 2,
+};
+
+// Enum for UserTypeEnum
+enum class UserTypeEnum : uint8_t
+{
+    kUnrestrictedUser       = 0x00,
+    kYearDayScheduleUser    = 0x01,
+    kWeekDayScheduleUser    = 0x02,
+    kProgrammingUser        = 0x03,
+    kNonAccessUser          = 0x04,
+    kForcedUser             = 0x05,
+    kDisposableUser         = 0x06,
+    kExpiringUser           = 0x07,
+    kScheduleRestrictedUser = 0x08,
+    kRemoteOnlyUser         = 0x09,
+    kUnknownEnumValue       = 10,
+};
+
+// Bitmap for DaysMaskMap
+enum class DaysMaskMap : uint8_t
 {
     kSunday    = 0x1,
     kMonday    = 0x2,
@@ -1309,6 +1293,22 @@ enum class DlDaysMaskMap : uint8_t
     kSaturday  = 0x40,
 };
 
+// Bitmap for DlCredentialRuleMask
+enum class DlCredentialRuleMask : uint8_t
+{
+    kSingle = 0x1,
+    kDual   = 0x2,
+    kTri    = 0x4,
+};
+
+// Bitmap for DlCredentialRulesSupport
+enum class DlCredentialRulesSupport : uint8_t
+{
+    kSingle = 0x1,
+    kDual   = 0x2,
+    kTri    = 0x4,
+};
+
 // Bitmap for DlDefaultConfigurationRegister
 enum class DlDefaultConfigurationRegister : uint16_t
 {
@@ -1437,18 +1437,18 @@ enum class DoorLockDayOfWeek : uint8_t
 // Bitmap for DoorLockFeature
 enum class DoorLockFeature : uint32_t
 {
-    kPINCredentials     = 0x1,
-    kRFIDCredentials    = 0x2,
-    kFingerCredentials  = 0x4,
-    kLogging            = 0x8,
-    kWeekDaySchedules   = 0x10,
-    kDoorPositionSensor = 0x20,
-    kFaceCredentials    = 0x40,
-    kCredentialsOTA     = 0x80,
-    kUsersManagement    = 0x100,
-    kNotifications      = 0x200,
-    kYearDaySchedules   = 0x400,
-    kHolidaySchedules   = 0x800,
+    kPinCredential               = 0x1,
+    kRfidCredential              = 0x2,
+    kFingerCredentials           = 0x4,
+    kLogging                     = 0x8,
+    kWeekDayAccessSchedules      = 0x10,
+    kDoorPositionSensor          = 0x20,
+    kFaceCredentials             = 0x40,
+    kCredentialsOverTheAirAccess = 0x80,
+    kUser                        = 0x100,
+    kNotification                = 0x200,
+    kYearDayAccessSchedules      = 0x400,
+    kHolidaySchedules            = 0x800,
 };
 } // namespace DoorLock
 
@@ -1585,6 +1585,18 @@ enum class PumpOperationMode : uint8_t
     kUnknownEnumValue = 4,
 };
 
+// Bitmap for PumpFeature
+enum class PumpFeature : uint32_t
+{
+    kConstantPressure    = 0x1,
+    kCompensatedPressure = 0x2,
+    kConstantFlow        = 0x4,
+    kConstantSpeed       = 0x8,
+    kConstantTemperature = 0x10,
+    kAutomatic           = 0x20,
+    kLocal               = 0x40,
+};
+
 // Bitmap for PumpStatus
 enum class PumpStatus : uint16_t
 {
diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp
index bab9ed25be187a..9f9e4f394f0fe4 100644
--- a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp
+++ b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp
@@ -10440,7 +10440,7 @@ namespace Events {} // namespace Events
 } // namespace ModeSelect
 namespace DoorLock {
 namespace Structs {
-namespace DlCredential {
+namespace CredentialStruct {
 CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
@@ -10483,7 +10483,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
     return CHIP_NO_ERROR;
 }
 
-} // namespace DlCredential
+} // namespace CredentialStruct
 } // namespace Structs
 
 namespace Commands {
@@ -10492,7 +10492,7 @@ CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kPinCode)), pinCode));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kPINCode)), PINCode));
     ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
@@ -10511,8 +10511,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
         switch (TLV::TagNumFromTag(reader.GetTag()))
         {
-        case to_underlying(Fields::kPinCode):
-            ReturnErrorOnFailure(DataModel::Decode(reader, pinCode));
+        case to_underlying(Fields::kPINCode):
+            ReturnErrorOnFailure(DataModel::Decode(reader, PINCode));
             break;
         default:
             break;
@@ -10529,7 +10529,7 @@ CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kPinCode)), pinCode));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kPINCode)), PINCode));
     ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
@@ -10548,8 +10548,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
         switch (TLV::TagNumFromTag(reader.GetTag()))
         {
-        case to_underlying(Fields::kPinCode):
-            ReturnErrorOnFailure(DataModel::Decode(reader, pinCode));
+        case to_underlying(Fields::kPINCode):
+            ReturnErrorOnFailure(DataModel::Decode(reader, PINCode));
             break;
         default:
             break;
@@ -10567,7 +10567,7 @@ CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
     ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kTimeout)), timeout));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kPinCode)), pinCode));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kPINCode)), PINCode));
     ReturnErrorOnFailure(writer.EndContainer(outer));
     return CHIP_NO_ERROR;
 }
@@ -10589,8 +10589,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         case to_underlying(Fields::kTimeout):
             ReturnErrorOnFailure(DataModel::Decode(reader, timeout));
             break;
-        case to_underlying(Fields::kPinCode):
-            ReturnErrorOnFailure(DataModel::Decode(reader, pinCode));
+        case to_underlying(Fields::kPINCode):
+            ReturnErrorOnFailure(DataModel::Decode(reader, PINCode));
             break;
         default:
             break;
@@ -11178,7 +11178,7 @@ CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
     ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOperationType)), operationType));
     ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserIndex)), userIndex));
     ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserName)), userName));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserUniqueId)), userUniqueId));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserUniqueID)), userUniqueID));
     ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserStatus)), userStatus));
     ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserType)), userType));
     ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kCredentialRule)), credentialRule));
@@ -11209,8 +11209,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         case to_underlying(Fields::kUserName):
             ReturnErrorOnFailure(DataModel::Decode(reader, userName));
             break;
-        case to_underlying(Fields::kUserUniqueId):
-            ReturnErrorOnFailure(DataModel::Decode(reader, userUniqueId));
+        case to_underlying(Fields::kUserUniqueID):
+            ReturnErrorOnFailure(DataModel::Decode(reader, userUniqueID));
             break;
         case to_underlying(Fields::kUserStatus):
             ReturnErrorOnFailure(DataModel::Decode(reader, userStatus));
@@ -11275,7 +11275,7 @@ CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
     ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserIndex)), userIndex));
     ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserName)), userName));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserUniqueId)), userUniqueId));
+    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserUniqueID)), userUniqueID));
     ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserStatus)), userStatus));
     ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kUserType)), userType));
     ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kCredentialRule)), credentialRule));
@@ -11309,8 +11309,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         case to_underlying(Fields::kUserName):
             ReturnErrorOnFailure(DataModel::Decode(reader, userName));
             break;
-        case to_underlying(Fields::kUserUniqueId):
-            ReturnErrorOnFailure(DataModel::Decode(reader, userUniqueId));
+        case to_underlying(Fields::kUserUniqueID):
+            ReturnErrorOnFailure(DataModel::Decode(reader, userUniqueID));
             break;
         case to_underlying(Fields::kUserStatus):
             ReturnErrorOnFailure(DataModel::Decode(reader, userStatus));
@@ -14245,7 +14245,8 @@ CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const
 {
     TLV::TLVType outer;
     ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer));
-    ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kColorTemperature)), colorTemperature));
+    ReturnErrorOnFailure(
+        DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kColorTemperatureMireds)), colorTemperatureMireds));
     ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kTransitionTime)), transitionTime));
     ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOptionsMask)), optionsMask));
     ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kOptionsOverride)), optionsOverride));
@@ -14267,8 +14268,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader)
         }
         switch (TLV::TagNumFromTag(reader.GetTag()))
         {
-        case to_underlying(Fields::kColorTemperature):
-            ReturnErrorOnFailure(DataModel::Decode(reader, colorTemperature));
+        case to_underlying(Fields::kColorTemperatureMireds):
+            ReturnErrorOnFailure(DataModel::Decode(reader, colorTemperatureMireds));
             break;
         case to_underlying(Fields::kTransitionTime):
             ReturnErrorOnFailure(DataModel::Decode(reader, transitionTime));
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 54616044a5437b..6590c48c17a38c 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
@@ -7685,7 +7685,7 @@ struct Type
     chip::ByteSpan hardwareAddress;
     DataModel::List<const chip::ByteSpan> IPv4Addresses;
     DataModel::List<const chip::ByteSpan> IPv6Addresses;
-    InterfaceType type = static_cast<InterfaceType>(0);
+    InterfaceTypeEnum type = static_cast<InterfaceTypeEnum>(0);
 
     static constexpr bool kIsFabricScoped = false;
 
@@ -7702,7 +7702,7 @@ struct DecodableType
     chip::ByteSpan hardwareAddress;
     DataModel::DecodableList<chip::ByteSpan> IPv4Addresses;
     DataModel::DecodableList<chip::ByteSpan> IPv6Addresses;
-    InterfaceType type = static_cast<InterfaceType>(0);
+    InterfaceTypeEnum type = static_cast<InterfaceTypeEnum>(0);
 
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 
@@ -7827,9 +7827,10 @@ struct TypeInfo
 namespace ActiveHardwareFaults {
 struct TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::app::Clusters::GeneralDiagnostics::HardwareFault>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::app::Clusters::GeneralDiagnostics::HardwareFault>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::app::Clusters::GeneralDiagnostics::HardwareFault> &;
+    using Type          = chip::app::DataModel::List<const chip::app::Clusters::GeneralDiagnostics::HardwareFaultEnum>;
+    using DecodableType = chip::app::DataModel::DecodableList<chip::app::Clusters::GeneralDiagnostics::HardwareFaultEnum>;
+    using DecodableArgType =
+        const chip::app::DataModel::DecodableList<chip::app::Clusters::GeneralDiagnostics::HardwareFaultEnum> &;
 
     static constexpr ClusterId GetClusterId() { return Clusters::GeneralDiagnostics::Id; }
     static constexpr AttributeId GetAttributeId() { return Attributes::ActiveHardwareFaults::Id; }
@@ -7839,9 +7840,9 @@ struct TypeInfo
 namespace ActiveRadioFaults {
 struct TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::app::Clusters::GeneralDiagnostics::RadioFault>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::app::Clusters::GeneralDiagnostics::RadioFault>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::app::Clusters::GeneralDiagnostics::RadioFault> &;
+    using Type             = chip::app::DataModel::List<const chip::app::Clusters::GeneralDiagnostics::RadioFaultEnum>;
+    using DecodableType    = chip::app::DataModel::DecodableList<chip::app::Clusters::GeneralDiagnostics::RadioFaultEnum>;
+    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::app::Clusters::GeneralDiagnostics::RadioFaultEnum> &;
 
     static constexpr ClusterId GetClusterId() { return Clusters::GeneralDiagnostics::Id; }
     static constexpr AttributeId GetAttributeId() { return Attributes::ActiveRadioFaults::Id; }
@@ -7851,9 +7852,9 @@ struct TypeInfo
 namespace ActiveNetworkFaults {
 struct TypeInfo
 {
-    using Type             = chip::app::DataModel::List<const chip::app::Clusters::GeneralDiagnostics::NetworkFaultType>;
-    using DecodableType    = chip::app::DataModel::DecodableList<chip::app::Clusters::GeneralDiagnostics::NetworkFaultType>;
-    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::app::Clusters::GeneralDiagnostics::NetworkFaultType> &;
+    using Type             = chip::app::DataModel::List<const chip::app::Clusters::GeneralDiagnostics::NetworkFaultEnum>;
+    using DecodableType    = chip::app::DataModel::DecodableList<chip::app::Clusters::GeneralDiagnostics::NetworkFaultEnum>;
+    using DecodableArgType = const chip::app::DataModel::DecodableList<chip::app::Clusters::GeneralDiagnostics::NetworkFaultEnum> &;
 
     static constexpr ClusterId GetClusterId() { return Clusters::GeneralDiagnostics::Id; }
     static constexpr AttributeId GetAttributeId() { return Attributes::ActiveNetworkFaults::Id; }
@@ -7947,8 +7948,8 @@ struct Type
     static constexpr ClusterId GetClusterId() { return Clusters::GeneralDiagnostics::Id; }
     static constexpr bool kIsFabricScoped = false;
 
-    DataModel::List<const HardwareFault> current;
-    DataModel::List<const HardwareFault> previous;
+    DataModel::List<const HardwareFaultEnum> current;
+    DataModel::List<const HardwareFaultEnum> previous;
 
     CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
 };
@@ -7960,8 +7961,8 @@ struct DecodableType
     static constexpr EventId GetEventId() { return Events::HardwareFaultChange::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::GeneralDiagnostics::Id; }
 
-    DataModel::DecodableList<HardwareFault> current;
-    DataModel::DecodableList<HardwareFault> previous;
+    DataModel::DecodableList<HardwareFaultEnum> current;
+    DataModel::DecodableList<HardwareFaultEnum> previous;
 
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
@@ -7983,8 +7984,8 @@ struct Type
     static constexpr ClusterId GetClusterId() { return Clusters::GeneralDiagnostics::Id; }
     static constexpr bool kIsFabricScoped = false;
 
-    DataModel::List<const RadioFault> current;
-    DataModel::List<const RadioFault> previous;
+    DataModel::List<const RadioFaultEnum> current;
+    DataModel::List<const RadioFaultEnum> previous;
 
     CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
 };
@@ -7996,8 +7997,8 @@ struct DecodableType
     static constexpr EventId GetEventId() { return Events::RadioFaultChange::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::GeneralDiagnostics::Id; }
 
-    DataModel::DecodableList<RadioFault> current;
-    DataModel::DecodableList<RadioFault> previous;
+    DataModel::DecodableList<RadioFaultEnum> current;
+    DataModel::DecodableList<RadioFaultEnum> previous;
 
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
@@ -8019,8 +8020,8 @@ struct Type
     static constexpr ClusterId GetClusterId() { return Clusters::GeneralDiagnostics::Id; }
     static constexpr bool kIsFabricScoped = false;
 
-    DataModel::List<const NetworkFaultType> current;
-    DataModel::List<const NetworkFaultType> previous;
+    DataModel::List<const NetworkFaultEnum> current;
+    DataModel::List<const NetworkFaultEnum> previous;
 
     CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
 };
@@ -8032,8 +8033,8 @@ struct DecodableType
     static constexpr EventId GetEventId() { return Events::NetworkFaultChange::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::GeneralDiagnostics::Id; }
 
-    DataModel::DecodableList<NetworkFaultType> current;
-    DataModel::DecodableList<NetworkFaultType> previous;
+    DataModel::DecodableList<NetworkFaultEnum> current;
+    DataModel::DecodableList<NetworkFaultEnum> previous;
 
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
@@ -9858,9 +9859,9 @@ namespace Attributes {
 namespace PHYRate {
 struct TypeInfo
 {
-    using Type             = chip::app::DataModel::Nullable<chip::app::Clusters::EthernetNetworkDiagnostics::PHYRate>;
-    using DecodableType    = chip::app::DataModel::Nullable<chip::app::Clusters::EthernetNetworkDiagnostics::PHYRate>;
-    using DecodableArgType = const chip::app::DataModel::Nullable<chip::app::Clusters::EthernetNetworkDiagnostics::PHYRate> &;
+    using Type             = chip::app::DataModel::Nullable<chip::app::Clusters::EthernetNetworkDiagnostics::PHYRateEnum>;
+    using DecodableType    = chip::app::DataModel::Nullable<chip::app::Clusters::EthernetNetworkDiagnostics::PHYRateEnum>;
+    using DecodableArgType = const chip::app::DataModel::Nullable<chip::app::Clusters::EthernetNetworkDiagnostics::PHYRateEnum> &;
 
     static constexpr ClusterId GetClusterId() { return Clusters::EthernetNetworkDiagnostics::Id; }
     static constexpr AttributeId GetAttributeId() { return Attributes::PHYRate::Id; }
@@ -11158,9 +11159,9 @@ namespace Attributes {
 namespace WindowStatus {
 struct TypeInfo
 {
-    using Type             = chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatus;
-    using DecodableType    = chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatus;
-    using DecodableArgType = chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatus;
+    using Type             = chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatusEnum;
+    using DecodableType    = chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatusEnum;
+    using DecodableArgType = chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatusEnum;
 
     static constexpr ClusterId GetClusterId() { return Clusters::AdministratorCommissioning::Id; }
     static constexpr AttributeId GetAttributeId() { return Attributes::WindowStatus::Id; }
@@ -11231,7 +11232,7 @@ struct TypeInfo
         CHIP_ERROR Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path);
 
         Attributes::WindowStatus::TypeInfo::DecodableType windowStatus =
-            static_cast<chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatus>(0);
+            static_cast<chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatusEnum>(0);
         Attributes::AdminFabricIndex::TypeInfo::DecodableType adminFabricIndex;
         Attributes::AdminVendorId::TypeInfo::DecodableType adminVendorId;
         Attributes::GeneratedCommandList::TypeInfo::DecodableType generatedCommandList;
@@ -13022,7 +13023,7 @@ struct TypeInfo
 } // namespace ModeSelect
 namespace DoorLock {
 namespace Structs {
-namespace DlCredential {
+namespace CredentialStruct {
 enum class Fields
 {
     kCredentialType  = 0,
@@ -13032,8 +13033,8 @@ enum class Fields
 struct Type
 {
 public:
-    DlCredentialType credentialType = static_cast<DlCredentialType>(0);
-    uint16_t credentialIndex        = static_cast<uint16_t>(0);
+    CredentialTypeEnum credentialType = static_cast<CredentialTypeEnum>(0);
+    uint16_t credentialIndex          = static_cast<uint16_t>(0);
 
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 
@@ -13044,7 +13045,7 @@ struct Type
 
 using DecodableType = Type;
 
-} // namespace DlCredential
+} // namespace CredentialStruct
 } // namespace Structs
 
 namespace Commands {
@@ -13176,7 +13177,7 @@ namespace Commands {
 namespace LockDoor {
 enum class Fields
 {
-    kPinCode = 0,
+    kPINCode = 0,
 };
 
 struct Type
@@ -13186,7 +13187,7 @@ struct Type
     static constexpr CommandId GetCommandId() { return Commands::LockDoor::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; }
 
-    Optional<chip::ByteSpan> pinCode;
+    Optional<chip::ByteSpan> PINCode;
 
     CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
 
@@ -13201,14 +13202,14 @@ struct DecodableType
     static constexpr CommandId GetCommandId() { return Commands::LockDoor::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; }
 
-    Optional<chip::ByteSpan> pinCode;
+    Optional<chip::ByteSpan> PINCode;
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
 }; // namespace LockDoor
 namespace UnlockDoor {
 enum class Fields
 {
-    kPinCode = 0,
+    kPINCode = 0,
 };
 
 struct Type
@@ -13218,7 +13219,7 @@ struct Type
     static constexpr CommandId GetCommandId() { return Commands::UnlockDoor::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; }
 
-    Optional<chip::ByteSpan> pinCode;
+    Optional<chip::ByteSpan> PINCode;
 
     CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
 
@@ -13233,7 +13234,7 @@ struct DecodableType
     static constexpr CommandId GetCommandId() { return Commands::UnlockDoor::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; }
 
-    Optional<chip::ByteSpan> pinCode;
+    Optional<chip::ByteSpan> PINCode;
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
 }; // namespace UnlockDoor
@@ -13241,7 +13242,7 @@ namespace UnlockWithTimeout {
 enum class Fields
 {
     kTimeout = 0,
-    kPinCode = 1,
+    kPINCode = 1,
 };
 
 struct Type
@@ -13252,7 +13253,7 @@ struct Type
     static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; }
 
     uint16_t timeout = static_cast<uint16_t>(0);
-    Optional<chip::ByteSpan> pinCode;
+    Optional<chip::ByteSpan> PINCode;
 
     CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
 
@@ -13268,7 +13269,7 @@ struct DecodableType
     static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; }
 
     uint16_t timeout = static_cast<uint16_t>(0);
-    Optional<chip::ByteSpan> pinCode;
+    Optional<chip::ByteSpan> PINCode;
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
 }; // namespace UnlockWithTimeout
@@ -13291,13 +13292,13 @@ struct Type
     static constexpr CommandId GetCommandId() { return Commands::SetWeekDaySchedule::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; }
 
-    uint8_t weekDayIndex                  = static_cast<uint8_t>(0);
-    uint16_t userIndex                    = static_cast<uint16_t>(0);
-    chip::BitMask<DlDaysMaskMap> daysMask = static_cast<chip::BitMask<DlDaysMaskMap>>(0);
-    uint8_t startHour                     = static_cast<uint8_t>(0);
-    uint8_t startMinute                   = static_cast<uint8_t>(0);
-    uint8_t endHour                       = static_cast<uint8_t>(0);
-    uint8_t endMinute                     = static_cast<uint8_t>(0);
+    uint8_t weekDayIndex                = static_cast<uint8_t>(0);
+    uint16_t userIndex                  = static_cast<uint16_t>(0);
+    chip::BitMask<DaysMaskMap> daysMask = static_cast<chip::BitMask<DaysMaskMap>>(0);
+    uint8_t startHour                   = static_cast<uint8_t>(0);
+    uint8_t startMinute                 = static_cast<uint8_t>(0);
+    uint8_t endHour                     = static_cast<uint8_t>(0);
+    uint8_t endMinute                   = static_cast<uint8_t>(0);
 
     CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
 
@@ -13312,13 +13313,13 @@ struct DecodableType
     static constexpr CommandId GetCommandId() { return Commands::SetWeekDaySchedule::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; }
 
-    uint8_t weekDayIndex                  = static_cast<uint8_t>(0);
-    uint16_t userIndex                    = static_cast<uint16_t>(0);
-    chip::BitMask<DlDaysMaskMap> daysMask = static_cast<chip::BitMask<DlDaysMaskMap>>(0);
-    uint8_t startHour                     = static_cast<uint8_t>(0);
-    uint8_t startMinute                   = static_cast<uint8_t>(0);
-    uint8_t endHour                       = static_cast<uint8_t>(0);
-    uint8_t endMinute                     = static_cast<uint8_t>(0);
+    uint8_t weekDayIndex                = static_cast<uint8_t>(0);
+    uint16_t userIndex                  = static_cast<uint16_t>(0);
+    chip::BitMask<DaysMaskMap> daysMask = static_cast<chip::BitMask<DaysMaskMap>>(0);
+    uint8_t startHour                   = static_cast<uint8_t>(0);
+    uint8_t startMinute                 = static_cast<uint8_t>(0);
+    uint8_t endHour                     = static_cast<uint8_t>(0);
+    uint8_t endMinute                   = static_cast<uint8_t>(0);
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
 }; // namespace SetWeekDaySchedule
@@ -13380,7 +13381,7 @@ struct Type
     uint8_t weekDayIndex = static_cast<uint8_t>(0);
     uint16_t userIndex   = static_cast<uint16_t>(0);
     DlStatus status      = static_cast<DlStatus>(0);
-    Optional<chip::BitMask<DlDaysMaskMap>> daysMask;
+    Optional<chip::BitMask<DaysMaskMap>> daysMask;
     Optional<uint8_t> startHour;
     Optional<uint8_t> startMinute;
     Optional<uint8_t> endHour;
@@ -13402,7 +13403,7 @@ struct DecodableType
     uint8_t weekDayIndex = static_cast<uint8_t>(0);
     uint16_t userIndex   = static_cast<uint16_t>(0);
     DlStatus status      = static_cast<DlStatus>(0);
-    Optional<chip::BitMask<DlDaysMaskMap>> daysMask;
+    Optional<chip::BitMask<DaysMaskMap>> daysMask;
     Optional<uint8_t> startHour;
     Optional<uint8_t> startMinute;
     Optional<uint8_t> endHour;
@@ -13616,10 +13617,10 @@ struct Type
     static constexpr CommandId GetCommandId() { return Commands::SetHolidaySchedule::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; }
 
-    uint8_t holidayIndex          = static_cast<uint8_t>(0);
-    uint32_t localStartTime       = static_cast<uint32_t>(0);
-    uint32_t localEndTime         = static_cast<uint32_t>(0);
-    DlOperatingMode operatingMode = static_cast<DlOperatingMode>(0);
+    uint8_t holidayIndex            = static_cast<uint8_t>(0);
+    uint32_t localStartTime         = static_cast<uint32_t>(0);
+    uint32_t localEndTime           = static_cast<uint32_t>(0);
+    OperatingModeEnum operatingMode = static_cast<OperatingModeEnum>(0);
 
     CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
 
@@ -13634,10 +13635,10 @@ struct DecodableType
     static constexpr CommandId GetCommandId() { return Commands::SetHolidaySchedule::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; }
 
-    uint8_t holidayIndex          = static_cast<uint8_t>(0);
-    uint32_t localStartTime       = static_cast<uint32_t>(0);
-    uint32_t localEndTime         = static_cast<uint32_t>(0);
-    DlOperatingMode operatingMode = static_cast<DlOperatingMode>(0);
+    uint8_t holidayIndex            = static_cast<uint8_t>(0);
+    uint32_t localStartTime         = static_cast<uint32_t>(0);
+    uint32_t localEndTime           = static_cast<uint32_t>(0);
+    OperatingModeEnum operatingMode = static_cast<OperatingModeEnum>(0);
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
 }; // namespace SetHolidaySchedule
@@ -13694,7 +13695,7 @@ struct Type
     DlStatus status      = static_cast<DlStatus>(0);
     Optional<uint32_t> localStartTime;
     Optional<uint32_t> localEndTime;
-    Optional<DlOperatingMode> operatingMode;
+    Optional<OperatingModeEnum> operatingMode;
 
     CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
 
@@ -13713,7 +13714,7 @@ struct DecodableType
     DlStatus status      = static_cast<DlStatus>(0);
     Optional<uint32_t> localStartTime;
     Optional<uint32_t> localEndTime;
-    Optional<DlOperatingMode> operatingMode;
+    Optional<OperatingModeEnum> operatingMode;
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
 }; // namespace GetHolidayScheduleResponse
@@ -13755,7 +13756,7 @@ enum class Fields
     kOperationType  = 0,
     kUserIndex      = 1,
     kUserName       = 2,
-    kUserUniqueId   = 3,
+    kUserUniqueID   = 3,
     kUserStatus     = 4,
     kUserType       = 5,
     kCredentialRule = 6,
@@ -13768,13 +13769,13 @@ struct Type
     static constexpr CommandId GetCommandId() { return Commands::SetUser::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; }
 
-    DlDataOperationType operationType = static_cast<DlDataOperationType>(0);
-    uint16_t userIndex                = static_cast<uint16_t>(0);
+    DataOperationTypeEnum operationType = static_cast<DataOperationTypeEnum>(0);
+    uint16_t userIndex                  = static_cast<uint16_t>(0);
     DataModel::Nullable<chip::CharSpan> userName;
-    DataModel::Nullable<uint32_t> userUniqueId;
-    DataModel::Nullable<DlUserStatus> userStatus;
-    DataModel::Nullable<DlUserType> userType;
-    DataModel::Nullable<DlCredentialRule> credentialRule;
+    DataModel::Nullable<uint32_t> userUniqueID;
+    DataModel::Nullable<UserStatusEnum> userStatus;
+    DataModel::Nullable<UserTypeEnum> userType;
+    DataModel::Nullable<CredentialRuleEnum> credentialRule;
 
     CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
 
@@ -13789,13 +13790,13 @@ struct DecodableType
     static constexpr CommandId GetCommandId() { return Commands::SetUser::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; }
 
-    DlDataOperationType operationType = static_cast<DlDataOperationType>(0);
-    uint16_t userIndex                = static_cast<uint16_t>(0);
+    DataOperationTypeEnum operationType = static_cast<DataOperationTypeEnum>(0);
+    uint16_t userIndex                  = static_cast<uint16_t>(0);
     DataModel::Nullable<chip::CharSpan> userName;
-    DataModel::Nullable<uint32_t> userUniqueId;
-    DataModel::Nullable<DlUserStatus> userStatus;
-    DataModel::Nullable<DlUserType> userType;
-    DataModel::Nullable<DlCredentialRule> credentialRule;
+    DataModel::Nullable<uint32_t> userUniqueID;
+    DataModel::Nullable<UserStatusEnum> userStatus;
+    DataModel::Nullable<UserTypeEnum> userType;
+    DataModel::Nullable<CredentialRuleEnum> credentialRule;
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
 }; // namespace SetUser
@@ -13836,7 +13837,7 @@ enum class Fields
 {
     kUserIndex               = 0,
     kUserName                = 1,
-    kUserUniqueId            = 2,
+    kUserUniqueID            = 2,
     kUserStatus              = 3,
     kUserType                = 4,
     kCredentialRule          = 5,
@@ -13855,11 +13856,11 @@ struct Type
 
     uint16_t userIndex = static_cast<uint16_t>(0);
     DataModel::Nullable<chip::CharSpan> userName;
-    DataModel::Nullable<uint32_t> userUniqueId;
-    DataModel::Nullable<DlUserStatus> userStatus;
-    DataModel::Nullable<DlUserType> userType;
-    DataModel::Nullable<DlCredentialRule> credentialRule;
-    DataModel::Nullable<DataModel::List<const Structs::DlCredential::Type>> credentials;
+    DataModel::Nullable<uint32_t> userUniqueID;
+    DataModel::Nullable<UserStatusEnum> userStatus;
+    DataModel::Nullable<UserTypeEnum> userType;
+    DataModel::Nullable<CredentialRuleEnum> credentialRule;
+    DataModel::Nullable<DataModel::List<const Structs::CredentialStruct::Type>> credentials;
     DataModel::Nullable<chip::FabricIndex> creatorFabricIndex;
     DataModel::Nullable<chip::FabricIndex> lastModifiedFabricIndex;
     DataModel::Nullable<uint16_t> nextUserIndex;
@@ -13879,11 +13880,11 @@ struct DecodableType
 
     uint16_t userIndex = static_cast<uint16_t>(0);
     DataModel::Nullable<chip::CharSpan> userName;
-    DataModel::Nullable<uint32_t> userUniqueId;
-    DataModel::Nullable<DlUserStatus> userStatus;
-    DataModel::Nullable<DlUserType> userType;
-    DataModel::Nullable<DlCredentialRule> credentialRule;
-    DataModel::Nullable<DataModel::DecodableList<Structs::DlCredential::DecodableType>> credentials;
+    DataModel::Nullable<uint32_t> userUniqueID;
+    DataModel::Nullable<UserStatusEnum> userStatus;
+    DataModel::Nullable<UserTypeEnum> userType;
+    DataModel::Nullable<CredentialRuleEnum> credentialRule;
+    DataModel::Nullable<DataModel::DecodableList<Structs::CredentialStruct::DecodableType>> credentials;
     DataModel::Nullable<chip::FabricIndex> creatorFabricIndex;
     DataModel::Nullable<chip::FabricIndex> lastModifiedFabricIndex;
     DataModel::Nullable<uint16_t> nextUserIndex;
@@ -13940,12 +13941,12 @@ struct Type
     static constexpr CommandId GetCommandId() { return Commands::SetCredential::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; }
 
-    DlDataOperationType operationType = static_cast<DlDataOperationType>(0);
-    Structs::DlCredential::Type credential;
+    DataOperationTypeEnum operationType = static_cast<DataOperationTypeEnum>(0);
+    Structs::CredentialStruct::Type credential;
     chip::ByteSpan credentialData;
     DataModel::Nullable<uint16_t> userIndex;
-    DataModel::Nullable<DlUserStatus> userStatus;
-    DataModel::Nullable<DlUserType> userType;
+    DataModel::Nullable<UserStatusEnum> userStatus;
+    DataModel::Nullable<UserTypeEnum> userType;
 
     CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
 
@@ -13960,12 +13961,12 @@ struct DecodableType
     static constexpr CommandId GetCommandId() { return Commands::SetCredential::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; }
 
-    DlDataOperationType operationType = static_cast<DlDataOperationType>(0);
-    Structs::DlCredential::DecodableType credential;
+    DataOperationTypeEnum operationType = static_cast<DataOperationTypeEnum>(0);
+    Structs::CredentialStruct::DecodableType credential;
     chip::ByteSpan credentialData;
     DataModel::Nullable<uint16_t> userIndex;
-    DataModel::Nullable<DlUserStatus> userStatus;
-    DataModel::Nullable<DlUserType> userType;
+    DataModel::Nullable<UserStatusEnum> userStatus;
+    DataModel::Nullable<UserTypeEnum> userType;
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
 }; // namespace SetCredential
@@ -14020,7 +14021,7 @@ struct Type
     static constexpr CommandId GetCommandId() { return Commands::GetCredentialStatus::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; }
 
-    Structs::DlCredential::Type credential;
+    Structs::CredentialStruct::Type credential;
 
     CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
 
@@ -14035,7 +14036,7 @@ struct DecodableType
     static constexpr CommandId GetCommandId() { return Commands::GetCredentialStatus::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; }
 
-    Structs::DlCredential::DecodableType credential;
+    Structs::CredentialStruct::DecodableType credential;
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
 }; // namespace GetCredentialStatus
@@ -14096,7 +14097,7 @@ struct Type
     static constexpr CommandId GetCommandId() { return Commands::ClearCredential::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; }
 
-    DataModel::Nullable<Structs::DlCredential::Type> credential;
+    DataModel::Nullable<Structs::CredentialStruct::Type> credential;
 
     CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
 
@@ -14111,7 +14112,7 @@ struct DecodableType
     static constexpr CommandId GetCommandId() { return Commands::ClearCredential::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; }
 
-    DataModel::Nullable<Structs::DlCredential::DecodableType> credential;
+    DataModel::Nullable<Structs::CredentialStruct::DecodableType> credential;
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
 }; // namespace ClearCredential
@@ -14158,9 +14159,9 @@ struct TypeInfo
 namespace DoorState {
 struct TypeInfo
 {
-    using Type             = chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::DlDoorState>;
-    using DecodableType    = chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::DlDoorState>;
-    using DecodableArgType = const chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::DlDoorState> &;
+    using Type             = chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::DoorStateEnum>;
+    using DecodableType    = chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::DoorStateEnum>;
+    using DecodableArgType = const chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::DoorStateEnum> &;
 
     static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; }
     static constexpr AttributeId GetAttributeId() { return Attributes::DoorState::Id; }
@@ -14399,9 +14400,9 @@ struct TypeInfo
 namespace OperatingMode {
 struct TypeInfo
 {
-    using Type             = chip::app::Clusters::DoorLock::DlOperatingMode;
-    using DecodableType    = chip::app::Clusters::DoorLock::DlOperatingMode;
-    using DecodableArgType = chip::app::Clusters::DoorLock::DlOperatingMode;
+    using Type             = chip::app::Clusters::DoorLock::OperatingModeEnum;
+    using DecodableType    = chip::app::Clusters::DoorLock::OperatingModeEnum;
+    using DecodableArgType = chip::app::Clusters::DoorLock::OperatingModeEnum;
 
     static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; }
     static constexpr AttributeId GetAttributeId() { return Attributes::OperatingMode::Id; }
@@ -14620,7 +14621,7 @@ struct TypeInfo
         Attributes::AutoRelockTime::TypeInfo::DecodableType autoRelockTime = static_cast<uint32_t>(0);
         Attributes::SoundVolume::TypeInfo::DecodableType soundVolume       = static_cast<uint8_t>(0);
         Attributes::OperatingMode::TypeInfo::DecodableType operatingMode =
-            static_cast<chip::app::Clusters::DoorLock::DlOperatingMode>(0);
+            static_cast<chip::app::Clusters::DoorLock::OperatingModeEnum>(0);
         Attributes::SupportedOperatingModes::TypeInfo::DecodableType supportedOperatingModes =
             static_cast<chip::BitMask<chip::app::Clusters::DoorLock::DlSupportedOperatingModes>>(0);
         Attributes::DefaultConfigurationRegister::TypeInfo::DecodableType defaultConfigurationRegister =
@@ -14661,7 +14662,7 @@ struct Type
     static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; }
     static constexpr bool kIsFabricScoped = false;
 
-    DlAlarmCode alarmCode = static_cast<DlAlarmCode>(0);
+    AlarmCodeEnum alarmCode = static_cast<AlarmCodeEnum>(0);
 
     CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
 };
@@ -14673,7 +14674,7 @@ struct DecodableType
     static constexpr EventId GetEventId() { return Events::DoorLockAlarm::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; }
 
-    DlAlarmCode alarmCode = static_cast<DlAlarmCode>(0);
+    AlarmCodeEnum alarmCode = static_cast<AlarmCodeEnum>(0);
 
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
@@ -14694,7 +14695,7 @@ struct Type
     static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; }
     static constexpr bool kIsFabricScoped = false;
 
-    DlDoorState doorState = static_cast<DlDoorState>(0);
+    DoorStateEnum doorState = static_cast<DoorStateEnum>(0);
 
     CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
 };
@@ -14706,7 +14707,7 @@ struct DecodableType
     static constexpr EventId GetEventId() { return Events::DoorStateChange::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; }
 
-    DlDoorState doorState = static_cast<DlDoorState>(0);
+    DoorStateEnum doorState = static_cast<DoorStateEnum>(0);
 
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
@@ -14732,12 +14733,12 @@ struct Type
     static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; }
     static constexpr bool kIsFabricScoped = false;
 
-    DlLockOperationType lockOperationType = static_cast<DlLockOperationType>(0);
-    DlOperationSource operationSource     = static_cast<DlOperationSource>(0);
+    LockOperationTypeEnum lockOperationType = static_cast<LockOperationTypeEnum>(0);
+    OperationSourceEnum operationSource     = static_cast<OperationSourceEnum>(0);
     DataModel::Nullable<uint16_t> userIndex;
     DataModel::Nullable<chip::FabricIndex> fabricIndex;
     DataModel::Nullable<chip::NodeId> sourceNode;
-    Optional<DataModel::Nullable<DataModel::List<const Structs::DlCredential::Type>>> credentials;
+    Optional<DataModel::Nullable<DataModel::List<const Structs::CredentialStruct::Type>>> credentials;
 
     CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
 };
@@ -14749,12 +14750,12 @@ struct DecodableType
     static constexpr EventId GetEventId() { return Events::LockOperation::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; }
 
-    DlLockOperationType lockOperationType = static_cast<DlLockOperationType>(0);
-    DlOperationSource operationSource     = static_cast<DlOperationSource>(0);
+    LockOperationTypeEnum lockOperationType = static_cast<LockOperationTypeEnum>(0);
+    OperationSourceEnum operationSource     = static_cast<OperationSourceEnum>(0);
     DataModel::Nullable<uint16_t> userIndex;
     DataModel::Nullable<chip::FabricIndex> fabricIndex;
     DataModel::Nullable<chip::NodeId> sourceNode;
-    Optional<DataModel::Nullable<DataModel::DecodableList<Structs::DlCredential::DecodableType>>> credentials;
+    Optional<DataModel::Nullable<DataModel::DecodableList<Structs::CredentialStruct::DecodableType>>> credentials;
 
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
@@ -14781,13 +14782,13 @@ struct Type
     static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; }
     static constexpr bool kIsFabricScoped = false;
 
-    DlLockOperationType lockOperationType = static_cast<DlLockOperationType>(0);
-    DlOperationSource operationSource     = static_cast<DlOperationSource>(0);
-    DlOperationError operationError       = static_cast<DlOperationError>(0);
+    LockOperationTypeEnum lockOperationType = static_cast<LockOperationTypeEnum>(0);
+    OperationSourceEnum operationSource     = static_cast<OperationSourceEnum>(0);
+    OperationErrorEnum operationError       = static_cast<OperationErrorEnum>(0);
     DataModel::Nullable<uint16_t> userIndex;
     DataModel::Nullable<chip::FabricIndex> fabricIndex;
     DataModel::Nullable<chip::NodeId> sourceNode;
-    Optional<DataModel::Nullable<DataModel::List<const Structs::DlCredential::Type>>> credentials;
+    Optional<DataModel::Nullable<DataModel::List<const Structs::CredentialStruct::Type>>> credentials;
 
     CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
 };
@@ -14799,13 +14800,13 @@ struct DecodableType
     static constexpr EventId GetEventId() { return Events::LockOperationError::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; }
 
-    DlLockOperationType lockOperationType = static_cast<DlLockOperationType>(0);
-    DlOperationSource operationSource     = static_cast<DlOperationSource>(0);
-    DlOperationError operationError       = static_cast<DlOperationError>(0);
+    LockOperationTypeEnum lockOperationType = static_cast<LockOperationTypeEnum>(0);
+    OperationSourceEnum operationSource     = static_cast<OperationSourceEnum>(0);
+    OperationErrorEnum operationError       = static_cast<OperationErrorEnum>(0);
     DataModel::Nullable<uint16_t> userIndex;
     DataModel::Nullable<chip::FabricIndex> fabricIndex;
     DataModel::Nullable<chip::NodeId> sourceNode;
-    Optional<DataModel::Nullable<DataModel::DecodableList<Structs::DlCredential::DecodableType>>> credentials;
+    Optional<DataModel::Nullable<DataModel::DecodableList<Structs::CredentialStruct::DecodableType>>> credentials;
 
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
@@ -14832,9 +14833,9 @@ struct Type
     static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; }
     static constexpr bool kIsFabricScoped = false;
 
-    DlLockDataType lockDataType           = static_cast<DlLockDataType>(0);
-    DlDataOperationType dataOperationType = static_cast<DlDataOperationType>(0);
-    DlOperationSource operationSource     = static_cast<DlOperationSource>(0);
+    LockDataTypeEnum lockDataType           = static_cast<LockDataTypeEnum>(0);
+    DataOperationTypeEnum dataOperationType = static_cast<DataOperationTypeEnum>(0);
+    OperationSourceEnum operationSource     = static_cast<OperationSourceEnum>(0);
     DataModel::Nullable<uint16_t> userIndex;
     DataModel::Nullable<chip::FabricIndex> fabricIndex;
     DataModel::Nullable<chip::NodeId> sourceNode;
@@ -14850,9 +14851,9 @@ struct DecodableType
     static constexpr EventId GetEventId() { return Events::LockUserChange::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::DoorLock::Id; }
 
-    DlLockDataType lockDataType           = static_cast<DlLockDataType>(0);
-    DlDataOperationType dataOperationType = static_cast<DlDataOperationType>(0);
-    DlOperationSource operationSource     = static_cast<DlOperationSource>(0);
+    LockDataTypeEnum lockDataType           = static_cast<LockDataTypeEnum>(0);
+    DataOperationTypeEnum dataOperationType = static_cast<DataOperationTypeEnum>(0);
+    OperationSourceEnum operationSource     = static_cast<OperationSourceEnum>(0);
     DataModel::Nullable<uint16_t> userIndex;
     DataModel::Nullable<chip::FabricIndex> fabricIndex;
     DataModel::Nullable<chip::NodeId> sourceNode;
@@ -18306,10 +18307,10 @@ struct DecodableType
 namespace MoveToColorTemperature {
 enum class Fields
 {
-    kColorTemperature = 0,
-    kTransitionTime   = 1,
-    kOptionsMask      = 2,
-    kOptionsOverride  = 3,
+    kColorTemperatureMireds = 0,
+    kTransitionTime         = 1,
+    kOptionsMask            = 2,
+    kOptionsOverride        = 3,
 };
 
 struct Type
@@ -18319,10 +18320,10 @@ struct Type
     static constexpr CommandId GetCommandId() { return Commands::MoveToColorTemperature::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::ColorControl::Id; }
 
-    uint16_t colorTemperature = static_cast<uint16_t>(0);
-    uint16_t transitionTime   = static_cast<uint16_t>(0);
-    uint8_t optionsMask       = static_cast<uint8_t>(0);
-    uint8_t optionsOverride   = static_cast<uint8_t>(0);
+    uint16_t colorTemperatureMireds = static_cast<uint16_t>(0);
+    uint16_t transitionTime         = static_cast<uint16_t>(0);
+    uint8_t optionsMask             = static_cast<uint8_t>(0);
+    uint8_t optionsOverride         = static_cast<uint8_t>(0);
 
     CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const;
 
@@ -18337,10 +18338,10 @@ struct DecodableType
     static constexpr CommandId GetCommandId() { return Commands::MoveToColorTemperature::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::ColorControl::Id; }
 
-    uint16_t colorTemperature = static_cast<uint16_t>(0);
-    uint16_t transitionTime   = static_cast<uint16_t>(0);
-    uint8_t optionsMask       = static_cast<uint8_t>(0);
-    uint8_t optionsOverride   = static_cast<uint8_t>(0);
+    uint16_t colorTemperatureMireds = static_cast<uint16_t>(0);
+    uint16_t transitionTime         = static_cast<uint16_t>(0);
+    uint8_t optionsMask             = static_cast<uint8_t>(0);
+    uint8_t optionsOverride         = static_cast<uint8_t>(0);
     CHIP_ERROR Decode(TLV::TLVReader & reader);
 };
 }; // namespace MoveToColorTemperature
diff --git a/zzz_generated/app-common/app-common/zap-generated/command-id.h b/zzz_generated/app-common/app-common/zap-generated/command-id.h
deleted file mode 100644
index 7caa52c0d19bdb..00000000000000
--- a/zzz_generated/app-common/app-common/zap-generated/command-id.h
+++ /dev/null
@@ -1,363 +0,0 @@
-/*
- *
- *    Copyright (c) 2022 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
-
-// Prevent multiple inclusion
-#pragma once
-
-// Global, non-cluster-specific commands
-#define ZCL_READ_ATTRIBUTES_COMMAND_ID (0x00)
-#define ZCL_READ_ATTRIBUTES_RESPONSE_COMMAND_ID (0x01)
-#define ZCL_WRITE_ATTRIBUTES_COMMAND_ID (0x02)
-#define ZCL_WRITE_ATTRIBUTES_UNDIVIDED_COMMAND_ID (0x03)
-#define ZCL_WRITE_ATTRIBUTES_RESPONSE_COMMAND_ID (0x04)
-#define ZCL_WRITE_ATTRIBUTES_NO_RESPONSE_COMMAND_ID (0x05)
-#define ZCL_DEFAULT_RESPONSE_COMMAND_ID (0x0B)
-#define ZCL_READ_ATTRIBUTES_STRUCTURED_COMMAND_ID (0x0E)
-#define ZCL_WRITE_ATTRIBUTES_STRUCTURED_COMMAND_ID (0x0F)
-#define ZCL_WRITE_ATTRIBUTES_STRUCTURED_RESPONSE_COMMAND_ID (0x10)
-
-// Commands for cluster: Identify
-#define ZCL_IDENTIFY_COMMAND_ID (0x00)
-#define ZCL_TRIGGER_EFFECT_COMMAND_ID (0x40)
-
-// Commands for cluster: Groups
-#define ZCL_ADD_GROUP_COMMAND_ID (0x00)
-#define ZCL_ADD_GROUP_RESPONSE_COMMAND_ID (0x00)
-#define ZCL_VIEW_GROUP_COMMAND_ID (0x01)
-#define ZCL_VIEW_GROUP_RESPONSE_COMMAND_ID (0x01)
-#define ZCL_GET_GROUP_MEMBERSHIP_COMMAND_ID (0x02)
-#define ZCL_GET_GROUP_MEMBERSHIP_RESPONSE_COMMAND_ID (0x02)
-#define ZCL_REMOVE_GROUP_COMMAND_ID (0x03)
-#define ZCL_REMOVE_GROUP_RESPONSE_COMMAND_ID (0x03)
-#define ZCL_REMOVE_ALL_GROUPS_COMMAND_ID (0x04)
-#define ZCL_ADD_GROUP_IF_IDENTIFYING_COMMAND_ID (0x05)
-
-// Commands for cluster: Scenes
-#define ZCL_ADD_SCENE_COMMAND_ID (0x00)
-#define ZCL_ADD_SCENE_RESPONSE_COMMAND_ID (0x00)
-#define ZCL_VIEW_SCENE_COMMAND_ID (0x01)
-#define ZCL_VIEW_SCENE_RESPONSE_COMMAND_ID (0x01)
-#define ZCL_REMOVE_SCENE_COMMAND_ID (0x02)
-#define ZCL_REMOVE_SCENE_RESPONSE_COMMAND_ID (0x02)
-#define ZCL_REMOVE_ALL_SCENES_COMMAND_ID (0x03)
-#define ZCL_REMOVE_ALL_SCENES_RESPONSE_COMMAND_ID (0x03)
-#define ZCL_STORE_SCENE_COMMAND_ID (0x04)
-#define ZCL_STORE_SCENE_RESPONSE_COMMAND_ID (0x04)
-#define ZCL_RECALL_SCENE_COMMAND_ID (0x05)
-#define ZCL_GET_SCENE_MEMBERSHIP_COMMAND_ID (0x06)
-#define ZCL_GET_SCENE_MEMBERSHIP_RESPONSE_COMMAND_ID (0x06)
-#define ZCL_ENHANCED_ADD_SCENE_COMMAND_ID (0x40)
-#define ZCL_ENHANCED_ADD_SCENE_RESPONSE_COMMAND_ID (0x40)
-#define ZCL_ENHANCED_VIEW_SCENE_COMMAND_ID (0x41)
-#define ZCL_ENHANCED_VIEW_SCENE_RESPONSE_COMMAND_ID (0x41)
-#define ZCL_COPY_SCENE_COMMAND_ID (0x42)
-#define ZCL_COPY_SCENE_RESPONSE_COMMAND_ID (0x42)
-
-// Commands for cluster: On/Off
-#define ZCL_OFF_COMMAND_ID (0x00)
-#define ZCL_ON_COMMAND_ID (0x01)
-#define ZCL_TOGGLE_COMMAND_ID (0x02)
-#define ZCL_OFF_WITH_EFFECT_COMMAND_ID (0x40)
-#define ZCL_ON_WITH_RECALL_GLOBAL_SCENE_COMMAND_ID (0x41)
-#define ZCL_ON_WITH_TIMED_OFF_COMMAND_ID (0x42)
-
-// Commands for cluster: Level Control
-#define ZCL_MOVE_TO_LEVEL_COMMAND_ID (0x00)
-#define ZCL_MOVE_COMMAND_ID (0x01)
-#define ZCL_STEP_COMMAND_ID (0x02)
-#define ZCL_STOP_COMMAND_ID (0x03)
-#define ZCL_MOVE_TO_LEVEL_WITH_ON_OFF_COMMAND_ID (0x04)
-#define ZCL_MOVE_WITH_ON_OFF_COMMAND_ID (0x05)
-#define ZCL_STEP_WITH_ON_OFF_COMMAND_ID (0x06)
-#define ZCL_STOP_WITH_ON_OFF_COMMAND_ID (0x07)
-#define ZCL_MOVE_TO_CLOSEST_FREQUENCY_COMMAND_ID (0x08)
-
-// Commands for cluster: Actions
-#define ZCL_INSTANT_ACTION_COMMAND_ID (0x00)
-#define ZCL_INSTANT_ACTION_WITH_TRANSITION_COMMAND_ID (0x01)
-#define ZCL_START_ACTION_COMMAND_ID (0x02)
-#define ZCL_START_ACTION_WITH_DURATION_COMMAND_ID (0x03)
-#define ZCL_STOP_ACTION_COMMAND_ID (0x04)
-#define ZCL_PAUSE_ACTION_COMMAND_ID (0x05)
-#define ZCL_PAUSE_ACTION_WITH_DURATION_COMMAND_ID (0x06)
-#define ZCL_RESUME_ACTION_COMMAND_ID (0x07)
-#define ZCL_ENABLE_ACTION_COMMAND_ID (0x08)
-#define ZCL_ENABLE_ACTION_WITH_DURATION_COMMAND_ID (0x09)
-#define ZCL_DISABLE_ACTION_COMMAND_ID (0x0A)
-#define ZCL_DISABLE_ACTION_WITH_DURATION_COMMAND_ID (0x0B)
-
-// Commands for cluster: Basic Information
-#define ZCL_MFG_SPECIFIC_PING_COMMAND_ID (0x00)
-
-// Commands for cluster: OTA Software Update Provider
-#define ZCL_QUERY_IMAGE_COMMAND_ID (0x00)
-#define ZCL_QUERY_IMAGE_RESPONSE_COMMAND_ID (0x01)
-#define ZCL_APPLY_UPDATE_REQUEST_COMMAND_ID (0x02)
-#define ZCL_APPLY_UPDATE_RESPONSE_COMMAND_ID (0x03)
-#define ZCL_NOTIFY_UPDATE_APPLIED_COMMAND_ID (0x04)
-
-// Commands for cluster: OTA Software Update Requestor
-#define ZCL_ANNOUNCE_OTA_PROVIDER_COMMAND_ID (0x00)
-
-// Commands for cluster: General Commissioning
-#define ZCL_ARM_FAIL_SAFE_COMMAND_ID (0x00)
-#define ZCL_ARM_FAIL_SAFE_RESPONSE_COMMAND_ID (0x01)
-#define ZCL_SET_REGULATORY_CONFIG_COMMAND_ID (0x02)
-#define ZCL_SET_REGULATORY_CONFIG_RESPONSE_COMMAND_ID (0x03)
-#define ZCL_COMMISSIONING_COMPLETE_COMMAND_ID (0x04)
-#define ZCL_COMMISSIONING_COMPLETE_RESPONSE_COMMAND_ID (0x05)
-
-// Commands for cluster: Network Commissioning
-#define ZCL_SCAN_NETWORKS_COMMAND_ID (0x00)
-#define ZCL_SCAN_NETWORKS_RESPONSE_COMMAND_ID (0x01)
-#define ZCL_ADD_OR_UPDATE_WI_FI_NETWORK_COMMAND_ID (0x02)
-#define ZCL_ADD_OR_UPDATE_THREAD_NETWORK_COMMAND_ID (0x03)
-#define ZCL_REMOVE_NETWORK_COMMAND_ID (0x04)
-#define ZCL_NETWORK_CONFIG_RESPONSE_COMMAND_ID (0x05)
-#define ZCL_CONNECT_NETWORK_COMMAND_ID (0x06)
-#define ZCL_CONNECT_NETWORK_RESPONSE_COMMAND_ID (0x07)
-#define ZCL_REORDER_NETWORK_COMMAND_ID (0x08)
-
-// Commands for cluster: Diagnostic Logs
-#define ZCL_RETRIEVE_LOGS_REQUEST_COMMAND_ID (0x00)
-#define ZCL_RETRIEVE_LOGS_RESPONSE_COMMAND_ID (0x01)
-
-// Commands for cluster: General Diagnostics
-#define ZCL_TEST_EVENT_TRIGGER_COMMAND_ID (0x00)
-
-// Commands for cluster: Software Diagnostics
-#define ZCL_RESET_WATERMARKS_COMMAND_ID (0x00)
-
-// Commands for cluster: Thread Network Diagnostics
-#define ZCL_RESET_COUNTS_COMMAND_ID (0x00)
-
-// Commands for cluster: WiFi Network Diagnostics
-#define ZCL_RESET_COUNTS_COMMAND_ID (0x00)
-
-// Commands for cluster: Ethernet Network Diagnostics
-#define ZCL_RESET_COUNTS_COMMAND_ID (0x00)
-
-// Commands for cluster: Time Synchronization
-#define ZCL_SET_UTC_TIME_COMMAND_ID (0x00)
-
-// Commands for cluster: AdministratorCommissioning
-#define ZCL_OPEN_COMMISSIONING_WINDOW_COMMAND_ID (0x00)
-#define ZCL_OPEN_BASIC_COMMISSIONING_WINDOW_COMMAND_ID (0x01)
-#define ZCL_REVOKE_COMMISSIONING_COMMAND_ID (0x02)
-
-// Commands for cluster: Operational Credentials
-#define ZCL_ATTESTATION_REQUEST_COMMAND_ID (0x00)
-#define ZCL_ATTESTATION_RESPONSE_COMMAND_ID (0x01)
-#define ZCL_CERTIFICATE_CHAIN_REQUEST_COMMAND_ID (0x02)
-#define ZCL_CERTIFICATE_CHAIN_RESPONSE_COMMAND_ID (0x03)
-#define ZCL_CSR_REQUEST_COMMAND_ID (0x04)
-#define ZCL_CSR_RESPONSE_COMMAND_ID (0x05)
-#define ZCL_ADD_NOC_COMMAND_ID (0x06)
-#define ZCL_UPDATE_NOC_COMMAND_ID (0x07)
-#define ZCL_NOC_RESPONSE_COMMAND_ID (0x08)
-#define ZCL_UPDATE_FABRIC_LABEL_COMMAND_ID (0x09)
-#define ZCL_REMOVE_FABRIC_COMMAND_ID (0x0A)
-#define ZCL_ADD_TRUSTED_ROOT_CERTIFICATE_COMMAND_ID (0x0B)
-
-// Commands for cluster: Group Key Management
-#define ZCL_KEY_SET_WRITE_COMMAND_ID (0x00)
-#define ZCL_KEY_SET_READ_COMMAND_ID (0x01)
-#define ZCL_KEY_SET_READ_RESPONSE_COMMAND_ID (0x02)
-#define ZCL_KEY_SET_REMOVE_COMMAND_ID (0x03)
-#define ZCL_KEY_SET_READ_ALL_INDICES_COMMAND_ID (0x04)
-#define ZCL_KEY_SET_READ_ALL_INDICES_RESPONSE_COMMAND_ID (0x05)
-
-// Commands for cluster: Mode Select
-#define ZCL_CHANGE_TO_MODE_COMMAND_ID (0x00)
-
-// Commands for cluster: Door Lock
-#define ZCL_LOCK_DOOR_COMMAND_ID (0x00)
-#define ZCL_UNLOCK_DOOR_COMMAND_ID (0x01)
-#define ZCL_UNLOCK_WITH_TIMEOUT_COMMAND_ID (0x03)
-#define ZCL_SET_WEEK_DAY_SCHEDULE_COMMAND_ID (0x0B)
-#define ZCL_GET_WEEK_DAY_SCHEDULE_COMMAND_ID (0x0C)
-#define ZCL_GET_WEEK_DAY_SCHEDULE_RESPONSE_COMMAND_ID (0x0C)
-#define ZCL_CLEAR_WEEK_DAY_SCHEDULE_COMMAND_ID (0x0D)
-#define ZCL_SET_YEAR_DAY_SCHEDULE_COMMAND_ID (0x0E)
-#define ZCL_GET_YEAR_DAY_SCHEDULE_COMMAND_ID (0x0F)
-#define ZCL_GET_YEAR_DAY_SCHEDULE_RESPONSE_COMMAND_ID (0x0F)
-#define ZCL_CLEAR_YEAR_DAY_SCHEDULE_COMMAND_ID (0x10)
-#define ZCL_SET_HOLIDAY_SCHEDULE_COMMAND_ID (0x11)
-#define ZCL_GET_HOLIDAY_SCHEDULE_COMMAND_ID (0x12)
-#define ZCL_GET_HOLIDAY_SCHEDULE_RESPONSE_COMMAND_ID (0x12)
-#define ZCL_CLEAR_HOLIDAY_SCHEDULE_COMMAND_ID (0x13)
-#define ZCL_SET_USER_COMMAND_ID (0x1A)
-#define ZCL_GET_USER_COMMAND_ID (0x1B)
-#define ZCL_GET_USER_RESPONSE_COMMAND_ID (0x1C)
-#define ZCL_CLEAR_USER_COMMAND_ID (0x1D)
-#define ZCL_SET_CREDENTIAL_COMMAND_ID (0x22)
-#define ZCL_SET_CREDENTIAL_RESPONSE_COMMAND_ID (0x23)
-#define ZCL_GET_CREDENTIAL_STATUS_COMMAND_ID (0x24)
-#define ZCL_GET_CREDENTIAL_STATUS_RESPONSE_COMMAND_ID (0x25)
-#define ZCL_CLEAR_CREDENTIAL_COMMAND_ID (0x26)
-
-// Commands for cluster: Window Covering
-#define ZCL_UP_OR_OPEN_COMMAND_ID (0x00)
-#define ZCL_DOWN_OR_CLOSE_COMMAND_ID (0x01)
-#define ZCL_STOP_MOTION_COMMAND_ID (0x02)
-#define ZCL_GO_TO_LIFT_VALUE_COMMAND_ID (0x04)
-#define ZCL_GO_TO_LIFT_PERCENTAGE_COMMAND_ID (0x05)
-#define ZCL_GO_TO_TILT_VALUE_COMMAND_ID (0x07)
-#define ZCL_GO_TO_TILT_PERCENTAGE_COMMAND_ID (0x08)
-
-// Commands for cluster: Barrier Control
-#define ZCL_BARRIER_CONTROL_GO_TO_PERCENT_COMMAND_ID (0x00)
-#define ZCL_BARRIER_CONTROL_STOP_COMMAND_ID (0x01)
-
-// Commands for cluster: Thermostat
-#define ZCL_SETPOINT_RAISE_LOWER_COMMAND_ID (0x00)
-#define ZCL_GET_WEEKLY_SCHEDULE_RESPONSE_COMMAND_ID (0x00)
-#define ZCL_SET_WEEKLY_SCHEDULE_COMMAND_ID (0x01)
-#define ZCL_GET_WEEKLY_SCHEDULE_COMMAND_ID (0x02)
-#define ZCL_CLEAR_WEEKLY_SCHEDULE_COMMAND_ID (0x03)
-
-// Commands for cluster: Color Control
-#define ZCL_MOVE_TO_HUE_COMMAND_ID (0x00)
-#define ZCL_MOVE_HUE_COMMAND_ID (0x01)
-#define ZCL_STEP_HUE_COMMAND_ID (0x02)
-#define ZCL_MOVE_TO_SATURATION_COMMAND_ID (0x03)
-#define ZCL_MOVE_SATURATION_COMMAND_ID (0x04)
-#define ZCL_STEP_SATURATION_COMMAND_ID (0x05)
-#define ZCL_MOVE_TO_HUE_AND_SATURATION_COMMAND_ID (0x06)
-#define ZCL_MOVE_TO_COLOR_COMMAND_ID (0x07)
-#define ZCL_MOVE_COLOR_COMMAND_ID (0x08)
-#define ZCL_STEP_COLOR_COMMAND_ID (0x09)
-#define ZCL_MOVE_TO_COLOR_TEMPERATURE_COMMAND_ID (0x0A)
-#define ZCL_ENHANCED_MOVE_TO_HUE_COMMAND_ID (0x40)
-#define ZCL_ENHANCED_MOVE_HUE_COMMAND_ID (0x41)
-#define ZCL_ENHANCED_STEP_HUE_COMMAND_ID (0x42)
-#define ZCL_ENHANCED_MOVE_TO_HUE_AND_SATURATION_COMMAND_ID (0x43)
-#define ZCL_COLOR_LOOP_SET_COMMAND_ID (0x44)
-#define ZCL_STOP_MOVE_STEP_COMMAND_ID (0x47)
-#define ZCL_MOVE_COLOR_TEMPERATURE_COMMAND_ID (0x4B)
-#define ZCL_STEP_COLOR_TEMPERATURE_COMMAND_ID (0x4C)
-
-// Commands for cluster: Channel
-#define ZCL_CHANGE_CHANNEL_COMMAND_ID (0x00)
-#define ZCL_CHANGE_CHANNEL_RESPONSE_COMMAND_ID (0x01)
-#define ZCL_CHANGE_CHANNEL_BY_NUMBER_COMMAND_ID (0x02)
-#define ZCL_SKIP_CHANNEL_COMMAND_ID (0x03)
-
-// Commands for cluster: Target Navigator
-#define ZCL_NAVIGATE_TARGET_COMMAND_ID (0x00)
-#define ZCL_NAVIGATE_TARGET_RESPONSE_COMMAND_ID (0x01)
-
-// Commands for cluster: Media Playback
-#define ZCL_PLAY_COMMAND_ID (0x00)
-#define ZCL_PAUSE_COMMAND_ID (0x01)
-#define ZCL_STOP_PLAYBACK_COMMAND_ID (0x02)
-#define ZCL_START_OVER_COMMAND_ID (0x03)
-#define ZCL_PREVIOUS_COMMAND_ID (0x04)
-#define ZCL_NEXT_COMMAND_ID (0x05)
-#define ZCL_REWIND_COMMAND_ID (0x06)
-#define ZCL_FAST_FORWARD_COMMAND_ID (0x07)
-#define ZCL_SKIP_FORWARD_COMMAND_ID (0x08)
-#define ZCL_SKIP_BACKWARD_COMMAND_ID (0x09)
-#define ZCL_PLAYBACK_RESPONSE_COMMAND_ID (0x0A)
-#define ZCL_SEEK_COMMAND_ID (0x0B)
-
-// Commands for cluster: Media Input
-#define ZCL_SELECT_INPUT_COMMAND_ID (0x00)
-#define ZCL_SHOW_INPUT_STATUS_COMMAND_ID (0x01)
-#define ZCL_HIDE_INPUT_STATUS_COMMAND_ID (0x02)
-#define ZCL_RENAME_INPUT_COMMAND_ID (0x03)
-
-// Commands for cluster: Low Power
-#define ZCL_SLEEP_COMMAND_ID (0x00)
-
-// Commands for cluster: Keypad Input
-#define ZCL_SEND_KEY_COMMAND_ID (0x00)
-#define ZCL_SEND_KEY_RESPONSE_COMMAND_ID (0x01)
-
-// Commands for cluster: Content Launcher
-#define ZCL_LAUNCH_CONTENT_COMMAND_ID (0x00)
-#define ZCL_LAUNCH_URL_COMMAND_ID (0x01)
-#define ZCL_LAUNCH_RESPONSE_COMMAND_ID (0x02)
-
-// Commands for cluster: Audio Output
-#define ZCL_SELECT_OUTPUT_COMMAND_ID (0x00)
-#define ZCL_RENAME_OUTPUT_COMMAND_ID (0x01)
-
-// Commands for cluster: Application Launcher
-#define ZCL_LAUNCH_APP_COMMAND_ID (0x00)
-#define ZCL_STOP_APP_COMMAND_ID (0x01)
-#define ZCL_HIDE_APP_COMMAND_ID (0x02)
-#define ZCL_LAUNCHER_RESPONSE_COMMAND_ID (0x03)
-
-// Commands for cluster: Account Login
-#define ZCL_GET_SETUP_PIN_COMMAND_ID (0x00)
-#define ZCL_GET_SETUP_PIN_RESPONSE_COMMAND_ID (0x01)
-#define ZCL_LOGIN_COMMAND_ID (0x02)
-#define ZCL_LOGOUT_COMMAND_ID (0x03)
-
-// Commands for cluster: Electrical Measurement
-#define ZCL_GET_PROFILE_INFO_RESPONSE_COMMAND_COMMAND_ID (0x00)
-#define ZCL_GET_PROFILE_INFO_COMMAND_COMMAND_ID (0x00)
-#define ZCL_GET_MEASUREMENT_PROFILE_RESPONSE_COMMAND_COMMAND_ID (0x01)
-#define ZCL_GET_MEASUREMENT_PROFILE_COMMAND_COMMAND_ID (0x01)
-
-// Commands for cluster: Client Monitoring
-#define ZCL_REGISTER_CLIENT_MONITORING_COMMAND_ID (0x00)
-#define ZCL_UNREGISTER_CLIENT_MONITORING_COMMAND_ID (0x01)
-#define ZCL_STAY_AWAKE_REQUEST_COMMAND_ID (0x02)
-
-// Commands for cluster: Unit Testing
-#define ZCL_TEST_COMMAND_ID (0x00)
-#define ZCL_TEST_SPECIFIC_RESPONSE_COMMAND_ID (0x00)
-#define ZCL_TEST_NOT_HANDLED_COMMAND_ID (0x01)
-#define ZCL_TEST_ADD_ARGUMENTS_RESPONSE_COMMAND_ID (0x01)
-#define ZCL_TEST_SPECIFIC_COMMAND_ID (0x02)
-#define ZCL_TEST_SIMPLE_ARGUMENT_RESPONSE_COMMAND_ID (0x02)
-#define ZCL_TEST_UNKNOWN_COMMAND_COMMAND_ID (0x03)
-#define ZCL_TEST_STRUCT_ARRAY_ARGUMENT_RESPONSE_COMMAND_ID (0x03)
-#define ZCL_TEST_ADD_ARGUMENTS_COMMAND_ID (0x04)
-#define ZCL_TEST_LIST_INT8_U_REVERSE_RESPONSE_COMMAND_ID (0x04)
-#define ZCL_TEST_SIMPLE_ARGUMENT_REQUEST_COMMAND_ID (0x05)
-#define ZCL_TEST_ENUMS_RESPONSE_COMMAND_ID (0x05)
-#define ZCL_TEST_STRUCT_ARRAY_ARGUMENT_REQUEST_COMMAND_ID (0x06)
-#define ZCL_TEST_NULLABLE_OPTIONAL_RESPONSE_COMMAND_ID (0x06)
-#define ZCL_TEST_STRUCT_ARGUMENT_REQUEST_COMMAND_ID (0x07)
-#define ZCL_TEST_COMPLEX_NULLABLE_OPTIONAL_RESPONSE_COMMAND_ID (0x07)
-#define ZCL_TEST_NESTED_STRUCT_ARGUMENT_REQUEST_COMMAND_ID (0x08)
-#define ZCL_BOOLEAN_RESPONSE_COMMAND_ID (0x08)
-#define ZCL_TEST_LIST_STRUCT_ARGUMENT_REQUEST_COMMAND_ID (0x09)
-#define ZCL_SIMPLE_STRUCT_RESPONSE_COMMAND_ID (0x09)
-#define ZCL_TEST_LIST_INT8_U_ARGUMENT_REQUEST_COMMAND_ID (0x0A)
-#define ZCL_TEST_EMIT_TEST_EVENT_RESPONSE_COMMAND_ID (0x0A)
-#define ZCL_TEST_NESTED_STRUCT_LIST_ARGUMENT_REQUEST_COMMAND_ID (0x0B)
-#define ZCL_TEST_EMIT_TEST_FABRIC_SCOPED_EVENT_RESPONSE_COMMAND_ID (0x0B)
-#define ZCL_TEST_LIST_NESTED_STRUCT_LIST_ARGUMENT_REQUEST_COMMAND_ID (0x0C)
-#define ZCL_TEST_LIST_INT8_U_REVERSE_REQUEST_COMMAND_ID (0x0D)
-#define ZCL_TEST_ENUMS_REQUEST_COMMAND_ID (0x0E)
-#define ZCL_TEST_NULLABLE_OPTIONAL_REQUEST_COMMAND_ID (0x0F)
-#define ZCL_TEST_COMPLEX_NULLABLE_OPTIONAL_REQUEST_COMMAND_ID (0x10)
-#define ZCL_SIMPLE_STRUCT_ECHO_REQUEST_COMMAND_ID (0x11)
-#define ZCL_TIMED_INVOKE_REQUEST_COMMAND_ID (0x12)
-#define ZCL_TEST_SIMPLE_OPTIONAL_ARGUMENT_REQUEST_COMMAND_ID (0x13)
-#define ZCL_TEST_EMIT_TEST_EVENT_REQUEST_COMMAND_ID (0x14)
-#define ZCL_TEST_EMIT_TEST_FABRIC_SCOPED_EVENT_REQUEST_COMMAND_ID (0x15)
-
-// Commands for cluster: Fault Injection
-#define ZCL_FAIL_AT_FAULT_COMMAND_ID (0x00)
-#define ZCL_FAIL_RANDOMLY_AT_FAULT_COMMAND_ID (0x01)
diff --git a/zzz_generated/app-common/app-common/zap-generated/enums.h b/zzz_generated/app-common/app-common/zap-generated/enums.h
index fe568a150e46ce..36dc14164bf444 100644
--- a/zzz_generated/app-common/app-common/zap-generated/enums.h
+++ b/zzz_generated/app-common/app-common/zap-generated/enums.h
@@ -90,20 +90,20 @@ enum EmberAfEnhancedColorMode : uint8_t
     EMBER_ZCL_ENHANCED_COLOR_MODE_ENHANCED_CURRENT_HUE_AND_CURRENT_SATURATION = 3,
 };
 
-// Enum for HardwareFault
-enum EmberAfHardwareFault : uint8_t
-{
-    EMBER_ZCL_HARDWARE_FAULT_UNSPECIFIED               = 0,
-    EMBER_ZCL_HARDWARE_FAULT_RADIO                     = 1,
-    EMBER_ZCL_HARDWARE_FAULT_SENSOR                    = 2,
-    EMBER_ZCL_HARDWARE_FAULT_RESETTABLE_OVER_TEMP      = 3,
-    EMBER_ZCL_HARDWARE_FAULT_NON_RESETTABLE_OVER_TEMP  = 4,
-    EMBER_ZCL_HARDWARE_FAULT_POWER_SOURCE              = 5,
-    EMBER_ZCL_HARDWARE_FAULT_VISUAL_DISPLAY_FAULT      = 6,
-    EMBER_ZCL_HARDWARE_FAULT_AUDIO_OUTPUT_FAULT        = 7,
-    EMBER_ZCL_HARDWARE_FAULT_USER_INTERFACE_FAULT      = 8,
-    EMBER_ZCL_HARDWARE_FAULT_NON_VOLATILE_MEMORY_ERROR = 9,
-    EMBER_ZCL_HARDWARE_FAULT_TAMPER_DETECTED           = 10,
+// Enum for HardwareFaultEnum
+enum EmberAfHardwareFaultEnum : uint8_t
+{
+    EMBER_ZCL_HARDWARE_FAULT_ENUM_UNSPECIFIED               = 0,
+    EMBER_ZCL_HARDWARE_FAULT_ENUM_RADIO                     = 1,
+    EMBER_ZCL_HARDWARE_FAULT_ENUM_SENSOR                    = 2,
+    EMBER_ZCL_HARDWARE_FAULT_ENUM_RESETTABLE_OVER_TEMP      = 3,
+    EMBER_ZCL_HARDWARE_FAULT_ENUM_NON_RESETTABLE_OVER_TEMP  = 4,
+    EMBER_ZCL_HARDWARE_FAULT_ENUM_POWER_SOURCE              = 5,
+    EMBER_ZCL_HARDWARE_FAULT_ENUM_VISUAL_DISPLAY_FAULT      = 6,
+    EMBER_ZCL_HARDWARE_FAULT_ENUM_AUDIO_OUTPUT_FAULT        = 7,
+    EMBER_ZCL_HARDWARE_FAULT_ENUM_USER_INTERFACE_FAULT      = 8,
+    EMBER_ZCL_HARDWARE_FAULT_ENUM_NON_VOLATILE_MEMORY_ERROR = 9,
+    EMBER_ZCL_HARDWARE_FAULT_ENUM_TAMPER_DETECTED           = 10,
 };
 
 // Enum for HueDirection
@@ -158,14 +158,14 @@ enum EmberAfIdentifyIdentifyType : uint8_t
     EMBER_ZCL_IDENTIFY_IDENTIFY_TYPE_ACTUATOR      = 5,
 };
 
-// Enum for InterfaceType
-enum EmberAfInterfaceType : uint8_t
+// Enum for InterfaceTypeEnum
+enum EmberAfInterfaceTypeEnum : uint8_t
 {
-    EMBER_ZCL_INTERFACE_TYPE_UNSPECIFIED = 0,
-    EMBER_ZCL_INTERFACE_TYPE_WI_FI       = 1,
-    EMBER_ZCL_INTERFACE_TYPE_ETHERNET    = 2,
-    EMBER_ZCL_INTERFACE_TYPE_CELLULAR    = 3,
-    EMBER_ZCL_INTERFACE_TYPE_THREAD      = 4,
+    EMBER_ZCL_INTERFACE_TYPE_ENUM_UNSPECIFIED = 0,
+    EMBER_ZCL_INTERFACE_TYPE_ENUM_WI_FI       = 1,
+    EMBER_ZCL_INTERFACE_TYPE_ENUM_ETHERNET    = 2,
+    EMBER_ZCL_INTERFACE_TYPE_ENUM_CELLULAR    = 3,
+    EMBER_ZCL_INTERFACE_TYPE_ENUM_THREAD      = 4,
 };
 
 // Enum for KeypadLockout
@@ -186,13 +186,13 @@ enum EmberAfMoveMode : uint8_t
     EMBER_ZCL_MOVE_MODE_DOWN = 1,
 };
 
-// Enum for NetworkFaultType
-enum EmberAfNetworkFaultType : uint8_t
+// Enum for NetworkFaultEnum
+enum EmberAfNetworkFaultEnum : uint8_t
 {
-    EMBER_ZCL_NETWORK_FAULT_TYPE_UNSPECIFIED       = 0,
-    EMBER_ZCL_NETWORK_FAULT_TYPE_HARDWARE_FAILURE  = 1,
-    EMBER_ZCL_NETWORK_FAULT_TYPE_NETWORK_JAMMED    = 2,
-    EMBER_ZCL_NETWORK_FAULT_TYPE_CONNECTION_FAILED = 3,
+    EMBER_ZCL_NETWORK_FAULT_ENUM_UNSPECIFIED       = 0,
+    EMBER_ZCL_NETWORK_FAULT_ENUM_HARDWARE_FAILURE  = 1,
+    EMBER_ZCL_NETWORK_FAULT_ENUM_NETWORK_JAMMED    = 2,
+    EMBER_ZCL_NETWORK_FAULT_ENUM_CONNECTION_FAILED = 3,
 };
 
 // Enum for OnOffDelayedAllOffEffectVariant
@@ -216,31 +216,31 @@ enum EmberAfOnOffEffectIdentifier : uint8_t
     EMBER_ZCL_ON_OFF_EFFECT_IDENTIFIER_DYING_LIGHT     = 1,
 };
 
-// Enum for PHYRate
-enum EmberAfPHYRate : uint8_t
+// Enum for PHYRateEnum
+enum EmberAfPHYRateEnum : uint8_t
 {
-    EMBER_ZCL_PHY_RATE_RATE10_M  = 0,
-    EMBER_ZCL_PHY_RATE_RATE100_M = 1,
-    EMBER_ZCL_PHY_RATE_RATE1_G   = 2,
-    EMBER_ZCL_PHY_RATE_RATE2_5_G = 3,
-    EMBER_ZCL_PHY_RATE_RATE5_G   = 4,
-    EMBER_ZCL_PHY_RATE_RATE10_G  = 5,
-    EMBER_ZCL_PHY_RATE_RATE40_G  = 6,
-    EMBER_ZCL_PHY_RATE_RATE100_G = 7,
-    EMBER_ZCL_PHY_RATE_RATE200_G = 8,
-    EMBER_ZCL_PHY_RATE_RATE400_G = 9,
+    EMBER_ZCL_PHY_RATE_ENUM_RATE10_M  = 0,
+    EMBER_ZCL_PHY_RATE_ENUM_RATE100_M = 1,
+    EMBER_ZCL_PHY_RATE_ENUM_RATE1_G   = 2,
+    EMBER_ZCL_PHY_RATE_ENUM_RATE2_5_G = 3,
+    EMBER_ZCL_PHY_RATE_ENUM_RATE5_G   = 4,
+    EMBER_ZCL_PHY_RATE_ENUM_RATE10_G  = 5,
+    EMBER_ZCL_PHY_RATE_ENUM_RATE40_G  = 6,
+    EMBER_ZCL_PHY_RATE_ENUM_RATE100_G = 7,
+    EMBER_ZCL_PHY_RATE_ENUM_RATE200_G = 8,
+    EMBER_ZCL_PHY_RATE_ENUM_RATE400_G = 9,
 };
 
-// Enum for RadioFault
-enum EmberAfRadioFault : uint8_t
+// Enum for RadioFaultEnum
+enum EmberAfRadioFaultEnum : uint8_t
 {
-    EMBER_ZCL_RADIO_FAULT_UNSPECIFIED    = 0,
-    EMBER_ZCL_RADIO_FAULT_WI_FI_FAULT    = 1,
-    EMBER_ZCL_RADIO_FAULT_CELLULAR_FAULT = 2,
-    EMBER_ZCL_RADIO_FAULT_THREAD_FAULT   = 3,
-    EMBER_ZCL_RADIO_FAULT_NFC_FAULT      = 4,
-    EMBER_ZCL_RADIO_FAULT_BLE_FAULT      = 5,
-    EMBER_ZCL_RADIO_FAULT_ETHERNET_FAULT = 6,
+    EMBER_ZCL_RADIO_FAULT_ENUM_UNSPECIFIED    = 0,
+    EMBER_ZCL_RADIO_FAULT_ENUM_WI_FI_FAULT    = 1,
+    EMBER_ZCL_RADIO_FAULT_ENUM_CELLULAR_FAULT = 2,
+    EMBER_ZCL_RADIO_FAULT_ENUM_THREAD_FAULT   = 3,
+    EMBER_ZCL_RADIO_FAULT_ENUM_NFC_FAULT      = 4,
+    EMBER_ZCL_RADIO_FAULT_ENUM_BLE_FAULT      = 5,
+    EMBER_ZCL_RADIO_FAULT_ENUM_ETHERNET_FAULT = 6,
 };
 
 // Enum for RoutingRole
@@ -476,6 +476,20 @@ enum EmberAfWiFiVersionType : uint8_t
 #define EMBER_AF_DAY_OF_WEEK_SATURDAY_OFFSET (6)
 #define EMBER_AF_DAY_OF_WEEK_AWAY_OR_VACATION (128)
 #define EMBER_AF_DAY_OF_WEEK_AWAY_OR_VACATION_OFFSET (7)
+#define EMBER_AF_DAYS_MASK_MAP_SUNDAY (1)
+#define EMBER_AF_DAYS_MASK_MAP_SUNDAY_OFFSET (0)
+#define EMBER_AF_DAYS_MASK_MAP_MONDAY (2)
+#define EMBER_AF_DAYS_MASK_MAP_MONDAY_OFFSET (1)
+#define EMBER_AF_DAYS_MASK_MAP_TUESDAY (4)
+#define EMBER_AF_DAYS_MASK_MAP_TUESDAY_OFFSET (2)
+#define EMBER_AF_DAYS_MASK_MAP_WEDNESDAY (8)
+#define EMBER_AF_DAYS_MASK_MAP_WEDNESDAY_OFFSET (3)
+#define EMBER_AF_DAYS_MASK_MAP_THURSDAY (16)
+#define EMBER_AF_DAYS_MASK_MAP_THURSDAY_OFFSET (4)
+#define EMBER_AF_DAYS_MASK_MAP_FRIDAY (32)
+#define EMBER_AF_DAYS_MASK_MAP_FRIDAY_OFFSET (5)
+#define EMBER_AF_DAYS_MASK_MAP_SATURDAY (64)
+#define EMBER_AF_DAYS_MASK_MAP_SATURDAY_OFFSET (6)
 #define EMBER_AF_DEVICE_TEMP_ALARM_MASK_TOO_LOW (1)
 #define EMBER_AF_DEVICE_TEMP_ALARM_MASK_TOO_LOW_OFFSET (0)
 #define EMBER_AF_DEVICE_TEMP_ALARM_MASK_TOO_HIGH (2)
@@ -492,20 +506,6 @@ enum EmberAfWiFiVersionType : uint8_t
 #define EMBER_AF_DL_CREDENTIAL_RULES_SUPPORT_DUAL_OFFSET (1)
 #define EMBER_AF_DL_CREDENTIAL_RULES_SUPPORT_TRI (4)
 #define EMBER_AF_DL_CREDENTIAL_RULES_SUPPORT_TRI_OFFSET (2)
-#define EMBER_AF_DL_DAYS_MASK_MAP_SUNDAY (1)
-#define EMBER_AF_DL_DAYS_MASK_MAP_SUNDAY_OFFSET (0)
-#define EMBER_AF_DL_DAYS_MASK_MAP_MONDAY (2)
-#define EMBER_AF_DL_DAYS_MASK_MAP_MONDAY_OFFSET (1)
-#define EMBER_AF_DL_DAYS_MASK_MAP_TUESDAY (4)
-#define EMBER_AF_DL_DAYS_MASK_MAP_TUESDAY_OFFSET (2)
-#define EMBER_AF_DL_DAYS_MASK_MAP_WEDNESDAY (8)
-#define EMBER_AF_DL_DAYS_MASK_MAP_WEDNESDAY_OFFSET (3)
-#define EMBER_AF_DL_DAYS_MASK_MAP_THURSDAY (16)
-#define EMBER_AF_DL_DAYS_MASK_MAP_THURSDAY_OFFSET (4)
-#define EMBER_AF_DL_DAYS_MASK_MAP_FRIDAY (32)
-#define EMBER_AF_DL_DAYS_MASK_MAP_FRIDAY_OFFSET (5)
-#define EMBER_AF_DL_DAYS_MASK_MAP_SATURDAY (64)
-#define EMBER_AF_DL_DAYS_MASK_MAP_SATURDAY_OFFSET (6)
 #define EMBER_AF_DL_DEFAULT_CONFIGURATION_REGISTER_ENABLE_LOCAL_PROGRAMMING_ENABLED (1)
 #define EMBER_AF_DL_DEFAULT_CONFIGURATION_REGISTER_ENABLE_LOCAL_PROGRAMMING_ENABLED_OFFSET (0)
 #define EMBER_AF_DL_DEFAULT_CONFIGURATION_REGISTER_KEYPAD_INTERFACE_DEFAULT_ACCESS_ENABLED (2)
@@ -646,28 +646,28 @@ enum EmberAfWiFiVersionType : uint8_t
 #define EMBER_AF_DOOR_LOCK_DAY_OF_WEEK_FRIDAY_OFFSET (5)
 #define EMBER_AF_DOOR_LOCK_DAY_OF_WEEK_SATURDAY (64)
 #define EMBER_AF_DOOR_LOCK_DAY_OF_WEEK_SATURDAY_OFFSET (6)
-#define EMBER_AF_DOOR_LOCK_FEATURE_PIN_CREDENTIALS (1)
-#define EMBER_AF_DOOR_LOCK_FEATURE_PIN_CREDENTIALS_OFFSET (0)
-#define EMBER_AF_DOOR_LOCK_FEATURE_RFID_CREDENTIALS (2)
-#define EMBER_AF_DOOR_LOCK_FEATURE_RFID_CREDENTIALS_OFFSET (1)
+#define EMBER_AF_DOOR_LOCK_FEATURE_PIN_CREDENTIAL (1)
+#define EMBER_AF_DOOR_LOCK_FEATURE_PIN_CREDENTIAL_OFFSET (0)
+#define EMBER_AF_DOOR_LOCK_FEATURE_RFID_CREDENTIAL (2)
+#define EMBER_AF_DOOR_LOCK_FEATURE_RFID_CREDENTIAL_OFFSET (1)
 #define EMBER_AF_DOOR_LOCK_FEATURE_FINGER_CREDENTIALS (4)
 #define EMBER_AF_DOOR_LOCK_FEATURE_FINGER_CREDENTIALS_OFFSET (2)
 #define EMBER_AF_DOOR_LOCK_FEATURE_LOGGING (8)
 #define EMBER_AF_DOOR_LOCK_FEATURE_LOGGING_OFFSET (3)
-#define EMBER_AF_DOOR_LOCK_FEATURE_WEEK_DAY_SCHEDULES (16)
-#define EMBER_AF_DOOR_LOCK_FEATURE_WEEK_DAY_SCHEDULES_OFFSET (4)
+#define EMBER_AF_DOOR_LOCK_FEATURE_WEEK_DAY_ACCESS_SCHEDULES (16)
+#define EMBER_AF_DOOR_LOCK_FEATURE_WEEK_DAY_ACCESS_SCHEDULES_OFFSET (4)
 #define EMBER_AF_DOOR_LOCK_FEATURE_DOOR_POSITION_SENSOR (32)
 #define EMBER_AF_DOOR_LOCK_FEATURE_DOOR_POSITION_SENSOR_OFFSET (5)
 #define EMBER_AF_DOOR_LOCK_FEATURE_FACE_CREDENTIALS (64)
 #define EMBER_AF_DOOR_LOCK_FEATURE_FACE_CREDENTIALS_OFFSET (6)
-#define EMBER_AF_DOOR_LOCK_FEATURE_CREDENTIALS_OTA (128)
-#define EMBER_AF_DOOR_LOCK_FEATURE_CREDENTIALS_OTA_OFFSET (7)
-#define EMBER_AF_DOOR_LOCK_FEATURE_USERS_MANAGEMENT (256)
-#define EMBER_AF_DOOR_LOCK_FEATURE_USERS_MANAGEMENT_OFFSET (8)
-#define EMBER_AF_DOOR_LOCK_FEATURE_NOTIFICATIONS (512)
-#define EMBER_AF_DOOR_LOCK_FEATURE_NOTIFICATIONS_OFFSET (9)
-#define EMBER_AF_DOOR_LOCK_FEATURE_YEAR_DAY_SCHEDULES (1024)
-#define EMBER_AF_DOOR_LOCK_FEATURE_YEAR_DAY_SCHEDULES_OFFSET (10)
+#define EMBER_AF_DOOR_LOCK_FEATURE_CREDENTIALS_OVER_THE_AIR_ACCESS (128)
+#define EMBER_AF_DOOR_LOCK_FEATURE_CREDENTIALS_OVER_THE_AIR_ACCESS_OFFSET (7)
+#define EMBER_AF_DOOR_LOCK_FEATURE_USER (256)
+#define EMBER_AF_DOOR_LOCK_FEATURE_USER_OFFSET (8)
+#define EMBER_AF_DOOR_LOCK_FEATURE_NOTIFICATION (512)
+#define EMBER_AF_DOOR_LOCK_FEATURE_NOTIFICATION_OFFSET (9)
+#define EMBER_AF_DOOR_LOCK_FEATURE_YEAR_DAY_ACCESS_SCHEDULES (1024)
+#define EMBER_AF_DOOR_LOCK_FEATURE_YEAR_DAY_ACCESS_SCHEDULES_OFFSET (10)
 #define EMBER_AF_DOOR_LOCK_FEATURE_HOLIDAY_SCHEDULES (2048)
 #define EMBER_AF_DOOR_LOCK_FEATURE_HOLIDAY_SCHEDULES_OFFSET (11)
 #define EMBER_AF_ENERGY_FORMATTING_NUMBER_OF_DIGITS_TO_THE_RIGHT_OF_THE_DECIMAL_POINT (7)
@@ -798,6 +798,20 @@ enum EmberAfWiFiVersionType : uint8_t
 #define EMBER_AF_POWER_SOURCE_FEATURE_REPLACEABLE_OFFSET (3)
 #define EMBER_AF_PRESSURE_FEATURE_EXTENDED (1)
 #define EMBER_AF_PRESSURE_FEATURE_EXTENDED_OFFSET (0)
+#define EMBER_AF_PUMP_FEATURE_CONSTANT_PRESSURE (1)
+#define EMBER_AF_PUMP_FEATURE_CONSTANT_PRESSURE_OFFSET (0)
+#define EMBER_AF_PUMP_FEATURE_COMPENSATED_PRESSURE (2)
+#define EMBER_AF_PUMP_FEATURE_COMPENSATED_PRESSURE_OFFSET (1)
+#define EMBER_AF_PUMP_FEATURE_CONSTANT_FLOW (4)
+#define EMBER_AF_PUMP_FEATURE_CONSTANT_FLOW_OFFSET (2)
+#define EMBER_AF_PUMP_FEATURE_CONSTANT_SPEED (8)
+#define EMBER_AF_PUMP_FEATURE_CONSTANT_SPEED_OFFSET (3)
+#define EMBER_AF_PUMP_FEATURE_CONSTANT_TEMPERATURE (16)
+#define EMBER_AF_PUMP_FEATURE_CONSTANT_TEMPERATURE_OFFSET (4)
+#define EMBER_AF_PUMP_FEATURE_AUTOMATIC (32)
+#define EMBER_AF_PUMP_FEATURE_AUTOMATIC_OFFSET (5)
+#define EMBER_AF_PUMP_FEATURE_LOCAL (64)
+#define EMBER_AF_PUMP_FEATURE_LOCAL_OFFSET (6)
 #define EMBER_AF_PUMP_STATUS_DEVICE_FAULT (1)
 #define EMBER_AF_PUMP_STATUS_DEVICE_FAULT_OFFSET (0)
 #define EMBER_AF_PUMP_STATUS_SUPPLYFAULT (2)
diff --git a/zzz_generated/app-common/app-common/zap-generated/print-cluster.h b/zzz_generated/app-common/app-common/zap-generated/print-cluster.h
index ed7dedb5a5d63b..d4beeec2e80ec5 100644
--- a/zzz_generated/app-common/app-common/zap-generated/print-cluster.h
+++ b/zzz_generated/app-common/app-common/zap-generated/print-cluster.h
@@ -226,7 +226,7 @@
 
 #if defined(ZCL_USING_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER) || defined(ZCL_USING_ADMINISTRATOR_COMMISSIONING_CLUSTER_CLIENT)
 #define CHIP_PRINTCLUSTER_ADMINISTRATOR_COMMISSIONING_CLUSTER                                                                      \
-    { chip::app::Clusters::AdministratorCommissioning::Id, "AdministratorCommissioning" },
+    { chip::app::Clusters::AdministratorCommissioning::Id, "Administrator Commissioning" },
 #else
 #define CHIP_PRINTCLUSTER_ADMINISTRATOR_COMMISSIONING_CLUSTER
 #endif
diff --git a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h
index e5577dfb66dae9..f4cbb7a92db5dc 100644
--- a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h
+++ b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h
@@ -3800,7 +3800,7 @@ class DoorLockLockDoor : public ClusterCommand
 public:
     DoorLockLockDoor(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("lock-door", credsIssuerConfig)
     {
-        AddArgument("PinCode", &mRequest.pinCode);
+        AddArgument("PINCode", &mRequest.PINCode);
         ClusterCommand::AddArguments();
     }
 
@@ -3830,7 +3830,7 @@ class DoorLockUnlockDoor : public ClusterCommand
 public:
     DoorLockUnlockDoor(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("unlock-door", credsIssuerConfig)
     {
-        AddArgument("PinCode", &mRequest.pinCode);
+        AddArgument("PINCode", &mRequest.PINCode);
         ClusterCommand::AddArguments();
     }
 
@@ -3862,7 +3862,7 @@ class DoorLockUnlockWithTimeout : public ClusterCommand
         ClusterCommand("unlock-with-timeout", credsIssuerConfig)
     {
         AddArgument("Timeout", 0, UINT16_MAX, &mRequest.timeout);
-        AddArgument("PinCode", &mRequest.pinCode);
+        AddArgument("PINCode", &mRequest.PINCode);
         ClusterCommand::AddArguments();
     }
 
@@ -4190,7 +4190,7 @@ class DoorLockSetUser : public ClusterCommand
         AddArgument("OperationType", 0, UINT8_MAX, &mRequest.operationType);
         AddArgument("UserIndex", 0, UINT16_MAX, &mRequest.userIndex);
         AddArgument("UserName", &mRequest.userName);
-        AddArgument("UserUniqueId", 0, UINT32_MAX, &mRequest.userUniqueId);
+        AddArgument("UserUniqueID", 0, UINT32_MAX, &mRequest.userUniqueID);
         AddArgument("UserStatus", 0, UINT8_MAX, &mRequest.userStatus);
         AddArgument("UserType", 0, UINT8_MAX, &mRequest.userType);
         AddArgument("CredentialRule", 0, UINT8_MAX, &mRequest.credentialRule);
@@ -4309,7 +4309,7 @@ class DoorLockSetCredential : public ClusterCommand
 
 private:
     chip::app::Clusters::DoorLock::Commands::SetCredential::Type mRequest;
-    TypedComplexArgument<chip::app::Clusters::DoorLock::Structs::DlCredential::Type> mComplex_Credential;
+    TypedComplexArgument<chip::app::Clusters::DoorLock::Structs::CredentialStruct::Type> mComplex_Credential;
 };
 
 /*
@@ -4341,7 +4341,7 @@ class DoorLockGetCredentialStatus : public ClusterCommand
 
 private:
     chip::app::Clusters::DoorLock::Commands::GetCredentialStatus::Type mRequest;
-    TypedComplexArgument<chip::app::Clusters::DoorLock::Structs::DlCredential::Type> mComplex_Credential;
+    TypedComplexArgument<chip::app::Clusters::DoorLock::Structs::CredentialStruct::Type> mComplex_Credential;
 };
 
 /*
@@ -4373,7 +4373,7 @@ class DoorLockClearCredential : public ClusterCommand
 
 private:
     chip::app::Clusters::DoorLock::Commands::ClearCredential::Type mRequest;
-    TypedComplexArgument<chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::Structs::DlCredential::Type>>
+    TypedComplexArgument<chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::Structs::CredentialStruct::Type>>
         mComplex_Credential;
 };
 
@@ -5451,7 +5451,7 @@ class ColorControlMoveToColorTemperature : public ClusterCommand
     ColorControlMoveToColorTemperature(CredentialIssuerCommands * credsIssuerConfig) :
         ClusterCommand("move-to-color-temperature", credsIssuerConfig)
     {
-        AddArgument("ColorTemperature", 0, UINT16_MAX, &mRequest.colorTemperature);
+        AddArgument("ColorTemperatureMireds", 0, UINT16_MAX, &mRequest.colorTemperatureMireds);
         AddArgument("TransitionTime", 0, UINT16_MAX, &mRequest.transitionTime);
         AddArgument("OptionsMask", 0, UINT8_MAX, &mRequest.optionsMask);
         AddArgument("OptionsOverride", 0, UINT8_MAX, &mRequest.optionsOverride);
@@ -10755,7 +10755,7 @@ void registerClusterDoorLock(Commands & commands, CredentialIssuerCommands * cre
         make_unique<WriteAttribute<uint32_t>>(Id, "auto-relock-time", 0, UINT32_MAX, Attributes::AutoRelockTime::Id,
                                               credsIssuerConfig),                                                               //
         make_unique<WriteAttribute<uint8_t>>(Id, "sound-volume", 0, UINT8_MAX, Attributes::SoundVolume::Id, credsIssuerConfig), //
-        make_unique<WriteAttribute<chip::app::Clusters::DoorLock::DlOperatingMode>>(
+        make_unique<WriteAttribute<chip::app::Clusters::DoorLock::OperatingModeEnum>>(
             Id, "operating-mode", 0, UINT8_MAX, Attributes::OperatingMode::Id, credsIssuerConfig), //
         make_unique<WriteAttribute<bool>>(Id, "enable-local-programming", 0, 1, Attributes::EnableLocalProgramming::Id,
                                           credsIssuerConfig), //
diff --git a/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp b/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp
index c19ad8821dab8c..ae169a0046aa34 100644
--- a/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp
+++ b/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp
@@ -497,6 +497,32 @@ void ComplexArgumentParser::Finalize(chip::app::Clusters::ContentLauncher::Struc
 {
     ComplexArgumentParser::Finalize(request.parameterList);
 }
+CHIP_ERROR ComplexArgumentParser::Setup(const char * label,
+                                        chip::app::Clusters::DoorLock::Structs::CredentialStruct::Type & request,
+                                        Json::Value & value)
+{
+    VerifyOrReturnError(value.isObject(), CHIP_ERROR_INVALID_ARGUMENT);
+
+    ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("CredentialStruct.credentialType", "credentialType",
+                                                                  value.isMember("credentialType")));
+    ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("CredentialStruct.credentialIndex", "credentialIndex",
+                                                                  value.isMember("credentialIndex")));
+
+    char labelWithMember[kMaxLabelLength];
+    snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "credentialType");
+    ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.credentialType, value["credentialType"]));
+
+    snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "credentialIndex");
+    ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.credentialIndex, value["credentialIndex"]));
+
+    return CHIP_NO_ERROR;
+}
+
+void ComplexArgumentParser::Finalize(chip::app::Clusters::DoorLock::Structs::CredentialStruct::Type & request)
+{
+    ComplexArgumentParser::Finalize(request.credentialType);
+    ComplexArgumentParser::Finalize(request.credentialIndex);
+}
 CHIP_ERROR ComplexArgumentParser::Setup(const char * label,
                                         chip::app::Clusters::Descriptor::Structs::DeviceTypeStruct::Type & request,
                                         Json::Value & value)
@@ -552,31 +578,6 @@ void ComplexArgumentParser::Finalize(chip::app::Clusters::ContentLauncher::Struc
     ComplexArgumentParser::Finalize(request.height);
     ComplexArgumentParser::Finalize(request.metric);
 }
-CHIP_ERROR ComplexArgumentParser::Setup(const char * label, chip::app::Clusters::DoorLock::Structs::DlCredential::Type & request,
-                                        Json::Value & value)
-{
-    VerifyOrReturnError(value.isObject(), CHIP_ERROR_INVALID_ARGUMENT);
-
-    ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("DlCredential.credentialType", "credentialType",
-                                                                  value.isMember("credentialType")));
-    ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("DlCredential.credentialIndex", "credentialIndex",
-                                                                  value.isMember("credentialIndex")));
-
-    char labelWithMember[kMaxLabelLength];
-    snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "credentialType");
-    ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.credentialType, value["credentialType"]));
-
-    snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "credentialIndex");
-    ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.credentialIndex, value["credentialIndex"]));
-
-    return CHIP_NO_ERROR;
-}
-
-void ComplexArgumentParser::Finalize(chip::app::Clusters::DoorLock::Structs::DlCredential::Type & request)
-{
-    ComplexArgumentParser::Finalize(request.credentialType);
-    ComplexArgumentParser::Finalize(request.credentialIndex);
-}
 CHIP_ERROR ComplexArgumentParser::Setup(const char * label,
                                         chip::app::Clusters::UnitTesting::Structs::DoubleNestedStructList::Type & request,
                                         Json::Value & value)
diff --git a/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.h b/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.h
index 7339dc6d9a5a30..483493b009426a 100644
--- a/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.h
+++ b/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.h
@@ -85,6 +85,10 @@ static CHIP_ERROR Setup(const char * label, chip::app::Clusters::ContentLauncher
                         Json::Value & value);
 
 static void Finalize(chip::app::Clusters::ContentLauncher::Structs::ContentSearch::Type & request);
+static CHIP_ERROR Setup(const char * label, chip::app::Clusters::DoorLock::Structs::CredentialStruct::Type & request,
+                        Json::Value & value);
+
+static void Finalize(chip::app::Clusters::DoorLock::Structs::CredentialStruct::Type & request);
 static CHIP_ERROR Setup(const char * label, chip::app::Clusters::Descriptor::Structs::DeviceTypeStruct::Type & request,
                         Json::Value & value);
 
@@ -93,10 +97,6 @@ static CHIP_ERROR Setup(const char * label, chip::app::Clusters::ContentLauncher
                         Json::Value & value);
 
 static void Finalize(chip::app::Clusters::ContentLauncher::Structs::Dimension::Type & request);
-static CHIP_ERROR Setup(const char * label, chip::app::Clusters::DoorLock::Structs::DlCredential::Type & request,
-                        Json::Value & value);
-
-static void Finalize(chip::app::Clusters::DoorLock::Structs::DlCredential::Type & request);
 static CHIP_ERROR Setup(const char * label, chip::app::Clusters::UnitTesting::Structs::DoubleNestedStructList::Type & request,
                         Json::Value & value);
 
diff --git a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp
index f77ad32d213845..e5d1d79bfc9825 100644
--- a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp
+++ b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp
@@ -493,22 +493,22 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
     return CHIP_NO_ERROR;
 }
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const chip::app::Clusters::Descriptor::Structs::DeviceTypeStruct::DecodableType & value)
+                                     const chip::app::Clusters::DoorLock::Structs::CredentialStruct::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
     {
-        CHIP_ERROR err = LogValue("DeviceType", indent + 1, value.deviceType);
+        CHIP_ERROR err = LogValue("CredentialType", indent + 1, value.credentialType);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'DeviceType'");
+            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'CredentialType'");
             return err;
         }
     }
     {
-        CHIP_ERROR err = LogValue("Revision", indent + 1, value.revision);
+        CHIP_ERROR err = LogValue("CredentialIndex", indent + 1, value.credentialIndex);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'Revision'");
+            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'CredentialIndex'");
             return err;
         }
     }
@@ -517,30 +517,22 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
     return CHIP_NO_ERROR;
 }
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const chip::app::Clusters::ContentLauncher::Structs::Dimension::DecodableType & value)
+                                     const chip::app::Clusters::Descriptor::Structs::DeviceTypeStruct::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
     {
-        CHIP_ERROR err = LogValue("Width", indent + 1, value.width);
-        if (err != CHIP_NO_ERROR)
-        {
-            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'Width'");
-            return err;
-        }
-    }
-    {
-        CHIP_ERROR err = LogValue("Height", indent + 1, value.height);
+        CHIP_ERROR err = LogValue("DeviceType", indent + 1, value.deviceType);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'Height'");
+            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'DeviceType'");
             return err;
         }
     }
     {
-        CHIP_ERROR err = LogValue("Metric", indent + 1, value.metric);
+        CHIP_ERROR err = LogValue("Revision", indent + 1, value.revision);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'Metric'");
+            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'Revision'");
             return err;
         }
     }
@@ -549,22 +541,30 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
     return CHIP_NO_ERROR;
 }
 CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
-                                     const chip::app::Clusters::DoorLock::Structs::DlCredential::DecodableType & value)
+                                     const chip::app::Clusters::ContentLauncher::Structs::Dimension::DecodableType & value)
 {
     DataModelLogger::LogString(label, indent, "{");
     {
-        CHIP_ERROR err = LogValue("CredentialType", indent + 1, value.credentialType);
+        CHIP_ERROR err = LogValue("Width", indent + 1, value.width);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'CredentialType'");
+            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'Width'");
             return err;
         }
     }
     {
-        CHIP_ERROR err = LogValue("CredentialIndex", indent + 1, value.credentialIndex);
+        CHIP_ERROR err = LogValue("Height", indent + 1, value.height);
         if (err != CHIP_NO_ERROR)
         {
-            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'CredentialIndex'");
+            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'Height'");
+            return err;
+        }
+    }
+    {
+        CHIP_ERROR err = LogValue("Metric", indent + 1, value.metric);
+        if (err != CHIP_NO_ERROR)
+        {
+            DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'Metric'");
             return err;
         }
     }
@@ -3995,7 +3995,7 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent,
     DataModelLogger::LogString(label, indent, "{");
     ReturnErrorOnFailure(DataModelLogger::LogValue("userIndex", indent + 1, value.userIndex));
     ReturnErrorOnFailure(DataModelLogger::LogValue("userName", indent + 1, value.userName));
-    ReturnErrorOnFailure(DataModelLogger::LogValue("userUniqueId", indent + 1, value.userUniqueId));
+    ReturnErrorOnFailure(DataModelLogger::LogValue("userUniqueID", indent + 1, value.userUniqueID));
     ReturnErrorOnFailure(DataModelLogger::LogValue("userStatus", indent + 1, value.userStatus));
     ReturnErrorOnFailure(DataModelLogger::LogValue("userType", indent + 1, value.userType));
     ReturnErrorOnFailure(DataModelLogger::LogValue("credentialRule", indent + 1, value.credentialRule));
@@ -5627,17 +5627,17 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP
             return DataModelLogger::LogValue("BootReason", 1, value);
         }
         case GeneralDiagnostics::Attributes::ActiveHardwareFaults::Id: {
-            chip::app::DataModel::DecodableList<chip::app::Clusters::GeneralDiagnostics::HardwareFault> value;
+            chip::app::DataModel::DecodableList<chip::app::Clusters::GeneralDiagnostics::HardwareFaultEnum> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("ActiveHardwareFaults", 1, value);
         }
         case GeneralDiagnostics::Attributes::ActiveRadioFaults::Id: {
-            chip::app::DataModel::DecodableList<chip::app::Clusters::GeneralDiagnostics::RadioFault> value;
+            chip::app::DataModel::DecodableList<chip::app::Clusters::GeneralDiagnostics::RadioFaultEnum> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("ActiveRadioFaults", 1, value);
         }
         case GeneralDiagnostics::Attributes::ActiveNetworkFaults::Id: {
-            chip::app::DataModel::DecodableList<chip::app::Clusters::GeneralDiagnostics::NetworkFaultType> value;
+            chip::app::DataModel::DecodableList<chip::app::Clusters::GeneralDiagnostics::NetworkFaultEnum> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("ActiveNetworkFaults", 1, value);
         }
@@ -6179,7 +6179,7 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP
         switch (path.mAttributeId)
         {
         case EthernetNetworkDiagnostics::Attributes::PHYRate::Id: {
-            chip::app::DataModel::Nullable<chip::app::Clusters::EthernetNetworkDiagnostics::PHYRate> value;
+            chip::app::DataModel::Nullable<chip::app::Clusters::EthernetNetworkDiagnostics::PHYRateEnum> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("PHYRate", 1, value);
         }
@@ -6407,7 +6407,7 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP
         switch (path.mAttributeId)
         {
         case AdministratorCommissioning::Attributes::WindowStatus::Id: {
-            chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatus value;
+            chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatusEnum value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("WindowStatus", 1, value);
         }
@@ -6754,7 +6754,7 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP
             return DataModelLogger::LogValue("ActuatorEnabled", 1, value);
         }
         case DoorLock::Attributes::DoorState::Id: {
-            chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::DlDoorState> value;
+            chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::DoorStateEnum> value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("DoorState", 1, value);
         }
@@ -6854,7 +6854,7 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP
             return DataModelLogger::LogValue("SoundVolume", 1, value);
         }
         case DoorLock::Attributes::OperatingMode::Id: {
-            chip::app::Clusters::DoorLock::DlOperatingMode value;
+            chip::app::Clusters::DoorLock::OperatingModeEnum value;
             ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value));
             return DataModelLogger::LogValue("OperatingMode", 1, value);
         }
diff --git a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.h b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.h
index 82643f35a3a980..dee95473a7f8aa 100644
--- a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.h
+++ b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.h
@@ -51,12 +51,12 @@ static CHIP_ERROR LogValue(const char * label, size_t indent,
                            const chip::app::Clusters::Channel::Structs::ChannelInfo::DecodableType & value);
 static CHIP_ERROR LogValue(const char * label, size_t indent,
                            const chip::app::Clusters::ContentLauncher::Structs::ContentSearch::DecodableType & value);
+static CHIP_ERROR LogValue(const char * label, size_t indent,
+                           const chip::app::Clusters::DoorLock::Structs::CredentialStruct::DecodableType & value);
 static CHIP_ERROR LogValue(const char * label, size_t indent,
                            const chip::app::Clusters::Descriptor::Structs::DeviceTypeStruct::DecodableType & value);
 static CHIP_ERROR LogValue(const char * label, size_t indent,
                            const chip::app::Clusters::ContentLauncher::Structs::Dimension::DecodableType & value);
-static CHIP_ERROR LogValue(const char * label, size_t indent,
-                           const chip::app::Clusters::DoorLock::Structs::DlCredential::DecodableType & value);
 static CHIP_ERROR LogValue(const char * label, size_t indent,
                            const chip::app::Clusters::UnitTesting::Structs::DoubleNestedStructList::DecodableType & value);
 static CHIP_ERROR LogValue(const char * label, size_t indent,
diff --git a/zzz_generated/chip-tool/zap-generated/test/Commands.h b/zzz_generated/chip-tool/zap-generated/test/Commands.h
index 567e77bded05c6..8a58eb4aa96b0a 100644
--- a/zzz_generated/chip-tool/zap-generated/test/Commands.h
+++ b/zzz_generated/chip-tool/zap-generated/test/Commands.h
@@ -14215,10 +14215,10 @@ class Test_TC_CC_6_1Suite : public TestCommand
             VerifyOrDo(!ShouldSkip("CC.S.F04 && CC.S.C0a.Rsp"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::ColorControl::Commands::MoveToColorTemperature::Type value;
-            value.colorTemperature = 310U;
-            value.transitionTime   = 0U;
-            value.optionsMask      = 0U;
-            value.optionsOverride  = 0U;
+            value.colorTemperatureMireds = 310U;
+            value.transitionTime         = 0U;
+            value.optionsMask            = 0U;
+            value.optionsOverride        = 0U;
             return SendCommand(kIdentityAlpha, GetEndpoint(1), ColorControl::Id, ColorControl::Commands::MoveToColorTemperature::Id,
                                value, chip::NullOptional
 
@@ -14237,10 +14237,10 @@ class Test_TC_CC_6_1Suite : public TestCommand
             VerifyOrDo(!ShouldSkip("CC.S.F04 && CC.S.C0a.Rsp"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::ColorControl::Commands::MoveToColorTemperature::Type value;
-            value.colorTemperature = 250U;
-            value.transitionTime   = 300U;
-            value.optionsMask      = 0U;
-            value.optionsOverride  = 0U;
+            value.colorTemperatureMireds = 250U;
+            value.transitionTime         = 300U;
+            value.optionsMask            = 0U;
+            value.optionsOverride        = 0U;
             return SendCommand(kIdentityAlpha, GetEndpoint(1), ColorControl::Id, ColorControl::Commands::MoveToColorTemperature::Id,
                                value, chip::NullOptional
 
@@ -14645,10 +14645,11 @@ class Test_TC_CC_6_2Suite : public TestCommand
             VerifyOrDo(!ShouldSkip("CC.S.F04 && CC.S.C0a.Rsp"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::ColorControl::Commands::MoveToColorTemperature::Type value;
-            value.colorTemperature = static_cast<uint16_t>((ColorTempPhysicalMinMiredsValue + ColorTempPhysicalMaxMiredsValue) / 2);
-            value.transitionTime   = 0U;
-            value.optionsMask      = 0U;
-            value.optionsOverride  = 0U;
+            value.colorTemperatureMireds =
+                static_cast<uint16_t>((ColorTempPhysicalMinMiredsValue + ColorTempPhysicalMaxMiredsValue) / 2);
+            value.transitionTime  = 0U;
+            value.optionsMask     = 0U;
+            value.optionsOverride = 0U;
             return SendCommand(kIdentityAlpha, GetEndpoint(1), ColorControl::Id, ColorControl::Commands::MoveToColorTemperature::Id,
                                value, chip::NullOptional
 
@@ -15152,10 +15153,11 @@ class Test_TC_CC_6_3Suite : public TestCommand
             VerifyOrDo(!ShouldSkip("CC.S.F04 && CC.S.C0a.Rsp"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::ColorControl::Commands::MoveToColorTemperature::Type value;
-            value.colorTemperature = static_cast<uint16_t>((ColorTempPhysicalMinMiredsValue + ColorTempPhysicalMaxMiredsValue) / 2);
-            value.transitionTime   = 0U;
-            value.optionsMask      = 0U;
-            value.optionsOverride  = 0U;
+            value.colorTemperatureMireds =
+                static_cast<uint16_t>((ColorTempPhysicalMinMiredsValue + ColorTempPhysicalMaxMiredsValue) / 2);
+            value.transitionTime  = 0U;
+            value.optionsMask     = 0U;
+            value.optionsOverride = 0U;
             return SendCommand(kIdentityAlpha, GetEndpoint(1), ColorControl::Id, ColorControl::Commands::MoveToColorTemperature::Id,
                                value, chip::NullOptional
 
@@ -17113,10 +17115,10 @@ class Test_TC_CC_8_1Suite : public TestCommand
             VerifyOrDo(!ShouldSkip("CC.S.C0a.Rsp"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::ColorControl::Commands::MoveToColorTemperature::Type value;
-            value.colorTemperature = static_cast<uint16_t>((ColorTempPhysicalMinMireds + ColorTempPhysicalMaxMireds) / 2);
-            value.transitionTime   = 0U;
-            value.optionsMask      = 0U;
-            value.optionsOverride  = 0U;
+            value.colorTemperatureMireds = static_cast<uint16_t>((ColorTempPhysicalMinMireds + ColorTempPhysicalMaxMireds) / 2);
+            value.transitionTime         = 0U;
+            value.optionsMask            = 0U;
+            value.optionsOverride        = 0U;
             return SendCommand(kIdentityAlpha, GetEndpoint(1), ColorControl::Id, ColorControl::Commands::MoveToColorTemperature::Id,
                                value, chip::NullOptional
 
@@ -19974,7 +19976,7 @@ class Test_TC_DGETH_2_1Suite : public TestCommand
         case 1:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                chip::app::DataModel::Nullable<chip::app::Clusters::EthernetNetworkDiagnostics::PHYRate> value;
+                chip::app::DataModel::Nullable<chip::app::Clusters::EthernetNetworkDiagnostics::PHYRateEnum> value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckConstraintType("value", "enum8", "enum8"));
                 VerifyOrReturn(CheckConstraintMinValue("value", value, 0U));
@@ -20295,7 +20297,7 @@ class Test_TC_DGETH_2_2Suite : public TestCommand
         case 1:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                chip::app::DataModel::Nullable<chip::app::Clusters::EthernetNetworkDiagnostics::PHYRate> value;
+                chip::app::DataModel::Nullable<chip::app::Clusters::EthernetNetworkDiagnostics::PHYRateEnum> value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckConstraintType("value", "enum8", "enum8"));
                 VerifyOrReturn(CheckConstraintMinValue("value", value, 0U));
@@ -20305,7 +20307,7 @@ class Test_TC_DGETH_2_2Suite : public TestCommand
         case 2:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                chip::app::DataModel::Nullable<chip::app::Clusters::EthernetNetworkDiagnostics::PHYRate> value;
+                chip::app::DataModel::Nullable<chip::app::Clusters::EthernetNetworkDiagnostics::PHYRateEnum> value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckConstraintType("value", "enum8", "enum8"));
                 VerifyOrReturn(CheckConstraintMinValue("value", value, 0U));
@@ -20315,7 +20317,7 @@ class Test_TC_DGETH_2_2Suite : public TestCommand
         case 3:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                chip::app::DataModel::Nullable<chip::app::Clusters::EthernetNetworkDiagnostics::PHYRate> value;
+                chip::app::DataModel::Nullable<chip::app::Clusters::EthernetNetworkDiagnostics::PHYRateEnum> value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckConstraintType("value", "enum8", "enum8"));
                 VerifyOrReturn(CheckConstraintMinValue("value", value, 0U));
@@ -20325,7 +20327,7 @@ class Test_TC_DGETH_2_2Suite : public TestCommand
         case 4:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                chip::app::DataModel::Nullable<chip::app::Clusters::EthernetNetworkDiagnostics::PHYRate> value;
+                chip::app::DataModel::Nullable<chip::app::Clusters::EthernetNetworkDiagnostics::PHYRateEnum> value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckConstraintType("value", "enum8", "enum8"));
                 VerifyOrReturn(CheckConstraintMinValue("value", value, 0U));
@@ -20335,7 +20337,7 @@ class Test_TC_DGETH_2_2Suite : public TestCommand
         case 5:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                chip::app::DataModel::Nullable<chip::app::Clusters::EthernetNetworkDiagnostics::PHYRate> value;
+                chip::app::DataModel::Nullable<chip::app::Clusters::EthernetNetworkDiagnostics::PHYRateEnum> value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckConstraintType("value", "enum8", "enum8"));
                 VerifyOrReturn(CheckConstraintMinValue("value", value, 0U));
@@ -20345,7 +20347,7 @@ class Test_TC_DGETH_2_2Suite : public TestCommand
         case 6:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                chip::app::DataModel::Nullable<chip::app::Clusters::EthernetNetworkDiagnostics::PHYRate> value;
+                chip::app::DataModel::Nullable<chip::app::Clusters::EthernetNetworkDiagnostics::PHYRateEnum> value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckConstraintType("value", "enum8", "enum8"));
                 VerifyOrReturn(CheckConstraintMinValue("value", value, 0U));
@@ -20355,7 +20357,7 @@ class Test_TC_DGETH_2_2Suite : public TestCommand
         case 7:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                chip::app::DataModel::Nullable<chip::app::Clusters::EthernetNetworkDiagnostics::PHYRate> value;
+                chip::app::DataModel::Nullable<chip::app::Clusters::EthernetNetworkDiagnostics::PHYRateEnum> value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckConstraintType("value", "enum8", "enum8"));
                 VerifyOrReturn(CheckConstraintMinValue("value", value, 0U));
@@ -20365,7 +20367,7 @@ class Test_TC_DGETH_2_2Suite : public TestCommand
         case 8:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                chip::app::DataModel::Nullable<chip::app::Clusters::EthernetNetworkDiagnostics::PHYRate> value;
+                chip::app::DataModel::Nullable<chip::app::Clusters::EthernetNetworkDiagnostics::PHYRateEnum> value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckConstraintType("value", "enum8", "enum8"));
                 VerifyOrReturn(CheckConstraintMinValue("value", value, 0U));
@@ -20375,7 +20377,7 @@ class Test_TC_DGETH_2_2Suite : public TestCommand
         case 9:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                chip::app::DataModel::Nullable<chip::app::Clusters::EthernetNetworkDiagnostics::PHYRate> value;
+                chip::app::DataModel::Nullable<chip::app::Clusters::EthernetNetworkDiagnostics::PHYRateEnum> value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckConstraintType("value", "enum8", "enum8"));
                 VerifyOrReturn(CheckConstraintMinValue("value", value, 0U));
@@ -20385,7 +20387,7 @@ class Test_TC_DGETH_2_2Suite : public TestCommand
         case 10:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                chip::app::DataModel::Nullable<chip::app::Clusters::EthernetNetworkDiagnostics::PHYRate> value;
+                chip::app::DataModel::Nullable<chip::app::Clusters::EthernetNetworkDiagnostics::PHYRateEnum> value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckConstraintType("value", "enum8", "enum8"));
                 VerifyOrReturn(CheckConstraintMinValue("value", value, 0U));
@@ -38004,7 +38006,7 @@ class Test_TC_PRS_2_2Suite : public TestCommand
 class Test_TC_PCC_1_1Suite : public TestCommand
 {
 public:
-    Test_TC_PCC_1_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_PCC_1_1", 22, credsIssuerConfig)
+    Test_TC_PCC_1_1Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_PCC_1_1", 29, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -38054,7 +38056,7 @@ class Test_TC_PCC_1_1Suite : public TestCommand
             {
                 uint16_t value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckValue("clusterRevision", value, 3U));
+                VerifyOrReturn(CheckValue("clusterRevision", value, 4U));
                 VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u"));
             }
             break;
@@ -38068,6 +38070,69 @@ class Test_TC_PCC_1_1Suite : public TestCommand
             }
             break;
         case 3:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                uint32_t value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckConstraintType("value", "bitmap32", "bitmap32"));
+                VerifyOrReturn(CheckConstraintHasMasksSet("value", value, 1UL));
+            }
+            break;
+        case 4:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                uint32_t value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckConstraintType("value", "bitmap32", "bitmap32"));
+                VerifyOrReturn(CheckConstraintHasMasksSet("value", value, 2UL));
+            }
+            break;
+        case 5:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                uint32_t value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckConstraintType("value", "bitmap32", "bitmap32"));
+                VerifyOrReturn(CheckConstraintHasMasksSet("value", value, 4UL));
+            }
+            break;
+        case 6:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                uint32_t value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckConstraintType("value", "bitmap32", "bitmap32"));
+                VerifyOrReturn(CheckConstraintHasMasksSet("value", value, 8UL));
+            }
+            break;
+        case 7:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                uint32_t value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckConstraintType("value", "bitmap32", "bitmap32"));
+                VerifyOrReturn(CheckConstraintHasMasksSet("value", value, 16UL));
+            }
+            break;
+        case 8:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                uint32_t value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckConstraintType("value", "bitmap32", "bitmap32"));
+                VerifyOrReturn(CheckConstraintHasMasksSet("value", value, 32UL));
+            }
+            break;
+        case 9:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            {
+                uint32_t value;
+                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
+                VerifyOrReturn(CheckConstraintType("value", "bitmap32", "bitmap32"));
+                VerifyOrReturn(CheckConstraintHasMasksSet("value", value, 64UL));
+            }
+            break;
+        case 10:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::DecodableList<chip::AttributeId> value;
@@ -38087,7 +38152,7 @@ class Test_TC_PCC_1_1Suite : public TestCommand
                 VerifyOrReturn(CheckConstraintContains("value", value, 65533UL));
             }
             break;
-        case 4:
+        case 11:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::DecodableList<chip::AttributeId> value;
@@ -38096,7 +38161,7 @@ class Test_TC_PCC_1_1Suite : public TestCommand
                 VerifyOrReturn(CheckConstraintContains("value", value, 3UL));
             }
             break;
-        case 5:
+        case 12:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::DecodableList<chip::AttributeId> value;
@@ -38105,7 +38170,7 @@ class Test_TC_PCC_1_1Suite : public TestCommand
                 VerifyOrReturn(CheckConstraintContains("value", value, 4UL));
             }
             break;
-        case 6:
+        case 13:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::DecodableList<chip::AttributeId> value;
@@ -38114,7 +38179,7 @@ class Test_TC_PCC_1_1Suite : public TestCommand
                 VerifyOrReturn(CheckConstraintContains("value", value, 5UL));
             }
             break;
-        case 7:
+        case 14:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::DecodableList<chip::AttributeId> value;
@@ -38123,7 +38188,7 @@ class Test_TC_PCC_1_1Suite : public TestCommand
                 VerifyOrReturn(CheckConstraintContains("value", value, 6UL));
             }
             break;
-        case 8:
+        case 15:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::DecodableList<chip::AttributeId> value;
@@ -38132,7 +38197,7 @@ class Test_TC_PCC_1_1Suite : public TestCommand
                 VerifyOrReturn(CheckConstraintContains("value", value, 7UL));
             }
             break;
-        case 9:
+        case 16:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::DecodableList<chip::AttributeId> value;
@@ -38141,7 +38206,7 @@ class Test_TC_PCC_1_1Suite : public TestCommand
                 VerifyOrReturn(CheckConstraintContains("value", value, 8UL));
             }
             break;
-        case 10:
+        case 17:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::DecodableList<chip::AttributeId> value;
@@ -38150,7 +38215,7 @@ class Test_TC_PCC_1_1Suite : public TestCommand
                 VerifyOrReturn(CheckConstraintContains("value", value, 9UL));
             }
             break;
-        case 11:
+        case 18:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::DecodableList<chip::AttributeId> value;
@@ -38159,7 +38224,7 @@ class Test_TC_PCC_1_1Suite : public TestCommand
                 VerifyOrReturn(CheckConstraintContains("value", value, 10UL));
             }
             break;
-        case 12:
+        case 19:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::DecodableList<chip::AttributeId> value;
@@ -38168,7 +38233,7 @@ class Test_TC_PCC_1_1Suite : public TestCommand
                 VerifyOrReturn(CheckConstraintContains("value", value, 11UL));
             }
             break;
-        case 13:
+        case 20:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::DecodableList<chip::AttributeId> value;
@@ -38177,7 +38242,7 @@ class Test_TC_PCC_1_1Suite : public TestCommand
                 VerifyOrReturn(CheckConstraintContains("value", value, 12UL));
             }
             break;
-        case 14:
+        case 21:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::DecodableList<chip::AttributeId> value;
@@ -38186,7 +38251,7 @@ class Test_TC_PCC_1_1Suite : public TestCommand
                 VerifyOrReturn(CheckConstraintContains("value", value, 16UL));
             }
             break;
-        case 15:
+        case 22:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::DecodableList<chip::AttributeId> value;
@@ -38195,7 +38260,7 @@ class Test_TC_PCC_1_1Suite : public TestCommand
                 VerifyOrReturn(CheckConstraintContains("value", value, 20UL));
             }
             break;
-        case 16:
+        case 23:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::DecodableList<chip::AttributeId> value;
@@ -38204,7 +38269,7 @@ class Test_TC_PCC_1_1Suite : public TestCommand
                 VerifyOrReturn(CheckConstraintContains("value", value, 21UL));
             }
             break;
-        case 17:
+        case 24:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::DecodableList<chip::AttributeId> value;
@@ -38213,7 +38278,7 @@ class Test_TC_PCC_1_1Suite : public TestCommand
                 VerifyOrReturn(CheckConstraintContains("value", value, 22UL));
             }
             break;
-        case 18:
+        case 25:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::DecodableList<chip::AttributeId> value;
@@ -38222,7 +38287,7 @@ class Test_TC_PCC_1_1Suite : public TestCommand
                 VerifyOrReturn(CheckConstraintContains("value", value, 23UL));
             }
             break;
-        case 19:
+        case 26:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::DecodableList<chip::AttributeId> value;
@@ -38231,7 +38296,7 @@ class Test_TC_PCC_1_1Suite : public TestCommand
                 VerifyOrReturn(CheckConstraintContains("value", value, 33UL));
             }
             break;
-        case 20:
+        case 27:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::DecodableList<chip::CommandId> value;
@@ -38243,7 +38308,7 @@ class Test_TC_PCC_1_1Suite : public TestCommand
                 VerifyOrReturn(CheckConstraintType("value", "list", "list"));
             }
             break;
-        case 21:
+        case 28:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::DecodableList<chip::CommandId> value;
@@ -38290,117 +38355,162 @@ class Test_TC_PCC_1_1Suite : public TestCommand
         }
         case 2: {
             LogStep(2, "TH reads the FeatureMap attribute from the DUT");
+            VerifyOrDo(
+                !ShouldSkip(" !PCC.S.F00 && !PCC.S.F01 && !PCC.S.F02 && !PCC.S.F03 && !PCC.S.F04 && !PCC.S.F05 && !PCC.S.F06 "),
+                return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), PumpConfigurationAndControl::Id,
                                  PumpConfigurationAndControl::Attributes::FeatureMap::Id, true, chip::NullOptional);
         }
         case 3: {
-            LogStep(3, "TH reads the AttributeList attribute from the DUT");
+            LogStep(3, "Given PCC.S.F00(PRSCONST) ensure featuremap has the correct bit set");
+            VerifyOrDo(!ShouldSkip("PCC.S.F00"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), PumpConfigurationAndControl::Id,
-                                 PumpConfigurationAndControl::Attributes::AttributeList::Id, true, chip::NullOptional);
+                                 PumpConfigurationAndControl::Attributes::FeatureMap::Id, true, chip::NullOptional);
         }
         case 4: {
-            LogStep(4, "TH reads optional attribute(MinConstPressure) attribute in AttributeList from the DUT");
+            LogStep(4, "Given PCC.S.F01(PRSCOMP) ensure featuremap has the correct bit set");
+            VerifyOrDo(!ShouldSkip("PCC.S.F01"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), PumpConfigurationAndControl::Id,
+                                 PumpConfigurationAndControl::Attributes::FeatureMap::Id, true, chip::NullOptional);
+        }
+        case 5: {
+            LogStep(5, "Given PCC.S.F02(FLW) ensure featuremap has the correct bit set");
+            VerifyOrDo(!ShouldSkip("PCC.S.F02"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), PumpConfigurationAndControl::Id,
+                                 PumpConfigurationAndControl::Attributes::FeatureMap::Id, true, chip::NullOptional);
+        }
+        case 6: {
+            LogStep(6, "Given PCC.S.F03(SPD) ensure featuremap has the correct bit set");
+            VerifyOrDo(!ShouldSkip("PCC.S.F03"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), PumpConfigurationAndControl::Id,
+                                 PumpConfigurationAndControl::Attributes::FeatureMap::Id, true, chip::NullOptional);
+        }
+        case 7: {
+            LogStep(7, "Given PCC.S.F04(TEMP) ensure featuremap has the correct bit set");
+            VerifyOrDo(!ShouldSkip("PCC.S.F04"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), PumpConfigurationAndControl::Id,
+                                 PumpConfigurationAndControl::Attributes::FeatureMap::Id, true, chip::NullOptional);
+        }
+        case 8: {
+            LogStep(8, "Given PCC.S.F05(AUTO) ensure featuremap has the correct bit set");
+            VerifyOrDo(!ShouldSkip("PCC.S.F05"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), PumpConfigurationAndControl::Id,
+                                 PumpConfigurationAndControl::Attributes::FeatureMap::Id, true, chip::NullOptional);
+        }
+        case 9: {
+            LogStep(9, "Given PCC.S.F06(LOCAL) ensure featuremap has the correct bit set");
+            VerifyOrDo(!ShouldSkip("PCC.S.F06"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), PumpConfigurationAndControl::Id,
+                                 PumpConfigurationAndControl::Attributes::FeatureMap::Id, true, chip::NullOptional);
+        }
+        case 10: {
+            LogStep(10, "TH reads the AttributeList attribute from the DUT");
+            return ReadAttribute(kIdentityAlpha, GetEndpoint(1), PumpConfigurationAndControl::Id,
+                                 PumpConfigurationAndControl::Attributes::AttributeList::Id, true, chip::NullOptional);
+        }
+        case 11: {
+            LogStep(11, "TH reads optional attribute(MinConstPressure) attribute in AttributeList from the DUT");
             VerifyOrDo(!ShouldSkip("PCC.S.A0003"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), PumpConfigurationAndControl::Id,
                                  PumpConfigurationAndControl::Attributes::AttributeList::Id, true, chip::NullOptional);
         }
-        case 5: {
-            LogStep(5, "TH reads optional attribute(MaxConstPressure) attribute in AttributeList from the DUT");
+        case 12: {
+            LogStep(12, "TH reads optional attribute(MaxConstPressure) attribute in AttributeList from the DUT");
             VerifyOrDo(!ShouldSkip("PCC.S.A0004"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), PumpConfigurationAndControl::Id,
                                  PumpConfigurationAndControl::Attributes::AttributeList::Id, true, chip::NullOptional);
         }
-        case 6: {
-            LogStep(6, "TH reads optional attribute(MinCompPressure) attribute in AttributeList from the DUT");
+        case 13: {
+            LogStep(13, "TH reads optional attribute(MinCompPressure) attribute in AttributeList from the DUT");
             VerifyOrDo(!ShouldSkip("PCC.S.A0005"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), PumpConfigurationAndControl::Id,
                                  PumpConfigurationAndControl::Attributes::AttributeList::Id, true, chip::NullOptional);
         }
-        case 7: {
-            LogStep(7, "TH reads optional attribute(MaxCompPressure) attribute in AttributeList from the DUT");
+        case 14: {
+            LogStep(14, "TH reads optional attribute(MaxCompPressure) attribute in AttributeList from the DUT");
             VerifyOrDo(!ShouldSkip("PCC.S.A0006"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), PumpConfigurationAndControl::Id,
                                  PumpConfigurationAndControl::Attributes::AttributeList::Id, true, chip::NullOptional);
         }
-        case 8: {
-            LogStep(8, "TH reads optional attribute(MinConstSpeed) attribute in AttributeList from the DUT");
+        case 15: {
+            LogStep(15, "TH reads optional attribute(MinConstSpeed) attribute in AttributeList from the DUT");
             VerifyOrDo(!ShouldSkip("PCC.S.A0007"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), PumpConfigurationAndControl::Id,
                                  PumpConfigurationAndControl::Attributes::AttributeList::Id, true, chip::NullOptional);
         }
-        case 9: {
-            LogStep(9, "TH reads optional attribute(MaxConstSpeed) attribute in AttributeList from the DUT");
+        case 16: {
+            LogStep(16, "TH reads optional attribute(MaxConstSpeed) attribute in AttributeList from the DUT");
             VerifyOrDo(!ShouldSkip("PCC.S.A0008"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), PumpConfigurationAndControl::Id,
                                  PumpConfigurationAndControl::Attributes::AttributeList::Id, true, chip::NullOptional);
         }
-        case 10: {
-            LogStep(10, "TH reads optional attribute(MinConstFlow) attribute in AttributeList from the DUT");
+        case 17: {
+            LogStep(17, "TH reads optional attribute(MinConstFlow) attribute in AttributeList from the DUT");
             VerifyOrDo(!ShouldSkip("PCC.S.A0009"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), PumpConfigurationAndControl::Id,
                                  PumpConfigurationAndControl::Attributes::AttributeList::Id, true, chip::NullOptional);
         }
-        case 11: {
-            LogStep(11, "TH reads optional attribute(MaxConstFlow) attribute in AttributeList from the DUT");
+        case 18: {
+            LogStep(18, "TH reads optional attribute(MaxConstFlow) attribute in AttributeList from the DUT");
             VerifyOrDo(!ShouldSkip("PCC.S.A000a"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), PumpConfigurationAndControl::Id,
                                  PumpConfigurationAndControl::Attributes::AttributeList::Id, true, chip::NullOptional);
         }
-        case 12: {
-            LogStep(12, "TH reads optional attribute(MinConstTemp) attribute in AttributeList from the DUT");
+        case 19: {
+            LogStep(19, "TH reads optional attribute(MinConstTemp) attribute in AttributeList from the DUT");
             VerifyOrDo(!ShouldSkip("PCC.S.A000b"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), PumpConfigurationAndControl::Id,
                                  PumpConfigurationAndControl::Attributes::AttributeList::Id, true, chip::NullOptional);
         }
-        case 13: {
-            LogStep(13, "TH reads optional attribute(MaxConstTemp) attribute in AttributeList from the DUT");
+        case 20: {
+            LogStep(20, "TH reads optional attribute(MaxConstTemp) attribute in AttributeList from the DUT");
             VerifyOrDo(!ShouldSkip("PCC.S.A000c"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), PumpConfigurationAndControl::Id,
                                  PumpConfigurationAndControl::Attributes::AttributeList::Id, true, chip::NullOptional);
         }
-        case 14: {
-            LogStep(14, "TH reads optional attribute(PumpStatus) attribute in AttributeList from the DUT");
+        case 21: {
+            LogStep(21, "TH reads optional attribute(PumpStatus) attribute in AttributeList from the DUT");
             VerifyOrDo(!ShouldSkip("PCC.S.A0010"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), PumpConfigurationAndControl::Id,
                                  PumpConfigurationAndControl::Attributes::AttributeList::Id, true, chip::NullOptional);
         }
-        case 15: {
-            LogStep(15, "TH reads optional attribute(Speed) attribute in AttributeList from the DUT");
+        case 22: {
+            LogStep(22, "TH reads optional attribute(Speed) attribute in AttributeList from the DUT");
             VerifyOrDo(!ShouldSkip("PCC.S.A0014"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), PumpConfigurationAndControl::Id,
                                  PumpConfigurationAndControl::Attributes::AttributeList::Id, true, chip::NullOptional);
         }
-        case 16: {
-            LogStep(16, "TH reads optional attribute(LifetimeRunningHours) attribute in AttributeList from the DUT");
+        case 23: {
+            LogStep(23, "TH reads optional attribute(LifetimeRunningHours) attribute in AttributeList from the DUT");
             VerifyOrDo(!ShouldSkip("PCC.S.A0015"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), PumpConfigurationAndControl::Id,
                                  PumpConfigurationAndControl::Attributes::AttributeList::Id, true, chip::NullOptional);
         }
-        case 17: {
-            LogStep(17, "TH reads optional attribute(Power) attribute in AttributeList from the DUT");
+        case 24: {
+            LogStep(24, "TH reads optional attribute(Power) attribute in AttributeList from the DUT");
             VerifyOrDo(!ShouldSkip("PCC.S.A0016"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), PumpConfigurationAndControl::Id,
                                  PumpConfigurationAndControl::Attributes::AttributeList::Id, true, chip::NullOptional);
         }
-        case 18: {
-            LogStep(18, "TH reads optional attribute(LifetimeEnergyConsumed) attribute in AttributeList from the DUT");
+        case 25: {
+            LogStep(25, "TH reads optional attribute(LifetimeEnergyConsumed) attribute in AttributeList from the DUT");
             VerifyOrDo(!ShouldSkip("PCC.S.A0017"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), PumpConfigurationAndControl::Id,
                                  PumpConfigurationAndControl::Attributes::AttributeList::Id, true, chip::NullOptional);
         }
-        case 19: {
-            LogStep(19, "TH reads optional attribute(ControlMode) attribute in AttributeList from the DUT");
+        case 26: {
+            LogStep(26, "TH reads optional attribute(ControlMode) attribute in AttributeList from the DUT");
             VerifyOrDo(!ShouldSkip("PCC.S.A0021"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), PumpConfigurationAndControl::Id,
                                  PumpConfigurationAndControl::Attributes::AttributeList::Id, true, chip::NullOptional);
         }
-        case 20: {
-            LogStep(20, "TH reads the AcceptedCommandList attribute from the DUT");
+        case 27: {
+            LogStep(27, "TH reads the AcceptedCommandList attribute from the DUT");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), PumpConfigurationAndControl::Id,
                                  PumpConfigurationAndControl::Attributes::AcceptedCommandList::Id, true, chip::NullOptional);
         }
-        case 21: {
-            LogStep(21, "TH reads the GeneratedCommandList attribute from the DUT");
+        case 28: {
+            LogStep(28, "TH reads the GeneratedCommandList attribute from the DUT");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), PumpConfigurationAndControl::Id,
                                  PumpConfigurationAndControl::Attributes::GeneratedCommandList::Id, true, chip::NullOptional);
         }
@@ -38996,7 +39106,7 @@ class Test_TC_PCC_2_2Suite : public TestCommand
         }
         case 3: {
             LogStep(3, "TH write 1 (Minimum) to the OperationMode attribute to DUT");
-            VerifyOrDo(!ShouldSkip("PCC.S.A0020 && PCC.M.ControlModeConstSpeed"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("PCC.S.F03 && PCC.S.A0020"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::PumpConfigurationAndControl::PumpOperationMode value;
             value = static_cast<chip::app::Clusters::PumpConfigurationAndControl::PumpOperationMode>(1);
@@ -39006,13 +39116,13 @@ class Test_TC_PCC_2_2Suite : public TestCommand
         }
         case 4: {
             LogStep(4, "TH reads from the DUT the EffectiveOperationMode attribute");
-            VerifyOrDo(!ShouldSkip("PCC.S.A0011 && PCC.M.ControlModeConstSpeed"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("PCC.S.F03 && PCC.S.A0011"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), PumpConfigurationAndControl::Id,
                                  PumpConfigurationAndControl::Attributes::EffectiveOperationMode::Id, true, chip::NullOptional);
         }
         case 5: {
             LogStep(5, "TH write 2 (Maximum) to the OperationMode attribute to DUT one at a time.");
-            VerifyOrDo(!ShouldSkip("PCC.S.A0020 && PCC.M.ControlModeConstSpeed"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("PCC.S.F03 && PCC.S.A0020"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::PumpConfigurationAndControl::PumpOperationMode value;
             value = static_cast<chip::app::Clusters::PumpConfigurationAndControl::PumpOperationMode>(2);
@@ -39022,13 +39132,13 @@ class Test_TC_PCC_2_2Suite : public TestCommand
         }
         case 6: {
             LogStep(6, "TH reads from the DUT the EffectiveOperationMode attribute");
-            VerifyOrDo(!ShouldSkip("PCC.S.A0011 && PCC.M.ControlModeConstSpeed"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("PCC.S.F03 && PCC.S.A0011"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), PumpConfigurationAndControl::Id,
                                  PumpConfigurationAndControl::Attributes::EffectiveOperationMode::Id, true, chip::NullOptional);
         }
         case 7: {
             LogStep(7, "TH write 3 (Local) to the OperationMode attribute to DUT");
-            VerifyOrDo(!ShouldSkip("PCC.S.A0020"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("PCC.S.F06 && PCC.S.A0020"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::PumpConfigurationAndControl::PumpOperationMode value;
             value = static_cast<chip::app::Clusters::PumpConfigurationAndControl::PumpOperationMode>(3);
@@ -39038,7 +39148,7 @@ class Test_TC_PCC_2_2Suite : public TestCommand
         }
         case 8: {
             LogStep(8, "TH reads from the DUT the EffectiveOperationMode attribute");
-            VerifyOrDo(!ShouldSkip("PCC.S.A0011"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("PCC.S.F06 && PCC.S.A0011"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), PumpConfigurationAndControl::Id,
                                  PumpConfigurationAndControl::Attributes::EffectiveOperationMode::Id, true, chip::NullOptional);
         }
@@ -39218,7 +39328,7 @@ class Test_TC_PCC_2_3Suite : public TestCommand
         }
         case 3: {
             LogStep(3, "Write 0 to the ControlMode attribute to DUT");
-            VerifyOrDo(!ShouldSkip("PCC.S.A0021 && PCC.M.ControlModeConstSpeed"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("PCC.S.F03 && PCC.S.A0021"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::PumpConfigurationAndControl::PumpControlMode value;
             value = static_cast<chip::app::Clusters::PumpConfigurationAndControl::PumpControlMode>(0);
@@ -39228,14 +39338,13 @@ class Test_TC_PCC_2_3Suite : public TestCommand
         }
         case 4: {
             LogStep(4, "Reads the attribute: EffectiveControlMode");
-            VerifyOrDo(!ShouldSkip("PCC.S.A0012 && PCC.M.ControlModeConstSpeed"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("PCC.S.F03 && PCC.S.A0012"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), PumpConfigurationAndControl::Id,
                                  PumpConfigurationAndControl::Attributes::EffectiveControlMode::Id, true, chip::NullOptional);
         }
         case 5: {
             LogStep(5, "Write 1 to the ControlMode attribute to DUT");
-            VerifyOrDo(!ShouldSkip("PCC.S.A0021 && PCC.M.ControlModeConstPressure"),
-                       return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("PCC.S.F00 && PCC.S.A0021"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::PumpConfigurationAndControl::PumpControlMode value;
             value = static_cast<chip::app::Clusters::PumpConfigurationAndControl::PumpControlMode>(1);
@@ -39245,14 +39354,13 @@ class Test_TC_PCC_2_3Suite : public TestCommand
         }
         case 6: {
             LogStep(6, "Reads the attribute: EffectiveControlMode");
-            VerifyOrDo(!ShouldSkip("PCC.S.A0012 && PCC.M.ControlModeConstPressure"),
-                       return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("PCC.S.F00 && PCC.S.A0012"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), PumpConfigurationAndControl::Id,
                                  PumpConfigurationAndControl::Attributes::EffectiveControlMode::Id, true, chip::NullOptional);
         }
         case 7: {
             LogStep(7, "Write 2 to the ControlMode attribute to DUT");
-            VerifyOrDo(!ShouldSkip("PCC.S.A0021 && PCC.M.ControlModeCompPressure"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("PCC.S.F01 && PCC.S.A0021"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::PumpConfigurationAndControl::PumpControlMode value;
             value = static_cast<chip::app::Clusters::PumpConfigurationAndControl::PumpControlMode>(2);
@@ -39262,13 +39370,13 @@ class Test_TC_PCC_2_3Suite : public TestCommand
         }
         case 8: {
             LogStep(8, "Reads the attribute: EffectiveControlMode");
-            VerifyOrDo(!ShouldSkip("PCC.S.A0012 && PCC.M.ControlModeCompPressure"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("PCC.S.F01 && PCC.S.A0012"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), PumpConfigurationAndControl::Id,
                                  PumpConfigurationAndControl::Attributes::EffectiveControlMode::Id, true, chip::NullOptional);
         }
         case 9: {
             LogStep(9, "Write 3 to the ControlMode attribute to DUT");
-            VerifyOrDo(!ShouldSkip("PCC.S.A0021 && PCC.M.ControlModeConstFlow"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("PCC.S.F02 && PCC.S.A0021"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::PumpConfigurationAndControl::PumpControlMode value;
             value = static_cast<chip::app::Clusters::PumpConfigurationAndControl::PumpControlMode>(3);
@@ -39278,13 +39386,13 @@ class Test_TC_PCC_2_3Suite : public TestCommand
         }
         case 10: {
             LogStep(10, "Reads the attribute: EffectiveControlMode");
-            VerifyOrDo(!ShouldSkip("PCC.S.A0012 && PCC.M.ControlModeConstFlow"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("PCC.S.F02 && PCC.S.A0012"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), PumpConfigurationAndControl::Id,
                                  PumpConfigurationAndControl::Attributes::EffectiveControlMode::Id, true, chip::NullOptional);
         }
         case 11: {
             LogStep(11, "Write 5 to the ControlMode attribute to DUT");
-            VerifyOrDo(!ShouldSkip("PCC.S.A0021 && PCC.M.ControlModeConstTemp"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("PCC.S.F04 && PCC.S.A0021"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::PumpConfigurationAndControl::PumpControlMode value;
             value = static_cast<chip::app::Clusters::PumpConfigurationAndControl::PumpControlMode>(5);
@@ -39294,13 +39402,13 @@ class Test_TC_PCC_2_3Suite : public TestCommand
         }
         case 12: {
             LogStep(12, "Reads the attribute: EffectiveControlMode");
-            VerifyOrDo(!ShouldSkip("PCC.S.A0012 && PCC.M.ControlModeConstTemp"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("PCC.S.F04 && PCC.S.A0012"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), PumpConfigurationAndControl::Id,
                                  PumpConfigurationAndControl::Attributes::EffectiveControlMode::Id, true, chip::NullOptional);
         }
         case 13: {
             LogStep(13, "Write 7 to the ControlMode attribute to DUT");
-            VerifyOrDo(!ShouldSkip("PCC.S.A0021 && PCC.M.ControlModeAuto"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("PCC.S.F05 && PCC.S.A0021"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::PumpConfigurationAndControl::PumpControlMode value;
             value = static_cast<chip::app::Clusters::PumpConfigurationAndControl::PumpControlMode>(7);
@@ -39310,7 +39418,7 @@ class Test_TC_PCC_2_3Suite : public TestCommand
         }
         case 14: {
             LogStep(14, "Reads the attribute: EffectiveControlMode");
-            VerifyOrDo(!ShouldSkip("PCC.S.A0012 && PCC.M.ControlModeAuto"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            VerifyOrDo(!ShouldSkip("PCC.S.F02 && PCC.S.A0012"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(1), PumpConfigurationAndControl::Id,
                                  PumpConfigurationAndControl::Attributes::EffectiveControlMode::Id, true, chip::NullOptional);
         }
@@ -45662,7 +45770,7 @@ class Test_TC_DGTHREAD_1_1Suite : public TestCommand
 {
 public:
     Test_TC_DGTHREAD_1_1Suite(CredentialIssuerCommands * credsIssuerConfig) :
-        TestCommand("Test_TC_DGTHREAD_1_1", 56, credsIssuerConfig)
+        TestCommand("Test_TC_DGTHREAD_1_1", 16, credsIssuerConfig)
     {
         AddArgument("nodeId", 0, UINT64_MAX, &mNodeId);
         AddArgument("cluster", &mCluster);
@@ -45807,378 +45915,58 @@ class Test_TC_DGTHREAD_1_1Suite : public TestCommand
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckConstraintType("value", "list", "list"));
                 VerifyOrReturn(CheckConstraintContains("value", value, 14UL));
-            }
-            break;
-        case 10:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                chip::app::DataModel::DecodableList<chip::AttributeId> value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckConstraintType("value", "list", "list"));
                 VerifyOrReturn(CheckConstraintContains("value", value, 15UL));
-            }
-            break;
-        case 11:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                chip::app::DataModel::DecodableList<chip::AttributeId> value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckConstraintType("value", "list", "list"));
                 VerifyOrReturn(CheckConstraintContains("value", value, 16UL));
-            }
-            break;
-        case 12:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                chip::app::DataModel::DecodableList<chip::AttributeId> value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckConstraintType("value", "list", "list"));
                 VerifyOrReturn(CheckConstraintContains("value", value, 17UL));
-            }
-            break;
-        case 13:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                chip::app::DataModel::DecodableList<chip::AttributeId> value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckConstraintType("value", "list", "list"));
                 VerifyOrReturn(CheckConstraintContains("value", value, 18UL));
-            }
-            break;
-        case 14:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                chip::app::DataModel::DecodableList<chip::AttributeId> value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckConstraintType("value", "list", "list"));
                 VerifyOrReturn(CheckConstraintContains("value", value, 19UL));
-            }
-            break;
-        case 15:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                chip::app::DataModel::DecodableList<chip::AttributeId> value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckConstraintType("value", "list", "list"));
                 VerifyOrReturn(CheckConstraintContains("value", value, 20UL));
-            }
-            break;
-        case 16:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                chip::app::DataModel::DecodableList<chip::AttributeId> value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckConstraintType("value", "list", "list"));
                 VerifyOrReturn(CheckConstraintContains("value", value, 21UL));
             }
             break;
-        case 17:
+        case 10:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::DecodableList<chip::AttributeId> value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckConstraintType("value", "list", "list"));
                 VerifyOrReturn(CheckConstraintContains("value", value, 22UL));
-            }
-            break;
-        case 18:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                chip::app::DataModel::DecodableList<chip::AttributeId> value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckConstraintType("value", "list", "list"));
                 VerifyOrReturn(CheckConstraintContains("value", value, 23UL));
-            }
-            break;
-        case 19:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                chip::app::DataModel::DecodableList<chip::AttributeId> value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckConstraintType("value", "list", "list"));
                 VerifyOrReturn(CheckConstraintContains("value", value, 24UL));
-            }
-            break;
-        case 20:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                chip::app::DataModel::DecodableList<chip::AttributeId> value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckConstraintType("value", "list", "list"));
                 VerifyOrReturn(CheckConstraintContains("value", value, 25UL));
-            }
-            break;
-        case 21:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                chip::app::DataModel::DecodableList<chip::AttributeId> value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckConstraintType("value", "list", "list"));
                 VerifyOrReturn(CheckConstraintContains("value", value, 26UL));
-            }
-            break;
-        case 22:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                chip::app::DataModel::DecodableList<chip::AttributeId> value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckConstraintType("value", "list", "list"));
                 VerifyOrReturn(CheckConstraintContains("value", value, 27UL));
-            }
-            break;
-        case 23:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                chip::app::DataModel::DecodableList<chip::AttributeId> value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckConstraintType("value", "list", "list"));
                 VerifyOrReturn(CheckConstraintContains("value", value, 28UL));
-            }
-            break;
-        case 24:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                chip::app::DataModel::DecodableList<chip::AttributeId> value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckConstraintType("value", "list", "list"));
                 VerifyOrReturn(CheckConstraintContains("value", value, 29UL));
-            }
-            break;
-        case 25:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                chip::app::DataModel::DecodableList<chip::AttributeId> value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckConstraintType("value", "list", "list"));
                 VerifyOrReturn(CheckConstraintContains("value", value, 30UL));
-            }
-            break;
-        case 26:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                chip::app::DataModel::DecodableList<chip::AttributeId> value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckConstraintType("value", "list", "list"));
                 VerifyOrReturn(CheckConstraintContains("value", value, 31UL));
-            }
-            break;
-        case 27:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                chip::app::DataModel::DecodableList<chip::AttributeId> value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckConstraintType("value", "list", "list"));
                 VerifyOrReturn(CheckConstraintContains("value", value, 32UL));
-            }
-            break;
-        case 28:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                chip::app::DataModel::DecodableList<chip::AttributeId> value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckConstraintType("value", "list", "list"));
                 VerifyOrReturn(CheckConstraintContains("value", value, 33UL));
-            }
-            break;
-        case 29:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                chip::app::DataModel::DecodableList<chip::AttributeId> value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckConstraintType("value", "list", "list"));
                 VerifyOrReturn(CheckConstraintContains("value", value, 34UL));
-            }
-            break;
-        case 30:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                chip::app::DataModel::DecodableList<chip::AttributeId> value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckConstraintType("value", "list", "list"));
                 VerifyOrReturn(CheckConstraintContains("value", value, 35UL));
-            }
-            break;
-        case 31:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                chip::app::DataModel::DecodableList<chip::AttributeId> value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckConstraintType("value", "list", "list"));
                 VerifyOrReturn(CheckConstraintContains("value", value, 36UL));
-            }
-            break;
-        case 32:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                chip::app::DataModel::DecodableList<chip::AttributeId> value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckConstraintType("value", "list", "list"));
                 VerifyOrReturn(CheckConstraintContains("value", value, 37UL));
-            }
-            break;
-        case 33:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                chip::app::DataModel::DecodableList<chip::AttributeId> value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckConstraintType("value", "list", "list"));
                 VerifyOrReturn(CheckConstraintContains("value", value, 38UL));
-            }
-            break;
-        case 34:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                chip::app::DataModel::DecodableList<chip::AttributeId> value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckConstraintType("value", "list", "list"));
                 VerifyOrReturn(CheckConstraintContains("value", value, 39UL));
-            }
-            break;
-        case 35:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                chip::app::DataModel::DecodableList<chip::AttributeId> value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckConstraintType("value", "list", "list"));
                 VerifyOrReturn(CheckConstraintContains("value", value, 40UL));
-            }
-            break;
-        case 36:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                chip::app::DataModel::DecodableList<chip::AttributeId> value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckConstraintType("value", "list", "list"));
                 VerifyOrReturn(CheckConstraintContains("value", value, 41UL));
-            }
-            break;
-        case 37:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                chip::app::DataModel::DecodableList<chip::AttributeId> value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckConstraintType("value", "list", "list"));
                 VerifyOrReturn(CheckConstraintContains("value", value, 42UL));
-            }
-            break;
-        case 38:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                chip::app::DataModel::DecodableList<chip::AttributeId> value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckConstraintType("value", "list", "list"));
                 VerifyOrReturn(CheckConstraintContains("value", value, 43UL));
-            }
-            break;
-        case 39:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                chip::app::DataModel::DecodableList<chip::AttributeId> value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckConstraintType("value", "list", "list"));
                 VerifyOrReturn(CheckConstraintContains("value", value, 44UL));
-            }
-            break;
-        case 40:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                chip::app::DataModel::DecodableList<chip::AttributeId> value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckConstraintType("value", "list", "list"));
                 VerifyOrReturn(CheckConstraintContains("value", value, 45UL));
-            }
-            break;
-        case 41:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                chip::app::DataModel::DecodableList<chip::AttributeId> value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckConstraintType("value", "list", "list"));
                 VerifyOrReturn(CheckConstraintContains("value", value, 46UL));
-            }
-            break;
-        case 42:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                chip::app::DataModel::DecodableList<chip::AttributeId> value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckConstraintType("value", "list", "list"));
                 VerifyOrReturn(CheckConstraintContains("value", value, 47UL));
-            }
-            break;
-        case 43:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                chip::app::DataModel::DecodableList<chip::AttributeId> value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckConstraintType("value", "list", "list"));
                 VerifyOrReturn(CheckConstraintContains("value", value, 48UL));
-            }
-            break;
-        case 44:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                chip::app::DataModel::DecodableList<chip::AttributeId> value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckConstraintType("value", "list", "list"));
                 VerifyOrReturn(CheckConstraintContains("value", value, 49UL));
-            }
-            break;
-        case 45:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                chip::app::DataModel::DecodableList<chip::AttributeId> value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckConstraintType("value", "list", "list"));
                 VerifyOrReturn(CheckConstraintContains("value", value, 50UL));
-            }
-            break;
-        case 46:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                chip::app::DataModel::DecodableList<chip::AttributeId> value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckConstraintType("value", "list", "list"));
                 VerifyOrReturn(CheckConstraintContains("value", value, 51UL));
-            }
-            break;
-        case 47:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                chip::app::DataModel::DecodableList<chip::AttributeId> value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckConstraintType("value", "list", "list"));
                 VerifyOrReturn(CheckConstraintContains("value", value, 52UL));
-            }
-            break;
-        case 48:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                chip::app::DataModel::DecodableList<chip::AttributeId> value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckConstraintType("value", "list", "list"));
                 VerifyOrReturn(CheckConstraintContains("value", value, 53UL));
-            }
-            break;
-        case 49:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                chip::app::DataModel::DecodableList<chip::AttributeId> value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckConstraintType("value", "list", "list"));
                 VerifyOrReturn(CheckConstraintContains("value", value, 54UL));
-            }
-            break;
-        case 50:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            {
-                chip::app::DataModel::DecodableList<chip::AttributeId> value;
-                VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
-                VerifyOrReturn(CheckConstraintType("value", "list", "list"));
                 VerifyOrReturn(CheckConstraintContains("value", value, 55UL));
             }
             break;
-        case 51:
+        case 11:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::DecodableList<chip::AttributeId> value;
@@ -46187,7 +45975,7 @@ class Test_TC_DGTHREAD_1_1Suite : public TestCommand
                 VerifyOrReturn(CheckConstraintContains("value", value, 56UL));
             }
             break;
-        case 52:
+        case 12:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::DecodableList<chip::AttributeId> value;
@@ -46196,7 +45984,7 @@ class Test_TC_DGTHREAD_1_1Suite : public TestCommand
                 VerifyOrReturn(CheckConstraintContains("value", value, 57UL));
             }
             break;
-        case 53:
+        case 13:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::DecodableList<chip::AttributeId> value;
@@ -46205,7 +45993,7 @@ class Test_TC_DGTHREAD_1_1Suite : public TestCommand
                 VerifyOrReturn(CheckConstraintContains("value", value, 58UL));
             }
             break;
-        case 54:
+        case 14:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::DecodableList<chip::CommandId> value;
@@ -46214,7 +46002,7 @@ class Test_TC_DGTHREAD_1_1Suite : public TestCommand
                 VerifyOrReturn(CheckConstraintContains("value", value, 0UL));
             }
             break;
-        case 55:
+        case 15:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
                 chip::app::DataModel::DecodableList<chip::CommandId> value;
@@ -46302,282 +46090,42 @@ class Test_TC_DGTHREAD_1_1Suite : public TestCommand
                                  ThreadNetworkDiagnostics::Attributes::AttributeList::Id, true, chip::NullOptional);
         }
         case 9: {
-            LogStep(9, "TH reads optional attribute (DetachedRoleCount) in AttributeList");
-            VerifyOrDo(!ShouldSkip("DGTHREAD.S.A000e"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            LogStep(9, "TH reads Feature dependent attribute (DGTHREAD.S.F02(MLECNT)) in attributeList");
+            VerifyOrDo(!ShouldSkip("DGTHREAD.S.F02"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(0), ThreadNetworkDiagnostics::Id,
                                  ThreadNetworkDiagnostics::Attributes::AttributeList::Id, true, chip::NullOptional);
         }
         case 10: {
-            LogStep(10, "TH reads optional attribute (ChildRoleCount) AttributeList");
-            VerifyOrDo(!ShouldSkip("DGTHREAD.S.A001f"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
+            LogStep(10, "TH reads Feature dependent attribute (DGTHREAD.S.F03(MACCNT)) in attributeList");
+            VerifyOrDo(!ShouldSkip("DGTHREAD.S.F03"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(0), ThreadNetworkDiagnostics::Id,
                                  ThreadNetworkDiagnostics::Attributes::AttributeList::Id, true, chip::NullOptional);
         }
         case 11: {
-            LogStep(11, "TH reads optional attribute (RouterRoleCount) in AttributeList");
-            VerifyOrDo(!ShouldSkip("DGTHREAD.S.A0010"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(0), ThreadNetworkDiagnostics::Id,
-                                 ThreadNetworkDiagnostics::Attributes::AttributeList::Id, true, chip::NullOptional);
-        }
-        case 12: {
-            LogStep(12, "TH reads optional attribute (LeaderRoleCount) in AttributeList");
-            VerifyOrDo(!ShouldSkip("DGTHREAD.S.A0011"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(0), ThreadNetworkDiagnostics::Id,
-                                 ThreadNetworkDiagnostics::Attributes::AttributeList::Id, true, chip::NullOptional);
-        }
-        case 13: {
-            LogStep(13, "TH reads optional attribute (AttachAttemptCount) in AttributeList");
-            VerifyOrDo(!ShouldSkip("DGTHREAD.S.A0012"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(0), ThreadNetworkDiagnostics::Id,
-                                 ThreadNetworkDiagnostics::Attributes::AttributeList::Id, true, chip::NullOptional);
-        }
-        case 14: {
-            LogStep(14, "TH reads optional attribute (PartitionIdChangeCount) in AttributeList");
-            VerifyOrDo(!ShouldSkip("DGTHREAD.S.A0013"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(0), ThreadNetworkDiagnostics::Id,
-                                 ThreadNetworkDiagnostics::Attributes::AttributeList::Id, true, chip::NullOptional);
-        }
-        case 15: {
-            LogStep(15, "TH reads optional attribute (BetterPartitionAttachAttemptCount) in AttributeList");
-            VerifyOrDo(!ShouldSkip("DGTHREAD.S.A0014"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(0), ThreadNetworkDiagnostics::Id,
-                                 ThreadNetworkDiagnostics::Attributes::AttributeList::Id, true, chip::NullOptional);
-        }
-        case 16: {
-            LogStep(16, "TH reads optional attribute (ParentChangeCount) in AttributeList");
-            VerifyOrDo(!ShouldSkip("DGTHREAD.S.A0015"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(0), ThreadNetworkDiagnostics::Id,
-                                 ThreadNetworkDiagnostics::Attributes::AttributeList::Id, true, chip::NullOptional);
-        }
-        case 17: {
-            LogStep(17, "TH reads optional attribute (TxTotalCount) in AttributeList");
-            VerifyOrDo(!ShouldSkip("DGTHREAD.S.A0016"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(0), ThreadNetworkDiagnostics::Id,
-                                 ThreadNetworkDiagnostics::Attributes::AttributeList::Id, true, chip::NullOptional);
-        }
-        case 18: {
-            LogStep(18, "TH reads optional attribute (TxUnicastCount) in AttributeList");
-            VerifyOrDo(!ShouldSkip("DGTHREAD.S.A0017"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(0), ThreadNetworkDiagnostics::Id,
-                                 ThreadNetworkDiagnostics::Attributes::AttributeList::Id, true, chip::NullOptional);
-        }
-        case 19: {
-            LogStep(19, "TH reads optional attribute (TxBroadcastCount) in AttributeList");
-            VerifyOrDo(!ShouldSkip("DGTHREAD.S.A0018"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(0), ThreadNetworkDiagnostics::Id,
-                                 ThreadNetworkDiagnostics::Attributes::AttributeList::Id, true, chip::NullOptional);
-        }
-        case 20: {
-            LogStep(20, "TH reads optional attribute (TxAckRequestedCount) in AttributeList");
-            VerifyOrDo(!ShouldSkip("DGTHREAD.S.A0019"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(0), ThreadNetworkDiagnostics::Id,
-                                 ThreadNetworkDiagnostics::Attributes::AttributeList::Id, true, chip::NullOptional);
-        }
-        case 21: {
-            LogStep(21, "TH reads optional attribute (TxAckedCount) in AttributeList");
-            VerifyOrDo(!ShouldSkip("DGTHREAD.S.A001a"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(0), ThreadNetworkDiagnostics::Id,
-                                 ThreadNetworkDiagnostics::Attributes::AttributeList::Id, true, chip::NullOptional);
-        }
-        case 22: {
-            LogStep(22, "TH reads optional attribute (TxNoAckRequestedCount) in AttributeList");
-            VerifyOrDo(!ShouldSkip("DGTHREAD.S.A001b"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(0), ThreadNetworkDiagnostics::Id,
-                                 ThreadNetworkDiagnostics::Attributes::AttributeList::Id, true, chip::NullOptional);
-        }
-        case 23: {
-            LogStep(23, "TH reads optional attributes (TxDataCount) in AttributeList");
-            VerifyOrDo(!ShouldSkip("DGTHREAD.S.A001c"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(0), ThreadNetworkDiagnostics::Id,
-                                 ThreadNetworkDiagnostics::Attributes::AttributeList::Id, true, chip::NullOptional);
-        }
-        case 24: {
-            LogStep(24, "TH reads optional attribute (TxDataPollCount) in AttributeList");
-            VerifyOrDo(!ShouldSkip("DGTHREAD.S.A001d"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(0), ThreadNetworkDiagnostics::Id,
-                                 ThreadNetworkDiagnostics::Attributes::AttributeList::Id, true, chip::NullOptional);
-        }
-        case 25: {
-            LogStep(25, "TH reads optional attribute (TxBeaconCount) in AttributeList");
-            VerifyOrDo(!ShouldSkip("DGTHREAD.S.A001e"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(0), ThreadNetworkDiagnostics::Id,
-                                 ThreadNetworkDiagnostics::Attributes::AttributeList::Id, true, chip::NullOptional);
-        }
-        case 26: {
-            LogStep(26, "TH reads optional attribute (TxBeaconRequestCount) in AttributeList");
-            VerifyOrDo(!ShouldSkip("DGTHREAD.S.A001f"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(0), ThreadNetworkDiagnostics::Id,
-                                 ThreadNetworkDiagnostics::Attributes::AttributeList::Id, true, chip::NullOptional);
-        }
-        case 27: {
-            LogStep(27, "TH reads optional attribute (TxOtherCount) in AttributeList");
-            VerifyOrDo(!ShouldSkip("DGTHREAD.S.A0020"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(0), ThreadNetworkDiagnostics::Id,
-                                 ThreadNetworkDiagnostics::Attributes::AttributeList::Id, true, chip::NullOptional);
-        }
-        case 28: {
-            LogStep(28, "TH reads optional attribute (TxRetryCount) in AttributeList");
-            VerifyOrDo(!ShouldSkip("DGTHREAD.S.A0021"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(0), ThreadNetworkDiagnostics::Id,
-                                 ThreadNetworkDiagnostics::Attributes::AttributeList::Id, true, chip::NullOptional);
-        }
-        case 29: {
-            LogStep(29, "TH reads optional attribute (TxDirectMaxRetryExpiryCount) in AttributeList");
-            VerifyOrDo(!ShouldSkip("DGTHREAD.S.A0022"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(0), ThreadNetworkDiagnostics::Id,
-                                 ThreadNetworkDiagnostics::Attributes::AttributeList::Id, true, chip::NullOptional);
-        }
-        case 30: {
-            LogStep(30, "TH reads optional attribute (TxIndirectMaxRetryExpiryCount) in AttributeList");
-            VerifyOrDo(!ShouldSkip("DGTHREAD.S.A0023"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(0), ThreadNetworkDiagnostics::Id,
-                                 ThreadNetworkDiagnostics::Attributes::AttributeList::Id, true, chip::NullOptional);
-        }
-        case 31: {
-            LogStep(31, "TH reads optional attribute (TxErrCcaCount) in AttributeList");
-            VerifyOrDo(!ShouldSkip("DGTHREAD.S.A0024"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(0), ThreadNetworkDiagnostics::Id,
-                                 ThreadNetworkDiagnostics::Attributes::AttributeList::Id, true, chip::NullOptional);
-        }
-        case 32: {
-            LogStep(32, "TH reads optional attribute (TxErrAbortCount) in AttributeList");
-            VerifyOrDo(!ShouldSkip("DGTHREAD.S.A0025"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(0), ThreadNetworkDiagnostics::Id,
-                                 ThreadNetworkDiagnostics::Attributes::AttributeList::Id, true, chip::NullOptional);
-        }
-        case 33: {
-            LogStep(33, "TH reads optional attribute (TxErrBusyChannelCount) in AttributeList");
-            VerifyOrDo(!ShouldSkip("DGTHREAD.S.A0026"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(0), ThreadNetworkDiagnostics::Id,
-                                 ThreadNetworkDiagnostics::Attributes::AttributeList::Id, true, chip::NullOptional);
-        }
-        case 34: {
-            LogStep(34, "TH reads optional attribute (RxTotalCount) in AttributeList");
-            VerifyOrDo(!ShouldSkip("DGTHREAD.S.A0027"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(0), ThreadNetworkDiagnostics::Id,
-                                 ThreadNetworkDiagnostics::Attributes::AttributeList::Id, true, chip::NullOptional);
-        }
-        case 35: {
-            LogStep(35, "TH reads optional attribute (RxUnicastCount) in AttributeList");
-            VerifyOrDo(!ShouldSkip("DGTHREAD.S.A0028"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(0), ThreadNetworkDiagnostics::Id,
-                                 ThreadNetworkDiagnostics::Attributes::AttributeList::Id, true, chip::NullOptional);
-        }
-        case 36: {
-            LogStep(36, "TH reads optional attribute (RxBroadcastCount) in AttributeList");
-            VerifyOrDo(!ShouldSkip("DGTHREAD.S.A0029"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(0), ThreadNetworkDiagnostics::Id,
-                                 ThreadNetworkDiagnostics::Attributes::AttributeList::Id, true, chip::NullOptional);
-        }
-        case 37: {
-            LogStep(37, "TH reads optional attribute (RxDataCount) in AttributeList");
-            VerifyOrDo(!ShouldSkip("DGTHREAD.S.A002a"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(0), ThreadNetworkDiagnostics::Id,
-                                 ThreadNetworkDiagnostics::Attributes::AttributeList::Id, true, chip::NullOptional);
-        }
-        case 38: {
-            LogStep(38, "TH reads optional attribute (RxDataPollCount) in AttributeList");
-            VerifyOrDo(!ShouldSkip("DGTHREAD.S.A002b"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(0), ThreadNetworkDiagnostics::Id,
-                                 ThreadNetworkDiagnostics::Attributes::AttributeList::Id, true, chip::NullOptional);
-        }
-        case 39: {
-            LogStep(39, "TH reads optional attribute (RxBeaconCount) in AttributeList");
-            VerifyOrDo(!ShouldSkip("DGTHREAD.S.A002c"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(0), ThreadNetworkDiagnostics::Id,
-                                 ThreadNetworkDiagnostics::Attributes::AttributeList::Id, true, chip::NullOptional);
-        }
-        case 40: {
-            LogStep(40, "TH reads optional attribute (RxBeaconRequestCount) in AttributeList");
-            VerifyOrDo(!ShouldSkip("DGTHREAD.S.A002d"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(0), ThreadNetworkDiagnostics::Id,
-                                 ThreadNetworkDiagnostics::Attributes::AttributeList::Id, true, chip::NullOptional);
-        }
-        case 41: {
-            LogStep(41, "TH reads optional attribute (RxOtherCount) in AttributeList");
-            VerifyOrDo(!ShouldSkip("DGTHREAD.S.A002e"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(0), ThreadNetworkDiagnostics::Id,
-                                 ThreadNetworkDiagnostics::Attributes::AttributeList::Id, true, chip::NullOptional);
-        }
-        case 42: {
-            LogStep(42, "TH reads optional attribute (RxAddressFilteredCount) in AttributeList");
-            VerifyOrDo(!ShouldSkip("DGTHREAD.S.A002f"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(0), ThreadNetworkDiagnostics::Id,
-                                 ThreadNetworkDiagnostics::Attributes::AttributeList::Id, true, chip::NullOptional);
-        }
-        case 43: {
-            LogStep(43, "TH reads optional attribute (RxDestAddrFilteredCount) in AttributeList");
-            VerifyOrDo(!ShouldSkip("DGTHREAD.S.A0030"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(0), ThreadNetworkDiagnostics::Id,
-                                 ThreadNetworkDiagnostics::Attributes::AttributeList::Id, true, chip::NullOptional);
-        }
-        case 44: {
-            LogStep(44, "TH reads optional attribute (RxDuplicatedCount) in AttributeList");
-            VerifyOrDo(!ShouldSkip("DGTHREAD.S.A0031"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(0), ThreadNetworkDiagnostics::Id,
-                                 ThreadNetworkDiagnostics::Attributes::AttributeList::Id, true, chip::NullOptional);
-        }
-        case 45: {
-            LogStep(45, "TH reads optional attribute (RxErrNoFrameCount) in AttributeList");
-            VerifyOrDo(!ShouldSkip("DGTHREAD.S.A0032"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(0), ThreadNetworkDiagnostics::Id,
-                                 ThreadNetworkDiagnostics::Attributes::AttributeList::Id, true, chip::NullOptional);
-        }
-        case 46: {
-            LogStep(46, "TH reads optional attribute (RxErrUnknownNeighborCount) in AttributeList");
-            VerifyOrDo(!ShouldSkip("DGTHREAD.S.A0033"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(0), ThreadNetworkDiagnostics::Id,
-                                 ThreadNetworkDiagnostics::Attributes::AttributeList::Id, true, chip::NullOptional);
-        }
-        case 47: {
-            LogStep(47, "TH reads optional attribute (RxErrInvalidScrAddrCount) in AttributeList");
-            VerifyOrDo(!ShouldSkip("DGTHREAD.S.A0034"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(0), ThreadNetworkDiagnostics::Id,
-                                 ThreadNetworkDiagnostics::Attributes::AttributeList::Id, true, chip::NullOptional);
-        }
-        case 48: {
-            LogStep(48, "TH reads optional attribute (RxErrSecCount) in AttributeList");
-            VerifyOrDo(!ShouldSkip("DGTHREAD.S.A0035"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(0), ThreadNetworkDiagnostics::Id,
-                                 ThreadNetworkDiagnostics::Attributes::AttributeList::Id, true, chip::NullOptional);
-        }
-        case 49: {
-            LogStep(49, "TH reads optional attribute (RxErrFcsCount) in AttributeList");
-            VerifyOrDo(!ShouldSkip("DGTHREAD.S.A0036"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(0), ThreadNetworkDiagnostics::Id,
-                                 ThreadNetworkDiagnostics::Attributes::AttributeList::Id, true, chip::NullOptional);
-        }
-        case 50: {
-            LogStep(50, "TH reads optional attribute (RxErrOtherCount) in AttributeList");
-            VerifyOrDo(!ShouldSkip("DGTHREAD.S.A0037"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
-            return ReadAttribute(kIdentityAlpha, GetEndpoint(0), ThreadNetworkDiagnostics::Id,
-                                 ThreadNetworkDiagnostics::Attributes::AttributeList::Id, true, chip::NullOptional);
-        }
-        case 51: {
-            LogStep(51, "Read the optional attribute (ActiveTimestamp) in AttributeList");
+            LogStep(11, "Read the optional attribute (ActiveTimestamp) in AttributeList");
             VerifyOrDo(!ShouldSkip("DGTHREAD.S.A0038"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(0), ThreadNetworkDiagnostics::Id,
                                  ThreadNetworkDiagnostics::Attributes::AttributeList::Id, true, chip::NullOptional);
         }
-        case 52: {
-            LogStep(52, "Read the optional attribute (PendingTimestamp) in AttributeList");
+        case 12: {
+            LogStep(12, "Read the optional attribute (PendingTimestamp) in AttributeList");
             VerifyOrDo(!ShouldSkip("DGTHREAD.S.A0039"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(0), ThreadNetworkDiagnostics::Id,
                                  ThreadNetworkDiagnostics::Attributes::AttributeList::Id, true, chip::NullOptional);
         }
-        case 53: {
-            LogStep(53, "Read the optional attribute (Delay) in AttributeList");
+        case 13: {
+            LogStep(13, "Read the optional attribute (Delay) in AttributeList");
             VerifyOrDo(!ShouldSkip("DGTHREAD.S.A003a"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             return ReadAttribute(kIdentityAlpha, GetEndpoint(0), ThreadNetworkDiagnostics::Id,
                                  ThreadNetworkDiagnostics::Attributes::AttributeList::Id, true, chip::NullOptional);
         }
-        case 54: {
-            LogStep(54, "TH reads AcceptedCommandList from DUT");
+        case 14: {
+            LogStep(14, "TH reads AcceptedCommandList from DUT");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(0), ThreadNetworkDiagnostics::Id,
                                  ThreadNetworkDiagnostics::Attributes::AcceptedCommandList::Id, true, chip::NullOptional);
         }
-        case 55: {
-            LogStep(55, "TH reads GeneratedCommandList from DUT");
+        case 15: {
+            LogStep(15, "TH reads GeneratedCommandList from DUT");
             return ReadAttribute(kIdentityAlpha, GetEndpoint(0), ThreadNetworkDiagnostics::Id,
                                  ThreadNetworkDiagnostics::Attributes::GeneratedCommandList::Id, true, chip::NullOptional);
         }
@@ -72030,7 +71578,7 @@ class TestCommissioningWindowSuite : public TestCommand
         case 2:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatus value;
+                chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatusEnum value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckValue("windowStatus", value, 0U));
             }
@@ -72057,7 +71605,7 @@ class TestCommissioningWindowSuite : public TestCommand
         case 6:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatus value;
+                chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatusEnum value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckValue("windowStatus", value, 2U));
             }
@@ -72085,7 +71633,7 @@ class TestCommissioningWindowSuite : public TestCommand
         case 10:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatus value;
+                chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatusEnum value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckValue("windowStatus", value, 0U));
             }
@@ -72120,7 +71668,7 @@ class TestCommissioningWindowSuite : public TestCommand
         case 16:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatus value;
+                chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatusEnum value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckValue("windowStatus", value, 0U));
             }
@@ -72155,7 +71703,7 @@ class TestCommissioningWindowSuite : public TestCommand
         case 21:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatus value;
+                chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatusEnum value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckValue("windowStatus", value, 2U));
             }
@@ -72188,7 +71736,7 @@ class TestCommissioningWindowSuite : public TestCommand
         case 25:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatus value;
+                chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatusEnum value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckValue("windowStatus", value, 2U));
             }
@@ -73879,7 +73427,7 @@ class TestSubscribe_AdministratorCommissioningSuite : public TestCommand
         case 2:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatus value;
+                chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatusEnum value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckValue("windowStatus", value, 0U));
             }
@@ -73890,7 +73438,7 @@ class TestSubscribe_AdministratorCommissioningSuite : public TestCommand
         case 4:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatus value;
+                chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatusEnum value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckValue("windowStatus", value, 2U));
             }
@@ -73902,7 +73450,7 @@ class TestSubscribe_AdministratorCommissioningSuite : public TestCommand
         case 6:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatus value;
+                chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatusEnum value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckValue("windowStatus", value, 0U));
             }
@@ -74178,7 +73726,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckValue("userIndex", value.userIndex, 1U));
                 VerifyOrReturn(CheckValueNull("userName", value.userName));
-                VerifyOrReturn(CheckValueNull("userUniqueId", value.userUniqueId));
+                VerifyOrReturn(CheckValueNull("userUniqueID", value.userUniqueID));
                 VerifyOrReturn(CheckValueNull("userStatus", value.userStatus));
                 VerifyOrReturn(CheckValueNull("userType", value.userType));
                 VerifyOrReturn(CheckValueNull("credentialRule", value.credentialRule));
@@ -74214,7 +73762,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand
                 VerifyOrReturn(CheckValue("userIndex", value.userIndex, 1U));
                 VerifyOrReturn(CheckValueNonNull("userName", value.userName));
                 VerifyOrReturn(CheckValueAsString("userName.Value()", value.userName.Value(), chip::CharSpan("", 0)));
-                VerifyOrReturn(CheckValueNull("userUniqueId", value.userUniqueId));
+                VerifyOrReturn(CheckValueNull("userUniqueID", value.userUniqueID));
                 VerifyOrReturn(CheckValueNonNull("userStatus", value.userStatus));
                 VerifyOrReturn(CheckValue("userStatus.Value()", value.userStatus.Value(), 1U));
                 VerifyOrReturn(CheckValueNonNull("userType", value.userType));
@@ -74243,7 +73791,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand
                 VerifyOrReturn(CheckValue("userIndex", value.userIndex, 1U));
                 VerifyOrReturn(CheckValueNonNull("userName", value.userName));
                 VerifyOrReturn(CheckValueAsString("userName.Value()", value.userName.Value(), chip::CharSpan("new_user", 8)));
-                VerifyOrReturn(CheckValueNull("userUniqueId", value.userUniqueId));
+                VerifyOrReturn(CheckValueNull("userUniqueID", value.userUniqueID));
                 VerifyOrReturn(CheckValueNonNull("userStatus", value.userStatus));
                 VerifyOrReturn(CheckValue("userStatus.Value()", value.userStatus.Value(), 1U));
                 VerifyOrReturn(CheckValueNonNull("userType", value.userType));
@@ -74269,8 +73817,8 @@ class DL_UsersAndCredentialsSuite : public TestCommand
                 VerifyOrReturn(CheckValue("userIndex", value.userIndex, 1U));
                 VerifyOrReturn(CheckValueNonNull("userName", value.userName));
                 VerifyOrReturn(CheckValueAsString("userName.Value()", value.userName.Value(), chip::CharSpan("new_user", 8)));
-                VerifyOrReturn(CheckValueNonNull("userUniqueId", value.userUniqueId));
-                VerifyOrReturn(CheckValue("userUniqueId.Value()", value.userUniqueId.Value(), 305441741UL));
+                VerifyOrReturn(CheckValueNonNull("userUniqueID", value.userUniqueID));
+                VerifyOrReturn(CheckValue("userUniqueID.Value()", value.userUniqueID.Value(), 305441741UL));
                 VerifyOrReturn(CheckValueNonNull("userStatus", value.userStatus));
                 VerifyOrReturn(CheckValue("userStatus.Value()", value.userStatus.Value(), 1U));
                 VerifyOrReturn(CheckValueNonNull("userType", value.userType));
@@ -74296,8 +73844,8 @@ class DL_UsersAndCredentialsSuite : public TestCommand
                 VerifyOrReturn(CheckValue("userIndex", value.userIndex, 1U));
                 VerifyOrReturn(CheckValueNonNull("userName", value.userName));
                 VerifyOrReturn(CheckValueAsString("userName.Value()", value.userName.Value(), chip::CharSpan("new_user", 8)));
-                VerifyOrReturn(CheckValueNonNull("userUniqueId", value.userUniqueId));
-                VerifyOrReturn(CheckValue("userUniqueId.Value()", value.userUniqueId.Value(), 305441741UL));
+                VerifyOrReturn(CheckValueNonNull("userUniqueID", value.userUniqueID));
+                VerifyOrReturn(CheckValue("userUniqueID.Value()", value.userUniqueID.Value(), 305441741UL));
                 VerifyOrReturn(CheckValueNonNull("userStatus", value.userStatus));
                 VerifyOrReturn(CheckValue("userStatus.Value()", value.userStatus.Value(), 3U));
                 VerifyOrReturn(CheckValueNonNull("userType", value.userType));
@@ -74323,8 +73871,8 @@ class DL_UsersAndCredentialsSuite : public TestCommand
                 VerifyOrReturn(CheckValue("userIndex", value.userIndex, 1U));
                 VerifyOrReturn(CheckValueNonNull("userName", value.userName));
                 VerifyOrReturn(CheckValueAsString("userName.Value()", value.userName.Value(), chip::CharSpan("new_user", 8)));
-                VerifyOrReturn(CheckValueNonNull("userUniqueId", value.userUniqueId));
-                VerifyOrReturn(CheckValue("userUniqueId.Value()", value.userUniqueId.Value(), 305441741UL));
+                VerifyOrReturn(CheckValueNonNull("userUniqueID", value.userUniqueID));
+                VerifyOrReturn(CheckValue("userUniqueID.Value()", value.userUniqueID.Value(), 305441741UL));
                 VerifyOrReturn(CheckValueNonNull("userStatus", value.userStatus));
                 VerifyOrReturn(CheckValue("userStatus.Value()", value.userStatus.Value(), 3U));
                 VerifyOrReturn(CheckValueNonNull("userType", value.userType));
@@ -74350,8 +73898,8 @@ class DL_UsersAndCredentialsSuite : public TestCommand
                 VerifyOrReturn(CheckValue("userIndex", value.userIndex, 1U));
                 VerifyOrReturn(CheckValueNonNull("userName", value.userName));
                 VerifyOrReturn(CheckValueAsString("userName.Value()", value.userName.Value(), chip::CharSpan("new_user", 8)));
-                VerifyOrReturn(CheckValueNonNull("userUniqueId", value.userUniqueId));
-                VerifyOrReturn(CheckValue("userUniqueId.Value()", value.userUniqueId.Value(), 305441741UL));
+                VerifyOrReturn(CheckValueNonNull("userUniqueID", value.userUniqueID));
+                VerifyOrReturn(CheckValue("userUniqueID.Value()", value.userUniqueID.Value(), 305441741UL));
                 VerifyOrReturn(CheckValueNonNull("userStatus", value.userStatus));
                 VerifyOrReturn(CheckValue("userStatus.Value()", value.userStatus.Value(), 3U));
                 VerifyOrReturn(CheckValueNonNull("userType", value.userType));
@@ -74377,8 +73925,8 @@ class DL_UsersAndCredentialsSuite : public TestCommand
                 VerifyOrReturn(CheckValue("userIndex", value.userIndex, 1U));
                 VerifyOrReturn(CheckValueNonNull("userName", value.userName));
                 VerifyOrReturn(CheckValueAsString("userName.Value()", value.userName.Value(), chip::CharSpan("test_user", 9)));
-                VerifyOrReturn(CheckValueNonNull("userUniqueId", value.userUniqueId));
-                VerifyOrReturn(CheckValue("userUniqueId.Value()", value.userUniqueId.Value(), 466460832UL));
+                VerifyOrReturn(CheckValueNonNull("userUniqueID", value.userUniqueID));
+                VerifyOrReturn(CheckValue("userUniqueID.Value()", value.userUniqueID.Value(), 466460832UL));
                 VerifyOrReturn(CheckValueNonNull("userStatus", value.userStatus));
                 VerifyOrReturn(CheckValue("userStatus.Value()", value.userStatus.Value(), 1U));
                 VerifyOrReturn(CheckValueNonNull("userType", value.userType));
@@ -74404,8 +73952,8 @@ class DL_UsersAndCredentialsSuite : public TestCommand
                 VerifyOrReturn(CheckValue("userIndex", value.userIndex, 2U));
                 VerifyOrReturn(CheckValueNonNull("userName", value.userName));
                 VerifyOrReturn(CheckValueAsString("userName.Value()", value.userName.Value(), chip::CharSpan("test_user2", 10)));
-                VerifyOrReturn(CheckValueNonNull("userUniqueId", value.userUniqueId));
-                VerifyOrReturn(CheckValue("userUniqueId.Value()", value.userUniqueId.Value(), 12648430UL));
+                VerifyOrReturn(CheckValueNonNull("userUniqueID", value.userUniqueID));
+                VerifyOrReturn(CheckValue("userUniqueID.Value()", value.userUniqueID.Value(), 12648430UL));
                 VerifyOrReturn(CheckValueNonNull("userStatus", value.userStatus));
                 VerifyOrReturn(CheckValue("userStatus.Value()", value.userStatus.Value(), 1U));
                 VerifyOrReturn(CheckValueNonNull("userType", value.userType));
@@ -74430,7 +73978,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckValue("userIndex", value.userIndex, 3U));
                 VerifyOrReturn(CheckValueNull("userName", value.userName));
-                VerifyOrReturn(CheckValueNull("userUniqueId", value.userUniqueId));
+                VerifyOrReturn(CheckValueNull("userUniqueID", value.userUniqueID));
                 VerifyOrReturn(CheckValueNull("userStatus", value.userStatus));
                 VerifyOrReturn(CheckValueNull("userType", value.userType));
                 VerifyOrReturn(CheckValueNull("credentialRule", value.credentialRule));
@@ -74450,7 +73998,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckValue("userIndex", value.userIndex, 3U));
                 VerifyOrReturn(CheckValueNull("userName", value.userName));
-                VerifyOrReturn(CheckValueNull("userUniqueId", value.userUniqueId));
+                VerifyOrReturn(CheckValueNull("userUniqueID", value.userUniqueID));
                 VerifyOrReturn(CheckValueNull("userStatus", value.userStatus));
                 VerifyOrReturn(CheckValueNull("userType", value.userType));
                 VerifyOrReturn(CheckValueNull("credentialRule", value.credentialRule));
@@ -74471,8 +74019,8 @@ class DL_UsersAndCredentialsSuite : public TestCommand
                 VerifyOrReturn(CheckValue("userIndex", value.userIndex, 3U));
                 VerifyOrReturn(CheckValueNonNull("userName", value.userName));
                 VerifyOrReturn(CheckValueAsString("userName.Value()", value.userName.Value(), chip::CharSpan("test_user3", 10)));
-                VerifyOrReturn(CheckValueNonNull("userUniqueId", value.userUniqueId));
-                VerifyOrReturn(CheckValue("userUniqueId.Value()", value.userUniqueId.Value(), 47802UL));
+                VerifyOrReturn(CheckValueNonNull("userUniqueID", value.userUniqueID));
+                VerifyOrReturn(CheckValue("userUniqueID.Value()", value.userUniqueID.Value(), 47802UL));
                 VerifyOrReturn(CheckValueNonNull("userStatus", value.userStatus));
                 VerifyOrReturn(CheckValue("userStatus.Value()", value.userStatus.Value(), 3U));
                 VerifyOrReturn(CheckValueNonNull("userType", value.userType));
@@ -74498,7 +74046,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand
                 VerifyOrReturn(CheckValue("userIndex", value.userIndex, NumberOfTotalUsersSupported));
                 VerifyOrReturn(CheckValueNonNull("userName", value.userName));
                 VerifyOrReturn(CheckValueAsString("userName.Value()", value.userName.Value(), chip::CharSpan("last_user", 9)));
-                VerifyOrReturn(CheckValueNull("userUniqueId", value.userUniqueId));
+                VerifyOrReturn(CheckValueNull("userUniqueID", value.userUniqueID));
                 VerifyOrReturn(CheckValueNonNull("userStatus", value.userStatus));
                 VerifyOrReturn(CheckValue("userStatus.Value()", value.userStatus.Value(), 1U));
                 VerifyOrReturn(CheckValueNonNull("userType", value.userType));
@@ -74529,7 +74077,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckValue("userIndex", value.userIndex, 1U));
                 VerifyOrReturn(CheckValueNull("userName", value.userName));
-                VerifyOrReturn(CheckValueNull("userUniqueId", value.userUniqueId));
+                VerifyOrReturn(CheckValueNull("userUniqueID", value.userUniqueID));
                 VerifyOrReturn(CheckValueNull("userStatus", value.userStatus));
                 VerifyOrReturn(CheckValueNull("userType", value.userType));
                 VerifyOrReturn(CheckValueNull("credentialRule", value.credentialRule));
@@ -74551,7 +74099,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand
                 VerifyOrReturn(CheckValue("userIndex", value.userIndex, 1U));
                 VerifyOrReturn(CheckValueNonNull("userName", value.userName));
                 VerifyOrReturn(CheckValueAsString("userName.Value()", value.userName.Value(), chip::CharSpan("", 0)));
-                VerifyOrReturn(CheckValueNull("userUniqueId", value.userUniqueId));
+                VerifyOrReturn(CheckValueNull("userUniqueID", value.userUniqueID));
                 VerifyOrReturn(CheckValueNonNull("userStatus", value.userStatus));
                 VerifyOrReturn(CheckValue("userStatus.Value()", value.userStatus.Value(), 1U));
                 VerifyOrReturn(CheckValueNonNull("userType", value.userType));
@@ -74583,7 +74131,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckValue("userIndex", value.userIndex, 2U));
                 VerifyOrReturn(CheckValueNull("userName", value.userName));
-                VerifyOrReturn(CheckValueNull("userUniqueId", value.userUniqueId));
+                VerifyOrReturn(CheckValueNull("userUniqueID", value.userUniqueID));
                 VerifyOrReturn(CheckValueNull("userStatus", value.userStatus));
                 VerifyOrReturn(CheckValueNull("userType", value.userType));
                 VerifyOrReturn(CheckValueNull("credentialRule", value.credentialRule));
@@ -74600,7 +74148,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckValue("userIndex", value.userIndex, NumberOfTotalUsersSupported));
                 VerifyOrReturn(CheckValueNull("userName", value.userName));
-                VerifyOrReturn(CheckValueNull("userUniqueId", value.userUniqueId));
+                VerifyOrReturn(CheckValueNull("userUniqueID", value.userUniqueID));
                 VerifyOrReturn(CheckValueNull("userStatus", value.userStatus));
                 VerifyOrReturn(CheckValueNull("userType", value.userType));
                 VerifyOrReturn(CheckValueNull("credentialRule", value.credentialRule));
@@ -74697,7 +74245,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand
                 VerifyOrReturn(CheckValue("userIndex", value.userIndex, 1U));
                 VerifyOrReturn(CheckValueNonNull("userName", value.userName));
                 VerifyOrReturn(CheckValueAsString("userName.Value()", value.userName.Value(), chip::CharSpan("", 0)));
-                VerifyOrReturn(CheckValueNull("userUniqueId", value.userUniqueId));
+                VerifyOrReturn(CheckValueNull("userUniqueID", value.userUniqueID));
                 VerifyOrReturn(CheckValueNonNull("userStatus", value.userStatus));
                 VerifyOrReturn(CheckValue("userStatus.Value()", value.userStatus.Value(), 1U));
                 VerifyOrReturn(CheckValueNonNull("userType", value.userType));
@@ -74818,7 +74366,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand
                 VerifyOrReturn(CheckValue("userIndex", value.userIndex, 1U));
                 VerifyOrReturn(CheckValueNonNull("userName", value.userName));
                 VerifyOrReturn(CheckValueAsString("userName.Value()", value.userName.Value(), chip::CharSpan("", 0)));
-                VerifyOrReturn(CheckValueNull("userUniqueId", value.userUniqueId));
+                VerifyOrReturn(CheckValueNull("userUniqueID", value.userUniqueID));
                 VerifyOrReturn(CheckValueNonNull("userStatus", value.userStatus));
                 VerifyOrReturn(CheckValue("userStatus.Value()", value.userStatus.Value(), 1U));
                 VerifyOrReturn(CheckValueNonNull("userType", value.userType));
@@ -75031,7 +74579,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand
                 VerifyOrReturn(CheckValue("userIndex", value.userIndex, 1U));
                 VerifyOrReturn(CheckValueNonNull("userName", value.userName));
                 VerifyOrReturn(CheckValueAsString("userName.Value()", value.userName.Value(), chip::CharSpan("", 0)));
-                VerifyOrReturn(CheckValueNull("userUniqueId", value.userUniqueId));
+                VerifyOrReturn(CheckValueNull("userUniqueID", value.userUniqueID));
                 VerifyOrReturn(CheckValueNonNull("userStatus", value.userStatus));
                 VerifyOrReturn(CheckValue("userStatus.Value()", value.userStatus.Value(), 1U));
                 VerifyOrReturn(CheckValueNonNull("userType", value.userType));
@@ -75079,7 +74627,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand
                 VerifyOrReturn(CheckValue("userIndex", value.userIndex, 1U));
                 VerifyOrReturn(CheckValueNonNull("userName", value.userName));
                 VerifyOrReturn(CheckValueAsString("userName.Value()", value.userName.Value(), chip::CharSpan("", 0)));
-                VerifyOrReturn(CheckValueNull("userUniqueId", value.userUniqueId));
+                VerifyOrReturn(CheckValueNull("userUniqueID", value.userUniqueID));
                 VerifyOrReturn(CheckValueNonNull("userStatus", value.userStatus));
                 VerifyOrReturn(CheckValue("userStatus.Value()", value.userStatus.Value(), 1U));
                 VerifyOrReturn(CheckValueNonNull("userType", value.userType));
@@ -75135,7 +74683,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand
                 VerifyOrReturn(CheckValue("userIndex", value.userIndex, 1U));
                 VerifyOrReturn(CheckValueNonNull("userName", value.userName));
                 VerifyOrReturn(CheckValueAsString("userName.Value()", value.userName.Value(), chip::CharSpan("", 0)));
-                VerifyOrReturn(CheckValueNull("userUniqueId", value.userUniqueId));
+                VerifyOrReturn(CheckValueNull("userUniqueID", value.userUniqueID));
                 VerifyOrReturn(CheckValueNonNull("userStatus", value.userStatus));
                 VerifyOrReturn(CheckValue("userStatus.Value()", value.userStatus.Value(), 1U));
                 VerifyOrReturn(CheckValueNonNull("userType", value.userType));
@@ -75187,7 +74735,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckValue("userIndex", value.userIndex, 2U));
                 VerifyOrReturn(CheckValueNull("userName", value.userName));
-                VerifyOrReturn(CheckValueNull("userUniqueId", value.userUniqueId));
+                VerifyOrReturn(CheckValueNull("userUniqueID", value.userUniqueID));
                 VerifyOrReturn(CheckValueNull("userStatus", value.userStatus));
                 VerifyOrReturn(CheckValueNull("userType", value.userType));
                 VerifyOrReturn(CheckValueNull("credentialRule", value.credentialRule));
@@ -75259,7 +74807,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand
                 VerifyOrReturn(CheckValue("userIndex", value.userIndex, 1U));
                 VerifyOrReturn(CheckValueNonNull("userName", value.userName));
                 VerifyOrReturn(CheckValueAsString("userName.Value()", value.userName.Value(), chip::CharSpan("", 0)));
-                VerifyOrReturn(CheckValueNull("userUniqueId", value.userUniqueId));
+                VerifyOrReturn(CheckValueNull("userUniqueID", value.userUniqueID));
                 VerifyOrReturn(CheckValueNonNull("userStatus", value.userStatus));
                 VerifyOrReturn(CheckValue("userStatus.Value()", value.userStatus.Value(), 1U));
                 VerifyOrReturn(CheckValueNonNull("userType", value.userType));
@@ -75288,7 +74836,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckValue("userIndex", value.userIndex, 2U));
                 VerifyOrReturn(CheckValueNull("userName", value.userName));
-                VerifyOrReturn(CheckValueNull("userUniqueId", value.userUniqueId));
+                VerifyOrReturn(CheckValueNull("userUniqueID", value.userUniqueID));
                 VerifyOrReturn(CheckValueNull("userStatus", value.userStatus));
                 VerifyOrReturn(CheckValueNull("userType", value.userType));
                 VerifyOrReturn(CheckValueNull("credentialRule", value.credentialRule));
@@ -75380,7 +74928,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckValue("userIndex", value.userIndex, 1U));
                 VerifyOrReturn(CheckValueNull("userName", value.userName));
-                VerifyOrReturn(CheckValueNull("userUniqueId", value.userUniqueId));
+                VerifyOrReturn(CheckValueNull("userUniqueID", value.userUniqueID));
                 VerifyOrReturn(CheckValueNull("userStatus", value.userStatus));
                 VerifyOrReturn(CheckValueNull("userType", value.userType));
                 VerifyOrReturn(CheckValueNull("credentialRule", value.credentialRule));
@@ -75397,7 +74945,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckValue("userIndex", value.userIndex, 2U));
                 VerifyOrReturn(CheckValueNull("userName", value.userName));
-                VerifyOrReturn(CheckValueNull("userUniqueId", value.userUniqueId));
+                VerifyOrReturn(CheckValueNull("userUniqueID", value.userUniqueID));
                 VerifyOrReturn(CheckValueNull("userStatus", value.userStatus));
                 VerifyOrReturn(CheckValueNull("userType", value.userType));
                 VerifyOrReturn(CheckValueNull("credentialRule", value.credentialRule));
@@ -75414,7 +74962,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckValue("userIndex", value.userIndex, 3U));
                 VerifyOrReturn(CheckValueNull("userName", value.userName));
-                VerifyOrReturn(CheckValueNull("userUniqueId", value.userUniqueId));
+                VerifyOrReturn(CheckValueNull("userUniqueID", value.userUniqueID));
                 VerifyOrReturn(CheckValueNull("userStatus", value.userStatus));
                 VerifyOrReturn(CheckValueNull("userType", value.userType));
                 VerifyOrReturn(CheckValueNull("credentialRule", value.credentialRule));
@@ -75431,7 +74979,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckValue("userIndex", value.userIndex, 4U));
                 VerifyOrReturn(CheckValueNull("userName", value.userName));
-                VerifyOrReturn(CheckValueNull("userUniqueId", value.userUniqueId));
+                VerifyOrReturn(CheckValueNull("userUniqueID", value.userUniqueID));
                 VerifyOrReturn(CheckValueNull("userStatus", value.userStatus));
                 VerifyOrReturn(CheckValueNull("userType", value.userType));
                 VerifyOrReturn(CheckValueNull("credentialRule", value.credentialRule));
@@ -75470,7 +75018,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand
                 VerifyOrReturn(CheckValue("userIndex", value.userIndex, 1U));
                 VerifyOrReturn(CheckValueNonNull("userName", value.userName));
                 VerifyOrReturn(CheckValueAsString("userName.Value()", value.userName.Value(), chip::CharSpan("", 0)));
-                VerifyOrReturn(CheckValueNull("userUniqueId", value.userUniqueId));
+                VerifyOrReturn(CheckValueNull("userUniqueID", value.userUniqueID));
                 VerifyOrReturn(CheckValueNonNull("userStatus", value.userStatus));
                 VerifyOrReturn(CheckValue("userStatus.Value()", value.userStatus.Value(), 1U));
                 VerifyOrReturn(CheckValueNonNull("userType", value.userType));
@@ -75545,7 +75093,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckValue("userIndex", value.userIndex, 1U));
                 VerifyOrReturn(CheckValueNull("userName", value.userName));
-                VerifyOrReturn(CheckValueNull("userUniqueId", value.userUniqueId));
+                VerifyOrReturn(CheckValueNull("userUniqueID", value.userUniqueID));
                 VerifyOrReturn(CheckValueNull("userStatus", value.userStatus));
                 VerifyOrReturn(CheckValueNull("userType", value.userType));
                 VerifyOrReturn(CheckValueNull("credentialRule", value.credentialRule));
@@ -75704,10 +75252,10 @@ class DL_UsersAndCredentialsSuite : public TestCommand
             LogStep(5, "Create new user with default parameters");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::SetUser::Type value;
-            value.operationType = static_cast<chip::app::Clusters::DoorLock::DlDataOperationType>(0);
+            value.operationType = static_cast<chip::app::Clusters::DoorLock::DataOperationTypeEnum>(0);
             value.userIndex     = 1U;
             value.userName.SetNull();
-            value.userUniqueId.SetNull();
+            value.userUniqueID.SetNull();
             value.userStatus.SetNull();
             value.userType.SetNull();
             value.credentialRule.SetNull();
@@ -75730,10 +75278,10 @@ class DL_UsersAndCredentialsSuite : public TestCommand
             LogStep(7, "Set user at the occupied index fails with appropriate response");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::SetUser::Type value;
-            value.operationType = static_cast<chip::app::Clusters::DoorLock::DlDataOperationType>(0);
+            value.operationType = static_cast<chip::app::Clusters::DoorLock::DataOperationTypeEnum>(0);
             value.userIndex     = 1U;
             value.userName.SetNull();
-            value.userUniqueId.SetNull();
+            value.userUniqueID.SetNull();
             value.userStatus.SetNull();
             value.userType.SetNull();
             value.credentialRule.SetNull();
@@ -75746,11 +75294,11 @@ class DL_UsersAndCredentialsSuite : public TestCommand
             LogStep(8, "Modify userName for existing user");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::SetUser::Type value;
-            value.operationType = static_cast<chip::app::Clusters::DoorLock::DlDataOperationType>(2);
+            value.operationType = static_cast<chip::app::Clusters::DoorLock::DataOperationTypeEnum>(2);
             value.userIndex     = 1U;
             value.userName.SetNonNull();
             value.userName.Value() = chip::Span<const char>("new_usergarbage: not in length on purpose", 8);
-            value.userUniqueId.SetNull();
+            value.userUniqueID.SetNull();
             value.userStatus.SetNull();
             value.userType.SetNull();
             value.credentialRule.SetNull();
@@ -75773,11 +75321,11 @@ class DL_UsersAndCredentialsSuite : public TestCommand
             LogStep(10, "Modify userUniqueId for existing user");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::SetUser::Type value;
-            value.operationType = static_cast<chip::app::Clusters::DoorLock::DlDataOperationType>(2);
+            value.operationType = static_cast<chip::app::Clusters::DoorLock::DataOperationTypeEnum>(2);
             value.userIndex     = 1U;
             value.userName.SetNull();
-            value.userUniqueId.SetNonNull();
-            value.userUniqueId.Value() = 305441741UL;
+            value.userUniqueID.SetNonNull();
+            value.userUniqueID.Value() = 305441741UL;
             value.userStatus.SetNull();
             value.userType.SetNull();
             value.credentialRule.SetNull();
@@ -75800,12 +75348,12 @@ class DL_UsersAndCredentialsSuite : public TestCommand
             LogStep(12, "Modify userStatus for existing user");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::SetUser::Type value;
-            value.operationType = static_cast<chip::app::Clusters::DoorLock::DlDataOperationType>(2);
+            value.operationType = static_cast<chip::app::Clusters::DoorLock::DataOperationTypeEnum>(2);
             value.userIndex     = 1U;
             value.userName.SetNull();
-            value.userUniqueId.SetNull();
+            value.userUniqueID.SetNull();
             value.userStatus.SetNonNull();
-            value.userStatus.Value() = static_cast<chip::app::Clusters::DoorLock::DlUserStatus>(3);
+            value.userStatus.Value() = static_cast<chip::app::Clusters::DoorLock::UserStatusEnum>(3);
             value.userType.SetNull();
             value.credentialRule.SetNull();
             return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::SetUser::Id, value,
@@ -75827,13 +75375,13 @@ class DL_UsersAndCredentialsSuite : public TestCommand
             LogStep(14, "Modify userType for existing user");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::SetUser::Type value;
-            value.operationType = static_cast<chip::app::Clusters::DoorLock::DlDataOperationType>(2);
+            value.operationType = static_cast<chip::app::Clusters::DoorLock::DataOperationTypeEnum>(2);
             value.userIndex     = 1U;
             value.userName.SetNull();
-            value.userUniqueId.SetNull();
+            value.userUniqueID.SetNull();
             value.userStatus.SetNull();
             value.userType.SetNonNull();
-            value.userType.Value() = static_cast<chip::app::Clusters::DoorLock::DlUserType>(6);
+            value.userType.Value() = static_cast<chip::app::Clusters::DoorLock::UserTypeEnum>(6);
             value.credentialRule.SetNull();
             return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::SetUser::Id, value,
                                chip::Optional<uint16_t>(10000), chip::NullOptional
@@ -75854,14 +75402,14 @@ class DL_UsersAndCredentialsSuite : public TestCommand
             LogStep(16, "Modify credentialRule for existing user");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::SetUser::Type value;
-            value.operationType = static_cast<chip::app::Clusters::DoorLock::DlDataOperationType>(2);
+            value.operationType = static_cast<chip::app::Clusters::DoorLock::DataOperationTypeEnum>(2);
             value.userIndex     = 1U;
             value.userName.SetNull();
-            value.userUniqueId.SetNull();
+            value.userUniqueID.SetNull();
             value.userStatus.SetNull();
             value.userType.SetNull();
             value.credentialRule.SetNonNull();
-            value.credentialRule.Value() = static_cast<chip::app::Clusters::DoorLock::DlCredentialRule>(2);
+            value.credentialRule.Value() = static_cast<chip::app::Clusters::DoorLock::CredentialRuleEnum>(2);
             return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::SetUser::Id, value,
                                chip::Optional<uint16_t>(10000), chip::NullOptional
 
@@ -75881,18 +75429,18 @@ class DL_UsersAndCredentialsSuite : public TestCommand
             LogStep(18, "Modify all fields for existing user");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::SetUser::Type value;
-            value.operationType = static_cast<chip::app::Clusters::DoorLock::DlDataOperationType>(2);
+            value.operationType = static_cast<chip::app::Clusters::DoorLock::DataOperationTypeEnum>(2);
             value.userIndex     = 1U;
             value.userName.SetNonNull();
             value.userName.Value() = chip::Span<const char>("test_usergarbage: not in length on purpose", 9);
-            value.userUniqueId.SetNonNull();
-            value.userUniqueId.Value() = 466460832UL;
+            value.userUniqueID.SetNonNull();
+            value.userUniqueID.Value() = 466460832UL;
             value.userStatus.SetNonNull();
-            value.userStatus.Value() = static_cast<chip::app::Clusters::DoorLock::DlUserStatus>(1);
+            value.userStatus.Value() = static_cast<chip::app::Clusters::DoorLock::UserStatusEnum>(1);
             value.userType.SetNonNull();
-            value.userType.Value() = static_cast<chip::app::Clusters::DoorLock::DlUserType>(0);
+            value.userType.Value() = static_cast<chip::app::Clusters::DoorLock::UserTypeEnum>(0);
             value.credentialRule.SetNonNull();
-            value.credentialRule.Value() = static_cast<chip::app::Clusters::DoorLock::DlCredentialRule>(1);
+            value.credentialRule.Value() = static_cast<chip::app::Clusters::DoorLock::CredentialRuleEnum>(1);
             return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::SetUser::Id, value,
                                chip::Optional<uint16_t>(10000), chip::NullOptional
 
@@ -75912,18 +75460,18 @@ class DL_UsersAndCredentialsSuite : public TestCommand
             LogStep(20, "Add another user with non-default fields");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::SetUser::Type value;
-            value.operationType = static_cast<chip::app::Clusters::DoorLock::DlDataOperationType>(0);
+            value.operationType = static_cast<chip::app::Clusters::DoorLock::DataOperationTypeEnum>(0);
             value.userIndex     = 2U;
             value.userName.SetNonNull();
             value.userName.Value() = chip::Span<const char>("test_user2garbage: not in length on purpose", 10);
-            value.userUniqueId.SetNonNull();
-            value.userUniqueId.Value() = 12648430UL;
+            value.userUniqueID.SetNonNull();
+            value.userUniqueID.Value() = 12648430UL;
             value.userStatus.SetNonNull();
-            value.userStatus.Value() = static_cast<chip::app::Clusters::DoorLock::DlUserStatus>(1);
+            value.userStatus.Value() = static_cast<chip::app::Clusters::DoorLock::UserStatusEnum>(1);
             value.userType.SetNonNull();
-            value.userType.Value() = static_cast<chip::app::Clusters::DoorLock::DlUserType>(1);
+            value.userType.Value() = static_cast<chip::app::Clusters::DoorLock::UserTypeEnum>(1);
             value.credentialRule.SetNonNull();
-            value.credentialRule.Value() = static_cast<chip::app::Clusters::DoorLock::DlCredentialRule>(2);
+            value.credentialRule.Value() = static_cast<chip::app::Clusters::DoorLock::CredentialRuleEnum>(2);
             return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::SetUser::Id, value,
                                chip::Optional<uint16_t>(10000), chip::NullOptional
 
@@ -75943,14 +75491,14 @@ class DL_UsersAndCredentialsSuite : public TestCommand
             LogStep(22, "Try to add a user with userStatus 0");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::SetUser::Type value;
-            value.operationType = static_cast<chip::app::Clusters::DoorLock::DlDataOperationType>(0);
+            value.operationType = static_cast<chip::app::Clusters::DoorLock::DataOperationTypeEnum>(0);
             value.userIndex     = 3U;
             value.userName.SetNonNull();
             value.userName.Value() = chip::Span<const char>("test_user3garbage: not in length on purpose", 10);
-            value.userUniqueId.SetNonNull();
-            value.userUniqueId.Value() = 47802UL;
+            value.userUniqueID.SetNonNull();
+            value.userUniqueID.Value() = 47802UL;
             value.userStatus.SetNonNull();
-            value.userStatus.Value() = static_cast<chip::app::Clusters::DoorLock::DlUserStatus>(0);
+            value.userStatus.Value() = static_cast<chip::app::Clusters::DoorLock::UserStatusEnum>(0);
             value.userType.SetNull();
             value.credentialRule.SetNull();
             return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::SetUser::Id, value,
@@ -75972,14 +75520,14 @@ class DL_UsersAndCredentialsSuite : public TestCommand
             LogStep(24, "Try to add a user with userStatus 2");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::SetUser::Type value;
-            value.operationType = static_cast<chip::app::Clusters::DoorLock::DlDataOperationType>(0);
+            value.operationType = static_cast<chip::app::Clusters::DoorLock::DataOperationTypeEnum>(0);
             value.userIndex     = 3U;
             value.userName.SetNonNull();
             value.userName.Value() = chip::Span<const char>("test_user3garbage: not in length on purpose", 10);
-            value.userUniqueId.SetNonNull();
-            value.userUniqueId.Value() = 47802UL;
+            value.userUniqueID.SetNonNull();
+            value.userUniqueID.Value() = 47802UL;
             value.userStatus.SetNonNull();
-            value.userStatus.Value() = static_cast<chip::app::Clusters::DoorLock::DlUserStatus>(2);
+            value.userStatus.Value() = static_cast<chip::app::Clusters::DoorLock::UserStatusEnum>(2);
             value.userType.SetNull();
             value.credentialRule.SetNull();
             return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::SetUser::Id, value,
@@ -76001,14 +75549,14 @@ class DL_UsersAndCredentialsSuite : public TestCommand
             LogStep(26, "Try to add a user with userStatus 3");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::SetUser::Type value;
-            value.operationType = static_cast<chip::app::Clusters::DoorLock::DlDataOperationType>(0);
+            value.operationType = static_cast<chip::app::Clusters::DoorLock::DataOperationTypeEnum>(0);
             value.userIndex     = 3U;
             value.userName.SetNonNull();
             value.userName.Value() = chip::Span<const char>("test_user3garbage: not in length on purpose", 10);
-            value.userUniqueId.SetNonNull();
-            value.userUniqueId.Value() = 47802UL;
+            value.userUniqueID.SetNonNull();
+            value.userUniqueID.Value() = 47802UL;
             value.userStatus.SetNonNull();
-            value.userStatus.Value() = static_cast<chip::app::Clusters::DoorLock::DlUserStatus>(3);
+            value.userStatus.Value() = static_cast<chip::app::Clusters::DoorLock::UserStatusEnum>(3);
             value.userType.SetNull();
             value.credentialRule.SetNull();
             return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::SetUser::Id, value,
@@ -76030,11 +75578,11 @@ class DL_UsersAndCredentialsSuite : public TestCommand
             LogStep(28, "Create user in the last slot");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::SetUser::Type value;
-            value.operationType = static_cast<chip::app::Clusters::DoorLock::DlDataOperationType>(0);
+            value.operationType = static_cast<chip::app::Clusters::DoorLock::DataOperationTypeEnum>(0);
             value.userIndex     = NumberOfTotalUsersSupported;
             value.userName.SetNonNull();
             value.userName.Value() = chip::Span<const char>("last_usergarbage: not in length on purpose", 9);
-            value.userUniqueId.SetNull();
+            value.userUniqueID.SetNull();
             value.userStatus.SetNull();
             value.userType.SetNull();
             value.credentialRule.SetNull();
@@ -76057,10 +75605,10 @@ class DL_UsersAndCredentialsSuite : public TestCommand
             LogStep(30, "User creation in the 0 slot fails");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::SetUser::Type value;
-            value.operationType = static_cast<chip::app::Clusters::DoorLock::DlDataOperationType>(0);
+            value.operationType = static_cast<chip::app::Clusters::DoorLock::DataOperationTypeEnum>(0);
             value.userIndex     = 0U;
             value.userName.SetNull();
-            value.userUniqueId.SetNull();
+            value.userUniqueID.SetNull();
             value.userStatus.SetNull();
             value.userType.SetNull();
             value.credentialRule.SetNull();
@@ -76073,10 +75621,10 @@ class DL_UsersAndCredentialsSuite : public TestCommand
             LogStep(31, "User creation in the out-of-bounds slot fails");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::SetUser::Type value;
-            value.operationType = static_cast<chip::app::Clusters::DoorLock::DlDataOperationType>(0);
+            value.operationType = static_cast<chip::app::Clusters::DoorLock::DataOperationTypeEnum>(0);
             value.userIndex     = static_cast<uint16_t>(NumberOfTotalUsersSupported + 1);
             value.userName.SetNull();
-            value.userUniqueId.SetNull();
+            value.userUniqueID.SetNull();
             value.userStatus.SetNull();
             value.userType.SetNull();
             value.credentialRule.SetNull();
@@ -76109,10 +75657,10 @@ class DL_UsersAndCredentialsSuite : public TestCommand
             LogStep(34, "Create new user in the cleared slot");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::SetUser::Type value;
-            value.operationType = static_cast<chip::app::Clusters::DoorLock::DlDataOperationType>(0);
+            value.operationType = static_cast<chip::app::Clusters::DoorLock::DataOperationTypeEnum>(0);
             value.userIndex     = 1U;
             value.userName.SetNull();
-            value.userUniqueId.SetNull();
+            value.userUniqueID.SetNull();
             value.userStatus.SetNull();
             value.userType.SetNull();
             value.credentialRule.SetNull();
@@ -76191,7 +75739,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::GetCredentialStatus::Type value;
 
-            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::DlCredentialType>(1);
+            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::CredentialTypeEnum>(1);
             value.credential.credentialIndex = 1U;
 
             return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::GetCredentialStatus::Id, value,
@@ -76204,7 +75752,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::GetCredentialStatus::Type value;
 
-            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::DlCredentialType>(1);
+            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::CredentialTypeEnum>(1);
             value.credential.credentialIndex = 0U;
 
             return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::GetCredentialStatus::Id, value,
@@ -76217,7 +75765,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::GetCredentialStatus::Type value;
 
-            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::DlCredentialType>(1);
+            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::CredentialTypeEnum>(1);
             value.credential.credentialIndex = static_cast<uint16_t>(NumberOfPINUsersSupported + 1);
 
             return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::GetCredentialStatus::Id, value,
@@ -76229,15 +75777,15 @@ class DL_UsersAndCredentialsSuite : public TestCommand
             LogStep(45, "Verify that a user with UserStatus = 0 cannot be added via SetCredential");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::SetCredential::Type value;
-            value.operationType = static_cast<chip::app::Clusters::DoorLock::DlDataOperationType>(0);
+            value.operationType = static_cast<chip::app::Clusters::DoorLock::DataOperationTypeEnum>(0);
 
-            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::DlCredentialType>(1);
+            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::CredentialTypeEnum>(1);
             value.credential.credentialIndex = 1U;
 
             value.credentialData = chip::ByteSpan(chip::Uint8::from_const_char("000000garbage: not in length on purpose"), 6);
             value.userIndex.SetNull();
             value.userStatus.SetNonNull();
-            value.userStatus.Value() = static_cast<chip::app::Clusters::DoorLock::DlUserStatus>(0);
+            value.userStatus.Value() = static_cast<chip::app::Clusters::DoorLock::UserStatusEnum>(0);
             value.userType.SetNull();
             return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::SetCredential::Id, value,
                                chip::Optional<uint16_t>(10000), chip::NullOptional
@@ -76248,15 +75796,15 @@ class DL_UsersAndCredentialsSuite : public TestCommand
             LogStep(46, "Verify that a user with UserStatus = 2 cannot be added via SetCredential");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::SetCredential::Type value;
-            value.operationType = static_cast<chip::app::Clusters::DoorLock::DlDataOperationType>(0);
+            value.operationType = static_cast<chip::app::Clusters::DoorLock::DataOperationTypeEnum>(0);
 
-            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::DlCredentialType>(1);
+            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::CredentialTypeEnum>(1);
             value.credential.credentialIndex = 1U;
 
             value.credentialData = chip::ByteSpan(chip::Uint8::from_const_char("000000garbage: not in length on purpose"), 6);
             value.userIndex.SetNull();
             value.userStatus.SetNonNull();
-            value.userStatus.Value() = static_cast<chip::app::Clusters::DoorLock::DlUserStatus>(2);
+            value.userStatus.Value() = static_cast<chip::app::Clusters::DoorLock::UserStatusEnum>(2);
             value.userType.SetNull();
             return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::SetCredential::Id, value,
                                chip::Optional<uint16_t>(10000), chip::NullOptional
@@ -76267,9 +75815,9 @@ class DL_UsersAndCredentialsSuite : public TestCommand
             LogStep(47, "Create new PIN credential and user");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::SetCredential::Type value;
-            value.operationType = static_cast<chip::app::Clusters::DoorLock::DlDataOperationType>(0);
+            value.operationType = static_cast<chip::app::Clusters::DoorLock::DataOperationTypeEnum>(0);
 
-            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::DlCredentialType>(1);
+            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::CredentialTypeEnum>(1);
             value.credential.credentialIndex = 1U;
 
             value.credentialData = chip::ByteSpan(chip::Uint8::from_const_char("000000garbage: not in length on purpose"), 6);
@@ -76296,7 +75844,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::GetCredentialStatus::Type value;
 
-            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::DlCredentialType>(1);
+            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::CredentialTypeEnum>(1);
             value.credential.credentialIndex = 1U;
 
             return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::GetCredentialStatus::Id, value,
@@ -76308,9 +75856,9 @@ class DL_UsersAndCredentialsSuite : public TestCommand
             LogStep(50, "Create new PIN credential and user with index 0 fails");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::SetCredential::Type value;
-            value.operationType = static_cast<chip::app::Clusters::DoorLock::DlDataOperationType>(0);
+            value.operationType = static_cast<chip::app::Clusters::DoorLock::DataOperationTypeEnum>(0);
 
-            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::DlCredentialType>(1);
+            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::CredentialTypeEnum>(1);
             value.credential.credentialIndex = 0U;
 
             value.credentialData = chip::ByteSpan(chip::Uint8::from_const_char("123456garbage: not in length on purpose"), 6);
@@ -76326,9 +75874,9 @@ class DL_UsersAndCredentialsSuite : public TestCommand
             LogStep(51, "Create new PIN credential and user with out-of-bounds index fails");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::SetCredential::Type value;
-            value.operationType = static_cast<chip::app::Clusters::DoorLock::DlDataOperationType>(0);
+            value.operationType = static_cast<chip::app::Clusters::DoorLock::DataOperationTypeEnum>(0);
 
-            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::DlCredentialType>(1);
+            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::CredentialTypeEnum>(1);
             value.credential.credentialIndex = static_cast<uint16_t>(NumberOfPINUsersSupported + 1);
 
             value.credentialData = chip::ByteSpan(chip::Uint8::from_const_char("123456garbage: not in length on purpose"), 6);
@@ -76350,7 +75898,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::GetCredentialStatus::Type value;
 
-            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::DlCredentialType>(2);
+            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::CredentialTypeEnum>(2);
             value.credential.credentialIndex = 0U;
 
             return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::GetCredentialStatus::Id, value,
@@ -76363,7 +75911,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::GetCredentialStatus::Type value;
 
-            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::DlCredentialType>(2);
+            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::CredentialTypeEnum>(2);
             value.credential.credentialIndex = static_cast<uint16_t>(NumberOfRFIDUsersSupported + 1);
 
             return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::GetCredentialStatus::Id, value,
@@ -76376,7 +75924,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::GetCredentialStatus::Type value;
 
-            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::DlCredentialType>(2);
+            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::CredentialTypeEnum>(2);
             value.credential.credentialIndex = 2U;
 
             return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::GetCredentialStatus::Id, value,
@@ -76388,9 +75936,9 @@ class DL_UsersAndCredentialsSuite : public TestCommand
             LogStep(56, "Create new RFID credential and add it to existing user");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::SetCredential::Type value;
-            value.operationType = static_cast<chip::app::Clusters::DoorLock::DlDataOperationType>(0);
+            value.operationType = static_cast<chip::app::Clusters::DoorLock::DataOperationTypeEnum>(0);
 
-            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::DlCredentialType>(2);
+            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::CredentialTypeEnum>(2);
             value.credential.credentialIndex = 2U;
 
             value.credentialData =
@@ -76419,7 +75967,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::GetCredentialStatus::Type value;
 
-            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::DlCredentialType>(2);
+            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::CredentialTypeEnum>(2);
             value.credential.credentialIndex = 2U;
 
             return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::GetCredentialStatus::Id, value,
@@ -76431,9 +75979,9 @@ class DL_UsersAndCredentialsSuite : public TestCommand
             LogStep(59, "Create new RFID credential and user with index 0 fails");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::SetCredential::Type value;
-            value.operationType = static_cast<chip::app::Clusters::DoorLock::DlDataOperationType>(0);
+            value.operationType = static_cast<chip::app::Clusters::DoorLock::DataOperationTypeEnum>(0);
 
-            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::DlCredentialType>(2);
+            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::CredentialTypeEnum>(2);
             value.credential.credentialIndex = 0U;
 
             value.credentialData =
@@ -76450,9 +75998,9 @@ class DL_UsersAndCredentialsSuite : public TestCommand
             LogStep(60, "Create new RFID credential and user with out-of-bounds index fails");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::SetCredential::Type value;
-            value.operationType = static_cast<chip::app::Clusters::DoorLock::DlDataOperationType>(0);
+            value.operationType = static_cast<chip::app::Clusters::DoorLock::DataOperationTypeEnum>(0);
 
-            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::DlCredentialType>(2);
+            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::CredentialTypeEnum>(2);
             value.credential.credentialIndex = static_cast<uint16_t>(NumberOfRFIDUsersSupported + 1);
 
             value.credentialData =
@@ -76469,9 +76017,9 @@ class DL_UsersAndCredentialsSuite : public TestCommand
             LogStep(61, "Create new credential and try to add it to 0 user");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::SetCredential::Type value;
-            value.operationType = static_cast<chip::app::Clusters::DoorLock::DlDataOperationType>(0);
+            value.operationType = static_cast<chip::app::Clusters::DoorLock::DataOperationTypeEnum>(0);
 
-            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::DlCredentialType>(1);
+            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::CredentialTypeEnum>(1);
             value.credential.credentialIndex = 3U;
 
             value.credentialData = chip::ByteSpan(chip::Uint8::from_const_char("123465garbage: not in length on purpose"), 6);
@@ -76488,9 +76036,9 @@ class DL_UsersAndCredentialsSuite : public TestCommand
             LogStep(62, "Create new credential and try to add it to out-of-bounds user");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::SetCredential::Type value;
-            value.operationType = static_cast<chip::app::Clusters::DoorLock::DlDataOperationType>(0);
+            value.operationType = static_cast<chip::app::Clusters::DoorLock::DataOperationTypeEnum>(0);
 
-            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::DlCredentialType>(1);
+            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::CredentialTypeEnum>(1);
             value.credential.credentialIndex = 3U;
 
             value.credentialData = chip::ByteSpan(chip::Uint8::from_const_char("123465garbage: not in length on purpose"), 6);
@@ -76507,9 +76055,9 @@ class DL_UsersAndCredentialsSuite : public TestCommand
             LogStep(63, "Create new PIN with too short data");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::SetCredential::Type value;
-            value.operationType = static_cast<chip::app::Clusters::DoorLock::DlDataOperationType>(0);
+            value.operationType = static_cast<chip::app::Clusters::DoorLock::DataOperationTypeEnum>(0);
 
-            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::DlCredentialType>(1);
+            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::CredentialTypeEnum>(1);
             value.credential.credentialIndex = 3U;
 
             value.credentialData = chip::ByteSpan(chip::Uint8::from_const_char("12345garbage: not in length on purpose"), 5);
@@ -76526,9 +76074,9 @@ class DL_UsersAndCredentialsSuite : public TestCommand
             LogStep(64, "Create new PIN with too long data");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::SetCredential::Type value;
-            value.operationType = static_cast<chip::app::Clusters::DoorLock::DlDataOperationType>(0);
+            value.operationType = static_cast<chip::app::Clusters::DoorLock::DataOperationTypeEnum>(0);
 
-            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::DlCredentialType>(1);
+            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::CredentialTypeEnum>(1);
             value.credential.credentialIndex = 3U;
 
             value.credentialData = chip::ByteSpan(chip::Uint8::from_const_char("123456789garbage: not in length on purpose"), 9);
@@ -76545,9 +76093,9 @@ class DL_UsersAndCredentialsSuite : public TestCommand
             LogStep(65, "Create new RFID with too short data");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::SetCredential::Type value;
-            value.operationType = static_cast<chip::app::Clusters::DoorLock::DlDataOperationType>(0);
+            value.operationType = static_cast<chip::app::Clusters::DoorLock::DataOperationTypeEnum>(0);
 
-            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::DlCredentialType>(2);
+            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::CredentialTypeEnum>(2);
             value.credential.credentialIndex = 3U;
 
             value.credentialData = chip::ByteSpan(chip::Uint8::from_const_char("rfid_datagarbage: not in length on purpose"), 9);
@@ -76564,9 +76112,9 @@ class DL_UsersAndCredentialsSuite : public TestCommand
             LogStep(66, "Create new PIN with Programming user type fails");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::SetCredential::Type value;
-            value.operationType = static_cast<chip::app::Clusters::DoorLock::DlDataOperationType>(0);
+            value.operationType = static_cast<chip::app::Clusters::DoorLock::DataOperationTypeEnum>(0);
 
-            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::DlCredentialType>(1);
+            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::CredentialTypeEnum>(1);
             value.credential.credentialIndex = 3U;
 
             value.credentialData = chip::ByteSpan(chip::Uint8::from_const_char("123456garbage: not in length on purpose"), 6);
@@ -76574,7 +76122,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand
             value.userIndex.Value() = 0U;
             value.userStatus.SetNull();
             value.userType.SetNonNull();
-            value.userType.Value() = static_cast<chip::app::Clusters::DoorLock::DlUserType>(3);
+            value.userType.Value() = static_cast<chip::app::Clusters::DoorLock::UserTypeEnum>(3);
             return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::SetCredential::Id, value,
                                chip::Optional<uint16_t>(10000), chip::NullOptional
 
@@ -76584,9 +76132,9 @@ class DL_UsersAndCredentialsSuite : public TestCommand
             LogStep(67, "Create new RFID with too short data");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::SetCredential::Type value;
-            value.operationType = static_cast<chip::app::Clusters::DoorLock::DlDataOperationType>(0);
+            value.operationType = static_cast<chip::app::Clusters::DoorLock::DataOperationTypeEnum>(0);
 
-            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::DlCredentialType>(2);
+            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::CredentialTypeEnum>(2);
             value.credential.credentialIndex = 3U;
 
             value.credentialData = chip::ByteSpan(
@@ -76604,9 +76152,9 @@ class DL_UsersAndCredentialsSuite : public TestCommand
             LogStep(68, "Create new PIN credential with data the would cause duplicate");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::SetCredential::Type value;
-            value.operationType = static_cast<chip::app::Clusters::DoorLock::DlDataOperationType>(0);
+            value.operationType = static_cast<chip::app::Clusters::DoorLock::DataOperationTypeEnum>(0);
 
-            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::DlCredentialType>(1);
+            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::CredentialTypeEnum>(1);
             value.credential.credentialIndex = 4U;
 
             value.credentialData = chip::ByteSpan(chip::Uint8::from_const_char("000000garbage: not in length on purpose"), 6);
@@ -76622,9 +76170,9 @@ class DL_UsersAndCredentialsSuite : public TestCommand
             LogStep(69, "Create new RFID credential with data the would cause duplicate");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::SetCredential::Type value;
-            value.operationType = static_cast<chip::app::Clusters::DoorLock::DlDataOperationType>(0);
+            value.operationType = static_cast<chip::app::Clusters::DoorLock::DataOperationTypeEnum>(0);
 
-            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::DlCredentialType>(2);
+            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::CredentialTypeEnum>(2);
             value.credential.credentialIndex = 4U;
 
             value.credentialData =
@@ -76641,9 +76189,9 @@ class DL_UsersAndCredentialsSuite : public TestCommand
             LogStep(70, "Modify credentialData of existing PIN credential");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::SetCredential::Type value;
-            value.operationType = static_cast<chip::app::Clusters::DoorLock::DlDataOperationType>(2);
+            value.operationType = static_cast<chip::app::Clusters::DoorLock::DataOperationTypeEnum>(2);
 
-            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::DlCredentialType>(1);
+            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::CredentialTypeEnum>(1);
             value.credential.credentialIndex = 1U;
 
             value.credentialData = chip::ByteSpan(chip::Uint8::from_const_char("123456garbage: not in length on purpose"), 6);
@@ -76660,9 +76208,9 @@ class DL_UsersAndCredentialsSuite : public TestCommand
             LogStep(71, "Verify that credential was changed by creating new credential with old data");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::SetCredential::Type value;
-            value.operationType = static_cast<chip::app::Clusters::DoorLock::DlDataOperationType>(0);
+            value.operationType = static_cast<chip::app::Clusters::DoorLock::DataOperationTypeEnum>(0);
 
-            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::DlCredentialType>(1);
+            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::CredentialTypeEnum>(1);
             value.credential.credentialIndex = 3U;
 
             value.credentialData = chip::ByteSpan(chip::Uint8::from_const_char("000000garbage: not in length on purpose"), 6);
@@ -76678,9 +76226,9 @@ class DL_UsersAndCredentialsSuite : public TestCommand
             LogStep(72, "Verify that credential was changed by creating new credential with new data");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::SetCredential::Type value;
-            value.operationType = static_cast<chip::app::Clusters::DoorLock::DlDataOperationType>(0);
+            value.operationType = static_cast<chip::app::Clusters::DoorLock::DataOperationTypeEnum>(0);
 
-            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::DlCredentialType>(1);
+            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::CredentialTypeEnum>(1);
             value.credential.credentialIndex = 4U;
 
             value.credentialData = chip::ByteSpan(chip::Uint8::from_const_char("123456garbage: not in length on purpose"), 6);
@@ -76696,9 +76244,9 @@ class DL_UsersAndCredentialsSuite : public TestCommand
             LogStep(73, "Create new RFID credential and add it to existing user");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::SetCredential::Type value;
-            value.operationType = static_cast<chip::app::Clusters::DoorLock::DlDataOperationType>(0);
+            value.operationType = static_cast<chip::app::Clusters::DoorLock::DataOperationTypeEnum>(0);
 
-            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::DlCredentialType>(2);
+            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::CredentialTypeEnum>(2);
             value.credential.credentialIndex = 4U;
 
             value.credentialData =
@@ -76726,9 +76274,9 @@ class DL_UsersAndCredentialsSuite : public TestCommand
             LogStep(75, "Create new RFID credential and add it to existing user");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::SetCredential::Type value;
-            value.operationType = static_cast<chip::app::Clusters::DoorLock::DlDataOperationType>(0);
+            value.operationType = static_cast<chip::app::Clusters::DoorLock::DataOperationTypeEnum>(0);
 
-            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::DlCredentialType>(1);
+            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::CredentialTypeEnum>(1);
             value.credential.credentialIndex = 5U;
 
             value.credentialData = chip::ByteSpan(chip::Uint8::from_const_char("789012garbage: not in length on purpose"), 6);
@@ -76757,7 +76305,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand
             chip::app::Clusters::DoorLock::Commands::ClearCredential::Type value;
             value.credential.SetNonNull();
 
-            value.credential.Value().credentialType  = static_cast<chip::app::Clusters::DoorLock::DlCredentialType>(1);
+            value.credential.Value().credentialType  = static_cast<chip::app::Clusters::DoorLock::CredentialTypeEnum>(1);
             value.credential.Value().credentialIndex = 1U;
 
             return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::ClearCredential::Id, value,
@@ -76770,7 +76318,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::GetCredentialStatus::Type value;
 
-            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::DlCredentialType>(1);
+            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::CredentialTypeEnum>(1);
             value.credential.credentialIndex = 1U;
 
             return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::GetCredentialStatus::Id, value,
@@ -76794,7 +76342,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand
             chip::app::Clusters::DoorLock::Commands::ClearCredential::Type value;
             value.credential.SetNonNull();
 
-            value.credential.Value().credentialType  = static_cast<chip::app::Clusters::DoorLock::DlCredentialType>(1);
+            value.credential.Value().credentialType  = static_cast<chip::app::Clusters::DoorLock::CredentialTypeEnum>(1);
             value.credential.Value().credentialIndex = 3U;
 
             return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::ClearCredential::Id, value,
@@ -76807,7 +76355,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::GetCredentialStatus::Type value;
 
-            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::DlCredentialType>(1);
+            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::CredentialTypeEnum>(1);
             value.credential.credentialIndex = 3U;
 
             return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::GetCredentialStatus::Id, value,
@@ -76829,9 +76377,9 @@ class DL_UsersAndCredentialsSuite : public TestCommand
             LogStep(83, "Create new RFID credential with user");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::SetCredential::Type value;
-            value.operationType = static_cast<chip::app::Clusters::DoorLock::DlDataOperationType>(0);
+            value.operationType = static_cast<chip::app::Clusters::DoorLock::DataOperationTypeEnum>(0);
 
-            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::DlCredentialType>(2);
+            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::CredentialTypeEnum>(2);
             value.credential.credentialIndex = 1U;
 
             value.credentialData =
@@ -76850,7 +76398,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand
             chip::app::Clusters::DoorLock::Commands::ClearCredential::Type value;
             value.credential.SetNonNull();
 
-            value.credential.Value().credentialType  = static_cast<chip::app::Clusters::DoorLock::DlCredentialType>(2);
+            value.credential.Value().credentialType  = static_cast<chip::app::Clusters::DoorLock::CredentialTypeEnum>(2);
             value.credential.Value().credentialIndex = 65534U;
 
             return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::ClearCredential::Id, value,
@@ -76863,7 +76411,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::GetCredentialStatus::Type value;
 
-            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::DlCredentialType>(2);
+            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::CredentialTypeEnum>(2);
             value.credential.credentialIndex = 1U;
 
             return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::GetCredentialStatus::Id, value,
@@ -76876,7 +76424,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::GetCredentialStatus::Type value;
 
-            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::DlCredentialType>(2);
+            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::CredentialTypeEnum>(2);
             value.credential.credentialIndex = 2U;
 
             return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::GetCredentialStatus::Id, value,
@@ -76889,7 +76437,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::GetCredentialStatus::Type value;
 
-            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::DlCredentialType>(2);
+            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::CredentialTypeEnum>(2);
             value.credential.credentialIndex = 4U;
 
             return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::GetCredentialStatus::Id, value,
@@ -76921,9 +76469,9 @@ class DL_UsersAndCredentialsSuite : public TestCommand
             LogStep(90, "Create new PIN credential with user");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::SetCredential::Type value;
-            value.operationType = static_cast<chip::app::Clusters::DoorLock::DlDataOperationType>(0);
+            value.operationType = static_cast<chip::app::Clusters::DoorLock::DataOperationTypeEnum>(0);
 
-            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::DlCredentialType>(1);
+            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::CredentialTypeEnum>(1);
             value.credential.credentialIndex = 1U;
 
             value.credentialData = chip::ByteSpan(chip::Uint8::from_const_char("123456garbage: not in length on purpose"), 6);
@@ -76939,9 +76487,9 @@ class DL_UsersAndCredentialsSuite : public TestCommand
             LogStep(91, "Create new RFID credential with user");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::SetCredential::Type value;
-            value.operationType = static_cast<chip::app::Clusters::DoorLock::DlDataOperationType>(0);
+            value.operationType = static_cast<chip::app::Clusters::DoorLock::DataOperationTypeEnum>(0);
 
-            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::DlCredentialType>(2);
+            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::CredentialTypeEnum>(2);
             value.credential.credentialIndex = 2U;
 
             value.credentialData =
@@ -76958,9 +76506,9 @@ class DL_UsersAndCredentialsSuite : public TestCommand
             LogStep(92, "Create another RFID credential with user");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::SetCredential::Type value;
-            value.operationType = static_cast<chip::app::Clusters::DoorLock::DlDataOperationType>(0);
+            value.operationType = static_cast<chip::app::Clusters::DoorLock::DataOperationTypeEnum>(0);
 
-            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::DlCredentialType>(2);
+            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::CredentialTypeEnum>(2);
             value.credential.credentialIndex = 6U;
 
             value.credentialData =
@@ -76988,7 +76536,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::GetCredentialStatus::Type value;
 
-            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::DlCredentialType>(1);
+            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::CredentialTypeEnum>(1);
             value.credential.credentialIndex = 1U;
 
             return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::GetCredentialStatus::Id, value,
@@ -77001,7 +76549,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::GetCredentialStatus::Type value;
 
-            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::DlCredentialType>(2);
+            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::CredentialTypeEnum>(2);
             value.credential.credentialIndex = 2U;
 
             return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::GetCredentialStatus::Id, value,
@@ -77014,7 +76562,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::GetCredentialStatus::Type value;
 
-            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::DlCredentialType>(1);
+            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::CredentialTypeEnum>(1);
             value.credential.credentialIndex = 6U;
 
             return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::GetCredentialStatus::Id, value,
@@ -77066,9 +76614,9 @@ class DL_UsersAndCredentialsSuite : public TestCommand
             LogStep(101, "Create new Programming PIN credential with invalid index");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::SetCredential::Type value;
-            value.operationType = static_cast<chip::app::Clusters::DoorLock::DlDataOperationType>(0);
+            value.operationType = static_cast<chip::app::Clusters::DoorLock::DataOperationTypeEnum>(0);
 
-            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::DlCredentialType>(0);
+            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::CredentialTypeEnum>(0);
             value.credential.credentialIndex = 1U;
 
             value.credentialData = chip::ByteSpan(chip::Uint8::from_const_char("123456garbage: not in length on purpose"), 6);
@@ -77084,9 +76632,9 @@ class DL_UsersAndCredentialsSuite : public TestCommand
             LogStep(102, "Create new Programming PIN credential with valid index");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::SetCredential::Type value;
-            value.operationType = static_cast<chip::app::Clusters::DoorLock::DlDataOperationType>(0);
+            value.operationType = static_cast<chip::app::Clusters::DoorLock::DataOperationTypeEnum>(0);
 
-            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::DlCredentialType>(0);
+            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::CredentialTypeEnum>(0);
             value.credential.credentialIndex = 0U;
 
             value.credentialData = chip::ByteSpan(chip::Uint8::from_const_char("123456garbage: not in length on purpose"), 6);
@@ -77113,7 +76661,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::GetCredentialStatus::Type value;
 
-            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::DlCredentialType>(0);
+            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::CredentialTypeEnum>(0);
             value.credential.credentialIndex = 0U;
 
             return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::GetCredentialStatus::Id, value,
@@ -77125,9 +76673,9 @@ class DL_UsersAndCredentialsSuite : public TestCommand
             LogStep(105, "Modify the Programming PIN credential");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::SetCredential::Type value;
-            value.operationType = static_cast<chip::app::Clusters::DoorLock::DlDataOperationType>(2);
+            value.operationType = static_cast<chip::app::Clusters::DoorLock::DataOperationTypeEnum>(2);
 
-            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::DlCredentialType>(0);
+            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::CredentialTypeEnum>(0);
             value.credential.credentialIndex = 0U;
 
             value.credentialData = chip::ByteSpan(chip::Uint8::from_const_char("654321garbage: not in length on purpose"), 6);
@@ -77145,7 +76693,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand
             chip::app::Clusters::DoorLock::Commands::ClearCredential::Type value;
             value.credential.SetNonNull();
 
-            value.credential.Value().credentialType  = static_cast<chip::app::Clusters::DoorLock::DlCredentialType>(0);
+            value.credential.Value().credentialType  = static_cast<chip::app::Clusters::DoorLock::CredentialTypeEnum>(0);
             value.credential.Value().credentialIndex = 0U;
 
             return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::ClearCredential::Id, value,
@@ -77159,7 +76707,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand
             chip::app::Clusters::DoorLock::Commands::ClearCredential::Type value;
             value.credential.SetNonNull();
 
-            value.credential.Value().credentialType  = static_cast<chip::app::Clusters::DoorLock::DlCredentialType>(0);
+            value.credential.Value().credentialType  = static_cast<chip::app::Clusters::DoorLock::CredentialTypeEnum>(0);
             value.credential.Value().credentialIndex = 1U;
 
             return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::ClearCredential::Id, value,
@@ -77173,7 +76721,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand
             chip::app::Clusters::DoorLock::Commands::ClearCredential::Type value;
             value.credential.SetNonNull();
 
-            value.credential.Value().credentialType  = static_cast<chip::app::Clusters::DoorLock::DlCredentialType>(1);
+            value.credential.Value().credentialType  = static_cast<chip::app::Clusters::DoorLock::CredentialTypeEnum>(1);
             value.credential.Value().credentialIndex = 0U;
 
             return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::ClearCredential::Id, value,
@@ -77187,7 +76735,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand
             chip::app::Clusters::DoorLock::Commands::ClearCredential::Type value;
             value.credential.SetNonNull();
 
-            value.credential.Value().credentialType  = static_cast<chip::app::Clusters::DoorLock::DlCredentialType>(1);
+            value.credential.Value().credentialType  = static_cast<chip::app::Clusters::DoorLock::CredentialTypeEnum>(1);
             value.credential.Value().credentialIndex = static_cast<uint16_t>(NumberOfPINUsersSupported + 1);
 
             return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::ClearCredential::Id, value,
@@ -77201,7 +76749,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand
             chip::app::Clusters::DoorLock::Commands::ClearCredential::Type value;
             value.credential.SetNonNull();
 
-            value.credential.Value().credentialType  = static_cast<chip::app::Clusters::DoorLock::DlCredentialType>(2);
+            value.credential.Value().credentialType  = static_cast<chip::app::Clusters::DoorLock::CredentialTypeEnum>(2);
             value.credential.Value().credentialIndex = 0U;
 
             return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::ClearCredential::Id, value,
@@ -77215,7 +76763,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand
             chip::app::Clusters::DoorLock::Commands::ClearCredential::Type value;
             value.credential.SetNonNull();
 
-            value.credential.Value().credentialType  = static_cast<chip::app::Clusters::DoorLock::DlCredentialType>(2);
+            value.credential.Value().credentialType  = static_cast<chip::app::Clusters::DoorLock::CredentialTypeEnum>(2);
             value.credential.Value().credentialIndex = static_cast<uint16_t>(NumberOfRFIDUsersSupported + 1);
 
             return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::ClearCredential::Id, value,
@@ -77248,7 +76796,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::GetCredentialStatus::Type value;
 
-            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::DlCredentialType>(0);
+            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::CredentialTypeEnum>(0);
             value.credential.credentialIndex = 0U;
 
             return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::GetCredentialStatus::Id, value,
@@ -77260,9 +76808,9 @@ class DL_UsersAndCredentialsSuite : public TestCommand
             LogStep(115, "Create new PIN credential and user");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::SetCredential::Type value;
-            value.operationType = static_cast<chip::app::Clusters::DoorLock::DlDataOperationType>(0);
+            value.operationType = static_cast<chip::app::Clusters::DoorLock::DataOperationTypeEnum>(0);
 
-            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::DlCredentialType>(1);
+            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::CredentialTypeEnum>(1);
             value.credential.credentialIndex = 1U;
 
             value.credentialData = chip::ByteSpan(chip::Uint8::from_const_char("000000garbage: not in length on purpose"), 6);
@@ -77278,9 +76826,9 @@ class DL_UsersAndCredentialsSuite : public TestCommand
             LogStep(116, "Create second PIN credential and add it to existing user");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::SetCredential::Type value;
-            value.operationType = static_cast<chip::app::Clusters::DoorLock::DlDataOperationType>(0);
+            value.operationType = static_cast<chip::app::Clusters::DoorLock::DataOperationTypeEnum>(0);
 
-            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::DlCredentialType>(1);
+            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::CredentialTypeEnum>(1);
             value.credential.credentialIndex = 2U;
 
             value.credentialData = chip::ByteSpan(chip::Uint8::from_const_char("000001garbage: not in length on purpose"), 6);
@@ -77297,9 +76845,9 @@ class DL_UsersAndCredentialsSuite : public TestCommand
             LogStep(117, "Create third PIN credential and add it to existing user");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::SetCredential::Type value;
-            value.operationType = static_cast<chip::app::Clusters::DoorLock::DlDataOperationType>(0);
+            value.operationType = static_cast<chip::app::Clusters::DoorLock::DataOperationTypeEnum>(0);
 
-            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::DlCredentialType>(1);
+            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::CredentialTypeEnum>(1);
             value.credential.credentialIndex = 3U;
 
             value.credentialData = chip::ByteSpan(chip::Uint8::from_const_char("000002garbage: not in length on purpose"), 6);
@@ -77316,9 +76864,9 @@ class DL_UsersAndCredentialsSuite : public TestCommand
             LogStep(118, "Create fourth PIN credential and add it to existing user");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::SetCredential::Type value;
-            value.operationType = static_cast<chip::app::Clusters::DoorLock::DlDataOperationType>(0);
+            value.operationType = static_cast<chip::app::Clusters::DoorLock::DataOperationTypeEnum>(0);
 
-            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::DlCredentialType>(1);
+            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::CredentialTypeEnum>(1);
             value.credential.credentialIndex = 4U;
 
             value.credentialData = chip::ByteSpan(chip::Uint8::from_const_char("000003garbage: not in length on purpose"), 6);
@@ -77335,9 +76883,9 @@ class DL_UsersAndCredentialsSuite : public TestCommand
             LogStep(119, "Create fifth PIN credential and add it to existing user");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::SetCredential::Type value;
-            value.operationType = static_cast<chip::app::Clusters::DoorLock::DlDataOperationType>(0);
+            value.operationType = static_cast<chip::app::Clusters::DoorLock::DataOperationTypeEnum>(0);
 
-            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::DlCredentialType>(1);
+            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::CredentialTypeEnum>(1);
             value.credential.credentialIndex = 5U;
 
             value.credentialData = chip::ByteSpan(chip::Uint8::from_const_char("000004garbage: not in length on purpose"), 6);
@@ -77354,9 +76902,9 @@ class DL_UsersAndCredentialsSuite : public TestCommand
             LogStep(120, "Try to create sixth PIN credential and make sure it fails");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::SetCredential::Type value;
-            value.operationType = static_cast<chip::app::Clusters::DoorLock::DlDataOperationType>(0);
+            value.operationType = static_cast<chip::app::Clusters::DoorLock::DataOperationTypeEnum>(0);
 
-            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::DlCredentialType>(1);
+            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::CredentialTypeEnum>(1);
             value.credential.credentialIndex = 6U;
 
             value.credentialData = chip::ByteSpan(chip::Uint8::from_const_char("000005garbage: not in length on purpose"), 6);
@@ -77693,9 +77241,9 @@ class DL_LockUnlockSuite : public TestCommand
             LogStep(5, "Create new PIN credential and lock/unlock user");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::SetCredential::Type value;
-            value.operationType = static_cast<chip::app::Clusters::DoorLock::DlDataOperationType>(0);
+            value.operationType = static_cast<chip::app::Clusters::DoorLock::DataOperationTypeEnum>(0);
 
-            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::DlCredentialType>(1);
+            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::CredentialTypeEnum>(1);
             value.credential.credentialIndex = 1U;
 
             value.credentialData = chip::ByteSpan(chip::Uint8::from_const_char("123456garbage: not in length on purpose"), 6);
@@ -77719,8 +77267,8 @@ class DL_LockUnlockSuite : public TestCommand
             LogStep(7, "Try to unlock the door with invalid PIN");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::UnlockDoor::Type value;
-            value.pinCode.Emplace();
-            value.pinCode.Value() = chip::ByteSpan(chip::Uint8::from_const_char("000000garbage: not in length on purpose"), 6);
+            value.PINCode.Emplace();
+            value.PINCode.Value() = chip::ByteSpan(chip::Uint8::from_const_char("000000garbage: not in length on purpose"), 6);
             return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::UnlockDoor::Id, value,
                                chip::Optional<uint16_t>(10000), chip::NullOptional
 
@@ -77735,8 +77283,8 @@ class DL_LockUnlockSuite : public TestCommand
             LogStep(9, "Try to unlock the door with valid PIN");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::UnlockDoor::Type value;
-            value.pinCode.Emplace();
-            value.pinCode.Value() = chip::ByteSpan(chip::Uint8::from_const_char("123456garbage: not in length on purpose"), 6);
+            value.PINCode.Emplace();
+            value.PINCode.Value() = chip::ByteSpan(chip::Uint8::from_const_char("123456garbage: not in length on purpose"), 6);
             return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::UnlockDoor::Id, value,
                                chip::Optional<uint16_t>(10000), chip::NullOptional
 
@@ -77751,8 +77299,8 @@ class DL_LockUnlockSuite : public TestCommand
             LogStep(11, "Try to lock the door with invalid PIN");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::LockDoor::Type value;
-            value.pinCode.Emplace();
-            value.pinCode.Value() = chip::ByteSpan(chip::Uint8::from_const_char("000000garbage: not in length on purpose"), 6);
+            value.PINCode.Emplace();
+            value.PINCode.Value() = chip::ByteSpan(chip::Uint8::from_const_char("000000garbage: not in length on purpose"), 6);
             return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::LockDoor::Id, value,
                                chip::Optional<uint16_t>(10000), chip::NullOptional
 
@@ -77767,8 +77315,8 @@ class DL_LockUnlockSuite : public TestCommand
             LogStep(13, "Try to lock the door with valid PIN");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::LockDoor::Type value;
-            value.pinCode.Emplace();
-            value.pinCode.Value() = chip::ByteSpan(chip::Uint8::from_const_char("123456garbage: not in length on purpose"), 6);
+            value.PINCode.Emplace();
+            value.PINCode.Value() = chip::ByteSpan(chip::Uint8::from_const_char("123456garbage: not in length on purpose"), 6);
             return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::LockDoor::Id, value,
                                chip::Optional<uint16_t>(10000), chip::NullOptional
 
@@ -77782,8 +77330,8 @@ class DL_LockUnlockSuite : public TestCommand
         case 15: {
             LogStep(15, "Set OperatingMode to NoRemoteLockUnlock");
             ListFreer listFreer;
-            chip::app::Clusters::DoorLock::DlOperatingMode value;
-            value = static_cast<chip::app::Clusters::DoorLock::DlOperatingMode>(3);
+            chip::app::Clusters::DoorLock::OperatingModeEnum value;
+            value = static_cast<chip::app::Clusters::DoorLock::OperatingModeEnum>(3);
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Attributes::OperatingMode::Id, value,
                                   chip::NullOptional, chip::NullOptional);
         }
@@ -77799,8 +77347,8 @@ class DL_LockUnlockSuite : public TestCommand
         case 17: {
             LogStep(17, "Set OperatingMode to Normal");
             ListFreer listFreer;
-            chip::app::Clusters::DoorLock::DlOperatingMode value;
-            value = static_cast<chip::app::Clusters::DoorLock::DlOperatingMode>(0);
+            chip::app::Clusters::DoorLock::OperatingModeEnum value;
+            value = static_cast<chip::app::Clusters::DoorLock::OperatingModeEnum>(0);
             return WriteAttribute(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Attributes::OperatingMode::Id, value,
                                   chip::NullOptional, chip::NullOptional);
         }
@@ -77821,8 +77369,8 @@ class DL_LockUnlockSuite : public TestCommand
             LogStep(20, "Try to unlock the door with invalid PIN for the first time");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::UnlockDoor::Type value;
-            value.pinCode.Emplace();
-            value.pinCode.Value() = chip::ByteSpan(chip::Uint8::from_const_char("000000garbage: not in length on purpose"), 6);
+            value.PINCode.Emplace();
+            value.PINCode.Value() = chip::ByteSpan(chip::Uint8::from_const_char("000000garbage: not in length on purpose"), 6);
             return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::UnlockDoor::Id, value,
                                chip::Optional<uint16_t>(10000), chip::NullOptional
 
@@ -77832,8 +77380,8 @@ class DL_LockUnlockSuite : public TestCommand
             LogStep(21, "Try to unlock the door with invalid PIN for the second time");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::UnlockDoor::Type value;
-            value.pinCode.Emplace();
-            value.pinCode.Value() = chip::ByteSpan(chip::Uint8::from_const_char("000000garbage: not in length on purpose"), 6);
+            value.PINCode.Emplace();
+            value.PINCode.Value() = chip::ByteSpan(chip::Uint8::from_const_char("000000garbage: not in length on purpose"), 6);
             return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::UnlockDoor::Id, value,
                                chip::Optional<uint16_t>(10000), chip::NullOptional
 
@@ -77843,8 +77391,8 @@ class DL_LockUnlockSuite : public TestCommand
             LogStep(22, "Try to unlock the door with invalid PIN for the third time");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::UnlockDoor::Type value;
-            value.pinCode.Emplace();
-            value.pinCode.Value() = chip::ByteSpan(chip::Uint8::from_const_char("000000garbage: not in length on purpose"), 6);
+            value.PINCode.Emplace();
+            value.PINCode.Value() = chip::ByteSpan(chip::Uint8::from_const_char("000000garbage: not in length on purpose"), 6);
             return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::UnlockDoor::Id, value,
                                chip::Optional<uint16_t>(10000), chip::NullOptional
 
@@ -77854,8 +77402,8 @@ class DL_LockUnlockSuite : public TestCommand
             LogStep(23, "Try to unlock the door with valid PIN and make sure it fails due to lockout");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::UnlockDoor::Type value;
-            value.pinCode.Emplace();
-            value.pinCode.Value() = chip::ByteSpan(chip::Uint8::from_const_char("123456garbage: not in length on purpose"), 6);
+            value.PINCode.Emplace();
+            value.PINCode.Value() = chip::ByteSpan(chip::Uint8::from_const_char("123456garbage: not in length on purpose"), 6);
             return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::UnlockDoor::Id, value,
                                chip::Optional<uint16_t>(10000), chip::NullOptional
 
@@ -77872,8 +77420,8 @@ class DL_LockUnlockSuite : public TestCommand
             LogStep(25, "Try to unlock the door with valid PIN and make sure it succeeds");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::UnlockDoor::Type value;
-            value.pinCode.Emplace();
-            value.pinCode.Value() = chip::ByteSpan(chip::Uint8::from_const_char("123456garbage: not in length on purpose"), 6);
+            value.PINCode.Emplace();
+            value.PINCode.Value() = chip::ByteSpan(chip::Uint8::from_const_char("123456garbage: not in length on purpose"), 6);
             return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::UnlockDoor::Id, value,
                                chip::Optional<uint16_t>(10000), chip::NullOptional
 
@@ -77888,8 +77436,8 @@ class DL_LockUnlockSuite : public TestCommand
             LogStep(27, "Lock the door back prior to next tests");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::LockDoor::Type value;
-            value.pinCode.Emplace();
-            value.pinCode.Value() = chip::ByteSpan(chip::Uint8::from_const_char("123456garbage: not in length on purpose"), 6);
+            value.PINCode.Emplace();
+            value.PINCode.Value() = chip::ByteSpan(chip::Uint8::from_const_char("123456garbage: not in length on purpose"), 6);
             return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::LockDoor::Id, value,
                                chip::Optional<uint16_t>(10000), chip::NullOptional
 
@@ -77899,15 +77447,15 @@ class DL_LockUnlockSuite : public TestCommand
             LogStep(28, "Create a disabled user and credential");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::SetCredential::Type value;
-            value.operationType = static_cast<chip::app::Clusters::DoorLock::DlDataOperationType>(0);
+            value.operationType = static_cast<chip::app::Clusters::DoorLock::DataOperationTypeEnum>(0);
 
-            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::DlCredentialType>(1);
+            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::CredentialTypeEnum>(1);
             value.credential.credentialIndex = 2U;
 
             value.credentialData = chip::ByteSpan(chip::Uint8::from_const_char("654321garbage: not in length on purpose"), 6);
             value.userIndex.SetNull();
             value.userStatus.SetNonNull();
-            value.userStatus.Value() = static_cast<chip::app::Clusters::DoorLock::DlUserStatus>(3);
+            value.userStatus.Value() = static_cast<chip::app::Clusters::DoorLock::UserStatusEnum>(3);
             value.userType.SetNull();
             return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::SetCredential::Id, value,
                                chip::Optional<uint16_t>(10000), chip::NullOptional
@@ -77918,8 +77466,8 @@ class DL_LockUnlockSuite : public TestCommand
             LogStep(29, "Try to unlock the door with disabled user PIN");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::UnlockDoor::Type value;
-            value.pinCode.Emplace();
-            value.pinCode.Value() = chip::ByteSpan(chip::Uint8::from_const_char("654321garbage: not in length on purpose"), 6);
+            value.PINCode.Emplace();
+            value.PINCode.Value() = chip::ByteSpan(chip::Uint8::from_const_char("654321garbage: not in length on purpose"), 6);
             return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::UnlockDoor::Id, value,
                                chip::Optional<uint16_t>(10000), chip::NullOptional
 
@@ -77934,8 +77482,8 @@ class DL_LockUnlockSuite : public TestCommand
             LogStep(31, "Unlock the door with enabled user PIN");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::UnlockDoor::Type value;
-            value.pinCode.Emplace();
-            value.pinCode.Value() = chip::ByteSpan(chip::Uint8::from_const_char("123456garbage: not in length on purpose"), 6);
+            value.PINCode.Emplace();
+            value.PINCode.Value() = chip::ByteSpan(chip::Uint8::from_const_char("123456garbage: not in length on purpose"), 6);
             return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::UnlockDoor::Id, value,
                                chip::Optional<uint16_t>(10000), chip::NullOptional
 
@@ -77950,8 +77498,8 @@ class DL_LockUnlockSuite : public TestCommand
             LogStep(33, "Try to lock the door with disabled user PIN");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::LockDoor::Type value;
-            value.pinCode.Emplace();
-            value.pinCode.Value() = chip::ByteSpan(chip::Uint8::from_const_char("654321garbage: not in length on purpose"), 6);
+            value.PINCode.Emplace();
+            value.PINCode.Value() = chip::ByteSpan(chip::Uint8::from_const_char("654321garbage: not in length on purpose"), 6);
             return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::LockDoor::Id, value,
                                chip::Optional<uint16_t>(10000), chip::NullOptional
 
@@ -77966,8 +77514,8 @@ class DL_LockUnlockSuite : public TestCommand
             LogStep(35, "Lock the door with enabled user PIN");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::LockDoor::Type value;
-            value.pinCode.Emplace();
-            value.pinCode.Value() = chip::ByteSpan(chip::Uint8::from_const_char("123456garbage: not in length on purpose"), 6);
+            value.PINCode.Emplace();
+            value.PINCode.Value() = chip::ByteSpan(chip::Uint8::from_const_char("123456garbage: not in length on purpose"), 6);
             return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::LockDoor::Id, value,
                                chip::Optional<uint16_t>(10000), chip::NullOptional
 
@@ -79118,9 +78666,9 @@ class DL_SchedulesSuite : public TestCommand
             LogStep(1, "Create new PIN credential and schedule user");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::SetCredential::Type value;
-            value.operationType = static_cast<chip::app::Clusters::DoorLock::DlDataOperationType>(0);
+            value.operationType = static_cast<chip::app::Clusters::DoorLock::DataOperationTypeEnum>(0);
 
-            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::DlCredentialType>(1);
+            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::CredentialTypeEnum>(1);
             value.credential.credentialIndex = 1U;
 
             value.credentialData = chip::ByteSpan(chip::Uint8::from_const_char("123456garbage: not in length on purpose"), 6);
@@ -79158,7 +78706,7 @@ class DL_SchedulesSuite : public TestCommand
             chip::app::Clusters::DoorLock::Commands::SetWeekDaySchedule::Type value;
             value.weekDayIndex = 0U;
             value.userIndex    = 1U;
-            value.daysMask     = static_cast<chip::BitMask<chip::app::Clusters::DoorLock::DlDaysMaskMap>>(1U);
+            value.daysMask     = static_cast<chip::BitMask<chip::app::Clusters::DoorLock::DaysMaskMap>>(1U);
             value.startHour    = 15U;
             value.startMinute  = 16U;
             value.endHour      = 18U;
@@ -79174,7 +78722,7 @@ class DL_SchedulesSuite : public TestCommand
             chip::app::Clusters::DoorLock::Commands::SetWeekDaySchedule::Type value;
             value.weekDayIndex = static_cast<uint8_t>(NumberOfWeekDaySchedulesSupportedPerUser + 1);
             value.userIndex    = 1U;
-            value.daysMask     = static_cast<chip::BitMask<chip::app::Clusters::DoorLock::DlDaysMaskMap>>(1U);
+            value.daysMask     = static_cast<chip::BitMask<chip::app::Clusters::DoorLock::DaysMaskMap>>(1U);
             value.startHour    = 15U;
             value.startMinute  = 16U;
             value.endHour      = 18U;
@@ -79190,7 +78738,7 @@ class DL_SchedulesSuite : public TestCommand
             chip::app::Clusters::DoorLock::Commands::SetWeekDaySchedule::Type value;
             value.weekDayIndex = 1U;
             value.userIndex    = 0U;
-            value.daysMask     = static_cast<chip::BitMask<chip::app::Clusters::DoorLock::DlDaysMaskMap>>(1U);
+            value.daysMask     = static_cast<chip::BitMask<chip::app::Clusters::DoorLock::DaysMaskMap>>(1U);
             value.startHour    = 15U;
             value.startMinute  = 16U;
             value.endHour      = 18U;
@@ -79206,7 +78754,7 @@ class DL_SchedulesSuite : public TestCommand
             chip::app::Clusters::DoorLock::Commands::SetWeekDaySchedule::Type value;
             value.weekDayIndex = 1U;
             value.userIndex    = static_cast<uint16_t>(NumberOfTotalUsersSupported + 1);
-            value.daysMask     = static_cast<chip::BitMask<chip::app::Clusters::DoorLock::DlDaysMaskMap>>(1U);
+            value.daysMask     = static_cast<chip::BitMask<chip::app::Clusters::DoorLock::DaysMaskMap>>(1U);
             value.startHour    = 15U;
             value.startMinute  = 16U;
             value.endHour      = 18U;
@@ -79222,7 +78770,7 @@ class DL_SchedulesSuite : public TestCommand
             chip::app::Clusters::DoorLock::Commands::SetWeekDaySchedule::Type value;
             value.weekDayIndex = 1U;
             value.userIndex    = 2U;
-            value.daysMask     = static_cast<chip::BitMask<chip::app::Clusters::DoorLock::DlDaysMaskMap>>(1U);
+            value.daysMask     = static_cast<chip::BitMask<chip::app::Clusters::DoorLock::DaysMaskMap>>(1U);
             value.startHour    = 15U;
             value.startMinute  = 16U;
             value.endHour      = 18U;
@@ -79238,7 +78786,7 @@ class DL_SchedulesSuite : public TestCommand
             chip::app::Clusters::DoorLock::Commands::SetWeekDaySchedule::Type value;
             value.weekDayIndex = 1U;
             value.userIndex    = 1U;
-            value.daysMask     = static_cast<chip::BitMask<chip::app::Clusters::DoorLock::DlDaysMaskMap>>(0U);
+            value.daysMask     = static_cast<chip::BitMask<chip::app::Clusters::DoorLock::DaysMaskMap>>(0U);
             value.startHour    = 15U;
             value.startMinute  = 16U;
             value.endHour      = 18U;
@@ -79254,7 +78802,7 @@ class DL_SchedulesSuite : public TestCommand
             chip::app::Clusters::DoorLock::Commands::SetWeekDaySchedule::Type value;
             value.weekDayIndex = 1U;
             value.userIndex    = 1U;
-            value.daysMask     = static_cast<chip::BitMask<chip::app::Clusters::DoorLock::DlDaysMaskMap>>(3U);
+            value.daysMask     = static_cast<chip::BitMask<chip::app::Clusters::DoorLock::DaysMaskMap>>(3U);
             value.startHour    = 15U;
             value.startMinute  = 16U;
             value.endHour      = 18U;
@@ -79270,7 +78818,7 @@ class DL_SchedulesSuite : public TestCommand
             chip::app::Clusters::DoorLock::Commands::SetWeekDaySchedule::Type value;
             value.weekDayIndex = 1U;
             value.userIndex    = 1U;
-            value.daysMask     = static_cast<chip::BitMask<chip::app::Clusters::DoorLock::DlDaysMaskMap>>(73U);
+            value.daysMask     = static_cast<chip::BitMask<chip::app::Clusters::DoorLock::DaysMaskMap>>(73U);
             value.startHour    = 15U;
             value.startMinute  = 16U;
             value.endHour      = 18U;
@@ -79286,7 +78834,7 @@ class DL_SchedulesSuite : public TestCommand
             chip::app::Clusters::DoorLock::Commands::SetWeekDaySchedule::Type value;
             value.weekDayIndex = 1U;
             value.userIndex    = 1U;
-            value.daysMask     = static_cast<chip::BitMask<chip::app::Clusters::DoorLock::DlDaysMaskMap>>(1U);
+            value.daysMask     = static_cast<chip::BitMask<chip::app::Clusters::DoorLock::DaysMaskMap>>(1U);
             value.startHour    = 24U;
             value.startMinute  = 16U;
             value.endHour      = 18U;
@@ -79302,7 +78850,7 @@ class DL_SchedulesSuite : public TestCommand
             chip::app::Clusters::DoorLock::Commands::SetWeekDaySchedule::Type value;
             value.weekDayIndex = 1U;
             value.userIndex    = 1U;
-            value.daysMask     = static_cast<chip::BitMask<chip::app::Clusters::DoorLock::DlDaysMaskMap>>(1U);
+            value.daysMask     = static_cast<chip::BitMask<chip::app::Clusters::DoorLock::DaysMaskMap>>(1U);
             value.startHour    = 15U;
             value.startMinute  = 60U;
             value.endHour      = 18U;
@@ -79318,7 +78866,7 @@ class DL_SchedulesSuite : public TestCommand
             chip::app::Clusters::DoorLock::Commands::SetWeekDaySchedule::Type value;
             value.weekDayIndex = 1U;
             value.userIndex    = 1U;
-            value.daysMask     = static_cast<chip::BitMask<chip::app::Clusters::DoorLock::DlDaysMaskMap>>(1U);
+            value.daysMask     = static_cast<chip::BitMask<chip::app::Clusters::DoorLock::DaysMaskMap>>(1U);
             value.startHour    = 15U;
             value.startMinute  = 16U;
             value.endHour      = 24U;
@@ -79334,7 +78882,7 @@ class DL_SchedulesSuite : public TestCommand
             chip::app::Clusters::DoorLock::Commands::SetWeekDaySchedule::Type value;
             value.weekDayIndex = 1U;
             value.userIndex    = 1U;
-            value.daysMask     = static_cast<chip::BitMask<chip::app::Clusters::DoorLock::DlDaysMaskMap>>(1U);
+            value.daysMask     = static_cast<chip::BitMask<chip::app::Clusters::DoorLock::DaysMaskMap>>(1U);
             value.startHour    = 15U;
             value.startMinute  = 16U;
             value.endHour      = 18U;
@@ -79350,7 +78898,7 @@ class DL_SchedulesSuite : public TestCommand
             chip::app::Clusters::DoorLock::Commands::SetWeekDaySchedule::Type value;
             value.weekDayIndex = 1U;
             value.userIndex    = 1U;
-            value.daysMask     = static_cast<chip::BitMask<chip::app::Clusters::DoorLock::DlDaysMaskMap>>(1U);
+            value.daysMask     = static_cast<chip::BitMask<chip::app::Clusters::DoorLock::DaysMaskMap>>(1U);
             value.startHour    = 19U;
             value.startMinute  = 16U;
             value.endHour      = 18U;
@@ -79366,7 +78914,7 @@ class DL_SchedulesSuite : public TestCommand
             chip::app::Clusters::DoorLock::Commands::SetWeekDaySchedule::Type value;
             value.weekDayIndex = 1U;
             value.userIndex    = 1U;
-            value.daysMask     = static_cast<chip::BitMask<chip::app::Clusters::DoorLock::DlDaysMaskMap>>(1U);
+            value.daysMask     = static_cast<chip::BitMask<chip::app::Clusters::DoorLock::DaysMaskMap>>(1U);
             value.startHour    = 15U;
             value.startMinute  = 50U;
             value.endHour      = 15U;
@@ -79593,7 +79141,7 @@ class DL_SchedulesSuite : public TestCommand
             value.holidayIndex   = 0U;
             value.localStartTime = 12345UL;
             value.localEndTime   = 12345689UL;
-            value.operatingMode  = static_cast<chip::app::Clusters::DoorLock::DlOperatingMode>(0);
+            value.operatingMode  = static_cast<chip::app::Clusters::DoorLock::OperatingModeEnum>(0);
             return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::SetHolidaySchedule::Id, value,
                                chip::NullOptional
 
@@ -79606,7 +79154,7 @@ class DL_SchedulesSuite : public TestCommand
             value.holidayIndex   = static_cast<uint8_t>(NumberOfHolidaySchedulesSupported + 1);
             value.localStartTime = 12345UL;
             value.localEndTime   = 12345689UL;
-            value.operatingMode  = static_cast<chip::app::Clusters::DoorLock::DlOperatingMode>(0);
+            value.operatingMode  = static_cast<chip::app::Clusters::DoorLock::OperatingModeEnum>(0);
             return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::SetHolidaySchedule::Id, value,
                                chip::NullOptional
 
@@ -79619,7 +79167,7 @@ class DL_SchedulesSuite : public TestCommand
             value.holidayIndex   = 1U;
             value.localStartTime = 12345689UL;
             value.localEndTime   = 12345688UL;
-            value.operatingMode  = static_cast<chip::app::Clusters::DoorLock::DlOperatingMode>(0);
+            value.operatingMode  = static_cast<chip::app::Clusters::DoorLock::OperatingModeEnum>(0);
             return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::SetHolidaySchedule::Id, value,
                                chip::NullOptional
 
@@ -79632,7 +79180,7 @@ class DL_SchedulesSuite : public TestCommand
             value.holidayIndex   = 1U;
             value.localStartTime = 12345UL;
             value.localEndTime   = 12345689UL;
-            value.operatingMode  = static_cast<chip::app::Clusters::DoorLock::DlOperatingMode>(5);
+            value.operatingMode  = static_cast<chip::app::Clusters::DoorLock::OperatingModeEnum>(5);
             return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::SetHolidaySchedule::Id, value,
                                chip::NullOptional
 
@@ -79675,7 +79223,7 @@ class DL_SchedulesSuite : public TestCommand
             value.holidayIndex   = 1U;
             value.localStartTime = 12345UL;
             value.localEndTime   = 12345689UL;
-            value.operatingMode  = static_cast<chip::app::Clusters::DoorLock::DlOperatingMode>(0);
+            value.operatingMode  = static_cast<chip::app::Clusters::DoorLock::OperatingModeEnum>(0);
             return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::SetHolidaySchedule::Id, value,
                                chip::NullOptional
 
@@ -79697,7 +79245,7 @@ class DL_SchedulesSuite : public TestCommand
             chip::app::Clusters::DoorLock::Commands::SetWeekDaySchedule::Type value;
             value.weekDayIndex = 1U;
             value.userIndex    = 1U;
-            value.daysMask     = static_cast<chip::BitMask<chip::app::Clusters::DoorLock::DlDaysMaskMap>>(1U);
+            value.daysMask     = static_cast<chip::BitMask<chip::app::Clusters::DoorLock::DaysMaskMap>>(1U);
             value.startHour    = 15U;
             value.startMinute  = 16U;
             value.endHour      = 18U;
@@ -79974,7 +79522,7 @@ class DL_SchedulesSuite : public TestCommand
             chip::app::Clusters::DoorLock::Commands::SetWeekDaySchedule::Type value;
             value.weekDayIndex = 2U;
             value.userIndex    = 1U;
-            value.daysMask     = static_cast<chip::BitMask<chip::app::Clusters::DoorLock::DlDaysMaskMap>>(2U);
+            value.daysMask     = static_cast<chip::BitMask<chip::app::Clusters::DoorLock::DaysMaskMap>>(2U);
             value.startHour    = 0U;
             value.startMinute  = 0U;
             value.endHour      = 23U;
@@ -80026,7 +79574,7 @@ class DL_SchedulesSuite : public TestCommand
             value.holidayIndex   = 2U;
             value.localStartTime = 123456UL;
             value.localEndTime   = 1234567UL;
-            value.operatingMode  = static_cast<chip::app::Clusters::DoorLock::DlOperatingMode>(1);
+            value.operatingMode  = static_cast<chip::app::Clusters::DoorLock::OperatingModeEnum>(1);
             return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::SetHolidaySchedule::Id, value,
                                chip::NullOptional
 
@@ -80134,7 +79682,7 @@ class DL_SchedulesSuite : public TestCommand
             chip::app::Clusters::DoorLock::Commands::SetWeekDaySchedule::Type value;
             value.weekDayIndex = 1U;
             value.userIndex    = 1U;
-            value.daysMask     = static_cast<chip::BitMask<chip::app::Clusters::DoorLock::DlDaysMaskMap>>(2U);
+            value.daysMask     = static_cast<chip::BitMask<chip::app::Clusters::DoorLock::DaysMaskMap>>(2U);
             value.startHour    = 0U;
             value.startMinute  = 0U;
             value.endHour      = 23U;
@@ -80214,10 +79762,10 @@ class DL_SchedulesSuite : public TestCommand
             LogStep(93, "Create new user without credential so we can add more schedules to it");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::SetUser::Type value;
-            value.operationType = static_cast<chip::app::Clusters::DoorLock::DlDataOperationType>(0);
+            value.operationType = static_cast<chip::app::Clusters::DoorLock::DataOperationTypeEnum>(0);
             value.userIndex     = 2U;
             value.userName.SetNull();
-            value.userUniqueId.SetNull();
+            value.userUniqueID.SetNull();
             value.userStatus.SetNull();
             value.userType.SetNull();
             value.credentialRule.SetNull();
@@ -80232,7 +79780,7 @@ class DL_SchedulesSuite : public TestCommand
             chip::app::Clusters::DoorLock::Commands::SetWeekDaySchedule::Type value;
             value.weekDayIndex = 1U;
             value.userIndex    = 1U;
-            value.daysMask     = static_cast<chip::BitMask<chip::app::Clusters::DoorLock::DlDaysMaskMap>>(1U);
+            value.daysMask     = static_cast<chip::BitMask<chip::app::Clusters::DoorLock::DaysMaskMap>>(1U);
             value.startHour    = 0U;
             value.startMinute  = 0U;
             value.endHour      = 23U;
@@ -80283,7 +79831,7 @@ class DL_SchedulesSuite : public TestCommand
             chip::app::Clusters::DoorLock::Commands::SetWeekDaySchedule::Type value;
             value.weekDayIndex = 4U;
             value.userIndex    = 2U;
-            value.daysMask     = static_cast<chip::BitMask<chip::app::Clusters::DoorLock::DlDaysMaskMap>>(64U);
+            value.daysMask     = static_cast<chip::BitMask<chip::app::Clusters::DoorLock::DaysMaskMap>>(64U);
             value.startHour    = 23U;
             value.startMinute  = 0U;
             value.endHour      = 23U;
@@ -80409,7 +79957,7 @@ class DL_SchedulesSuite : public TestCommand
             value.holidayIndex   = NumberOfHolidaySchedulesSupported;
             value.localStartTime = 1UL;
             value.localEndTime   = 100UL;
-            value.operatingMode  = static_cast<chip::app::Clusters::DoorLock::DlOperatingMode>(4);
+            value.operatingMode  = static_cast<chip::app::Clusters::DoorLock::OperatingModeEnum>(4);
             return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::SetHolidaySchedule::Id, value,
                                chip::NullOptional
 
@@ -80429,9 +79977,9 @@ class DL_SchedulesSuite : public TestCommand
             LogStep(111, "Create new PIN credential and schedule user");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::SetCredential::Type value;
-            value.operationType = static_cast<chip::app::Clusters::DoorLock::DlDataOperationType>(0);
+            value.operationType = static_cast<chip::app::Clusters::DoorLock::DataOperationTypeEnum>(0);
 
-            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::DlCredentialType>(1);
+            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::CredentialTypeEnum>(1);
             value.credential.credentialIndex = 1U;
 
             value.credentialData = chip::ByteSpan(chip::Uint8::from_const_char("123456garbage: not in length on purpose"), 6);
@@ -80449,7 +79997,7 @@ class DL_SchedulesSuite : public TestCommand
             chip::app::Clusters::DoorLock::Commands::SetWeekDaySchedule::Type value;
             value.weekDayIndex = 1U;
             value.userIndex    = 1U;
-            value.daysMask     = static_cast<chip::BitMask<chip::app::Clusters::DoorLock::DlDaysMaskMap>>(1U);
+            value.daysMask     = static_cast<chip::BitMask<chip::app::Clusters::DoorLock::DaysMaskMap>>(1U);
             value.startHour    = 0U;
             value.startMinute  = 0U;
             value.endHour      = 23U;
@@ -81410,8 +80958,8 @@ class Test_TC_DRLK_2_2Suite : public TestCommand
                 VerifyOrReturn(CheckValue("userIndex", value.userIndex, 1U));
                 VerifyOrReturn(CheckValueNonNull("userName", value.userName));
                 VerifyOrReturn(CheckValueAsString("userName.Value()", value.userName.Value(), chip::CharSpan("xxx", 3)));
-                VerifyOrReturn(CheckValueNonNull("userUniqueId", value.userUniqueId));
-                VerifyOrReturn(CheckValue("userUniqueId.Value()", value.userUniqueId.Value(), 6452UL));
+                VerifyOrReturn(CheckValueNonNull("userUniqueID", value.userUniqueID));
+                VerifyOrReturn(CheckValue("userUniqueID.Value()", value.userUniqueID.Value(), 6452UL));
                 VerifyOrReturn(CheckValueNonNull("userStatus", value.userStatus));
                 VerifyOrReturn(CheckValue("userStatus.Value()", value.userStatus.Value(), 1U));
                 VerifyOrReturn(CheckValueNonNull("userType", value.userType));
@@ -81575,18 +81123,18 @@ class Test_TC_DRLK_2_2Suite : public TestCommand
             LogStep(1, "Create new user");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::SetUser::Type value;
-            value.operationType = static_cast<chip::app::Clusters::DoorLock::DlDataOperationType>(0);
+            value.operationType = static_cast<chip::app::Clusters::DoorLock::DataOperationTypeEnum>(0);
             value.userIndex     = 1U;
             value.userName.SetNonNull();
             value.userName.Value() = chip::Span<const char>("xxxgarbage: not in length on purpose", 3);
-            value.userUniqueId.SetNonNull();
-            value.userUniqueId.Value() = 6452UL;
+            value.userUniqueID.SetNonNull();
+            value.userUniqueID.Value() = 6452UL;
             value.userStatus.SetNonNull();
-            value.userStatus.Value() = static_cast<chip::app::Clusters::DoorLock::DlUserStatus>(1);
+            value.userStatus.Value() = static_cast<chip::app::Clusters::DoorLock::UserStatusEnum>(1);
             value.userType.SetNonNull();
-            value.userType.Value() = static_cast<chip::app::Clusters::DoorLock::DlUserType>(0);
+            value.userType.Value() = static_cast<chip::app::Clusters::DoorLock::UserTypeEnum>(0);
             value.credentialRule.SetNonNull();
-            value.credentialRule.Value() = static_cast<chip::app::Clusters::DoorLock::DlCredentialRule>(0);
+            value.credentialRule.Value() = static_cast<chip::app::Clusters::DoorLock::CredentialRuleEnum>(0);
             return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::SetUser::Id, value,
                                chip::Optional<uint16_t>(1000), chip::NullOptional
 
@@ -81606,9 +81154,9 @@ class Test_TC_DRLK_2_2Suite : public TestCommand
             LogStep(3, "Create new PIN credential and lock/unlock user");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::SetCredential::Type value;
-            value.operationType = static_cast<chip::app::Clusters::DoorLock::DlDataOperationType>(0);
+            value.operationType = static_cast<chip::app::Clusters::DoorLock::DataOperationTypeEnum>(0);
 
-            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::DlCredentialType>(1);
+            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::CredentialTypeEnum>(1);
             value.credential.credentialIndex = 1U;
 
             value.credentialData = chip::ByteSpan(chip::Uint8::from_const_char("123456garbage: not in length on purpose"), 6);
@@ -81626,7 +81174,7 @@ class Test_TC_DRLK_2_2Suite : public TestCommand
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::GetCredentialStatus::Type value;
 
-            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::DlCredentialType>(1);
+            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::CredentialTypeEnum>(1);
             value.credential.credentialIndex = 1U;
 
             return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::GetCredentialStatus::Id, value,
@@ -81677,8 +81225,8 @@ class Test_TC_DRLK_2_2Suite : public TestCommand
             VerifyOrDo(!ShouldSkip("DRLK.S.C00.Rsp"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::LockDoor::Type value;
-            value.pinCode.Emplace();
-            value.pinCode.Value() = chip::ByteSpan(chip::Uint8::from_const_char("123456garbage: not in length on purpose"), 6);
+            value.PINCode.Emplace();
+            value.PINCode.Value() = chip::ByteSpan(chip::Uint8::from_const_char("123456garbage: not in length on purpose"), 6);
             return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::LockDoor::Id, value,
                                chip::Optional<uint16_t>(1000), chip::NullOptional
 
@@ -81717,8 +81265,8 @@ class Test_TC_DRLK_2_2Suite : public TestCommand
             VerifyOrDo(!ShouldSkip("DRLK.S.C00.Rsp && DRLK.S.A0033"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::LockDoor::Type value;
-            value.pinCode.Emplace();
-            value.pinCode.Value() = chip::ByteSpan(chip::Uint8::from_const_char("123456garbage: not in length on purpose"), 6);
+            value.PINCode.Emplace();
+            value.PINCode.Value() = chip::ByteSpan(chip::Uint8::from_const_char("123456garbage: not in length on purpose"), 6);
             return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::LockDoor::Id, value,
                                chip::Optional<uint16_t>(1000), chip::NullOptional
 
@@ -81729,8 +81277,8 @@ class Test_TC_DRLK_2_2Suite : public TestCommand
             VerifyOrDo(!ShouldSkip("DRLK.S.C00.Rsp && DRLK.S.A0033"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::LockDoor::Type value;
-            value.pinCode.Emplace();
-            value.pinCode.Value() = chip::ByteSpan(chip::Uint8::from_const_char("645321garbage: not in length on purpose"), 6);
+            value.PINCode.Emplace();
+            value.PINCode.Value() = chip::ByteSpan(chip::Uint8::from_const_char("645321garbage: not in length on purpose"), 6);
             return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::LockDoor::Id, value,
                                chip::Optional<uint16_t>(1000), chip::NullOptional
 
@@ -81855,7 +81403,7 @@ class Test_TC_DRLK_2_2Suite : public TestCommand
             chip::app::Clusters::DoorLock::Commands::ClearCredential::Type value;
             value.credential.SetNonNull();
 
-            value.credential.Value().credentialType  = static_cast<chip::app::Clusters::DoorLock::DlCredentialType>(1);
+            value.credential.Value().credentialType  = static_cast<chip::app::Clusters::DoorLock::CredentialTypeEnum>(1);
             value.credential.Value().credentialIndex = 1U;
 
             return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::ClearCredential::Id, value,
@@ -81924,8 +81472,8 @@ class Test_TC_DRLK_2_3Suite : public TestCommand
                 VerifyOrReturn(CheckValue("userIndex", value.userIndex, 1U));
                 VerifyOrReturn(CheckValueNonNull("userName", value.userName));
                 VerifyOrReturn(CheckValueAsString("userName.Value()", value.userName.Value(), chip::CharSpan("xxx", 3)));
-                VerifyOrReturn(CheckValueNonNull("userUniqueId", value.userUniqueId));
-                VerifyOrReturn(CheckValue("userUniqueId.Value()", value.userUniqueId.Value(), 6452UL));
+                VerifyOrReturn(CheckValueNonNull("userUniqueID", value.userUniqueID));
+                VerifyOrReturn(CheckValue("userUniqueID.Value()", value.userUniqueID.Value(), 6452UL));
                 VerifyOrReturn(CheckValueNonNull("userStatus", value.userStatus));
                 VerifyOrReturn(CheckValue("userStatus.Value()", value.userStatus.Value(), 1U));
                 VerifyOrReturn(CheckValueNonNull("userType", value.userType));
@@ -82118,18 +81666,18 @@ class Test_TC_DRLK_2_3Suite : public TestCommand
             LogStep(1, "Create new user");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::SetUser::Type value;
-            value.operationType = static_cast<chip::app::Clusters::DoorLock::DlDataOperationType>(0);
+            value.operationType = static_cast<chip::app::Clusters::DoorLock::DataOperationTypeEnum>(0);
             value.userIndex     = 1U;
             value.userName.SetNonNull();
             value.userName.Value() = chip::Span<const char>("xxxgarbage: not in length on purpose", 3);
-            value.userUniqueId.SetNonNull();
-            value.userUniqueId.Value() = 6452UL;
+            value.userUniqueID.SetNonNull();
+            value.userUniqueID.Value() = 6452UL;
             value.userStatus.SetNonNull();
-            value.userStatus.Value() = static_cast<chip::app::Clusters::DoorLock::DlUserStatus>(1);
+            value.userStatus.Value() = static_cast<chip::app::Clusters::DoorLock::UserStatusEnum>(1);
             value.userType.SetNonNull();
-            value.userType.Value() = static_cast<chip::app::Clusters::DoorLock::DlUserType>(0);
+            value.userType.Value() = static_cast<chip::app::Clusters::DoorLock::UserTypeEnum>(0);
             value.credentialRule.SetNonNull();
-            value.credentialRule.Value() = static_cast<chip::app::Clusters::DoorLock::DlCredentialRule>(0);
+            value.credentialRule.Value() = static_cast<chip::app::Clusters::DoorLock::CredentialRuleEnum>(0);
             return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::SetUser::Id, value,
                                chip::Optional<uint16_t>(1000), chip::NullOptional
 
@@ -82149,9 +81697,9 @@ class Test_TC_DRLK_2_3Suite : public TestCommand
             LogStep(3, "Create new PIN credential and lock/unlock user");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::SetCredential::Type value;
-            value.operationType = static_cast<chip::app::Clusters::DoorLock::DlDataOperationType>(0);
+            value.operationType = static_cast<chip::app::Clusters::DoorLock::DataOperationTypeEnum>(0);
 
-            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::DlCredentialType>(1);
+            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::CredentialTypeEnum>(1);
             value.credential.credentialIndex = 1U;
 
             value.credentialData = chip::ByteSpan(chip::Uint8::from_const_char("123456garbage: not in length on purpose"), 6);
@@ -82169,7 +81717,7 @@ class Test_TC_DRLK_2_3Suite : public TestCommand
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::GetCredentialStatus::Type value;
 
-            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::DlCredentialType>(1);
+            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::CredentialTypeEnum>(1);
             value.credential.credentialIndex = 1U;
 
             return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::GetCredentialStatus::Id, value,
@@ -82220,8 +81768,8 @@ class Test_TC_DRLK_2_3Suite : public TestCommand
             VerifyOrDo(!ShouldSkip("DRLK.S.C01.Rsp"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::UnlockDoor::Type value;
-            value.pinCode.Emplace();
-            value.pinCode.Value() = chip::ByteSpan(chip::Uint8::from_const_char("123456garbage: not in length on purpose"), 6);
+            value.PINCode.Emplace();
+            value.PINCode.Value() = chip::ByteSpan(chip::Uint8::from_const_char("123456garbage: not in length on purpose"), 6);
             return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::UnlockDoor::Id, value,
                                chip::Optional<uint16_t>(1000), chip::NullOptional
 
@@ -82260,8 +81808,8 @@ class Test_TC_DRLK_2_3Suite : public TestCommand
             VerifyOrDo(!ShouldSkip("DRLK.S.C01.Rsp && DRLK.S.A0033"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::UnlockDoor::Type value;
-            value.pinCode.Emplace();
-            value.pinCode.Value() = chip::ByteSpan(chip::Uint8::from_const_char("123456garbage: not in length on purpose"), 6);
+            value.PINCode.Emplace();
+            value.PINCode.Value() = chip::ByteSpan(chip::Uint8::from_const_char("123456garbage: not in length on purpose"), 6);
             return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::UnlockDoor::Id, value,
                                chip::Optional<uint16_t>(1000), chip::NullOptional
 
@@ -82272,8 +81820,8 @@ class Test_TC_DRLK_2_3Suite : public TestCommand
             VerifyOrDo(!ShouldSkip("DRLK.S.C01.Rsp && DRLK.S.A0033"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::UnlockDoor::Type value;
-            value.pinCode.Emplace();
-            value.pinCode.Value() = chip::ByteSpan(chip::Uint8::from_const_char("1234568garbage: not in length on purpose"), 7);
+            value.PINCode.Emplace();
+            value.PINCode.Value() = chip::ByteSpan(chip::Uint8::from_const_char("1234568garbage: not in length on purpose"), 7);
             return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::UnlockDoor::Id, value,
                                chip::Optional<uint16_t>(1000), chip::NullOptional
 
@@ -82338,8 +81886,8 @@ class Test_TC_DRLK_2_3Suite : public TestCommand
             VerifyOrDo(!ShouldSkip("DRLK.S.C01.Rsp"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::UnlockDoor::Type value;
-            value.pinCode.Emplace();
-            value.pinCode.Value() = chip::ByteSpan(chip::Uint8::from_const_char("1234568garbage: not in length on purpose"), 7);
+            value.PINCode.Emplace();
+            value.PINCode.Value() = chip::ByteSpan(chip::Uint8::from_const_char("1234568garbage: not in length on purpose"), 7);
             return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::UnlockDoor::Id, value,
                                chip::Optional<uint16_t>(1000), chip::NullOptional
 
@@ -82350,8 +81898,8 @@ class Test_TC_DRLK_2_3Suite : public TestCommand
             VerifyOrDo(!ShouldSkip("DRLK.S.C01.Rsp"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::UnlockDoor::Type value;
-            value.pinCode.Emplace();
-            value.pinCode.Value() = chip::ByteSpan(chip::Uint8::from_const_char("1234568garbage: not in length on purpose"), 7);
+            value.PINCode.Emplace();
+            value.PINCode.Value() = chip::ByteSpan(chip::Uint8::from_const_char("1234568garbage: not in length on purpose"), 7);
             return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::UnlockDoor::Id, value,
                                chip::Optional<uint16_t>(1000), chip::NullOptional
 
@@ -82362,8 +81910,8 @@ class Test_TC_DRLK_2_3Suite : public TestCommand
             VerifyOrDo(!ShouldSkip("DRLK.S.C01.Rsp"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::UnlockDoor::Type value;
-            value.pinCode.Emplace();
-            value.pinCode.Value() = chip::ByteSpan(chip::Uint8::from_const_char("1234568garbage: not in length on purpose"), 7);
+            value.PINCode.Emplace();
+            value.PINCode.Value() = chip::ByteSpan(chip::Uint8::from_const_char("1234568garbage: not in length on purpose"), 7);
             return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::UnlockDoor::Id, value,
                                chip::Optional<uint16_t>(1000), chip::NullOptional
 
@@ -82374,8 +81922,8 @@ class Test_TC_DRLK_2_3Suite : public TestCommand
             VerifyOrDo(!ShouldSkip("DRLK.S.C01.Rsp"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::UnlockDoor::Type value;
-            value.pinCode.Emplace();
-            value.pinCode.Value() = chip::ByteSpan(chip::Uint8::from_const_char("1234568garbage: not in length on purpose"), 7);
+            value.PINCode.Emplace();
+            value.PINCode.Value() = chip::ByteSpan(chip::Uint8::from_const_char("1234568garbage: not in length on purpose"), 7);
             return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::UnlockDoor::Id, value,
                                chip::Optional<uint16_t>(1000), chip::NullOptional
 
@@ -82392,8 +81940,8 @@ class Test_TC_DRLK_2_3Suite : public TestCommand
             VerifyOrDo(!ShouldSkip("DRLK.S.C01.Rsp"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::UnlockDoor::Type value;
-            value.pinCode.Emplace();
-            value.pinCode.Value() = chip::ByteSpan(chip::Uint8::from_const_char("123456garbage: not in length on purpose"), 6);
+            value.PINCode.Emplace();
+            value.PINCode.Value() = chip::ByteSpan(chip::Uint8::from_const_char("123456garbage: not in length on purpose"), 6);
             return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::UnlockDoor::Id, value,
                                chip::Optional<uint16_t>(1000), chip::NullOptional
 
@@ -82486,7 +82034,7 @@ class Test_TC_DRLK_2_3Suite : public TestCommand
             chip::app::Clusters::DoorLock::Commands::ClearCredential::Type value;
             value.credential.SetNonNull();
 
-            value.credential.Value().credentialType  = static_cast<chip::app::Clusters::DoorLock::DlCredentialType>(1);
+            value.credential.Value().credentialType  = static_cast<chip::app::Clusters::DoorLock::CredentialTypeEnum>(1);
             value.credential.Value().credentialIndex = 1U;
 
             return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::ClearCredential::Id, value,
@@ -82558,8 +82106,8 @@ class Test_TC_DRLK_2_4Suite : public TestCommand
                 VerifyOrReturn(CheckValue("userIndex", value.userIndex, 1U));
                 VerifyOrReturn(CheckValueNonNull("userName", value.userName));
                 VerifyOrReturn(CheckValueAsString("userName.Value()", value.userName.Value(), chip::CharSpan("xxx", 3)));
-                VerifyOrReturn(CheckValueNonNull("userUniqueId", value.userUniqueId));
-                VerifyOrReturn(CheckValue("userUniqueId.Value()", value.userUniqueId.Value(), 6452UL));
+                VerifyOrReturn(CheckValueNonNull("userUniqueID", value.userUniqueID));
+                VerifyOrReturn(CheckValue("userUniqueID.Value()", value.userUniqueID.Value(), 6452UL));
                 VerifyOrReturn(CheckValueNonNull("userStatus", value.userStatus));
                 VerifyOrReturn(CheckValue("userStatus.Value()", value.userStatus.Value(), 1U));
                 VerifyOrReturn(CheckValueNonNull("userType", value.userType));
@@ -82660,18 +82208,18 @@ class Test_TC_DRLK_2_4Suite : public TestCommand
             LogStep(1, "Create new user");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::SetUser::Type value;
-            value.operationType = static_cast<chip::app::Clusters::DoorLock::DlDataOperationType>(0);
+            value.operationType = static_cast<chip::app::Clusters::DoorLock::DataOperationTypeEnum>(0);
             value.userIndex     = 1U;
             value.userName.SetNonNull();
             value.userName.Value() = chip::Span<const char>("xxxgarbage: not in length on purpose", 3);
-            value.userUniqueId.SetNonNull();
-            value.userUniqueId.Value() = 6452UL;
+            value.userUniqueID.SetNonNull();
+            value.userUniqueID.Value() = 6452UL;
             value.userStatus.SetNonNull();
-            value.userStatus.Value() = static_cast<chip::app::Clusters::DoorLock::DlUserStatus>(1);
+            value.userStatus.Value() = static_cast<chip::app::Clusters::DoorLock::UserStatusEnum>(1);
             value.userType.SetNonNull();
-            value.userType.Value() = static_cast<chip::app::Clusters::DoorLock::DlUserType>(0);
+            value.userType.Value() = static_cast<chip::app::Clusters::DoorLock::UserTypeEnum>(0);
             value.credentialRule.SetNonNull();
-            value.credentialRule.Value() = static_cast<chip::app::Clusters::DoorLock::DlCredentialRule>(0);
+            value.credentialRule.Value() = static_cast<chip::app::Clusters::DoorLock::CredentialRuleEnum>(0);
             return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::SetUser::Id, value,
                                chip::Optional<uint16_t>(1000), chip::NullOptional
 
@@ -82691,9 +82239,9 @@ class Test_TC_DRLK_2_4Suite : public TestCommand
             LogStep(3, "Create new PIN credential and lock/unlock user");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::SetCredential::Type value;
-            value.operationType = static_cast<chip::app::Clusters::DoorLock::DlDataOperationType>(0);
+            value.operationType = static_cast<chip::app::Clusters::DoorLock::DataOperationTypeEnum>(0);
 
-            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::DlCredentialType>(1);
+            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::CredentialTypeEnum>(1);
             value.credential.credentialIndex = 1U;
 
             value.credentialData = chip::ByteSpan(chip::Uint8::from_const_char("123456garbage: not in length on purpose"), 6);
@@ -82711,7 +82259,7 @@ class Test_TC_DRLK_2_4Suite : public TestCommand
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::GetCredentialStatus::Type value;
 
-            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::DlCredentialType>(1);
+            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::CredentialTypeEnum>(1);
             value.credential.credentialIndex = 1U;
 
             return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::GetCredentialStatus::Id, value,
@@ -82743,8 +82291,8 @@ class Test_TC_DRLK_2_4Suite : public TestCommand
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::UnlockWithTimeout::Type value;
             value.timeout = 60U;
-            value.pinCode.Emplace();
-            value.pinCode.Value() = chip::ByteSpan(chip::Uint8::from_const_char("123456garbage: not in length on purpose"), 6);
+            value.PINCode.Emplace();
+            value.PINCode.Value() = chip::ByteSpan(chip::Uint8::from_const_char("123456garbage: not in length on purpose"), 6);
             return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::UnlockWithTimeout::Id, value,
                                chip::Optional<uint16_t>(1000), chip::NullOptional
 
@@ -82781,7 +82329,7 @@ class Test_TC_DRLK_2_4Suite : public TestCommand
             chip::app::Clusters::DoorLock::Commands::ClearCredential::Type value;
             value.credential.SetNonNull();
 
-            value.credential.Value().credentialType  = static_cast<chip::app::Clusters::DoorLock::DlCredentialType>(1);
+            value.credential.Value().credentialType  = static_cast<chip::app::Clusters::DoorLock::CredentialTypeEnum>(1);
             value.credential.Value().credentialIndex = 1U;
 
             return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::ClearCredential::Id, value,
@@ -82856,8 +82404,8 @@ class Test_TC_DRLK_2_5Suite : public TestCommand
                 VerifyOrReturn(CheckValue("userIndex", value.userIndex, 1U));
                 VerifyOrReturn(CheckValueNonNull("userName", value.userName));
                 VerifyOrReturn(CheckValueAsString("userName.Value()", value.userName.Value(), chip::CharSpan("xxx", 3)));
-                VerifyOrReturn(CheckValueNonNull("userUniqueId", value.userUniqueId));
-                VerifyOrReturn(CheckValue("userUniqueId.Value()", value.userUniqueId.Value(), 6452UL));
+                VerifyOrReturn(CheckValueNonNull("userUniqueID", value.userUniqueID));
+                VerifyOrReturn(CheckValue("userUniqueID.Value()", value.userUniqueID.Value(), 6452UL));
                 VerifyOrReturn(CheckValueNonNull("userStatus", value.userStatus));
                 VerifyOrReturn(CheckValue("userStatus.Value()", value.userStatus.Value(), 1U));
                 VerifyOrReturn(CheckValueNonNull("userType", value.userType));
@@ -82986,18 +82534,18 @@ class Test_TC_DRLK_2_5Suite : public TestCommand
             LogStep(1, "Create new user");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::SetUser::Type value;
-            value.operationType = static_cast<chip::app::Clusters::DoorLock::DlDataOperationType>(0);
+            value.operationType = static_cast<chip::app::Clusters::DoorLock::DataOperationTypeEnum>(0);
             value.userIndex     = 1U;
             value.userName.SetNonNull();
             value.userName.Value() = chip::Span<const char>("xxxgarbage: not in length on purpose", 3);
-            value.userUniqueId.SetNonNull();
-            value.userUniqueId.Value() = 6452UL;
+            value.userUniqueID.SetNonNull();
+            value.userUniqueID.Value() = 6452UL;
             value.userStatus.SetNonNull();
-            value.userStatus.Value() = static_cast<chip::app::Clusters::DoorLock::DlUserStatus>(1);
+            value.userStatus.Value() = static_cast<chip::app::Clusters::DoorLock::UserStatusEnum>(1);
             value.userType.SetNonNull();
-            value.userType.Value() = static_cast<chip::app::Clusters::DoorLock::DlUserType>(0);
+            value.userType.Value() = static_cast<chip::app::Clusters::DoorLock::UserTypeEnum>(0);
             value.credentialRule.SetNonNull();
-            value.credentialRule.Value() = static_cast<chip::app::Clusters::DoorLock::DlCredentialRule>(0);
+            value.credentialRule.Value() = static_cast<chip::app::Clusters::DoorLock::CredentialRuleEnum>(0);
             return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::SetUser::Id, value,
                                chip::Optional<uint16_t>(10000), chip::NullOptional
 
@@ -83032,7 +82580,7 @@ class Test_TC_DRLK_2_5Suite : public TestCommand
             chip::app::Clusters::DoorLock::Commands::SetWeekDaySchedule::Type value;
             value.weekDayIndex = 1U;
             value.userIndex    = 1U;
-            value.daysMask     = static_cast<chip::BitMask<chip::app::Clusters::DoorLock::DlDaysMaskMap>>(2U);
+            value.daysMask     = static_cast<chip::BitMask<chip::app::Clusters::DoorLock::DaysMaskMap>>(2U);
             value.startHour    = 15U;
             value.startMinute  = 45U;
             value.endHour      = 16U;
@@ -83062,7 +82610,7 @@ class Test_TC_DRLK_2_5Suite : public TestCommand
             chip::app::Clusters::DoorLock::Commands::SetWeekDaySchedule::Type value;
             value.weekDayIndex = 0U;
             value.userIndex    = 1U;
-            value.daysMask     = static_cast<chip::BitMask<chip::app::Clusters::DoorLock::DlDaysMaskMap>>(7U);
+            value.daysMask     = static_cast<chip::BitMask<chip::app::Clusters::DoorLock::DaysMaskMap>>(7U);
             value.startHour    = 15U;
             value.startMinute  = 45U;
             value.endHour      = 16U;
@@ -83285,7 +82833,7 @@ class Test_TC_DRLK_2_6Suite : public TestCommand
             value.holidayIndex   = 1U;
             value.localStartTime = 20UL;
             value.localEndTime   = 30UL;
-            value.operatingMode  = static_cast<chip::app::Clusters::DoorLock::DlOperatingMode>(0);
+            value.operatingMode  = static_cast<chip::app::Clusters::DoorLock::OperatingModeEnum>(0);
             return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::SetHolidaySchedule::Id, value,
                                chip::NullOptional
 
@@ -83311,7 +82859,7 @@ class Test_TC_DRLK_2_6Suite : public TestCommand
             value.holidayIndex   = 1U;
             value.localStartTime = 20UL;
             value.localEndTime   = 30UL;
-            value.operatingMode  = static_cast<chip::app::Clusters::DoorLock::DlOperatingMode>(5);
+            value.operatingMode  = static_cast<chip::app::Clusters::DoorLock::OperatingModeEnum>(5);
             return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::SetHolidaySchedule::Id, value,
                                chip::NullOptional
 
@@ -83441,8 +82989,8 @@ class Test_TC_DRLK_2_7Suite : public TestCommand
                 VerifyOrReturn(CheckValue("userIndex", value.userIndex, 1U));
                 VerifyOrReturn(CheckValueNonNull("userName", value.userName));
                 VerifyOrReturn(CheckValueAsString("userName.Value()", value.userName.Value(), chip::CharSpan("xxx", 3)));
-                VerifyOrReturn(CheckValueNonNull("userUniqueId", value.userUniqueId));
-                VerifyOrReturn(CheckValue("userUniqueId.Value()", value.userUniqueId.Value(), 6452UL));
+                VerifyOrReturn(CheckValueNonNull("userUniqueID", value.userUniqueID));
+                VerifyOrReturn(CheckValue("userUniqueID.Value()", value.userUniqueID.Value(), 6452UL));
                 VerifyOrReturn(CheckValueNonNull("userStatus", value.userStatus));
                 VerifyOrReturn(CheckValue("userStatus.Value()", value.userStatus.Value(), 1U));
                 VerifyOrReturn(CheckValueNonNull("userType", value.userType));
@@ -83605,18 +83153,18 @@ class Test_TC_DRLK_2_7Suite : public TestCommand
             LogStep(1, "Create new user");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::SetUser::Type value;
-            value.operationType = static_cast<chip::app::Clusters::DoorLock::DlDataOperationType>(0);
+            value.operationType = static_cast<chip::app::Clusters::DoorLock::DataOperationTypeEnum>(0);
             value.userIndex     = 1U;
             value.userName.SetNonNull();
             value.userName.Value() = chip::Span<const char>("xxxgarbage: not in length on purpose", 3);
-            value.userUniqueId.SetNonNull();
-            value.userUniqueId.Value() = 6452UL;
+            value.userUniqueID.SetNonNull();
+            value.userUniqueID.Value() = 6452UL;
             value.userStatus.SetNonNull();
-            value.userStatus.Value() = static_cast<chip::app::Clusters::DoorLock::DlUserStatus>(1);
+            value.userStatus.Value() = static_cast<chip::app::Clusters::DoorLock::UserStatusEnum>(1);
             value.userType.SetNonNull();
-            value.userType.Value() = static_cast<chip::app::Clusters::DoorLock::DlUserType>(0);
+            value.userType.Value() = static_cast<chip::app::Clusters::DoorLock::UserTypeEnum>(0);
             value.credentialRule.SetNonNull();
-            value.credentialRule.Value() = static_cast<chip::app::Clusters::DoorLock::DlCredentialRule>(0);
+            value.credentialRule.Value() = static_cast<chip::app::Clusters::DoorLock::CredentialRuleEnum>(0);
             return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::SetUser::Id, value,
                                chip::Optional<uint16_t>(10000), chip::NullOptional
 
@@ -83702,18 +83250,18 @@ class Test_TC_DRLK_2_7Suite : public TestCommand
             LogStep(9, "Create a user with userIndex as 5");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::SetUser::Type value;
-            value.operationType = static_cast<chip::app::Clusters::DoorLock::DlDataOperationType>(0);
+            value.operationType = static_cast<chip::app::Clusters::DoorLock::DataOperationTypeEnum>(0);
             value.userIndex     = 5U;
             value.userName.SetNonNull();
             value.userName.Value() = chip::Span<const char>("xxxgarbage: not in length on purpose", 3);
-            value.userUniqueId.SetNonNull();
-            value.userUniqueId.Value() = 6452UL;
+            value.userUniqueID.SetNonNull();
+            value.userUniqueID.Value() = 6452UL;
             value.userStatus.SetNonNull();
-            value.userStatus.Value() = static_cast<chip::app::Clusters::DoorLock::DlUserStatus>(1);
+            value.userStatus.Value() = static_cast<chip::app::Clusters::DoorLock::UserStatusEnum>(1);
             value.userType.SetNonNull();
-            value.userType.Value() = static_cast<chip::app::Clusters::DoorLock::DlUserType>(0);
+            value.userType.Value() = static_cast<chip::app::Clusters::DoorLock::UserTypeEnum>(0);
             value.credentialRule.SetNonNull();
-            value.credentialRule.Value() = static_cast<chip::app::Clusters::DoorLock::DlCredentialRule>(0);
+            value.credentialRule.Value() = static_cast<chip::app::Clusters::DoorLock::CredentialRuleEnum>(0);
             return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::SetUser::Id, value,
                                chip::Optional<uint16_t>(10000), chip::NullOptional
 
@@ -83884,8 +83432,8 @@ class Test_TC_DRLK_2_9Suite : public TestCommand
                 VerifyOrReturn(CheckValue("userIndex", value.userIndex, 1U));
                 VerifyOrReturn(CheckValueNonNull("userName", value.userName));
                 VerifyOrReturn(CheckValueAsString("userName.Value()", value.userName.Value(), chip::CharSpan("xxx", 3)));
-                VerifyOrReturn(CheckValueNonNull("userUniqueId", value.userUniqueId));
-                VerifyOrReturn(CheckValue("userUniqueId.Value()", value.userUniqueId.Value(), 6452UL));
+                VerifyOrReturn(CheckValueNonNull("userUniqueID", value.userUniqueID));
+                VerifyOrReturn(CheckValue("userUniqueID.Value()", value.userUniqueID.Value(), 6452UL));
                 VerifyOrReturn(CheckValueNonNull("userStatus", value.userStatus));
                 VerifyOrReturn(CheckValue("userStatus.Value()", value.userStatus.Value(), 1U));
                 VerifyOrReturn(CheckValueNonNull("userType", value.userType));
@@ -84067,18 +83615,18 @@ class Test_TC_DRLK_2_9Suite : public TestCommand
             LogStep(1, "Create new user with default parameters");
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::SetUser::Type value;
-            value.operationType = static_cast<chip::app::Clusters::DoorLock::DlDataOperationType>(0);
+            value.operationType = static_cast<chip::app::Clusters::DoorLock::DataOperationTypeEnum>(0);
             value.userIndex     = 1U;
             value.userName.SetNonNull();
             value.userName.Value() = chip::Span<const char>("xxxgarbage: not in length on purpose", 3);
-            value.userUniqueId.SetNonNull();
-            value.userUniqueId.Value() = 6452UL;
+            value.userUniqueID.SetNonNull();
+            value.userUniqueID.Value() = 6452UL;
             value.userStatus.SetNonNull();
-            value.userStatus.Value() = static_cast<chip::app::Clusters::DoorLock::DlUserStatus>(1);
+            value.userStatus.Value() = static_cast<chip::app::Clusters::DoorLock::UserStatusEnum>(1);
             value.userType.SetNonNull();
-            value.userType.Value() = static_cast<chip::app::Clusters::DoorLock::DlUserType>(0);
+            value.userType.Value() = static_cast<chip::app::Clusters::DoorLock::UserTypeEnum>(0);
             value.credentialRule.SetNonNull();
-            value.credentialRule.Value() = static_cast<chip::app::Clusters::DoorLock::DlCredentialRule>(0);
+            value.credentialRule.Value() = static_cast<chip::app::Clusters::DoorLock::CredentialRuleEnum>(0);
             return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::SetUser::Id, value,
                                chip::Optional<uint16_t>(10000), chip::NullOptional
 
@@ -84106,9 +83654,9 @@ class Test_TC_DRLK_2_9Suite : public TestCommand
                        return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::SetCredential::Type value;
-            value.operationType = static_cast<chip::app::Clusters::DoorLock::DlDataOperationType>(0);
+            value.operationType = static_cast<chip::app::Clusters::DoorLock::DataOperationTypeEnum>(0);
 
-            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::DlCredentialType>(1);
+            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::CredentialTypeEnum>(1);
             value.credential.credentialIndex = 1U;
 
             value.credentialData = chip::ByteSpan(chip::Uint8::from_const_char("123456garbage: not in length on purpose"), 6);
@@ -84128,7 +83676,7 @@ class Test_TC_DRLK_2_9Suite : public TestCommand
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::GetCredentialStatus::Type value;
 
-            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::DlCredentialType>(1);
+            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::CredentialTypeEnum>(1);
             value.credential.credentialIndex = 1U;
 
             return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::GetCredentialStatus::Id, value,
@@ -84142,17 +83690,17 @@ class Test_TC_DRLK_2_9Suite : public TestCommand
                        return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::SetCredential::Type value;
-            value.operationType = static_cast<chip::app::Clusters::DoorLock::DlDataOperationType>(0);
+            value.operationType = static_cast<chip::app::Clusters::DoorLock::DataOperationTypeEnum>(0);
 
-            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::DlCredentialType>(1);
+            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::CredentialTypeEnum>(1);
             value.credential.credentialIndex = 2U;
 
             value.credentialData = chip::ByteSpan(chip::Uint8::from_const_char("4321garbage: not in length on purpose"), 4);
             value.userIndex.SetNull();
             value.userStatus.SetNonNull();
-            value.userStatus.Value() = static_cast<chip::app::Clusters::DoorLock::DlUserStatus>(5);
+            value.userStatus.Value() = static_cast<chip::app::Clusters::DoorLock::UserStatusEnum>(5);
             value.userType.SetNonNull();
-            value.userType.Value() = static_cast<chip::app::Clusters::DoorLock::DlUserType>(10);
+            value.userType.Value() = static_cast<chip::app::Clusters::DoorLock::UserTypeEnum>(10);
             return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::SetCredential::Id, value,
                                chip::Optional<uint16_t>(10000), chip::NullOptional
 
@@ -84164,9 +83712,9 @@ class Test_TC_DRLK_2_9Suite : public TestCommand
                        return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::SetCredential::Type value;
-            value.operationType = static_cast<chip::app::Clusters::DoorLock::DlDataOperationType>(0);
+            value.operationType = static_cast<chip::app::Clusters::DoorLock::DataOperationTypeEnum>(0);
 
-            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::DlCredentialType>(1);
+            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::CredentialTypeEnum>(1);
             value.credential.credentialIndex = 2U;
 
             value.credentialData = chip::ByteSpan(chip::Uint8::from_const_char("123456garbage: not in length on purpose"), 6);
@@ -84224,7 +83772,7 @@ class Test_TC_DRLK_2_9Suite : public TestCommand
             chip::app::Clusters::DoorLock::Commands::ClearCredential::Type value;
             value.credential.SetNonNull();
 
-            value.credential.Value().credentialType  = static_cast<chip::app::Clusters::DoorLock::DlCredentialType>(1);
+            value.credential.Value().credentialType  = static_cast<chip::app::Clusters::DoorLock::CredentialTypeEnum>(1);
             value.credential.Value().credentialIndex = 1U;
 
             return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::ClearCredential::Id, value,
@@ -84239,7 +83787,7 @@ class Test_TC_DRLK_2_9Suite : public TestCommand
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::GetCredentialStatus::Type value;
 
-            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::DlCredentialType>(1);
+            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::CredentialTypeEnum>(1);
             value.credential.credentialIndex = 1U;
 
             return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::GetCredentialStatus::Id, value,
@@ -84252,18 +83800,18 @@ class Test_TC_DRLK_2_9Suite : public TestCommand
             VerifyOrDo(!ShouldSkip("DRLK.S.F08 && DRLK.S.C1a.Rsp"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::SetUser::Type value;
-            value.operationType = static_cast<chip::app::Clusters::DoorLock::DlDataOperationType>(0);
+            value.operationType = static_cast<chip::app::Clusters::DoorLock::DataOperationTypeEnum>(0);
             value.userIndex     = 2U;
             value.userName.SetNonNull();
             value.userName.Value() = chip::Span<const char>("xxxgarbage: not in length on purpose", 3);
-            value.userUniqueId.SetNonNull();
-            value.userUniqueId.Value() = 6452UL;
+            value.userUniqueID.SetNonNull();
+            value.userUniqueID.Value() = 6452UL;
             value.userStatus.SetNonNull();
-            value.userStatus.Value() = static_cast<chip::app::Clusters::DoorLock::DlUserStatus>(1);
+            value.userStatus.Value() = static_cast<chip::app::Clusters::DoorLock::UserStatusEnum>(1);
             value.userType.SetNonNull();
-            value.userType.Value() = static_cast<chip::app::Clusters::DoorLock::DlUserType>(0);
+            value.userType.Value() = static_cast<chip::app::Clusters::DoorLock::UserTypeEnum>(0);
             value.credentialRule.SetNonNull();
-            value.credentialRule.Value() = static_cast<chip::app::Clusters::DoorLock::DlCredentialRule>(0);
+            value.credentialRule.Value() = static_cast<chip::app::Clusters::DoorLock::CredentialRuleEnum>(0);
             return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::SetUser::Id, value,
                                chip::Optional<uint16_t>(10000), chip::NullOptional
 
@@ -84275,9 +83823,9 @@ class Test_TC_DRLK_2_9Suite : public TestCommand
                        return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::SetCredential::Type value;
-            value.operationType = static_cast<chip::app::Clusters::DoorLock::DlDataOperationType>(0);
+            value.operationType = static_cast<chip::app::Clusters::DoorLock::DataOperationTypeEnum>(0);
 
-            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::DlCredentialType>(1);
+            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::CredentialTypeEnum>(1);
             value.credential.credentialIndex = 1U;
 
             value.credentialData = chip::ByteSpan(chip::Uint8::from_const_char("123456garbage: not in length on purpose"), 6);
@@ -84297,7 +83845,7 @@ class Test_TC_DRLK_2_9Suite : public TestCommand
             chip::app::Clusters::DoorLock::Commands::ClearCredential::Type value;
             value.credential.SetNonNull();
 
-            value.credential.Value().credentialType  = static_cast<chip::app::Clusters::DoorLock::DlCredentialType>(1);
+            value.credential.Value().credentialType  = static_cast<chip::app::Clusters::DoorLock::CredentialTypeEnum>(1);
             value.credential.Value().credentialIndex = 65534U;
 
             return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::ClearCredential::Id, value,
@@ -84312,7 +83860,7 @@ class Test_TC_DRLK_2_9Suite : public TestCommand
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::GetCredentialStatus::Type value;
 
-            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::DlCredentialType>(1);
+            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::CredentialTypeEnum>(1);
             value.credential.credentialIndex = 65534U;
 
             return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::GetCredentialStatus::Id, value,
@@ -84327,7 +83875,7 @@ class Test_TC_DRLK_2_9Suite : public TestCommand
             ListFreer listFreer;
             chip::app::Clusters::DoorLock::Commands::GetCredentialStatus::Type value;
 
-            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::DlCredentialType>(1);
+            value.credential.credentialType  = static_cast<chip::app::Clusters::DoorLock::CredentialTypeEnum>(1);
             value.credential.credentialIndex = 1U;
 
             return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::GetCredentialStatus::Id, value,
@@ -84342,7 +83890,7 @@ class Test_TC_DRLK_2_9Suite : public TestCommand
             chip::app::Clusters::DoorLock::Commands::ClearCredential::Type value;
             value.credential.SetNonNull();
 
-            value.credential.Value().credentialType  = static_cast<chip::app::Clusters::DoorLock::DlCredentialType>(8);
+            value.credential.Value().credentialType  = static_cast<chip::app::Clusters::DoorLock::CredentialTypeEnum>(8);
             value.credential.Value().credentialIndex = 2U;
 
             return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::ClearCredential::Id, value,
@@ -98825,7 +98373,7 @@ class Test_TC_CADMIN_1_21Suite : public TestCommand
         case 5:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatus value;
+                chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatusEnum value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckValue("windowStatus", value, 0U));
             }
@@ -98836,7 +98384,7 @@ class Test_TC_CADMIN_1_21Suite : public TestCommand
         case 7:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatus value;
+                chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatusEnum value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckValue("windowStatus", value, 0U));
             }
@@ -99002,7 +98550,7 @@ class Test_TC_CADMIN_1_22Suite : public TestCommand
         case 5:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatus value;
+                chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatusEnum value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckValue("windowStatus", value, 0U));
             }
@@ -99013,7 +98561,7 @@ class Test_TC_CADMIN_1_22Suite : public TestCommand
         case 7:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatus value;
+                chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatusEnum value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckValue("windowStatus", value, 0U));
             }
@@ -99308,7 +98856,7 @@ class Test_TC_CADMIN_1_3Suite : public TestCommand
         case 18:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatus value;
+                chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatusEnum value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckValue("windowStatus", value, 0U));
             }
@@ -99730,7 +99278,7 @@ class Test_TC_CADMIN_1_4Suite : public TestCommand
         case 18:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatus value;
+                chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatusEnum value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckValue("windowStatus", value, 0U));
             }
@@ -101668,7 +101216,7 @@ class Test_TC_CADMIN_1_13Suite : public TestCommand
         case 4:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatus value;
+                chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatusEnum value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckValue("windowStatus", value, 2U));
             }
@@ -101748,7 +101296,7 @@ class Test_TC_CADMIN_1_13Suite : public TestCommand
         case 18:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatus value;
+                chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatusEnum value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckValue("windowStatus", value, 1U));
             }
@@ -101807,7 +101355,7 @@ class Test_TC_CADMIN_1_13Suite : public TestCommand
         case 26:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatus value;
+                chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatusEnum value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckValue("windowStatus", value, 0U));
             }
@@ -102239,7 +101787,7 @@ class Test_TC_CADMIN_1_23Suite : public TestCommand
         case 5:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatus value;
+                chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatusEnum value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckValue("windowStatus", value, 0U));
             }
@@ -102250,7 +101798,7 @@ class Test_TC_CADMIN_1_23Suite : public TestCommand
         case 7:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatus value;
+                chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatusEnum value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckValue("windowStatus", value, 0U));
             }
@@ -102416,7 +101964,7 @@ class Test_TC_CADMIN_1_24Suite : public TestCommand
         case 5:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatus value;
+                chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatusEnum value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckValue("windowStatus", value, 0U));
             }
@@ -102427,7 +101975,7 @@ class Test_TC_CADMIN_1_24Suite : public TestCommand
         case 7:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             {
-                chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatus value;
+                chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatusEnum value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckValue("windowStatus", value, 0U));
             }
diff --git a/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h b/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h
index 8ab732426f50ee..82b58f558c753d 100644
--- a/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h
+++ b/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h
@@ -37833,7 +37833,7 @@ class DoorLockLockDoor : public ClusterCommand {
     DoorLockLockDoor()
         : ClusterCommand("lock-door")
     {
-        AddArgument("PinCode", &mRequest.pinCode);
+        AddArgument("PINCode", &mRequest.PINCode);
         ClusterCommand::AddArguments();
     }
 
@@ -37846,8 +37846,8 @@ class DoorLockLockDoor : public ClusterCommand {
         __auto_type * params = [[MTRDoorLockClusterLockDoorParams alloc] init];
         params.timedInvokeTimeoutMs
             = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        if (mRequest.pinCode.HasValue()) {
-            params.pinCode = [NSData dataWithBytes:mRequest.pinCode.Value().data() length:mRequest.pinCode.Value().size()];
+        if (mRequest.PINCode.HasValue()) {
+            params.pinCode = [NSData dataWithBytes:mRequest.PINCode.Value().data() length:mRequest.PINCode.Value().size()];
         } else {
             params.pinCode = nil;
         }
@@ -37881,7 +37881,7 @@ class DoorLockUnlockDoor : public ClusterCommand {
     DoorLockUnlockDoor()
         : ClusterCommand("unlock-door")
     {
-        AddArgument("PinCode", &mRequest.pinCode);
+        AddArgument("PINCode", &mRequest.PINCode);
         ClusterCommand::AddArguments();
     }
 
@@ -37894,8 +37894,8 @@ class DoorLockUnlockDoor : public ClusterCommand {
         __auto_type * params = [[MTRDoorLockClusterUnlockDoorParams alloc] init];
         params.timedInvokeTimeoutMs
             = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        if (mRequest.pinCode.HasValue()) {
-            params.pinCode = [NSData dataWithBytes:mRequest.pinCode.Value().data() length:mRequest.pinCode.Value().size()];
+        if (mRequest.PINCode.HasValue()) {
+            params.pinCode = [NSData dataWithBytes:mRequest.PINCode.Value().data() length:mRequest.PINCode.Value().size()];
         } else {
             params.pinCode = nil;
         }
@@ -37930,7 +37930,7 @@ class DoorLockUnlockWithTimeout : public ClusterCommand {
         : ClusterCommand("unlock-with-timeout")
     {
         AddArgument("Timeout", 0, UINT16_MAX, &mRequest.timeout);
-        AddArgument("PinCode", &mRequest.pinCode);
+        AddArgument("PINCode", &mRequest.PINCode);
         ClusterCommand::AddArguments();
     }
 
@@ -37944,8 +37944,8 @@ class DoorLockUnlockWithTimeout : public ClusterCommand {
         params.timedInvokeTimeoutMs
             = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
         params.timeout = [NSNumber numberWithUnsignedShort:mRequest.timeout];
-        if (mRequest.pinCode.HasValue()) {
-            params.pinCode = [NSData dataWithBytes:mRequest.pinCode.Value().data() length:mRequest.pinCode.Value().size()];
+        if (mRequest.PINCode.HasValue()) {
+            params.pinCode = [NSData dataWithBytes:mRequest.PINCode.Value().data() length:mRequest.PINCode.Value().size()];
         } else {
             params.pinCode = nil;
         }
@@ -38416,7 +38416,7 @@ class DoorLockSetUser : public ClusterCommand {
         AddArgument("OperationType", 0, UINT8_MAX, &mRequest.operationType);
         AddArgument("UserIndex", 0, UINT16_MAX, &mRequest.userIndex);
         AddArgument("UserName", &mRequest.userName);
-        AddArgument("UserUniqueId", 0, UINT32_MAX, &mRequest.userUniqueId);
+        AddArgument("UserUniqueID", 0, UINT32_MAX, &mRequest.userUniqueID);
         AddArgument("UserStatus", 0, UINT8_MAX, &mRequest.userStatus);
         AddArgument("UserType", 0, UINT8_MAX, &mRequest.userType);
         AddArgument("CredentialRule", 0, UINT8_MAX, &mRequest.credentialRule);
@@ -38441,10 +38441,10 @@ class DoorLockSetUser : public ClusterCommand {
                                                        length:mRequest.userName.Value().size()
                                                      encoding:NSUTF8StringEncoding];
         }
-        if (mRequest.userUniqueId.IsNull()) {
-            params.userUniqueId = nil;
+        if (mRequest.userUniqueID.IsNull()) {
+            params.userUniqueID = nil;
         } else {
-            params.userUniqueId = [NSNumber numberWithUnsignedInt:mRequest.userUniqueId.Value()];
+            params.userUniqueID = [NSNumber numberWithUnsignedInt:mRequest.userUniqueID.Value()];
         }
         if (mRequest.userStatus.IsNull()) {
             params.userStatus = nil;
@@ -38600,7 +38600,7 @@ class DoorLockSetCredential : public ClusterCommand {
         params.timedInvokeTimeoutMs
             = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
         params.operationType = [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.operationType)];
-        params.credential = [MTRDoorLockClusterDlCredential new];
+        params.credential = [MTRDoorLockClusterCredentialStruct new];
         params.credential.credentialType =
             [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.credential.credentialType)];
         params.credential.credentialIndex = [NSNumber numberWithUnsignedShort:mRequest.credential.credentialIndex];
@@ -38642,7 +38642,7 @@ class DoorLockSetCredential : public ClusterCommand {
 
 private:
     chip::app::Clusters::DoorLock::Commands::SetCredential::Type mRequest;
-    TypedComplexArgument<chip::app::Clusters::DoorLock::Structs::DlCredential::Type> mComplex_Credential;
+    TypedComplexArgument<chip::app::Clusters::DoorLock::Structs::CredentialStruct::Type> mComplex_Credential;
 };
 
 /*
@@ -38667,7 +38667,7 @@ class DoorLockGetCredentialStatus : public ClusterCommand {
         __auto_type * params = [[MTRDoorLockClusterGetCredentialStatusParams alloc] init];
         params.timedInvokeTimeoutMs
             = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.credential = [MTRDoorLockClusterDlCredential new];
+        params.credential = [MTRDoorLockClusterCredentialStruct new];
         params.credential.credentialType =
             [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.credential.credentialType)];
         params.credential.credentialIndex = [NSNumber numberWithUnsignedShort:mRequest.credential.credentialIndex];
@@ -38693,7 +38693,7 @@ class DoorLockGetCredentialStatus : public ClusterCommand {
 
 private:
     chip::app::Clusters::DoorLock::Commands::GetCredentialStatus::Type mRequest;
-    TypedComplexArgument<chip::app::Clusters::DoorLock::Structs::DlCredential::Type> mComplex_Credential;
+    TypedComplexArgument<chip::app::Clusters::DoorLock::Structs::CredentialStruct::Type> mComplex_Credential;
 };
 
 /*
@@ -38721,7 +38721,7 @@ class DoorLockClearCredential : public ClusterCommand {
         if (mRequest.credential.IsNull()) {
             params.credential = nil;
         } else {
-            params.credential = [MTRDoorLockClusterDlCredential new];
+            params.credential = [MTRDoorLockClusterCredentialStruct new];
             params.credential.credentialType =
                 [NSNumber numberWithUnsignedChar:chip::to_underlying(mRequest.credential.Value().credentialType)];
             params.credential.credentialIndex = [NSNumber numberWithUnsignedShort:mRequest.credential.Value().credentialIndex];
@@ -38746,7 +38746,7 @@ class DoorLockClearCredential : public ClusterCommand {
 
 private:
     chip::app::Clusters::DoorLock::Commands::ClearCredential::Type mRequest;
-    TypedComplexArgument<chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::Structs::DlCredential::Type>>
+    TypedComplexArgument<chip::app::DataModel::Nullable<chip::app::Clusters::DoorLock::Structs::CredentialStruct::Type>>
         mComplex_Credential;
 };
 
@@ -55896,7 +55896,7 @@ class ColorControlMoveToColorTemperature : public ClusterCommand {
     ColorControlMoveToColorTemperature()
         : ClusterCommand("move-to-color-temperature")
     {
-        AddArgument("ColorTemperature", 0, UINT16_MAX, &mRequest.colorTemperature);
+        AddArgument("ColorTemperatureMireds", 0, UINT16_MAX, &mRequest.colorTemperatureMireds);
         AddArgument("TransitionTime", 0, UINT16_MAX, &mRequest.transitionTime);
         AddArgument("OptionsMask", 0, UINT8_MAX, &mRequest.optionsMask);
         AddArgument("OptionsOverride", 0, UINT8_MAX, &mRequest.optionsOverride);
@@ -55914,7 +55914,7 @@ class ColorControlMoveToColorTemperature : public ClusterCommand {
         __auto_type * params = [[MTRColorControlClusterMoveToColorTemperatureParams alloc] init];
         params.timedInvokeTimeoutMs
             = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil;
-        params.colorTemperature = [NSNumber numberWithUnsignedShort:mRequest.colorTemperature];
+        params.colorTemperatureMireds = [NSNumber numberWithUnsignedShort:mRequest.colorTemperatureMireds];
         params.transitionTime = [NSNumber numberWithUnsignedShort:mRequest.transitionTime];
         params.optionsMask = [NSNumber numberWithUnsignedChar:mRequest.optionsMask];
         params.optionsOverride = [NSNumber numberWithUnsignedChar:mRequest.optionsOverride];
diff --git a/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h b/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h
index c256bdac0b83a7..4a9f25cc1c386d 100644
--- a/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h
+++ b/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h
@@ -17643,7 +17643,7 @@ class Test_TC_CC_6_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         __auto_type * params = [[MTRColorControlClusterMoveToColorTemperatureParams alloc] init];
-        params.colorTemperature = [NSNumber numberWithUnsignedShort:310U];
+        params.colorTemperatureMireds = [NSNumber numberWithUnsignedShort:310U];
         params.transitionTime = [NSNumber numberWithUnsignedShort:0U];
         params.optionsMask = [NSNumber numberWithUnsignedChar:0U];
         params.optionsOverride = [NSNumber numberWithUnsignedChar:0U];
@@ -17678,7 +17678,7 @@ class Test_TC_CC_6_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         __auto_type * params = [[MTRColorControlClusterMoveToColorTemperatureParams alloc] init];
-        params.colorTemperature = [NSNumber numberWithUnsignedShort:250U];
+        params.colorTemperatureMireds = [NSNumber numberWithUnsignedShort:250U];
         params.transitionTime = [NSNumber numberWithUnsignedShort:300U];
         params.optionsMask = [NSNumber numberWithUnsignedChar:0U];
         params.optionsOverride = [NSNumber numberWithUnsignedChar:0U];
@@ -53282,165 +53282,225 @@ class Test_TC_PCC_1_1 : public TestCommandBridge {
             break;
         case 2:
             ChipLogProgress(chipTool, " ***** Test Step 2 : TH reads the FeatureMap attribute from the DUT\n");
+            if (ShouldSkip(" !PCC.S.F00 && !PCC.S.F01 && !PCC.S.F02 && !PCC.S.F03 && !PCC.S.F04 && !PCC.S.F05 && !PCC.S.F06 ")) {
+                NextTest();
+                return;
+            }
             err = TestThReadsTheFeatureMapAttributeFromTheDut_2();
             break;
         case 3:
-            ChipLogProgress(chipTool, " ***** Test Step 3 : TH reads the AttributeList attribute from the DUT\n");
-            err = TestThReadsTheAttributeListAttributeFromTheDut_3();
+            ChipLogProgress(chipTool, " ***** Test Step 3 : Given PCC.S.F00(PRSCONST) ensure featuremap has the correct bit set\n");
+            if (ShouldSkip("PCC.S.F00")) {
+                NextTest();
+                return;
+            }
+            err = TestGivenPccsf00prsconstEnsureFeaturemapHasTheCorrectBitSet_3();
             break;
         case 4:
+            ChipLogProgress(chipTool, " ***** Test Step 4 : Given PCC.S.F01(PRSCOMP) ensure featuremap has the correct bit set\n");
+            if (ShouldSkip("PCC.S.F01")) {
+                NextTest();
+                return;
+            }
+            err = TestGivenPccsf01prscompEnsureFeaturemapHasTheCorrectBitSet_4();
+            break;
+        case 5:
+            ChipLogProgress(chipTool, " ***** Test Step 5 : Given PCC.S.F02(FLW) ensure featuremap has the correct bit set\n");
+            if (ShouldSkip("PCC.S.F02")) {
+                NextTest();
+                return;
+            }
+            err = TestGivenPccsf02flwEnsureFeaturemapHasTheCorrectBitSet_5();
+            break;
+        case 6:
+            ChipLogProgress(chipTool, " ***** Test Step 6 : Given PCC.S.F03(SPD) ensure featuremap has the correct bit set\n");
+            if (ShouldSkip("PCC.S.F03")) {
+                NextTest();
+                return;
+            }
+            err = TestGivenPccsf03spdEnsureFeaturemapHasTheCorrectBitSet_6();
+            break;
+        case 7:
+            ChipLogProgress(chipTool, " ***** Test Step 7 : Given PCC.S.F04(TEMP) ensure featuremap has the correct bit set\n");
+            if (ShouldSkip("PCC.S.F04")) {
+                NextTest();
+                return;
+            }
+            err = TestGivenPccsf04tempEnsureFeaturemapHasTheCorrectBitSet_7();
+            break;
+        case 8:
+            ChipLogProgress(chipTool, " ***** Test Step 8 : Given PCC.S.F05(AUTO) ensure featuremap has the correct bit set\n");
+            if (ShouldSkip("PCC.S.F05")) {
+                NextTest();
+                return;
+            }
+            err = TestGivenPccsf05autoEnsureFeaturemapHasTheCorrectBitSet_8();
+            break;
+        case 9:
+            ChipLogProgress(chipTool, " ***** Test Step 9 : Given PCC.S.F06(LOCAL) ensure featuremap has the correct bit set\n");
+            if (ShouldSkip("PCC.S.F06")) {
+                NextTest();
+                return;
+            }
+            err = TestGivenPccsf06localEnsureFeaturemapHasTheCorrectBitSet_9();
+            break;
+        case 10:
+            ChipLogProgress(chipTool, " ***** Test Step 10 : TH reads the AttributeList attribute from the DUT\n");
+            err = TestThReadsTheAttributeListAttributeFromTheDut_10();
+            break;
+        case 11:
             ChipLogProgress(chipTool,
-                " ***** Test Step 4 : TH reads optional attribute(MinConstPressure) attribute in AttributeList from the DUT\n");
+                " ***** Test Step 11 : TH reads optional attribute(MinConstPressure) attribute in AttributeList from the DUT\n");
             if (ShouldSkip("PCC.S.A0003")) {
                 NextTest();
                 return;
             }
-            err = TestThReadsOptionalAttributeMinConstPressureAttributeInAttributeListFromTheDut_4();
+            err = TestThReadsOptionalAttributeMinConstPressureAttributeInAttributeListFromTheDut_11();
             break;
-        case 5:
+        case 12:
             ChipLogProgress(chipTool,
-                " ***** Test Step 5 : TH reads optional attribute(MaxConstPressure) attribute in AttributeList from the DUT\n");
+                " ***** Test Step 12 : TH reads optional attribute(MaxConstPressure) attribute in AttributeList from the DUT\n");
             if (ShouldSkip("PCC.S.A0004")) {
                 NextTest();
                 return;
             }
-            err = TestThReadsOptionalAttributeMaxConstPressureAttributeInAttributeListFromTheDut_5();
+            err = TestThReadsOptionalAttributeMaxConstPressureAttributeInAttributeListFromTheDut_12();
             break;
-        case 6:
+        case 13:
             ChipLogProgress(chipTool,
-                " ***** Test Step 6 : TH reads optional attribute(MinCompPressure) attribute in AttributeList from the DUT\n");
+                " ***** Test Step 13 : TH reads optional attribute(MinCompPressure) attribute in AttributeList from the DUT\n");
             if (ShouldSkip("PCC.S.A0005")) {
                 NextTest();
                 return;
             }
-            err = TestThReadsOptionalAttributeMinCompPressureAttributeInAttributeListFromTheDut_6();
+            err = TestThReadsOptionalAttributeMinCompPressureAttributeInAttributeListFromTheDut_13();
             break;
-        case 7:
+        case 14:
             ChipLogProgress(chipTool,
-                " ***** Test Step 7 : TH reads optional attribute(MaxCompPressure) attribute in AttributeList from the DUT\n");
+                " ***** Test Step 14 : TH reads optional attribute(MaxCompPressure) attribute in AttributeList from the DUT\n");
             if (ShouldSkip("PCC.S.A0006")) {
                 NextTest();
                 return;
             }
-            err = TestThReadsOptionalAttributeMaxCompPressureAttributeInAttributeListFromTheDut_7();
+            err = TestThReadsOptionalAttributeMaxCompPressureAttributeInAttributeListFromTheDut_14();
             break;
-        case 8:
+        case 15:
             ChipLogProgress(chipTool,
-                " ***** Test Step 8 : TH reads optional attribute(MinConstSpeed) attribute in AttributeList from the DUT\n");
+                " ***** Test Step 15 : TH reads optional attribute(MinConstSpeed) attribute in AttributeList from the DUT\n");
             if (ShouldSkip("PCC.S.A0007")) {
                 NextTest();
                 return;
             }
-            err = TestThReadsOptionalAttributeMinConstSpeedAttributeInAttributeListFromTheDut_8();
+            err = TestThReadsOptionalAttributeMinConstSpeedAttributeInAttributeListFromTheDut_15();
             break;
-        case 9:
+        case 16:
             ChipLogProgress(chipTool,
-                " ***** Test Step 9 : TH reads optional attribute(MaxConstSpeed) attribute in AttributeList from the DUT\n");
+                " ***** Test Step 16 : TH reads optional attribute(MaxConstSpeed) attribute in AttributeList from the DUT\n");
             if (ShouldSkip("PCC.S.A0008")) {
                 NextTest();
                 return;
             }
-            err = TestThReadsOptionalAttributeMaxConstSpeedAttributeInAttributeListFromTheDut_9();
+            err = TestThReadsOptionalAttributeMaxConstSpeedAttributeInAttributeListFromTheDut_16();
             break;
-        case 10:
+        case 17:
             ChipLogProgress(chipTool,
-                " ***** Test Step 10 : TH reads optional attribute(MinConstFlow) attribute in AttributeList from the DUT\n");
+                " ***** Test Step 17 : TH reads optional attribute(MinConstFlow) attribute in AttributeList from the DUT\n");
             if (ShouldSkip("PCC.S.A0009")) {
                 NextTest();
                 return;
             }
-            err = TestThReadsOptionalAttributeMinConstFlowAttributeInAttributeListFromTheDut_10();
+            err = TestThReadsOptionalAttributeMinConstFlowAttributeInAttributeListFromTheDut_17();
             break;
-        case 11:
+        case 18:
             ChipLogProgress(chipTool,
-                " ***** Test Step 11 : TH reads optional attribute(MaxConstFlow) attribute in AttributeList from the DUT\n");
+                " ***** Test Step 18 : TH reads optional attribute(MaxConstFlow) attribute in AttributeList from the DUT\n");
             if (ShouldSkip("PCC.S.A000a")) {
                 NextTest();
                 return;
             }
-            err = TestThReadsOptionalAttributeMaxConstFlowAttributeInAttributeListFromTheDut_11();
+            err = TestThReadsOptionalAttributeMaxConstFlowAttributeInAttributeListFromTheDut_18();
             break;
-        case 12:
+        case 19:
             ChipLogProgress(chipTool,
-                " ***** Test Step 12 : TH reads optional attribute(MinConstTemp) attribute in AttributeList from the DUT\n");
+                " ***** Test Step 19 : TH reads optional attribute(MinConstTemp) attribute in AttributeList from the DUT\n");
             if (ShouldSkip("PCC.S.A000b")) {
                 NextTest();
                 return;
             }
-            err = TestThReadsOptionalAttributeMinConstTempAttributeInAttributeListFromTheDut_12();
+            err = TestThReadsOptionalAttributeMinConstTempAttributeInAttributeListFromTheDut_19();
             break;
-        case 13:
+        case 20:
             ChipLogProgress(chipTool,
-                " ***** Test Step 13 : TH reads optional attribute(MaxConstTemp) attribute in AttributeList from the DUT\n");
+                " ***** Test Step 20 : TH reads optional attribute(MaxConstTemp) attribute in AttributeList from the DUT\n");
             if (ShouldSkip("PCC.S.A000c")) {
                 NextTest();
                 return;
             }
-            err = TestThReadsOptionalAttributeMaxConstTempAttributeInAttributeListFromTheDut_13();
+            err = TestThReadsOptionalAttributeMaxConstTempAttributeInAttributeListFromTheDut_20();
             break;
-        case 14:
+        case 21:
             ChipLogProgress(chipTool,
-                " ***** Test Step 14 : TH reads optional attribute(PumpStatus) attribute in AttributeList from the DUT\n");
+                " ***** Test Step 21 : TH reads optional attribute(PumpStatus) attribute in AttributeList from the DUT\n");
             if (ShouldSkip("PCC.S.A0010")) {
                 NextTest();
                 return;
             }
-            err = TestThReadsOptionalAttributePumpStatusAttributeInAttributeListFromTheDut_14();
+            err = TestThReadsOptionalAttributePumpStatusAttributeInAttributeListFromTheDut_21();
             break;
-        case 15:
+        case 22:
             ChipLogProgress(
-                chipTool, " ***** Test Step 15 : TH reads optional attribute(Speed) attribute in AttributeList from the DUT\n");
+                chipTool, " ***** Test Step 22 : TH reads optional attribute(Speed) attribute in AttributeList from the DUT\n");
             if (ShouldSkip("PCC.S.A0014")) {
                 NextTest();
                 return;
             }
-            err = TestThReadsOptionalAttributeSpeedAttributeInAttributeListFromTheDut_15();
+            err = TestThReadsOptionalAttributeSpeedAttributeInAttributeListFromTheDut_22();
             break;
-        case 16:
+        case 23:
             ChipLogProgress(chipTool,
-                " ***** Test Step 16 : TH reads optional attribute(LifetimeRunningHours) attribute in AttributeList from the "
+                " ***** Test Step 23 : TH reads optional attribute(LifetimeRunningHours) attribute in AttributeList from the "
                 "DUT\n");
             if (ShouldSkip("PCC.S.A0015")) {
                 NextTest();
                 return;
             }
-            err = TestThReadsOptionalAttributeLifetimeRunningHoursAttributeInAttributeListFromTheDut_16();
+            err = TestThReadsOptionalAttributeLifetimeRunningHoursAttributeInAttributeListFromTheDut_23();
             break;
-        case 17:
+        case 24:
             ChipLogProgress(
-                chipTool, " ***** Test Step 17 : TH reads optional attribute(Power) attribute in AttributeList from the DUT\n");
+                chipTool, " ***** Test Step 24 : TH reads optional attribute(Power) attribute in AttributeList from the DUT\n");
             if (ShouldSkip("PCC.S.A0016")) {
                 NextTest();
                 return;
             }
-            err = TestThReadsOptionalAttributePowerAttributeInAttributeListFromTheDut_17();
+            err = TestThReadsOptionalAttributePowerAttributeInAttributeListFromTheDut_24();
             break;
-        case 18:
+        case 25:
             ChipLogProgress(chipTool,
-                " ***** Test Step 18 : TH reads optional attribute(LifetimeEnergyConsumed) attribute in AttributeList from the "
+                " ***** Test Step 25 : TH reads optional attribute(LifetimeEnergyConsumed) attribute in AttributeList from the "
                 "DUT\n");
             if (ShouldSkip("PCC.S.A0017")) {
                 NextTest();
                 return;
             }
-            err = TestThReadsOptionalAttributeLifetimeEnergyConsumedAttributeInAttributeListFromTheDut_18();
+            err = TestThReadsOptionalAttributeLifetimeEnergyConsumedAttributeInAttributeListFromTheDut_25();
             break;
-        case 19:
+        case 26:
             ChipLogProgress(chipTool,
-                " ***** Test Step 19 : TH reads optional attribute(ControlMode) attribute in AttributeList from the DUT\n");
+                " ***** Test Step 26 : TH reads optional attribute(ControlMode) attribute in AttributeList from the DUT\n");
             if (ShouldSkip("PCC.S.A0021")) {
                 NextTest();
                 return;
             }
-            err = TestThReadsOptionalAttributeControlModeAttributeInAttributeListFromTheDut_19();
+            err = TestThReadsOptionalAttributeControlModeAttributeInAttributeListFromTheDut_26();
             break;
-        case 20:
-            ChipLogProgress(chipTool, " ***** Test Step 20 : TH reads the AcceptedCommandList attribute from the DUT\n");
-            err = TestThReadsTheAcceptedCommandListAttributeFromTheDut_20();
+        case 27:
+            ChipLogProgress(chipTool, " ***** Test Step 27 : TH reads the AcceptedCommandList attribute from the DUT\n");
+            err = TestThReadsTheAcceptedCommandListAttributeFromTheDut_27();
             break;
-        case 21:
-            ChipLogProgress(chipTool, " ***** Test Step 21 : TH reads the GeneratedCommandList attribute from the DUT\n");
-            err = TestThReadsTheGeneratedCommandListAttributeFromTheDut_21();
+        case 28:
+            ChipLogProgress(chipTool, " ***** Test Step 28 : TH reads the GeneratedCommandList attribute from the DUT\n");
+            err = TestThReadsTheGeneratedCommandListAttributeFromTheDut_28();
             break;
         }
 
@@ -53519,6 +53579,27 @@ class Test_TC_PCC_1_1 : public TestCommandBridge {
         case 21:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
+        case 22:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 23:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 24:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 25:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 26:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 27:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
+        case 28:
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
+            break;
         }
 
         // Go on to the next test.
@@ -53532,7 +53613,7 @@ class Test_TC_PCC_1_1 : public TestCommandBridge {
 
 private:
     std::atomic_uint16_t mTestIndex;
-    const uint16_t mTestCount = 22;
+    const uint16_t mTestCount = 29;
 
     chip::Optional<chip::NodeId> mNodeId;
     chip::Optional<chip::CharSpan> mCluster;
@@ -53564,7 +53645,7 @@ class Test_TC_PCC_1_1 : public TestCommandBridge {
 
             {
                 id actualValue = value;
-                VerifyOrReturn(CheckValue("ClusterRevision", actualValue, 3U));
+                VerifyOrReturn(CheckValue("ClusterRevision", actualValue, 4U));
             }
 
             VerifyOrReturn(CheckConstraintType("clusterRevision", "int16u", "int16u"));
@@ -53601,7 +53682,161 @@ class Test_TC_PCC_1_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestThReadsTheAttributeListAttributeFromTheDut_3()
+    CHIP_ERROR TestGivenPccsf00prsconstEnsureFeaturemapHasTheCorrectBitSet_3()
+    {
+
+        MTRBaseDevice * device = GetDevice("alpha");
+        commissionerNodeId = mCommissionerNodeId.ValueOr(0);
+        __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device
+                                                                                       endpointID:@(1)
+                                                                                            queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Given PCC.S.F00(PRSCONST) ensure featuremap has the correct bit set Error: %@", err);
+
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+            VerifyOrReturn(CheckConstraintType("featureMap", "bitmap32", "bitmap32"));
+            NextTest();
+        }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestGivenPccsf01prscompEnsureFeaturemapHasTheCorrectBitSet_4()
+    {
+
+        MTRBaseDevice * device = GetDevice("alpha");
+        commissionerNodeId = mCommissionerNodeId.ValueOr(0);
+        __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device
+                                                                                       endpointID:@(1)
+                                                                                            queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Given PCC.S.F01(PRSCOMP) ensure featuremap has the correct bit set Error: %@", err);
+
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+            VerifyOrReturn(CheckConstraintType("featureMap", "bitmap32", "bitmap32"));
+            NextTest();
+        }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestGivenPccsf02flwEnsureFeaturemapHasTheCorrectBitSet_5()
+    {
+
+        MTRBaseDevice * device = GetDevice("alpha");
+        commissionerNodeId = mCommissionerNodeId.ValueOr(0);
+        __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device
+                                                                                       endpointID:@(1)
+                                                                                            queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Given PCC.S.F02(FLW) ensure featuremap has the correct bit set Error: %@", err);
+
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+            VerifyOrReturn(CheckConstraintType("featureMap", "bitmap32", "bitmap32"));
+            NextTest();
+        }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestGivenPccsf03spdEnsureFeaturemapHasTheCorrectBitSet_6()
+    {
+
+        MTRBaseDevice * device = GetDevice("alpha");
+        commissionerNodeId = mCommissionerNodeId.ValueOr(0);
+        __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device
+                                                                                       endpointID:@(1)
+                                                                                            queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Given PCC.S.F03(SPD) ensure featuremap has the correct bit set Error: %@", err);
+
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+            VerifyOrReturn(CheckConstraintType("featureMap", "bitmap32", "bitmap32"));
+            NextTest();
+        }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestGivenPccsf04tempEnsureFeaturemapHasTheCorrectBitSet_7()
+    {
+
+        MTRBaseDevice * device = GetDevice("alpha");
+        commissionerNodeId = mCommissionerNodeId.ValueOr(0);
+        __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device
+                                                                                       endpointID:@(1)
+                                                                                            queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Given PCC.S.F04(TEMP) ensure featuremap has the correct bit set Error: %@", err);
+
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+            VerifyOrReturn(CheckConstraintType("featureMap", "bitmap32", "bitmap32"));
+            NextTest();
+        }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestGivenPccsf05autoEnsureFeaturemapHasTheCorrectBitSet_8()
+    {
+
+        MTRBaseDevice * device = GetDevice("alpha");
+        commissionerNodeId = mCommissionerNodeId.ValueOr(0);
+        __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device
+                                                                                       endpointID:@(1)
+                                                                                            queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Given PCC.S.F05(AUTO) ensure featuremap has the correct bit set Error: %@", err);
+
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+            VerifyOrReturn(CheckConstraintType("featureMap", "bitmap32", "bitmap32"));
+            NextTest();
+        }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestGivenPccsf06localEnsureFeaturemapHasTheCorrectBitSet_9()
+    {
+
+        MTRBaseDevice * device = GetDevice("alpha");
+        commissionerNodeId = mCommissionerNodeId.ValueOr(0);
+        __auto_type * cluster = [[MTRBaseClusterPumpConfigurationAndControl alloc] initWithDevice:device
+                                                                                       endpointID:@(1)
+                                                                                            queue:mCallbackQueue];
+        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
+
+        [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) {
+            NSLog(@"Given PCC.S.F06(LOCAL) ensure featuremap has the correct bit set Error: %@", err);
+
+            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
+
+            VerifyOrReturn(CheckConstraintType("featureMap", "bitmap32", "bitmap32"));
+            NextTest();
+        }];
+
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR TestThReadsTheAttributeListAttributeFromTheDut_10()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -53636,7 +53871,7 @@ class Test_TC_PCC_1_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestThReadsOptionalAttributeMinConstPressureAttributeInAttributeListFromTheDut_4()
+    CHIP_ERROR TestThReadsOptionalAttributeMinConstPressureAttributeInAttributeListFromTheDut_11()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -53660,7 +53895,7 @@ class Test_TC_PCC_1_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestThReadsOptionalAttributeMaxConstPressureAttributeInAttributeListFromTheDut_5()
+    CHIP_ERROR TestThReadsOptionalAttributeMaxConstPressureAttributeInAttributeListFromTheDut_12()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -53684,7 +53919,7 @@ class Test_TC_PCC_1_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestThReadsOptionalAttributeMinCompPressureAttributeInAttributeListFromTheDut_6()
+    CHIP_ERROR TestThReadsOptionalAttributeMinCompPressureAttributeInAttributeListFromTheDut_13()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -53708,7 +53943,7 @@ class Test_TC_PCC_1_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestThReadsOptionalAttributeMaxCompPressureAttributeInAttributeListFromTheDut_7()
+    CHIP_ERROR TestThReadsOptionalAttributeMaxCompPressureAttributeInAttributeListFromTheDut_14()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -53732,7 +53967,7 @@ class Test_TC_PCC_1_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestThReadsOptionalAttributeMinConstSpeedAttributeInAttributeListFromTheDut_8()
+    CHIP_ERROR TestThReadsOptionalAttributeMinConstSpeedAttributeInAttributeListFromTheDut_15()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -53756,7 +53991,7 @@ class Test_TC_PCC_1_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestThReadsOptionalAttributeMaxConstSpeedAttributeInAttributeListFromTheDut_9()
+    CHIP_ERROR TestThReadsOptionalAttributeMaxConstSpeedAttributeInAttributeListFromTheDut_16()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -53780,7 +54015,7 @@ class Test_TC_PCC_1_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestThReadsOptionalAttributeMinConstFlowAttributeInAttributeListFromTheDut_10()
+    CHIP_ERROR TestThReadsOptionalAttributeMinConstFlowAttributeInAttributeListFromTheDut_17()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -53804,7 +54039,7 @@ class Test_TC_PCC_1_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestThReadsOptionalAttributeMaxConstFlowAttributeInAttributeListFromTheDut_11()
+    CHIP_ERROR TestThReadsOptionalAttributeMaxConstFlowAttributeInAttributeListFromTheDut_18()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -53828,7 +54063,7 @@ class Test_TC_PCC_1_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestThReadsOptionalAttributeMinConstTempAttributeInAttributeListFromTheDut_12()
+    CHIP_ERROR TestThReadsOptionalAttributeMinConstTempAttributeInAttributeListFromTheDut_19()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -53852,7 +54087,7 @@ class Test_TC_PCC_1_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestThReadsOptionalAttributeMaxConstTempAttributeInAttributeListFromTheDut_13()
+    CHIP_ERROR TestThReadsOptionalAttributeMaxConstTempAttributeInAttributeListFromTheDut_20()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -53876,7 +54111,7 @@ class Test_TC_PCC_1_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestThReadsOptionalAttributePumpStatusAttributeInAttributeListFromTheDut_14()
+    CHIP_ERROR TestThReadsOptionalAttributePumpStatusAttributeInAttributeListFromTheDut_21()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -53900,7 +54135,7 @@ class Test_TC_PCC_1_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestThReadsOptionalAttributeSpeedAttributeInAttributeListFromTheDut_15()
+    CHIP_ERROR TestThReadsOptionalAttributeSpeedAttributeInAttributeListFromTheDut_22()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -53924,7 +54159,7 @@ class Test_TC_PCC_1_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestThReadsOptionalAttributeLifetimeRunningHoursAttributeInAttributeListFromTheDut_16()
+    CHIP_ERROR TestThReadsOptionalAttributeLifetimeRunningHoursAttributeInAttributeListFromTheDut_23()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -53948,7 +54183,7 @@ class Test_TC_PCC_1_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestThReadsOptionalAttributePowerAttributeInAttributeListFromTheDut_17()
+    CHIP_ERROR TestThReadsOptionalAttributePowerAttributeInAttributeListFromTheDut_24()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -53972,7 +54207,7 @@ class Test_TC_PCC_1_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestThReadsOptionalAttributeLifetimeEnergyConsumedAttributeInAttributeListFromTheDut_18()
+    CHIP_ERROR TestThReadsOptionalAttributeLifetimeEnergyConsumedAttributeInAttributeListFromTheDut_25()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -53996,7 +54231,7 @@ class Test_TC_PCC_1_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestThReadsOptionalAttributeControlModeAttributeInAttributeListFromTheDut_19()
+    CHIP_ERROR TestThReadsOptionalAttributeControlModeAttributeInAttributeListFromTheDut_26()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -54020,7 +54255,7 @@ class Test_TC_PCC_1_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestThReadsTheAcceptedCommandListAttributeFromTheDut_20()
+    CHIP_ERROR TestThReadsTheAcceptedCommandListAttributeFromTheDut_27()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -54047,7 +54282,7 @@ class Test_TC_PCC_1_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestThReadsTheGeneratedCommandListAttributeFromTheDut_21()
+    CHIP_ERROR TestThReadsTheGeneratedCommandListAttributeFromTheDut_28()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -55116,7 +55351,7 @@ class Test_TC_PCC_2_2 : public TestCommandBridge {
             break;
         case 3:
             ChipLogProgress(chipTool, " ***** Test Step 3 : TH write 1 (Minimum) to the OperationMode attribute to DUT\n");
-            if (ShouldSkip("PCC.S.A0020 && PCC.M.ControlModeConstSpeed")) {
+            if (ShouldSkip("PCC.S.F03 && PCC.S.A0020")) {
                 NextTest();
                 return;
             }
@@ -55124,7 +55359,7 @@ class Test_TC_PCC_2_2 : public TestCommandBridge {
             break;
         case 4:
             ChipLogProgress(chipTool, " ***** Test Step 4 : TH reads from the DUT the EffectiveOperationMode attribute\n");
-            if (ShouldSkip("PCC.S.A0011 && PCC.M.ControlModeConstSpeed")) {
+            if (ShouldSkip("PCC.S.F03 && PCC.S.A0011")) {
                 NextTest();
                 return;
             }
@@ -55133,7 +55368,7 @@ class Test_TC_PCC_2_2 : public TestCommandBridge {
         case 5:
             ChipLogProgress(
                 chipTool, " ***** Test Step 5 : TH write 2 (Maximum) to the OperationMode attribute to DUT one at a time.\n");
-            if (ShouldSkip("PCC.S.A0020 && PCC.M.ControlModeConstSpeed")) {
+            if (ShouldSkip("PCC.S.F03 && PCC.S.A0020")) {
                 NextTest();
                 return;
             }
@@ -55141,7 +55376,7 @@ class Test_TC_PCC_2_2 : public TestCommandBridge {
             break;
         case 6:
             ChipLogProgress(chipTool, " ***** Test Step 6 : TH reads from the DUT the EffectiveOperationMode attribute\n");
-            if (ShouldSkip("PCC.S.A0011 && PCC.M.ControlModeConstSpeed")) {
+            if (ShouldSkip("PCC.S.F03 && PCC.S.A0011")) {
                 NextTest();
                 return;
             }
@@ -55149,7 +55384,7 @@ class Test_TC_PCC_2_2 : public TestCommandBridge {
             break;
         case 7:
             ChipLogProgress(chipTool, " ***** Test Step 7 : TH write 3 (Local) to the OperationMode attribute to DUT\n");
-            if (ShouldSkip("PCC.S.A0020")) {
+            if (ShouldSkip("PCC.S.F06 && PCC.S.A0020")) {
                 NextTest();
                 return;
             }
@@ -55157,7 +55392,7 @@ class Test_TC_PCC_2_2 : public TestCommandBridge {
             break;
         case 8:
             ChipLogProgress(chipTool, " ***** Test Step 8 : TH reads from the DUT the EffectiveOperationMode attribute\n");
-            if (ShouldSkip("PCC.S.A0011")) {
+            if (ShouldSkip("PCC.S.F06 && PCC.S.A0011")) {
                 NextTest();
                 return;
             }
@@ -55499,7 +55734,7 @@ class Test_TC_PCC_2_3 : public TestCommandBridge {
             break;
         case 3:
             ChipLogProgress(chipTool, " ***** Test Step 3 : Write 0 to the ControlMode attribute to DUT\n");
-            if (ShouldSkip("PCC.S.A0021 && PCC.M.ControlModeConstSpeed")) {
+            if (ShouldSkip("PCC.S.F03 && PCC.S.A0021")) {
                 NextTest();
                 return;
             }
@@ -55507,7 +55742,7 @@ class Test_TC_PCC_2_3 : public TestCommandBridge {
             break;
         case 4:
             ChipLogProgress(chipTool, " ***** Test Step 4 : Reads the attribute: EffectiveControlMode\n");
-            if (ShouldSkip("PCC.S.A0012 && PCC.M.ControlModeConstSpeed")) {
+            if (ShouldSkip("PCC.S.F03 && PCC.S.A0012")) {
                 NextTest();
                 return;
             }
@@ -55515,7 +55750,7 @@ class Test_TC_PCC_2_3 : public TestCommandBridge {
             break;
         case 5:
             ChipLogProgress(chipTool, " ***** Test Step 5 : Write 1 to the ControlMode attribute to DUT\n");
-            if (ShouldSkip("PCC.S.A0021 && PCC.M.ControlModeConstPressure")) {
+            if (ShouldSkip("PCC.S.F00 && PCC.S.A0021")) {
                 NextTest();
                 return;
             }
@@ -55523,7 +55758,7 @@ class Test_TC_PCC_2_3 : public TestCommandBridge {
             break;
         case 6:
             ChipLogProgress(chipTool, " ***** Test Step 6 : Reads the attribute: EffectiveControlMode\n");
-            if (ShouldSkip("PCC.S.A0012 && PCC.M.ControlModeConstPressure")) {
+            if (ShouldSkip("PCC.S.F00 && PCC.S.A0012")) {
                 NextTest();
                 return;
             }
@@ -55531,7 +55766,7 @@ class Test_TC_PCC_2_3 : public TestCommandBridge {
             break;
         case 7:
             ChipLogProgress(chipTool, " ***** Test Step 7 : Write 2 to the ControlMode attribute to DUT\n");
-            if (ShouldSkip("PCC.S.A0021 && PCC.M.ControlModeCompPressure")) {
+            if (ShouldSkip("PCC.S.F01 && PCC.S.A0021")) {
                 NextTest();
                 return;
             }
@@ -55539,7 +55774,7 @@ class Test_TC_PCC_2_3 : public TestCommandBridge {
             break;
         case 8:
             ChipLogProgress(chipTool, " ***** Test Step 8 : Reads the attribute: EffectiveControlMode\n");
-            if (ShouldSkip("PCC.S.A0012 && PCC.M.ControlModeCompPressure")) {
+            if (ShouldSkip("PCC.S.F01 && PCC.S.A0012")) {
                 NextTest();
                 return;
             }
@@ -55547,7 +55782,7 @@ class Test_TC_PCC_2_3 : public TestCommandBridge {
             break;
         case 9:
             ChipLogProgress(chipTool, " ***** Test Step 9 : Write 3 to the ControlMode attribute to DUT\n");
-            if (ShouldSkip("PCC.S.A0021 && PCC.M.ControlModeConstFlow")) {
+            if (ShouldSkip("PCC.S.F02 && PCC.S.A0021")) {
                 NextTest();
                 return;
             }
@@ -55555,7 +55790,7 @@ class Test_TC_PCC_2_3 : public TestCommandBridge {
             break;
         case 10:
             ChipLogProgress(chipTool, " ***** Test Step 10 : Reads the attribute: EffectiveControlMode\n");
-            if (ShouldSkip("PCC.S.A0012 && PCC.M.ControlModeConstFlow")) {
+            if (ShouldSkip("PCC.S.F02 && PCC.S.A0012")) {
                 NextTest();
                 return;
             }
@@ -55563,7 +55798,7 @@ class Test_TC_PCC_2_3 : public TestCommandBridge {
             break;
         case 11:
             ChipLogProgress(chipTool, " ***** Test Step 11 : Write 5 to the ControlMode attribute to DUT\n");
-            if (ShouldSkip("PCC.S.A0021 && PCC.M.ControlModeConstTemp")) {
+            if (ShouldSkip("PCC.S.F04 && PCC.S.A0021")) {
                 NextTest();
                 return;
             }
@@ -55571,7 +55806,7 @@ class Test_TC_PCC_2_3 : public TestCommandBridge {
             break;
         case 12:
             ChipLogProgress(chipTool, " ***** Test Step 12 : Reads the attribute: EffectiveControlMode\n");
-            if (ShouldSkip("PCC.S.A0012 && PCC.M.ControlModeConstTemp")) {
+            if (ShouldSkip("PCC.S.F04 && PCC.S.A0012")) {
                 NextTest();
                 return;
             }
@@ -55579,7 +55814,7 @@ class Test_TC_PCC_2_3 : public TestCommandBridge {
             break;
         case 13:
             ChipLogProgress(chipTool, " ***** Test Step 13 : Write 7 to the ControlMode attribute to DUT\n");
-            if (ShouldSkip("PCC.S.A0021 && PCC.M.ControlModeAuto")) {
+            if (ShouldSkip("PCC.S.F05 && PCC.S.A0021")) {
                 NextTest();
                 return;
             }
@@ -55587,7 +55822,7 @@ class Test_TC_PCC_2_3 : public TestCommandBridge {
             break;
         case 14:
             ChipLogProgress(chipTool, " ***** Test Step 14 : Reads the attribute: EffectiveControlMode\n");
-            if (ShouldSkip("PCC.S.A0012 && PCC.M.ControlModeAuto")) {
+            if (ShouldSkip("PCC.S.F02 && PCC.S.A0012")) {
                 NextTest();
                 return;
             }
@@ -61132,384 +61367,54 @@ class Test_TC_DGTHREAD_1_1 : public TestCommandBridge {
             err = TestThReadsFeatureDependentAttributeDGTHREADSF01ERRCNTInAttributeList_8();
             break;
         case 9:
-            ChipLogProgress(chipTool, " ***** Test Step 9 : TH reads optional attribute (DetachedRoleCount) in AttributeList\n");
-            if (ShouldSkip("DGTHREAD.S.A000e")) {
+            ChipLogProgress(
+                chipTool, " ***** Test Step 9 : TH reads Feature dependent attribute (DGTHREAD.S.F02(MLECNT)) in attributeList\n");
+            if (ShouldSkip("DGTHREAD.S.F02")) {
                 NextTest();
                 return;
             }
-            err = TestThReadsOptionalAttributeDetachedRoleCountInAttributeList_9();
+            err = TestThReadsFeatureDependentAttributeDgthreadsf02mlecntInAttributeList_9();
             break;
         case 10:
-            ChipLogProgress(chipTool, " ***** Test Step 10 : TH reads optional attribute (ChildRoleCount) AttributeList\n");
-            if (ShouldSkip("DGTHREAD.S.A001f")) {
+            ChipLogProgress(
+                chipTool, " ***** Test Step 10 : TH reads Feature dependent attribute (DGTHREAD.S.F03(MACCNT)) in attributeList\n");
+            if (ShouldSkip("DGTHREAD.S.F03")) {
                 NextTest();
                 return;
             }
-            err = TestThReadsOptionalAttributeChildRoleCountAttributeList_10();
+            err = TestThReadsFeatureDependentAttributeDgthreadsf03maccntInAttributeList_10();
             break;
         case 11:
-            ChipLogProgress(chipTool, " ***** Test Step 11 : TH reads optional attribute (RouterRoleCount) in AttributeList\n");
-            if (ShouldSkip("DGTHREAD.S.A0010")) {
+            ChipLogProgress(chipTool, " ***** Test Step 11 : Read the optional attribute (ActiveTimestamp) in AttributeList\n");
+            if (ShouldSkip("DGTHREAD.S.A0038")) {
                 NextTest();
                 return;
             }
-            err = TestThReadsOptionalAttributeRouterRoleCountInAttributeList_11();
+            err = TestReadTheOptionalAttributeActiveTimestampInAttributeList_11();
             break;
         case 12:
-            ChipLogProgress(chipTool, " ***** Test Step 12 : TH reads optional attribute (LeaderRoleCount) in AttributeList\n");
-            if (ShouldSkip("DGTHREAD.S.A0011")) {
+            ChipLogProgress(chipTool, " ***** Test Step 12 : Read the optional attribute (PendingTimestamp) in AttributeList\n");
+            if (ShouldSkip("DGTHREAD.S.A0039")) {
                 NextTest();
                 return;
             }
-            err = TestThReadsOptionalAttributeLeaderRoleCountInAttributeList_12();
+            err = TestReadTheOptionalAttributePendingTimestampInAttributeList_12();
             break;
         case 13:
-            ChipLogProgress(chipTool, " ***** Test Step 13 : TH reads optional attribute (AttachAttemptCount) in AttributeList\n");
-            if (ShouldSkip("DGTHREAD.S.A0012")) {
+            ChipLogProgress(chipTool, " ***** Test Step 13 : Read the optional attribute (Delay) in AttributeList\n");
+            if (ShouldSkip("DGTHREAD.S.A003a")) {
                 NextTest();
                 return;
             }
-            err = TestThReadsOptionalAttributeAttachAttemptCountInAttributeList_13();
+            err = TestReadTheOptionalAttributeDelayInAttributeList_13();
             break;
         case 14:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 14 : TH reads optional attribute (PartitionIdChangeCount) in AttributeList\n");
-            if (ShouldSkip("DGTHREAD.S.A0013")) {
-                NextTest();
-                return;
-            }
-            err = TestThReadsOptionalAttributePartitionIdChangeCountInAttributeList_14();
+            ChipLogProgress(chipTool, " ***** Test Step 14 : TH reads AcceptedCommandList from DUT\n");
+            err = TestThReadsAcceptedCommandListFromDut_14();
             break;
         case 15:
-            ChipLogProgress(chipTool,
-                " ***** Test Step 15 : TH reads optional attribute (BetterPartitionAttachAttemptCount) in AttributeList\n");
-            if (ShouldSkip("DGTHREAD.S.A0014")) {
-                NextTest();
-                return;
-            }
-            err = TestThReadsOptionalAttributeBetterPartitionAttachAttemptCountInAttributeList_15();
-            break;
-        case 16:
-            ChipLogProgress(chipTool, " ***** Test Step 16 : TH reads optional attribute (ParentChangeCount) in AttributeList\n");
-            if (ShouldSkip("DGTHREAD.S.A0015")) {
-                NextTest();
-                return;
-            }
-            err = TestThReadsOptionalAttributeParentChangeCountInAttributeList_16();
-            break;
-        case 17:
-            ChipLogProgress(chipTool, " ***** Test Step 17 : TH reads optional attribute (TxTotalCount) in AttributeList\n");
-            if (ShouldSkip("DGTHREAD.S.A0016")) {
-                NextTest();
-                return;
-            }
-            err = TestThReadsOptionalAttributeTxTotalCountInAttributeList_17();
-            break;
-        case 18:
-            ChipLogProgress(chipTool, " ***** Test Step 18 : TH reads optional attribute (TxUnicastCount) in AttributeList\n");
-            if (ShouldSkip("DGTHREAD.S.A0017")) {
-                NextTest();
-                return;
-            }
-            err = TestThReadsOptionalAttributeTxUnicastCountInAttributeList_18();
-            break;
-        case 19:
-            ChipLogProgress(chipTool, " ***** Test Step 19 : TH reads optional attribute (TxBroadcastCount) in AttributeList\n");
-            if (ShouldSkip("DGTHREAD.S.A0018")) {
-                NextTest();
-                return;
-            }
-            err = TestThReadsOptionalAttributeTxBroadcastCountInAttributeList_19();
-            break;
-        case 20:
-            ChipLogProgress(chipTool, " ***** Test Step 20 : TH reads optional attribute (TxAckRequestedCount) in AttributeList\n");
-            if (ShouldSkip("DGTHREAD.S.A0019")) {
-                NextTest();
-                return;
-            }
-            err = TestThReadsOptionalAttributeTxAckRequestedCountInAttributeList_20();
-            break;
-        case 21:
-            ChipLogProgress(chipTool, " ***** Test Step 21 : TH reads optional attribute (TxAckedCount) in AttributeList\n");
-            if (ShouldSkip("DGTHREAD.S.A001a")) {
-                NextTest();
-                return;
-            }
-            err = TestThReadsOptionalAttributeTxAckedCountInAttributeList_21();
-            break;
-        case 22:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 22 : TH reads optional attribute (TxNoAckRequestedCount) in AttributeList\n");
-            if (ShouldSkip("DGTHREAD.S.A001b")) {
-                NextTest();
-                return;
-            }
-            err = TestThReadsOptionalAttributeTxNoAckRequestedCountInAttributeList_22();
-            break;
-        case 23:
-            ChipLogProgress(chipTool, " ***** Test Step 23 : TH reads optional attributes (TxDataCount) in AttributeList\n");
-            if (ShouldSkip("DGTHREAD.S.A001c")) {
-                NextTest();
-                return;
-            }
-            err = TestThReadsOptionalAttributesTxDataCountInAttributeList_23();
-            break;
-        case 24:
-            ChipLogProgress(chipTool, " ***** Test Step 24 : TH reads optional attribute (TxDataPollCount) in AttributeList\n");
-            if (ShouldSkip("DGTHREAD.S.A001d")) {
-                NextTest();
-                return;
-            }
-            err = TestThReadsOptionalAttributeTxDataPollCountInAttributeList_24();
-            break;
-        case 25:
-            ChipLogProgress(chipTool, " ***** Test Step 25 : TH reads optional attribute (TxBeaconCount) in AttributeList\n");
-            if (ShouldSkip("DGTHREAD.S.A001e")) {
-                NextTest();
-                return;
-            }
-            err = TestThReadsOptionalAttributeTxBeaconCountInAttributeList_25();
-            break;
-        case 26:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 26 : TH reads optional attribute (TxBeaconRequestCount) in AttributeList\n");
-            if (ShouldSkip("DGTHREAD.S.A001f")) {
-                NextTest();
-                return;
-            }
-            err = TestThReadsOptionalAttributeTxBeaconRequestCountInAttributeList_26();
-            break;
-        case 27:
-            ChipLogProgress(chipTool, " ***** Test Step 27 : TH reads optional attribute (TxOtherCount) in AttributeList\n");
-            if (ShouldSkip("DGTHREAD.S.A0020")) {
-                NextTest();
-                return;
-            }
-            err = TestThReadsOptionalAttributeTxOtherCountInAttributeList_27();
-            break;
-        case 28:
-            ChipLogProgress(chipTool, " ***** Test Step 28 : TH reads optional attribute (TxRetryCount) in AttributeList\n");
-            if (ShouldSkip("DGTHREAD.S.A0021")) {
-                NextTest();
-                return;
-            }
-            err = TestThReadsOptionalAttributeTxRetryCountInAttributeList_28();
-            break;
-        case 29:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 29 : TH reads optional attribute (TxDirectMaxRetryExpiryCount) in AttributeList\n");
-            if (ShouldSkip("DGTHREAD.S.A0022")) {
-                NextTest();
-                return;
-            }
-            err = TestThReadsOptionalAttributeTxDirectMaxRetryExpiryCountInAttributeList_29();
-            break;
-        case 30:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 30 : TH reads optional attribute (TxIndirectMaxRetryExpiryCount) in AttributeList\n");
-            if (ShouldSkip("DGTHREAD.S.A0023")) {
-                NextTest();
-                return;
-            }
-            err = TestThReadsOptionalAttributeTxIndirectMaxRetryExpiryCountInAttributeList_30();
-            break;
-        case 31:
-            ChipLogProgress(chipTool, " ***** Test Step 31 : TH reads optional attribute (TxErrCcaCount) in AttributeList\n");
-            if (ShouldSkip("DGTHREAD.S.A0024")) {
-                NextTest();
-                return;
-            }
-            err = TestThReadsOptionalAttributeTxErrCcaCountInAttributeList_31();
-            break;
-        case 32:
-            ChipLogProgress(chipTool, " ***** Test Step 32 : TH reads optional attribute (TxErrAbortCount) in AttributeList\n");
-            if (ShouldSkip("DGTHREAD.S.A0025")) {
-                NextTest();
-                return;
-            }
-            err = TestThReadsOptionalAttributeTxErrAbortCountInAttributeList_32();
-            break;
-        case 33:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 33 : TH reads optional attribute (TxErrBusyChannelCount) in AttributeList\n");
-            if (ShouldSkip("DGTHREAD.S.A0026")) {
-                NextTest();
-                return;
-            }
-            err = TestThReadsOptionalAttributeTxErrBusyChannelCountInAttributeList_33();
-            break;
-        case 34:
-            ChipLogProgress(chipTool, " ***** Test Step 34 : TH reads optional attribute (RxTotalCount) in AttributeList\n");
-            if (ShouldSkip("DGTHREAD.S.A0027")) {
-                NextTest();
-                return;
-            }
-            err = TestThReadsOptionalAttributeRxTotalCountInAttributeList_34();
-            break;
-        case 35:
-            ChipLogProgress(chipTool, " ***** Test Step 35 : TH reads optional attribute (RxUnicastCount) in AttributeList\n");
-            if (ShouldSkip("DGTHREAD.S.A0028")) {
-                NextTest();
-                return;
-            }
-            err = TestThReadsOptionalAttributeRxUnicastCountInAttributeList_35();
-            break;
-        case 36:
-            ChipLogProgress(chipTool, " ***** Test Step 36 : TH reads optional attribute (RxBroadcastCount) in AttributeList\n");
-            if (ShouldSkip("DGTHREAD.S.A0029")) {
-                NextTest();
-                return;
-            }
-            err = TestThReadsOptionalAttributeRxBroadcastCountInAttributeList_36();
-            break;
-        case 37:
-            ChipLogProgress(chipTool, " ***** Test Step 37 : TH reads optional attribute (RxDataCount) in AttributeList\n");
-            if (ShouldSkip("DGTHREAD.S.A002a")) {
-                NextTest();
-                return;
-            }
-            err = TestThReadsOptionalAttributeRxDataCountInAttributeList_37();
-            break;
-        case 38:
-            ChipLogProgress(chipTool, " ***** Test Step 38 : TH reads optional attribute (RxDataPollCount) in AttributeList\n");
-            if (ShouldSkip("DGTHREAD.S.A002b")) {
-                NextTest();
-                return;
-            }
-            err = TestThReadsOptionalAttributeRxDataPollCountInAttributeList_38();
-            break;
-        case 39:
-            ChipLogProgress(chipTool, " ***** Test Step 39 : TH reads optional attribute (RxBeaconCount) in AttributeList\n");
-            if (ShouldSkip("DGTHREAD.S.A002c")) {
-                NextTest();
-                return;
-            }
-            err = TestThReadsOptionalAttributeRxBeaconCountInAttributeList_39();
-            break;
-        case 40:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 40 : TH reads optional attribute (RxBeaconRequestCount) in AttributeList\n");
-            if (ShouldSkip("DGTHREAD.S.A002d")) {
-                NextTest();
-                return;
-            }
-            err = TestThReadsOptionalAttributeRxBeaconRequestCountInAttributeList_40();
-            break;
-        case 41:
-            ChipLogProgress(chipTool, " ***** Test Step 41 : TH reads optional attribute (RxOtherCount) in AttributeList\n");
-            if (ShouldSkip("DGTHREAD.S.A002e")) {
-                NextTest();
-                return;
-            }
-            err = TestThReadsOptionalAttributeRxOtherCountInAttributeList_41();
-            break;
-        case 42:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 42 : TH reads optional attribute (RxAddressFilteredCount) in AttributeList\n");
-            if (ShouldSkip("DGTHREAD.S.A002f")) {
-                NextTest();
-                return;
-            }
-            err = TestThReadsOptionalAttributeRxAddressFilteredCountInAttributeList_42();
-            break;
-        case 43:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 43 : TH reads optional attribute (RxDestAddrFilteredCount) in AttributeList\n");
-            if (ShouldSkip("DGTHREAD.S.A0030")) {
-                NextTest();
-                return;
-            }
-            err = TestThReadsOptionalAttributeRxDestAddrFilteredCountInAttributeList_43();
-            break;
-        case 44:
-            ChipLogProgress(chipTool, " ***** Test Step 44 : TH reads optional attribute (RxDuplicatedCount) in AttributeList\n");
-            if (ShouldSkip("DGTHREAD.S.A0031")) {
-                NextTest();
-                return;
-            }
-            err = TestThReadsOptionalAttributeRxDuplicatedCountInAttributeList_44();
-            break;
-        case 45:
-            ChipLogProgress(chipTool, " ***** Test Step 45 : TH reads optional attribute (RxErrNoFrameCount) in AttributeList\n");
-            if (ShouldSkip("DGTHREAD.S.A0032")) {
-                NextTest();
-                return;
-            }
-            err = TestThReadsOptionalAttributeRxErrNoFrameCountInAttributeList_45();
-            break;
-        case 46:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 46 : TH reads optional attribute (RxErrUnknownNeighborCount) in AttributeList\n");
-            if (ShouldSkip("DGTHREAD.S.A0033")) {
-                NextTest();
-                return;
-            }
-            err = TestThReadsOptionalAttributeRxErrUnknownNeighborCountInAttributeList_46();
-            break;
-        case 47:
-            ChipLogProgress(
-                chipTool, " ***** Test Step 47 : TH reads optional attribute (RxErrInvalidScrAddrCount) in AttributeList\n");
-            if (ShouldSkip("DGTHREAD.S.A0034")) {
-                NextTest();
-                return;
-            }
-            err = TestThReadsOptionalAttributeRxErrInvalidScrAddrCountInAttributeList_47();
-            break;
-        case 48:
-            ChipLogProgress(chipTool, " ***** Test Step 48 : TH reads optional attribute (RxErrSecCount) in AttributeList\n");
-            if (ShouldSkip("DGTHREAD.S.A0035")) {
-                NextTest();
-                return;
-            }
-            err = TestThReadsOptionalAttributeRxErrSecCountInAttributeList_48();
-            break;
-        case 49:
-            ChipLogProgress(chipTool, " ***** Test Step 49 : TH reads optional attribute (RxErrFcsCount) in AttributeList\n");
-            if (ShouldSkip("DGTHREAD.S.A0036")) {
-                NextTest();
-                return;
-            }
-            err = TestThReadsOptionalAttributeRxErrFcsCountInAttributeList_49();
-            break;
-        case 50:
-            ChipLogProgress(chipTool, " ***** Test Step 50 : TH reads optional attribute (RxErrOtherCount) in AttributeList\n");
-            if (ShouldSkip("DGTHREAD.S.A0037")) {
-                NextTest();
-                return;
-            }
-            err = TestThReadsOptionalAttributeRxErrOtherCountInAttributeList_50();
-            break;
-        case 51:
-            ChipLogProgress(chipTool, " ***** Test Step 51 : Read the optional attribute (ActiveTimestamp) in AttributeList\n");
-            if (ShouldSkip("DGTHREAD.S.A0038")) {
-                NextTest();
-                return;
-            }
-            err = TestReadTheOptionalAttributeActiveTimestampInAttributeList_51();
-            break;
-        case 52:
-            ChipLogProgress(chipTool, " ***** Test Step 52 : Read the optional attribute (PendingTimestamp) in AttributeList\n");
-            if (ShouldSkip("DGTHREAD.S.A0039")) {
-                NextTest();
-                return;
-            }
-            err = TestReadTheOptionalAttributePendingTimestampInAttributeList_52();
-            break;
-        case 53:
-            ChipLogProgress(chipTool, " ***** Test Step 53 : Read the optional attribute (Delay) in AttributeList\n");
-            if (ShouldSkip("DGTHREAD.S.A003a")) {
-                NextTest();
-                return;
-            }
-            err = TestReadTheOptionalAttributeDelayInAttributeList_53();
-            break;
-        case 54:
-            ChipLogProgress(chipTool, " ***** Test Step 54 : TH reads AcceptedCommandList from DUT\n");
-            err = TestThReadsAcceptedCommandListFromDut_54();
-            break;
-        case 55:
-            ChipLogProgress(chipTool, " ***** Test Step 55 : TH reads GeneratedCommandList from DUT\n");
-            err = TestThReadsGeneratedCommandListFromDut_55();
+            ChipLogProgress(chipTool, " ***** Test Step 15 : TH reads GeneratedCommandList from DUT\n");
+            err = TestThReadsGeneratedCommandListFromDut_15();
             break;
         }
 
@@ -61570,126 +61475,6 @@ class Test_TC_DGTHREAD_1_1 : public TestCommandBridge {
         case 15:
             VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
             break;
-        case 16:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 17:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 18:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 19:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 20:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 21:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 22:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 23:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 24:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 25:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 26:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 27:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 28:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 29:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 30:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 31:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 32:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 33:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 34:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 35:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 36:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 37:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 38:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 39:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 40:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 41:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 42:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 43:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 44:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 45:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 46:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 47:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 48:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 49:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 50:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 51:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 52:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 53:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 54:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
-        case 55:
-            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0));
-            break;
         }
 
         // Go on to the next test.
@@ -61703,7 +61488,7 @@ class Test_TC_DGTHREAD_1_1 : public TestCommandBridge {
 
 private:
     std::atomic_uint16_t mTestIndex;
-    const uint16_t mTestCount = 56;
+    const uint16_t mTestCount = 16;
 
     chip::Optional<chip::NodeId> mNodeId;
     chip::Optional<chip::CharSpan> mCluster;
@@ -61929,7 +61714,7 @@ class Test_TC_DGTHREAD_1_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestThReadsOptionalAttributeDetachedRoleCountInAttributeList_9()
+    CHIP_ERROR TestThReadsFeatureDependentAttributeDgthreadsf02mlecntInAttributeList_9()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -61940,179 +61725,18 @@ class Test_TC_DGTHREAD_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"TH reads optional attribute (DetachedRoleCount) in AttributeList Error: %@", err);
+            NSLog(@"TH reads Feature dependent attribute (DGTHREAD.S.F02(MLECNT)) in attributeList Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("attributeList", "list", "list"));
             VerifyOrReturn(CheckConstraintContains("attributeList", value, 14UL));
-
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestThReadsOptionalAttributeChildRoleCountAttributeList_10()
-    {
-
-        MTRBaseDevice * device = GetDevice("alpha");
-        commissionerNodeId = mCommissionerNodeId.ValueOr(0);
-        __auto_type * cluster = [[MTRBaseClusterThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                    endpointID:@(0)
-                                                                                         queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"TH reads optional attribute (ChildRoleCount) AttributeList Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            VerifyOrReturn(CheckConstraintType("attributeList", "list", "list"));
             VerifyOrReturn(CheckConstraintContains("attributeList", value, 15UL));
-
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestThReadsOptionalAttributeRouterRoleCountInAttributeList_11()
-    {
-
-        MTRBaseDevice * device = GetDevice("alpha");
-        commissionerNodeId = mCommissionerNodeId.ValueOr(0);
-        __auto_type * cluster = [[MTRBaseClusterThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                    endpointID:@(0)
-                                                                                         queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"TH reads optional attribute (RouterRoleCount) in AttributeList Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            VerifyOrReturn(CheckConstraintType("attributeList", "list", "list"));
             VerifyOrReturn(CheckConstraintContains("attributeList", value, 16UL));
-
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestThReadsOptionalAttributeLeaderRoleCountInAttributeList_12()
-    {
-
-        MTRBaseDevice * device = GetDevice("alpha");
-        commissionerNodeId = mCommissionerNodeId.ValueOr(0);
-        __auto_type * cluster = [[MTRBaseClusterThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                    endpointID:@(0)
-                                                                                         queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"TH reads optional attribute (LeaderRoleCount) in AttributeList Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            VerifyOrReturn(CheckConstraintType("attributeList", "list", "list"));
             VerifyOrReturn(CheckConstraintContains("attributeList", value, 17UL));
-
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestThReadsOptionalAttributeAttachAttemptCountInAttributeList_13()
-    {
-
-        MTRBaseDevice * device = GetDevice("alpha");
-        commissionerNodeId = mCommissionerNodeId.ValueOr(0);
-        __auto_type * cluster = [[MTRBaseClusterThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                    endpointID:@(0)
-                                                                                         queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"TH reads optional attribute (AttachAttemptCount) in AttributeList Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            VerifyOrReturn(CheckConstraintType("attributeList", "list", "list"));
             VerifyOrReturn(CheckConstraintContains("attributeList", value, 18UL));
-
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestThReadsOptionalAttributePartitionIdChangeCountInAttributeList_14()
-    {
-
-        MTRBaseDevice * device = GetDevice("alpha");
-        commissionerNodeId = mCommissionerNodeId.ValueOr(0);
-        __auto_type * cluster = [[MTRBaseClusterThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                    endpointID:@(0)
-                                                                                         queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"TH reads optional attribute (PartitionIdChangeCount) in AttributeList Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            VerifyOrReturn(CheckConstraintType("attributeList", "list", "list"));
             VerifyOrReturn(CheckConstraintContains("attributeList", value, 19UL));
-
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestThReadsOptionalAttributeBetterPartitionAttachAttemptCountInAttributeList_15()
-    {
-
-        MTRBaseDevice * device = GetDevice("alpha");
-        commissionerNodeId = mCommissionerNodeId.ValueOr(0);
-        __auto_type * cluster = [[MTRBaseClusterThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                    endpointID:@(0)
-                                                                                         queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"TH reads optional attribute (BetterPartitionAttachAttemptCount) in AttributeList Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            VerifyOrReturn(CheckConstraintType("attributeList", "list", "list"));
             VerifyOrReturn(CheckConstraintContains("attributeList", value, 20UL));
-
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestThReadsOptionalAttributeParentChangeCountInAttributeList_16()
-    {
-
-        MTRBaseDevice * device = GetDevice("alpha");
-        commissionerNodeId = mCommissionerNodeId.ValueOr(0);
-        __auto_type * cluster = [[MTRBaseClusterThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                    endpointID:@(0)
-                                                                                         queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"TH reads optional attribute (ParentChangeCount) in AttributeList Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            VerifyOrReturn(CheckConstraintType("attributeList", "list", "list"));
             VerifyOrReturn(CheckConstraintContains("attributeList", value, 21UL));
 
             NextTest();
@@ -62121,607 +61745,7 @@ class Test_TC_DGTHREAD_1_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestThReadsOptionalAttributeTxTotalCountInAttributeList_17()
-    {
-
-        MTRBaseDevice * device = GetDevice("alpha");
-        commissionerNodeId = mCommissionerNodeId.ValueOr(0);
-        __auto_type * cluster = [[MTRBaseClusterThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                    endpointID:@(0)
-                                                                                         queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"TH reads optional attribute (TxTotalCount) in AttributeList Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            VerifyOrReturn(CheckConstraintType("attributeList", "list", "list"));
-            VerifyOrReturn(CheckConstraintContains("attributeList", value, 22UL));
-
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestThReadsOptionalAttributeTxUnicastCountInAttributeList_18()
-    {
-
-        MTRBaseDevice * device = GetDevice("alpha");
-        commissionerNodeId = mCommissionerNodeId.ValueOr(0);
-        __auto_type * cluster = [[MTRBaseClusterThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                    endpointID:@(0)
-                                                                                         queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"TH reads optional attribute (TxUnicastCount) in AttributeList Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            VerifyOrReturn(CheckConstraintType("attributeList", "list", "list"));
-            VerifyOrReturn(CheckConstraintContains("attributeList", value, 23UL));
-
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestThReadsOptionalAttributeTxBroadcastCountInAttributeList_19()
-    {
-
-        MTRBaseDevice * device = GetDevice("alpha");
-        commissionerNodeId = mCommissionerNodeId.ValueOr(0);
-        __auto_type * cluster = [[MTRBaseClusterThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                    endpointID:@(0)
-                                                                                         queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"TH reads optional attribute (TxBroadcastCount) in AttributeList Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            VerifyOrReturn(CheckConstraintType("attributeList", "list", "list"));
-            VerifyOrReturn(CheckConstraintContains("attributeList", value, 24UL));
-
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestThReadsOptionalAttributeTxAckRequestedCountInAttributeList_20()
-    {
-
-        MTRBaseDevice * device = GetDevice("alpha");
-        commissionerNodeId = mCommissionerNodeId.ValueOr(0);
-        __auto_type * cluster = [[MTRBaseClusterThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                    endpointID:@(0)
-                                                                                         queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"TH reads optional attribute (TxAckRequestedCount) in AttributeList Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            VerifyOrReturn(CheckConstraintType("attributeList", "list", "list"));
-            VerifyOrReturn(CheckConstraintContains("attributeList", value, 25UL));
-
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestThReadsOptionalAttributeTxAckedCountInAttributeList_21()
-    {
-
-        MTRBaseDevice * device = GetDevice("alpha");
-        commissionerNodeId = mCommissionerNodeId.ValueOr(0);
-        __auto_type * cluster = [[MTRBaseClusterThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                    endpointID:@(0)
-                                                                                         queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"TH reads optional attribute (TxAckedCount) in AttributeList Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            VerifyOrReturn(CheckConstraintType("attributeList", "list", "list"));
-            VerifyOrReturn(CheckConstraintContains("attributeList", value, 26UL));
-
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestThReadsOptionalAttributeTxNoAckRequestedCountInAttributeList_22()
-    {
-
-        MTRBaseDevice * device = GetDevice("alpha");
-        commissionerNodeId = mCommissionerNodeId.ValueOr(0);
-        __auto_type * cluster = [[MTRBaseClusterThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                    endpointID:@(0)
-                                                                                         queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"TH reads optional attribute (TxNoAckRequestedCount) in AttributeList Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            VerifyOrReturn(CheckConstraintType("attributeList", "list", "list"));
-            VerifyOrReturn(CheckConstraintContains("attributeList", value, 27UL));
-
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestThReadsOptionalAttributesTxDataCountInAttributeList_23()
-    {
-
-        MTRBaseDevice * device = GetDevice("alpha");
-        commissionerNodeId = mCommissionerNodeId.ValueOr(0);
-        __auto_type * cluster = [[MTRBaseClusterThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                    endpointID:@(0)
-                                                                                         queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"TH reads optional attributes (TxDataCount) in AttributeList Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            VerifyOrReturn(CheckConstraintType("attributeList", "list", "list"));
-            VerifyOrReturn(CheckConstraintContains("attributeList", value, 28UL));
-
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestThReadsOptionalAttributeTxDataPollCountInAttributeList_24()
-    {
-
-        MTRBaseDevice * device = GetDevice("alpha");
-        commissionerNodeId = mCommissionerNodeId.ValueOr(0);
-        __auto_type * cluster = [[MTRBaseClusterThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                    endpointID:@(0)
-                                                                                         queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"TH reads optional attribute (TxDataPollCount) in AttributeList Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            VerifyOrReturn(CheckConstraintType("attributeList", "list", "list"));
-            VerifyOrReturn(CheckConstraintContains("attributeList", value, 29UL));
-
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestThReadsOptionalAttributeTxBeaconCountInAttributeList_25()
-    {
-
-        MTRBaseDevice * device = GetDevice("alpha");
-        commissionerNodeId = mCommissionerNodeId.ValueOr(0);
-        __auto_type * cluster = [[MTRBaseClusterThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                    endpointID:@(0)
-                                                                                         queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"TH reads optional attribute (TxBeaconCount) in AttributeList Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            VerifyOrReturn(CheckConstraintType("attributeList", "list", "list"));
-            VerifyOrReturn(CheckConstraintContains("attributeList", value, 30UL));
-
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestThReadsOptionalAttributeTxBeaconRequestCountInAttributeList_26()
-    {
-
-        MTRBaseDevice * device = GetDevice("alpha");
-        commissionerNodeId = mCommissionerNodeId.ValueOr(0);
-        __auto_type * cluster = [[MTRBaseClusterThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                    endpointID:@(0)
-                                                                                         queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"TH reads optional attribute (TxBeaconRequestCount) in AttributeList Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            VerifyOrReturn(CheckConstraintType("attributeList", "list", "list"));
-            VerifyOrReturn(CheckConstraintContains("attributeList", value, 31UL));
-
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestThReadsOptionalAttributeTxOtherCountInAttributeList_27()
-    {
-
-        MTRBaseDevice * device = GetDevice("alpha");
-        commissionerNodeId = mCommissionerNodeId.ValueOr(0);
-        __auto_type * cluster = [[MTRBaseClusterThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                    endpointID:@(0)
-                                                                                         queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"TH reads optional attribute (TxOtherCount) in AttributeList Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            VerifyOrReturn(CheckConstraintType("attributeList", "list", "list"));
-            VerifyOrReturn(CheckConstraintContains("attributeList", value, 32UL));
-
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestThReadsOptionalAttributeTxRetryCountInAttributeList_28()
-    {
-
-        MTRBaseDevice * device = GetDevice("alpha");
-        commissionerNodeId = mCommissionerNodeId.ValueOr(0);
-        __auto_type * cluster = [[MTRBaseClusterThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                    endpointID:@(0)
-                                                                                         queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"TH reads optional attribute (TxRetryCount) in AttributeList Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            VerifyOrReturn(CheckConstraintType("attributeList", "list", "list"));
-            VerifyOrReturn(CheckConstraintContains("attributeList", value, 33UL));
-
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestThReadsOptionalAttributeTxDirectMaxRetryExpiryCountInAttributeList_29()
-    {
-
-        MTRBaseDevice * device = GetDevice("alpha");
-        commissionerNodeId = mCommissionerNodeId.ValueOr(0);
-        __auto_type * cluster = [[MTRBaseClusterThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                    endpointID:@(0)
-                                                                                         queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"TH reads optional attribute (TxDirectMaxRetryExpiryCount) in AttributeList Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            VerifyOrReturn(CheckConstraintType("attributeList", "list", "list"));
-            VerifyOrReturn(CheckConstraintContains("attributeList", value, 34UL));
-
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestThReadsOptionalAttributeTxIndirectMaxRetryExpiryCountInAttributeList_30()
-    {
-
-        MTRBaseDevice * device = GetDevice("alpha");
-        commissionerNodeId = mCommissionerNodeId.ValueOr(0);
-        __auto_type * cluster = [[MTRBaseClusterThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                    endpointID:@(0)
-                                                                                         queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"TH reads optional attribute (TxIndirectMaxRetryExpiryCount) in AttributeList Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            VerifyOrReturn(CheckConstraintType("attributeList", "list", "list"));
-            VerifyOrReturn(CheckConstraintContains("attributeList", value, 35UL));
-
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestThReadsOptionalAttributeTxErrCcaCountInAttributeList_31()
-    {
-
-        MTRBaseDevice * device = GetDevice("alpha");
-        commissionerNodeId = mCommissionerNodeId.ValueOr(0);
-        __auto_type * cluster = [[MTRBaseClusterThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                    endpointID:@(0)
-                                                                                         queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"TH reads optional attribute (TxErrCcaCount) in AttributeList Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            VerifyOrReturn(CheckConstraintType("attributeList", "list", "list"));
-            VerifyOrReturn(CheckConstraintContains("attributeList", value, 36UL));
-
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestThReadsOptionalAttributeTxErrAbortCountInAttributeList_32()
-    {
-
-        MTRBaseDevice * device = GetDevice("alpha");
-        commissionerNodeId = mCommissionerNodeId.ValueOr(0);
-        __auto_type * cluster = [[MTRBaseClusterThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                    endpointID:@(0)
-                                                                                         queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"TH reads optional attribute (TxErrAbortCount) in AttributeList Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            VerifyOrReturn(CheckConstraintType("attributeList", "list", "list"));
-            VerifyOrReturn(CheckConstraintContains("attributeList", value, 37UL));
-
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestThReadsOptionalAttributeTxErrBusyChannelCountInAttributeList_33()
-    {
-
-        MTRBaseDevice * device = GetDevice("alpha");
-        commissionerNodeId = mCommissionerNodeId.ValueOr(0);
-        __auto_type * cluster = [[MTRBaseClusterThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                    endpointID:@(0)
-                                                                                         queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"TH reads optional attribute (TxErrBusyChannelCount) in AttributeList Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            VerifyOrReturn(CheckConstraintType("attributeList", "list", "list"));
-            VerifyOrReturn(CheckConstraintContains("attributeList", value, 38UL));
-
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestThReadsOptionalAttributeRxTotalCountInAttributeList_34()
-    {
-
-        MTRBaseDevice * device = GetDevice("alpha");
-        commissionerNodeId = mCommissionerNodeId.ValueOr(0);
-        __auto_type * cluster = [[MTRBaseClusterThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                    endpointID:@(0)
-                                                                                         queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"TH reads optional attribute (RxTotalCount) in AttributeList Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            VerifyOrReturn(CheckConstraintType("attributeList", "list", "list"));
-            VerifyOrReturn(CheckConstraintContains("attributeList", value, 39UL));
-
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestThReadsOptionalAttributeRxUnicastCountInAttributeList_35()
-    {
-
-        MTRBaseDevice * device = GetDevice("alpha");
-        commissionerNodeId = mCommissionerNodeId.ValueOr(0);
-        __auto_type * cluster = [[MTRBaseClusterThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                    endpointID:@(0)
-                                                                                         queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"TH reads optional attribute (RxUnicastCount) in AttributeList Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            VerifyOrReturn(CheckConstraintType("attributeList", "list", "list"));
-            VerifyOrReturn(CheckConstraintContains("attributeList", value, 40UL));
-
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestThReadsOptionalAttributeRxBroadcastCountInAttributeList_36()
-    {
-
-        MTRBaseDevice * device = GetDevice("alpha");
-        commissionerNodeId = mCommissionerNodeId.ValueOr(0);
-        __auto_type * cluster = [[MTRBaseClusterThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                    endpointID:@(0)
-                                                                                         queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"TH reads optional attribute (RxBroadcastCount) in AttributeList Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            VerifyOrReturn(CheckConstraintType("attributeList", "list", "list"));
-            VerifyOrReturn(CheckConstraintContains("attributeList", value, 41UL));
-
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestThReadsOptionalAttributeRxDataCountInAttributeList_37()
-    {
-
-        MTRBaseDevice * device = GetDevice("alpha");
-        commissionerNodeId = mCommissionerNodeId.ValueOr(0);
-        __auto_type * cluster = [[MTRBaseClusterThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                    endpointID:@(0)
-                                                                                         queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"TH reads optional attribute (RxDataCount) in AttributeList Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            VerifyOrReturn(CheckConstraintType("attributeList", "list", "list"));
-            VerifyOrReturn(CheckConstraintContains("attributeList", value, 42UL));
-
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestThReadsOptionalAttributeRxDataPollCountInAttributeList_38()
-    {
-
-        MTRBaseDevice * device = GetDevice("alpha");
-        commissionerNodeId = mCommissionerNodeId.ValueOr(0);
-        __auto_type * cluster = [[MTRBaseClusterThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                    endpointID:@(0)
-                                                                                         queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"TH reads optional attribute (RxDataPollCount) in AttributeList Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            VerifyOrReturn(CheckConstraintType("attributeList", "list", "list"));
-            VerifyOrReturn(CheckConstraintContains("attributeList", value, 43UL));
-
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestThReadsOptionalAttributeRxBeaconCountInAttributeList_39()
-    {
-
-        MTRBaseDevice * device = GetDevice("alpha");
-        commissionerNodeId = mCommissionerNodeId.ValueOr(0);
-        __auto_type * cluster = [[MTRBaseClusterThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                    endpointID:@(0)
-                                                                                         queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"TH reads optional attribute (RxBeaconCount) in AttributeList Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            VerifyOrReturn(CheckConstraintType("attributeList", "list", "list"));
-            VerifyOrReturn(CheckConstraintContains("attributeList", value, 44UL));
-
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestThReadsOptionalAttributeRxBeaconRequestCountInAttributeList_40()
-    {
-
-        MTRBaseDevice * device = GetDevice("alpha");
-        commissionerNodeId = mCommissionerNodeId.ValueOr(0);
-        __auto_type * cluster = [[MTRBaseClusterThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                    endpointID:@(0)
-                                                                                         queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"TH reads optional attribute (RxBeaconRequestCount) in AttributeList Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            VerifyOrReturn(CheckConstraintType("attributeList", "list", "list"));
-            VerifyOrReturn(CheckConstraintContains("attributeList", value, 45UL));
-
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestThReadsOptionalAttributeRxOtherCountInAttributeList_41()
-    {
-
-        MTRBaseDevice * device = GetDevice("alpha");
-        commissionerNodeId = mCommissionerNodeId.ValueOr(0);
-        __auto_type * cluster = [[MTRBaseClusterThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                    endpointID:@(0)
-                                                                                         queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"TH reads optional attribute (RxOtherCount) in AttributeList Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            VerifyOrReturn(CheckConstraintType("attributeList", "list", "list"));
-            VerifyOrReturn(CheckConstraintContains("attributeList", value, 46UL));
-
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestThReadsOptionalAttributeRxAddressFilteredCountInAttributeList_42()
+    CHIP_ERROR TestThReadsFeatureDependentAttributeDgthreadsf03maccntInAttributeList_10()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -62732,203 +61756,44 @@ class Test_TC_DGTHREAD_1_1 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"TH reads optional attribute (RxAddressFilteredCount) in AttributeList Error: %@", err);
+            NSLog(@"TH reads Feature dependent attribute (DGTHREAD.S.F03(MACCNT)) in attributeList Error: %@", err);
 
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintType("attributeList", "list", "list"));
+            VerifyOrReturn(CheckConstraintContains("attributeList", value, 22UL));
+            VerifyOrReturn(CheckConstraintContains("attributeList", value, 23UL));
+            VerifyOrReturn(CheckConstraintContains("attributeList", value, 24UL));
+            VerifyOrReturn(CheckConstraintContains("attributeList", value, 25UL));
+            VerifyOrReturn(CheckConstraintContains("attributeList", value, 26UL));
+            VerifyOrReturn(CheckConstraintContains("attributeList", value, 27UL));
+            VerifyOrReturn(CheckConstraintContains("attributeList", value, 28UL));
+            VerifyOrReturn(CheckConstraintContains("attributeList", value, 29UL));
+            VerifyOrReturn(CheckConstraintContains("attributeList", value, 30UL));
+            VerifyOrReturn(CheckConstraintContains("attributeList", value, 31UL));
+            VerifyOrReturn(CheckConstraintContains("attributeList", value, 32UL));
+            VerifyOrReturn(CheckConstraintContains("attributeList", value, 33UL));
+            VerifyOrReturn(CheckConstraintContains("attributeList", value, 34UL));
+            VerifyOrReturn(CheckConstraintContains("attributeList", value, 35UL));
+            VerifyOrReturn(CheckConstraintContains("attributeList", value, 36UL));
+            VerifyOrReturn(CheckConstraintContains("attributeList", value, 37UL));
+            VerifyOrReturn(CheckConstraintContains("attributeList", value, 38UL));
+            VerifyOrReturn(CheckConstraintContains("attributeList", value, 39UL));
+            VerifyOrReturn(CheckConstraintContains("attributeList", value, 40UL));
+            VerifyOrReturn(CheckConstraintContains("attributeList", value, 41UL));
+            VerifyOrReturn(CheckConstraintContains("attributeList", value, 42UL));
+            VerifyOrReturn(CheckConstraintContains("attributeList", value, 43UL));
+            VerifyOrReturn(CheckConstraintContains("attributeList", value, 44UL));
+            VerifyOrReturn(CheckConstraintContains("attributeList", value, 45UL));
+            VerifyOrReturn(CheckConstraintContains("attributeList", value, 46UL));
             VerifyOrReturn(CheckConstraintContains("attributeList", value, 47UL));
-
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestThReadsOptionalAttributeRxDestAddrFilteredCountInAttributeList_43()
-    {
-
-        MTRBaseDevice * device = GetDevice("alpha");
-        commissionerNodeId = mCommissionerNodeId.ValueOr(0);
-        __auto_type * cluster = [[MTRBaseClusterThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                    endpointID:@(0)
-                                                                                         queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"TH reads optional attribute (RxDestAddrFilteredCount) in AttributeList Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            VerifyOrReturn(CheckConstraintType("attributeList", "list", "list"));
             VerifyOrReturn(CheckConstraintContains("attributeList", value, 48UL));
-
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestThReadsOptionalAttributeRxDuplicatedCountInAttributeList_44()
-    {
-
-        MTRBaseDevice * device = GetDevice("alpha");
-        commissionerNodeId = mCommissionerNodeId.ValueOr(0);
-        __auto_type * cluster = [[MTRBaseClusterThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                    endpointID:@(0)
-                                                                                         queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"TH reads optional attribute (RxDuplicatedCount) in AttributeList Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            VerifyOrReturn(CheckConstraintType("attributeList", "list", "list"));
             VerifyOrReturn(CheckConstraintContains("attributeList", value, 49UL));
-
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestThReadsOptionalAttributeRxErrNoFrameCountInAttributeList_45()
-    {
-
-        MTRBaseDevice * device = GetDevice("alpha");
-        commissionerNodeId = mCommissionerNodeId.ValueOr(0);
-        __auto_type * cluster = [[MTRBaseClusterThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                    endpointID:@(0)
-                                                                                         queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"TH reads optional attribute (RxErrNoFrameCount) in AttributeList Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            VerifyOrReturn(CheckConstraintType("attributeList", "list", "list"));
             VerifyOrReturn(CheckConstraintContains("attributeList", value, 50UL));
-
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestThReadsOptionalAttributeRxErrUnknownNeighborCountInAttributeList_46()
-    {
-
-        MTRBaseDevice * device = GetDevice("alpha");
-        commissionerNodeId = mCommissionerNodeId.ValueOr(0);
-        __auto_type * cluster = [[MTRBaseClusterThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                    endpointID:@(0)
-                                                                                         queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"TH reads optional attribute (RxErrUnknownNeighborCount) in AttributeList Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            VerifyOrReturn(CheckConstraintType("attributeList", "list", "list"));
             VerifyOrReturn(CheckConstraintContains("attributeList", value, 51UL));
-
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestThReadsOptionalAttributeRxErrInvalidScrAddrCountInAttributeList_47()
-    {
-
-        MTRBaseDevice * device = GetDevice("alpha");
-        commissionerNodeId = mCommissionerNodeId.ValueOr(0);
-        __auto_type * cluster = [[MTRBaseClusterThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                    endpointID:@(0)
-                                                                                         queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"TH reads optional attribute (RxErrInvalidScrAddrCount) in AttributeList Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            VerifyOrReturn(CheckConstraintType("attributeList", "list", "list"));
             VerifyOrReturn(CheckConstraintContains("attributeList", value, 52UL));
-
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestThReadsOptionalAttributeRxErrSecCountInAttributeList_48()
-    {
-
-        MTRBaseDevice * device = GetDevice("alpha");
-        commissionerNodeId = mCommissionerNodeId.ValueOr(0);
-        __auto_type * cluster = [[MTRBaseClusterThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                    endpointID:@(0)
-                                                                                         queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"TH reads optional attribute (RxErrSecCount) in AttributeList Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            VerifyOrReturn(CheckConstraintType("attributeList", "list", "list"));
             VerifyOrReturn(CheckConstraintContains("attributeList", value, 53UL));
-
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestThReadsOptionalAttributeRxErrFcsCountInAttributeList_49()
-    {
-
-        MTRBaseDevice * device = GetDevice("alpha");
-        commissionerNodeId = mCommissionerNodeId.ValueOr(0);
-        __auto_type * cluster = [[MTRBaseClusterThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                    endpointID:@(0)
-                                                                                         queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"TH reads optional attribute (RxErrFcsCount) in AttributeList Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            VerifyOrReturn(CheckConstraintType("attributeList", "list", "list"));
             VerifyOrReturn(CheckConstraintContains("attributeList", value, 54UL));
-
-            NextTest();
-        }];
-
-        return CHIP_NO_ERROR;
-    }
-
-    CHIP_ERROR TestThReadsOptionalAttributeRxErrOtherCountInAttributeList_50()
-    {
-
-        MTRBaseDevice * device = GetDevice("alpha");
-        commissionerNodeId = mCommissionerNodeId.ValueOr(0);
-        __auto_type * cluster = [[MTRBaseClusterThreadNetworkDiagnostics alloc] initWithDevice:device
-                                                                                    endpointID:@(0)
-                                                                                         queue:mCallbackQueue];
-        VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
-
-        [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) {
-            NSLog(@"TH reads optional attribute (RxErrOtherCount) in AttributeList Error: %@", err);
-
-            VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
-
-            VerifyOrReturn(CheckConstraintType("attributeList", "list", "list"));
             VerifyOrReturn(CheckConstraintContains("attributeList", value, 55UL));
 
             NextTest();
@@ -62937,7 +61802,7 @@ class Test_TC_DGTHREAD_1_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadTheOptionalAttributeActiveTimestampInAttributeList_51()
+    CHIP_ERROR TestReadTheOptionalAttributeActiveTimestampInAttributeList_11()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -62961,7 +61826,7 @@ class Test_TC_DGTHREAD_1_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadTheOptionalAttributePendingTimestampInAttributeList_52()
+    CHIP_ERROR TestReadTheOptionalAttributePendingTimestampInAttributeList_12()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -62985,7 +61850,7 @@ class Test_TC_DGTHREAD_1_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestReadTheOptionalAttributeDelayInAttributeList_53()
+    CHIP_ERROR TestReadTheOptionalAttributeDelayInAttributeList_13()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -63009,7 +61874,7 @@ class Test_TC_DGTHREAD_1_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestThReadsAcceptedCommandListFromDut_54()
+    CHIP_ERROR TestThReadsAcceptedCommandListFromDut_14()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -63033,7 +61898,7 @@ class Test_TC_DGTHREAD_1_1 : public TestCommandBridge {
         return CHIP_NO_ERROR;
     }
 
-    CHIP_ERROR TestThReadsGeneratedCommandListFromDut_55()
+    CHIP_ERROR TestThReadsGeneratedCommandListFromDut_15()
     {
 
         MTRBaseDevice * device = GetDevice("alpha");
@@ -111619,52 +110484,52 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
                             {
                                 id actualValue = values.userIndex;
-                                VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
+                                VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U));
                             }
 
                             {
                                 id actualValue = values.userName;
-                                VerifyOrReturn(CheckValueNull("userName", actualValue));
+                                VerifyOrReturn(CheckValueNull("UserName", actualValue));
                             }
 
                             {
-                                id actualValue = values.userUniqueId;
-                                VerifyOrReturn(CheckValueNull("userUniqueId", actualValue));
+                                id actualValue = values.userUniqueID;
+                                VerifyOrReturn(CheckValueNull("UserUniqueID", actualValue));
                             }
 
                             {
                                 id actualValue = values.userStatus;
-                                VerifyOrReturn(CheckValueNull("userStatus", actualValue));
+                                VerifyOrReturn(CheckValueNull("UserStatus", actualValue));
                             }
 
                             {
                                 id actualValue = values.userType;
-                                VerifyOrReturn(CheckValueNull("userType", actualValue));
+                                VerifyOrReturn(CheckValueNull("UserType", actualValue));
                             }
 
                             {
                                 id actualValue = values.credentialRule;
-                                VerifyOrReturn(CheckValueNull("credentialRule", actualValue));
+                                VerifyOrReturn(CheckValueNull("CredentialRule", actualValue));
                             }
 
                             {
                                 id actualValue = values.credentials;
-                                VerifyOrReturn(CheckValueNull("credentials", actualValue));
+                                VerifyOrReturn(CheckValueNull("Credentials", actualValue));
                             }
 
                             {
                                 id actualValue = values.creatorFabricIndex;
-                                VerifyOrReturn(CheckValueNull("creatorFabricIndex", actualValue));
+                                VerifyOrReturn(CheckValueNull("CreatorFabricIndex", actualValue));
                             }
 
                             {
                                 id actualValue = values.lastModifiedFabricIndex;
-                                VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", actualValue));
+                                VerifyOrReturn(CheckValueNull("LastModifiedFabricIndex", actualValue));
                             }
 
                             {
                                 id actualValue = values.nextUserIndex;
-                                VerifyOrReturn(CheckValueNull("nextUserIndex", actualValue));
+                                VerifyOrReturn(CheckValueNull("NextUserIndex", actualValue));
                             }
 
                             NextTest();
@@ -111761,7 +110626,7 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         params.operationType = [NSNumber numberWithUnsignedChar:0U];
         params.userIndex = [NSNumber numberWithUnsignedShort:1U];
         params.userName = nil;
-        params.userUniqueId = nil;
+        params.userUniqueID = nil;
         params.userStatus = nil;
         params.userType = nil;
         params.credentialRule = nil;
@@ -111795,58 +110660,58 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
                             {
                                 id actualValue = values.userIndex;
-                                VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
+                                VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U));
                             }
 
                             {
                                 id actualValue = values.userName;
-                                VerifyOrReturn(CheckValueNonNull("userName", actualValue));
-                                VerifyOrReturn(CheckValueAsString("userName", actualValue, @""));
+                                VerifyOrReturn(CheckValueNonNull("UserName", actualValue));
+                                VerifyOrReturn(CheckValueAsString("UserName", actualValue, @""));
                             }
 
                             {
-                                id actualValue = values.userUniqueId;
-                                VerifyOrReturn(CheckValueNull("userUniqueId", actualValue));
+                                id actualValue = values.userUniqueID;
+                                VerifyOrReturn(CheckValueNull("UserUniqueID", actualValue));
                             }
 
                             {
                                 id actualValue = values.userStatus;
-                                VerifyOrReturn(CheckValueNonNull("userStatus", actualValue));
-                                VerifyOrReturn(CheckValue("userStatus", actualValue, 1U));
+                                VerifyOrReturn(CheckValueNonNull("UserStatus", actualValue));
+                                VerifyOrReturn(CheckValue("UserStatus", actualValue, 1U));
                             }
 
                             {
                                 id actualValue = values.userType;
-                                VerifyOrReturn(CheckValueNonNull("userType", actualValue));
-                                VerifyOrReturn(CheckValue("userType", actualValue, 0U));
+                                VerifyOrReturn(CheckValueNonNull("UserType", actualValue));
+                                VerifyOrReturn(CheckValue("UserType", actualValue, 0U));
                             }
 
                             {
                                 id actualValue = values.credentialRule;
-                                VerifyOrReturn(CheckValueNonNull("credentialRule", actualValue));
-                                VerifyOrReturn(CheckValue("credentialRule", actualValue, 0U));
+                                VerifyOrReturn(CheckValueNonNull("CredentialRule", actualValue));
+                                VerifyOrReturn(CheckValue("CredentialRule", actualValue, 0U));
                             }
 
                             {
                                 id actualValue = values.credentials;
-                                VerifyOrReturn(CheckValueNull("credentials", actualValue));
+                                VerifyOrReturn(CheckValueNull("Credentials", actualValue));
                             }
 
                             {
                                 id actualValue = values.creatorFabricIndex;
-                                VerifyOrReturn(CheckValueNonNull("creatorFabricIndex", actualValue));
-                                VerifyOrReturn(CheckValue("creatorFabricIndex", actualValue, 1U));
+                                VerifyOrReturn(CheckValueNonNull("CreatorFabricIndex", actualValue));
+                                VerifyOrReturn(CheckValue("CreatorFabricIndex", actualValue, 1U));
                             }
 
                             {
                                 id actualValue = values.lastModifiedFabricIndex;
-                                VerifyOrReturn(CheckValueNonNull("lastModifiedFabricIndex", actualValue));
-                                VerifyOrReturn(CheckValue("lastModifiedFabricIndex", actualValue, 1U));
+                                VerifyOrReturn(CheckValueNonNull("LastModifiedFabricIndex", actualValue));
+                                VerifyOrReturn(CheckValue("LastModifiedFabricIndex", actualValue, 1U));
                             }
 
                             {
                                 id actualValue = values.nextUserIndex;
-                                VerifyOrReturn(CheckValueNull("nextUserIndex", actualValue));
+                                VerifyOrReturn(CheckValueNull("NextUserIndex", actualValue));
                             }
 
                             NextTest();
@@ -111867,7 +110732,7 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         params.operationType = [NSNumber numberWithUnsignedChar:0U];
         params.userIndex = [NSNumber numberWithUnsignedShort:1U];
         params.userName = nil;
-        params.userUniqueId = nil;
+        params.userUniqueID = nil;
         params.userStatus = nil;
         params.userType = nil;
         params.credentialRule = nil;
@@ -111897,7 +110762,7 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         params.operationType = [NSNumber numberWithUnsignedChar:2U];
         params.userIndex = [NSNumber numberWithUnsignedShort:1U];
         params.userName = @"new_user";
-        params.userUniqueId = nil;
+        params.userUniqueID = nil;
         params.userStatus = nil;
         params.userType = nil;
         params.credentialRule = nil;
@@ -111931,58 +110796,58 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
                             {
                                 id actualValue = values.userIndex;
-                                VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
+                                VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U));
                             }
 
                             {
                                 id actualValue = values.userName;
-                                VerifyOrReturn(CheckValueNonNull("userName", actualValue));
-                                VerifyOrReturn(CheckValueAsString("userName", actualValue, @"new_user"));
+                                VerifyOrReturn(CheckValueNonNull("UserName", actualValue));
+                                VerifyOrReturn(CheckValueAsString("UserName", actualValue, @"new_user"));
                             }
 
                             {
-                                id actualValue = values.userUniqueId;
-                                VerifyOrReturn(CheckValueNull("userUniqueId", actualValue));
+                                id actualValue = values.userUniqueID;
+                                VerifyOrReturn(CheckValueNull("UserUniqueID", actualValue));
                             }
 
                             {
                                 id actualValue = values.userStatus;
-                                VerifyOrReturn(CheckValueNonNull("userStatus", actualValue));
-                                VerifyOrReturn(CheckValue("userStatus", actualValue, 1U));
+                                VerifyOrReturn(CheckValueNonNull("UserStatus", actualValue));
+                                VerifyOrReturn(CheckValue("UserStatus", actualValue, 1U));
                             }
 
                             {
                                 id actualValue = values.userType;
-                                VerifyOrReturn(CheckValueNonNull("userType", actualValue));
-                                VerifyOrReturn(CheckValue("userType", actualValue, 0U));
+                                VerifyOrReturn(CheckValueNonNull("UserType", actualValue));
+                                VerifyOrReturn(CheckValue("UserType", actualValue, 0U));
                             }
 
                             {
                                 id actualValue = values.credentialRule;
-                                VerifyOrReturn(CheckValueNonNull("credentialRule", actualValue));
-                                VerifyOrReturn(CheckValue("credentialRule", actualValue, 0U));
+                                VerifyOrReturn(CheckValueNonNull("CredentialRule", actualValue));
+                                VerifyOrReturn(CheckValue("CredentialRule", actualValue, 0U));
                             }
 
                             {
                                 id actualValue = values.credentials;
-                                VerifyOrReturn(CheckValueNull("credentials", actualValue));
+                                VerifyOrReturn(CheckValueNull("Credentials", actualValue));
                             }
 
                             {
                                 id actualValue = values.creatorFabricIndex;
-                                VerifyOrReturn(CheckValueNonNull("creatorFabricIndex", actualValue));
-                                VerifyOrReturn(CheckValue("creatorFabricIndex", actualValue, 1U));
+                                VerifyOrReturn(CheckValueNonNull("CreatorFabricIndex", actualValue));
+                                VerifyOrReturn(CheckValue("CreatorFabricIndex", actualValue, 1U));
                             }
 
                             {
                                 id actualValue = values.lastModifiedFabricIndex;
-                                VerifyOrReturn(CheckValueNonNull("lastModifiedFabricIndex", actualValue));
-                                VerifyOrReturn(CheckValue("lastModifiedFabricIndex", actualValue, 1U));
+                                VerifyOrReturn(CheckValueNonNull("LastModifiedFabricIndex", actualValue));
+                                VerifyOrReturn(CheckValue("LastModifiedFabricIndex", actualValue, 1U));
                             }
 
                             {
                                 id actualValue = values.nextUserIndex;
-                                VerifyOrReturn(CheckValueNull("nextUserIndex", actualValue));
+                                VerifyOrReturn(CheckValueNull("NextUserIndex", actualValue));
                             }
 
                             NextTest();
@@ -112003,7 +110868,7 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         params.operationType = [NSNumber numberWithUnsignedChar:2U];
         params.userIndex = [NSNumber numberWithUnsignedShort:1U];
         params.userName = nil;
-        params.userUniqueId = [NSNumber numberWithUnsignedInt:305441741UL];
+        params.userUniqueID = [NSNumber numberWithUnsignedInt:305441741UL];
         params.userStatus = nil;
         params.userType = nil;
         params.credentialRule = nil;
@@ -112037,59 +110902,59 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
                             {
                                 id actualValue = values.userIndex;
-                                VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
+                                VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U));
                             }
 
                             {
                                 id actualValue = values.userName;
-                                VerifyOrReturn(CheckValueNonNull("userName", actualValue));
-                                VerifyOrReturn(CheckValueAsString("userName", actualValue, @"new_user"));
+                                VerifyOrReturn(CheckValueNonNull("UserName", actualValue));
+                                VerifyOrReturn(CheckValueAsString("UserName", actualValue, @"new_user"));
                             }
 
                             {
-                                id actualValue = values.userUniqueId;
-                                VerifyOrReturn(CheckValueNonNull("userUniqueId", actualValue));
-                                VerifyOrReturn(CheckValue("userUniqueId", actualValue, 305441741UL));
+                                id actualValue = values.userUniqueID;
+                                VerifyOrReturn(CheckValueNonNull("UserUniqueID", actualValue));
+                                VerifyOrReturn(CheckValue("UserUniqueID", actualValue, 305441741UL));
                             }
 
                             {
                                 id actualValue = values.userStatus;
-                                VerifyOrReturn(CheckValueNonNull("userStatus", actualValue));
-                                VerifyOrReturn(CheckValue("userStatus", actualValue, 1U));
+                                VerifyOrReturn(CheckValueNonNull("UserStatus", actualValue));
+                                VerifyOrReturn(CheckValue("UserStatus", actualValue, 1U));
                             }
 
                             {
                                 id actualValue = values.userType;
-                                VerifyOrReturn(CheckValueNonNull("userType", actualValue));
-                                VerifyOrReturn(CheckValue("userType", actualValue, 0U));
+                                VerifyOrReturn(CheckValueNonNull("UserType", actualValue));
+                                VerifyOrReturn(CheckValue("UserType", actualValue, 0U));
                             }
 
                             {
                                 id actualValue = values.credentialRule;
-                                VerifyOrReturn(CheckValueNonNull("credentialRule", actualValue));
-                                VerifyOrReturn(CheckValue("credentialRule", actualValue, 0U));
+                                VerifyOrReturn(CheckValueNonNull("CredentialRule", actualValue));
+                                VerifyOrReturn(CheckValue("CredentialRule", actualValue, 0U));
                             }
 
                             {
                                 id actualValue = values.credentials;
-                                VerifyOrReturn(CheckValueNull("credentials", actualValue));
+                                VerifyOrReturn(CheckValueNull("Credentials", actualValue));
                             }
 
                             {
                                 id actualValue = values.creatorFabricIndex;
-                                VerifyOrReturn(CheckValueNonNull("creatorFabricIndex", actualValue));
-                                VerifyOrReturn(CheckValue("creatorFabricIndex", actualValue, 1U));
+                                VerifyOrReturn(CheckValueNonNull("CreatorFabricIndex", actualValue));
+                                VerifyOrReturn(CheckValue("CreatorFabricIndex", actualValue, 1U));
                             }
 
                             {
                                 id actualValue = values.lastModifiedFabricIndex;
-                                VerifyOrReturn(CheckValueNonNull("lastModifiedFabricIndex", actualValue));
-                                VerifyOrReturn(CheckValue("lastModifiedFabricIndex", actualValue, 1U));
+                                VerifyOrReturn(CheckValueNonNull("LastModifiedFabricIndex", actualValue));
+                                VerifyOrReturn(CheckValue("LastModifiedFabricIndex", actualValue, 1U));
                             }
 
                             {
                                 id actualValue = values.nextUserIndex;
-                                VerifyOrReturn(CheckValueNull("nextUserIndex", actualValue));
+                                VerifyOrReturn(CheckValueNull("NextUserIndex", actualValue));
                             }
 
                             NextTest();
@@ -112110,7 +110975,7 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         params.operationType = [NSNumber numberWithUnsignedChar:2U];
         params.userIndex = [NSNumber numberWithUnsignedShort:1U];
         params.userName = nil;
-        params.userUniqueId = nil;
+        params.userUniqueID = nil;
         params.userStatus = [NSNumber numberWithUnsignedChar:3U];
         params.userType = nil;
         params.credentialRule = nil;
@@ -112144,59 +111009,59 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
                             {
                                 id actualValue = values.userIndex;
-                                VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
+                                VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U));
                             }
 
                             {
                                 id actualValue = values.userName;
-                                VerifyOrReturn(CheckValueNonNull("userName", actualValue));
-                                VerifyOrReturn(CheckValueAsString("userName", actualValue, @"new_user"));
+                                VerifyOrReturn(CheckValueNonNull("UserName", actualValue));
+                                VerifyOrReturn(CheckValueAsString("UserName", actualValue, @"new_user"));
                             }
 
                             {
-                                id actualValue = values.userUniqueId;
-                                VerifyOrReturn(CheckValueNonNull("userUniqueId", actualValue));
-                                VerifyOrReturn(CheckValue("userUniqueId", actualValue, 305441741UL));
+                                id actualValue = values.userUniqueID;
+                                VerifyOrReturn(CheckValueNonNull("UserUniqueID", actualValue));
+                                VerifyOrReturn(CheckValue("UserUniqueID", actualValue, 305441741UL));
                             }
 
                             {
                                 id actualValue = values.userStatus;
-                                VerifyOrReturn(CheckValueNonNull("userStatus", actualValue));
-                                VerifyOrReturn(CheckValue("userStatus", actualValue, 3U));
+                                VerifyOrReturn(CheckValueNonNull("UserStatus", actualValue));
+                                VerifyOrReturn(CheckValue("UserStatus", actualValue, 3U));
                             }
 
                             {
                                 id actualValue = values.userType;
-                                VerifyOrReturn(CheckValueNonNull("userType", actualValue));
-                                VerifyOrReturn(CheckValue("userType", actualValue, 0U));
+                                VerifyOrReturn(CheckValueNonNull("UserType", actualValue));
+                                VerifyOrReturn(CheckValue("UserType", actualValue, 0U));
                             }
 
                             {
                                 id actualValue = values.credentialRule;
-                                VerifyOrReturn(CheckValueNonNull("credentialRule", actualValue));
-                                VerifyOrReturn(CheckValue("credentialRule", actualValue, 0U));
+                                VerifyOrReturn(CheckValueNonNull("CredentialRule", actualValue));
+                                VerifyOrReturn(CheckValue("CredentialRule", actualValue, 0U));
                             }
 
                             {
                                 id actualValue = values.credentials;
-                                VerifyOrReturn(CheckValueNull("credentials", actualValue));
+                                VerifyOrReturn(CheckValueNull("Credentials", actualValue));
                             }
 
                             {
                                 id actualValue = values.creatorFabricIndex;
-                                VerifyOrReturn(CheckValueNonNull("creatorFabricIndex", actualValue));
-                                VerifyOrReturn(CheckValue("creatorFabricIndex", actualValue, 1U));
+                                VerifyOrReturn(CheckValueNonNull("CreatorFabricIndex", actualValue));
+                                VerifyOrReturn(CheckValue("CreatorFabricIndex", actualValue, 1U));
                             }
 
                             {
                                 id actualValue = values.lastModifiedFabricIndex;
-                                VerifyOrReturn(CheckValueNonNull("lastModifiedFabricIndex", actualValue));
-                                VerifyOrReturn(CheckValue("lastModifiedFabricIndex", actualValue, 1U));
+                                VerifyOrReturn(CheckValueNonNull("LastModifiedFabricIndex", actualValue));
+                                VerifyOrReturn(CheckValue("LastModifiedFabricIndex", actualValue, 1U));
                             }
 
                             {
                                 id actualValue = values.nextUserIndex;
-                                VerifyOrReturn(CheckValueNull("nextUserIndex", actualValue));
+                                VerifyOrReturn(CheckValueNull("NextUserIndex", actualValue));
                             }
 
                             NextTest();
@@ -112217,7 +111082,7 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         params.operationType = [NSNumber numberWithUnsignedChar:2U];
         params.userIndex = [NSNumber numberWithUnsignedShort:1U];
         params.userName = nil;
-        params.userUniqueId = nil;
+        params.userUniqueID = nil;
         params.userStatus = nil;
         params.userType = [NSNumber numberWithUnsignedChar:6U];
         params.credentialRule = nil;
@@ -112251,59 +111116,59 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
                             {
                                 id actualValue = values.userIndex;
-                                VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
+                                VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U));
                             }
 
                             {
                                 id actualValue = values.userName;
-                                VerifyOrReturn(CheckValueNonNull("userName", actualValue));
-                                VerifyOrReturn(CheckValueAsString("userName", actualValue, @"new_user"));
+                                VerifyOrReturn(CheckValueNonNull("UserName", actualValue));
+                                VerifyOrReturn(CheckValueAsString("UserName", actualValue, @"new_user"));
                             }
 
                             {
-                                id actualValue = values.userUniqueId;
-                                VerifyOrReturn(CheckValueNonNull("userUniqueId", actualValue));
-                                VerifyOrReturn(CheckValue("userUniqueId", actualValue, 305441741UL));
+                                id actualValue = values.userUniqueID;
+                                VerifyOrReturn(CheckValueNonNull("UserUniqueID", actualValue));
+                                VerifyOrReturn(CheckValue("UserUniqueID", actualValue, 305441741UL));
                             }
 
                             {
                                 id actualValue = values.userStatus;
-                                VerifyOrReturn(CheckValueNonNull("userStatus", actualValue));
-                                VerifyOrReturn(CheckValue("userStatus", actualValue, 3U));
+                                VerifyOrReturn(CheckValueNonNull("UserStatus", actualValue));
+                                VerifyOrReturn(CheckValue("UserStatus", actualValue, 3U));
                             }
 
                             {
                                 id actualValue = values.userType;
-                                VerifyOrReturn(CheckValueNonNull("userType", actualValue));
-                                VerifyOrReturn(CheckValue("userType", actualValue, 6U));
+                                VerifyOrReturn(CheckValueNonNull("UserType", actualValue));
+                                VerifyOrReturn(CheckValue("UserType", actualValue, 6U));
                             }
 
                             {
                                 id actualValue = values.credentialRule;
-                                VerifyOrReturn(CheckValueNonNull("credentialRule", actualValue));
-                                VerifyOrReturn(CheckValue("credentialRule", actualValue, 0U));
+                                VerifyOrReturn(CheckValueNonNull("CredentialRule", actualValue));
+                                VerifyOrReturn(CheckValue("CredentialRule", actualValue, 0U));
                             }
 
                             {
                                 id actualValue = values.credentials;
-                                VerifyOrReturn(CheckValueNull("credentials", actualValue));
+                                VerifyOrReturn(CheckValueNull("Credentials", actualValue));
                             }
 
                             {
                                 id actualValue = values.creatorFabricIndex;
-                                VerifyOrReturn(CheckValueNonNull("creatorFabricIndex", actualValue));
-                                VerifyOrReturn(CheckValue("creatorFabricIndex", actualValue, 1U));
+                                VerifyOrReturn(CheckValueNonNull("CreatorFabricIndex", actualValue));
+                                VerifyOrReturn(CheckValue("CreatorFabricIndex", actualValue, 1U));
                             }
 
                             {
                                 id actualValue = values.lastModifiedFabricIndex;
-                                VerifyOrReturn(CheckValueNonNull("lastModifiedFabricIndex", actualValue));
-                                VerifyOrReturn(CheckValue("lastModifiedFabricIndex", actualValue, 1U));
+                                VerifyOrReturn(CheckValueNonNull("LastModifiedFabricIndex", actualValue));
+                                VerifyOrReturn(CheckValue("LastModifiedFabricIndex", actualValue, 1U));
                             }
 
                             {
                                 id actualValue = values.nextUserIndex;
-                                VerifyOrReturn(CheckValueNull("nextUserIndex", actualValue));
+                                VerifyOrReturn(CheckValueNull("NextUserIndex", actualValue));
                             }
 
                             NextTest();
@@ -112324,7 +111189,7 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         params.operationType = [NSNumber numberWithUnsignedChar:2U];
         params.userIndex = [NSNumber numberWithUnsignedShort:1U];
         params.userName = nil;
-        params.userUniqueId = nil;
+        params.userUniqueID = nil;
         params.userStatus = nil;
         params.userType = nil;
         params.credentialRule = [NSNumber numberWithUnsignedChar:2U];
@@ -112358,59 +111223,59 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
                             {
                                 id actualValue = values.userIndex;
-                                VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
+                                VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U));
                             }
 
                             {
                                 id actualValue = values.userName;
-                                VerifyOrReturn(CheckValueNonNull("userName", actualValue));
-                                VerifyOrReturn(CheckValueAsString("userName", actualValue, @"new_user"));
+                                VerifyOrReturn(CheckValueNonNull("UserName", actualValue));
+                                VerifyOrReturn(CheckValueAsString("UserName", actualValue, @"new_user"));
                             }
 
                             {
-                                id actualValue = values.userUniqueId;
-                                VerifyOrReturn(CheckValueNonNull("userUniqueId", actualValue));
-                                VerifyOrReturn(CheckValue("userUniqueId", actualValue, 305441741UL));
+                                id actualValue = values.userUniqueID;
+                                VerifyOrReturn(CheckValueNonNull("UserUniqueID", actualValue));
+                                VerifyOrReturn(CheckValue("UserUniqueID", actualValue, 305441741UL));
                             }
 
                             {
                                 id actualValue = values.userStatus;
-                                VerifyOrReturn(CheckValueNonNull("userStatus", actualValue));
-                                VerifyOrReturn(CheckValue("userStatus", actualValue, 3U));
+                                VerifyOrReturn(CheckValueNonNull("UserStatus", actualValue));
+                                VerifyOrReturn(CheckValue("UserStatus", actualValue, 3U));
                             }
 
                             {
                                 id actualValue = values.userType;
-                                VerifyOrReturn(CheckValueNonNull("userType", actualValue));
-                                VerifyOrReturn(CheckValue("userType", actualValue, 6U));
+                                VerifyOrReturn(CheckValueNonNull("UserType", actualValue));
+                                VerifyOrReturn(CheckValue("UserType", actualValue, 6U));
                             }
 
                             {
                                 id actualValue = values.credentialRule;
-                                VerifyOrReturn(CheckValueNonNull("credentialRule", actualValue));
-                                VerifyOrReturn(CheckValue("credentialRule", actualValue, 2U));
+                                VerifyOrReturn(CheckValueNonNull("CredentialRule", actualValue));
+                                VerifyOrReturn(CheckValue("CredentialRule", actualValue, 2U));
                             }
 
                             {
                                 id actualValue = values.credentials;
-                                VerifyOrReturn(CheckValueNull("credentials", actualValue));
+                                VerifyOrReturn(CheckValueNull("Credentials", actualValue));
                             }
 
                             {
                                 id actualValue = values.creatorFabricIndex;
-                                VerifyOrReturn(CheckValueNonNull("creatorFabricIndex", actualValue));
-                                VerifyOrReturn(CheckValue("creatorFabricIndex", actualValue, 1U));
+                                VerifyOrReturn(CheckValueNonNull("CreatorFabricIndex", actualValue));
+                                VerifyOrReturn(CheckValue("CreatorFabricIndex", actualValue, 1U));
                             }
 
                             {
                                 id actualValue = values.lastModifiedFabricIndex;
-                                VerifyOrReturn(CheckValueNonNull("lastModifiedFabricIndex", actualValue));
-                                VerifyOrReturn(CheckValue("lastModifiedFabricIndex", actualValue, 1U));
+                                VerifyOrReturn(CheckValueNonNull("LastModifiedFabricIndex", actualValue));
+                                VerifyOrReturn(CheckValue("LastModifiedFabricIndex", actualValue, 1U));
                             }
 
                             {
                                 id actualValue = values.nextUserIndex;
-                                VerifyOrReturn(CheckValueNull("nextUserIndex", actualValue));
+                                VerifyOrReturn(CheckValueNull("NextUserIndex", actualValue));
                             }
 
                             NextTest();
@@ -112431,7 +111296,7 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         params.operationType = [NSNumber numberWithUnsignedChar:2U];
         params.userIndex = [NSNumber numberWithUnsignedShort:1U];
         params.userName = @"test_user";
-        params.userUniqueId = [NSNumber numberWithUnsignedInt:466460832UL];
+        params.userUniqueID = [NSNumber numberWithUnsignedInt:466460832UL];
         params.userStatus = [NSNumber numberWithUnsignedChar:1U];
         params.userType = [NSNumber numberWithUnsignedChar:0U];
         params.credentialRule = [NSNumber numberWithUnsignedChar:1U];
@@ -112465,59 +111330,59 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
                             {
                                 id actualValue = values.userIndex;
-                                VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
+                                VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U));
                             }
 
                             {
                                 id actualValue = values.userName;
-                                VerifyOrReturn(CheckValueNonNull("userName", actualValue));
-                                VerifyOrReturn(CheckValueAsString("userName", actualValue, @"test_user"));
+                                VerifyOrReturn(CheckValueNonNull("UserName", actualValue));
+                                VerifyOrReturn(CheckValueAsString("UserName", actualValue, @"test_user"));
                             }
 
                             {
-                                id actualValue = values.userUniqueId;
-                                VerifyOrReturn(CheckValueNonNull("userUniqueId", actualValue));
-                                VerifyOrReturn(CheckValue("userUniqueId", actualValue, 466460832UL));
+                                id actualValue = values.userUniqueID;
+                                VerifyOrReturn(CheckValueNonNull("UserUniqueID", actualValue));
+                                VerifyOrReturn(CheckValue("UserUniqueID", actualValue, 466460832UL));
                             }
 
                             {
                                 id actualValue = values.userStatus;
-                                VerifyOrReturn(CheckValueNonNull("userStatus", actualValue));
-                                VerifyOrReturn(CheckValue("userStatus", actualValue, 1U));
+                                VerifyOrReturn(CheckValueNonNull("UserStatus", actualValue));
+                                VerifyOrReturn(CheckValue("UserStatus", actualValue, 1U));
                             }
 
                             {
                                 id actualValue = values.userType;
-                                VerifyOrReturn(CheckValueNonNull("userType", actualValue));
-                                VerifyOrReturn(CheckValue("userType", actualValue, 0U));
+                                VerifyOrReturn(CheckValueNonNull("UserType", actualValue));
+                                VerifyOrReturn(CheckValue("UserType", actualValue, 0U));
                             }
 
                             {
                                 id actualValue = values.credentialRule;
-                                VerifyOrReturn(CheckValueNonNull("credentialRule", actualValue));
-                                VerifyOrReturn(CheckValue("credentialRule", actualValue, 1U));
+                                VerifyOrReturn(CheckValueNonNull("CredentialRule", actualValue));
+                                VerifyOrReturn(CheckValue("CredentialRule", actualValue, 1U));
                             }
 
                             {
                                 id actualValue = values.credentials;
-                                VerifyOrReturn(CheckValueNull("credentials", actualValue));
+                                VerifyOrReturn(CheckValueNull("Credentials", actualValue));
                             }
 
                             {
                                 id actualValue = values.creatorFabricIndex;
-                                VerifyOrReturn(CheckValueNonNull("creatorFabricIndex", actualValue));
-                                VerifyOrReturn(CheckValue("creatorFabricIndex", actualValue, 1U));
+                                VerifyOrReturn(CheckValueNonNull("CreatorFabricIndex", actualValue));
+                                VerifyOrReturn(CheckValue("CreatorFabricIndex", actualValue, 1U));
                             }
 
                             {
                                 id actualValue = values.lastModifiedFabricIndex;
-                                VerifyOrReturn(CheckValueNonNull("lastModifiedFabricIndex", actualValue));
-                                VerifyOrReturn(CheckValue("lastModifiedFabricIndex", actualValue, 1U));
+                                VerifyOrReturn(CheckValueNonNull("LastModifiedFabricIndex", actualValue));
+                                VerifyOrReturn(CheckValue("LastModifiedFabricIndex", actualValue, 1U));
                             }
 
                             {
                                 id actualValue = values.nextUserIndex;
-                                VerifyOrReturn(CheckValueNull("nextUserIndex", actualValue));
+                                VerifyOrReturn(CheckValueNull("NextUserIndex", actualValue));
                             }
 
                             NextTest();
@@ -112538,7 +111403,7 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         params.operationType = [NSNumber numberWithUnsignedChar:0U];
         params.userIndex = [NSNumber numberWithUnsignedShort:2U];
         params.userName = @"test_user2";
-        params.userUniqueId = [NSNumber numberWithUnsignedInt:12648430UL];
+        params.userUniqueID = [NSNumber numberWithUnsignedInt:12648430UL];
         params.userStatus = [NSNumber numberWithUnsignedChar:1U];
         params.userType = [NSNumber numberWithUnsignedChar:1U];
         params.credentialRule = [NSNumber numberWithUnsignedChar:2U];
@@ -112572,59 +111437,59 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
                             {
                                 id actualValue = values.userIndex;
-                                VerifyOrReturn(CheckValue("userIndex", actualValue, 2U));
+                                VerifyOrReturn(CheckValue("UserIndex", actualValue, 2U));
                             }
 
                             {
                                 id actualValue = values.userName;
-                                VerifyOrReturn(CheckValueNonNull("userName", actualValue));
-                                VerifyOrReturn(CheckValueAsString("userName", actualValue, @"test_user2"));
+                                VerifyOrReturn(CheckValueNonNull("UserName", actualValue));
+                                VerifyOrReturn(CheckValueAsString("UserName", actualValue, @"test_user2"));
                             }
 
                             {
-                                id actualValue = values.userUniqueId;
-                                VerifyOrReturn(CheckValueNonNull("userUniqueId", actualValue));
-                                VerifyOrReturn(CheckValue("userUniqueId", actualValue, 12648430UL));
+                                id actualValue = values.userUniqueID;
+                                VerifyOrReturn(CheckValueNonNull("UserUniqueID", actualValue));
+                                VerifyOrReturn(CheckValue("UserUniqueID", actualValue, 12648430UL));
                             }
 
                             {
                                 id actualValue = values.userStatus;
-                                VerifyOrReturn(CheckValueNonNull("userStatus", actualValue));
-                                VerifyOrReturn(CheckValue("userStatus", actualValue, 1U));
+                                VerifyOrReturn(CheckValueNonNull("UserStatus", actualValue));
+                                VerifyOrReturn(CheckValue("UserStatus", actualValue, 1U));
                             }
 
                             {
                                 id actualValue = values.userType;
-                                VerifyOrReturn(CheckValueNonNull("userType", actualValue));
-                                VerifyOrReturn(CheckValue("userType", actualValue, 1U));
+                                VerifyOrReturn(CheckValueNonNull("UserType", actualValue));
+                                VerifyOrReturn(CheckValue("UserType", actualValue, 1U));
                             }
 
                             {
                                 id actualValue = values.credentialRule;
-                                VerifyOrReturn(CheckValueNonNull("credentialRule", actualValue));
-                                VerifyOrReturn(CheckValue("credentialRule", actualValue, 2U));
+                                VerifyOrReturn(CheckValueNonNull("CredentialRule", actualValue));
+                                VerifyOrReturn(CheckValue("CredentialRule", actualValue, 2U));
                             }
 
                             {
                                 id actualValue = values.credentials;
-                                VerifyOrReturn(CheckValueNull("credentials", actualValue));
+                                VerifyOrReturn(CheckValueNull("Credentials", actualValue));
                             }
 
                             {
                                 id actualValue = values.creatorFabricIndex;
-                                VerifyOrReturn(CheckValueNonNull("creatorFabricIndex", actualValue));
-                                VerifyOrReturn(CheckValue("creatorFabricIndex", actualValue, 1U));
+                                VerifyOrReturn(CheckValueNonNull("CreatorFabricIndex", actualValue));
+                                VerifyOrReturn(CheckValue("CreatorFabricIndex", actualValue, 1U));
                             }
 
                             {
                                 id actualValue = values.lastModifiedFabricIndex;
-                                VerifyOrReturn(CheckValueNonNull("lastModifiedFabricIndex", actualValue));
-                                VerifyOrReturn(CheckValue("lastModifiedFabricIndex", actualValue, 1U));
+                                VerifyOrReturn(CheckValueNonNull("LastModifiedFabricIndex", actualValue));
+                                VerifyOrReturn(CheckValue("LastModifiedFabricIndex", actualValue, 1U));
                             }
 
                             {
                                 id actualValue = values.nextUserIndex;
-                                VerifyOrReturn(CheckValueNull("nextUserIndex", actualValue));
+                                VerifyOrReturn(CheckValueNull("NextUserIndex", actualValue));
                             }
 
                             NextTest();
@@ -112645,7 +111510,7 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         params.operationType = [NSNumber numberWithUnsignedChar:0U];
         params.userIndex = [NSNumber numberWithUnsignedShort:3U];
         params.userName = @"test_user3";
-        params.userUniqueId = [NSNumber numberWithUnsignedInt:47802UL];
+        params.userUniqueID = [NSNumber numberWithUnsignedInt:47802UL];
         params.userStatus = [NSNumber numberWithUnsignedChar:0U];
         params.userType = nil;
         params.credentialRule = nil;
@@ -112681,52 +111546,52 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
                             {
                                 id actualValue = values.userIndex;
-                                VerifyOrReturn(CheckValue("userIndex", actualValue, 3U));
+                                VerifyOrReturn(CheckValue("UserIndex", actualValue, 3U));
                             }
 
                             {
                                 id actualValue = values.userName;
-                                VerifyOrReturn(CheckValueNull("userName", actualValue));
+                                VerifyOrReturn(CheckValueNull("UserName", actualValue));
                             }
 
                             {
-                                id actualValue = values.userUniqueId;
-                                VerifyOrReturn(CheckValueNull("userUniqueId", actualValue));
+                                id actualValue = values.userUniqueID;
+                                VerifyOrReturn(CheckValueNull("UserUniqueID", actualValue));
                             }
 
                             {
                                 id actualValue = values.userStatus;
-                                VerifyOrReturn(CheckValueNull("userStatus", actualValue));
+                                VerifyOrReturn(CheckValueNull("UserStatus", actualValue));
                             }
 
                             {
                                 id actualValue = values.userType;
-                                VerifyOrReturn(CheckValueNull("userType", actualValue));
+                                VerifyOrReturn(CheckValueNull("UserType", actualValue));
                             }
 
                             {
                                 id actualValue = values.credentialRule;
-                                VerifyOrReturn(CheckValueNull("credentialRule", actualValue));
+                                VerifyOrReturn(CheckValueNull("CredentialRule", actualValue));
                             }
 
                             {
                                 id actualValue = values.credentials;
-                                VerifyOrReturn(CheckValueNull("credentials", actualValue));
+                                VerifyOrReturn(CheckValueNull("Credentials", actualValue));
                             }
 
                             {
                                 id actualValue = values.creatorFabricIndex;
-                                VerifyOrReturn(CheckValueNull("creatorFabricIndex", actualValue));
+                                VerifyOrReturn(CheckValueNull("CreatorFabricIndex", actualValue));
                             }
 
                             {
                                 id actualValue = values.lastModifiedFabricIndex;
-                                VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", actualValue));
+                                VerifyOrReturn(CheckValueNull("LastModifiedFabricIndex", actualValue));
                             }
 
                             {
                                 id actualValue = values.nextUserIndex;
-                                VerifyOrReturn(CheckValueNull("nextUserIndex", actualValue));
+                                VerifyOrReturn(CheckValueNull("NextUserIndex", actualValue));
                             }
 
                             NextTest();
@@ -112747,7 +111612,7 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         params.operationType = [NSNumber numberWithUnsignedChar:0U];
         params.userIndex = [NSNumber numberWithUnsignedShort:3U];
         params.userName = @"test_user3";
-        params.userUniqueId = [NSNumber numberWithUnsignedInt:47802UL];
+        params.userUniqueID = [NSNumber numberWithUnsignedInt:47802UL];
         params.userStatus = [NSNumber numberWithUnsignedChar:2U];
         params.userType = nil;
         params.credentialRule = nil;
@@ -112783,52 +111648,52 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
                             {
                                 id actualValue = values.userIndex;
-                                VerifyOrReturn(CheckValue("userIndex", actualValue, 3U));
+                                VerifyOrReturn(CheckValue("UserIndex", actualValue, 3U));
                             }
 
                             {
                                 id actualValue = values.userName;
-                                VerifyOrReturn(CheckValueNull("userName", actualValue));
+                                VerifyOrReturn(CheckValueNull("UserName", actualValue));
                             }
 
                             {
-                                id actualValue = values.userUniqueId;
-                                VerifyOrReturn(CheckValueNull("userUniqueId", actualValue));
+                                id actualValue = values.userUniqueID;
+                                VerifyOrReturn(CheckValueNull("UserUniqueID", actualValue));
                             }
 
                             {
                                 id actualValue = values.userStatus;
-                                VerifyOrReturn(CheckValueNull("userStatus", actualValue));
+                                VerifyOrReturn(CheckValueNull("UserStatus", actualValue));
                             }
 
                             {
                                 id actualValue = values.userType;
-                                VerifyOrReturn(CheckValueNull("userType", actualValue));
+                                VerifyOrReturn(CheckValueNull("UserType", actualValue));
                             }
 
                             {
                                 id actualValue = values.credentialRule;
-                                VerifyOrReturn(CheckValueNull("credentialRule", actualValue));
+                                VerifyOrReturn(CheckValueNull("CredentialRule", actualValue));
                             }
 
                             {
                                 id actualValue = values.credentials;
-                                VerifyOrReturn(CheckValueNull("credentials", actualValue));
+                                VerifyOrReturn(CheckValueNull("Credentials", actualValue));
                             }
 
                             {
                                 id actualValue = values.creatorFabricIndex;
-                                VerifyOrReturn(CheckValueNull("creatorFabricIndex", actualValue));
+                                VerifyOrReturn(CheckValueNull("CreatorFabricIndex", actualValue));
                             }
 
                             {
                                 id actualValue = values.lastModifiedFabricIndex;
-                                VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", actualValue));
+                                VerifyOrReturn(CheckValueNull("LastModifiedFabricIndex", actualValue));
                             }
 
                             {
                                 id actualValue = values.nextUserIndex;
-                                VerifyOrReturn(CheckValueNull("nextUserIndex", actualValue));
+                                VerifyOrReturn(CheckValueNull("NextUserIndex", actualValue));
                             }
 
                             NextTest();
@@ -112849,7 +111714,7 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         params.operationType = [NSNumber numberWithUnsignedChar:0U];
         params.userIndex = [NSNumber numberWithUnsignedShort:3U];
         params.userName = @"test_user3";
-        params.userUniqueId = [NSNumber numberWithUnsignedInt:47802UL];
+        params.userUniqueID = [NSNumber numberWithUnsignedInt:47802UL];
         params.userStatus = [NSNumber numberWithUnsignedChar:3U];
         params.userType = nil;
         params.credentialRule = nil;
@@ -112883,59 +111748,59 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
                             {
                                 id actualValue = values.userIndex;
-                                VerifyOrReturn(CheckValue("userIndex", actualValue, 3U));
+                                VerifyOrReturn(CheckValue("UserIndex", actualValue, 3U));
                             }
 
                             {
                                 id actualValue = values.userName;
-                                VerifyOrReturn(CheckValueNonNull("userName", actualValue));
-                                VerifyOrReturn(CheckValueAsString("userName", actualValue, @"test_user3"));
+                                VerifyOrReturn(CheckValueNonNull("UserName", actualValue));
+                                VerifyOrReturn(CheckValueAsString("UserName", actualValue, @"test_user3"));
                             }
 
                             {
-                                id actualValue = values.userUniqueId;
-                                VerifyOrReturn(CheckValueNonNull("userUniqueId", actualValue));
-                                VerifyOrReturn(CheckValue("userUniqueId", actualValue, 47802UL));
+                                id actualValue = values.userUniqueID;
+                                VerifyOrReturn(CheckValueNonNull("UserUniqueID", actualValue));
+                                VerifyOrReturn(CheckValue("UserUniqueID", actualValue, 47802UL));
                             }
 
                             {
                                 id actualValue = values.userStatus;
-                                VerifyOrReturn(CheckValueNonNull("userStatus", actualValue));
-                                VerifyOrReturn(CheckValue("userStatus", actualValue, 3U));
+                                VerifyOrReturn(CheckValueNonNull("UserStatus", actualValue));
+                                VerifyOrReturn(CheckValue("UserStatus", actualValue, 3U));
                             }
 
                             {
                                 id actualValue = values.userType;
-                                VerifyOrReturn(CheckValueNonNull("userType", actualValue));
-                                VerifyOrReturn(CheckValue("userType", actualValue, 0U));
+                                VerifyOrReturn(CheckValueNonNull("UserType", actualValue));
+                                VerifyOrReturn(CheckValue("UserType", actualValue, 0U));
                             }
 
                             {
                                 id actualValue = values.credentialRule;
-                                VerifyOrReturn(CheckValueNonNull("credentialRule", actualValue));
-                                VerifyOrReturn(CheckValue("credentialRule", actualValue, 0U));
+                                VerifyOrReturn(CheckValueNonNull("CredentialRule", actualValue));
+                                VerifyOrReturn(CheckValue("CredentialRule", actualValue, 0U));
                             }
 
                             {
                                 id actualValue = values.credentials;
-                                VerifyOrReturn(CheckValueNull("credentials", actualValue));
+                                VerifyOrReturn(CheckValueNull("Credentials", actualValue));
                             }
 
                             {
                                 id actualValue = values.creatorFabricIndex;
-                                VerifyOrReturn(CheckValueNonNull("creatorFabricIndex", actualValue));
-                                VerifyOrReturn(CheckValue("creatorFabricIndex", actualValue, 1U));
+                                VerifyOrReturn(CheckValueNonNull("CreatorFabricIndex", actualValue));
+                                VerifyOrReturn(CheckValue("CreatorFabricIndex", actualValue, 1U));
                             }
 
                             {
                                 id actualValue = values.lastModifiedFabricIndex;
-                                VerifyOrReturn(CheckValueNonNull("lastModifiedFabricIndex", actualValue));
-                                VerifyOrReturn(CheckValue("lastModifiedFabricIndex", actualValue, 1U));
+                                VerifyOrReturn(CheckValueNonNull("LastModifiedFabricIndex", actualValue));
+                                VerifyOrReturn(CheckValue("LastModifiedFabricIndex", actualValue, 1U));
                             }
 
                             {
                                 id actualValue = values.nextUserIndex;
-                                VerifyOrReturn(CheckValueNull("nextUserIndex", actualValue));
+                                VerifyOrReturn(CheckValueNull("NextUserIndex", actualValue));
                             }
 
                             NextTest();
@@ -112956,7 +111821,7 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         params.operationType = [NSNumber numberWithUnsignedChar:0U];
         params.userIndex = [NumberOfTotalUsersSupported copy];
         params.userName = @"last_user";
-        params.userUniqueId = nil;
+        params.userUniqueID = nil;
         params.userStatus = nil;
         params.userType = nil;
         params.credentialRule = nil;
@@ -112990,58 +111855,58 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
                             {
                                 id actualValue = values.userIndex;
-                                VerifyOrReturn(CheckValue("userIndex", actualValue, NumberOfTotalUsersSupported));
+                                VerifyOrReturn(CheckValue("UserIndex", actualValue, NumberOfTotalUsersSupported));
                             }
 
                             {
                                 id actualValue = values.userName;
-                                VerifyOrReturn(CheckValueNonNull("userName", actualValue));
-                                VerifyOrReturn(CheckValueAsString("userName", actualValue, @"last_user"));
+                                VerifyOrReturn(CheckValueNonNull("UserName", actualValue));
+                                VerifyOrReturn(CheckValueAsString("UserName", actualValue, @"last_user"));
                             }
 
                             {
-                                id actualValue = values.userUniqueId;
-                                VerifyOrReturn(CheckValueNull("userUniqueId", actualValue));
+                                id actualValue = values.userUniqueID;
+                                VerifyOrReturn(CheckValueNull("UserUniqueID", actualValue));
                             }
 
                             {
                                 id actualValue = values.userStatus;
-                                VerifyOrReturn(CheckValueNonNull("userStatus", actualValue));
-                                VerifyOrReturn(CheckValue("userStatus", actualValue, 1U));
+                                VerifyOrReturn(CheckValueNonNull("UserStatus", actualValue));
+                                VerifyOrReturn(CheckValue("UserStatus", actualValue, 1U));
                             }
 
                             {
                                 id actualValue = values.userType;
-                                VerifyOrReturn(CheckValueNonNull("userType", actualValue));
-                                VerifyOrReturn(CheckValue("userType", actualValue, 0U));
+                                VerifyOrReturn(CheckValueNonNull("UserType", actualValue));
+                                VerifyOrReturn(CheckValue("UserType", actualValue, 0U));
                             }
 
                             {
                                 id actualValue = values.credentialRule;
-                                VerifyOrReturn(CheckValueNonNull("credentialRule", actualValue));
-                                VerifyOrReturn(CheckValue("credentialRule", actualValue, 0U));
+                                VerifyOrReturn(CheckValueNonNull("CredentialRule", actualValue));
+                                VerifyOrReturn(CheckValue("CredentialRule", actualValue, 0U));
                             }
 
                             {
                                 id actualValue = values.credentials;
-                                VerifyOrReturn(CheckValueNull("credentials", actualValue));
+                                VerifyOrReturn(CheckValueNull("Credentials", actualValue));
                             }
 
                             {
                                 id actualValue = values.creatorFabricIndex;
-                                VerifyOrReturn(CheckValueNonNull("creatorFabricIndex", actualValue));
-                                VerifyOrReturn(CheckValue("creatorFabricIndex", actualValue, 1U));
+                                VerifyOrReturn(CheckValueNonNull("CreatorFabricIndex", actualValue));
+                                VerifyOrReturn(CheckValue("CreatorFabricIndex", actualValue, 1U));
                             }
 
                             {
                                 id actualValue = values.lastModifiedFabricIndex;
-                                VerifyOrReturn(CheckValueNonNull("lastModifiedFabricIndex", actualValue));
-                                VerifyOrReturn(CheckValue("lastModifiedFabricIndex", actualValue, 1U));
+                                VerifyOrReturn(CheckValueNonNull("LastModifiedFabricIndex", actualValue));
+                                VerifyOrReturn(CheckValue("LastModifiedFabricIndex", actualValue, 1U));
                             }
 
                             {
                                 id actualValue = values.nextUserIndex;
-                                VerifyOrReturn(CheckValueNull("nextUserIndex", actualValue));
+                                VerifyOrReturn(CheckValueNull("NextUserIndex", actualValue));
                             }
 
                             NextTest();
@@ -113062,7 +111927,7 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         params.operationType = [NSNumber numberWithUnsignedChar:0U];
         params.userIndex = [NSNumber numberWithUnsignedShort:0U];
         params.userName = nil;
-        params.userUniqueId = nil;
+        params.userUniqueID = nil;
         params.userStatus = nil;
         params.userType = nil;
         params.credentialRule = nil;
@@ -113092,7 +111957,7 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         params.operationType = [NSNumber numberWithUnsignedChar:0U];
         params.userIndex = [NSNumber numberWithUnsignedShort:[NumberOfTotalUsersSupported unsignedShortValue] + 1U];
         params.userName = nil;
-        params.userUniqueId = nil;
+        params.userUniqueID = nil;
         params.userStatus = nil;
         params.userType = nil;
         params.credentialRule = nil;
@@ -113150,53 +112015,53 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
                             {
                                 id actualValue = values.userIndex;
-                                VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
+                                VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U));
                             }
 
                             {
                                 id actualValue = values.userName;
-                                VerifyOrReturn(CheckValueNull("userName", actualValue));
+                                VerifyOrReturn(CheckValueNull("UserName", actualValue));
                             }
 
                             {
-                                id actualValue = values.userUniqueId;
-                                VerifyOrReturn(CheckValueNull("userUniqueId", actualValue));
+                                id actualValue = values.userUniqueID;
+                                VerifyOrReturn(CheckValueNull("UserUniqueID", actualValue));
                             }
 
                             {
                                 id actualValue = values.userStatus;
-                                VerifyOrReturn(CheckValueNull("userStatus", actualValue));
+                                VerifyOrReturn(CheckValueNull("UserStatus", actualValue));
                             }
 
                             {
                                 id actualValue = values.userType;
-                                VerifyOrReturn(CheckValueNull("userType", actualValue));
+                                VerifyOrReturn(CheckValueNull("UserType", actualValue));
                             }
 
                             {
                                 id actualValue = values.credentialRule;
-                                VerifyOrReturn(CheckValueNull("credentialRule", actualValue));
+                                VerifyOrReturn(CheckValueNull("CredentialRule", actualValue));
                             }
 
                             {
                                 id actualValue = values.credentials;
-                                VerifyOrReturn(CheckValueNull("credentials", actualValue));
+                                VerifyOrReturn(CheckValueNull("Credentials", actualValue));
                             }
 
                             {
                                 id actualValue = values.creatorFabricIndex;
-                                VerifyOrReturn(CheckValueNull("creatorFabricIndex", actualValue));
+                                VerifyOrReturn(CheckValueNull("CreatorFabricIndex", actualValue));
                             }
 
                             {
                                 id actualValue = values.lastModifiedFabricIndex;
-                                VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", actualValue));
+                                VerifyOrReturn(CheckValueNull("LastModifiedFabricIndex", actualValue));
                             }
 
                             {
                                 id actualValue = values.nextUserIndex;
-                                VerifyOrReturn(CheckValueNonNull("nextUserIndex", actualValue));
-                                VerifyOrReturn(CheckValue("nextUserIndex", actualValue, 2U));
+                                VerifyOrReturn(CheckValueNonNull("NextUserIndex", actualValue));
+                                VerifyOrReturn(CheckValue("NextUserIndex", actualValue, 2U));
                             }
 
                             NextTest();
@@ -113217,7 +112082,7 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         params.operationType = [NSNumber numberWithUnsignedChar:0U];
         params.userIndex = [NSNumber numberWithUnsignedShort:1U];
         params.userName = nil;
-        params.userUniqueId = nil;
+        params.userUniqueID = nil;
         params.userStatus = nil;
         params.userType = nil;
         params.credentialRule = nil;
@@ -113251,59 +112116,59 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
                             {
                                 id actualValue = values.userIndex;
-                                VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
+                                VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U));
                             }
 
                             {
                                 id actualValue = values.userName;
-                                VerifyOrReturn(CheckValueNonNull("userName", actualValue));
-                                VerifyOrReturn(CheckValueAsString("userName", actualValue, @""));
+                                VerifyOrReturn(CheckValueNonNull("UserName", actualValue));
+                                VerifyOrReturn(CheckValueAsString("UserName", actualValue, @""));
                             }
 
                             {
-                                id actualValue = values.userUniqueId;
-                                VerifyOrReturn(CheckValueNull("userUniqueId", actualValue));
+                                id actualValue = values.userUniqueID;
+                                VerifyOrReturn(CheckValueNull("UserUniqueID", actualValue));
                             }
 
                             {
                                 id actualValue = values.userStatus;
-                                VerifyOrReturn(CheckValueNonNull("userStatus", actualValue));
-                                VerifyOrReturn(CheckValue("userStatus", actualValue, 1U));
+                                VerifyOrReturn(CheckValueNonNull("UserStatus", actualValue));
+                                VerifyOrReturn(CheckValue("UserStatus", actualValue, 1U));
                             }
 
                             {
                                 id actualValue = values.userType;
-                                VerifyOrReturn(CheckValueNonNull("userType", actualValue));
-                                VerifyOrReturn(CheckValue("userType", actualValue, 0U));
+                                VerifyOrReturn(CheckValueNonNull("UserType", actualValue));
+                                VerifyOrReturn(CheckValue("UserType", actualValue, 0U));
                             }
 
                             {
                                 id actualValue = values.credentialRule;
-                                VerifyOrReturn(CheckValueNonNull("credentialRule", actualValue));
-                                VerifyOrReturn(CheckValue("credentialRule", actualValue, 0U));
+                                VerifyOrReturn(CheckValueNonNull("CredentialRule", actualValue));
+                                VerifyOrReturn(CheckValue("CredentialRule", actualValue, 0U));
                             }
 
                             {
                                 id actualValue = values.credentials;
-                                VerifyOrReturn(CheckValueNull("credentials", actualValue));
+                                VerifyOrReturn(CheckValueNull("Credentials", actualValue));
                             }
 
                             {
                                 id actualValue = values.creatorFabricIndex;
-                                VerifyOrReturn(CheckValueNonNull("creatorFabricIndex", actualValue));
-                                VerifyOrReturn(CheckValue("creatorFabricIndex", actualValue, 1U));
+                                VerifyOrReturn(CheckValueNonNull("CreatorFabricIndex", actualValue));
+                                VerifyOrReturn(CheckValue("CreatorFabricIndex", actualValue, 1U));
                             }
 
                             {
                                 id actualValue = values.lastModifiedFabricIndex;
-                                VerifyOrReturn(CheckValueNonNull("lastModifiedFabricIndex", actualValue));
-                                VerifyOrReturn(CheckValue("lastModifiedFabricIndex", actualValue, 1U));
+                                VerifyOrReturn(CheckValueNonNull("LastModifiedFabricIndex", actualValue));
+                                VerifyOrReturn(CheckValue("LastModifiedFabricIndex", actualValue, 1U));
                             }
 
                             {
                                 id actualValue = values.nextUserIndex;
-                                VerifyOrReturn(CheckValueNonNull("nextUserIndex", actualValue));
-                                VerifyOrReturn(CheckValue("nextUserIndex", actualValue, 2U));
+                                VerifyOrReturn(CheckValueNonNull("NextUserIndex", actualValue));
+                                VerifyOrReturn(CheckValue("NextUserIndex", actualValue, 2U));
                             }
 
                             NextTest();
@@ -113402,52 +112267,52 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
                             {
                                 id actualValue = values.userIndex;
-                                VerifyOrReturn(CheckValue("userIndex", actualValue, 2U));
+                                VerifyOrReturn(CheckValue("UserIndex", actualValue, 2U));
                             }
 
                             {
                                 id actualValue = values.userName;
-                                VerifyOrReturn(CheckValueNull("userName", actualValue));
+                                VerifyOrReturn(CheckValueNull("UserName", actualValue));
                             }
 
                             {
-                                id actualValue = values.userUniqueId;
-                                VerifyOrReturn(CheckValueNull("userUniqueId", actualValue));
+                                id actualValue = values.userUniqueID;
+                                VerifyOrReturn(CheckValueNull("UserUniqueID", actualValue));
                             }
 
                             {
                                 id actualValue = values.userStatus;
-                                VerifyOrReturn(CheckValueNull("userStatus", actualValue));
+                                VerifyOrReturn(CheckValueNull("UserStatus", actualValue));
                             }
 
                             {
                                 id actualValue = values.userType;
-                                VerifyOrReturn(CheckValueNull("userType", actualValue));
+                                VerifyOrReturn(CheckValueNull("UserType", actualValue));
                             }
 
                             {
                                 id actualValue = values.credentialRule;
-                                VerifyOrReturn(CheckValueNull("credentialRule", actualValue));
+                                VerifyOrReturn(CheckValueNull("CredentialRule", actualValue));
                             }
 
                             {
                                 id actualValue = values.credentials;
-                                VerifyOrReturn(CheckValueNull("credentials", actualValue));
+                                VerifyOrReturn(CheckValueNull("Credentials", actualValue));
                             }
 
                             {
                                 id actualValue = values.creatorFabricIndex;
-                                VerifyOrReturn(CheckValueNull("creatorFabricIndex", actualValue));
+                                VerifyOrReturn(CheckValueNull("CreatorFabricIndex", actualValue));
                             }
 
                             {
                                 id actualValue = values.lastModifiedFabricIndex;
-                                VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", actualValue));
+                                VerifyOrReturn(CheckValueNull("LastModifiedFabricIndex", actualValue));
                             }
 
                             {
                                 id actualValue = values.nextUserIndex;
-                                VerifyOrReturn(CheckValueNull("nextUserIndex", actualValue));
+                                VerifyOrReturn(CheckValueNull("NextUserIndex", actualValue));
                             }
 
                             NextTest();
@@ -113474,52 +112339,52 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
                             {
                                 id actualValue = values.userIndex;
-                                VerifyOrReturn(CheckValue("userIndex", actualValue, NumberOfTotalUsersSupported));
+                                VerifyOrReturn(CheckValue("UserIndex", actualValue, NumberOfTotalUsersSupported));
                             }
 
                             {
                                 id actualValue = values.userName;
-                                VerifyOrReturn(CheckValueNull("userName", actualValue));
+                                VerifyOrReturn(CheckValueNull("UserName", actualValue));
                             }
 
                             {
-                                id actualValue = values.userUniqueId;
-                                VerifyOrReturn(CheckValueNull("userUniqueId", actualValue));
+                                id actualValue = values.userUniqueID;
+                                VerifyOrReturn(CheckValueNull("UserUniqueID", actualValue));
                             }
 
                             {
                                 id actualValue = values.userStatus;
-                                VerifyOrReturn(CheckValueNull("userStatus", actualValue));
+                                VerifyOrReturn(CheckValueNull("UserStatus", actualValue));
                             }
 
                             {
                                 id actualValue = values.userType;
-                                VerifyOrReturn(CheckValueNull("userType", actualValue));
+                                VerifyOrReturn(CheckValueNull("UserType", actualValue));
                             }
 
                             {
                                 id actualValue = values.credentialRule;
-                                VerifyOrReturn(CheckValueNull("credentialRule", actualValue));
+                                VerifyOrReturn(CheckValueNull("CredentialRule", actualValue));
                             }
 
                             {
                                 id actualValue = values.credentials;
-                                VerifyOrReturn(CheckValueNull("credentials", actualValue));
+                                VerifyOrReturn(CheckValueNull("Credentials", actualValue));
                             }
 
                             {
                                 id actualValue = values.creatorFabricIndex;
-                                VerifyOrReturn(CheckValueNull("creatorFabricIndex", actualValue));
+                                VerifyOrReturn(CheckValueNull("CreatorFabricIndex", actualValue));
                             }
 
                             {
                                 id actualValue = values.lastModifiedFabricIndex;
-                                VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", actualValue));
+                                VerifyOrReturn(CheckValueNull("LastModifiedFabricIndex", actualValue));
                             }
 
                             {
                                 id actualValue = values.nextUserIndex;
-                                VerifyOrReturn(CheckValueNull("nextUserIndex", actualValue));
+                                VerifyOrReturn(CheckValueNull("NextUserIndex", actualValue));
                             }
 
                             NextTest();
@@ -113565,9 +112430,9 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         __auto_type * params = [[MTRDoorLockClusterGetCredentialStatusParams alloc] init];
-        params.credential = [[MTRDoorLockClusterDlCredential alloc] init];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U];
+        params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U];
 
         [cluster getCredentialStatusWithParams:params
                                     completion:^(MTRDoorLockClusterGetCredentialStatusResponseParams * _Nullable values,
@@ -113578,27 +112443,27 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
                                         {
                                             id actualValue = values.credentialExists;
-                                            VerifyOrReturn(CheckValue("credentialExists", actualValue, false));
+                                            VerifyOrReturn(CheckValue("CredentialExists", actualValue, false));
                                         }
 
                                         {
                                             id actualValue = values.userIndex;
-                                            VerifyOrReturn(CheckValueNull("userIndex", actualValue));
+                                            VerifyOrReturn(CheckValueNull("UserIndex", actualValue));
                                         }
 
                                         {
                                             id actualValue = values.creatorFabricIndex;
-                                            VerifyOrReturn(CheckValueNull("creatorFabricIndex", actualValue));
+                                            VerifyOrReturn(CheckValueNull("CreatorFabricIndex", actualValue));
                                         }
 
                                         {
                                             id actualValue = values.lastModifiedFabricIndex;
-                                            VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", actualValue));
+                                            VerifyOrReturn(CheckValueNull("LastModifiedFabricIndex", actualValue));
                                         }
 
                                         {
                                             id actualValue = values.nextCredentialIndex;
-                                            VerifyOrReturn(CheckValueNull("nextCredentialIndex", actualValue));
+                                            VerifyOrReturn(CheckValueNull("NextCredentialIndex", actualValue));
                                         }
 
                                         NextTest();
@@ -113616,9 +112481,9 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         __auto_type * params = [[MTRDoorLockClusterGetCredentialStatusParams alloc] init];
-        params.credential = [[MTRDoorLockClusterDlCredential alloc] init];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:0U];
+        params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:0U];
 
         [cluster getCredentialStatusWithParams:params
                                     completion:^(MTRDoorLockClusterGetCredentialStatusResponseParams * _Nullable values,
@@ -113629,27 +112494,27 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
                                         {
                                             id actualValue = values.credentialExists;
-                                            VerifyOrReturn(CheckValue("credentialExists", actualValue, false));
+                                            VerifyOrReturn(CheckValue("CredentialExists", actualValue, false));
                                         }
 
                                         {
                                             id actualValue = values.userIndex;
-                                            VerifyOrReturn(CheckValueNull("userIndex", actualValue));
+                                            VerifyOrReturn(CheckValueNull("UserIndex", actualValue));
                                         }
 
                                         {
                                             id actualValue = values.creatorFabricIndex;
-                                            VerifyOrReturn(CheckValueNull("creatorFabricIndex", actualValue));
+                                            VerifyOrReturn(CheckValueNull("CreatorFabricIndex", actualValue));
                                         }
 
                                         {
                                             id actualValue = values.lastModifiedFabricIndex;
-                                            VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", actualValue));
+                                            VerifyOrReturn(CheckValueNull("LastModifiedFabricIndex", actualValue));
                                         }
 
                                         {
                                             id actualValue = values.nextCredentialIndex;
-                                            VerifyOrReturn(CheckValueNull("nextCredentialIndex", actualValue));
+                                            VerifyOrReturn(CheckValueNull("NextCredentialIndex", actualValue));
                                         }
 
                                         NextTest();
@@ -113667,9 +112532,9 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         __auto_type * params = [[MTRDoorLockClusterGetCredentialStatusParams alloc] init];
-        params.credential = [[MTRDoorLockClusterDlCredential alloc] init];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex =
+        params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex =
             [NSNumber numberWithUnsignedShort:[NumberOfPINUsersSupported unsignedShortValue] + 1U];
 
         [cluster
@@ -113682,27 +112547,27 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
                                    {
                                        id actualValue = values.credentialExists;
-                                       VerifyOrReturn(CheckValue("credentialExists", actualValue, false));
+                                       VerifyOrReturn(CheckValue("CredentialExists", actualValue, false));
                                    }
 
                                    {
                                        id actualValue = values.userIndex;
-                                       VerifyOrReturn(CheckValueNull("userIndex", actualValue));
+                                       VerifyOrReturn(CheckValueNull("UserIndex", actualValue));
                                    }
 
                                    {
                                        id actualValue = values.creatorFabricIndex;
-                                       VerifyOrReturn(CheckValueNull("creatorFabricIndex", actualValue));
+                                       VerifyOrReturn(CheckValueNull("CreatorFabricIndex", actualValue));
                                    }
 
                                    {
                                        id actualValue = values.lastModifiedFabricIndex;
-                                       VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", actualValue));
+                                       VerifyOrReturn(CheckValueNull("LastModifiedFabricIndex", actualValue));
                                    }
 
                                    {
                                        id actualValue = values.nextCredentialIndex;
-                                       VerifyOrReturn(CheckValueNull("nextCredentialIndex", actualValue));
+                                       VerifyOrReturn(CheckValueNull("NextCredentialIndex", actualValue));
                                    }
 
                                    NextTest();
@@ -113721,9 +112586,9 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
         __auto_type * params = [[MTRDoorLockClusterSetCredentialParams alloc] init];
         params.operationType = [NSNumber numberWithUnsignedChar:0U];
-        params.credential = [[MTRDoorLockClusterDlCredential alloc] init];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U];
+        params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U];
 
         params.credentialData = [[NSData alloc] initWithBytes:"000000" length:6];
         params.userIndex = nil;
@@ -113738,18 +112603,18 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
                              {
                                  id actualValue = values.status;
-                                 VerifyOrReturn(CheckValue("status", actualValue, 133U));
+                                 VerifyOrReturn(CheckValue("Status", actualValue, 133U));
                              }
 
                              {
                                  id actualValue = values.userIndex;
-                                 VerifyOrReturn(CheckValueNull("userIndex", actualValue));
+                                 VerifyOrReturn(CheckValueNull("UserIndex", actualValue));
                              }
 
                              {
                                  id actualValue = values.nextCredentialIndex;
-                                 VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue));
-                                 VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 2U));
+                                 VerifyOrReturn(CheckValueNonNull("NextCredentialIndex", actualValue));
+                                 VerifyOrReturn(CheckValue("NextCredentialIndex", actualValue, 2U));
                              }
 
                              NextTest();
@@ -113768,9 +112633,9 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
         __auto_type * params = [[MTRDoorLockClusterSetCredentialParams alloc] init];
         params.operationType = [NSNumber numberWithUnsignedChar:0U];
-        params.credential = [[MTRDoorLockClusterDlCredential alloc] init];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U];
+        params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U];
 
         params.credentialData = [[NSData alloc] initWithBytes:"000000" length:6];
         params.userIndex = nil;
@@ -113785,18 +112650,18 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
                              {
                                  id actualValue = values.status;
-                                 VerifyOrReturn(CheckValue("status", actualValue, 133U));
+                                 VerifyOrReturn(CheckValue("Status", actualValue, 133U));
                              }
 
                              {
                                  id actualValue = values.userIndex;
-                                 VerifyOrReturn(CheckValueNull("userIndex", actualValue));
+                                 VerifyOrReturn(CheckValueNull("UserIndex", actualValue));
                              }
 
                              {
                                  id actualValue = values.nextCredentialIndex;
-                                 VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue));
-                                 VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 2U));
+                                 VerifyOrReturn(CheckValueNonNull("NextCredentialIndex", actualValue));
+                                 VerifyOrReturn(CheckValue("NextCredentialIndex", actualValue, 2U));
                              }
 
                              NextTest();
@@ -113815,9 +112680,9 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
         __auto_type * params = [[MTRDoorLockClusterSetCredentialParams alloc] init];
         params.operationType = [NSNumber numberWithUnsignedChar:0U];
-        params.credential = [[MTRDoorLockClusterDlCredential alloc] init];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U];
+        params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U];
 
         params.credentialData = [[NSData alloc] initWithBytes:"000000" length:6];
         params.userIndex = nil;
@@ -113832,19 +112697,19 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
                              {
                                  id actualValue = values.status;
-                                 VerifyOrReturn(CheckValue("status", actualValue, 0U));
+                                 VerifyOrReturn(CheckValue("Status", actualValue, 0U));
                              }
 
                              {
                                  id actualValue = values.userIndex;
-                                 VerifyOrReturn(CheckValueNonNull("userIndex", actualValue));
-                                 VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
+                                 VerifyOrReturn(CheckValueNonNull("UserIndex", actualValue));
+                                 VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U));
                              }
 
                              {
                                  id actualValue = values.nextCredentialIndex;
-                                 VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue));
-                                 VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 2U));
+                                 VerifyOrReturn(CheckValueNonNull("NextCredentialIndex", actualValue));
+                                 VerifyOrReturn(CheckValue("NextCredentialIndex", actualValue, 2U));
                              }
 
                              NextTest();
@@ -113871,63 +112736,63 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
                             {
                                 id actualValue = values.userIndex;
-                                VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
+                                VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U));
                             }
 
                             {
                                 id actualValue = values.userName;
-                                VerifyOrReturn(CheckValueNonNull("userName", actualValue));
-                                VerifyOrReturn(CheckValueAsString("userName", actualValue, @""));
+                                VerifyOrReturn(CheckValueNonNull("UserName", actualValue));
+                                VerifyOrReturn(CheckValueAsString("UserName", actualValue, @""));
                             }
 
                             {
-                                id actualValue = values.userUniqueId;
-                                VerifyOrReturn(CheckValueNull("userUniqueId", actualValue));
+                                id actualValue = values.userUniqueID;
+                                VerifyOrReturn(CheckValueNull("UserUniqueID", actualValue));
                             }
 
                             {
                                 id actualValue = values.userStatus;
-                                VerifyOrReturn(CheckValueNonNull("userStatus", actualValue));
-                                VerifyOrReturn(CheckValue("userStatus", actualValue, 1U));
+                                VerifyOrReturn(CheckValueNonNull("UserStatus", actualValue));
+                                VerifyOrReturn(CheckValue("UserStatus", actualValue, 1U));
                             }
 
                             {
                                 id actualValue = values.userType;
-                                VerifyOrReturn(CheckValueNonNull("userType", actualValue));
-                                VerifyOrReturn(CheckValue("userType", actualValue, 0U));
+                                VerifyOrReturn(CheckValueNonNull("UserType", actualValue));
+                                VerifyOrReturn(CheckValue("UserType", actualValue, 0U));
                             }
 
                             {
                                 id actualValue = values.credentialRule;
-                                VerifyOrReturn(CheckValueNonNull("credentialRule", actualValue));
-                                VerifyOrReturn(CheckValue("credentialRule", actualValue, 0U));
+                                VerifyOrReturn(CheckValueNonNull("CredentialRule", actualValue));
+                                VerifyOrReturn(CheckValue("CredentialRule", actualValue, 0U));
                             }
 
                             {
                                 id actualValue = values.credentials;
-                                VerifyOrReturn(CheckValueNonNull("credentials", actualValue));
-                                VerifyOrReturn(CheckValue("credentials", [actualValue count], static_cast<uint32_t>(1)));
+                                VerifyOrReturn(CheckValueNonNull("Credentials", actualValue));
+                                VerifyOrReturn(CheckValue("Credentials", [actualValue count], static_cast<uint32_t>(1)));
                                 VerifyOrReturn(CheckValue(
-                                    "CredentialType", ((MTRDoorLockClusterDlCredential *) actualValue[0]).credentialType, 1U));
-                                VerifyOrReturn(CheckValue(
-                                    "CredentialIndex", ((MTRDoorLockClusterDlCredential *) actualValue[0]).credentialIndex, 1U));
+                                    "CredentialType", ((MTRDoorLockClusterCredentialStruct *) actualValue[0]).credentialType, 1U));
+                                VerifyOrReturn(CheckValue("CredentialIndex",
+                                    ((MTRDoorLockClusterCredentialStruct *) actualValue[0]).credentialIndex, 1U));
                             }
 
                             {
                                 id actualValue = values.creatorFabricIndex;
-                                VerifyOrReturn(CheckValueNonNull("creatorFabricIndex", actualValue));
-                                VerifyOrReturn(CheckValue("creatorFabricIndex", actualValue, 1U));
+                                VerifyOrReturn(CheckValueNonNull("CreatorFabricIndex", actualValue));
+                                VerifyOrReturn(CheckValue("CreatorFabricIndex", actualValue, 1U));
                             }
 
                             {
                                 id actualValue = values.lastModifiedFabricIndex;
-                                VerifyOrReturn(CheckValueNonNull("lastModifiedFabricIndex", actualValue));
-                                VerifyOrReturn(CheckValue("lastModifiedFabricIndex", actualValue, 1U));
+                                VerifyOrReturn(CheckValueNonNull("LastModifiedFabricIndex", actualValue));
+                                VerifyOrReturn(CheckValue("LastModifiedFabricIndex", actualValue, 1U));
                             }
 
                             {
                                 id actualValue = values.nextUserIndex;
-                                VerifyOrReturn(CheckValueNull("nextUserIndex", actualValue));
+                                VerifyOrReturn(CheckValueNull("NextUserIndex", actualValue));
                             }
 
                             NextTest();
@@ -113945,9 +112810,9 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         __auto_type * params = [[MTRDoorLockClusterGetCredentialStatusParams alloc] init];
-        params.credential = [[MTRDoorLockClusterDlCredential alloc] init];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U];
+        params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U];
 
         [cluster getCredentialStatusWithParams:params
                                     completion:^(MTRDoorLockClusterGetCredentialStatusResponseParams * _Nullable values,
@@ -113958,30 +112823,30 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
                                         {
                                             id actualValue = values.credentialExists;
-                                            VerifyOrReturn(CheckValue("credentialExists", actualValue, true));
+                                            VerifyOrReturn(CheckValue("CredentialExists", actualValue, true));
                                         }
 
                                         {
                                             id actualValue = values.userIndex;
-                                            VerifyOrReturn(CheckValueNonNull("userIndex", actualValue));
-                                            VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
+                                            VerifyOrReturn(CheckValueNonNull("UserIndex", actualValue));
+                                            VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U));
                                         }
 
                                         {
                                             id actualValue = values.creatorFabricIndex;
-                                            VerifyOrReturn(CheckValueNonNull("creatorFabricIndex", actualValue));
-                                            VerifyOrReturn(CheckValue("creatorFabricIndex", actualValue, 1U));
+                                            VerifyOrReturn(CheckValueNonNull("CreatorFabricIndex", actualValue));
+                                            VerifyOrReturn(CheckValue("CreatorFabricIndex", actualValue, 1U));
                                         }
 
                                         {
                                             id actualValue = values.lastModifiedFabricIndex;
-                                            VerifyOrReturn(CheckValueNonNull("lastModifiedFabricIndex", actualValue));
-                                            VerifyOrReturn(CheckValue("lastModifiedFabricIndex", actualValue, 1U));
+                                            VerifyOrReturn(CheckValueNonNull("LastModifiedFabricIndex", actualValue));
+                                            VerifyOrReturn(CheckValue("LastModifiedFabricIndex", actualValue, 1U));
                                         }
 
                                         {
                                             id actualValue = values.nextCredentialIndex;
-                                            VerifyOrReturn(CheckValueNull("nextCredentialIndex", actualValue));
+                                            VerifyOrReturn(CheckValueNull("NextCredentialIndex", actualValue));
                                         }
 
                                         NextTest();
@@ -114000,9 +112865,9 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
         __auto_type * params = [[MTRDoorLockClusterSetCredentialParams alloc] init];
         params.operationType = [NSNumber numberWithUnsignedChar:0U];
-        params.credential = [[MTRDoorLockClusterDlCredential alloc] init];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:0U];
+        params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:0U];
 
         params.credentialData = [[NSData alloc] initWithBytes:"123456" length:6];
         params.userIndex = nil;
@@ -114017,18 +112882,18 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
                              {
                                  id actualValue = values.status;
-                                 VerifyOrReturn(CheckValue("status", actualValue, 133U));
+                                 VerifyOrReturn(CheckValue("Status", actualValue, 133U));
                              }
 
                              {
                                  id actualValue = values.userIndex;
-                                 VerifyOrReturn(CheckValueNull("userIndex", actualValue));
+                                 VerifyOrReturn(CheckValueNull("UserIndex", actualValue));
                              }
 
                              {
                                  id actualValue = values.nextCredentialIndex;
-                                 VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue));
-                                 VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 2U));
+                                 VerifyOrReturn(CheckValueNonNull("NextCredentialIndex", actualValue));
+                                 VerifyOrReturn(CheckValue("NextCredentialIndex", actualValue, 2U));
                              }
 
                              NextTest();
@@ -114047,9 +112912,9 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
         __auto_type * params = [[MTRDoorLockClusterSetCredentialParams alloc] init];
         params.operationType = [NSNumber numberWithUnsignedChar:0U];
-        params.credential = [[MTRDoorLockClusterDlCredential alloc] init];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex =
+        params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex =
             [NSNumber numberWithUnsignedShort:[NumberOfPINUsersSupported unsignedShortValue] + 1U];
 
         params.credentialData = [[NSData alloc] initWithBytes:"123456" length:6];
@@ -114065,17 +112930,17 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
                              {
                                  id actualValue = values.status;
-                                 VerifyOrReturn(CheckValue("status", actualValue, 133U));
+                                 VerifyOrReturn(CheckValue("Status", actualValue, 133U));
                              }
 
                              {
                                  id actualValue = values.userIndex;
-                                 VerifyOrReturn(CheckValueNull("userIndex", actualValue));
+                                 VerifyOrReturn(CheckValueNull("UserIndex", actualValue));
                              }
 
                              {
                                  id actualValue = values.nextCredentialIndex;
-                                 VerifyOrReturn(CheckValueNull("nextCredentialIndex", actualValue));
+                                 VerifyOrReturn(CheckValueNull("NextCredentialIndex", actualValue));
                              }
 
                              NextTest();
@@ -114121,9 +112986,9 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         __auto_type * params = [[MTRDoorLockClusterGetCredentialStatusParams alloc] init];
-        params.credential = [[MTRDoorLockClusterDlCredential alloc] init];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:2U];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:0U];
+        params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:2U];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:0U];
 
         [cluster getCredentialStatusWithParams:params
                                     completion:^(MTRDoorLockClusterGetCredentialStatusResponseParams * _Nullable values,
@@ -114136,22 +113001,22 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
                                         {
                                             id actualValue = values.credentialExists;
-                                            VerifyOrReturn(CheckValue("credentialExists", actualValue, false));
+                                            VerifyOrReturn(CheckValue("CredentialExists", actualValue, false));
                                         }
 
                                         {
                                             id actualValue = values.userIndex;
-                                            VerifyOrReturn(CheckValueNull("userIndex", actualValue));
+                                            VerifyOrReturn(CheckValueNull("UserIndex", actualValue));
                                         }
 
                                         {
                                             id actualValue = values.creatorFabricIndex;
-                                            VerifyOrReturn(CheckValueNull("creatorFabricIndex", actualValue));
+                                            VerifyOrReturn(CheckValueNull("CreatorFabricIndex", actualValue));
                                         }
 
                                         {
                                             id actualValue = values.lastModifiedFabricIndex;
-                                            VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", actualValue));
+                                            VerifyOrReturn(CheckValueNull("LastModifiedFabricIndex", actualValue));
                                         }
 
                                         NextTest();
@@ -114169,9 +113034,9 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         __auto_type * params = [[MTRDoorLockClusterGetCredentialStatusParams alloc] init];
-        params.credential = [[MTRDoorLockClusterDlCredential alloc] init];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:2U];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex =
+        params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:2U];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex =
             [NSNumber numberWithUnsignedShort:[NumberOfRFIDUsersSupported unsignedShortValue] + 1U];
 
         [cluster
@@ -114184,27 +113049,27 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
                                    {
                                        id actualValue = values.credentialExists;
-                                       VerifyOrReturn(CheckValue("credentialExists", actualValue, false));
+                                       VerifyOrReturn(CheckValue("CredentialExists", actualValue, false));
                                    }
 
                                    {
                                        id actualValue = values.userIndex;
-                                       VerifyOrReturn(CheckValueNull("userIndex", actualValue));
+                                       VerifyOrReturn(CheckValueNull("UserIndex", actualValue));
                                    }
 
                                    {
                                        id actualValue = values.creatorFabricIndex;
-                                       VerifyOrReturn(CheckValueNull("creatorFabricIndex", actualValue));
+                                       VerifyOrReturn(CheckValueNull("CreatorFabricIndex", actualValue));
                                    }
 
                                    {
                                        id actualValue = values.lastModifiedFabricIndex;
-                                       VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", actualValue));
+                                       VerifyOrReturn(CheckValueNull("LastModifiedFabricIndex", actualValue));
                                    }
 
                                    {
                                        id actualValue = values.nextCredentialIndex;
-                                       VerifyOrReturn(CheckValueNull("nextCredentialIndex", actualValue));
+                                       VerifyOrReturn(CheckValueNull("NextCredentialIndex", actualValue));
                                    }
 
                                    NextTest();
@@ -114222,9 +113087,9 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         __auto_type * params = [[MTRDoorLockClusterGetCredentialStatusParams alloc] init];
-        params.credential = [[MTRDoorLockClusterDlCredential alloc] init];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:2U];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:2U];
+        params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:2U];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:2U];
 
         [cluster getCredentialStatusWithParams:params
                                     completion:^(MTRDoorLockClusterGetCredentialStatusResponseParams * _Nullable values,
@@ -114235,27 +113100,27 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
                                         {
                                             id actualValue = values.credentialExists;
-                                            VerifyOrReturn(CheckValue("credentialExists", actualValue, false));
+                                            VerifyOrReturn(CheckValue("CredentialExists", actualValue, false));
                                         }
 
                                         {
                                             id actualValue = values.userIndex;
-                                            VerifyOrReturn(CheckValueNull("userIndex", actualValue));
+                                            VerifyOrReturn(CheckValueNull("UserIndex", actualValue));
                                         }
 
                                         {
                                             id actualValue = values.creatorFabricIndex;
-                                            VerifyOrReturn(CheckValueNull("creatorFabricIndex", actualValue));
+                                            VerifyOrReturn(CheckValueNull("CreatorFabricIndex", actualValue));
                                         }
 
                                         {
                                             id actualValue = values.lastModifiedFabricIndex;
-                                            VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", actualValue));
+                                            VerifyOrReturn(CheckValueNull("LastModifiedFabricIndex", actualValue));
                                         }
 
                                         {
                                             id actualValue = values.nextCredentialIndex;
-                                            VerifyOrReturn(CheckValueNull("nextCredentialIndex", actualValue));
+                                            VerifyOrReturn(CheckValueNull("NextCredentialIndex", actualValue));
                                         }
 
                                         NextTest();
@@ -114274,9 +113139,9 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
         __auto_type * params = [[MTRDoorLockClusterSetCredentialParams alloc] init];
         params.operationType = [NSNumber numberWithUnsignedChar:0U];
-        params.credential = [[MTRDoorLockClusterDlCredential alloc] init];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:2U];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:2U];
+        params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:2U];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:2U];
 
         params.credentialData = [[NSData alloc] initWithBytes:"rfid_data_123456" length:16];
         params.userIndex = [NSNumber numberWithUnsignedShort:1U];
@@ -114291,18 +113156,18 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
                              {
                                  id actualValue = values.status;
-                                 VerifyOrReturn(CheckValue("status", actualValue, 0U));
+                                 VerifyOrReturn(CheckValue("Status", actualValue, 0U));
                              }
 
                              {
                                  id actualValue = values.userIndex;
-                                 VerifyOrReturn(CheckValueNull("userIndex", actualValue));
+                                 VerifyOrReturn(CheckValueNull("UserIndex", actualValue));
                              }
 
                              {
                                  id actualValue = values.nextCredentialIndex;
-                                 VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue));
-                                 VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 3U));
+                                 VerifyOrReturn(CheckValueNonNull("NextCredentialIndex", actualValue));
+                                 VerifyOrReturn(CheckValue("NextCredentialIndex", actualValue, 3U));
                              }
 
                              NextTest();
@@ -114329,67 +113194,67 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
                             {
                                 id actualValue = values.userIndex;
-                                VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
+                                VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U));
                             }
 
                             {
                                 id actualValue = values.userName;
-                                VerifyOrReturn(CheckValueNonNull("userName", actualValue));
-                                VerifyOrReturn(CheckValueAsString("userName", actualValue, @""));
+                                VerifyOrReturn(CheckValueNonNull("UserName", actualValue));
+                                VerifyOrReturn(CheckValueAsString("UserName", actualValue, @""));
                             }
 
                             {
-                                id actualValue = values.userUniqueId;
-                                VerifyOrReturn(CheckValueNull("userUniqueId", actualValue));
+                                id actualValue = values.userUniqueID;
+                                VerifyOrReturn(CheckValueNull("UserUniqueID", actualValue));
                             }
 
                             {
                                 id actualValue = values.userStatus;
-                                VerifyOrReturn(CheckValueNonNull("userStatus", actualValue));
-                                VerifyOrReturn(CheckValue("userStatus", actualValue, 1U));
+                                VerifyOrReturn(CheckValueNonNull("UserStatus", actualValue));
+                                VerifyOrReturn(CheckValue("UserStatus", actualValue, 1U));
                             }
 
                             {
                                 id actualValue = values.userType;
-                                VerifyOrReturn(CheckValueNonNull("userType", actualValue));
-                                VerifyOrReturn(CheckValue("userType", actualValue, 0U));
+                                VerifyOrReturn(CheckValueNonNull("UserType", actualValue));
+                                VerifyOrReturn(CheckValue("UserType", actualValue, 0U));
                             }
 
                             {
                                 id actualValue = values.credentialRule;
-                                VerifyOrReturn(CheckValueNonNull("credentialRule", actualValue));
-                                VerifyOrReturn(CheckValue("credentialRule", actualValue, 0U));
+                                VerifyOrReturn(CheckValueNonNull("CredentialRule", actualValue));
+                                VerifyOrReturn(CheckValue("CredentialRule", actualValue, 0U));
                             }
 
                             {
                                 id actualValue = values.credentials;
-                                VerifyOrReturn(CheckValueNonNull("credentials", actualValue));
-                                VerifyOrReturn(CheckValue("credentials", [actualValue count], static_cast<uint32_t>(2)));
-                                VerifyOrReturn(CheckValue(
-                                    "CredentialType", ((MTRDoorLockClusterDlCredential *) actualValue[0]).credentialType, 1U));
+                                VerifyOrReturn(CheckValueNonNull("Credentials", actualValue));
+                                VerifyOrReturn(CheckValue("Credentials", [actualValue count], static_cast<uint32_t>(2)));
                                 VerifyOrReturn(CheckValue(
-                                    "CredentialIndex", ((MTRDoorLockClusterDlCredential *) actualValue[0]).credentialIndex, 1U));
+                                    "CredentialType", ((MTRDoorLockClusterCredentialStruct *) actualValue[0]).credentialType, 1U));
+                                VerifyOrReturn(CheckValue("CredentialIndex",
+                                    ((MTRDoorLockClusterCredentialStruct *) actualValue[0]).credentialIndex, 1U));
                                 VerifyOrReturn(CheckValue(
-                                    "CredentialType", ((MTRDoorLockClusterDlCredential *) actualValue[1]).credentialType, 2U));
-                                VerifyOrReturn(CheckValue(
-                                    "CredentialIndex", ((MTRDoorLockClusterDlCredential *) actualValue[1]).credentialIndex, 2U));
+                                    "CredentialType", ((MTRDoorLockClusterCredentialStruct *) actualValue[1]).credentialType, 2U));
+                                VerifyOrReturn(CheckValue("CredentialIndex",
+                                    ((MTRDoorLockClusterCredentialStruct *) actualValue[1]).credentialIndex, 2U));
                             }
 
                             {
                                 id actualValue = values.creatorFabricIndex;
-                                VerifyOrReturn(CheckValueNonNull("creatorFabricIndex", actualValue));
-                                VerifyOrReturn(CheckValue("creatorFabricIndex", actualValue, 1U));
+                                VerifyOrReturn(CheckValueNonNull("CreatorFabricIndex", actualValue));
+                                VerifyOrReturn(CheckValue("CreatorFabricIndex", actualValue, 1U));
                             }
 
                             {
                                 id actualValue = values.lastModifiedFabricIndex;
-                                VerifyOrReturn(CheckValueNonNull("lastModifiedFabricIndex", actualValue));
-                                VerifyOrReturn(CheckValue("lastModifiedFabricIndex", actualValue, 1U));
+                                VerifyOrReturn(CheckValueNonNull("LastModifiedFabricIndex", actualValue));
+                                VerifyOrReturn(CheckValue("LastModifiedFabricIndex", actualValue, 1U));
                             }
 
                             {
                                 id actualValue = values.nextUserIndex;
-                                VerifyOrReturn(CheckValueNull("nextUserIndex", actualValue));
+                                VerifyOrReturn(CheckValueNull("NextUserIndex", actualValue));
                             }
 
                             NextTest();
@@ -114407,9 +113272,9 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         __auto_type * params = [[MTRDoorLockClusterGetCredentialStatusParams alloc] init];
-        params.credential = [[MTRDoorLockClusterDlCredential alloc] init];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:2U];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:2U];
+        params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:2U];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:2U];
 
         [cluster getCredentialStatusWithParams:params
                                     completion:^(MTRDoorLockClusterGetCredentialStatusResponseParams * _Nullable values,
@@ -114420,30 +113285,30 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
                                         {
                                             id actualValue = values.credentialExists;
-                                            VerifyOrReturn(CheckValue("credentialExists", actualValue, true));
+                                            VerifyOrReturn(CheckValue("CredentialExists", actualValue, true));
                                         }
 
                                         {
                                             id actualValue = values.userIndex;
-                                            VerifyOrReturn(CheckValueNonNull("userIndex", actualValue));
-                                            VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
+                                            VerifyOrReturn(CheckValueNonNull("UserIndex", actualValue));
+                                            VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U));
                                         }
 
                                         {
                                             id actualValue = values.creatorFabricIndex;
-                                            VerifyOrReturn(CheckValueNonNull("creatorFabricIndex", actualValue));
-                                            VerifyOrReturn(CheckValue("creatorFabricIndex", actualValue, 1U));
+                                            VerifyOrReturn(CheckValueNonNull("CreatorFabricIndex", actualValue));
+                                            VerifyOrReturn(CheckValue("CreatorFabricIndex", actualValue, 1U));
                                         }
 
                                         {
                                             id actualValue = values.lastModifiedFabricIndex;
-                                            VerifyOrReturn(CheckValueNonNull("lastModifiedFabricIndex", actualValue));
-                                            VerifyOrReturn(CheckValue("lastModifiedFabricIndex", actualValue, 1U));
+                                            VerifyOrReturn(CheckValueNonNull("LastModifiedFabricIndex", actualValue));
+                                            VerifyOrReturn(CheckValue("LastModifiedFabricIndex", actualValue, 1U));
                                         }
 
                                         {
                                             id actualValue = values.nextCredentialIndex;
-                                            VerifyOrReturn(CheckValueNull("nextCredentialIndex", actualValue));
+                                            VerifyOrReturn(CheckValueNull("NextCredentialIndex", actualValue));
                                         }
 
                                         NextTest();
@@ -114462,9 +113327,9 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
         __auto_type * params = [[MTRDoorLockClusterSetCredentialParams alloc] init];
         params.operationType = [NSNumber numberWithUnsignedChar:0U];
-        params.credential = [[MTRDoorLockClusterDlCredential alloc] init];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:2U];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:0U];
+        params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:2U];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:0U];
 
         params.credentialData = [[NSData alloc] initWithBytes:"new_rfid_data_field" length:19];
         params.userIndex = nil;
@@ -114479,18 +113344,18 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
                              {
                                  id actualValue = values.status;
-                                 VerifyOrReturn(CheckValue("status", actualValue, 133U));
+                                 VerifyOrReturn(CheckValue("Status", actualValue, 133U));
                              }
 
                              {
                                  id actualValue = values.userIndex;
-                                 VerifyOrReturn(CheckValueNull("userIndex", actualValue));
+                                 VerifyOrReturn(CheckValueNull("UserIndex", actualValue));
                              }
 
                              {
                                  id actualValue = values.nextCredentialIndex;
-                                 VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue));
-                                 VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 3U));
+                                 VerifyOrReturn(CheckValueNonNull("NextCredentialIndex", actualValue));
+                                 VerifyOrReturn(CheckValue("NextCredentialIndex", actualValue, 3U));
                              }
 
                              NextTest();
@@ -114509,9 +113374,9 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
         __auto_type * params = [[MTRDoorLockClusterSetCredentialParams alloc] init];
         params.operationType = [NSNumber numberWithUnsignedChar:0U];
-        params.credential = [[MTRDoorLockClusterDlCredential alloc] init];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:2U];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex =
+        params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:2U];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex =
             [NSNumber numberWithUnsignedShort:[NumberOfRFIDUsersSupported unsignedShortValue] + 1U];
 
         params.credentialData = [[NSData alloc] initWithBytes:"new_rfid_data_field" length:19];
@@ -114527,17 +113392,17 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
                              {
                                  id actualValue = values.status;
-                                 VerifyOrReturn(CheckValue("status", actualValue, 133U));
+                                 VerifyOrReturn(CheckValue("Status", actualValue, 133U));
                              }
 
                              {
                                  id actualValue = values.userIndex;
-                                 VerifyOrReturn(CheckValueNull("userIndex", actualValue));
+                                 VerifyOrReturn(CheckValueNull("UserIndex", actualValue));
                              }
 
                              {
                                  id actualValue = values.nextCredentialIndex;
-                                 VerifyOrReturn(CheckValueNull("nextCredentialIndex", actualValue));
+                                 VerifyOrReturn(CheckValueNull("NextCredentialIndex", actualValue));
                              }
 
                              NextTest();
@@ -114556,9 +113421,9 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
         __auto_type * params = [[MTRDoorLockClusterSetCredentialParams alloc] init];
         params.operationType = [NSNumber numberWithUnsignedChar:0U];
-        params.credential = [[MTRDoorLockClusterDlCredential alloc] init];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:3U];
+        params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:3U];
 
         params.credentialData = [[NSData alloc] initWithBytes:"123465" length:6];
         params.userIndex = [NSNumber numberWithUnsignedShort:0U];
@@ -114573,18 +113438,18 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
                              {
                                  id actualValue = values.status;
-                                 VerifyOrReturn(CheckValue("status", actualValue, 133U));
+                                 VerifyOrReturn(CheckValue("Status", actualValue, 133U));
                              }
 
                              {
                                  id actualValue = values.userIndex;
-                                 VerifyOrReturn(CheckValueNull("userIndex", actualValue));
+                                 VerifyOrReturn(CheckValueNull("UserIndex", actualValue));
                              }
 
                              {
                                  id actualValue = values.nextCredentialIndex;
-                                 VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue));
-                                 VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 4U));
+                                 VerifyOrReturn(CheckValueNonNull("NextCredentialIndex", actualValue));
+                                 VerifyOrReturn(CheckValue("NextCredentialIndex", actualValue, 4U));
                              }
 
                              NextTest();
@@ -114603,9 +113468,9 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
         __auto_type * params = [[MTRDoorLockClusterSetCredentialParams alloc] init];
         params.operationType = [NSNumber numberWithUnsignedChar:0U];
-        params.credential = [[MTRDoorLockClusterDlCredential alloc] init];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:3U];
+        params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:3U];
 
         params.credentialData = [[NSData alloc] initWithBytes:"123465" length:6];
         params.userIndex = [NSNumber numberWithUnsignedShort:[NumberOfTotalUsersSupported unsignedShortValue] + 1U];
@@ -114620,18 +113485,18 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
                              {
                                  id actualValue = values.status;
-                                 VerifyOrReturn(CheckValue("status", actualValue, 133U));
+                                 VerifyOrReturn(CheckValue("Status", actualValue, 133U));
                              }
 
                              {
                                  id actualValue = values.userIndex;
-                                 VerifyOrReturn(CheckValueNull("userIndex", actualValue));
+                                 VerifyOrReturn(CheckValueNull("UserIndex", actualValue));
                              }
 
                              {
                                  id actualValue = values.nextCredentialIndex;
-                                 VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue));
-                                 VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 4U));
+                                 VerifyOrReturn(CheckValueNonNull("NextCredentialIndex", actualValue));
+                                 VerifyOrReturn(CheckValue("NextCredentialIndex", actualValue, 4U));
                              }
 
                              NextTest();
@@ -114650,9 +113515,9 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
         __auto_type * params = [[MTRDoorLockClusterSetCredentialParams alloc] init];
         params.operationType = [NSNumber numberWithUnsignedChar:0U];
-        params.credential = [[MTRDoorLockClusterDlCredential alloc] init];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:3U];
+        params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:3U];
 
         params.credentialData = [[NSData alloc] initWithBytes:"12345" length:5];
         params.userIndex = [NSNumber numberWithUnsignedShort:0U];
@@ -114667,18 +113532,18 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
                              {
                                  id actualValue = values.status;
-                                 VerifyOrReturn(CheckValue("status", actualValue, 133U));
+                                 VerifyOrReturn(CheckValue("Status", actualValue, 133U));
                              }
 
                              {
                                  id actualValue = values.userIndex;
-                                 VerifyOrReturn(CheckValueNull("userIndex", actualValue));
+                                 VerifyOrReturn(CheckValueNull("UserIndex", actualValue));
                              }
 
                              {
                                  id actualValue = values.nextCredentialIndex;
-                                 VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue));
-                                 VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 4U));
+                                 VerifyOrReturn(CheckValueNonNull("NextCredentialIndex", actualValue));
+                                 VerifyOrReturn(CheckValue("NextCredentialIndex", actualValue, 4U));
                              }
 
                              NextTest();
@@ -114697,9 +113562,9 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
         __auto_type * params = [[MTRDoorLockClusterSetCredentialParams alloc] init];
         params.operationType = [NSNumber numberWithUnsignedChar:0U];
-        params.credential = [[MTRDoorLockClusterDlCredential alloc] init];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:3U];
+        params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:3U];
 
         params.credentialData = [[NSData alloc] initWithBytes:"123456789" length:9];
         params.userIndex = [NSNumber numberWithUnsignedShort:0U];
@@ -114714,18 +113579,18 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
                              {
                                  id actualValue = values.status;
-                                 VerifyOrReturn(CheckValue("status", actualValue, 133U));
+                                 VerifyOrReturn(CheckValue("Status", actualValue, 133U));
                              }
 
                              {
                                  id actualValue = values.userIndex;
-                                 VerifyOrReturn(CheckValueNull("userIndex", actualValue));
+                                 VerifyOrReturn(CheckValueNull("UserIndex", actualValue));
                              }
 
                              {
                                  id actualValue = values.nextCredentialIndex;
-                                 VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue));
-                                 VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 4U));
+                                 VerifyOrReturn(CheckValueNonNull("NextCredentialIndex", actualValue));
+                                 VerifyOrReturn(CheckValue("NextCredentialIndex", actualValue, 4U));
                              }
 
                              NextTest();
@@ -114744,9 +113609,9 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
         __auto_type * params = [[MTRDoorLockClusterSetCredentialParams alloc] init];
         params.operationType = [NSNumber numberWithUnsignedChar:0U];
-        params.credential = [[MTRDoorLockClusterDlCredential alloc] init];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:2U];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:3U];
+        params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:2U];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:3U];
 
         params.credentialData = [[NSData alloc] initWithBytes:"rfid_data" length:9];
         params.userIndex = [NSNumber numberWithUnsignedShort:0U];
@@ -114761,18 +113626,18 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
                              {
                                  id actualValue = values.status;
-                                 VerifyOrReturn(CheckValue("status", actualValue, 133U));
+                                 VerifyOrReturn(CheckValue("Status", actualValue, 133U));
                              }
 
                              {
                                  id actualValue = values.userIndex;
-                                 VerifyOrReturn(CheckValueNull("userIndex", actualValue));
+                                 VerifyOrReturn(CheckValueNull("UserIndex", actualValue));
                              }
 
                              {
                                  id actualValue = values.nextCredentialIndex;
-                                 VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue));
-                                 VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 4U));
+                                 VerifyOrReturn(CheckValueNonNull("NextCredentialIndex", actualValue));
+                                 VerifyOrReturn(CheckValue("NextCredentialIndex", actualValue, 4U));
                              }
 
                              NextTest();
@@ -114791,9 +113656,9 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
         __auto_type * params = [[MTRDoorLockClusterSetCredentialParams alloc] init];
         params.operationType = [NSNumber numberWithUnsignedChar:0U];
-        params.credential = [[MTRDoorLockClusterDlCredential alloc] init];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:3U];
+        params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:3U];
 
         params.credentialData = [[NSData alloc] initWithBytes:"123456" length:6];
         params.userIndex = [NSNumber numberWithUnsignedShort:0U];
@@ -114808,18 +113673,18 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
                              {
                                  id actualValue = values.status;
-                                 VerifyOrReturn(CheckValue("status", actualValue, 133U));
+                                 VerifyOrReturn(CheckValue("Status", actualValue, 133U));
                              }
 
                              {
                                  id actualValue = values.userIndex;
-                                 VerifyOrReturn(CheckValueNull("userIndex", actualValue));
+                                 VerifyOrReturn(CheckValueNull("UserIndex", actualValue));
                              }
 
                              {
                                  id actualValue = values.nextCredentialIndex;
-                                 VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue));
-                                 VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 4U));
+                                 VerifyOrReturn(CheckValueNonNull("NextCredentialIndex", actualValue));
+                                 VerifyOrReturn(CheckValue("NextCredentialIndex", actualValue, 4U));
                              }
 
                              NextTest();
@@ -114838,9 +113703,9 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
         __auto_type * params = [[MTRDoorLockClusterSetCredentialParams alloc] init];
         params.operationType = [NSNumber numberWithUnsignedChar:0U];
-        params.credential = [[MTRDoorLockClusterDlCredential alloc] init];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:2U];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:3U];
+        params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:2U];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:3U];
 
         params.credentialData = [[NSData alloc] initWithBytes:"very_long_rfid_data_to_test_boundaries" length:38];
         params.userIndex = [NSNumber numberWithUnsignedShort:0U];
@@ -114855,18 +113720,18 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
                              {
                                  id actualValue = values.status;
-                                 VerifyOrReturn(CheckValue("status", actualValue, 133U));
+                                 VerifyOrReturn(CheckValue("Status", actualValue, 133U));
                              }
 
                              {
                                  id actualValue = values.userIndex;
-                                 VerifyOrReturn(CheckValueNull("userIndex", actualValue));
+                                 VerifyOrReturn(CheckValueNull("UserIndex", actualValue));
                              }
 
                              {
                                  id actualValue = values.nextCredentialIndex;
-                                 VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue));
-                                 VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 4U));
+                                 VerifyOrReturn(CheckValueNonNull("NextCredentialIndex", actualValue));
+                                 VerifyOrReturn(CheckValue("NextCredentialIndex", actualValue, 4U));
                              }
 
                              NextTest();
@@ -114885,9 +113750,9 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
         __auto_type * params = [[MTRDoorLockClusterSetCredentialParams alloc] init];
         params.operationType = [NSNumber numberWithUnsignedChar:0U];
-        params.credential = [[MTRDoorLockClusterDlCredential alloc] init];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:4U];
+        params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:4U];
 
         params.credentialData = [[NSData alloc] initWithBytes:"000000" length:6];
         params.userIndex = nil;
@@ -114902,18 +113767,18 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
                              {
                                  id actualValue = values.status;
-                                 VerifyOrReturn(CheckValue("status", actualValue, 2U));
+                                 VerifyOrReturn(CheckValue("Status", actualValue, 2U));
                              }
 
                              {
                                  id actualValue = values.userIndex;
-                                 VerifyOrReturn(CheckValueNull("userIndex", actualValue));
+                                 VerifyOrReturn(CheckValueNull("UserIndex", actualValue));
                              }
 
                              {
                                  id actualValue = values.nextCredentialIndex;
-                                 VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue));
-                                 VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 5U));
+                                 VerifyOrReturn(CheckValueNonNull("NextCredentialIndex", actualValue));
+                                 VerifyOrReturn(CheckValue("NextCredentialIndex", actualValue, 5U));
                              }
 
                              NextTest();
@@ -114932,9 +113797,9 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
         __auto_type * params = [[MTRDoorLockClusterSetCredentialParams alloc] init];
         params.operationType = [NSNumber numberWithUnsignedChar:0U];
-        params.credential = [[MTRDoorLockClusterDlCredential alloc] init];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:2U];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:4U];
+        params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:2U];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:4U];
 
         params.credentialData = [[NSData alloc] initWithBytes:"rfid_data_123456" length:16];
         params.userIndex = nil;
@@ -114949,18 +113814,18 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
                              {
                                  id actualValue = values.status;
-                                 VerifyOrReturn(CheckValue("status", actualValue, 2U));
+                                 VerifyOrReturn(CheckValue("Status", actualValue, 2U));
                              }
 
                              {
                                  id actualValue = values.userIndex;
-                                 VerifyOrReturn(CheckValueNull("userIndex", actualValue));
+                                 VerifyOrReturn(CheckValueNull("UserIndex", actualValue));
                              }
 
                              {
                                  id actualValue = values.nextCredentialIndex;
-                                 VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue));
-                                 VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 5U));
+                                 VerifyOrReturn(CheckValueNonNull("NextCredentialIndex", actualValue));
+                                 VerifyOrReturn(CheckValue("NextCredentialIndex", actualValue, 5U));
                              }
 
                              NextTest();
@@ -114979,9 +113844,9 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
         __auto_type * params = [[MTRDoorLockClusterSetCredentialParams alloc] init];
         params.operationType = [NSNumber numberWithUnsignedChar:2U];
-        params.credential = [[MTRDoorLockClusterDlCredential alloc] init];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U];
+        params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U];
 
         params.credentialData = [[NSData alloc] initWithBytes:"123456" length:6];
         params.userIndex = [NSNumber numberWithUnsignedShort:1U];
@@ -114996,18 +113861,18 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
                              {
                                  id actualValue = values.status;
-                                 VerifyOrReturn(CheckValue("status", actualValue, 0U));
+                                 VerifyOrReturn(CheckValue("Status", actualValue, 0U));
                              }
 
                              {
                                  id actualValue = values.userIndex;
-                                 VerifyOrReturn(CheckValueNull("userIndex", actualValue));
+                                 VerifyOrReturn(CheckValueNull("UserIndex", actualValue));
                              }
 
                              {
                                  id actualValue = values.nextCredentialIndex;
-                                 VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue));
-                                 VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 3U));
+                                 VerifyOrReturn(CheckValueNonNull("NextCredentialIndex", actualValue));
+                                 VerifyOrReturn(CheckValue("NextCredentialIndex", actualValue, 3U));
                              }
 
                              NextTest();
@@ -115026,9 +113891,9 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
         __auto_type * params = [[MTRDoorLockClusterSetCredentialParams alloc] init];
         params.operationType = [NSNumber numberWithUnsignedChar:0U];
-        params.credential = [[MTRDoorLockClusterDlCredential alloc] init];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:3U];
+        params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:3U];
 
         params.credentialData = [[NSData alloc] initWithBytes:"000000" length:6];
         params.userIndex = nil;
@@ -115043,19 +113908,19 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
                              {
                                  id actualValue = values.status;
-                                 VerifyOrReturn(CheckValue("status", actualValue, 0U));
+                                 VerifyOrReturn(CheckValue("Status", actualValue, 0U));
                              }
 
                              {
                                  id actualValue = values.userIndex;
-                                 VerifyOrReturn(CheckValueNonNull("userIndex", actualValue));
-                                 VerifyOrReturn(CheckValue("userIndex", actualValue, 2U));
+                                 VerifyOrReturn(CheckValueNonNull("UserIndex", actualValue));
+                                 VerifyOrReturn(CheckValue("UserIndex", actualValue, 2U));
                              }
 
                              {
                                  id actualValue = values.nextCredentialIndex;
-                                 VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue));
-                                 VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 4U));
+                                 VerifyOrReturn(CheckValueNonNull("NextCredentialIndex", actualValue));
+                                 VerifyOrReturn(CheckValue("NextCredentialIndex", actualValue, 4U));
                              }
 
                              NextTest();
@@ -115074,9 +113939,9 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
         __auto_type * params = [[MTRDoorLockClusterSetCredentialParams alloc] init];
         params.operationType = [NSNumber numberWithUnsignedChar:0U];
-        params.credential = [[MTRDoorLockClusterDlCredential alloc] init];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:4U];
+        params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:4U];
 
         params.credentialData = [[NSData alloc] initWithBytes:"123456" length:6];
         params.userIndex = nil;
@@ -115091,18 +113956,18 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
                              {
                                  id actualValue = values.status;
-                                 VerifyOrReturn(CheckValue("status", actualValue, 2U));
+                                 VerifyOrReturn(CheckValue("Status", actualValue, 2U));
                              }
 
                              {
                                  id actualValue = values.userIndex;
-                                 VerifyOrReturn(CheckValueNull("userIndex", actualValue));
+                                 VerifyOrReturn(CheckValueNull("UserIndex", actualValue));
                              }
 
                              {
                                  id actualValue = values.nextCredentialIndex;
-                                 VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue));
-                                 VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 5U));
+                                 VerifyOrReturn(CheckValueNonNull("NextCredentialIndex", actualValue));
+                                 VerifyOrReturn(CheckValue("NextCredentialIndex", actualValue, 5U));
                              }
 
                              NextTest();
@@ -115121,9 +113986,9 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
         __auto_type * params = [[MTRDoorLockClusterSetCredentialParams alloc] init];
         params.operationType = [NSNumber numberWithUnsignedChar:0U];
-        params.credential = [[MTRDoorLockClusterDlCredential alloc] init];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:2U];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:4U];
+        params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:2U];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:4U];
 
         params.credentialData = [[NSData alloc] initWithBytes:"rfid_data_7890" length:14];
         params.userIndex = [NSNumber numberWithUnsignedShort:1U];
@@ -115138,18 +114003,18 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
                              {
                                  id actualValue = values.status;
-                                 VerifyOrReturn(CheckValue("status", actualValue, 0U));
+                                 VerifyOrReturn(CheckValue("Status", actualValue, 0U));
                              }
 
                              {
                                  id actualValue = values.userIndex;
-                                 VerifyOrReturn(CheckValueNull("userIndex", actualValue));
+                                 VerifyOrReturn(CheckValueNull("UserIndex", actualValue));
                              }
 
                              {
                                  id actualValue = values.nextCredentialIndex;
-                                 VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue));
-                                 VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 5U));
+                                 VerifyOrReturn(CheckValueNonNull("NextCredentialIndex", actualValue));
+                                 VerifyOrReturn(CheckValue("NextCredentialIndex", actualValue, 5U));
                              }
 
                              NextTest();
@@ -115176,72 +114041,72 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
                             {
                                 id actualValue = values.userIndex;
-                                VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
+                                VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U));
                             }
 
                             {
                                 id actualValue = values.userName;
-                                VerifyOrReturn(CheckValueNonNull("userName", actualValue));
-                                VerifyOrReturn(CheckValueAsString("userName", actualValue, @""));
+                                VerifyOrReturn(CheckValueNonNull("UserName", actualValue));
+                                VerifyOrReturn(CheckValueAsString("UserName", actualValue, @""));
                             }
 
                             {
-                                id actualValue = values.userUniqueId;
-                                VerifyOrReturn(CheckValueNull("userUniqueId", actualValue));
+                                id actualValue = values.userUniqueID;
+                                VerifyOrReturn(CheckValueNull("UserUniqueID", actualValue));
                             }
 
                             {
                                 id actualValue = values.userStatus;
-                                VerifyOrReturn(CheckValueNonNull("userStatus", actualValue));
-                                VerifyOrReturn(CheckValue("userStatus", actualValue, 1U));
+                                VerifyOrReturn(CheckValueNonNull("UserStatus", actualValue));
+                                VerifyOrReturn(CheckValue("UserStatus", actualValue, 1U));
                             }
 
                             {
                                 id actualValue = values.userType;
-                                VerifyOrReturn(CheckValueNonNull("userType", actualValue));
-                                VerifyOrReturn(CheckValue("userType", actualValue, 0U));
+                                VerifyOrReturn(CheckValueNonNull("UserType", actualValue));
+                                VerifyOrReturn(CheckValue("UserType", actualValue, 0U));
                             }
 
                             {
                                 id actualValue = values.credentialRule;
-                                VerifyOrReturn(CheckValueNonNull("credentialRule", actualValue));
-                                VerifyOrReturn(CheckValue("credentialRule", actualValue, 0U));
+                                VerifyOrReturn(CheckValueNonNull("CredentialRule", actualValue));
+                                VerifyOrReturn(CheckValue("CredentialRule", actualValue, 0U));
                             }
 
                             {
                                 id actualValue = values.credentials;
-                                VerifyOrReturn(CheckValueNonNull("credentials", actualValue));
-                                VerifyOrReturn(CheckValue("credentials", [actualValue count], static_cast<uint32_t>(3)));
-                                VerifyOrReturn(CheckValue(
-                                    "CredentialType", ((MTRDoorLockClusterDlCredential *) actualValue[0]).credentialType, 1U));
+                                VerifyOrReturn(CheckValueNonNull("Credentials", actualValue));
+                                VerifyOrReturn(CheckValue("Credentials", [actualValue count], static_cast<uint32_t>(3)));
                                 VerifyOrReturn(CheckValue(
-                                    "CredentialIndex", ((MTRDoorLockClusterDlCredential *) actualValue[0]).credentialIndex, 1U));
+                                    "CredentialType", ((MTRDoorLockClusterCredentialStruct *) actualValue[0]).credentialType, 1U));
+                                VerifyOrReturn(CheckValue("CredentialIndex",
+                                    ((MTRDoorLockClusterCredentialStruct *) actualValue[0]).credentialIndex, 1U));
                                 VerifyOrReturn(CheckValue(
-                                    "CredentialType", ((MTRDoorLockClusterDlCredential *) actualValue[1]).credentialType, 2U));
+                                    "CredentialType", ((MTRDoorLockClusterCredentialStruct *) actualValue[1]).credentialType, 2U));
+                                VerifyOrReturn(CheckValue("CredentialIndex",
+                                    ((MTRDoorLockClusterCredentialStruct *) actualValue[1]).credentialIndex, 2U));
                                 VerifyOrReturn(CheckValue(
-                                    "CredentialIndex", ((MTRDoorLockClusterDlCredential *) actualValue[1]).credentialIndex, 2U));
-                                VerifyOrReturn(CheckValue(
-                                    "CredentialType", ((MTRDoorLockClusterDlCredential *) actualValue[2]).credentialType, 2U));
-                                VerifyOrReturn(CheckValue(
-                                    "CredentialIndex", ((MTRDoorLockClusterDlCredential *) actualValue[2]).credentialIndex, 4U));
+                                    "CredentialType", ((MTRDoorLockClusterCredentialStruct *) actualValue[2]).credentialType, 2U));
+                                VerifyOrReturn(CheckValue("CredentialIndex",
+                                    ((MTRDoorLockClusterCredentialStruct *) actualValue[2]).credentialIndex, 4U));
                             }
 
                             {
                                 id actualValue = values.creatorFabricIndex;
-                                VerifyOrReturn(CheckValueNonNull("creatorFabricIndex", actualValue));
-                                VerifyOrReturn(CheckValue("creatorFabricIndex", actualValue, 1U));
+                                VerifyOrReturn(CheckValueNonNull("CreatorFabricIndex", actualValue));
+                                VerifyOrReturn(CheckValue("CreatorFabricIndex", actualValue, 1U));
                             }
 
                             {
                                 id actualValue = values.lastModifiedFabricIndex;
-                                VerifyOrReturn(CheckValueNonNull("lastModifiedFabricIndex", actualValue));
-                                VerifyOrReturn(CheckValue("lastModifiedFabricIndex", actualValue, 1U));
+                                VerifyOrReturn(CheckValueNonNull("LastModifiedFabricIndex", actualValue));
+                                VerifyOrReturn(CheckValue("LastModifiedFabricIndex", actualValue, 1U));
                             }
 
                             {
                                 id actualValue = values.nextUserIndex;
-                                VerifyOrReturn(CheckValueNonNull("nextUserIndex", actualValue));
-                                VerifyOrReturn(CheckValue("nextUserIndex", actualValue, 2U));
+                                VerifyOrReturn(CheckValueNonNull("NextUserIndex", actualValue));
+                                VerifyOrReturn(CheckValue("NextUserIndex", actualValue, 2U));
                             }
 
                             NextTest();
@@ -115260,9 +114125,9 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
         __auto_type * params = [[MTRDoorLockClusterSetCredentialParams alloc] init];
         params.operationType = [NSNumber numberWithUnsignedChar:0U];
-        params.credential = [[MTRDoorLockClusterDlCredential alloc] init];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:5U];
+        params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:5U];
 
         params.credentialData = [[NSData alloc] initWithBytes:"789012" length:6];
         params.userIndex = [NSNumber numberWithUnsignedShort:1U];
@@ -115277,18 +114142,18 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
                              {
                                  id actualValue = values.status;
-                                 VerifyOrReturn(CheckValue("status", actualValue, 0U));
+                                 VerifyOrReturn(CheckValue("Status", actualValue, 0U));
                              }
 
                              {
                                  id actualValue = values.userIndex;
-                                 VerifyOrReturn(CheckValueNull("userIndex", actualValue));
+                                 VerifyOrReturn(CheckValueNull("UserIndex", actualValue));
                              }
 
                              {
                                  id actualValue = values.nextCredentialIndex;
-                                 VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue));
-                                 VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 6U));
+                                 VerifyOrReturn(CheckValueNonNull("NextCredentialIndex", actualValue));
+                                 VerifyOrReturn(CheckValue("NextCredentialIndex", actualValue, 6U));
                              }
 
                              NextTest();
@@ -115315,76 +114180,76 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
                             {
                                 id actualValue = values.userIndex;
-                                VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
+                                VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U));
                             }
 
                             {
                                 id actualValue = values.userName;
-                                VerifyOrReturn(CheckValueNonNull("userName", actualValue));
-                                VerifyOrReturn(CheckValueAsString("userName", actualValue, @""));
+                                VerifyOrReturn(CheckValueNonNull("UserName", actualValue));
+                                VerifyOrReturn(CheckValueAsString("UserName", actualValue, @""));
                             }
 
                             {
-                                id actualValue = values.userUniqueId;
-                                VerifyOrReturn(CheckValueNull("userUniqueId", actualValue));
+                                id actualValue = values.userUniqueID;
+                                VerifyOrReturn(CheckValueNull("UserUniqueID", actualValue));
                             }
 
                             {
                                 id actualValue = values.userStatus;
-                                VerifyOrReturn(CheckValueNonNull("userStatus", actualValue));
-                                VerifyOrReturn(CheckValue("userStatus", actualValue, 1U));
+                                VerifyOrReturn(CheckValueNonNull("UserStatus", actualValue));
+                                VerifyOrReturn(CheckValue("UserStatus", actualValue, 1U));
                             }
 
                             {
                                 id actualValue = values.userType;
-                                VerifyOrReturn(CheckValueNonNull("userType", actualValue));
-                                VerifyOrReturn(CheckValue("userType", actualValue, 0U));
+                                VerifyOrReturn(CheckValueNonNull("UserType", actualValue));
+                                VerifyOrReturn(CheckValue("UserType", actualValue, 0U));
                             }
 
                             {
                                 id actualValue = values.credentialRule;
-                                VerifyOrReturn(CheckValueNonNull("credentialRule", actualValue));
-                                VerifyOrReturn(CheckValue("credentialRule", actualValue, 0U));
+                                VerifyOrReturn(CheckValueNonNull("CredentialRule", actualValue));
+                                VerifyOrReturn(CheckValue("CredentialRule", actualValue, 0U));
                             }
 
                             {
                                 id actualValue = values.credentials;
-                                VerifyOrReturn(CheckValueNonNull("credentials", actualValue));
-                                VerifyOrReturn(CheckValue("credentials", [actualValue count], static_cast<uint32_t>(4)));
+                                VerifyOrReturn(CheckValueNonNull("Credentials", actualValue));
+                                VerifyOrReturn(CheckValue("Credentials", [actualValue count], static_cast<uint32_t>(4)));
                                 VerifyOrReturn(CheckValue(
-                                    "CredentialType", ((MTRDoorLockClusterDlCredential *) actualValue[0]).credentialType, 1U));
+                                    "CredentialType", ((MTRDoorLockClusterCredentialStruct *) actualValue[0]).credentialType, 1U));
+                                VerifyOrReturn(CheckValue("CredentialIndex",
+                                    ((MTRDoorLockClusterCredentialStruct *) actualValue[0]).credentialIndex, 1U));
                                 VerifyOrReturn(CheckValue(
-                                    "CredentialIndex", ((MTRDoorLockClusterDlCredential *) actualValue[0]).credentialIndex, 1U));
+                                    "CredentialType", ((MTRDoorLockClusterCredentialStruct *) actualValue[1]).credentialType, 2U));
+                                VerifyOrReturn(CheckValue("CredentialIndex",
+                                    ((MTRDoorLockClusterCredentialStruct *) actualValue[1]).credentialIndex, 2U));
                                 VerifyOrReturn(CheckValue(
-                                    "CredentialType", ((MTRDoorLockClusterDlCredential *) actualValue[1]).credentialType, 2U));
+                                    "CredentialType", ((MTRDoorLockClusterCredentialStruct *) actualValue[2]).credentialType, 2U));
+                                VerifyOrReturn(CheckValue("CredentialIndex",
+                                    ((MTRDoorLockClusterCredentialStruct *) actualValue[2]).credentialIndex, 4U));
                                 VerifyOrReturn(CheckValue(
-                                    "CredentialIndex", ((MTRDoorLockClusterDlCredential *) actualValue[1]).credentialIndex, 2U));
-                                VerifyOrReturn(CheckValue(
-                                    "CredentialType", ((MTRDoorLockClusterDlCredential *) actualValue[2]).credentialType, 2U));
-                                VerifyOrReturn(CheckValue(
-                                    "CredentialIndex", ((MTRDoorLockClusterDlCredential *) actualValue[2]).credentialIndex, 4U));
-                                VerifyOrReturn(CheckValue(
-                                    "CredentialType", ((MTRDoorLockClusterDlCredential *) actualValue[3]).credentialType, 1U));
-                                VerifyOrReturn(CheckValue(
-                                    "CredentialIndex", ((MTRDoorLockClusterDlCredential *) actualValue[3]).credentialIndex, 5U));
+                                    "CredentialType", ((MTRDoorLockClusterCredentialStruct *) actualValue[3]).credentialType, 1U));
+                                VerifyOrReturn(CheckValue("CredentialIndex",
+                                    ((MTRDoorLockClusterCredentialStruct *) actualValue[3]).credentialIndex, 5U));
                             }
 
                             {
                                 id actualValue = values.creatorFabricIndex;
-                                VerifyOrReturn(CheckValueNonNull("creatorFabricIndex", actualValue));
-                                VerifyOrReturn(CheckValue("creatorFabricIndex", actualValue, 1U));
+                                VerifyOrReturn(CheckValueNonNull("CreatorFabricIndex", actualValue));
+                                VerifyOrReturn(CheckValue("CreatorFabricIndex", actualValue, 1U));
                             }
 
                             {
                                 id actualValue = values.lastModifiedFabricIndex;
-                                VerifyOrReturn(CheckValueNonNull("lastModifiedFabricIndex", actualValue));
-                                VerifyOrReturn(CheckValue("lastModifiedFabricIndex", actualValue, 1U));
+                                VerifyOrReturn(CheckValueNonNull("LastModifiedFabricIndex", actualValue));
+                                VerifyOrReturn(CheckValue("LastModifiedFabricIndex", actualValue, 1U));
                             }
 
                             {
                                 id actualValue = values.nextUserIndex;
-                                VerifyOrReturn(CheckValueNonNull("nextUserIndex", actualValue));
-                                VerifyOrReturn(CheckValue("nextUserIndex", actualValue, 2U));
+                                VerifyOrReturn(CheckValueNonNull("NextUserIndex", actualValue));
+                                VerifyOrReturn(CheckValue("NextUserIndex", actualValue, 2U));
                             }
 
                             NextTest();
@@ -115402,9 +114267,9 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         __auto_type * params = [[MTRDoorLockClusterClearCredentialParams alloc] init];
-        params.credential = [[MTRDoorLockClusterDlCredential alloc] init];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U];
+        params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U];
 
         [cluster clearCredentialWithParams:params
                                 completion:^(NSError * _Nullable err) {
@@ -115427,9 +114292,9 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         __auto_type * params = [[MTRDoorLockClusterGetCredentialStatusParams alloc] init];
-        params.credential = [[MTRDoorLockClusterDlCredential alloc] init];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U];
+        params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U];
 
         [cluster getCredentialStatusWithParams:params
                                     completion:^(MTRDoorLockClusterGetCredentialStatusResponseParams * _Nullable values,
@@ -115440,28 +114305,28 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
                                         {
                                             id actualValue = values.credentialExists;
-                                            VerifyOrReturn(CheckValue("credentialExists", actualValue, false));
+                                            VerifyOrReturn(CheckValue("CredentialExists", actualValue, false));
                                         }
 
                                         {
                                             id actualValue = values.userIndex;
-                                            VerifyOrReturn(CheckValueNull("userIndex", actualValue));
+                                            VerifyOrReturn(CheckValueNull("UserIndex", actualValue));
                                         }
 
                                         {
                                             id actualValue = values.creatorFabricIndex;
-                                            VerifyOrReturn(CheckValueNull("creatorFabricIndex", actualValue));
+                                            VerifyOrReturn(CheckValueNull("CreatorFabricIndex", actualValue));
                                         }
 
                                         {
                                             id actualValue = values.lastModifiedFabricIndex;
-                                            VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", actualValue));
+                                            VerifyOrReturn(CheckValueNull("LastModifiedFabricIndex", actualValue));
                                         }
 
                                         {
                                             id actualValue = values.nextCredentialIndex;
-                                            VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue));
-                                            VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 2U));
+                                            VerifyOrReturn(CheckValueNonNull("NextCredentialIndex", actualValue));
+                                            VerifyOrReturn(CheckValue("NextCredentialIndex", actualValue, 2U));
                                         }
 
                                         NextTest();
@@ -115488,72 +114353,72 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
                             {
                                 id actualValue = values.userIndex;
-                                VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
+                                VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U));
                             }
 
                             {
                                 id actualValue = values.userName;
-                                VerifyOrReturn(CheckValueNonNull("userName", actualValue));
-                                VerifyOrReturn(CheckValueAsString("userName", actualValue, @""));
+                                VerifyOrReturn(CheckValueNonNull("UserName", actualValue));
+                                VerifyOrReturn(CheckValueAsString("UserName", actualValue, @""));
                             }
 
                             {
-                                id actualValue = values.userUniqueId;
-                                VerifyOrReturn(CheckValueNull("userUniqueId", actualValue));
+                                id actualValue = values.userUniqueID;
+                                VerifyOrReturn(CheckValueNull("UserUniqueID", actualValue));
                             }
 
                             {
                                 id actualValue = values.userStatus;
-                                VerifyOrReturn(CheckValueNonNull("userStatus", actualValue));
-                                VerifyOrReturn(CheckValue("userStatus", actualValue, 1U));
+                                VerifyOrReturn(CheckValueNonNull("UserStatus", actualValue));
+                                VerifyOrReturn(CheckValue("UserStatus", actualValue, 1U));
                             }
 
                             {
                                 id actualValue = values.userType;
-                                VerifyOrReturn(CheckValueNonNull("userType", actualValue));
-                                VerifyOrReturn(CheckValue("userType", actualValue, 0U));
+                                VerifyOrReturn(CheckValueNonNull("UserType", actualValue));
+                                VerifyOrReturn(CheckValue("UserType", actualValue, 0U));
                             }
 
                             {
                                 id actualValue = values.credentialRule;
-                                VerifyOrReturn(CheckValueNonNull("credentialRule", actualValue));
-                                VerifyOrReturn(CheckValue("credentialRule", actualValue, 0U));
+                                VerifyOrReturn(CheckValueNonNull("CredentialRule", actualValue));
+                                VerifyOrReturn(CheckValue("CredentialRule", actualValue, 0U));
                             }
 
                             {
                                 id actualValue = values.credentials;
-                                VerifyOrReturn(CheckValueNonNull("credentials", actualValue));
-                                VerifyOrReturn(CheckValue("credentials", [actualValue count], static_cast<uint32_t>(3)));
+                                VerifyOrReturn(CheckValueNonNull("Credentials", actualValue));
+                                VerifyOrReturn(CheckValue("Credentials", [actualValue count], static_cast<uint32_t>(3)));
                                 VerifyOrReturn(CheckValue(
-                                    "CredentialType", ((MTRDoorLockClusterDlCredential *) actualValue[0]).credentialType, 2U));
+                                    "CredentialType", ((MTRDoorLockClusterCredentialStruct *) actualValue[0]).credentialType, 2U));
+                                VerifyOrReturn(CheckValue("CredentialIndex",
+                                    ((MTRDoorLockClusterCredentialStruct *) actualValue[0]).credentialIndex, 2U));
                                 VerifyOrReturn(CheckValue(
-                                    "CredentialIndex", ((MTRDoorLockClusterDlCredential *) actualValue[0]).credentialIndex, 2U));
+                                    "CredentialType", ((MTRDoorLockClusterCredentialStruct *) actualValue[1]).credentialType, 2U));
+                                VerifyOrReturn(CheckValue("CredentialIndex",
+                                    ((MTRDoorLockClusterCredentialStruct *) actualValue[1]).credentialIndex, 4U));
                                 VerifyOrReturn(CheckValue(
-                                    "CredentialType", ((MTRDoorLockClusterDlCredential *) actualValue[1]).credentialType, 2U));
-                                VerifyOrReturn(CheckValue(
-                                    "CredentialIndex", ((MTRDoorLockClusterDlCredential *) actualValue[1]).credentialIndex, 4U));
-                                VerifyOrReturn(CheckValue(
-                                    "CredentialType", ((MTRDoorLockClusterDlCredential *) actualValue[2]).credentialType, 1U));
-                                VerifyOrReturn(CheckValue(
-                                    "CredentialIndex", ((MTRDoorLockClusterDlCredential *) actualValue[2]).credentialIndex, 5U));
+                                    "CredentialType", ((MTRDoorLockClusterCredentialStruct *) actualValue[2]).credentialType, 1U));
+                                VerifyOrReturn(CheckValue("CredentialIndex",
+                                    ((MTRDoorLockClusterCredentialStruct *) actualValue[2]).credentialIndex, 5U));
                             }
 
                             {
                                 id actualValue = values.creatorFabricIndex;
-                                VerifyOrReturn(CheckValueNonNull("creatorFabricIndex", actualValue));
-                                VerifyOrReturn(CheckValue("creatorFabricIndex", actualValue, 1U));
+                                VerifyOrReturn(CheckValueNonNull("CreatorFabricIndex", actualValue));
+                                VerifyOrReturn(CheckValue("CreatorFabricIndex", actualValue, 1U));
                             }
 
                             {
                                 id actualValue = values.lastModifiedFabricIndex;
-                                VerifyOrReturn(CheckValueNonNull("lastModifiedFabricIndex", actualValue));
-                                VerifyOrReturn(CheckValue("lastModifiedFabricIndex", actualValue, 1U));
+                                VerifyOrReturn(CheckValueNonNull("LastModifiedFabricIndex", actualValue));
+                                VerifyOrReturn(CheckValue("LastModifiedFabricIndex", actualValue, 1U));
                             }
 
                             {
                                 id actualValue = values.nextUserIndex;
-                                VerifyOrReturn(CheckValueNonNull("nextUserIndex", actualValue));
-                                VerifyOrReturn(CheckValue("nextUserIndex", actualValue, 2U));
+                                VerifyOrReturn(CheckValueNonNull("NextUserIndex", actualValue));
+                                VerifyOrReturn(CheckValue("NextUserIndex", actualValue, 2U));
                             }
 
                             NextTest();
@@ -115571,9 +114436,9 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         __auto_type * params = [[MTRDoorLockClusterClearCredentialParams alloc] init];
-        params.credential = [[MTRDoorLockClusterDlCredential alloc] init];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:3U];
+        params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:3U];
 
         [cluster clearCredentialWithParams:params
                                 completion:^(NSError * _Nullable err) {
@@ -115596,9 +114461,9 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         __auto_type * params = [[MTRDoorLockClusterGetCredentialStatusParams alloc] init];
-        params.credential = [[MTRDoorLockClusterDlCredential alloc] init];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:3U];
+        params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:3U];
 
         [cluster getCredentialStatusWithParams:params
                                     completion:^(MTRDoorLockClusterGetCredentialStatusResponseParams * _Nullable values,
@@ -115609,28 +114474,28 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
                                         {
                                             id actualValue = values.credentialExists;
-                                            VerifyOrReturn(CheckValue("credentialExists", actualValue, false));
+                                            VerifyOrReturn(CheckValue("CredentialExists", actualValue, false));
                                         }
 
                                         {
                                             id actualValue = values.userIndex;
-                                            VerifyOrReturn(CheckValueNull("userIndex", actualValue));
+                                            VerifyOrReturn(CheckValueNull("UserIndex", actualValue));
                                         }
 
                                         {
                                             id actualValue = values.creatorFabricIndex;
-                                            VerifyOrReturn(CheckValueNull("creatorFabricIndex", actualValue));
+                                            VerifyOrReturn(CheckValueNull("CreatorFabricIndex", actualValue));
                                         }
 
                                         {
                                             id actualValue = values.lastModifiedFabricIndex;
-                                            VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", actualValue));
+                                            VerifyOrReturn(CheckValueNull("LastModifiedFabricIndex", actualValue));
                                         }
 
                                         {
                                             id actualValue = values.nextCredentialIndex;
-                                            VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue));
-                                            VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 4U));
+                                            VerifyOrReturn(CheckValueNonNull("NextCredentialIndex", actualValue));
+                                            VerifyOrReturn(CheckValue("NextCredentialIndex", actualValue, 4U));
                                         }
 
                                         NextTest();
@@ -115657,52 +114522,52 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
                             {
                                 id actualValue = values.userIndex;
-                                VerifyOrReturn(CheckValue("userIndex", actualValue, 2U));
+                                VerifyOrReturn(CheckValue("UserIndex", actualValue, 2U));
                             }
 
                             {
                                 id actualValue = values.userName;
-                                VerifyOrReturn(CheckValueNull("userName", actualValue));
+                                VerifyOrReturn(CheckValueNull("UserName", actualValue));
                             }
 
                             {
-                                id actualValue = values.userUniqueId;
-                                VerifyOrReturn(CheckValueNull("userUniqueId", actualValue));
+                                id actualValue = values.userUniqueID;
+                                VerifyOrReturn(CheckValueNull("UserUniqueID", actualValue));
                             }
 
                             {
                                 id actualValue = values.userStatus;
-                                VerifyOrReturn(CheckValueNull("userStatus", actualValue));
+                                VerifyOrReturn(CheckValueNull("UserStatus", actualValue));
                             }
 
                             {
                                 id actualValue = values.userType;
-                                VerifyOrReturn(CheckValueNull("userType", actualValue));
+                                VerifyOrReturn(CheckValueNull("UserType", actualValue));
                             }
 
                             {
                                 id actualValue = values.credentialRule;
-                                VerifyOrReturn(CheckValueNull("credentialRule", actualValue));
+                                VerifyOrReturn(CheckValueNull("CredentialRule", actualValue));
                             }
 
                             {
                                 id actualValue = values.credentials;
-                                VerifyOrReturn(CheckValueNull("credentials", actualValue));
+                                VerifyOrReturn(CheckValueNull("Credentials", actualValue));
                             }
 
                             {
                                 id actualValue = values.creatorFabricIndex;
-                                VerifyOrReturn(CheckValueNull("creatorFabricIndex", actualValue));
+                                VerifyOrReturn(CheckValueNull("CreatorFabricIndex", actualValue));
                             }
 
                             {
                                 id actualValue = values.lastModifiedFabricIndex;
-                                VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", actualValue));
+                                VerifyOrReturn(CheckValueNull("LastModifiedFabricIndex", actualValue));
                             }
 
                             {
                                 id actualValue = values.nextUserIndex;
-                                VerifyOrReturn(CheckValueNull("nextUserIndex", actualValue));
+                                VerifyOrReturn(CheckValueNull("NextUserIndex", actualValue));
                             }
 
                             NextTest();
@@ -115721,9 +114586,9 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
         __auto_type * params = [[MTRDoorLockClusterSetCredentialParams alloc] init];
         params.operationType = [NSNumber numberWithUnsignedChar:0U];
-        params.credential = [[MTRDoorLockClusterDlCredential alloc] init];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:2U];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U];
+        params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:2U];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U];
 
         params.credentialData = [[NSData alloc] initWithBytes:"rfid_data_12345" length:15];
         params.userIndex = nil;
@@ -115738,19 +114603,19 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
                              {
                                  id actualValue = values.status;
-                                 VerifyOrReturn(CheckValue("status", actualValue, 0U));
+                                 VerifyOrReturn(CheckValue("Status", actualValue, 0U));
                              }
 
                              {
                                  id actualValue = values.userIndex;
-                                 VerifyOrReturn(CheckValueNonNull("userIndex", actualValue));
-                                 VerifyOrReturn(CheckValue("userIndex", actualValue, 2U));
+                                 VerifyOrReturn(CheckValueNonNull("UserIndex", actualValue));
+                                 VerifyOrReturn(CheckValue("UserIndex", actualValue, 2U));
                              }
 
                              {
                                  id actualValue = values.nextCredentialIndex;
-                                 VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue));
-                                 VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 3U));
+                                 VerifyOrReturn(CheckValueNonNull("NextCredentialIndex", actualValue));
+                                 VerifyOrReturn(CheckValue("NextCredentialIndex", actualValue, 3U));
                              }
 
                              NextTest();
@@ -115768,9 +114633,9 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         __auto_type * params = [[MTRDoorLockClusterClearCredentialParams alloc] init];
-        params.credential = [[MTRDoorLockClusterDlCredential alloc] init];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:2U];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:65534U];
+        params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:2U];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:65534U];
 
         [cluster clearCredentialWithParams:params
                                 completion:^(NSError * _Nullable err) {
@@ -115793,9 +114658,9 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         __auto_type * params = [[MTRDoorLockClusterGetCredentialStatusParams alloc] init];
-        params.credential = [[MTRDoorLockClusterDlCredential alloc] init];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:2U];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U];
+        params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:2U];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U];
 
         [cluster getCredentialStatusWithParams:params
                                     completion:^(MTRDoorLockClusterGetCredentialStatusResponseParams * _Nullable values,
@@ -115806,28 +114671,28 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
                                         {
                                             id actualValue = values.credentialExists;
-                                            VerifyOrReturn(CheckValue("credentialExists", actualValue, false));
+                                            VerifyOrReturn(CheckValue("CredentialExists", actualValue, false));
                                         }
 
                                         {
                                             id actualValue = values.userIndex;
-                                            VerifyOrReturn(CheckValueNull("userIndex", actualValue));
+                                            VerifyOrReturn(CheckValueNull("UserIndex", actualValue));
                                         }
 
                                         {
                                             id actualValue = values.creatorFabricIndex;
-                                            VerifyOrReturn(CheckValueNull("creatorFabricIndex", actualValue));
+                                            VerifyOrReturn(CheckValueNull("CreatorFabricIndex", actualValue));
                                         }
 
                                         {
                                             id actualValue = values.lastModifiedFabricIndex;
-                                            VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", actualValue));
+                                            VerifyOrReturn(CheckValueNull("LastModifiedFabricIndex", actualValue));
                                         }
 
                                         {
                                             id actualValue = values.nextCredentialIndex;
-                                            VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue));
-                                            VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 5U));
+                                            VerifyOrReturn(CheckValueNonNull("NextCredentialIndex", actualValue));
+                                            VerifyOrReturn(CheckValue("NextCredentialIndex", actualValue, 5U));
                                         }
 
                                         NextTest();
@@ -115845,9 +114710,9 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         __auto_type * params = [[MTRDoorLockClusterGetCredentialStatusParams alloc] init];
-        params.credential = [[MTRDoorLockClusterDlCredential alloc] init];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:2U];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:2U];
+        params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:2U];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:2U];
 
         [cluster getCredentialStatusWithParams:params
                                     completion:^(MTRDoorLockClusterGetCredentialStatusResponseParams * _Nullable values,
@@ -115858,28 +114723,28 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
                                         {
                                             id actualValue = values.credentialExists;
-                                            VerifyOrReturn(CheckValue("credentialExists", actualValue, false));
+                                            VerifyOrReturn(CheckValue("CredentialExists", actualValue, false));
                                         }
 
                                         {
                                             id actualValue = values.userIndex;
-                                            VerifyOrReturn(CheckValueNull("userIndex", actualValue));
+                                            VerifyOrReturn(CheckValueNull("UserIndex", actualValue));
                                         }
 
                                         {
                                             id actualValue = values.creatorFabricIndex;
-                                            VerifyOrReturn(CheckValueNull("creatorFabricIndex", actualValue));
+                                            VerifyOrReturn(CheckValueNull("CreatorFabricIndex", actualValue));
                                         }
 
                                         {
                                             id actualValue = values.lastModifiedFabricIndex;
-                                            VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", actualValue));
+                                            VerifyOrReturn(CheckValueNull("LastModifiedFabricIndex", actualValue));
                                         }
 
                                         {
                                             id actualValue = values.nextCredentialIndex;
-                                            VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue));
-                                            VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 5U));
+                                            VerifyOrReturn(CheckValueNonNull("NextCredentialIndex", actualValue));
+                                            VerifyOrReturn(CheckValue("NextCredentialIndex", actualValue, 5U));
                                         }
 
                                         NextTest();
@@ -115897,9 +114762,9 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         __auto_type * params = [[MTRDoorLockClusterGetCredentialStatusParams alloc] init];
-        params.credential = [[MTRDoorLockClusterDlCredential alloc] init];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:2U];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:4U];
+        params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:2U];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:4U];
 
         [cluster getCredentialStatusWithParams:params
                                     completion:^(MTRDoorLockClusterGetCredentialStatusResponseParams * _Nullable values,
@@ -115910,28 +114775,28 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
                                         {
                                             id actualValue = values.credentialExists;
-                                            VerifyOrReturn(CheckValue("credentialExists", actualValue, false));
+                                            VerifyOrReturn(CheckValue("CredentialExists", actualValue, false));
                                         }
 
                                         {
                                             id actualValue = values.userIndex;
-                                            VerifyOrReturn(CheckValueNull("userIndex", actualValue));
+                                            VerifyOrReturn(CheckValueNull("UserIndex", actualValue));
                                         }
 
                                         {
                                             id actualValue = values.creatorFabricIndex;
-                                            VerifyOrReturn(CheckValueNull("creatorFabricIndex", actualValue));
+                                            VerifyOrReturn(CheckValueNull("CreatorFabricIndex", actualValue));
                                         }
 
                                         {
                                             id actualValue = values.lastModifiedFabricIndex;
-                                            VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", actualValue));
+                                            VerifyOrReturn(CheckValueNull("LastModifiedFabricIndex", actualValue));
                                         }
 
                                         {
                                             id actualValue = values.nextCredentialIndex;
-                                            VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue));
-                                            VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 5U));
+                                            VerifyOrReturn(CheckValueNonNull("NextCredentialIndex", actualValue));
+                                            VerifyOrReturn(CheckValue("NextCredentialIndex", actualValue, 5U));
                                         }
 
                                         NextTest();
@@ -115959,63 +114824,63 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
                        {
                            id actualValue = values.userIndex;
-                           VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
+                           VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U));
                        }
 
                        {
                            id actualValue = values.userName;
-                           VerifyOrReturn(CheckValueNonNull("userName", actualValue));
-                           VerifyOrReturn(CheckValueAsString("userName", actualValue, @""));
+                           VerifyOrReturn(CheckValueNonNull("UserName", actualValue));
+                           VerifyOrReturn(CheckValueAsString("UserName", actualValue, @""));
                        }
 
                        {
-                           id actualValue = values.userUniqueId;
-                           VerifyOrReturn(CheckValueNull("userUniqueId", actualValue));
+                           id actualValue = values.userUniqueID;
+                           VerifyOrReturn(CheckValueNull("UserUniqueID", actualValue));
                        }
 
                        {
                            id actualValue = values.userStatus;
-                           VerifyOrReturn(CheckValueNonNull("userStatus", actualValue));
-                           VerifyOrReturn(CheckValue("userStatus", actualValue, 1U));
+                           VerifyOrReturn(CheckValueNonNull("UserStatus", actualValue));
+                           VerifyOrReturn(CheckValue("UserStatus", actualValue, 1U));
                        }
 
                        {
                            id actualValue = values.userType;
-                           VerifyOrReturn(CheckValueNonNull("userType", actualValue));
-                           VerifyOrReturn(CheckValue("userType", actualValue, 0U));
+                           VerifyOrReturn(CheckValueNonNull("UserType", actualValue));
+                           VerifyOrReturn(CheckValue("UserType", actualValue, 0U));
                        }
 
                        {
                            id actualValue = values.credentialRule;
-                           VerifyOrReturn(CheckValueNonNull("credentialRule", actualValue));
-                           VerifyOrReturn(CheckValue("credentialRule", actualValue, 0U));
+                           VerifyOrReturn(CheckValueNonNull("CredentialRule", actualValue));
+                           VerifyOrReturn(CheckValue("CredentialRule", actualValue, 0U));
                        }
 
                        {
                            id actualValue = values.credentials;
-                           VerifyOrReturn(CheckValueNonNull("credentials", actualValue));
-                           VerifyOrReturn(CheckValue("credentials", [actualValue count], static_cast<uint32_t>(1)));
+                           VerifyOrReturn(CheckValueNonNull("Credentials", actualValue));
+                           VerifyOrReturn(CheckValue("Credentials", [actualValue count], static_cast<uint32_t>(1)));
                            VerifyOrReturn(CheckValue(
-                               "CredentialType", ((MTRDoorLockClusterDlCredential *) actualValue[0]).credentialType, 1U));
+                               "CredentialType", ((MTRDoorLockClusterCredentialStruct *) actualValue[0]).credentialType, 1U));
                            VerifyOrReturn(CheckValue(
-                               "CredentialIndex", ((MTRDoorLockClusterDlCredential *) actualValue[0]).credentialIndex, 5U));
+                               "CredentialIndex", ((MTRDoorLockClusterCredentialStruct *) actualValue[0]).credentialIndex, 5U));
                        }
 
                        {
                            id actualValue = values.creatorFabricIndex;
-                           VerifyOrReturn(CheckValueNonNull("creatorFabricIndex", actualValue));
-                           VerifyOrReturn(CheckValue("creatorFabricIndex", actualValue, 1U));
+                           VerifyOrReturn(CheckValueNonNull("CreatorFabricIndex", actualValue));
+                           VerifyOrReturn(CheckValue("CreatorFabricIndex", actualValue, 1U));
                        }
 
                        {
                            id actualValue = values.lastModifiedFabricIndex;
-                           VerifyOrReturn(CheckValueNonNull("lastModifiedFabricIndex", actualValue));
-                           VerifyOrReturn(CheckValue("lastModifiedFabricIndex", actualValue, 1U));
+                           VerifyOrReturn(CheckValueNonNull("LastModifiedFabricIndex", actualValue));
+                           VerifyOrReturn(CheckValue("LastModifiedFabricIndex", actualValue, 1U));
                        }
 
                        {
                            id actualValue = values.nextUserIndex;
-                           VerifyOrReturn(CheckValueNull("nextUserIndex", actualValue));
+                           VerifyOrReturn(CheckValueNull("NextUserIndex", actualValue));
                        }
 
                        NextTest();
@@ -116042,52 +114907,52 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
                             {
                                 id actualValue = values.userIndex;
-                                VerifyOrReturn(CheckValue("userIndex", actualValue, 2U));
+                                VerifyOrReturn(CheckValue("UserIndex", actualValue, 2U));
                             }
 
                             {
                                 id actualValue = values.userName;
-                                VerifyOrReturn(CheckValueNull("userName", actualValue));
+                                VerifyOrReturn(CheckValueNull("UserName", actualValue));
                             }
 
                             {
-                                id actualValue = values.userUniqueId;
-                                VerifyOrReturn(CheckValueNull("userUniqueId", actualValue));
+                                id actualValue = values.userUniqueID;
+                                VerifyOrReturn(CheckValueNull("UserUniqueID", actualValue));
                             }
 
                             {
                                 id actualValue = values.userStatus;
-                                VerifyOrReturn(CheckValueNull("userStatus", actualValue));
+                                VerifyOrReturn(CheckValueNull("UserStatus", actualValue));
                             }
 
                             {
                                 id actualValue = values.userType;
-                                VerifyOrReturn(CheckValueNull("userType", actualValue));
+                                VerifyOrReturn(CheckValueNull("UserType", actualValue));
                             }
 
                             {
                                 id actualValue = values.credentialRule;
-                                VerifyOrReturn(CheckValueNull("credentialRule", actualValue));
+                                VerifyOrReturn(CheckValueNull("CredentialRule", actualValue));
                             }
 
                             {
                                 id actualValue = values.credentials;
-                                VerifyOrReturn(CheckValueNull("credentials", actualValue));
+                                VerifyOrReturn(CheckValueNull("Credentials", actualValue));
                             }
 
                             {
                                 id actualValue = values.creatorFabricIndex;
-                                VerifyOrReturn(CheckValueNull("creatorFabricIndex", actualValue));
+                                VerifyOrReturn(CheckValueNull("CreatorFabricIndex", actualValue));
                             }
 
                             {
                                 id actualValue = values.lastModifiedFabricIndex;
-                                VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", actualValue));
+                                VerifyOrReturn(CheckValueNull("LastModifiedFabricIndex", actualValue));
                             }
 
                             {
                                 id actualValue = values.nextUserIndex;
-                                VerifyOrReturn(CheckValueNull("nextUserIndex", actualValue));
+                                VerifyOrReturn(CheckValueNull("NextUserIndex", actualValue));
                             }
 
                             NextTest();
@@ -116106,9 +114971,9 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
         __auto_type * params = [[MTRDoorLockClusterSetCredentialParams alloc] init];
         params.operationType = [NSNumber numberWithUnsignedChar:0U];
-        params.credential = [[MTRDoorLockClusterDlCredential alloc] init];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U];
+        params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U];
 
         params.credentialData = [[NSData alloc] initWithBytes:"123456" length:6];
         params.userIndex = nil;
@@ -116123,19 +114988,19 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
                              {
                                  id actualValue = values.status;
-                                 VerifyOrReturn(CheckValue("status", actualValue, 0U));
+                                 VerifyOrReturn(CheckValue("Status", actualValue, 0U));
                              }
 
                              {
                                  id actualValue = values.userIndex;
-                                 VerifyOrReturn(CheckValueNonNull("userIndex", actualValue));
-                                 VerifyOrReturn(CheckValue("userIndex", actualValue, 2U));
+                                 VerifyOrReturn(CheckValueNonNull("UserIndex", actualValue));
+                                 VerifyOrReturn(CheckValue("UserIndex", actualValue, 2U));
                              }
 
                              {
                                  id actualValue = values.nextCredentialIndex;
-                                 VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue));
-                                 VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 2U));
+                                 VerifyOrReturn(CheckValueNonNull("NextCredentialIndex", actualValue));
+                                 VerifyOrReturn(CheckValue("NextCredentialIndex", actualValue, 2U));
                              }
 
                              NextTest();
@@ -116154,9 +115019,9 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
         __auto_type * params = [[MTRDoorLockClusterSetCredentialParams alloc] init];
         params.operationType = [NSNumber numberWithUnsignedChar:0U];
-        params.credential = [[MTRDoorLockClusterDlCredential alloc] init];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:2U];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:2U];
+        params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:2U];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:2U];
 
         params.credentialData = [[NSData alloc] initWithBytes:"rfid_data_1234" length:14];
         params.userIndex = nil;
@@ -116171,19 +115036,19 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
                              {
                                  id actualValue = values.status;
-                                 VerifyOrReturn(CheckValue("status", actualValue, 0U));
+                                 VerifyOrReturn(CheckValue("Status", actualValue, 0U));
                              }
 
                              {
                                  id actualValue = values.userIndex;
-                                 VerifyOrReturn(CheckValueNonNull("userIndex", actualValue));
-                                 VerifyOrReturn(CheckValue("userIndex", actualValue, 3U));
+                                 VerifyOrReturn(CheckValueNonNull("UserIndex", actualValue));
+                                 VerifyOrReturn(CheckValue("UserIndex", actualValue, 3U));
                              }
 
                              {
                                  id actualValue = values.nextCredentialIndex;
-                                 VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue));
-                                 VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 3U));
+                                 VerifyOrReturn(CheckValueNonNull("NextCredentialIndex", actualValue));
+                                 VerifyOrReturn(CheckValue("NextCredentialIndex", actualValue, 3U));
                              }
 
                              NextTest();
@@ -116202,9 +115067,9 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
         __auto_type * params = [[MTRDoorLockClusterSetCredentialParams alloc] init];
         params.operationType = [NSNumber numberWithUnsignedChar:0U];
-        params.credential = [[MTRDoorLockClusterDlCredential alloc] init];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:2U];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:6U];
+        params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:2U];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:6U];
 
         params.credentialData = [[NSData alloc] initWithBytes:"rfid_data_9876" length:14];
         params.userIndex = nil;
@@ -116219,19 +115084,19 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
                              {
                                  id actualValue = values.status;
-                                 VerifyOrReturn(CheckValue("status", actualValue, 0U));
+                                 VerifyOrReturn(CheckValue("Status", actualValue, 0U));
                              }
 
                              {
                                  id actualValue = values.userIndex;
-                                 VerifyOrReturn(CheckValueNonNull("userIndex", actualValue));
-                                 VerifyOrReturn(CheckValue("userIndex", actualValue, 4U));
+                                 VerifyOrReturn(CheckValueNonNull("UserIndex", actualValue));
+                                 VerifyOrReturn(CheckValue("UserIndex", actualValue, 4U));
                              }
 
                              {
                                  id actualValue = values.nextCredentialIndex;
-                                 VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue));
-                                 VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 7U));
+                                 VerifyOrReturn(CheckValueNonNull("NextCredentialIndex", actualValue));
+                                 VerifyOrReturn(CheckValue("NextCredentialIndex", actualValue, 7U));
                              }
 
                              NextTest();
@@ -116271,9 +115136,9 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         __auto_type * params = [[MTRDoorLockClusterGetCredentialStatusParams alloc] init];
-        params.credential = [[MTRDoorLockClusterDlCredential alloc] init];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U];
+        params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U];
 
         [cluster getCredentialStatusWithParams:params
                                     completion:^(MTRDoorLockClusterGetCredentialStatusResponseParams * _Nullable values,
@@ -116284,27 +115149,27 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
                                         {
                                             id actualValue = values.credentialExists;
-                                            VerifyOrReturn(CheckValue("credentialExists", actualValue, false));
+                                            VerifyOrReturn(CheckValue("CredentialExists", actualValue, false));
                                         }
 
                                         {
                                             id actualValue = values.userIndex;
-                                            VerifyOrReturn(CheckValueNull("userIndex", actualValue));
+                                            VerifyOrReturn(CheckValueNull("UserIndex", actualValue));
                                         }
 
                                         {
                                             id actualValue = values.creatorFabricIndex;
-                                            VerifyOrReturn(CheckValueNull("creatorFabricIndex", actualValue));
+                                            VerifyOrReturn(CheckValueNull("CreatorFabricIndex", actualValue));
                                         }
 
                                         {
                                             id actualValue = values.lastModifiedFabricIndex;
-                                            VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", actualValue));
+                                            VerifyOrReturn(CheckValueNull("LastModifiedFabricIndex", actualValue));
                                         }
 
                                         {
                                             id actualValue = values.nextCredentialIndex;
-                                            VerifyOrReturn(CheckValueNull("nextCredentialIndex", actualValue));
+                                            VerifyOrReturn(CheckValueNull("NextCredentialIndex", actualValue));
                                         }
 
                                         NextTest();
@@ -116322,9 +115187,9 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         __auto_type * params = [[MTRDoorLockClusterGetCredentialStatusParams alloc] init];
-        params.credential = [[MTRDoorLockClusterDlCredential alloc] init];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:2U];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:2U];
+        params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:2U];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:2U];
 
         [cluster getCredentialStatusWithParams:params
                                     completion:^(MTRDoorLockClusterGetCredentialStatusResponseParams * _Nullable values,
@@ -116335,27 +115200,27 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
                                         {
                                             id actualValue = values.credentialExists;
-                                            VerifyOrReturn(CheckValue("credentialExists", actualValue, false));
+                                            VerifyOrReturn(CheckValue("CredentialExists", actualValue, false));
                                         }
 
                                         {
                                             id actualValue = values.userIndex;
-                                            VerifyOrReturn(CheckValueNull("userIndex", actualValue));
+                                            VerifyOrReturn(CheckValueNull("UserIndex", actualValue));
                                         }
 
                                         {
                                             id actualValue = values.creatorFabricIndex;
-                                            VerifyOrReturn(CheckValueNull("creatorFabricIndex", actualValue));
+                                            VerifyOrReturn(CheckValueNull("CreatorFabricIndex", actualValue));
                                         }
 
                                         {
                                             id actualValue = values.lastModifiedFabricIndex;
-                                            VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", actualValue));
+                                            VerifyOrReturn(CheckValueNull("LastModifiedFabricIndex", actualValue));
                                         }
 
                                         {
                                             id actualValue = values.nextCredentialIndex;
-                                            VerifyOrReturn(CheckValueNull("nextCredentialIndex", actualValue));
+                                            VerifyOrReturn(CheckValueNull("NextCredentialIndex", actualValue));
                                         }
 
                                         NextTest();
@@ -116373,9 +115238,9 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         __auto_type * params = [[MTRDoorLockClusterGetCredentialStatusParams alloc] init];
-        params.credential = [[MTRDoorLockClusterDlCredential alloc] init];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:6U];
+        params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:6U];
 
         [cluster getCredentialStatusWithParams:params
                                     completion:^(MTRDoorLockClusterGetCredentialStatusResponseParams * _Nullable values,
@@ -116386,27 +115251,27 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
                                         {
                                             id actualValue = values.credentialExists;
-                                            VerifyOrReturn(CheckValue("credentialExists", actualValue, false));
+                                            VerifyOrReturn(CheckValue("CredentialExists", actualValue, false));
                                         }
 
                                         {
                                             id actualValue = values.userIndex;
-                                            VerifyOrReturn(CheckValueNull("userIndex", actualValue));
+                                            VerifyOrReturn(CheckValueNull("UserIndex", actualValue));
                                         }
 
                                         {
                                             id actualValue = values.creatorFabricIndex;
-                                            VerifyOrReturn(CheckValueNull("creatorFabricIndex", actualValue));
+                                            VerifyOrReturn(CheckValueNull("CreatorFabricIndex", actualValue));
                                         }
 
                                         {
                                             id actualValue = values.lastModifiedFabricIndex;
-                                            VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", actualValue));
+                                            VerifyOrReturn(CheckValueNull("LastModifiedFabricIndex", actualValue));
                                         }
 
                                         {
                                             id actualValue = values.nextCredentialIndex;
-                                            VerifyOrReturn(CheckValueNull("nextCredentialIndex", actualValue));
+                                            VerifyOrReturn(CheckValueNull("NextCredentialIndex", actualValue));
                                         }
 
                                         NextTest();
@@ -116433,52 +115298,52 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
                             {
                                 id actualValue = values.userIndex;
-                                VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
+                                VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U));
                             }
 
                             {
                                 id actualValue = values.userName;
-                                VerifyOrReturn(CheckValueNull("userName", actualValue));
+                                VerifyOrReturn(CheckValueNull("UserName", actualValue));
                             }
 
                             {
-                                id actualValue = values.userUniqueId;
-                                VerifyOrReturn(CheckValueNull("userUniqueId", actualValue));
+                                id actualValue = values.userUniqueID;
+                                VerifyOrReturn(CheckValueNull("UserUniqueID", actualValue));
                             }
 
                             {
                                 id actualValue = values.userStatus;
-                                VerifyOrReturn(CheckValueNull("userStatus", actualValue));
+                                VerifyOrReturn(CheckValueNull("UserStatus", actualValue));
                             }
 
                             {
                                 id actualValue = values.userType;
-                                VerifyOrReturn(CheckValueNull("userType", actualValue));
+                                VerifyOrReturn(CheckValueNull("UserType", actualValue));
                             }
 
                             {
                                 id actualValue = values.credentialRule;
-                                VerifyOrReturn(CheckValueNull("credentialRule", actualValue));
+                                VerifyOrReturn(CheckValueNull("CredentialRule", actualValue));
                             }
 
                             {
                                 id actualValue = values.credentials;
-                                VerifyOrReturn(CheckValueNull("credentials", actualValue));
+                                VerifyOrReturn(CheckValueNull("Credentials", actualValue));
                             }
 
                             {
                                 id actualValue = values.creatorFabricIndex;
-                                VerifyOrReturn(CheckValueNull("creatorFabricIndex", actualValue));
+                                VerifyOrReturn(CheckValueNull("CreatorFabricIndex", actualValue));
                             }
 
                             {
                                 id actualValue = values.lastModifiedFabricIndex;
-                                VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", actualValue));
+                                VerifyOrReturn(CheckValueNull("LastModifiedFabricIndex", actualValue));
                             }
 
                             {
                                 id actualValue = values.nextUserIndex;
-                                VerifyOrReturn(CheckValueNull("nextUserIndex", actualValue));
+                                VerifyOrReturn(CheckValueNull("NextUserIndex", actualValue));
                             }
 
                             NextTest();
@@ -116505,52 +115370,52 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
                             {
                                 id actualValue = values.userIndex;
-                                VerifyOrReturn(CheckValue("userIndex", actualValue, 2U));
+                                VerifyOrReturn(CheckValue("UserIndex", actualValue, 2U));
                             }
 
                             {
                                 id actualValue = values.userName;
-                                VerifyOrReturn(CheckValueNull("userName", actualValue));
+                                VerifyOrReturn(CheckValueNull("UserName", actualValue));
                             }
 
                             {
-                                id actualValue = values.userUniqueId;
-                                VerifyOrReturn(CheckValueNull("userUniqueId", actualValue));
+                                id actualValue = values.userUniqueID;
+                                VerifyOrReturn(CheckValueNull("UserUniqueID", actualValue));
                             }
 
                             {
                                 id actualValue = values.userStatus;
-                                VerifyOrReturn(CheckValueNull("userStatus", actualValue));
+                                VerifyOrReturn(CheckValueNull("UserStatus", actualValue));
                             }
 
                             {
                                 id actualValue = values.userType;
-                                VerifyOrReturn(CheckValueNull("userType", actualValue));
+                                VerifyOrReturn(CheckValueNull("UserType", actualValue));
                             }
 
                             {
                                 id actualValue = values.credentialRule;
-                                VerifyOrReturn(CheckValueNull("credentialRule", actualValue));
+                                VerifyOrReturn(CheckValueNull("CredentialRule", actualValue));
                             }
 
                             {
                                 id actualValue = values.credentials;
-                                VerifyOrReturn(CheckValueNull("credentials", actualValue));
+                                VerifyOrReturn(CheckValueNull("Credentials", actualValue));
                             }
 
                             {
                                 id actualValue = values.creatorFabricIndex;
-                                VerifyOrReturn(CheckValueNull("creatorFabricIndex", actualValue));
+                                VerifyOrReturn(CheckValueNull("CreatorFabricIndex", actualValue));
                             }
 
                             {
                                 id actualValue = values.lastModifiedFabricIndex;
-                                VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", actualValue));
+                                VerifyOrReturn(CheckValueNull("LastModifiedFabricIndex", actualValue));
                             }
 
                             {
                                 id actualValue = values.nextUserIndex;
-                                VerifyOrReturn(CheckValueNull("nextUserIndex", actualValue));
+                                VerifyOrReturn(CheckValueNull("NextUserIndex", actualValue));
                             }
 
                             NextTest();
@@ -116577,52 +115442,52 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
                             {
                                 id actualValue = values.userIndex;
-                                VerifyOrReturn(CheckValue("userIndex", actualValue, 3U));
+                                VerifyOrReturn(CheckValue("UserIndex", actualValue, 3U));
                             }
 
                             {
                                 id actualValue = values.userName;
-                                VerifyOrReturn(CheckValueNull("userName", actualValue));
+                                VerifyOrReturn(CheckValueNull("UserName", actualValue));
                             }
 
                             {
-                                id actualValue = values.userUniqueId;
-                                VerifyOrReturn(CheckValueNull("userUniqueId", actualValue));
+                                id actualValue = values.userUniqueID;
+                                VerifyOrReturn(CheckValueNull("UserUniqueID", actualValue));
                             }
 
                             {
                                 id actualValue = values.userStatus;
-                                VerifyOrReturn(CheckValueNull("userStatus", actualValue));
+                                VerifyOrReturn(CheckValueNull("UserStatus", actualValue));
                             }
 
                             {
                                 id actualValue = values.userType;
-                                VerifyOrReturn(CheckValueNull("userType", actualValue));
+                                VerifyOrReturn(CheckValueNull("UserType", actualValue));
                             }
 
                             {
                                 id actualValue = values.credentialRule;
-                                VerifyOrReturn(CheckValueNull("credentialRule", actualValue));
+                                VerifyOrReturn(CheckValueNull("CredentialRule", actualValue));
                             }
 
                             {
                                 id actualValue = values.credentials;
-                                VerifyOrReturn(CheckValueNull("credentials", actualValue));
+                                VerifyOrReturn(CheckValueNull("Credentials", actualValue));
                             }
 
                             {
                                 id actualValue = values.creatorFabricIndex;
-                                VerifyOrReturn(CheckValueNull("creatorFabricIndex", actualValue));
+                                VerifyOrReturn(CheckValueNull("CreatorFabricIndex", actualValue));
                             }
 
                             {
                                 id actualValue = values.lastModifiedFabricIndex;
-                                VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", actualValue));
+                                VerifyOrReturn(CheckValueNull("LastModifiedFabricIndex", actualValue));
                             }
 
                             {
                                 id actualValue = values.nextUserIndex;
-                                VerifyOrReturn(CheckValueNull("nextUserIndex", actualValue));
+                                VerifyOrReturn(CheckValueNull("NextUserIndex", actualValue));
                             }
 
                             NextTest();
@@ -116649,52 +115514,52 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
                             {
                                 id actualValue = values.userIndex;
-                                VerifyOrReturn(CheckValue("userIndex", actualValue, 4U));
+                                VerifyOrReturn(CheckValue("UserIndex", actualValue, 4U));
                             }
 
                             {
                                 id actualValue = values.userName;
-                                VerifyOrReturn(CheckValueNull("userName", actualValue));
+                                VerifyOrReturn(CheckValueNull("UserName", actualValue));
                             }
 
                             {
-                                id actualValue = values.userUniqueId;
-                                VerifyOrReturn(CheckValueNull("userUniqueId", actualValue));
+                                id actualValue = values.userUniqueID;
+                                VerifyOrReturn(CheckValueNull("UserUniqueID", actualValue));
                             }
 
                             {
                                 id actualValue = values.userStatus;
-                                VerifyOrReturn(CheckValueNull("userStatus", actualValue));
+                                VerifyOrReturn(CheckValueNull("UserStatus", actualValue));
                             }
 
                             {
                                 id actualValue = values.userType;
-                                VerifyOrReturn(CheckValueNull("userType", actualValue));
+                                VerifyOrReturn(CheckValueNull("UserType", actualValue));
                             }
 
                             {
                                 id actualValue = values.credentialRule;
-                                VerifyOrReturn(CheckValueNull("credentialRule", actualValue));
+                                VerifyOrReturn(CheckValueNull("CredentialRule", actualValue));
                             }
 
                             {
                                 id actualValue = values.credentials;
-                                VerifyOrReturn(CheckValueNull("credentials", actualValue));
+                                VerifyOrReturn(CheckValueNull("Credentials", actualValue));
                             }
 
                             {
                                 id actualValue = values.creatorFabricIndex;
-                                VerifyOrReturn(CheckValueNull("creatorFabricIndex", actualValue));
+                                VerifyOrReturn(CheckValueNull("CreatorFabricIndex", actualValue));
                             }
 
                             {
                                 id actualValue = values.lastModifiedFabricIndex;
-                                VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", actualValue));
+                                VerifyOrReturn(CheckValueNull("LastModifiedFabricIndex", actualValue));
                             }
 
                             {
                                 id actualValue = values.nextUserIndex;
-                                VerifyOrReturn(CheckValueNull("nextUserIndex", actualValue));
+                                VerifyOrReturn(CheckValueNull("NextUserIndex", actualValue));
                             }
 
                             NextTest();
@@ -116713,9 +115578,9 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
         __auto_type * params = [[MTRDoorLockClusterSetCredentialParams alloc] init];
         params.operationType = [NSNumber numberWithUnsignedChar:0U];
-        params.credential = [[MTRDoorLockClusterDlCredential alloc] init];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:0U];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U];
+        params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:0U];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U];
 
         params.credentialData = [[NSData alloc] initWithBytes:"123456" length:6];
         params.userIndex = nil;
@@ -116730,17 +115595,17 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
                              {
                                  id actualValue = values.status;
-                                 VerifyOrReturn(CheckValue("status", actualValue, 133U));
+                                 VerifyOrReturn(CheckValue("Status", actualValue, 133U));
                              }
 
                              {
                                  id actualValue = values.userIndex;
-                                 VerifyOrReturn(CheckValueNull("userIndex", actualValue));
+                                 VerifyOrReturn(CheckValueNull("UserIndex", actualValue));
                              }
 
                              {
                                  id actualValue = values.nextCredentialIndex;
-                                 VerifyOrReturn(CheckValueNull("nextCredentialIndex", actualValue));
+                                 VerifyOrReturn(CheckValueNull("NextCredentialIndex", actualValue));
                              }
 
                              NextTest();
@@ -116759,9 +115624,9 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
         __auto_type * params = [[MTRDoorLockClusterSetCredentialParams alloc] init];
         params.operationType = [NSNumber numberWithUnsignedChar:0U];
-        params.credential = [[MTRDoorLockClusterDlCredential alloc] init];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:0U];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:0U];
+        params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:0U];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:0U];
 
         params.credentialData = [[NSData alloc] initWithBytes:"123456" length:6];
         params.userIndex = nil;
@@ -116776,18 +115641,18 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
                              {
                                  id actualValue = values.status;
-                                 VerifyOrReturn(CheckValue("status", actualValue, 0U));
+                                 VerifyOrReturn(CheckValue("Status", actualValue, 0U));
                              }
 
                              {
                                  id actualValue = values.userIndex;
-                                 VerifyOrReturn(CheckValueNonNull("userIndex", actualValue));
-                                 VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
+                                 VerifyOrReturn(CheckValueNonNull("UserIndex", actualValue));
+                                 VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U));
                              }
 
                              {
                                  id actualValue = values.nextCredentialIndex;
-                                 VerifyOrReturn(CheckValueNull("nextCredentialIndex", actualValue));
+                                 VerifyOrReturn(CheckValueNull("NextCredentialIndex", actualValue));
                              }
 
                              NextTest();
@@ -116814,63 +115679,63 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
                             {
                                 id actualValue = values.userIndex;
-                                VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
+                                VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U));
                             }
 
                             {
                                 id actualValue = values.userName;
-                                VerifyOrReturn(CheckValueNonNull("userName", actualValue));
-                                VerifyOrReturn(CheckValueAsString("userName", actualValue, @""));
+                                VerifyOrReturn(CheckValueNonNull("UserName", actualValue));
+                                VerifyOrReturn(CheckValueAsString("UserName", actualValue, @""));
                             }
 
                             {
-                                id actualValue = values.userUniqueId;
-                                VerifyOrReturn(CheckValueNull("userUniqueId", actualValue));
+                                id actualValue = values.userUniqueID;
+                                VerifyOrReturn(CheckValueNull("UserUniqueID", actualValue));
                             }
 
                             {
                                 id actualValue = values.userStatus;
-                                VerifyOrReturn(CheckValueNonNull("userStatus", actualValue));
-                                VerifyOrReturn(CheckValue("userStatus", actualValue, 1U));
+                                VerifyOrReturn(CheckValueNonNull("UserStatus", actualValue));
+                                VerifyOrReturn(CheckValue("UserStatus", actualValue, 1U));
                             }
 
                             {
                                 id actualValue = values.userType;
-                                VerifyOrReturn(CheckValueNonNull("userType", actualValue));
-                                VerifyOrReturn(CheckValue("userType", actualValue, 0U));
+                                VerifyOrReturn(CheckValueNonNull("UserType", actualValue));
+                                VerifyOrReturn(CheckValue("UserType", actualValue, 0U));
                             }
 
                             {
                                 id actualValue = values.credentialRule;
-                                VerifyOrReturn(CheckValueNonNull("credentialRule", actualValue));
-                                VerifyOrReturn(CheckValue("credentialRule", actualValue, 0U));
+                                VerifyOrReturn(CheckValueNonNull("CredentialRule", actualValue));
+                                VerifyOrReturn(CheckValue("CredentialRule", actualValue, 0U));
                             }
 
                             {
                                 id actualValue = values.credentials;
-                                VerifyOrReturn(CheckValueNonNull("credentials", actualValue));
-                                VerifyOrReturn(CheckValue("credentials", [actualValue count], static_cast<uint32_t>(1)));
-                                VerifyOrReturn(CheckValue(
-                                    "CredentialType", ((MTRDoorLockClusterDlCredential *) actualValue[0]).credentialType, 0U));
+                                VerifyOrReturn(CheckValueNonNull("Credentials", actualValue));
+                                VerifyOrReturn(CheckValue("Credentials", [actualValue count], static_cast<uint32_t>(1)));
                                 VerifyOrReturn(CheckValue(
-                                    "CredentialIndex", ((MTRDoorLockClusterDlCredential *) actualValue[0]).credentialIndex, 0U));
+                                    "CredentialType", ((MTRDoorLockClusterCredentialStruct *) actualValue[0]).credentialType, 0U));
+                                VerifyOrReturn(CheckValue("CredentialIndex",
+                                    ((MTRDoorLockClusterCredentialStruct *) actualValue[0]).credentialIndex, 0U));
                             }
 
                             {
                                 id actualValue = values.creatorFabricIndex;
-                                VerifyOrReturn(CheckValueNonNull("creatorFabricIndex", actualValue));
-                                VerifyOrReturn(CheckValue("creatorFabricIndex", actualValue, 1U));
+                                VerifyOrReturn(CheckValueNonNull("CreatorFabricIndex", actualValue));
+                                VerifyOrReturn(CheckValue("CreatorFabricIndex", actualValue, 1U));
                             }
 
                             {
                                 id actualValue = values.lastModifiedFabricIndex;
-                                VerifyOrReturn(CheckValueNonNull("lastModifiedFabricIndex", actualValue));
-                                VerifyOrReturn(CheckValue("lastModifiedFabricIndex", actualValue, 1U));
+                                VerifyOrReturn(CheckValueNonNull("LastModifiedFabricIndex", actualValue));
+                                VerifyOrReturn(CheckValue("LastModifiedFabricIndex", actualValue, 1U));
                             }
 
                             {
                                 id actualValue = values.nextUserIndex;
-                                VerifyOrReturn(CheckValueNull("nextUserIndex", actualValue));
+                                VerifyOrReturn(CheckValueNull("NextUserIndex", actualValue));
                             }
 
                             NextTest();
@@ -116888,9 +115753,9 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         __auto_type * params = [[MTRDoorLockClusterGetCredentialStatusParams alloc] init];
-        params.credential = [[MTRDoorLockClusterDlCredential alloc] init];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:0U];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:0U];
+        params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:0U];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:0U];
 
         [cluster getCredentialStatusWithParams:params
                                     completion:^(MTRDoorLockClusterGetCredentialStatusResponseParams * _Nullable values,
@@ -116901,30 +115766,30 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
                                         {
                                             id actualValue = values.credentialExists;
-                                            VerifyOrReturn(CheckValue("credentialExists", actualValue, true));
+                                            VerifyOrReturn(CheckValue("CredentialExists", actualValue, true));
                                         }
 
                                         {
                                             id actualValue = values.userIndex;
-                                            VerifyOrReturn(CheckValueNonNull("userIndex", actualValue));
-                                            VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
+                                            VerifyOrReturn(CheckValueNonNull("UserIndex", actualValue));
+                                            VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U));
                                         }
 
                                         {
                                             id actualValue = values.creatorFabricIndex;
-                                            VerifyOrReturn(CheckValueNonNull("creatorFabricIndex", actualValue));
-                                            VerifyOrReturn(CheckValue("creatorFabricIndex", actualValue, 1U));
+                                            VerifyOrReturn(CheckValueNonNull("CreatorFabricIndex", actualValue));
+                                            VerifyOrReturn(CheckValue("CreatorFabricIndex", actualValue, 1U));
                                         }
 
                                         {
                                             id actualValue = values.lastModifiedFabricIndex;
-                                            VerifyOrReturn(CheckValueNonNull("lastModifiedFabricIndex", actualValue));
-                                            VerifyOrReturn(CheckValue("lastModifiedFabricIndex", actualValue, 1U));
+                                            VerifyOrReturn(CheckValueNonNull("LastModifiedFabricIndex", actualValue));
+                                            VerifyOrReturn(CheckValue("LastModifiedFabricIndex", actualValue, 1U));
                                         }
 
                                         {
                                             id actualValue = values.nextCredentialIndex;
-                                            VerifyOrReturn(CheckValueNull("nextCredentialIndex", actualValue));
+                                            VerifyOrReturn(CheckValueNull("NextCredentialIndex", actualValue));
                                         }
 
                                         NextTest();
@@ -116943,9 +115808,9 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
         __auto_type * params = [[MTRDoorLockClusterSetCredentialParams alloc] init];
         params.operationType = [NSNumber numberWithUnsignedChar:2U];
-        params.credential = [[MTRDoorLockClusterDlCredential alloc] init];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:0U];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:0U];
+        params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:0U];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:0U];
 
         params.credentialData = [[NSData alloc] initWithBytes:"654321" length:6];
         params.userIndex = nil;
@@ -116960,17 +115825,17 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
                              {
                                  id actualValue = values.status;
-                                 VerifyOrReturn(CheckValue("status", actualValue, 0U));
+                                 VerifyOrReturn(CheckValue("Status", actualValue, 0U));
                              }
 
                              {
                                  id actualValue = values.userIndex;
-                                 VerifyOrReturn(CheckValueNull("userIndex", actualValue));
+                                 VerifyOrReturn(CheckValueNull("UserIndex", actualValue));
                              }
 
                              {
                                  id actualValue = values.nextCredentialIndex;
-                                 VerifyOrReturn(CheckValueNull("nextCredentialIndex", actualValue));
+                                 VerifyOrReturn(CheckValueNull("NextCredentialIndex", actualValue));
                              }
 
                              NextTest();
@@ -116988,9 +115853,9 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         __auto_type * params = [[MTRDoorLockClusterClearCredentialParams alloc] init];
-        params.credential = [[MTRDoorLockClusterDlCredential alloc] init];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:0U];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:0U];
+        params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:0U];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:0U];
 
         [cluster clearCredentialWithParams:params
                                 completion:^(NSError * _Nullable err) {
@@ -117016,9 +115881,9 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         __auto_type * params = [[MTRDoorLockClusterClearCredentialParams alloc] init];
-        params.credential = [[MTRDoorLockClusterDlCredential alloc] init];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:0U];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U];
+        params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:0U];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U];
 
         [cluster clearCredentialWithParams:params
                                 completion:^(NSError * _Nullable err) {
@@ -117044,9 +115909,9 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         __auto_type * params = [[MTRDoorLockClusterClearCredentialParams alloc] init];
-        params.credential = [[MTRDoorLockClusterDlCredential alloc] init];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:0U];
+        params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:0U];
 
         [cluster clearCredentialWithParams:params
                                 completion:^(NSError * _Nullable err) {
@@ -117072,9 +115937,9 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         __auto_type * params = [[MTRDoorLockClusterClearCredentialParams alloc] init];
-        params.credential = [[MTRDoorLockClusterDlCredential alloc] init];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex =
+        params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex =
             [NSNumber numberWithUnsignedShort:[NumberOfPINUsersSupported unsignedShortValue] + 1U];
 
         [cluster clearCredentialWithParams:params
@@ -117101,9 +115966,9 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         __auto_type * params = [[MTRDoorLockClusterClearCredentialParams alloc] init];
-        params.credential = [[MTRDoorLockClusterDlCredential alloc] init];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:2U];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:0U];
+        params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:2U];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:0U];
 
         [cluster clearCredentialWithParams:params
                                 completion:^(NSError * _Nullable err) {
@@ -117129,9 +115994,9 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         __auto_type * params = [[MTRDoorLockClusterClearCredentialParams alloc] init];
-        params.credential = [[MTRDoorLockClusterDlCredential alloc] init];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:2U];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex =
+        params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:2U];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex =
             [NSNumber numberWithUnsignedShort:[NumberOfRFIDUsersSupported unsignedShortValue] + 1U];
 
         [cluster clearCredentialWithParams:params
@@ -117189,52 +116054,52 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
                             {
                                 id actualValue = values.userIndex;
-                                VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
+                                VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U));
                             }
 
                             {
                                 id actualValue = values.userName;
-                                VerifyOrReturn(CheckValueNull("userName", actualValue));
+                                VerifyOrReturn(CheckValueNull("UserName", actualValue));
                             }
 
                             {
-                                id actualValue = values.userUniqueId;
-                                VerifyOrReturn(CheckValueNull("userUniqueId", actualValue));
+                                id actualValue = values.userUniqueID;
+                                VerifyOrReturn(CheckValueNull("UserUniqueID", actualValue));
                             }
 
                             {
                                 id actualValue = values.userStatus;
-                                VerifyOrReturn(CheckValueNull("userStatus", actualValue));
+                                VerifyOrReturn(CheckValueNull("UserStatus", actualValue));
                             }
 
                             {
                                 id actualValue = values.userType;
-                                VerifyOrReturn(CheckValueNull("userType", actualValue));
+                                VerifyOrReturn(CheckValueNull("UserType", actualValue));
                             }
 
                             {
                                 id actualValue = values.credentialRule;
-                                VerifyOrReturn(CheckValueNull("credentialRule", actualValue));
+                                VerifyOrReturn(CheckValueNull("CredentialRule", actualValue));
                             }
 
                             {
                                 id actualValue = values.credentials;
-                                VerifyOrReturn(CheckValueNull("credentials", actualValue));
+                                VerifyOrReturn(CheckValueNull("Credentials", actualValue));
                             }
 
                             {
                                 id actualValue = values.creatorFabricIndex;
-                                VerifyOrReturn(CheckValueNull("creatorFabricIndex", actualValue));
+                                VerifyOrReturn(CheckValueNull("CreatorFabricIndex", actualValue));
                             }
 
                             {
                                 id actualValue = values.lastModifiedFabricIndex;
-                                VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", actualValue));
+                                VerifyOrReturn(CheckValueNull("LastModifiedFabricIndex", actualValue));
                             }
 
                             {
                                 id actualValue = values.nextUserIndex;
-                                VerifyOrReturn(CheckValueNull("nextUserIndex", actualValue));
+                                VerifyOrReturn(CheckValueNull("NextUserIndex", actualValue));
                             }
 
                             NextTest();
@@ -117252,9 +116117,9 @@ class DL_UsersAndCredentials : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         __auto_type * params = [[MTRDoorLockClusterGetCredentialStatusParams alloc] init];
-        params.credential = [[MTRDoorLockClusterDlCredential alloc] init];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:0U];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:0U];
+        params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:0U];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:0U];
 
         [cluster getCredentialStatusWithParams:params
                                     completion:^(MTRDoorLockClusterGetCredentialStatusResponseParams * _Nullable values,
@@ -117265,27 +116130,27 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
                                         {
                                             id actualValue = values.credentialExists;
-                                            VerifyOrReturn(CheckValue("credentialExists", actualValue, false));
+                                            VerifyOrReturn(CheckValue("CredentialExists", actualValue, false));
                                         }
 
                                         {
                                             id actualValue = values.userIndex;
-                                            VerifyOrReturn(CheckValueNull("userIndex", actualValue));
+                                            VerifyOrReturn(CheckValueNull("UserIndex", actualValue));
                                         }
 
                                         {
                                             id actualValue = values.creatorFabricIndex;
-                                            VerifyOrReturn(CheckValueNull("creatorFabricIndex", actualValue));
+                                            VerifyOrReturn(CheckValueNull("CreatorFabricIndex", actualValue));
                                         }
 
                                         {
                                             id actualValue = values.lastModifiedFabricIndex;
-                                            VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", actualValue));
+                                            VerifyOrReturn(CheckValueNull("LastModifiedFabricIndex", actualValue));
                                         }
 
                                         {
                                             id actualValue = values.nextCredentialIndex;
-                                            VerifyOrReturn(CheckValueNull("nextCredentialIndex", actualValue));
+                                            VerifyOrReturn(CheckValueNull("NextCredentialIndex", actualValue));
                                         }
 
                                         NextTest();
@@ -117304,9 +116169,9 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
         __auto_type * params = [[MTRDoorLockClusterSetCredentialParams alloc] init];
         params.operationType = [NSNumber numberWithUnsignedChar:0U];
-        params.credential = [[MTRDoorLockClusterDlCredential alloc] init];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U];
+        params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U];
 
         params.credentialData = [[NSData alloc] initWithBytes:"000000" length:6];
         params.userIndex = nil;
@@ -117321,19 +116186,19 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
                              {
                                  id actualValue = values.status;
-                                 VerifyOrReturn(CheckValue("status", actualValue, 0U));
+                                 VerifyOrReturn(CheckValue("Status", actualValue, 0U));
                              }
 
                              {
                                  id actualValue = values.userIndex;
-                                 VerifyOrReturn(CheckValueNonNull("userIndex", actualValue));
-                                 VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
+                                 VerifyOrReturn(CheckValueNonNull("UserIndex", actualValue));
+                                 VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U));
                              }
 
                              {
                                  id actualValue = values.nextCredentialIndex;
-                                 VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue));
-                                 VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 2U));
+                                 VerifyOrReturn(CheckValueNonNull("NextCredentialIndex", actualValue));
+                                 VerifyOrReturn(CheckValue("NextCredentialIndex", actualValue, 2U));
                              }
 
                              NextTest();
@@ -117352,9 +116217,9 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
         __auto_type * params = [[MTRDoorLockClusterSetCredentialParams alloc] init];
         params.operationType = [NSNumber numberWithUnsignedChar:0U];
-        params.credential = [[MTRDoorLockClusterDlCredential alloc] init];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:2U];
+        params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:2U];
 
         params.credentialData = [[NSData alloc] initWithBytes:"000001" length:6];
         params.userIndex = [NSNumber numberWithUnsignedShort:1U];
@@ -117369,18 +116234,18 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
                              {
                                  id actualValue = values.status;
-                                 VerifyOrReturn(CheckValue("status", actualValue, 0U));
+                                 VerifyOrReturn(CheckValue("Status", actualValue, 0U));
                              }
 
                              {
                                  id actualValue = values.userIndex;
-                                 VerifyOrReturn(CheckValueNull("userIndex", actualValue));
+                                 VerifyOrReturn(CheckValueNull("UserIndex", actualValue));
                              }
 
                              {
                                  id actualValue = values.nextCredentialIndex;
-                                 VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue));
-                                 VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 3U));
+                                 VerifyOrReturn(CheckValueNonNull("NextCredentialIndex", actualValue));
+                                 VerifyOrReturn(CheckValue("NextCredentialIndex", actualValue, 3U));
                              }
 
                              NextTest();
@@ -117399,9 +116264,9 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
         __auto_type * params = [[MTRDoorLockClusterSetCredentialParams alloc] init];
         params.operationType = [NSNumber numberWithUnsignedChar:0U];
-        params.credential = [[MTRDoorLockClusterDlCredential alloc] init];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:3U];
+        params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:3U];
 
         params.credentialData = [[NSData alloc] initWithBytes:"000002" length:6];
         params.userIndex = [NSNumber numberWithUnsignedShort:1U];
@@ -117416,18 +116281,18 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
                              {
                                  id actualValue = values.status;
-                                 VerifyOrReturn(CheckValue("status", actualValue, 0U));
+                                 VerifyOrReturn(CheckValue("Status", actualValue, 0U));
                              }
 
                              {
                                  id actualValue = values.userIndex;
-                                 VerifyOrReturn(CheckValueNull("userIndex", actualValue));
+                                 VerifyOrReturn(CheckValueNull("UserIndex", actualValue));
                              }
 
                              {
                                  id actualValue = values.nextCredentialIndex;
-                                 VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue));
-                                 VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 4U));
+                                 VerifyOrReturn(CheckValueNonNull("NextCredentialIndex", actualValue));
+                                 VerifyOrReturn(CheckValue("NextCredentialIndex", actualValue, 4U));
                              }
 
                              NextTest();
@@ -117446,9 +116311,9 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
         __auto_type * params = [[MTRDoorLockClusterSetCredentialParams alloc] init];
         params.operationType = [NSNumber numberWithUnsignedChar:0U];
-        params.credential = [[MTRDoorLockClusterDlCredential alloc] init];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:4U];
+        params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:4U];
 
         params.credentialData = [[NSData alloc] initWithBytes:"000003" length:6];
         params.userIndex = [NSNumber numberWithUnsignedShort:1U];
@@ -117463,18 +116328,18 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
                              {
                                  id actualValue = values.status;
-                                 VerifyOrReturn(CheckValue("status", actualValue, 0U));
+                                 VerifyOrReturn(CheckValue("Status", actualValue, 0U));
                              }
 
                              {
                                  id actualValue = values.userIndex;
-                                 VerifyOrReturn(CheckValueNull("userIndex", actualValue));
+                                 VerifyOrReturn(CheckValueNull("UserIndex", actualValue));
                              }
 
                              {
                                  id actualValue = values.nextCredentialIndex;
-                                 VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue));
-                                 VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 5U));
+                                 VerifyOrReturn(CheckValueNonNull("NextCredentialIndex", actualValue));
+                                 VerifyOrReturn(CheckValue("NextCredentialIndex", actualValue, 5U));
                              }
 
                              NextTest();
@@ -117493,9 +116358,9 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
         __auto_type * params = [[MTRDoorLockClusterSetCredentialParams alloc] init];
         params.operationType = [NSNumber numberWithUnsignedChar:0U];
-        params.credential = [[MTRDoorLockClusterDlCredential alloc] init];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:5U];
+        params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:5U];
 
         params.credentialData = [[NSData alloc] initWithBytes:"000004" length:6];
         params.userIndex = [NSNumber numberWithUnsignedShort:1U];
@@ -117510,18 +116375,18 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
                              {
                                  id actualValue = values.status;
-                                 VerifyOrReturn(CheckValue("status", actualValue, 0U));
+                                 VerifyOrReturn(CheckValue("Status", actualValue, 0U));
                              }
 
                              {
                                  id actualValue = values.userIndex;
-                                 VerifyOrReturn(CheckValueNull("userIndex", actualValue));
+                                 VerifyOrReturn(CheckValueNull("UserIndex", actualValue));
                              }
 
                              {
                                  id actualValue = values.nextCredentialIndex;
-                                 VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue));
-                                 VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 6U));
+                                 VerifyOrReturn(CheckValueNonNull("NextCredentialIndex", actualValue));
+                                 VerifyOrReturn(CheckValue("NextCredentialIndex", actualValue, 6U));
                              }
 
                              NextTest();
@@ -117540,9 +116405,9 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
         __auto_type * params = [[MTRDoorLockClusterSetCredentialParams alloc] init];
         params.operationType = [NSNumber numberWithUnsignedChar:0U];
-        params.credential = [[MTRDoorLockClusterDlCredential alloc] init];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:6U];
+        params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:6U];
 
         params.credentialData = [[NSData alloc] initWithBytes:"000005" length:6];
         params.userIndex = [NSNumber numberWithUnsignedShort:1U];
@@ -117557,18 +116422,18 @@ class DL_UsersAndCredentials : public TestCommandBridge {
 
                              {
                                  id actualValue = values.status;
-                                 VerifyOrReturn(CheckValue("status", actualValue, 137U));
+                                 VerifyOrReturn(CheckValue("Status", actualValue, 137U));
                              }
 
                              {
                                  id actualValue = values.userIndex;
-                                 VerifyOrReturn(CheckValueNull("userIndex", actualValue));
+                                 VerifyOrReturn(CheckValueNull("UserIndex", actualValue));
                              }
 
                              {
                                  id actualValue = values.nextCredentialIndex;
-                                 VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue));
-                                 VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 7U));
+                                 VerifyOrReturn(CheckValueNonNull("NextCredentialIndex", actualValue));
+                                 VerifyOrReturn(CheckValue("NextCredentialIndex", actualValue, 7U));
                              }
 
                              NextTest();
@@ -118054,9 +116919,9 @@ class DL_LockUnlock : public TestCommandBridge {
 
         __auto_type * params = [[MTRDoorLockClusterSetCredentialParams alloc] init];
         params.operationType = [NSNumber numberWithUnsignedChar:0U];
-        params.credential = [[MTRDoorLockClusterDlCredential alloc] init];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U];
+        params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U];
 
         params.credentialData = [[NSData alloc] initWithBytes:"123456" length:6];
         params.userIndex = nil;
@@ -118071,19 +116936,19 @@ class DL_LockUnlock : public TestCommandBridge {
 
                              {
                                  id actualValue = values.status;
-                                 VerifyOrReturn(CheckValue("status", actualValue, 0U));
+                                 VerifyOrReturn(CheckValue("Status", actualValue, 0U));
                              }
 
                              {
                                  id actualValue = values.userIndex;
-                                 VerifyOrReturn(CheckValueNonNull("userIndex", actualValue));
-                                 VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
+                                 VerifyOrReturn(CheckValueNonNull("UserIndex", actualValue));
+                                 VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U));
                              }
 
                              {
                                  id actualValue = values.nextCredentialIndex;
-                                 VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue));
-                                 VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 2U));
+                                 VerifyOrReturn(CheckValueNonNull("NextCredentialIndex", actualValue));
+                                 VerifyOrReturn(CheckValue("NextCredentialIndex", actualValue, 2U));
                              }
 
                              NextTest();
@@ -118614,9 +117479,9 @@ class DL_LockUnlock : public TestCommandBridge {
 
         __auto_type * params = [[MTRDoorLockClusterSetCredentialParams alloc] init];
         params.operationType = [NSNumber numberWithUnsignedChar:0U];
-        params.credential = [[MTRDoorLockClusterDlCredential alloc] init];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:2U];
+        params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:2U];
 
         params.credentialData = [[NSData alloc] initWithBytes:"654321" length:6];
         params.userIndex = nil;
@@ -118631,19 +117496,19 @@ class DL_LockUnlock : public TestCommandBridge {
 
                              {
                                  id actualValue = values.status;
-                                 VerifyOrReturn(CheckValue("status", actualValue, 0U));
+                                 VerifyOrReturn(CheckValue("Status", actualValue, 0U));
                              }
 
                              {
                                  id actualValue = values.userIndex;
-                                 VerifyOrReturn(CheckValueNonNull("userIndex", actualValue));
-                                 VerifyOrReturn(CheckValue("userIndex", actualValue, 2U));
+                                 VerifyOrReturn(CheckValueNonNull("UserIndex", actualValue));
+                                 VerifyOrReturn(CheckValue("UserIndex", actualValue, 2U));
                              }
 
                              {
                                  id actualValue = values.nextCredentialIndex;
-                                 VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue));
-                                 VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 3U));
+                                 VerifyOrReturn(CheckValueNonNull("NextCredentialIndex", actualValue));
+                                 VerifyOrReturn(CheckValue("NextCredentialIndex", actualValue, 3U));
                              }
 
                              NextTest();
@@ -119860,9 +118725,9 @@ class DL_Schedules : public TestCommandBridge {
 
         __auto_type * params = [[MTRDoorLockClusterSetCredentialParams alloc] init];
         params.operationType = [NSNumber numberWithUnsignedChar:0U];
-        params.credential = [[MTRDoorLockClusterDlCredential alloc] init];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U];
+        params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U];
 
         params.credentialData = [[NSData alloc] initWithBytes:"123456" length:6];
         params.userIndex = nil;
@@ -119877,19 +118742,19 @@ class DL_Schedules : public TestCommandBridge {
 
                              {
                                  id actualValue = values.status;
-                                 VerifyOrReturn(CheckValue("status", actualValue, 0U));
+                                 VerifyOrReturn(CheckValue("Status", actualValue, 0U));
                              }
 
                              {
                                  id actualValue = values.userIndex;
-                                 VerifyOrReturn(CheckValueNonNull("userIndex", actualValue));
-                                 VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
+                                 VerifyOrReturn(CheckValueNonNull("UserIndex", actualValue));
+                                 VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U));
                              }
 
                              {
                                  id actualValue = values.nextCredentialIndex;
-                                 VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue));
-                                 VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 2U));
+                                 VerifyOrReturn(CheckValueNonNull("NextCredentialIndex", actualValue));
+                                 VerifyOrReturn(CheckValue("NextCredentialIndex", actualValue, 2U));
                              }
 
                              NextTest();
@@ -120469,17 +119334,17 @@ class DL_Schedules : public TestCommandBridge {
 
                                        {
                                            id actualValue = values.weekDayIndex;
-                                           VerifyOrReturn(CheckValue("weekDayIndex", actualValue, 1U));
+                                           VerifyOrReturn(CheckValue("WeekDayIndex", actualValue, 1U));
                                        }
 
                                        {
                                            id actualValue = values.userIndex;
-                                           VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
+                                           VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U));
                                        }
 
                                        {
                                            id actualValue = values.status;
-                                           VerifyOrReturn(CheckValue("status", actualValue, 139U));
+                                           VerifyOrReturn(CheckValue("Status", actualValue, 139U));
                                        }
 
                                        NextTest();
@@ -120508,17 +119373,17 @@ class DL_Schedules : public TestCommandBridge {
 
                                        {
                                            id actualValue = values.weekDayIndex;
-                                           VerifyOrReturn(CheckValue("weekDayIndex", actualValue, 0U));
+                                           VerifyOrReturn(CheckValue("WeekDayIndex", actualValue, 0U));
                                        }
 
                                        {
                                            id actualValue = values.userIndex;
-                                           VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
+                                           VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U));
                                        }
 
                                        {
                                            id actualValue = values.status;
-                                           VerifyOrReturn(CheckValue("status", actualValue, 133U));
+                                           VerifyOrReturn(CheckValue("Status", actualValue, 133U));
                                        }
 
                                        NextTest();
@@ -120547,18 +119412,18 @@ class DL_Schedules : public TestCommandBridge {
 
                                        {
                                            id actualValue = values.weekDayIndex;
-                                           VerifyOrReturn(CheckValue("weekDayIndex", actualValue,
+                                           VerifyOrReturn(CheckValue("WeekDayIndex", actualValue,
                                                [NumberOfWeekDaySchedulesSupportedPerUser unsignedCharValue] + 1U));
                                        }
 
                                        {
                                            id actualValue = values.userIndex;
-                                           VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
+                                           VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U));
                                        }
 
                                        {
                                            id actualValue = values.status;
-                                           VerifyOrReturn(CheckValue("status", actualValue, 133U));
+                                           VerifyOrReturn(CheckValue("Status", actualValue, 133U));
                                        }
 
                                        NextTest();
@@ -120587,17 +119452,17 @@ class DL_Schedules : public TestCommandBridge {
 
                                        {
                                            id actualValue = values.weekDayIndex;
-                                           VerifyOrReturn(CheckValue("weekDayIndex", actualValue, 1U));
+                                           VerifyOrReturn(CheckValue("WeekDayIndex", actualValue, 1U));
                                        }
 
                                        {
                                            id actualValue = values.userIndex;
-                                           VerifyOrReturn(CheckValue("userIndex", actualValue, 0U));
+                                           VerifyOrReturn(CheckValue("UserIndex", actualValue, 0U));
                                        }
 
                                        {
                                            id actualValue = values.status;
-                                           VerifyOrReturn(CheckValue("status", actualValue, 133U));
+                                           VerifyOrReturn(CheckValue("Status", actualValue, 133U));
                                        }
 
                                        NextTest();
@@ -120626,18 +119491,18 @@ class DL_Schedules : public TestCommandBridge {
 
                                        {
                                            id actualValue = values.weekDayIndex;
-                                           VerifyOrReturn(CheckValue("weekDayIndex", actualValue, 1U));
+                                           VerifyOrReturn(CheckValue("WeekDayIndex", actualValue, 1U));
                                        }
 
                                        {
                                            id actualValue = values.userIndex;
                                            VerifyOrReturn(CheckValue(
-                                               "userIndex", actualValue, [NumberOfTotalUsersSupported unsignedShortValue] + 1U));
+                                               "UserIndex", actualValue, [NumberOfTotalUsersSupported unsignedShortValue] + 1U));
                                        }
 
                                        {
                                            id actualValue = values.status;
-                                           VerifyOrReturn(CheckValue("status", actualValue, 133U));
+                                           VerifyOrReturn(CheckValue("Status", actualValue, 133U));
                                        }
 
                                        NextTest();
@@ -120666,17 +119531,17 @@ class DL_Schedules : public TestCommandBridge {
 
                                        {
                                            id actualValue = values.weekDayIndex;
-                                           VerifyOrReturn(CheckValue("weekDayIndex", actualValue, 1U));
+                                           VerifyOrReturn(CheckValue("WeekDayIndex", actualValue, 1U));
                                        }
 
                                        {
                                            id actualValue = values.userIndex;
-                                           VerifyOrReturn(CheckValue("userIndex", actualValue, 2U));
+                                           VerifyOrReturn(CheckValue("UserIndex", actualValue, 2U));
                                        }
 
                                        {
                                            id actualValue = values.status;
-                                           VerifyOrReturn(CheckValue("status", actualValue, 1U));
+                                           VerifyOrReturn(CheckValue("Status", actualValue, 1U));
                                        }
 
                                        NextTest();
@@ -120873,17 +119738,17 @@ class DL_Schedules : public TestCommandBridge {
 
                                        {
                                            id actualValue = values.yearDayIndex;
-                                           VerifyOrReturn(CheckValue("yearDayIndex", actualValue, 1U));
+                                           VerifyOrReturn(CheckValue("YearDayIndex", actualValue, 1U));
                                        }
 
                                        {
                                            id actualValue = values.userIndex;
-                                           VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
+                                           VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U));
                                        }
 
                                        {
                                            id actualValue = values.status;
-                                           VerifyOrReturn(CheckValue("status", actualValue, 139U));
+                                           VerifyOrReturn(CheckValue("Status", actualValue, 139U));
                                        }
 
                                        NextTest();
@@ -120912,17 +119777,17 @@ class DL_Schedules : public TestCommandBridge {
 
                                        {
                                            id actualValue = values.yearDayIndex;
-                                           VerifyOrReturn(CheckValue("yearDayIndex", actualValue, 0U));
+                                           VerifyOrReturn(CheckValue("YearDayIndex", actualValue, 0U));
                                        }
 
                                        {
                                            id actualValue = values.userIndex;
-                                           VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
+                                           VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U));
                                        }
 
                                        {
                                            id actualValue = values.status;
-                                           VerifyOrReturn(CheckValue("status", actualValue, 133U));
+                                           VerifyOrReturn(CheckValue("Status", actualValue, 133U));
                                        }
 
                                        NextTest();
@@ -120951,18 +119816,18 @@ class DL_Schedules : public TestCommandBridge {
 
                                        {
                                            id actualValue = values.yearDayIndex;
-                                           VerifyOrReturn(CheckValue("yearDayIndex", actualValue,
+                                           VerifyOrReturn(CheckValue("YearDayIndex", actualValue,
                                                [NumberOfYearDaySchedulesSupportedPerUser unsignedCharValue] + 1U));
                                        }
 
                                        {
                                            id actualValue = values.userIndex;
-                                           VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
+                                           VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U));
                                        }
 
                                        {
                                            id actualValue = values.status;
-                                           VerifyOrReturn(CheckValue("status", actualValue, 133U));
+                                           VerifyOrReturn(CheckValue("Status", actualValue, 133U));
                                        }
 
                                        NextTest();
@@ -120991,17 +119856,17 @@ class DL_Schedules : public TestCommandBridge {
 
                                        {
                                            id actualValue = values.yearDayIndex;
-                                           VerifyOrReturn(CheckValue("yearDayIndex", actualValue, 1U));
+                                           VerifyOrReturn(CheckValue("YearDayIndex", actualValue, 1U));
                                        }
 
                                        {
                                            id actualValue = values.userIndex;
-                                           VerifyOrReturn(CheckValue("userIndex", actualValue, 0U));
+                                           VerifyOrReturn(CheckValue("UserIndex", actualValue, 0U));
                                        }
 
                                        {
                                            id actualValue = values.status;
-                                           VerifyOrReturn(CheckValue("status", actualValue, 133U));
+                                           VerifyOrReturn(CheckValue("Status", actualValue, 133U));
                                        }
 
                                        NextTest();
@@ -121030,18 +119895,18 @@ class DL_Schedules : public TestCommandBridge {
 
                                        {
                                            id actualValue = values.yearDayIndex;
-                                           VerifyOrReturn(CheckValue("yearDayIndex", actualValue, 1U));
+                                           VerifyOrReturn(CheckValue("YearDayIndex", actualValue, 1U));
                                        }
 
                                        {
                                            id actualValue = values.userIndex;
                                            VerifyOrReturn(CheckValue(
-                                               "userIndex", actualValue, [NumberOfTotalUsersSupported unsignedShortValue] + 1U));
+                                               "UserIndex", actualValue, [NumberOfTotalUsersSupported unsignedShortValue] + 1U));
                                        }
 
                                        {
                                            id actualValue = values.status;
-                                           VerifyOrReturn(CheckValue("status", actualValue, 133U));
+                                           VerifyOrReturn(CheckValue("Status", actualValue, 133U));
                                        }
 
                                        NextTest();
@@ -121070,17 +119935,17 @@ class DL_Schedules : public TestCommandBridge {
 
                                        {
                                            id actualValue = values.yearDayIndex;
-                                           VerifyOrReturn(CheckValue("yearDayIndex", actualValue, 1U));
+                                           VerifyOrReturn(CheckValue("YearDayIndex", actualValue, 1U));
                                        }
 
                                        {
                                            id actualValue = values.userIndex;
-                                           VerifyOrReturn(CheckValue("userIndex", actualValue, 2U));
+                                           VerifyOrReturn(CheckValue("UserIndex", actualValue, 2U));
                                        }
 
                                        {
                                            id actualValue = values.status;
-                                           VerifyOrReturn(CheckValue("status", actualValue, 1U));
+                                           VerifyOrReturn(CheckValue("Status", actualValue, 1U));
                                        }
 
                                        NextTest();
@@ -121220,12 +120085,12 @@ class DL_Schedules : public TestCommandBridge {
 
                                        {
                                            id actualValue = values.holidayIndex;
-                                           VerifyOrReturn(CheckValue("holidayIndex", actualValue, 1U));
+                                           VerifyOrReturn(CheckValue("HolidayIndex", actualValue, 1U));
                                        }
 
                                        {
                                            id actualValue = values.status;
-                                           VerifyOrReturn(CheckValue("status", actualValue, 139U));
+                                           VerifyOrReturn(CheckValue("Status", actualValue, 139U));
                                        }
 
                                        NextTest();
@@ -121253,12 +120118,12 @@ class DL_Schedules : public TestCommandBridge {
 
                                        {
                                            id actualValue = values.holidayIndex;
-                                           VerifyOrReturn(CheckValue("holidayIndex", actualValue, 0U));
+                                           VerifyOrReturn(CheckValue("HolidayIndex", actualValue, 0U));
                                        }
 
                                        {
                                            id actualValue = values.status;
-                                           VerifyOrReturn(CheckValue("status", actualValue, 133U));
+                                           VerifyOrReturn(CheckValue("Status", actualValue, 133U));
                                        }
 
                                        NextTest();
@@ -121286,13 +120151,13 @@ class DL_Schedules : public TestCommandBridge {
 
                                        {
                                            id actualValue = values.holidayIndex;
-                                           VerifyOrReturn(CheckValue("holidayIndex", actualValue,
+                                           VerifyOrReturn(CheckValue("HolidayIndex", actualValue,
                                                [NumberOfHolidaySchedulesSupported unsignedCharValue] + 1U));
                                        }
 
                                        {
                                            id actualValue = values.status;
-                                           VerifyOrReturn(CheckValue("status", actualValue, 133U));
+                                           VerifyOrReturn(CheckValue("Status", actualValue, 133U));
                                        }
 
                                        NextTest();
@@ -121345,27 +120210,27 @@ class DL_Schedules : public TestCommandBridge {
 
                                        {
                                            id actualValue = values.holidayIndex;
-                                           VerifyOrReturn(CheckValue("holidayIndex", actualValue, 1U));
+                                           VerifyOrReturn(CheckValue("HolidayIndex", actualValue, 1U));
                                        }
 
                                        {
                                            id actualValue = values.status;
-                                           VerifyOrReturn(CheckValue("status", actualValue, 0U));
+                                           VerifyOrReturn(CheckValue("Status", actualValue, 0U));
                                        }
 
                                        {
                                            id actualValue = values.localStartTime;
-                                           VerifyOrReturn(CheckValue("localStartTime", actualValue, 12345UL));
+                                           VerifyOrReturn(CheckValue("LocalStartTime", actualValue, 12345UL));
                                        }
 
                                        {
                                            id actualValue = values.localEndTime;
-                                           VerifyOrReturn(CheckValue("localEndTime", actualValue, 12345689UL));
+                                           VerifyOrReturn(CheckValue("LocalEndTime", actualValue, 12345689UL));
                                        }
 
                                        {
                                            id actualValue = values.operatingMode;
-                                           VerifyOrReturn(CheckValue("operatingMode", actualValue, 0U));
+                                           VerifyOrReturn(CheckValue("OperatingMode", actualValue, 0U));
                                        }
 
                                        NextTest();
@@ -121422,42 +120287,42 @@ class DL_Schedules : public TestCommandBridge {
 
                                        {
                                            id actualValue = values.weekDayIndex;
-                                           VerifyOrReturn(CheckValue("weekDayIndex", actualValue, 1U));
+                                           VerifyOrReturn(CheckValue("WeekDayIndex", actualValue, 1U));
                                        }
 
                                        {
                                            id actualValue = values.userIndex;
-                                           VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
+                                           VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U));
                                        }
 
                                        {
                                            id actualValue = values.status;
-                                           VerifyOrReturn(CheckValue("status", actualValue, 0U));
+                                           VerifyOrReturn(CheckValue("Status", actualValue, 0U));
                                        }
 
                                        {
                                            id actualValue = values.daysMask;
-                                           VerifyOrReturn(CheckValue("daysMask", actualValue, 1U));
+                                           VerifyOrReturn(CheckValue("DaysMask", actualValue, 1U));
                                        }
 
                                        {
                                            id actualValue = values.startHour;
-                                           VerifyOrReturn(CheckValue("startHour", actualValue, 15U));
+                                           VerifyOrReturn(CheckValue("StartHour", actualValue, 15U));
                                        }
 
                                        {
                                            id actualValue = values.startMinute;
-                                           VerifyOrReturn(CheckValue("startMinute", actualValue, 16U));
+                                           VerifyOrReturn(CheckValue("StartMinute", actualValue, 16U));
                                        }
 
                                        {
                                            id actualValue = values.endHour;
-                                           VerifyOrReturn(CheckValue("endHour", actualValue, 18U));
+                                           VerifyOrReturn(CheckValue("EndHour", actualValue, 18U));
                                        }
 
                                        {
                                            id actualValue = values.endMinute;
-                                           VerifyOrReturn(CheckValue("endMinute", actualValue, 0U));
+                                           VerifyOrReturn(CheckValue("EndMinute", actualValue, 0U));
                                        }
 
                                        NextTest();
@@ -121511,27 +120376,27 @@ class DL_Schedules : public TestCommandBridge {
 
                                        {
                                            id actualValue = values.yearDayIndex;
-                                           VerifyOrReturn(CheckValue("yearDayIndex", actualValue, 1U));
+                                           VerifyOrReturn(CheckValue("YearDayIndex", actualValue, 1U));
                                        }
 
                                        {
                                            id actualValue = values.userIndex;
-                                           VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
+                                           VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U));
                                        }
 
                                        {
                                            id actualValue = values.status;
-                                           VerifyOrReturn(CheckValue("status", actualValue, 0U));
+                                           VerifyOrReturn(CheckValue("Status", actualValue, 0U));
                                        }
 
                                        {
                                            id actualValue = values.localStartTime;
-                                           VerifyOrReturn(CheckValue("localStartTime", actualValue, 12345UL));
+                                           VerifyOrReturn(CheckValue("LocalStartTime", actualValue, 12345UL));
                                        }
 
                                        {
                                            id actualValue = values.localEndTime;
-                                           VerifyOrReturn(CheckValue("localEndTime", actualValue, 12345689UL));
+                                           VerifyOrReturn(CheckValue("LocalEndTime", actualValue, 12345689UL));
                                        }
 
                                        NextTest();
@@ -121695,42 +120560,42 @@ class DL_Schedules : public TestCommandBridge {
 
                                        {
                                            id actualValue = values.weekDayIndex;
-                                           VerifyOrReturn(CheckValue("weekDayIndex", actualValue, 1U));
+                                           VerifyOrReturn(CheckValue("WeekDayIndex", actualValue, 1U));
                                        }
 
                                        {
                                            id actualValue = values.userIndex;
-                                           VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
+                                           VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U));
                                        }
 
                                        {
                                            id actualValue = values.status;
-                                           VerifyOrReturn(CheckValue("status", actualValue, 0U));
+                                           VerifyOrReturn(CheckValue("Status", actualValue, 0U));
                                        }
 
                                        {
                                            id actualValue = values.daysMask;
-                                           VerifyOrReturn(CheckValue("daysMask", actualValue, 1U));
+                                           VerifyOrReturn(CheckValue("DaysMask", actualValue, 1U));
                                        }
 
                                        {
                                            id actualValue = values.startHour;
-                                           VerifyOrReturn(CheckValue("startHour", actualValue, 15U));
+                                           VerifyOrReturn(CheckValue("StartHour", actualValue, 15U));
                                        }
 
                                        {
                                            id actualValue = values.startMinute;
-                                           VerifyOrReturn(CheckValue("startMinute", actualValue, 16U));
+                                           VerifyOrReturn(CheckValue("StartMinute", actualValue, 16U));
                                        }
 
                                        {
                                            id actualValue = values.endHour;
-                                           VerifyOrReturn(CheckValue("endHour", actualValue, 18U));
+                                           VerifyOrReturn(CheckValue("EndHour", actualValue, 18U));
                                        }
 
                                        {
                                            id actualValue = values.endMinute;
-                                           VerifyOrReturn(CheckValue("endMinute", actualValue, 0U));
+                                           VerifyOrReturn(CheckValue("EndMinute", actualValue, 0U));
                                        }
 
                                        NextTest();
@@ -121759,27 +120624,27 @@ class DL_Schedules : public TestCommandBridge {
 
                                        {
                                            id actualValue = values.yearDayIndex;
-                                           VerifyOrReturn(CheckValue("yearDayIndex", actualValue, 1U));
+                                           VerifyOrReturn(CheckValue("YearDayIndex", actualValue, 1U));
                                        }
 
                                        {
                                            id actualValue = values.userIndex;
-                                           VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
+                                           VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U));
                                        }
 
                                        {
                                            id actualValue = values.status;
-                                           VerifyOrReturn(CheckValue("status", actualValue, 0U));
+                                           VerifyOrReturn(CheckValue("Status", actualValue, 0U));
                                        }
 
                                        {
                                            id actualValue = values.localStartTime;
-                                           VerifyOrReturn(CheckValue("localStartTime", actualValue, 12345UL));
+                                           VerifyOrReturn(CheckValue("LocalStartTime", actualValue, 12345UL));
                                        }
 
                                        {
                                            id actualValue = values.localEndTime;
-                                           VerifyOrReturn(CheckValue("localEndTime", actualValue, 12345689UL));
+                                           VerifyOrReturn(CheckValue("LocalEndTime", actualValue, 12345689UL));
                                        }
 
                                        NextTest();
@@ -121807,27 +120672,27 @@ class DL_Schedules : public TestCommandBridge {
 
                                        {
                                            id actualValue = values.holidayIndex;
-                                           VerifyOrReturn(CheckValue("holidayIndex", actualValue, 1U));
+                                           VerifyOrReturn(CheckValue("HolidayIndex", actualValue, 1U));
                                        }
 
                                        {
                                            id actualValue = values.status;
-                                           VerifyOrReturn(CheckValue("status", actualValue, 0U));
+                                           VerifyOrReturn(CheckValue("Status", actualValue, 0U));
                                        }
 
                                        {
                                            id actualValue = values.localStartTime;
-                                           VerifyOrReturn(CheckValue("localStartTime", actualValue, 12345UL));
+                                           VerifyOrReturn(CheckValue("LocalStartTime", actualValue, 12345UL));
                                        }
 
                                        {
                                            id actualValue = values.localEndTime;
-                                           VerifyOrReturn(CheckValue("localEndTime", actualValue, 12345689UL));
+                                           VerifyOrReturn(CheckValue("LocalEndTime", actualValue, 12345689UL));
                                        }
 
                                        {
                                            id actualValue = values.operatingMode;
-                                           VerifyOrReturn(CheckValue("operatingMode", actualValue, 0U));
+                                           VerifyOrReturn(CheckValue("OperatingMode", actualValue, 0U));
                                        }
 
                                        NextTest();
@@ -121991,42 +120856,42 @@ class DL_Schedules : public TestCommandBridge {
 
                                        {
                                            id actualValue = values.weekDayIndex;
-                                           VerifyOrReturn(CheckValue("weekDayIndex", actualValue, 1U));
+                                           VerifyOrReturn(CheckValue("WeekDayIndex", actualValue, 1U));
                                        }
 
                                        {
                                            id actualValue = values.userIndex;
-                                           VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
+                                           VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U));
                                        }
 
                                        {
                                            id actualValue = values.status;
-                                           VerifyOrReturn(CheckValue("status", actualValue, 0U));
+                                           VerifyOrReturn(CheckValue("Status", actualValue, 0U));
                                        }
 
                                        {
                                            id actualValue = values.daysMask;
-                                           VerifyOrReturn(CheckValue("daysMask", actualValue, 1U));
+                                           VerifyOrReturn(CheckValue("DaysMask", actualValue, 1U));
                                        }
 
                                        {
                                            id actualValue = values.startHour;
-                                           VerifyOrReturn(CheckValue("startHour", actualValue, 15U));
+                                           VerifyOrReturn(CheckValue("StartHour", actualValue, 15U));
                                        }
 
                                        {
                                            id actualValue = values.startMinute;
-                                           VerifyOrReturn(CheckValue("startMinute", actualValue, 16U));
+                                           VerifyOrReturn(CheckValue("StartMinute", actualValue, 16U));
                                        }
 
                                        {
                                            id actualValue = values.endHour;
-                                           VerifyOrReturn(CheckValue("endHour", actualValue, 18U));
+                                           VerifyOrReturn(CheckValue("EndHour", actualValue, 18U));
                                        }
 
                                        {
                                            id actualValue = values.endMinute;
-                                           VerifyOrReturn(CheckValue("endMinute", actualValue, 0U));
+                                           VerifyOrReturn(CheckValue("EndMinute", actualValue, 0U));
                                        }
 
                                        NextTest();
@@ -122055,27 +120920,27 @@ class DL_Schedules : public TestCommandBridge {
 
                                        {
                                            id actualValue = values.yearDayIndex;
-                                           VerifyOrReturn(CheckValue("yearDayIndex", actualValue, 1U));
+                                           VerifyOrReturn(CheckValue("YearDayIndex", actualValue, 1U));
                                        }
 
                                        {
                                            id actualValue = values.userIndex;
-                                           VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
+                                           VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U));
                                        }
 
                                        {
                                            id actualValue = values.status;
-                                           VerifyOrReturn(CheckValue("status", actualValue, 0U));
+                                           VerifyOrReturn(CheckValue("Status", actualValue, 0U));
                                        }
 
                                        {
                                            id actualValue = values.localStartTime;
-                                           VerifyOrReturn(CheckValue("localStartTime", actualValue, 12345UL));
+                                           VerifyOrReturn(CheckValue("LocalStartTime", actualValue, 12345UL));
                                        }
 
                                        {
                                            id actualValue = values.localEndTime;
-                                           VerifyOrReturn(CheckValue("localEndTime", actualValue, 12345689UL));
+                                           VerifyOrReturn(CheckValue("LocalEndTime", actualValue, 12345689UL));
                                        }
 
                                        NextTest();
@@ -122103,27 +120968,27 @@ class DL_Schedules : public TestCommandBridge {
 
                                        {
                                            id actualValue = values.holidayIndex;
-                                           VerifyOrReturn(CheckValue("holidayIndex", actualValue, 1U));
+                                           VerifyOrReturn(CheckValue("HolidayIndex", actualValue, 1U));
                                        }
 
                                        {
                                            id actualValue = values.status;
-                                           VerifyOrReturn(CheckValue("status", actualValue, 0U));
+                                           VerifyOrReturn(CheckValue("Status", actualValue, 0U));
                                        }
 
                                        {
                                            id actualValue = values.localStartTime;
-                                           VerifyOrReturn(CheckValue("localStartTime", actualValue, 12345UL));
+                                           VerifyOrReturn(CheckValue("LocalStartTime", actualValue, 12345UL));
                                        }
 
                                        {
                                            id actualValue = values.localEndTime;
-                                           VerifyOrReturn(CheckValue("localEndTime", actualValue, 12345689UL));
+                                           VerifyOrReturn(CheckValue("LocalEndTime", actualValue, 12345689UL));
                                        }
 
                                        {
                                            id actualValue = values.operatingMode;
-                                           VerifyOrReturn(CheckValue("operatingMode", actualValue, 0U));
+                                           VerifyOrReturn(CheckValue("OperatingMode", actualValue, 0U));
                                        }
 
                                        NextTest();
@@ -122204,42 +121069,42 @@ class DL_Schedules : public TestCommandBridge {
 
                                        {
                                            id actualValue = values.weekDayIndex;
-                                           VerifyOrReturn(CheckValue("weekDayIndex", actualValue, 1U));
+                                           VerifyOrReturn(CheckValue("WeekDayIndex", actualValue, 1U));
                                        }
 
                                        {
                                            id actualValue = values.userIndex;
-                                           VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
+                                           VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U));
                                        }
 
                                        {
                                            id actualValue = values.status;
-                                           VerifyOrReturn(CheckValue("status", actualValue, 0U));
+                                           VerifyOrReturn(CheckValue("Status", actualValue, 0U));
                                        }
 
                                        {
                                            id actualValue = values.daysMask;
-                                           VerifyOrReturn(CheckValue("daysMask", actualValue, 1U));
+                                           VerifyOrReturn(CheckValue("DaysMask", actualValue, 1U));
                                        }
 
                                        {
                                            id actualValue = values.startHour;
-                                           VerifyOrReturn(CheckValue("startHour", actualValue, 15U));
+                                           VerifyOrReturn(CheckValue("StartHour", actualValue, 15U));
                                        }
 
                                        {
                                            id actualValue = values.startMinute;
-                                           VerifyOrReturn(CheckValue("startMinute", actualValue, 16U));
+                                           VerifyOrReturn(CheckValue("StartMinute", actualValue, 16U));
                                        }
 
                                        {
                                            id actualValue = values.endHour;
-                                           VerifyOrReturn(CheckValue("endHour", actualValue, 18U));
+                                           VerifyOrReturn(CheckValue("EndHour", actualValue, 18U));
                                        }
 
                                        {
                                            id actualValue = values.endMinute;
-                                           VerifyOrReturn(CheckValue("endMinute", actualValue, 0U));
+                                           VerifyOrReturn(CheckValue("EndMinute", actualValue, 0U));
                                        }
 
                                        NextTest();
@@ -122268,27 +121133,27 @@ class DL_Schedules : public TestCommandBridge {
 
                                        {
                                            id actualValue = values.yearDayIndex;
-                                           VerifyOrReturn(CheckValue("yearDayIndex", actualValue, 1U));
+                                           VerifyOrReturn(CheckValue("YearDayIndex", actualValue, 1U));
                                        }
 
                                        {
                                            id actualValue = values.userIndex;
-                                           VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
+                                           VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U));
                                        }
 
                                        {
                                            id actualValue = values.status;
-                                           VerifyOrReturn(CheckValue("status", actualValue, 0U));
+                                           VerifyOrReturn(CheckValue("Status", actualValue, 0U));
                                        }
 
                                        {
                                            id actualValue = values.localStartTime;
-                                           VerifyOrReturn(CheckValue("localStartTime", actualValue, 12345UL));
+                                           VerifyOrReturn(CheckValue("LocalStartTime", actualValue, 12345UL));
                                        }
 
                                        {
                                            id actualValue = values.localEndTime;
-                                           VerifyOrReturn(CheckValue("localEndTime", actualValue, 12345689UL));
+                                           VerifyOrReturn(CheckValue("LocalEndTime", actualValue, 12345689UL));
                                        }
 
                                        NextTest();
@@ -122316,27 +121181,27 @@ class DL_Schedules : public TestCommandBridge {
 
                                        {
                                            id actualValue = values.holidayIndex;
-                                           VerifyOrReturn(CheckValue("holidayIndex", actualValue, 1U));
+                                           VerifyOrReturn(CheckValue("HolidayIndex", actualValue, 1U));
                                        }
 
                                        {
                                            id actualValue = values.status;
-                                           VerifyOrReturn(CheckValue("status", actualValue, 0U));
+                                           VerifyOrReturn(CheckValue("Status", actualValue, 0U));
                                        }
 
                                        {
                                            id actualValue = values.localStartTime;
-                                           VerifyOrReturn(CheckValue("localStartTime", actualValue, 12345UL));
+                                           VerifyOrReturn(CheckValue("LocalStartTime", actualValue, 12345UL));
                                        }
 
                                        {
                                            id actualValue = values.localEndTime;
-                                           VerifyOrReturn(CheckValue("localEndTime", actualValue, 12345689UL));
+                                           VerifyOrReturn(CheckValue("LocalEndTime", actualValue, 12345689UL));
                                        }
 
                                        {
                                            id actualValue = values.operatingMode;
-                                           VerifyOrReturn(CheckValue("operatingMode", actualValue, 0U));
+                                           VerifyOrReturn(CheckValue("OperatingMode", actualValue, 0U));
                                        }
 
                                        NextTest();
@@ -122393,42 +121258,42 @@ class DL_Schedules : public TestCommandBridge {
 
                                        {
                                            id actualValue = values.weekDayIndex;
-                                           VerifyOrReturn(CheckValue("weekDayIndex", actualValue, 2U));
+                                           VerifyOrReturn(CheckValue("WeekDayIndex", actualValue, 2U));
                                        }
 
                                        {
                                            id actualValue = values.userIndex;
-                                           VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
+                                           VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U));
                                        }
 
                                        {
                                            id actualValue = values.status;
-                                           VerifyOrReturn(CheckValue("status", actualValue, 0U));
+                                           VerifyOrReturn(CheckValue("Status", actualValue, 0U));
                                        }
 
                                        {
                                            id actualValue = values.daysMask;
-                                           VerifyOrReturn(CheckValue("daysMask", actualValue, 2U));
+                                           VerifyOrReturn(CheckValue("DaysMask", actualValue, 2U));
                                        }
 
                                        {
                                            id actualValue = values.startHour;
-                                           VerifyOrReturn(CheckValue("startHour", actualValue, 0U));
+                                           VerifyOrReturn(CheckValue("StartHour", actualValue, 0U));
                                        }
 
                                        {
                                            id actualValue = values.startMinute;
-                                           VerifyOrReturn(CheckValue("startMinute", actualValue, 0U));
+                                           VerifyOrReturn(CheckValue("StartMinute", actualValue, 0U));
                                        }
 
                                        {
                                            id actualValue = values.endHour;
-                                           VerifyOrReturn(CheckValue("endHour", actualValue, 23U));
+                                           VerifyOrReturn(CheckValue("EndHour", actualValue, 23U));
                                        }
 
                                        {
                                            id actualValue = values.endMinute;
-                                           VerifyOrReturn(CheckValue("endMinute", actualValue, 59U));
+                                           VerifyOrReturn(CheckValue("EndMinute", actualValue, 59U));
                                        }
 
                                        NextTest();
@@ -122482,27 +121347,27 @@ class DL_Schedules : public TestCommandBridge {
 
                                        {
                                            id actualValue = values.yearDayIndex;
-                                           VerifyOrReturn(CheckValue("yearDayIndex", actualValue, 2U));
+                                           VerifyOrReturn(CheckValue("YearDayIndex", actualValue, 2U));
                                        }
 
                                        {
                                            id actualValue = values.userIndex;
-                                           VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
+                                           VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U));
                                        }
 
                                        {
                                            id actualValue = values.status;
-                                           VerifyOrReturn(CheckValue("status", actualValue, 0U));
+                                           VerifyOrReturn(CheckValue("Status", actualValue, 0U));
                                        }
 
                                        {
                                            id actualValue = values.localStartTime;
-                                           VerifyOrReturn(CheckValue("localStartTime", actualValue, 9000UL));
+                                           VerifyOrReturn(CheckValue("LocalStartTime", actualValue, 9000UL));
                                        }
 
                                        {
                                            id actualValue = values.localEndTime;
-                                           VerifyOrReturn(CheckValue("localEndTime", actualValue, 888888888UL));
+                                           VerifyOrReturn(CheckValue("LocalEndTime", actualValue, 888888888UL));
                                        }
 
                                        NextTest();
@@ -122555,27 +121420,27 @@ class DL_Schedules : public TestCommandBridge {
 
                                        {
                                            id actualValue = values.holidayIndex;
-                                           VerifyOrReturn(CheckValue("holidayIndex", actualValue, 2U));
+                                           VerifyOrReturn(CheckValue("HolidayIndex", actualValue, 2U));
                                        }
 
                                        {
                                            id actualValue = values.status;
-                                           VerifyOrReturn(CheckValue("status", actualValue, 0U));
+                                           VerifyOrReturn(CheckValue("Status", actualValue, 0U));
                                        }
 
                                        {
                                            id actualValue = values.localStartTime;
-                                           VerifyOrReturn(CheckValue("localStartTime", actualValue, 123456UL));
+                                           VerifyOrReturn(CheckValue("LocalStartTime", actualValue, 123456UL));
                                        }
 
                                        {
                                            id actualValue = values.localEndTime;
-                                           VerifyOrReturn(CheckValue("localEndTime", actualValue, 1234567UL));
+                                           VerifyOrReturn(CheckValue("LocalEndTime", actualValue, 1234567UL));
                                        }
 
                                        {
                                            id actualValue = values.operatingMode;
-                                           VerifyOrReturn(CheckValue("operatingMode", actualValue, 1U));
+                                           VerifyOrReturn(CheckValue("OperatingMode", actualValue, 1U));
                                        }
 
                                        NextTest();
@@ -122627,17 +121492,17 @@ class DL_Schedules : public TestCommandBridge {
 
                                        {
                                            id actualValue = values.weekDayIndex;
-                                           VerifyOrReturn(CheckValue("weekDayIndex", actualValue, 1U));
+                                           VerifyOrReturn(CheckValue("WeekDayIndex", actualValue, 1U));
                                        }
 
                                        {
                                            id actualValue = values.userIndex;
-                                           VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
+                                           VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U));
                                        }
 
                                        {
                                            id actualValue = values.status;
-                                           VerifyOrReturn(CheckValue("status", actualValue, 139U));
+                                           VerifyOrReturn(CheckValue("Status", actualValue, 139U));
                                        }
 
                                        NextTest();
@@ -122689,17 +121554,17 @@ class DL_Schedules : public TestCommandBridge {
 
                                        {
                                            id actualValue = values.weekDayIndex;
-                                           VerifyOrReturn(CheckValue("weekDayIndex", actualValue, 2U));
+                                           VerifyOrReturn(CheckValue("WeekDayIndex", actualValue, 2U));
                                        }
 
                                        {
                                            id actualValue = values.userIndex;
-                                           VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
+                                           VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U));
                                        }
 
                                        {
                                            id actualValue = values.status;
-                                           VerifyOrReturn(CheckValue("status", actualValue, 139U));
+                                           VerifyOrReturn(CheckValue("Status", actualValue, 139U));
                                        }
 
                                        NextTest();
@@ -122728,27 +121593,27 @@ class DL_Schedules : public TestCommandBridge {
 
                                        {
                                            id actualValue = values.yearDayIndex;
-                                           VerifyOrReturn(CheckValue("yearDayIndex", actualValue, 1U));
+                                           VerifyOrReturn(CheckValue("YearDayIndex", actualValue, 1U));
                                        }
 
                                        {
                                            id actualValue = values.userIndex;
-                                           VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
+                                           VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U));
                                        }
 
                                        {
                                            id actualValue = values.status;
-                                           VerifyOrReturn(CheckValue("status", actualValue, 0U));
+                                           VerifyOrReturn(CheckValue("Status", actualValue, 0U));
                                        }
 
                                        {
                                            id actualValue = values.localStartTime;
-                                           VerifyOrReturn(CheckValue("localStartTime", actualValue, 12345UL));
+                                           VerifyOrReturn(CheckValue("LocalStartTime", actualValue, 12345UL));
                                        }
 
                                        {
                                            id actualValue = values.localEndTime;
-                                           VerifyOrReturn(CheckValue("localEndTime", actualValue, 12345689UL));
+                                           VerifyOrReturn(CheckValue("LocalEndTime", actualValue, 12345689UL));
                                        }
 
                                        NextTest();
@@ -122777,27 +121642,27 @@ class DL_Schedules : public TestCommandBridge {
 
                                        {
                                            id actualValue = values.yearDayIndex;
-                                           VerifyOrReturn(CheckValue("yearDayIndex", actualValue, 2U));
+                                           VerifyOrReturn(CheckValue("YearDayIndex", actualValue, 2U));
                                        }
 
                                        {
                                            id actualValue = values.userIndex;
-                                           VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
+                                           VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U));
                                        }
 
                                        {
                                            id actualValue = values.status;
-                                           VerifyOrReturn(CheckValue("status", actualValue, 0U));
+                                           VerifyOrReturn(CheckValue("Status", actualValue, 0U));
                                        }
 
                                        {
                                            id actualValue = values.localStartTime;
-                                           VerifyOrReturn(CheckValue("localStartTime", actualValue, 9000UL));
+                                           VerifyOrReturn(CheckValue("LocalStartTime", actualValue, 9000UL));
                                        }
 
                                        {
                                            id actualValue = values.localEndTime;
-                                           VerifyOrReturn(CheckValue("localEndTime", actualValue, 888888888UL));
+                                           VerifyOrReturn(CheckValue("LocalEndTime", actualValue, 888888888UL));
                                        }
 
                                        NextTest();
@@ -122825,27 +121690,27 @@ class DL_Schedules : public TestCommandBridge {
 
                                        {
                                            id actualValue = values.holidayIndex;
-                                           VerifyOrReturn(CheckValue("holidayIndex", actualValue, 1U));
+                                           VerifyOrReturn(CheckValue("HolidayIndex", actualValue, 1U));
                                        }
 
                                        {
                                            id actualValue = values.status;
-                                           VerifyOrReturn(CheckValue("status", actualValue, 0U));
+                                           VerifyOrReturn(CheckValue("Status", actualValue, 0U));
                                        }
 
                                        {
                                            id actualValue = values.localStartTime;
-                                           VerifyOrReturn(CheckValue("localStartTime", actualValue, 12345UL));
+                                           VerifyOrReturn(CheckValue("LocalStartTime", actualValue, 12345UL));
                                        }
 
                                        {
                                            id actualValue = values.localEndTime;
-                                           VerifyOrReturn(CheckValue("localEndTime", actualValue, 12345689UL));
+                                           VerifyOrReturn(CheckValue("LocalEndTime", actualValue, 12345689UL));
                                        }
 
                                        {
                                            id actualValue = values.operatingMode;
-                                           VerifyOrReturn(CheckValue("operatingMode", actualValue, 0U));
+                                           VerifyOrReturn(CheckValue("OperatingMode", actualValue, 0U));
                                        }
 
                                        NextTest();
@@ -122873,27 +121738,27 @@ class DL_Schedules : public TestCommandBridge {
 
                                        {
                                            id actualValue = values.holidayIndex;
-                                           VerifyOrReturn(CheckValue("holidayIndex", actualValue, 2U));
+                                           VerifyOrReturn(CheckValue("HolidayIndex", actualValue, 2U));
                                        }
 
                                        {
                                            id actualValue = values.status;
-                                           VerifyOrReturn(CheckValue("status", actualValue, 0U));
+                                           VerifyOrReturn(CheckValue("Status", actualValue, 0U));
                                        }
 
                                        {
                                            id actualValue = values.localStartTime;
-                                           VerifyOrReturn(CheckValue("localStartTime", actualValue, 123456UL));
+                                           VerifyOrReturn(CheckValue("LocalStartTime", actualValue, 123456UL));
                                        }
 
                                        {
                                            id actualValue = values.localEndTime;
-                                           VerifyOrReturn(CheckValue("localEndTime", actualValue, 1234567UL));
+                                           VerifyOrReturn(CheckValue("LocalEndTime", actualValue, 1234567UL));
                                        }
 
                                        {
                                            id actualValue = values.operatingMode;
-                                           VerifyOrReturn(CheckValue("operatingMode", actualValue, 1U));
+                                           VerifyOrReturn(CheckValue("OperatingMode", actualValue, 1U));
                                        }
 
                                        NextTest();
@@ -122973,17 +121838,17 @@ class DL_Schedules : public TestCommandBridge {
 
                                        {
                                            id actualValue = values.yearDayIndex;
-                                           VerifyOrReturn(CheckValue("yearDayIndex", actualValue, 1U));
+                                           VerifyOrReturn(CheckValue("YearDayIndex", actualValue, 1U));
                                        }
 
                                        {
                                            id actualValue = values.userIndex;
-                                           VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
+                                           VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U));
                                        }
 
                                        {
                                            id actualValue = values.status;
-                                           VerifyOrReturn(CheckValue("status", actualValue, 139U));
+                                           VerifyOrReturn(CheckValue("Status", actualValue, 139U));
                                        }
 
                                        NextTest();
@@ -123035,17 +121900,17 @@ class DL_Schedules : public TestCommandBridge {
 
                                        {
                                            id actualValue = values.yearDayIndex;
-                                           VerifyOrReturn(CheckValue("yearDayIndex", actualValue, 2U));
+                                           VerifyOrReturn(CheckValue("YearDayIndex", actualValue, 2U));
                                        }
 
                                        {
                                            id actualValue = values.userIndex;
-                                           VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
+                                           VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U));
                                        }
 
                                        {
                                            id actualValue = values.status;
-                                           VerifyOrReturn(CheckValue("status", actualValue, 139U));
+                                           VerifyOrReturn(CheckValue("Status", actualValue, 139U));
                                        }
 
                                        NextTest();
@@ -123074,42 +121939,42 @@ class DL_Schedules : public TestCommandBridge {
 
                                        {
                                            id actualValue = values.weekDayIndex;
-                                           VerifyOrReturn(CheckValue("weekDayIndex", actualValue, 1U));
+                                           VerifyOrReturn(CheckValue("WeekDayIndex", actualValue, 1U));
                                        }
 
                                        {
                                            id actualValue = values.userIndex;
-                                           VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
+                                           VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U));
                                        }
 
                                        {
                                            id actualValue = values.status;
-                                           VerifyOrReturn(CheckValue("status", actualValue, 0U));
+                                           VerifyOrReturn(CheckValue("Status", actualValue, 0U));
                                        }
 
                                        {
                                            id actualValue = values.daysMask;
-                                           VerifyOrReturn(CheckValue("daysMask", actualValue, 2U));
+                                           VerifyOrReturn(CheckValue("DaysMask", actualValue, 2U));
                                        }
 
                                        {
                                            id actualValue = values.startHour;
-                                           VerifyOrReturn(CheckValue("startHour", actualValue, 0U));
+                                           VerifyOrReturn(CheckValue("StartHour", actualValue, 0U));
                                        }
 
                                        {
                                            id actualValue = values.startMinute;
-                                           VerifyOrReturn(CheckValue("startMinute", actualValue, 0U));
+                                           VerifyOrReturn(CheckValue("StartMinute", actualValue, 0U));
                                        }
 
                                        {
                                            id actualValue = values.endHour;
-                                           VerifyOrReturn(CheckValue("endHour", actualValue, 23U));
+                                           VerifyOrReturn(CheckValue("EndHour", actualValue, 23U));
                                        }
 
                                        {
                                            id actualValue = values.endMinute;
-                                           VerifyOrReturn(CheckValue("endMinute", actualValue, 59U));
+                                           VerifyOrReturn(CheckValue("EndMinute", actualValue, 59U));
                                        }
 
                                        NextTest();
@@ -123153,7 +122018,7 @@ class DL_Schedules : public TestCommandBridge {
         params.operationType = [NSNumber numberWithUnsignedChar:0U];
         params.userIndex = [NSNumber numberWithUnsignedShort:2U];
         params.userName = nil;
-        params.userUniqueId = nil;
+        params.userUniqueID = nil;
         params.userStatus = nil;
         params.userType = nil;
         params.credentialRule = nil;
@@ -123217,42 +122082,42 @@ class DL_Schedules : public TestCommandBridge {
 
                                        {
                                            id actualValue = values.weekDayIndex;
-                                           VerifyOrReturn(CheckValue("weekDayIndex", actualValue, 1U));
+                                           VerifyOrReturn(CheckValue("WeekDayIndex", actualValue, 1U));
                                        }
 
                                        {
                                            id actualValue = values.userIndex;
-                                           VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
+                                           VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U));
                                        }
 
                                        {
                                            id actualValue = values.status;
-                                           VerifyOrReturn(CheckValue("status", actualValue, 0U));
+                                           VerifyOrReturn(CheckValue("Status", actualValue, 0U));
                                        }
 
                                        {
                                            id actualValue = values.daysMask;
-                                           VerifyOrReturn(CheckValue("daysMask", actualValue, 1U));
+                                           VerifyOrReturn(CheckValue("DaysMask", actualValue, 1U));
                                        }
 
                                        {
                                            id actualValue = values.startHour;
-                                           VerifyOrReturn(CheckValue("startHour", actualValue, 0U));
+                                           VerifyOrReturn(CheckValue("StartHour", actualValue, 0U));
                                        }
 
                                        {
                                            id actualValue = values.startMinute;
-                                           VerifyOrReturn(CheckValue("startMinute", actualValue, 0U));
+                                           VerifyOrReturn(CheckValue("StartMinute", actualValue, 0U));
                                        }
 
                                        {
                                            id actualValue = values.endHour;
-                                           VerifyOrReturn(CheckValue("endHour", actualValue, 23U));
+                                           VerifyOrReturn(CheckValue("EndHour", actualValue, 23U));
                                        }
 
                                        {
                                            id actualValue = values.endMinute;
-                                           VerifyOrReturn(CheckValue("endMinute", actualValue, 59U));
+                                           VerifyOrReturn(CheckValue("EndMinute", actualValue, 59U));
                                        }
 
                                        NextTest();
@@ -123306,27 +122171,27 @@ class DL_Schedules : public TestCommandBridge {
 
                                        {
                                            id actualValue = values.yearDayIndex;
-                                           VerifyOrReturn(CheckValue("yearDayIndex", actualValue, 4U));
+                                           VerifyOrReturn(CheckValue("YearDayIndex", actualValue, 4U));
                                        }
 
                                        {
                                            id actualValue = values.userIndex;
-                                           VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
+                                           VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U));
                                        }
 
                                        {
                                            id actualValue = values.status;
-                                           VerifyOrReturn(CheckValue("status", actualValue, 0U));
+                                           VerifyOrReturn(CheckValue("Status", actualValue, 0U));
                                        }
 
                                        {
                                            id actualValue = values.localStartTime;
-                                           VerifyOrReturn(CheckValue("localStartTime", actualValue, 9000UL));
+                                           VerifyOrReturn(CheckValue("LocalStartTime", actualValue, 9000UL));
                                        }
 
                                        {
                                            id actualValue = values.localEndTime;
-                                           VerifyOrReturn(CheckValue("localEndTime", actualValue, 888888888UL));
+                                           VerifyOrReturn(CheckValue("LocalEndTime", actualValue, 888888888UL));
                                        }
 
                                        NextTest();
@@ -123383,42 +122248,42 @@ class DL_Schedules : public TestCommandBridge {
 
                                        {
                                            id actualValue = values.weekDayIndex;
-                                           VerifyOrReturn(CheckValue("weekDayIndex", actualValue, 4U));
+                                           VerifyOrReturn(CheckValue("WeekDayIndex", actualValue, 4U));
                                        }
 
                                        {
                                            id actualValue = values.userIndex;
-                                           VerifyOrReturn(CheckValue("userIndex", actualValue, 2U));
+                                           VerifyOrReturn(CheckValue("UserIndex", actualValue, 2U));
                                        }
 
                                        {
                                            id actualValue = values.status;
-                                           VerifyOrReturn(CheckValue("status", actualValue, 0U));
+                                           VerifyOrReturn(CheckValue("Status", actualValue, 0U));
                                        }
 
                                        {
                                            id actualValue = values.daysMask;
-                                           VerifyOrReturn(CheckValue("daysMask", actualValue, 64U));
+                                           VerifyOrReturn(CheckValue("DaysMask", actualValue, 64U));
                                        }
 
                                        {
                                            id actualValue = values.startHour;
-                                           VerifyOrReturn(CheckValue("startHour", actualValue, 23U));
+                                           VerifyOrReturn(CheckValue("StartHour", actualValue, 23U));
                                        }
 
                                        {
                                            id actualValue = values.startMinute;
-                                           VerifyOrReturn(CheckValue("startMinute", actualValue, 0U));
+                                           VerifyOrReturn(CheckValue("StartMinute", actualValue, 0U));
                                        }
 
                                        {
                                            id actualValue = values.endHour;
-                                           VerifyOrReturn(CheckValue("endHour", actualValue, 23U));
+                                           VerifyOrReturn(CheckValue("EndHour", actualValue, 23U));
                                        }
 
                                        {
                                            id actualValue = values.endMinute;
-                                           VerifyOrReturn(CheckValue("endMinute", actualValue, 59U));
+                                           VerifyOrReturn(CheckValue("EndMinute", actualValue, 59U));
                                        }
 
                                        NextTest();
@@ -123472,27 +122337,27 @@ class DL_Schedules : public TestCommandBridge {
 
                                        {
                                            id actualValue = values.yearDayIndex;
-                                           VerifyOrReturn(CheckValue("yearDayIndex", actualValue, 1U));
+                                           VerifyOrReturn(CheckValue("YearDayIndex", actualValue, 1U));
                                        }
 
                                        {
                                            id actualValue = values.userIndex;
-                                           VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
+                                           VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U));
                                        }
 
                                        {
                                            id actualValue = values.status;
-                                           VerifyOrReturn(CheckValue("status", actualValue, 0U));
+                                           VerifyOrReturn(CheckValue("Status", actualValue, 0U));
                                        }
 
                                        {
                                            id actualValue = values.localStartTime;
-                                           VerifyOrReturn(CheckValue("localStartTime", actualValue, 55555UL));
+                                           VerifyOrReturn(CheckValue("LocalStartTime", actualValue, 55555UL));
                                        }
 
                                        {
                                            id actualValue = values.localEndTime;
-                                           VerifyOrReturn(CheckValue("localEndTime", actualValue, 7777777UL));
+                                           VerifyOrReturn(CheckValue("LocalEndTime", actualValue, 7777777UL));
                                        }
 
                                        NextTest();
@@ -123543,17 +122408,17 @@ class DL_Schedules : public TestCommandBridge {
 
                                        {
                                            id actualValue = values.weekDayIndex;
-                                           VerifyOrReturn(CheckValue("weekDayIndex", actualValue, 1U));
+                                           VerifyOrReturn(CheckValue("WeekDayIndex", actualValue, 1U));
                                        }
 
                                        {
                                            id actualValue = values.userIndex;
-                                           VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
+                                           VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U));
                                        }
 
                                        {
                                            id actualValue = values.status;
-                                           VerifyOrReturn(CheckValue("status", actualValue, 1U));
+                                           VerifyOrReturn(CheckValue("Status", actualValue, 1U));
                                        }
 
                                        NextTest();
@@ -123582,17 +122447,17 @@ class DL_Schedules : public TestCommandBridge {
 
                                        {
                                            id actualValue = values.yearDayIndex;
-                                           VerifyOrReturn(CheckValue("yearDayIndex", actualValue, 4U));
+                                           VerifyOrReturn(CheckValue("YearDayIndex", actualValue, 4U));
                                        }
 
                                        {
                                            id actualValue = values.userIndex;
-                                           VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
+                                           VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U));
                                        }
 
                                        {
                                            id actualValue = values.status;
-                                           VerifyOrReturn(CheckValue("status", actualValue, 1U));
+                                           VerifyOrReturn(CheckValue("Status", actualValue, 1U));
                                        }
 
                                        NextTest();
@@ -123621,17 +122486,17 @@ class DL_Schedules : public TestCommandBridge {
 
                                        {
                                            id actualValue = values.weekDayIndex;
-                                           VerifyOrReturn(CheckValue("weekDayIndex", actualValue, 4U));
+                                           VerifyOrReturn(CheckValue("WeekDayIndex", actualValue, 4U));
                                        }
 
                                        {
                                            id actualValue = values.userIndex;
-                                           VerifyOrReturn(CheckValue("userIndex", actualValue, 2U));
+                                           VerifyOrReturn(CheckValue("UserIndex", actualValue, 2U));
                                        }
 
                                        {
                                            id actualValue = values.status;
-                                           VerifyOrReturn(CheckValue("status", actualValue, 1U));
+                                           VerifyOrReturn(CheckValue("Status", actualValue, 1U));
                                        }
 
                                        NextTest();
@@ -123660,17 +122525,17 @@ class DL_Schedules : public TestCommandBridge {
 
                                        {
                                            id actualValue = values.yearDayIndex;
-                                           VerifyOrReturn(CheckValue("yearDayIndex", actualValue, 1U));
+                                           VerifyOrReturn(CheckValue("YearDayIndex", actualValue, 1U));
                                        }
 
                                        {
                                            id actualValue = values.userIndex;
-                                           VerifyOrReturn(CheckValue("userIndex", actualValue, 2U));
+                                           VerifyOrReturn(CheckValue("UserIndex", actualValue, 2U));
                                        }
 
                                        {
                                            id actualValue = values.status;
-                                           VerifyOrReturn(CheckValue("status", actualValue, 1U));
+                                           VerifyOrReturn(CheckValue("Status", actualValue, 1U));
                                        }
 
                                        NextTest();
@@ -123698,27 +122563,27 @@ class DL_Schedules : public TestCommandBridge {
 
                                        {
                                            id actualValue = values.holidayIndex;
-                                           VerifyOrReturn(CheckValue("holidayIndex", actualValue, 1U));
+                                           VerifyOrReturn(CheckValue("HolidayIndex", actualValue, 1U));
                                        }
 
                                        {
                                            id actualValue = values.status;
-                                           VerifyOrReturn(CheckValue("status", actualValue, 0U));
+                                           VerifyOrReturn(CheckValue("Status", actualValue, 0U));
                                        }
 
                                        {
                                            id actualValue = values.localStartTime;
-                                           VerifyOrReturn(CheckValue("localStartTime", actualValue, 12345UL));
+                                           VerifyOrReturn(CheckValue("LocalStartTime", actualValue, 12345UL));
                                        }
 
                                        {
                                            id actualValue = values.localEndTime;
-                                           VerifyOrReturn(CheckValue("localEndTime", actualValue, 12345689UL));
+                                           VerifyOrReturn(CheckValue("LocalEndTime", actualValue, 12345689UL));
                                        }
 
                                        {
                                            id actualValue = values.operatingMode;
-                                           VerifyOrReturn(CheckValue("operatingMode", actualValue, 0U));
+                                           VerifyOrReturn(CheckValue("OperatingMode", actualValue, 0U));
                                        }
 
                                        NextTest();
@@ -123746,27 +122611,27 @@ class DL_Schedules : public TestCommandBridge {
 
                                        {
                                            id actualValue = values.holidayIndex;
-                                           VerifyOrReturn(CheckValue("holidayIndex", actualValue, 2U));
+                                           VerifyOrReturn(CheckValue("HolidayIndex", actualValue, 2U));
                                        }
 
                                        {
                                            id actualValue = values.status;
-                                           VerifyOrReturn(CheckValue("status", actualValue, 0U));
+                                           VerifyOrReturn(CheckValue("Status", actualValue, 0U));
                                        }
 
                                        {
                                            id actualValue = values.localStartTime;
-                                           VerifyOrReturn(CheckValue("localStartTime", actualValue, 123456UL));
+                                           VerifyOrReturn(CheckValue("LocalStartTime", actualValue, 123456UL));
                                        }
 
                                        {
                                            id actualValue = values.localEndTime;
-                                           VerifyOrReturn(CheckValue("localEndTime", actualValue, 1234567UL));
+                                           VerifyOrReturn(CheckValue("LocalEndTime", actualValue, 1234567UL));
                                        }
 
                                        {
                                            id actualValue = values.operatingMode;
-                                           VerifyOrReturn(CheckValue("operatingMode", actualValue, 1U));
+                                           VerifyOrReturn(CheckValue("OperatingMode", actualValue, 1U));
                                        }
 
                                        NextTest();
@@ -123820,27 +122685,27 @@ class DL_Schedules : public TestCommandBridge {
 
                                   {
                                       id actualValue = values.holidayIndex;
-                                      VerifyOrReturn(CheckValue("holidayIndex", actualValue, NumberOfHolidaySchedulesSupported));
+                                      VerifyOrReturn(CheckValue("HolidayIndex", actualValue, NumberOfHolidaySchedulesSupported));
                                   }
 
                                   {
                                       id actualValue = values.status;
-                                      VerifyOrReturn(CheckValue("status", actualValue, 0U));
+                                      VerifyOrReturn(CheckValue("Status", actualValue, 0U));
                                   }
 
                                   {
                                       id actualValue = values.localStartTime;
-                                      VerifyOrReturn(CheckValue("localStartTime", actualValue, 1UL));
+                                      VerifyOrReturn(CheckValue("LocalStartTime", actualValue, 1UL));
                                   }
 
                                   {
                                       id actualValue = values.localEndTime;
-                                      VerifyOrReturn(CheckValue("localEndTime", actualValue, 100UL));
+                                      VerifyOrReturn(CheckValue("LocalEndTime", actualValue, 100UL));
                                   }
 
                                   {
                                       id actualValue = values.operatingMode;
-                                      VerifyOrReturn(CheckValue("operatingMode", actualValue, 4U));
+                                      VerifyOrReturn(CheckValue("OperatingMode", actualValue, 4U));
                                   }
 
                                   NextTest();
@@ -123859,9 +122724,9 @@ class DL_Schedules : public TestCommandBridge {
 
         __auto_type * params = [[MTRDoorLockClusterSetCredentialParams alloc] init];
         params.operationType = [NSNumber numberWithUnsignedChar:0U];
-        params.credential = [[MTRDoorLockClusterDlCredential alloc] init];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U];
+        params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U];
 
         params.credentialData = [[NSData alloc] initWithBytes:"123456" length:6];
         params.userIndex = nil;
@@ -123876,19 +122741,19 @@ class DL_Schedules : public TestCommandBridge {
 
                              {
                                  id actualValue = values.status;
-                                 VerifyOrReturn(CheckValue("status", actualValue, 0U));
+                                 VerifyOrReturn(CheckValue("Status", actualValue, 0U));
                              }
 
                              {
                                  id actualValue = values.userIndex;
-                                 VerifyOrReturn(CheckValueNonNull("userIndex", actualValue));
-                                 VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
+                                 VerifyOrReturn(CheckValueNonNull("UserIndex", actualValue));
+                                 VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U));
                              }
 
                              {
                                  id actualValue = values.nextCredentialIndex;
-                                 VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue));
-                                 VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 2U));
+                                 VerifyOrReturn(CheckValueNonNull("NextCredentialIndex", actualValue));
+                                 VerifyOrReturn(CheckValue("NextCredentialIndex", actualValue, 2U));
                              }
 
                              NextTest();
@@ -123991,27 +122856,27 @@ class DL_Schedules : public TestCommandBridge {
 
                                        {
                                            id actualValue = values.holidayIndex;
-                                           VerifyOrReturn(CheckValue("holidayIndex", actualValue, 1U));
+                                           VerifyOrReturn(CheckValue("HolidayIndex", actualValue, 1U));
                                        }
 
                                        {
                                            id actualValue = values.status;
-                                           VerifyOrReturn(CheckValue("status", actualValue, 0U));
+                                           VerifyOrReturn(CheckValue("Status", actualValue, 0U));
                                        }
 
                                        {
                                            id actualValue = values.localStartTime;
-                                           VerifyOrReturn(CheckValue("localStartTime", actualValue, 12345UL));
+                                           VerifyOrReturn(CheckValue("LocalStartTime", actualValue, 12345UL));
                                        }
 
                                        {
                                            id actualValue = values.localEndTime;
-                                           VerifyOrReturn(CheckValue("localEndTime", actualValue, 12345689UL));
+                                           VerifyOrReturn(CheckValue("LocalEndTime", actualValue, 12345689UL));
                                        }
 
                                        {
                                            id actualValue = values.operatingMode;
-                                           VerifyOrReturn(CheckValue("operatingMode", actualValue, 0U));
+                                           VerifyOrReturn(CheckValue("OperatingMode", actualValue, 0U));
                                        }
 
                                        NextTest();
@@ -124039,12 +122904,12 @@ class DL_Schedules : public TestCommandBridge {
 
                                        {
                                            id actualValue = values.holidayIndex;
-                                           VerifyOrReturn(CheckValue("holidayIndex", actualValue, 2U));
+                                           VerifyOrReturn(CheckValue("HolidayIndex", actualValue, 2U));
                                        }
 
                                        {
                                            id actualValue = values.status;
-                                           VerifyOrReturn(CheckValue("status", actualValue, 139U));
+                                           VerifyOrReturn(CheckValue("Status", actualValue, 139U));
                                        }
 
                                        NextTest();
@@ -124073,27 +122938,27 @@ class DL_Schedules : public TestCommandBridge {
 
                                   {
                                       id actualValue = values.holidayIndex;
-                                      VerifyOrReturn(CheckValue("holidayIndex", actualValue, NumberOfHolidaySchedulesSupported));
+                                      VerifyOrReturn(CheckValue("HolidayIndex", actualValue, NumberOfHolidaySchedulesSupported));
                                   }
 
                                   {
                                       id actualValue = values.status;
-                                      VerifyOrReturn(CheckValue("status", actualValue, 0U));
+                                      VerifyOrReturn(CheckValue("Status", actualValue, 0U));
                                   }
 
                                   {
                                       id actualValue = values.localStartTime;
-                                      VerifyOrReturn(CheckValue("localStartTime", actualValue, 1UL));
+                                      VerifyOrReturn(CheckValue("LocalStartTime", actualValue, 1UL));
                                   }
 
                                   {
                                       id actualValue = values.localEndTime;
-                                      VerifyOrReturn(CheckValue("localEndTime", actualValue, 100UL));
+                                      VerifyOrReturn(CheckValue("LocalEndTime", actualValue, 100UL));
                                   }
 
                                   {
                                       id actualValue = values.operatingMode;
-                                      VerifyOrReturn(CheckValue("operatingMode", actualValue, 4U));
+                                      VerifyOrReturn(CheckValue("OperatingMode", actualValue, 4U));
                                   }
 
                                   NextTest();
@@ -124122,42 +122987,42 @@ class DL_Schedules : public TestCommandBridge {
 
                                        {
                                            id actualValue = values.weekDayIndex;
-                                           VerifyOrReturn(CheckValue("weekDayIndex", actualValue, 1U));
+                                           VerifyOrReturn(CheckValue("WeekDayIndex", actualValue, 1U));
                                        }
 
                                        {
                                            id actualValue = values.userIndex;
-                                           VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
+                                           VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U));
                                        }
 
                                        {
                                            id actualValue = values.status;
-                                           VerifyOrReturn(CheckValue("status", actualValue, 0U));
+                                           VerifyOrReturn(CheckValue("Status", actualValue, 0U));
                                        }
 
                                        {
                                            id actualValue = values.daysMask;
-                                           VerifyOrReturn(CheckValue("daysMask", actualValue, 1U));
+                                           VerifyOrReturn(CheckValue("DaysMask", actualValue, 1U));
                                        }
 
                                        {
                                            id actualValue = values.startHour;
-                                           VerifyOrReturn(CheckValue("startHour", actualValue, 0U));
+                                           VerifyOrReturn(CheckValue("StartHour", actualValue, 0U));
                                        }
 
                                        {
                                            id actualValue = values.startMinute;
-                                           VerifyOrReturn(CheckValue("startMinute", actualValue, 0U));
+                                           VerifyOrReturn(CheckValue("StartMinute", actualValue, 0U));
                                        }
 
                                        {
                                            id actualValue = values.endHour;
-                                           VerifyOrReturn(CheckValue("endHour", actualValue, 23U));
+                                           VerifyOrReturn(CheckValue("EndHour", actualValue, 23U));
                                        }
 
                                        {
                                            id actualValue = values.endMinute;
-                                           VerifyOrReturn(CheckValue("endMinute", actualValue, 59U));
+                                           VerifyOrReturn(CheckValue("EndMinute", actualValue, 59U));
                                        }
 
                                        NextTest();
@@ -124186,27 +123051,27 @@ class DL_Schedules : public TestCommandBridge {
 
                                        {
                                            id actualValue = values.yearDayIndex;
-                                           VerifyOrReturn(CheckValue("yearDayIndex", actualValue, 1U));
+                                           VerifyOrReturn(CheckValue("YearDayIndex", actualValue, 1U));
                                        }
 
                                        {
                                            id actualValue = values.userIndex;
-                                           VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
+                                           VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U));
                                        }
 
                                        {
                                            id actualValue = values.status;
-                                           VerifyOrReturn(CheckValue("status", actualValue, 0U));
+                                           VerifyOrReturn(CheckValue("Status", actualValue, 0U));
                                        }
 
                                        {
                                            id actualValue = values.localStartTime;
-                                           VerifyOrReturn(CheckValue("localStartTime", actualValue, 9000UL));
+                                           VerifyOrReturn(CheckValue("LocalStartTime", actualValue, 9000UL));
                                        }
 
                                        {
                                            id actualValue = values.localEndTime;
-                                           VerifyOrReturn(CheckValue("localEndTime", actualValue, 888888888UL));
+                                           VerifyOrReturn(CheckValue("LocalEndTime", actualValue, 888888888UL));
                                        }
 
                                        NextTest();
@@ -124256,12 +123121,12 @@ class DL_Schedules : public TestCommandBridge {
 
                                        {
                                            id actualValue = values.holidayIndex;
-                                           VerifyOrReturn(CheckValue("holidayIndex", actualValue, 1U));
+                                           VerifyOrReturn(CheckValue("HolidayIndex", actualValue, 1U));
                                        }
 
                                        {
                                            id actualValue = values.status;
-                                           VerifyOrReturn(CheckValue("status", actualValue, 139U));
+                                           VerifyOrReturn(CheckValue("Status", actualValue, 139U));
                                        }
 
                                        NextTest();
@@ -124289,12 +123154,12 @@ class DL_Schedules : public TestCommandBridge {
 
                                        {
                                            id actualValue = values.holidayIndex;
-                                           VerifyOrReturn(CheckValue("holidayIndex", actualValue, 2U));
+                                           VerifyOrReturn(CheckValue("HolidayIndex", actualValue, 2U));
                                        }
 
                                        {
                                            id actualValue = values.status;
-                                           VerifyOrReturn(CheckValue("status", actualValue, 139U));
+                                           VerifyOrReturn(CheckValue("Status", actualValue, 139U));
                                        }
 
                                        NextTest();
@@ -124323,12 +123188,12 @@ class DL_Schedules : public TestCommandBridge {
 
                                   {
                                       id actualValue = values.holidayIndex;
-                                      VerifyOrReturn(CheckValue("holidayIndex", actualValue, NumberOfHolidaySchedulesSupported));
+                                      VerifyOrReturn(CheckValue("HolidayIndex", actualValue, NumberOfHolidaySchedulesSupported));
                                   }
 
                                   {
                                       id actualValue = values.status;
-                                      VerifyOrReturn(CheckValue("status", actualValue, 139U));
+                                      VerifyOrReturn(CheckValue("Status", actualValue, 139U));
                                   }
 
                                   NextTest();
@@ -124357,42 +123222,42 @@ class DL_Schedules : public TestCommandBridge {
 
                                        {
                                            id actualValue = values.weekDayIndex;
-                                           VerifyOrReturn(CheckValue("weekDayIndex", actualValue, 1U));
+                                           VerifyOrReturn(CheckValue("WeekDayIndex", actualValue, 1U));
                                        }
 
                                        {
                                            id actualValue = values.userIndex;
-                                           VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
+                                           VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U));
                                        }
 
                                        {
                                            id actualValue = values.status;
-                                           VerifyOrReturn(CheckValue("status", actualValue, 0U));
+                                           VerifyOrReturn(CheckValue("Status", actualValue, 0U));
                                        }
 
                                        {
                                            id actualValue = values.daysMask;
-                                           VerifyOrReturn(CheckValue("daysMask", actualValue, 1U));
+                                           VerifyOrReturn(CheckValue("DaysMask", actualValue, 1U));
                                        }
 
                                        {
                                            id actualValue = values.startHour;
-                                           VerifyOrReturn(CheckValue("startHour", actualValue, 0U));
+                                           VerifyOrReturn(CheckValue("StartHour", actualValue, 0U));
                                        }
 
                                        {
                                            id actualValue = values.startMinute;
-                                           VerifyOrReturn(CheckValue("startMinute", actualValue, 0U));
+                                           VerifyOrReturn(CheckValue("StartMinute", actualValue, 0U));
                                        }
 
                                        {
                                            id actualValue = values.endHour;
-                                           VerifyOrReturn(CheckValue("endHour", actualValue, 23U));
+                                           VerifyOrReturn(CheckValue("EndHour", actualValue, 23U));
                                        }
 
                                        {
                                            id actualValue = values.endMinute;
-                                           VerifyOrReturn(CheckValue("endMinute", actualValue, 59U));
+                                           VerifyOrReturn(CheckValue("EndMinute", actualValue, 59U));
                                        }
 
                                        NextTest();
@@ -124421,27 +123286,27 @@ class DL_Schedules : public TestCommandBridge {
 
                                        {
                                            id actualValue = values.yearDayIndex;
-                                           VerifyOrReturn(CheckValue("yearDayIndex", actualValue, 1U));
+                                           VerifyOrReturn(CheckValue("YearDayIndex", actualValue, 1U));
                                        }
 
                                        {
                                            id actualValue = values.userIndex;
-                                           VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
+                                           VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U));
                                        }
 
                                        {
                                            id actualValue = values.status;
-                                           VerifyOrReturn(CheckValue("status", actualValue, 0U));
+                                           VerifyOrReturn(CheckValue("Status", actualValue, 0U));
                                        }
 
                                        {
                                            id actualValue = values.localStartTime;
-                                           VerifyOrReturn(CheckValue("localStartTime", actualValue, 9000UL));
+                                           VerifyOrReturn(CheckValue("LocalStartTime", actualValue, 9000UL));
                                        }
 
                                        {
                                            id actualValue = values.localEndTime;
-                                           VerifyOrReturn(CheckValue("localEndTime", actualValue, 888888888UL));
+                                           VerifyOrReturn(CheckValue("LocalEndTime", actualValue, 888888888UL));
                                        }
 
                                        NextTest();
@@ -126361,7 +125226,7 @@ class Test_TC_DRLK_2_2 : public TestCommandBridge {
         params.operationType = [NSNumber numberWithUnsignedChar:0U];
         params.userIndex = [NSNumber numberWithUnsignedShort:1U];
         params.userName = @"xxx";
-        params.userUniqueId = [NSNumber numberWithUnsignedInt:6452UL];
+        params.userUniqueID = [NSNumber numberWithUnsignedInt:6452UL];
         params.userStatus = [NSNumber numberWithUnsignedChar:1U];
         params.userType = [NSNumber numberWithUnsignedChar:0U];
         params.credentialRule = [NSNumber numberWithUnsignedChar:0U];
@@ -126395,59 +125260,59 @@ class Test_TC_DRLK_2_2 : public TestCommandBridge {
 
                             {
                                 id actualValue = values.userIndex;
-                                VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
+                                VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U));
                             }
 
                             {
                                 id actualValue = values.userName;
-                                VerifyOrReturn(CheckValueNonNull("userName", actualValue));
-                                VerifyOrReturn(CheckValueAsString("userName", actualValue, @"xxx"));
+                                VerifyOrReturn(CheckValueNonNull("UserName", actualValue));
+                                VerifyOrReturn(CheckValueAsString("UserName", actualValue, @"xxx"));
                             }
 
                             {
-                                id actualValue = values.userUniqueId;
-                                VerifyOrReturn(CheckValueNonNull("userUniqueId", actualValue));
-                                VerifyOrReturn(CheckValue("userUniqueId", actualValue, 6452UL));
+                                id actualValue = values.userUniqueID;
+                                VerifyOrReturn(CheckValueNonNull("UserUniqueID", actualValue));
+                                VerifyOrReturn(CheckValue("UserUniqueID", actualValue, 6452UL));
                             }
 
                             {
                                 id actualValue = values.userStatus;
-                                VerifyOrReturn(CheckValueNonNull("userStatus", actualValue));
-                                VerifyOrReturn(CheckValue("userStatus", actualValue, 1U));
+                                VerifyOrReturn(CheckValueNonNull("UserStatus", actualValue));
+                                VerifyOrReturn(CheckValue("UserStatus", actualValue, 1U));
                             }
 
                             {
                                 id actualValue = values.userType;
-                                VerifyOrReturn(CheckValueNonNull("userType", actualValue));
-                                VerifyOrReturn(CheckValue("userType", actualValue, 0U));
+                                VerifyOrReturn(CheckValueNonNull("UserType", actualValue));
+                                VerifyOrReturn(CheckValue("UserType", actualValue, 0U));
                             }
 
                             {
                                 id actualValue = values.credentialRule;
-                                VerifyOrReturn(CheckValueNonNull("credentialRule", actualValue));
-                                VerifyOrReturn(CheckValue("credentialRule", actualValue, 0U));
+                                VerifyOrReturn(CheckValueNonNull("CredentialRule", actualValue));
+                                VerifyOrReturn(CheckValue("CredentialRule", actualValue, 0U));
                             }
 
                             {
                                 id actualValue = values.credentials;
-                                VerifyOrReturn(CheckValueNull("credentials", actualValue));
+                                VerifyOrReturn(CheckValueNull("Credentials", actualValue));
                             }
 
                             {
                                 id actualValue = values.creatorFabricIndex;
-                                VerifyOrReturn(CheckValueNonNull("creatorFabricIndex", actualValue));
-                                VerifyOrReturn(CheckValue("creatorFabricIndex", actualValue, 1U));
+                                VerifyOrReturn(CheckValueNonNull("CreatorFabricIndex", actualValue));
+                                VerifyOrReturn(CheckValue("CreatorFabricIndex", actualValue, 1U));
                             }
 
                             {
                                 id actualValue = values.lastModifiedFabricIndex;
-                                VerifyOrReturn(CheckValueNonNull("lastModifiedFabricIndex", actualValue));
-                                VerifyOrReturn(CheckValue("lastModifiedFabricIndex", actualValue, 1U));
+                                VerifyOrReturn(CheckValueNonNull("LastModifiedFabricIndex", actualValue));
+                                VerifyOrReturn(CheckValue("LastModifiedFabricIndex", actualValue, 1U));
                             }
 
                             {
                                 id actualValue = values.nextUserIndex;
-                                VerifyOrReturn(CheckValueNull("nextUserIndex", actualValue));
+                                VerifyOrReturn(CheckValueNull("NextUserIndex", actualValue));
                             }
 
                             NextTest();
@@ -126466,9 +125331,9 @@ class Test_TC_DRLK_2_2 : public TestCommandBridge {
 
         __auto_type * params = [[MTRDoorLockClusterSetCredentialParams alloc] init];
         params.operationType = [NSNumber numberWithUnsignedChar:0U];
-        params.credential = [[MTRDoorLockClusterDlCredential alloc] init];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U];
+        params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U];
 
         params.credentialData = [[NSData alloc] initWithBytes:"123456" length:6];
         params.userIndex = [NSNumber numberWithUnsignedShort:1U];
@@ -126483,18 +125348,18 @@ class Test_TC_DRLK_2_2 : public TestCommandBridge {
 
                              {
                                  id actualValue = values.status;
-                                 VerifyOrReturn(CheckValue("status", actualValue, 0U));
+                                 VerifyOrReturn(CheckValue("Status", actualValue, 0U));
                              }
 
                              {
                                  id actualValue = values.userIndex;
-                                 VerifyOrReturn(CheckValueNull("userIndex", actualValue));
+                                 VerifyOrReturn(CheckValueNull("UserIndex", actualValue));
                              }
 
                              {
                                  id actualValue = values.nextCredentialIndex;
-                                 VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue));
-                                 VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 2U));
+                                 VerifyOrReturn(CheckValueNonNull("NextCredentialIndex", actualValue));
+                                 VerifyOrReturn(CheckValue("NextCredentialIndex", actualValue, 2U));
                              }
 
                              NextTest();
@@ -126512,9 +125377,9 @@ class Test_TC_DRLK_2_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         __auto_type * params = [[MTRDoorLockClusterGetCredentialStatusParams alloc] init];
-        params.credential = [[MTRDoorLockClusterDlCredential alloc] init];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U];
+        params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U];
 
         [cluster getCredentialStatusWithParams:params
                                     completion:^(MTRDoorLockClusterGetCredentialStatusResponseParams * _Nullable values,
@@ -126525,30 +125390,30 @@ class Test_TC_DRLK_2_2 : public TestCommandBridge {
 
                                         {
                                             id actualValue = values.credentialExists;
-                                            VerifyOrReturn(CheckValue("credentialExists", actualValue, true));
+                                            VerifyOrReturn(CheckValue("CredentialExists", actualValue, true));
                                         }
 
                                         {
                                             id actualValue = values.userIndex;
-                                            VerifyOrReturn(CheckValueNonNull("userIndex", actualValue));
-                                            VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
+                                            VerifyOrReturn(CheckValueNonNull("UserIndex", actualValue));
+                                            VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U));
                                         }
 
                                         {
                                             id actualValue = values.creatorFabricIndex;
-                                            VerifyOrReturn(CheckValueNonNull("creatorFabricIndex", actualValue));
-                                            VerifyOrReturn(CheckValue("creatorFabricIndex", actualValue, 1U));
+                                            VerifyOrReturn(CheckValueNonNull("CreatorFabricIndex", actualValue));
+                                            VerifyOrReturn(CheckValue("CreatorFabricIndex", actualValue, 1U));
                                         }
 
                                         {
                                             id actualValue = values.lastModifiedFabricIndex;
-                                            VerifyOrReturn(CheckValueNonNull("lastModifiedFabricIndex", actualValue));
-                                            VerifyOrReturn(CheckValue("lastModifiedFabricIndex", actualValue, 1U));
+                                            VerifyOrReturn(CheckValueNonNull("LastModifiedFabricIndex", actualValue));
+                                            VerifyOrReturn(CheckValue("LastModifiedFabricIndex", actualValue, 1U));
                                         }
 
                                         {
                                             id actualValue = values.nextCredentialIndex;
-                                            VerifyOrReturn(CheckValueNull("nextCredentialIndex", actualValue));
+                                            VerifyOrReturn(CheckValueNull("NextCredentialIndex", actualValue));
                                         }
 
                                         NextTest();
@@ -127042,9 +125907,9 @@ class Test_TC_DRLK_2_2 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         __auto_type * params = [[MTRDoorLockClusterClearCredentialParams alloc] init];
-        params.credential = [[MTRDoorLockClusterDlCredential alloc] init];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U];
+        params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U];
 
         [cluster clearCredentialWithParams:params
                                 completion:^(NSError * _Nullable err) {
@@ -127544,7 +126409,7 @@ class Test_TC_DRLK_2_3 : public TestCommandBridge {
         params.operationType = [NSNumber numberWithUnsignedChar:0U];
         params.userIndex = [NSNumber numberWithUnsignedShort:1U];
         params.userName = @"xxx";
-        params.userUniqueId = [NSNumber numberWithUnsignedInt:6452UL];
+        params.userUniqueID = [NSNumber numberWithUnsignedInt:6452UL];
         params.userStatus = [NSNumber numberWithUnsignedChar:1U];
         params.userType = [NSNumber numberWithUnsignedChar:0U];
         params.credentialRule = [NSNumber numberWithUnsignedChar:0U];
@@ -127578,59 +126443,59 @@ class Test_TC_DRLK_2_3 : public TestCommandBridge {
 
                             {
                                 id actualValue = values.userIndex;
-                                VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
+                                VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U));
                             }
 
                             {
                                 id actualValue = values.userName;
-                                VerifyOrReturn(CheckValueNonNull("userName", actualValue));
-                                VerifyOrReturn(CheckValueAsString("userName", actualValue, @"xxx"));
+                                VerifyOrReturn(CheckValueNonNull("UserName", actualValue));
+                                VerifyOrReturn(CheckValueAsString("UserName", actualValue, @"xxx"));
                             }
 
                             {
-                                id actualValue = values.userUniqueId;
-                                VerifyOrReturn(CheckValueNonNull("userUniqueId", actualValue));
-                                VerifyOrReturn(CheckValue("userUniqueId", actualValue, 6452UL));
+                                id actualValue = values.userUniqueID;
+                                VerifyOrReturn(CheckValueNonNull("UserUniqueID", actualValue));
+                                VerifyOrReturn(CheckValue("UserUniqueID", actualValue, 6452UL));
                             }
 
                             {
                                 id actualValue = values.userStatus;
-                                VerifyOrReturn(CheckValueNonNull("userStatus", actualValue));
-                                VerifyOrReturn(CheckValue("userStatus", actualValue, 1U));
+                                VerifyOrReturn(CheckValueNonNull("UserStatus", actualValue));
+                                VerifyOrReturn(CheckValue("UserStatus", actualValue, 1U));
                             }
 
                             {
                                 id actualValue = values.userType;
-                                VerifyOrReturn(CheckValueNonNull("userType", actualValue));
-                                VerifyOrReturn(CheckValue("userType", actualValue, 0U));
+                                VerifyOrReturn(CheckValueNonNull("UserType", actualValue));
+                                VerifyOrReturn(CheckValue("UserType", actualValue, 0U));
                             }
 
                             {
                                 id actualValue = values.credentialRule;
-                                VerifyOrReturn(CheckValueNonNull("credentialRule", actualValue));
-                                VerifyOrReturn(CheckValue("credentialRule", actualValue, 0U));
+                                VerifyOrReturn(CheckValueNonNull("CredentialRule", actualValue));
+                                VerifyOrReturn(CheckValue("CredentialRule", actualValue, 0U));
                             }
 
                             {
                                 id actualValue = values.credentials;
-                                VerifyOrReturn(CheckValueNull("credentials", actualValue));
+                                VerifyOrReturn(CheckValueNull("Credentials", actualValue));
                             }
 
                             {
                                 id actualValue = values.creatorFabricIndex;
-                                VerifyOrReturn(CheckValueNonNull("creatorFabricIndex", actualValue));
-                                VerifyOrReturn(CheckValue("creatorFabricIndex", actualValue, 1U));
+                                VerifyOrReturn(CheckValueNonNull("CreatorFabricIndex", actualValue));
+                                VerifyOrReturn(CheckValue("CreatorFabricIndex", actualValue, 1U));
                             }
 
                             {
                                 id actualValue = values.lastModifiedFabricIndex;
-                                VerifyOrReturn(CheckValueNonNull("lastModifiedFabricIndex", actualValue));
-                                VerifyOrReturn(CheckValue("lastModifiedFabricIndex", actualValue, 1U));
+                                VerifyOrReturn(CheckValueNonNull("LastModifiedFabricIndex", actualValue));
+                                VerifyOrReturn(CheckValue("LastModifiedFabricIndex", actualValue, 1U));
                             }
 
                             {
                                 id actualValue = values.nextUserIndex;
-                                VerifyOrReturn(CheckValueNull("nextUserIndex", actualValue));
+                                VerifyOrReturn(CheckValueNull("NextUserIndex", actualValue));
                             }
 
                             NextTest();
@@ -127649,9 +126514,9 @@ class Test_TC_DRLK_2_3 : public TestCommandBridge {
 
         __auto_type * params = [[MTRDoorLockClusterSetCredentialParams alloc] init];
         params.operationType = [NSNumber numberWithUnsignedChar:0U];
-        params.credential = [[MTRDoorLockClusterDlCredential alloc] init];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U];
+        params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U];
 
         params.credentialData = [[NSData alloc] initWithBytes:"123456" length:6];
         params.userIndex = [NSNumber numberWithUnsignedShort:1U];
@@ -127666,18 +126531,18 @@ class Test_TC_DRLK_2_3 : public TestCommandBridge {
 
                              {
                                  id actualValue = values.status;
-                                 VerifyOrReturn(CheckValue("status", actualValue, 0U));
+                                 VerifyOrReturn(CheckValue("Status", actualValue, 0U));
                              }
 
                              {
                                  id actualValue = values.userIndex;
-                                 VerifyOrReturn(CheckValueNull("userIndex", actualValue));
+                                 VerifyOrReturn(CheckValueNull("UserIndex", actualValue));
                              }
 
                              {
                                  id actualValue = values.nextCredentialIndex;
-                                 VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue));
-                                 VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 2U));
+                                 VerifyOrReturn(CheckValueNonNull("NextCredentialIndex", actualValue));
+                                 VerifyOrReturn(CheckValue("NextCredentialIndex", actualValue, 2U));
                              }
 
                              NextTest();
@@ -127695,9 +126560,9 @@ class Test_TC_DRLK_2_3 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         __auto_type * params = [[MTRDoorLockClusterGetCredentialStatusParams alloc] init];
-        params.credential = [[MTRDoorLockClusterDlCredential alloc] init];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U];
+        params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U];
 
         [cluster getCredentialStatusWithParams:params
                                     completion:^(MTRDoorLockClusterGetCredentialStatusResponseParams * _Nullable values,
@@ -127708,30 +126573,30 @@ class Test_TC_DRLK_2_3 : public TestCommandBridge {
 
                                         {
                                             id actualValue = values.credentialExists;
-                                            VerifyOrReturn(CheckValue("credentialExists", actualValue, true));
+                                            VerifyOrReturn(CheckValue("CredentialExists", actualValue, true));
                                         }
 
                                         {
                                             id actualValue = values.userIndex;
-                                            VerifyOrReturn(CheckValueNonNull("userIndex", actualValue));
-                                            VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
+                                            VerifyOrReturn(CheckValueNonNull("UserIndex", actualValue));
+                                            VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U));
                                         }
 
                                         {
                                             id actualValue = values.creatorFabricIndex;
-                                            VerifyOrReturn(CheckValueNonNull("creatorFabricIndex", actualValue));
-                                            VerifyOrReturn(CheckValue("creatorFabricIndex", actualValue, 1U));
+                                            VerifyOrReturn(CheckValueNonNull("CreatorFabricIndex", actualValue));
+                                            VerifyOrReturn(CheckValue("CreatorFabricIndex", actualValue, 1U));
                                         }
 
                                         {
                                             id actualValue = values.lastModifiedFabricIndex;
-                                            VerifyOrReturn(CheckValueNonNull("lastModifiedFabricIndex", actualValue));
-                                            VerifyOrReturn(CheckValue("lastModifiedFabricIndex", actualValue, 1U));
+                                            VerifyOrReturn(CheckValueNonNull("LastModifiedFabricIndex", actualValue));
+                                            VerifyOrReturn(CheckValue("LastModifiedFabricIndex", actualValue, 1U));
                                         }
 
                                         {
                                             id actualValue = values.nextCredentialIndex;
-                                            VerifyOrReturn(CheckValueNull("nextCredentialIndex", actualValue));
+                                            VerifyOrReturn(CheckValueNull("NextCredentialIndex", actualValue));
                                         }
 
                                         NextTest();
@@ -128469,9 +127334,9 @@ class Test_TC_DRLK_2_3 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         __auto_type * params = [[MTRDoorLockClusterClearCredentialParams alloc] init];
-        params.credential = [[MTRDoorLockClusterDlCredential alloc] init];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U];
+        params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U];
 
         [cluster clearCredentialWithParams:params
                                 completion:^(NSError * _Nullable err) {
@@ -128690,7 +127555,7 @@ class Test_TC_DRLK_2_4 : public TestCommandBridge {
         params.operationType = [NSNumber numberWithUnsignedChar:0U];
         params.userIndex = [NSNumber numberWithUnsignedShort:1U];
         params.userName = @"xxx";
-        params.userUniqueId = [NSNumber numberWithUnsignedInt:6452UL];
+        params.userUniqueID = [NSNumber numberWithUnsignedInt:6452UL];
         params.userStatus = [NSNumber numberWithUnsignedChar:1U];
         params.userType = [NSNumber numberWithUnsignedChar:0U];
         params.credentialRule = [NSNumber numberWithUnsignedChar:0U];
@@ -128724,59 +127589,59 @@ class Test_TC_DRLK_2_4 : public TestCommandBridge {
 
                             {
                                 id actualValue = values.userIndex;
-                                VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
+                                VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U));
                             }
 
                             {
                                 id actualValue = values.userName;
-                                VerifyOrReturn(CheckValueNonNull("userName", actualValue));
-                                VerifyOrReturn(CheckValueAsString("userName", actualValue, @"xxx"));
+                                VerifyOrReturn(CheckValueNonNull("UserName", actualValue));
+                                VerifyOrReturn(CheckValueAsString("UserName", actualValue, @"xxx"));
                             }
 
                             {
-                                id actualValue = values.userUniqueId;
-                                VerifyOrReturn(CheckValueNonNull("userUniqueId", actualValue));
-                                VerifyOrReturn(CheckValue("userUniqueId", actualValue, 6452UL));
+                                id actualValue = values.userUniqueID;
+                                VerifyOrReturn(CheckValueNonNull("UserUniqueID", actualValue));
+                                VerifyOrReturn(CheckValue("UserUniqueID", actualValue, 6452UL));
                             }
 
                             {
                                 id actualValue = values.userStatus;
-                                VerifyOrReturn(CheckValueNonNull("userStatus", actualValue));
-                                VerifyOrReturn(CheckValue("userStatus", actualValue, 1U));
+                                VerifyOrReturn(CheckValueNonNull("UserStatus", actualValue));
+                                VerifyOrReturn(CheckValue("UserStatus", actualValue, 1U));
                             }
 
                             {
                                 id actualValue = values.userType;
-                                VerifyOrReturn(CheckValueNonNull("userType", actualValue));
-                                VerifyOrReturn(CheckValue("userType", actualValue, 0U));
+                                VerifyOrReturn(CheckValueNonNull("UserType", actualValue));
+                                VerifyOrReturn(CheckValue("UserType", actualValue, 0U));
                             }
 
                             {
                                 id actualValue = values.credentialRule;
-                                VerifyOrReturn(CheckValueNonNull("credentialRule", actualValue));
-                                VerifyOrReturn(CheckValue("credentialRule", actualValue, 0U));
+                                VerifyOrReturn(CheckValueNonNull("CredentialRule", actualValue));
+                                VerifyOrReturn(CheckValue("CredentialRule", actualValue, 0U));
                             }
 
                             {
                                 id actualValue = values.credentials;
-                                VerifyOrReturn(CheckValueNull("credentials", actualValue));
+                                VerifyOrReturn(CheckValueNull("Credentials", actualValue));
                             }
 
                             {
                                 id actualValue = values.creatorFabricIndex;
-                                VerifyOrReturn(CheckValueNonNull("creatorFabricIndex", actualValue));
-                                VerifyOrReturn(CheckValue("creatorFabricIndex", actualValue, 1U));
+                                VerifyOrReturn(CheckValueNonNull("CreatorFabricIndex", actualValue));
+                                VerifyOrReturn(CheckValue("CreatorFabricIndex", actualValue, 1U));
                             }
 
                             {
                                 id actualValue = values.lastModifiedFabricIndex;
-                                VerifyOrReturn(CheckValueNonNull("lastModifiedFabricIndex", actualValue));
-                                VerifyOrReturn(CheckValue("lastModifiedFabricIndex", actualValue, 1U));
+                                VerifyOrReturn(CheckValueNonNull("LastModifiedFabricIndex", actualValue));
+                                VerifyOrReturn(CheckValue("LastModifiedFabricIndex", actualValue, 1U));
                             }
 
                             {
                                 id actualValue = values.nextUserIndex;
-                                VerifyOrReturn(CheckValueNull("nextUserIndex", actualValue));
+                                VerifyOrReturn(CheckValueNull("NextUserIndex", actualValue));
                             }
 
                             NextTest();
@@ -128795,9 +127660,9 @@ class Test_TC_DRLK_2_4 : public TestCommandBridge {
 
         __auto_type * params = [[MTRDoorLockClusterSetCredentialParams alloc] init];
         params.operationType = [NSNumber numberWithUnsignedChar:0U];
-        params.credential = [[MTRDoorLockClusterDlCredential alloc] init];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U];
+        params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U];
 
         params.credentialData = [[NSData alloc] initWithBytes:"123456" length:6];
         params.userIndex = [NSNumber numberWithUnsignedShort:1U];
@@ -128812,18 +127677,18 @@ class Test_TC_DRLK_2_4 : public TestCommandBridge {
 
                              {
                                  id actualValue = values.status;
-                                 VerifyOrReturn(CheckValue("status", actualValue, 0U));
+                                 VerifyOrReturn(CheckValue("Status", actualValue, 0U));
                              }
 
                              {
                                  id actualValue = values.userIndex;
-                                 VerifyOrReturn(CheckValueNull("userIndex", actualValue));
+                                 VerifyOrReturn(CheckValueNull("UserIndex", actualValue));
                              }
 
                              {
                                  id actualValue = values.nextCredentialIndex;
-                                 VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue));
-                                 VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 2U));
+                                 VerifyOrReturn(CheckValueNonNull("NextCredentialIndex", actualValue));
+                                 VerifyOrReturn(CheckValue("NextCredentialIndex", actualValue, 2U));
                              }
 
                              NextTest();
@@ -128841,9 +127706,9 @@ class Test_TC_DRLK_2_4 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         __auto_type * params = [[MTRDoorLockClusterGetCredentialStatusParams alloc] init];
-        params.credential = [[MTRDoorLockClusterDlCredential alloc] init];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U];
+        params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U];
 
         [cluster getCredentialStatusWithParams:params
                                     completion:^(MTRDoorLockClusterGetCredentialStatusResponseParams * _Nullable values,
@@ -128854,30 +127719,30 @@ class Test_TC_DRLK_2_4 : public TestCommandBridge {
 
                                         {
                                             id actualValue = values.credentialExists;
-                                            VerifyOrReturn(CheckValue("credentialExists", actualValue, true));
+                                            VerifyOrReturn(CheckValue("CredentialExists", actualValue, true));
                                         }
 
                                         {
                                             id actualValue = values.userIndex;
-                                            VerifyOrReturn(CheckValueNonNull("userIndex", actualValue));
-                                            VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
+                                            VerifyOrReturn(CheckValueNonNull("UserIndex", actualValue));
+                                            VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U));
                                         }
 
                                         {
                                             id actualValue = values.creatorFabricIndex;
-                                            VerifyOrReturn(CheckValueNonNull("creatorFabricIndex", actualValue));
-                                            VerifyOrReturn(CheckValue("creatorFabricIndex", actualValue, 1U));
+                                            VerifyOrReturn(CheckValueNonNull("CreatorFabricIndex", actualValue));
+                                            VerifyOrReturn(CheckValue("CreatorFabricIndex", actualValue, 1U));
                                         }
 
                                         {
                                             id actualValue = values.lastModifiedFabricIndex;
-                                            VerifyOrReturn(CheckValueNonNull("lastModifiedFabricIndex", actualValue));
-                                            VerifyOrReturn(CheckValue("lastModifiedFabricIndex", actualValue, 1U));
+                                            VerifyOrReturn(CheckValueNonNull("LastModifiedFabricIndex", actualValue));
+                                            VerifyOrReturn(CheckValue("LastModifiedFabricIndex", actualValue, 1U));
                                         }
 
                                         {
                                             id actualValue = values.nextCredentialIndex;
-                                            VerifyOrReturn(CheckValueNull("nextCredentialIndex", actualValue));
+                                            VerifyOrReturn(CheckValueNull("NextCredentialIndex", actualValue));
                                         }
 
                                         NextTest();
@@ -129025,9 +127890,9 @@ class Test_TC_DRLK_2_4 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         __auto_type * params = [[MTRDoorLockClusterClearCredentialParams alloc] init];
-        params.credential = [[MTRDoorLockClusterDlCredential alloc] init];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U];
+        params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U];
 
         [cluster clearCredentialWithParams:params
                                 completion:^(NSError * _Nullable err) {
@@ -129254,7 +128119,7 @@ class Test_TC_DRLK_2_5 : public TestCommandBridge {
         params.operationType = [NSNumber numberWithUnsignedChar:0U];
         params.userIndex = [NSNumber numberWithUnsignedShort:1U];
         params.userName = @"xxx";
-        params.userUniqueId = [NSNumber numberWithUnsignedInt:6452UL];
+        params.userUniqueID = [NSNumber numberWithUnsignedInt:6452UL];
         params.userStatus = [NSNumber numberWithUnsignedChar:1U];
         params.userType = [NSNumber numberWithUnsignedChar:0U];
         params.credentialRule = [NSNumber numberWithUnsignedChar:0U];
@@ -129288,59 +128153,59 @@ class Test_TC_DRLK_2_5 : public TestCommandBridge {
 
                             {
                                 id actualValue = values.userIndex;
-                                VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
+                                VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U));
                             }
 
                             {
                                 id actualValue = values.userName;
-                                VerifyOrReturn(CheckValueNonNull("userName", actualValue));
-                                VerifyOrReturn(CheckValueAsString("userName", actualValue, @"xxx"));
+                                VerifyOrReturn(CheckValueNonNull("UserName", actualValue));
+                                VerifyOrReturn(CheckValueAsString("UserName", actualValue, @"xxx"));
                             }
 
                             {
-                                id actualValue = values.userUniqueId;
-                                VerifyOrReturn(CheckValueNonNull("userUniqueId", actualValue));
-                                VerifyOrReturn(CheckValue("userUniqueId", actualValue, 6452UL));
+                                id actualValue = values.userUniqueID;
+                                VerifyOrReturn(CheckValueNonNull("UserUniqueID", actualValue));
+                                VerifyOrReturn(CheckValue("UserUniqueID", actualValue, 6452UL));
                             }
 
                             {
                                 id actualValue = values.userStatus;
-                                VerifyOrReturn(CheckValueNonNull("userStatus", actualValue));
-                                VerifyOrReturn(CheckValue("userStatus", actualValue, 1U));
+                                VerifyOrReturn(CheckValueNonNull("UserStatus", actualValue));
+                                VerifyOrReturn(CheckValue("UserStatus", actualValue, 1U));
                             }
 
                             {
                                 id actualValue = values.userType;
-                                VerifyOrReturn(CheckValueNonNull("userType", actualValue));
-                                VerifyOrReturn(CheckValue("userType", actualValue, 0U));
+                                VerifyOrReturn(CheckValueNonNull("UserType", actualValue));
+                                VerifyOrReturn(CheckValue("UserType", actualValue, 0U));
                             }
 
                             {
                                 id actualValue = values.credentialRule;
-                                VerifyOrReturn(CheckValueNonNull("credentialRule", actualValue));
-                                VerifyOrReturn(CheckValue("credentialRule", actualValue, 0U));
+                                VerifyOrReturn(CheckValueNonNull("CredentialRule", actualValue));
+                                VerifyOrReturn(CheckValue("CredentialRule", actualValue, 0U));
                             }
 
                             {
                                 id actualValue = values.credentials;
-                                VerifyOrReturn(CheckValueNull("credentials", actualValue));
+                                VerifyOrReturn(CheckValueNull("Credentials", actualValue));
                             }
 
                             {
                                 id actualValue = values.creatorFabricIndex;
-                                VerifyOrReturn(CheckValueNonNull("creatorFabricIndex", actualValue));
-                                VerifyOrReturn(CheckValue("creatorFabricIndex", actualValue, 1U));
+                                VerifyOrReturn(CheckValueNonNull("CreatorFabricIndex", actualValue));
+                                VerifyOrReturn(CheckValue("CreatorFabricIndex", actualValue, 1U));
                             }
 
                             {
                                 id actualValue = values.lastModifiedFabricIndex;
-                                VerifyOrReturn(CheckValueNonNull("lastModifiedFabricIndex", actualValue));
-                                VerifyOrReturn(CheckValue("lastModifiedFabricIndex", actualValue, 1U));
+                                VerifyOrReturn(CheckValueNonNull("LastModifiedFabricIndex", actualValue));
+                                VerifyOrReturn(CheckValue("LastModifiedFabricIndex", actualValue, 1U));
                             }
 
                             {
                                 id actualValue = values.nextUserIndex;
-                                VerifyOrReturn(CheckValueNull("nextUserIndex", actualValue));
+                                VerifyOrReturn(CheckValueNull("NextUserIndex", actualValue));
                             }
 
                             NextTest();
@@ -129453,32 +128318,32 @@ class Test_TC_DRLK_2_5 : public TestCommandBridge {
 
                                   {
                                       id actualValue = values.weekDayIndex;
-                                      VerifyOrReturn(CheckValue("weekDayIndex", actualValue, 1U));
+                                      VerifyOrReturn(CheckValue("WeekDayIndex", actualValue, 1U));
                                   }
 
                                   {
                                       id actualValue = values.userIndex;
-                                      VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
+                                      VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U));
                                   }
 
                                   {
                                       id actualValue = values.status;
-                                      VerifyOrReturn(CheckValue("status", actualValue, 0U));
+                                      VerifyOrReturn(CheckValue("Status", actualValue, 0U));
                                   }
 
                                   {
                                       id actualValue = values.daysMask;
-                                      VerifyOrReturn(CheckValue("daysMask", actualValue, 2U));
+                                      VerifyOrReturn(CheckValue("DaysMask", actualValue, 2U));
                                   }
 
                                   {
                                       id actualValue = values.startHour;
-                                      VerifyOrReturn(CheckValue("startHour", actualValue, 15U));
+                                      VerifyOrReturn(CheckValue("StartHour", actualValue, 15U));
                                   }
 
                                   {
                                       id actualValue = values.startMinute;
-                                      VerifyOrReturn(CheckValue("startMinute", actualValue, 45U));
+                                      VerifyOrReturn(CheckValue("StartMinute", actualValue, 45U));
                                   }
 
                                   VerifyOrReturn(CheckConstraintHasValue("endHour", values.endHour, true));
@@ -129552,17 +128417,17 @@ class Test_TC_DRLK_2_5 : public TestCommandBridge {
 
                                        {
                                            id actualValue = values.weekDayIndex;
-                                           VerifyOrReturn(CheckValue("weekDayIndex", actualValue, 0U));
+                                           VerifyOrReturn(CheckValue("WeekDayIndex", actualValue, 0U));
                                        }
 
                                        {
                                            id actualValue = values.userIndex;
-                                           VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
+                                           VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U));
                                        }
 
                                        {
                                            id actualValue = values.status;
-                                           VerifyOrReturn(CheckValue("status", actualValue, 133U));
+                                           VerifyOrReturn(CheckValue("Status", actualValue, 133U));
                                        }
 
                                        VerifyOrReturn(CheckConstraintHasValue("daysMask", values.daysMask, false));
@@ -129634,17 +128499,17 @@ class Test_TC_DRLK_2_5 : public TestCommandBridge {
 
                                        {
                                            id actualValue = values.weekDayIndex;
-                                           VerifyOrReturn(CheckValue("weekDayIndex", actualValue, 1U));
+                                           VerifyOrReturn(CheckValue("WeekDayIndex", actualValue, 1U));
                                        }
 
                                        {
                                            id actualValue = values.userIndex;
-                                           VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
+                                           VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U));
                                        }
 
                                        {
                                            id actualValue = values.status;
-                                           VerifyOrReturn(CheckValue("status", actualValue, 139U));
+                                           VerifyOrReturn(CheckValue("Status", actualValue, 139U));
                                        }
 
                                        VerifyOrReturn(CheckConstraintHasValue("daysMask", values.daysMask, false));
@@ -129954,22 +128819,22 @@ class Test_TC_DRLK_2_6 : public TestCommandBridge {
 
                                        {
                                            id actualValue = values.holidayIndex;
-                                           VerifyOrReturn(CheckValue("holidayIndex", actualValue, 1U));
+                                           VerifyOrReturn(CheckValue("HolidayIndex", actualValue, 1U));
                                        }
 
                                        {
                                            id actualValue = values.status;
-                                           VerifyOrReturn(CheckValue("status", actualValue, 0U));
+                                           VerifyOrReturn(CheckValue("Status", actualValue, 0U));
                                        }
 
                                        {
                                            id actualValue = values.localStartTime;
-                                           VerifyOrReturn(CheckValue("localStartTime", actualValue, 20UL));
+                                           VerifyOrReturn(CheckValue("LocalStartTime", actualValue, 20UL));
                                        }
 
                                        {
                                            id actualValue = values.localEndTime;
-                                           VerifyOrReturn(CheckValue("localEndTime", actualValue, 30UL));
+                                           VerifyOrReturn(CheckValue("LocalEndTime", actualValue, 30UL));
                                        }
 
                                        if (values.localEndTime != nil) {
@@ -129980,7 +128845,7 @@ class Test_TC_DRLK_2_6 : public TestCommandBridge {
 
                                        {
                                            id actualValue = values.operatingMode;
-                                           VerifyOrReturn(CheckValue("operatingMode", actualValue, 0U));
+                                           VerifyOrReturn(CheckValue("OperatingMode", actualValue, 0U));
                                        }
 
                                        NextTest();
@@ -130036,12 +128901,12 @@ class Test_TC_DRLK_2_6 : public TestCommandBridge {
 
                                        {
                                            id actualValue = values.holidayIndex;
-                                           VerifyOrReturn(CheckValue("holidayIndex", actualValue, 15U));
+                                           VerifyOrReturn(CheckValue("HolidayIndex", actualValue, 15U));
                                        }
 
                                        {
                                            id actualValue = values.status;
-                                           VerifyOrReturn(CheckValue("status", actualValue, 133U));
+                                           VerifyOrReturn(CheckValue("Status", actualValue, 133U));
                                        }
 
                                        NextTest();
@@ -130069,12 +128934,12 @@ class Test_TC_DRLK_2_6 : public TestCommandBridge {
 
                                        {
                                            id actualValue = values.holidayIndex;
-                                           VerifyOrReturn(CheckValue("holidayIndex", actualValue, 10U));
+                                           VerifyOrReturn(CheckValue("HolidayIndex", actualValue, 10U));
                                        }
 
                                        {
                                            id actualValue = values.status;
-                                           VerifyOrReturn(CheckValue("status", actualValue, 139U));
+                                           VerifyOrReturn(CheckValue("Status", actualValue, 139U));
                                        }
 
                                        NextTest();
@@ -130124,12 +128989,12 @@ class Test_TC_DRLK_2_6 : public TestCommandBridge {
 
                                        {
                                            id actualValue = values.holidayIndex;
-                                           VerifyOrReturn(CheckValue("holidayIndex", actualValue, 1U));
+                                           VerifyOrReturn(CheckValue("HolidayIndex", actualValue, 1U));
                                        }
 
                                        {
                                            id actualValue = values.status;
-                                           VerifyOrReturn(CheckValue("status", actualValue, 139U));
+                                           VerifyOrReturn(CheckValue("Status", actualValue, 139U));
                                        }
 
                                        NextTest();
@@ -130435,7 +129300,7 @@ class Test_TC_DRLK_2_7 : public TestCommandBridge {
         params.operationType = [NSNumber numberWithUnsignedChar:0U];
         params.userIndex = [NSNumber numberWithUnsignedShort:1U];
         params.userName = @"xxx";
-        params.userUniqueId = [NSNumber numberWithUnsignedInt:6452UL];
+        params.userUniqueID = [NSNumber numberWithUnsignedInt:6452UL];
         params.userStatus = [NSNumber numberWithUnsignedChar:1U];
         params.userType = [NSNumber numberWithUnsignedChar:0U];
         params.credentialRule = [NSNumber numberWithUnsignedChar:0U];
@@ -130469,59 +129334,59 @@ class Test_TC_DRLK_2_7 : public TestCommandBridge {
 
                             {
                                 id actualValue = values.userIndex;
-                                VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
+                                VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U));
                             }
 
                             {
                                 id actualValue = values.userName;
-                                VerifyOrReturn(CheckValueNonNull("userName", actualValue));
-                                VerifyOrReturn(CheckValueAsString("userName", actualValue, @"xxx"));
+                                VerifyOrReturn(CheckValueNonNull("UserName", actualValue));
+                                VerifyOrReturn(CheckValueAsString("UserName", actualValue, @"xxx"));
                             }
 
                             {
-                                id actualValue = values.userUniqueId;
-                                VerifyOrReturn(CheckValueNonNull("userUniqueId", actualValue));
-                                VerifyOrReturn(CheckValue("userUniqueId", actualValue, 6452UL));
+                                id actualValue = values.userUniqueID;
+                                VerifyOrReturn(CheckValueNonNull("UserUniqueID", actualValue));
+                                VerifyOrReturn(CheckValue("UserUniqueID", actualValue, 6452UL));
                             }
 
                             {
                                 id actualValue = values.userStatus;
-                                VerifyOrReturn(CheckValueNonNull("userStatus", actualValue));
-                                VerifyOrReturn(CheckValue("userStatus", actualValue, 1U));
+                                VerifyOrReturn(CheckValueNonNull("UserStatus", actualValue));
+                                VerifyOrReturn(CheckValue("UserStatus", actualValue, 1U));
                             }
 
                             {
                                 id actualValue = values.userType;
-                                VerifyOrReturn(CheckValueNonNull("userType", actualValue));
-                                VerifyOrReturn(CheckValue("userType", actualValue, 0U));
+                                VerifyOrReturn(CheckValueNonNull("UserType", actualValue));
+                                VerifyOrReturn(CheckValue("UserType", actualValue, 0U));
                             }
 
                             {
                                 id actualValue = values.credentialRule;
-                                VerifyOrReturn(CheckValueNonNull("credentialRule", actualValue));
-                                VerifyOrReturn(CheckValue("credentialRule", actualValue, 0U));
+                                VerifyOrReturn(CheckValueNonNull("CredentialRule", actualValue));
+                                VerifyOrReturn(CheckValue("CredentialRule", actualValue, 0U));
                             }
 
                             {
                                 id actualValue = values.credentials;
-                                VerifyOrReturn(CheckValueNull("credentials", actualValue));
+                                VerifyOrReturn(CheckValueNull("Credentials", actualValue));
                             }
 
                             {
                                 id actualValue = values.creatorFabricIndex;
-                                VerifyOrReturn(CheckValueNonNull("creatorFabricIndex", actualValue));
-                                VerifyOrReturn(CheckValue("creatorFabricIndex", actualValue, 1U));
+                                VerifyOrReturn(CheckValueNonNull("CreatorFabricIndex", actualValue));
+                                VerifyOrReturn(CheckValue("CreatorFabricIndex", actualValue, 1U));
                             }
 
                             {
                                 id actualValue = values.lastModifiedFabricIndex;
-                                VerifyOrReturn(CheckValueNonNull("lastModifiedFabricIndex", actualValue));
-                                VerifyOrReturn(CheckValue("lastModifiedFabricIndex", actualValue, 1U));
+                                VerifyOrReturn(CheckValueNonNull("LastModifiedFabricIndex", actualValue));
+                                VerifyOrReturn(CheckValue("LastModifiedFabricIndex", actualValue, 1U));
                             }
 
                             {
                                 id actualValue = values.nextUserIndex;
-                                VerifyOrReturn(CheckValueNull("nextUserIndex", actualValue));
+                                VerifyOrReturn(CheckValueNull("NextUserIndex", actualValue));
                             }
 
                             NextTest();
@@ -130630,27 +129495,27 @@ class Test_TC_DRLK_2_7 : public TestCommandBridge {
 
                                        {
                                            id actualValue = values.yearDayIndex;
-                                           VerifyOrReturn(CheckValue("yearDayIndex", actualValue, 1U));
+                                           VerifyOrReturn(CheckValue("YearDayIndex", actualValue, 1U));
                                        }
 
                                        {
                                            id actualValue = values.userIndex;
-                                           VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
+                                           VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U));
                                        }
 
                                        {
                                            id actualValue = values.status;
-                                           VerifyOrReturn(CheckValue("status", actualValue, 0U));
+                                           VerifyOrReturn(CheckValue("Status", actualValue, 0U));
                                        }
 
                                        {
                                            id actualValue = values.localStartTime;
-                                           VerifyOrReturn(CheckValue("localStartTime", actualValue, 960UL));
+                                           VerifyOrReturn(CheckValue("LocalStartTime", actualValue, 960UL));
                                        }
 
                                        {
                                            id actualValue = values.localEndTime;
-                                           VerifyOrReturn(CheckValue("localEndTime", actualValue, 1980UL));
+                                           VerifyOrReturn(CheckValue("LocalEndTime", actualValue, 1980UL));
                                        }
 
                                        if (values.localEndTime != nil) {
@@ -130713,17 +129578,17 @@ class Test_TC_DRLK_2_7 : public TestCommandBridge {
 
                                        {
                                            id actualValue = values.yearDayIndex;
-                                           VerifyOrReturn(CheckValue("yearDayIndex", actualValue, 0U));
+                                           VerifyOrReturn(CheckValue("YearDayIndex", actualValue, 0U));
                                        }
 
                                        {
                                            id actualValue = values.userIndex;
-                                           VerifyOrReturn(CheckValue("userIndex", actualValue, 15U));
+                                           VerifyOrReturn(CheckValue("UserIndex", actualValue, 15U));
                                        }
 
                                        {
                                            id actualValue = values.status;
-                                           VerifyOrReturn(CheckValue("status", actualValue, 133U));
+                                           VerifyOrReturn(CheckValue("Status", actualValue, 133U));
                                        }
 
                                        VerifyOrReturn(CheckConstraintHasValue("localStartTime", values.localStartTime, false));
@@ -130752,7 +129617,7 @@ class Test_TC_DRLK_2_7 : public TestCommandBridge {
         params.operationType = [NSNumber numberWithUnsignedChar:0U];
         params.userIndex = [NSNumber numberWithUnsignedShort:5U];
         params.userName = @"xxx";
-        params.userUniqueId = [NSNumber numberWithUnsignedInt:6452UL];
+        params.userUniqueID = [NSNumber numberWithUnsignedInt:6452UL];
         params.userStatus = [NSNumber numberWithUnsignedChar:1U];
         params.userType = [NSNumber numberWithUnsignedChar:0U];
         params.credentialRule = [NSNumber numberWithUnsignedChar:0U];
@@ -130789,17 +129654,17 @@ class Test_TC_DRLK_2_7 : public TestCommandBridge {
                                        {
                                            id actualValue = values.yearDayIndex;
                                            VerifyOrReturn(
-                                               CheckValue("yearDayIndex", actualValue, NumberOfYearDaySchedulesSupportedPerUser));
+                                               CheckValue("YearDayIndex", actualValue, NumberOfYearDaySchedulesSupportedPerUser));
                                        }
 
                                        {
                                            id actualValue = values.userIndex;
-                                           VerifyOrReturn(CheckValue("userIndex", actualValue, 5U));
+                                           VerifyOrReturn(CheckValue("UserIndex", actualValue, 5U));
                                        }
 
                                        {
                                            id actualValue = values.status;
-                                           VerifyOrReturn(CheckValue("status", actualValue, 139U));
+                                           VerifyOrReturn(CheckValue("Status", actualValue, 139U));
                                        }
 
                                        VerifyOrReturn(CheckConstraintHasValue("localStartTime", values.localStartTime, false));
@@ -130859,17 +129724,17 @@ class Test_TC_DRLK_2_7 : public TestCommandBridge {
 
                                        {
                                            id actualValue = values.yearDayIndex;
-                                           VerifyOrReturn(CheckValue("yearDayIndex", actualValue, 1U));
+                                           VerifyOrReturn(CheckValue("YearDayIndex", actualValue, 1U));
                                        }
 
                                        {
                                            id actualValue = values.userIndex;
-                                           VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
+                                           VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U));
                                        }
 
                                        {
                                            id actualValue = values.status;
-                                           VerifyOrReturn(CheckValue("status", actualValue, 139U));
+                                           VerifyOrReturn(CheckValue("Status", actualValue, 139U));
                                        }
 
                                        VerifyOrReturn(CheckConstraintHasValue("localStartTime", values.localStartTime, false));
@@ -130931,27 +129796,27 @@ class Test_TC_DRLK_2_7 : public TestCommandBridge {
 
                                        {
                                            id actualValue = values.yearDayIndex;
-                                           VerifyOrReturn(CheckValue("yearDayIndex", actualValue, 1U));
+                                           VerifyOrReturn(CheckValue("YearDayIndex", actualValue, 1U));
                                        }
 
                                        {
                                            id actualValue = values.userIndex;
-                                           VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
+                                           VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U));
                                        }
 
                                        {
                                            id actualValue = values.status;
-                                           VerifyOrReturn(CheckValue("status", actualValue, 0U));
+                                           VerifyOrReturn(CheckValue("Status", actualValue, 0U));
                                        }
 
                                        {
                                            id actualValue = values.localStartTime;
-                                           VerifyOrReturn(CheckValue("localStartTime", actualValue, 1080UL));
+                                           VerifyOrReturn(CheckValue("LocalStartTime", actualValue, 1080UL));
                                        }
 
                                        {
                                            id actualValue = values.localEndTime;
-                                           VerifyOrReturn(CheckValue("localEndTime", actualValue, 2100UL));
+                                           VerifyOrReturn(CheckValue("LocalEndTime", actualValue, 2100UL));
                                        }
 
                                        if (values.localEndTime != nil) {
@@ -131353,7 +130218,7 @@ class Test_TC_DRLK_2_9 : public TestCommandBridge {
         params.operationType = [NSNumber numberWithUnsignedChar:0U];
         params.userIndex = [NSNumber numberWithUnsignedShort:1U];
         params.userName = @"xxx";
-        params.userUniqueId = [NSNumber numberWithUnsignedInt:6452UL];
+        params.userUniqueID = [NSNumber numberWithUnsignedInt:6452UL];
         params.userStatus = [NSNumber numberWithUnsignedChar:1U];
         params.userType = [NSNumber numberWithUnsignedChar:0U];
         params.credentialRule = [NSNumber numberWithUnsignedChar:0U];
@@ -131387,59 +130252,59 @@ class Test_TC_DRLK_2_9 : public TestCommandBridge {
 
                             {
                                 id actualValue = values.userIndex;
-                                VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
+                                VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U));
                             }
 
                             {
                                 id actualValue = values.userName;
-                                VerifyOrReturn(CheckValueNonNull("userName", actualValue));
-                                VerifyOrReturn(CheckValueAsString("userName", actualValue, @"xxx"));
+                                VerifyOrReturn(CheckValueNonNull("UserName", actualValue));
+                                VerifyOrReturn(CheckValueAsString("UserName", actualValue, @"xxx"));
                             }
 
                             {
-                                id actualValue = values.userUniqueId;
-                                VerifyOrReturn(CheckValueNonNull("userUniqueId", actualValue));
-                                VerifyOrReturn(CheckValue("userUniqueId", actualValue, 6452UL));
+                                id actualValue = values.userUniqueID;
+                                VerifyOrReturn(CheckValueNonNull("UserUniqueID", actualValue));
+                                VerifyOrReturn(CheckValue("UserUniqueID", actualValue, 6452UL));
                             }
 
                             {
                                 id actualValue = values.userStatus;
-                                VerifyOrReturn(CheckValueNonNull("userStatus", actualValue));
-                                VerifyOrReturn(CheckValue("userStatus", actualValue, 1U));
+                                VerifyOrReturn(CheckValueNonNull("UserStatus", actualValue));
+                                VerifyOrReturn(CheckValue("UserStatus", actualValue, 1U));
                             }
 
                             {
                                 id actualValue = values.userType;
-                                VerifyOrReturn(CheckValueNonNull("userType", actualValue));
-                                VerifyOrReturn(CheckValue("userType", actualValue, 0U));
+                                VerifyOrReturn(CheckValueNonNull("UserType", actualValue));
+                                VerifyOrReturn(CheckValue("UserType", actualValue, 0U));
                             }
 
                             {
                                 id actualValue = values.credentialRule;
-                                VerifyOrReturn(CheckValueNonNull("credentialRule", actualValue));
-                                VerifyOrReturn(CheckValue("credentialRule", actualValue, 0U));
+                                VerifyOrReturn(CheckValueNonNull("CredentialRule", actualValue));
+                                VerifyOrReturn(CheckValue("CredentialRule", actualValue, 0U));
                             }
 
                             {
                                 id actualValue = values.credentials;
-                                VerifyOrReturn(CheckValueNull("credentials", actualValue));
+                                VerifyOrReturn(CheckValueNull("Credentials", actualValue));
                             }
 
                             {
                                 id actualValue = values.creatorFabricIndex;
-                                VerifyOrReturn(CheckValueNonNull("creatorFabricIndex", actualValue));
-                                VerifyOrReturn(CheckValue("creatorFabricIndex", actualValue, 1U));
+                                VerifyOrReturn(CheckValueNonNull("CreatorFabricIndex", actualValue));
+                                VerifyOrReturn(CheckValue("CreatorFabricIndex", actualValue, 1U));
                             }
 
                             {
                                 id actualValue = values.lastModifiedFabricIndex;
-                                VerifyOrReturn(CheckValueNonNull("lastModifiedFabricIndex", actualValue));
-                                VerifyOrReturn(CheckValue("lastModifiedFabricIndex", actualValue, 1U));
+                                VerifyOrReturn(CheckValueNonNull("LastModifiedFabricIndex", actualValue));
+                                VerifyOrReturn(CheckValue("LastModifiedFabricIndex", actualValue, 1U));
                             }
 
                             {
                                 id actualValue = values.nextUserIndex;
-                                VerifyOrReturn(CheckValueNull("nextUserIndex", actualValue));
+                                VerifyOrReturn(CheckValueNull("NextUserIndex", actualValue));
                             }
 
                             NextTest();
@@ -131484,9 +130349,9 @@ class Test_TC_DRLK_2_9 : public TestCommandBridge {
 
         __auto_type * params = [[MTRDoorLockClusterSetCredentialParams alloc] init];
         params.operationType = [NSNumber numberWithUnsignedChar:0U];
-        params.credential = [[MTRDoorLockClusterDlCredential alloc] init];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U];
+        params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U];
 
         params.credentialData = [[NSData alloc] initWithBytes:"123456" length:6];
         params.userIndex = [NSNumber numberWithUnsignedShort:1U];
@@ -131501,18 +130366,18 @@ class Test_TC_DRLK_2_9 : public TestCommandBridge {
 
                              {
                                  id actualValue = values.status;
-                                 VerifyOrReturn(CheckValue("status", actualValue, 0U));
+                                 VerifyOrReturn(CheckValue("Status", actualValue, 0U));
                              }
 
                              {
                                  id actualValue = values.userIndex;
-                                 VerifyOrReturn(CheckValueNull("userIndex", actualValue));
+                                 VerifyOrReturn(CheckValueNull("UserIndex", actualValue));
                              }
 
                              {
                                  id actualValue = values.nextCredentialIndex;
-                                 VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue));
-                                 VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 2U));
+                                 VerifyOrReturn(CheckValueNonNull("NextCredentialIndex", actualValue));
+                                 VerifyOrReturn(CheckValue("NextCredentialIndex", actualValue, 2U));
                              }
 
                              NextTest();
@@ -131530,9 +130395,9 @@ class Test_TC_DRLK_2_9 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         __auto_type * params = [[MTRDoorLockClusterGetCredentialStatusParams alloc] init];
-        params.credential = [[MTRDoorLockClusterDlCredential alloc] init];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U];
+        params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U];
 
         [cluster getCredentialStatusWithParams:params
                                     completion:^(MTRDoorLockClusterGetCredentialStatusResponseParams * _Nullable values,
@@ -131544,25 +130409,25 @@ class Test_TC_DRLK_2_9 : public TestCommandBridge {
                                         VerifyOrReturn(CheckConstraintType("credentialExists", "boolean", "boolean"));
                                         {
                                             id actualValue = values.userIndex;
-                                            VerifyOrReturn(CheckValueNonNull("userIndex", actualValue));
-                                            VerifyOrReturn(CheckValue("userIndex", actualValue, 1U));
+                                            VerifyOrReturn(CheckValueNonNull("UserIndex", actualValue));
+                                            VerifyOrReturn(CheckValue("UserIndex", actualValue, 1U));
                                         }
 
                                         {
                                             id actualValue = values.creatorFabricIndex;
-                                            VerifyOrReturn(CheckValueNonNull("creatorFabricIndex", actualValue));
-                                            VerifyOrReturn(CheckValue("creatorFabricIndex", actualValue, 1U));
+                                            VerifyOrReturn(CheckValueNonNull("CreatorFabricIndex", actualValue));
+                                            VerifyOrReturn(CheckValue("CreatorFabricIndex", actualValue, 1U));
                                         }
 
                                         {
                                             id actualValue = values.lastModifiedFabricIndex;
-                                            VerifyOrReturn(CheckValueNonNull("lastModifiedFabricIndex", actualValue));
-                                            VerifyOrReturn(CheckValue("lastModifiedFabricIndex", actualValue, 1U));
+                                            VerifyOrReturn(CheckValueNonNull("LastModifiedFabricIndex", actualValue));
+                                            VerifyOrReturn(CheckValue("LastModifiedFabricIndex", actualValue, 1U));
                                         }
 
                                         {
                                             id actualValue = values.nextCredentialIndex;
-                                            VerifyOrReturn(CheckValueNull("nextCredentialIndex", actualValue));
+                                            VerifyOrReturn(CheckValueNull("NextCredentialIndex", actualValue));
                                         }
 
                                         NextTest();
@@ -131581,9 +130446,9 @@ class Test_TC_DRLK_2_9 : public TestCommandBridge {
 
         __auto_type * params = [[MTRDoorLockClusterSetCredentialParams alloc] init];
         params.operationType = [NSNumber numberWithUnsignedChar:0U];
-        params.credential = [[MTRDoorLockClusterDlCredential alloc] init];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:2U];
+        params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:2U];
 
         params.credentialData = [[NSData alloc] initWithBytes:"4321" length:4];
         params.userIndex = nil;
@@ -131598,18 +130463,18 @@ class Test_TC_DRLK_2_9 : public TestCommandBridge {
 
                              {
                                  id actualValue = values.status;
-                                 VerifyOrReturn(CheckValue("status", actualValue, 133U));
+                                 VerifyOrReturn(CheckValue("Status", actualValue, 133U));
                              }
 
                              {
                                  id actualValue = values.userIndex;
-                                 VerifyOrReturn(CheckValueNull("userIndex", actualValue));
+                                 VerifyOrReturn(CheckValueNull("UserIndex", actualValue));
                              }
 
                              {
                                  id actualValue = values.nextCredentialIndex;
-                                 VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue));
-                                 VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 3U));
+                                 VerifyOrReturn(CheckValueNonNull("NextCredentialIndex", actualValue));
+                                 VerifyOrReturn(CheckValue("NextCredentialIndex", actualValue, 3U));
                              }
 
                              NextTest();
@@ -131628,9 +130493,9 @@ class Test_TC_DRLK_2_9 : public TestCommandBridge {
 
         __auto_type * params = [[MTRDoorLockClusterSetCredentialParams alloc] init];
         params.operationType = [NSNumber numberWithUnsignedChar:0U];
-        params.credential = [[MTRDoorLockClusterDlCredential alloc] init];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:2U];
+        params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:2U];
 
         params.credentialData = [[NSData alloc] initWithBytes:"123456" length:6];
         params.userIndex = nil;
@@ -131645,18 +130510,18 @@ class Test_TC_DRLK_2_9 : public TestCommandBridge {
 
                              {
                                  id actualValue = values.status;
-                                 VerifyOrReturn(CheckValue("status", actualValue, 2U));
+                                 VerifyOrReturn(CheckValue("Status", actualValue, 2U));
                              }
 
                              {
                                  id actualValue = values.userIndex;
-                                 VerifyOrReturn(CheckValueNull("userIndex", actualValue));
+                                 VerifyOrReturn(CheckValueNull("UserIndex", actualValue));
                              }
 
                              {
                                  id actualValue = values.nextCredentialIndex;
-                                 VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue));
-                                 VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 3U));
+                                 VerifyOrReturn(CheckValueNonNull("NextCredentialIndex", actualValue));
+                                 VerifyOrReturn(CheckValue("NextCredentialIndex", actualValue, 3U));
                              }
 
                              NextTest();
@@ -131707,9 +130572,9 @@ class Test_TC_DRLK_2_9 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         __auto_type * params = [[MTRDoorLockClusterClearCredentialParams alloc] init];
-        params.credential = [[MTRDoorLockClusterDlCredential alloc] init];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U];
+        params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U];
 
         [cluster clearCredentialWithParams:params
                                 completion:^(NSError * _Nullable err) {
@@ -131732,9 +130597,9 @@ class Test_TC_DRLK_2_9 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         __auto_type * params = [[MTRDoorLockClusterGetCredentialStatusParams alloc] init];
-        params.credential = [[MTRDoorLockClusterDlCredential alloc] init];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U];
+        params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U];
 
         [cluster getCredentialStatusWithParams:params
                                     completion:^(MTRDoorLockClusterGetCredentialStatusResponseParams * _Nullable values,
@@ -131745,27 +130610,27 @@ class Test_TC_DRLK_2_9 : public TestCommandBridge {
 
                                         {
                                             id actualValue = values.credentialExists;
-                                            VerifyOrReturn(CheckValue("credentialExists", actualValue, false));
+                                            VerifyOrReturn(CheckValue("CredentialExists", actualValue, false));
                                         }
 
                                         {
                                             id actualValue = values.userIndex;
-                                            VerifyOrReturn(CheckValueNull("userIndex", actualValue));
+                                            VerifyOrReturn(CheckValueNull("UserIndex", actualValue));
                                         }
 
                                         {
                                             id actualValue = values.creatorFabricIndex;
-                                            VerifyOrReturn(CheckValueNull("creatorFabricIndex", actualValue));
+                                            VerifyOrReturn(CheckValueNull("CreatorFabricIndex", actualValue));
                                         }
 
                                         {
                                             id actualValue = values.lastModifiedFabricIndex;
-                                            VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", actualValue));
+                                            VerifyOrReturn(CheckValueNull("LastModifiedFabricIndex", actualValue));
                                         }
 
                                         {
                                             id actualValue = values.nextCredentialIndex;
-                                            VerifyOrReturn(CheckValueNull("nextCredentialIndex", actualValue));
+                                            VerifyOrReturn(CheckValueNull("NextCredentialIndex", actualValue));
                                         }
 
                                         NextTest();
@@ -131786,7 +130651,7 @@ class Test_TC_DRLK_2_9 : public TestCommandBridge {
         params.operationType = [NSNumber numberWithUnsignedChar:0U];
         params.userIndex = [NSNumber numberWithUnsignedShort:2U];
         params.userName = @"xxx";
-        params.userUniqueId = [NSNumber numberWithUnsignedInt:6452UL];
+        params.userUniqueID = [NSNumber numberWithUnsignedInt:6452UL];
         params.userStatus = [NSNumber numberWithUnsignedChar:1U];
         params.userType = [NSNumber numberWithUnsignedChar:0U];
         params.credentialRule = [NSNumber numberWithUnsignedChar:0U];
@@ -131812,9 +130677,9 @@ class Test_TC_DRLK_2_9 : public TestCommandBridge {
 
         __auto_type * params = [[MTRDoorLockClusterSetCredentialParams alloc] init];
         params.operationType = [NSNumber numberWithUnsignedChar:0U];
-        params.credential = [[MTRDoorLockClusterDlCredential alloc] init];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U];
+        params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U];
 
         params.credentialData = [[NSData alloc] initWithBytes:"123456" length:6];
         params.userIndex = [NSNumber numberWithUnsignedShort:2U];
@@ -131829,18 +130694,18 @@ class Test_TC_DRLK_2_9 : public TestCommandBridge {
 
                              {
                                  id actualValue = values.status;
-                                 VerifyOrReturn(CheckValue("status", actualValue, 0U));
+                                 VerifyOrReturn(CheckValue("Status", actualValue, 0U));
                              }
 
                              {
                                  id actualValue = values.userIndex;
-                                 VerifyOrReturn(CheckValueNull("userIndex", actualValue));
+                                 VerifyOrReturn(CheckValueNull("UserIndex", actualValue));
                              }
 
                              {
                                  id actualValue = values.nextCredentialIndex;
-                                 VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", actualValue));
-                                 VerifyOrReturn(CheckValue("nextCredentialIndex", actualValue, 2U));
+                                 VerifyOrReturn(CheckValueNonNull("NextCredentialIndex", actualValue));
+                                 VerifyOrReturn(CheckValue("NextCredentialIndex", actualValue, 2U));
                              }
 
                              NextTest();
@@ -131858,9 +130723,9 @@ class Test_TC_DRLK_2_9 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         __auto_type * params = [[MTRDoorLockClusterClearCredentialParams alloc] init];
-        params.credential = [[MTRDoorLockClusterDlCredential alloc] init];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:65534U];
+        params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:65534U];
 
         [cluster clearCredentialWithParams:params
                                 completion:^(NSError * _Nullable err) {
@@ -131883,9 +130748,9 @@ class Test_TC_DRLK_2_9 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         __auto_type * params = [[MTRDoorLockClusterGetCredentialStatusParams alloc] init];
-        params.credential = [[MTRDoorLockClusterDlCredential alloc] init];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:65534U];
+        params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:65534U];
 
         [cluster getCredentialStatusWithParams:params
                                     completion:^(MTRDoorLockClusterGetCredentialStatusResponseParams * _Nullable values,
@@ -131896,27 +130761,27 @@ class Test_TC_DRLK_2_9 : public TestCommandBridge {
 
                                         {
                                             id actualValue = values.credentialExists;
-                                            VerifyOrReturn(CheckValue("credentialExists", actualValue, false));
+                                            VerifyOrReturn(CheckValue("CredentialExists", actualValue, false));
                                         }
 
                                         {
                                             id actualValue = values.userIndex;
-                                            VerifyOrReturn(CheckValueNull("userIndex", actualValue));
+                                            VerifyOrReturn(CheckValueNull("UserIndex", actualValue));
                                         }
 
                                         {
                                             id actualValue = values.creatorFabricIndex;
-                                            VerifyOrReturn(CheckValueNull("creatorFabricIndex", actualValue));
+                                            VerifyOrReturn(CheckValueNull("CreatorFabricIndex", actualValue));
                                         }
 
                                         {
                                             id actualValue = values.lastModifiedFabricIndex;
-                                            VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", actualValue));
+                                            VerifyOrReturn(CheckValueNull("LastModifiedFabricIndex", actualValue));
                                         }
 
                                         {
                                             id actualValue = values.nextCredentialIndex;
-                                            VerifyOrReturn(CheckValueNull("nextCredentialIndex", actualValue));
+                                            VerifyOrReturn(CheckValueNull("NextCredentialIndex", actualValue));
                                         }
 
                                         NextTest();
@@ -131934,9 +130799,9 @@ class Test_TC_DRLK_2_9 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         __auto_type * params = [[MTRDoorLockClusterGetCredentialStatusParams alloc] init];
-        params.credential = [[MTRDoorLockClusterDlCredential alloc] init];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U];
+        params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U];
 
         [cluster getCredentialStatusWithParams:params
                                     completion:^(MTRDoorLockClusterGetCredentialStatusResponseParams * _Nullable values,
@@ -131947,27 +130812,27 @@ class Test_TC_DRLK_2_9 : public TestCommandBridge {
 
                                         {
                                             id actualValue = values.credentialExists;
-                                            VerifyOrReturn(CheckValue("credentialExists", actualValue, false));
+                                            VerifyOrReturn(CheckValue("CredentialExists", actualValue, false));
                                         }
 
                                         {
                                             id actualValue = values.userIndex;
-                                            VerifyOrReturn(CheckValueNull("userIndex", actualValue));
+                                            VerifyOrReturn(CheckValueNull("UserIndex", actualValue));
                                         }
 
                                         {
                                             id actualValue = values.creatorFabricIndex;
-                                            VerifyOrReturn(CheckValueNull("creatorFabricIndex", actualValue));
+                                            VerifyOrReturn(CheckValueNull("CreatorFabricIndex", actualValue));
                                         }
 
                                         {
                                             id actualValue = values.lastModifiedFabricIndex;
-                                            VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", actualValue));
+                                            VerifyOrReturn(CheckValueNull("LastModifiedFabricIndex", actualValue));
                                         }
 
                                         {
                                             id actualValue = values.nextCredentialIndex;
-                                            VerifyOrReturn(CheckValueNull("nextCredentialIndex", actualValue));
+                                            VerifyOrReturn(CheckValueNull("NextCredentialIndex", actualValue));
                                         }
 
                                         NextTest();
@@ -131985,9 +130850,9 @@ class Test_TC_DRLK_2_9 : public TestCommandBridge {
         VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE);
 
         __auto_type * params = [[MTRDoorLockClusterClearCredentialParams alloc] init];
-        params.credential = [[MTRDoorLockClusterDlCredential alloc] init];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:8U];
-        ((MTRDoorLockClusterDlCredential *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:2U];
+        params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:8U];
+        ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:2U];
 
         [cluster clearCredentialWithParams:params
                                 completion:^(NSError * _Nullable err) {
diff --git a/zzz_generated/darwin/controller-clusters/zap-generated/CHIPClientCallbacks.h b/zzz_generated/darwin/controller-clusters/zap-generated/CHIPClientCallbacks.h
index 2deb1193e41411..3f697a1360a23a 100644
--- a/zzz_generated/darwin/controller-clusters/zap-generated/CHIPClientCallbacks.h
+++ b/zzz_generated/darwin/controller-clusters/zap-generated/CHIPClientCallbacks.h
@@ -195,11 +195,11 @@ typedef void (*GeneralDiagnosticsNetworkInterfacesListAttributeCallback)(
     const chip::app::DataModel::DecodableList<chip::app::Clusters::GeneralDiagnostics::Structs::NetworkInterface::DecodableType> &
         data);
 typedef void (*GeneralDiagnosticsActiveHardwareFaultsListAttributeCallback)(
-    void * context, const chip::app::DataModel::DecodableList<chip::app::Clusters::GeneralDiagnostics::HardwareFault> & data);
+    void * context, const chip::app::DataModel::DecodableList<chip::app::Clusters::GeneralDiagnostics::HardwareFaultEnum> & data);
 typedef void (*GeneralDiagnosticsActiveRadioFaultsListAttributeCallback)(
-    void * context, const chip::app::DataModel::DecodableList<chip::app::Clusters::GeneralDiagnostics::RadioFault> & data);
+    void * context, const chip::app::DataModel::DecodableList<chip::app::Clusters::GeneralDiagnostics::RadioFaultEnum> & data);
 typedef void (*GeneralDiagnosticsActiveNetworkFaultsListAttributeCallback)(
-    void * context, const chip::app::DataModel::DecodableList<chip::app::Clusters::GeneralDiagnostics::NetworkFaultType> & data);
+    void * context, const chip::app::DataModel::DecodableList<chip::app::Clusters::GeneralDiagnostics::NetworkFaultEnum> & data);
 typedef void (*GeneralDiagnosticsGeneratedCommandListListAttributeCallback)(
     void * context, const chip::app::DataModel::DecodableList<chip::CommandId> & data);
 typedef void (*GeneralDiagnosticsAcceptedCommandListListAttributeCallback)(
diff --git a/zzz_generated/darwin/controller-clusters/zap-generated/endpoint_config.h b/zzz_generated/darwin/controller-clusters/zap-generated/endpoint_config.h
index 0cd46e9f520462..4729fa584a8793 100644
--- a/zzz_generated/darwin/controller-clusters/zap-generated/endpoint_config.h
+++ b/zzz_generated/darwin/controller-clusters/zap-generated/endpoint_config.h
@@ -399,7 +399,7 @@
       .generatedCommandList = nullptr ,\
     },\
   { \
-      /* Endpoint: 1, Cluster: AdministratorCommissioning (client) */ \
+      /* Endpoint: 1, Cluster: Administrator Commissioning (client) */ \
       .clusterId = 0x0000003C,  \
       .attributes = ZAP_ATTRIBUTE_INDEX(0), \
       .attributeCount = 0, \
diff --git a/zzz_generated/darwin/controller-clusters/zap-generated/gen_config.h b/zzz_generated/darwin/controller-clusters/zap-generated/gen_config.h
index b660cfc04b17a8..8918782d13bdde 100644
--- a/zzz_generated/darwin/controller-clusters/zap-generated/gen_config.h
+++ b/zzz_generated/darwin/controller-clusters/zap-generated/gen_config.h
@@ -214,7 +214,7 @@
 #define ZCL_USING_SWITCH_CLUSTER_CLIENT
 #define EMBER_AF_PLUGIN_SWITCH_CLIENT
 
-// Use this macro to check if the client side of the AdministratorCommissioning cluster is included
+// Use this macro to check if the client side of the Administrator Commissioning cluster is included
 #define ZCL_USING_ADMINISTRATOR_COMMISSIONING_CLUSTER_CLIENT
 #define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING_CLIENT