diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index 3d5bad7b9207e8..a51bacd2340a84 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -197,7 +197,7 @@ jobs:
src/app/zap-templates/zcl/data-model/draft/electrical-measurement-cluster.xml \
src/app/zap-templates/zcl/data-model/draft/input-output-value-clusters.xml \
src/app/zap-templates/zcl/data-model/draft/onoff-switch-configuration-cluster.xml \
- src/app/zap-templates/zcl/data-model/chip/replacable-monitoring-cluster.xml \
+ src/app/zap-templates/zcl/data-model/chip/resource-monitoring-cluster.xml \
"
- name: Build Apps
timeout-minutes: 60
diff --git a/scripts/rules.matterlint b/scripts/rules.matterlint
index 9aac905e0db834..af393232526ef3 100644
--- a/scripts/rules.matterlint
+++ b/scripts/rules.matterlint
@@ -80,7 +80,7 @@ load "../src/app/zap-templates/zcl/data-model/draft/electrical-measurement-clust
load "../src/app/zap-templates/zcl/data-model/draft/input-output-value-clusters.xml";
load "../src/app/zap-templates/zcl/data-model/draft/onoff-switch-configuration-cluster.xml";
load "../src/app/zap-templates/zcl/data-model/chip/air-quality-cluster.xml";
-load "../src/app/zap-templates/zcl/data-model/chip/replacable-monitoring-cluster.xml";
+load "../src/app/zap-templates/zcl/data-model/chip/resource-monitoring-cluster.xml";
all endpoints {
// These attributes follow a different code path and do not have to be
diff --git a/src/app/zap-templates/zcl/data-model/all.xml b/src/app/zap-templates/zcl/data-model/all.xml
index fbc8b1f5d80857..d0f256128e19a4 100644
--- a/src/app/zap-templates/zcl/data-model/all.xml
+++ b/src/app/zap-templates/zcl/data-model/all.xml
@@ -56,7 +56,7 @@
-
+
diff --git a/src/app/zap-templates/zcl/data-model/chip/replacable-monitoring-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/resource-monitoring-cluster.xml
similarity index 100%
rename from src/app/zap-templates/zcl/data-model/chip/replacable-monitoring-cluster.xml
rename to src/app/zap-templates/zcl/data-model/chip/resource-monitoring-cluster.xml
diff --git a/src/app/zap-templates/zcl/zcl-with-test-extensions.json b/src/app/zap-templates/zcl/zcl-with-test-extensions.json
index 9aa99576b33208..24a435d846fade 100644
--- a/src/app/zap-templates/zcl/zcl-with-test-extensions.json
+++ b/src/app/zap-templates/zcl/zcl-with-test-extensions.json
@@ -75,7 +75,7 @@
"pwm-cluster.xml",
"refrigerator-alarm.xml",
"relative-humidity-measurement-cluster.xml",
- "replacable-monitoring-cluster.xml",
+ "resource-monitoring-cluster.xml",
"scene.xml",
"smoke-co-alarm-cluster.xml",
"software-diagnostics-cluster.xml",
diff --git a/src/app/zap-templates/zcl/zcl.json b/src/app/zap-templates/zcl/zcl.json
index cdee396cb50811..dfe2ebd70e9471 100644
--- a/src/app/zap-templates/zcl/zcl.json
+++ b/src/app/zap-templates/zcl/zcl.json
@@ -73,7 +73,7 @@
"pwm-cluster.xml",
"refrigerator-alarm.xml",
"relative-humidity-measurement-cluster.xml",
- "replacable-monitoring-cluster.xml",
+ "resource-monitoring-cluster.xml",
"scene.xml",
"smoke-co-alarm-cluster.xml",
"software-diagnostics-cluster.xml",