diff --git a/src/app/zap-templates/zcl/data-model/chip/replacable-monitoring-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/replacable-monitoring-cluster.xml
index 0ee370b7156443..5e7f23568ad6c6 100644
--- a/src/app/zap-templates/zcl/data-model/chip/replacable-monitoring-cluster.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/replacable-monitoring-cluster.xml
@@ -269,7 +269,7 @@ limitations under the License.
   </cluster>
 
   <!-- Feature Map -->
-  <bitmap name="Features" type="BITMAP32">
+  <bitmap name="Feature" type="BITMAP32">
     <cluster code="0x0071" />
     <cluster code="0x0072" />
     <cluster code="0x0073" />
diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter
index 0f3d32506f0216..5a960777719c68 100644
--- a/src/controller/data_model/controller-clusters.matter
+++ b/src/controller/data_model/controller-clusters.matter
@@ -2627,7 +2627,7 @@ client cluster HepaFilterMonitoring = 113 {
     kDown = 1;
   }
 
-  bitmap Features : BITMAP32 {
+  bitmap Feature : BITMAP32 {
     kCondition = 0x1;
     kWarning = 0x2;
   }
@@ -2660,7 +2660,7 @@ client cluster ActivatedCarbonFilterMonitoring = 114 {
     kDown = 1;
   }
 
-  bitmap Features : BITMAP32 {
+  bitmap Feature : BITMAP32 {
     kCondition = 0x1;
     kWarning = 0x2;
   }
@@ -2693,7 +2693,7 @@ client cluster CeramicFilterMonitoring = 115 {
     kDown = 1;
   }
 
-  bitmap Features : BITMAP32 {
+  bitmap Feature : BITMAP32 {
     kCondition = 0x1;
     kWarning = 0x2;
   }
@@ -2726,7 +2726,7 @@ client cluster ElectrostaticFilterMonitoring = 116 {
     kDown = 1;
   }
 
-  bitmap Features : BITMAP32 {
+  bitmap Feature : BITMAP32 {
     kCondition = 0x1;
     kWarning = 0x2;
   }
@@ -2759,7 +2759,7 @@ client cluster UvFilterMonitoring = 117 {
     kDown = 1;
   }
 
-  bitmap Features : BITMAP32 {
+  bitmap Feature : BITMAP32 {
     kCondition = 0x1;
     kWarning = 0x2;
   }
@@ -2792,7 +2792,7 @@ client cluster IonizingFilterMonitoring = 118 {
     kDown = 1;
   }
 
-  bitmap Features : BITMAP32 {
+  bitmap Feature : BITMAP32 {
     kCondition = 0x1;
     kWarning = 0x2;
   }
@@ -2825,7 +2825,7 @@ client cluster ZeoliteFilterMonitoring = 119 {
     kDown = 1;
   }
 
-  bitmap Features : BITMAP32 {
+  bitmap Feature : BITMAP32 {
     kCondition = 0x1;
     kWarning = 0x2;
   }
@@ -2858,7 +2858,7 @@ client cluster OzoneFilterMonitoring = 120 {
     kDown = 1;
   }
 
-  bitmap Features : BITMAP32 {
+  bitmap Feature : BITMAP32 {
     kCondition = 0x1;
     kWarning = 0x2;
   }
@@ -2891,7 +2891,7 @@ client cluster WaterTankMonitoring = 121 {
     kDown = 1;
   }
 
-  bitmap Features : BITMAP32 {
+  bitmap Feature : BITMAP32 {
     kCondition = 0x1;
     kWarning = 0x2;
   }
@@ -2924,7 +2924,7 @@ client cluster FuelTankMonitoring = 122 {
     kDown = 1;
   }
 
-  bitmap Features : BITMAP32 {
+  bitmap Feature : BITMAP32 {
     kCondition = 0x1;
     kWarning = 0x2;
   }
@@ -2957,7 +2957,7 @@ client cluster InkCartridgeMonitoring = 123 {
     kDown = 1;
   }
 
-  bitmap Features : BITMAP32 {
+  bitmap Feature : BITMAP32 {
     kCondition = 0x1;
     kWarning = 0x2;
   }
@@ -2990,7 +2990,7 @@ client cluster TonerCartridgeMonitoring = 124 {
     kDown = 1;
   }
 
-  bitmap Features : BITMAP32 {
+  bitmap Feature : BITMAP32 {
     kCondition = 0x1;
     kWarning = 0x2;
   }
diff --git a/src/controller/python/chip/clusters/Objects.py b/src/controller/python/chip/clusters/Objects.py
index e1c7392971e3b3..d1d1fd36d0450b 100644
--- a/src/controller/python/chip/clusters/Objects.py
+++ b/src/controller/python/chip/clusters/Objects.py
@@ -15314,7 +15314,7 @@ class DegradationDirectionEnum(MatterIntEnum):
             kUnknownEnumValue = 2,
 
     class Bitmaps:
-        class Features(IntFlag):
+        class Feature(IntFlag):
             kCondition = 0x1
             kWarning = 0x2
 
@@ -15546,7 +15546,7 @@ class DegradationDirectionEnum(MatterIntEnum):
             kUnknownEnumValue = 2,
 
     class Bitmaps:
-        class Features(IntFlag):
+        class Feature(IntFlag):
             kCondition = 0x1
             kWarning = 0x2
 
@@ -15778,7 +15778,7 @@ class DegradationDirectionEnum(MatterIntEnum):
             kUnknownEnumValue = 2,
 
     class Bitmaps:
-        class Features(IntFlag):
+        class Feature(IntFlag):
             kCondition = 0x1
             kWarning = 0x2
 
@@ -16010,7 +16010,7 @@ class DegradationDirectionEnum(MatterIntEnum):
             kUnknownEnumValue = 2,
 
     class Bitmaps:
-        class Features(IntFlag):
+        class Feature(IntFlag):
             kCondition = 0x1
             kWarning = 0x2
 
@@ -16242,7 +16242,7 @@ class DegradationDirectionEnum(MatterIntEnum):
             kUnknownEnumValue = 2,
 
     class Bitmaps:
-        class Features(IntFlag):
+        class Feature(IntFlag):
             kCondition = 0x1
             kWarning = 0x2
 
@@ -16474,7 +16474,7 @@ class DegradationDirectionEnum(MatterIntEnum):
             kUnknownEnumValue = 2,
 
     class Bitmaps:
-        class Features(IntFlag):
+        class Feature(IntFlag):
             kCondition = 0x1
             kWarning = 0x2
 
@@ -16706,7 +16706,7 @@ class DegradationDirectionEnum(MatterIntEnum):
             kUnknownEnumValue = 2,
 
     class Bitmaps:
-        class Features(IntFlag):
+        class Feature(IntFlag):
             kCondition = 0x1
             kWarning = 0x2
 
@@ -16938,7 +16938,7 @@ class DegradationDirectionEnum(MatterIntEnum):
             kUnknownEnumValue = 2,
 
     class Bitmaps:
-        class Features(IntFlag):
+        class Feature(IntFlag):
             kCondition = 0x1
             kWarning = 0x2
 
@@ -17170,7 +17170,7 @@ class DegradationDirectionEnum(MatterIntEnum):
             kUnknownEnumValue = 2,
 
     class Bitmaps:
-        class Features(IntFlag):
+        class Feature(IntFlag):
             kCondition = 0x1
             kWarning = 0x2
 
@@ -17402,7 +17402,7 @@ class DegradationDirectionEnum(MatterIntEnum):
             kUnknownEnumValue = 2,
 
     class Bitmaps:
-        class Features(IntFlag):
+        class Feature(IntFlag):
             kCondition = 0x1
             kWarning = 0x2
 
@@ -17634,7 +17634,7 @@ class DegradationDirectionEnum(MatterIntEnum):
             kUnknownEnumValue = 2,
 
     class Bitmaps:
-        class Features(IntFlag):
+        class Feature(IntFlag):
             kCondition = 0x1
             kWarning = 0x2
 
@@ -17866,7 +17866,7 @@ class DegradationDirectionEnum(MatterIntEnum):
             kUnknownEnumValue = 2,
 
     class Bitmaps:
-        class Features(IntFlag):
+        class Feature(IntFlag):
             kCondition = 0x1
             kWarning = 0x2
 
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h
index 3ca90637bbff2f..b6701eae3e480b 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h
@@ -21861,9 +21861,9 @@ typedef NS_ENUM(uint8_t, MTRHEPAFilterMonitoringDegradationDirection) {
     MTRHEPAFilterMonitoringDegradationDirectionDown MTR_NEWLY_AVAILABLE = 0x01,
 } MTR_NEWLY_AVAILABLE;
 
-typedef NS_OPTIONS(uint32_t, MTRHEPAFilterMonitoringFeatures) {
-    MTRHEPAFilterMonitoringFeaturesCondition MTR_NEWLY_AVAILABLE = 0x1,
-    MTRHEPAFilterMonitoringFeaturesWarning MTR_NEWLY_AVAILABLE = 0x2,
+typedef NS_OPTIONS(uint32_t, MTRHEPAFilterMonitoringFeature) {
+    MTRHEPAFilterMonitoringFeatureCondition MTR_NEWLY_AVAILABLE = 0x1,
+    MTRHEPAFilterMonitoringFeatureWarning MTR_NEWLY_AVAILABLE = 0x2,
 } MTR_NEWLY_AVAILABLE;
 
 typedef NS_ENUM(uint8_t, MTRActivatedCarbonFilterMonitoringChangeIndication) {
@@ -21877,9 +21877,9 @@ typedef NS_ENUM(uint8_t, MTRActivatedCarbonFilterMonitoringDegradationDirection)
     MTRActivatedCarbonFilterMonitoringDegradationDirectionDown MTR_NEWLY_AVAILABLE = 0x01,
 } MTR_NEWLY_AVAILABLE;
 
-typedef NS_OPTIONS(uint32_t, MTRActivatedCarbonFilterMonitoringFeatures) {
-    MTRActivatedCarbonFilterMonitoringFeaturesCondition MTR_NEWLY_AVAILABLE = 0x1,
-    MTRActivatedCarbonFilterMonitoringFeaturesWarning MTR_NEWLY_AVAILABLE = 0x2,
+typedef NS_OPTIONS(uint32_t, MTRActivatedCarbonFilterMonitoringFeature) {
+    MTRActivatedCarbonFilterMonitoringFeatureCondition MTR_NEWLY_AVAILABLE = 0x1,
+    MTRActivatedCarbonFilterMonitoringFeatureWarning MTR_NEWLY_AVAILABLE = 0x2,
 } MTR_NEWLY_AVAILABLE;
 
 typedef NS_ENUM(uint8_t, MTRCeramicFilterMonitoringChangeIndication) {
@@ -21893,9 +21893,9 @@ typedef NS_ENUM(uint8_t, MTRCeramicFilterMonitoringDegradationDirection) {
     MTRCeramicFilterMonitoringDegradationDirectionDown MTR_NEWLY_AVAILABLE = 0x01,
 } MTR_NEWLY_AVAILABLE;
 
-typedef NS_OPTIONS(uint32_t, MTRCeramicFilterMonitoringFeatures) {
-    MTRCeramicFilterMonitoringFeaturesCondition MTR_NEWLY_AVAILABLE = 0x1,
-    MTRCeramicFilterMonitoringFeaturesWarning MTR_NEWLY_AVAILABLE = 0x2,
+typedef NS_OPTIONS(uint32_t, MTRCeramicFilterMonitoringFeature) {
+    MTRCeramicFilterMonitoringFeatureCondition MTR_NEWLY_AVAILABLE = 0x1,
+    MTRCeramicFilterMonitoringFeatureWarning MTR_NEWLY_AVAILABLE = 0x2,
 } MTR_NEWLY_AVAILABLE;
 
 typedef NS_ENUM(uint8_t, MTRElectrostaticFilterMonitoringChangeIndication) {
@@ -21909,9 +21909,9 @@ typedef NS_ENUM(uint8_t, MTRElectrostaticFilterMonitoringDegradationDirection) {
     MTRElectrostaticFilterMonitoringDegradationDirectionDown MTR_NEWLY_AVAILABLE = 0x01,
 } MTR_NEWLY_AVAILABLE;
 
-typedef NS_OPTIONS(uint32_t, MTRElectrostaticFilterMonitoringFeatures) {
-    MTRElectrostaticFilterMonitoringFeaturesCondition MTR_NEWLY_AVAILABLE = 0x1,
-    MTRElectrostaticFilterMonitoringFeaturesWarning MTR_NEWLY_AVAILABLE = 0x2,
+typedef NS_OPTIONS(uint32_t, MTRElectrostaticFilterMonitoringFeature) {
+    MTRElectrostaticFilterMonitoringFeatureCondition MTR_NEWLY_AVAILABLE = 0x1,
+    MTRElectrostaticFilterMonitoringFeatureWarning MTR_NEWLY_AVAILABLE = 0x2,
 } MTR_NEWLY_AVAILABLE;
 
 typedef NS_ENUM(uint8_t, MTRUVFilterMonitoringChangeIndication) {
@@ -21925,9 +21925,9 @@ typedef NS_ENUM(uint8_t, MTRUVFilterMonitoringDegradationDirection) {
     MTRUVFilterMonitoringDegradationDirectionDown MTR_NEWLY_AVAILABLE = 0x01,
 } MTR_NEWLY_AVAILABLE;
 
-typedef NS_OPTIONS(uint32_t, MTRUVFilterMonitoringFeatures) {
-    MTRUVFilterMonitoringFeaturesCondition MTR_NEWLY_AVAILABLE = 0x1,
-    MTRUVFilterMonitoringFeaturesWarning MTR_NEWLY_AVAILABLE = 0x2,
+typedef NS_OPTIONS(uint32_t, MTRUVFilterMonitoringFeature) {
+    MTRUVFilterMonitoringFeatureCondition MTR_NEWLY_AVAILABLE = 0x1,
+    MTRUVFilterMonitoringFeatureWarning MTR_NEWLY_AVAILABLE = 0x2,
 } MTR_NEWLY_AVAILABLE;
 
 typedef NS_ENUM(uint8_t, MTRIonizingFilterMonitoringChangeIndication) {
@@ -21941,9 +21941,9 @@ typedef NS_ENUM(uint8_t, MTRIonizingFilterMonitoringDegradationDirection) {
     MTRIonizingFilterMonitoringDegradationDirectionDown MTR_NEWLY_AVAILABLE = 0x01,
 } MTR_NEWLY_AVAILABLE;
 
-typedef NS_OPTIONS(uint32_t, MTRIonizingFilterMonitoringFeatures) {
-    MTRIonizingFilterMonitoringFeaturesCondition MTR_NEWLY_AVAILABLE = 0x1,
-    MTRIonizingFilterMonitoringFeaturesWarning MTR_NEWLY_AVAILABLE = 0x2,
+typedef NS_OPTIONS(uint32_t, MTRIonizingFilterMonitoringFeature) {
+    MTRIonizingFilterMonitoringFeatureCondition MTR_NEWLY_AVAILABLE = 0x1,
+    MTRIonizingFilterMonitoringFeatureWarning MTR_NEWLY_AVAILABLE = 0x2,
 } MTR_NEWLY_AVAILABLE;
 
 typedef NS_ENUM(uint8_t, MTRZeoliteFilterMonitoringChangeIndication) {
@@ -21957,9 +21957,9 @@ typedef NS_ENUM(uint8_t, MTRZeoliteFilterMonitoringDegradationDirection) {
     MTRZeoliteFilterMonitoringDegradationDirectionDown MTR_NEWLY_AVAILABLE = 0x01,
 } MTR_NEWLY_AVAILABLE;
 
-typedef NS_OPTIONS(uint32_t, MTRZeoliteFilterMonitoringFeatures) {
-    MTRZeoliteFilterMonitoringFeaturesCondition MTR_NEWLY_AVAILABLE = 0x1,
-    MTRZeoliteFilterMonitoringFeaturesWarning MTR_NEWLY_AVAILABLE = 0x2,
+typedef NS_OPTIONS(uint32_t, MTRZeoliteFilterMonitoringFeature) {
+    MTRZeoliteFilterMonitoringFeatureCondition MTR_NEWLY_AVAILABLE = 0x1,
+    MTRZeoliteFilterMonitoringFeatureWarning MTR_NEWLY_AVAILABLE = 0x2,
 } MTR_NEWLY_AVAILABLE;
 
 typedef NS_ENUM(uint8_t, MTROzoneFilterMonitoringChangeIndication) {
@@ -21973,9 +21973,9 @@ typedef NS_ENUM(uint8_t, MTROzoneFilterMonitoringDegradationDirection) {
     MTROzoneFilterMonitoringDegradationDirectionDown MTR_NEWLY_AVAILABLE = 0x01,
 } MTR_NEWLY_AVAILABLE;
 
-typedef NS_OPTIONS(uint32_t, MTROzoneFilterMonitoringFeatures) {
-    MTROzoneFilterMonitoringFeaturesCondition MTR_NEWLY_AVAILABLE = 0x1,
-    MTROzoneFilterMonitoringFeaturesWarning MTR_NEWLY_AVAILABLE = 0x2,
+typedef NS_OPTIONS(uint32_t, MTROzoneFilterMonitoringFeature) {
+    MTROzoneFilterMonitoringFeatureCondition MTR_NEWLY_AVAILABLE = 0x1,
+    MTROzoneFilterMonitoringFeatureWarning MTR_NEWLY_AVAILABLE = 0x2,
 } MTR_NEWLY_AVAILABLE;
 
 typedef NS_ENUM(uint8_t, MTRWaterTankMonitoringChangeIndication) {
@@ -21989,9 +21989,9 @@ typedef NS_ENUM(uint8_t, MTRWaterTankMonitoringDegradationDirection) {
     MTRWaterTankMonitoringDegradationDirectionDown MTR_NEWLY_AVAILABLE = 0x01,
 } MTR_NEWLY_AVAILABLE;
 
-typedef NS_OPTIONS(uint32_t, MTRWaterTankMonitoringFeatures) {
-    MTRWaterTankMonitoringFeaturesCondition MTR_NEWLY_AVAILABLE = 0x1,
-    MTRWaterTankMonitoringFeaturesWarning MTR_NEWLY_AVAILABLE = 0x2,
+typedef NS_OPTIONS(uint32_t, MTRWaterTankMonitoringFeature) {
+    MTRWaterTankMonitoringFeatureCondition MTR_NEWLY_AVAILABLE = 0x1,
+    MTRWaterTankMonitoringFeatureWarning MTR_NEWLY_AVAILABLE = 0x2,
 } MTR_NEWLY_AVAILABLE;
 
 typedef NS_ENUM(uint8_t, MTRFuelTankMonitoringChangeIndication) {
@@ -22005,9 +22005,9 @@ typedef NS_ENUM(uint8_t, MTRFuelTankMonitoringDegradationDirection) {
     MTRFuelTankMonitoringDegradationDirectionDown MTR_NEWLY_AVAILABLE = 0x01,
 } MTR_NEWLY_AVAILABLE;
 
-typedef NS_OPTIONS(uint32_t, MTRFuelTankMonitoringFeatures) {
-    MTRFuelTankMonitoringFeaturesCondition MTR_NEWLY_AVAILABLE = 0x1,
-    MTRFuelTankMonitoringFeaturesWarning MTR_NEWLY_AVAILABLE = 0x2,
+typedef NS_OPTIONS(uint32_t, MTRFuelTankMonitoringFeature) {
+    MTRFuelTankMonitoringFeatureCondition MTR_NEWLY_AVAILABLE = 0x1,
+    MTRFuelTankMonitoringFeatureWarning MTR_NEWLY_AVAILABLE = 0x2,
 } MTR_NEWLY_AVAILABLE;
 
 typedef NS_ENUM(uint8_t, MTRInkCartridgeMonitoringChangeIndication) {
@@ -22021,9 +22021,9 @@ typedef NS_ENUM(uint8_t, MTRInkCartridgeMonitoringDegradationDirection) {
     MTRInkCartridgeMonitoringDegradationDirectionDown MTR_NEWLY_AVAILABLE = 0x01,
 } MTR_NEWLY_AVAILABLE;
 
-typedef NS_OPTIONS(uint32_t, MTRInkCartridgeMonitoringFeatures) {
-    MTRInkCartridgeMonitoringFeaturesCondition MTR_NEWLY_AVAILABLE = 0x1,
-    MTRInkCartridgeMonitoringFeaturesWarning MTR_NEWLY_AVAILABLE = 0x2,
+typedef NS_OPTIONS(uint32_t, MTRInkCartridgeMonitoringFeature) {
+    MTRInkCartridgeMonitoringFeatureCondition MTR_NEWLY_AVAILABLE = 0x1,
+    MTRInkCartridgeMonitoringFeatureWarning MTR_NEWLY_AVAILABLE = 0x2,
 } MTR_NEWLY_AVAILABLE;
 
 typedef NS_ENUM(uint8_t, MTRTonerCartridgeMonitoringChangeIndication) {
@@ -22037,9 +22037,9 @@ typedef NS_ENUM(uint8_t, MTRTonerCartridgeMonitoringDegradationDirection) {
     MTRTonerCartridgeMonitoringDegradationDirectionDown MTR_NEWLY_AVAILABLE = 0x01,
 } MTR_NEWLY_AVAILABLE;
 
-typedef NS_OPTIONS(uint32_t, MTRTonerCartridgeMonitoringFeatures) {
-    MTRTonerCartridgeMonitoringFeaturesCondition MTR_NEWLY_AVAILABLE = 0x1,
-    MTRTonerCartridgeMonitoringFeaturesWarning MTR_NEWLY_AVAILABLE = 0x2,
+typedef NS_OPTIONS(uint32_t, MTRTonerCartridgeMonitoringFeature) {
+    MTRTonerCartridgeMonitoringFeatureCondition MTR_NEWLY_AVAILABLE = 0x1,
+    MTRTonerCartridgeMonitoringFeatureWarning MTR_NEWLY_AVAILABLE = 0x2,
 } MTR_NEWLY_AVAILABLE;
 
 typedef NS_ENUM(uint8_t, MTRDoorLockAlarmCode) {
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 7ba17464cb84f9..f84c4635d79d1a 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
@@ -1560,8 +1560,8 @@ enum class DegradationDirectionEnum : uint8_t
     kUnknownEnumValue = 2,
 };
 
-// Bitmap for Features
-enum class Features : uint32_t
+// Bitmap for Feature
+enum class Feature : uint32_t
 {
     kCondition = 0x1,
     kWarning   = 0x2,
@@ -1595,8 +1595,8 @@ enum class DegradationDirectionEnum : uint8_t
     kUnknownEnumValue = 2,
 };
 
-// Bitmap for Features
-enum class Features : uint32_t
+// Bitmap for Feature
+enum class Feature : uint32_t
 {
     kCondition = 0x1,
     kWarning   = 0x2,
@@ -1630,8 +1630,8 @@ enum class DegradationDirectionEnum : uint8_t
     kUnknownEnumValue = 2,
 };
 
-// Bitmap for Features
-enum class Features : uint32_t
+// Bitmap for Feature
+enum class Feature : uint32_t
 {
     kCondition = 0x1,
     kWarning   = 0x2,
@@ -1665,8 +1665,8 @@ enum class DegradationDirectionEnum : uint8_t
     kUnknownEnumValue = 2,
 };
 
-// Bitmap for Features
-enum class Features : uint32_t
+// Bitmap for Feature
+enum class Feature : uint32_t
 {
     kCondition = 0x1,
     kWarning   = 0x2,
@@ -1700,8 +1700,8 @@ enum class DegradationDirectionEnum : uint8_t
     kUnknownEnumValue = 2,
 };
 
-// Bitmap for Features
-enum class Features : uint32_t
+// Bitmap for Feature
+enum class Feature : uint32_t
 {
     kCondition = 0x1,
     kWarning   = 0x2,
@@ -1735,8 +1735,8 @@ enum class DegradationDirectionEnum : uint8_t
     kUnknownEnumValue = 2,
 };
 
-// Bitmap for Features
-enum class Features : uint32_t
+// Bitmap for Feature
+enum class Feature : uint32_t
 {
     kCondition = 0x1,
     kWarning   = 0x2,
@@ -1770,8 +1770,8 @@ enum class DegradationDirectionEnum : uint8_t
     kUnknownEnumValue = 2,
 };
 
-// Bitmap for Features
-enum class Features : uint32_t
+// Bitmap for Feature
+enum class Feature : uint32_t
 {
     kCondition = 0x1,
     kWarning   = 0x2,
@@ -1805,8 +1805,8 @@ enum class DegradationDirectionEnum : uint8_t
     kUnknownEnumValue = 2,
 };
 
-// Bitmap for Features
-enum class Features : uint32_t
+// Bitmap for Feature
+enum class Feature : uint32_t
 {
     kCondition = 0x1,
     kWarning   = 0x2,
@@ -1840,8 +1840,8 @@ enum class DegradationDirectionEnum : uint8_t
     kUnknownEnumValue = 2,
 };
 
-// Bitmap for Features
-enum class Features : uint32_t
+// Bitmap for Feature
+enum class Feature : uint32_t
 {
     kCondition = 0x1,
     kWarning   = 0x2,
@@ -1875,8 +1875,8 @@ enum class DegradationDirectionEnum : uint8_t
     kUnknownEnumValue = 2,
 };
 
-// Bitmap for Features
-enum class Features : uint32_t
+// Bitmap for Feature
+enum class Feature : uint32_t
 {
     kCondition = 0x1,
     kWarning   = 0x2,
@@ -1910,8 +1910,8 @@ enum class DegradationDirectionEnum : uint8_t
     kUnknownEnumValue = 2,
 };
 
-// Bitmap for Features
-enum class Features : uint32_t
+// Bitmap for Feature
+enum class Feature : uint32_t
 {
     kCondition = 0x1,
     kWarning   = 0x2,
@@ -1945,8 +1945,8 @@ enum class DegradationDirectionEnum : uint8_t
     kUnknownEnumValue = 2,
 };
 
-// Bitmap for Features
-enum class Features : uint32_t
+// Bitmap for Feature
+enum class Feature : uint32_t
 {
     kCondition = 0x1,
     kWarning   = 0x2,