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..f0d962e70588e2 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
@@ -84,7 +84,7 @@ limitations under the License.
     <domain>Measurement &amp; Sensing</domain>
     <description>Attributes and commands for monitoring electrostatic filters in a device</description>
     <code>0x0074</code>
-    <define>ELECTROSTATIC_FILTER_MONITORING</define>
+    <define>ELECTROSTATIC_FILTER_MONITORING_CLUSTER</define>
     <client tick="false" init="false">true</client>
     <server tick="false" init="false">true</server>
 
@@ -147,7 +147,7 @@ limitations under the License.
     <domain>Measurement &amp; Sensing</domain>
     <description>Attributes and commands for monitoring zeolite filters in a device</description>
     <code>0x0077</code>
-    <define>ZEOLITE_FILTER_MONITORING</define>
+    <define>ZEOLITE_FILTER_MONITORING_CLUSTER</define>
     <client tick="false" init="false">true</client>
     <server tick="false" init="false">true</server>
 
diff --git a/src/controller/data_model/controller-clusters.zap b/src/controller/data_model/controller-clusters.zap
index 338f53f316ba2b..d52d30e81ac43c 100644
--- a/src/controller/data_model/controller-clusters.zap
+++ b/src/controller/data_model/controller-clusters.zap
@@ -11430,7 +11430,7 @@
           "name": "Electrostatic Filter Monitoring",
           "code": 116,
           "mfgCode": null,
-          "define": "ELECTROSTATIC_FILTER_MONITORING",
+          "define": "ELECTROSTATIC_FILTER_MONITORING_CLUSTER",
           "side": "client",
           "enabled": 1,
           "attributes": [
@@ -11472,7 +11472,7 @@
           "name": "Electrostatic Filter Monitoring",
           "code": 116,
           "mfgCode": null,
-          "define": "ELECTROSTATIC_FILTER_MONITORING",
+          "define": "ELECTROSTATIC_FILTER_MONITORING_CLUSTER",
           "side": "server",
           "enabled": 0,
           "attributes": [
@@ -12066,7 +12066,7 @@
           "name": "Zeolite Filter Monitoring",
           "code": 119,
           "mfgCode": null,
-          "define": "ZEOLITE_FILTER_MONITORING",
+          "define": "ZEOLITE_FILTER_MONITORING_CLUSTER",
           "side": "client",
           "enabled": 1,
           "attributes": [
@@ -12108,7 +12108,7 @@
           "name": "Zeolite Filter Monitoring",
           "code": 119,
           "mfgCode": null,
-          "define": "ZEOLITE_FILTER_MONITORING",
+          "define": "ZEOLITE_FILTER_MONITORING_CLUSTER",
           "side": "server",
           "enabled": 0,
           "attributes": [
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 52bc9447206d5d..76e325f4fb0c76 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
@@ -326,11 +326,12 @@
 #define CHIP_PRINTCLUSTER_CERAMIC_FILTER_MONITORING_CLUSTER
 #endif
 
-#if defined(ZCL_USING_ELECTROSTATIC_FILTER_MONITORING_SERVER) || defined(ZCL_USING_ELECTROSTATIC_FILTER_MONITORING_CLIENT)
-#define CHIP_PRINTCLUSTER_ELECTROSTATIC_FILTER_MONITORING                                                                          \
+#if defined(ZCL_USING_ELECTROSTATIC_FILTER_MONITORING_CLUSTER_SERVER) ||                                                           \
+    defined(ZCL_USING_ELECTROSTATIC_FILTER_MONITORING_CLUSTER_CLIENT)
+#define CHIP_PRINTCLUSTER_ELECTROSTATIC_FILTER_MONITORING_CLUSTER                                                                  \
     { chip::app::Clusters::ElectrostaticFilterMonitoring::Id, "Electrostatic Filter Monitoring" },
 #else
-#define CHIP_PRINTCLUSTER_ELECTROSTATIC_FILTER_MONITORING
+#define CHIP_PRINTCLUSTER_ELECTROSTATIC_FILTER_MONITORING_CLUSTER
 #endif
 
 #if defined(ZCL_USING_UV_FILTER_MONITORING_CLUSTER_SERVER) || defined(ZCL_USING_UV_FILTER_MONITORING_CLUSTER_CLIENT)
@@ -346,11 +347,11 @@
 #define CHIP_PRINTCLUSTER_IONIZING_FILTER_MONITORING_CLUSTER
 #endif
 
-#if defined(ZCL_USING_ZEOLITE_FILTER_MONITORING_SERVER) || defined(ZCL_USING_ZEOLITE_FILTER_MONITORING_CLIENT)
-#define CHIP_PRINTCLUSTER_ZEOLITE_FILTER_MONITORING                                                                                \
+#if defined(ZCL_USING_ZEOLITE_FILTER_MONITORING_CLUSTER_SERVER) || defined(ZCL_USING_ZEOLITE_FILTER_MONITORING_CLUSTER_CLIENT)
+#define CHIP_PRINTCLUSTER_ZEOLITE_FILTER_MONITORING_CLUSTER                                                                        \
     { chip::app::Clusters::ZeoliteFilterMonitoring::Id, "Zeolite Filter Monitoring" },
 #else
-#define CHIP_PRINTCLUSTER_ZEOLITE_FILTER_MONITORING
+#define CHIP_PRINTCLUSTER_ZEOLITE_FILTER_MONITORING_CLUSTER
 #endif
 
 #if defined(ZCL_USING_OZONE_FILTER_MONITORING_CLUSTER_SERVER) || defined(ZCL_USING_OZONE_FILTER_MONITORING_CLUSTER_CLIENT)
@@ -623,10 +624,10 @@
     CHIP_PRINTCLUSTER_HEPA_FILTER_MONITORING_CLUSTER                                                                               \
     CHIP_PRINTCLUSTER_ACTIVATED_CARBON_FILTER_MONITORING_CLUSTER                                                                   \
     CHIP_PRINTCLUSTER_CERAMIC_FILTER_MONITORING_CLUSTER                                                                            \
-    CHIP_PRINTCLUSTER_ELECTROSTATIC_FILTER_MONITORING                                                                              \
+    CHIP_PRINTCLUSTER_ELECTROSTATIC_FILTER_MONITORING_CLUSTER                                                                      \
     CHIP_PRINTCLUSTER_UV_FILTER_MONITORING_CLUSTER                                                                                 \
     CHIP_PRINTCLUSTER_IONIZING_FILTER_MONITORING_CLUSTER                                                                           \
-    CHIP_PRINTCLUSTER_ZEOLITE_FILTER_MONITORING                                                                                    \
+    CHIP_PRINTCLUSTER_ZEOLITE_FILTER_MONITORING_CLUSTER                                                                            \
     CHIP_PRINTCLUSTER_OZONE_FILTER_MONITORING_CLUSTER                                                                              \
     CHIP_PRINTCLUSTER_WATER_TANK_MONITORING_CLUSTER                                                                                \
     CHIP_PRINTCLUSTER_FUEL_TANK_MONITORING_CLUSTER                                                                                 \
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 92890866b64a9c..a7f94ba50a2fdf 100644
--- a/zzz_generated/darwin/controller-clusters/zap-generated/gen_config.h
+++ b/zzz_generated/darwin/controller-clusters/zap-generated/gen_config.h
@@ -63,10 +63,10 @@
 #define EMBER_AF_HEPA_FILTER_MONITORING_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
 #define EMBER_AF_ACTIVATED_CARBON_FILTER_MONITORING_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
 #define EMBER_AF_CERAMIC_FILTER_MONITORING_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
-#define EMBER_AF_ELECTROSTATIC_FILTER_MONITORING_CLIENT_ENDPOINT_COUNT (1)
+#define EMBER_AF_ELECTROSTATIC_FILTER_MONITORING_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
 #define EMBER_AF_UV_FILTER_MONITORING_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
 #define EMBER_AF_IONIZING_FILTER_MONITORING_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
-#define EMBER_AF_ZEOLITE_FILTER_MONITORING_CLIENT_ENDPOINT_COUNT (1)
+#define EMBER_AF_ZEOLITE_FILTER_MONITORING_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
 #define EMBER_AF_OZONE_FILTER_MONITORING_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
 #define EMBER_AF_WATER_TANK_MONITORING_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
 #define EMBER_AF_FUEL_TANK_MONITORING_CLUSTER_CLIENT_ENDPOINT_COUNT (1)
@@ -273,7 +273,7 @@
 #define EMBER_AF_PLUGIN_CERAMIC_FILTER_MONITORING_CLIENT
 
 // Use this macro to check if the client side of the Electrostatic Filter Monitoring cluster is included
-#define ZCL_USING_ELECTROSTATIC_FILTER_MONITORING_CLIENT
+#define ZCL_USING_ELECTROSTATIC_FILTER_MONITORING_CLUSTER_CLIENT
 #define EMBER_AF_PLUGIN_ELECTROSTATIC_FILTER_MONITORING_CLIENT
 
 // Use this macro to check if the client side of the UV Filter Monitoring cluster is included
@@ -285,7 +285,7 @@
 #define EMBER_AF_PLUGIN_IONIZING_FILTER_MONITORING_CLIENT
 
 // Use this macro to check if the client side of the Zeolite Filter Monitoring cluster is included
-#define ZCL_USING_ZEOLITE_FILTER_MONITORING_CLIENT
+#define ZCL_USING_ZEOLITE_FILTER_MONITORING_CLUSTER_CLIENT
 #define EMBER_AF_PLUGIN_ZEOLITE_FILTER_MONITORING_CLIENT
 
 // Use this macro to check if the client side of the Ozone Filter Monitoring cluster is included