From 45ff81d3cbbe2d9eab7a769bea017ce1b5d34320 Mon Sep 17 00:00:00 2001
From: John Stennett <john00ivy@gmail.com>
Date: Wed, 27 Sep 2017 13:49:35 -0500
Subject: [PATCH 1/3] MQE-350: Demos for Core and SE Teams

- Updating the README, replacing "Acceptance" with "Functional", adding "./vendor/bin/" to all commands so they will run if you don't have it in your $PATH.
- Updating Robo commands to include "./vendor/bin/" so they will run.
---
 dev/tests/acceptance/README.md    | 142 +++++++++++++++++-------------
 dev/tests/acceptance/RoboFile.php |  24 ++---
 2 files changed, 88 insertions(+), 78 deletions(-)

diff --git a/dev/tests/acceptance/README.md b/dev/tests/acceptance/README.md
index df6c804815b0..d55625a64420 100755
--- a/dev/tests/acceptance/README.md
+++ b/dev/tests/acceptance/README.md
@@ -8,21 +8,39 @@
 ----
 
 # Prerequisites
+* **IMPORTANT**: Configure your Magento Store for [Automated Testing](http://devdocs.magento.com/guides/v2.0/mtf/mtf_quickstart/mtf_quickstart_magento.html)
 * [PHP v7.x](http://php.net/manual/en/install.php)
 * [Composer v1.4.x](https://getcomposer.org/download/)
 * [Java](https://www.java.com/en/download/)
-* [Selenium Server](http://www.seleniumhq.org/download/)
+* [Selenium Server](http://www.seleniumhq.org/download/) - [v2.53.x](http://selenium-release.storage.googleapis.com/index.html?path=2.53/)
 * [ChromeDriver](https://sites.google.com/a/chromium.org/chromedriver/downloads)
 * [Allure CLI](https://docs.qameta.io/allure/latest/#_installing_a_commandline)
 * [GitHub](https://desktop.github.com/)
-* GitHub Repos:
-  * [CE Tests](https://github.com/magento-pangolin/magento2ce-acceptance-tests)
-  * [EE Tests](https://github.com/magento-pangolin/magento2ee-acceptance-tests)
-* Configure Magento for [Automated Testing](http://devdocs.magento.com/guides/v2.0/mtf/mtf_quickstart/mtf_quickstart_magento.html)
 
 ### Recommendations
 * We recommend using [PHPStorm 2017](https://www.jetbrains.com/phpstorm/) for your IDE. They recently added support for [Codeception Test execution](https://blog.jetbrains.com/phpstorm/2017/03/codeception-support-comes-to-phpstorm-2017-1/) which is helpful when debugging.
-* We also recommend updating your [$PATH to include](https://stackoverflow.com/questions/7703041/editing-path-variable-on-mac) `vendor/bin` so you can easily execute the necessary `robo` and `codecept` commands instead of `vendor/bin/robo` or `vendor/bin/codecept`.  
+* We also recommend updating your [$PATH to include](https://stackoverflow.com/questions/7703041/editing-path-variable-on-mac) `./vendor/bin` so you can easily execute the necessary `robo` and `codecept` commands instead of `./vendor/bin/robo` or `./vendor/bin/codecept`.  
+
+----
+
+# TEMPORARY INSTALLATION INSTRUCTIONS
+Due to the current setup of the Framework you will need to do the following:
+
+  * `mkdir [DIRECTORY_NAME]`
+  * `cd [DIRECTORY_NAME]`
+  * Pull down - [EE](https://github.com/magento-pangolin/magento2ee)
+  * Pull down - [CE](https://github.com/magento-pangolin/magento2ce)
+  * `cd magento2ee`
+  * `php -f dev/tools/build-ee.php -- --command=link --exclude=true`
+  * Generate a `github-oauth` token: [Instructions](https://help.github.com/articles/creating-a-personal-access-token-for-the-command-line/#creating-a-token)
+  * `touch magento2ce/dev/tests/acceptance/auth.json`
+  * `nano magento2ce/dev/tests/acceptance/auth.json`
+  * Replace `<personal access token>` with the token you generated in GitHub.
+  * Save your work.
+  * `cd ../magento2ce`
+  * `cd dev/tests/acceptance`
+  * `composer install`
+    * **PLEASE IGNORE THE "Installation" SECTION THAT FOLLOWS, START WITH THE "Building The Framework" SECTION INSTEAD.**
 
 ----
 
@@ -31,7 +49,7 @@ You can **either** install through composer **or** clone from git repository.
 ## Git
 ```
 git clone GITHUB_REPO_URL
-cd magento2ce-acceptance-tests
+cd magento2ce
 composer install
 ```
 
@@ -50,85 +68,85 @@ Robo is a task runner for PHP that allows you to alias long complex CLI commands
 ### Example
 
 * Original: `allure generate tests/_output/allure-results/ -o tests/_output/allure-report/`
-* Robo: `robo allure1:generate`
+* Robo: `./vendor/bin/robo allure1:generate`
 
 ## Available Robo Commands
-You can see a list of all available Robo commands by calling `robo` directly in the Terminal.
+You can see a list of all available Robo commands by calling `./vendor/bin/robo` in the Terminal.
 
 ##### Codeception Robo Commands
-* `robo`
+* `./vendor/bin/robo`
   * Lists all available Robo commands.
-* `robo clone:files`
+* `./vendor/bin/robo clone:files`
   * Duplicate the Example configuration files used to customize the Project
-* `robo build:project`
+* `./vendor/bin/robo build:project`
   * Build the Codeception project
-* `robo generate:pages`
+* `./vendor/bin/robo generate:pages`
   * Generate all Page Objects
-* `robo generate:tests`
+* `./vendor/bin/robo generate:tests`
   * Generate all Tests in PHP
-* `robo example`
+* `./vendor/bin/robo example`
   * Run all Tests marked with the @group tag 'example', using the Chrome environment
-* `robo chrome`
-  * Run all Acceptance tests using the Chrome environment
-* `robo firefox`
-  * Run all Acceptance tests using the FireFox environment
-* `robo phantomjs`
-  * Run all Acceptance tests using the PhantomJS environment
-* `robo folder ______`
-  * Run all Acceptance tests located under the Directory Path provided using the Chrome environment
-* `robo group ______`
+* `./vendor/bin/robo chrome`
+  * Run all Functional tests using the Chrome environment
+* `./vendor/bin/robo firefox`
+  * Run all Functional tests using the FireFox environment
+* `./vendor/bin/robo phantomjs`
+  * Run all Functional tests using the PhantomJS environment
+* `./vendor/bin/robo folder ______`
+  * Run all Functional tests located under the Directory Path provided using the Chrome environment
+* `./vendor/bin/robo group ______`
   * Run all Tests with the specified @group tag, excluding @group 'skip', using the Chrome environment
   
 ##### Allure Robo Commands
 To determine which version of the Allure command you need to use please run `allure --version`.
 
-* `robo allure1:generate`
+* `./vendor/bin/robo allure1:generate`
   * Allure v1.x.x - Generate the HTML for the Allure report based on the Test XML output
-* `robo allure1:open`
+* `./vendor/bin/robo allure1:open`
   * Allure v1.x.x - Open the HTML Allure report
-* `robo allure1:report`
+* `./vendor/bin/robo allure1:report`
   * Allure v1.x.x - Generate and open the HTML Allure report
-* `robo allure2:generate`
+* `./vendor/bin/robo allure2:generate`
   * Allure v2.x.x - Generate the HTML for the Allure report based on the Test XML output
-* `robo allure2:open`
+* `./vendor/bin/robo allure2:open`
   * Allure v2.x.x - Open the HTML Allure report
-* `robo allure2:report`
+* `./vendor/bin/robo allure2:report`
   * Allure v2.x.x - Generate and open the HTML Allure report
 
 ----
 
 # Building The Framework
-After installing the dependencies you will want to build the Codeception project in the [Acceptance Test Framework](https://github.com/magento-pangolin/magento2-acceptance-test-framework), which is a dependency of the CE or EE Tests repo. Run `robo build:project` to complete this task.
+After installing the dependencies you will want to build the Codeception project in the [Magento 2 Functional Testing Framework](https://github.com/magento-pangolin/magento2-functional-testing-framework), which is a dependency of the CE or EE Tests repo. Run `./vendor/bin/robo build:project` to complete this task.
 
-`robo build:project`
+`./vendor/bin/robo build:project`
 
 ----
 
 # Configure the Framework
-Before you can generate or run the Tests you will need to clone the Example Configuration files and edit them for your specific Store settings. You can edit these files with out the fear of accidentally committing your credentials or other sensitive information as these files are listed in the *.gitignore* file.
-Run the following command to generate these files:
+Before you can generate or run the Tests you will need to edit the Configuration files and configure them for your specific Store settings. You can edit these files with out the fear of accidentally committing your credentials or other sensitive information as these files are listed in the *.gitignore* file.
 
-`robo setup`
+In the `.env` file you will find key pieces of information that are unique to your local Magento setup that will need to be edited before you can generate tests:
+* **MAGENTO_BASE_URL**
+* **MAGENTO_BACKEND_NAME**
+* **MAGENTO_ADMIN_USERNAME**
+* **MAGENTO_ADMIN_PASSWORD**
 
-In these files you will find key pieces of information that are unique to your local Magento setup that will need to be edited (ex **MAGENTO_BASE_URL**, **MAGENTO_BACKEND_NAME**, **MAGENTO_ADMIN_USERNAME**, **MAGENTO_ADMIN_PASSWORD**, etc...).
-* **tests/acceptance.suite.yml**
+##### Additional Codeception settings can be found in the following files: 
+* **tests/functional.suite.yml**
 * **codeception.dist.yml**
-* **.env**
 
 ----
 
 # Generate PHP files for Tests
-All Tests in the Framework are written in XML and need to have the PHP generated for Codeception to run. Run the following command to generate the PHP files into the following directory: `tests/acceptance/Magento/AcceptanceTest/_generated`
+All Tests in the Framework are written in XML and need to have the PHP generated for Codeception to run. Run the following command to generate the PHP files in the following directory (If this directory does not exist it will be created): `dev/tests/acceptance/tests/functional/Magento/FunctionalTest/_generated`
 
-If this directory doesn't exist it will be created.
-
-`robo generate:tests`
+`./vendor/bin/robo generate:tests`
 
 ----
 
 # Running Tests
 ## Start the Selenium Server
-PLEASE NOTE: You will need to have an instance of the Selenium Server running on your machine before you can execute the Tests.
+**PLEASE NOTE**: You will need to have an instance of the Selenium Server running on your machine before you can execute the Tests.
 
 ```
 cd [LOCATION_OF_SELENIUM_JAR]
@@ -136,7 +154,7 @@ java -jar selenium-server-standalone-X.X.X.jar
 ```
 
 ## Run Tests Manually
-You can run the Codeception tests directly without using Robo if you'd like. To do so please run `codecept run acceptance` to execute all Acceptance tests that DO NOT include @env tags. IF a Test includes an [@env tag](http://codeception.com/docs/07-AdvancedUsage#Environments) you MUST include the `--env ENV_NAME` flag.
+You can run the Codeception tests directly without using Robo if you'd like. To do so please run `./vendor/bin/codecept run functional` to execute all Functional tests that DO NOT include @env tags. IF a Test includes an [@env tag](http://codeception.com/docs/07-AdvancedUsage#Environments) you MUST include the `--env ENV_NAME` flag.
 
 #### Common Codeception Flags:
 
@@ -150,17 +168,17 @@ You can run the Codeception tests directly without using Robo if you'd like. To
 
 #### Examples
 
-* Run ALL Acceptance Tests without an @env tag: `codecept run acceptance`
-* Run ALL Acceptance Tests without the "skip" @group: `codecept run acceptance --skip-group skip`
-* Run ALL Acceptance Tests with the @group tag "example" without the "skip" @group tests: `codecept run acceptance --group example --skip-group skip`
+* Run ALL Functional Tests without an @env tag: `./vendor/bin/codecept run functional`
+* Run ALL Functional Tests without the "skip" @group: `./vendor/bin/codecept run functional --skip-group skip`
+* Run ALL Functional Tests with the @group tag "example" without the "skip" @group tests: `./vendor/bin/codecept run functional --group example --skip-group skip`
 
 ## Run Tests using Robo
-* Run all Acceptance Tests using the @env tag "chrome": `robo chrome`
-* Run all Acceptance Tests using the @env tag "firefox": `robo firefox`
-* Run all Acceptance Tests using the @env tag "phantomjs": `robo phantomjs`
-* Run all Acceptance Tests using the @group tag "example": `robo example`
-* Run all Acceptance Tests using the provided @group tag: `robo group GROUP_NAME`
-* Run all Acceptance Tests listed under the provided Folder Path: `robo folder tests/acceptance/Magento/AcceptanceTest/MODULE_NAME`
+* Run all Functional Tests using the @env tag "chrome": `./vendor/bin/robo chrome`
+* Run all Functional Tests using the @env tag "firefox": `./vendor/bin/robo firefox`
+* Run all Functional Tests using the @env tag "phantomjs": `./vendor/bin/robo phantomjs`
+* Run all Functional Tests using the @group tag "example": `./vendor/bin/robo example`
+* Run all Functional Tests using the provided @group tag: `./vendor/bin/robo group GROUP_NAME`
+* Run all Functional Tests listed under the provided Folder Path: `./vendor/bin/robo folder dev/tests/acceptance/tests/functional/Magento/FunctionalTest/MODULE_NAME`
 
 ----
 
@@ -180,14 +198,14 @@ You can run the following commands in the Terminal to generate and open an Allur
 You can run the following Robo commands in the Terminal to generate and open an Allure report (Run the following terminal command for the Allure version: `allure --version`):
 
 ##### Allure v1.x.x
-* Build the Report: `robo allure1:generate`
-* Open the Report: `robo allure1:open`
-* Build/Open the Report: `robo allure1:report`
+* Build the Report: `./vendor/bin/robo allure1:generate`
+* Open the Report: `./vendor/bin/robo allure1:open`
+* Build/Open the Report: `./vendor/bin/robo allure1:report`
 
 ##### Allure v2.x.x
-* Build the Report: `robo allure2:generate`
-* Open the Report: `robo allure2:open`
-* Build/Open the Report: `robo allure2:report`
+* Build the Report: `./vendor/bin/robo allure2:generate`
+* Open the Report: `./vendor/bin/robo allure2:open`
+* Build/Open the Report: `./vendor/bin/robo allure2:report`
 
 ----
 
@@ -199,9 +217,9 @@ Due to the interdependent nature of the 2 repos it is recommended to Symlink the
 # Troubleshooting
 * TimeZone Error - http://stackoverflow.com/questions/18768276/codeception-datetime-error
 * TimeZone List - http://php.net/manual/en/timezones.america.php
-* System PATH - Make sure you have `vendor/bin/` and `vendor/` listed in your system path so you can run the  `codecept` and `robo` commands directly:
+* System PATH - Make sure you have `./vendor/bin/`, `vendor/bin/` and `vendor/` listed in your system path so you can run the  `codecept` and `robo` commands directly:
 
-    `sudo nano /etc/private/paths`
+    `sudo nano /etc/paths`
     
 * StackOverflow Help: https://stackoverflow.com/questions/7703041/editing-path-variable-on-mac
 * Allure `@env error` - Allure recently changed their Codeception Adapter that breaks Codeception when tests include the `@env` tag. A workaround for this error is to revert the changes they made to a function. 
@@ -225,4 +243,4 @@ public function _initialize(array $ignoredAnnotations = [])
             Model\Provider::setOutputDirectory($outputDirectory);
         }
     }
-```
\ No newline at end of file
+```
diff --git a/dev/tests/acceptance/RoboFile.php b/dev/tests/acceptance/RoboFile.php
index e41816cccbf1..4f6346de148e 100644
--- a/dev/tests/acceptance/RoboFile.php
+++ b/dev/tests/acceptance/RoboFile.php
@@ -13,15 +13,6 @@ class RoboFile extends \Robo\Tasks
 {
     use Robo\Task\Base\loadShortcuts;
 
-    /**
-     * Complete all Project Setup tasks
-     */
-    function setup()
-    {
-        $this->_exec('vendor/bin/robo clone:files');
-        $this->_exec('vendor/bin/codecept build');
-    }
-
     /**
      * Duplicate the Example configuration files used to customize the Project for customization
      */
@@ -33,12 +24,13 @@ function cloneFiles()
     }
 
     /**
+     * Clone the Example configuration files
      * Build the Codeception project
      */
     function buildProject()
     {
         $this->cloneFiles();
-        $this->_exec('vendor/bin/codecept build');
+        $this->_exec('./vendor/bin/codecept build');
     }
 
     /**
@@ -56,7 +48,7 @@ function generateTests()
      */
     function chrome()
     {
-        $this->_exec('codecept run functional --env chrome --skip-group skip');
+        $this->_exec('./vendor/bin/codecept run functional --env chrome --skip-group skip');
     }
 
     /**
@@ -64,7 +56,7 @@ function chrome()
      */
     function firefox()
     {
-        $this->_exec('codecept run functional --env firefox --skip-group skip');
+        $this->_exec('./vendor/bin/codecept run functional --env firefox --skip-group skip');
     }
 
     /**
@@ -72,7 +64,7 @@ function firefox()
      */
     function phantomjs()
     {
-        $this->_exec('codecept run functional --env phantomjs --skip-group skip');
+        $this->_exec('./vendor/bin/codecept run functional --env phantomjs --skip-group skip');
     }
 
     /**
@@ -80,7 +72,7 @@ function phantomjs()
      */
     function group($args = '')
     {
-        $this->taskExec('codecept run functional --verbose --steps --env chrome --skip-group skip --group')->args($args)->run();
+        $this->taskExec('./vendor/bin/codecept run functional --verbose --steps --env chrome --skip-group skip --group')->args($args)->run();
     }
 
     /**
@@ -88,7 +80,7 @@ function group($args = '')
      */
     function folder($args = '')
     {
-        $this->taskExec('codecept run functional --env chrome')->args($args)->run();
+        $this->taskExec('./vendor/bin/codecept run functional --env chrome')->args($args)->run();
     }
 
     /**
@@ -96,7 +88,7 @@ function folder($args = '')
      */
     function example()
     {
-        $this->_exec('codecept run --env chrome --group example --skip-group skip');
+        $this->_exec('./vendor/bin/codecept run --env chrome --group example --skip-group skip');
     }
 
     /**

From 4ba6fe0faa07e6e9c9024a5b78741ca922dbcae5 Mon Sep 17 00:00:00 2001
From: Kevin Kozan <kkozan@magento.com>
Date: Wed, 27 Sep 2017 13:14:51 -0500
Subject: [PATCH 2/3] MQE-292: Use "selector" name consistently instead of
 "locator"

Renamed all occurences of locator to selector.
---
 .../Backend/Section/AdminLoginFormSection.xml |  6 +-
 .../Backend/Section/AdminMessagesSection.xml  |  4 +-
 .../AdminCategoryBasicFieldSection.xml        |  6 +-
 .../AdminCategoryMainActionsSection.xml       |  2 +-
 .../Section/AdminCategoryMessagesSection.xml  |  2 +-
 .../Section/AdminCategorySEOSection.xml       | 10 +--
 .../AdminCategorySidebarActionSection.xml     |  4 +-
 .../AdminCategorySidebarTreeSection.xml       |  4 +-
 .../Section/AdminProductFormActionSection.xml |  2 +-
 .../Section/AdminProductFormSection.xml       | 66 +++++++++----------
 .../Section/AdminProductGridActionSection.xml |  6 +-
 .../Section/AdminProductGridSection.xml       |  4 +-
 .../Section/AdminProductMessagesSection.xml   |  2 +-
 .../Section/AdminProductSEOSection.xml        |  4 +-
 .../Section/StorefrontCategoryMainSection.xml | 10 +--
 .../Section/StorefrontMessagesSection.xml     |  2 +-
 .../Section/StorefrontMiniCartSection.xml     |  6 +-
 .../StorefrontProductInfoDetailsSection.xml   |  2 +-
 .../StorefrontProductInfoMainSection.xml      | 12 ++--
 .../Section/CheckoutOrderSummarySection.xml   |  8 +--
 .../Section/CheckoutPaymentSection.xml        |  6 +-
 .../CheckoutShippingGuestInfoSection.xml      | 16 ++---
 .../CheckoutShippingMethodsSection.xml        |  4 +-
 .../Section/CheckoutShippingSection.xml       |  4 +-
 .../Section/CheckoutSuccessMainSection.xml    |  6 +-
 .../Section/GuestCheckoutPaymentSection.xml   |  6 +-
 .../Section/GuestCheckoutShippingSection.xml  | 20 +++---
 .../Section/CmsNewPagePageActionsSection.xml  |  2 +-
 .../CmsNewPagePageBasicFieldsSection.xml      |  2 +-
 .../Section/CmsNewPagePageContentSection.xml  |  6 +-
 .../Cms/Section/CmsNewPagePageSeoSection.xml  |  4 +-
 .../Section/CmsPagesPageActionsSection.xml    |  2 +-
 .../Section/AdminCustomerFiltersSection.xml   |  6 +-
 .../Section/AdminCustomerGridSection.xml      |  2 +-
 .../AdminCustomerMainActionsSection.xml       |  2 +-
 .../Section/AdminCustomerMessagesSection.xml  |  2 +-
 ...inNewCustomerAccountInformationSection.xml |  6 +-
 .../AdminNewCustomerMainActionsSection.xml    |  2 +-
 .../StorefrontCustomerCreateFormSection.xml   | 12 ++--
 ...omerDashboardAccountInformationSection.xml |  2 +-
 .../StorefrontCustomerSignInFormSection.xml   |  6 +-
 .../Section/StorefrontPanelHeaderSection.xml  |  2 +-
 .../InvoiceDetailsInformationSection.xml      |  2 +-
 .../Sales/Section/InvoiceNewSection.xml       |  2 +-
 .../Sales/Section/InvoicesFiltersSection.xml  |  2 +-
 .../Sales/Section/InvoicesGridSection.xml     |  6 +-
 .../OrderDetailsInformationSection.xml        | 10 +--
 .../Section/OrderDetailsInvoicesSection.xml   |  4 +-
 .../OrderDetailsMainActionsSection.xml        | 16 ++---
 .../Section/OrderDetailsMessagesSection.xml   |  2 +-
 .../Section/OrderDetailsOrderViewSection.xml  |  4 +-
 .../Sales/Section/OrdersGridSection.xml       | 14 ++--
 .../Templates/TemplateSectionFile.xml         |  2 +-
 53 files changed, 173 insertions(+), 173 deletions(-)

diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/Section/AdminLoginFormSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/Section/AdminLoginFormSection.xml
index 532a354da12d..762aa002492c 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/Section/AdminLoginFormSection.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/Section/AdminLoginFormSection.xml
@@ -9,8 +9,8 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminLoginFormSection">
-        <element name="username" type="input" locator="#username"/>
-        <element name="password" type="input" locator="#login"/>
-        <element name="signIn" type="button" locator=".actions .action-primary" timeout="30"/>
+        <element name="username" type="input" selector="#username"/>
+        <element name="password" type="input" selector="#login"/>
+        <element name="signIn" type="button" selector=".actions .action-primary" timeout="30"/>
     </section>
 </config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/Section/AdminMessagesSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/Section/AdminMessagesSection.xml
index b77233ab260d..591731f53e0a 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/Section/AdminMessagesSection.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/Section/AdminMessagesSection.xml
@@ -7,8 +7,8 @@
 -->
 
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../../../../magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminMessagesSection">
-        <element name="test" type="input" locator=".test"/>
+        <element name="test" type="input" selector=".test"/>
     </section>
 </config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminCategoryBasicFieldSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminCategoryBasicFieldSection.xml
index 5720e198df09..4a55b4db465b 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminCategoryBasicFieldSection.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminCategoryBasicFieldSection.xml
@@ -9,8 +9,8 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminCategoryBasicFieldSection">
-        <element name="IncludeInMenu" type="checkbox" locator="input[name='include_in_menu']"/>
-        <element name="EnableCategory" type="checkbox" locator="input[name='is_active']"/>
-        <element name="CategoryNameInput" type="input" locator="input[name='name']"/>
+        <element name="IncludeInMenu" type="checkbox" selector="input[name='include_in_menu']"/>
+        <element name="EnableCategory" type="checkbox" selector="input[name='is_active']"/>
+        <element name="CategoryNameInput" type="input" selector="input[name='name']"/>
     </section>
 </config>
\ No newline at end of file
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminCategoryMainActionsSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminCategoryMainActionsSection.xml
index 425b98d2a4f0..2ca068f0c10e 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminCategoryMainActionsSection.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminCategoryMainActionsSection.xml
@@ -9,6 +9,6 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminCategoryMainActionsSection">
-        <element name="SaveButton" type="button" locator=".page-actions-inner #save" timeout="30"/>
+        <element name="SaveButton" type="button" selector=".page-actions-inner #save" timeout="30"/>
     </section>
 </config>
\ No newline at end of file
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminCategoryMessagesSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminCategoryMessagesSection.xml
index f58e66f9cd99..bf8b4f795425 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminCategoryMessagesSection.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminCategoryMessagesSection.xml
@@ -9,6 +9,6 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminCategoryMessagesSection">
-        <element name="SuccessMessage" type="text" locator=".message-success"/>
+        <element name="SuccessMessage" type="text" selector=".message-success"/>
     </section>
 </config>
\ No newline at end of file
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminCategorySEOSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminCategorySEOSection.xml
index f6780f1eb32c..078e591b535e 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminCategorySEOSection.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminCategorySEOSection.xml
@@ -9,10 +9,10 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminCategorySEOSection">
-        <element name="SectionHeader" type="button" locator="div[data-index='search_engine_optimization']" timeout="30"/>
-        <element name="UrlKeyInput" type="input" locator="input[name='url_key']"/>
-        <element name="MetaTitleInput" type="input" locator="input[name='meta_title']"/>
-        <element name="MetaKeywordsInput" type="textarea" locator="textarea[name='meta_keywords']"/>
-        <element name="MetaDescriptionInput" type="textarea" locator="textarea[name='meta_description']"/>
+        <element name="SectionHeader" type="button" selector="div[data-index='search_engine_optimization']" timeout="30"/>
+        <element name="UrlKeyInput" type="input" selector="input[name='url_key']"/>
+        <element name="MetaTitleInput" type="input" selector="input[name='meta_title']"/>
+        <element name="MetaKeywordsInput" type="textarea" selector="textarea[name='meta_keywords']"/>
+        <element name="MetaDescriptionInput" type="textarea" selector="textarea[name='meta_description']"/>
     </section>
 </config>
\ No newline at end of file
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminCategorySidebarActionSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminCategorySidebarActionSection.xml
index 0847d2298483..99ec25950216 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminCategorySidebarActionSection.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminCategorySidebarActionSection.xml
@@ -9,7 +9,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminCategorySidebarActionSection">
-        <element name="AddRootCategoryButton" type="button" locator="#add_root_category_button" timeout="30"/>
-        <element name="AddSubcategoryButton" type="button" locator="#add_subcategory_button" timeout="30"/>
+        <element name="AddRootCategoryButton" type="button" selector="#add_root_category_button" timeout="30"/>
+        <element name="AddSubcategoryButton" type="button" selector="#add_subcategory_button" timeout="30"/>
     </section>
 </config>
\ No newline at end of file
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminCategorySidebarTreeSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminCategorySidebarTreeSection.xml
index 6bbf3876fb4d..d6ddd44bda5b 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminCategorySidebarTreeSection.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminCategorySidebarTreeSection.xml
@@ -9,7 +9,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminCategorySidebarTreeSection">
-        <element name="Collapse All" type="button" locator=".tree-actions a:first-child"/>
-        <element name="Expand All" type="button" locator=".tree-actions a:last-child"/>
+        <element name="Collapse All" type="button" selector=".tree-actions a:first-child"/>
+        <element name="Expand All" type="button" selector=".tree-actions a:last-child"/>
     </section>
 </config>
\ No newline at end of file
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductFormActionSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductFormActionSection.xml
index f7b7b989ace1..696e6cacc3e2 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductFormActionSection.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductFormActionSection.xml
@@ -9,6 +9,6 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminProductFormActionSection">
-        <element name="saveButton" type="button" locator="#save-button" timeout="30"/>
+        <element name="saveButton" type="button" selector="#save-button" timeout="30"/>
     </section>
 </config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductFormSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductFormSection.xml
index a23112065fdd..7b3f62929084 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductFormSection.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductFormSection.xml
@@ -9,49 +9,49 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminProductFormSection">
-        <element name="productName" type="input" locator=".admin__field[data-index=name] input"/>
-        <element name="productSku" type="input" locator=".admin__field[data-index=sku] input"/>
-        <element name="productPrice" type="input" locator=".admin__field[data-index=price] input"/>
-        <element name="categoriesDropdown" type="multiselect" locator="div[data-index='category_ids']"/>
-        <element name="productQuantity" type="input" locator=".admin__field[data-index=qty] input"/>
+        <element name="productName" type="input" selector=".admin__field[data-index=name] input"/>
+        <element name="productSku" type="input" selector=".admin__field[data-index=sku] input"/>
+        <element name="productPrice" type="input" selector=".admin__field[data-index=price] input"/>
+        <element name="categoriesDropdown" type="multiselect" selector="div[data-index='category_ids']"/>
+        <element name="productQuantity" type="input" selector=".admin__field[data-index=qty] input"/>
     </section>
     <section name="AdminProductFormConfigurationsSection">
-        <element name="createConfigurations" type="button" locator="button[data-index='create_configurable_products_button']" timeout="30"/>
-        <element name="currentVariationsRows" type="button" locator=".data-row"/>
-        <element name="currentVariationsNameCells" type="textarea" locator=".admin__control-fields[data-index='name_container']"/>
-        <element name="currentVariationsSkuCells" type="textarea" locator=".admin__control-fields[data-index='sku_container']"/>
-        <element name="currentVariationsPriceCells" type="textarea" locator=".admin__control-fields[data-index='price_container']"/>
-        <element name="currentVariationsQuantityCells" type="textarea" locator=".admin__control-fields[data-index='quantity_container']"/>
-        <element name="currentVariationsAttributesCells" type="textarea" locator=".admin__control-fields[data-index='attributes']"/>
+        <element name="createConfigurations" type="button" selector="button[data-index='create_configurable_products_button']" timeout="30"/>
+        <element name="currentVariationsRows" type="button" selector=".data-row"/>
+        <element name="currentVariationsNameCells" type="textarea" selector=".admin__control-fields[data-index='name_container']"/>
+        <element name="currentVariationsSkuCells" type="textarea" selector=".admin__control-fields[data-index='sku_container']"/>
+        <element name="currentVariationsPriceCells" type="textarea" selector=".admin__control-fields[data-index='price_container']"/>
+        <element name="currentVariationsQuantityCells" type="textarea" selector=".admin__control-fields[data-index='quantity_container']"/>
+        <element name="currentVariationsAttributesCells" type="textarea" selector=".admin__control-fields[data-index='attributes']"/>
     </section>
     <section name="AdminCreateProductConfigurationsPanel">
-        <element name="next" type="button" locator=".steps-wizard-navigation .action-next-step" timeout="30"/>
-        <element name="createNewAttribute" type="button" locator=".select-attributes-actions button[title='Create New Attribute']" timeout="30"/>
-        <element name="filters" type="button" locator="button[data-action='grid-filter-expand']"/>
-        <element name="attributeCode" type="input" locator=".admin__control-text[name='attribute_code']"/>
-        <element name="applyFilters" type="button" locator="button[data-action='grid-filter-apply']" timeout="30"/>
-        <element name="firstCheckbox" type="input" locator="tr[data-repeat-index='0'] .admin__control-checkbox"/>
+        <element name="next" type="button" selector=".steps-wizard-navigation .action-next-step" timeout="30"/>
+        <element name="createNewAttribute" type="button" selector=".select-attributes-actions button[title='Create New Attribute']" timeout="30"/>
+        <element name="filters" type="button" selector="button[data-action='grid-filter-expand']"/>
+        <element name="attributeCode" type="input" selector=".admin__control-text[name='attribute_code']"/>
+        <element name="applyFilters" type="button" selector="button[data-action='grid-filter-apply']" timeout="30"/>
+        <element name="firstCheckbox" type="input" selector="tr[data-repeat-index='0'] .admin__control-checkbox"/>
 
-        <element name="selectAll" type="button" locator=".action-select-all"/>
-        <element name="createNewValue" type="input" locator=".action-create-new" timeout="30"/>
-        <element name="attributeName" type="input" locator="li[data-attribute-option-title=''] .admin__field-create-new .admin__control-text"/>
-        <element name="saveAttribute" type="button" locator="li[data-attribute-option-title=''] .action-save" timeout="30"/>
+        <element name="selectAll" type="button" selector=".action-select-all"/>
+        <element name="createNewValue" type="input" selector=".action-create-new" timeout="30"/>
+        <element name="attributeName" type="input" selector="li[data-attribute-option-title=''] .admin__field-create-new .admin__control-text"/>
+        <element name="saveAttribute" type="button" selector="li[data-attribute-option-title=''] .action-save" timeout="30"/>
 
-        <element name="applyUniquePricesByAttributeToEachSku" type="radio" locator=".admin__field-label[for='apply-unique-prices-radio']"/>
-        <element name="selectAttribute" type="select" locator="#select-each-price" timeout="30"/>
-        <element name="attribute1" type="input" locator="#apply-single-price-input-0"/>
-        <element name="attribute2" type="input" locator="#apply-single-price-input-1"/>
-        <element name="attribute3" type="input" locator="#apply-single-price-input-2"/>
+        <element name="applyUniquePricesByAttributeToEachSku" type="radio" selector=".admin__field-label[for='apply-unique-prices-radio']"/>
+        <element name="selectAttribute" type="select" selector="#select-each-price" timeout="30"/>
+        <element name="attribute1" type="input" selector="#apply-single-price-input-0"/>
+        <element name="attribute2" type="input" selector="#apply-single-price-input-1"/>
+        <element name="attribute3" type="input" selector="#apply-single-price-input-2"/>
 
-        <element name="applySingleQuantityToEachSkus" type="radio" locator=".admin__field-label[for='apply-single-inventory-radio']" timeout="30"/>
-        <element name="quantity" type="input" locator="#apply-single-inventory-input"/>
+        <element name="applySingleQuantityToEachSkus" type="radio" selector=".admin__field-label[for='apply-single-inventory-radio']" timeout="30"/>
+        <element name="quantity" type="input" selector="#apply-single-inventory-input"/>
     </section>
     <section name="AdminNewAttributePanel">
-        <element name="saveAttribute" type="button" locator="#save" timeout="30"/>
-        <element name="newAttributeIFrame" type="iframe" locator="create_new_attribute_container"/>
-        <element name="defaultLabel" type="input" locator="#attribute_label"/>
+        <element name="saveAttribute" type="button" selector="#save" timeout="30"/>
+        <element name="newAttributeIFrame" type="iframe" selector="create_new_attribute_container"/>
+        <element name="defaultLabel" type="input" selector="#attribute_label"/>
     </section>
     <section name="AdminChooseAffectedAttributeSetPopup">
-        <element name="confirm" type="button" locator="button[data-index='confirm_button']" timeout="30"/>
+        <element name="confirm" type="button" selector="button[data-index='confirm_button']" timeout="30"/>
     </section>
 </config>
\ No newline at end of file
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductGridActionSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductGridActionSection.xml
index e45c67c0dcf8..866bcb4223e9 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductGridActionSection.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductGridActionSection.xml
@@ -9,8 +9,8 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminProductGridActionSection">
-        <element name="addProductToggle" type="button" locator=".action-toggle.primary.add" timeout="30"/>
-        <element name="addSimpleProduct" type="button" locator=".item[data-ui-id='products-list-add-new-product-button-item-simple']" timeout="30"/>
-        <element name="addConfigurableProduct" type="button" locator=".item[data-ui-id='products-list-add-new-product-button-item-configurable']" timeout="30"/>
+        <element name="addProductToggle" type="button" selector=".action-toggle.primary.add" timeout="30"/>
+        <element name="addSimpleProduct" type="button" selector=".item[data-ui-id='products-list-add-new-product-button-item-simple']" timeout="30"/>
+        <element name="addConfigurableProduct" type="button" selector=".item[data-ui-id='products-list-add-new-product-button-item-configurable']" timeout="30"/>
     </section>
 </config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductGridSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductGridSection.xml
index feecb1cc8f06..db8b641c9d2f 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductGridSection.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductGridSection.xml
@@ -9,7 +9,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminProductGridSection">
-        <element name="productGridElement1" type="input" locator="#addLocator" />
-        <element name="productGridElement2" type="text" locator="#addLocator" />
+        <element name="productGridElement1" type="input" selector="#addselector" />
+        <element name="productGridElement2" type="text" selector="#addselector" />
     </section>
 </config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductMessagesSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductMessagesSection.xml
index 860fdbe398ac..f20d3f51becd 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductMessagesSection.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductMessagesSection.xml
@@ -9,6 +9,6 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminProductMessagesSection">
-        <element name="successMessage" type="text" locator=".message-success"/>
+        <element name="successMessage" type="text" selector=".message-success"/>
     </section>
 </config>
\ No newline at end of file
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductSEOSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductSEOSection.xml
index d994a1d73902..1f9fc4fc3fc6 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductSEOSection.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductSEOSection.xml
@@ -9,7 +9,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminProductSEOSection">
-        <element name="sectionHeader" type="button" locator="div[data-index='search-engine-optimization']" timeout="30"/>
-        <element name="urlKeyInput" type="input" locator="input[name='product[url_key]']"/>
+        <element name="sectionHeader" type="button" selector="div[data-index='search-engine-optimization']" timeout="30"/>
+        <element name="urlKeyInput" type="input" selector="input[name='product[url_key]']"/>
     </section>
 </config>
\ No newline at end of file
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontCategoryMainSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontCategoryMainSection.xml
index c3dbe95bc6bc..83622dd759f2 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontCategoryMainSection.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontCategoryMainSection.xml
@@ -9,10 +9,10 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="StorefrontCategoryMainSection">
-        <element name="CategoryTitle" type="text" locator="#page-title-heading span"/>
-        <element name="ProductItemInfo" type="button" locator=".product-item-info"/>
-        <element name="AddToCartBtn" type="button" locator="button.action.tocart.primary"/>
-        <element name="SuccessMsg" type="button" locator="div.message-success"/>
-        <element name="productCount" type="text" locator="#toolbar-amount"/>
+        <element name="CategoryTitle" type="text" selector="#page-title-heading span"/>
+        <element name="ProductItemInfo" type="button" selector=".product-item-info"/>
+        <element name="AddToCartBtn" type="button" selector="button.action.tocart.primary"/>
+        <element name="SuccessMsg" type="button" selector="div.message-success"/>
+        <element name="productCount" type="text" selector="#toolbar-amount"/>
     </section>
 </config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontMessagesSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontMessagesSection.xml
index dcfc2564d3ca..a7036388814d 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontMessagesSection.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontMessagesSection.xml
@@ -9,6 +9,6 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="StorefrontMessagesSection">
-        <element name="test" type="input" locator=".test"/>
+        <element name="test" type="input" selector=".test"/>
     </section>
 </config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontMiniCartSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontMiniCartSection.xml
index fd814766ea6e..db9e1cd4b23e 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontMiniCartSection.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontMiniCartSection.xml
@@ -9,8 +9,8 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="StorefrontMiniCartSection">
-        <element name="quantity" type="button" locator="span.counter-number"/>
-        <element name="show" type="button" locator="a.showcart"/>
-        <element name="goToCheckout" type="button" locator="#top-cart-btn-checkout"/>
+        <element name="quantity" type="button" selector="span.counter-number"/>
+        <element name="show" type="button" selector="a.showcart"/>
+        <element name="goToCheckout" type="button" selector="#top-cart-btn-checkout"/>
     </section>
 </config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontProductInfoDetailsSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontProductInfoDetailsSection.xml
index ebdff90a69da..742dbac0e088 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontProductInfoDetailsSection.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontProductInfoDetailsSection.xml
@@ -9,6 +9,6 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="StorefrontProductInfoDetailsSection">
-        <element name="productNameForReview" type="text" locator=".legend.review-legend>strong" />
+        <element name="productNameForReview" type="text" selector=".legend.review-legend>strong" />
     </section>
 </config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontProductInfoMainSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontProductInfoMainSection.xml
index 22b55bb879fb..78940343506b 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontProductInfoMainSection.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/StorefrontProductInfoMainSection.xml
@@ -9,12 +9,12 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="StorefrontProductInfoMainSection">
-        <element name="productName" type="text" locator=".base"/>
-        <element name="productSku" type="text" locator=".product.attribute.sku>.value"/>
-        <element name="productPrice" type="text" locator=".price"/>
-        <element name="productStockStatus" type="text" locator=".stock[title=Availability]>span"/>
+        <element name="productName" type="text" selector=".base"/>
+        <element name="productSku" type="text" selector=".product.attribute.sku>.value"/>
+        <element name="productPrice" type="text" selector=".price"/>
+        <element name="productStockStatus" type="text" selector=".stock[title=Availability]>span"/>
         
-        <element name="productAttributeTitle1" type="text" locator="#product-options-wrapper div[tabindex='0'] label"/>
-        <element name="productAttributeOptions1" type="select" locator="#product-options-wrapper div[tabindex='0'] option"/>
+        <element name="productAttributeTitle1" type="text" selector="#product-options-wrapper div[tabindex='0'] label"/>
+        <element name="productAttributeOptions1" type="select" selector="#product-options-wrapper div[tabindex='0'] option"/>
     </section>
 </config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutOrderSummarySection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutOrderSummarySection.xml
index 319bafca8c25..5b45d1a24b3a 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutOrderSummarySection.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutOrderSummarySection.xml
@@ -9,9 +9,9 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="CheckoutOrderSummarySection">
-        <element name="miniCartTab" type="button" locator=".title[role='tab']"/>
-        <element name="productItemName" type="text" locator=".product-item-name"/>
-        <element name="productItemQty" type="text" locator=".value"/>
-        <element name="productItemPrice" type="text" locator=".price"/>
+        <element name="miniCartTab" type="button" selector=".title[role='tab']"/>
+        <element name="productItemName" type="text" selector=".product-item-name"/>
+        <element name="productItemQty" type="text" selector=".value"/>
+        <element name="productItemPrice" type="text" selector=".price"/>
     </section>
 </config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutPaymentSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutPaymentSection.xml
index fc616a51207c..29f97e8defaf 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutPaymentSection.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutPaymentSection.xml
@@ -9,8 +9,8 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="CheckoutPaymentSection">
-        <element name="cartItems" type="text" locator=".minicart-items"/>
-        <element name="billingAddress" type="text" locator="div.billing-address-details"/>
-        <element name="placeOrder" type="button" locator="button.action.primary.checkout" timeout="30"/>
+        <element name="cartItems" type="text" selector=".minicart-items"/>
+        <element name="billingAddress" type="text" selector="div.billing-address-details"/>
+        <element name="placeOrder" type="button" selector="button.action.primary.checkout" timeout="30"/>
     </section>
 </config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutShippingGuestInfoSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutShippingGuestInfoSection.xml
index a783d5ea7aa5..bbe8b0b1fee5 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutShippingGuestInfoSection.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutShippingGuestInfoSection.xml
@@ -9,13 +9,13 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="CheckoutShippingGuestInfoSection">
-        <element name="email" type="input" locator="#customer-email"/>
-        <element name="firstName" type="input" locator="input[name=firstname]"/>
-        <element name="lastName" type="input" locator="input[name=lastname]"/>
-        <element name="street" type="input" locator="input[name='street[0]']"/>
-        <element name="city" type="input" locator="input[name=city]"/>
-        <element name="region" type="select" locator="select[name=region_id]"/>
-        <element name="postcode" type="input" locator="input[name=postcode]"/>
-        <element name="telephone" type="input" locator="input[name=telephone]"/>
+        <element name="email" type="input" selector="#customer-email"/>
+        <element name="firstName" type="input" selector="input[name=firstname]"/>
+        <element name="lastName" type="input" selector="input[name=lastname]"/>
+        <element name="street" type="input" selector="input[name='street[0]']"/>
+        <element name="city" type="input" selector="input[name=city]"/>
+        <element name="region" type="select" selector="select[name=region_id]"/>
+        <element name="postcode" type="input" selector="input[name=postcode]"/>
+        <element name="telephone" type="input" selector="input[name=telephone]"/>
     </section>
 </config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutShippingMethodsSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutShippingMethodsSection.xml
index dbe09299929f..52653d15c41c 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutShippingMethodsSection.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutShippingMethodsSection.xml
@@ -9,7 +9,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="CheckoutShippingMethodsSection">
-        <element name="next" type="button" locator="button.button.action.continue.primary"/>
-        <element name="firstShippingMethod" type="radio" locator=".row:nth-of-type(1) .col-method .radio"/>
+        <element name="next" type="button" selector="button.button.action.continue.primary"/>
+        <element name="firstShippingMethod" type="radio" selector=".row:nth-of-type(1) .col-method .radio"/>
     </section>
 </config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutShippingSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutShippingSection.xml
index 364c2d92c1d4..3e507dbb898a 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutShippingSection.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutShippingSection.xml
@@ -9,7 +9,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="CheckoutShippingSection">
-        <element name="selectedShippingAddress" type="text" locator=".shipping-address-item.selected-item"/>
-        <element name="newAddressButton" type="button" locator="#checkout-step-shipping button"/>
+        <element name="selectedShippingAddress" type="text" selector=".shipping-address-item.selected-item"/>
+        <element name="newAddressButton" type="button" selector="#checkout-step-shipping button"/>
     </section>
 </config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutSuccessMainSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutSuccessMainSection.xml
index cb47bf9900e7..9204bf51344c 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutSuccessMainSection.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/CheckoutSuccessMainSection.xml
@@ -9,8 +9,8 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="CheckoutSuccessMainSection">
-        <element name="success" type="text" locator="div.checkout-success"/>
-        <element name="orderNumber" type="text" locator="div.checkout-success > p:nth-child(1) > span"/>
-        <element name="orderNumber22" type="text" locator=".order-number>strong"/>
+        <element name="success" type="text" selector="div.checkout-success"/>
+        <element name="orderNumber" type="text" selector="div.checkout-success > p:nth-child(1) > span"/>
+        <element name="orderNumber22" type="text" selector=".order-number>strong"/>
     </section>
 </config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/GuestCheckoutPaymentSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/GuestCheckoutPaymentSection.xml
index 7050068ba27a..200a699d2bb5 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/GuestCheckoutPaymentSection.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/GuestCheckoutPaymentSection.xml
@@ -9,8 +9,8 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="GuestCheckoutPaymentSection">
-        <element name="cartItems" type="text" locator=".minicart-items"/>
-        <element name="billingAddress" type="text" locator="div.billing-address-details"/>
-        <element name="placeOrder" type="button" locator="button.action.primary.checkout" timeout="30"/>
+        <element name="cartItems" type="text" selector=".minicart-items"/>
+        <element name="billingAddress" type="text" selector="div.billing-address-details"/>
+        <element name="placeOrder" type="button" selector="button.action.primary.checkout" timeout="30"/>
     </section>
 </config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/GuestCheckoutShippingSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/GuestCheckoutShippingSection.xml
index a2606edb3797..b2cca4d8f37b 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/GuestCheckoutShippingSection.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Section/GuestCheckoutShippingSection.xml
@@ -9,15 +9,15 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="GuestCheckoutShippingSection">
-        <element name="email" type="input" locator="#customer-email"/>
-        <element name="firstName" type="input" locator="input[name=firstname]"/>
-        <element name="lastName" type="input" locator="input[name=lastname]"/>
-        <element name="street" type="input" locator="input[name='street[0]']"/>
-        <element name="city" type="input" locator="input[name=city]"/>
-        <element name="region" type="select" locator="select[name=region_id]"/>
-        <element name="postcode" type="input" locator="input[name=postcode]"/>
-        <element name="telephone" type="input" locator="input[name=telephone]"/>
-        <element name="next" type="button" locator="button.button.action.continue.primary"/>
-        <element name="firstShippingMethod" type="radio" locator=".row:nth-of-type(1) .col-method .radio"/>
+        <element name="email" type="input" selector="#customer-email"/>
+        <element name="firstName" type="input" selector="input[name=firstname]"/>
+        <element name="lastName" type="input" selector="input[name=lastname]"/>
+        <element name="street" type="input" selector="input[name='street[0]']"/>
+        <element name="city" type="input" selector="input[name=city]"/>
+        <element name="region" type="select" selector="select[name=region_id]"/>
+        <element name="postcode" type="input" selector="input[name=postcode]"/>
+        <element name="telephone" type="input" selector="input[name=telephone]"/>
+        <element name="next" type="button" selector="button.button.action.continue.primary"/>
+        <element name="firstShippingMethod" type="radio" selector=".row:nth-of-type(1) .col-method .radio"/>
     </section>
 </config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Section/CmsNewPagePageActionsSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Section/CmsNewPagePageActionsSection.xml
index bb5e854078bb..521489186e4c 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Section/CmsNewPagePageActionsSection.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Section/CmsNewPagePageActionsSection.xml
@@ -9,6 +9,6 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="CmsNewPagePageActionsSection">
-        <element name="savePage" type="button" locator="#save" timeout="30"/>
+        <element name="savePage" type="button" selector="#save" timeout="30"/>
     </section>
 </config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Section/CmsNewPagePageBasicFieldsSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Section/CmsNewPagePageBasicFieldsSection.xml
index e5f314a0fb53..6cd0bfc98c88 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Section/CmsNewPagePageBasicFieldsSection.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Section/CmsNewPagePageBasicFieldsSection.xml
@@ -9,6 +9,6 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="CmsNewPagePageBasicFieldsSection">
-        <element name="pageTitle" type="input" locator="input[name=title]"/>
+        <element name="pageTitle" type="input" selector="input[name=title]"/>
     </section>
 </config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Section/CmsNewPagePageContentSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Section/CmsNewPagePageContentSection.xml
index c0da938d99bf..3983259632cd 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Section/CmsNewPagePageContentSection.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Section/CmsNewPagePageContentSection.xml
@@ -9,8 +9,8 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="CmsNewPagePageContentSection">
-        <element name="header" type="button" locator="div[data-index=content]"/>
-        <element name="contentHeading" type="input" locator="input[name=content_heading]"/>
-        <element name="content" type="input" locator="#cms_page_form_content"/>
+        <element name="header" type="button" selector="div[data-index=content]"/>
+        <element name="contentHeading" type="input" selector="input[name=content_heading]"/>
+        <element name="content" type="input" selector="#cms_page_form_content"/>
     </section>
 </config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Section/CmsNewPagePageSeoSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Section/CmsNewPagePageSeoSection.xml
index 8f541c0bbf10..56dbe2fad005 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Section/CmsNewPagePageSeoSection.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Section/CmsNewPagePageSeoSection.xml
@@ -9,7 +9,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="CmsNewPagePageSeoSection">
-        <element name="header" type="button" locator="div[data-index=search_engine_optimisation]" timeout="30"/>
-        <element name="urlKey" type="input" locator="input[name=identifier]"/>
+        <element name="header" type="button" selector="div[data-index=search_engine_optimisation]" timeout="30"/>
+        <element name="urlKey" type="input" selector="input[name=identifier]"/>
     </section>
 </config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Section/CmsPagesPageActionsSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Section/CmsPagesPageActionsSection.xml
index 75c1c46ed1bc..fe759a66cd6d 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Section/CmsPagesPageActionsSection.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Section/CmsPagesPageActionsSection.xml
@@ -9,6 +9,6 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="CmsPagesPageActionsSection">
-        <element name="addNewPage" type="button" locator="#add" timeout="30"/>
+        <element name="addNewPage" type="button" selector="#add" timeout="30"/>
     </section>
 </config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Section/AdminCustomerFiltersSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Section/AdminCustomerFiltersSection.xml
index ea9961bb2751..40a5fc2f1192 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Section/AdminCustomerFiltersSection.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Section/AdminCustomerFiltersSection.xml
@@ -9,8 +9,8 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminCustomerFiltersSection">
-        <element name="filtersButton" type="button" locator="#container > div > div.admin__data-grid-header > div:nth-child(1) > div.data-grid-filters-actions-wrap > div > button" timeout="30"/>
-        <element name="nameInput" type="input" locator="input[name=name]"/>
-        <element name="apply" type="button" locator="button[data-action=grid-filter-apply]" timeout="30"/>
+        <element name="filtersButton" type="button" selector="#container > div > div.admin__data-grid-header > div:nth-child(1) > div.data-grid-filters-actions-wrap > div > button" timeout="30"/>
+        <element name="nameInput" type="input" selector="input[name=name]"/>
+        <element name="apply" type="button" selector="button[data-action=grid-filter-apply]" timeout="30"/>
     </section>
 </config>
\ No newline at end of file
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Section/AdminCustomerGridSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Section/AdminCustomerGridSection.xml
index 12055b5314af..ec6dd21c9ed1 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Section/AdminCustomerGridSection.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Section/AdminCustomerGridSection.xml
@@ -9,6 +9,6 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminCustomerGridSection">
-        <element name="customerGrid" type="text" locator="table[data-role='grid']"/>
+        <element name="customerGrid" type="text" selector="table[data-role='grid']"/>
     </section>
 </config>
\ No newline at end of file
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Section/AdminCustomerMainActionsSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Section/AdminCustomerMainActionsSection.xml
index fbdff1f9ca5c..148958c49d67 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Section/AdminCustomerMainActionsSection.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Section/AdminCustomerMainActionsSection.xml
@@ -9,6 +9,6 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminCustomerMainActionsSection">
-        <element name="addNewCustomer" type="button" locator="#add" timeout="30"/>
+        <element name="addNewCustomer" type="button" selector="#add" timeout="30"/>
     </section>
 </config>
\ No newline at end of file
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Section/AdminCustomerMessagesSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Section/AdminCustomerMessagesSection.xml
index e82e4c1947e0..5871da67356f 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Section/AdminCustomerMessagesSection.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Section/AdminCustomerMessagesSection.xml
@@ -9,6 +9,6 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminCustomerMessagesSection">
-        <element name="successMessage" type="text" locator=".message-success"/>
+        <element name="successMessage" type="text" selector=".message-success"/>
     </section>
 </config>
\ No newline at end of file
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Section/AdminNewCustomerAccountInformationSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Section/AdminNewCustomerAccountInformationSection.xml
index 5bdbef440737..2e2c2930807c 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Section/AdminNewCustomerAccountInformationSection.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Section/AdminNewCustomerAccountInformationSection.xml
@@ -9,8 +9,8 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminNewCustomerAccountInformationSection">
-        <element name="firstName" type="input" locator="input[name='customer[firstname]']"/>
-        <element name="lastName" type="input" locator="input[name='customer[lastname]']"/>
-        <element name="email" type="input" locator="input[name='customer[email]']"/>
+        <element name="firstName" type="input" selector="input[name='customer[firstname]']"/>
+        <element name="lastName" type="input" selector="input[name='customer[lastname]']"/>
+        <element name="email" type="input" selector="input[name='customer[email]']"/>
     </section>
 </config>
\ No newline at end of file
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Section/AdminNewCustomerMainActionsSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Section/AdminNewCustomerMainActionsSection.xml
index 9366c7c50df6..18e7e45f992e 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Section/AdminNewCustomerMainActionsSection.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Section/AdminNewCustomerMainActionsSection.xml
@@ -9,6 +9,6 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminNewCustomerMainActionsSection">
-        <element name="saveButton" type="button" locator="#save" timeout="30"/>
+        <element name="saveButton" type="button" selector="#save" timeout="30"/>
     </section>
 </config>
\ No newline at end of file
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Section/StorefrontCustomerCreateFormSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Section/StorefrontCustomerCreateFormSection.xml
index 33389a2013d7..e578d9c064c8 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Section/StorefrontCustomerCreateFormSection.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Section/StorefrontCustomerCreateFormSection.xml
@@ -9,11 +9,11 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="StorefrontCustomerCreateFormSection">
-        <element name="firstnameField" type="input" locator="#firstname"/>
-        <element name="lastnameField" type="input" locator="#lastname"/>
-        <element name="emailField" type="input" locator="#email_address"/>
-        <element name="passwordField" type="input" locator="#password"/>
-        <element name="confirmPasswordField" type="input" locator="#password-confirmation"/>
-        <element name="createAccountButton" type="button" locator="button.action.submit.primary" timeout="30"/>
+        <element name="firstnameField" type="input" selector="#firstname"/>
+        <element name="lastnameField" type="input" selector="#lastname"/>
+        <element name="emailField" type="input" selector="#email_address"/>
+        <element name="passwordField" type="input" selector="#password"/>
+        <element name="confirmPasswordField" type="input" selector="#password-confirmation"/>
+        <element name="createAccountButton" type="button" selector="button.action.submit.primary" timeout="30"/>
     </section>
 </config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Section/StorefrontCustomerDashboardAccountInformationSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Section/StorefrontCustomerDashboardAccountInformationSection.xml
index 1bff73476364..0ed3b4cceed8 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Section/StorefrontCustomerDashboardAccountInformationSection.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Section/StorefrontCustomerDashboardAccountInformationSection.xml
@@ -9,6 +9,6 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="StorefrontCustomerDashboardAccountInformationSection">
-        <element name="ContactInformation" type="textarea" locator=".box.box-information .box-content"/>
+        <element name="ContactInformation" type="textarea" selector=".box.box-information .box-content"/>
     </section>
 </config>
\ No newline at end of file
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Section/StorefrontCustomerSignInFormSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Section/StorefrontCustomerSignInFormSection.xml
index 00c6ed9282e4..41b14ac84c0a 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Section/StorefrontCustomerSignInFormSection.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Section/StorefrontCustomerSignInFormSection.xml
@@ -9,8 +9,8 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="StorefrontCustomerSignInFormSection">
-        <element name="emailField" type="input" locator="#email"/>
-        <element name="passwordField" type="input" locator="#pass"/>
-        <element name="signInAccountButton" type="button" locator="#send2" timeout="30"/>
+        <element name="emailField" type="input" selector="#email"/>
+        <element name="passwordField" type="input" selector="#pass"/>
+        <element name="signInAccountButton" type="button" selector="#send2" timeout="30"/>
     </section>
 </config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Section/StorefrontPanelHeaderSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Section/StorefrontPanelHeaderSection.xml
index cd9f84ce0f1f..0ada8563eee9 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Section/StorefrontPanelHeaderSection.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Customer/Section/StorefrontPanelHeaderSection.xml
@@ -9,6 +9,6 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="StorefrontPanelHeaderSection">
-        <element name="createAnAccountLink" type="select" locator=".panel.header li:nth-child(3)"/>
+        <element name="createAnAccountLink" type="select" selector=".panel.header li:nth-child(3)"/>
     </section>
 </config>
\ No newline at end of file
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/InvoiceDetailsInformationSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/InvoiceDetailsInformationSection.xml
index 872e9ac007d2..0549247e8aa9 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/InvoiceDetailsInformationSection.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/InvoiceDetailsInformationSection.xml
@@ -9,6 +9,6 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="InvoiceDetailsInformationSection">
-        <element name="orderStatus" type="text" locator="#order_status"/>
+        <element name="orderStatus" type="text" selector="#order_status"/>
     </section>
 </config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/InvoiceNewSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/InvoiceNewSection.xml
index 90e5c31f8663..282c9e675e2b 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/InvoiceNewSection.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/InvoiceNewSection.xml
@@ -9,6 +9,6 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="InvoiceNewSection">
-        <element name="submitInvoice" type="button" locator=".action-default.scalable.save.submit-button.primary"/>
+        <element name="submitInvoice" type="button" selector=".action-default.scalable.save.submit-button.primary"/>
     </section>
 </config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/InvoicesFiltersSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/InvoicesFiltersSection.xml
index e14e651eb1aa..9598199dcb7b 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/InvoicesFiltersSection.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/InvoicesFiltersSection.xml
@@ -9,6 +9,6 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="InvoicesFiltersSection">
-        <element name="orderNum" type="input" locator="input[name='order_increment_id']"/>
+        <element name="orderNum" type="input" selector="input[name='order_increment_id']"/>
     </section>
 </config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/InvoicesGridSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/InvoicesGridSection.xml
index aca1aaa747b7..024b3db71414 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/InvoicesGridSection.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/InvoicesGridSection.xml
@@ -9,8 +9,8 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="InvoicesGridSection">
-        <element name="spinner" type="button" locator=".spinner"/>
-        <element name="filter" type="button" locator="#container > div > div.admin__data-grid-header > div:nth-child(1) > div.data-grid-filters-actions-wrap > div > button"/>
-        <element name="firstRow" type="button" locator="tr.data-row:nth-of-type(1)"/>
+        <element name="spinner" type="button" selector=".spinner"/>
+        <element name="filter" type="button" selector="#container > div > div.admin__data-grid-header > div:nth-child(1) > div.data-grid-filters-actions-wrap > div > button"/>
+        <element name="firstRow" type="button" selector="tr.data-row:nth-of-type(1)"/>
     </section>
 </config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/OrderDetailsInformationSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/OrderDetailsInformationSection.xml
index 4f971c755d2b..a8f8b3dc1e0e 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/OrderDetailsInformationSection.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/OrderDetailsInformationSection.xml
@@ -9,10 +9,10 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="OrderDetailsInformationSection">
-        <element name="orderStatus" type="text" locator="#order_status"/>
-        <element name="accountInformation" type="text" locator=".order-account-information-table"/>
-        <element name="billingAddress" type="text" locator=".order-billing-address"/>
-        <element name="shippingAddress" type="text" locator=".order-shipping-address"/>
-        <element name="itemsOrdered" type="text" locator=".edit-order-table"/>
+        <element name="orderStatus" type="text" selector="#order_status"/>
+        <element name="accountInformation" type="text" selector=".order-account-information-table"/>
+        <element name="billingAddress" type="text" selector=".order-billing-address"/>
+        <element name="shippingAddress" type="text" selector=".order-shipping-address"/>
+        <element name="itemsOrdered" type="text" selector=".edit-order-table"/>
     </section>
 </config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/OrderDetailsInvoicesSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/OrderDetailsInvoicesSection.xml
index 7039fb3e2502..34d42ed419ba 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/OrderDetailsInvoicesSection.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/OrderDetailsInvoicesSection.xml
@@ -9,7 +9,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="OrderDetailsInvoicesSection">
-        <element name="spinner" type="button" locator=".spinner"/>
-        <element name="content" type="text" locator="#sales_order_view_tabs_order_invoices_content"/>
+        <element name="spinner" type="button" selector=".spinner"/>
+        <element name="content" type="text" selector="#sales_order_view_tabs_order_invoices_content"/>
     </section>
 </config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/OrderDetailsMainActionsSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/OrderDetailsMainActionsSection.xml
index 78613e58d468..9632c5e5ddb1 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/OrderDetailsMainActionsSection.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/OrderDetailsMainActionsSection.xml
@@ -9,13 +9,13 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="OrderDetailsMainActionsSection">
-        <element name="back" type="button" locator="#back"/>
-        <element name="cancel" type="button" locator="#order-view-cancel-button"/>
-        <element name="sendEmail" type="button" locator="#send_notification"/>
-        <element name="hold" type="button" locator="#order-view-hold-button"/>
-        <element name="invoice" type="button" locator="#order_invoice"/>
-        <element name="ship" type="button" locator="#order_ship"/>
-        <element name="reorder" type="button" locator="#order_reorder"/>
-        <element name="edit" type="button" locator="#order_edit"/>
+        <element name="back" type="button" selector="#back"/>
+        <element name="cancel" type="button" selector="#order-view-cancel-button"/>
+        <element name="sendEmail" type="button" selector="#send_notification"/>
+        <element name="hold" type="button" selector="#order-view-hold-button"/>
+        <element name="invoice" type="button" selector="#order_invoice"/>
+        <element name="ship" type="button" selector="#order_ship"/>
+        <element name="reorder" type="button" selector="#order_reorder"/>
+        <element name="edit" type="button" selector="#order_edit"/>
     </section>
 </config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/OrderDetailsMessagesSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/OrderDetailsMessagesSection.xml
index b63c1da9a988..dc32b61bde93 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/OrderDetailsMessagesSection.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/OrderDetailsMessagesSection.xml
@@ -9,6 +9,6 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="OrderDetailsMessagesSection">
-        <element name="successMessage" type="text" locator="div.message-success"/>
+        <element name="successMessage" type="text" selector="div.message-success"/>
     </section>
 </config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/OrderDetailsOrderViewSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/OrderDetailsOrderViewSection.xml
index 63c80a085e0a..a3c48ecfc61b 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/OrderDetailsOrderViewSection.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/OrderDetailsOrderViewSection.xml
@@ -9,7 +9,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="OrderDetailsOrderViewSection">
-        <element name="information" type="button" locator="#sales_order_view_tabs_order_info"/>
-        <element name="invoices" type="button" locator="#sales_order_view_tabs_order_invoices"/>
+        <element name="information" type="button" selector="#sales_order_view_tabs_order_info"/>
+        <element name="invoices" type="button" selector="#sales_order_view_tabs_order_invoices"/>
     </section>
 </config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/OrdersGridSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/OrdersGridSection.xml
index 2683305340f0..c0b3c84fb430 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/OrdersGridSection.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Section/OrdersGridSection.xml
@@ -9,12 +9,12 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="OrdersGridSection">
-        <element name="spinner" type="button" locator=".spinner"/>
-        <element name="gridLoadingMask" type="button" locator=".admin__data-grid-loading-mask"/>
-        <element name="search" type="input" locator="#fulltext"/>
-        <element name="submitSearch" type="button" locator=".//*[@id='container']/div/div[2]/div[1]/div[2]/button"/>
-        <element name="submitSearch22" type="button" locator=".//*[@class=&quot;admin__data-grid-filters-wrap&quot;]/parent::*/div[@class=&quot;data-grid-search-control-wrap&quot;]/button"/>
-        <element name="firstRow" type="button" locator="tr.data-row:nth-of-type(1)"/>
-        <element name="createNewOrder" type="button" locator="button[title='Create New Order'"/>
+        <element name="spinner" type="button" selector=".spinner"/>
+        <element name="gridLoadingMask" type="button" selector=".admin__data-grid-loading-mask"/>
+        <element name="search" type="input" selector="#fulltext"/>
+        <element name="submitSearch" type="button" selector=".//*[@id='container']/div/div[2]/div[1]/div[2]/button"/>
+        <element name="submitSearch22" type="button" selector=".//*[@class=&quot;admin__data-grid-filters-wrap&quot;]/parent::*/div[@class=&quot;data-grid-search-control-wrap&quot;]/button"/>
+        <element name="firstRow" type="button" selector="tr.data-row:nth-of-type(1)"/>
+        <element name="createNewOrder" type="button" selector="button[title='Create New Order'"/>
     </section>
 </config>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Templates/TemplateSectionFile.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Templates/TemplateSectionFile.xml
index 9cf871a562ad..df29d4c6a545 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Templates/TemplateSectionFile.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Templates/TemplateSectionFile.xml
@@ -9,6 +9,6 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="">
-        <element name="" type="" locator=""/>
+        <element name="" type="" selector=""/>
     </section>
 </config>
\ No newline at end of file

From 5198633eee76fa406fe24ed2631cf598141255ab Mon Sep 17 00:00:00 2001
From: John S <ivy00johns@users.noreply.github.com>
Date: Thu, 21 Sep 2017 14:03:39 -0500
Subject: [PATCH 3/3] MQE-350: Demos for Core and SE Teams

Adding unique="suffix" to data that was missed during the merge. 1 test fails without it.
---
 .../Magento/FunctionalTest/Catalog/Data/ProductData.xml         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Data/ProductData.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Data/ProductData.xml
index cdbcd2d130d0..55b7192405a8 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Data/ProductData.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Data/ProductData.xml
@@ -24,7 +24,7 @@
         <data key="sku" unique="suffix">SimpleProduct</data>
         <data key="type_id">simple</data>
         <data key="attribute_set_id">4</data>
-        <data key="name">SimpleProduct</data>
+        <data key="name" unique="suffix">SimpleProduct</data>
         <data key="price">123.00</data>
         <data key="visibility">4</data>
         <data key="status">1</data>