diff --git a/data_model/clusters/ICDManagement.xml b/data_model/clusters/ICDManagement.xml
index be52f390be1786..efd974dece9fe4 100644
--- a/data_model/clusters/ICDManagement.xml
+++ b/data_model/clusters/ICDManagement.xml
@@ -84,10 +84,10 @@ Davis, CA 95616, USA
- -
+
-
- -
+
-
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 b39c6dae527d89..19c9f5231f5e22 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
@@ -2116,8 +2116,8 @@ cluster IcdManagement = 70 {
revision 2;
enum OperatingModeEnum : enum8 {
- kSITOperatingMode = 0;
- kLITOperatingMode = 1;
+ kSIT = 0;
+ kLIT = 1;
}
bitmap Feature : bitmap32 {
diff --git a/examples/lit-icd-app/lit-icd-common/lit-icd-server-app.matter b/examples/lit-icd-app/lit-icd-common/lit-icd-server-app.matter
index 52ce7da1146612..5f8d076636a3f6 100644
--- a/examples/lit-icd-app/lit-icd-common/lit-icd-server-app.matter
+++ b/examples/lit-icd-app/lit-icd-common/lit-icd-server-app.matter
@@ -1381,8 +1381,8 @@ cluster IcdManagement = 70 {
revision 2;
enum OperatingModeEnum : enum8 {
- kSITOperatingMode = 0;
- kLITOperatingMode = 1;
+ kSIT = 0;
+ kLIT = 1;
}
bitmap Feature : bitmap32 {
diff --git a/examples/lock-app/lock-common/lock-app.matter b/examples/lock-app/lock-common/lock-app.matter
index 9e729ea730533a..da3227a62464ce 100644
--- a/examples/lock-app/lock-common/lock-app.matter
+++ b/examples/lock-app/lock-common/lock-app.matter
@@ -1741,8 +1741,8 @@ cluster IcdManagement = 70 {
revision 2;
enum OperatingModeEnum : enum8 {
- kSITOperatingMode = 0;
- kLITOperatingMode = 1;
+ kSIT = 0;
+ kLIT = 1;
}
bitmap Feature : bitmap32 {
diff --git a/examples/lock-app/qpg/zap/lock.matter b/examples/lock-app/qpg/zap/lock.matter
index a3c3564aa18d57..18934e075afec3 100644
--- a/examples/lock-app/qpg/zap/lock.matter
+++ b/examples/lock-app/qpg/zap/lock.matter
@@ -1397,8 +1397,8 @@ cluster IcdManagement = 70 {
revision 2;
enum OperatingModeEnum : enum8 {
- kSITOperatingMode = 0;
- kLITOperatingMode = 1;
+ kSIT = 0;
+ kLIT = 1;
}
bitmap Feature : bitmap32 {
diff --git a/examples/smoke-co-alarm-app/smoke-co-alarm-common/smoke-co-alarm-app.matter b/examples/smoke-co-alarm-app/smoke-co-alarm-common/smoke-co-alarm-app.matter
index 57ea88dda741dc..95582b5d2e4416 100644
--- a/examples/smoke-co-alarm-app/smoke-co-alarm-common/smoke-co-alarm-app.matter
+++ b/examples/smoke-co-alarm-app/smoke-co-alarm-common/smoke-co-alarm-app.matter
@@ -1717,8 +1717,8 @@ cluster IcdManagement = 70 {
revision 2;
enum OperatingModeEnum : enum8 {
- kSITOperatingMode = 0;
- kLITOperatingMode = 1;
+ kSIT = 0;
+ kLIT = 1;
}
bitmap Feature : bitmap32 {
diff --git a/src/app/zap-templates/zcl/data-model/chip/icd-management-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/icd-management-cluster.xml
index 677d28588432e7..929988e9c3b258 100644
--- a/src/app/zap-templates/zcl/data-model/chip/icd-management-cluster.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/icd-management-cluster.xml
@@ -55,8 +55,8 @@ limitations under the License.
-
-
+
+
diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter
index 68aaf0ef063051..9b39b0d849af15 100644
--- a/src/controller/data_model/controller-clusters.matter
+++ b/src/controller/data_model/controller-clusters.matter
@@ -2849,8 +2849,8 @@ cluster IcdManagement = 70 {
revision 2;
enum OperatingModeEnum : enum8 {
- kSITOperatingMode = 0;
- kLITOperatingMode = 1;
+ kSIT = 0;
+ kLIT = 1;
}
bitmap Feature : bitmap32 {
diff --git a/src/controller/python/chip/clusters/Objects.py b/src/controller/python/chip/clusters/Objects.py
index e3389f02467fe0..ecc9b63039e8bc 100644
--- a/src/controller/python/chip/clusters/Objects.py
+++ b/src/controller/python/chip/clusters/Objects.py
@@ -14862,8 +14862,8 @@ def descriptor(cls) -> ClusterObjectDescriptor:
class Enums:
class OperatingModeEnum(MatterIntEnum):
- kSITOperatingMode = 0x00
- kLITOperatingMode = 0x01
+ kSit = 0x00
+ kLit = 0x01
# All received enum values that are not listed above will be mapped
# to kUnknownEnumValue. This is a helper enum value that should only
# be used by code to process how it handles receiving and unknown
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h
index 5f1145cc3dae8d..7271543d1242db 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h
@@ -16712,8 +16712,8 @@ typedef NS_OPTIONS(uint32_t, MTRGroupKeyManagementFeature) {
} MTR_PROVISIONALLY_AVAILABLE;
typedef NS_ENUM(uint8_t, MTRICDManagementOperatingMode) {
- MTRICDManagementOperatingModeSITOperatingMode MTR_PROVISIONALLY_AVAILABLE = 0x00,
- MTRICDManagementOperatingModeLITOperatingMode MTR_PROVISIONALLY_AVAILABLE = 0x01,
+ MTRICDManagementOperatingModeSIT MTR_PROVISIONALLY_AVAILABLE = 0x00,
+ MTRICDManagementOperatingModeLIT MTR_PROVISIONALLY_AVAILABLE = 0x01,
} MTR_PROVISIONALLY_AVAILABLE;
typedef NS_OPTIONS(uint32_t, MTRICDManagementFeature) {
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 e2863842196b4e..0136ff608c9770 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
@@ -1193,8 +1193,8 @@ static auto __attribute__((unused)) EnsureKnownEnumValue(IcdManagement::Operatin
using EnumType = IcdManagement::OperatingModeEnum;
switch (val)
{
- case EnumType::kSITOperatingMode:
- case EnumType::kLITOperatingMode:
+ case EnumType::kSit:
+ case EnumType::kLit:
return val;
default:
return static_cast(2);
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 39a80c0b9e0ae4..7a056869230537 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
@@ -1475,8 +1475,8 @@ namespace IcdManagement {
// Enum for OperatingModeEnum
enum class OperatingModeEnum : uint8_t
{
- kSITOperatingMode = 0x00,
- kLITOperatingMode = 0x01,
+ kSit = 0x00,
+ kLit = 0x01,
// All received enum values that are not listed above will be mapped
// to kUnknownEnumValue. This is a helper enum value that should only
// be used by code to process how it handles receiving and unknown