diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index d29e18d8cae9c5..262e90cb6b549e 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -189,7 +189,7 @@ jobs:
                   ./scripts/run_in_build_env.sh \
                   "./scripts/tests/run_test_suite.py \
                      --chip-tool ./out/darwin-x64-chip-tool${CHIP_TOOL_VARIANT}-${BUILD_VARIANT}/chip-tool \
-                     --target-skip-glob '{TestGroupMessaging,TestArmFailSafe}' \
+                     --target-skip-glob '{TestGroupMessaging}' \
                      run \
                      --iterations 1 \
                      --all-clusters-app ./out/darwin-x64-all-clusters-${BUILD_VARIANT}/chip-all-clusters-app \
diff --git a/src/app/tests/suites/TestArmFailSafe.yaml b/src/app/tests/suites/TestArmFailSafe.yaml
index d10a91f946ea19..c58446d9b6f389 100644
--- a/src/app/tests/suites/TestArmFailSafe.yaml
+++ b/src/app/tests/suites/TestArmFailSafe.yaml
@@ -65,14 +65,14 @@ tests:
     - label: "Commission from beta device"
       identity: "beta"
       cluster: "CommissionerCommands"
-      command: "PairDevice"
+      command: "PairWithTimeout"
       arguments:
           values:
               - name: "nodeId"
                 value: nodeId2
               - name: "payload"
                 value: payload
-              - name: "timeout"
+              - name: "failsafeTimeout"
                 value: 0
       response:
           error: UNSUPPORTED_ACCESS
diff --git a/src/app/tests/suites/commands/commissioner/CommissionerCommands.cpp b/src/app/tests/suites/commands/commissioner/CommissionerCommands.cpp
index 01456a91749c90..4941e0e930446e 100644
--- a/src/app/tests/suites/commands/commissioner/CommissionerCommands.cpp
+++ b/src/app/tests/suites/commands/commissioner/CommissionerCommands.cpp
@@ -20,7 +20,7 @@
 
 constexpr uint16_t kPayloadMaxSize = 64;
 
-CHIP_ERROR CommissionerCommands::PairDevice(chip::NodeId nodeId, const chip::CharSpan payload, uint16_t timeout)
+CHIP_ERROR CommissionerCommands::PairWithTimeout(chip::NodeId nodeId, const chip::CharSpan payload, uint16_t failsafeTimeout)
 {
     VerifyOrReturnError(payload.size() > 0 && payload.size() < kPayloadMaxSize, CHIP_ERROR_INVALID_ARGUMENT);
 
@@ -30,7 +30,7 @@ CHIP_ERROR CommissionerCommands::PairDevice(chip::NodeId nodeId, const chip::Cha
     memcpy(qrCode, payload.data(), payload.size());
 
     chip::Controller::CommissioningParameters commissioningParams;
-    commissioningParams.SetFailsafeTimerSeconds(timeout);
+    commissioningParams.SetFailsafeTimerSeconds(failsafeTimeout);
 
     return GetCurrentCommissioner().PairDevice(nodeId, qrCode, commissioningParams);
 }
diff --git a/src/app/tests/suites/commands/commissioner/CommissionerCommands.h b/src/app/tests/suites/commands/commissioner/CommissionerCommands.h
index ee9a9c50fe3a00..da30e203197025 100644
--- a/src/app/tests/suites/commands/commissioner/CommissionerCommands.h
+++ b/src/app/tests/suites/commands/commissioner/CommissionerCommands.h
@@ -31,7 +31,7 @@ class CommissionerCommands : public chip::Controller::DevicePairingDelegate
     virtual CHIP_ERROR ContinueOnChipMainThread(CHIP_ERROR err)                              = 0;
     virtual chip::Controller::DeviceCommissioner & GetCurrentCommissioner()                  = 0;
 
-    CHIP_ERROR PairDevice(chip::NodeId nodeId, const chip::CharSpan payload, uint16_t timeout);
+    CHIP_ERROR PairWithTimeout(chip::NodeId nodeId, const chip::CharSpan payload, uint16_t failsafeTimeout);
     CHIP_ERROR PairWithQRCode(chip::NodeId nodeId, const chip::CharSpan payload);
     CHIP_ERROR PairWithManualCode(chip::NodeId nodeId, const chip::CharSpan payload);
     CHIP_ERROR Unpair(chip::NodeId nodeId);
diff --git a/src/app/zap-templates/common/simulated-clusters/clusters/CommissionerCommands.js b/src/app/zap-templates/common/simulated-clusters/clusters/CommissionerCommands.js
index 86b9c1b24c99b0..5832b49a61a02a 100644
--- a/src/app/zap-templates/common/simulated-clusters/clusters/CommissionerCommands.js
+++ b/src/app/zap-templates/common/simulated-clusters/clusters/CommissionerCommands.js
@@ -24,10 +24,11 @@
  *
  */
 
-const PairDevice = {
-  name : 'PairDevice',
-  arguments :
-      [ { type : 'NODE_ID', name : 'nodeId' }, { type : 'CHAR_STRING', name : 'payload' }, { type : 'INT16U', name : 'timeout' } ],
+const PairWithTimeout = {
+  name : 'PairWithTimeout',
+  arguments : [
+    { type : 'NODE_ID', name : 'nodeId' }, { type : 'CHAR_STRING', name : 'payload' }, { type : 'INT16U', name : 'failsafeTimeout' }
+  ],
   response : { arguments : [] }
 };
 
@@ -50,7 +51,7 @@ const Unpair = {
 };
 
 const name     = 'CommissionerCommands';
-const commands = [ PairDevice, PairWithQRCode, PairWithManualCode, Unpair ];
+const commands = [ PairWithTimeout, PairWithQRCode, PairWithManualCode, Unpair ];
 
 const CommissionerCommands = {
   name,
diff --git a/zzz_generated/chip-tool/zap-generated/test/Commands.h b/zzz_generated/chip-tool/zap-generated/test/Commands.h
index be8bc93e5ef2e2..bd600a81470fa9 100644
--- a/zzz_generated/chip-tool/zap-generated/test/Commands.h
+++ b/zzz_generated/chip-tool/zap-generated/test/Commands.h
@@ -100189,8 +100189,9 @@ class TestArmFailSafeSuite : public TestCommand
     CHIP_ERROR TestCommissionFromBetaDevice_4()
     {
         SetIdentity(kIdentityBeta);
-        return PairDevice(mNodeId2.HasValue() ? mNodeId2.Value() : 51966ULL,
-                          mPayload.HasValue() ? mPayload.Value() : chip::CharSpan::fromCharString("MT:-24J0AFN00KA0648G00"), 0);
+        return PairWithTimeout(mNodeId2.HasValue() ? mNodeId2.Value() : 51966ULL,
+                               mPayload.HasValue() ? mPayload.Value() : chip::CharSpan::fromCharString("MT:-24J0AFN00KA0648G00"),
+                               0);
     }
 };