diff --git a/src/controller/java/zap-generated/CHIPInvokeCallbacks.cpp b/src/controller/java/zap-generated/CHIPInvokeCallbacks.cpp
index 0da0bfa0ab2f95..bd2241983c4c63 100644
--- a/src/controller/java/zap-generated/CHIPInvokeCallbacks.cpp
+++ b/src/controller/java/zap-generated/CHIPInvokeCallbacks.cpp
@@ -3520,13 +3520,13 @@ void CHIPKeypadInputClusterSendKeyResponseCallback::CallbackFn(
     err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
     VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error invoking Java callback: %s", ErrorStr(err)));
 
-    jobject status;
-    std::string statusClassName     = "java/lang/Integer";
-    std::string statusCtorSignature = "(I)V";
-    chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(statusClassName.c_str(), statusCtorSignature.c_str(),
-                                                                  static_cast<uint8_t>(dataResponse.status), status);
+    jobject Status;
+    std::string StatusClassName     = "java/lang/Integer";
+    std::string StatusCtorSignature = "(I)V";
+    chip::JniReferences::GetInstance().CreateBoxedObject<uint8_t>(StatusClassName.c_str(), StatusCtorSignature.c_str(),
+                                                                  static_cast<uint8_t>(dataResponse.status), Status);
 
-    env->CallVoidMethod(javaCallbackRef, javaMethod, status);
+    env->CallVoidMethod(javaCallbackRef, javaMethod, Status);
 }
 CHIPContentLauncherClusterLaunchResponseCallback::CHIPContentLauncherClusterLaunchResponseCallback(jobject javaCallback) :
     Callback::Callback<CHIPContentLauncherClusterLaunchResponseCallbackType>(CallbackFn, this)
diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java b/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java
index 4a30a6afdeca7a..a6861d5efc1101 100644
--- a/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java
+++ b/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java
@@ -6013,10 +6013,10 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(Integer status) {
+    public void onSuccess(Integer Status) {
       Map<CommandResponseInfo, Object> responseValues = new LinkedHashMap<>();
-      CommandResponseInfo statusResponseValue = new CommandResponseInfo("status", "Integer");
-      responseValues.put(statusResponseValue, status);
+      CommandResponseInfo StatusResponseValue = new CommandResponseInfo("Status", "Integer");
+      responseValues.put(StatusResponseValue, Status);
       callback.onSuccess(responseValues);
     }
 
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 f1c14e78474450..a01d0e85dbc100 100644
--- a/zzz_generated/app-common/app-common/zap-generated/callback.h
+++ b/zzz_generated/app-common/app-common/zap-generated/callback.h
@@ -8704,7 +8704,7 @@ bool emberAfKeypadInputClusterSendKeyCallback(
  * @brief Keypad Input Cluster SendKeyResponse Command callback (from server)
  */
 bool emberAfKeypadInputClusterSendKeyResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj,
-                                                      uint8_t status);
+                                                      uint8_t Status);
 /**
  * @brief Content Launcher Cluster LaunchContent Command callback (from client)
  */
diff --git a/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h b/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h
index 29e91879267357..82c7a6adab373d 100644
--- a/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h
+++ b/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h
@@ -41026,7 +41026,7 @@ class Test_TC_KEYPADINPUT_3_2 : public TestCommandBridge {
 
                             {
                                 id actualValue = values.status;
-                                VerifyOrReturn(CheckValue("status", actualValue, 0U));
+                                VerifyOrReturn(CheckValue("Status", actualValue, 0U));
                             }
 
                             NextTest();
@@ -41053,7 +41053,7 @@ class Test_TC_KEYPADINPUT_3_2 : public TestCommandBridge {
 
                             {
                                 id actualValue = values.status;
-                                VerifyOrReturn(CheckValue("status", actualValue, 0U));
+                                VerifyOrReturn(CheckValue("Status", actualValue, 0U));
                             }
 
                             NextTest();
@@ -41271,7 +41271,7 @@ class Test_TC_KEYPADINPUT_3_3 : public TestCommandBridge {
 
                             {
                                 id actualValue = values.status;
-                                VerifyOrReturn(CheckValue("status", actualValue, 0U));
+                                VerifyOrReturn(CheckValue("Status", actualValue, 0U));
                             }
 
                             NextTest();
@@ -41298,7 +41298,7 @@ class Test_TC_KEYPADINPUT_3_3 : public TestCommandBridge {
 
                             {
                                 id actualValue = values.status;
-                                VerifyOrReturn(CheckValue("status", actualValue, 0U));
+                                VerifyOrReturn(CheckValue("Status", actualValue, 0U));
                             }
 
                             NextTest();
@@ -41325,7 +41325,7 @@ class Test_TC_KEYPADINPUT_3_3 : public TestCommandBridge {
 
                             {
                                 id actualValue = values.status;
-                                VerifyOrReturn(CheckValue("status", actualValue, 0U));
+                                VerifyOrReturn(CheckValue("Status", actualValue, 0U));
                             }
 
                             NextTest();
@@ -41352,7 +41352,7 @@ class Test_TC_KEYPADINPUT_3_3 : public TestCommandBridge {
 
                             {
                                 id actualValue = values.status;
-                                VerifyOrReturn(CheckValue("status", actualValue, 0U));
+                                VerifyOrReturn(CheckValue("Status", actualValue, 0U));
                             }
 
                             NextTest();
@@ -41379,7 +41379,7 @@ class Test_TC_KEYPADINPUT_3_3 : public TestCommandBridge {
 
                             {
                                 id actualValue = values.status;
-                                VerifyOrReturn(CheckValue("status", actualValue, 0U));
+                                VerifyOrReturn(CheckValue("Status", actualValue, 0U));
                             }
 
                             NextTest();
@@ -41406,7 +41406,7 @@ class Test_TC_KEYPADINPUT_3_3 : public TestCommandBridge {
 
                             {
                                 id actualValue = values.status;
-                                VerifyOrReturn(CheckValue("status", actualValue, 0U));
+                                VerifyOrReturn(CheckValue("Status", actualValue, 0U));
                             }
 
                             NextTest();
@@ -41433,7 +41433,7 @@ class Test_TC_KEYPADINPUT_3_3 : public TestCommandBridge {
 
                             {
                                 id actualValue = values.status;
-                                VerifyOrReturn(CheckValue("status", actualValue, 0U));
+                                VerifyOrReturn(CheckValue("Status", actualValue, 0U));
                             }
 
                             NextTest();
@@ -41460,7 +41460,7 @@ class Test_TC_KEYPADINPUT_3_3 : public TestCommandBridge {
 
                             {
                                 id actualValue = values.status;
-                                VerifyOrReturn(CheckValue("status", actualValue, 0U));
+                                VerifyOrReturn(CheckValue("Status", actualValue, 0U));
                             }
 
                             NextTest();
@@ -41487,7 +41487,7 @@ class Test_TC_KEYPADINPUT_3_3 : public TestCommandBridge {
 
                             {
                                 id actualValue = values.status;
-                                VerifyOrReturn(CheckValue("status", actualValue, 0U));
+                                VerifyOrReturn(CheckValue("Status", actualValue, 0U));
                             }
 
                             NextTest();
@@ -73585,7 +73585,7 @@ class TV_KeypadInputCluster : public TestCommandBridge {
 
                             {
                                 id actualValue = values.status;
-                                VerifyOrReturn(CheckValue("status", actualValue, 0U));
+                                VerifyOrReturn(CheckValue("Status", actualValue, 0U));
                             }
 
                             NextTest();