diff --git a/examples/tv-app/linux/include/content-launcher/ContentLauncherManager.cpp b/examples/tv-app/linux/include/content-launcher/ContentLauncherManager.cpp
index 5e011c92f..676b4bae4 100644
--- a/examples/tv-app/linux/include/content-launcher/ContentLauncherManager.cpp
+++ b/examples/tv-app/linux/include/content-launcher/ContentLauncherManager.cpp
@@ -107,7 +107,7 @@ static void sendResponse(const char * responseName, ContentLaunchResponse launch
 
 bool emberAfContentLauncherClusterLaunchContentCallback(
     chip::app::CommandHandler * command, const chip::app::ConcreteCommandPath & commandPath, chip::EndpointId endpoint,
-    bool autoplay, unsigned char * data, chip::app::Clusters::ContentLauncher::Commands::LaunchContent::DecodableType & fields)
+    bool autoplay, unsigned char * data, chip::app::Clusters::ContentLauncher::Commands::LaunchContent::DecodableType & commandData)
 {
 
     string dataString(reinterpret_cast<char *>(data));
@@ -120,7 +120,7 @@ bool emberAfContentLauncherClusterLaunchContentCallback(
 bool emberAfContentLauncherClusterLaunchURLCallback(
     chip::app::CommandHandler * command, const chip::app::ConcreteCommandPath & commandPath, chip::EndpointId endpoint,
     unsigned char * contentUrl, unsigned char * displayString,
-    chip::app::Clusters::ContentLauncher::Commands::LaunchURL::DecodableType & fields)
+    chip::app::Clusters::ContentLauncher::Commands::LaunchURL::DecodableType & commandData)
 {
     string contentUrlString(reinterpret_cast<char *>(contentUrl));
     string displayStringString(reinterpret_cast<char *>(displayString));
diff --git a/examples/window-app/common/src/ZclCallbacks.cpp b/examples/window-app/common/src/ZclCallbacks.cpp
index c6aa27764..f5578d59b 100644
--- a/examples/window-app/common/src/ZclCallbacks.cpp
+++ b/examples/window-app/common/src/ZclCallbacks.cpp
@@ -98,7 +98,7 @@ void emberAfPostAttributeChangeCallback(chip::EndpointId endpoint, chip::Cluster
  */
 bool emberAfWindowCoveringClusterStopMotionCallback(chip::app::CommandHandler * commandObj,
                                                     const chip::app::ConcreteCommandPath & commandPath, chip::EndpointId endpoint,
-                                                    Commands::StopMotion::DecodableType & fields)
+                                                    Commands::StopMotion::DecodableType & commandData)
 {
     ChipLogProgress(Zcl, "StopMotion command received");
     WindowApp::Instance().PostEvent(WindowApp::Event(WindowApp::EventId::StopMotion, endpoint));
diff --git a/src/app/ConcreteCommandPath.h b/src/app/ConcreteCommandPath.h
index f254d0b2a..e811fa75d 100644
--- a/src/app/ConcreteCommandPath.h
+++ b/src/app/ConcreteCommandPath.h
@@ -25,8 +25,7 @@ namespace chip {
 namespace app {
 
 /**
- * A representation of a concrete invoke path, with one additional piece of data
- * added: the command id of the spec-defined response command, if there is one.
+ * A representation of a concrete invoke path.
  */
 struct ConcreteCommandPath
 {
@@ -34,14 +33,9 @@ struct ConcreteCommandPath
         mEndpointId(aEndpointId), mClusterId(aClusterId), mCommandId(aCommandId)
     {}
 
-    ConcreteCommandPath(EndpointId aEndpointId, ClusterId aClusterId, CommandId aCommandId, CommandId aResponseId) :
-        mEndpointId(aEndpointId), mClusterId(aClusterId), mCommandId(aCommandId), mResponseCommand(aResponseId)
-    {}
-
     const EndpointId mEndpointId = 0;
     const ClusterId mClusterId   = 0;
     const CommandId mCommandId   = 0;
-    const Optional<CommandId> mResponseCommand;
 };
 } // namespace app
 } // namespace chip
diff --git a/src/app/clusters/account-login-server/account-login-server.cpp b/src/app/clusters/account-login-server/account-login-server.cpp
index 0a3ebfdd1..0a4efad96 100644
--- a/src/app/clusters/account-login-server/account-login-server.cpp
+++ b/src/app/clusters/account-login-server/account-login-server.cpp
@@ -54,7 +54,7 @@ exit:
 
 bool emberAfAccountLoginClusterGetSetupPINCallback(app::CommandHandler * command, const app::ConcreteCommandPath & commandPath,
                                                    EndpointId endpoint, uint8_t * tempAccountIdentifier,
-                                                   Commands::GetSetupPIN::DecodableType & fields)
+                                                   Commands::GetSetupPIN::DecodableType & commandData)
 {
     // TODO: char is not null terminated, verify this code once #7963 gets merged.
     std::string tempAccountIdentifierString(reinterpret_cast<char *>(tempAccountIdentifier));
@@ -65,7 +65,7 @@ bool emberAfAccountLoginClusterGetSetupPINCallback(app::CommandHandler * command
 
 bool emberAfAccountLoginClusterLoginCallback(app::CommandHandler * command, const app::ConcreteCommandPath & commandPath,
                                              EndpointId endpoint, uint8_t * tempAccountIdentifier, uint8_t * tempSetupPin,
-                                             Commands::Login::DecodableType & fields)
+                                             Commands::Login::DecodableType & commandData)
 {
     // TODO: char is not null terminated, verify this code once #7963 gets merged.
     std::string tempAccountIdentifierString(reinterpret_cast<char *>(tempAccountIdentifier));
diff --git a/src/app/clusters/administrator-commissioning-server/administrator-commissioning-server.cpp b/src/app/clusters/administrator-commissioning-server/administrator-commissioning-server.cpp
index a7b17e1fc..5c63bcc78 100644
--- a/src/app/clusters/administrator-commissioning-server/administrator-commissioning-server.cpp
+++ b/src/app/clusters/administrator-commissioning-server/administrator-commissioning-server.cpp
@@ -38,7 +38,7 @@ constexpr uint32_t kMaxCommissionioningTimeoutSeconds = 15 * 60;
 bool emberAfAdministratorCommissioningClusterOpenCommissioningWindowCallback(
     app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath, EndpointId endpoint,
     uint16_t commissioningTimeout, ByteSpan pakeVerifier, uint16_t discriminator, uint32_t iterations, ByteSpan salt,
-    uint16_t passcodeID, Commands::OpenCommissioningWindow::DecodableType & fields)
+    uint16_t passcodeID, Commands::OpenCommissioningWindow::DecodableType & commandData)
 {
     EmberAfStatus status = EMBER_ZCL_STATUS_SUCCESS;
     PASEVerifier verifier;
@@ -75,7 +75,7 @@ exit:
 
 bool emberAfAdministratorCommissioningClusterOpenBasicCommissioningWindowCallback(
     app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath, EndpointId endpoint,
-    uint16_t commissioningTimeout, Commands::OpenBasicCommissioningWindow::DecodableType & fields)
+    uint16_t commissioningTimeout, Commands::OpenBasicCommissioningWindow::DecodableType & commandData)
 {
     EmberAfStatus status = EMBER_ZCL_STATUS_SUCCESS;
     ChipLogProgress(Zcl, "Received command to open basic commissioning window");
@@ -99,7 +99,7 @@ exit:
 bool emberAfAdministratorCommissioningClusterRevokeCommissioningCallback(app::CommandHandler * commandObj,
                                                                          const app::ConcreteCommandPath & commandPath,
                                                                          EndpointId endpoint,
-                                                                         Commands::RevokeCommissioning::DecodableType & fields)
+                                                                         Commands::RevokeCommissioning::DecodableType & commandData)
 {
     ChipLogProgress(Zcl, "Received command to close commissioning window");
     Server::GetInstance().GetCommissioningWindowManager().CloseCommissioningWindow();
diff --git a/src/app/clusters/application-basic-server/application-basic-server.cpp b/src/app/clusters/application-basic-server/application-basic-server.cpp
index 479911029..9ddb015f7 100644
--- a/src/app/clusters/application-basic-server/application-basic-server.cpp
+++ b/src/app/clusters/application-basic-server/application-basic-server.cpp
@@ -37,7 +37,7 @@ bool applicationBasicClusterChangeApplicationStatus(EmberAfApplicationBasicStatu
 bool emberAfApplicationBasicClusterChangeStatusCallback(app::CommandHandler * commandObj,
                                                         const app::ConcreteCommandPath & commandPath, EndpointId endpoint,
                                                         uint8_t newApplicationStatus,
-                                                        Commands::ChangeStatus::DecodableType & fields)
+                                                        Commands::ChangeStatus::DecodableType & commandData)
 {
     bool success = applicationBasicClusterChangeApplicationStatus(static_cast<EmberAfApplicationBasicStatus>(newApplicationStatus),
                                                                   emberAfCurrentEndpoint());
diff --git a/src/app/clusters/application-launcher-server/application-launcher-server.cpp b/src/app/clusters/application-launcher-server/application-launcher-server.cpp
index c08b72f26..a9cd0ed15 100644
--- a/src/app/clusters/application-launcher-server/application-launcher-server.cpp
+++ b/src/app/clusters/application-launcher-server/application-launcher-server.cpp
@@ -39,7 +39,7 @@ ApplicationLauncherResponse applicationLauncherClusterLaunchApp(::ApplicationLau
 
 bool emberAfApplicationLauncherClusterLaunchAppCallback(app::CommandHandler * commandObj,
                                                         const app::ConcreteCommandPath & commandPath, EndpointId endpoint,
-                                                        uint8_t *, uint8_t *, Commands::LaunchApp::DecodableType & fields)
+                                                        uint8_t *, uint8_t *, Commands::LaunchApp::DecodableType & commandData)
 {
     EmberAfStatus status = EMBER_ZCL_STATUS_SUCCESS;
     emberAfSendImmediateDefaultResponse(status);
@@ -75,7 +75,7 @@ exit:
 bool emberAfApplicationLauncherClusterLaunchAppCallback(app::CommandHandler * command, const app::ConcreteCommandPath & commandPath,
                                                         EndpointId endpoint, uint8_t * requestData,
                                                         uint16_t requestApplicationCatalogVendorId, uint8_t * requestApplicationId,
-                                                        Commands::LaunchApp::DecodableType & fields)
+                                                        Commands::LaunchApp::DecodableType & commandData)
 {
     ::ApplicationLauncherApp application = getApplicationFromCommand(requestApplicationCatalogVendorId, requestApplicationId);
     // TODO: Char is not null terminated, verify this code once #7963 gets merged.
diff --git a/src/app/clusters/audio-output-server/audio-output-server.cpp b/src/app/clusters/audio-output-server/audio-output-server.cpp
index 78b497d3b..6286a0c80 100644
--- a/src/app/clusters/audio-output-server/audio-output-server.cpp
+++ b/src/app/clusters/audio-output-server/audio-output-server.cpp
@@ -35,7 +35,7 @@ bool audioOutputClusterRenameOutput(uint8_t index, uint8_t * name);
 
 bool emberAfAudioOutputClusterRenameOutputCallback(app::CommandHandler * command, const app::ConcreteCommandPath & commandPath,
                                                    EndpointId endpoint, uint8_t index, uint8_t * name,
-                                                   Commands::RenameOutput::DecodableType & fields)
+                                                   Commands::RenameOutput::DecodableType & commandData)
 {
     bool success         = audioOutputClusterRenameOutput(index, name);
     EmberAfStatus status = success ? EMBER_ZCL_STATUS_SUCCESS : EMBER_ZCL_STATUS_FAILURE;
@@ -45,7 +45,7 @@ bool emberAfAudioOutputClusterRenameOutputCallback(app::CommandHandler * command
 
 bool emberAfAudioOutputClusterSelectOutputCallback(app::CommandHandler * command, const app::ConcreteCommandPath & commandPath,
                                                    EndpointId endpoint, uint8_t index,
-                                                   Commands::SelectOutput::DecodableType & fields)
+                                                   Commands::SelectOutput::DecodableType & commandData)
 {
     bool success         = audioOutputClusterSelectOutput(index);
     EmberAfStatus status = success ? EMBER_ZCL_STATUS_SUCCESS : EMBER_ZCL_STATUS_FAILURE;
diff --git a/src/app/clusters/barrier-control-server/barrier-control-server.cpp b/src/app/clusters/barrier-control-server/barrier-control-server.cpp
index 832eba1c2..1aac71ed8 100644
--- a/src/app/clusters/barrier-control-server/barrier-control-server.cpp
+++ b/src/app/clusters/barrier-control-server/barrier-control-server.cpp
@@ -302,7 +302,7 @@ static void sendDefaultResponse(EmberAfStatus status)
 bool emberAfBarrierControlClusterBarrierControlGoToPercentCallback(app::CommandHandler * commandObj,
                                                                    const app::ConcreteCommandPath & commandPath,
                                                                    EndpointId aEndpoint, uint8_t percentOpen,
-                                                                   Commands::BarrierControlGoToPercent::DecodableType & fields)
+                                                                   Commands::BarrierControlGoToPercent::DecodableType & commandData)
 {
     EndpointId endpoint  = emberAfCurrentCommand()->apsFrame->destinationEndpoint;
     EmberAfStatus status = EMBER_ZCL_STATUS_SUCCESS;
@@ -346,7 +346,7 @@ bool emberAfBarrierControlClusterBarrierControlGoToPercentCallback(app::CommandH
 
 bool emberAfBarrierControlClusterBarrierControlStopCallback(app::CommandHandler * commandObj,
                                                             const app::ConcreteCommandPath & commandPath, EndpointId aEndpoint,
-                                                            Commands::BarrierControlStop::DecodableType & fields)
+                                                            Commands::BarrierControlStop::DecodableType & commandData)
 {
     EndpointId endpoint = emberAfCurrentCommand()->apsFrame->destinationEndpoint;
     emberAfDeactivateServerTick(endpoint, BarrierControl::Id);
diff --git a/src/app/clusters/bindings/bindings.cpp b/src/app/clusters/bindings/bindings.cpp
index 13c9fb08c..6686f0b80 100644
--- a/src/app/clusters/bindings/bindings.cpp
+++ b/src/app/clusters/bindings/bindings.cpp
@@ -93,7 +93,7 @@ EmberStatus getUnusedBindingIndex(uint8_t * bindingIndex)
 
 bool emberAfBindingClusterBindCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath,
                                        EndpointId endpoint, NodeId nodeId, GroupId groupId, EndpointId endpointId,
-                                       ClusterId clusterId, Commands::Bind::DecodableType & fields)
+                                       ClusterId clusterId, Commands::Bind::DecodableType & commandData)
 {
     ChipLogDetail(Zcl, "RX: BindCallback");
 
@@ -124,7 +124,7 @@ bool emberAfBindingClusterBindCallback(app::CommandHandler * commandObj, const a
 
 bool emberAfBindingClusterUnbindCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath,
                                          EndpointId endpoint, NodeId nodeId, GroupId groupId, EndpointId endpointId,
-                                         ClusterId clusterId, Commands::Unbind::DecodableType & fields)
+                                         ClusterId clusterId, Commands::Unbind::DecodableType & commandData)
 {
     ChipLogDetail(Zcl, "RX: UnbindCallback");
 
diff --git a/src/app/clusters/color-control-server/color-control-server.cpp b/src/app/clusters/color-control-server/color-control-server.cpp
index 115c046f1..d828aab5a 100644
--- a/src/app/clusters/color-control-server/color-control-server.cpp
+++ b/src/app/clusters/color-control-server/color-control-server.cpp
@@ -2289,7 +2289,7 @@ void emberAfPluginColorControlServerStopTransition(void)
 
 bool emberAfColorControlClusterMoveHueCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath,
                                                EndpointId endpoint, uint8_t moveMode, uint8_t rate, uint8_t optionsMask,
-                                               uint8_t optionsOverride, Commands::MoveHue::DecodableType & fields)
+                                               uint8_t optionsOverride, Commands::MoveHue::DecodableType & commandData)
 {
     return ColorControlServer::Instance().moveHueCommand(moveMode, static_cast<uint16_t>(rate), optionsMask, optionsOverride,
                                                          false);
@@ -2298,7 +2298,7 @@ bool emberAfColorControlClusterMoveHueCallback(app::CommandHandler * commandObj,
 bool emberAfColorControlClusterMoveSaturationCallback(app::CommandHandler * commandObj,
                                                       const app::ConcreteCommandPath & commandPath, EndpointId aEndpoint,
                                                       uint8_t moveMode, uint8_t rate, uint8_t optionsMask, uint8_t optionsOverride,
-                                                      Commands::MoveSaturation::DecodableType & fields)
+                                                      Commands::MoveSaturation::DecodableType & commandData)
 {
     return ColorControlServer::Instance().moveSaturationCommand(moveMode, rate, optionsMask, optionsOverride);
 }
@@ -2306,7 +2306,7 @@ bool emberAfColorControlClusterMoveSaturationCallback(app::CommandHandler * comm
 bool emberAfColorControlClusterMoveToHueCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath,
                                                  EndpointId endpoint, uint8_t hue, uint8_t hueMoveMode, uint16_t transitionTime,
                                                  uint8_t optionsMask, uint8_t optionsOverride,
-                                                 Commands::MoveToHue::DecodableType & fields)
+                                                 Commands::MoveToHue::DecodableType & commandData)
 {
     return ColorControlServer::Instance().moveToHueCommand(static_cast<uint16_t>(hue), hueMoveMode, transitionTime, optionsMask,
                                                            optionsOverride, false);
@@ -2315,7 +2315,8 @@ bool emberAfColorControlClusterMoveToHueCallback(app::CommandHandler * commandOb
 bool emberAfColorControlClusterMoveToSaturationCallback(app::CommandHandler * commandObj,
                                                         const app::ConcreteCommandPath & commandPath, EndpointId aEndpoint,
                                                         uint8_t saturation, uint16_t transitionTime, uint8_t optionsMask,
-                                                        uint8_t optionsOverride, Commands::MoveToSaturation::DecodableType & fields)
+                                                        uint8_t optionsOverride,
+                                                        Commands::MoveToSaturation::DecodableType & commandData)
 {
     return ColorControlServer::Instance().moveToSaturationCommand(saturation, transitionTime, optionsMask, optionsOverride);
 }
@@ -2324,7 +2325,7 @@ bool emberAfColorControlClusterMoveToHueAndSaturationCallback(app::CommandHandle
                                                               const app::ConcreteCommandPath & commandPath, EndpointId endpoint,
                                                               uint8_t hue, uint8_t saturation, uint16_t transitionTime,
                                                               uint8_t optionsMask, uint8_t optionsOverride,
-                                                              Commands::MoveToHueAndSaturation::DecodableType & fields)
+                                                              Commands::MoveToHueAndSaturation::DecodableType & commandData)
 {
     return ColorControlServer::Instance().moveToHueAndSaturationCommand(static_cast<uint16_t>(hue), saturation, transitionTime,
                                                                         optionsMask, optionsOverride, false);
@@ -2333,7 +2334,7 @@ bool emberAfColorControlClusterMoveToHueAndSaturationCallback(app::CommandHandle
 bool emberAfColorControlClusterStepHueCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath,
                                                EndpointId endpoint, uint8_t stepMode, uint8_t stepSize, uint8_t transitionTime,
                                                uint8_t optionsMask, uint8_t optionsOverride,
-                                               Commands::StepHue::DecodableType & fields)
+                                               Commands::StepHue::DecodableType & commandData)
 {
     return ColorControlServer::Instance().stepHueCommand(
         stepMode, static_cast<uint16_t>(stepSize), static_cast<uint16_t>(transitionTime), optionsMask, optionsOverride, false);
@@ -2343,7 +2344,7 @@ bool emberAfColorControlClusterStepSaturationCallback(app::CommandHandler * comm
                                                       const app::ConcreteCommandPath & commandPath, EndpointId aEndpoint,
                                                       uint8_t stepMode, uint8_t stepSize, uint8_t transitionTime,
                                                       uint8_t optionsMask, uint8_t optionsOverride,
-                                                      Commands::StepSaturation::DecodableType & fields)
+                                                      Commands::StepSaturation::DecodableType & commandData)
 {
     return ColorControlServer::Instance().stepSaturationCommand(stepMode, stepSize, transitionTime, optionsMask, optionsOverride);
 }
@@ -2351,7 +2352,8 @@ bool emberAfColorControlClusterStepSaturationCallback(app::CommandHandler * comm
 bool emberAfColorControlClusterEnhancedMoveHueCallback(app::CommandHandler * commandObj,
                                                        const app::ConcreteCommandPath & commandPath, EndpointId endpoint,
                                                        uint8_t moveMode, uint16_t rate, uint8_t optionsMask,
-                                                       uint8_t optionsOverride, Commands::EnhancedMoveHue::DecodableType & fields)
+                                                       uint8_t optionsOverride,
+                                                       Commands::EnhancedMoveHue::DecodableType & commandData)
 {
     return ColorControlServer::Instance().moveHueCommand(moveMode, rate, optionsMask, optionsOverride, true);
 }
@@ -2360,7 +2362,7 @@ bool emberAfColorControlClusterEnhancedMoveToHueCallback(app::CommandHandler * c
                                                          const app::ConcreteCommandPath & commandPath, EndpointId endpoint,
                                                          uint16_t enhancedHue, uint8_t direction, uint16_t transitionTime,
                                                          uint8_t optionsMask, uint8_t optionsOverride,
-                                                         Commands::EnhancedMoveToHue::DecodableType & fields)
+                                                         Commands::EnhancedMoveToHue::DecodableType & commandData)
 {
     return ColorControlServer::Instance().moveToHueCommand(enhancedHue, direction, transitionTime, optionsMask, optionsOverride,
                                                            true);
@@ -2369,7 +2371,7 @@ bool emberAfColorControlClusterEnhancedMoveToHueCallback(app::CommandHandler * c
 bool emberAfColorControlClusterEnhancedMoveToHueAndSaturationCallback(
     app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath, EndpointId endpoint, uint16_t enhancedHue,
     uint8_t saturation, uint16_t transitionTime, uint8_t optionsMask, uint8_t optionsOverride,
-    Commands::EnhancedMoveToHueAndSaturation::DecodableType & fields)
+    Commands::EnhancedMoveToHueAndSaturation::DecodableType & commandData)
 {
     return ColorControlServer::Instance().moveToHueAndSaturationCommand(enhancedHue, saturation, transitionTime, optionsMask,
                                                                         optionsOverride, true);
@@ -2379,7 +2381,7 @@ bool emberAfColorControlClusterEnhancedStepHueCallback(app::CommandHandler * com
                                                        const app::ConcreteCommandPath & commandPath, EndpointId endpoint,
                                                        uint8_t stepMode, uint16_t stepSize, uint16_t transitionTime,
                                                        uint8_t optionsMask, uint8_t optionsOverride,
-                                                       Commands::EnhancedStepHue::DecodableType & fields)
+                                                       Commands::EnhancedStepHue::DecodableType & commandData)
 {
     return ColorControlServer::Instance().stepHueCommand(stepMode, stepSize, transitionTime, optionsMask, optionsOverride, true);
 }
@@ -2387,7 +2389,7 @@ bool emberAfColorControlClusterEnhancedStepHueCallback(app::CommandHandler * com
 bool emberAfColorControlClusterColorLoopSetCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath,
                                                     EndpointId aEndpoint, uint8_t updateFlags, uint8_t action, uint8_t direction,
                                                     uint16_t time, uint16_t startHue, uint8_t optionsMask, uint8_t optionsOverride,
-                                                    Commands::ColorLoopSet::DecodableType & fields)
+                                                    Commands::ColorLoopSet::DecodableType & commandData)
 {
     return ColorControlServer::Instance().colorLoopCommand(updateFlags, action, direction, time, startHue, optionsMask,
                                                            optionsOverride);
@@ -2400,14 +2402,14 @@ bool emberAfColorControlClusterColorLoopSetCallback(app::CommandHandler * comman
 bool emberAfColorControlClusterMoveToColorCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath,
                                                    EndpointId aEndpoint, uint16_t colorX, uint16_t colorY, uint16_t transitionTime,
                                                    uint8_t optionsMask, uint8_t optionsOverride,
-                                                   Commands::MoveToColor::DecodableType & fields)
+                                                   Commands::MoveToColor::DecodableType & commandData)
 {
     return ColorControlServer::Instance().moveToColorCommand(colorX, colorY, transitionTime, optionsMask, optionsOverride);
 }
 
 bool emberAfColorControlClusterMoveColorCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath,
                                                  EndpointId aEndpoint, int16_t rateX, int16_t rateY, uint8_t optionsMask,
-                                                 uint8_t optionsOverride, Commands::MoveColor::DecodableType & fields)
+                                                 uint8_t optionsOverride, Commands::MoveColor::DecodableType & commandData)
 {
     return ColorControlServer::Instance().moveColorCommand(rateX, rateY, optionsMask, optionsOverride);
 }
@@ -2415,7 +2417,7 @@ bool emberAfColorControlClusterMoveColorCallback(app::CommandHandler * commandOb
 bool emberAfColorControlClusterStepColorCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath,
                                                  EndpointId aEndpoint, int16_t stepX, int16_t stepY, uint16_t transitionTime,
                                                  uint8_t optionsMask, uint8_t optionsOverride,
-                                                 Commands::StepColor::DecodableType & fields)
+                                                 Commands::StepColor::DecodableType & commandData)
 {
     return ColorControlServer::Instance().stepColorCommand(stepX, stepY, transitionTime, optionsMask, optionsOverride);
 }
@@ -2428,7 +2430,7 @@ bool emberAfColorControlClusterMoveToColorTemperatureCallback(app::CommandHandle
                                                               const app::ConcreteCommandPath & commandPath, EndpointId aEndpoint,
                                                               uint16_t colorTemperature, uint16_t transitionTime,
                                                               uint8_t optionsMask, uint8_t optionsOverride,
-                                                              Commands::MoveToColorTemperature::DecodableType & fields)
+                                                              Commands::MoveToColorTemperature::DecodableType & commandData)
 {
     return ColorControlServer::Instance().moveToColorTempCommand(colorTemperature, transitionTime, optionsMask, optionsOverride);
 }
@@ -2438,7 +2440,7 @@ bool emberAfColorControlClusterMoveColorTemperatureCallback(app::CommandHandler
                                                             uint8_t moveMode, uint16_t rate, uint16_t colorTemperatureMinimum,
                                                             uint16_t colorTemperatureMaximum, uint8_t optionsMask,
                                                             uint8_t optionsOverride,
-                                                            Commands::MoveColorTemperature::DecodableType & fields)
+                                                            Commands::MoveColorTemperature::DecodableType & commandData)
 {
     return ColorControlServer::Instance().moveColorTempCommand(moveMode, rate, colorTemperatureMinimum, colorTemperatureMaximum,
                                                                optionsMask, optionsOverride);
@@ -2449,7 +2451,7 @@ bool emberAfColorControlClusterStepColorTemperatureCallback(app::CommandHandler
                                                             uint8_t stepMode, uint16_t stepSize, uint16_t transitionTime,
                                                             uint16_t colorTemperatureMinimum, uint16_t colorTemperatureMaximum,
                                                             uint8_t optionsMask, uint8_t optionsOverride,
-                                                            Commands::StepColorTemperature::DecodableType & fields)
+                                                            Commands::StepColorTemperature::DecodableType & commandData)
 {
     return ColorControlServer::Instance().stepColorTempCommand(stepMode, stepSize, transitionTime, colorTemperatureMinimum,
                                                                colorTemperatureMaximum, optionsMask, optionsOverride);
@@ -2464,7 +2466,7 @@ void emberAfPluginLevelControlCoupledColorTempChangeCallback(EndpointId endpoint
 
 bool emberAfColorControlClusterStopMoveStepCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath,
                                                     EndpointId aEndpoint, uint8_t optionsMask, uint8_t optionsOverride,
-                                                    Commands::StopMoveStep::DecodableType & fields)
+                                                    Commands::StopMoveStep::DecodableType & commandData)
 {
     return ColorControlServer::Instance().stopMoveStepCommand(optionsMask, optionsOverride);
 }
diff --git a/src/app/clusters/diagnostic-logs-server/diagnostic-logs-server.cpp b/src/app/clusters/diagnostic-logs-server/diagnostic-logs-server.cpp
index bf8fddf18..c7c33b795 100644
--- a/src/app/clusters/diagnostic-logs-server/diagnostic-logs-server.cpp
+++ b/src/app/clusters/diagnostic-logs-server/diagnostic-logs-server.cpp
@@ -27,7 +27,7 @@ bool emberAfDiagnosticLogsClusterRetrieveLogsRequestCallback(app::CommandHandler
                                                              const app::ConcreteCommandPath & commandPath, EndpointId endpoint,
                                                              uint8_t intent, uint8_t requestedProtocol,
                                                              ByteSpan transferFileDesignator,
-                                                             Commands::RetrieveLogsRequest::DecodableType & fields)
+                                                             Commands::RetrieveLogsRequest::DecodableType & commandData)
 {
     EmberAfStatus status = EMBER_ZCL_STATUS_SUCCESS;
     emberAfSendImmediateDefaultResponse(status);
diff --git a/src/app/clusters/door-lock-server/door-lock-server-logging.cpp b/src/app/clusters/door-lock-server/door-lock-server-logging.cpp
index feac4b171..c428655f1 100644
--- a/src/app/clusters/door-lock-server/door-lock-server-logging.cpp
+++ b/src/app/clusters/door-lock-server/door-lock-server-logging.cpp
@@ -122,7 +122,7 @@ bool emberAfPluginDoorLockServerGetLogEntry(uint16_t * entryId, EmberAfPluginDoo
 
 bool emberAfDoorLockClusterGetLogRecordCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath,
                                                 EndpointId endpoint, uint16_t entryId,
-                                                Commands::GetLogRecord::DecodableType & fields)
+                                                Commands::GetLogRecord::DecodableType & commandData)
 {
     EmberStatus status;
     EmberAfPluginDoorLockServerLogEntry entry;
diff --git a/src/app/clusters/door-lock-server/door-lock-server-schedule.cpp b/src/app/clusters/door-lock-server/door-lock-server-schedule.cpp
index 085938891..172b3651f 100644
--- a/src/app/clusters/door-lock-server/door-lock-server-schedule.cpp
+++ b/src/app/clusters/door-lock-server/door-lock-server-schedule.cpp
@@ -127,7 +127,7 @@ bool emberAfDoorLockClusterSetWeekdayScheduleCallback(app::CommandHandler * comm
                                                       const app::ConcreteCommandPath & commandPath, EndpointId endpoint,
                                                       uint8_t scheduleId, uint16_t userId, uint8_t daysMask, uint8_t startHour,
                                                       uint8_t startMinute, uint8_t stopHour, uint8_t stopMinute,
-                                                      Commands::SetWeekdaySchedule::DecodableType & fields)
+                                                      Commands::SetWeekdaySchedule::DecodableType & commandData)
 {
     uint8_t status                  = 0x00;
     uint8_t userPin                 = 0x00;
@@ -186,7 +186,7 @@ exit:
 bool emberAfDoorLockClusterGetWeekdayScheduleCallback(app::CommandHandler * commandObj,
                                                       const app::ConcreteCommandPath & commandPath, EndpointId endpoint,
                                                       uint8_t scheduleId, uint16_t userId,
-                                                      Commands::GetWeekdaySchedule::DecodableType & fields)
+                                                      Commands::GetWeekdaySchedule::DecodableType & commandData)
 {
     EmberAfStatus zclStatus =
         ((scheduleId > EMBER_AF_PLUGIN_DOOR_LOCK_SERVER_WEEKDAY_SCHEDULE_TABLE_SIZE) ? EMBER_ZCL_STATUS_INVALID_FIELD
@@ -228,7 +228,7 @@ exit:
 bool emberAfDoorLockClusterClearWeekdayScheduleCallback(app::CommandHandler * commandObj,
                                                         const app::ConcreteCommandPath & commandPath, EndpointId endpoint,
                                                         uint8_t scheduleId, uint16_t userId,
-                                                        Commands::ClearWeekdaySchedule::DecodableType & fields)
+                                                        Commands::ClearWeekdaySchedule::DecodableType & commandData)
 {
     EmberAfStatus zclStatus =
         ((scheduleId > EMBER_AF_PLUGIN_DOOR_LOCK_SERVER_WEEKDAY_SCHEDULE_TABLE_SIZE) ? EMBER_ZCL_STATUS_INVALID_FIELD
@@ -261,7 +261,8 @@ exit:
 bool emberAfDoorLockClusterSetYeardayScheduleCallback(app::CommandHandler * commandObj,
                                                       const app::ConcreteCommandPath & commandPath, EndpointId endpoint,
                                                       uint8_t scheduleId, uint16_t userId, uint32_t localStartTime,
-                                                      uint32_t localEndTime, Commands::SetYeardaySchedule::DecodableType & fields)
+                                                      uint32_t localEndTime,
+                                                      Commands::SetYeardaySchedule::DecodableType & commandData)
 {
     uint8_t status;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -299,7 +300,7 @@ exit:
 bool emberAfDoorLockClusterGetYeardayScheduleCallback(app::CommandHandler * commandObj,
                                                       const app::ConcreteCommandPath & commandPath, EndpointId endpoint,
                                                       uint8_t scheduleId, uint16_t userId,
-                                                      Commands::GetYeardaySchedule::DecodableType & fields)
+                                                      Commands::GetYeardaySchedule::DecodableType & commandData)
 {
     EmberAfPluginDoorLockServerYeardayScheduleEntry * entry = &yeardayScheduleTable[0];
     EmberAfStatus zclStatus;
@@ -347,7 +348,7 @@ exit:
 bool emberAfDoorLockClusterClearYeardayScheduleCallback(app::CommandHandler * commandObj,
                                                         const app::ConcreteCommandPath & commandPath, EndpointId endpoint,
                                                         uint8_t scheduleId, uint16_t userId,
-                                                        Commands::ClearYeardaySchedule::DecodableType & fields)
+                                                        Commands::ClearYeardaySchedule::DecodableType & commandData)
 {
     uint8_t status;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -384,7 +385,7 @@ bool emberAfDoorLockClusterSetHolidayScheduleCallback(app::CommandHandler * comm
                                                       const app::ConcreteCommandPath & commandPath, EndpointId endpoint,
                                                       uint8_t holidayScheduleId, uint32_t localStartTime, uint32_t localEndTime,
                                                       uint8_t operatingModeDuringHoliday,
-                                                      Commands::SetHolidaySchedule::DecodableType & fields)
+                                                      Commands::SetHolidaySchedule::DecodableType & commandData)
 {
     uint8_t status;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -424,7 +425,7 @@ exit:
 bool emberAfDoorLockClusterGetHolidayScheduleCallback(app::CommandHandler * commandObj,
                                                       const app::ConcreteCommandPath & commandPath, EndpointId endpoint,
                                                       uint8_t holidayScheduleId,
-                                                      Commands::GetHolidaySchedule::DecodableType & fields)
+                                                      Commands::GetHolidaySchedule::DecodableType & commandData)
 {
     EmberAfPluginDoorLockServerHolidayScheduleEntry * entry = &holidayScheduleTable[0];
     EmberAfStatus zclStatus;
@@ -471,7 +472,7 @@ exit:
 bool emberAfDoorLockClusterClearHolidayScheduleCallback(app::CommandHandler * commandObj,
                                                         const app::ConcreteCommandPath & commandPath, EndpointId endpoint,
                                                         uint8_t holidayScheduleId,
-                                                        Commands::ClearHolidaySchedule::DecodableType & fields)
+                                                        Commands::ClearHolidaySchedule::DecodableType & commandData)
 {
     uint8_t status;
     CHIP_ERROR err = CHIP_NO_ERROR;
diff --git a/src/app/clusters/door-lock-server/door-lock-server-user.cpp b/src/app/clusters/door-lock-server/door-lock-server-user.cpp
index 510fb59a4..efd13a601 100644
--- a/src/app/clusters/door-lock-server/door-lock-server-user.cpp
+++ b/src/app/clusters/door-lock-server/door-lock-server-user.cpp
@@ -224,7 +224,8 @@ static uint8_t clearUserPinOrRfid(uint16_t userId, EmberAfPluginDoorLockServerUs
 }
 
 bool emberAfDoorLockClusterGetUserTypeCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath,
-                                               EndpointId endpoint, uint16_t userId, Commands::GetUserType::DecodableType & fields)
+                                               EndpointId endpoint, uint16_t userId,
+                                               Commands::GetUserType::DecodableType & commandData)
 {
     CHIP_ERROR err = CHIP_NO_ERROR;
     if (emAfPluginDoorLockServerCheckForSufficientSpace(userId, EMBER_AF_PLUGIN_DOOR_LOCK_SERVER_PIN_USER_TABLE_SIZE))
@@ -252,7 +253,7 @@ exit:
 
 bool emberAfDoorLockClusterSetUserTypeCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath,
                                                EndpointId endpoint, uint16_t userId, uint8_t userType,
-                                               Commands::SetUserType::DecodableType & fields)
+                                               Commands::SetUserType::DecodableType & commandData)
 {
     CHIP_ERROR err = CHIP_NO_ERROR;
     // TODO: Need to validate userType.  https://github.com/project-chip/connectedhomeip/issues/3580
@@ -295,7 +296,7 @@ bool emAfPluginDoorLockServerSetPinUserType(uint16_t userId, EmberAfDoorLockUser
 
 bool emberAfDoorLockClusterSetPinCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath,
                                           EndpointId endpoint, uint16_t userId, uint8_t userStatus, uint8_t userType, uint8_t * pin,
-                                          Commands::SetPin::DecodableType & fields)
+                                          Commands::SetPin::DecodableType & commandData)
 {
     CHIP_ERROR err = CHIP_NO_ERROR;
     // send response
@@ -347,7 +348,7 @@ static bool getSendPinOverTheAir(void)
 }
 
 bool emberAfDoorLockClusterGetPinCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath,
-                                          EndpointId endpoint, uint16_t userId, Commands::GetPin::DecodableType & fields)
+                                          EndpointId endpoint, uint16_t userId, Commands::GetPin::DecodableType & commandData)
 {
     EmberAfPluginDoorLockServerUser user;
     EmberStatus status = EMBER_SUCCESS;
@@ -392,7 +393,7 @@ exit:
 }
 
 bool emberAfDoorLockClusterClearPinCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath,
-                                            EndpointId endpoint, uint16_t userId, Commands::ClearPin::DecodableType & fields)
+                                            EndpointId endpoint, uint16_t userId, Commands::ClearPin::DecodableType & commandData)
 {
     CHIP_ERROR err = CHIP_NO_ERROR;
     uint8_t status = clearUserPinOrRfid(userId, pinUserTable, EMBER_AF_PLUGIN_DOOR_LOCK_SERVER_PIN_USER_TABLE_SIZE);
@@ -435,7 +436,7 @@ exit:
 }
 
 bool emberAfDoorLockClusterClearAllPinsCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath,
-                                                EndpointId endpoint, Commands::ClearAllPins::DecodableType & fields)
+                                                EndpointId endpoint, Commands::ClearAllPins::DecodableType & commandData)
 {
     uint8_t i;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -467,7 +468,7 @@ exit:
 
 bool emberAfDoorLockClusterSetRfidCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath,
                                            EndpointId endpoint, uint16_t userId, uint8_t userStatus, uint8_t userType,
-                                           uint8_t * rfid, Commands::SetRfid::DecodableType & fields)
+                                           uint8_t * rfid, Commands::SetRfid::DecodableType & commandData)
 {
     CHIP_ERROR err = CHIP_NO_ERROR;
     uint8_t status =
@@ -491,7 +492,7 @@ exit:
 }
 
 bool emberAfDoorLockClusterGetRfidCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath,
-                                           EndpointId endpoint, uint16_t userId, Commands::GetRfid::DecodableType & fields)
+                                           EndpointId endpoint, uint16_t userId, Commands::GetRfid::DecodableType & commandData)
 {
     EmberAfPluginDoorLockServerUser user;
     EmberStatus status = EMBER_SUCCESS;
@@ -529,7 +530,7 @@ exit:
 }
 
 bool emberAfDoorLockClusterClearRfidCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath,
-                                             EndpointId endpoint, uint16_t userId, Commands::ClearRfid::DecodableType & fields)
+                                             EndpointId endpoint, uint16_t userId, Commands::ClearRfid::DecodableType & commandData)
 {
     CHIP_ERROR err = CHIP_NO_ERROR;
     uint8_t status = clearUserPinOrRfid(userId, rfidUserTable, EMBER_AF_PLUGIN_DOOR_LOCK_SERVER_RFID_USER_TABLE_SIZE);
@@ -552,7 +553,7 @@ exit:
 }
 
 bool emberAfDoorLockClusterClearAllRfidsCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath,
-                                                 EndpointId endpoint, Commands::ClearAllRfids::DecodableType & fields)
+                                                 EndpointId endpoint, Commands::ClearAllRfids::DecodableType & commandData)
 {
     CHIP_ERROR err = CHIP_NO_ERROR;
     for (uint8_t i = 0; i < EMBER_AF_PLUGIN_DOOR_LOCK_SERVER_RFID_USER_TABLE_SIZE; i++)
@@ -634,7 +635,7 @@ static bool verifyPin(uint8_t * pin, uint8_t * userId)
 }
 
 bool emberAfDoorLockClusterLockDoorCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath,
-                                            EndpointId endpoint, uint8_t * PIN, Commands::LockDoor::DecodableType & fields)
+                                            EndpointId endpoint, uint8_t * PIN, Commands::LockDoor::DecodableType & commandData)
 {
     uint8_t userId                = 0;
     bool pinVerified              = verifyPin(PIN, &userId);
@@ -699,7 +700,7 @@ exit:
 }
 
 bool emberAfDoorLockClusterUnlockDoorCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath,
-                                              EndpointId endpoint, uint8_t * pin, Commands::UnlockDoor::DecodableType & fields)
+                                              EndpointId endpoint, uint8_t * pin, Commands::UnlockDoor::DecodableType & commandData)
 {
     uint8_t userId                = 0;
     bool pinVerified              = verifyPin(pin, &userId);
@@ -890,7 +891,7 @@ void emberAfDoorLockClusterServerAttributeChangedCallback(EndpointId endpoint, A
 
 bool emberAfDoorLockClusterUnlockWithTimeoutCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath,
                                                      EndpointId endpoint, uint16_t timeoutS, uint8_t * pin,
-                                                     Commands::UnlockWithTimeout::DecodableType & fields)
+                                                     Commands::UnlockWithTimeout::DecodableType & commandData)
 {
     uint8_t userId;
     uint8_t status;
diff --git a/src/app/clusters/ethernet_network_diagnostics_server/ethernet_network_diagnostics_server.cpp b/src/app/clusters/ethernet_network_diagnostics_server/ethernet_network_diagnostics_server.cpp
index 3345b3196..4df066bf9 100644
--- a/src/app/clusters/ethernet_network_diagnostics_server/ethernet_network_diagnostics_server.cpp
+++ b/src/app/clusters/ethernet_network_diagnostics_server/ethernet_network_diagnostics_server.cpp
@@ -105,7 +105,7 @@ CHIP_ERROR EthernetDiagosticsAttrAccess::ReadIfSupported(CHIP_ERROR (Connectivit
 
 bool emberAfEthernetNetworkDiagnosticsClusterResetCountsCallback(app::CommandHandler * commandObj,
                                                                  const app::ConcreteCommandPath & commandPath, EndpointId endpoint,
-                                                                 Commands::ResetCounts::DecodableType & fields)
+                                                                 Commands::ResetCounts::DecodableType & commandData)
 {
     EmberAfStatus status = EMBER_ZCL_STATUS_SUCCESS;
 
diff --git a/src/app/clusters/general-commissioning-server/general-commissioning-server.cpp b/src/app/clusters/general-commissioning-server/general-commissioning-server.cpp
index 7e161651f..5d2cfeeeb 100644
--- a/src/app/clusters/general-commissioning-server/general-commissioning-server.cpp
+++ b/src/app/clusters/general-commissioning-server/general-commissioning-server.cpp
@@ -35,7 +35,7 @@ using namespace chip::app::Clusters::GeneralCommissioning;
 bool emberAfGeneralCommissioningClusterArmFailSafeCallback(app::CommandHandler * commandObj,
                                                            const app::ConcreteCommandPath & commandPath, EndpointId endpoint,
                                                            uint16_t expiryLengthSeconds, uint64_t breadcrumb, uint32_t timeoutMs,
-                                                           Commands::ArmFailSafe::DecodableType & fields)
+                                                           Commands::ArmFailSafe::DecodableType & commandData)
 {
     CHIP_ERROR err = DeviceLayer::Internal::DeviceControlServer::DeviceControlSvr().ArmFailSafe(expiryLengthSeconds);
     emberAfSendImmediateDefaultResponse(err == CHIP_NO_ERROR ? EMBER_ZCL_STATUS_SUCCESS : EMBER_ZCL_STATUS_FAILURE);
@@ -46,7 +46,7 @@ bool emberAfGeneralCommissioningClusterArmFailSafeCallback(app::CommandHandler *
 bool emberAfGeneralCommissioningClusterCommissioningCompleteCallback(app::CommandHandler * commandObj,
                                                                      const app::ConcreteCommandPath & commandPath,
                                                                      EndpointId endpoint,
-                                                                     Commands::CommissioningComplete::DecodableType & fields)
+                                                                     Commands::CommissioningComplete::DecodableType & commandData)
 {
     CHIP_ERROR err = DeviceLayer::Internal::DeviceControlServer::DeviceControlSvr().CommissioningComplete();
     emberAfSendImmediateDefaultResponse(err == CHIP_NO_ERROR ? EMBER_ZCL_STATUS_SUCCESS : EMBER_ZCL_STATUS_FAILURE);
@@ -58,7 +58,7 @@ bool emberAfGeneralCommissioningClusterSetRegulatoryConfigCallback(app::CommandH
                                                                    const app::ConcreteCommandPath & commandPath,
                                                                    EndpointId endpoint, uint8_t location, uint8_t * countryCode,
                                                                    uint64_t breadcrumb, uint32_t timeoutMs,
-                                                                   Commands::SetRegulatoryConfig::DecodableType & fields)
+                                                                   Commands::SetRegulatoryConfig::DecodableType & commandData)
 {
     CHIP_ERROR err = DeviceLayer::Internal::DeviceControlServer::DeviceControlSvr().SetRegulatoryConfig(
         location, reinterpret_cast<const char *>(countryCode), breadcrumb);
diff --git a/src/app/clusters/groups-server/groups-server.cpp b/src/app/clusters/groups-server/groups-server.cpp
index 32917a976..c7c0e592f 100644
--- a/src/app/clusters/groups-server/groups-server.cpp
+++ b/src/app/clusters/groups-server/groups-server.cpp
@@ -156,7 +156,7 @@ static EmberAfStatus removeEntryFromGroupTable(EndpointId endpoint, GroupId grou
 
 bool emberAfGroupsClusterAddGroupCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath,
                                           EndpointId endpoint, GroupId groupId, uint8_t * groupName,
-                                          Commands::AddGroup::DecodableType & fields)
+                                          Commands::AddGroup::DecodableType & commandData)
 {
     EmberAfStatus status;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -193,7 +193,7 @@ exit:
 }
 
 bool emberAfGroupsClusterViewGroupCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath,
-                                           EndpointId endpoint, GroupId groupId, Commands::ViewGroup::DecodableType & fields)
+                                           EndpointId endpoint, GroupId groupId, Commands::ViewGroup::DecodableType & commandData)
 {
     EmberAfStatus status                                          = EMBER_ZCL_STATUS_NOT_FOUND;
     CHIP_ERROR err                                                = CHIP_NO_ERROR;
@@ -237,7 +237,7 @@ exit:
 
 bool emberAfGroupsClusterGetGroupMembershipCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath,
                                                     EndpointId endpoint, uint8_t groupCount, uint8_t * groupList,
-                                                    Commands::GetGroupMembership::DecodableType & fields)
+                                                    Commands::GetGroupMembership::DecodableType & commandData)
 {
     EmberStatus status = EMBER_ZCL_STATUS_FAILURE;
     uint8_t i, j;
@@ -335,7 +335,8 @@ exit:
 }
 
 bool emberAfGroupsClusterRemoveGroupCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath,
-                                             EndpointId endpoint, GroupId groupId, Commands::RemoveGroup::DecodableType & fields)
+                                             EndpointId endpoint, GroupId groupId,
+                                             Commands::RemoveGroup::DecodableType & commandData)
 {
     EmberAfStatus status;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -374,7 +375,7 @@ exit:
 }
 
 bool emberAfGroupsClusterRemoveAllGroupsCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath,
-                                                 EndpointId aEndpoint, Commands::RemoveAllGroups::DecodableType & fields)
+                                                 EndpointId aEndpoint, Commands::RemoveAllGroups::DecodableType & commandData)
 {
     EmberStatus sendStatus = EMBER_SUCCESS;
     uint8_t i;
@@ -425,7 +426,7 @@ bool emberAfGroupsClusterRemoveAllGroupsCallback(app::CommandHandler * commandOb
 bool emberAfGroupsClusterAddGroupIfIdentifyingCallback(app::CommandHandler * commandObj,
                                                        const app::ConcreteCommandPath & commandPath, EndpointId endpoint,
                                                        GroupId groupId, uint8_t * groupName,
-                                                       Commands::AddGroupIfIdentifying::DecodableType & fields)
+                                                       Commands::AddGroupIfIdentifying::DecodableType & commandData)
 {
     EmberAfStatus status;
     EmberStatus sendStatus = EMBER_SUCCESS;
diff --git a/src/app/clusters/ias-zone-server/ias-zone-server.cpp b/src/app/clusters/ias-zone-server/ias-zone-server.cpp
index ee7b396fb..1e2411b36 100644
--- a/src/app/clusters/ias-zone-server/ias-zone-server.cpp
+++ b/src/app/clusters/ias-zone-server/ias-zone-server.cpp
@@ -353,7 +353,7 @@ static void updateEnrollState(EndpointId endpoint, bool enrolled)
 
 bool emberAfIasZoneClusterZoneEnrollResponseCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath,
                                                      EndpointId aEndpoint, uint8_t enrollResponseCode, uint8_t zoneId,
-                                                     Commands::ZoneEnrollResponse::DecodableType & fields)
+                                                     Commands::ZoneEnrollResponse::DecodableType & commandData)
 {
     EndpointId endpoint;
     uint8_t epZoneId;
diff --git a/src/app/clusters/identify-server/identify-server.cpp b/src/app/clusters/identify-server/identify-server.cpp
index 7c4fdc38d..a812d458a 100644
--- a/src/app/clusters/identify-server/identify-server.cpp
+++ b/src/app/clusters/identify-server/identify-server.cpp
@@ -209,7 +209,8 @@ void emberAfIdentifyClusterServerAttributeChangedCallback(EndpointId endpoint, A
 }
 
 bool emberAfIdentifyClusterIdentifyCallback(CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath,
-                                            EndpointId endpoint, uint16_t identifyTime, Commands::Identify::DecodableType & fields)
+                                            EndpointId endpoint, uint16_t identifyTime,
+                                            Commands::Identify::DecodableType & commandData)
 {
     // cmd Identify
     return EMBER_SUCCESS ==
@@ -217,7 +218,7 @@ bool emberAfIdentifyClusterIdentifyCallback(CommandHandler * commandObj, const a
 }
 
 bool emberAfIdentifyClusterIdentifyQueryCallback(CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath,
-                                                 EndpointId endpoint, Commands::IdentifyQuery::DecodableType & fields)
+                                                 EndpointId endpoint, Commands::IdentifyQuery::DecodableType & commandData)
 {
     // cmd IdentifyQuery
     uint16_t identifyTime  = 0;
@@ -272,7 +273,7 @@ exit:
 
 bool emberAfIdentifyClusterTriggerEffectCallback(CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath,
                                                  EndpointId endpoint, uint8_t effectIdentifier, uint8_t effectVariant,
-                                                 Commands::TriggerEffect::DecodableType & fields)
+                                                 Commands::TriggerEffect::DecodableType & commandData)
 {
     // cmd TriggerEffect
     Identify * identify                      = inst(endpoint);
diff --git a/src/app/clusters/keypad-input-server/keypad-input-server.cpp b/src/app/clusters/keypad-input-server/keypad-input-server.cpp
index c1c751c9f..f02e5d93c 100644
--- a/src/app/clusters/keypad-input-server/keypad-input-server.cpp
+++ b/src/app/clusters/keypad-input-server/keypad-input-server.cpp
@@ -55,7 +55,7 @@ exit:
 }
 
 bool emberAfKeypadInputClusterSendKeyCallback(app::CommandHandler * command, const app::ConcreteCommandPath & commandPath,
-                                              EndpointId endpoint, uint8_t keyCode, Commands::SendKey::DecodableType & fields)
+                                              EndpointId endpoint, uint8_t keyCode, Commands::SendKey::DecodableType & commandData)
 {
     EmberAfKeypadInputStatus status = keypadInputClusterSendKey(static_cast<EmberAfKeypadInputCecKeyCode>(keyCode));
     sendResponse(command, status);
diff --git a/src/app/clusters/level-control/level-control.cpp b/src/app/clusters/level-control/level-control.cpp
index 226748295..9574366c0 100644
--- a/src/app/clusters/level-control/level-control.cpp
+++ b/src/app/clusters/level-control/level-control.cpp
@@ -411,7 +411,7 @@ static bool shouldExecuteIfOff(EndpointId endpoint, CommandId commandId, uint8_t
 
 bool emberAfLevelControlClusterMoveToLevelCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath,
                                                    EndpointId endpoint, uint8_t level, uint16_t transitionTime, uint8_t optionMask,
-                                                   uint8_t optionOverride, Commands::MoveToLevel::DecodableType & fields)
+                                                   uint8_t optionOverride, Commands::MoveToLevel::DecodableType & commandData)
 {
     emberAfLevelControlClusterPrintln("%pMOVE_TO_LEVEL %x %2x %x %x", "RX level-control:", level, transitionTime, optionMask,
                                       optionOverride);
@@ -423,7 +423,7 @@ bool emberAfLevelControlClusterMoveToLevelCallback(app::CommandHandler * command
 bool emberAfLevelControlClusterMoveToLevelWithOnOffCallback(app::CommandHandler * commandObj,
                                                             const app::ConcreteCommandPath & commandPath, EndpointId endpoint,
                                                             uint8_t level, uint16_t transitionTime,
-                                                            Commands::MoveToLevelWithOnOff::DecodableType & fields)
+                                                            Commands::MoveToLevelWithOnOff::DecodableType & commandData)
 {
     emberAfLevelControlClusterPrintln("%pMOVE_TO_LEVEL_WITH_ON_OFF %x %2x", "RX level-control:", level, transitionTime);
     moveToLevelHandler(ZCL_MOVE_TO_LEVEL_WITH_ON_OFF_COMMAND_ID, level, transitionTime, 0xFF, 0xFF,
@@ -433,7 +433,7 @@ bool emberAfLevelControlClusterMoveToLevelWithOnOffCallback(app::CommandHandler
 
 bool emberAfLevelControlClusterMoveCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath,
                                             EndpointId endpoint, uint8_t moveMode, uint8_t rate, uint8_t optionMask,
-                                            uint8_t optionOverride, Commands::Move::DecodableType & fields)
+                                            uint8_t optionOverride, Commands::Move::DecodableType & commandData)
 {
     emberAfLevelControlClusterPrintln("%pMOVE %x %x", "RX level-control:", moveMode, rate);
     moveHandler(ZCL_MOVE_COMMAND_ID, moveMode, rate, optionMask, optionOverride);
@@ -442,7 +442,7 @@ bool emberAfLevelControlClusterMoveCallback(app::CommandHandler * commandObj, co
 
 bool emberAfLevelControlClusterMoveWithOnOffCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath,
                                                      EndpointId endpoint, uint8_t moveMode, uint8_t rate,
-                                                     Commands::MoveWithOnOff::DecodableType & fields)
+                                                     Commands::MoveWithOnOff::DecodableType & commandData)
 {
     emberAfLevelControlClusterPrintln("%pMOVE_WITH_ON_OFF %x %x", "RX level-control:", moveMode, rate);
     moveHandler(ZCL_MOVE_WITH_ON_OFF_COMMAND_ID, moveMode, rate, 0xFF, 0xFF);
@@ -451,7 +451,7 @@ bool emberAfLevelControlClusterMoveWithOnOffCallback(app::CommandHandler * comma
 
 bool emberAfLevelControlClusterStepCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath,
                                             EndpointId endpoint, uint8_t stepMode, uint8_t stepSize, uint16_t transitionTime,
-                                            uint8_t optionMask, uint8_t optionOverride, Commands::Step::DecodableType & fields)
+                                            uint8_t optionMask, uint8_t optionOverride, Commands::Step::DecodableType & commandData)
 {
     emberAfLevelControlClusterPrintln("%pSTEP %x %x %2x", "RX level-control:", stepMode, stepSize, transitionTime);
     stepHandler(ZCL_STEP_COMMAND_ID, stepMode, stepSize, transitionTime, optionMask, optionOverride);
@@ -460,7 +460,7 @@ bool emberAfLevelControlClusterStepCallback(app::CommandHandler * commandObj, co
 
 bool emberAfLevelControlClusterStepWithOnOffCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath,
                                                      EndpointId endpoint, uint8_t stepMode, uint8_t stepSize,
-                                                     uint16_t transitionTime, Commands::StepWithOnOff::DecodableType & fields)
+                                                     uint16_t transitionTime, Commands::StepWithOnOff::DecodableType & commandData)
 {
     emberAfLevelControlClusterPrintln("%pSTEP_WITH_ON_OFF %x %x %2x", "RX level-control:", stepMode, stepSize, transitionTime);
     stepHandler(ZCL_STEP_WITH_ON_OFF_COMMAND_ID, stepMode, stepSize, transitionTime, 0xFF, 0xFF);
@@ -469,7 +469,7 @@ bool emberAfLevelControlClusterStepWithOnOffCallback(app::CommandHandler * comma
 
 bool emberAfLevelControlClusterStopCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath,
                                             EndpointId endpoint, uint8_t optionMask, uint8_t optionOverride,
-                                            Commands::Stop::DecodableType & fields)
+                                            Commands::Stop::DecodableType & commandData)
 {
     emberAfLevelControlClusterPrintln("%pSTOP", "RX level-control:");
     stopHandler(ZCL_STOP_COMMAND_ID, optionMask, optionOverride);
@@ -477,7 +477,7 @@ bool emberAfLevelControlClusterStopCallback(app::CommandHandler * commandObj, co
 }
 
 bool emberAfLevelControlClusterStopWithOnOffCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath,
-                                                     EndpointId endpoint, Commands::StopWithOnOff::DecodableType & fields)
+                                                     EndpointId endpoint, Commands::StopWithOnOff::DecodableType & commandData)
 {
     emberAfLevelControlClusterPrintln("%pSTOP_WITH_ON_OFF", "RX level-control:");
     stopHandler(ZCL_STOP_WITH_ON_OFF_COMMAND_ID, 0xFF, 0xFF);
diff --git a/src/app/clusters/low-power-server/low-power-server.cpp b/src/app/clusters/low-power-server/low-power-server.cpp
index 93e5f546f..405eaefae 100644
--- a/src/app/clusters/low-power-server/low-power-server.cpp
+++ b/src/app/clusters/low-power-server/low-power-server.cpp
@@ -33,7 +33,7 @@ using namespace chip::app::Clusters::LowPower;
 bool lowPowerClusterSleep();
 
 bool emberAfLowPowerClusterSleepCallback(app::CommandHandler * command, const app::ConcreteCommandPath & commandPath,
-                                         EndpointId endpoint, Commands::Sleep::DecodableType & fields)
+                                         EndpointId endpoint, Commands::Sleep::DecodableType & commandData)
 {
     bool success         = lowPowerClusterSleep();
     EmberAfStatus status = success ? EMBER_ZCL_STATUS_SUCCESS : EMBER_ZCL_STATUS_FAILURE;
diff --git a/src/app/clusters/media-input-server/media-input-server.cpp b/src/app/clusters/media-input-server/media-input-server.cpp
index ee8e05a7b..f9850b573 100644
--- a/src/app/clusters/media-input-server/media-input-server.cpp
+++ b/src/app/clusters/media-input-server/media-input-server.cpp
@@ -50,7 +50,8 @@ static void storeCurrentInput(EndpointId endpoint, uint8_t currentInput)
 }
 
 bool emberAfMediaInputClusterSelectInputCallback(app::CommandHandler * command, const app::ConcreteCommandPath & commandPath,
-                                                 EndpointId endpoint, uint8_t input, Commands::SelectInput::DecodableType & fields)
+                                                 EndpointId endpoint, uint8_t input,
+                                                 Commands::SelectInput::DecodableType & commandData)
 {
     bool success         = mediaInputClusterSelectInput(input);
     EmberAfStatus status = success ? EMBER_ZCL_STATUS_SUCCESS : EMBER_ZCL_STATUS_FAILURE;
@@ -63,7 +64,7 @@ bool emberAfMediaInputClusterSelectInputCallback(app::CommandHandler * command,
 }
 
 bool emberAfMediaInputClusterShowInputStatusCallback(app::CommandHandler * command, const app::ConcreteCommandPath & commandPath,
-                                                     EndpointId endpoint, Commands::ShowInputStatus::DecodableType & fields)
+                                                     EndpointId endpoint, Commands::ShowInputStatus::DecodableType & commandData)
 {
     bool success         = mediaInputClusterShowInputStatus();
     EmberAfStatus status = success ? EMBER_ZCL_STATUS_SUCCESS : EMBER_ZCL_STATUS_FAILURE;
@@ -72,7 +73,7 @@ bool emberAfMediaInputClusterShowInputStatusCallback(app::CommandHandler * comma
 }
 
 bool emberAfMediaInputClusterHideInputStatusCallback(app::CommandHandler * command, const app::ConcreteCommandPath & commandPath,
-                                                     EndpointId endpoint, Commands::HideInputStatus::DecodableType & fields)
+                                                     EndpointId endpoint, Commands::HideInputStatus::DecodableType & commandData)
 {
     bool success         = mediaInputClusterHideInputStatus();
     EmberAfStatus status = success ? EMBER_ZCL_STATUS_SUCCESS : EMBER_ZCL_STATUS_FAILURE;
@@ -82,7 +83,7 @@ bool emberAfMediaInputClusterHideInputStatusCallback(app::CommandHandler * comma
 
 bool emberAfMediaInputClusterRenameInputCallback(app::CommandHandler * command, const app::ConcreteCommandPath & commandPath,
                                                  EndpointId endpoint, uint8_t input, uint8_t * name,
-                                                 Commands::RenameInput::DecodableType & fields)
+                                                 Commands::RenameInput::DecodableType & commandData)
 {
     // TODO: char is not null terminated, verify this code once #7963 gets merged.
     std::string nameString(reinterpret_cast<char *>(name));
diff --git a/src/app/clusters/media-playback-server/media-playback-server.cpp b/src/app/clusters/media-playback-server/media-playback-server.cpp
index 8b23496e8..3a87bd948 100644
--- a/src/app/clusters/media-playback-server/media-playback-server.cpp
+++ b/src/app/clusters/media-playback-server/media-playback-server.cpp
@@ -98,7 +98,7 @@ exit:
 }
 
 bool emberAfMediaPlaybackClusterMediaPlayCallback(app::CommandHandler * command, const app::ConcreteCommandPath & commandPath,
-                                                  EndpointId endpoint, Commands::MediaPlay::DecodableType & fields)
+                                                  EndpointId endpoint, Commands::MediaPlay::DecodableType & commandData)
 {
     EmberAfMediaPlaybackStatus status = mediaPlaybackClusterSendMediaPlaybackRequest(MEDIA_PLAYBACK_REQUEST_PLAY, 0);
     storeNewPlaybackState(emberAfCurrentEndpoint(), EMBER_ZCL_MEDIA_PLAYBACK_STATE_PLAYING);
@@ -107,7 +107,7 @@ bool emberAfMediaPlaybackClusterMediaPlayCallback(app::CommandHandler * command,
 }
 
 bool emberAfMediaPlaybackClusterMediaPauseCallback(app::CommandHandler * command, const app::ConcreteCommandPath & commandPath,
-                                                   EndpointId endpoint, Commands::MediaPause::DecodableType & fields)
+                                                   EndpointId endpoint, Commands::MediaPause::DecodableType & commandData)
 {
     EmberAfMediaPlaybackStatus status = mediaPlaybackClusterSendMediaPlaybackRequest(MEDIA_PLAYBACK_REQUEST_PAUSE, 0);
     storeNewPlaybackState(emberAfCurrentEndpoint(), EMBER_ZCL_MEDIA_PLAYBACK_STATE_PAUSED);
@@ -116,7 +116,7 @@ bool emberAfMediaPlaybackClusterMediaPauseCallback(app::CommandHandler * command
 }
 
 bool emberAfMediaPlaybackClusterMediaStopCallback(app::CommandHandler * command, const app::ConcreteCommandPath & commandPath,
-                                                  EndpointId endpoint, Commands::MediaStop::DecodableType & fields)
+                                                  EndpointId endpoint, Commands::MediaStop::DecodableType & commandData)
 {
     EmberAfMediaPlaybackStatus status = mediaPlaybackClusterSendMediaPlaybackRequest(MEDIA_PLAYBACK_REQUEST_STOP, 0);
     storeNewPlaybackState(emberAfCurrentEndpoint(), EMBER_ZCL_MEDIA_PLAYBACK_STATE_NOT_PLAYING);
@@ -126,7 +126,7 @@ bool emberAfMediaPlaybackClusterMediaStopCallback(app::CommandHandler * command,
 
 bool emberAfMediaPlaybackClusterMediaFastForwardCallback(app::CommandHandler * command,
                                                          const app::ConcreteCommandPath & commandPath, EndpointId endpoint,
-                                                         Commands::MediaFastForward::DecodableType & fields)
+                                                         Commands::MediaFastForward::DecodableType & commandData)
 {
     EmberAfMediaPlaybackStatus status = mediaPlaybackClusterSendMediaPlaybackRequest(MEDIA_PLAYBACK_REQUEST_FAST_FORWARD, 0);
     sendResponse(command, "MediaFastForward", ZCL_MEDIA_FAST_FORWARD_RESPONSE_COMMAND_ID, status);
@@ -134,7 +134,7 @@ bool emberAfMediaPlaybackClusterMediaFastForwardCallback(app::CommandHandler * c
 }
 
 bool emberAfMediaPlaybackClusterMediaPreviousCallback(app::CommandHandler * command, const app::ConcreteCommandPath & commandPath,
-                                                      EndpointId endpoint, Commands::MediaPrevious::DecodableType & fields)
+                                                      EndpointId endpoint, Commands::MediaPrevious::DecodableType & commandData)
 {
     EmberAfMediaPlaybackStatus status = mediaPlaybackClusterSendMediaPlaybackRequest(MEDIA_PLAYBACK_REQUEST_PREVIOUS, 0);
     sendResponse(command, "MediaPrevious", ZCL_MEDIA_PREVIOUS_RESPONSE_COMMAND_ID, status);
@@ -142,7 +142,7 @@ bool emberAfMediaPlaybackClusterMediaPreviousCallback(app::CommandHandler * comm
 }
 
 bool emberAfMediaPlaybackClusterMediaRewindCallback(app::CommandHandler * command, const app::ConcreteCommandPath & commandPath,
-                                                    EndpointId endpoint, Commands::MediaRewind::DecodableType & fields)
+                                                    EndpointId endpoint, Commands::MediaRewind::DecodableType & commandData)
 {
     EmberAfMediaPlaybackStatus status = mediaPlaybackClusterSendMediaPlaybackRequest(MEDIA_PLAYBACK_REQUEST_REWIND, 0);
     sendResponse(command, "MediaRewind", ZCL_MEDIA_REWIND_RESPONSE_COMMAND_ID, status);
@@ -152,7 +152,7 @@ bool emberAfMediaPlaybackClusterMediaRewindCallback(app::CommandHandler * comman
 bool emberAfMediaPlaybackClusterMediaSkipBackwardCallback(app::CommandHandler * command,
                                                           const app::ConcreteCommandPath & commandPath, EndpointId endpoint,
                                                           uint64_t deltaPositionMilliseconds,
-                                                          Commands::MediaSkipBackward::DecodableType & fields)
+                                                          Commands::MediaSkipBackward::DecodableType & commandData)
 {
     EmberAfMediaPlaybackStatus status =
         mediaPlaybackClusterSendMediaPlaybackRequest(MEDIA_PLAYBACK_REQUEST_SKIP_BACKWARD, deltaPositionMilliseconds);
@@ -163,7 +163,7 @@ bool emberAfMediaPlaybackClusterMediaSkipBackwardCallback(app::CommandHandler *
 bool emberAfMediaPlaybackClusterMediaSkipForwardCallback(app::CommandHandler * command,
                                                          const app::ConcreteCommandPath & commandPath, EndpointId endpoint,
                                                          uint64_t deltaPositionMilliseconds,
-                                                         Commands::MediaSkipForward::DecodableType & fields)
+                                                         Commands::MediaSkipForward::DecodableType & commandData)
 {
     EmberAfMediaPlaybackStatus status =
         mediaPlaybackClusterSendMediaPlaybackRequest(MEDIA_PLAYBACK_REQUEST_SKIP_FORWARD, deltaPositionMilliseconds);
@@ -173,7 +173,7 @@ bool emberAfMediaPlaybackClusterMediaSkipForwardCallback(app::CommandHandler * c
 
 bool emberAfMediaPlaybackClusterMediaSeekCallback(app::CommandHandler * command, const app::ConcreteCommandPath & commandPath,
                                                   EndpointId endpoint, uint64_t positionMilliseconds,
-                                                  Commands::MediaSeek::DecodableType & fields)
+                                                  Commands::MediaSeek::DecodableType & commandData)
 {
     EmberAfMediaPlaybackStatus status =
         mediaPlaybackClusterSendMediaPlaybackRequest(MEDIA_PLAYBACK_REQUEST_SEEK, positionMilliseconds);
@@ -182,14 +182,14 @@ bool emberAfMediaPlaybackClusterMediaSeekCallback(app::CommandHandler * command,
 }
 
 bool emberAfMediaPlaybackClusterMediaNextCallback(app::CommandHandler * command, const app::ConcreteCommandPath & commandPath,
-                                                  EndpointId endpoint, Commands::MediaNext::DecodableType & fields)
+                                                  EndpointId endpoint, Commands::MediaNext::DecodableType & commandData)
 {
     EmberAfMediaPlaybackStatus status = mediaPlaybackClusterSendMediaPlaybackRequest(MEDIA_PLAYBACK_REQUEST_NEXT, 0);
     sendResponse(command, "MediaNext", ZCL_MEDIA_NEXT_RESPONSE_COMMAND_ID, status);
     return true;
 }
 bool emberAfMediaPlaybackClusterMediaStartOverCallback(app::CommandHandler * command, const app::ConcreteCommandPath & commandPath,
-                                                       EndpointId endpoint, Commands::MediaStartOver::DecodableType & fields)
+                                                       EndpointId endpoint, Commands::MediaStartOver::DecodableType & commandData)
 {
     EmberAfMediaPlaybackStatus status = mediaPlaybackClusterSendMediaPlaybackRequest(MEDIA_PLAYBACK_REQUEST_START_OVER, 0);
     sendResponse(command, "MediaStartOver", ZCL_MEDIA_START_OVER_RESPONSE_COMMAND_ID, status);
diff --git a/src/app/clusters/network-commissioning/network-commissioning-ember.cpp b/src/app/clusters/network-commissioning/network-commissioning-ember.cpp
index 4860bb849..814167244 100644
--- a/src/app/clusters/network-commissioning/network-commissioning-ember.cpp
+++ b/src/app/clusters/network-commissioning/network-commissioning-ember.cpp
@@ -39,7 +39,7 @@ bool emberAfNetworkCommissioningClusterAddThreadNetworkCallback(app::CommandHand
                                                                 const app::ConcreteCommandPath & commandPath, EndpointId endpoint,
                                                                 ByteSpan operationalDataset, uint64_t breadcrumb,
                                                                 uint32_t timeoutMs,
-                                                                Commands::AddThreadNetwork::DecodableType & fields)
+                                                                Commands::AddThreadNetwork::DecodableType & commandData)
 {
     EmberAfNetworkCommissioningError err = app::Clusters::NetworkCommissioning::OnAddThreadNetworkCommandCallbackInternal(
         nullptr, emberAfCurrentEndpoint(), operationalDataset, breadcrumb, timeoutMs);
@@ -51,7 +51,8 @@ bool emberAfNetworkCommissioningClusterAddThreadNetworkCallback(app::CommandHand
 bool emberAfNetworkCommissioningClusterAddWiFiNetworkCallback(app::CommandHandler * commandObj,
                                                               const app::ConcreteCommandPath & commandPath, EndpointId endpoint,
                                                               ByteSpan ssid, ByteSpan credentials, uint64_t breadcrumb,
-                                                              uint32_t timeoutMs, Commands::AddWiFiNetwork::DecodableType & fields)
+                                                              uint32_t timeoutMs,
+                                                              Commands::AddWiFiNetwork::DecodableType & commandData)
 {
     EmberAfNetworkCommissioningError err = app::Clusters::NetworkCommissioning::OnAddWiFiNetworkCommandCallbackInternal(
         nullptr, emberAfCurrentEndpoint(), ssid, credentials, breadcrumb, timeoutMs);
@@ -63,7 +64,7 @@ bool emberAfNetworkCommissioningClusterAddWiFiNetworkCallback(app::CommandHandle
 bool emberAfNetworkCommissioningClusterEnableNetworkCallback(app::CommandHandler * commandObj,
                                                              const app::ConcreteCommandPath & commandPath, EndpointId endpoint,
                                                              ByteSpan networkID, uint64_t breadcrumb, uint32_t timeoutMs,
-                                                             Commands::EnableNetwork::DecodableType & fields)
+                                                             Commands::EnableNetwork::DecodableType & commandData)
 {
     EmberAfNetworkCommissioningError err = app::Clusters::NetworkCommissioning::OnEnableNetworkCommandCallbackInternal(
         nullptr, emberAfCurrentEndpoint(), networkID, breadcrumb, timeoutMs);
@@ -78,14 +79,14 @@ bool emberAfNetworkCommissioningClusterEnableNetworkCallback(app::CommandHandler
 bool emberAfNetworkCommissioningClusterDisableNetworkCallback(app::CommandHandler * commandObj,
                                                               const app::ConcreteCommandPath & commandPath, EndpointId endpoint,
                                                               ByteSpan networkID, uint64_t breadcrumb, uint32_t timeoutMs,
-                                                              Commands::DisableNetwork::DecodableType & fields)
+                                                              Commands::DisableNetwork::DecodableType & commandData)
 {
     return false;
 }
 
 bool emberAfNetworkCommissioningClusterGetLastNetworkCommissioningResultCallback(
     app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath, EndpointId endpoint, uint32_t timeoutMs,
-    Commands::GetLastNetworkCommissioningResult::DecodableType & fields)
+    Commands::GetLastNetworkCommissioningResult::DecodableType & commandData)
 {
     return false;
 }
@@ -93,7 +94,7 @@ bool emberAfNetworkCommissioningClusterGetLastNetworkCommissioningResultCallback
 bool emberAfNetworkCommissioningClusterRemoveNetworkCallback(app::CommandHandler * commandObj,
                                                              const app::ConcreteCommandPath & commandPath, EndpointId endpoint,
                                                              ByteSpan NetworkID, uint64_t Breadcrumb, uint32_t TimeoutMs,
-                                                             Commands::RemoveNetwork::DecodableType & fields)
+                                                             Commands::RemoveNetwork::DecodableType & commandData)
 {
     return false;
 }
@@ -101,7 +102,7 @@ bool emberAfNetworkCommissioningClusterRemoveNetworkCallback(app::CommandHandler
 bool emberAfNetworkCommissioningClusterScanNetworksCallback(app::CommandHandler * commandObj,
                                                             const app::ConcreteCommandPath & commandPath, EndpointId endpoint,
                                                             ByteSpan ssid, uint64_t breadcrumb, uint32_t timeoutMs,
-                                                            Commands::ScanNetworks::DecodableType & fields)
+                                                            Commands::ScanNetworks::DecodableType & commandData)
 {
     return false;
 }
@@ -109,7 +110,7 @@ bool emberAfNetworkCommissioningClusterUpdateThreadNetworkCallback(app::CommandH
                                                                    const app::ConcreteCommandPath & commandPath,
                                                                    EndpointId endpoint, ByteSpan operationalDataset,
                                                                    uint64_t breadcrumb, uint32_t timeoutMs,
-                                                                   Commands::UpdateThreadNetwork::DecodableType & fields)
+                                                                   Commands::UpdateThreadNetwork::DecodableType & commandData)
 {
     return false;
 }
@@ -118,7 +119,7 @@ bool emberAfNetworkCommissioningClusterUpdateWiFiNetworkCallback(app::CommandHan
                                                                  const app::ConcreteCommandPath & commandPath, EndpointId endpoint,
                                                                  ByteSpan ssid, ByteSpan credentials, uint64_t breadcrumb,
                                                                  uint32_t timeoutMs,
-                                                                 Commands::UpdateWiFiNetwork::DecodableType & fields)
+                                                                 Commands::UpdateWiFiNetwork::DecodableType & commandData)
 {
     return false;
 }
diff --git a/src/app/clusters/on-off-server/on-off-server.cpp b/src/app/clusters/on-off-server/on-off-server.cpp
index 5537e4ea8..6d56d1f31 100644
--- a/src/app/clusters/on-off-server/on-off-server.cpp
+++ b/src/app/clusters/on-off-server/on-off-server.cpp
@@ -169,7 +169,7 @@ EmberAfStatus emberAfOnOffClusterSetValueCallback(EndpointId endpoint, uint8_t c
 }
 
 bool emberAfOnOffClusterOffCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath,
-                                    EndpointId endpoint, Commands::Off::DecodableType & fields)
+                                    EndpointId endpoint, Commands::Off::DecodableType & commandData)
 {
     EmberAfStatus status = emberAfOnOffClusterSetValueCallback(emberAfCurrentEndpoint(), ZCL_OFF_COMMAND_ID, false);
 #ifdef EMBER_AF_PLUGIN_ZLL_ON_OFF_SERVER
@@ -183,7 +183,7 @@ bool emberAfOnOffClusterOffCallback(app::CommandHandler * commandObj, const app:
 }
 
 bool emberAfOnOffClusterOnCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath,
-                                   EndpointId endpoint, Commands::On::DecodableType & fields)
+                                   EndpointId endpoint, Commands::On::DecodableType & commandData)
 {
     EmberAfStatus status = emberAfOnOffClusterSetValueCallback(emberAfCurrentEndpoint(), ZCL_ON_COMMAND_ID, false);
 #ifdef EMBER_AF_PLUGIN_ZLL_ON_OFF_SERVER
@@ -197,7 +197,7 @@ bool emberAfOnOffClusterOnCallback(app::CommandHandler * commandObj, const app::
 }
 
 bool emberAfOnOffClusterToggleCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath,
-                                       EndpointId endpoint, Commands::Toggle::DecodableType & fields)
+                                       EndpointId endpoint, Commands::Toggle::DecodableType & commandData)
 {
     EmberAfStatus status = emberAfOnOffClusterSetValueCallback(emberAfCurrentEndpoint(), ZCL_TOGGLE_COMMAND_ID, false);
 #ifdef EMBER_AF_PLUGIN_ZLL_ON_OFF_SERVER
diff --git a/src/app/clusters/operational-credentials-server/operational-credentials-server.cpp b/src/app/clusters/operational-credentials-server/operational-credentials-server.cpp
index 83cfe2969..807156795 100644
--- a/src/app/clusters/operational-credentials-server/operational-credentials-server.cpp
+++ b/src/app/clusters/operational-credentials-server/operational-credentials-server.cpp
@@ -273,7 +273,7 @@ FabricCleanupExchangeDelegate gFabricCleanupExchangeDelegate;
 bool emberAfOperationalCredentialsClusterRemoveFabricCallback(app::CommandHandler * commandObj,
                                                               const app::ConcreteCommandPath & commandPath, EndpointId endpoint,
                                                               FabricIndex fabricBeingRemoved,
-                                                              Commands::RemoveFabric::DecodableType & fields)
+                                                              Commands::RemoveFabric::DecodableType & commandData)
 {
     emberAfPrintln(EMBER_AF_PRINT_DEBUG, "OpCreds: RemoveFabric"); // TODO: Generate emberAfFabricClusterPrintln
 
@@ -309,7 +309,7 @@ exit:
 bool emberAfOperationalCredentialsClusterUpdateFabricLabelCallback(app::CommandHandler * commandObj,
                                                                    const app::ConcreteCommandPath & commandPath,
                                                                    EndpointId endpoint, uint8_t * Label,
-                                                                   Commands::UpdateFabricLabel::DecodableType & fields)
+                                                                   Commands::UpdateFabricLabel::DecodableType & commandData)
 {
     emberAfPrintln(EMBER_AF_PRINT_DEBUG, "OpCreds: UpdateFabricLabel");
 
@@ -394,7 +394,7 @@ bool emberAfOperationalCredentialsClusterAddNOCCallback(app::CommandHandler * co
                                                         const app::ConcreteCommandPath & commandPath, EndpointId endpoint,
                                                         ByteSpan NOCValue, ByteSpan ICACValue, ByteSpan IPKValue,
                                                         NodeId adminNodeId, uint16_t adminVendorId,
-                                                        Commands::AddNOC::DecodableType & fields)
+                                                        Commands::AddNOC::DecodableType & commandData)
 {
     EmberAfNodeOperationalCertStatus nocResponse = EMBER_ZCL_NODE_OPERATIONAL_CERT_STATUS_SUCCESS;
 
@@ -436,7 +436,7 @@ exit:
 bool emberAfOperationalCredentialsClusterUpdateNOCCallback(app::CommandHandler * commandObj,
                                                            const app::ConcreteCommandPath & commandPath, EndpointId endpoint,
                                                            ByteSpan NOCValue, ByteSpan ICACValue,
-                                                           Commands::UpdateNOC::DecodableType & fields)
+                                                           Commands::UpdateNOC::DecodableType & commandData)
 {
     EmberAfNodeOperationalCertStatus nocResponse = EMBER_ZCL_NODE_OPERATIONAL_CERT_STATUS_SUCCESS;
 
@@ -475,10 +475,9 @@ exit:
     return true;
 }
 
-bool emberAfOperationalCredentialsClusterCertificateChainRequestCallback(app::CommandHandler * commandObj,
-                                                                         const app::ConcreteCommandPath & commandPath,
-                                                                         EndpointId endpoint, uint8_t certificateType,
-                                                                         Commands::CertificateChainRequest::DecodableType & fields)
+bool emberAfOperationalCredentialsClusterCertificateChainRequestCallback(
+    app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath, EndpointId endpoint, uint8_t certificateType,
+    Commands::CertificateChainRequest::DecodableType & commandData)
 {
     CHIP_ERROR err = CHIP_NO_ERROR;
 
@@ -536,7 +535,7 @@ exit:
 bool emberAfOperationalCredentialsClusterAttestationRequestCallback(app::CommandHandler * commandObj,
                                                                     const app::ConcreteCommandPath & commandPath,
                                                                     EndpointId endpoint, ByteSpan attestationNonce,
-                                                                    Commands::AttestationRequest::DecodableType & fields)
+                                                                    Commands::AttestationRequest::DecodableType & commandData)
 {
     CHIP_ERROR err          = CHIP_NO_ERROR;
     TLV::TLVWriter * writer = nullptr;
@@ -621,7 +620,8 @@ exit:
 
 bool emberAfOperationalCredentialsClusterOpCSRRequestCallback(app::CommandHandler * commandObj,
                                                               const app::ConcreteCommandPath & commandPath, EndpointId endpoint,
-                                                              ByteSpan CSRNonce, Commands::OpCSRRequest::DecodableType & fields)
+                                                              ByteSpan CSRNonce,
+                                                              Commands::OpCSRRequest::DecodableType & commandData)
 {
     CHIP_ERROR err = CHIP_NO_ERROR;
 
@@ -690,7 +690,7 @@ exit:
 
 bool emberAfOperationalCredentialsClusterAddTrustedRootCertificateCallback(
     app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath, EndpointId endpoint, ByteSpan RootCertificate,
-    Commands::AddTrustedRootCertificate::DecodableType & fields)
+    Commands::AddTrustedRootCertificate::DecodableType & commandData)
 {
     EmberAfStatus status = EMBER_ZCL_STATUS_SUCCESS;
 
@@ -711,7 +711,7 @@ exit:
 
 bool emberAfOperationalCredentialsClusterRemoveTrustedRootCertificateCallback(
     app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath, EndpointId endpoint,
-    ByteSpan TrustedRootIdentifier, Commands::RemoveTrustedRootCertificate::DecodableType & fields)
+    ByteSpan TrustedRootIdentifier, Commands::RemoveTrustedRootCertificate::DecodableType & commandData)
 {
     EmberAfStatus status = EMBER_ZCL_STATUS_FAILURE;
     emberAfSendImmediateDefaultResponse(status);
diff --git a/src/app/clusters/ota-provider/ota-provider.cpp b/src/app/clusters/ota-provider/ota-provider.cpp
index 4a5b22812..fc7087722 100644
--- a/src/app/clusters/ota-provider/ota-provider.cpp
+++ b/src/app/clusters/ota-provider/ota-provider.cpp
@@ -75,7 +75,7 @@ bool emberAfOtaSoftwareUpdateProviderClusterApplyUpdateRequestCallback(app::Comm
                                                                        const app::ConcreteCommandPath & commandPath,
                                                                        EndpointId endpoint, ByteSpan updateToken,
                                                                        uint32_t newVersion,
-                                                                       Commands::ApplyUpdateRequest::DecodableType & fields)
+                                                                       Commands::ApplyUpdateRequest::DecodableType & commandData)
 {
     EmberAfStatus status           = EMBER_ZCL_STATUS_SUCCESS;
     OTAProviderDelegate * delegate = GetDelegate(endpoint);
@@ -115,7 +115,7 @@ bool emberAfOtaSoftwareUpdateProviderClusterNotifyUpdateAppliedCallback(app::Com
                                                                         const app::ConcreteCommandPath & commandPath,
                                                                         EndpointId endpoint, chip::ByteSpan updateToken,
                                                                         uint32_t softwareVersion,
-                                                                        Commands::NotifyUpdateApplied::DecodableType & fields)
+                                                                        Commands::NotifyUpdateApplied::DecodableType & commandData)
 {
     EmberAfStatus status           = EMBER_ZCL_STATUS_SUCCESS;
     OTAProviderDelegate * delegate = GetDelegate(endpoint);
@@ -162,7 +162,7 @@ bool emberAfOtaSoftwareUpdateProviderClusterNotifyUpdateAppliedCallback(app::Com
 bool emberAfOtaSoftwareUpdateProviderClusterQueryImageCallback(
     app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath, EndpointId endpoint, uint16_t vendorId,
     uint16_t productId, uint16_t hardwareVersion, uint32_t softwareVersion, uint8_t protocolsSupported, uint8_t * location,
-    bool requestorCanConsent, chip::ByteSpan metadataForProvider, Commands::QueryImage::DecodableType & fields)
+    bool requestorCanConsent, chip::ByteSpan metadataForProvider, Commands::QueryImage::DecodableType & commandData)
 {
     EmberAfStatus status           = EMBER_ZCL_STATUS_SUCCESS;
     OTAProviderDelegate * delegate = GetDelegate(endpoint);
diff --git a/src/app/clusters/scenes/scenes.cpp b/src/app/clusters/scenes/scenes.cpp
index 999f98d9e..a098de84a 100644
--- a/src/app/clusters/scenes/scenes.cpp
+++ b/src/app/clusters/scenes/scenes.cpp
@@ -222,7 +222,7 @@ void emAfPluginScenesServerPrintInfo(void)
 bool emberAfScenesClusterAddSceneCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath,
                                           EndpointId endpoint, GroupId groupId, uint8_t sceneId, uint16_t transitionTime,
                                           uint8_t * sceneName, uint8_t * extensionFieldSets,
-                                          Commands::AddScene::DecodableType & fields)
+                                          Commands::AddScene::DecodableType & commandData)
 {
     return emberAfPluginScenesServerParseAddScene(commandObj, emberAfCurrentCommand(), groupId, sceneId, transitionTime, sceneName,
                                                   extensionFieldSets);
@@ -230,14 +230,14 @@ bool emberAfScenesClusterAddSceneCallback(app::CommandHandler * commandObj, cons
 
 bool emberAfScenesClusterViewSceneCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath,
                                            EndpointId endpoint, GroupId groupId, uint8_t sceneId,
-                                           Commands::ViewScene::DecodableType & fields)
+                                           Commands::ViewScene::DecodableType & commandData)
 {
     return emberAfPluginScenesServerParseViewScene(commandObj, emberAfCurrentCommand(), groupId, sceneId);
 }
 
 bool emberAfScenesClusterRemoveSceneCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath,
                                              EndpointId endpoint, GroupId groupId, uint8_t sceneId,
-                                             Commands::RemoveScene::DecodableType & fields)
+                                             Commands::RemoveScene::DecodableType & commandData)
 {
     EmberAfStatus status = EMBER_ZCL_STATUS_NOT_FOUND;
     CHIP_ERROR err       = CHIP_NO_ERROR;
@@ -293,7 +293,7 @@ exit:
 
 bool emberAfScenesClusterRemoveAllScenesCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath,
                                                  EndpointId endpoint, GroupId groupId,
-                                                 Commands::RemoveAllScenes::DecodableType & fields)
+                                                 Commands::RemoveAllScenes::DecodableType & commandData)
 {
     EmberAfStatus status = EMBER_ZCL_STATUS_INVALID_FIELD;
     CHIP_ERROR err       = CHIP_NO_ERROR;
@@ -344,7 +344,7 @@ exit:
 
 bool emberAfScenesClusterStoreSceneCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath,
                                             EndpointId endpoint, GroupId groupId, uint8_t sceneId,
-                                            Commands::StoreScene::DecodableType & fields)
+                                            Commands::StoreScene::DecodableType & commandData)
 {
     EmberAfStatus status;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -377,7 +377,7 @@ exit:
 
 bool emberAfScenesClusterRecallSceneCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath,
                                              EndpointId endpoint, GroupId groupId, uint8_t sceneId, uint16_t transitionTime,
-                                             Commands::RecallScene::DecodableType & fields)
+                                             Commands::RecallScene::DecodableType & commandData)
 {
     // NOTE: TransitionTime field in the RecallScene command is currently
     // ignored. Per Zigbee Alliance ZCL 7 (07-5123-07):
@@ -412,7 +412,7 @@ bool emberAfScenesClusterRecallSceneCallback(app::CommandHandler * commandObj, c
 
 bool emberAfScenesClusterGetSceneMembershipCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath,
                                                     EndpointId endpoint, GroupId groupId,
-                                                    Commands::GetSceneMembership::DecodableType & fields)
+                                                    Commands::GetSceneMembership::DecodableType & commandData)
 {
     CHIP_ERROR err       = CHIP_NO_ERROR;
     EmberAfStatus status = EMBER_ZCL_STATUS_SUCCESS;
diff --git a/src/app/clusters/software_diagnostics_server/software_diagnostics_server.cpp b/src/app/clusters/software_diagnostics_server/software_diagnostics_server.cpp
index 44eeee1f8..3e520df47 100644
--- a/src/app/clusters/software_diagnostics_server/software_diagnostics_server.cpp
+++ b/src/app/clusters/software_diagnostics_server/software_diagnostics_server.cpp
@@ -99,7 +99,7 @@ CHIP_ERROR SoftwareDiagosticsAttrAccess::ReadIfSupported(CHIP_ERROR (PlatformMan
 
 bool emberAfSoftwareDiagnosticsClusterResetWatermarksCallback(app::CommandHandler * commandObj,
                                                               const app::ConcreteCommandPath & commandPath, EndpointId endpoint,
-                                                              Commands::ResetWatermarks::DecodableType & fields)
+                                                              Commands::ResetWatermarks::DecodableType & commandData)
 {
     uint64_t currentHeapUsed;
 
diff --git a/src/app/clusters/target-navigator-server/target-navigator-server.cpp b/src/app/clusters/target-navigator-server/target-navigator-server.cpp
index 09f6a808f..b0dc1883a 100644
--- a/src/app/clusters/target-navigator-server/target-navigator-server.cpp
+++ b/src/app/clusters/target-navigator-server/target-navigator-server.cpp
@@ -58,7 +58,7 @@ exit:
 bool emberAfTargetNavigatorClusterNavigateTargetCallback(app::CommandHandler * command,
                                                          const app::ConcreteCommandPath & commandPath, EndpointId endpoint,
                                                          uint8_t target, uint8_t * data,
-                                                         Commands::NavigateTarget::DecodableType & fields)
+                                                         Commands::NavigateTarget::DecodableType & commandData)
 {
     // TODO: char is not null terminated, verify this code once #7963 gets merged.
     std::string dataString(reinterpret_cast<char *>(data));
diff --git a/src/app/clusters/test-cluster-server/test-cluster-server.cpp b/src/app/clusters/test-cluster-server/test-cluster-server.cpp
index 0a5066e2c..2144da317 100644
--- a/src/app/clusters/test-cluster-server/test-cluster-server.cpp
+++ b/src/app/clusters/test-cluster-server/test-cluster-server.cpp
@@ -151,7 +151,7 @@ void emberAfPluginTestClusterServerInitCallback(void)
 }
 
 bool emberAfTestClusterClusterTestCallback(app::CommandHandler *, const app::ConcreteCommandPath & commandPath, EndpointId endpoint,
-                                           Commands::Test::DecodableType & fields)
+                                           Commands::Test::DecodableType & commandData)
 {
     emberAfSendImmediateDefaultResponse(EMBER_ZCL_STATUS_SUCCESS);
     return true;
@@ -181,13 +181,13 @@ exit:
 }
 
 bool emberAfTestClusterClusterTestSpecificCallback(app::CommandHandler * apCommandObj, const app::ConcreteCommandPath & commandPath,
-                                                   EndpointId endpoint, Commands::TestSpecific::DecodableType & fields)
+                                                   EndpointId endpoint, Commands::TestSpecific::DecodableType & commandData)
 {
     return sendNumericResponse(endpoint, apCommandObj, Commands::TestSpecificResponse::Id, 7);
 }
 
 bool emberAfTestClusterClusterTestNotHandledCallback(app::CommandHandler *, const app::ConcreteCommandPath & commandPath,
-                                                     EndpointId endpoint, Commands::TestNotHandled::DecodableType & fields)
+                                                     EndpointId endpoint, Commands::TestNotHandled::DecodableType & commandData)
 {
     return false;
 }
@@ -195,7 +195,7 @@ bool emberAfTestClusterClusterTestNotHandledCallback(app::CommandHandler *, cons
 bool emberAfTestClusterClusterTestAddArgumentsCallback(app::CommandHandler * apCommandObj,
                                                        const app::ConcreteCommandPath & commandPath, EndpointId endpoint,
                                                        uint8_t arg1, uint8_t arg2,
-                                                       Commands::TestAddArguments::DecodableType & fields)
+                                                       Commands::TestAddArguments::DecodableType & commandData)
 {
     if (arg1 > UINT8_MAX - arg2)
     {
diff --git a/src/app/clusters/thermostat-server/thermostat-server.cpp b/src/app/clusters/thermostat-server/thermostat-server.cpp
index c9a4e9dab..497d588bb 100644
--- a/src/app/clusters/thermostat-server/thermostat-server.cpp
+++ b/src/app/clusters/thermostat-server/thermostat-server.cpp
@@ -258,14 +258,14 @@ EmberAfStatus emberAfThermostatClusterServerPreAttributeChangedCallback(chip::En
 
 bool emberAfThermostatClusterClearWeeklyScheduleCallback(app::CommandHandler * commandObj,
                                                          const app::ConcreteCommandPath & commandPath, EndpointId aEndpointId,
-                                                         Commands::ClearWeeklySchedule::DecodableType & fields)
+                                                         Commands::ClearWeeklySchedule::DecodableType & commandData)
 {
     // TODO
     return false;
 }
 bool emberAfThermostatClusterGetRelayStatusLogCallback(app::CommandHandler * commandObj,
                                                        const app::ConcreteCommandPath & commandPath, EndpointId aEndpointId,
-                                                       Commands::GetRelayStatusLog::DecodableType & fields)
+                                                       Commands::GetRelayStatusLog::DecodableType & commandData)
 {
     // TODO
     return false;
@@ -274,7 +274,7 @@ bool emberAfThermostatClusterGetRelayStatusLogCallback(app::CommandHandler * com
 bool emberAfThermostatClusterGetWeeklyScheduleCallback(app::CommandHandler * commandObj,
                                                        const app::ConcreteCommandPath & commandPath, EndpointId aEndpointId,
                                                        uint8_t daysToReturn, uint8_t modeToReturn,
-                                                       Commands::GetWeeklySchedule::DecodableType & fields)
+                                                       Commands::GetWeeklySchedule::DecodableType & commandData)
 {
     // TODO
     return false;
@@ -284,7 +284,7 @@ bool emberAfThermostatClusterSetWeeklyScheduleCallback(app::CommandHandler * com
                                                        const app::ConcreteCommandPath & commandPath, EndpointId aEndpointId,
                                                        uint8_t numberOfTransitionsForSequence, uint8_t daysOfWeekForSequence,
                                                        uint8_t modeForSequence, uint8_t * payload,
-                                                       Commands::SetWeeklySchedule::DecodableType & fields)
+                                                       Commands::SetWeeklySchedule::DecodableType & commandData)
 {
     // TODO
     return false;
@@ -436,7 +436,7 @@ int16_t EnforceCoolingSetpointLimits(int16_t CoolingSetpoint, EndpointId endpoin
 bool emberAfThermostatClusterSetpointRaiseLowerCallback(app::CommandHandler * commandObj,
                                                         const app::ConcreteCommandPath & commandPath, EndpointId aEndpointId,
                                                         uint8_t mode, int8_t amount,
-                                                        Commands::SetpointRaiseLower::DecodableType & fields)
+                                                        Commands::SetpointRaiseLower::DecodableType & commandData)
 {
     int16_t HeatingSetpoint = kDefaultHeatingSetpoint, CoolingSetpoint = kDefaultCoolingSetpoint; // Set to defaults to be safe
     EmberAfStatus status                     = EMBER_ZCL_STATUS_FAILURE;
diff --git a/src/app/clusters/thread_network_diagnostics_server/thread_network_diagnostics_server.cpp b/src/app/clusters/thread_network_diagnostics_server/thread_network_diagnostics_server.cpp
index 874b02858..fdcd7d97b 100644
--- a/src/app/clusters/thread_network_diagnostics_server/thread_network_diagnostics_server.cpp
+++ b/src/app/clusters/thread_network_diagnostics_server/thread_network_diagnostics_server.cpp
@@ -79,7 +79,7 @@ CHIP_ERROR ThreadDiagosticsAttrAccess::Read(ClusterInfo & aClusterInfo, const At
 
 bool emberAfThreadNetworkDiagnosticsClusterResetCountsCallback(app::CommandHandler * commandObj,
                                                                const app::ConcreteCommandPath & commandPath, EndpointId endpoint,
-                                                               Commands::ResetCounts::DecodableType & fields)
+                                                               Commands::ResetCounts::DecodableType & commandData)
 {
     EmberAfStatus status = ThreadNetworkDiagnostics::Attributes::OverrunCount::Set(endpoint, 0);
     if (status != EMBER_ZCL_STATUS_SUCCESS)
diff --git a/src/app/clusters/tv-channel-server/tv-channel-server.cpp b/src/app/clusters/tv-channel-server/tv-channel-server.cpp
index 577188e37..ebee8b104 100644
--- a/src/app/clusters/tv-channel-server/tv-channel-server.cpp
+++ b/src/app/clusters/tv-channel-server/tv-channel-server.cpp
@@ -75,7 +75,7 @@ exit:
 
 bool emberAfTvChannelClusterChangeChannelCallback(app::CommandHandler * command, const app::ConcreteCommandPath & commandPath,
                                                   EndpointId endpoint, uint8_t * match,
-                                                  Commands::ChangeChannel::DecodableType & fields)
+                                                  Commands::ChangeChannel::DecodableType & commandData)
 {
     // TODO: char is not null terminated, verify this code once #7963 gets merged.
     std::string matchString(reinterpret_cast<char *>(match));
@@ -89,7 +89,7 @@ bool emberAfTvChannelClusterChangeChannelCallback(app::CommandHandler * command,
 bool emberAfTvChannelClusterChangeChannelByNumberCallback(app::CommandHandler * command,
                                                           const app::ConcreteCommandPath & commandPath, EndpointId endpoint,
                                                           uint16_t majorNumber, uint16_t minorNumber,
-                                                          Commands::ChangeChannelByNumber::DecodableType & fields)
+                                                          Commands::ChangeChannelByNumber::DecodableType & commandData)
 {
     bool success         = tvChannelClusterChangeChannelByNumber(majorNumber, minorNumber);
     EmberAfStatus status = success ? EMBER_ZCL_STATUS_SUCCESS : EMBER_ZCL_STATUS_FAILURE;
@@ -98,7 +98,8 @@ bool emberAfTvChannelClusterChangeChannelByNumberCallback(app::CommandHandler *
 }
 
 bool emberAfTvChannelClusterSkipChannelCallback(app::CommandHandler * command, const app::ConcreteCommandPath & commandPath,
-                                                EndpointId endpoint, uint16_t count, Commands::SkipChannel::DecodableType & fields)
+                                                EndpointId endpoint, uint16_t count,
+                                                Commands::SkipChannel::DecodableType & commandData)
 {
     bool success         = tvChannelClusterSkipChannel(count);
     EmberAfStatus status = success ? EMBER_ZCL_STATUS_SUCCESS : EMBER_ZCL_STATUS_FAILURE;
diff --git a/src/app/clusters/wifi_network_diagnostics_server/wifi_network_diagnostics_server.cpp b/src/app/clusters/wifi_network_diagnostics_server/wifi_network_diagnostics_server.cpp
index b9fd508bf..ed1d6889c 100644
--- a/src/app/clusters/wifi_network_diagnostics_server/wifi_network_diagnostics_server.cpp
+++ b/src/app/clusters/wifi_network_diagnostics_server/wifi_network_diagnostics_server.cpp
@@ -128,7 +128,7 @@ CHIP_ERROR WiFiDiagosticsAttrAccess::Read(ClusterInfo & aClusterInfo, const Attr
 
 bool emberAfWiFiNetworkDiagnosticsClusterResetCountsCallback(app::CommandHandler * commandObj,
                                                              const app::ConcreteCommandPath & commandPath, EndpointId endpoint,
-                                                             Commands::ResetCounts::DecodableType & fields)
+                                                             Commands::ResetCounts::DecodableType & commandData)
 {
     EmberAfStatus status = EMBER_ZCL_STATUS_SUCCESS;
 
diff --git a/src/app/clusters/window-covering-server/window-covering-server.cpp b/src/app/clusters/window-covering-server/window-covering-server.cpp
index aa842a17c..0e6b0650c 100644
--- a/src/app/clusters/window-covering-server/window-covering-server.cpp
+++ b/src/app/clusters/window-covering-server/window-covering-server.cpp
@@ -382,7 +382,7 @@ void emberAfWindowCoveringClusterInitCallback(chip::EndpointId endpoint)
  * @brief  Cluster UpOrOpen Command callback (from client)
  */
 bool emberAfWindowCoveringClusterUpOrOpenCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath,
-                                                  EndpointId endpoint, Commands::UpOrOpen::DecodableType & fields)
+                                                  EndpointId endpoint, Commands::UpOrOpen::DecodableType & commandData)
 {
     emberAfWindowCoveringClusterPrint("UpOrOpen command received");
     if (HasFeature(endpoint, Features::Lift))
@@ -401,7 +401,7 @@ bool emberAfWindowCoveringClusterUpOrOpenCallback(app::CommandHandler * commandO
  * @brief  Cluster DownOrClose Command callback (from client)
  */
 bool emberAfWindowCoveringClusterDownOrCloseCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath,
-                                                     EndpointId endpoint, Commands::DownOrClose::DecodableType & fields)
+                                                     EndpointId endpoint, Commands::DownOrClose::DecodableType & commandData)
 {
     emberAfWindowCoveringClusterPrint("DownOrClose command received");
     if (HasFeature(endpoint, Features::Lift))
@@ -434,7 +434,7 @@ emberAfWindowCoveringClusterStopMotionCallback(app::CommandHandler * commandObj,
  */
 bool emberAfWindowCoveringClusterGoToLiftValueCallback(app::CommandHandler * commandObj,
                                                        const app::ConcreteCommandPath & commandPath, EndpointId endpoint,
-                                                       uint16_t liftValue, Commands::GoToLiftValue::DecodableType & fields)
+                                                       uint16_t liftValue, Commands::GoToLiftValue::DecodableType & commandData)
 {
     bool hasLift         = HasFeature(endpoint, Features::Lift);
     bool isPositionAware = HasFeature(endpoint, Features::PositionAware);
@@ -459,7 +459,7 @@ bool emberAfWindowCoveringClusterGoToLiftValueCallback(app::CommandHandler * com
 bool emberAfWindowCoveringClusterGoToLiftPercentageCallback(app::CommandHandler * commandObj,
                                                             const app::ConcreteCommandPath & commandPath, EndpointId endpoint,
                                                             uint8_t liftPercentageValue, uint16_t liftPercent100thsValue,
-                                                            Commands::GoToLiftPercentage::DecodableType & fields)
+                                                            Commands::GoToLiftPercentage::DecodableType & commandData)
 {
     bool hasLift         = HasFeature(endpoint, Features::Lift);
     bool isPositionAware = HasFeature(endpoint, Features::PositionAware);
@@ -484,7 +484,7 @@ bool emberAfWindowCoveringClusterGoToLiftPercentageCallback(app::CommandHandler
  */
 bool emberAfWindowCoveringClusterGoToTiltValueCallback(app::CommandHandler * commandObj,
                                                        const app::ConcreteCommandPath & commandPath, EndpointId endpoint,
-                                                       uint16_t tiltValue, Commands::GoToTiltValue::DecodableType & fields)
+                                                       uint16_t tiltValue, Commands::GoToTiltValue::DecodableType & commandData)
 {
     bool hasTilt         = HasFeature(endpoint, Features::Tilt);
     bool isPositionAware = HasFeature(endpoint, Features::PositionAware);
@@ -509,7 +509,7 @@ bool emberAfWindowCoveringClusterGoToTiltValueCallback(app::CommandHandler * com
 bool emberAfWindowCoveringClusterGoToTiltPercentageCallback(app::CommandHandler * commandObj,
                                                             const app::ConcreteCommandPath & commandPath, EndpointId endpoint,
                                                             uint8_t tiltPercentageValue, uint16_t tiltPercent100thsValue,
-                                                            Commands::GoToTiltPercentage::DecodableType & fields)
+                                                            Commands::GoToTiltPercentage::DecodableType & commandData)
 {
     bool hasTilt         = HasFeature(endpoint, Features::Tilt);
     bool isPositionAware = HasFeature(endpoint, Features::PositionAware);
diff --git a/src/app/zap-templates/partials/im_command_handler_cluster_commands.zapt b/src/app/zap-templates/partials/im_command_handler_cluster_commands.zapt
index 6e381f9ba..a31c56542 100644
--- a/src/app/zap-templates/partials/im_command_handler_cluster_commands.zapt
+++ b/src/app/zap-templates/partials/im_command_handler_cluster_commands.zapt
@@ -1,4 +1,6 @@
+{{#if (isServer parent.side)}}
 Commands::{{asUpperCamelCase name}}::DecodableType fieldStruct;
+{{/if}}
 {{#if (zcl_command_arguments_count this.id)}}
 expectArgumentCount = {{ zcl_command_arguments_count this.id }};
 {{#zcl_command_arguments}}
@@ -73,7 +75,11 @@ if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && {{zcl_comman
 {
 {{/if}}
 {{! TODO: if the command has a response command defined, put its id in the command path. }}
+{{#if (isServer parent.side)}}
 wasHandled = emberAf{{asUpperCamelCase parent.name}}Cluster{{asUpperCamelCase name}}Callback(apCommandObj, aCommandPath, aCommandPath.mEndpointId, {{#zcl_command_arguments}}{{#if (isCharString type)}}const_cast<uint8_t*>({{asSymbol label}}){{else}}{{asSymbol label}}{{/if}},{{/zcl_command_arguments}} fieldStruct);
+{{else}}
+wasHandled = emberAf{{asUpperCamelCase parent.name}}Cluster{{asUpperCamelCase name}}Callback(aCommandPath.mEndpointId, apCommandObj{{#zcl_command_arguments}}, {{#if (isCharString type)}}const_cast<uint8_t*>({{asSymbol label}}){{else}}{{asSymbol label}}{{/if}}{{/zcl_command_arguments}});
+{{/if}}
 {{#if (zcl_command_arguments_count this.id)}}
 }
 {{/if}}
diff --git a/src/app/zap-templates/templates/app/CHIPClientCallbacks-src.zapt b/src/app/zap-templates/templates/app/CHIPClientCallbacks-src.zapt
index 7c6810ca1..91a13139e 100644
--- a/src/app/zap-templates/templates/app/CHIPClientCallbacks-src.zapt
+++ b/src/app/zap-templates/templates/app/CHIPClientCallbacks-src.zapt
@@ -6,9 +6,7 @@
 #include <cinttypes>
 
 #include <app/Command.h>
-#include <app/ConcreteCommandPath.h>
 #include <app-common/zap-generated/enums.h>
-#include <app-common/zap-generated/cluster-objects.h>
 #include <app/util/af.h>
 #include <app/util/af-enums.h>
 #include <app/util/attribute-list-byte-span.h>
@@ -409,7 +407,7 @@ void {{asUpperCamelCase parent.name}}Cluster{{asUpperCamelCase name}}ListAttribu
 
 {{#chip_client_clusters}}
 {{#chip_cluster_responses}}
-bool emberAf{{asUpperCamelCase parent.name}}Cluster{{asUpperCamelCase name}}Callback(app::CommandSender * commandObj, const app::ConcreteCommandPath & commandPath, EndpointId endpoint, {{#chip_cluster_response_arguments}}{{asUnderlyingZclType type}} {{asSymbol label}}, {{/chip_cluster_response_arguments}}app::Clusters::{{asUpperCamelCase parent.name}}::Commands::{{asUpperCamelCase name}}::DecodableType & fields)
+bool emberAf{{asUpperCamelCase parent.name}}Cluster{{asUpperCamelCase name}}Callback(EndpointId endpoint, app::CommandSender * commandObj{{#chip_cluster_response_arguments}}, {{asUnderlyingZclType type}} {{asSymbol label}}{{/chip_cluster_response_arguments}})
 {
     ChipLogProgress(Zcl, "{{asUpperCamelCase name}}:");
     {{#chip_cluster_response_arguments}}
diff --git a/src/app/zap-templates/templates/app/callback.zapt b/src/app/zap-templates/templates/app/callback.zapt
index 85b69a6a7..c4849ee9a 100644
--- a/src/app/zap-templates/templates/app/callback.zapt
+++ b/src/app/zap-templates/templates/app/callback.zapt
@@ -174,9 +174,15 @@ void emberAf{{asUpperCamelCase label}}ClusterClientTickCallback(chip::EndpointId
 /**
  * @brief {{parent.name}} Cluster {{name}} Command callback (from {{source}})
  */
-bool emberAf{{asUpperCamelCase parent.label}}Cluster{{asUpperCamelCase name}}Callback({{#if (isServer source)}}chip::app::CommandSender{{else}}chip::app::CommandHandler{{/if}} * commandObj,
+ {{#if (isServer source)}}
+bool emberAf{{asUpperCamelCase parent.label}}Cluster{{asUpperCamelCase name}}Callback(chip::EndpointId endpoint,
+       chip::app::CommandSender * commandObj
+       {{#zcl_command_arguments}}, {{asUnderlyingZclType type}} {{asSymbol label}}{{/zcl_command_arguments}});
+ {{else}}
+bool emberAf{{asUpperCamelCase parent.label}}Cluster{{asUpperCamelCase name}}Callback(chip::app::CommandHandler * commandObj,
       const chip::app::ConcreteCommandPath & commandPath, chip::EndpointId endpoint,
       {{#zcl_command_arguments}}{{asUnderlyingZclType type}} {{asSymbol label}},{{/zcl_command_arguments}} chip::app::Clusters::{{asUpperCamelCase parent.label}}::Commands::{{asUpperCamelCase name}}::DecodableType & fields);
+{{/if}}
 {{/zcl_commands}}
 {{/zcl_clusters}}
 
diff --git a/zzz_generated/app-common/app-common/zap-generated/callback.h b/zzz_generated/app-common/app-common/zap-generated/callback.h
index c15c9cca8..6b248336e 100644
--- a/zzz_generated/app-common/app-common/zap-generated/callback.h
+++ b/zzz_generated/app-common/app-common/zap-generated/callback.h
@@ -15170,9 +15170,8 @@ bool emberAfIdentifyClusterIdentifyCallback(chip::app::CommandHandler * commandO
 /**
  * @brief Identify Cluster IdentifyQueryResponse Command callback (from server)
  */
-bool emberAfIdentifyClusterIdentifyQueryResponseCallback(
-    chip::app::CommandSender * commandObj, const chip::app::ConcreteCommandPath & commandPath, chip::EndpointId endpoint,
-    uint16_t timeout, chip::app::Clusters::Identify::Commands::IdentifyQueryResponse::DecodableType & fields);
+bool emberAfIdentifyClusterIdentifyQueryResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj,
+                                                         uint16_t timeout);
 /**
  * @brief Identify Cluster IdentifyQuery Command callback (from client)
  */
@@ -15196,10 +15195,8 @@ bool emberAfGroupsClusterAddGroupCallback(chip::app::CommandHandler * commandObj
 /**
  * @brief Groups Cluster AddGroupResponse Command callback (from server)
  */
-bool emberAfGroupsClusterAddGroupResponseCallback(chip::app::CommandSender * commandObj,
-                                                  const chip::app::ConcreteCommandPath & commandPath, chip::EndpointId endpoint,
-                                                  uint8_t status, uint16_t groupId,
-                                                  chip::app::Clusters::Groups::Commands::AddGroupResponse::DecodableType & fields);
+bool emberAfGroupsClusterAddGroupResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj, uint8_t status,
+                                                  uint16_t groupId);
 /**
  * @brief Groups Cluster ViewGroup Command callback (from client)
  */
@@ -15210,10 +15207,8 @@ bool emberAfGroupsClusterViewGroupCallback(chip::app::CommandHandler * commandOb
 /**
  * @brief Groups Cluster ViewGroupResponse Command callback (from server)
  */
-bool emberAfGroupsClusterViewGroupResponseCallback(
-    chip::app::CommandSender * commandObj, const chip::app::ConcreteCommandPath & commandPath, chip::EndpointId endpoint,
-    uint8_t status, uint16_t groupId, uint8_t * groupName,
-    chip::app::Clusters::Groups::Commands::ViewGroupResponse::DecodableType & fields);
+bool emberAfGroupsClusterViewGroupResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj, uint8_t status,
+                                                   uint16_t groupId, uint8_t * groupName);
 /**
  * @brief Groups Cluster GetGroupMembership Command callback (from client)
  */
@@ -15224,10 +15219,9 @@ bool emberAfGroupsClusterGetGroupMembershipCallback(
 /**
  * @brief Groups Cluster GetGroupMembershipResponse Command callback (from server)
  */
-bool emberAfGroupsClusterGetGroupMembershipResponseCallback(
-    chip::app::CommandSender * commandObj, const chip::app::ConcreteCommandPath & commandPath, chip::EndpointId endpoint,
-    uint8_t capacity, uint8_t groupCount, /* TYPE WARNING: array array defaults to */ uint8_t * groupList,
-    chip::app::Clusters::Groups::Commands::GetGroupMembershipResponse::DecodableType & fields);
+bool emberAfGroupsClusterGetGroupMembershipResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj,
+                                                            uint8_t capacity, uint8_t groupCount,
+                                                            /* TYPE WARNING: array array defaults to */ uint8_t * groupList);
 /**
  * @brief Groups Cluster RemoveGroup Command callback (from client)
  */
@@ -15238,9 +15232,8 @@ bool emberAfGroupsClusterRemoveGroupCallback(chip::app::CommandHandler * command
 /**
  * @brief Groups Cluster RemoveGroupResponse Command callback (from server)
  */
-bool emberAfGroupsClusterRemoveGroupResponseCallback(
-    chip::app::CommandSender * commandObj, const chip::app::ConcreteCommandPath & commandPath, chip::EndpointId endpoint,
-    uint8_t status, uint16_t groupId, chip::app::Clusters::Groups::Commands::RemoveGroupResponse::DecodableType & fields);
+bool emberAfGroupsClusterRemoveGroupResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj,
+                                                     uint8_t status, uint16_t groupId);
 /**
  * @brief Groups Cluster RemoveAllGroups Command callback (from client)
  */
@@ -15264,10 +15257,8 @@ bool emberAfScenesClusterAddSceneCallback(chip::app::CommandHandler * commandObj
 /**
  * @brief Scenes Cluster AddSceneResponse Command callback (from server)
  */
-bool emberAfScenesClusterAddSceneResponseCallback(chip::app::CommandSender * commandObj,
-                                                  const chip::app::ConcreteCommandPath & commandPath, chip::EndpointId endpoint,
-                                                  uint8_t status, uint16_t groupId, uint8_t sceneId,
-                                                  chip::app::Clusters::Scenes::Commands::AddSceneResponse::DecodableType & fields);
+bool emberAfScenesClusterAddSceneResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj, uint8_t status,
+                                                  uint16_t groupId, uint8_t sceneId);
 /**
  * @brief Scenes Cluster ViewScene Command callback (from client)
  */
@@ -15278,11 +15269,9 @@ bool emberAfScenesClusterViewSceneCallback(chip::app::CommandHandler * commandOb
 /**
  * @brief Scenes Cluster ViewSceneResponse Command callback (from server)
  */
-bool emberAfScenesClusterViewSceneResponseCallback(
-    chip::app::CommandSender * commandObj, const chip::app::ConcreteCommandPath & commandPath, chip::EndpointId endpoint,
-    uint8_t status, uint16_t groupId, uint8_t sceneId, uint16_t transitionTime, uint8_t * sceneName,
-    /* TYPE WARNING: array array defaults to */ uint8_t * extensionFieldSets,
-    chip::app::Clusters::Scenes::Commands::ViewSceneResponse::DecodableType & fields);
+bool emberAfScenesClusterViewSceneResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj, uint8_t status,
+                                                   uint16_t groupId, uint8_t sceneId, uint16_t transitionTime, uint8_t * sceneName,
+                                                   /* TYPE WARNING: array array defaults to */ uint8_t * extensionFieldSets);
 /**
  * @brief Scenes Cluster RemoveScene Command callback (from client)
  */
@@ -15293,10 +15282,8 @@ bool emberAfScenesClusterRemoveSceneCallback(chip::app::CommandHandler * command
 /**
  * @brief Scenes Cluster RemoveSceneResponse Command callback (from server)
  */
-bool emberAfScenesClusterRemoveSceneResponseCallback(
-    chip::app::CommandSender * commandObj, const chip::app::ConcreteCommandPath & commandPath, chip::EndpointId endpoint,
-    uint8_t status, uint16_t groupId, uint8_t sceneId,
-    chip::app::Clusters::Scenes::Commands::RemoveSceneResponse::DecodableType & fields);
+bool emberAfScenesClusterRemoveSceneResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj,
+                                                     uint8_t status, uint16_t groupId, uint8_t sceneId);
 /**
  * @brief Scenes Cluster RemoveAllScenes Command callback (from client)
  */
@@ -15307,9 +15294,8 @@ bool emberAfScenesClusterRemoveAllScenesCallback(chip::app::CommandHandler * com
 /**
  * @brief Scenes Cluster RemoveAllScenesResponse Command callback (from server)
  */
-bool emberAfScenesClusterRemoveAllScenesResponseCallback(
-    chip::app::CommandSender * commandObj, const chip::app::ConcreteCommandPath & commandPath, chip::EndpointId endpoint,
-    uint8_t status, uint16_t groupId, chip::app::Clusters::Scenes::Commands::RemoveAllScenesResponse::DecodableType & fields);
+bool emberAfScenesClusterRemoveAllScenesResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj,
+                                                         uint8_t status, uint16_t groupId);
 /**
  * @brief Scenes Cluster StoreScene Command callback (from client)
  */
@@ -15320,10 +15306,8 @@ bool emberAfScenesClusterStoreSceneCallback(chip::app::CommandHandler * commandO
 /**
  * @brief Scenes Cluster StoreSceneResponse Command callback (from server)
  */
-bool emberAfScenesClusterStoreSceneResponseCallback(
-    chip::app::CommandSender * commandObj, const chip::app::ConcreteCommandPath & commandPath, chip::EndpointId endpoint,
-    uint8_t status, uint16_t groupId, uint8_t sceneId,
-    chip::app::Clusters::Scenes::Commands::StoreSceneResponse::DecodableType & fields);
+bool emberAfScenesClusterStoreSceneResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj,
+                                                    uint8_t status, uint16_t groupId, uint8_t sceneId);
 /**
  * @brief Scenes Cluster RecallScene Command callback (from client)
  */
@@ -15340,11 +15324,9 @@ bool emberAfScenesClusterGetSceneMembershipCallback(
 /**
  * @brief Scenes Cluster GetSceneMembershipResponse Command callback (from server)
  */
-bool emberAfScenesClusterGetSceneMembershipResponseCallback(
-    chip::app::CommandSender * commandObj, const chip::app::ConcreteCommandPath & commandPath, chip::EndpointId endpoint,
-    uint8_t status, uint8_t capacity, uint16_t groupId, uint8_t sceneCount,
-    /* TYPE WARNING: array array defaults to */ uint8_t * sceneList,
-    chip::app::Clusters::Scenes::Commands::GetSceneMembershipResponse::DecodableType & fields);
+bool emberAfScenesClusterGetSceneMembershipResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj,
+                                                            uint8_t status, uint8_t capacity, uint16_t groupId, uint8_t sceneCount,
+                                                            /* TYPE WARNING: array array defaults to */ uint8_t * sceneList);
 /**
  * @brief Scenes Cluster EnhancedAddScene Command callback (from client)
  */
@@ -15356,10 +15338,8 @@ bool emberAfScenesClusterEnhancedAddSceneCallback(chip::app::CommandHandler * co
 /**
  * @brief Scenes Cluster EnhancedAddSceneResponse Command callback (from server)
  */
-bool emberAfScenesClusterEnhancedAddSceneResponseCallback(
-    chip::app::CommandSender * commandObj, const chip::app::ConcreteCommandPath & commandPath, chip::EndpointId endpoint,
-    uint8_t status, uint16_t groupId, uint8_t sceneId,
-    chip::app::Clusters::Scenes::Commands::EnhancedAddSceneResponse::DecodableType & fields);
+bool emberAfScenesClusterEnhancedAddSceneResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj,
+                                                          uint8_t status, uint16_t groupId, uint8_t sceneId);
 /**
  * @brief Scenes Cluster EnhancedViewScene Command callback (from client)
  */
@@ -15370,10 +15350,8 @@ bool emberAfScenesClusterEnhancedViewSceneCallback(
  * @brief Scenes Cluster EnhancedViewSceneResponse Command callback (from server)
  */
 bool emberAfScenesClusterEnhancedViewSceneResponseCallback(
-    chip::app::CommandSender * commandObj, const chip::app::ConcreteCommandPath & commandPath, chip::EndpointId endpoint,
-    uint8_t status, uint16_t groupId, uint8_t sceneId, uint16_t transitionTime, uint8_t * sceneName,
-    /* TYPE WARNING: array array defaults to */ uint8_t * extensionFieldSets,
-    chip::app::Clusters::Scenes::Commands::EnhancedViewSceneResponse::DecodableType & fields);
+    chip::EndpointId endpoint, chip::app::CommandSender * commandObj, uint8_t status, uint16_t groupId, uint8_t sceneId,
+    uint16_t transitionTime, uint8_t * sceneName, /* TYPE WARNING: array array defaults to */ uint8_t * extensionFieldSets);
 /**
  * @brief Scenes Cluster CopyScene Command callback (from client)
  */
@@ -15385,10 +15363,8 @@ bool emberAfScenesClusterCopySceneCallback(chip::app::CommandHandler * commandOb
 /**
  * @brief Scenes Cluster CopySceneResponse Command callback (from server)
  */
-bool emberAfScenesClusterCopySceneResponseCallback(
-    chip::app::CommandSender * commandObj, const chip::app::ConcreteCommandPath & commandPath, chip::EndpointId endpoint,
-    uint8_t status, uint16_t groupIdFrom, uint8_t sceneIdFrom,
-    chip::app::Clusters::Scenes::Commands::CopySceneResponse::DecodableType & fields);
+bool emberAfScenesClusterCopySceneResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj, uint8_t status,
+                                                   uint16_t groupIdFrom, uint8_t sceneIdFrom);
 /**
  * @brief On/Off Cluster Off Command callback (from client)
  */
@@ -15520,9 +15496,8 @@ bool emberAfAlarmsClusterResetAlarmCallback(chip::app::CommandHandler * commandO
 /**
  * @brief Alarms Cluster Alarm Command callback (from server)
  */
-bool emberAfAlarmsClusterAlarmCallback(chip::app::CommandSender * commandObj, const chip::app::ConcreteCommandPath & commandPath,
-                                       chip::EndpointId endpoint, uint8_t alarmCode, chip::ClusterId clusterId,
-                                       chip::app::Clusters::Alarms::Commands::Alarm::DecodableType & fields);
+bool emberAfAlarmsClusterAlarmCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj, uint8_t alarmCode,
+                                       chip::ClusterId clusterId);
 /**
  * @brief Alarms Cluster ResetAllAlarms Command callback (from client)
  */
@@ -15532,10 +15507,8 @@ bool emberAfAlarmsClusterResetAllAlarmsCallback(chip::app::CommandHandler * comm
 /**
  * @brief Alarms Cluster GetAlarmResponse Command callback (from server)
  */
-bool emberAfAlarmsClusterGetAlarmResponseCallback(chip::app::CommandSender * commandObj,
-                                                  const chip::app::ConcreteCommandPath & commandPath, chip::EndpointId endpoint,
-                                                  uint8_t status, uint8_t alarmCode, chip::ClusterId clusterId, uint32_t timeStamp,
-                                                  chip::app::Clusters::Alarms::Commands::GetAlarmResponse::DecodableType & fields);
+bool emberAfAlarmsClusterGetAlarmResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj, uint8_t status,
+                                                  uint8_t alarmCode, chip::ClusterId clusterId, uint32_t timeStamp);
 /**
  * @brief Alarms Cluster GetAlarm Command callback (from client)
  */
@@ -15558,10 +15531,8 @@ bool emberAfPowerProfileClusterPowerProfileRequestCallback(
  * @brief Power Profile Cluster PowerProfileNotification Command callback (from server)
  */
 bool emberAfPowerProfileClusterPowerProfileNotificationCallback(
-    chip::app::CommandSender * commandObj, const chip::app::ConcreteCommandPath & commandPath, chip::EndpointId endpoint,
-    uint8_t totalProfileNum, uint8_t powerProfileId, uint8_t numOfTransferredPhases,
-    /* TYPE WARNING: array array defaults to */ uint8_t * transferredPhases,
-    chip::app::Clusters::PowerProfile::Commands::PowerProfileNotification::DecodableType & fields);
+    chip::EndpointId endpoint, chip::app::CommandSender * commandObj, uint8_t totalProfileNum, uint8_t powerProfileId,
+    uint8_t numOfTransferredPhases, /* TYPE WARNING: array array defaults to */ uint8_t * transferredPhases);
 /**
  * @brief Power Profile Cluster PowerProfileStateRequest Command callback (from client)
  */
@@ -15572,10 +15543,8 @@ bool emberAfPowerProfileClusterPowerProfileStateRequestCallback(
  * @brief Power Profile Cluster PowerProfileResponse Command callback (from server)
  */
 bool emberAfPowerProfileClusterPowerProfileResponseCallback(
-    chip::app::CommandSender * commandObj, const chip::app::ConcreteCommandPath & commandPath, chip::EndpointId endpoint,
-    uint8_t totalProfileNum, uint8_t powerProfileId, uint8_t numOfTransferredPhases,
-    /* TYPE WARNING: array array defaults to */ uint8_t * transferredPhases,
-    chip::app::Clusters::PowerProfile::Commands::PowerProfileResponse::DecodableType & fields);
+    chip::EndpointId endpoint, chip::app::CommandSender * commandObj, uint8_t totalProfileNum, uint8_t powerProfileId,
+    uint8_t numOfTransferredPhases, /* TYPE WARNING: array array defaults to */ uint8_t * transferredPhases);
 /**
  * @brief Power Profile Cluster GetPowerProfilePriceResponse Command callback (from client)
  */
@@ -15587,9 +15556,8 @@ bool emberAfPowerProfileClusterGetPowerProfilePriceResponseCallback(
  * @brief Power Profile Cluster PowerProfileStateResponse Command callback (from server)
  */
 bool emberAfPowerProfileClusterPowerProfileStateResponseCallback(
-    chip::app::CommandSender * commandObj, const chip::app::ConcreteCommandPath & commandPath, chip::EndpointId endpoint,
-    uint8_t powerProfileCount, /* TYPE WARNING: array array defaults to */ uint8_t * powerProfileRecords,
-    chip::app::Clusters::PowerProfile::Commands::PowerProfileStateResponse::DecodableType & fields);
+    chip::EndpointId endpoint, chip::app::CommandSender * commandObj, uint8_t powerProfileCount,
+    /* TYPE WARNING: array array defaults to */ uint8_t * powerProfileRecords);
 /**
  * @brief Power Profile Cluster GetOverallSchedulePriceResponse Command callback (from client)
  */
@@ -15600,9 +15568,8 @@ bool emberAfPowerProfileClusterGetOverallSchedulePriceResponseCallback(
 /**
  * @brief Power Profile Cluster GetPowerProfilePrice Command callback (from server)
  */
-bool emberAfPowerProfileClusterGetPowerProfilePriceCallback(
-    chip::app::CommandSender * commandObj, const chip::app::ConcreteCommandPath & commandPath, chip::EndpointId endpoint,
-    uint8_t powerProfileId, chip::app::Clusters::PowerProfile::Commands::GetPowerProfilePrice::DecodableType & fields);
+bool emberAfPowerProfileClusterGetPowerProfilePriceCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj,
+                                                            uint8_t powerProfileId);
 /**
  * @brief Power Profile Cluster EnergyPhasesScheduleNotification Command callback (from client)
  */
@@ -15614,9 +15581,8 @@ bool emberAfPowerProfileClusterEnergyPhasesScheduleNotificationCallback(
  * @brief Power Profile Cluster PowerProfilesStateNotification Command callback (from server)
  */
 bool emberAfPowerProfileClusterPowerProfilesStateNotificationCallback(
-    chip::app::CommandSender * commandObj, const chip::app::ConcreteCommandPath & commandPath, chip::EndpointId endpoint,
-    uint8_t powerProfileCount, /* TYPE WARNING: array array defaults to */ uint8_t * powerProfileRecords,
-    chip::app::Clusters::PowerProfile::Commands::PowerProfilesStateNotification::DecodableType & fields);
+    chip::EndpointId endpoint, chip::app::CommandSender * commandObj, uint8_t powerProfileCount,
+    /* TYPE WARNING: array array defaults to */ uint8_t * powerProfileRecords);
 /**
  * @brief Power Profile Cluster EnergyPhasesScheduleResponse Command callback (from client)
  */
@@ -15627,9 +15593,7 @@ bool emberAfPowerProfileClusterEnergyPhasesScheduleResponseCallback(
 /**
  * @brief Power Profile Cluster GetOverallSchedulePrice Command callback (from server)
  */
-bool emberAfPowerProfileClusterGetOverallSchedulePriceCallback(
-    chip::app::CommandSender * commandObj, const chip::app::ConcreteCommandPath & commandPath, chip::EndpointId endpoint,
-    chip::app::Clusters::PowerProfile::Commands::GetOverallSchedulePrice::DecodableType & fields);
+bool emberAfPowerProfileClusterGetOverallSchedulePriceCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj);
 /**
  * @brief Power Profile Cluster PowerProfileScheduleConstraintsRequest Command callback (from client)
  */
@@ -15640,9 +15604,8 @@ bool emberAfPowerProfileClusterPowerProfileScheduleConstraintsRequestCallback(
 /**
  * @brief Power Profile Cluster EnergyPhasesScheduleRequest Command callback (from server)
  */
-bool emberAfPowerProfileClusterEnergyPhasesScheduleRequestCallback(
-    chip::app::CommandSender * commandObj, const chip::app::ConcreteCommandPath & commandPath, chip::EndpointId endpoint,
-    uint8_t powerProfileId, chip::app::Clusters::PowerProfile::Commands::EnergyPhasesScheduleRequest::DecodableType & fields);
+bool emberAfPowerProfileClusterEnergyPhasesScheduleRequestCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj,
+                                                                   uint8_t powerProfileId);
 /**
  * @brief Power Profile Cluster EnergyPhasesScheduleStateRequest Command callback (from client)
  */
@@ -15653,9 +15616,8 @@ bool emberAfPowerProfileClusterEnergyPhasesScheduleStateRequestCallback(
  * @brief Power Profile Cluster EnergyPhasesScheduleStateResponse Command callback (from server)
  */
 bool emberAfPowerProfileClusterEnergyPhasesScheduleStateResponseCallback(
-    chip::app::CommandSender * commandObj, const chip::app::ConcreteCommandPath & commandPath, chip::EndpointId endpoint,
-    uint8_t powerProfileId, uint8_t numOfScheduledPhases, /* TYPE WARNING: array array defaults to */ uint8_t * scheduledPhases,
-    chip::app::Clusters::PowerProfile::Commands::EnergyPhasesScheduleStateResponse::DecodableType & fields);
+    chip::EndpointId endpoint, chip::app::CommandSender * commandObj, uint8_t powerProfileId, uint8_t numOfScheduledPhases,
+    /* TYPE WARNING: array array defaults to */ uint8_t * scheduledPhases);
 /**
  * @brief Power Profile Cluster GetPowerProfilePriceExtendedResponse Command callback (from client)
  */
@@ -15667,30 +15629,28 @@ bool emberAfPowerProfileClusterGetPowerProfilePriceExtendedResponseCallback(
  * @brief Power Profile Cluster EnergyPhasesScheduleStateNotification Command callback (from server)
  */
 bool emberAfPowerProfileClusterEnergyPhasesScheduleStateNotificationCallback(
-    chip::app::CommandSender * commandObj, const chip::app::ConcreteCommandPath & commandPath, chip::EndpointId endpoint,
-    uint8_t powerProfileId, uint8_t numOfScheduledPhases, /* TYPE WARNING: array array defaults to */ uint8_t * scheduledPhases,
-    chip::app::Clusters::PowerProfile::Commands::EnergyPhasesScheduleStateNotification::DecodableType & fields);
+    chip::EndpointId endpoint, chip::app::CommandSender * commandObj, uint8_t powerProfileId, uint8_t numOfScheduledPhases,
+    /* TYPE WARNING: array array defaults to */ uint8_t * scheduledPhases);
 /**
  * @brief Power Profile Cluster PowerProfileScheduleConstraintsNotification Command callback (from server)
  */
-bool emberAfPowerProfileClusterPowerProfileScheduleConstraintsNotificationCallback(
-    chip::app::CommandSender * commandObj, const chip::app::ConcreteCommandPath & commandPath, chip::EndpointId endpoint,
-    uint8_t powerProfileId, uint16_t startAfter, uint16_t stopBefore,
-    chip::app::Clusters::PowerProfile::Commands::PowerProfileScheduleConstraintsNotification::DecodableType & fields);
+bool emberAfPowerProfileClusterPowerProfileScheduleConstraintsNotificationCallback(chip::EndpointId endpoint,
+                                                                                   chip::app::CommandSender * commandObj,
+                                                                                   uint8_t powerProfileId, uint16_t startAfter,
+                                                                                   uint16_t stopBefore);
 /**
  * @brief Power Profile Cluster PowerProfileScheduleConstraintsResponse Command callback (from server)
  */
-bool emberAfPowerProfileClusterPowerProfileScheduleConstraintsResponseCallback(
-    chip::app::CommandSender * commandObj, const chip::app::ConcreteCommandPath & commandPath, chip::EndpointId endpoint,
-    uint8_t powerProfileId, uint16_t startAfter, uint16_t stopBefore,
-    chip::app::Clusters::PowerProfile::Commands::PowerProfileScheduleConstraintsResponse::DecodableType & fields);
+bool emberAfPowerProfileClusterPowerProfileScheduleConstraintsResponseCallback(chip::EndpointId endpoint,
+                                                                               chip::app::CommandSender * commandObj,
+                                                                               uint8_t powerProfileId, uint16_t startAfter,
+                                                                               uint16_t stopBefore);
 /**
  * @brief Power Profile Cluster GetPowerProfilePriceExtended Command callback (from server)
  */
-bool emberAfPowerProfileClusterGetPowerProfilePriceExtendedCallback(
-    chip::app::CommandSender * commandObj, const chip::app::ConcreteCommandPath & commandPath, chip::EndpointId endpoint,
-    uint8_t options, uint8_t powerProfileId, uint16_t powerProfileStartTime,
-    chip::app::Clusters::PowerProfile::Commands::GetPowerProfilePriceExtended::DecodableType & fields);
+bool emberAfPowerProfileClusterGetPowerProfilePriceExtendedCallback(chip::EndpointId endpoint,
+                                                                    chip::app::CommandSender * commandObj, uint8_t options,
+                                                                    uint8_t powerProfileId, uint16_t powerProfileStartTime);
 /**
  * @brief Appliance Control Cluster ExecutionOfACommand Command callback (from client)
  */
@@ -15700,10 +15660,9 @@ bool emberAfApplianceControlClusterExecutionOfACommandCallback(
 /**
  * @brief Appliance Control Cluster SignalStateResponse Command callback (from server)
  */
-bool emberAfApplianceControlClusterSignalStateResponseCallback(
-    chip::app::CommandSender * commandObj, const chip::app::ConcreteCommandPath & commandPath, chip::EndpointId endpoint,
-    uint8_t applianceStatus, uint8_t remoteEnableFlagsAndDeviceStatus2, uint32_t applianceStatus2,
-    chip::app::Clusters::ApplianceControl::Commands::SignalStateResponse::DecodableType & fields);
+bool emberAfApplianceControlClusterSignalStateResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj,
+                                                               uint8_t applianceStatus, uint8_t remoteEnableFlagsAndDeviceStatus2,
+                                                               uint32_t applianceStatus2);
 /**
  * @brief Appliance Control Cluster SignalState Command callback (from client)
  */
@@ -15713,10 +15672,10 @@ bool emberAfApplianceControlClusterSignalStateCallback(
 /**
  * @brief Appliance Control Cluster SignalStateNotification Command callback (from server)
  */
-bool emberAfApplianceControlClusterSignalStateNotificationCallback(
-    chip::app::CommandSender * commandObj, const chip::app::ConcreteCommandPath & commandPath, chip::EndpointId endpoint,
-    uint8_t applianceStatus, uint8_t remoteEnableFlagsAndDeviceStatus2, uint32_t applianceStatus2,
-    chip::app::Clusters::ApplianceControl::Commands::SignalStateNotification::DecodableType & fields);
+bool emberAfApplianceControlClusterSignalStateNotificationCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj,
+                                                                   uint8_t applianceStatus,
+                                                                   uint8_t remoteEnableFlagsAndDeviceStatus2,
+                                                                   uint32_t applianceStatus2);
 /**
  * @brief Appliance Control Cluster WriteFunctions Command callback (from client)
  */
@@ -15745,9 +15704,7 @@ bool emberAfApplianceControlClusterOverloadWarningCallback(
 /**
  * @brief Poll Control Cluster CheckIn Command callback (from server)
  */
-bool emberAfPollControlClusterCheckInCallback(chip::app::CommandSender * commandObj,
-                                              const chip::app::ConcreteCommandPath & commandPath, chip::EndpointId endpoint,
-                                              chip::app::Clusters::PollControl::Commands::CheckIn::DecodableType & fields);
+bool emberAfPollControlClusterCheckInCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj);
 /**
  * @brief Poll Control Cluster CheckInResponse Command callback (from client)
  */
@@ -15776,9 +15733,7 @@ bool emberAfPollControlClusterSetShortPollIntervalCallback(
 /**
  * @brief Basic Cluster StartUp Command callback (from server)
  */
-bool emberAfBasicClusterStartUpCallback(chip::app::CommandSender * commandObj, const chip::app::ConcreteCommandPath & commandPath,
-                                        chip::EndpointId endpoint,
-                                        chip::app::Clusters::Basic::Commands::StartUp::DecodableType & fields);
+bool emberAfBasicClusterStartUpCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj);
 /**
  * @brief Basic Cluster MfgSpecificPing Command callback (from client)
  */
@@ -15788,15 +15743,11 @@ bool emberAfBasicClusterMfgSpecificPingCallback(chip::app::CommandHandler * comm
 /**
  * @brief Basic Cluster ShutDown Command callback (from server)
  */
-bool emberAfBasicClusterShutDownCallback(chip::app::CommandSender * commandObj, const chip::app::ConcreteCommandPath & commandPath,
-                                         chip::EndpointId endpoint,
-                                         chip::app::Clusters::Basic::Commands::ShutDown::DecodableType & fields);
+bool emberAfBasicClusterShutDownCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj);
 /**
  * @brief Basic Cluster Leave Command callback (from server)
  */
-bool emberAfBasicClusterLeaveCallback(chip::app::CommandSender * commandObj, const chip::app::ConcreteCommandPath & commandPath,
-                                      chip::EndpointId endpoint,
-                                      chip::app::Clusters::Basic::Commands::Leave::DecodableType & fields);
+bool emberAfBasicClusterLeaveCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj);
 /**
  * @brief OTA Software Update Provider Cluster QueryImage Command callback (from client)
  */
@@ -15822,18 +15773,18 @@ bool emberAfOtaSoftwareUpdateProviderClusterNotifyUpdateAppliedCallback(
 /**
  * @brief OTA Software Update Provider Cluster QueryImageResponse Command callback (from server)
  */
-bool emberAfOtaSoftwareUpdateProviderClusterQueryImageResponseCallback(
-    chip::app::CommandSender * commandObj, const chip::app::ConcreteCommandPath & commandPath, chip::EndpointId endpoint,
-    uint8_t status, uint32_t delayedActionTime, uint8_t * imageURI, uint32_t softwareVersion, uint8_t * softwareVersionString,
-    chip::ByteSpan updateToken, bool userConsentNeeded, chip::ByteSpan metadataForRequestor,
-    chip::app::Clusters::OtaSoftwareUpdateProvider::Commands::QueryImageResponse::DecodableType & fields);
+bool emberAfOtaSoftwareUpdateProviderClusterQueryImageResponseCallback(chip::EndpointId endpoint,
+                                                                       chip::app::CommandSender * commandObj, uint8_t status,
+                                                                       uint32_t delayedActionTime, uint8_t * imageURI,
+                                                                       uint32_t softwareVersion, uint8_t * softwareVersionString,
+                                                                       chip::ByteSpan updateToken, bool userConsentNeeded,
+                                                                       chip::ByteSpan metadataForRequestor);
 /**
  * @brief OTA Software Update Provider Cluster ApplyUpdateRequestResponse Command callback (from server)
  */
-bool emberAfOtaSoftwareUpdateProviderClusterApplyUpdateRequestResponseCallback(
-    chip::app::CommandSender * commandObj, const chip::app::ConcreteCommandPath & commandPath, chip::EndpointId endpoint,
-    uint8_t action, uint32_t delayedActionTime,
-    chip::app::Clusters::OtaSoftwareUpdateProvider::Commands::ApplyUpdateRequestResponse::DecodableType & fields);
+bool emberAfOtaSoftwareUpdateProviderClusterApplyUpdateRequestResponseCallback(chip::EndpointId endpoint,
+                                                                               chip::app::CommandSender * commandObj,
+                                                                               uint8_t action, uint32_t delayedActionTime);
 /**
  * @brief OTA Software Update Requestor Cluster AnnounceOtaProvider Command callback (from client)
  */
@@ -15851,10 +15802,8 @@ bool emberAfGeneralCommissioningClusterArmFailSafeCallback(
 /**
  * @brief General Commissioning Cluster ArmFailSafeResponse Command callback (from server)
  */
-bool emberAfGeneralCommissioningClusterArmFailSafeResponseCallback(
-    chip::app::CommandSender * commandObj, const chip::app::ConcreteCommandPath & commandPath, chip::EndpointId endpoint,
-    uint8_t errorCode, uint8_t * debugText,
-    chip::app::Clusters::GeneralCommissioning::Commands::ArmFailSafeResponse::DecodableType & fields);
+bool emberAfGeneralCommissioningClusterArmFailSafeResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj,
+                                                                   uint8_t errorCode, uint8_t * debugText);
 /**
  * @brief General Commissioning Cluster SetRegulatoryConfig Command callback (from client)
  */
@@ -15865,10 +15814,9 @@ bool emberAfGeneralCommissioningClusterSetRegulatoryConfigCallback(
 /**
  * @brief General Commissioning Cluster SetRegulatoryConfigResponse Command callback (from server)
  */
-bool emberAfGeneralCommissioningClusterSetRegulatoryConfigResponseCallback(
-    chip::app::CommandSender * commandObj, const chip::app::ConcreteCommandPath & commandPath, chip::EndpointId endpoint,
-    uint8_t errorCode, uint8_t * debugText,
-    chip::app::Clusters::GeneralCommissioning::Commands::SetRegulatoryConfigResponse::DecodableType & fields);
+bool emberAfGeneralCommissioningClusterSetRegulatoryConfigResponseCallback(chip::EndpointId endpoint,
+                                                                           chip::app::CommandSender * commandObj, uint8_t errorCode,
+                                                                           uint8_t * debugText);
 /**
  * @brief General Commissioning Cluster CommissioningComplete Command callback (from client)
  */
@@ -15878,10 +15826,9 @@ bool emberAfGeneralCommissioningClusterCommissioningCompleteCallback(
 /**
  * @brief General Commissioning Cluster CommissioningCompleteResponse Command callback (from server)
  */
-bool emberAfGeneralCommissioningClusterCommissioningCompleteResponseCallback(
-    chip::app::CommandSender * commandObj, const chip::app::ConcreteCommandPath & commandPath, chip::EndpointId endpoint,
-    uint8_t errorCode, uint8_t * debugText,
-    chip::app::Clusters::GeneralCommissioning::Commands::CommissioningCompleteResponse::DecodableType & fields);
+bool emberAfGeneralCommissioningClusterCommissioningCompleteResponseCallback(chip::EndpointId endpoint,
+                                                                             chip::app::CommandSender * commandObj,
+                                                                             uint8_t errorCode, uint8_t * debugText);
 /**
  * @brief Network Commissioning Cluster ScanNetworks Command callback (from client)
  */
@@ -15893,10 +15840,9 @@ bool emberAfNetworkCommissioningClusterScanNetworksCallback(
  * @brief Network Commissioning Cluster ScanNetworksResponse Command callback (from server)
  */
 bool emberAfNetworkCommissioningClusterScanNetworksResponseCallback(
-    chip::app::CommandSender * commandObj, const chip::app::ConcreteCommandPath & commandPath, chip::EndpointId endpoint,
-    uint8_t errorCode, uint8_t * debugText, /* TYPE WARNING: array array defaults to */ uint8_t * wifiScanResults,
-    /* TYPE WARNING: array array defaults to */ uint8_t * threadScanResults,
-    chip::app::Clusters::NetworkCommissioning::Commands::ScanNetworksResponse::DecodableType & fields);
+    chip::EndpointId endpoint, chip::app::CommandSender * commandObj, uint8_t errorCode, uint8_t * debugText,
+    /* TYPE WARNING: array array defaults to */ uint8_t * wifiScanResults,
+    /* TYPE WARNING: array array defaults to */ uint8_t * threadScanResults);
 /**
  * @brief Network Commissioning Cluster AddWiFiNetwork Command callback (from client)
  */
@@ -15907,10 +15853,9 @@ bool emberAfNetworkCommissioningClusterAddWiFiNetworkCallback(
 /**
  * @brief Network Commissioning Cluster AddWiFiNetworkResponse Command callback (from server)
  */
-bool emberAfNetworkCommissioningClusterAddWiFiNetworkResponseCallback(
-    chip::app::CommandSender * commandObj, const chip::app::ConcreteCommandPath & commandPath, chip::EndpointId endpoint,
-    uint8_t errorCode, uint8_t * debugText,
-    chip::app::Clusters::NetworkCommissioning::Commands::AddWiFiNetworkResponse::DecodableType & fields);
+bool emberAfNetworkCommissioningClusterAddWiFiNetworkResponseCallback(chip::EndpointId endpoint,
+                                                                      chip::app::CommandSender * commandObj, uint8_t errorCode,
+                                                                      uint8_t * debugText);
 /**
  * @brief Network Commissioning Cluster UpdateWiFiNetwork Command callback (from client)
  */
@@ -15921,10 +15866,9 @@ bool emberAfNetworkCommissioningClusterUpdateWiFiNetworkCallback(
 /**
  * @brief Network Commissioning Cluster UpdateWiFiNetworkResponse Command callback (from server)
  */
-bool emberAfNetworkCommissioningClusterUpdateWiFiNetworkResponseCallback(
-    chip::app::CommandSender * commandObj, const chip::app::ConcreteCommandPath & commandPath, chip::EndpointId endpoint,
-    uint8_t errorCode, uint8_t * debugText,
-    chip::app::Clusters::NetworkCommissioning::Commands::UpdateWiFiNetworkResponse::DecodableType & fields);
+bool emberAfNetworkCommissioningClusterUpdateWiFiNetworkResponseCallback(chip::EndpointId endpoint,
+                                                                         chip::app::CommandSender * commandObj, uint8_t errorCode,
+                                                                         uint8_t * debugText);
 /**
  * @brief Network Commissioning Cluster AddThreadNetwork Command callback (from client)
  */
@@ -15935,10 +15879,9 @@ bool emberAfNetworkCommissioningClusterAddThreadNetworkCallback(
 /**
  * @brief Network Commissioning Cluster AddThreadNetworkResponse Command callback (from server)
  */
-bool emberAfNetworkCommissioningClusterAddThreadNetworkResponseCallback(
-    chip::app::CommandSender * commandObj, const chip::app::ConcreteCommandPath & commandPath, chip::EndpointId endpoint,
-    uint8_t errorCode, uint8_t * debugText,
-    chip::app::Clusters::NetworkCommissioning::Commands::AddThreadNetworkResponse::DecodableType & fields);
+bool emberAfNetworkCommissioningClusterAddThreadNetworkResponseCallback(chip::EndpointId endpoint,
+                                                                        chip::app::CommandSender * commandObj, uint8_t errorCode,
+                                                                        uint8_t * debugText);
 /**
  * @brief Network Commissioning Cluster UpdateThreadNetwork Command callback (from client)
  */
@@ -15949,10 +15892,9 @@ bool emberAfNetworkCommissioningClusterUpdateThreadNetworkCallback(
 /**
  * @brief Network Commissioning Cluster UpdateThreadNetworkResponse Command callback (from server)
  */
-bool emberAfNetworkCommissioningClusterUpdateThreadNetworkResponseCallback(
-    chip::app::CommandSender * commandObj, const chip::app::ConcreteCommandPath & commandPath, chip::EndpointId endpoint,
-    uint8_t errorCode, uint8_t * debugText,
-    chip::app::Clusters::NetworkCommissioning::Commands::UpdateThreadNetworkResponse::DecodableType & fields);
+bool emberAfNetworkCommissioningClusterUpdateThreadNetworkResponseCallback(chip::EndpointId endpoint,
+                                                                           chip::app::CommandSender * commandObj, uint8_t errorCode,
+                                                                           uint8_t * debugText);
 /**
  * @brief Network Commissioning Cluster RemoveNetwork Command callback (from client)
  */
@@ -15963,10 +15905,9 @@ bool emberAfNetworkCommissioningClusterRemoveNetworkCallback(
 /**
  * @brief Network Commissioning Cluster RemoveNetworkResponse Command callback (from server)
  */
-bool emberAfNetworkCommissioningClusterRemoveNetworkResponseCallback(
-    chip::app::CommandSender * commandObj, const chip::app::ConcreteCommandPath & commandPath, chip::EndpointId endpoint,
-    uint8_t errorCode, uint8_t * debugText,
-    chip::app::Clusters::NetworkCommissioning::Commands::RemoveNetworkResponse::DecodableType & fields);
+bool emberAfNetworkCommissioningClusterRemoveNetworkResponseCallback(chip::EndpointId endpoint,
+                                                                     chip::app::CommandSender * commandObj, uint8_t errorCode,
+                                                                     uint8_t * debugText);
 /**
  * @brief Network Commissioning Cluster EnableNetwork Command callback (from client)
  */
@@ -15977,10 +15918,9 @@ bool emberAfNetworkCommissioningClusterEnableNetworkCallback(
 /**
  * @brief Network Commissioning Cluster EnableNetworkResponse Command callback (from server)
  */
-bool emberAfNetworkCommissioningClusterEnableNetworkResponseCallback(
-    chip::app::CommandSender * commandObj, const chip::app::ConcreteCommandPath & commandPath, chip::EndpointId endpoint,
-    uint8_t errorCode, uint8_t * debugText,
-    chip::app::Clusters::NetworkCommissioning::Commands::EnableNetworkResponse::DecodableType & fields);
+bool emberAfNetworkCommissioningClusterEnableNetworkResponseCallback(chip::EndpointId endpoint,
+                                                                     chip::app::CommandSender * commandObj, uint8_t errorCode,
+                                                                     uint8_t * debugText);
 /**
  * @brief Network Commissioning Cluster DisableNetwork Command callback (from client)
  */
@@ -15991,10 +15931,9 @@ bool emberAfNetworkCommissioningClusterDisableNetworkCallback(
 /**
  * @brief Network Commissioning Cluster DisableNetworkResponse Command callback (from server)
  */
-bool emberAfNetworkCommissioningClusterDisableNetworkResponseCallback(
-    chip::app::CommandSender * commandObj, const chip::app::ConcreteCommandPath & commandPath, chip::EndpointId endpoint,
-    uint8_t errorCode, uint8_t * debugText,
-    chip::app::Clusters::NetworkCommissioning::Commands::DisableNetworkResponse::DecodableType & fields);
+bool emberAfNetworkCommissioningClusterDisableNetworkResponseCallback(chip::EndpointId endpoint,
+                                                                      chip::app::CommandSender * commandObj, uint8_t errorCode,
+                                                                      uint8_t * debugText);
 /**
  * @brief Network Commissioning Cluster GetLastNetworkCommissioningResult Command callback (from client)
  */
@@ -16012,10 +15951,10 @@ bool emberAfDiagnosticLogsClusterRetrieveLogsRequestCallback(
 /**
  * @brief Diagnostic Logs Cluster RetrieveLogsResponse Command callback (from server)
  */
-bool emberAfDiagnosticLogsClusterRetrieveLogsResponseCallback(
-    chip::app::CommandSender * commandObj, const chip::app::ConcreteCommandPath & commandPath, chip::EndpointId endpoint,
-    uint8_t status, chip::ByteSpan content, /* TYPE WARNING: utc defaults to */ uint8_t * timeStamp, uint32_t timeSinceBoot,
-    chip::app::Clusters::DiagnosticLogs::Commands::RetrieveLogsResponse::DecodableType & fields);
+bool emberAfDiagnosticLogsClusterRetrieveLogsResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj,
+                                                              uint8_t status, chip::ByteSpan content,
+                                                              /* TYPE WARNING: utc defaults to */ uint8_t * timeStamp,
+                                                              uint32_t timeSinceBoot);
 /**
  * @brief Software Diagnostics Cluster ResetWatermarks Command callback (from client)
  */
@@ -16043,27 +15982,19 @@ bool emberAfEthernetNetworkDiagnosticsClusterResetCountsCallback(
 /**
  * @brief Bridged Device Basic Cluster StartUp Command callback (from server)
  */
-bool emberAfBridgedDeviceBasicClusterStartUpCallback(
-    chip::app::CommandSender * commandObj, const chip::app::ConcreteCommandPath & commandPath, chip::EndpointId endpoint,
-    chip::app::Clusters::BridgedDeviceBasic::Commands::StartUp::DecodableType & fields);
+bool emberAfBridgedDeviceBasicClusterStartUpCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj);
 /**
  * @brief Bridged Device Basic Cluster ShutDown Command callback (from server)
  */
-bool emberAfBridgedDeviceBasicClusterShutDownCallback(
-    chip::app::CommandSender * commandObj, const chip::app::ConcreteCommandPath & commandPath, chip::EndpointId endpoint,
-    chip::app::Clusters::BridgedDeviceBasic::Commands::ShutDown::DecodableType & fields);
+bool emberAfBridgedDeviceBasicClusterShutDownCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj);
 /**
  * @brief Bridged Device Basic Cluster Leave Command callback (from server)
  */
-bool emberAfBridgedDeviceBasicClusterLeaveCallback(
-    chip::app::CommandSender * commandObj, const chip::app::ConcreteCommandPath & commandPath, chip::EndpointId endpoint,
-    chip::app::Clusters::BridgedDeviceBasic::Commands::Leave::DecodableType & fields);
+bool emberAfBridgedDeviceBasicClusterLeaveCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj);
 /**
  * @brief Bridged Device Basic Cluster ReachableChanged Command callback (from server)
  */
-bool emberAfBridgedDeviceBasicClusterReachableChangedCallback(
-    chip::app::CommandSender * commandObj, const chip::app::ConcreteCommandPath & commandPath, chip::EndpointId endpoint,
-    chip::app::Clusters::BridgedDeviceBasic::Commands::ReachableChanged::DecodableType & fields);
+bool emberAfBridgedDeviceBasicClusterReachableChangedCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj);
 /**
  * @brief AdministratorCommissioning Cluster OpenCommissioningWindow Command callback (from client)
  */
@@ -16095,10 +16026,9 @@ bool emberAfOperationalCredentialsClusterAttestationRequestCallback(
 /**
  * @brief Operational Credentials Cluster AttestationResponse Command callback (from server)
  */
-bool emberAfOperationalCredentialsClusterAttestationResponseCallback(
-    chip::app::CommandSender * commandObj, const chip::app::ConcreteCommandPath & commandPath, chip::EndpointId endpoint,
-    chip::ByteSpan AttestationElements, chip::ByteSpan Signature,
-    chip::app::Clusters::OperationalCredentials::Commands::AttestationResponse::DecodableType & fields);
+bool emberAfOperationalCredentialsClusterAttestationResponseCallback(chip::EndpointId endpoint,
+                                                                     chip::app::CommandSender * commandObj,
+                                                                     chip::ByteSpan AttestationElements, chip::ByteSpan Signature);
 /**
  * @brief Operational Credentials Cluster CertificateChainRequest Command callback (from client)
  */
@@ -16109,10 +16039,9 @@ bool emberAfOperationalCredentialsClusterCertificateChainRequestCallback(
 /**
  * @brief Operational Credentials Cluster CertificateChainResponse Command callback (from server)
  */
-bool emberAfOperationalCredentialsClusterCertificateChainResponseCallback(
-    chip::app::CommandSender * commandObj, const chip::app::ConcreteCommandPath & commandPath, chip::EndpointId endpoint,
-    chip::ByteSpan Certificate,
-    chip::app::Clusters::OperationalCredentials::Commands::CertificateChainResponse::DecodableType & fields);
+bool emberAfOperationalCredentialsClusterCertificateChainResponseCallback(chip::EndpointId endpoint,
+                                                                          chip::app::CommandSender * commandObj,
+                                                                          chip::ByteSpan Certificate);
 /**
  * @brief Operational Credentials Cluster OpCSRRequest Command callback (from client)
  */
@@ -16122,10 +16051,8 @@ bool emberAfOperationalCredentialsClusterOpCSRRequestCallback(
 /**
  * @brief Operational Credentials Cluster OpCSRResponse Command callback (from server)
  */
-bool emberAfOperationalCredentialsClusterOpCSRResponseCallback(
-    chip::app::CommandSender * commandObj, const chip::app::ConcreteCommandPath & commandPath, chip::EndpointId endpoint,
-    chip::ByteSpan NOCSRElements, chip::ByteSpan AttestationSignature,
-    chip::app::Clusters::OperationalCredentials::Commands::OpCSRResponse::DecodableType & fields);
+bool emberAfOperationalCredentialsClusterOpCSRResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj,
+                                                               chip::ByteSpan NOCSRElements, chip::ByteSpan AttestationSignature);
 /**
  * @brief Operational Credentials Cluster AddNOC Command callback (from client)
  */
@@ -16143,10 +16070,8 @@ bool emberAfOperationalCredentialsClusterUpdateNOCCallback(
 /**
  * @brief Operational Credentials Cluster NOCResponse Command callback (from server)
  */
-bool emberAfOperationalCredentialsClusterNOCResponseCallback(
-    chip::app::CommandSender * commandObj, const chip::app::ConcreteCommandPath & commandPath, chip::EndpointId endpoint,
-    uint8_t StatusCode, uint8_t FabricIndex, chip::ByteSpan DebugText,
-    chip::app::Clusters::OperationalCredentials::Commands::NOCResponse::DecodableType & fields);
+bool emberAfOperationalCredentialsClusterNOCResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj,
+                                                             uint8_t StatusCode, uint8_t FabricIndex, chip::ByteSpan DebugText);
 /**
  * @brief Operational Credentials Cluster UpdateFabricLabel Command callback (from client)
  */
@@ -16183,9 +16108,8 @@ bool emberAfDoorLockClusterLockDoorCallback(chip::app::CommandHandler * commandO
 /**
  * @brief Door Lock Cluster LockDoorResponse Command callback (from server)
  */
-bool emberAfDoorLockClusterLockDoorResponseCallback(
-    chip::app::CommandSender * commandObj, const chip::app::ConcreteCommandPath & commandPath, chip::EndpointId endpoint,
-    uint8_t status, chip::app::Clusters::DoorLock::Commands::LockDoorResponse::DecodableType & fields);
+bool emberAfDoorLockClusterLockDoorResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj,
+                                                    uint8_t status);
 /**
  * @brief Door Lock Cluster UnlockDoor Command callback (from client)
  */
@@ -16196,9 +16120,8 @@ bool emberAfDoorLockClusterUnlockDoorCallback(chip::app::CommandHandler * comman
 /**
  * @brief Door Lock Cluster UnlockDoorResponse Command callback (from server)
  */
-bool emberAfDoorLockClusterUnlockDoorResponseCallback(
-    chip::app::CommandSender * commandObj, const chip::app::ConcreteCommandPath & commandPath, chip::EndpointId endpoint,
-    uint8_t status, chip::app::Clusters::DoorLock::Commands::UnlockDoorResponse::DecodableType & fields);
+bool emberAfDoorLockClusterUnlockDoorResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj,
+                                                      uint8_t status);
 /**
  * @brief Door Lock Cluster Toggle Command callback (from client)
  */
@@ -16208,10 +16131,7 @@ bool emberAfDoorLockClusterToggleCallback(chip::app::CommandHandler * commandObj
 /**
  * @brief Door Lock Cluster ToggleResponse Command callback (from server)
  */
-bool emberAfDoorLockClusterToggleResponseCallback(chip::app::CommandSender * commandObj,
-                                                  const chip::app::ConcreteCommandPath & commandPath, chip::EndpointId endpoint,
-                                                  uint8_t status,
-                                                  chip::app::Clusters::DoorLock::Commands::ToggleResponse::DecodableType & fields);
+bool emberAfDoorLockClusterToggleResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj, uint8_t status);
 /**
  * @brief Door Lock Cluster UnlockWithTimeout Command callback (from client)
  */
@@ -16221,9 +16141,8 @@ bool emberAfDoorLockClusterUnlockWithTimeoutCallback(
 /**
  * @brief Door Lock Cluster UnlockWithTimeoutResponse Command callback (from server)
  */
-bool emberAfDoorLockClusterUnlockWithTimeoutResponseCallback(
-    chip::app::CommandSender * commandObj, const chip::app::ConcreteCommandPath & commandPath, chip::EndpointId endpoint,
-    uint8_t status, chip::app::Clusters::DoorLock::Commands::UnlockWithTimeoutResponse::DecodableType & fields);
+bool emberAfDoorLockClusterUnlockWithTimeoutResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj,
+                                                             uint8_t status);
 /**
  * @brief Door Lock Cluster GetLogRecord Command callback (from client)
  */
@@ -16234,10 +16153,9 @@ bool emberAfDoorLockClusterGetLogRecordCallback(chip::app::CommandHandler * comm
 /**
  * @brief Door Lock Cluster GetLogRecordResponse Command callback (from server)
  */
-bool emberAfDoorLockClusterGetLogRecordResponseCallback(
-    chip::app::CommandSender * commandObj, const chip::app::ConcreteCommandPath & commandPath, chip::EndpointId endpoint,
-    uint16_t logEntryId, uint32_t timestamp, uint8_t eventType, uint8_t source, uint8_t eventIdOrAlarmCode, uint16_t userId,
-    uint8_t * pin, chip::app::Clusters::DoorLock::Commands::GetLogRecordResponse::DecodableType & fields);
+bool emberAfDoorLockClusterGetLogRecordResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj,
+                                                        uint16_t logEntryId, uint32_t timestamp, uint8_t eventType, uint8_t source,
+                                                        uint8_t eventIdOrAlarmCode, uint16_t userId, uint8_t * pin);
 /**
  * @brief Door Lock Cluster SetPin Command callback (from client)
  */
@@ -16248,10 +16166,7 @@ bool emberAfDoorLockClusterSetPinCallback(chip::app::CommandHandler * commandObj
 /**
  * @brief Door Lock Cluster SetPinResponse Command callback (from server)
  */
-bool emberAfDoorLockClusterSetPinResponseCallback(chip::app::CommandSender * commandObj,
-                                                  const chip::app::ConcreteCommandPath & commandPath, chip::EndpointId endpoint,
-                                                  uint8_t status,
-                                                  chip::app::Clusters::DoorLock::Commands::SetPinResponse::DecodableType & fields);
+bool emberAfDoorLockClusterSetPinResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj, uint8_t status);
 /**
  * @brief Door Lock Cluster GetPin Command callback (from client)
  */
@@ -16261,10 +16176,8 @@ bool emberAfDoorLockClusterGetPinCallback(chip::app::CommandHandler * commandObj
 /**
  * @brief Door Lock Cluster GetPinResponse Command callback (from server)
  */
-bool emberAfDoorLockClusterGetPinResponseCallback(chip::app::CommandSender * commandObj,
-                                                  const chip::app::ConcreteCommandPath & commandPath, chip::EndpointId endpoint,
-                                                  uint16_t userId, uint8_t userStatus, uint8_t userType, uint8_t * pin,
-                                                  chip::app::Clusters::DoorLock::Commands::GetPinResponse::DecodableType & fields);
+bool emberAfDoorLockClusterGetPinResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj, uint16_t userId,
+                                                  uint8_t userStatus, uint8_t userType, uint8_t * pin);
 /**
  * @brief Door Lock Cluster ClearPin Command callback (from client)
  */
@@ -16275,9 +16188,8 @@ bool emberAfDoorLockClusterClearPinCallback(chip::app::CommandHandler * commandO
 /**
  * @brief Door Lock Cluster ClearPinResponse Command callback (from server)
  */
-bool emberAfDoorLockClusterClearPinResponseCallback(
-    chip::app::CommandSender * commandObj, const chip::app::ConcreteCommandPath & commandPath, chip::EndpointId endpoint,
-    uint8_t status, chip::app::Clusters::DoorLock::Commands::ClearPinResponse::DecodableType & fields);
+bool emberAfDoorLockClusterClearPinResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj,
+                                                    uint8_t status);
 /**
  * @brief Door Lock Cluster ClearAllPins Command callback (from client)
  */
@@ -16287,9 +16199,8 @@ bool emberAfDoorLockClusterClearAllPinsCallback(chip::app::CommandHandler * comm
 /**
  * @brief Door Lock Cluster ClearAllPinsResponse Command callback (from server)
  */
-bool emberAfDoorLockClusterClearAllPinsResponseCallback(
-    chip::app::CommandSender * commandObj, const chip::app::ConcreteCommandPath & commandPath, chip::EndpointId endpoint,
-    uint8_t status, chip::app::Clusters::DoorLock::Commands::ClearAllPinsResponse::DecodableType & fields);
+bool emberAfDoorLockClusterClearAllPinsResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj,
+                                                        uint8_t status);
 /**
  * @brief Door Lock Cluster SetUserStatus Command callback (from client)
  */
@@ -16300,9 +16211,8 @@ bool emberAfDoorLockClusterSetUserStatusCallback(chip::app::CommandHandler * com
 /**
  * @brief Door Lock Cluster SetUserStatusResponse Command callback (from server)
  */
-bool emberAfDoorLockClusterSetUserStatusResponseCallback(
-    chip::app::CommandSender * commandObj, const chip::app::ConcreteCommandPath & commandPath, chip::EndpointId endpoint,
-    uint8_t status, chip::app::Clusters::DoorLock::Commands::SetUserStatusResponse::DecodableType & fields);
+bool emberAfDoorLockClusterSetUserStatusResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj,
+                                                         uint8_t status);
 /**
  * @brief Door Lock Cluster GetUserStatus Command callback (from client)
  */
@@ -16313,9 +16223,8 @@ bool emberAfDoorLockClusterGetUserStatusCallback(chip::app::CommandHandler * com
 /**
  * @brief Door Lock Cluster GetUserStatusResponse Command callback (from server)
  */
-bool emberAfDoorLockClusterGetUserStatusResponseCallback(
-    chip::app::CommandSender * commandObj, const chip::app::ConcreteCommandPath & commandPath, chip::EndpointId endpoint,
-    uint16_t userId, uint8_t status, chip::app::Clusters::DoorLock::Commands::GetUserStatusResponse::DecodableType & fields);
+bool emberAfDoorLockClusterGetUserStatusResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj,
+                                                         uint16_t userId, uint8_t status);
 /**
  * @brief Door Lock Cluster SetWeekdaySchedule Command callback (from client)
  */
@@ -16326,9 +16235,8 @@ bool emberAfDoorLockClusterSetWeekdayScheduleCallback(
 /**
  * @brief Door Lock Cluster SetWeekdayScheduleResponse Command callback (from server)
  */
-bool emberAfDoorLockClusterSetWeekdayScheduleResponseCallback(
-    chip::app::CommandSender * commandObj, const chip::app::ConcreteCommandPath & commandPath, chip::EndpointId endpoint,
-    uint8_t status, chip::app::Clusters::DoorLock::Commands::SetWeekdayScheduleResponse::DecodableType & fields);
+bool emberAfDoorLockClusterSetWeekdayScheduleResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj,
+                                                              uint8_t status);
 /**
  * @brief Door Lock Cluster GetWeekdaySchedule Command callback (from client)
  */
@@ -16338,10 +16246,10 @@ bool emberAfDoorLockClusterGetWeekdayScheduleCallback(
 /**
  * @brief Door Lock Cluster GetWeekdayScheduleResponse Command callback (from server)
  */
-bool emberAfDoorLockClusterGetWeekdayScheduleResponseCallback(
-    chip::app::CommandSender * commandObj, const chip::app::ConcreteCommandPath & commandPath, chip::EndpointId endpoint,
-    uint8_t scheduleId, uint16_t userId, uint8_t status, uint8_t daysMask, uint8_t startHour, uint8_t startMinute, uint8_t endHour,
-    uint8_t endMinute, chip::app::Clusters::DoorLock::Commands::GetWeekdayScheduleResponse::DecodableType & fields);
+bool emberAfDoorLockClusterGetWeekdayScheduleResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj,
+                                                              uint8_t scheduleId, uint16_t userId, uint8_t status, uint8_t daysMask,
+                                                              uint8_t startHour, uint8_t startMinute, uint8_t endHour,
+                                                              uint8_t endMinute);
 /**
  * @brief Door Lock Cluster ClearWeekdaySchedule Command callback (from client)
  */
@@ -16351,9 +16259,8 @@ bool emberAfDoorLockClusterClearWeekdayScheduleCallback(
 /**
  * @brief Door Lock Cluster ClearWeekdayScheduleResponse Command callback (from server)
  */
-bool emberAfDoorLockClusterClearWeekdayScheduleResponseCallback(
-    chip::app::CommandSender * commandObj, const chip::app::ConcreteCommandPath & commandPath, chip::EndpointId endpoint,
-    uint8_t status, chip::app::Clusters::DoorLock::Commands::ClearWeekdayScheduleResponse::DecodableType & fields);
+bool emberAfDoorLockClusterClearWeekdayScheduleResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj,
+                                                                uint8_t status);
 /**
  * @brief Door Lock Cluster SetYeardaySchedule Command callback (from client)
  */
@@ -16364,9 +16271,8 @@ bool emberAfDoorLockClusterSetYeardayScheduleCallback(
 /**
  * @brief Door Lock Cluster SetYeardayScheduleResponse Command callback (from server)
  */
-bool emberAfDoorLockClusterSetYeardayScheduleResponseCallback(
-    chip::app::CommandSender * commandObj, const chip::app::ConcreteCommandPath & commandPath, chip::EndpointId endpoint,
-    uint8_t status, chip::app::Clusters::DoorLock::Commands::SetYeardayScheduleResponse::DecodableType & fields);
+bool emberAfDoorLockClusterSetYeardayScheduleResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj,
+                                                              uint8_t status);
 /**
  * @brief Door Lock Cluster GetYeardaySchedule Command callback (from client)
  */
@@ -16376,10 +16282,9 @@ bool emberAfDoorLockClusterGetYeardayScheduleCallback(
 /**
  * @brief Door Lock Cluster GetYeardayScheduleResponse Command callback (from server)
  */
-bool emberAfDoorLockClusterGetYeardayScheduleResponseCallback(
-    chip::app::CommandSender * commandObj, const chip::app::ConcreteCommandPath & commandPath, chip::EndpointId endpoint,
-    uint8_t scheduleId, uint16_t userId, uint8_t status, uint32_t localStartTime, uint32_t localEndTime,
-    chip::app::Clusters::DoorLock::Commands::GetYeardayScheduleResponse::DecodableType & fields);
+bool emberAfDoorLockClusterGetYeardayScheduleResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj,
+                                                              uint8_t scheduleId, uint16_t userId, uint8_t status,
+                                                              uint32_t localStartTime, uint32_t localEndTime);
 /**
  * @brief Door Lock Cluster ClearYeardaySchedule Command callback (from client)
  */
@@ -16389,9 +16294,8 @@ bool emberAfDoorLockClusterClearYeardayScheduleCallback(
 /**
  * @brief Door Lock Cluster ClearYeardayScheduleResponse Command callback (from server)
  */
-bool emberAfDoorLockClusterClearYeardayScheduleResponseCallback(
-    chip::app::CommandSender * commandObj, const chip::app::ConcreteCommandPath & commandPath, chip::EndpointId endpoint,
-    uint8_t status, chip::app::Clusters::DoorLock::Commands::ClearYeardayScheduleResponse::DecodableType & fields);
+bool emberAfDoorLockClusterClearYeardayScheduleResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj,
+                                                                uint8_t status);
 /**
  * @brief Door Lock Cluster SetHolidaySchedule Command callback (from client)
  */
@@ -16402,9 +16306,8 @@ bool emberAfDoorLockClusterSetHolidayScheduleCallback(
 /**
  * @brief Door Lock Cluster SetHolidayScheduleResponse Command callback (from server)
  */
-bool emberAfDoorLockClusterSetHolidayScheduleResponseCallback(
-    chip::app::CommandSender * commandObj, const chip::app::ConcreteCommandPath & commandPath, chip::EndpointId endpoint,
-    uint8_t status, chip::app::Clusters::DoorLock::Commands::SetHolidayScheduleResponse::DecodableType & fields);
+bool emberAfDoorLockClusterSetHolidayScheduleResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj,
+                                                              uint8_t status);
 /**
  * @brief Door Lock Cluster GetHolidaySchedule Command callback (from client)
  */
@@ -16414,10 +16317,9 @@ bool emberAfDoorLockClusterGetHolidayScheduleCallback(
 /**
  * @brief Door Lock Cluster GetHolidayScheduleResponse Command callback (from server)
  */
-bool emberAfDoorLockClusterGetHolidayScheduleResponseCallback(
-    chip::app::CommandSender * commandObj, const chip::app::ConcreteCommandPath & commandPath, chip::EndpointId endpoint,
-    uint8_t scheduleId, uint8_t status, uint32_t localStartTime, uint32_t localEndTime, uint8_t operatingModeDuringHoliday,
-    chip::app::Clusters::DoorLock::Commands::GetHolidayScheduleResponse::DecodableType & fields);
+bool emberAfDoorLockClusterGetHolidayScheduleResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj,
+                                                              uint8_t scheduleId, uint8_t status, uint32_t localStartTime,
+                                                              uint32_t localEndTime, uint8_t operatingModeDuringHoliday);
 /**
  * @brief Door Lock Cluster ClearHolidaySchedule Command callback (from client)
  */
@@ -16427,9 +16329,8 @@ bool emberAfDoorLockClusterClearHolidayScheduleCallback(
 /**
  * @brief Door Lock Cluster ClearHolidayScheduleResponse Command callback (from server)
  */
-bool emberAfDoorLockClusterClearHolidayScheduleResponseCallback(
-    chip::app::CommandSender * commandObj, const chip::app::ConcreteCommandPath & commandPath, chip::EndpointId endpoint,
-    uint8_t status, chip::app::Clusters::DoorLock::Commands::ClearHolidayScheduleResponse::DecodableType & fields);
+bool emberAfDoorLockClusterClearHolidayScheduleResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj,
+                                                                uint8_t status);
 /**
  * @brief Door Lock Cluster SetUserType Command callback (from client)
  */
@@ -16440,9 +16341,8 @@ bool emberAfDoorLockClusterSetUserTypeCallback(chip::app::CommandHandler * comma
 /**
  * @brief Door Lock Cluster SetUserTypeResponse Command callback (from server)
  */
-bool emberAfDoorLockClusterSetUserTypeResponseCallback(
-    chip::app::CommandSender * commandObj, const chip::app::ConcreteCommandPath & commandPath, chip::EndpointId endpoint,
-    uint8_t status, chip::app::Clusters::DoorLock::Commands::SetUserTypeResponse::DecodableType & fields);
+bool emberAfDoorLockClusterSetUserTypeResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj,
+                                                       uint8_t status);
 /**
  * @brief Door Lock Cluster GetUserType Command callback (from client)
  */
@@ -16453,9 +16353,8 @@ bool emberAfDoorLockClusterGetUserTypeCallback(chip::app::CommandHandler * comma
 /**
  * @brief Door Lock Cluster GetUserTypeResponse Command callback (from server)
  */
-bool emberAfDoorLockClusterGetUserTypeResponseCallback(
-    chip::app::CommandSender * commandObj, const chip::app::ConcreteCommandPath & commandPath, chip::EndpointId endpoint,
-    uint16_t userId, uint8_t userType, chip::app::Clusters::DoorLock::Commands::GetUserTypeResponse::DecodableType & fields);
+bool emberAfDoorLockClusterGetUserTypeResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj,
+                                                       uint16_t userId, uint8_t userType);
 /**
  * @brief Door Lock Cluster SetRfid Command callback (from client)
  */
@@ -16466,9 +16365,8 @@ bool emberAfDoorLockClusterSetRfidCallback(chip::app::CommandHandler * commandOb
 /**
  * @brief Door Lock Cluster SetRfidResponse Command callback (from server)
  */
-bool emberAfDoorLockClusterSetRfidResponseCallback(
-    chip::app::CommandSender * commandObj, const chip::app::ConcreteCommandPath & commandPath, chip::EndpointId endpoint,
-    uint8_t status, chip::app::Clusters::DoorLock::Commands::SetRfidResponse::DecodableType & fields);
+bool emberAfDoorLockClusterSetRfidResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj,
+                                                   uint8_t status);
 /**
  * @brief Door Lock Cluster GetRfid Command callback (from client)
  */
@@ -16479,10 +16377,8 @@ bool emberAfDoorLockClusterGetRfidCallback(chip::app::CommandHandler * commandOb
 /**
  * @brief Door Lock Cluster GetRfidResponse Command callback (from server)
  */
-bool emberAfDoorLockClusterGetRfidResponseCallback(
-    chip::app::CommandSender * commandObj, const chip::app::ConcreteCommandPath & commandPath, chip::EndpointId endpoint,
-    uint16_t userId, uint8_t userStatus, uint8_t userType, uint8_t * rfid,
-    chip::app::Clusters::DoorLock::Commands::GetRfidResponse::DecodableType & fields);
+bool emberAfDoorLockClusterGetRfidResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj,
+                                                   uint16_t userId, uint8_t userStatus, uint8_t userType, uint8_t * rfid);
 /**
  * @brief Door Lock Cluster ClearRfid Command callback (from client)
  */
@@ -16493,9 +16389,8 @@ bool emberAfDoorLockClusterClearRfidCallback(chip::app::CommandHandler * command
 /**
  * @brief Door Lock Cluster ClearRfidResponse Command callback (from server)
  */
-bool emberAfDoorLockClusterClearRfidResponseCallback(
-    chip::app::CommandSender * commandObj, const chip::app::ConcreteCommandPath & commandPath, chip::EndpointId endpoint,
-    uint8_t status, chip::app::Clusters::DoorLock::Commands::ClearRfidResponse::DecodableType & fields);
+bool emberAfDoorLockClusterClearRfidResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj,
+                                                     uint8_t status);
 /**
  * @brief Door Lock Cluster ClearAllRfids Command callback (from client)
  */
@@ -16505,23 +16400,21 @@ bool emberAfDoorLockClusterClearAllRfidsCallback(chip::app::CommandHandler * com
 /**
  * @brief Door Lock Cluster ClearAllRfidsResponse Command callback (from server)
  */
-bool emberAfDoorLockClusterClearAllRfidsResponseCallback(
-    chip::app::CommandSender * commandObj, const chip::app::ConcreteCommandPath & commandPath, chip::EndpointId endpoint,
-    uint8_t status, chip::app::Clusters::DoorLock::Commands::ClearAllRfidsResponse::DecodableType & fields);
+bool emberAfDoorLockClusterClearAllRfidsResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj,
+                                                         uint8_t status);
 /**
  * @brief Door Lock Cluster OperationEventNotification Command callback (from server)
  */
-bool emberAfDoorLockClusterOperationEventNotificationCallback(
-    chip::app::CommandSender * commandObj, const chip::app::ConcreteCommandPath & commandPath, chip::EndpointId endpoint,
-    uint8_t source, uint8_t eventCode, uint16_t userId, uint8_t * pin, uint32_t timeStamp, uint8_t * data,
-    chip::app::Clusters::DoorLock::Commands::OperationEventNotification::DecodableType & fields);
+bool emberAfDoorLockClusterOperationEventNotificationCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj,
+                                                              uint8_t source, uint8_t eventCode, uint16_t userId, uint8_t * pin,
+                                                              uint32_t timeStamp, uint8_t * data);
 /**
  * @brief Door Lock Cluster ProgrammingEventNotification Command callback (from server)
  */
-bool emberAfDoorLockClusterProgrammingEventNotificationCallback(
-    chip::app::CommandSender * commandObj, const chip::app::ConcreteCommandPath & commandPath, chip::EndpointId endpoint,
-    uint8_t source, uint8_t eventCode, uint16_t userId, uint8_t * pin, uint8_t userType, uint8_t userStatus, uint32_t timeStamp,
-    uint8_t * data, chip::app::Clusters::DoorLock::Commands::ProgrammingEventNotification::DecodableType & fields);
+bool emberAfDoorLockClusterProgrammingEventNotificationCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj,
+                                                                uint8_t source, uint8_t eventCode, uint16_t userId, uint8_t * pin,
+                                                                uint8_t userType, uint8_t userStatus, uint32_t timeStamp,
+                                                                uint8_t * data);
 /**
  * @brief Window Covering Cluster UpOrOpen Command callback (from client)
  */
@@ -16587,11 +16480,10 @@ bool emberAfThermostatClusterSetpointRaiseLowerCallback(
 /**
  * @brief Thermostat Cluster CurrentWeeklySchedule Command callback (from server)
  */
-bool emberAfThermostatClusterCurrentWeeklyScheduleCallback(
-    chip::app::CommandSender * commandObj, const chip::app::ConcreteCommandPath & commandPath, chip::EndpointId endpoint,
-    uint8_t numberOfTransitionsForSequence, uint8_t dayOfWeekForSequence, uint8_t modeForSequence,
-    /* TYPE WARNING: array array defaults to */ uint8_t * payload,
-    chip::app::Clusters::Thermostat::Commands::CurrentWeeklySchedule::DecodableType & fields);
+bool emberAfThermostatClusterCurrentWeeklyScheduleCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj,
+                                                           uint8_t numberOfTransitionsForSequence, uint8_t dayOfWeekForSequence,
+                                                           uint8_t modeForSequence,
+                                                           /* TYPE WARNING: array array defaults to */ uint8_t * payload);
 /**
  * @brief Thermostat Cluster SetWeeklySchedule Command callback (from client)
  */
@@ -16603,10 +16495,9 @@ bool emberAfThermostatClusterSetWeeklyScheduleCallback(
 /**
  * @brief Thermostat Cluster RelayStatusLog Command callback (from server)
  */
-bool emberAfThermostatClusterRelayStatusLogCallback(
-    chip::app::CommandSender * commandObj, const chip::app::ConcreteCommandPath & commandPath, chip::EndpointId endpoint,
-    uint16_t timeOfDay, uint16_t relayStatus, int16_t localTemperature, uint8_t humidityInPercentage, int16_t setpoint,
-    uint16_t unreadEntries, chip::app::Clusters::Thermostat::Commands::RelayStatusLog::DecodableType & fields);
+bool emberAfThermostatClusterRelayStatusLogCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj,
+                                                    uint16_t timeOfDay, uint16_t relayStatus, int16_t localTemperature,
+                                                    uint8_t humidityInPercentage, int16_t setpoint, uint16_t unreadEntries);
 /**
  * @brief Thermostat Cluster GetWeeklySchedule Command callback (from client)
  */
@@ -16772,10 +16663,9 @@ bool emberAfIasZoneClusterZoneEnrollResponseCallback(
 /**
  * @brief IAS Zone Cluster ZoneStatusChangeNotification Command callback (from server)
  */
-bool emberAfIasZoneClusterZoneStatusChangeNotificationCallback(
-    chip::app::CommandSender * commandObj, const chip::app::ConcreteCommandPath & commandPath, chip::EndpointId endpoint,
-    uint16_t zoneStatus, uint8_t extendedStatus, uint8_t zoneId, uint16_t delay,
-    chip::app::Clusters::IasZone::Commands::ZoneStatusChangeNotification::DecodableType & fields);
+bool emberAfIasZoneClusterZoneStatusChangeNotificationCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj,
+                                                               uint16_t zoneStatus, uint8_t extendedStatus, uint8_t zoneId,
+                                                               uint16_t delay);
 /**
  * @brief IAS Zone Cluster InitiateNormalOperationMode Command callback (from client)
  */
@@ -16785,10 +16675,8 @@ bool emberAfIasZoneClusterInitiateNormalOperationModeCallback(
 /**
  * @brief IAS Zone Cluster ZoneEnrollRequest Command callback (from server)
  */
-bool emberAfIasZoneClusterZoneEnrollRequestCallback(
-    chip::app::CommandSender * commandObj, const chip::app::ConcreteCommandPath & commandPath, chip::EndpointId endpoint,
-    uint16_t zoneType, uint16_t manufacturerCode,
-    chip::app::Clusters::IasZone::Commands::ZoneEnrollRequest::DecodableType & fields);
+bool emberAfIasZoneClusterZoneEnrollRequestCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj,
+                                                    uint16_t zoneType, uint16_t manufacturerCode);
 /**
  * @brief IAS Zone Cluster InitiateTestMode Command callback (from client)
  */
@@ -16799,15 +16687,12 @@ bool emberAfIasZoneClusterInitiateTestModeCallback(
 /**
  * @brief IAS Zone Cluster InitiateNormalOperationModeResponse Command callback (from server)
  */
-bool emberAfIasZoneClusterInitiateNormalOperationModeResponseCallback(
-    chip::app::CommandSender * commandObj, const chip::app::ConcreteCommandPath & commandPath, chip::EndpointId endpoint,
-    chip::app::Clusters::IasZone::Commands::InitiateNormalOperationModeResponse::DecodableType & fields);
+bool emberAfIasZoneClusterInitiateNormalOperationModeResponseCallback(chip::EndpointId endpoint,
+                                                                      chip::app::CommandSender * commandObj);
 /**
  * @brief IAS Zone Cluster InitiateTestModeResponse Command callback (from server)
  */
-bool emberAfIasZoneClusterInitiateTestModeResponseCallback(
-    chip::app::CommandSender * commandObj, const chip::app::ConcreteCommandPath & commandPath, chip::EndpointId endpoint,
-    chip::app::Clusters::IasZone::Commands::InitiateTestModeResponse::DecodableType & fields);
+bool emberAfIasZoneClusterInitiateTestModeResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj);
 /**
  * @brief IAS ACE Cluster Arm Command callback (from client)
  */
@@ -16817,10 +16702,8 @@ bool emberAfIasAceClusterArmCallback(chip::app::CommandHandler * commandObj, con
 /**
  * @brief IAS ACE Cluster ArmResponse Command callback (from server)
  */
-bool emberAfIasAceClusterArmResponseCallback(chip::app::CommandSender * commandObj,
-                                             const chip::app::ConcreteCommandPath & commandPath, chip::EndpointId endpoint,
-                                             uint8_t armNotification,
-                                             chip::app::Clusters::IasAce::Commands::ArmResponse::DecodableType & fields);
+bool emberAfIasAceClusterArmResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj,
+                                             uint8_t armNotification);
 /**
  * @brief IAS ACE Cluster Bypass Command callback (from client)
  */
@@ -16831,12 +16714,12 @@ bool emberAfIasAceClusterBypassCallback(chip::app::CommandHandler * commandObj,
 /**
  * @brief IAS ACE Cluster GetZoneIdMapResponse Command callback (from server)
  */
-bool emberAfIasAceClusterGetZoneIdMapResponseCallback(
-    chip::app::CommandSender * commandObj, const chip::app::ConcreteCommandPath & commandPath, chip::EndpointId endpoint,
-    uint16_t section0, uint16_t section1, uint16_t section2, uint16_t section3, uint16_t section4, uint16_t section5,
-    uint16_t section6, uint16_t section7, uint16_t section8, uint16_t section9, uint16_t section10, uint16_t section11,
-    uint16_t section12, uint16_t section13, uint16_t section14, uint16_t section15,
-    chip::app::Clusters::IasAce::Commands::GetZoneIdMapResponse::DecodableType & fields);
+bool emberAfIasAceClusterGetZoneIdMapResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj,
+                                                      uint16_t section0, uint16_t section1, uint16_t section2, uint16_t section3,
+                                                      uint16_t section4, uint16_t section5, uint16_t section6, uint16_t section7,
+                                                      uint16_t section8, uint16_t section9, uint16_t section10, uint16_t section11,
+                                                      uint16_t section12, uint16_t section13, uint16_t section14,
+                                                      uint16_t section15);
 /**
  * @brief IAS ACE Cluster Emergency Command callback (from client)
  */
@@ -16846,10 +16729,9 @@ bool emberAfIasAceClusterEmergencyCallback(chip::app::CommandHandler * commandOb
 /**
  * @brief IAS ACE Cluster GetZoneInformationResponse Command callback (from server)
  */
-bool emberAfIasAceClusterGetZoneInformationResponseCallback(
-    chip::app::CommandSender * commandObj, const chip::app::ConcreteCommandPath & commandPath, chip::EndpointId endpoint,
-    uint8_t zoneId, uint16_t zoneType, chip::NodeId ieeeAddress, uint8_t * zoneLabel,
-    chip::app::Clusters::IasAce::Commands::GetZoneInformationResponse::DecodableType & fields);
+bool emberAfIasAceClusterGetZoneInformationResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj,
+                                                            uint8_t zoneId, uint16_t zoneType, chip::NodeId ieeeAddress,
+                                                            uint8_t * zoneLabel);
 /**
  * @brief IAS ACE Cluster Fire Command callback (from client)
  */
@@ -16859,10 +16741,8 @@ bool emberAfIasAceClusterFireCallback(chip::app::CommandHandler * commandObj, co
 /**
  * @brief IAS ACE Cluster ZoneStatusChanged Command callback (from server)
  */
-bool emberAfIasAceClusterZoneStatusChangedCallback(
-    chip::app::CommandSender * commandObj, const chip::app::ConcreteCommandPath & commandPath, chip::EndpointId endpoint,
-    uint8_t zoneId, uint16_t zoneStatus, uint8_t audibleNotification, uint8_t * zoneLabel,
-    chip::app::Clusters::IasAce::Commands::ZoneStatusChanged::DecodableType & fields);
+bool emberAfIasAceClusterZoneStatusChangedCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj, uint8_t zoneId,
+                                                   uint16_t zoneStatus, uint8_t audibleNotification, uint8_t * zoneLabel);
 /**
  * @brief IAS ACE Cluster Panic Command callback (from client)
  */
@@ -16872,10 +16752,9 @@ bool emberAfIasAceClusterPanicCallback(chip::app::CommandHandler * commandObj, c
 /**
  * @brief IAS ACE Cluster PanelStatusChanged Command callback (from server)
  */
-bool emberAfIasAceClusterPanelStatusChangedCallback(
-    chip::app::CommandSender * commandObj, const chip::app::ConcreteCommandPath & commandPath, chip::EndpointId endpoint,
-    uint8_t panelStatus, uint8_t secondsRemaining, uint8_t audibleNotification, uint8_t alarmStatus,
-    chip::app::Clusters::IasAce::Commands::PanelStatusChanged::DecodableType & fields);
+bool emberAfIasAceClusterPanelStatusChangedCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj,
+                                                    uint8_t panelStatus, uint8_t secondsRemaining, uint8_t audibleNotification,
+                                                    uint8_t alarmStatus);
 /**
  * @brief IAS ACE Cluster GetZoneIdMap Command callback (from client)
  */
@@ -16885,10 +16764,9 @@ bool emberAfIasAceClusterGetZoneIdMapCallback(chip::app::CommandHandler * comman
 /**
  * @brief IAS ACE Cluster GetPanelStatusResponse Command callback (from server)
  */
-bool emberAfIasAceClusterGetPanelStatusResponseCallback(
-    chip::app::CommandSender * commandObj, const chip::app::ConcreteCommandPath & commandPath, chip::EndpointId endpoint,
-    uint8_t panelStatus, uint8_t secondsRemaining, uint8_t audibleNotification, uint8_t alarmStatus,
-    chip::app::Clusters::IasAce::Commands::GetPanelStatusResponse::DecodableType & fields);
+bool emberAfIasAceClusterGetPanelStatusResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj,
+                                                        uint8_t panelStatus, uint8_t secondsRemaining, uint8_t audibleNotification,
+                                                        uint8_t alarmStatus);
 /**
  * @brief IAS ACE Cluster GetZoneInformation Command callback (from client)
  */
@@ -16898,10 +16776,9 @@ bool emberAfIasAceClusterGetZoneInformationCallback(
 /**
  * @brief IAS ACE Cluster SetBypassedZoneList Command callback (from server)
  */
-bool emberAfIasAceClusterSetBypassedZoneListCallback(
-    chip::app::CommandSender * commandObj, const chip::app::ConcreteCommandPath & commandPath, chip::EndpointId endpoint,
-    uint8_t numberOfZones, /* TYPE WARNING: array array defaults to */ uint8_t * zoneIds,
-    chip::app::Clusters::IasAce::Commands::SetBypassedZoneList::DecodableType & fields);
+bool emberAfIasAceClusterSetBypassedZoneListCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj,
+                                                     uint8_t numberOfZones,
+                                                     /* TYPE WARNING: array array defaults to */ uint8_t * zoneIds);
 /**
  * @brief IAS ACE Cluster GetPanelStatus Command callback (from client)
  */
@@ -16911,11 +16788,9 @@ bool emberAfIasAceClusterGetPanelStatusCallback(chip::app::CommandHandler * comm
 /**
  * @brief IAS ACE Cluster BypassResponse Command callback (from server)
  */
-bool emberAfIasAceClusterBypassResponseCallback(chip::app::CommandSender * commandObj,
-                                                const chip::app::ConcreteCommandPath & commandPath, chip::EndpointId endpoint,
+bool emberAfIasAceClusterBypassResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj,
                                                 uint8_t numberOfZones,
-                                                /* TYPE WARNING: array array defaults to */ uint8_t * bypassResult,
-                                                chip::app::Clusters::IasAce::Commands::BypassResponse::DecodableType & fields);
+                                                /* TYPE WARNING: array array defaults to */ uint8_t * bypassResult);
 /**
  * @brief IAS ACE Cluster GetBypassedZoneList Command callback (from client)
  */
@@ -16925,10 +16800,9 @@ bool emberAfIasAceClusterGetBypassedZoneListCallback(
 /**
  * @brief IAS ACE Cluster GetZoneStatusResponse Command callback (from server)
  */
-bool emberAfIasAceClusterGetZoneStatusResponseCallback(
-    chip::app::CommandSender * commandObj, const chip::app::ConcreteCommandPath & commandPath, chip::EndpointId endpoint,
-    bool zoneStatusComplete, uint8_t numberOfZones, /* TYPE WARNING: array array defaults to */ uint8_t * zoneStatusResult,
-    chip::app::Clusters::IasAce::Commands::GetZoneStatusResponse::DecodableType & fields);
+bool emberAfIasAceClusterGetZoneStatusResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj,
+                                                       bool zoneStatusComplete, uint8_t numberOfZones,
+                                                       /* TYPE WARNING: array array defaults to */ uint8_t * zoneStatusResult);
 /**
  * @brief IAS ACE Cluster GetZoneStatus Command callback (from client)
  */
@@ -16961,10 +16835,9 @@ bool emberAfTvChannelClusterChangeChannelCallback(chip::app::CommandHandler * co
 /**
  * @brief TV Channel Cluster ChangeChannelResponse Command callback (from server)
  */
-bool emberAfTvChannelClusterChangeChannelResponseCallback(
-    chip::app::CommandSender * commandObj, const chip::app::ConcreteCommandPath & commandPath, chip::EndpointId endpoint,
-    /* TYPE WARNING: array array defaults to */ uint8_t * ChannelMatch, uint8_t ErrorType,
-    chip::app::Clusters::TvChannel::Commands::ChangeChannelResponse::DecodableType & fields);
+bool emberAfTvChannelClusterChangeChannelResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj,
+                                                          /* TYPE WARNING: array array defaults to */ uint8_t * ChannelMatch,
+                                                          uint8_t ErrorType);
 /**
  * @brief TV Channel Cluster ChangeChannelByNumber Command callback (from client)
  */
@@ -16988,9 +16861,8 @@ bool emberAfTargetNavigatorClusterNavigateTargetCallback(
 /**
  * @brief Target Navigator Cluster NavigateTargetResponse Command callback (from server)
  */
-bool emberAfTargetNavigatorClusterNavigateTargetResponseCallback(
-    chip::app::CommandSender * commandObj, const chip::app::ConcreteCommandPath & commandPath, chip::EndpointId endpoint,
-    uint8_t status, uint8_t * data, chip::app::Clusters::TargetNavigator::Commands::NavigateTargetResponse::DecodableType & fields);
+bool emberAfTargetNavigatorClusterNavigateTargetResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj,
+                                                                 uint8_t status, uint8_t * data);
 /**
  * @brief Media Playback Cluster MediaPlay Command callback (from client)
  */
@@ -17000,9 +16872,8 @@ bool emberAfMediaPlaybackClusterMediaPlayCallback(chip::app::CommandHandler * co
 /**
  * @brief Media Playback Cluster MediaPlayResponse Command callback (from server)
  */
-bool emberAfMediaPlaybackClusterMediaPlayResponseCallback(
-    chip::app::CommandSender * commandObj, const chip::app::ConcreteCommandPath & commandPath, chip::EndpointId endpoint,
-    uint8_t mediaPlaybackStatus, chip::app::Clusters::MediaPlayback::Commands::MediaPlayResponse::DecodableType & fields);
+bool emberAfMediaPlaybackClusterMediaPlayResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj,
+                                                          uint8_t mediaPlaybackStatus);
 /**
  * @brief Media Playback Cluster MediaPause Command callback (from client)
  */
@@ -17012,9 +16883,8 @@ bool emberAfMediaPlaybackClusterMediaPauseCallback(
 /**
  * @brief Media Playback Cluster MediaPauseResponse Command callback (from server)
  */
-bool emberAfMediaPlaybackClusterMediaPauseResponseCallback(
-    chip::app::CommandSender * commandObj, const chip::app::ConcreteCommandPath & commandPath, chip::EndpointId endpoint,
-    uint8_t mediaPlaybackStatus, chip::app::Clusters::MediaPlayback::Commands::MediaPauseResponse::DecodableType & fields);
+bool emberAfMediaPlaybackClusterMediaPauseResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj,
+                                                           uint8_t mediaPlaybackStatus);
 /**
  * @brief Media Playback Cluster MediaStop Command callback (from client)
  */
@@ -17024,9 +16894,8 @@ bool emberAfMediaPlaybackClusterMediaStopCallback(chip::app::CommandHandler * co
 /**
  * @brief Media Playback Cluster MediaStopResponse Command callback (from server)
  */
-bool emberAfMediaPlaybackClusterMediaStopResponseCallback(
-    chip::app::CommandSender * commandObj, const chip::app::ConcreteCommandPath & commandPath, chip::EndpointId endpoint,
-    uint8_t mediaPlaybackStatus, chip::app::Clusters::MediaPlayback::Commands::MediaStopResponse::DecodableType & fields);
+bool emberAfMediaPlaybackClusterMediaStopResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj,
+                                                          uint8_t mediaPlaybackStatus);
 /**
  * @brief Media Playback Cluster MediaStartOver Command callback (from client)
  */
@@ -17036,9 +16905,8 @@ bool emberAfMediaPlaybackClusterMediaStartOverCallback(
 /**
  * @brief Media Playback Cluster MediaStartOverResponse Command callback (from server)
  */
-bool emberAfMediaPlaybackClusterMediaStartOverResponseCallback(
-    chip::app::CommandSender * commandObj, const chip::app::ConcreteCommandPath & commandPath, chip::EndpointId endpoint,
-    uint8_t mediaPlaybackStatus, chip::app::Clusters::MediaPlayback::Commands::MediaStartOverResponse::DecodableType & fields);
+bool emberAfMediaPlaybackClusterMediaStartOverResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj,
+                                                               uint8_t mediaPlaybackStatus);
 /**
  * @brief Media Playback Cluster MediaPrevious Command callback (from client)
  */
@@ -17048,9 +16916,8 @@ bool emberAfMediaPlaybackClusterMediaPreviousCallback(
 /**
  * @brief Media Playback Cluster MediaPreviousResponse Command callback (from server)
  */
-bool emberAfMediaPlaybackClusterMediaPreviousResponseCallback(
-    chip::app::CommandSender * commandObj, const chip::app::ConcreteCommandPath & commandPath, chip::EndpointId endpoint,
-    uint8_t mediaPlaybackStatus, chip::app::Clusters::MediaPlayback::Commands::MediaPreviousResponse::DecodableType & fields);
+bool emberAfMediaPlaybackClusterMediaPreviousResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj,
+                                                              uint8_t mediaPlaybackStatus);
 /**
  * @brief Media Playback Cluster MediaNext Command callback (from client)
  */
@@ -17060,9 +16927,8 @@ bool emberAfMediaPlaybackClusterMediaNextCallback(chip::app::CommandHandler * co
 /**
  * @brief Media Playback Cluster MediaNextResponse Command callback (from server)
  */
-bool emberAfMediaPlaybackClusterMediaNextResponseCallback(
-    chip::app::CommandSender * commandObj, const chip::app::ConcreteCommandPath & commandPath, chip::EndpointId endpoint,
-    uint8_t mediaPlaybackStatus, chip::app::Clusters::MediaPlayback::Commands::MediaNextResponse::DecodableType & fields);
+bool emberAfMediaPlaybackClusterMediaNextResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj,
+                                                          uint8_t mediaPlaybackStatus);
 /**
  * @brief Media Playback Cluster MediaRewind Command callback (from client)
  */
@@ -17072,9 +16938,8 @@ bool emberAfMediaPlaybackClusterMediaRewindCallback(
 /**
  * @brief Media Playback Cluster MediaRewindResponse Command callback (from server)
  */
-bool emberAfMediaPlaybackClusterMediaRewindResponseCallback(
-    chip::app::CommandSender * commandObj, const chip::app::ConcreteCommandPath & commandPath, chip::EndpointId endpoint,
-    uint8_t mediaPlaybackStatus, chip::app::Clusters::MediaPlayback::Commands::MediaRewindResponse::DecodableType & fields);
+bool emberAfMediaPlaybackClusterMediaRewindResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj,
+                                                            uint8_t mediaPlaybackStatus);
 /**
  * @brief Media Playback Cluster MediaFastForward Command callback (from client)
  */
@@ -17084,9 +16949,8 @@ bool emberAfMediaPlaybackClusterMediaFastForwardCallback(
 /**
  * @brief Media Playback Cluster MediaFastForwardResponse Command callback (from server)
  */
-bool emberAfMediaPlaybackClusterMediaFastForwardResponseCallback(
-    chip::app::CommandSender * commandObj, const chip::app::ConcreteCommandPath & commandPath, chip::EndpointId endpoint,
-    uint8_t mediaPlaybackStatus, chip::app::Clusters::MediaPlayback::Commands::MediaFastForwardResponse::DecodableType & fields);
+bool emberAfMediaPlaybackClusterMediaFastForwardResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj,
+                                                                 uint8_t mediaPlaybackStatus);
 /**
  * @brief Media Playback Cluster MediaSkipForward Command callback (from client)
  */
@@ -17096,9 +16960,8 @@ bool emberAfMediaPlaybackClusterMediaSkipForwardCallback(
 /**
  * @brief Media Playback Cluster MediaSkipForwardResponse Command callback (from server)
  */
-bool emberAfMediaPlaybackClusterMediaSkipForwardResponseCallback(
-    chip::app::CommandSender * commandObj, const chip::app::ConcreteCommandPath & commandPath, chip::EndpointId endpoint,
-    uint8_t mediaPlaybackStatus, chip::app::Clusters::MediaPlayback::Commands::MediaSkipForwardResponse::DecodableType & fields);
+bool emberAfMediaPlaybackClusterMediaSkipForwardResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj,
+                                                                 uint8_t mediaPlaybackStatus);
 /**
  * @brief Media Playback Cluster MediaSkipBackward Command callback (from client)
  */
@@ -17108,9 +16971,8 @@ bool emberAfMediaPlaybackClusterMediaSkipBackwardCallback(
 /**
  * @brief Media Playback Cluster MediaSkipBackwardResponse Command callback (from server)
  */
-bool emberAfMediaPlaybackClusterMediaSkipBackwardResponseCallback(
-    chip::app::CommandSender * commandObj, const chip::app::ConcreteCommandPath & commandPath, chip::EndpointId endpoint,
-    uint8_t mediaPlaybackStatus, chip::app::Clusters::MediaPlayback::Commands::MediaSkipBackwardResponse::DecodableType & fields);
+bool emberAfMediaPlaybackClusterMediaSkipBackwardResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj,
+                                                                  uint8_t mediaPlaybackStatus);
 /**
  * @brief Media Playback Cluster MediaSeek Command callback (from client)
  */
@@ -17121,9 +16983,8 @@ bool emberAfMediaPlaybackClusterMediaSeekCallback(chip::app::CommandHandler * co
 /**
  * @brief Media Playback Cluster MediaSeekResponse Command callback (from server)
  */
-bool emberAfMediaPlaybackClusterMediaSeekResponseCallback(
-    chip::app::CommandSender * commandObj, const chip::app::ConcreteCommandPath & commandPath, chip::EndpointId endpoint,
-    uint8_t mediaPlaybackStatus, chip::app::Clusters::MediaPlayback::Commands::MediaSeekResponse::DecodableType & fields);
+bool emberAfMediaPlaybackClusterMediaSeekResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj,
+                                                          uint8_t mediaPlaybackStatus);
 /**
  * @brief Media Input Cluster SelectInput Command callback (from client)
  */
@@ -17166,9 +17027,8 @@ bool emberAfKeypadInputClusterSendKeyCallback(chip::app::CommandHandler * comman
 /**
  * @brief Keypad Input Cluster SendKeyResponse Command callback (from server)
  */
-bool emberAfKeypadInputClusterSendKeyResponseCallback(
-    chip::app::CommandSender * commandObj, const chip::app::ConcreteCommandPath & commandPath, chip::EndpointId endpoint,
-    uint8_t status, chip::app::Clusters::KeypadInput::Commands::SendKeyResponse::DecodableType & fields);
+bool emberAfKeypadInputClusterSendKeyResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj,
+                                                      uint8_t status);
 /**
  * @brief Content Launcher Cluster LaunchContent Command callback (from client)
  */
@@ -17178,10 +17038,8 @@ bool emberAfContentLauncherClusterLaunchContentCallback(
 /**
  * @brief Content Launcher Cluster LaunchContentResponse Command callback (from server)
  */
-bool emberAfContentLauncherClusterLaunchContentResponseCallback(
-    chip::app::CommandSender * commandObj, const chip::app::ConcreteCommandPath & commandPath, chip::EndpointId endpoint,
-    uint8_t * data, uint8_t contentLaunchStatus,
-    chip::app::Clusters::ContentLauncher::Commands::LaunchContentResponse::DecodableType & fields);
+bool emberAfContentLauncherClusterLaunchContentResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj,
+                                                                uint8_t * data, uint8_t contentLaunchStatus);
 /**
  * @brief Content Launcher Cluster LaunchURL Command callback (from client)
  */
@@ -17192,10 +17050,8 @@ bool emberAfContentLauncherClusterLaunchURLCallback(
 /**
  * @brief Content Launcher Cluster LaunchURLResponse Command callback (from server)
  */
-bool emberAfContentLauncherClusterLaunchURLResponseCallback(
-    chip::app::CommandSender * commandObj, const chip::app::ConcreteCommandPath & commandPath, chip::EndpointId endpoint,
-    uint8_t * data, uint8_t contentLaunchStatus,
-    chip::app::Clusters::ContentLauncher::Commands::LaunchURLResponse::DecodableType & fields);
+bool emberAfContentLauncherClusterLaunchURLResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj,
+                                                            uint8_t * data, uint8_t contentLaunchStatus);
 /**
  * @brief Audio Output Cluster SelectOutput Command callback (from client)
  */
@@ -17218,9 +17074,8 @@ bool emberAfApplicationLauncherClusterLaunchAppCallback(
 /**
  * @brief Application Launcher Cluster LaunchAppResponse Command callback (from server)
  */
-bool emberAfApplicationLauncherClusterLaunchAppResponseCallback(
-    chip::app::CommandSender * commandObj, const chip::app::ConcreteCommandPath & commandPath, chip::EndpointId endpoint,
-    uint8_t status, uint8_t * data, chip::app::Clusters::ApplicationLauncher::Commands::LaunchAppResponse::DecodableType & fields);
+bool emberAfApplicationLauncherClusterLaunchAppResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj,
+                                                                uint8_t status, uint8_t * data);
 /**
  * @brief Application Basic Cluster ChangeStatus Command callback (from client)
  */
@@ -17236,9 +17091,8 @@ bool emberAfAccountLoginClusterGetSetupPINCallback(
 /**
  * @brief Account Login Cluster GetSetupPINResponse Command callback (from server)
  */
-bool emberAfAccountLoginClusterGetSetupPINResponseCallback(
-    chip::app::CommandSender * commandObj, const chip::app::ConcreteCommandPath & commandPath, chip::EndpointId endpoint,
-    uint8_t * setupPIN, chip::app::Clusters::AccountLogin::Commands::GetSetupPINResponse::DecodableType & fields);
+bool emberAfAccountLoginClusterGetSetupPINResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj,
+                                                           uint8_t * setupPIN);
 /**
  * @brief Account Login Cluster Login Command callback (from client)
  */
@@ -17255,9 +17109,8 @@ bool emberAfTestClusterClusterTestCallback(chip::app::CommandHandler * commandOb
 /**
  * @brief Test Cluster Cluster TestSpecificResponse Command callback (from server)
  */
-bool emberAfTestClusterClusterTestSpecificResponseCallback(
-    chip::app::CommandSender * commandObj, const chip::app::ConcreteCommandPath & commandPath, chip::EndpointId endpoint,
-    uint8_t returnValue, chip::app::Clusters::TestCluster::Commands::TestSpecificResponse::DecodableType & fields);
+bool emberAfTestClusterClusterTestSpecificResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj,
+                                                           uint8_t returnValue);
 /**
  * @brief Test Cluster Cluster TestNotHandled Command callback (from client)
  */
@@ -17267,9 +17120,8 @@ bool emberAfTestClusterClusterTestNotHandledCallback(
 /**
  * @brief Test Cluster Cluster TestAddArgumentsResponse Command callback (from server)
  */
-bool emberAfTestClusterClusterTestAddArgumentsResponseCallback(
-    chip::app::CommandSender * commandObj, const chip::app::ConcreteCommandPath & commandPath, chip::EndpointId endpoint,
-    uint8_t returnValue, chip::app::Clusters::TestCluster::Commands::TestAddArgumentsResponse::DecodableType & fields);
+bool emberAfTestClusterClusterTestAddArgumentsResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj,
+                                                               uint8_t returnValue);
 /**
  * @brief Test Cluster Cluster TestSpecific Command callback (from client)
  */
@@ -17291,11 +17143,11 @@ bool emberAfTestClusterClusterTestAddArgumentsCallback(
 /**
  * @brief Messaging Cluster DisplayMessage Command callback (from server)
  */
-bool emberAfMessagingClusterDisplayMessageCallback(
-    chip::app::CommandSender * commandObj, const chip::app::ConcreteCommandPath & commandPath, chip::EndpointId endpoint,
-    uint32_t messageId, uint8_t messageControl, /* TYPE WARNING: utc defaults to */ uint8_t * startTime, uint16_t durationInMinutes,
-    uint8_t * message, uint8_t optionalExtendedMessageControl,
-    chip::app::Clusters::Messaging::Commands::DisplayMessage::DecodableType & fields);
+bool emberAfMessagingClusterDisplayMessageCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj,
+                                                   uint32_t messageId, uint8_t messageControl,
+                                                   /* TYPE WARNING: utc defaults to */ uint8_t * startTime,
+                                                   uint16_t durationInMinutes, uint8_t * message,
+                                                   uint8_t optionalExtendedMessageControl);
 /**
  * @brief Messaging Cluster GetLastMessage Command callback (from client)
  */
@@ -17305,10 +17157,8 @@ bool emberAfMessagingClusterGetLastMessageCallback(
 /**
  * @brief Messaging Cluster CancelMessage Command callback (from server)
  */
-bool emberAfMessagingClusterCancelMessageCallback(chip::app::CommandSender * commandObj,
-                                                  const chip::app::ConcreteCommandPath & commandPath, chip::EndpointId endpoint,
-                                                  uint32_t messageId, uint8_t messageControl,
-                                                  chip::app::Clusters::Messaging::Commands::CancelMessage::DecodableType & fields);
+bool emberAfMessagingClusterCancelMessageCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj,
+                                                  uint32_t messageId, uint8_t messageControl);
 /**
  * @brief Messaging Cluster MessageConfirmation Command callback (from client)
  */
@@ -17319,11 +17169,11 @@ bool emberAfMessagingClusterMessageConfirmationCallback(
 /**
  * @brief Messaging Cluster DisplayProtectedMessage Command callback (from server)
  */
-bool emberAfMessagingClusterDisplayProtectedMessageCallback(
-    chip::app::CommandSender * commandObj, const chip::app::ConcreteCommandPath & commandPath, chip::EndpointId endpoint,
-    uint32_t messageId, uint8_t messageControl, /* TYPE WARNING: utc defaults to */ uint8_t * startTime, uint16_t durationInMinutes,
-    uint8_t * message, uint8_t optionalExtendedMessageControl,
-    chip::app::Clusters::Messaging::Commands::DisplayProtectedMessage::DecodableType & fields);
+bool emberAfMessagingClusterDisplayProtectedMessageCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj,
+                                                            uint32_t messageId, uint8_t messageControl,
+                                                            /* TYPE WARNING: utc defaults to */ uint8_t * startTime,
+                                                            uint16_t durationInMinutes, uint8_t * message,
+                                                            uint8_t optionalExtendedMessageControl);
 /**
  * @brief Messaging Cluster GetMessageCancellation Command callback (from client)
  */
@@ -17334,10 +17184,8 @@ bool emberAfMessagingClusterGetMessageCancellationCallback(
 /**
  * @brief Messaging Cluster CancelAllMessages Command callback (from server)
  */
-bool emberAfMessagingClusterCancelAllMessagesCallback(
-    chip::app::CommandSender * commandObj, const chip::app::ConcreteCommandPath & commandPath, chip::EndpointId endpoint,
-    /* TYPE WARNING: utc defaults to */ uint8_t * implementationDateTime,
-    chip::app::Clusters::Messaging::Commands::CancelAllMessages::DecodableType & fields);
+bool emberAfMessagingClusterCancelAllMessagesCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj,
+                                                      /* TYPE WARNING: utc defaults to */ uint8_t * implementationDateTime);
 /**
  * @brief Appliance Events and Alert Cluster GetAlerts Command callback (from client)
  */
@@ -17348,31 +17196,27 @@ bool emberAfApplianceEventsAndAlertClusterGetAlertsCallback(
  * @brief Appliance Events and Alert Cluster GetAlertsResponse Command callback (from server)
  */
 bool emberAfApplianceEventsAndAlertClusterGetAlertsResponseCallback(
-    chip::app::CommandSender * commandObj, const chip::app::ConcreteCommandPath & commandPath, chip::EndpointId endpoint,
-    uint8_t alertsCount, /* TYPE WARNING: array array defaults to */ uint8_t * alertStructures,
-    chip::app::Clusters::ApplianceEventsAndAlert::Commands::GetAlertsResponse::DecodableType & fields);
+    chip::EndpointId endpoint, chip::app::CommandSender * commandObj, uint8_t alertsCount,
+    /* TYPE WARNING: array array defaults to */ uint8_t * alertStructures);
 /**
  * @brief Appliance Events and Alert Cluster AlertsNotification Command callback (from server)
  */
 bool emberAfApplianceEventsAndAlertClusterAlertsNotificationCallback(
-    chip::app::CommandSender * commandObj, const chip::app::ConcreteCommandPath & commandPath, chip::EndpointId endpoint,
-    uint8_t alertsCount, /* TYPE WARNING: array array defaults to */ uint8_t * alertStructures,
-    chip::app::Clusters::ApplianceEventsAndAlert::Commands::AlertsNotification::DecodableType & fields);
+    chip::EndpointId endpoint, chip::app::CommandSender * commandObj, uint8_t alertsCount,
+    /* TYPE WARNING: array array defaults to */ uint8_t * alertStructures);
 /**
  * @brief Appliance Events and Alert Cluster EventsNotification Command callback (from server)
  */
-bool emberAfApplianceEventsAndAlertClusterEventsNotificationCallback(
-    chip::app::CommandSender * commandObj, const chip::app::ConcreteCommandPath & commandPath, chip::EndpointId endpoint,
-    uint8_t eventHeader, uint8_t eventId,
-    chip::app::Clusters::ApplianceEventsAndAlert::Commands::EventsNotification::DecodableType & fields);
+bool emberAfApplianceEventsAndAlertClusterEventsNotificationCallback(chip::EndpointId endpoint,
+                                                                     chip::app::CommandSender * commandObj, uint8_t eventHeader,
+                                                                     uint8_t eventId);
 /**
  * @brief Appliance Statistics Cluster LogNotification Command callback (from server)
  */
-bool emberAfApplianceStatisticsClusterLogNotificationCallback(
-    chip::app::CommandSender * commandObj, const chip::app::ConcreteCommandPath & commandPath, chip::EndpointId endpoint,
-    /* TYPE WARNING: unknown defaults to */ uint8_t * timeStamp, uint32_t logId, uint32_t logLength,
-    /* TYPE WARNING: array array defaults to */ uint8_t * logPayload,
-    chip::app::Clusters::ApplianceStatistics::Commands::LogNotification::DecodableType & fields);
+bool emberAfApplianceStatisticsClusterLogNotificationCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj,
+                                                              /* TYPE WARNING: unknown defaults to */ uint8_t * timeStamp,
+                                                              uint32_t logId, uint32_t logLength,
+                                                              /* TYPE WARNING: array array defaults to */ uint8_t * logPayload);
 /**
  * @brief Appliance Statistics Cluster LogRequest Command callback (from client)
  */
@@ -17382,11 +17226,10 @@ bool emberAfApplianceStatisticsClusterLogRequestCallback(
 /**
  * @brief Appliance Statistics Cluster LogResponse Command callback (from server)
  */
-bool emberAfApplianceStatisticsClusterLogResponseCallback(
-    chip::app::CommandSender * commandObj, const chip::app::ConcreteCommandPath & commandPath, chip::EndpointId endpoint,
-    /* TYPE WARNING: unknown defaults to */ uint8_t * timeStamp, uint32_t logId, uint32_t logLength,
-    /* TYPE WARNING: array array defaults to */ uint8_t * logPayload,
-    chip::app::Clusters::ApplianceStatistics::Commands::LogResponse::DecodableType & fields);
+bool emberAfApplianceStatisticsClusterLogResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj,
+                                                          /* TYPE WARNING: unknown defaults to */ uint8_t * timeStamp,
+                                                          uint32_t logId, uint32_t logLength,
+                                                          /* TYPE WARNING: array array defaults to */ uint8_t * logPayload);
 /**
  * @brief Appliance Statistics Cluster LogQueueRequest Command callback (from client)
  */
@@ -17396,25 +17239,21 @@ bool emberAfApplianceStatisticsClusterLogQueueRequestCallback(
 /**
  * @brief Appliance Statistics Cluster LogQueueResponse Command callback (from server)
  */
-bool emberAfApplianceStatisticsClusterLogQueueResponseCallback(
-    chip::app::CommandSender * commandObj, const chip::app::ConcreteCommandPath & commandPath, chip::EndpointId endpoint,
-    uint8_t logQueueSize, /* TYPE WARNING: array array defaults to */ uint8_t * logIds,
-    chip::app::Clusters::ApplianceStatistics::Commands::LogQueueResponse::DecodableType & fields);
+bool emberAfApplianceStatisticsClusterLogQueueResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj,
+                                                               uint8_t logQueueSize,
+                                                               /* TYPE WARNING: array array defaults to */ uint8_t * logIds);
 /**
  * @brief Appliance Statistics Cluster StatisticsAvailable Command callback (from server)
  */
-bool emberAfApplianceStatisticsClusterStatisticsAvailableCallback(
-    chip::app::CommandSender * commandObj, const chip::app::ConcreteCommandPath & commandPath, chip::EndpointId endpoint,
-    uint8_t logQueueSize, /* TYPE WARNING: array array defaults to */ uint8_t * logIds,
-    chip::app::Clusters::ApplianceStatistics::Commands::StatisticsAvailable::DecodableType & fields);
+bool emberAfApplianceStatisticsClusterStatisticsAvailableCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj,
+                                                                  uint8_t logQueueSize,
+                                                                  /* TYPE WARNING: array array defaults to */ uint8_t * logIds);
 /**
  * @brief Electrical Measurement Cluster GetProfileInfoResponseCommand Command callback (from server)
  */
 bool emberAfElectricalMeasurementClusterGetProfileInfoResponseCommandCallback(
-    chip::app::CommandSender * commandObj, const chip::app::ConcreteCommandPath & commandPath, chip::EndpointId endpoint,
-    uint8_t profileCount, uint8_t profileIntervalPeriod, uint8_t maxNumberOfIntervals,
-    /* TYPE WARNING: array array defaults to */ uint8_t * listOfAttributes,
-    chip::app::Clusters::ElectricalMeasurement::Commands::GetProfileInfoResponseCommand::DecodableType & fields);
+    chip::EndpointId endpoint, chip::app::CommandSender * commandObj, uint8_t profileCount, uint8_t profileIntervalPeriod,
+    uint8_t maxNumberOfIntervals, /* TYPE WARNING: array array defaults to */ uint8_t * listOfAttributes);
 /**
  * @brief Electrical Measurement Cluster GetProfileInfoCommand Command callback (from client)
  */
@@ -17425,10 +17264,9 @@ bool emberAfElectricalMeasurementClusterGetProfileInfoCommandCallback(
  * @brief Electrical Measurement Cluster GetMeasurementProfileResponseCommand Command callback (from server)
  */
 bool emberAfElectricalMeasurementClusterGetMeasurementProfileResponseCommandCallback(
-    chip::app::CommandSender * commandObj, const chip::app::ConcreteCommandPath & commandPath, chip::EndpointId endpoint,
-    uint32_t startTime, uint8_t status, uint8_t profileIntervalPeriod, uint8_t numberOfIntervalsDelivered, uint16_t attributeId,
-    /* TYPE WARNING: array array defaults to */ uint8_t * intervals,
-    chip::app::Clusters::ElectricalMeasurement::Commands::GetMeasurementProfileResponseCommand::DecodableType & fields);
+    chip::EndpointId endpoint, chip::app::CommandSender * commandObj, uint32_t startTime, uint8_t status,
+    uint8_t profileIntervalPeriod, uint8_t numberOfIntervalsDelivered, uint16_t attributeId,
+    /* TYPE WARNING: array array defaults to */ uint8_t * intervals);
 /**
  * @brief Electrical Measurement Cluster GetMeasurementProfileCommand Command callback (from client)
  */
diff --git a/zzz_generated/controller-clusters/zap-generated/CHIPClientCallbacks.cpp b/zzz_generated/controller-clusters/zap-generated/CHIPClientCallbacks.cpp
index 63aae920b..5a223af67 100644
--- a/zzz_generated/controller-clusters/zap-generated/CHIPClientCallbacks.cpp
+++ b/zzz_generated/controller-clusters/zap-generated/CHIPClientCallbacks.cpp
@@ -21,10 +21,8 @@
 
 #include <cinttypes>
 
-#include <app-common/zap-generated/cluster-objects.h>
 #include <app-common/zap-generated/enums.h>
 #include <app/Command.h>
-#include <app/ConcreteCommandPath.h>
 #include <app/util/CHIPDeviceCallbacksMgr.h>
 #include <app/util/af-enums.h>
 #include <app/util/af.h>
@@ -1647,9 +1645,7 @@ void ThreadNetworkDiagnosticsClusterActiveNetworkFaultsListListAttributeFilter(T
 #pragma GCC diagnostic pop
 #endif // __clang__
 
-bool emberAfAccountLoginClusterGetSetupPINResponseCallback(
-    app::CommandSender * commandObj, const app::ConcreteCommandPath & commandPath, EndpointId endpoint, uint8_t * setupPIN,
-    app::Clusters::AccountLogin::Commands::GetSetupPINResponse::DecodableType & fields)
+bool emberAfAccountLoginClusterGetSetupPINResponseCallback(EndpointId endpoint, app::CommandSender * commandObj, uint8_t * setupPIN)
 {
     ChipLogProgress(Zcl, "GetSetupPINResponse:");
     // Currently the generated code emits `uint8_t *` for CHAR_STRING, it needs to emits ByteSpan
@@ -1663,9 +1659,8 @@ bool emberAfAccountLoginClusterGetSetupPINResponseCallback(
     return true;
 }
 
-bool emberAfApplicationLauncherClusterLaunchAppResponseCallback(
-    app::CommandSender * commandObj, const app::ConcreteCommandPath & commandPath, EndpointId endpoint, uint8_t status,
-    uint8_t * data, app::Clusters::ApplicationLauncher::Commands::LaunchAppResponse::DecodableType & fields)
+bool emberAfApplicationLauncherClusterLaunchAppResponseCallback(EndpointId endpoint, app::CommandSender * commandObj,
+                                                                uint8_t status, uint8_t * data)
 {
     ChipLogProgress(Zcl, "LaunchAppResponse:");
     ChipLogProgress(Zcl, "  status: %" PRIu8 "", status);
@@ -1680,9 +1675,8 @@ bool emberAfApplicationLauncherClusterLaunchAppResponseCallback(
     return true;
 }
 
-bool emberAfContentLauncherClusterLaunchContentResponseCallback(
-    app::CommandSender * commandObj, const app::ConcreteCommandPath & commandPath, EndpointId endpoint, uint8_t * data,
-    uint8_t contentLaunchStatus, app::Clusters::ContentLauncher::Commands::LaunchContentResponse::DecodableType & fields)
+bool emberAfContentLauncherClusterLaunchContentResponseCallback(EndpointId endpoint, app::CommandSender * commandObj,
+                                                                uint8_t * data, uint8_t contentLaunchStatus)
 {
     ChipLogProgress(Zcl, "LaunchContentResponse:");
     // Currently the generated code emits `uint8_t *` for CHAR_STRING, it needs to emits ByteSpan
@@ -1697,9 +1691,8 @@ bool emberAfContentLauncherClusterLaunchContentResponseCallback(
     return true;
 }
 
-bool emberAfContentLauncherClusterLaunchURLResponseCallback(
-    app::CommandSender * commandObj, const app::ConcreteCommandPath & commandPath, EndpointId endpoint, uint8_t * data,
-    uint8_t contentLaunchStatus, app::Clusters::ContentLauncher::Commands::LaunchURLResponse::DecodableType & fields)
+bool emberAfContentLauncherClusterLaunchURLResponseCallback(EndpointId endpoint, app::CommandSender * commandObj, uint8_t * data,
+                                                            uint8_t contentLaunchStatus)
 {
     ChipLogProgress(Zcl, "LaunchURLResponse:");
     // Currently the generated code emits `uint8_t *` for CHAR_STRING, it needs to emits ByteSpan
@@ -1714,9 +1707,7 @@ bool emberAfContentLauncherClusterLaunchURLResponseCallback(
     return true;
 }
 
-bool emberAfDoorLockClusterClearAllPinsResponseCallback(
-    app::CommandSender * commandObj, const app::ConcreteCommandPath & commandPath, EndpointId endpoint, uint8_t status,
-    app::Clusters::DoorLock::Commands::ClearAllPinsResponse::DecodableType & fields)
+bool emberAfDoorLockClusterClearAllPinsResponseCallback(EndpointId endpoint, app::CommandSender * commandObj, uint8_t status)
 {
     ChipLogProgress(Zcl, "ClearAllPinsResponse:");
     ChipLogProgress(Zcl, "  status: %" PRIu8 "", status);
@@ -1729,9 +1720,7 @@ bool emberAfDoorLockClusterClearAllPinsResponseCallback(
     return true;
 }
 
-bool emberAfDoorLockClusterClearAllRfidsResponseCallback(
-    app::CommandSender * commandObj, const app::ConcreteCommandPath & commandPath, EndpointId endpoint, uint8_t status,
-    app::Clusters::DoorLock::Commands::ClearAllRfidsResponse::DecodableType & fields)
+bool emberAfDoorLockClusterClearAllRfidsResponseCallback(EndpointId endpoint, app::CommandSender * commandObj, uint8_t status)
 {
     ChipLogProgress(Zcl, "ClearAllRfidsResponse:");
     ChipLogProgress(Zcl, "  status: %" PRIu8 "", status);
@@ -1744,9 +1733,8 @@ bool emberAfDoorLockClusterClearAllRfidsResponseCallback(
     return true;
 }
 
-bool emberAfDoorLockClusterClearHolidayScheduleResponseCallback(
-    app::CommandSender * commandObj, const app::ConcreteCommandPath & commandPath, EndpointId endpoint, uint8_t status,
-    app::Clusters::DoorLock::Commands::ClearHolidayScheduleResponse::DecodableType & fields)
+bool emberAfDoorLockClusterClearHolidayScheduleResponseCallback(EndpointId endpoint, app::CommandSender * commandObj,
+                                                                uint8_t status)
 {
     ChipLogProgress(Zcl, "ClearHolidayScheduleResponse:");
     ChipLogProgress(Zcl, "  status: %" PRIu8 "", status);
@@ -1759,9 +1747,7 @@ bool emberAfDoorLockClusterClearHolidayScheduleResponseCallback(
     return true;
 }
 
-bool emberAfDoorLockClusterClearPinResponseCallback(app::CommandSender * commandObj, const app::ConcreteCommandPath & commandPath,
-                                                    EndpointId endpoint, uint8_t status,
-                                                    app::Clusters::DoorLock::Commands::ClearPinResponse::DecodableType & fields)
+bool emberAfDoorLockClusterClearPinResponseCallback(EndpointId endpoint, app::CommandSender * commandObj, uint8_t status)
 {
     ChipLogProgress(Zcl, "ClearPinResponse:");
     ChipLogProgress(Zcl, "  status: %" PRIu8 "", status);
@@ -1774,9 +1760,7 @@ bool emberAfDoorLockClusterClearPinResponseCallback(app::CommandSender * command
     return true;
 }
 
-bool emberAfDoorLockClusterClearRfidResponseCallback(app::CommandSender * commandObj, const app::ConcreteCommandPath & commandPath,
-                                                     EndpointId endpoint, uint8_t status,
-                                                     app::Clusters::DoorLock::Commands::ClearRfidResponse::DecodableType & fields)
+bool emberAfDoorLockClusterClearRfidResponseCallback(EndpointId endpoint, app::CommandSender * commandObj, uint8_t status)
 {
     ChipLogProgress(Zcl, "ClearRfidResponse:");
     ChipLogProgress(Zcl, "  status: %" PRIu8 "", status);
@@ -1789,9 +1773,8 @@ bool emberAfDoorLockClusterClearRfidResponseCallback(app::CommandSender * comman
     return true;
 }
 
-bool emberAfDoorLockClusterClearWeekdayScheduleResponseCallback(
-    app::CommandSender * commandObj, const app::ConcreteCommandPath & commandPath, EndpointId endpoint, uint8_t status,
-    app::Clusters::DoorLock::Commands::ClearWeekdayScheduleResponse::DecodableType & fields)
+bool emberAfDoorLockClusterClearWeekdayScheduleResponseCallback(EndpointId endpoint, app::CommandSender * commandObj,
+                                                                uint8_t status)
 {
     ChipLogProgress(Zcl, "ClearWeekdayScheduleResponse:");
     ChipLogProgress(Zcl, "  status: %" PRIu8 "", status);
@@ -1804,9 +1787,8 @@ bool emberAfDoorLockClusterClearWeekdayScheduleResponseCallback(
     return true;
 }
 
-bool emberAfDoorLockClusterClearYeardayScheduleResponseCallback(
-    app::CommandSender * commandObj, const app::ConcreteCommandPath & commandPath, EndpointId endpoint, uint8_t status,
-    app::Clusters::DoorLock::Commands::ClearYeardayScheduleResponse::DecodableType & fields)
+bool emberAfDoorLockClusterClearYeardayScheduleResponseCallback(EndpointId endpoint, app::CommandSender * commandObj,
+                                                                uint8_t status)
 {
     ChipLogProgress(Zcl, "ClearYeardayScheduleResponse:");
     ChipLogProgress(Zcl, "  status: %" PRIu8 "", status);
@@ -1819,10 +1801,9 @@ bool emberAfDoorLockClusterClearYeardayScheduleResponseCallback(
     return true;
 }
 
-bool emberAfDoorLockClusterGetHolidayScheduleResponseCallback(
-    app::CommandSender * commandObj, const app::ConcreteCommandPath & commandPath, EndpointId endpoint, uint8_t scheduleId,
-    uint8_t status, uint32_t localStartTime, uint32_t localEndTime, uint8_t operatingModeDuringHoliday,
-    app::Clusters::DoorLock::Commands::GetHolidayScheduleResponse::DecodableType & fields)
+bool emberAfDoorLockClusterGetHolidayScheduleResponseCallback(EndpointId endpoint, app::CommandSender * commandObj,
+                                                              uint8_t scheduleId, uint8_t status, uint32_t localStartTime,
+                                                              uint32_t localEndTime, uint8_t operatingModeDuringHoliday)
 {
     ChipLogProgress(Zcl, "GetHolidayScheduleResponse:");
     ChipLogProgress(Zcl, "  scheduleId: %" PRIu8 "", scheduleId);
@@ -1839,10 +1820,9 @@ bool emberAfDoorLockClusterGetHolidayScheduleResponseCallback(
     return true;
 }
 
-bool emberAfDoorLockClusterGetLogRecordResponseCallback(
-    app::CommandSender * commandObj, const app::ConcreteCommandPath & commandPath, EndpointId endpoint, uint16_t logEntryId,
-    uint32_t timestamp, uint8_t eventType, uint8_t source, uint8_t eventIdOrAlarmCode, uint16_t userId, uint8_t * pin,
-    app::Clusters::DoorLock::Commands::GetLogRecordResponse::DecodableType & fields)
+bool emberAfDoorLockClusterGetLogRecordResponseCallback(EndpointId endpoint, app::CommandSender * commandObj, uint16_t logEntryId,
+                                                        uint32_t timestamp, uint8_t eventType, uint8_t source,
+                                                        uint8_t eventIdOrAlarmCode, uint16_t userId, uint8_t * pin)
 {
     ChipLogProgress(Zcl, "GetLogRecordResponse:");
     ChipLogProgress(Zcl, "  logEntryId: %" PRIu16 "", logEntryId);
@@ -1862,10 +1842,8 @@ bool emberAfDoorLockClusterGetLogRecordResponseCallback(
     return true;
 }
 
-bool emberAfDoorLockClusterGetPinResponseCallback(app::CommandSender * commandObj, const app::ConcreteCommandPath & commandPath,
-                                                  EndpointId endpoint, uint16_t userId, uint8_t userStatus, uint8_t userType,
-                                                  uint8_t * pin,
-                                                  app::Clusters::DoorLock::Commands::GetPinResponse::DecodableType & fields)
+bool emberAfDoorLockClusterGetPinResponseCallback(EndpointId endpoint, app::CommandSender * commandObj, uint16_t userId,
+                                                  uint8_t userStatus, uint8_t userType, uint8_t * pin)
 {
     ChipLogProgress(Zcl, "GetPinResponse:");
     ChipLogProgress(Zcl, "  userId: %" PRIu16 "", userId);
@@ -1882,10 +1860,8 @@ bool emberAfDoorLockClusterGetPinResponseCallback(app::CommandSender * commandOb
     return true;
 }
 
-bool emberAfDoorLockClusterGetRfidResponseCallback(app::CommandSender * commandObj, const app::ConcreteCommandPath & commandPath,
-                                                   EndpointId endpoint, uint16_t userId, uint8_t userStatus, uint8_t userType,
-                                                   uint8_t * rfid,
-                                                   app::Clusters::DoorLock::Commands::GetRfidResponse::DecodableType & fields)
+bool emberAfDoorLockClusterGetRfidResponseCallback(EndpointId endpoint, app::CommandSender * commandObj, uint16_t userId,
+                                                   uint8_t userStatus, uint8_t userType, uint8_t * rfid)
 {
     ChipLogProgress(Zcl, "GetRfidResponse:");
     ChipLogProgress(Zcl, "  userId: %" PRIu16 "", userId);
@@ -1902,9 +1878,8 @@ bool emberAfDoorLockClusterGetRfidResponseCallback(app::CommandSender * commandO
     return true;
 }
 
-bool emberAfDoorLockClusterGetUserTypeResponseCallback(
-    app::CommandSender * commandObj, const app::ConcreteCommandPath & commandPath, EndpointId endpoint, uint16_t userId,
-    uint8_t userType, app::Clusters::DoorLock::Commands::GetUserTypeResponse::DecodableType & fields)
+bool emberAfDoorLockClusterGetUserTypeResponseCallback(EndpointId endpoint, app::CommandSender * commandObj, uint16_t userId,
+                                                       uint8_t userType)
 {
     ChipLogProgress(Zcl, "GetUserTypeResponse:");
     ChipLogProgress(Zcl, "  userId: %" PRIu16 "", userId);
@@ -1918,10 +1893,10 @@ bool emberAfDoorLockClusterGetUserTypeResponseCallback(
     return true;
 }
 
-bool emberAfDoorLockClusterGetWeekdayScheduleResponseCallback(
-    app::CommandSender * commandObj, const app::ConcreteCommandPath & commandPath, EndpointId endpoint, uint8_t scheduleId,
-    uint16_t userId, uint8_t status, uint8_t daysMask, uint8_t startHour, uint8_t startMinute, uint8_t endHour, uint8_t endMinute,
-    app::Clusters::DoorLock::Commands::GetWeekdayScheduleResponse::DecodableType & fields)
+bool emberAfDoorLockClusterGetWeekdayScheduleResponseCallback(EndpointId endpoint, app::CommandSender * commandObj,
+                                                              uint8_t scheduleId, uint16_t userId, uint8_t status, uint8_t daysMask,
+                                                              uint8_t startHour, uint8_t startMinute, uint8_t endHour,
+                                                              uint8_t endMinute)
 {
     ChipLogProgress(Zcl, "GetWeekdayScheduleResponse:");
     ChipLogProgress(Zcl, "  scheduleId: %" PRIu8 "", scheduleId);
@@ -1941,10 +1916,9 @@ bool emberAfDoorLockClusterGetWeekdayScheduleResponseCallback(
     return true;
 }
 
-bool emberAfDoorLockClusterGetYeardayScheduleResponseCallback(
-    app::CommandSender * commandObj, const app::ConcreteCommandPath & commandPath, EndpointId endpoint, uint8_t scheduleId,
-    uint16_t userId, uint8_t status, uint32_t localStartTime, uint32_t localEndTime,
-    app::Clusters::DoorLock::Commands::GetYeardayScheduleResponse::DecodableType & fields)
+bool emberAfDoorLockClusterGetYeardayScheduleResponseCallback(EndpointId endpoint, app::CommandSender * commandObj,
+                                                              uint8_t scheduleId, uint16_t userId, uint8_t status,
+                                                              uint32_t localStartTime, uint32_t localEndTime)
 {
     ChipLogProgress(Zcl, "GetYeardayScheduleResponse:");
     ChipLogProgress(Zcl, "  scheduleId: %" PRIu8 "", scheduleId);
@@ -1961,9 +1935,7 @@ bool emberAfDoorLockClusterGetYeardayScheduleResponseCallback(
     return true;
 }
 
-bool emberAfDoorLockClusterLockDoorResponseCallback(app::CommandSender * commandObj, const app::ConcreteCommandPath & commandPath,
-                                                    EndpointId endpoint, uint8_t status,
-                                                    app::Clusters::DoorLock::Commands::LockDoorResponse::DecodableType & fields)
+bool emberAfDoorLockClusterLockDoorResponseCallback(EndpointId endpoint, app::CommandSender * commandObj, uint8_t status)
 {
     ChipLogProgress(Zcl, "LockDoorResponse:");
     ChipLogProgress(Zcl, "  status: %" PRIu8 "", status);
@@ -1976,9 +1948,7 @@ bool emberAfDoorLockClusterLockDoorResponseCallback(app::CommandSender * command
     return true;
 }
 
-bool emberAfDoorLockClusterSetHolidayScheduleResponseCallback(
-    app::CommandSender * commandObj, const app::ConcreteCommandPath & commandPath, EndpointId endpoint, uint8_t status,
-    app::Clusters::DoorLock::Commands::SetHolidayScheduleResponse::DecodableType & fields)
+bool emberAfDoorLockClusterSetHolidayScheduleResponseCallback(EndpointId endpoint, app::CommandSender * commandObj, uint8_t status)
 {
     ChipLogProgress(Zcl, "SetHolidayScheduleResponse:");
     ChipLogProgress(Zcl, "  status: %" PRIu8 "", status);
@@ -1991,9 +1961,7 @@ bool emberAfDoorLockClusterSetHolidayScheduleResponseCallback(
     return true;
 }
 
-bool emberAfDoorLockClusterSetPinResponseCallback(app::CommandSender * commandObj, const app::ConcreteCommandPath & commandPath,
-                                                  EndpointId endpoint, uint8_t status,
-                                                  app::Clusters::DoorLock::Commands::SetPinResponse::DecodableType & fields)
+bool emberAfDoorLockClusterSetPinResponseCallback(EndpointId endpoint, app::CommandSender * commandObj, uint8_t status)
 {
     ChipLogProgress(Zcl, "SetPinResponse:");
     ChipLogProgress(Zcl, "  status: %" PRIu8 "", status);
@@ -2006,9 +1974,7 @@ bool emberAfDoorLockClusterSetPinResponseCallback(app::CommandSender * commandOb
     return true;
 }
 
-bool emberAfDoorLockClusterSetRfidResponseCallback(app::CommandSender * commandObj, const app::ConcreteCommandPath & commandPath,
-                                                   EndpointId endpoint, uint8_t status,
-                                                   app::Clusters::DoorLock::Commands::SetRfidResponse::DecodableType & fields)
+bool emberAfDoorLockClusterSetRfidResponseCallback(EndpointId endpoint, app::CommandSender * commandObj, uint8_t status)
 {
     ChipLogProgress(Zcl, "SetRfidResponse:");
     ChipLogProgress(Zcl, "  status: %" PRIu8 "", status);
@@ -2021,9 +1987,7 @@ bool emberAfDoorLockClusterSetRfidResponseCallback(app::CommandSender * commandO
     return true;
 }
 
-bool emberAfDoorLockClusterSetUserTypeResponseCallback(
-    app::CommandSender * commandObj, const app::ConcreteCommandPath & commandPath, EndpointId endpoint, uint8_t status,
-    app::Clusters::DoorLock::Commands::SetUserTypeResponse::DecodableType & fields)
+bool emberAfDoorLockClusterSetUserTypeResponseCallback(EndpointId endpoint, app::CommandSender * commandObj, uint8_t status)
 {
     ChipLogProgress(Zcl, "SetUserTypeResponse:");
     ChipLogProgress(Zcl, "  status: %" PRIu8 "", status);
@@ -2036,9 +2000,7 @@ bool emberAfDoorLockClusterSetUserTypeResponseCallback(
     return true;
 }
 
-bool emberAfDoorLockClusterSetWeekdayScheduleResponseCallback(
-    app::CommandSender * commandObj, const app::ConcreteCommandPath & commandPath, EndpointId endpoint, uint8_t status,
-    app::Clusters::DoorLock::Commands::SetWeekdayScheduleResponse::DecodableType & fields)
+bool emberAfDoorLockClusterSetWeekdayScheduleResponseCallback(EndpointId endpoint, app::CommandSender * commandObj, uint8_t status)
 {
     ChipLogProgress(Zcl, "SetWeekdayScheduleResponse:");
     ChipLogProgress(Zcl, "  status: %" PRIu8 "", status);
@@ -2051,9 +2013,7 @@ bool emberAfDoorLockClusterSetWeekdayScheduleResponseCallback(
     return true;
 }
 
-bool emberAfDoorLockClusterSetYeardayScheduleResponseCallback(
-    app::CommandSender * commandObj, const app::ConcreteCommandPath & commandPath, EndpointId endpoint, uint8_t status,
-    app::Clusters::DoorLock::Commands::SetYeardayScheduleResponse::DecodableType & fields)
+bool emberAfDoorLockClusterSetYeardayScheduleResponseCallback(EndpointId endpoint, app::CommandSender * commandObj, uint8_t status)
 {
     ChipLogProgress(Zcl, "SetYeardayScheduleResponse:");
     ChipLogProgress(Zcl, "  status: %" PRIu8 "", status);
@@ -2066,9 +2026,7 @@ bool emberAfDoorLockClusterSetYeardayScheduleResponseCallback(
     return true;
 }
 
-bool emberAfDoorLockClusterUnlockDoorResponseCallback(app::CommandSender * commandObj, const app::ConcreteCommandPath & commandPath,
-                                                      EndpointId endpoint, uint8_t status,
-                                                      app::Clusters::DoorLock::Commands::UnlockDoorResponse::DecodableType & fields)
+bool emberAfDoorLockClusterUnlockDoorResponseCallback(EndpointId endpoint, app::CommandSender * commandObj, uint8_t status)
 {
     ChipLogProgress(Zcl, "UnlockDoorResponse:");
     ChipLogProgress(Zcl, "  status: %" PRIu8 "", status);
@@ -2081,9 +2039,7 @@ bool emberAfDoorLockClusterUnlockDoorResponseCallback(app::CommandSender * comma
     return true;
 }
 
-bool emberAfDoorLockClusterUnlockWithTimeoutResponseCallback(
-    app::CommandSender * commandObj, const app::ConcreteCommandPath & commandPath, EndpointId endpoint, uint8_t status,
-    app::Clusters::DoorLock::Commands::UnlockWithTimeoutResponse::DecodableType & fields)
+bool emberAfDoorLockClusterUnlockWithTimeoutResponseCallback(EndpointId endpoint, app::CommandSender * commandObj, uint8_t status)
 {
     ChipLogProgress(Zcl, "UnlockWithTimeoutResponse:");
     ChipLogProgress(Zcl, "  status: %" PRIu8 "", status);
@@ -2096,9 +2052,8 @@ bool emberAfDoorLockClusterUnlockWithTimeoutResponseCallback(
     return true;
 }
 
-bool emberAfGeneralCommissioningClusterArmFailSafeResponseCallback(
-    app::CommandSender * commandObj, const app::ConcreteCommandPath & commandPath, EndpointId endpoint, uint8_t errorCode,
-    uint8_t * debugText, app::Clusters::GeneralCommissioning::Commands::ArmFailSafeResponse::DecodableType & fields)
+bool emberAfGeneralCommissioningClusterArmFailSafeResponseCallback(EndpointId endpoint, app::CommandSender * commandObj,
+                                                                   uint8_t errorCode, uint8_t * debugText)
 {
     ChipLogProgress(Zcl, "ArmFailSafeResponse:");
     ChipLogProgress(Zcl, "  errorCode: %" PRIu8 "", errorCode);
@@ -2113,9 +2068,8 @@ bool emberAfGeneralCommissioningClusterArmFailSafeResponseCallback(
     return true;
 }
 
-bool emberAfGeneralCommissioningClusterCommissioningCompleteResponseCallback(
-    app::CommandSender * commandObj, const app::ConcreteCommandPath & commandPath, EndpointId endpoint, uint8_t errorCode,
-    uint8_t * debugText, app::Clusters::GeneralCommissioning::Commands::CommissioningCompleteResponse::DecodableType & fields)
+bool emberAfGeneralCommissioningClusterCommissioningCompleteResponseCallback(EndpointId endpoint, app::CommandSender * commandObj,
+                                                                             uint8_t errorCode, uint8_t * debugText)
 {
     ChipLogProgress(Zcl, "CommissioningCompleteResponse:");
     ChipLogProgress(Zcl, "  errorCode: %" PRIu8 "", errorCode);
@@ -2130,9 +2084,8 @@ bool emberAfGeneralCommissioningClusterCommissioningCompleteResponseCallback(
     return true;
 }
 
-bool emberAfGeneralCommissioningClusterSetRegulatoryConfigResponseCallback(
-    app::CommandSender * commandObj, const app::ConcreteCommandPath & commandPath, EndpointId endpoint, uint8_t errorCode,
-    uint8_t * debugText, app::Clusters::GeneralCommissioning::Commands::SetRegulatoryConfigResponse::DecodableType & fields)
+bool emberAfGeneralCommissioningClusterSetRegulatoryConfigResponseCallback(EndpointId endpoint, app::CommandSender * commandObj,
+                                                                           uint8_t errorCode, uint8_t * debugText)
 {
     ChipLogProgress(Zcl, "SetRegulatoryConfigResponse:");
     ChipLogProgress(Zcl, "  errorCode: %" PRIu8 "", errorCode);
@@ -2147,9 +2100,8 @@ bool emberAfGeneralCommissioningClusterSetRegulatoryConfigResponseCallback(
     return true;
 }
 
-bool emberAfGroupsClusterAddGroupResponseCallback(app::CommandSender * commandObj, const app::ConcreteCommandPath & commandPath,
-                                                  EndpointId endpoint, uint8_t status, uint16_t groupId,
-                                                  app::Clusters::Groups::Commands::AddGroupResponse::DecodableType & fields)
+bool emberAfGroupsClusterAddGroupResponseCallback(EndpointId endpoint, app::CommandSender * commandObj, uint8_t status,
+                                                  uint16_t groupId)
 {
     ChipLogProgress(Zcl, "AddGroupResponse:");
     ChipLogProgress(Zcl, "  status: %" PRIu8 "", status);
@@ -2163,10 +2115,9 @@ bool emberAfGroupsClusterAddGroupResponseCallback(app::CommandSender * commandOb
     return true;
 }
 
-bool emberAfGroupsClusterGetGroupMembershipResponseCallback(
-    app::CommandSender * commandObj, const app::ConcreteCommandPath & commandPath, EndpointId endpoint, uint8_t capacity,
-    uint8_t groupCount, /* TYPE WARNING: array array defaults to */ uint8_t * groupList,
-    app::Clusters::Groups::Commands::GetGroupMembershipResponse::DecodableType & fields)
+bool emberAfGroupsClusterGetGroupMembershipResponseCallback(EndpointId endpoint, app::CommandSender * commandObj, uint8_t capacity,
+                                                            uint8_t groupCount,
+                                                            /* TYPE WARNING: array array defaults to */ uint8_t * groupList)
 {
     ChipLogProgress(Zcl, "GetGroupMembershipResponse:");
     ChipLogProgress(Zcl, "  capacity: %" PRIu8 "", capacity);
@@ -2181,9 +2132,8 @@ bool emberAfGroupsClusterGetGroupMembershipResponseCallback(
     return true;
 }
 
-bool emberAfGroupsClusterRemoveGroupResponseCallback(app::CommandSender * commandObj, const app::ConcreteCommandPath & commandPath,
-                                                     EndpointId endpoint, uint8_t status, uint16_t groupId,
-                                                     app::Clusters::Groups::Commands::RemoveGroupResponse::DecodableType & fields)
+bool emberAfGroupsClusterRemoveGroupResponseCallback(EndpointId endpoint, app::CommandSender * commandObj, uint8_t status,
+                                                     uint16_t groupId)
 {
     ChipLogProgress(Zcl, "RemoveGroupResponse:");
     ChipLogProgress(Zcl, "  status: %" PRIu8 "", status);
@@ -2197,9 +2147,8 @@ bool emberAfGroupsClusterRemoveGroupResponseCallback(app::CommandSender * comman
     return true;
 }
 
-bool emberAfGroupsClusterViewGroupResponseCallback(app::CommandSender * commandObj, const app::ConcreteCommandPath & commandPath,
-                                                   EndpointId endpoint, uint8_t status, uint16_t groupId, uint8_t * groupName,
-                                                   app::Clusters::Groups::Commands::ViewGroupResponse::DecodableType & fields)
+bool emberAfGroupsClusterViewGroupResponseCallback(EndpointId endpoint, app::CommandSender * commandObj, uint8_t status,
+                                                   uint16_t groupId, uint8_t * groupName)
 {
     ChipLogProgress(Zcl, "ViewGroupResponse:");
     ChipLogProgress(Zcl, "  status: %" PRIu8 "", status);
@@ -2215,9 +2164,7 @@ bool emberAfGroupsClusterViewGroupResponseCallback(app::CommandSender * commandO
     return true;
 }
 
-bool emberAfIdentifyClusterIdentifyQueryResponseCallback(
-    app::CommandSender * commandObj, const app::ConcreteCommandPath & commandPath, EndpointId endpoint, uint16_t timeout,
-    app::Clusters::Identify::Commands::IdentifyQueryResponse::DecodableType & fields)
+bool emberAfIdentifyClusterIdentifyQueryResponseCallback(EndpointId endpoint, app::CommandSender * commandObj, uint16_t timeout)
 {
     ChipLogProgress(Zcl, "IdentifyQueryResponse:");
     ChipLogProgress(Zcl, "  timeout: %" PRIu16 "", timeout);
@@ -2230,9 +2177,7 @@ bool emberAfIdentifyClusterIdentifyQueryResponseCallback(
     return true;
 }
 
-bool emberAfKeypadInputClusterSendKeyResponseCallback(app::CommandSender * commandObj, const app::ConcreteCommandPath & commandPath,
-                                                      EndpointId endpoint, uint8_t status,
-                                                      app::Clusters::KeypadInput::Commands::SendKeyResponse::DecodableType & fields)
+bool emberAfKeypadInputClusterSendKeyResponseCallback(EndpointId endpoint, app::CommandSender * commandObj, uint8_t status)
 {
     ChipLogProgress(Zcl, "SendKeyResponse:");
     ChipLogProgress(Zcl, "  status: %" PRIu8 "", status);
@@ -2245,9 +2190,8 @@ bool emberAfKeypadInputClusterSendKeyResponseCallback(app::CommandSender * comma
     return true;
 }
 
-bool emberAfMediaPlaybackClusterMediaFastForwardResponseCallback(
-    app::CommandSender * commandObj, const app::ConcreteCommandPath & commandPath, EndpointId endpoint, uint8_t mediaPlaybackStatus,
-    app::Clusters::MediaPlayback::Commands::MediaFastForwardResponse::DecodableType & fields)
+bool emberAfMediaPlaybackClusterMediaFastForwardResponseCallback(EndpointId endpoint, app::CommandSender * commandObj,
+                                                                 uint8_t mediaPlaybackStatus)
 {
     ChipLogProgress(Zcl, "MediaFastForwardResponse:");
     ChipLogProgress(Zcl, "  mediaPlaybackStatus: %" PRIu8 "", mediaPlaybackStatus);
@@ -2260,9 +2204,8 @@ bool emberAfMediaPlaybackClusterMediaFastForwardResponseCallback(
     return true;
 }
 
-bool emberAfMediaPlaybackClusterMediaNextResponseCallback(
-    app::CommandSender * commandObj, const app::ConcreteCommandPath & commandPath, EndpointId endpoint, uint8_t mediaPlaybackStatus,
-    app::Clusters::MediaPlayback::Commands::MediaNextResponse::DecodableType & fields)
+bool emberAfMediaPlaybackClusterMediaNextResponseCallback(EndpointId endpoint, app::CommandSender * commandObj,
+                                                          uint8_t mediaPlaybackStatus)
 {
     ChipLogProgress(Zcl, "MediaNextResponse:");
     ChipLogProgress(Zcl, "  mediaPlaybackStatus: %" PRIu8 "", mediaPlaybackStatus);
@@ -2275,9 +2218,8 @@ bool emberAfMediaPlaybackClusterMediaNextResponseCallback(
     return true;
 }
 
-bool emberAfMediaPlaybackClusterMediaPauseResponseCallback(
-    app::CommandSender * commandObj, const app::ConcreteCommandPath & commandPath, EndpointId endpoint, uint8_t mediaPlaybackStatus,
-    app::Clusters::MediaPlayback::Commands::MediaPauseResponse::DecodableType & fields)
+bool emberAfMediaPlaybackClusterMediaPauseResponseCallback(EndpointId endpoint, app::CommandSender * commandObj,
+                                                           uint8_t mediaPlaybackStatus)
 {
     ChipLogProgress(Zcl, "MediaPauseResponse:");
     ChipLogProgress(Zcl, "  mediaPlaybackStatus: %" PRIu8 "", mediaPlaybackStatus);
@@ -2290,9 +2232,8 @@ bool emberAfMediaPlaybackClusterMediaPauseResponseCallback(
     return true;
 }
 
-bool emberAfMediaPlaybackClusterMediaPlayResponseCallback(
-    app::CommandSender * commandObj, const app::ConcreteCommandPath & commandPath, EndpointId endpoint, uint8_t mediaPlaybackStatus,
-    app::Clusters::MediaPlayback::Commands::MediaPlayResponse::DecodableType & fields)
+bool emberAfMediaPlaybackClusterMediaPlayResponseCallback(EndpointId endpoint, app::CommandSender * commandObj,
+                                                          uint8_t mediaPlaybackStatus)
 {
     ChipLogProgress(Zcl, "MediaPlayResponse:");
     ChipLogProgress(Zcl, "  mediaPlaybackStatus: %" PRIu8 "", mediaPlaybackStatus);
@@ -2305,9 +2246,8 @@ bool emberAfMediaPlaybackClusterMediaPlayResponseCallback(
     return true;
 }
 
-bool emberAfMediaPlaybackClusterMediaPreviousResponseCallback(
-    app::CommandSender * commandObj, const app::ConcreteCommandPath & commandPath, EndpointId endpoint, uint8_t mediaPlaybackStatus,
-    app::Clusters::MediaPlayback::Commands::MediaPreviousResponse::DecodableType & fields)
+bool emberAfMediaPlaybackClusterMediaPreviousResponseCallback(EndpointId endpoint, app::CommandSender * commandObj,
+                                                              uint8_t mediaPlaybackStatus)
 {
     ChipLogProgress(Zcl, "MediaPreviousResponse:");
     ChipLogProgress(Zcl, "  mediaPlaybackStatus: %" PRIu8 "", mediaPlaybackStatus);
@@ -2320,9 +2260,8 @@ bool emberAfMediaPlaybackClusterMediaPreviousResponseCallback(
     return true;
 }
 
-bool emberAfMediaPlaybackClusterMediaRewindResponseCallback(
-    app::CommandSender * commandObj, const app::ConcreteCommandPath & commandPath, EndpointId endpoint, uint8_t mediaPlaybackStatus,
-    app::Clusters::MediaPlayback::Commands::MediaRewindResponse::DecodableType & fields)
+bool emberAfMediaPlaybackClusterMediaRewindResponseCallback(EndpointId endpoint, app::CommandSender * commandObj,
+                                                            uint8_t mediaPlaybackStatus)
 {
     ChipLogProgress(Zcl, "MediaRewindResponse:");
     ChipLogProgress(Zcl, "  mediaPlaybackStatus: %" PRIu8 "", mediaPlaybackStatus);
@@ -2335,9 +2274,8 @@ bool emberAfMediaPlaybackClusterMediaRewindResponseCallback(
     return true;
 }
 
-bool emberAfMediaPlaybackClusterMediaSeekResponseCallback(
-    app::CommandSender * commandObj, const app::ConcreteCommandPath & commandPath, EndpointId endpoint, uint8_t mediaPlaybackStatus,
-    app::Clusters::MediaPlayback::Commands::MediaSeekResponse::DecodableType & fields)
+bool emberAfMediaPlaybackClusterMediaSeekResponseCallback(EndpointId endpoint, app::CommandSender * commandObj,
+                                                          uint8_t mediaPlaybackStatus)
 {
     ChipLogProgress(Zcl, "MediaSeekResponse:");
     ChipLogProgress(Zcl, "  mediaPlaybackStatus: %" PRIu8 "", mediaPlaybackStatus);
@@ -2350,9 +2288,8 @@ bool emberAfMediaPlaybackClusterMediaSeekResponseCallback(
     return true;
 }
 
-bool emberAfMediaPlaybackClusterMediaSkipBackwardResponseCallback(
-    app::CommandSender * commandObj, const app::ConcreteCommandPath & commandPath, EndpointId endpoint, uint8_t mediaPlaybackStatus,
-    app::Clusters::MediaPlayback::Commands::MediaSkipBackwardResponse::DecodableType & fields)
+bool emberAfMediaPlaybackClusterMediaSkipBackwardResponseCallback(EndpointId endpoint, app::CommandSender * commandObj,
+                                                                  uint8_t mediaPlaybackStatus)
 {
     ChipLogProgress(Zcl, "MediaSkipBackwardResponse:");
     ChipLogProgress(Zcl, "  mediaPlaybackStatus: %" PRIu8 "", mediaPlaybackStatus);
@@ -2365,9 +2302,8 @@ bool emberAfMediaPlaybackClusterMediaSkipBackwardResponseCallback(
     return true;
 }
 
-bool emberAfMediaPlaybackClusterMediaSkipForwardResponseCallback(
-    app::CommandSender * commandObj, const app::ConcreteCommandPath & commandPath, EndpointId endpoint, uint8_t mediaPlaybackStatus,
-    app::Clusters::MediaPlayback::Commands::MediaSkipForwardResponse::DecodableType & fields)
+bool emberAfMediaPlaybackClusterMediaSkipForwardResponseCallback(EndpointId endpoint, app::CommandSender * commandObj,
+                                                                 uint8_t mediaPlaybackStatus)
 {
     ChipLogProgress(Zcl, "MediaSkipForwardResponse:");
     ChipLogProgress(Zcl, "  mediaPlaybackStatus: %" PRIu8 "", mediaPlaybackStatus);
@@ -2380,9 +2316,8 @@ bool emberAfMediaPlaybackClusterMediaSkipForwardResponseCallback(
     return true;
 }
 
-bool emberAfMediaPlaybackClusterMediaStartOverResponseCallback(
-    app::CommandSender * commandObj, const app::ConcreteCommandPath & commandPath, EndpointId endpoint, uint8_t mediaPlaybackStatus,
-    app::Clusters::MediaPlayback::Commands::MediaStartOverResponse::DecodableType & fields)
+bool emberAfMediaPlaybackClusterMediaStartOverResponseCallback(EndpointId endpoint, app::CommandSender * commandObj,
+                                                               uint8_t mediaPlaybackStatus)
 {
     ChipLogProgress(Zcl, "MediaStartOverResponse:");
     ChipLogProgress(Zcl, "  mediaPlaybackStatus: %" PRIu8 "", mediaPlaybackStatus);
@@ -2395,9 +2330,8 @@ bool emberAfMediaPlaybackClusterMediaStartOverResponseCallback(
     return true;
 }
 
-bool emberAfMediaPlaybackClusterMediaStopResponseCallback(
-    app::CommandSender * commandObj, const app::ConcreteCommandPath & commandPath, EndpointId endpoint, uint8_t mediaPlaybackStatus,
-    app::Clusters::MediaPlayback::Commands::MediaStopResponse::DecodableType & fields)
+bool emberAfMediaPlaybackClusterMediaStopResponseCallback(EndpointId endpoint, app::CommandSender * commandObj,
+                                                          uint8_t mediaPlaybackStatus)
 {
     ChipLogProgress(Zcl, "MediaStopResponse:");
     ChipLogProgress(Zcl, "  mediaPlaybackStatus: %" PRIu8 "", mediaPlaybackStatus);
@@ -2410,9 +2344,8 @@ bool emberAfMediaPlaybackClusterMediaStopResponseCallback(
     return true;
 }
 
-bool emberAfNetworkCommissioningClusterAddThreadNetworkResponseCallback(
-    app::CommandSender * commandObj, const app::ConcreteCommandPath & commandPath, EndpointId endpoint, uint8_t errorCode,
-    uint8_t * debugText, app::Clusters::NetworkCommissioning::Commands::AddThreadNetworkResponse::DecodableType & fields)
+bool emberAfNetworkCommissioningClusterAddThreadNetworkResponseCallback(EndpointId endpoint, app::CommandSender * commandObj,
+                                                                        uint8_t errorCode, uint8_t * debugText)
 {
     ChipLogProgress(Zcl, "AddThreadNetworkResponse:");
     ChipLogProgress(Zcl, "  errorCode: %" PRIu8 "", errorCode);
@@ -2427,9 +2360,8 @@ bool emberAfNetworkCommissioningClusterAddThreadNetworkResponseCallback(
     return true;
 }
 
-bool emberAfNetworkCommissioningClusterAddWiFiNetworkResponseCallback(
-    app::CommandSender * commandObj, const app::ConcreteCommandPath & commandPath, EndpointId endpoint, uint8_t errorCode,
-    uint8_t * debugText, app::Clusters::NetworkCommissioning::Commands::AddWiFiNetworkResponse::DecodableType & fields)
+bool emberAfNetworkCommissioningClusterAddWiFiNetworkResponseCallback(EndpointId endpoint, app::CommandSender * commandObj,
+                                                                      uint8_t errorCode, uint8_t * debugText)
 {
     ChipLogProgress(Zcl, "AddWiFiNetworkResponse:");
     ChipLogProgress(Zcl, "  errorCode: %" PRIu8 "", errorCode);
@@ -2444,9 +2376,8 @@ bool emberAfNetworkCommissioningClusterAddWiFiNetworkResponseCallback(
     return true;
 }
 
-bool emberAfNetworkCommissioningClusterDisableNetworkResponseCallback(
-    app::CommandSender * commandObj, const app::ConcreteCommandPath & commandPath, EndpointId endpoint, uint8_t errorCode,
-    uint8_t * debugText, app::Clusters::NetworkCommissioning::Commands::DisableNetworkResponse::DecodableType & fields)
+bool emberAfNetworkCommissioningClusterDisableNetworkResponseCallback(EndpointId endpoint, app::CommandSender * commandObj,
+                                                                      uint8_t errorCode, uint8_t * debugText)
 {
     ChipLogProgress(Zcl, "DisableNetworkResponse:");
     ChipLogProgress(Zcl, "  errorCode: %" PRIu8 "", errorCode);
@@ -2461,9 +2392,8 @@ bool emberAfNetworkCommissioningClusterDisableNetworkResponseCallback(
     return true;
 }
 
-bool emberAfNetworkCommissioningClusterEnableNetworkResponseCallback(
-    app::CommandSender * commandObj, const app::ConcreteCommandPath & commandPath, EndpointId endpoint, uint8_t errorCode,
-    uint8_t * debugText, app::Clusters::NetworkCommissioning::Commands::EnableNetworkResponse::DecodableType & fields)
+bool emberAfNetworkCommissioningClusterEnableNetworkResponseCallback(EndpointId endpoint, app::CommandSender * commandObj,
+                                                                     uint8_t errorCode, uint8_t * debugText)
 {
     ChipLogProgress(Zcl, "EnableNetworkResponse:");
     ChipLogProgress(Zcl, "  errorCode: %" PRIu8 "", errorCode);
@@ -2478,9 +2408,8 @@ bool emberAfNetworkCommissioningClusterEnableNetworkResponseCallback(
     return true;
 }
 
-bool emberAfNetworkCommissioningClusterRemoveNetworkResponseCallback(
-    app::CommandSender * commandObj, const app::ConcreteCommandPath & commandPath, EndpointId endpoint, uint8_t errorCode,
-    uint8_t * debugText, app::Clusters::NetworkCommissioning::Commands::RemoveNetworkResponse::DecodableType & fields)
+bool emberAfNetworkCommissioningClusterRemoveNetworkResponseCallback(EndpointId endpoint, app::CommandSender * commandObj,
+                                                                     uint8_t errorCode, uint8_t * debugText)
 {
     ChipLogProgress(Zcl, "RemoveNetworkResponse:");
     ChipLogProgress(Zcl, "  errorCode: %" PRIu8 "", errorCode);
@@ -2496,10 +2425,9 @@ bool emberAfNetworkCommissioningClusterRemoveNetworkResponseCallback(
 }
 
 bool emberAfNetworkCommissioningClusterScanNetworksResponseCallback(
-    app::CommandSender * commandObj, const app::ConcreteCommandPath & commandPath, EndpointId endpoint, uint8_t errorCode,
-    uint8_t * debugText, /* TYPE WARNING: array array defaults to */ uint8_t * wifiScanResults,
-    /* TYPE WARNING: array array defaults to */ uint8_t * threadScanResults,
-    app::Clusters::NetworkCommissioning::Commands::ScanNetworksResponse::DecodableType & fields)
+    EndpointId endpoint, app::CommandSender * commandObj, uint8_t errorCode, uint8_t * debugText,
+    /* TYPE WARNING: array array defaults to */ uint8_t * wifiScanResults,
+    /* TYPE WARNING: array array defaults to */ uint8_t * threadScanResults)
 {
     ChipLogProgress(Zcl, "ScanNetworksResponse:");
     ChipLogProgress(Zcl, "  errorCode: %" PRIu8 "", errorCode);
@@ -2516,9 +2444,8 @@ bool emberAfNetworkCommissioningClusterScanNetworksResponseCallback(
     return true;
 }
 
-bool emberAfNetworkCommissioningClusterUpdateThreadNetworkResponseCallback(
-    app::CommandSender * commandObj, const app::ConcreteCommandPath & commandPath, EndpointId endpoint, uint8_t errorCode,
-    uint8_t * debugText, app::Clusters::NetworkCommissioning::Commands::UpdateThreadNetworkResponse::DecodableType & fields)
+bool emberAfNetworkCommissioningClusterUpdateThreadNetworkResponseCallback(EndpointId endpoint, app::CommandSender * commandObj,
+                                                                           uint8_t errorCode, uint8_t * debugText)
 {
     ChipLogProgress(Zcl, "UpdateThreadNetworkResponse:");
     ChipLogProgress(Zcl, "  errorCode: %" PRIu8 "", errorCode);
@@ -2533,9 +2460,8 @@ bool emberAfNetworkCommissioningClusterUpdateThreadNetworkResponseCallback(
     return true;
 }
 
-bool emberAfNetworkCommissioningClusterUpdateWiFiNetworkResponseCallback(
-    app::CommandSender * commandObj, const app::ConcreteCommandPath & commandPath, EndpointId endpoint, uint8_t errorCode,
-    uint8_t * debugText, app::Clusters::NetworkCommissioning::Commands::UpdateWiFiNetworkResponse::DecodableType & fields)
+bool emberAfNetworkCommissioningClusterUpdateWiFiNetworkResponseCallback(EndpointId endpoint, app::CommandSender * commandObj,
+                                                                         uint8_t errorCode, uint8_t * debugText)
 {
     ChipLogProgress(Zcl, "UpdateWiFiNetworkResponse:");
     ChipLogProgress(Zcl, "  errorCode: %" PRIu8 "", errorCode);
@@ -2550,10 +2476,8 @@ bool emberAfNetworkCommissioningClusterUpdateWiFiNetworkResponseCallback(
     return true;
 }
 
-bool emberAfOtaSoftwareUpdateProviderClusterApplyUpdateRequestResponseCallback(
-    app::CommandSender * commandObj, const app::ConcreteCommandPath & commandPath, EndpointId endpoint, uint8_t action,
-    uint32_t delayedActionTime,
-    app::Clusters::OtaSoftwareUpdateProvider::Commands::ApplyUpdateRequestResponse::DecodableType & fields)
+bool emberAfOtaSoftwareUpdateProviderClusterApplyUpdateRequestResponseCallback(EndpointId endpoint, app::CommandSender * commandObj,
+                                                                               uint8_t action, uint32_t delayedActionTime)
 {
     ChipLogProgress(Zcl, "ApplyUpdateRequestResponse:");
     ChipLogProgress(Zcl, "  action: %" PRIu8 "", action);
@@ -2567,11 +2491,11 @@ bool emberAfOtaSoftwareUpdateProviderClusterApplyUpdateRequestResponseCallback(
     return true;
 }
 
-bool emberAfOtaSoftwareUpdateProviderClusterQueryImageResponseCallback(
-    app::CommandSender * commandObj, const app::ConcreteCommandPath & commandPath, EndpointId endpoint, uint8_t status,
-    uint32_t delayedActionTime, uint8_t * imageURI, uint32_t softwareVersion, uint8_t * softwareVersionString,
-    chip::ByteSpan updateToken, bool userConsentNeeded, chip::ByteSpan metadataForRequestor,
-    app::Clusters::OtaSoftwareUpdateProvider::Commands::QueryImageResponse::DecodableType & fields)
+bool emberAfOtaSoftwareUpdateProviderClusterQueryImageResponseCallback(EndpointId endpoint, app::CommandSender * commandObj,
+                                                                       uint8_t status, uint32_t delayedActionTime,
+                                                                       uint8_t * imageURI, uint32_t softwareVersion,
+                                                                       uint8_t * softwareVersionString, chip::ByteSpan updateToken,
+                                                                       bool userConsentNeeded, chip::ByteSpan metadataForRequestor)
 {
     ChipLogProgress(Zcl, "QueryImageResponse:");
     ChipLogProgress(Zcl, "  status: %" PRIu8 "", status);
@@ -2594,10 +2518,8 @@ bool emberAfOtaSoftwareUpdateProviderClusterQueryImageResponseCallback(
     return true;
 }
 
-bool emberAfOperationalCredentialsClusterAttestationResponseCallback(
-    app::CommandSender * commandObj, const app::ConcreteCommandPath & commandPath, EndpointId endpoint,
-    chip::ByteSpan AttestationElements, chip::ByteSpan Signature,
-    app::Clusters::OperationalCredentials::Commands::AttestationResponse::DecodableType & fields)
+bool emberAfOperationalCredentialsClusterAttestationResponseCallback(EndpointId endpoint, app::CommandSender * commandObj,
+                                                                     chip::ByteSpan AttestationElements, chip::ByteSpan Signature)
 {
     ChipLogProgress(Zcl, "AttestationResponse:");
     ChipLogProgress(Zcl, "  AttestationElements: %zu", AttestationElements.size());
@@ -2611,9 +2533,8 @@ bool emberAfOperationalCredentialsClusterAttestationResponseCallback(
     return true;
 }
 
-bool emberAfOperationalCredentialsClusterCertificateChainResponseCallback(
-    app::CommandSender * commandObj, const app::ConcreteCommandPath & commandPath, EndpointId endpoint, chip::ByteSpan Certificate,
-    app::Clusters::OperationalCredentials::Commands::CertificateChainResponse::DecodableType & fields)
+bool emberAfOperationalCredentialsClusterCertificateChainResponseCallback(EndpointId endpoint, app::CommandSender * commandObj,
+                                                                          chip::ByteSpan Certificate)
 {
     ChipLogProgress(Zcl, "CertificateChainResponse:");
     ChipLogProgress(Zcl, "  Certificate: %zu", Certificate.size());
@@ -2626,10 +2547,8 @@ bool emberAfOperationalCredentialsClusterCertificateChainResponseCallback(
     return true;
 }
 
-bool emberAfOperationalCredentialsClusterNOCResponseCallback(
-    app::CommandSender * commandObj, const app::ConcreteCommandPath & commandPath, EndpointId endpoint, uint8_t StatusCode,
-    uint8_t FabricIndex, chip::ByteSpan DebugText,
-    app::Clusters::OperationalCredentials::Commands::NOCResponse::DecodableType & fields)
+bool emberAfOperationalCredentialsClusterNOCResponseCallback(EndpointId endpoint, app::CommandSender * commandObj,
+                                                             uint8_t StatusCode, uint8_t FabricIndex, chip::ByteSpan DebugText)
 {
     ChipLogProgress(Zcl, "NOCResponse:");
     ChipLogProgress(Zcl, "  StatusCode: %" PRIu8 "", StatusCode);
@@ -2644,10 +2563,8 @@ bool emberAfOperationalCredentialsClusterNOCResponseCallback(
     return true;
 }
 
-bool emberAfOperationalCredentialsClusterOpCSRResponseCallback(
-    app::CommandSender * commandObj, const app::ConcreteCommandPath & commandPath, EndpointId endpoint,
-    chip::ByteSpan NOCSRElements, chip::ByteSpan AttestationSignature,
-    app::Clusters::OperationalCredentials::Commands::OpCSRResponse::DecodableType & fields)
+bool emberAfOperationalCredentialsClusterOpCSRResponseCallback(EndpointId endpoint, app::CommandSender * commandObj,
+                                                               chip::ByteSpan NOCSRElements, chip::ByteSpan AttestationSignature)
 {
     ChipLogProgress(Zcl, "OpCSRResponse:");
     ChipLogProgress(Zcl, "  NOCSRElements: %zu", NOCSRElements.size());
@@ -2661,9 +2578,8 @@ bool emberAfOperationalCredentialsClusterOpCSRResponseCallback(
     return true;
 }
 
-bool emberAfScenesClusterAddSceneResponseCallback(app::CommandSender * commandObj, const app::ConcreteCommandPath & commandPath,
-                                                  EndpointId endpoint, uint8_t status, uint16_t groupId, uint8_t sceneId,
-                                                  app::Clusters::Scenes::Commands::AddSceneResponse::DecodableType & fields)
+bool emberAfScenesClusterAddSceneResponseCallback(EndpointId endpoint, app::CommandSender * commandObj, uint8_t status,
+                                                  uint16_t groupId, uint8_t sceneId)
 {
     ChipLogProgress(Zcl, "AddSceneResponse:");
     ChipLogProgress(Zcl, "  status: %" PRIu8 "", status);
@@ -2678,10 +2594,9 @@ bool emberAfScenesClusterAddSceneResponseCallback(app::CommandSender * commandOb
     return true;
 }
 
-bool emberAfScenesClusterGetSceneMembershipResponseCallback(
-    app::CommandSender * commandObj, const app::ConcreteCommandPath & commandPath, EndpointId endpoint, uint8_t status,
-    uint8_t capacity, uint16_t groupId, uint8_t sceneCount, /* TYPE WARNING: array array defaults to */ uint8_t * sceneList,
-    app::Clusters::Scenes::Commands::GetSceneMembershipResponse::DecodableType & fields)
+bool emberAfScenesClusterGetSceneMembershipResponseCallback(EndpointId endpoint, app::CommandSender * commandObj, uint8_t status,
+                                                            uint8_t capacity, uint16_t groupId, uint8_t sceneCount,
+                                                            /* TYPE WARNING: array array defaults to */ uint8_t * sceneList)
 {
     ChipLogProgress(Zcl, "GetSceneMembershipResponse:");
     ChipLogProgress(Zcl, "  status: %" PRIu8 "", status);
@@ -2698,9 +2613,8 @@ bool emberAfScenesClusterGetSceneMembershipResponseCallback(
     return true;
 }
 
-bool emberAfScenesClusterRemoveAllScenesResponseCallback(
-    app::CommandSender * commandObj, const app::ConcreteCommandPath & commandPath, EndpointId endpoint, uint8_t status,
-    uint16_t groupId, app::Clusters::Scenes::Commands::RemoveAllScenesResponse::DecodableType & fields)
+bool emberAfScenesClusterRemoveAllScenesResponseCallback(EndpointId endpoint, app::CommandSender * commandObj, uint8_t status,
+                                                         uint16_t groupId)
 {
     ChipLogProgress(Zcl, "RemoveAllScenesResponse:");
     ChipLogProgress(Zcl, "  status: %" PRIu8 "", status);
@@ -2714,9 +2628,8 @@ bool emberAfScenesClusterRemoveAllScenesResponseCallback(
     return true;
 }
 
-bool emberAfScenesClusterRemoveSceneResponseCallback(app::CommandSender * commandObj, const app::ConcreteCommandPath & commandPath,
-                                                     EndpointId endpoint, uint8_t status, uint16_t groupId, uint8_t sceneId,
-                                                     app::Clusters::Scenes::Commands::RemoveSceneResponse::DecodableType & fields)
+bool emberAfScenesClusterRemoveSceneResponseCallback(EndpointId endpoint, app::CommandSender * commandObj, uint8_t status,
+                                                     uint16_t groupId, uint8_t sceneId)
 {
     ChipLogProgress(Zcl, "RemoveSceneResponse:");
     ChipLogProgress(Zcl, "  status: %" PRIu8 "", status);
@@ -2731,9 +2644,8 @@ bool emberAfScenesClusterRemoveSceneResponseCallback(app::CommandSender * comman
     return true;
 }
 
-bool emberAfScenesClusterStoreSceneResponseCallback(app::CommandSender * commandObj, const app::ConcreteCommandPath & commandPath,
-                                                    EndpointId endpoint, uint8_t status, uint16_t groupId, uint8_t sceneId,
-                                                    app::Clusters::Scenes::Commands::StoreSceneResponse::DecodableType & fields)
+bool emberAfScenesClusterStoreSceneResponseCallback(EndpointId endpoint, app::CommandSender * commandObj, uint8_t status,
+                                                    uint16_t groupId, uint8_t sceneId)
 {
     ChipLogProgress(Zcl, "StoreSceneResponse:");
     ChipLogProgress(Zcl, "  status: %" PRIu8 "", status);
@@ -2748,11 +2660,9 @@ bool emberAfScenesClusterStoreSceneResponseCallback(app::CommandSender * command
     return true;
 }
 
-bool emberAfScenesClusterViewSceneResponseCallback(app::CommandSender * commandObj, const app::ConcreteCommandPath & commandPath,
-                                                   EndpointId endpoint, uint8_t status, uint16_t groupId, uint8_t sceneId,
-                                                   uint16_t transitionTime, uint8_t * sceneName,
-                                                   /* TYPE WARNING: array array defaults to */ uint8_t * extensionFieldSets,
-                                                   app::Clusters::Scenes::Commands::ViewSceneResponse::DecodableType & fields)
+bool emberAfScenesClusterViewSceneResponseCallback(EndpointId endpoint, app::CommandSender * commandObj, uint8_t status,
+                                                   uint16_t groupId, uint8_t sceneId, uint16_t transitionTime, uint8_t * sceneName,
+                                                   /* TYPE WARNING: array array defaults to */ uint8_t * extensionFieldSets)
 {
     ChipLogProgress(Zcl, "ViewSceneResponse:");
     ChipLogProgress(Zcl, "  status: %" PRIu8 "", status);
@@ -2771,10 +2681,9 @@ bool emberAfScenesClusterViewSceneResponseCallback(app::CommandSender * commandO
     return true;
 }
 
-bool emberAfTvChannelClusterChangeChannelResponseCallback(
-    app::CommandSender * commandObj, const app::ConcreteCommandPath & commandPath, EndpointId endpoint,
-    /* TYPE WARNING: array array defaults to */ uint8_t * ChannelMatch, uint8_t ErrorType,
-    app::Clusters::TvChannel::Commands::ChangeChannelResponse::DecodableType & fields)
+bool emberAfTvChannelClusterChangeChannelResponseCallback(EndpointId endpoint, app::CommandSender * commandObj,
+                                                          /* TYPE WARNING: array array defaults to */ uint8_t * ChannelMatch,
+                                                          uint8_t ErrorType)
 {
     ChipLogProgress(Zcl, "ChangeChannelResponse:");
     ChipLogProgress(Zcl, "  ChannelMatch: %p", ChannelMatch);
@@ -2788,9 +2697,8 @@ bool emberAfTvChannelClusterChangeChannelResponseCallback(
     return true;
 }
 
-bool emberAfTargetNavigatorClusterNavigateTargetResponseCallback(
-    app::CommandSender * commandObj, const app::ConcreteCommandPath & commandPath, EndpointId endpoint, uint8_t status,
-    uint8_t * data, app::Clusters::TargetNavigator::Commands::NavigateTargetResponse::DecodableType & fields)
+bool emberAfTargetNavigatorClusterNavigateTargetResponseCallback(EndpointId endpoint, app::CommandSender * commandObj,
+                                                                 uint8_t status, uint8_t * data)
 {
     ChipLogProgress(Zcl, "NavigateTargetResponse:");
     ChipLogProgress(Zcl, "  status: %" PRIu8 "", status);
@@ -2805,9 +2713,8 @@ bool emberAfTargetNavigatorClusterNavigateTargetResponseCallback(
     return true;
 }
 
-bool emberAfTestClusterClusterTestAddArgumentsResponseCallback(
-    app::CommandSender * commandObj, const app::ConcreteCommandPath & commandPath, EndpointId endpoint, uint8_t returnValue,
-    app::Clusters::TestCluster::Commands::TestAddArgumentsResponse::DecodableType & fields)
+bool emberAfTestClusterClusterTestAddArgumentsResponseCallback(EndpointId endpoint, app::CommandSender * commandObj,
+                                                               uint8_t returnValue)
 {
     ChipLogProgress(Zcl, "TestAddArgumentsResponse:");
     ChipLogProgress(Zcl, "  returnValue: %" PRIu8 "", returnValue);
@@ -2820,9 +2727,8 @@ bool emberAfTestClusterClusterTestAddArgumentsResponseCallback(
     return true;
 }
 
-bool emberAfTestClusterClusterTestSpecificResponseCallback(
-    app::CommandSender * commandObj, const app::ConcreteCommandPath & commandPath, EndpointId endpoint, uint8_t returnValue,
-    app::Clusters::TestCluster::Commands::TestSpecificResponse::DecodableType & fields)
+bool emberAfTestClusterClusterTestSpecificResponseCallback(EndpointId endpoint, app::CommandSender * commandObj,
+                                                           uint8_t returnValue)
 {
     ChipLogProgress(Zcl, "TestSpecificResponse:");
     ChipLogProgress(Zcl, "  returnValue: %" PRIu8 "", returnValue);
diff --git a/zzz_generated/controller-clusters/zap-generated/IMClusterCommandHandler.cpp b/zzz_generated/controller-clusters/zap-generated/IMClusterCommandHandler.cpp
index 8d01de912..ec6f1b165 100644
--- a/zzz_generated/controller-clusters/zap-generated/IMClusterCommandHandler.cpp
+++ b/zzz_generated/controller-clusters/zap-generated/IMClusterCommandHandler.cpp
@@ -71,7 +71,6 @@ void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPa
         switch (aCommandPath.mCommandId)
         {
         case Commands::GetSetupPINResponse::Id: {
-            Commands::GetSetupPINResponse::DecodableType fieldStruct;
             expectArgumentCount = 1;
             const uint8_t * setupPIN;
             bool argExists[1];
@@ -126,8 +125,8 @@ void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPa
 
             if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
             {
-                wasHandled = emberAfAccountLoginClusterGetSetupPINResponseCallback(
-                    apCommandObj, aCommandPath, aCommandPath.mEndpointId, const_cast<uint8_t *>(setupPIN), fieldStruct);
+                wasHandled = emberAfAccountLoginClusterGetSetupPINResponseCallback(aCommandPath.mEndpointId, apCommandObj,
+                                                                                   const_cast<uint8_t *>(setupPIN));
             }
             break;
         }
@@ -177,7 +176,6 @@ void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPa
         switch (aCommandPath.mCommandId)
         {
         case Commands::LaunchAppResponse::Id: {
-            Commands::LaunchAppResponse::DecodableType fieldStruct;
             expectArgumentCount = 2;
             uint8_t status;
             const uint8_t * data;
@@ -236,8 +234,8 @@ void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPa
 
             if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
             {
-                wasHandled = emberAfApplicationLauncherClusterLaunchAppResponseCallback(
-                    apCommandObj, aCommandPath, aCommandPath.mEndpointId, status, const_cast<uint8_t *>(data), fieldStruct);
+                wasHandled = emberAfApplicationLauncherClusterLaunchAppResponseCallback(aCommandPath.mEndpointId, apCommandObj,
+                                                                                        status, const_cast<uint8_t *>(data));
             }
             break;
         }
@@ -288,7 +286,6 @@ void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPa
         switch (aCommandPath.mCommandId)
         {
         case Commands::LaunchContentResponse::Id: {
-            Commands::LaunchContentResponse::DecodableType fieldStruct;
             expectArgumentCount = 2;
             const uint8_t * data;
             uint8_t contentLaunchStatus;
@@ -348,13 +345,11 @@ void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPa
             if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
             {
                 wasHandled = emberAfContentLauncherClusterLaunchContentResponseCallback(
-                    apCommandObj, aCommandPath, aCommandPath.mEndpointId, const_cast<uint8_t *>(data), contentLaunchStatus,
-                    fieldStruct);
+                    aCommandPath.mEndpointId, apCommandObj, const_cast<uint8_t *>(data), contentLaunchStatus);
             }
             break;
         }
         case Commands::LaunchURLResponse::Id: {
-            Commands::LaunchURLResponse::DecodableType fieldStruct;
             expectArgumentCount = 2;
             const uint8_t * data;
             uint8_t contentLaunchStatus;
@@ -414,8 +409,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPa
             if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
             {
                 wasHandled = emberAfContentLauncherClusterLaunchURLResponseCallback(
-                    apCommandObj, aCommandPath, aCommandPath.mEndpointId, const_cast<uint8_t *>(data), contentLaunchStatus,
-                    fieldStruct);
+                    aCommandPath.mEndpointId, apCommandObj, const_cast<uint8_t *>(data), contentLaunchStatus);
             }
             break;
         }
@@ -466,7 +460,6 @@ void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPa
         switch (aCommandPath.mCommandId)
         {
         case Commands::ClearAllPinsResponse::Id: {
-            Commands::ClearAllPinsResponse::DecodableType fieldStruct;
             expectArgumentCount = 1;
             uint8_t status;
             bool argExists[1];
@@ -520,13 +513,11 @@ void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPa
 
             if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
             {
-                wasHandled = emberAfDoorLockClusterClearAllPinsResponseCallback(apCommandObj, aCommandPath,
-                                                                                aCommandPath.mEndpointId, status, fieldStruct);
+                wasHandled = emberAfDoorLockClusterClearAllPinsResponseCallback(aCommandPath.mEndpointId, apCommandObj, status);
             }
             break;
         }
         case Commands::ClearAllRfidsResponse::Id: {
-            Commands::ClearAllRfidsResponse::DecodableType fieldStruct;
             expectArgumentCount = 1;
             uint8_t status;
             bool argExists[1];
@@ -580,13 +571,11 @@ void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPa
 
             if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
             {
-                wasHandled = emberAfDoorLockClusterClearAllRfidsResponseCallback(apCommandObj, aCommandPath,
-                                                                                 aCommandPath.mEndpointId, status, fieldStruct);
+                wasHandled = emberAfDoorLockClusterClearAllRfidsResponseCallback(aCommandPath.mEndpointId, apCommandObj, status);
             }
             break;
         }
         case Commands::ClearHolidayScheduleResponse::Id: {
-            Commands::ClearHolidayScheduleResponse::DecodableType fieldStruct;
             expectArgumentCount = 1;
             uint8_t status;
             bool argExists[1];
@@ -640,13 +629,12 @@ void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPa
 
             if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
             {
-                wasHandled = emberAfDoorLockClusterClearHolidayScheduleResponseCallback(
-                    apCommandObj, aCommandPath, aCommandPath.mEndpointId, status, fieldStruct);
+                wasHandled =
+                    emberAfDoorLockClusterClearHolidayScheduleResponseCallback(aCommandPath.mEndpointId, apCommandObj, status);
             }
             break;
         }
         case Commands::ClearPinResponse::Id: {
-            Commands::ClearPinResponse::DecodableType fieldStruct;
             expectArgumentCount = 1;
             uint8_t status;
             bool argExists[1];
@@ -700,13 +688,11 @@ void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPa
 
             if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
             {
-                wasHandled = emberAfDoorLockClusterClearPinResponseCallback(apCommandObj, aCommandPath, aCommandPath.mEndpointId,
-                                                                            status, fieldStruct);
+                wasHandled = emberAfDoorLockClusterClearPinResponseCallback(aCommandPath.mEndpointId, apCommandObj, status);
             }
             break;
         }
         case Commands::ClearRfidResponse::Id: {
-            Commands::ClearRfidResponse::DecodableType fieldStruct;
             expectArgumentCount = 1;
             uint8_t status;
             bool argExists[1];
@@ -760,13 +746,11 @@ void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPa
 
             if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
             {
-                wasHandled = emberAfDoorLockClusterClearRfidResponseCallback(apCommandObj, aCommandPath, aCommandPath.mEndpointId,
-                                                                             status, fieldStruct);
+                wasHandled = emberAfDoorLockClusterClearRfidResponseCallback(aCommandPath.mEndpointId, apCommandObj, status);
             }
             break;
         }
         case Commands::ClearWeekdayScheduleResponse::Id: {
-            Commands::ClearWeekdayScheduleResponse::DecodableType fieldStruct;
             expectArgumentCount = 1;
             uint8_t status;
             bool argExists[1];
@@ -820,13 +804,12 @@ void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPa
 
             if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
             {
-                wasHandled = emberAfDoorLockClusterClearWeekdayScheduleResponseCallback(
-                    apCommandObj, aCommandPath, aCommandPath.mEndpointId, status, fieldStruct);
+                wasHandled =
+                    emberAfDoorLockClusterClearWeekdayScheduleResponseCallback(aCommandPath.mEndpointId, apCommandObj, status);
             }
             break;
         }
         case Commands::ClearYeardayScheduleResponse::Id: {
-            Commands::ClearYeardayScheduleResponse::DecodableType fieldStruct;
             expectArgumentCount = 1;
             uint8_t status;
             bool argExists[1];
@@ -880,13 +863,12 @@ void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPa
 
             if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
             {
-                wasHandled = emberAfDoorLockClusterClearYeardayScheduleResponseCallback(
-                    apCommandObj, aCommandPath, aCommandPath.mEndpointId, status, fieldStruct);
+                wasHandled =
+                    emberAfDoorLockClusterClearYeardayScheduleResponseCallback(aCommandPath.mEndpointId, apCommandObj, status);
             }
             break;
         }
         case Commands::GetHolidayScheduleResponse::Id: {
-            Commands::GetHolidayScheduleResponse::DecodableType fieldStruct;
             expectArgumentCount = 5;
             uint8_t scheduleId;
             uint8_t status;
@@ -956,14 +938,13 @@ void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPa
 
             if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 5 == validArgumentCount)
             {
-                wasHandled = emberAfDoorLockClusterGetHolidayScheduleResponseCallback(
-                    apCommandObj, aCommandPath, aCommandPath.mEndpointId, scheduleId, status, localStartTime, localEndTime,
-                    operatingModeDuringHoliday, fieldStruct);
+                wasHandled = emberAfDoorLockClusterGetHolidayScheduleResponseCallback(aCommandPath.mEndpointId, apCommandObj,
+                                                                                      scheduleId, status, localStartTime,
+                                                                                      localEndTime, operatingModeDuringHoliday);
             }
             break;
         }
         case Commands::GetLogRecordResponse::Id: {
-            Commands::GetLogRecordResponse::DecodableType fieldStruct;
             expectArgumentCount = 7;
             uint16_t logEntryId;
             uint32_t timestamp;
@@ -1042,14 +1023,13 @@ void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPa
 
             if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 7 == validArgumentCount)
             {
-                wasHandled = emberAfDoorLockClusterGetLogRecordResponseCallback(
-                    apCommandObj, aCommandPath, aCommandPath.mEndpointId, logEntryId, timestamp, eventType, source,
-                    eventIdOrAlarmCode, userId, const_cast<uint8_t *>(pin), fieldStruct);
+                wasHandled = emberAfDoorLockClusterGetLogRecordResponseCallback(aCommandPath.mEndpointId, apCommandObj, logEntryId,
+                                                                                timestamp, eventType, source, eventIdOrAlarmCode,
+                                                                                userId, const_cast<uint8_t *>(pin));
             }
             break;
         }
         case Commands::GetPinResponse::Id: {
-            Commands::GetPinResponse::DecodableType fieldStruct;
             expectArgumentCount = 4;
             uint16_t userId;
             uint8_t userStatus;
@@ -1116,14 +1096,12 @@ void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPa
 
             if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount)
             {
-                wasHandled =
-                    emberAfDoorLockClusterGetPinResponseCallback(apCommandObj, aCommandPath, aCommandPath.mEndpointId, userId,
-                                                                 userStatus, userType, const_cast<uint8_t *>(pin), fieldStruct);
+                wasHandled = emberAfDoorLockClusterGetPinResponseCallback(aCommandPath.mEndpointId, apCommandObj, userId,
+                                                                          userStatus, userType, const_cast<uint8_t *>(pin));
             }
             break;
         }
         case Commands::GetRfidResponse::Id: {
-            Commands::GetRfidResponse::DecodableType fieldStruct;
             expectArgumentCount = 4;
             uint16_t userId;
             uint8_t userStatus;
@@ -1190,14 +1168,12 @@ void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPa
 
             if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount)
             {
-                wasHandled =
-                    emberAfDoorLockClusterGetRfidResponseCallback(apCommandObj, aCommandPath, aCommandPath.mEndpointId, userId,
-                                                                  userStatus, userType, const_cast<uint8_t *>(rfid), fieldStruct);
+                wasHandled = emberAfDoorLockClusterGetRfidResponseCallback(aCommandPath.mEndpointId, apCommandObj, userId,
+                                                                           userStatus, userType, const_cast<uint8_t *>(rfid));
             }
             break;
         }
         case Commands::GetUserTypeResponse::Id: {
-            Commands::GetUserTypeResponse::DecodableType fieldStruct;
             expectArgumentCount = 2;
             uint16_t userId;
             uint8_t userType;
@@ -1255,13 +1231,12 @@ void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPa
 
             if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
             {
-                wasHandled = emberAfDoorLockClusterGetUserTypeResponseCallback(apCommandObj, aCommandPath, aCommandPath.mEndpointId,
-                                                                               userId, userType, fieldStruct);
+                wasHandled =
+                    emberAfDoorLockClusterGetUserTypeResponseCallback(aCommandPath.mEndpointId, apCommandObj, userId, userType);
             }
             break;
         }
         case Commands::GetWeekdayScheduleResponse::Id: {
-            Commands::GetWeekdayScheduleResponse::DecodableType fieldStruct;
             expectArgumentCount = 8;
             uint8_t scheduleId;
             uint16_t userId;
@@ -1343,14 +1318,13 @@ void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPa
 
             if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 8 == validArgumentCount)
             {
-                wasHandled = emberAfDoorLockClusterGetWeekdayScheduleResponseCallback(
-                    apCommandObj, aCommandPath, aCommandPath.mEndpointId, scheduleId, userId, status, daysMask, startHour,
-                    startMinute, endHour, endMinute, fieldStruct);
+                wasHandled = emberAfDoorLockClusterGetWeekdayScheduleResponseCallback(aCommandPath.mEndpointId, apCommandObj,
+                                                                                      scheduleId, userId, status, daysMask,
+                                                                                      startHour, startMinute, endHour, endMinute);
             }
             break;
         }
         case Commands::GetYeardayScheduleResponse::Id: {
-            Commands::GetYeardayScheduleResponse::DecodableType fieldStruct;
             expectArgumentCount = 5;
             uint8_t scheduleId;
             uint16_t userId;
@@ -1421,13 +1395,11 @@ void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPa
             if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 5 == validArgumentCount)
             {
                 wasHandled = emberAfDoorLockClusterGetYeardayScheduleResponseCallback(
-                    apCommandObj, aCommandPath, aCommandPath.mEndpointId, scheduleId, userId, status, localStartTime, localEndTime,
-                    fieldStruct);
+                    aCommandPath.mEndpointId, apCommandObj, scheduleId, userId, status, localStartTime, localEndTime);
             }
             break;
         }
         case Commands::LockDoorResponse::Id: {
-            Commands::LockDoorResponse::DecodableType fieldStruct;
             expectArgumentCount = 1;
             uint8_t status;
             bool argExists[1];
@@ -1481,13 +1453,11 @@ void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPa
 
             if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
             {
-                wasHandled = emberAfDoorLockClusterLockDoorResponseCallback(apCommandObj, aCommandPath, aCommandPath.mEndpointId,
-                                                                            status, fieldStruct);
+                wasHandled = emberAfDoorLockClusterLockDoorResponseCallback(aCommandPath.mEndpointId, apCommandObj, status);
             }
             break;
         }
         case Commands::SetHolidayScheduleResponse::Id: {
-            Commands::SetHolidayScheduleResponse::DecodableType fieldStruct;
             expectArgumentCount = 1;
             uint8_t status;
             bool argExists[1];
@@ -1541,13 +1511,12 @@ void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPa
 
             if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
             {
-                wasHandled = emberAfDoorLockClusterSetHolidayScheduleResponseCallback(
-                    apCommandObj, aCommandPath, aCommandPath.mEndpointId, status, fieldStruct);
+                wasHandled =
+                    emberAfDoorLockClusterSetHolidayScheduleResponseCallback(aCommandPath.mEndpointId, apCommandObj, status);
             }
             break;
         }
         case Commands::SetPinResponse::Id: {
-            Commands::SetPinResponse::DecodableType fieldStruct;
             expectArgumentCount = 1;
             uint8_t status;
             bool argExists[1];
@@ -1601,13 +1570,11 @@ void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPa
 
             if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
             {
-                wasHandled = emberAfDoorLockClusterSetPinResponseCallback(apCommandObj, aCommandPath, aCommandPath.mEndpointId,
-                                                                          status, fieldStruct);
+                wasHandled = emberAfDoorLockClusterSetPinResponseCallback(aCommandPath.mEndpointId, apCommandObj, status);
             }
             break;
         }
         case Commands::SetRfidResponse::Id: {
-            Commands::SetRfidResponse::DecodableType fieldStruct;
             expectArgumentCount = 1;
             uint8_t status;
             bool argExists[1];
@@ -1661,13 +1628,11 @@ void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPa
 
             if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
             {
-                wasHandled = emberAfDoorLockClusterSetRfidResponseCallback(apCommandObj, aCommandPath, aCommandPath.mEndpointId,
-                                                                           status, fieldStruct);
+                wasHandled = emberAfDoorLockClusterSetRfidResponseCallback(aCommandPath.mEndpointId, apCommandObj, status);
             }
             break;
         }
         case Commands::SetUserTypeResponse::Id: {
-            Commands::SetUserTypeResponse::DecodableType fieldStruct;
             expectArgumentCount = 1;
             uint8_t status;
             bool argExists[1];
@@ -1721,13 +1686,11 @@ void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPa
 
             if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
             {
-                wasHandled = emberAfDoorLockClusterSetUserTypeResponseCallback(apCommandObj, aCommandPath, aCommandPath.mEndpointId,
-                                                                               status, fieldStruct);
+                wasHandled = emberAfDoorLockClusterSetUserTypeResponseCallback(aCommandPath.mEndpointId, apCommandObj, status);
             }
             break;
         }
         case Commands::SetWeekdayScheduleResponse::Id: {
-            Commands::SetWeekdayScheduleResponse::DecodableType fieldStruct;
             expectArgumentCount = 1;
             uint8_t status;
             bool argExists[1];
@@ -1781,13 +1744,12 @@ void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPa
 
             if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
             {
-                wasHandled = emberAfDoorLockClusterSetWeekdayScheduleResponseCallback(
-                    apCommandObj, aCommandPath, aCommandPath.mEndpointId, status, fieldStruct);
+                wasHandled =
+                    emberAfDoorLockClusterSetWeekdayScheduleResponseCallback(aCommandPath.mEndpointId, apCommandObj, status);
             }
             break;
         }
         case Commands::SetYeardayScheduleResponse::Id: {
-            Commands::SetYeardayScheduleResponse::DecodableType fieldStruct;
             expectArgumentCount = 1;
             uint8_t status;
             bool argExists[1];
@@ -1841,13 +1803,12 @@ void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPa
 
             if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
             {
-                wasHandled = emberAfDoorLockClusterSetYeardayScheduleResponseCallback(
-                    apCommandObj, aCommandPath, aCommandPath.mEndpointId, status, fieldStruct);
+                wasHandled =
+                    emberAfDoorLockClusterSetYeardayScheduleResponseCallback(aCommandPath.mEndpointId, apCommandObj, status);
             }
             break;
         }
         case Commands::UnlockDoorResponse::Id: {
-            Commands::UnlockDoorResponse::DecodableType fieldStruct;
             expectArgumentCount = 1;
             uint8_t status;
             bool argExists[1];
@@ -1901,13 +1862,11 @@ void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPa
 
             if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
             {
-                wasHandled = emberAfDoorLockClusterUnlockDoorResponseCallback(apCommandObj, aCommandPath, aCommandPath.mEndpointId,
-                                                                              status, fieldStruct);
+                wasHandled = emberAfDoorLockClusterUnlockDoorResponseCallback(aCommandPath.mEndpointId, apCommandObj, status);
             }
             break;
         }
         case Commands::UnlockWithTimeoutResponse::Id: {
-            Commands::UnlockWithTimeoutResponse::DecodableType fieldStruct;
             expectArgumentCount = 1;
             uint8_t status;
             bool argExists[1];
@@ -1961,8 +1920,8 @@ void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPa
 
             if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
             {
-                wasHandled = emberAfDoorLockClusterUnlockWithTimeoutResponseCallback(apCommandObj, aCommandPath,
-                                                                                     aCommandPath.mEndpointId, status, fieldStruct);
+                wasHandled =
+                    emberAfDoorLockClusterUnlockWithTimeoutResponseCallback(aCommandPath.mEndpointId, apCommandObj, status);
             }
             break;
         }
@@ -2012,7 +1971,6 @@ void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPa
         switch (aCommandPath.mCommandId)
         {
         case Commands::ArmFailSafeResponse::Id: {
-            Commands::ArmFailSafeResponse::DecodableType fieldStruct;
             expectArgumentCount = 2;
             uint8_t errorCode;
             const uint8_t * debugText;
@@ -2072,12 +2030,11 @@ void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPa
             if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
             {
                 wasHandled = emberAfGeneralCommissioningClusterArmFailSafeResponseCallback(
-                    apCommandObj, aCommandPath, aCommandPath.mEndpointId, errorCode, const_cast<uint8_t *>(debugText), fieldStruct);
+                    aCommandPath.mEndpointId, apCommandObj, errorCode, const_cast<uint8_t *>(debugText));
             }
             break;
         }
         case Commands::CommissioningCompleteResponse::Id: {
-            Commands::CommissioningCompleteResponse::DecodableType fieldStruct;
             expectArgumentCount = 2;
             uint8_t errorCode;
             const uint8_t * debugText;
@@ -2137,12 +2094,11 @@ void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPa
             if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
             {
                 wasHandled = emberAfGeneralCommissioningClusterCommissioningCompleteResponseCallback(
-                    apCommandObj, aCommandPath, aCommandPath.mEndpointId, errorCode, const_cast<uint8_t *>(debugText), fieldStruct);
+                    aCommandPath.mEndpointId, apCommandObj, errorCode, const_cast<uint8_t *>(debugText));
             }
             break;
         }
         case Commands::SetRegulatoryConfigResponse::Id: {
-            Commands::SetRegulatoryConfigResponse::DecodableType fieldStruct;
             expectArgumentCount = 2;
             uint8_t errorCode;
             const uint8_t * debugText;
@@ -2202,7 +2158,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPa
             if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
             {
                 wasHandled = emberAfGeneralCommissioningClusterSetRegulatoryConfigResponseCallback(
-                    apCommandObj, aCommandPath, aCommandPath.mEndpointId, errorCode, const_cast<uint8_t *>(debugText), fieldStruct);
+                    aCommandPath.mEndpointId, apCommandObj, errorCode, const_cast<uint8_t *>(debugText));
             }
             break;
         }
@@ -2253,7 +2209,6 @@ void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPa
         switch (aCommandPath.mCommandId)
         {
         case Commands::AddGroupResponse::Id: {
-            Commands::AddGroupResponse::DecodableType fieldStruct;
             expectArgumentCount = 2;
             uint8_t status;
             uint16_t groupId;
@@ -2311,13 +2266,11 @@ void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPa
 
             if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
             {
-                wasHandled = emberAfGroupsClusterAddGroupResponseCallback(apCommandObj, aCommandPath, aCommandPath.mEndpointId,
-                                                                          status, groupId, fieldStruct);
+                wasHandled = emberAfGroupsClusterAddGroupResponseCallback(aCommandPath.mEndpointId, apCommandObj, status, groupId);
             }
             break;
         }
         case Commands::GetGroupMembershipResponse::Id: {
-            Commands::GetGroupMembershipResponse::DecodableType fieldStruct;
             expectArgumentCount = 3;
             uint8_t capacity;
             uint8_t groupCount;
@@ -2380,13 +2333,12 @@ void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPa
 
             if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount)
             {
-                wasHandled = emberAfGroupsClusterGetGroupMembershipResponseCallback(
-                    apCommandObj, aCommandPath, aCommandPath.mEndpointId, capacity, groupCount, groupList, fieldStruct);
+                wasHandled = emberAfGroupsClusterGetGroupMembershipResponseCallback(aCommandPath.mEndpointId, apCommandObj,
+                                                                                    capacity, groupCount, groupList);
             }
             break;
         }
         case Commands::RemoveGroupResponse::Id: {
-            Commands::RemoveGroupResponse::DecodableType fieldStruct;
             expectArgumentCount = 2;
             uint8_t status;
             uint16_t groupId;
@@ -2444,13 +2396,12 @@ void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPa
 
             if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
             {
-                wasHandled = emberAfGroupsClusterRemoveGroupResponseCallback(apCommandObj, aCommandPath, aCommandPath.mEndpointId,
-                                                                             status, groupId, fieldStruct);
+                wasHandled =
+                    emberAfGroupsClusterRemoveGroupResponseCallback(aCommandPath.mEndpointId, apCommandObj, status, groupId);
             }
             break;
         }
         case Commands::ViewGroupResponse::Id: {
-            Commands::ViewGroupResponse::DecodableType fieldStruct;
             expectArgumentCount = 3;
             uint8_t status;
             uint16_t groupId;
@@ -2513,9 +2464,8 @@ void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPa
 
             if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount)
             {
-                wasHandled =
-                    emberAfGroupsClusterViewGroupResponseCallback(apCommandObj, aCommandPath, aCommandPath.mEndpointId, status,
-                                                                  groupId, const_cast<uint8_t *>(groupName), fieldStruct);
+                wasHandled = emberAfGroupsClusterViewGroupResponseCallback(aCommandPath.mEndpointId, apCommandObj, status, groupId,
+                                                                           const_cast<uint8_t *>(groupName));
             }
             break;
         }
@@ -2565,7 +2515,6 @@ void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPa
         switch (aCommandPath.mCommandId)
         {
         case Commands::IdentifyQueryResponse::Id: {
-            Commands::IdentifyQueryResponse::DecodableType fieldStruct;
             expectArgumentCount = 1;
             uint16_t timeout;
             bool argExists[1];
@@ -2619,8 +2568,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPa
 
             if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
             {
-                wasHandled = emberAfIdentifyClusterIdentifyQueryResponseCallback(apCommandObj, aCommandPath,
-                                                                                 aCommandPath.mEndpointId, timeout, fieldStruct);
+                wasHandled = emberAfIdentifyClusterIdentifyQueryResponseCallback(aCommandPath.mEndpointId, apCommandObj, timeout);
             }
             break;
         }
@@ -2670,7 +2618,6 @@ void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPa
         switch (aCommandPath.mCommandId)
         {
         case Commands::SendKeyResponse::Id: {
-            Commands::SendKeyResponse::DecodableType fieldStruct;
             expectArgumentCount = 1;
             uint8_t status;
             bool argExists[1];
@@ -2724,8 +2671,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPa
 
             if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
             {
-                wasHandled = emberAfKeypadInputClusterSendKeyResponseCallback(apCommandObj, aCommandPath, aCommandPath.mEndpointId,
-                                                                              status, fieldStruct);
+                wasHandled = emberAfKeypadInputClusterSendKeyResponseCallback(aCommandPath.mEndpointId, apCommandObj, status);
             }
             break;
         }
@@ -2775,7 +2721,6 @@ void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPa
         switch (aCommandPath.mCommandId)
         {
         case Commands::MediaFastForwardResponse::Id: {
-            Commands::MediaFastForwardResponse::DecodableType fieldStruct;
             expectArgumentCount = 1;
             uint8_t mediaPlaybackStatus;
             bool argExists[1];
@@ -2829,13 +2774,12 @@ void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPa
 
             if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
             {
-                wasHandled = emberAfMediaPlaybackClusterMediaFastForwardResponseCallback(
-                    apCommandObj, aCommandPath, aCommandPath.mEndpointId, mediaPlaybackStatus, fieldStruct);
+                wasHandled = emberAfMediaPlaybackClusterMediaFastForwardResponseCallback(aCommandPath.mEndpointId, apCommandObj,
+                                                                                         mediaPlaybackStatus);
             }
             break;
         }
         case Commands::MediaNextResponse::Id: {
-            Commands::MediaNextResponse::DecodableType fieldStruct;
             expectArgumentCount = 1;
             uint8_t mediaPlaybackStatus;
             bool argExists[1];
@@ -2889,13 +2833,12 @@ void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPa
 
             if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
             {
-                wasHandled = emberAfMediaPlaybackClusterMediaNextResponseCallback(
-                    apCommandObj, aCommandPath, aCommandPath.mEndpointId, mediaPlaybackStatus, fieldStruct);
+                wasHandled = emberAfMediaPlaybackClusterMediaNextResponseCallback(aCommandPath.mEndpointId, apCommandObj,
+                                                                                  mediaPlaybackStatus);
             }
             break;
         }
         case Commands::MediaPauseResponse::Id: {
-            Commands::MediaPauseResponse::DecodableType fieldStruct;
             expectArgumentCount = 1;
             uint8_t mediaPlaybackStatus;
             bool argExists[1];
@@ -2949,13 +2892,12 @@ void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPa
 
             if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
             {
-                wasHandled = emberAfMediaPlaybackClusterMediaPauseResponseCallback(
-                    apCommandObj, aCommandPath, aCommandPath.mEndpointId, mediaPlaybackStatus, fieldStruct);
+                wasHandled = emberAfMediaPlaybackClusterMediaPauseResponseCallback(aCommandPath.mEndpointId, apCommandObj,
+                                                                                   mediaPlaybackStatus);
             }
             break;
         }
         case Commands::MediaPlayResponse::Id: {
-            Commands::MediaPlayResponse::DecodableType fieldStruct;
             expectArgumentCount = 1;
             uint8_t mediaPlaybackStatus;
             bool argExists[1];
@@ -3009,13 +2951,12 @@ void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPa
 
             if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
             {
-                wasHandled = emberAfMediaPlaybackClusterMediaPlayResponseCallback(
-                    apCommandObj, aCommandPath, aCommandPath.mEndpointId, mediaPlaybackStatus, fieldStruct);
+                wasHandled = emberAfMediaPlaybackClusterMediaPlayResponseCallback(aCommandPath.mEndpointId, apCommandObj,
+                                                                                  mediaPlaybackStatus);
             }
             break;
         }
         case Commands::MediaPreviousResponse::Id: {
-            Commands::MediaPreviousResponse::DecodableType fieldStruct;
             expectArgumentCount = 1;
             uint8_t mediaPlaybackStatus;
             bool argExists[1];
@@ -3069,13 +3010,12 @@ void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPa
 
             if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
             {
-                wasHandled = emberAfMediaPlaybackClusterMediaPreviousResponseCallback(
-                    apCommandObj, aCommandPath, aCommandPath.mEndpointId, mediaPlaybackStatus, fieldStruct);
+                wasHandled = emberAfMediaPlaybackClusterMediaPreviousResponseCallback(aCommandPath.mEndpointId, apCommandObj,
+                                                                                      mediaPlaybackStatus);
             }
             break;
         }
         case Commands::MediaRewindResponse::Id: {
-            Commands::MediaRewindResponse::DecodableType fieldStruct;
             expectArgumentCount = 1;
             uint8_t mediaPlaybackStatus;
             bool argExists[1];
@@ -3129,13 +3069,12 @@ void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPa
 
             if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
             {
-                wasHandled = emberAfMediaPlaybackClusterMediaRewindResponseCallback(
-                    apCommandObj, aCommandPath, aCommandPath.mEndpointId, mediaPlaybackStatus, fieldStruct);
+                wasHandled = emberAfMediaPlaybackClusterMediaRewindResponseCallback(aCommandPath.mEndpointId, apCommandObj,
+                                                                                    mediaPlaybackStatus);
             }
             break;
         }
         case Commands::MediaSeekResponse::Id: {
-            Commands::MediaSeekResponse::DecodableType fieldStruct;
             expectArgumentCount = 1;
             uint8_t mediaPlaybackStatus;
             bool argExists[1];
@@ -3189,13 +3128,12 @@ void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPa
 
             if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
             {
-                wasHandled = emberAfMediaPlaybackClusterMediaSeekResponseCallback(
-                    apCommandObj, aCommandPath, aCommandPath.mEndpointId, mediaPlaybackStatus, fieldStruct);
+                wasHandled = emberAfMediaPlaybackClusterMediaSeekResponseCallback(aCommandPath.mEndpointId, apCommandObj,
+                                                                                  mediaPlaybackStatus);
             }
             break;
         }
         case Commands::MediaSkipBackwardResponse::Id: {
-            Commands::MediaSkipBackwardResponse::DecodableType fieldStruct;
             expectArgumentCount = 1;
             uint8_t mediaPlaybackStatus;
             bool argExists[1];
@@ -3249,13 +3187,12 @@ void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPa
 
             if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
             {
-                wasHandled = emberAfMediaPlaybackClusterMediaSkipBackwardResponseCallback(
-                    apCommandObj, aCommandPath, aCommandPath.mEndpointId, mediaPlaybackStatus, fieldStruct);
+                wasHandled = emberAfMediaPlaybackClusterMediaSkipBackwardResponseCallback(aCommandPath.mEndpointId, apCommandObj,
+                                                                                          mediaPlaybackStatus);
             }
             break;
         }
         case Commands::MediaSkipForwardResponse::Id: {
-            Commands::MediaSkipForwardResponse::DecodableType fieldStruct;
             expectArgumentCount = 1;
             uint8_t mediaPlaybackStatus;
             bool argExists[1];
@@ -3309,13 +3246,12 @@ void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPa
 
             if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
             {
-                wasHandled = emberAfMediaPlaybackClusterMediaSkipForwardResponseCallback(
-                    apCommandObj, aCommandPath, aCommandPath.mEndpointId, mediaPlaybackStatus, fieldStruct);
+                wasHandled = emberAfMediaPlaybackClusterMediaSkipForwardResponseCallback(aCommandPath.mEndpointId, apCommandObj,
+                                                                                         mediaPlaybackStatus);
             }
             break;
         }
         case Commands::MediaStartOverResponse::Id: {
-            Commands::MediaStartOverResponse::DecodableType fieldStruct;
             expectArgumentCount = 1;
             uint8_t mediaPlaybackStatus;
             bool argExists[1];
@@ -3369,13 +3305,12 @@ void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPa
 
             if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
             {
-                wasHandled = emberAfMediaPlaybackClusterMediaStartOverResponseCallback(
-                    apCommandObj, aCommandPath, aCommandPath.mEndpointId, mediaPlaybackStatus, fieldStruct);
+                wasHandled = emberAfMediaPlaybackClusterMediaStartOverResponseCallback(aCommandPath.mEndpointId, apCommandObj,
+                                                                                       mediaPlaybackStatus);
             }
             break;
         }
         case Commands::MediaStopResponse::Id: {
-            Commands::MediaStopResponse::DecodableType fieldStruct;
             expectArgumentCount = 1;
             uint8_t mediaPlaybackStatus;
             bool argExists[1];
@@ -3429,8 +3364,8 @@ void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPa
 
             if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
             {
-                wasHandled = emberAfMediaPlaybackClusterMediaStopResponseCallback(
-                    apCommandObj, aCommandPath, aCommandPath.mEndpointId, mediaPlaybackStatus, fieldStruct);
+                wasHandled = emberAfMediaPlaybackClusterMediaStopResponseCallback(aCommandPath.mEndpointId, apCommandObj,
+                                                                                  mediaPlaybackStatus);
             }
             break;
         }
@@ -3480,7 +3415,6 @@ void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPa
         switch (aCommandPath.mCommandId)
         {
         case Commands::AddThreadNetworkResponse::Id: {
-            Commands::AddThreadNetworkResponse::DecodableType fieldStruct;
             expectArgumentCount = 2;
             uint8_t errorCode;
             const uint8_t * debugText;
@@ -3540,12 +3474,11 @@ void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPa
             if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
             {
                 wasHandled = emberAfNetworkCommissioningClusterAddThreadNetworkResponseCallback(
-                    apCommandObj, aCommandPath, aCommandPath.mEndpointId, errorCode, const_cast<uint8_t *>(debugText), fieldStruct);
+                    aCommandPath.mEndpointId, apCommandObj, errorCode, const_cast<uint8_t *>(debugText));
             }
             break;
         }
         case Commands::AddWiFiNetworkResponse::Id: {
-            Commands::AddWiFiNetworkResponse::DecodableType fieldStruct;
             expectArgumentCount = 2;
             uint8_t errorCode;
             const uint8_t * debugText;
@@ -3605,12 +3538,11 @@ void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPa
             if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
             {
                 wasHandled = emberAfNetworkCommissioningClusterAddWiFiNetworkResponseCallback(
-                    apCommandObj, aCommandPath, aCommandPath.mEndpointId, errorCode, const_cast<uint8_t *>(debugText), fieldStruct);
+                    aCommandPath.mEndpointId, apCommandObj, errorCode, const_cast<uint8_t *>(debugText));
             }
             break;
         }
         case Commands::DisableNetworkResponse::Id: {
-            Commands::DisableNetworkResponse::DecodableType fieldStruct;
             expectArgumentCount = 2;
             uint8_t errorCode;
             const uint8_t * debugText;
@@ -3670,12 +3602,11 @@ void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPa
             if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
             {
                 wasHandled = emberAfNetworkCommissioningClusterDisableNetworkResponseCallback(
-                    apCommandObj, aCommandPath, aCommandPath.mEndpointId, errorCode, const_cast<uint8_t *>(debugText), fieldStruct);
+                    aCommandPath.mEndpointId, apCommandObj, errorCode, const_cast<uint8_t *>(debugText));
             }
             break;
         }
         case Commands::EnableNetworkResponse::Id: {
-            Commands::EnableNetworkResponse::DecodableType fieldStruct;
             expectArgumentCount = 2;
             uint8_t errorCode;
             const uint8_t * debugText;
@@ -3735,12 +3666,11 @@ void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPa
             if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
             {
                 wasHandled = emberAfNetworkCommissioningClusterEnableNetworkResponseCallback(
-                    apCommandObj, aCommandPath, aCommandPath.mEndpointId, errorCode, const_cast<uint8_t *>(debugText), fieldStruct);
+                    aCommandPath.mEndpointId, apCommandObj, errorCode, const_cast<uint8_t *>(debugText));
             }
             break;
         }
         case Commands::RemoveNetworkResponse::Id: {
-            Commands::RemoveNetworkResponse::DecodableType fieldStruct;
             expectArgumentCount = 2;
             uint8_t errorCode;
             const uint8_t * debugText;
@@ -3800,12 +3730,11 @@ void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPa
             if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
             {
                 wasHandled = emberAfNetworkCommissioningClusterRemoveNetworkResponseCallback(
-                    apCommandObj, aCommandPath, aCommandPath.mEndpointId, errorCode, const_cast<uint8_t *>(debugText), fieldStruct);
+                    aCommandPath.mEndpointId, apCommandObj, errorCode, const_cast<uint8_t *>(debugText));
             }
             break;
         }
         case Commands::ScanNetworksResponse::Id: {
-            Commands::ScanNetworksResponse::DecodableType fieldStruct;
             expectArgumentCount = 4;
             uint8_t errorCode;
             const uint8_t * debugText;
@@ -3875,13 +3804,12 @@ void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPa
             if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount)
             {
                 wasHandled = emberAfNetworkCommissioningClusterScanNetworksResponseCallback(
-                    apCommandObj, aCommandPath, aCommandPath.mEndpointId, errorCode, const_cast<uint8_t *>(debugText),
-                    wifiScanResults, threadScanResults, fieldStruct);
+                    aCommandPath.mEndpointId, apCommandObj, errorCode, const_cast<uint8_t *>(debugText), wifiScanResults,
+                    threadScanResults);
             }
             break;
         }
         case Commands::UpdateThreadNetworkResponse::Id: {
-            Commands::UpdateThreadNetworkResponse::DecodableType fieldStruct;
             expectArgumentCount = 2;
             uint8_t errorCode;
             const uint8_t * debugText;
@@ -3941,12 +3869,11 @@ void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPa
             if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
             {
                 wasHandled = emberAfNetworkCommissioningClusterUpdateThreadNetworkResponseCallback(
-                    apCommandObj, aCommandPath, aCommandPath.mEndpointId, errorCode, const_cast<uint8_t *>(debugText), fieldStruct);
+                    aCommandPath.mEndpointId, apCommandObj, errorCode, const_cast<uint8_t *>(debugText));
             }
             break;
         }
         case Commands::UpdateWiFiNetworkResponse::Id: {
-            Commands::UpdateWiFiNetworkResponse::DecodableType fieldStruct;
             expectArgumentCount = 2;
             uint8_t errorCode;
             const uint8_t * debugText;
@@ -4006,7 +3933,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPa
             if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
             {
                 wasHandled = emberAfNetworkCommissioningClusterUpdateWiFiNetworkResponseCallback(
-                    apCommandObj, aCommandPath, aCommandPath.mEndpointId, errorCode, const_cast<uint8_t *>(debugText), fieldStruct);
+                    aCommandPath.mEndpointId, apCommandObj, errorCode, const_cast<uint8_t *>(debugText));
             }
             break;
         }
@@ -4057,7 +3984,6 @@ void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPa
         switch (aCommandPath.mCommandId)
         {
         case Commands::ApplyUpdateRequestResponse::Id: {
-            Commands::ApplyUpdateRequestResponse::DecodableType fieldStruct;
             expectArgumentCount = 2;
             uint8_t action;
             uint32_t delayedActionTime;
@@ -4116,12 +4042,11 @@ void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPa
             if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
             {
                 wasHandled = emberAfOtaSoftwareUpdateProviderClusterApplyUpdateRequestResponseCallback(
-                    apCommandObj, aCommandPath, aCommandPath.mEndpointId, action, delayedActionTime, fieldStruct);
+                    aCommandPath.mEndpointId, apCommandObj, action, delayedActionTime);
             }
             break;
         }
         case Commands::QueryImageResponse::Id: {
-            Commands::QueryImageResponse::DecodableType fieldStruct;
             expectArgumentCount = 8;
             uint8_t status;
             uint32_t delayedActionTime;
@@ -4206,9 +4131,9 @@ void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPa
             if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 8 == validArgumentCount)
             {
                 wasHandled = emberAfOtaSoftwareUpdateProviderClusterQueryImageResponseCallback(
-                    apCommandObj, aCommandPath, aCommandPath.mEndpointId, status, delayedActionTime,
-                    const_cast<uint8_t *>(imageURI), softwareVersion, const_cast<uint8_t *>(softwareVersionString), updateToken,
-                    userConsentNeeded, metadataForRequestor, fieldStruct);
+                    aCommandPath.mEndpointId, apCommandObj, status, delayedActionTime, const_cast<uint8_t *>(imageURI),
+                    softwareVersion, const_cast<uint8_t *>(softwareVersionString), updateToken, userConsentNeeded,
+                    metadataForRequestor);
             }
             break;
         }
@@ -4259,7 +4184,6 @@ void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPa
         switch (aCommandPath.mCommandId)
         {
         case Commands::AttestationResponse::Id: {
-            Commands::AttestationResponse::DecodableType fieldStruct;
             expectArgumentCount = 2;
             chip::ByteSpan AttestationElements;
             chip::ByteSpan Signature;
@@ -4317,13 +4241,12 @@ void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPa
 
             if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
             {
-                wasHandled = emberAfOperationalCredentialsClusterAttestationResponseCallback(
-                    apCommandObj, aCommandPath, aCommandPath.mEndpointId, AttestationElements, Signature, fieldStruct);
+                wasHandled = emberAfOperationalCredentialsClusterAttestationResponseCallback(aCommandPath.mEndpointId, apCommandObj,
+                                                                                             AttestationElements, Signature);
             }
             break;
         }
         case Commands::CertificateChainResponse::Id: {
-            Commands::CertificateChainResponse::DecodableType fieldStruct;
             expectArgumentCount = 1;
             chip::ByteSpan Certificate;
             bool argExists[1];
@@ -4377,13 +4300,12 @@ void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPa
 
             if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
             {
-                wasHandled = emberAfOperationalCredentialsClusterCertificateChainResponseCallback(
-                    apCommandObj, aCommandPath, aCommandPath.mEndpointId, Certificate, fieldStruct);
+                wasHandled = emberAfOperationalCredentialsClusterCertificateChainResponseCallback(aCommandPath.mEndpointId,
+                                                                                                  apCommandObj, Certificate);
             }
             break;
         }
         case Commands::NOCResponse::Id: {
-            Commands::NOCResponse::DecodableType fieldStruct;
             expectArgumentCount = 3;
             uint8_t StatusCode;
             uint8_t FabricIndex;
@@ -4445,13 +4367,12 @@ void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPa
 
             if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount)
             {
-                wasHandled = emberAfOperationalCredentialsClusterNOCResponseCallback(
-                    apCommandObj, aCommandPath, aCommandPath.mEndpointId, StatusCode, FabricIndex, DebugText, fieldStruct);
+                wasHandled = emberAfOperationalCredentialsClusterNOCResponseCallback(aCommandPath.mEndpointId, apCommandObj,
+                                                                                     StatusCode, FabricIndex, DebugText);
             }
             break;
         }
         case Commands::OpCSRResponse::Id: {
-            Commands::OpCSRResponse::DecodableType fieldStruct;
             expectArgumentCount = 2;
             chip::ByteSpan NOCSRElements;
             chip::ByteSpan AttestationSignature;
@@ -4509,8 +4430,8 @@ void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPa
 
             if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
             {
-                wasHandled = emberAfOperationalCredentialsClusterOpCSRResponseCallback(
-                    apCommandObj, aCommandPath, aCommandPath.mEndpointId, NOCSRElements, AttestationSignature, fieldStruct);
+                wasHandled = emberAfOperationalCredentialsClusterOpCSRResponseCallback(aCommandPath.mEndpointId, apCommandObj,
+                                                                                       NOCSRElements, AttestationSignature);
             }
             break;
         }
@@ -4561,7 +4482,6 @@ void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPa
         switch (aCommandPath.mCommandId)
         {
         case Commands::AddSceneResponse::Id: {
-            Commands::AddSceneResponse::DecodableType fieldStruct;
             expectArgumentCount = 3;
             uint8_t status;
             uint16_t groupId;
@@ -4623,13 +4543,12 @@ void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPa
 
             if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount)
             {
-                wasHandled = emberAfScenesClusterAddSceneResponseCallback(apCommandObj, aCommandPath, aCommandPath.mEndpointId,
-                                                                          status, groupId, sceneId, fieldStruct);
+                wasHandled =
+                    emberAfScenesClusterAddSceneResponseCallback(aCommandPath.mEndpointId, apCommandObj, status, groupId, sceneId);
             }
             break;
         }
         case Commands::GetSceneMembershipResponse::Id: {
-            Commands::GetSceneMembershipResponse::DecodableType fieldStruct;
             expectArgumentCount = 5;
             uint8_t status;
             uint8_t capacity;
@@ -4700,14 +4619,12 @@ void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPa
 
             if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 5 == validArgumentCount)
             {
-                wasHandled = emberAfScenesClusterGetSceneMembershipResponseCallback(apCommandObj, aCommandPath,
-                                                                                    aCommandPath.mEndpointId, status, capacity,
-                                                                                    groupId, sceneCount, sceneList, fieldStruct);
+                wasHandled = emberAfScenesClusterGetSceneMembershipResponseCallback(aCommandPath.mEndpointId, apCommandObj, status,
+                                                                                    capacity, groupId, sceneCount, sceneList);
             }
             break;
         }
         case Commands::RemoveAllScenesResponse::Id: {
-            Commands::RemoveAllScenesResponse::DecodableType fieldStruct;
             expectArgumentCount = 2;
             uint8_t status;
             uint16_t groupId;
@@ -4765,13 +4682,12 @@ void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPa
 
             if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
             {
-                wasHandled = emberAfScenesClusterRemoveAllScenesResponseCallback(
-                    apCommandObj, aCommandPath, aCommandPath.mEndpointId, status, groupId, fieldStruct);
+                wasHandled =
+                    emberAfScenesClusterRemoveAllScenesResponseCallback(aCommandPath.mEndpointId, apCommandObj, status, groupId);
             }
             break;
         }
         case Commands::RemoveSceneResponse::Id: {
-            Commands::RemoveSceneResponse::DecodableType fieldStruct;
             expectArgumentCount = 3;
             uint8_t status;
             uint16_t groupId;
@@ -4833,13 +4749,12 @@ void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPa
 
             if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount)
             {
-                wasHandled = emberAfScenesClusterRemoveSceneResponseCallback(apCommandObj, aCommandPath, aCommandPath.mEndpointId,
-                                                                             status, groupId, sceneId, fieldStruct);
+                wasHandled = emberAfScenesClusterRemoveSceneResponseCallback(aCommandPath.mEndpointId, apCommandObj, status,
+                                                                             groupId, sceneId);
             }
             break;
         }
         case Commands::StoreSceneResponse::Id: {
-            Commands::StoreSceneResponse::DecodableType fieldStruct;
             expectArgumentCount = 3;
             uint8_t status;
             uint16_t groupId;
@@ -4901,13 +4816,12 @@ void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPa
 
             if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount)
             {
-                wasHandled = emberAfScenesClusterStoreSceneResponseCallback(apCommandObj, aCommandPath, aCommandPath.mEndpointId,
-                                                                            status, groupId, sceneId, fieldStruct);
+                wasHandled = emberAfScenesClusterStoreSceneResponseCallback(aCommandPath.mEndpointId, apCommandObj, status, groupId,
+                                                                            sceneId);
             }
             break;
         }
         case Commands::ViewSceneResponse::Id: {
-            Commands::ViewSceneResponse::DecodableType fieldStruct;
             expectArgumentCount = 6;
             uint8_t status;
             uint16_t groupId;
@@ -4983,9 +4897,9 @@ void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPa
 
             if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 6 == validArgumentCount)
             {
-                wasHandled = emberAfScenesClusterViewSceneResponseCallback(
-                    apCommandObj, aCommandPath, aCommandPath.mEndpointId, status, groupId, sceneId, transitionTime,
-                    const_cast<uint8_t *>(sceneName), extensionFieldSets, fieldStruct);
+                wasHandled = emberAfScenesClusterViewSceneResponseCallback(aCommandPath.mEndpointId, apCommandObj, status, groupId,
+                                                                           sceneId, transitionTime,
+                                                                           const_cast<uint8_t *>(sceneName), extensionFieldSets);
             }
             break;
         }
@@ -5035,7 +4949,6 @@ void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPa
         switch (aCommandPath.mCommandId)
         {
         case Commands::ChangeChannelResponse::Id: {
-            Commands::ChangeChannelResponse::DecodableType fieldStruct;
             expectArgumentCount = 2;
             /* TYPE WARNING: array array defaults to */ uint8_t * ChannelMatch;
             uint8_t ErrorType;
@@ -5094,8 +5007,8 @@ void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPa
 
             if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
             {
-                wasHandled = emberAfTvChannelClusterChangeChannelResponseCallback(
-                    apCommandObj, aCommandPath, aCommandPath.mEndpointId, ChannelMatch, ErrorType, fieldStruct);
+                wasHandled = emberAfTvChannelClusterChangeChannelResponseCallback(aCommandPath.mEndpointId, apCommandObj,
+                                                                                  ChannelMatch, ErrorType);
             }
             break;
         }
@@ -5145,7 +5058,6 @@ void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPa
         switch (aCommandPath.mCommandId)
         {
         case Commands::NavigateTargetResponse::Id: {
-            Commands::NavigateTargetResponse::DecodableType fieldStruct;
             expectArgumentCount = 2;
             uint8_t status;
             const uint8_t * data;
@@ -5204,8 +5116,8 @@ void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPa
 
             if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
             {
-                wasHandled = emberAfTargetNavigatorClusterNavigateTargetResponseCallback(
-                    apCommandObj, aCommandPath, aCommandPath.mEndpointId, status, const_cast<uint8_t *>(data), fieldStruct);
+                wasHandled = emberAfTargetNavigatorClusterNavigateTargetResponseCallback(aCommandPath.mEndpointId, apCommandObj,
+                                                                                         status, const_cast<uint8_t *>(data));
             }
             break;
         }
@@ -5256,7 +5168,6 @@ void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPa
         switch (aCommandPath.mCommandId)
         {
         case Commands::TestAddArgumentsResponse::Id: {
-            Commands::TestAddArgumentsResponse::DecodableType fieldStruct;
             expectArgumentCount = 1;
             uint8_t returnValue;
             bool argExists[1];
@@ -5310,13 +5221,12 @@ void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPa
 
             if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
             {
-                wasHandled = emberAfTestClusterClusterTestAddArgumentsResponseCallback(
-                    apCommandObj, aCommandPath, aCommandPath.mEndpointId, returnValue, fieldStruct);
+                wasHandled =
+                    emberAfTestClusterClusterTestAddArgumentsResponseCallback(aCommandPath.mEndpointId, apCommandObj, returnValue);
             }
             break;
         }
         case Commands::TestSpecificResponse::Id: {
-            Commands::TestSpecificResponse::DecodableType fieldStruct;
             expectArgumentCount = 1;
             uint8_t returnValue;
             bool argExists[1];
@@ -5370,8 +5280,8 @@ void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPa
 
             if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
             {
-                wasHandled = emberAfTestClusterClusterTestSpecificResponseCallback(
-                    apCommandObj, aCommandPath, aCommandPath.mEndpointId, returnValue, fieldStruct);
+                wasHandled =
+                    emberAfTestClusterClusterTestSpecificResponseCallback(aCommandPath.mEndpointId, apCommandObj, returnValue);
             }
             break;
         }
diff --git a/zzz_generated/lighting-app/zap-generated/CHIPClientCallbacks.cpp b/zzz_generated/lighting-app/zap-generated/CHIPClientCallbacks.cpp
index 7ab23cee5..33694badf 100644
--- a/zzz_generated/lighting-app/zap-generated/CHIPClientCallbacks.cpp
+++ b/zzz_generated/lighting-app/zap-generated/CHIPClientCallbacks.cpp
@@ -21,10 +21,8 @@
 
 #include <cinttypes>
 
-#include <app-common/zap-generated/cluster-objects.h>
 #include <app-common/zap-generated/enums.h>
 #include <app/Command.h>
-#include <app/ConcreteCommandPath.h>
 #include <app/util/CHIPDeviceCallbacksMgr.h>
 #include <app/util/af-enums.h>
 #include <app/util/af.h>
diff --git a/zzz_generated/ota-requestor-app/zap-generated/CHIPClientCallbacks.cpp b/zzz_generated/ota-requestor-app/zap-generated/CHIPClientCallbacks.cpp
index 8e0bb80df..dc268beaf 100644
--- a/zzz_generated/ota-requestor-app/zap-generated/CHIPClientCallbacks.cpp
+++ b/zzz_generated/ota-requestor-app/zap-generated/CHIPClientCallbacks.cpp
@@ -21,10 +21,8 @@
 
 #include <cinttypes>
 
-#include <app-common/zap-generated/cluster-objects.h>
 #include <app-common/zap-generated/enums.h>
 #include <app/Command.h>
-#include <app/ConcreteCommandPath.h>
 #include <app/util/CHIPDeviceCallbacksMgr.h>
 #include <app/util/af-enums.h>
 #include <app/util/af.h>
@@ -353,10 +351,8 @@ bool emberAfDiscoverCommandsReceivedResponseCallback(ClusterId clusterId, uint16
     return true;
 }
 
-bool emberAfOtaSoftwareUpdateProviderClusterApplyUpdateRequestResponseCallback(
-    app::CommandSender * commandObj, const app::ConcreteCommandPath & commandPath, EndpointId endpoint, uint8_t action,
-    uint32_t delayedActionTime,
-    app::Clusters::OtaSoftwareUpdateProvider::Commands::ApplyUpdateRequestResponse::DecodableType & fields)
+bool emberAfOtaSoftwareUpdateProviderClusterApplyUpdateRequestResponseCallback(EndpointId endpoint, app::CommandSender * commandObj,
+                                                                               uint8_t action, uint32_t delayedActionTime)
 {
     ChipLogProgress(Zcl, "ApplyUpdateRequestResponse:");
     ChipLogProgress(Zcl, "  action: %" PRIu8 "", action);
@@ -370,11 +366,11 @@ bool emberAfOtaSoftwareUpdateProviderClusterApplyUpdateRequestResponseCallback(
     return true;
 }
 
-bool emberAfOtaSoftwareUpdateProviderClusterQueryImageResponseCallback(
-    app::CommandSender * commandObj, const app::ConcreteCommandPath & commandPath, EndpointId endpoint, uint8_t status,
-    uint32_t delayedActionTime, uint8_t * imageURI, uint32_t softwareVersion, uint8_t * softwareVersionString,
-    chip::ByteSpan updateToken, bool userConsentNeeded, chip::ByteSpan metadataForRequestor,
-    app::Clusters::OtaSoftwareUpdateProvider::Commands::QueryImageResponse::DecodableType & fields)
+bool emberAfOtaSoftwareUpdateProviderClusterQueryImageResponseCallback(EndpointId endpoint, app::CommandSender * commandObj,
+                                                                       uint8_t status, uint32_t delayedActionTime,
+                                                                       uint8_t * imageURI, uint32_t softwareVersion,
+                                                                       uint8_t * softwareVersionString, chip::ByteSpan updateToken,
+                                                                       bool userConsentNeeded, chip::ByteSpan metadataForRequestor)
 {
     ChipLogProgress(Zcl, "QueryImageResponse:");
     ChipLogProgress(Zcl, "  status: %" PRIu8 "", status);
diff --git a/zzz_generated/ota-requestor-app/zap-generated/IMClusterCommandHandler.cpp b/zzz_generated/ota-requestor-app/zap-generated/IMClusterCommandHandler.cpp
index 15111dfaa..779d10e19 100644
--- a/zzz_generated/ota-requestor-app/zap-generated/IMClusterCommandHandler.cpp
+++ b/zzz_generated/ota-requestor-app/zap-generated/IMClusterCommandHandler.cpp
@@ -71,7 +71,6 @@ void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPa
         switch (aCommandPath.mCommandId)
         {
         case Commands::ApplyUpdateRequestResponse::Id: {
-            Commands::ApplyUpdateRequestResponse::DecodableType fieldStruct;
             expectArgumentCount = 2;
             uint8_t action;
             uint32_t delayedActionTime;
@@ -130,12 +129,11 @@ void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPa
             if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
             {
                 wasHandled = emberAfOtaSoftwareUpdateProviderClusterApplyUpdateRequestResponseCallback(
-                    apCommandObj, aCommandPath, aCommandPath.mEndpointId, action, delayedActionTime, fieldStruct);
+                    aCommandPath.mEndpointId, apCommandObj, action, delayedActionTime);
             }
             break;
         }
         case Commands::QueryImageResponse::Id: {
-            Commands::QueryImageResponse::DecodableType fieldStruct;
             expectArgumentCount = 8;
             uint8_t status;
             uint32_t delayedActionTime;
@@ -220,9 +218,9 @@ void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPa
             if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 8 == validArgumentCount)
             {
                 wasHandled = emberAfOtaSoftwareUpdateProviderClusterQueryImageResponseCallback(
-                    apCommandObj, aCommandPath, aCommandPath.mEndpointId, status, delayedActionTime,
-                    const_cast<uint8_t *>(imageURI), softwareVersion, const_cast<uint8_t *>(softwareVersionString), updateToken,
-                    userConsentNeeded, metadataForRequestor, fieldStruct);
+                    aCommandPath.mEndpointId, apCommandObj, status, delayedActionTime, const_cast<uint8_t *>(imageURI),
+                    softwareVersion, const_cast<uint8_t *>(softwareVersionString), updateToken, userConsentNeeded,
+                    metadataForRequestor);
             }
             break;
         }
diff --git a/zzz_generated/pump-app/zap-generated/CHIPClientCallbacks.cpp b/zzz_generated/pump-app/zap-generated/CHIPClientCallbacks.cpp
index 7ab23cee5..33694badf 100644
--- a/zzz_generated/pump-app/zap-generated/CHIPClientCallbacks.cpp
+++ b/zzz_generated/pump-app/zap-generated/CHIPClientCallbacks.cpp
@@ -21,10 +21,8 @@
 
 #include <cinttypes>
 
-#include <app-common/zap-generated/cluster-objects.h>
 #include <app-common/zap-generated/enums.h>
 #include <app/Command.h>
-#include <app/ConcreteCommandPath.h>
 #include <app/util/CHIPDeviceCallbacksMgr.h>
 #include <app/util/af-enums.h>
 #include <app/util/af.h>
diff --git a/zzz_generated/pump-controller-app/zap-generated/CHIPClientCallbacks.cpp b/zzz_generated/pump-controller-app/zap-generated/CHIPClientCallbacks.cpp
index 7ab23cee5..33694badf 100644
--- a/zzz_generated/pump-controller-app/zap-generated/CHIPClientCallbacks.cpp
+++ b/zzz_generated/pump-controller-app/zap-generated/CHIPClientCallbacks.cpp
@@ -21,10 +21,8 @@
 
 #include <cinttypes>
 
-#include <app-common/zap-generated/cluster-objects.h>
 #include <app-common/zap-generated/enums.h>
 #include <app/Command.h>
-#include <app/ConcreteCommandPath.h>
 #include <app/util/CHIPDeviceCallbacksMgr.h>
 #include <app/util/af-enums.h>
 #include <app/util/af.h>
diff --git a/zzz_generated/tv-app/zap-generated/CHIPClientCallbacks.cpp b/zzz_generated/tv-app/zap-generated/CHIPClientCallbacks.cpp
index 1318ac0e9..8c2539597 100644
--- a/zzz_generated/tv-app/zap-generated/CHIPClientCallbacks.cpp
+++ b/zzz_generated/tv-app/zap-generated/CHIPClientCallbacks.cpp
@@ -21,10 +21,8 @@
 
 #include <cinttypes>
 
-#include <app-common/zap-generated/cluster-objects.h>
 #include <app-common/zap-generated/enums.h>
 #include <app/Command.h>
-#include <app/ConcreteCommandPath.h>
 #include <app/util/CHIPDeviceCallbacksMgr.h>
 #include <app/util/af-enums.h>
 #include <app/util/af.h>
@@ -497,9 +495,8 @@ void OperationalCredentialsClusterTrustedRootCertificatesListAttributeFilter(TLV
 #pragma GCC diagnostic pop
 #endif // __clang__
 
-bool emberAfGeneralCommissioningClusterArmFailSafeResponseCallback(
-    app::CommandSender * commandObj, const app::ConcreteCommandPath & commandPath, EndpointId endpoint, uint8_t errorCode,
-    uint8_t * debugText, app::Clusters::GeneralCommissioning::Commands::ArmFailSafeResponse::DecodableType & fields)
+bool emberAfGeneralCommissioningClusterArmFailSafeResponseCallback(EndpointId endpoint, app::CommandSender * commandObj,
+                                                                   uint8_t errorCode, uint8_t * debugText)
 {
     ChipLogProgress(Zcl, "ArmFailSafeResponse:");
     ChipLogProgress(Zcl, "  errorCode: %" PRIu8 "", errorCode);
@@ -514,9 +511,8 @@ bool emberAfGeneralCommissioningClusterArmFailSafeResponseCallback(
     return true;
 }
 
-bool emberAfGeneralCommissioningClusterCommissioningCompleteResponseCallback(
-    app::CommandSender * commandObj, const app::ConcreteCommandPath & commandPath, EndpointId endpoint, uint8_t errorCode,
-    uint8_t * debugText, app::Clusters::GeneralCommissioning::Commands::CommissioningCompleteResponse::DecodableType & fields)
+bool emberAfGeneralCommissioningClusterCommissioningCompleteResponseCallback(EndpointId endpoint, app::CommandSender * commandObj,
+                                                                             uint8_t errorCode, uint8_t * debugText)
 {
     ChipLogProgress(Zcl, "CommissioningCompleteResponse:");
     ChipLogProgress(Zcl, "  errorCode: %" PRIu8 "", errorCode);
@@ -531,9 +527,8 @@ bool emberAfGeneralCommissioningClusterCommissioningCompleteResponseCallback(
     return true;
 }
 
-bool emberAfGeneralCommissioningClusterSetRegulatoryConfigResponseCallback(
-    app::CommandSender * commandObj, const app::ConcreteCommandPath & commandPath, EndpointId endpoint, uint8_t errorCode,
-    uint8_t * debugText, app::Clusters::GeneralCommissioning::Commands::SetRegulatoryConfigResponse::DecodableType & fields)
+bool emberAfGeneralCommissioningClusterSetRegulatoryConfigResponseCallback(EndpointId endpoint, app::CommandSender * commandObj,
+                                                                           uint8_t errorCode, uint8_t * debugText)
 {
     ChipLogProgress(Zcl, "SetRegulatoryConfigResponse:");
     ChipLogProgress(Zcl, "  errorCode: %" PRIu8 "", errorCode);
@@ -548,9 +543,8 @@ bool emberAfGeneralCommissioningClusterSetRegulatoryConfigResponseCallback(
     return true;
 }
 
-bool emberAfNetworkCommissioningClusterAddThreadNetworkResponseCallback(
-    app::CommandSender * commandObj, const app::ConcreteCommandPath & commandPath, EndpointId endpoint, uint8_t errorCode,
-    uint8_t * debugText, app::Clusters::NetworkCommissioning::Commands::AddThreadNetworkResponse::DecodableType & fields)
+bool emberAfNetworkCommissioningClusterAddThreadNetworkResponseCallback(EndpointId endpoint, app::CommandSender * commandObj,
+                                                                        uint8_t errorCode, uint8_t * debugText)
 {
     ChipLogProgress(Zcl, "AddThreadNetworkResponse:");
     ChipLogProgress(Zcl, "  errorCode: %" PRIu8 "", errorCode);
@@ -565,9 +559,8 @@ bool emberAfNetworkCommissioningClusterAddThreadNetworkResponseCallback(
     return true;
 }
 
-bool emberAfNetworkCommissioningClusterAddWiFiNetworkResponseCallback(
-    app::CommandSender * commandObj, const app::ConcreteCommandPath & commandPath, EndpointId endpoint, uint8_t errorCode,
-    uint8_t * debugText, app::Clusters::NetworkCommissioning::Commands::AddWiFiNetworkResponse::DecodableType & fields)
+bool emberAfNetworkCommissioningClusterAddWiFiNetworkResponseCallback(EndpointId endpoint, app::CommandSender * commandObj,
+                                                                      uint8_t errorCode, uint8_t * debugText)
 {
     ChipLogProgress(Zcl, "AddWiFiNetworkResponse:");
     ChipLogProgress(Zcl, "  errorCode: %" PRIu8 "", errorCode);
@@ -582,9 +575,8 @@ bool emberAfNetworkCommissioningClusterAddWiFiNetworkResponseCallback(
     return true;
 }
 
-bool emberAfNetworkCommissioningClusterDisableNetworkResponseCallback(
-    app::CommandSender * commandObj, const app::ConcreteCommandPath & commandPath, EndpointId endpoint, uint8_t errorCode,
-    uint8_t * debugText, app::Clusters::NetworkCommissioning::Commands::DisableNetworkResponse::DecodableType & fields)
+bool emberAfNetworkCommissioningClusterDisableNetworkResponseCallback(EndpointId endpoint, app::CommandSender * commandObj,
+                                                                      uint8_t errorCode, uint8_t * debugText)
 {
     ChipLogProgress(Zcl, "DisableNetworkResponse:");
     ChipLogProgress(Zcl, "  errorCode: %" PRIu8 "", errorCode);
@@ -599,9 +591,8 @@ bool emberAfNetworkCommissioningClusterDisableNetworkResponseCallback(
     return true;
 }
 
-bool emberAfNetworkCommissioningClusterEnableNetworkResponseCallback(
-    app::CommandSender * commandObj, const app::ConcreteCommandPath & commandPath, EndpointId endpoint, uint8_t errorCode,
-    uint8_t * debugText, app::Clusters::NetworkCommissioning::Commands::EnableNetworkResponse::DecodableType & fields)
+bool emberAfNetworkCommissioningClusterEnableNetworkResponseCallback(EndpointId endpoint, app::CommandSender * commandObj,
+                                                                     uint8_t errorCode, uint8_t * debugText)
 {
     ChipLogProgress(Zcl, "EnableNetworkResponse:");
     ChipLogProgress(Zcl, "  errorCode: %" PRIu8 "", errorCode);
@@ -616,9 +607,8 @@ bool emberAfNetworkCommissioningClusterEnableNetworkResponseCallback(
     return true;
 }
 
-bool emberAfNetworkCommissioningClusterRemoveNetworkResponseCallback(
-    app::CommandSender * commandObj, const app::ConcreteCommandPath & commandPath, EndpointId endpoint, uint8_t errorCode,
-    uint8_t * debugText, app::Clusters::NetworkCommissioning::Commands::RemoveNetworkResponse::DecodableType & fields)
+bool emberAfNetworkCommissioningClusterRemoveNetworkResponseCallback(EndpointId endpoint, app::CommandSender * commandObj,
+                                                                     uint8_t errorCode, uint8_t * debugText)
 {
     ChipLogProgress(Zcl, "RemoveNetworkResponse:");
     ChipLogProgress(Zcl, "  errorCode: %" PRIu8 "", errorCode);
@@ -634,10 +624,9 @@ bool emberAfNetworkCommissioningClusterRemoveNetworkResponseCallback(
 }
 
 bool emberAfNetworkCommissioningClusterScanNetworksResponseCallback(
-    app::CommandSender * commandObj, const app::ConcreteCommandPath & commandPath, EndpointId endpoint, uint8_t errorCode,
-    uint8_t * debugText, /* TYPE WARNING: array array defaults to */ uint8_t * wifiScanResults,
-    /* TYPE WARNING: array array defaults to */ uint8_t * threadScanResults,
-    app::Clusters::NetworkCommissioning::Commands::ScanNetworksResponse::DecodableType & fields)
+    EndpointId endpoint, app::CommandSender * commandObj, uint8_t errorCode, uint8_t * debugText,
+    /* TYPE WARNING: array array defaults to */ uint8_t * wifiScanResults,
+    /* TYPE WARNING: array array defaults to */ uint8_t * threadScanResults)
 {
     ChipLogProgress(Zcl, "ScanNetworksResponse:");
     ChipLogProgress(Zcl, "  errorCode: %" PRIu8 "", errorCode);
@@ -654,9 +643,8 @@ bool emberAfNetworkCommissioningClusterScanNetworksResponseCallback(
     return true;
 }
 
-bool emberAfNetworkCommissioningClusterUpdateThreadNetworkResponseCallback(
-    app::CommandSender * commandObj, const app::ConcreteCommandPath & commandPath, EndpointId endpoint, uint8_t errorCode,
-    uint8_t * debugText, app::Clusters::NetworkCommissioning::Commands::UpdateThreadNetworkResponse::DecodableType & fields)
+bool emberAfNetworkCommissioningClusterUpdateThreadNetworkResponseCallback(EndpointId endpoint, app::CommandSender * commandObj,
+                                                                           uint8_t errorCode, uint8_t * debugText)
 {
     ChipLogProgress(Zcl, "UpdateThreadNetworkResponse:");
     ChipLogProgress(Zcl, "  errorCode: %" PRIu8 "", errorCode);
@@ -671,9 +659,8 @@ bool emberAfNetworkCommissioningClusterUpdateThreadNetworkResponseCallback(
     return true;
 }
 
-bool emberAfNetworkCommissioningClusterUpdateWiFiNetworkResponseCallback(
-    app::CommandSender * commandObj, const app::ConcreteCommandPath & commandPath, EndpointId endpoint, uint8_t errorCode,
-    uint8_t * debugText, app::Clusters::NetworkCommissioning::Commands::UpdateWiFiNetworkResponse::DecodableType & fields)
+bool emberAfNetworkCommissioningClusterUpdateWiFiNetworkResponseCallback(EndpointId endpoint, app::CommandSender * commandObj,
+                                                                         uint8_t errorCode, uint8_t * debugText)
 {
     ChipLogProgress(Zcl, "UpdateWiFiNetworkResponse:");
     ChipLogProgress(Zcl, "  errorCode: %" PRIu8 "", errorCode);
@@ -688,10 +675,8 @@ bool emberAfNetworkCommissioningClusterUpdateWiFiNetworkResponseCallback(
     return true;
 }
 
-bool emberAfOperationalCredentialsClusterAttestationResponseCallback(
-    app::CommandSender * commandObj, const app::ConcreteCommandPath & commandPath, EndpointId endpoint,
-    chip::ByteSpan AttestationElements, chip::ByteSpan Signature,
-    app::Clusters::OperationalCredentials::Commands::AttestationResponse::DecodableType & fields)
+bool emberAfOperationalCredentialsClusterAttestationResponseCallback(EndpointId endpoint, app::CommandSender * commandObj,
+                                                                     chip::ByteSpan AttestationElements, chip::ByteSpan Signature)
 {
     ChipLogProgress(Zcl, "AttestationResponse:");
     ChipLogProgress(Zcl, "  AttestationElements: %zu", AttestationElements.size());
@@ -705,9 +690,8 @@ bool emberAfOperationalCredentialsClusterAttestationResponseCallback(
     return true;
 }
 
-bool emberAfOperationalCredentialsClusterCertificateChainResponseCallback(
-    app::CommandSender * commandObj, const app::ConcreteCommandPath & commandPath, EndpointId endpoint, chip::ByteSpan Certificate,
-    app::Clusters::OperationalCredentials::Commands::CertificateChainResponse::DecodableType & fields)
+bool emberAfOperationalCredentialsClusterCertificateChainResponseCallback(EndpointId endpoint, app::CommandSender * commandObj,
+                                                                          chip::ByteSpan Certificate)
 {
     ChipLogProgress(Zcl, "CertificateChainResponse:");
     ChipLogProgress(Zcl, "  Certificate: %zu", Certificate.size());
@@ -720,10 +704,8 @@ bool emberAfOperationalCredentialsClusterCertificateChainResponseCallback(
     return true;
 }
 
-bool emberAfOperationalCredentialsClusterNOCResponseCallback(
-    app::CommandSender * commandObj, const app::ConcreteCommandPath & commandPath, EndpointId endpoint, uint8_t StatusCode,
-    uint8_t FabricIndex, chip::ByteSpan DebugText,
-    app::Clusters::OperationalCredentials::Commands::NOCResponse::DecodableType & fields)
+bool emberAfOperationalCredentialsClusterNOCResponseCallback(EndpointId endpoint, app::CommandSender * commandObj,
+                                                             uint8_t StatusCode, uint8_t FabricIndex, chip::ByteSpan DebugText)
 {
     ChipLogProgress(Zcl, "NOCResponse:");
     ChipLogProgress(Zcl, "  StatusCode: %" PRIu8 "", StatusCode);
@@ -738,10 +720,8 @@ bool emberAfOperationalCredentialsClusterNOCResponseCallback(
     return true;
 }
 
-bool emberAfOperationalCredentialsClusterOpCSRResponseCallback(
-    app::CommandSender * commandObj, const app::ConcreteCommandPath & commandPath, EndpointId endpoint,
-    chip::ByteSpan NOCSRElements, chip::ByteSpan AttestationSignature,
-    app::Clusters::OperationalCredentials::Commands::OpCSRResponse::DecodableType & fields)
+bool emberAfOperationalCredentialsClusterOpCSRResponseCallback(EndpointId endpoint, app::CommandSender * commandObj,
+                                                               chip::ByteSpan NOCSRElements, chip::ByteSpan AttestationSignature)
 {
     ChipLogProgress(Zcl, "OpCSRResponse:");
     ChipLogProgress(Zcl, "  NOCSRElements: %zu", NOCSRElements.size());
diff --git a/zzz_generated/tv-app/zap-generated/IMClusterCommandHandler.cpp b/zzz_generated/tv-app/zap-generated/IMClusterCommandHandler.cpp
index 2d0a10517..0dc8bd58e 100644
--- a/zzz_generated/tv-app/zap-generated/IMClusterCommandHandler.cpp
+++ b/zzz_generated/tv-app/zap-generated/IMClusterCommandHandler.cpp
@@ -1322,7 +1322,6 @@ void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPa
         switch (aCommandPath.mCommandId)
         {
         case Commands::ArmFailSafeResponse::Id: {
-            Commands::ArmFailSafeResponse::DecodableType fieldStruct;
             expectArgumentCount = 2;
             uint8_t errorCode;
             const uint8_t * debugText;
@@ -1382,12 +1381,11 @@ void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPa
             if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
             {
                 wasHandled = emberAfGeneralCommissioningClusterArmFailSafeResponseCallback(
-                    apCommandObj, aCommandPath, aCommandPath.mEndpointId, errorCode, const_cast<uint8_t *>(debugText), fieldStruct);
+                    aCommandPath.mEndpointId, apCommandObj, errorCode, const_cast<uint8_t *>(debugText));
             }
             break;
         }
         case Commands::CommissioningCompleteResponse::Id: {
-            Commands::CommissioningCompleteResponse::DecodableType fieldStruct;
             expectArgumentCount = 2;
             uint8_t errorCode;
             const uint8_t * debugText;
@@ -1447,12 +1445,11 @@ void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPa
             if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
             {
                 wasHandled = emberAfGeneralCommissioningClusterCommissioningCompleteResponseCallback(
-                    apCommandObj, aCommandPath, aCommandPath.mEndpointId, errorCode, const_cast<uint8_t *>(debugText), fieldStruct);
+                    aCommandPath.mEndpointId, apCommandObj, errorCode, const_cast<uint8_t *>(debugText));
             }
             break;
         }
         case Commands::SetRegulatoryConfigResponse::Id: {
-            Commands::SetRegulatoryConfigResponse::DecodableType fieldStruct;
             expectArgumentCount = 2;
             uint8_t errorCode;
             const uint8_t * debugText;
@@ -1512,7 +1509,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPa
             if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
             {
                 wasHandled = emberAfGeneralCommissioningClusterSetRegulatoryConfigResponseCallback(
-                    apCommandObj, aCommandPath, aCommandPath.mEndpointId, errorCode, const_cast<uint8_t *>(debugText), fieldStruct);
+                    aCommandPath.mEndpointId, apCommandObj, errorCode, const_cast<uint8_t *>(debugText));
             }
             break;
         }
@@ -2913,7 +2910,6 @@ void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPa
         switch (aCommandPath.mCommandId)
         {
         case Commands::AddThreadNetworkResponse::Id: {
-            Commands::AddThreadNetworkResponse::DecodableType fieldStruct;
             expectArgumentCount = 2;
             uint8_t errorCode;
             const uint8_t * debugText;
@@ -2973,12 +2969,11 @@ void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPa
             if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
             {
                 wasHandled = emberAfNetworkCommissioningClusterAddThreadNetworkResponseCallback(
-                    apCommandObj, aCommandPath, aCommandPath.mEndpointId, errorCode, const_cast<uint8_t *>(debugText), fieldStruct);
+                    aCommandPath.mEndpointId, apCommandObj, errorCode, const_cast<uint8_t *>(debugText));
             }
             break;
         }
         case Commands::AddWiFiNetworkResponse::Id: {
-            Commands::AddWiFiNetworkResponse::DecodableType fieldStruct;
             expectArgumentCount = 2;
             uint8_t errorCode;
             const uint8_t * debugText;
@@ -3038,12 +3033,11 @@ void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPa
             if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
             {
                 wasHandled = emberAfNetworkCommissioningClusterAddWiFiNetworkResponseCallback(
-                    apCommandObj, aCommandPath, aCommandPath.mEndpointId, errorCode, const_cast<uint8_t *>(debugText), fieldStruct);
+                    aCommandPath.mEndpointId, apCommandObj, errorCode, const_cast<uint8_t *>(debugText));
             }
             break;
         }
         case Commands::DisableNetworkResponse::Id: {
-            Commands::DisableNetworkResponse::DecodableType fieldStruct;
             expectArgumentCount = 2;
             uint8_t errorCode;
             const uint8_t * debugText;
@@ -3103,12 +3097,11 @@ void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPa
             if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
             {
                 wasHandled = emberAfNetworkCommissioningClusterDisableNetworkResponseCallback(
-                    apCommandObj, aCommandPath, aCommandPath.mEndpointId, errorCode, const_cast<uint8_t *>(debugText), fieldStruct);
+                    aCommandPath.mEndpointId, apCommandObj, errorCode, const_cast<uint8_t *>(debugText));
             }
             break;
         }
         case Commands::EnableNetworkResponse::Id: {
-            Commands::EnableNetworkResponse::DecodableType fieldStruct;
             expectArgumentCount = 2;
             uint8_t errorCode;
             const uint8_t * debugText;
@@ -3168,12 +3161,11 @@ void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPa
             if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
             {
                 wasHandled = emberAfNetworkCommissioningClusterEnableNetworkResponseCallback(
-                    apCommandObj, aCommandPath, aCommandPath.mEndpointId, errorCode, const_cast<uint8_t *>(debugText), fieldStruct);
+                    aCommandPath.mEndpointId, apCommandObj, errorCode, const_cast<uint8_t *>(debugText));
             }
             break;
         }
         case Commands::RemoveNetworkResponse::Id: {
-            Commands::RemoveNetworkResponse::DecodableType fieldStruct;
             expectArgumentCount = 2;
             uint8_t errorCode;
             const uint8_t * debugText;
@@ -3233,12 +3225,11 @@ void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPa
             if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
             {
                 wasHandled = emberAfNetworkCommissioningClusterRemoveNetworkResponseCallback(
-                    apCommandObj, aCommandPath, aCommandPath.mEndpointId, errorCode, const_cast<uint8_t *>(debugText), fieldStruct);
+                    aCommandPath.mEndpointId, apCommandObj, errorCode, const_cast<uint8_t *>(debugText));
             }
             break;
         }
         case Commands::ScanNetworksResponse::Id: {
-            Commands::ScanNetworksResponse::DecodableType fieldStruct;
             expectArgumentCount = 4;
             uint8_t errorCode;
             const uint8_t * debugText;
@@ -3308,13 +3299,12 @@ void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPa
             if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount)
             {
                 wasHandled = emberAfNetworkCommissioningClusterScanNetworksResponseCallback(
-                    apCommandObj, aCommandPath, aCommandPath.mEndpointId, errorCode, const_cast<uint8_t *>(debugText),
-                    wifiScanResults, threadScanResults, fieldStruct);
+                    aCommandPath.mEndpointId, apCommandObj, errorCode, const_cast<uint8_t *>(debugText), wifiScanResults,
+                    threadScanResults);
             }
             break;
         }
         case Commands::UpdateThreadNetworkResponse::Id: {
-            Commands::UpdateThreadNetworkResponse::DecodableType fieldStruct;
             expectArgumentCount = 2;
             uint8_t errorCode;
             const uint8_t * debugText;
@@ -3374,12 +3364,11 @@ void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPa
             if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
             {
                 wasHandled = emberAfNetworkCommissioningClusterUpdateThreadNetworkResponseCallback(
-                    apCommandObj, aCommandPath, aCommandPath.mEndpointId, errorCode, const_cast<uint8_t *>(debugText), fieldStruct);
+                    aCommandPath.mEndpointId, apCommandObj, errorCode, const_cast<uint8_t *>(debugText));
             }
             break;
         }
         case Commands::UpdateWiFiNetworkResponse::Id: {
-            Commands::UpdateWiFiNetworkResponse::DecodableType fieldStruct;
             expectArgumentCount = 2;
             uint8_t errorCode;
             const uint8_t * debugText;
@@ -3439,7 +3428,7 @@ void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPa
             if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
             {
                 wasHandled = emberAfNetworkCommissioningClusterUpdateWiFiNetworkResponseCallback(
-                    apCommandObj, aCommandPath, aCommandPath.mEndpointId, errorCode, const_cast<uint8_t *>(debugText), fieldStruct);
+                    aCommandPath.mEndpointId, apCommandObj, errorCode, const_cast<uint8_t *>(debugText));
             }
             break;
         }
@@ -4475,7 +4464,6 @@ void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPa
         switch (aCommandPath.mCommandId)
         {
         case Commands::AttestationResponse::Id: {
-            Commands::AttestationResponse::DecodableType fieldStruct;
             expectArgumentCount = 2;
             chip::ByteSpan AttestationElements;
             chip::ByteSpan Signature;
@@ -4533,13 +4521,12 @@ void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPa
 
             if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
             {
-                wasHandled = emberAfOperationalCredentialsClusterAttestationResponseCallback(
-                    apCommandObj, aCommandPath, aCommandPath.mEndpointId, AttestationElements, Signature, fieldStruct);
+                wasHandled = emberAfOperationalCredentialsClusterAttestationResponseCallback(aCommandPath.mEndpointId, apCommandObj,
+                                                                                             AttestationElements, Signature);
             }
             break;
         }
         case Commands::CertificateChainResponse::Id: {
-            Commands::CertificateChainResponse::DecodableType fieldStruct;
             expectArgumentCount = 1;
             chip::ByteSpan Certificate;
             bool argExists[1];
@@ -4593,13 +4580,12 @@ void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPa
 
             if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 1 == validArgumentCount)
             {
-                wasHandled = emberAfOperationalCredentialsClusterCertificateChainResponseCallback(
-                    apCommandObj, aCommandPath, aCommandPath.mEndpointId, Certificate, fieldStruct);
+                wasHandled = emberAfOperationalCredentialsClusterCertificateChainResponseCallback(aCommandPath.mEndpointId,
+                                                                                                  apCommandObj, Certificate);
             }
             break;
         }
         case Commands::NOCResponse::Id: {
-            Commands::NOCResponse::DecodableType fieldStruct;
             expectArgumentCount = 3;
             uint8_t StatusCode;
             uint8_t FabricIndex;
@@ -4661,13 +4647,12 @@ void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPa
 
             if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 3 == validArgumentCount)
             {
-                wasHandled = emberAfOperationalCredentialsClusterNOCResponseCallback(
-                    apCommandObj, aCommandPath, aCommandPath.mEndpointId, StatusCode, FabricIndex, DebugText, fieldStruct);
+                wasHandled = emberAfOperationalCredentialsClusterNOCResponseCallback(aCommandPath.mEndpointId, apCommandObj,
+                                                                                     StatusCode, FabricIndex, DebugText);
             }
             break;
         }
         case Commands::OpCSRResponse::Id: {
-            Commands::OpCSRResponse::DecodableType fieldStruct;
             expectArgumentCount = 2;
             chip::ByteSpan NOCSRElements;
             chip::ByteSpan AttestationSignature;
@@ -4725,8 +4710,8 @@ void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPa
 
             if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 2 == validArgumentCount)
             {
-                wasHandled = emberAfOperationalCredentialsClusterOpCSRResponseCallback(
-                    apCommandObj, aCommandPath, aCommandPath.mEndpointId, NOCSRElements, AttestationSignature, fieldStruct);
+                wasHandled = emberAfOperationalCredentialsClusterOpCSRResponseCallback(aCommandPath.mEndpointId, apCommandObj,
+                                                                                       NOCSRElements, AttestationSignature);
             }
             break;
         }