Rename OTA defines to be in line with cluster naming (#23503)
* Rename OTA_(PROVIDER|REQUESTOR) to OTA_SOFTWARE_UPDATE_(PROVIDER|REQUESTOR)
* Zap regen
* Fix typo: append CLUSTER suffix back to OTA_SOFTWARE_REQUESTOR
* Regen again after missed renaming
diff --git a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.zap b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.zap
index 05b052a..47e3750 100644
--- a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.zap
+++ b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.zap
@@ -1460,7 +1460,7 @@
"name": "OTA Software Update Provider",
"code": 41,
"mfgCode": null,
- "define": "OTA_PROVIDER_CLUSTER",
+ "define": "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER",
"side": "client",
"enabled": 1,
"commands": [
@@ -1512,7 +1512,7 @@
"name": "OTA Software Update Provider",
"code": 41,
"mfgCode": null,
- "define": "OTA_PROVIDER_CLUSTER",
+ "define": "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER",
"side": "server",
"enabled": 0,
"commands": [
@@ -1588,7 +1588,7 @@
"name": "OTA Software Update Requestor",
"code": 42,
"mfgCode": null,
- "define": "OTA_REQUESTOR_CLUSTER",
+ "define": "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER",
"side": "client",
"enabled": 0,
"commands": [
@@ -1624,7 +1624,7 @@
"name": "OTA Software Update Requestor",
"code": 42,
"mfgCode": null,
- "define": "OTA_REQUESTOR_CLUSTER",
+ "define": "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER",
"side": "server",
"enabled": 1,
"attributes": [
diff --git a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.zap b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.zap
index ffc5b4c..dedd809 100644
--- a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.zap
+++ b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.zap
@@ -1524,7 +1524,7 @@
"name": "OTA Software Update Provider",
"code": 41,
"mfgCode": null,
- "define": "OTA_PROVIDER_CLUSTER",
+ "define": "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER",
"side": "client",
"enabled": 1,
"commands": [
@@ -1576,7 +1576,7 @@
"name": "OTA Software Update Provider",
"code": 41,
"mfgCode": null,
- "define": "OTA_PROVIDER_CLUSTER",
+ "define": "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER",
"side": "server",
"enabled": 0,
"commands": [
@@ -1652,7 +1652,7 @@
"name": "OTA Software Update Requestor",
"code": 42,
"mfgCode": null,
- "define": "OTA_REQUESTOR_CLUSTER",
+ "define": "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER",
"side": "client",
"enabled": 0,
"commands": [
@@ -1688,7 +1688,7 @@
"name": "OTA Software Update Requestor",
"code": 42,
"mfgCode": null,
- "define": "OTA_REQUESTOR_CLUSTER",
+ "define": "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER",
"side": "server",
"enabled": 1,
"attributes": [
diff --git a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.zap b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.zap
index 9d842d7..9e29e9e 100644
--- a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.zap
+++ b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.zap
@@ -1460,7 +1460,7 @@
"name": "OTA Software Update Provider",
"code": 41,
"mfgCode": null,
- "define": "OTA_PROVIDER_CLUSTER",
+ "define": "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER",
"side": "client",
"enabled": 1,
"commands": [
@@ -1512,7 +1512,7 @@
"name": "OTA Software Update Provider",
"code": 41,
"mfgCode": null,
- "define": "OTA_PROVIDER_CLUSTER",
+ "define": "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER",
"side": "server",
"enabled": 0,
"commands": [
@@ -1588,7 +1588,7 @@
"name": "OTA Software Update Requestor",
"code": 42,
"mfgCode": null,
- "define": "OTA_REQUESTOR_CLUSTER",
+ "define": "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER",
"side": "client",
"enabled": 0,
"commands": [
@@ -1624,7 +1624,7 @@
"name": "OTA Software Update Requestor",
"code": 42,
"mfgCode": null,
- "define": "OTA_REQUESTOR_CLUSTER",
+ "define": "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER",
"side": "server",
"enabled": 1,
"attributes": [
diff --git a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.zap b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.zap
index f74ee13..bc11f60 100644
--- a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.zap
+++ b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.zap
@@ -1460,7 +1460,7 @@
"name": "OTA Software Update Provider",
"code": 41,
"mfgCode": null,
- "define": "OTA_PROVIDER_CLUSTER",
+ "define": "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER",
"side": "client",
"enabled": 1,
"commands": [
@@ -1512,7 +1512,7 @@
"name": "OTA Software Update Provider",
"code": 41,
"mfgCode": null,
- "define": "OTA_PROVIDER_CLUSTER",
+ "define": "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER",
"side": "server",
"enabled": 0,
"commands": [
@@ -1588,7 +1588,7 @@
"name": "OTA Software Update Requestor",
"code": 42,
"mfgCode": null,
- "define": "OTA_REQUESTOR_CLUSTER",
+ "define": "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER",
"side": "client",
"enabled": 0,
"commands": [
@@ -1624,7 +1624,7 @@
"name": "OTA Software Update Requestor",
"code": 42,
"mfgCode": null,
- "define": "OTA_REQUESTOR_CLUSTER",
+ "define": "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER",
"side": "server",
"enabled": 1,
"attributes": [
diff --git a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.zap b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.zap
index 11c414f..5d17b61 100644
--- a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.zap
+++ b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.zap
@@ -1460,7 +1460,7 @@
"name": "OTA Software Update Provider",
"code": 41,
"mfgCode": null,
- "define": "OTA_PROVIDER_CLUSTER",
+ "define": "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER",
"side": "client",
"enabled": 1,
"commands": [
@@ -1512,7 +1512,7 @@
"name": "OTA Software Update Provider",
"code": 41,
"mfgCode": null,
- "define": "OTA_PROVIDER_CLUSTER",
+ "define": "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER",
"side": "server",
"enabled": 0,
"commands": [
@@ -1588,7 +1588,7 @@
"name": "OTA Software Update Requestor",
"code": 42,
"mfgCode": null,
- "define": "OTA_REQUESTOR_CLUSTER",
+ "define": "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER",
"side": "client",
"enabled": 0,
"commands": [
@@ -1624,7 +1624,7 @@
"name": "OTA Software Update Requestor",
"code": 42,
"mfgCode": null,
- "define": "OTA_REQUESTOR_CLUSTER",
+ "define": "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER",
"side": "server",
"enabled": 1,
"attributes": [
diff --git a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.zap b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.zap
index 4e3bed1..6654567 100644
--- a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.zap
+++ b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.zap
@@ -1460,7 +1460,7 @@
"name": "OTA Software Update Provider",
"code": 41,
"mfgCode": null,
- "define": "OTA_PROVIDER_CLUSTER",
+ "define": "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER",
"side": "client",
"enabled": 1,
"commands": [
@@ -1512,7 +1512,7 @@
"name": "OTA Software Update Provider",
"code": 41,
"mfgCode": null,
- "define": "OTA_PROVIDER_CLUSTER",
+ "define": "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER",
"side": "server",
"enabled": 0,
"commands": [
@@ -1588,7 +1588,7 @@
"name": "OTA Software Update Requestor",
"code": 42,
"mfgCode": null,
- "define": "OTA_REQUESTOR_CLUSTER",
+ "define": "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER",
"side": "client",
"enabled": 0,
"commands": [
@@ -1624,7 +1624,7 @@
"name": "OTA Software Update Requestor",
"code": 42,
"mfgCode": null,
- "define": "OTA_REQUESTOR_CLUSTER",
+ "define": "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER",
"side": "server",
"enabled": 1,
"attributes": [
diff --git a/examples/chef/devices/rootnode_fan_7N2TobIlOX.zap b/examples/chef/devices/rootnode_fan_7N2TobIlOX.zap
index be9a797..b1ad604 100644
--- a/examples/chef/devices/rootnode_fan_7N2TobIlOX.zap
+++ b/examples/chef/devices/rootnode_fan_7N2TobIlOX.zap
@@ -1524,7 +1524,7 @@
"name": "OTA Software Update Provider",
"code": 41,
"mfgCode": null,
- "define": "OTA_PROVIDER_CLUSTER",
+ "define": "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER",
"side": "client",
"enabled": 1,
"commands": [
@@ -1576,7 +1576,7 @@
"name": "OTA Software Update Provider",
"code": 41,
"mfgCode": null,
- "define": "OTA_PROVIDER_CLUSTER",
+ "define": "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER",
"side": "server",
"enabled": 0,
"commands": [
@@ -1652,7 +1652,7 @@
"name": "OTA Software Update Requestor",
"code": 42,
"mfgCode": null,
- "define": "OTA_REQUESTOR_CLUSTER",
+ "define": "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER",
"side": "client",
"enabled": 0,
"commands": [
@@ -1688,7 +1688,7 @@
"name": "OTA Software Update Requestor",
"code": 42,
"mfgCode": null,
- "define": "OTA_REQUESTOR_CLUSTER",
+ "define": "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER",
"side": "server",
"enabled": 1,
"attributes": [
diff --git a/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.zap b/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.zap
index 50034a6..c02cddf 100644
--- a/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.zap
+++ b/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.zap
@@ -1460,7 +1460,7 @@
"name": "OTA Software Update Provider",
"code": 41,
"mfgCode": null,
- "define": "OTA_PROVIDER_CLUSTER",
+ "define": "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER",
"side": "client",
"enabled": 1,
"commands": [
@@ -1512,7 +1512,7 @@
"name": "OTA Software Update Provider",
"code": 41,
"mfgCode": null,
- "define": "OTA_PROVIDER_CLUSTER",
+ "define": "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER",
"side": "server",
"enabled": 0,
"commands": [
@@ -1588,7 +1588,7 @@
"name": "OTA Software Update Requestor",
"code": 42,
"mfgCode": null,
- "define": "OTA_REQUESTOR_CLUSTER",
+ "define": "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER",
"side": "client",
"enabled": 0,
"commands": [
@@ -1624,7 +1624,7 @@
"name": "OTA Software Update Requestor",
"code": 42,
"mfgCode": null,
- "define": "OTA_REQUESTOR_CLUSTER",
+ "define": "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER",
"side": "server",
"enabled": 1,
"attributes": [
diff --git a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.zap b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.zap
index a20354f..5eed8a8 100644
--- a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.zap
+++ b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.zap
@@ -1460,7 +1460,7 @@
"name": "OTA Software Update Provider",
"code": 41,
"mfgCode": null,
- "define": "OTA_PROVIDER_CLUSTER",
+ "define": "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER",
"side": "client",
"enabled": 1,
"commands": [
@@ -1512,7 +1512,7 @@
"name": "OTA Software Update Provider",
"code": 41,
"mfgCode": null,
- "define": "OTA_PROVIDER_CLUSTER",
+ "define": "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER",
"side": "server",
"enabled": 0,
"commands": [
@@ -1588,7 +1588,7 @@
"name": "OTA Software Update Requestor",
"code": 42,
"mfgCode": null,
- "define": "OTA_REQUESTOR_CLUSTER",
+ "define": "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER",
"side": "client",
"enabled": 0,
"commands": [
@@ -1624,7 +1624,7 @@
"name": "OTA Software Update Requestor",
"code": 42,
"mfgCode": null,
- "define": "OTA_REQUESTOR_CLUSTER",
+ "define": "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER",
"side": "server",
"enabled": 1,
"attributes": [
diff --git a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.zap b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.zap
index 68fc189..5401943 100644
--- a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.zap
+++ b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.zap
@@ -1460,7 +1460,7 @@
"name": "OTA Software Update Provider",
"code": 41,
"mfgCode": null,
- "define": "OTA_PROVIDER_CLUSTER",
+ "define": "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER",
"side": "client",
"enabled": 1,
"commands": [
@@ -1512,7 +1512,7 @@
"name": "OTA Software Update Provider",
"code": 41,
"mfgCode": null,
- "define": "OTA_PROVIDER_CLUSTER",
+ "define": "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER",
"side": "server",
"enabled": 0,
"commands": [
@@ -1588,7 +1588,7 @@
"name": "OTA Software Update Requestor",
"code": 42,
"mfgCode": null,
- "define": "OTA_REQUESTOR_CLUSTER",
+ "define": "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER",
"side": "client",
"enabled": 0,
"commands": [
@@ -1624,7 +1624,7 @@
"name": "OTA Software Update Requestor",
"code": 42,
"mfgCode": null,
- "define": "OTA_REQUESTOR_CLUSTER",
+ "define": "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER",
"side": "server",
"enabled": 1,
"attributes": [
diff --git a/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.zap b/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.zap
index d4529a0..7a42a45 100644
--- a/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.zap
+++ b/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.zap
@@ -1460,7 +1460,7 @@
"name": "OTA Software Update Provider",
"code": 41,
"mfgCode": null,
- "define": "OTA_PROVIDER_CLUSTER",
+ "define": "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER",
"side": "client",
"enabled": 1,
"commands": [
@@ -1512,7 +1512,7 @@
"name": "OTA Software Update Provider",
"code": 41,
"mfgCode": null,
- "define": "OTA_PROVIDER_CLUSTER",
+ "define": "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER",
"side": "server",
"enabled": 0,
"commands": [
@@ -1588,7 +1588,7 @@
"name": "OTA Software Update Requestor",
"code": 42,
"mfgCode": null,
- "define": "OTA_REQUESTOR_CLUSTER",
+ "define": "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER",
"side": "client",
"enabled": 0,
"commands": [
@@ -1624,7 +1624,7 @@
"name": "OTA Software Update Requestor",
"code": 42,
"mfgCode": null,
- "define": "OTA_REQUESTOR_CLUSTER",
+ "define": "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER",
"side": "server",
"enabled": 1,
"attributes": [
diff --git a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.zap b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.zap
index 78a4c75..3413421 100644
--- a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.zap
+++ b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.zap
@@ -1460,7 +1460,7 @@
"name": "OTA Software Update Provider",
"code": 41,
"mfgCode": null,
- "define": "OTA_PROVIDER_CLUSTER",
+ "define": "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER",
"side": "client",
"enabled": 1,
"commands": [
@@ -1512,7 +1512,7 @@
"name": "OTA Software Update Provider",
"code": 41,
"mfgCode": null,
- "define": "OTA_PROVIDER_CLUSTER",
+ "define": "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER",
"side": "server",
"enabled": 0,
"commands": [
@@ -1588,7 +1588,7 @@
"name": "OTA Software Update Requestor",
"code": 42,
"mfgCode": null,
- "define": "OTA_REQUESTOR_CLUSTER",
+ "define": "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER",
"side": "client",
"enabled": 0,
"commands": [
@@ -1624,7 +1624,7 @@
"name": "OTA Software Update Requestor",
"code": 42,
"mfgCode": null,
- "define": "OTA_REQUESTOR_CLUSTER",
+ "define": "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER",
"side": "server",
"enabled": 1,
"attributes": [
diff --git a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.zap b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.zap
index 69e419b..2b9c494 100644
--- a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.zap
+++ b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.zap
@@ -1460,7 +1460,7 @@
"name": "OTA Software Update Provider",
"code": 41,
"mfgCode": null,
- "define": "OTA_PROVIDER_CLUSTER",
+ "define": "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER",
"side": "client",
"enabled": 1,
"commands": [
@@ -1512,7 +1512,7 @@
"name": "OTA Software Update Provider",
"code": 41,
"mfgCode": null,
- "define": "OTA_PROVIDER_CLUSTER",
+ "define": "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER",
"side": "server",
"enabled": 0,
"commands": [
@@ -1588,7 +1588,7 @@
"name": "OTA Software Update Requestor",
"code": 42,
"mfgCode": null,
- "define": "OTA_REQUESTOR_CLUSTER",
+ "define": "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER",
"side": "client",
"enabled": 0,
"commands": [
@@ -1624,7 +1624,7 @@
"name": "OTA Software Update Requestor",
"code": 42,
"mfgCode": null,
- "define": "OTA_REQUESTOR_CLUSTER",
+ "define": "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER",
"side": "server",
"enabled": 1,
"attributes": [
diff --git a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.zap b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.zap
index 2c015a8..ee7c5ff 100644
--- a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.zap
+++ b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.zap
@@ -1460,7 +1460,7 @@
"name": "OTA Software Update Provider",
"code": 41,
"mfgCode": null,
- "define": "OTA_PROVIDER_CLUSTER",
+ "define": "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER",
"side": "client",
"enabled": 1,
"commands": [
@@ -1512,7 +1512,7 @@
"name": "OTA Software Update Provider",
"code": 41,
"mfgCode": null,
- "define": "OTA_PROVIDER_CLUSTER",
+ "define": "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER",
"side": "server",
"enabled": 0,
"commands": [
@@ -1588,7 +1588,7 @@
"name": "OTA Software Update Requestor",
"code": 42,
"mfgCode": null,
- "define": "OTA_REQUESTOR_CLUSTER",
+ "define": "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER",
"side": "client",
"enabled": 0,
"commands": [
@@ -1624,7 +1624,7 @@
"name": "OTA Software Update Requestor",
"code": 42,
"mfgCode": null,
- "define": "OTA_REQUESTOR_CLUSTER",
+ "define": "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER",
"side": "server",
"enabled": 1,
"attributes": [
diff --git a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.zap b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.zap
index a18f44b..9b09c58 100644
--- a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.zap
+++ b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.zap
@@ -1460,7 +1460,7 @@
"name": "OTA Software Update Provider",
"code": 41,
"mfgCode": null,
- "define": "OTA_PROVIDER_CLUSTER",
+ "define": "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER",
"side": "client",
"enabled": 1,
"commands": [
@@ -1512,7 +1512,7 @@
"name": "OTA Software Update Provider",
"code": 41,
"mfgCode": null,
- "define": "OTA_PROVIDER_CLUSTER",
+ "define": "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER",
"side": "server",
"enabled": 0,
"commands": [
@@ -1588,7 +1588,7 @@
"name": "OTA Software Update Requestor",
"code": 42,
"mfgCode": null,
- "define": "OTA_REQUESTOR_CLUSTER",
+ "define": "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER",
"side": "client",
"enabled": 0,
"commands": [
@@ -1624,7 +1624,7 @@
"name": "OTA Software Update Requestor",
"code": 42,
"mfgCode": null,
- "define": "OTA_REQUESTOR_CLUSTER",
+ "define": "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER",
"side": "server",
"enabled": 1,
"attributes": [
diff --git a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.zap b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.zap
index c376a19..7d48e7f 100644
--- a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.zap
+++ b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.zap
@@ -1460,7 +1460,7 @@
"name": "OTA Software Update Provider",
"code": 41,
"mfgCode": null,
- "define": "OTA_PROVIDER_CLUSTER",
+ "define": "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER",
"side": "client",
"enabled": 1,
"commands": [
@@ -1512,7 +1512,7 @@
"name": "OTA Software Update Provider",
"code": 41,
"mfgCode": null,
- "define": "OTA_PROVIDER_CLUSTER",
+ "define": "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER",
"side": "server",
"enabled": 0,
"commands": [
@@ -1588,7 +1588,7 @@
"name": "OTA Software Update Requestor",
"code": 42,
"mfgCode": null,
- "define": "OTA_REQUESTOR_CLUSTER",
+ "define": "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER",
"side": "client",
"enabled": 0,
"commands": [
@@ -1624,7 +1624,7 @@
"name": "OTA Software Update Requestor",
"code": 42,
"mfgCode": null,
- "define": "OTA_REQUESTOR_CLUSTER",
+ "define": "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER",
"side": "server",
"enabled": 1,
"attributes": [
diff --git a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.zap b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.zap
index 23218a3..0512c45 100644
--- a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.zap
+++ b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.zap
@@ -1460,7 +1460,7 @@
"name": "OTA Software Update Provider",
"code": 41,
"mfgCode": null,
- "define": "OTA_PROVIDER_CLUSTER",
+ "define": "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER",
"side": "client",
"enabled": 1,
"commands": [
@@ -1512,7 +1512,7 @@
"name": "OTA Software Update Provider",
"code": 41,
"mfgCode": null,
- "define": "OTA_PROVIDER_CLUSTER",
+ "define": "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER",
"side": "server",
"enabled": 0,
"commands": [
@@ -1588,7 +1588,7 @@
"name": "OTA Software Update Requestor",
"code": 42,
"mfgCode": null,
- "define": "OTA_REQUESTOR_CLUSTER",
+ "define": "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER",
"side": "client",
"enabled": 0,
"commands": [
@@ -1624,7 +1624,7 @@
"name": "OTA Software Update Requestor",
"code": 42,
"mfgCode": null,
- "define": "OTA_REQUESTOR_CLUSTER",
+ "define": "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER",
"side": "server",
"enabled": 1,
"attributes": [
diff --git a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.zap b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.zap
index 59fdbd0..324c56e 100644
--- a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.zap
+++ b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.zap
@@ -1460,7 +1460,7 @@
"name": "OTA Software Update Provider",
"code": 41,
"mfgCode": null,
- "define": "OTA_PROVIDER_CLUSTER",
+ "define": "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER",
"side": "client",
"enabled": 1,
"commands": [
@@ -1512,7 +1512,7 @@
"name": "OTA Software Update Provider",
"code": 41,
"mfgCode": null,
- "define": "OTA_PROVIDER_CLUSTER",
+ "define": "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER",
"side": "server",
"enabled": 0,
"commands": [
@@ -1588,7 +1588,7 @@
"name": "OTA Software Update Requestor",
"code": 42,
"mfgCode": null,
- "define": "OTA_REQUESTOR_CLUSTER",
+ "define": "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER",
"side": "client",
"enabled": 0,
"commands": [
@@ -1624,7 +1624,7 @@
"name": "OTA Software Update Requestor",
"code": 42,
"mfgCode": null,
- "define": "OTA_REQUESTOR_CLUSTER",
+ "define": "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER",
"side": "server",
"enabled": 1,
"attributes": [
diff --git a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.zap b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.zap
index a61f58c..d0278af 100644
--- a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.zap
+++ b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.zap
@@ -1460,7 +1460,7 @@
"name": "OTA Software Update Provider",
"code": 41,
"mfgCode": null,
- "define": "OTA_PROVIDER_CLUSTER",
+ "define": "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER",
"side": "client",
"enabled": 1,
"commands": [
@@ -1512,7 +1512,7 @@
"name": "OTA Software Update Provider",
"code": 41,
"mfgCode": null,
- "define": "OTA_PROVIDER_CLUSTER",
+ "define": "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER",
"side": "server",
"enabled": 0,
"commands": [
@@ -1588,7 +1588,7 @@
"name": "OTA Software Update Requestor",
"code": 42,
"mfgCode": null,
- "define": "OTA_REQUESTOR_CLUSTER",
+ "define": "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER",
"side": "client",
"enabled": 0,
"commands": [
@@ -1624,7 +1624,7 @@
"name": "OTA Software Update Requestor",
"code": 42,
"mfgCode": null,
- "define": "OTA_REQUESTOR_CLUSTER",
+ "define": "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER",
"side": "server",
"enabled": 1,
"attributes": [
diff --git a/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.zap b/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.zap
index 7ee8f41..70eba61 100644
--- a/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.zap
+++ b/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.zap
@@ -1460,7 +1460,7 @@
"name": "OTA Software Update Provider",
"code": 41,
"mfgCode": null,
- "define": "OTA_PROVIDER_CLUSTER",
+ "define": "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER",
"side": "client",
"enabled": 1,
"commands": [
@@ -1512,7 +1512,7 @@
"name": "OTA Software Update Provider",
"code": 41,
"mfgCode": null,
- "define": "OTA_PROVIDER_CLUSTER",
+ "define": "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER",
"side": "server",
"enabled": 0,
"commands": [
@@ -1588,7 +1588,7 @@
"name": "OTA Software Update Requestor",
"code": 42,
"mfgCode": null,
- "define": "OTA_REQUESTOR_CLUSTER",
+ "define": "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER",
"side": "client",
"enabled": 0,
"commands": [
@@ -1624,7 +1624,7 @@
"name": "OTA Software Update Requestor",
"code": 42,
"mfgCode": null,
- "define": "OTA_REQUESTOR_CLUSTER",
+ "define": "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER",
"side": "server",
"enabled": 1,
"attributes": [
