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 d4b1936ba7c955..aaa29c3563ef18 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
@@ -59,19 +59,19 @@ CHIP_ERROR EthernetDiagosticsAttrAccess::Read(ClusterInfo & aClusterInfo, const
     *aDataRead = true;
     switch (aClusterInfo.mFieldId)
     {
-    case Ids::PacketRxCount: {
+    case PacketRxCount::Id: {
         return ReadIfSupported(&ConnectivityManager::GetEthPacketRxCount, aEncoder);
     }
-    case Ids::PacketTxCount: {
+    case PacketTxCount::Id: {
         return ReadIfSupported(&ConnectivityManager::GetEthPacketTxCount, aEncoder);
     }
-    case Ids::TxErrCount: {
+    case TxErrCount::Id: {
         return ReadIfSupported(&ConnectivityManager::GetEthTxErrCount, aEncoder);
     }
-    case Ids::CollisionCount: {
+    case CollisionCount::Id: {
         return ReadIfSupported(&ConnectivityManager::GetEthCollisionCount, aEncoder);
     }
-    case Ids::OverrunCount: {
+    case OverrunCount::Id: {
         return ReadIfSupported(&ConnectivityManager::GetEthOverrunCount, aEncoder);
     }
     default: {
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 0554268a87d371..205c22ac69cee5 100644
--- a/src/app/clusters/general_diagnostics_server/general_diagnostics_server.cpp
+++ b/src/app/clusters/general_diagnostics_server/general_diagnostics_server.cpp
@@ -74,16 +74,16 @@ CHIP_ERROR GeneralDiagosticsAttrAccess::Read(ClusterInfo & aClusterInfo, const A
     *aDataRead = true;
     switch (aClusterInfo.mFieldId)
     {
-    case Ids::RebootCount: {
+    case RebootCount::Id: {
         return ReadIfSupported(&PlatformManager::GetRebootCount, aEncoder);
     }
-    case Ids::UpTime: {
+    case UpTime::Id: {
         return ReadIfSupported(&PlatformManager::GetUpTime, aEncoder);
     }
-    case Ids::TotalOperationalHours: {
+    case TotalOperationalHours::Id: {
         return ReadIfSupported(&PlatformManager::GetTotalOperationalHours, aEncoder);
     }
-    case Ids::BootReasons: {
+    case BootReasons::Id: {
         return ReadIfSupported(&PlatformManager::GetBootReasons, aEncoder);
     }
     default: {
diff --git a/src/app/clusters/software_diagnostics_server/software_diagnostics_server.cpp b/src/app/clusters/software_diagnostics_server/software_diagnostics_server.cpp
index a40341eb3db9dd..30940564548152 100644
--- a/src/app/clusters/software_diagnostics_server/software_diagnostics_server.cpp
+++ b/src/app/clusters/software_diagnostics_server/software_diagnostics_server.cpp
@@ -59,13 +59,13 @@ CHIP_ERROR SoftwareDiagosticsAttrAccess::Read(ClusterInfo & aClusterInfo, const
     *aDataRead = true;
     switch (aClusterInfo.mFieldId)
     {
-    case Ids::CurrentHeapFree: {
+    case CurrentHeapFree::Id: {
         return ReadIfSupported(&PlatformManager::GetCurrentHeapFree, aEncoder);
     }
-    case Ids::CurrentHeapUsed: {
+    case CurrentHeapUsed::Id: {
         return ReadIfSupported(&PlatformManager::GetCurrentHeapUsed, aEncoder);
     }
-    case Ids::CurrentHeapHighWatermark: {
+    case CurrentHeapHighWatermark::Id: {
         return ReadIfSupported(&PlatformManager::GetCurrentHeapHighWatermark, aEncoder);
     }
     default: {
diff --git a/src/app/clusters/thermostat-server/thermostat-server.cpp b/src/app/clusters/thermostat-server/thermostat-server.cpp
index 53476f683de283..fcba7c2caec09e 100644
--- a/src/app/clusters/thermostat-server/thermostat-server.cpp
+++ b/src/app/clusters/thermostat-server/thermostat-server.cpp
@@ -72,7 +72,7 @@ EmberAfStatus emberAfThermostatClusterServerPreAttributeChangedCallback(chip::En
 
     switch (attributeId)
     {
-    case Ids::OccupiedHeatingSetpoint: {
+    case OccupiedHeatingSetpoint::Id: {
         int16_t AbsMinHeatSetpointLimit;
         int16_t AbsMaxHeatSetpointLimit;
         int16_t MinHeatSetpointLimit;
@@ -112,7 +112,7 @@ EmberAfStatus emberAfThermostatClusterServerPreAttributeChangedCallback(chip::En
         break;
     }
 
-    case Ids::OccupiedCoolingSetpoint: {
+    case OccupiedCoolingSetpoint::Id: {
         int16_t AbsMinCoolSetpointLimit;
         int16_t AbsMaxCoolSetpointLimit;
         int16_t MinCoolSetpointLimit;
@@ -151,8 +151,8 @@ EmberAfStatus emberAfThermostatClusterServerPreAttributeChangedCallback(chip::En
         break;
     }
 
-    case Ids::MinHeatSetpointLimit:
-    case Ids::MaxHeatSetpointLimit: {
+    case MinHeatSetpointLimit::Id:
+    case MaxHeatSetpointLimit::Id: {
         int16_t AbsMinHeatSetpointLimit;
         int16_t AbsMaxHeatSetpointLimit;
 
@@ -176,8 +176,8 @@ EmberAfStatus emberAfThermostatClusterServerPreAttributeChangedCallback(chip::En
 
         break;
     }
-    case Ids::MinCoolSetpointLimit:
-    case Ids::MaxCoolSetpointLimit: {
+    case MinCoolSetpointLimit::Id:
+    case MaxCoolSetpointLimit::Id: {
         int16_t AbsMinCoolSetpointLimit;
         int16_t AbsMaxCoolSetpointLimit;
 
@@ -202,7 +202,7 @@ EmberAfStatus emberAfThermostatClusterServerPreAttributeChangedCallback(chip::En
         break;
     }
 
-    case Ids::ControlSequenceOfOperation: {
+    case ControlSequenceOfOperation::Id: {
         uint8_t requestedCSO;
         requestedCSO = *value;
         if (requestedCSO > EMBER_ZCL_THERMOSTAT_CONTROL_SEQUENCE_COOLING_AND_HEATING_WITH_REHEAT)
@@ -213,7 +213,7 @@ EmberAfStatus emberAfThermostatClusterServerPreAttributeChangedCallback(chip::En
         break;
     }
 
-    case Ids::SystemMode: {
+    case SystemMode::Id: {
         uint8_t ControlSequenceOfOperation = kInvalidControlSequenceOfOperation;
         uint8_t RequestedSystemMode        = kInvalidRequestedSystemMode;
         GetControlSequenceOfOperation(endpoint, &ControlSequenceOfOperation);