Address final set of review comments from Andrei

Author: PeterC1965

examples/all-clusters-app/all-clusters-common/include/water-heater-mode.h

@@ -44,11 +44,11 @@ class ExampleWaterHeaterModeDelegate : public ModeBase::Delegate
 
     const detail::Structs::ModeOptionStruct::Type kModeOptions[3] = {
         detail::Structs::ModeOptionStruct::Type{
-            .label = "Off"_span, .mode = ModeOff, .modeTags = DataModel::List<const ModeTagStructType>(modeTagsOff) },
+            .label = "Off"_span, .mode = kModeOff, .modeTags = DataModel::List<const ModeTagStructType>(modeTagsOff) },
         detail::Structs::ModeOptionStruct::Type{
-            .label = "Manual"_span, .mode = ModeManual, .modeTags = DataModel::List<const ModeTagStructType>(modeTagsManual) },
+            .label = "Manual"_span, .mode = kModeManual, .modeTags = DataModel::List<const ModeTagStructType>(modeTagsManual) },
         detail::Structs::ModeOptionStruct::Type{
-            .label = "Timed"_span, .mode = ModeTimed, .modeTags = DataModel::List<const ModeTagStructType>(modeTagsTimed) }
+            .label = "Timed"_span, .mode = kModeTimed, .modeTags = DataModel::List<const ModeTagStructType>(modeTagsTimed) }
     };
 
     CHIP_ERROR Init() override;