diff --git a/src/app/zap-templates/zcl/data-model/all.xml b/src/app/zap-templates/zcl/data-model/all.xml
index 3556c0309206e7..4eedb32f3578d9 100644
--- a/src/app/zap-templates/zcl/data-model/all.xml
+++ b/src/app/zap-templates/zcl/data-model/all.xml
@@ -10,8 +10,8 @@
    <xi:include href="chip/ballast-configuration-cluster.xml" />
    <xi:include href="chip/basic-information-cluster.xml" />
    <xi:include href="chip/binding-cluster.xml" />
-   <xi:include href="chip/boolean-sensor-configuration-cluster.xml" />
    <xi:include href="chip/boolean-state-cluster.xml" />
+   <xi:include href="chip/boolean-state-configuration-cluster.xml" />
    <xi:include href="chip/actions-cluster.xml" />
    <xi:include href="chip/bridged-device-basic-information.xml" />
    <xi:include href="chip/chip-ota.xml" />
diff --git a/src/controller/python/chip/clusters/__init__.py b/src/controller/python/chip/clusters/__init__.py
index 1f605fd56d4274..3a6099961c0463 100644
--- a/src/controller/python/chip/clusters/__init__.py
+++ b/src/controller/python/chip/clusters/__init__.py
@@ -25,7 +25,7 @@
 from . import Attribute, CHIPClusters, Command
 from .Objects import (AccessControl, AccountLogin, Actions, ActivatedCarbonFilterMonitoring, AdministratorCommissioning, AirQuality,
                       ApplicationBasic, ApplicationLauncher, AudioOutput, BallastConfiguration, BarrierControl, BasicInformation,
-                      BinaryInputBasic, Binding, BooleanStateConfiguration, BooleanState, BridgedDeviceBasicInformation,
+                      BinaryInputBasic, Binding, BooleanState, BooleanStateConfiguration, BridgedDeviceBasicInformation,
                       CarbonDioxideConcentrationMeasurement, CarbonMonoxideConcentrationMeasurement, Channel, ColorControl,
                       ContentLauncher, Descriptor, DeviceEnergyManagement, DiagnosticLogs, DishwasherAlarm, DishwasherMode,
                       DoorLock, ElectricalMeasurement, EnergyEvse, EthernetNetworkDiagnostics, FanControl, FaultInjection,