diff --git a/lib/libesp32/berry_matter/src/be_matter_module.c b/lib/libesp32/berry_matter/src/be_matter_module.c
index 9e9412854..41f66e3f4 100644
--- a/lib/libesp32/berry_matter/src/be_matter_module.c
+++ b/lib/libesp32/berry_matter/src/be_matter_module.c
@@ -210,7 +210,7 @@ extern const bclass be_class_Matter_TLV;   // need to declare it upfront because
 #include "../generate/be_matter_certs.h"
 
 #include "solidify/solidified_Matter_Plugin_1_Root.h"
-#include "solidify/solidified_Matter_Plugin_2_Aggregator.h"
+#include "solidify/solidified_Matter_Plugin_1_Aggregator.h"
 #include "solidify/solidified_Matter_Plugin_1_Device.h"
 #include "solidify/solidified_Matter_Plugin_2_OnOff.h"
 #include "solidify/solidified_Matter_Plugin_9_Virt_OnOff.h"
@@ -235,9 +235,9 @@ extern const bclass be_class_Matter_TLV;   // need to declare it upfront because
 #include "solidify/solidified_Matter_Plugin_9_Virt_Sensor_Illuminance.h"
 #include "solidify/solidified_Matter_Plugin_3_Sensor_Humidity.h"
 #include "solidify/solidified_Matter_Plugin_9_Virt_Sensor_Humidity.h"
-#include "solidify/solidified_Matter_Plugin_3_Sensor_Occupancy.h"
-#include "solidify/solidified_Matter_Plugin_3_Sensor_OnOff.h"
-#include "solidify/solidified_Matter_Plugin_3_Sensor_Contact.h"
+#include "solidify/solidified_Matter_Plugin_2_Sensor_Occupancy.h"
+#include "solidify/solidified_Matter_Plugin_2_Sensor_OnOff.h"
+#include "solidify/solidified_Matter_Plugin_2_Sensor_Contact.h"
 #include "solidify/solidified_Matter_Plugin_9_Virt_Sensor_Contact.h"
 #include "solidify/solidified_Matter_Plugin_9_Virt_Sensor_Occupancy.h"
 #include "solidify/solidified_Matter_Plugin_2_Bridge_HTTP.h"
@@ -251,8 +251,8 @@ extern const bclass be_class_Matter_TLV;   // need to declare it upfront because
 #include "solidify/solidified_Matter_Plugin_4_Bridge_Sensor_Temp.h"
 #include "solidify/solidified_Matter_Plugin_4_Bridge_Sensor_Illuminance.h"
 #include "solidify/solidified_Matter_Plugin_4_Bridge_Sensor_Humidity.h"
-#include "solidify/solidified_Matter_Plugin_4_Bridge_Sensor_Occupancy.h"
-#include "solidify/solidified_Matter_Plugin_4_Bridge_Sensor_Contact.h"
+#include "solidify/solidified_Matter_Plugin_3_Bridge_Sensor_Occupancy.h"
+#include "solidify/solidified_Matter_Plugin_3_Bridge_Sensor_Contact.h"
 #include "solidify/solidified_Matter_Plugin_4_Bridge_Sensor_Flow.h"
 
 /*********************************************************************************************\
diff --git a/lib/libesp32/berry_matter/src/embedded/Matter_Plugin_2_Aggregator.be b/lib/libesp32/berry_matter/src/embedded/Matter_Plugin_1_Aggregator.be
similarity index 100%
rename from lib/libesp32/berry_matter/src/embedded/Matter_Plugin_2_Aggregator.be
rename to lib/libesp32/berry_matter/src/embedded/Matter_Plugin_1_Aggregator.be
diff --git a/lib/libesp32/berry_matter/src/embedded/Matter_Plugin_3_Sensor_Contact.be b/lib/libesp32/berry_matter/src/embedded/Matter_Plugin_2_Sensor_Contact.be
similarity index 100%
rename from lib/libesp32/berry_matter/src/embedded/Matter_Plugin_3_Sensor_Contact.be
rename to lib/libesp32/berry_matter/src/embedded/Matter_Plugin_2_Sensor_Contact.be
diff --git a/lib/libesp32/berry_matter/src/embedded/Matter_Plugin_3_Sensor_Occupancy.be b/lib/libesp32/berry_matter/src/embedded/Matter_Plugin_2_Sensor_Occupancy.be
similarity index 100%
rename from lib/libesp32/berry_matter/src/embedded/Matter_Plugin_3_Sensor_Occupancy.be
rename to lib/libesp32/berry_matter/src/embedded/Matter_Plugin_2_Sensor_Occupancy.be
diff --git a/lib/libesp32/berry_matter/src/embedded/Matter_Plugin_3_Sensor_OnOff.be b/lib/libesp32/berry_matter/src/embedded/Matter_Plugin_2_Sensor_OnOff.be
similarity index 100%
rename from lib/libesp32/berry_matter/src/embedded/Matter_Plugin_3_Sensor_OnOff.be
rename to lib/libesp32/berry_matter/src/embedded/Matter_Plugin_2_Sensor_OnOff.be
diff --git a/lib/libesp32/berry_matter/src/embedded/Matter_Plugin_4_Bridge_Sensor_Contact.be b/lib/libesp32/berry_matter/src/embedded/Matter_Plugin_3_Bridge_Sensor_Contact.be
similarity index 100%
rename from lib/libesp32/berry_matter/src/embedded/Matter_Plugin_4_Bridge_Sensor_Contact.be
rename to lib/libesp32/berry_matter/src/embedded/Matter_Plugin_3_Bridge_Sensor_Contact.be
diff --git a/lib/libesp32/berry_matter/src/embedded/Matter_Plugin_4_Bridge_Sensor_Occupancy.be b/lib/libesp32/berry_matter/src/embedded/Matter_Plugin_3_Bridge_Sensor_Occupancy.be
similarity index 100%
rename from lib/libesp32/berry_matter/src/embedded/Matter_Plugin_4_Bridge_Sensor_Occupancy.be
rename to lib/libesp32/berry_matter/src/embedded/Matter_Plugin_3_Bridge_Sensor_Occupancy.be
diff --git a/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_2_Aggregator.h b/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_1_Aggregator.h
similarity index 99%
rename from lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_2_Aggregator.h
rename to lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_1_Aggregator.h
index af4ea7333..c9c2db74a 100644
--- a/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_2_Aggregator.h
+++ b/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_1_Aggregator.h
@@ -1,4 +1,4 @@
-/* Solidification of Matter_Plugin_2_Aggregator.h */
+/* Solidification of Matter_Plugin_1_Aggregator.h */
 /********************************************************************\
 * Generated code, don't edit                                         *
 \********************************************************************/
diff --git a/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_3_Sensor_Contact.h b/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_2_Sensor_Contact.h
similarity index 99%
rename from lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_3_Sensor_Contact.h
rename to lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_2_Sensor_Contact.h
index 7a33f6a30..2b98ba814 100644
--- a/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_3_Sensor_Contact.h
+++ b/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_2_Sensor_Contact.h
@@ -1,4 +1,4 @@
-/* Solidification of Matter_Plugin_3_Sensor_Contact.h */
+/* Solidification of Matter_Plugin_2_Sensor_Contact.h */
 /********************************************************************\
 * Generated code, don't edit                                         *
 \********************************************************************/
diff --git a/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_3_Sensor_Occupancy.h b/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_2_Sensor_Occupancy.h
similarity index 99%
rename from lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_3_Sensor_Occupancy.h
rename to lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_2_Sensor_Occupancy.h
index a2585b7a0..60c934fd1 100644
--- a/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_3_Sensor_Occupancy.h
+++ b/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_2_Sensor_Occupancy.h
@@ -1,4 +1,4 @@
-/* Solidification of Matter_Plugin_3_Sensor_Occupancy.h */
+/* Solidification of Matter_Plugin_2_Sensor_Occupancy.h */
 /********************************************************************\
 * Generated code, don't edit                                         *
 \********************************************************************/
diff --git a/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_3_Sensor_OnOff.h b/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_2_Sensor_OnOff.h
similarity index 99%
rename from lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_3_Sensor_OnOff.h
rename to lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_2_Sensor_OnOff.h
index 4bb8243a0..498676bf4 100644
--- a/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_3_Sensor_OnOff.h
+++ b/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_2_Sensor_OnOff.h
@@ -1,4 +1,4 @@
-/* Solidification of Matter_Plugin_3_Sensor_OnOff.h */
+/* Solidification of Matter_Plugin_2_Sensor_OnOff.h */
 /********************************************************************\
 * Generated code, don't edit                                         *
 \********************************************************************/
diff --git a/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_4_Bridge_Sensor_Contact.h b/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_3_Bridge_Sensor_Contact.h
similarity index 99%
rename from lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_4_Bridge_Sensor_Contact.h
rename to lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_3_Bridge_Sensor_Contact.h
index ded960e54..5f072e844 100644
--- a/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_4_Bridge_Sensor_Contact.h
+++ b/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_3_Bridge_Sensor_Contact.h
@@ -1,4 +1,4 @@
-/* Solidification of Matter_Plugin_4_Bridge_Sensor_Contact.h */
+/* Solidification of Matter_Plugin_3_Bridge_Sensor_Contact.h */
 /********************************************************************\
 * Generated code, don't edit                                         *
 \********************************************************************/
diff --git a/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_4_Bridge_Sensor_Occupancy.h b/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_3_Bridge_Sensor_Occupancy.h
similarity index 99%
rename from lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_4_Bridge_Sensor_Occupancy.h
rename to lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_3_Bridge_Sensor_Occupancy.h
index b19d193b9..f79147599 100644
--- a/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_4_Bridge_Sensor_Occupancy.h
+++ b/lib/libesp32/berry_matter/src/solidify/solidified_Matter_Plugin_3_Bridge_Sensor_Occupancy.h
@@ -1,4 +1,4 @@
-/* Solidification of Matter_Plugin_4_Bridge_Sensor_Occupancy.h */
+/* Solidification of Matter_Plugin_3_Bridge_Sensor_Occupancy.h */
 /********************************************************************\
 * Generated code, don't edit                                         *
 \********************************************************************/