MC-5810: Improve naming of the critical variables/parameters in the code and configuration

- Reverted MC-10833 test failure changes

Author: Hwashiang Yu

app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup.xml

@@ -409,11 +409,6 @@
         <seeInCurrentUrl url="{{AdminContentManagementPage.url}}#cms_pagebuilder" stepKey="validateURL"/>
         <seeElement selector="{{ContentManagementSection.GoogleMapsAPIKeyInputField}}" stepKey="seeGoogleMapsAPIKeyInputField"/>
     </actionGroup>
-    <actionGroup name="validateWarningMessageLinkNewTabTarget" extends="validateWarningMessageLink">
-        <switchToNextTab stepKey="switchToNewConfigurationTab" after="clickLink"/>
-        <closeTab stepKey="closeTab" after="seeGoogleMapsAPIKeyInputField"/>
-        <switchToPreviousTab stepKey="switchToPreviousTab" after="closeTab"/>
-    </actionGroup>
     <actionGroup name="validateAdvancedStyleWithAllUpdatedMapWithErrorOverlay" extends="validateAdvancedStyleWithAllUpdatedNotVisible">
         <waitForElementVisible selector="{{page.warningMessageLink(index)}}" stepKey="dontSeeElement"/>
     </actionGroup>

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilder.xml

@@ -97,7 +97,7 @@
         <actionGroup ref="dragContentTypeToDropZone" stepKey="dragRowToStage">
             <argument name="contentType" value="PageBuilderRowContentType"/>
             <argument name="contentTypeIndex" value="2"/>
-            <argument name="containerTargetType" value="PageBuilderRootContainerContentType"/>
+            <argument name="containerTargetType" value="PageBuilderStage"/>
             <argument name="dropZoneIndex" value="2"/>
         </actionGroup>
         <!-- Edit 2nd Row -->

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapGoogleMapsSettingsTests.xml

@@ -129,7 +129,7 @@
         <actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage1"/>
         <!-- Stage: Validate Warning Message Link -->
         <comment userInput="Stage: Validate Warning Message Link" stepKey="commentValidateWarningMessageLinkStage"/>
-        <actionGroup ref="validateWarningMessageLinkNewTabTarget" stepKey="validateWarningMessageLink1">
+        <actionGroup ref="validateWarningMessageLink" stepKey="validateWarningMessageLink1">
             <argument name="section" value="MapOnStage"/>
         </actionGroup>
         <!-- Edit Form: Validate Warning Message Link -->
@@ -149,7 +149,7 @@
             <argument name="contentType" value="PageBuilderMapContentType"/>
         </actionGroup>
         <actionGroup ref="clickAddLocationButton" stepKey="clickAddLocationButton"/>
-        <actionGroup ref="validateWarningMessageLinkNewTabTarget" stepKey="validateWarningMessageLink3">
+        <actionGroup ref="validateWarningMessageLink" stepKey="validateWarningMessageLink3">
             <argument name="section" value="AddLocationForm"/>
         </actionGroup>
     </test>

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowTest.xml

@@ -62,7 +62,7 @@
         <actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
         <actionGroup ref="dragContentTypeToDropZone" stepKey="dragRowIntoStage">
             <argument name="contentType" value="PageBuilderRowContentType"/>
-            <argument name="containerTargetType" value="PageBuilderRootContainerContentType"/>
+            <argument name="containerTargetType" value="PageBuilderStage"/>
             <argument name="containerTargetIndex" value="1"/>
             <argument name="contentTypeIndex" value="2"/>
             <argument name="dropZoneIndex" value="2"/>