diff --git a/src/app/zap-templates/zcl/data-model/chip/concentration-measurement-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/concentration-measurement-cluster.xml
index f6b9ea957cf1bb..8b11a638f75dc6 100644
--- a/src/app/zap-templates/zcl/data-model/chip/concentration-measurement-cluster.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/concentration-measurement-cluster.xml
@@ -805,7 +805,7 @@ limitations under the License.
Measurement & Sensing
Attributes for reporting total volatile organic compounds concentration measurements
0x042e
- VOC_CONCENTRATION_MEASUREMENT_CLUSTER
+ TVOC_CONCENTRATION_MEASUREMENT_CLUSTER
true
true
diff --git a/src/app/zap_cluster_list.json b/src/app/zap_cluster_list.json
index a47af46bf0a841..c7acfd77abdb92 100644
--- a/src/app/zap_cluster_list.json
+++ b/src/app/zap_cluster_list.json
@@ -131,7 +131,7 @@
"UNIT_TESTING_CLUSTER": [],
"USER_LABEL_CLUSTER": [],
"UV_FILTER_MONITORING_CLUSTER": [],
- "VOC_CONCENTRATION_MEASUREMENT_CLUSTER": [],
+ "TVOC_CONCENTRATION_MEASUREMENT_CLUSTER": [],
"WAKE_ON_LAN_CLUSTER": [],
"WATER_TANK_MONITORING_CLUSTER": [],
"WIFI_NETWORK_DIAGNOSTICS_CLUSTER": [],
diff --git a/src/controller/data_model/controller-clusters.zap b/src/controller/data_model/controller-clusters.zap
index 46ead7331a6331..f06e39d485051e 100644
--- a/src/controller/data_model/controller-clusters.zap
+++ b/src/controller/data_model/controller-clusters.zap
@@ -31168,7 +31168,7 @@
"name": "Total Volatile Organic Compounds Measurement",
"code": 1070,
"mfgCode": null,
- "define": "VOC_CONCENTRATION_MEASUREMENT_CLUSTER",
+ "define": "TVOC_CONCENTRATION_MEASUREMENT_CLUSTER",
"side": "client",
"enabled": 1,
"attributes": [
@@ -31210,7 +31210,7 @@
"name": "Total Volatile Organic Compounds Measurement",
"code": 1070,
"mfgCode": null,
- "define": "VOC_CONCENTRATION_MEASUREMENT_CLUSTER",
+ "define": "TVOC_CONCENTRATION_MEASUREMENT_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 1ff05fdf250ee1..3a80624fd90731 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
@@ -769,13 +769,13 @@
#define CHIP_PRINTCLUSTER_PM10_CONCENTRATION_MEASUREMENT_CLUSTER
#endif
-#if defined(ZCL_USING_VOC_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || \
- defined(ZCL_USING_VOC_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
-#define CHIP_PRINTCLUSTER_VOC_CONCENTRATION_MEASUREMENT_CLUSTER \
+#if defined(ZCL_USING_TVOC_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || \
+ defined(ZCL_USING_TVOC_CONCENTRATION_MEASUREMENT_CLUSTER_CLIENT)
+#define CHIP_PRINTCLUSTER_TVOC_CONCENTRATION_MEASUREMENT_CLUSTER \
{ chip::app::Clusters::TotalVolatileOrganicCompoundsConcentrationMeasurement::Id, \
"Total Volatile Organic Compounds Concentration Measurement" },
#else
-#define CHIP_PRINTCLUSTER_VOC_CONCENTRATION_MEASUREMENT_CLUSTER
+#define CHIP_PRINTCLUSTER_TVOC_CONCENTRATION_MEASUREMENT_CLUSTER
#endif
#if defined(ZCL_USING_RADON_CONCENTRATION_MEASUREMENT_CLUSTER_SERVER) || \
@@ -985,7 +985,7 @@
CHIP_PRINTCLUSTER_FORMALDEHYDE_CONCENTRATION_MEASUREMENT_CLUSTER \
CHIP_PRINTCLUSTER_PM1_CONCENTRATION_MEASUREMENT_CLUSTER \
CHIP_PRINTCLUSTER_PM10_CONCENTRATION_MEASUREMENT_CLUSTER \
- CHIP_PRINTCLUSTER_VOC_CONCENTRATION_MEASUREMENT_CLUSTER \
+ CHIP_PRINTCLUSTER_TVOC_CONCENTRATION_MEASUREMENT_CLUSTER \
CHIP_PRINTCLUSTER_RADON_CONCENTRATION_MEASUREMENT_CLUSTER \
CHIP_PRINTCLUSTER_WAKE_ON_LAN_CLUSTER \
CHIP_PRINTCLUSTER_CHANNEL_CLUSTER \