Merge branch 'MAGETWO-49426' of github.corp.magento.com:magento-troll/magento2ce into MAGETWO-43102

Author: slopukhov

dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/CreateCategoryEntityTest.xml

@@ -26,7 +26,7 @@
             <data name="category/data/display_mode" xsi:type="string">Static block and products</data>
             <data name="category/data/is_anchor" xsi:type="string">No</data>
             <data name="category/data/available_product_listing_config" xsi:type="string">No</data>
-            <data name="category/data/available_sort_by/sort_0" xsi:type="string">Name</data>
+            <data name="category/data/available_sort_by/sort_0" xsi:type="string">Product Name</data>
             <data name="category/data/available_sort_by/sort_1" xsi:type="string">Price</data>
             <data name="category/data/default_product_listing_config" xsi:type="string">No</data>
             <data name="category/data/default_sort_by" xsi:type="string">Price</data>
@@ -67,7 +67,7 @@
             <data name="category/data/display_mode" xsi:type="string">Static block and products</data>
             <data name="category/data/is_anchor" xsi:type="string">No</data>
             <data name="category/data/available_product_listing_config" xsi:type="string">No</data>
-            <data name="category/data/available_sort_by/sort_0" xsi:type="string">Name</data>
+            <data name="category/data/available_sort_by/sort_0" xsi:type="string">Product Name</data>
             <data name="category/data/available_sort_by/sort_1" xsi:type="string">Price</data>
             <data name="category/data/default_product_listing_config" xsi:type="string">No</data>
             <data name="category/data/default_sort_by" xsi:type="string">Price</data>
@@ -102,7 +102,7 @@
             <data name="category/data/is_anchor" xsi:type="string">Yes</data>
             <data name="category/data/available_product_listing_config" xsi:type="string">No</data>
             <data name="category/data/available_sort_by/sort_0" xsi:type="string">Position</data>
-            <data name="category/data/available_sort_by/sort_1" xsi:type="string">Name</data>
+            <data name="category/data/available_sort_by/sort_1" xsi:type="string">Product Name</data>
             <data name="category/data/available_sort_by/sort_2" xsi:type="string">Price</data>
             <data name="category/data/default_product_listing_config" xsi:type="string">No</data>
             <data name="category/data/default_sort_by" xsi:type="string">Name</data>

dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/UpdateCategoryEntityTest.xml

@@ -26,7 +26,7 @@
             <data name="category/data/default_product_listing_config" xsi:type="string">No</data>
             <data name="category/data/default_sort_by" xsi:type="string">Name</data>
             <data name="category/data/available_product_listing_config" xsi:type="string">No</data>
-            <data name="category/data/available_sort_by/sort_2" xsi:type="string">Name</data>
+            <data name="category/data/available_sort_by/sort_2" xsi:type="string">Product Name</data>
             <data name="category/data/available_sort_by/sort_1" xsi:type="string">Price</data>
             <data name="category/data/category_products/dataset" xsi:type="string">catalogProductSimple::default</data>
             <constraint name="Magento\Catalog\Test\Constraint\AssertCategorySaveMessage" />