diff --git a/dev/tests/unit/Magento/FunctionalTestFramework/Test/Util/ActionMergeUtilTest.php b/dev/tests/unit/Magento/FunctionalTestFramework/Test/Util/ActionMergeUtilTest.php
index 7917d663b..6aa6dc0ad 100644
--- a/dev/tests/unit/Magento/FunctionalTestFramework/Test/Util/ActionMergeUtilTest.php
+++ b/dev/tests/unit/Magento/FunctionalTestFramework/Test/Util/ActionMergeUtilTest.php
@@ -221,7 +221,7 @@ public function testValidMagentoCLISecretFunction()
         $actionObjectOne = new ActionObject(
             'actionKey1',
             'magentoCLI',
-            ['command' => 'config:set cms/wysiwyg/enabled {{_CREDS.payment_authorizenet_login}}']
+            ['command' => 'config:set cms/wysiwyg/enabled {{_CREDS.payment_method_login}}']
         );
         $actionObject = [$actionObjectOne];
 
@@ -232,7 +232,7 @@ public function testValidMagentoCLISecretFunction()
         $expectedValue = new ActionObject(
             'actionKey1',
             'magentoCLISecret',
-            ['command' => 'config:set cms/wysiwyg/enabled {{_CREDS.payment_authorizenet_login}}']
+            ['command' => 'config:set cms/wysiwyg/enabled {{_CREDS.payment_method_login}}']
         );
         $this->assertEquals($expectedValue, $result['actionKey1']);
     }
@@ -248,7 +248,7 @@ public function testValidCreateDataSecretFunction()
         $actionObjectOne = new ActionObject(
             'actionKey1',
             'field',
-            ['value' => '{{_CREDS.payment_authorizenet_login}}']
+            ['value' => '{{_CREDS.payment_method_login}}']
         );
         $actionObject = [$actionObjectOne];
 
@@ -259,7 +259,7 @@ public function testValidCreateDataSecretFunction()
         $expectedValue = new ActionObject(
             'actionKey1',
             'field',
-            ['value' => '{{_CREDS.payment_authorizenet_login}}']
+            ['value' => '{{_CREDS.payment_method_login}}']
         );
         $this->assertEquals($expectedValue, $result['actionKey1']);
     }
diff --git a/dev/tests/verification/TestModule/Test/SecretCredentialDataTest.xml b/dev/tests/verification/TestModule/Test/SecretCredentialDataTest.xml
index 4044a86e3..a7fd39bc9 100644
--- a/dev/tests/verification/TestModule/Test/SecretCredentialDataTest.xml
+++ b/dev/tests/verification/TestModule/Test/SecretCredentialDataTest.xml
@@ -14,7 +14,7 @@
             <field key="price">12.34</field>
         </createData>
         <createData entity="_defaultProduct" stepKey="createProductWithFieldOverridesUsingSecretCredData1">
-            <field key="qty">{{_CREDS.payment_authorizenet_trans_key}}</field>
+            <field key="qty">{{_CREDS.payment_method_trans_key}}</field>
             <field key="price">{{_CREDS.carriers_dhl_account_eu}}</field>
         </createData>
 
@@ -22,6 +22,6 @@
         <fillField selector="{{AdminLoginFormSection.username}}" userInput="{{_CREDS.carriers_dhl_id_eu}}" stepKey="fillFieldUsingSecretCredData1"/>
 
         <magentoCLI command="config:set cms/wysiwyg/enabled 0" stepKey="magentoCliUsingHardcodedData1"/>
-        <magentoCLI command="config:set cms/wysiwyg/enabled {{_CREDS.payment_authorizenet_login}}" stepKey="magentoCliUsingSecretCredData1"/>
+        <magentoCLI command="config:set cms/wysiwyg/enabled {{_CREDS.payment_method_login}}" stepKey="magentoCliUsingSecretCredData1"/>
     </test>
 </tests>
diff --git a/dev/tests/verification/Tests/SecretCredentialDataTest.php b/dev/tests/verification/Tests/SecretCredentialDataTest.php
index d1ef43745..927a12a42 100644
--- a/dev/tests/verification/Tests/SecretCredentialDataTest.php
+++ b/dev/tests/verification/Tests/SecretCredentialDataTest.php
@@ -46,7 +46,7 @@ public function secretCredentialDataTest(AcceptanceTester $I)
         );
 
         $createProductWithFieldOverridesUsingSecretCredData1Fields['qty'] =
-            $I->getSecret("payment_authorizenet_trans_key");
+            $I->getSecret("payment_method_trans_key");
 
         $createProductWithFieldOverridesUsingSecretCredData1Fields['price'] =
             $I->getSecret("carriers_dhl_account_eu");
@@ -68,7 +68,7 @@ public function secretCredentialDataTest(AcceptanceTester $I)
         $I->comment($magentoCliUsingHardcodedData1);
 
         $magentoCliUsingSecretCredData1 = $I->magentoCLI("config:set cms/wysiwyg/enabled " .
-            $I->getSecret("payment_authorizenet_login"));
+            $I->getSecret("payment_method_login"));
             // stepKey: magentoCliUsingSecretCredData1
         $I->comment($magentoCliUsingSecretCredData1);
     }
diff --git a/etc/config/.credentials.example b/etc/config/.credentials.example
index 429e9d19f..c15c6072f 100644
--- a/etc/config/.credentials.example
+++ b/etc/config/.credentials.example
@@ -19,15 +19,6 @@
 #magento/carriers_dhl_password_eu=
 #magento/carriers_dhl_account_eu=
 
-
-#magento/payment_authorizenet_login=
-#magento/payment_authorizenet_trans_key=
-#magento/payment_authorizenet_trans_md5=
-
-#magento/authorizenet_fraud_review_login=
-#magento/authorizenet_fraud_review_trans_key=
-#magento/authorizenet_fraud_review_md5=
-
 #magento/braintree_enabled_fraud_merchant_account_id=
 #magento/braintree_enabled_fraud_merchant_id=
 #magento/braintree_enabled_fraud_public_key=
@@ -72,4 +63,4 @@
 #magento/payment_paypal_alternative_payment_methods_express_checkout_us_express_checkout_required_express_checkout_required_express_checkout_api_password=
 #magento/payment_paypal_alternative_payment_methods_express_checkout_us_express_checkout_required_express_checkout_required_express_checkout_api_signature=
 
-#magento/fraud_protection_signifyd_api_key=
\ No newline at end of file
+#magento/fraud_protection_signifyd_api_key=