diff --git a/src/app/zap-templates/zcl/data-model/chip/keypad-input-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/keypad-input-cluster.xml
index 8842498b9d236a..56bf296516f376 100644
--- a/src/app/zap-templates/zcl/data-model/chip/keypad-input-cluster.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/keypad-input-cluster.xml
@@ -27,12 +27,12 @@ limitations under the License.
 
     <command source="client" code="0x00" name="SendKey" response="SendKeyResponse" optional="false">
       <description>Upon receipt, this SHALL process a keycode as input to the media device.</description>
-      <arg name="keyCode" type="CecKeyCode"/>
+      <arg name="KeyCode" type="CecKeyCode"/>
     </command>
 
     <command source="server" code="0x01" name="SendKeyResponse" optional="false">
       <description>This command SHALL be generated in response to a SendKey Request command.</description>
-      <arg name="status" type="KeypadInputStatusEnum"/>
+      <arg name="Status" type="KeypadInputStatusEnum"/>
     </command>
 
   </cluster>
diff --git a/src/controller/java/zap-generated/CHIPInvokeCallbacks.cpp b/src/controller/java/zap-generated/CHIPInvokeCallbacks.cpp
index 9543a2a5a4351a..617c66020edf6c 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 a75245a45e0dbe..787c2c2aa8635b 100644
--- a/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java
+++ b/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java
@@ -6014,10 +6014,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 4edc55370c5644..6e4b93de079725 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 67cb70140968e0..1df919e14b3008 100644
--- a/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h
+++ b/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h
@@ -41276,7 +41276,7 @@ class Test_TC_KEYPADINPUT_3_2 : public TestCommandBridge {
 
                             {
                                 id actualValue = values.status;
-                                VerifyOrReturn(CheckValue("status", actualValue, 0U));
+                                VerifyOrReturn(CheckValue("Status", actualValue, 0U));
                             }
 
                             NextTest();
@@ -41303,7 +41303,7 @@ class Test_TC_KEYPADINPUT_3_2 : public TestCommandBridge {
 
                             {
                                 id actualValue = values.status;
-                                VerifyOrReturn(CheckValue("status", actualValue, 0U));
+                                VerifyOrReturn(CheckValue("Status", actualValue, 0U));
                             }
 
                             NextTest();
@@ -41521,7 +41521,7 @@ class Test_TC_KEYPADINPUT_3_3 : public TestCommandBridge {
 
                             {
                                 id actualValue = values.status;
-                                VerifyOrReturn(CheckValue("status", actualValue, 0U));
+                                VerifyOrReturn(CheckValue("Status", actualValue, 0U));
                             }
 
                             NextTest();
@@ -41548,7 +41548,7 @@ class Test_TC_KEYPADINPUT_3_3 : public TestCommandBridge {
 
                             {
                                 id actualValue = values.status;
-                                VerifyOrReturn(CheckValue("status", actualValue, 0U));
+                                VerifyOrReturn(CheckValue("Status", actualValue, 0U));
                             }
 
                             NextTest();
@@ -41575,7 +41575,7 @@ class Test_TC_KEYPADINPUT_3_3 : public TestCommandBridge {
 
                             {
                                 id actualValue = values.status;
-                                VerifyOrReturn(CheckValue("status", actualValue, 0U));
+                                VerifyOrReturn(CheckValue("Status", actualValue, 0U));
                             }
 
                             NextTest();
@@ -41602,7 +41602,7 @@ class Test_TC_KEYPADINPUT_3_3 : public TestCommandBridge {
 
                             {
                                 id actualValue = values.status;
-                                VerifyOrReturn(CheckValue("status", actualValue, 0U));
+                                VerifyOrReturn(CheckValue("Status", actualValue, 0U));
                             }
 
                             NextTest();
@@ -41629,7 +41629,7 @@ class Test_TC_KEYPADINPUT_3_3 : public TestCommandBridge {
 
                             {
                                 id actualValue = values.status;
-                                VerifyOrReturn(CheckValue("status", actualValue, 0U));
+                                VerifyOrReturn(CheckValue("Status", actualValue, 0U));
                             }
 
                             NextTest();
@@ -41656,7 +41656,7 @@ class Test_TC_KEYPADINPUT_3_3 : public TestCommandBridge {
 
                             {
                                 id actualValue = values.status;
-                                VerifyOrReturn(CheckValue("status", actualValue, 0U));
+                                VerifyOrReturn(CheckValue("Status", actualValue, 0U));
                             }
 
                             NextTest();
@@ -41683,7 +41683,7 @@ class Test_TC_KEYPADINPUT_3_3 : public TestCommandBridge {
 
                             {
                                 id actualValue = values.status;
-                                VerifyOrReturn(CheckValue("status", actualValue, 0U));
+                                VerifyOrReturn(CheckValue("Status", actualValue, 0U));
                             }
 
                             NextTest();
@@ -41710,7 +41710,7 @@ class Test_TC_KEYPADINPUT_3_3 : public TestCommandBridge {
 
                             {
                                 id actualValue = values.status;
-                                VerifyOrReturn(CheckValue("status", actualValue, 0U));
+                                VerifyOrReturn(CheckValue("Status", actualValue, 0U));
                             }
 
                             NextTest();
@@ -41737,7 +41737,7 @@ class Test_TC_KEYPADINPUT_3_3 : public TestCommandBridge {
 
                             {
                                 id actualValue = values.status;
-                                VerifyOrReturn(CheckValue("status", actualValue, 0U));
+                                VerifyOrReturn(CheckValue("Status", actualValue, 0U));
                             }
 
                             NextTest();
@@ -73837,7 +73837,7 @@ class TV_KeypadInputCluster : public TestCommandBridge {
 
                             {
                                 id actualValue = values.status;
-                                VerifyOrReturn(CheckValue("status", actualValue, 0U));
+                                VerifyOrReturn(CheckValue("Status", actualValue, 0U));
                             }
 
                             NextTest();