diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index 88b4839585eb9b..449ab184170741 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -177,7 +177,7 @@ jobs:
                       src/app/zap-templates/zcl/data-model/silabs/ha-devices.xml \
                       src/app/zap-templates/zcl/data-model/silabs/ha.xml \
                       src/app/zap-templates/zcl/data-model/silabs/lo-devices.xml \
-                      src/app/zap-templates/zcl/data-model/silabs/types.xml \
+                      src/app/zap-templates/zcl/data-model/silabs/types-silabs.xml \
                       src/app/zap-templates/zcl/data-model/silabs/zll-devices.xml \
                       src/app/zap-templates/zcl/data-model/silabs/zll.xml \
                     "
diff --git a/src/app/zap-templates/zcl/data-model/all.xml b/src/app/zap-templates/zcl/data-model/all.xml
index 7a57701dfacaf4..1f83150c6818e7 100644
--- a/src/app/zap-templates/zcl/data-model/all.xml
+++ b/src/app/zap-templates/zcl/data-model/all.xml
@@ -68,7 +68,7 @@
    <xi:include href="silabs/ha-devices.xml" />
    <xi:include href="silabs/ha.xml" />
    <xi:include href="silabs/lo-devices.xml" />
-   <xi:include href="silabs/types.xml" />
+   <xi:include href="silabs/types-silabs.xml" />
    <xi:include href="silabs/zll-devices.xml" />
    <xi:include href="silabs/zll.xml" />
 </all>
diff --git a/src/app/zap-templates/zcl/data-model/silabs/types.xml b/src/app/zap-templates/zcl/data-model/silabs/types-silabs.xml
similarity index 100%
rename from src/app/zap-templates/zcl/data-model/silabs/types.xml
rename to src/app/zap-templates/zcl/data-model/silabs/types-silabs.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 5d2b71245f2d31..d762076f768186 100644
--- a/src/app/zap-templates/zcl/zcl-with-test-extensions.json
+++ b/src/app/zap-templates/zcl/zcl-with-test-extensions.json
@@ -11,6 +11,8 @@
     "_comment": "Ensure access-control-definitions.xml is first in xmlFile array",
     "xmlFile": [
         "access-control-definitions.xml",
+        "chip-types.xml",
+        "types-silabs.xml",
         "access-control-cluster.xml",
         "account-login-cluster.xml",
         "administrator-commissioning-cluster.xml",
@@ -23,7 +25,6 @@
         "actions-cluster.xml",
         "bridged-device-basic-information.xml",
         "chip-ota.xml",
-        "chip-types.xml",
         "channel-cluster.xml",
         "client-monitoring-cluster.xml",
         "clusters-extensions.xml",
@@ -80,7 +81,6 @@
         "ha-devices.xml",
         "ha.xml",
         "lo-devices.xml",
-        "types.xml",
         "zll-devices.xml",
         "zll.xml"
     ],
diff --git a/src/app/zap-templates/zcl/zcl.json b/src/app/zap-templates/zcl/zcl.json
index 2208625738e146..70cee4d22de626 100644
--- a/src/app/zap-templates/zcl/zcl.json
+++ b/src/app/zap-templates/zcl/zcl.json
@@ -6,6 +6,8 @@
     "_comment": "Ensure access-control-definitions.xml is first in xmlFile array",
     "xmlFile": [
         "access-control-definitions.xml",
+        "chip-types.xml",
+        "types-silabs.xml",
         "access-control-cluster.xml",
         "account-login-cluster.xml",
         "administrator-commissioning-cluster.xml",
@@ -18,7 +20,6 @@
         "actions-cluster.xml",
         "bridged-device-basic-information.xml",
         "chip-ota.xml",
-        "chip-types.xml",
         "channel-cluster.xml",
         "client-monitoring-cluster.xml",
         "clusters-extensions.xml",
@@ -74,7 +75,6 @@
         "ha-devices.xml",
         "ha.xml",
         "lo-devices.xml",
-        "types.xml",
         "zll-devices.xml",
         "zll.xml"
     ],
diff --git a/src/darwin/Framework/CHIP/templates/availability.yaml b/src/darwin/Framework/CHIP/templates/availability.yaml
index a6ca4c4f600fbf..95f83dbe711979 100644
--- a/src/darwin/Framework/CHIP/templates/availability.yaml
+++ b/src/darwin/Framework/CHIP/templates/availability.yaml
@@ -6001,7 +6001,7 @@
               - DlOperationSource
               - DlUserStatus
               - DlUserType
-              # The enums after this come from the silabs types.xml, not the
+              # The enums after this come from the silabs types-silabs.xml, not the
               # door lock cluster XML
               #
               # DoorLockUserStatus is not marked deprecated here because the