diff --git a/docs/merge_points/extend-action-groups.md b/docs/merge_points/extend-action-groups.md
index 95d6cff90..6e7a54d70 100644
--- a/docs/merge_points/extend-action-groups.md
+++ b/docs/merge_points/extend-action-groups.md
@@ -9,7 +9,7 @@ In this example we add a `<click>` command to check the checkbox that our extens
 <!-- {% raw %} -->
 
 ```xml
-<actionGroup name="FillAdminSimpleProductForm">
+<actionGroup name="AdminFillSimpleProductFormActionGroup">
     <arguments>
         <argument name="category"/>
         <argument name="simpleProduct"/>
@@ -34,10 +34,10 @@ In this example we add a `<click>` command to check the checkbox that our extens
 </actionGroup>
 ```
 
-## File to merge
+## Extend file
 
 ```xml
-<actionGroup name="FillAdminSimpleProductFormWithMyExtension" extends="FillAdminSimpleProductForm">
+<actionGroup name="AdminFillSimpleProductFormWithMyExtensionActionGroup" extends="AdminFillSimpleProductFormActionGroup">
     <!-- This will be added after the step "fillQuantity" on line 12 in the above test. -->
     <click selector="{{MyExtensionSection.myCheckbox}}" stepKey="clickMyCheckbox" after="fillQuantity"/>
 </actionGroup>
@@ -48,7 +48,7 @@ In this example we add a `<click>` command to check the checkbox that our extens
 Note that there are now two action groups below.
 
 ```xml
-<actionGroup name="FillAdminSimpleProductForm">
+<actionGroup name="AdminFillSimpleProductFormActionGroup">
     <arguments>
         <argument name="category"/>
         <argument name="simpleProduct"/>
@@ -71,7 +71,7 @@ Note that there are now two action groups below.
     <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="openSeoSectionAssert"/>
     <seeInField userInput="{{simpleProduct.urlKey}}" selector="{{AdminProductSEOSection.urlKeyInput}}" stepKey="assertFieldUrlKey"/>
 </actionGroup>
-<actionGroup name="FillAdminSimpleProductFormWithMyExtension">
+<actionGroup name="AdminFillSimpleProductFormWithMyExtensionActionGroup">
     <arguments>
         <argument name="category"/>
         <argument name="simpleProduct"/>
diff --git a/docs/merge_points/extend-data.md b/docs/merge_points/extend-data.md
index ebac16108..91d2a67bb 100644
--- a/docs/merge_points/extend-data.md
+++ b/docs/merge_points/extend-data.md
@@ -23,7 +23,7 @@ In this example we update the quantity to 1001 and add a new piece of data relev
 </entity>
 ```
 
-## File to merge
+## Extend file
 
 ```xml
 <entity name="ExtensionProduct" type="product" extends="SimpleProduct">
diff --git a/docs/merge_points/extend-tests.md b/docs/merge_points/extend-tests.md
index 6aab50764..763977049 100644
--- a/docs/merge_points/extend-tests.md
+++ b/docs/merge_points/extend-tests.md
@@ -25,8 +25,8 @@ In this example, we add an action group to a new copy of the original test for o
         <deleteData createDataKey="createPreReqCategory" stepKey="deletePreReqCategory"/>
     </after>
 
-    <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin1"/>
-    <actionGroup ref="FillAdminSimpleProductForm" stepKey="fillProductFieldsInAdmin">
+    <actionGroup ref="AdminLoginActionGroup" stepKey="AdminLoginActionGroup1"/>
+    <actionGroup ref="AdminFillSimpleProductFormActionGroup" stepKey="fillProductFieldsInAdmin">
         <argument name="category" value="$$createPreReqCategory$$"/>
         <argument name="simpleProduct" value="_defaultProduct"/>
     </actionGroup>
@@ -40,7 +40,7 @@ In this example, we add an action group to a new copy of the original test for o
 </test>
 ```
 
-## File to merge
+## Extend file
 
 ```xml
 <test name="AdminCreateSimpleProductExtensionTest" extends="AdminCreateSimpleProductTest">
@@ -89,8 +89,8 @@ Note that there are now two tests below.
         <deleteData createDataKey="createPreReqCategory" stepKey="deletePreReqCategory"/>
     </after>
 
-    <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin1"/>
-    <actionGroup ref="FillAdminSimpleProductForm" stepKey="fillProductFieldsInAdmin">
+    <actionGroup ref="AdminLoginActionGroup" stepKey="AdminLoginActionGroup1"/>
+    <actionGroup ref="AdminFillSimpleProductFormActionGroup" stepKey="fillProductFieldsInAdmin">
         <argument name="category" value="$$createPreReqCategory$$"/>
         <argument name="simpleProduct" value="_defaultProduct"/>
     </actionGroup>
@@ -120,8 +120,8 @@ Note that there are now two tests below.
         <deleteData createDataKey="createPreReqCategory" stepKey="deletePreReqCategory"/>
     </after>
 
-    <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin1"/>
-    <actionGroup ref="FillAdminSimpleProductForm" stepKey="fillProductFieldsInAdmin">
+    <actionGroup ref="AdminLoginActionGroup" stepKey="AdminLoginActionGroup1"/>
+    <actionGroup ref="AdminFillSimpleProductFormActionGroup" stepKey="fillProductFieldsInAdmin">
         <argument name="category" value="$$createPreReqCategory$$"/>
         <argument name="simpleProduct" value="_defaultProduct"/>
     </actionGroup>
diff --git a/docs/merge_points/merge-action-groups.md b/docs/merge_points/merge-action-groups.md
index 3a4f70ab1..ca6d20e68 100644
--- a/docs/merge_points/merge-action-groups.md
+++ b/docs/merge_points/merge-action-groups.md
@@ -1,7 +1,7 @@
 # Merge action groups
 
 An action group is a set of individual actions working together as a group.
-These action groups can be shared between tests and they also be modified to your needs.
+These action groups can be shared between tests and they also can be modified to your needs.
 
 In this example we add a `<click>` command to check the checkbox that our extension adds to the simple product creation form.
 
@@ -10,7 +10,7 @@ In this example we add a `<click>` command to check the checkbox that our extens
 <!-- {% raw %} -->
 
 ```xml
-<actionGroup name="FillAdminSimpleProductForm">
+<actionGroup name="AdminFillSimpleProductFormActionGroup">
     <arguments>
         <argument name="category"/>
         <argument name="simpleProduct"/>
@@ -38,7 +38,7 @@ In this example we add a `<click>` command to check the checkbox that our extens
 ## File to merge
 
 ```xml
-<actionGroup name="FillAdminSimpleProductForm">
+<actionGroup name="AdminFillSimpleProductFormActionGroup">
     <!-- This will be added after the step "fillQuantity" in the above test. -->
     <click selector="{{MyExtensionSection.myCheckbox}}" stepKey="clickMyCheckbox" after="fillQuantity"/>
 </actionGroup>
@@ -47,7 +47,7 @@ In this example we add a `<click>` command to check the checkbox that our extens
 ## Resultant test
 
 ```xml
-<actionGroup name="FillAdminSimpleProductForm">
+<actionGroup name="AdminFillSimpleProductFormActionGroup">
     <arguments>
         <argument name="category"/>
         <argument name="simpleProduct"/>
diff --git a/docs/merge_points/merge-sections.md b/docs/merge_points/merge-sections.md
index dbd6e3828..135b3f7d8 100644
--- a/docs/merge_points/merge-sections.md
+++ b/docs/merge_points/merge-sections.md
@@ -9,7 +9,7 @@ In this example we add another selector to the section on the products page sect
 <!-- {% raw %} -->
 
 ```xml
-<section name="ProductsPageSection">
+<section name="AdminProductsPageSection">
     <element name="addProductButton" type="button" selector="//button[@id='add_new_product-button']"/>
     <element name="checkboxForProduct" type="button" selector="//*[contains(text(),'{{args}}')]/parent::td/preceding-sibling::td/label[@class='data-grid-checkbox-cell-inner']" parameterized="true"/>
     <element name="actions" type="button" selector="//div[@class='col-xs-2']/div[@class='action-select-wrap']/button[@class='action-select']"/>
@@ -22,7 +22,7 @@ In this example we add another selector to the section on the products page sect
 ## File to merge
 
 ```xml
-<section name="ProductsPageSection">
+<section name="AdminProductsPageSection">
     <!-- myExtensionElement will simply be added to the page -->
     <element name="myExtensionElement" type="button" selector="input.myExtension"/>
 </section>
@@ -31,7 +31,7 @@ In this example we add another selector to the section on the products page sect
 ## Resultant section
 
 ```xml
-<section name="ProductsPageSection">
+<section name="AdminProductsPageSection">
     <element name="addProductButton" type="button" selector="//button[@id='add_new_product-button']"/>
     <element name="checkboxForProduct" type="button" selector="//*[contains(text(),'{{args}}')]/parent::td/preceding-sibling::td/label[@class='data-grid-checkbox-cell-inner']" parameterized="true"/>
     <element name="actions" type="button" selector="//div[@class='col-xs-2']/div[@class='action-select-wrap']/button[@class='action-select']"/>
@@ -41,7 +41,6 @@ In this example we add another selector to the section on the products page sect
     <!-- New element merged -->
     <element name="myExtensionElement" type="button" selector="input.myExtension"/>
 </section>
-</page>
 ```
 
 <!-- {% endraw %} -->
\ No newline at end of file
diff --git a/docs/merge_points/merge-tests.md b/docs/merge_points/merge-tests.md
index 3958410e9..b9e50d296 100644
--- a/docs/merge_points/merge-tests.md
+++ b/docs/merge_points/merge-tests.md
@@ -25,8 +25,8 @@ In this example we add an action group that modifies the original test to intera
         <deleteData createDataKey="createPreReqCategory" stepKey="deletePreReqCategory"/>
     </after>
 
-    <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin1"/>
-    <actionGroup ref="FillAdminSimpleProductForm" stepKey="fillProductFieldsInAdmin">
+    <actionGroup ref="AdminLoginActionGroup" stepKey="adminLoginActionGroup1"/>
+    <actionGroup ref="AdminFillSimpleProductFormActionGroup" stepKey="fillProductFieldsInAdmin">
         <argument name="category" value="$$createPreReqCategory$$"/>
         <argument name="simpleProduct" value="_defaultProduct"/>
     </actionGroup>
@@ -77,8 +77,8 @@ In this example we add an action group that modifies the original test to intera
         <deleteData createDataKey="createPreReqCategory" stepKey="deletePreReqCategory"/>
     </after>
 
-    <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin1"/>
-    <actionGroup ref="FillAdminSimpleProductForm" stepKey="fillProductFieldsInAdmin">
+    <actionGroup ref="AdminLoginActionGroup" stepKey="AdminLoginActionGroup1"/>
+    <actionGroup ref="AdminFillSimpleProductFormActionGroup" stepKey="fillProductFieldsInAdmin">
         <argument name="category" value="$$createPreReqCategory$$"/>
         <argument name="simpleProduct" value="_defaultProduct"/>
     </actionGroup>